diff -Nbru x11-toolkits/xbae.orig/Makefile x11-toolkits/xbae/Makefile --- x11-toolkits/xbae.orig/Makefile Wed Jun 6 05:58:08 2001 +++ x11-toolkits/xbae/Makefile Sat Nov 23 16:38:09 2002 @@ -8,39 +8,20 @@ # PORTNAME= xbae -PORTVERSION= 4.9.1 +PORTVERSION= 4.50.0 CATEGORIES= x11-toolkits math -MASTER_SITES= ftp://ftp.lesstif.org/pub/hungry/lesstif/srcdist/ \ - ftp://linux.mathematik.tu-darmstadt.de/pub/linux/mirrors/misc/lesstif/srcdist/ -MASTER_SITE_SUBDIR= widgets/motif +MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} +MASTER_SITE_SUBDIR= xbae DISTNAME= Xbae-${PORTVERSION} MAINTAINER= Lars.Koeller@Uni-Bielefeld.de USE_MOTIF= yes -USE_IMAKE= yes -USE_LIBTOOL= yes -INSTALLS_SHLIB= yes +USE_X_PREFIX= yes +GNU_CONFIGURE= yes -HAS_CONFIGURE= yes -CONFIGURE_ARGS= --prefix=${X11BASE} --enable-xbae-24bit --enable-xbae-row-heights +CONFIGURE_ARGS=--enable-production MAN3= XbaeCaption.3 XbaeInput.3 XbaeMatrix.3 -.include - -post-patch: - for na in $$(find ${WRKSRC}/examples -name Makefile.in); do \ - ${CP} $$na $$na.orig; \ - ${SED} "s%-lXm%${MOTIFLIB}%" $$na.orig > $$na; \ - done - -post-install: -.if ${PORTOBJFORMAT} == "aout" - ${LN} -sf libXbae.so.8.4 ${PREFIX}/lib/libXbae.so -.endif - ${RM} -rf ${PREFIX}/include/Xbae - ${LN} -sf Xbae-4.8 ${PREFIX}/include/Xbae - ${INSTALL_DATA} ${WRKSRC}/include/Xbae/patchlevel.h ${PREFIX}/include/Xbae - -.include +.include diff -Nbru x11-toolkits/xbae.orig/distinfo x11-toolkits/xbae/distinfo --- x11-toolkits/xbae.orig/distinfo Wed Jun 6 05:58:08 2001 +++ x11-toolkits/xbae/distinfo Sat Nov 23 16:38:09 2002 @@ -1 +1 @@ -MD5 (Xbae-4.9.1.tar.gz) = d20e2f688cb440a186ecd99e19de9fcf +MD5 (Xbae-4.50.0.tar.gz) = 8233877eae34f114f6f05590543af4ad diff -Nbru x11-toolkits/xbae.orig/files/patch-aa x11-toolkits/xbae/files/patch-aa --- x11-toolkits/xbae.orig/files/patch-aa Fri Dec 29 11:15:13 2000 +++ x11-toolkits/xbae/files/patch-aa Wed Dec 31 19:00:00 1969 @@ -1,36 +0,0 @@ -*** Xbae.tmpl.orig Thu Dec 28 20:02:38 2000 ---- Xbae.tmpl Thu Dec 28 20:05:49 2000 -*************** -*** 12,18 **** - - #define DoNormalLib YES - #define DoSharedLib YES -! #define DoDebugLib YES - - #include - ---- 12,18 ---- - - #define DoNormalLib YES - #define DoSharedLib YES -! #define DoDebugLib NO - - #include - -*************** -*** 166,172 **** - #endif - - #ifndef XmClientLibs -! # define XmClientLibs -lXm $(XTOOLLIB) $(XLIB) - #endif - - #ifndef HasSaberC ---- 166,172 ---- - #endif - - #ifndef XmClientLibs -! # define XmClientLibs ${MOTIFLIB} $(XTOOLLIB) $(XLIB) - #endif - - #ifndef HasSaberC diff -Nbru x11-toolkits/xbae.orig/files/patch-ab x11-toolkits/xbae/files/patch-ab --- x11-toolkits/xbae.orig/files/patch-ab Wed Dec 31 19:00:00 1969 +++ x11-toolkits/xbae/files/patch-ab Sat Nov 23 16:38:09 2002 @@ -0,0 +1,357 @@ +diff -bru acconfig.h acconfig.h +--- acconfig.h Thu Aug 16 12:35:43 2001 ++++ acconfig.h Sat Nov 23 15:52:20 2002 +@@ -6,3 +6,6 @@ + #undef HAVE_LIB_XP + + #undef HAVE_MOTIF ++ ++/* Build a production version of the library */ ++#undef XBAE_PRODUCTION +diff -bru configure configure +--- configure Wed Oct 16 13:56:36 2002 ++++ configure Sat Nov 23 15:52:48 2002 +@@ -1002,6 +1002,7 @@ + --disable-libtool-lock avoid locking (might break parallel builds) + --enable-maintainer-mode enable make rules and dependencies not useful + (and sometimes confusing) to the casual installer ++ --enable-production build a production version + + Optional Packages: + --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] +@@ -4694,7 +4695,7 @@ + case $host in + *-*-irix6*) + # Find out which ABI we are using. +- echo '#line 4697 "configure"' > conftest.$ac_ext ++ echo '#line 4698 "configure"' > conftest.$ac_ext + if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? +@@ -5230,7 +5231,7 @@ + save_CFLAGS="$CFLAGS" + CFLAGS="$CFLAGS -o out/conftest2.$ac_objext" + compiler_c_o=no +-if { (eval echo configure:5233: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>out/conftest.err; } && test -s out/conftest2.$ac_objext; then ++if { (eval echo configure:5234: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>out/conftest.err; } && test -s out/conftest2.$ac_objext; then + # The compiler can only warn and ignore the option if not recognized + # So say no if there are warnings + if test -s out/conftest.err; then +@@ -7023,7 +7024,7 @@ + lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 + lt_status=$lt_dlunknown + cat > conftest.$ac_ext < conftest.$ac_ext <&5 + echo "${ECHO_T}libraries $motif_libraries_result, headers $motif_includes_result" >&6 + ++ ++# Check whether --enable-production or --disable-production was given. ++if test "${enable_production+set}" = set; then ++ enableval="$enable_production" ++ ++fi; ++ ++if test "x$enable_production" = "xyes" ; then ++ cat >>confdefs.h <<\_ACEOF ++#define XBAE_PRODUCTION 1 ++_ACEOF ++ ++fi + + if (aclocal --print-ac-dir) /dev/null 2>&1 && test -w `aclocal --print-ac-dir`; then + ACLOCALDIR=`aclocal --print-ac-dir` +diff -bru configure.in configure.in +--- configure.in Wed Oct 16 13:44:30 2002 ++++ configure.in Sat Nov 23 15:52:20 2002 +@@ -98,6 +98,20 @@ + dnl + AC_FIND_MOTIF + ++dnl ++dnl Build a production version of the library ++dnl This will compile out XdbDebug statements ++dnl (the libraries itself remain binary compatible, you can ++dnl link against a debug version, run with a production version ++dnl and vice versa!) ++dnl ++AC_ARG_ENABLE(production, ++[ --enable-production build a production version]) ++ ++if test "x$enable_production" = "xyes" ; then ++ AC_DEFINE(XBAE_PRODUCTION) ++fi ++ + dnl Run test in a subshell; some versions of sh will print an error if + dnl an executable is not found, even if stderr is redirected. + dnl Redirect stdin to placate older versions of autoconf. Sigh. +diff -bru include/XbaeDebug.h include/XbaeDebug.h +--- include/XbaeDebug.h Sat Apr 6 10:01:19 2002 ++++ include/XbaeDebug.h Sat Nov 23 15:52:20 2002 +@@ -136,7 +136,7 @@ + void _XbaeDebugAction(const char *fn, Widget w, const String action, + const String *params, const Cardinal *num_params); + +-#ifdef LESSTIF_PRODUCTION ++#ifdef XBAE_PRODUCTION + #define _XbaeDebugInDebug(x, y) False + #define DEBUGOUT(x) + +@@ -146,7 +146,7 @@ + #else + Boolean _XbaeDebugInDebug(const char *fn, Widget w); + #define DEBUGOUT(x) x +-#endif /* LESSTIF_PRODUCTION */ ++#endif /* XBAE_PRODUCTION */ + + /* + * Some stuff to produce sensible tracing with dmalloc. +diff -bru src/DebugUtil.c src/DebugUtil.c +--- src/DebugUtil.c Thu Jul 25 16:37:10 2002 ++++ src/DebugUtil.c Sat Nov 23 15:52:20 2002 +@@ -77,7 +77,7 @@ + Boolean _XbaeDebugInDebug(const char *fn, Widget w); + + +-#ifndef LESSTIF_PRODUCTION ++#ifndef XBAE_PRODUCTION + /* All external interfaces need to be in place for both, + debug and production build. We may just reduce them + to empty stubs ... */ +@@ -130,16 +130,16 @@ + * enabled or disabled upon program start. Valid Values are on/off. + * e.g. XBAE_DEBUG_TOGGLE=off + * +- * If the C macro LESSTIF_PRODUCTION is defined, then _XbaeDebug etc. don't ++ * If the C macro XBAE_PRODUCTION is defined, then _XbaeDebug etc. don't + * work. Note: this is a compile time option. + * To have maximum performance, sequences of _XbaeDebug statements should be + * surrounded by an if (_XbaeDebugInDebug(__FILE__, w)) statement. +- * _XbaeDebugInDebug is False when LESSTIF_PRODUCTION is defined. ++ * _XbaeDebugInDebug is False when XBAE_PRODUCTION is defined. + */ + + + +-#ifndef LESSTIF_PRODUCTION ++#ifndef XBAE_PRODUCTION + static Boolean _XbaeDebugFlag = True; + static FILE *_XbaeDebugFile = NULL; + typedef void (*sighandler_t)(int); +@@ -638,7 +638,7 @@ + + + +-#ifndef LESSTIF_PRODUCTION ++#ifndef XBAE_PRODUCTION + /* catches the signal defined by XBAE_DEBUG_SIGNAL and toggles the + global debugging flag. + Avoid calling C-runtime functions from within here if possible +@@ -719,7 +719,7 @@ + return True; + } /* signo != NOSIG */ + } /* siginstall() */ +-#endif /* LESSTIF_PRODUCTION */ ++#endif /* XBAE_PRODUCTION */ + + + /* some initialization. +@@ -727,7 +727,7 @@ + is en- or disabled currently */ + extern Boolean + _XbaeDebugInit(void) { +-#ifdef LESSTIF_PRODUCTION ++#ifdef XBAE_PRODUCTION + return False; + #else + static Boolean init=False; +@@ -751,7 +751,7 @@ + #endif + } + +-#ifndef LESSTIF_PRODUCTION ++#ifndef XBAE_PRODUCTION + static void + _XbaeDebugOpenFile(void) + { +@@ -1009,13 +1009,13 @@ + } + } /* ValidateSource() */ + +-#endif /* !LESSTIF_PRODUCTION */ ++#endif /* !XBAE_PRODUCTION */ + + + extern void + _XbaeDebug(const char *fn, Widget w, const char *fmt, ...) + { +-#ifndef LESSTIF_PRODUCTION ++#ifndef XBAE_PRODUCTION + va_list ap; + + #ifdef DEBUGVALIDATE +@@ -1049,14 +1049,14 @@ + + fflush(_XbaeDebugFile); + } +-#endif /* !LESSTIF_PRODUCTION */ ++#endif /* !XBAE_PRODUCTION */ + } + + + extern void + _XbaeDebug2(const char *fn, Widget w, Widget c, const char *fmt, ...) + { +-#ifndef LESSTIF_PRODUCTION ++#ifndef XBAE_PRODUCTION + va_list ap; + + if (_XbaeDebugInit() && ValidateSource(fn)) +@@ -1100,14 +1100,14 @@ + vfprintf(_XbaeDebugFile, fmt, ap); + va_end(ap); + } +-#endif /* !LESSTIF_PRODUCTION */ ++#endif /* !XBAE_PRODUCTION */ + } + + + extern void + _XbaeDebug0(const char *fn, Widget w, const char *fmt, ...) + { +-#ifndef LESSTIF_PRODUCTION ++#ifndef XBAE_PRODUCTION + va_list ap; + + if (_XbaeDebugInit() && ValidateSource(fn)) +@@ -1116,7 +1116,7 @@ + vfprintf(_XbaeDebugFile, fmt, ap); + va_end(ap); + } +-#endif /* !LESSTIF_PRODUCTION */ ++#endif /* !XBAE_PRODUCTION */ + } + + +@@ -1125,7 +1125,7 @@ + extern Boolean + _XbaeDebugInDebug(const char *fn, Widget w) + { +-#ifdef LESSTIF_PRODUCTION ++#ifdef XBAE_PRODUCTION + return False; + #else + return ValidateSource(fn); +@@ -1165,7 +1165,7 @@ + extern void + _XbaeDebugSet(Boolean flag) + { +-#ifndef LESSTIF_PRODUCTION ++#ifndef XBAE_PRODUCTION + if (flag) + _XbaeDebugFlag = True; + else +@@ -1180,7 +1180,7 @@ + extern void + _XbaeDebugToggle(void) + { +-#ifndef LESSTIF_PRODUCTION ++#ifndef XBAE_PRODUCTION + _XbaeDebugFlag = !_XbaeDebugFlag; + #endif + } +@@ -1190,7 +1190,7 @@ + extern Boolean + _XbaeDebugQueryState(void) + { +-#ifndef LESSTIF_PRODUCTION ++#ifndef XBAE_PRODUCTION + return _XbaeDebugFlag; + #else + return False; +@@ -1198,7 +1198,7 @@ + } + + +-#ifndef LESSTIF_PRODUCTION ++#ifndef XBAE_PRODUCTION + static Boolean + __XbaeDebugPrintWidgetID(void) + { +@@ -1263,7 +1263,7 @@ + extern void + _XbaeDebugPrintTree(Widget w) + { +-#ifndef LESSTIF_PRODUCTION ++#ifndef XBAE_PRODUCTION + __XbaeDebugPrintTree(w, 0); + #endif + } +@@ -1272,7 +1272,7 @@ + extern void + _XbaeDebugPrintCompleteTree(Widget w) + { +-#ifndef LESSTIF_PRODUCTION ++#ifndef XBAE_PRODUCTION + Widget ww = w; + + while (ww) +@@ -1303,7 +1303,7 @@ + extern void + _XbaeDebugPrintArgList(const char *fn, Widget w, ArgList al, int n, Boolean Get) + { +-#ifndef LESSTIF_PRODUCTION ++#ifndef XBAE_PRODUCTION + int i; + unsigned num; + +@@ -1483,7 +1483,7 @@ + } + } + } +-#endif/* !LESSTIF_PRODUCTION */ ++#endif/* !XBAE_PRODUCTION */ + } + + +@@ -1493,7 +1493,7 @@ + extern void + _XbaeDebugPrintString(const char *s) + { +-#ifndef LESSTIF_PRODUCTION ++#ifndef XBAE_PRODUCTION + _XbaeDebugOpenFile(); + fprintf(_XbaeDebugFile, "%s", s); + #endif +@@ -2382,7 +2382,7 @@ + _XbaeDebugAction(const char *fn, Widget w, const String action, + const String *params, const Cardinal *num_params) + { +-#ifndef LESSTIF_PRODUCTION ++#ifndef XBAE_PRODUCTION + + if (_XbaeDebugInit() && ValidateSource(fn)) { + int i; +@@ -2411,7 +2411,7 @@ + + fflush(_XbaeDebugFile); + } +-#endif /* !LESSTIF_PRODUCTION */ ++#endif /* !XBAE_PRODUCTION */ + } + + /* diff -Nbru x11-toolkits/xbae.orig/files/patch-ac x11-toolkits/xbae/files/patch-ac --- x11-toolkits/xbae.orig/files/patch-ac Wed Dec 31 19:00:00 1969 +++ x11-toolkits/xbae/files/patch-ac Sat Nov 23 16:38:09 2002 @@ -0,0 +1,88 @@ +--- doc/Makefile.am.orig Sun Oct 6 13:19:58 2002 ++++ doc/Makefile.am Sat Nov 23 16:20:46 2002 +@@ -15,7 +15,7 @@ + # Lets put the informational stuff in a sub directory to avoid + # polluting /usr/local for default installs. + # +-docdir= $(prefix)/Xbae ++docdir= $(datadir)/Xbae + + doc_DATA= \ + contents.html coverplus.html difffonts.html \ +--- doc/Makefile.in.orig Wed Oct 16 14:00:35 2002 ++++ doc/Makefile.in Sat Nov 23 16:21:05 2002 +@@ -127,7 +127,7 @@ + # Lets put the informational stuff in a sub directory to avoid + # polluting /usr/local for default installs. + # +-docdir = $(prefix)/Xbae ++docdir = $(datadir)/Xbae + + doc_DATA = \ + contents.html coverplus.html difffonts.html \ +--- Makefile.am.orig Tue Aug 20 12:03:13 2002 ++++ Makefile.am Sat Nov 23 16:28:21 2002 +@@ -16,7 +16,7 @@ + + endif + +-docdir= $(prefix)/Xbae ++docdir= $(datadir)/Xbae + doc_DATA= NEWS README INSTALL + + .PHONY: changelog UpdateCheck +--- Makefile.in.orig Wed Oct 16 13:56:23 2002 ++++ Makefile.in Sat Nov 23 16:28:17 2002 +@@ -125,7 +125,7 @@ + + @Aclocal_TRUE@aclocal_DATA = ac_find_xbae.m4 + +-docdir = $(prefix)/Xbae ++docdir = $(datadir)/Xbae + doc_DATA = NEWS README INSTALL + + # +--- examples/builderXcessory/Makefile.am.orig Tue Jan 25 17:39:52 2000 ++++ examples/builderXcessory/Makefile.am Sat Nov 23 16:27:50 2002 +@@ -9,7 +9,7 @@ + xbae.wml \ + xbae_ctrl.tcl + +-examplesdir = $(prefix)/Xbae/examples/builderXcessory ++examplesdir = $(datadir)/Xbae/examples/builderXcessory + examples_DATA = \ + XbaeCaption.col XbaeInput.col XbaeMatrix.col \ + XbaeCaption.pix XbaeInput.pix XbaeMatrix.pix \ +--- examples/builderXcessory/Makefile.in.orig Wed Oct 16 14:00:28 2002 ++++ examples/builderXcessory/Makefile.in Sat Nov 23 16:27:46 2002 +@@ -122,7 +122,7 @@ + xbae_ctrl.tcl + + +-examplesdir = $(prefix)/Xbae/examples/builderXcessory ++examplesdir = $(datadir)/Xbae/examples/builderXcessory + examples_DATA = \ + XbaeCaption.col XbaeInput.col XbaeMatrix.col \ + XbaeCaption.pix XbaeInput.pix XbaeMatrix.pix \ +--- doc/images/Makefile.am.orig Tue Aug 20 14:11:11 2002 ++++ doc/images/Makefile.am Sat Nov 23 16:27:21 2002 +@@ -10,7 +10,7 @@ + # Lets put the informational stuff in a sub directory to avoid + # polluting /usr/local for default installs. + # +-imagedir= $(exec_prefix)/Xbae/images ++imagedir= $(datadir)/Xbae/images + + + +--- doc/images/Makefile.in.orig Wed Oct 16 14:00:42 2002 ++++ doc/images/Makefile.in Sat Nov 23 16:27:15 2002 +@@ -122,7 +122,7 @@ + # Lets put the informational stuff in a sub directory to avoid + # polluting /usr/local for default installs. + # +-imagedir = $(exec_prefix)/Xbae/images ++imagedir = $(datadir)/Xbae/images + + # + # Cut the distribution size, don't distribute these in a source diff -Nbru x11-toolkits/xbae.orig/pkg-descr x11-toolkits/xbae/pkg-descr --- x11-toolkits/xbae.orig/pkg-descr Wed Apr 8 09:28:21 1998 +++ x11-toolkits/xbae/pkg-descr Sat Nov 23 16:38:09 2002 @@ -6,3 +6,5 @@ XmTextField widgets, but is actually implemented with a single XmTextField. This means a big performance improvement due to less overhead. + +WWW: http://xbae.sourceforge.net/ diff -Nbru x11-toolkits/xbae.orig/pkg-plist x11-toolkits/xbae/pkg-plist --- x11-toolkits/xbae.orig/pkg-plist Fri Dec 29 11:15:12 2000 +++ x11-toolkits/xbae/pkg-plist Sat Nov 23 16:38:09 2002 @@ -1,15 +1,68 @@ -lib/libXbae-4.8.a -lib/libXbae.a -lib/libXbae.so -lib/libXbae.so.8 -include/Xbae-4.8/Caption.h -include/Xbae-4.8/CaptionP.h -include/Xbae-4.8/Input.h -include/Xbae-4.8/InputP.h -include/Xbae-4.8/Clip.h -include/Xbae-4.8/ClipP.h -include/Xbae-4.8/Matrix.h -include/Xbae-4.8/MatrixP.h -include/Xbae-4.8/patchlevel.h -@dirrm include/Xbae-4.8 -include/Xbae +include/Xbae/Caption.h +include/Xbae/CaptionP.h +include/Xbae/Clip.h +include/Xbae/ClipP.h +include/Xbae/Input.h +include/Xbae/InputP.h +include/Xbae/Matrix.h +include/Xbae/MatrixP.h +include/Xbae/patchlevel.h +lib/libXbae.la +lib/libXbae.so.4 +share/Xbae/FAQ.html +share/Xbae/INSTALL +share/Xbae/NEWS +share/Xbae/README +share/Xbae/contents.html +share/Xbae/coverplus.html +share/Xbae/difffonts.html +share/Xbae/examples/builderXcessory/XbaeCaption.col +share/Xbae/examples/builderXcessory/XbaeCaption.pix +share/Xbae/examples/builderXcessory/XbaeInput.col +share/Xbae/examples/builderXcessory/XbaeInput.pix +share/Xbae/examples/builderXcessory/XbaeMatrix.col +share/Xbae/examples/builderXcessory/XbaeMatrix.pix +share/Xbae/examples/builderXcessory/local.cat +share/Xbae/examples/builderXcessory/xbae.wml +share/Xbae/examples/builderXcessory/xbae_ctrl.tcl +share/Xbae/images/LDO.jpg +share/Xbae/images/add.jpg +share/Xbae/images/bg.png +share/Xbae/images/capfloor1.png +share/Xbae/images/capfloor3.png +share/Xbae/images/caption.png +share/Xbae/images/choice.png +share/Xbae/images/colors.jpg +share/Xbae/images/coverplus.png +share/Xbae/images/draw.png +share/Xbae/images/fifteen.jpg +share/Xbae/images/input.png +share/Xbae/images/lesstif.png +share/Xbae/images/list.jpg +share/Xbae/images/mailbox.png +share/Xbae/images/matrix.jpg +share/Xbae/images/multifixed.jpg +share/Xbae/images/new.png +share/Xbae/images/organize.jpg +share/Xbae/images/pricing.jpg +share/Xbae/images/risk.jpg +share/Xbae/images/select-push.jpg +share/Xbae/images/taam.png +share/Xbae/images/updated.png +share/Xbae/images/xbasket.png +share/Xbae/images/xbill2-2.png +share/Xbae/images/xbum1-2.png +share/Xbae/index.html +share/Xbae/main.html +share/Xbae/morelines.html +share/Xbae/psdriver.html +share/Xbae/scrolling.html +share/Xbae/sites.html +share/Xbae/spancells.html +share/Xbae/title.html +share/Xbae/users.html +@dirrm share/Xbae/images +@dirrm share/Xbae/examples/builderXcessory +@dirrm share/Xbae/examples +@dirrm share/Xbae +@dirrm include/Xbae