head 1.6; access; symbols OPENPKG_E1_MP_HEAD:1.4 OPENPKG_E1_MP:1.4 OPENPKG_E1_MP_2_STABLE:1.4 OPENPKG_E1_FP:1.4 OPENPKG_2_STABLE_MP:1.4 OPENPKG_2_STABLE_20061018:1.4 OPENPKG_2_STABLE_20060622:1.4 OPENPKG_2_STABLE:1.4.0.2 OPENPKG_2_STABLE_BP:1.4 OPENPKG_2_5_SOLID:1.3.0.6 OPENPKG_2_5_SOLID_BP:1.3 OPENPKG_2_4_RELEASE:1.3 OPENPKG_2_4_SOLID:1.3.0.4 OPENPKG_2_4_SOLID_BP:1.3 OPENPKG_2_3_RELEASE:1.3 OPENPKG_2_3_SOLID:1.3.0.2 OPENPKG_2_3_SOLID_BP:1.3 OPENPKG_2_2_RELEASE:1.2 OPENPKG_2_2_SOLID:1.2.0.4 OPENPKG_2_2_SOLID_BP:1.2 OPENPKG_2_1_RELEASE:1.2 OPENPKG_2_1_SOLID:1.2.0.2 OPENPKG_2_1_SOLID_BP:1.2 OPENPKG_2_0_RELEASE:1.1 OPENPKG_2_0_SOLID:1.1.0.4 OPENPKG_2_0_SOLID_BP:1.1 OPENPKG_1_3_RELEASE:1.1.2.1 OPENPKG_1_3_SOLID:1.1.2.1.0.2 OPENPKG_1_3_SOLID_BP:1.1.2.1 OPENPKG_1_STABLE:1.1.0.2 OPENPKG_1_STABLE_MP:1.1; locks; strict; comment @# @; 1.6 date 2009.08.11.18.07.46; author rse; state Exp; branches; next 1.5; commitid aXSdnFZqY8RSZiZt; 1.5 date 2007.09.10.05.44.18; author rse; state Exp; branches; next 1.4; commitid P7KQyIM1uTxRp9xs; 1.4 date 2006.03.10.19.04.40; author rse; state Exp; branches; next 1.3; commitid loveH0L8I8hwuFor; 1.3 date 2005.01.07.10.20.40; author cs; state dead; branches; next 1.2; 1.2 date 2004.06.24.10.37.06; author thl; state Exp; branches; next 1.1; 1.1 date 2003.07.16.08.32.43; author mlelstv; state Exp; branches 1.1.2.1; next ; 1.1.2.1 date 2003.07.24.20.50.26; author rse; state Exp; branches; next ; desc @@ 1.6 log @upgrading package: pstoedit 3.45 -> 3.50 @ text @Index: configure --- configure.orig 2009-08-10 12:58:11 +0200 +++ configure 2009-08-11 19:53:03 +0200 @@@@ -18178,7 +18178,7 @@@@ else { $as_echo "$as_me:$LINENO: result: GNU" >&5 $as_echo "GNU" >&6; } - SPECIAL_CXXFLAGS="-DBUGGYGPP -pedantic -Wall -Wwrite-strings -Wcast-qual -Wpointer-arith " + SPECIAL_CXXFLAGS="-DBUGGYGPP" fi CXXFLAGS="-g" elif test `echo "$CXX" | egrep -c 'xlC$'` -eq 1; then Index: src/Makefile.in --- src/Makefile.in.orig 2009-08-10 12:57:58 +0200 +++ src/Makefile.in 2009-08-11 19:53:23 +0200 @@@@ -381,7 +381,7 @@@@ genericints.h \ version.h -libpstoedit_la_LIBADD = ${CXX_STD_LIB} ${CXX_RUNTIME_LIB} -ldl -lm +libpstoedit_la_LIBADD = ${CXX_STD_LIB} ${CXX_RUNTIME_LIB} @@LIBLD_LDFLAGS@@ -lm libpstoedit_la_LDFLAGS = -no-undefined pstoedit_SOURCES = cmdmain.cpp pstoedit_LDFLAGS = -no-undefined -L. libpstoedit.la ${LIBLD_LDFLAGS} @ 1.5 log @upgrading package: pstoedit 3.44 -> 3.45 @ text @d2 3 a4 3 --- configure.orig 2007-08-10 22:26:10 +0200 +++ configure 2007-09-10 07:42:32 +0200 @@@@ -22282,7 +22282,7 @@@@ d6 2 a7 2 { echo "$as_me:$LINENO: result: GNU" >&5 echo "${ECHO_T}GNU" >&6; } d14 3 a16 3 --- src/Makefile.in.orig 2007-09-09 18:07:30 +0200 +++ src/Makefile.in 2007-09-10 07:42:39 +0200 @@@@ -358,7 +358,7 @@@@ d20 2 a21 2 -libpstoedit_la_LIBADD = ${CXX_STD_LIB} ${CXX_RUNTIME_LIB} -ldl +libpstoedit_la_LIBADD = ${CXX_STD_LIB} ${CXX_RUNTIME_LIB} @@LIBLD_LDFLAGS@@ @ 1.4 log @upgrading package: pstoedit 3.42 -> 3.43 @ text @d2 3 a4 3 --- configure.orig 2006-03-05 21:55:30 +0100 +++ configure 2006-03-10 19:53:49 +0100 @@@@ -22360,7 +22360,7 @@@@ d6 2 a7 2 echo "$as_me:$LINENO: result: GNU" >&5 echo "${ECHO_T}GNU" >&6 d13 12 @ 1.3 log @upgrading package: pstoedit 3.33 -> 3.40 @ text @d1 12 a12 291 --- src/dynload.cpp.dist 2003-07-16 10:25:08.000000000 +0200 +++ src/dynload.cpp 2003-07-16 10:30:42.000000000 +0200 @@@@ -24,7 +24,7 @@@@ // we need __linux__ instead of just linux since the latter is not defined when -ansi is used. -#if defined(__sparc) || defined(__linux) || defined(__linux__) || defined(__FreeBSD__) || defined(_WIN32) || defined(__OS2__) || (HAVE_DLFCN_H==1) +#if defined(__sun) || defined(__linux) || defined(__linux__) || defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(_WIN32) || defined(__OS2__) || (HAVE_DLFCN_H==1) #define HAVESHAREDLIBS #endif @@@@ -47,11 +47,11 @@@@ #if defined(__linux) || defined(__linux__) #include // static const char * const libsuffix = ".so"; -#elif defined(__FreeBSD__) +#elif defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) #include #elif defined(__hpux) #include -#elif defined(__sparc) +#elif defined(__sun) #if defined(__SVR4) #include #else @@@@ -103,13 +103,13 @@@@ #if defined(__linux) || defined(__linux__) int loadmode = RTLD_LAZY; // RTLD_NOW handle = dlopen(fulllibname, loadmode); -#elif defined(__FreeBSD__) +#elif defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) int loadmode = RTLD_LAZY; // RTLD_NOW handle = dlopen(fulllibname, loadmode); #elif defined(__hpux) int loadmode = RTLD_LAZY; // RTLD_NOW handle = dlopen(fulllibname, loadmode); -#elif defined(__sparc) +#elif defined(__sun) int loadmode = RTLD_LAZY; // RTLD_NOW handle = dlopen(fulllibname, loadmode); #elif defined(__OS2__) @@@@ -146,11 +146,11 @@@@ if (handle) { #if defined(__linux) || defined(__linux__) dlclose(handle); -#elif defined(__FreeBSD__) +#elif defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) dlclose(handle); #elif defined(__hpux) dlclose(handle); -#elif defined(__sparc) +#elif defined(__sun) dlclose(handle); #elif defined(__OS2__) dlclose(handle); @@@@ -177,11 +177,11 @@@@ { #if defined(__linux) || defined(__linux__) DynLoader::fptr rfptr = (DynLoader::fptr) dlsym(handle, name); //lint !e611 //: Suspicious cast -#elif defined(__FreeBSD__) +#elif defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) DynLoader::fptr rfptr = (DynLoader::fptr) dlsym(handle, name); //lint !e611 //: Suspicious cast #elif defined(__hpux) DynLoader::fptr rfptr = (DynLoader::fptr) dlsym(handle, name); //lint !e611 //: Suspicious cast -#elif defined(__sparc) +#elif defined(__sun) DynLoader::fptr rfptr = (DynLoader::fptr) dlsym(handle, name); //lint !e611 //: Suspicious cast #elif defined(__OS2__) DynLoader::fptr rfptr = (DynLoader::fptr) dlsym(handle, name); //lint !e611 //: Suspicious cast @@@@ -265,7 +265,7 @@@@ } -#if defined(__linux) || defined(__linux__) || defined(__FreeBSD__) || defined(__sparc) || defined(__hpux) || defined(__OS2__) +#if defined(__linux) || defined(__linux__) || defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__sun) || defined(__hpux) || defined(__OS2__) // for directory search #if HAVE_DIRENT_H #include Index: src/lexyy.cpp --- src/lexyy.cpp.orig 2003-01-05 13:14:06 +0100 +++ src/lexyy.cpp 2004-06-24 12:22:17 +0200 @@@@ -1411,7 +1411,7 @@@@ static inline int toInt(const float f) { return (f > 0.0f) ? (int)(f+0.5f) : (int)(f-0.5f); -}; +} Index: src/poptions.cpp --- src/poptions.cpp.orig 2003-01-05 13:14:06 +0100 +++ src/poptions.cpp 2004-06-24 12:22:45 +0200 @@@@ -40,7 +40,7 @@@@ cout << "missing integer argument for " << optname << " option:" << endl; return false; } -}; +} const char *IntValueExtractor::gettypename() { return "integer"; @@@@ -59,7 +59,7 @@@@ cout << "missing double argument for " << optname << " option:" << endl; return false; } -}; +} const char *DoubleValueExtractor::gettypename() { return "double"; Index: src/drvlwo.cpp --- src/drvlwo.cpp.orig 2003-01-05 13:14:06 +0100 +++ src/drvlwo.cpp 2004-06-24 12:23:04 +0200 @@@@ -174,7 +174,7 @@@@ void drvLWO::show_path() { print_coords(); -}; +} static DriverDescriptionT < drvLWO > D_lwo("lwo", "LightWave 3D Object Format", "lwo", false, // if backend supports subpathes, else 0 Index: src/drvrib.cpp --- src/drvrib.cpp.orig 2003-01-05 13:14:06 +0100 +++ src/drvrib.cpp 2004-06-24 12:23:30 +0200 @@@@ -102,7 +102,7 @@@@ { outf << "Color " << currentR() << " " << currentG() << " " << currentB() << endl; print_coords(); -}; +} static DriverDescriptionT < drvRIB > D_rib("rib", "RenderMan Interface Bytestream", "rib", false, // if backend supports subpathes, else 0 Index: src/drvrpl.cpp --- src/drvrpl.cpp.orig 2003-01-05 13:14:06 +0100 +++ src/drvrpl.cpp 2004-06-24 12:23:45 +0200 @@@@ -92,7 +92,7 @@@@ void drvRPL::show_path() { print_coords(); -}; +} static DriverDescriptionT < drvRPL > D_rpl("rpl", "Real3D Programming Language Format", "rpl", false, // if backend supports subpathes, else 0 // if subpathes are supported, the backend must deal with Index: src/drvjava.cpp --- src/drvjava.cpp.orig 2003-01-05 13:14:05 +0100 +++ src/drvjava.cpp 2004-06-24 12:24:08 +0200 @@@@ -231,7 +231,7 @@@@ break; } // outf << "\tcurrentLineWidth: " << currentLineWidth() << endl; -}; +} static DriverDescriptionT < drvJAVA > D_java("java1", "java 1 applet source code", "java", false, // if backend supports subpathes, else 0 Index: src/drvjava2.cpp --- src/drvjava2.cpp.orig 2003-01-05 13:14:05 +0100 +++ src/drvjava2.cpp 2004-06-24 12:24:46 +0200 @@@@ -302,7 +302,7 @@@@ print_coords(); outf << " currentPage.add(currentPath);" << endl; numberOfElements++; -}; +} void drvJAVA2::show_rectangle(const float llx, const float lly, const float urx, const float ury) Index: src/drvsk.cpp --- src/drvsk.cpp.orig 2003-01-05 13:14:06 +0100 +++ src/drvsk.cpp 2004-06-24 12:25:17 +0200 @@@@ -214,7 +214,7 @@@@ outf << "b()\n"; print_coords(); -}; +} void drvSK::show_rectangle(const float llx, const float lly, const float urx, const float ury) { Index: src/drvmpost.cpp --- src/drvmpost.cpp.orig 2003-01-05 13:14:06 +0100 +++ src/drvmpost.cpp 2004-06-24 12:25:37 +0200 @@@@ -401,7 +401,7 @@@@ } // Draw the path print_coords(); -}; +} static DriverDescriptionT < drvMPOST > D_mpost("mpost", "MetaPost Format", "mp", true, // if backend supports subpathes, else 0 // if subpathes are supported, the backend must deal with Index: src/drvmma.cpp --- src/drvmma.cpp.orig 2003-01-05 13:14:06 +0100 +++ src/drvmma.cpp 2004-06-24 12:25:54 +0200 @@@@ -239,7 +239,7 @@@@ outf << "AbsoluteThickness[" << mmaThickness << "],\n"; } print_coords(); -}; +} void drvMMA::RGBColor(float R, float G, float B) { Index: src/drvlatex2e.cpp --- src/drvlatex2e.cpp.orig 2003-01-05 13:14:06 +0100 +++ src/drvlatex2e.cpp 2004-06-24 12:26:24 +0200 @@@@ -328,7 +328,7 @@@@ } // Output the path. print_coords(); -}; +} // Draw a rectangle with \framebox. Index: src/drvpic.cpp --- src/drvpic.cpp.orig 2003-01-05 13:14:06 +0100 +++ src/drvpic.cpp 2004-06-24 12:26:39 +0200 @@@@ -425,7 +425,7 @@@@ outf << ".\\\" dashPattern: " << dashPattern() << endl; } print_coords(); -}; +} static DriverDescriptionT < drvPIC > D_PIC("pic", "PIC format for troff et.al.", "pic", true, // backend supports subpathes // if subpathes are supported, the backend must deal with Index: src/drvtk.cpp --- src/drvtk.cpp.orig 2003-01-05 13:14:06 +0100 +++ src/drvtk.cpp 2004-06-24 12:27:20 +0200 @@@@ -1220,7 +1220,7 @@@@ if (strcmp(tagNames, "") && !noImPress) { buffer << "set Group($Global(CurrentCanvas),$i) \"" << tagNames << "\"" << endl; } -}; +} static DriverDescriptionT < drvTK > D_tk("tk", "tk and/or tk applet source code", "tk", false, // backend supports subpathes Index: src/drvgnplt.cpp --- src/drvgnplt.cpp.orig 2003-01-05 13:14:05 +0100 +++ src/drvgnplt.cpp 2004-06-24 12:27:39 +0200 @@@@ -60,7 +60,7 @@@@ const Point & p = pathElement(n).getPoint(0); outf << p.x_ << " " << p.y_ << "\n"; } -}; +} static DriverDescriptionT < drvGNUPLOT > D_gnuplot("gnuplot", "gnuplot format", "gnuplot", false, // if backend supports subpathes Index: src/drvtgif.cpp --- src/drvtgif.cpp.orig 2003-01-05 13:14:06 +0100 +++ src/drvtgif.cpp 2004-06-24 12:28:02 +0200 @@@@ -356,7 +356,7 @@@@ } buffer << "\",[" << endl << "])." << endl; } -}; +} void drvTGIF::show_rectangle(const float llx, const float lly, const float urx, const float ury) { Index: src/drvidraw.cpp --- src/drvidraw.cpp.orig 2003-01-05 13:14:05 +0100 +++ src/drvidraw.cpp 2004-06-24 12:28:31 +0200 @@@@ -995,7 +995,7 @@@@ void drvIDRAW::show_path() { print_coords(); -}; +} void drvIDRAW::show_image(const PSImage & imageinfo) Index: src/drvsampl.cpp --- src/drvsampl.cpp.orig 2003-01-05 13:14:06 +0100 +++ src/drvsampl.cpp 2004-06-24 12:28:48 +0200 @@@@ -163,7 +163,7 @@@@ outf << "\tPath Elements 0 to " << numberOfElementsInPath() - 1 << endl; print_coords(); -}; +} void drvSAMPL::show_rectangle(const float llx, const float lly, const float urx, const float ury) { @ 1.2 log @fix superfluous semicolon; get rid of warnings about unsupported C++ warnings ;-) @ text @@ 1.1 log @better platform checks @ text @d79 213 @ 1.1.2.1 log @mass Merge-From-CURRENT (MFC) in preparation for OpenPKG 1.3 [class PLUS only] @ text @@