Attachment #26799 for bug #45655

View | Details | Raw Unified | Return to bug 45655
Collapse All | Expand All




#

PORTNAME=	xbae
PORTVERSION=	4.50.0
CATEGORIES=	x11-toolkits math
MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR=	xbae
MASTER_SITE_SUBDIR=	widgets/motif
DISTNAME=	Xbae-${PORTVERSION}

MAINTAINER=	Lars.Koeller@Uni-Bielefeld.de

USE_MOTIF=	yes
USE_X_PREFIX=	yes
GNU_CONFIGURE=	yes
INSTALLS_SHLIB=	yes

CONFIGURE_ARGS=--enable-production
CONFIGURE_ARGS= --prefix=${X11BASE} --enable-xbae-24bit --enable-xbae-row-heights

MAN3=		XbaeCaption.3 XbaeInput.3 XbaeMatrix.3

.include <bsd.port.mk>

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 <bsd.port.post.mk>

Line 1 Link Here

(-)x11-toolkits/xbae/distinfo (-1 / +1 lines)
1	MD5 (Xbae-4.9.1.tar.gz) = d20e2f688cb440a186ecd99e19de9fcf	1	MD5 (Xbae-4.50.0.tar.gz) = 8233877eae34f114f6f05590543af4ad




*** 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 <Library.tmpl>

--- 12,18 ----

  #define DoNormalLib		YES
  #define DoSharedLib		YES
! #define DoDebugLib		NO

  #include <Library.tmpl>

***************
*** 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 -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 <<EOF
-#line 7026 "configure"
+#line 7027 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -7121,7 +7122,7 @@
     lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 7124 "configure"
+#line 7125 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -9611,6 +9612,19 @@
 echo "$as_me:$LINENO: result: libraries $motif_libraries_result, headers $motif_includes_result" >&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 >/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 */
 }
 
 /*




--- 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

Lines 6-8 Link Here

(-)x11-toolkits/xbae/pkg-descr (+2 lines)
6	XmTextField widgets, but is actually implemented with a single	6	XmTextField widgets, but is actually implemented with a single
7	XmTextField. This means a big performance improvement due to less	7	XmTextField. This means a big performance improvement due to less
8	overhead.	8	overhead.
		9
		10	WWW: http://xbae.sourceforge.net/




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

Return to bug 45655

Lines 8-46 Link Here

(-)x11-toolkits/xbae/Makefile (-26 / +7 lines)
8	#	8	#
9		9
10	PORTNAME= xbae	10	PORTNAME= xbae
11	PORTVERSION= 4.9.1	11	PORTVERSION= 4.50.0
12	CATEGORIES= x11-toolkits math	12	CATEGORIES= x11-toolkits math
13	MASTER_SITES= ftp://ftp.lesstif.org/pub/hungry/lesstif/srcdist/ \	13	MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
14	ftp://linux.mathematik.tu-darmstadt.de/pub/linux/mirrors/misc/lesstif/srcdist/	14	MASTER_SITE_SUBDIR= xbae
15	MASTER_SITE_SUBDIR= widgets/motif
16	DISTNAME= Xbae-${PORTVERSION}	15	DISTNAME= Xbae-${PORTVERSION}
17		16
18	MAINTAINER= Lars.Koeller@Uni-Bielefeld.de	17	MAINTAINER= Lars.Koeller@Uni-Bielefeld.de
19		18
20	USE_MOTIF= yes	19	USE_MOTIF= yes
21	USE_IMAKE= yes	20	USE_X_PREFIX= yes
22	USE_LIBTOOL= yes	21	GNU_CONFIGURE= yes
23	INSTALLS_SHLIB= yes
24		22
25	HAS_CONFIGURE= yes	23	CONFIGURE_ARGS=--enable-production
26	CONFIGURE_ARGS= --prefix=${X11BASE} --enable-xbae-24bit --enable-xbae-row-heights
27		24
28	MAN3= XbaeCaption.3 XbaeInput.3 XbaeMatrix.3	25	MAN3= XbaeCaption.3 XbaeInput.3 XbaeMatrix.3
29		26
30	.include <bsd.port.pre.mk>	27	.include <bsd.port.mk>
31
32	post-patch:
33	for na in $$(find ${WRKSRC}/examples -name Makefile.in); do \
34	${CP} $$na $$na.orig; \
35	${SED} "s%-lXm%${MOTIFLIB}%" $$na.orig > $$na; \
36	done
37
38	post-install:
39	.if ${PORTOBJFORMAT} == "aout"
40	${LN} -sf libXbae.so.8.4 ${PREFIX}/lib/libXbae.so
41	.endif
42	${RM} -rf ${PREFIX}/include/Xbae
43	${LN} -sf Xbae-4.8 ${PREFIX}/include/Xbae
44	${INSTALL_DATA} ${WRKSRC}/include/Xbae/patchlevel.h ${PREFIX}/include/Xbae
45
46	.include <bsd.port.post.mk>

Lines 1-36 Link Here

(-)x11-toolkits/xbae/files/patch-aa (-36 lines)
1	*** Xbae.tmpl.orig Thu Dec 28 20:02:38 2000
2	--- Xbae.tmpl Thu Dec 28 20:05:49 2000
3	***************
4	* 12,18 **
5
6	#define DoNormalLib YES
7	#define DoSharedLib YES
8	! #define DoDebugLib YES
9
10	#include <Library.tmpl>
11
12	--- 12,18 ----
13
14	#define DoNormalLib YES
15	#define DoSharedLib YES
16	! #define DoDebugLib NO
17
18	#include <Library.tmpl>
19
20	***************
21	* 166,172 **
22	#endif
23
24	#ifndef XmClientLibs
25	! # define XmClientLibs -lXm $(XTOOLLIB) $(XLIB)
26	#endif
27
28	#ifndef HasSaberC
29	--- 166,172 ----
30	#endif
31
32	#ifndef XmClientLibs
33	! # define XmClientLibs ${MOTIFLIB} $(XTOOLLIB) $(XLIB)
34	#endif
35
36	#ifndef HasSaberC

Line 0 Link Here

(-)x11-toolkits/xbae/files/patch-ab (+357 lines)
		1	diff -bru acconfig.h acconfig.h
		2	--- acconfig.h Thu Aug 16 12:35:43 2001
		3	+++ acconfig.h Sat Nov 23 15:52:20 2002
		4	@@ -6,3 +6,6 @@
		5	#undef HAVE_LIB_XP
		6
		7	#undef HAVE_MOTIF
		8	+
		9	+/* Build a production version of the library */
		10	+#undef XBAE_PRODUCTION
		11	diff -bru configure configure
		12	--- configure Wed Oct 16 13:56:36 2002
		13	+++ configure Sat Nov 23 15:52:48 2002
		14	@@ -1002,6 +1002,7 @@
		15	--disable-libtool-lock avoid locking (might break parallel builds)
		16	--enable-maintainer-mode enable make rules and dependencies not useful
		17	(and sometimes confusing) to the casual installer
		18	+ --enable-production build a production version
		19
		20	Optional Packages:
		21	--with-PACKAGE[=ARG] use PACKAGE [ARG=yes]
		22	@@ -4694,7 +4695,7 @@
		23	case $host in
		24	--irix6*)
		25	# Find out which ABI we are using.
		26	- echo '#line 4697 "configure"' > conftest.$ac_ext
		27	+ echo '#line 4698 "configure"' > conftest.$ac_ext
		28	if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
		29	(eval $ac_compile) 2>&5
		30	ac_status=$?
		31	@@ -5230,7 +5231,7 @@
		32	save_CFLAGS="$CFLAGS"
		33	CFLAGS="$CFLAGS -o out/conftest2.$ac_objext"
		34	compiler_c_o=no
		35	-if { (eval echo configure:5233: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>out/conftest.err; } && test -s out/conftest2.$ac_objext; then
		36	+if { (eval echo configure:5234: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>out/conftest.err; } && test -s out/conftest2.$ac_objext; then
		37	# The compiler can only warn and ignore the option if not recognized
		38	# So say no if there are warnings
		39	if test -s out/conftest.err; then
		40	@@ -7023,7 +7024,7 @@
		41	lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
		42	lt_status=$lt_dlunknown
		43	cat > conftest.$ac_ext <<EOF
		44	-#line 7026 "configure"
		45	+#line 7027 "configure"
		46	#include "confdefs.h"
		47
		48	#if HAVE_DLFCN_H
		49	@@ -7121,7 +7122,7 @@
		50	lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
		51	lt_status=$lt_dlunknown
		52	cat > conftest.$ac_ext <<EOF
		53	-#line 7124 "configure"
		54	+#line 7125 "configure"
		55	#include "confdefs.h"
		56
		57	#if HAVE_DLFCN_H
		58	@@ -9611,6 +9612,19 @@
		59	echo "$as_me:$LINENO: result: libraries $motif_libraries_result, headers $motif_includes_result" >&5
		60	echo "${ECHO_T}libraries $motif_libraries_result, headers $motif_includes_result" >&6
		61
		62	+
		63	+# Check whether --enable-production or --disable-production was given.
		64	+if test "${enable_production+set}" = set; then
65	+ enableval="$enable_production"
66	+
67	+fi;
68	+
69	+if test "x$enable_production" = "xyes" ; then
70	+ cat >>confdefs.h <<\_ACEOF
71	+#define XBAE_PRODUCTION 1
72	+_ACEOF
73	+
74	+fi
75
76	if (aclocal --print-ac-dir) </dev/null >/dev/null 2>&1 && test -w `aclocal --print-ac-dir`; then
77	ACLOCALDIR=`aclocal --print-ac-dir`
78	diff -bru configure.in configure.in
79	--- configure.in Wed Oct 16 13:44:30 2002
80	+++ configure.in Sat Nov 23 15:52:20 2002
81	@@ -98,6 +98,20 @@
82	dnl
83	AC_FIND_MOTIF
84
85	+dnl
86	+dnl Build a production version of the library
87	+dnl This will compile out XdbDebug statements
88	+dnl (the libraries itself remain binary compatible, you can
89	+dnl link against a debug version, run with a production version
90	+dnl and vice versa!)
91	+dnl
92	+AC_ARG_ENABLE(production,
93	+[ --enable-production build a production version])
94	+
95	+if test "x$enable_production" = "xyes" ; then
96	+ AC_DEFINE(XBAE_PRODUCTION)
97	+fi
98	+
99	dnl Run test in a subshell; some versions of sh will print an error if
100	dnl an executable is not found, even if stderr is redirected.
101	dnl Redirect stdin to placate older versions of autoconf. Sigh.
102	diff -bru include/XbaeDebug.h include/XbaeDebug.h
103	--- include/XbaeDebug.h Sat Apr 6 10:01:19 2002
104	+++ include/XbaeDebug.h Sat Nov 23 15:52:20 2002
105	@@ -136,7 +136,7 @@
106	void _XbaeDebugAction(const char *fn, Widget w, const String action,
107	const String params, const Cardinal num_params);
108
109	-#ifdef LESSTIF_PRODUCTION
110	+#ifdef XBAE_PRODUCTION
111	#define _XbaeDebugInDebug(x, y) False
112	#define DEBUGOUT(x)
113
114	@@ -146,7 +146,7 @@
115	#else
116	Boolean _XbaeDebugInDebug(const char *fn, Widget w);
117	#define DEBUGOUT(x) x
118	-#endif /* LESSTIF_PRODUCTION */
119	+#endif /* XBAE_PRODUCTION */
120
121	/*
122	* Some stuff to produce sensible tracing with dmalloc.
123	diff -bru src/DebugUtil.c src/DebugUtil.c
124	--- src/DebugUtil.c Thu Jul 25 16:37:10 2002
125	+++ src/DebugUtil.c Sat Nov 23 15:52:20 2002
126	@@ -77,7 +77,7 @@
127	Boolean _XbaeDebugInDebug(const char *fn, Widget w);
128
129
130	-#ifndef LESSTIF_PRODUCTION
131	+#ifndef XBAE_PRODUCTION
132	/* All external interfaces need to be in place for both,
133	debug and production build. We may just reduce them
134	to empty stubs ... */
135	@@ -130,16 +130,16 @@
136	* enabled or disabled upon program start. Valid Values are on/off.
137	* e.g. XBAE_DEBUG_TOGGLE=off
138	*
139	- * If the C macro LESSTIF_PRODUCTION is defined, then _XbaeDebug etc. don't
140	+ * If the C macro XBAE_PRODUCTION is defined, then _XbaeDebug etc. don't
141	* work. Note: this is a compile time option.
142	* To have maximum performance, sequences of _XbaeDebug statements should be
143	* surrounded by an if (_XbaeDebugInDebug(__FILE__, w)) statement.
144	- * _XbaeDebugInDebug is False when LESSTIF_PRODUCTION is defined.
145	+ * _XbaeDebugInDebug is False when XBAE_PRODUCTION is defined.
146	*/
147
148
149
150	-#ifndef LESSTIF_PRODUCTION
151	+#ifndef XBAE_PRODUCTION
152	static Boolean _XbaeDebugFlag = True;
153	static FILE *_XbaeDebugFile = NULL;
154	typedef void (*sighandler_t)(int);
155	@@ -638,7 +638,7 @@
156
157
158
159	-#ifndef LESSTIF_PRODUCTION
160	+#ifndef XBAE_PRODUCTION
161	/* catches the signal defined by XBAE_DEBUG_SIGNAL and toggles the
162	global debugging flag.
163	Avoid calling C-runtime functions from within here if possible
164	@@ -719,7 +719,7 @@
165	return True;
166	} /* signo != NOSIG */
167	} /* siginstall() */
168	-#endif /* LESSTIF_PRODUCTION */
169	+#endif /* XBAE_PRODUCTION */
170
171
172	/* some initialization.
173	@@ -727,7 +727,7 @@
174	is en- or disabled currently */
175	extern Boolean
176	_XbaeDebugInit(void) {
177	-#ifdef LESSTIF_PRODUCTION
178	+#ifdef XBAE_PRODUCTION
179	return False;
180	#else
181	static Boolean init=False;
182	@@ -751,7 +751,7 @@
183	#endif
184	}
185
186	-#ifndef LESSTIF_PRODUCTION
187	+#ifndef XBAE_PRODUCTION
188	static void
189	_XbaeDebugOpenFile(void)
190	{
191	@@ -1009,13 +1009,13 @@
192	}
193	} /* ValidateSource() */
194
195	-#endif /* !LESSTIF_PRODUCTION */
196	+#endif /* !XBAE_PRODUCTION */
197
198
199	extern void
200	_XbaeDebug(const char fn, Widget w, const char fmt, ...)
201	{
202	-#ifndef LESSTIF_PRODUCTION
203	+#ifndef XBAE_PRODUCTION
204	va_list ap;
205
206	#ifdef DEBUGVALIDATE
207	@@ -1049,14 +1049,14 @@
208
209	fflush(_XbaeDebugFile);
210	}
211	-#endif /* !LESSTIF_PRODUCTION */
212	+#endif /* !XBAE_PRODUCTION */
213	}
214
215
216	extern void
217	_XbaeDebug2(const char fn, Widget w, Widget c, const char fmt, ...)
218	{
219	-#ifndef LESSTIF_PRODUCTION
220	+#ifndef XBAE_PRODUCTION
221	va_list ap;
222
223	if (_XbaeDebugInit() && ValidateSource(fn))
224	@@ -1100,14 +1100,14 @@
225	vfprintf(_XbaeDebugFile, fmt, ap);
226	va_end(ap);
227	}
228	-#endif /* !LESSTIF_PRODUCTION */
229	+#endif /* !XBAE_PRODUCTION */
230	}
231
232
233	extern void
234	_XbaeDebug0(const char fn, Widget w, const char fmt, ...)
235	{
236	-#ifndef LESSTIF_PRODUCTION
237	+#ifndef XBAE_PRODUCTION
238	va_list ap;
239
240	if (_XbaeDebugInit() && ValidateSource(fn))
241	@@ -1116,7 +1116,7 @@
242	vfprintf(_XbaeDebugFile, fmt, ap);
243	va_end(ap);
244	}
245	-#endif /* !LESSTIF_PRODUCTION */
246	+#endif /* !XBAE_PRODUCTION */
247	}
248
249
250	@@ -1125,7 +1125,7 @@
251	extern Boolean
252	_XbaeDebugInDebug(const char *fn, Widget w)
253	{
254	-#ifdef LESSTIF_PRODUCTION
255	+#ifdef XBAE_PRODUCTION
256	return False;
257	#else
258	return ValidateSource(fn);
259	@@ -1165,7 +1165,7 @@
260	extern void
261	_XbaeDebugSet(Boolean flag)
262	{
263	-#ifndef LESSTIF_PRODUCTION
264	+#ifndef XBAE_PRODUCTION
265	if (flag)
266	_XbaeDebugFlag = True;
267	else
268	@@ -1180,7 +1180,7 @@
269	extern void
270	_XbaeDebugToggle(void)
271	{
272	-#ifndef LESSTIF_PRODUCTION
273	+#ifndef XBAE_PRODUCTION
274	_XbaeDebugFlag = !_XbaeDebugFlag;
275	#endif
276	}
277	@@ -1190,7 +1190,7 @@
278	extern Boolean
279	_XbaeDebugQueryState(void)
280	{
281	-#ifndef LESSTIF_PRODUCTION
282	+#ifndef XBAE_PRODUCTION
283	return _XbaeDebugFlag;
284	#else
285	return False;
286	@@ -1198,7 +1198,7 @@
287	}
288
289
290	-#ifndef LESSTIF_PRODUCTION
291	+#ifndef XBAE_PRODUCTION
292	static Boolean
293	__XbaeDebugPrintWidgetID(void)
294	{
295	@@ -1263,7 +1263,7 @@
296	extern void
297	_XbaeDebugPrintTree(Widget w)
298	{
299	-#ifndef LESSTIF_PRODUCTION
300	+#ifndef XBAE_PRODUCTION
301	__XbaeDebugPrintTree(w, 0);
302	#endif
303	}
304	@@ -1272,7 +1272,7 @@
305	extern void
306	_XbaeDebugPrintCompleteTree(Widget w)
307	{
308	-#ifndef LESSTIF_PRODUCTION
309	+#ifndef XBAE_PRODUCTION
310	Widget ww = w;
311
312	while (ww)
313	@@ -1303,7 +1303,7 @@
314	extern void
315	_XbaeDebugPrintArgList(const char *fn, Widget w, ArgList al, int n, Boolean Get)
316	{
317	-#ifndef LESSTIF_PRODUCTION
318	+#ifndef XBAE_PRODUCTION
319	int i;
320	unsigned num;
321
322	@@ -1483,7 +1483,7 @@
323	}
324	}
325	}
326	-#endif/* !LESSTIF_PRODUCTION */
327	+#endif/* !XBAE_PRODUCTION */
328	}
329
330
331	@@ -1493,7 +1493,7 @@
332	extern void
333	_XbaeDebugPrintString(const char *s)
334	{
335	-#ifndef LESSTIF_PRODUCTION
336	+#ifndef XBAE_PRODUCTION
337	_XbaeDebugOpenFile();
338	fprintf(_XbaeDebugFile, "%s", s);
339	#endif
340	@@ -2382,7 +2382,7 @@
341	_XbaeDebugAction(const char *fn, Widget w, const String action,
342	const String params, const Cardinal num_params)
343	{
344	-#ifndef LESSTIF_PRODUCTION
345	+#ifndef XBAE_PRODUCTION
346
347	if (_XbaeDebugInit() && ValidateSource(fn)) {
348	int i;
349	@@ -2411,7 +2411,7 @@
350
351	fflush(_XbaeDebugFile);
352	}
353	-#endif /* !LESSTIF_PRODUCTION */
354	+#endif /* !XBAE_PRODUCTION */
355	}
356
357	/*

Line 0 Link Here

(-)x11-toolkits/xbae/files/patch-ac (+88 lines)
		1	--- doc/Makefile.am.orig Sun Oct 6 13:19:58 2002
		2	+++ doc/Makefile.am Sat Nov 23 16:20:46 2002
		3	@@ -15,7 +15,7 @@
		4	# Lets put the informational stuff in a sub directory to avoid
		5	# polluting /usr/local for default installs.
		6	#
		7	-docdir= $(prefix)/Xbae
		8	+docdir= $(datadir)/Xbae
		9
		10	doc_DATA= \
		11	contents.html coverplus.html difffonts.html \
		12	--- doc/Makefile.in.orig Wed Oct 16 14:00:35 2002
		13	+++ doc/Makefile.in Sat Nov 23 16:21:05 2002
		14	@@ -127,7 +127,7 @@
		15	# Lets put the informational stuff in a sub directory to avoid
		16	# polluting /usr/local for default installs.
		17	#
		18	-docdir = $(prefix)/Xbae
		19	+docdir = $(datadir)/Xbae
		20
		21	doc_DATA = \
		22	contents.html coverplus.html difffonts.html \
		23	--- Makefile.am.orig Tue Aug 20 12:03:13 2002
		24	+++ Makefile.am Sat Nov 23 16:28:21 2002
		25	@@ -16,7 +16,7 @@
		26
		27	endif
		28
		29	-docdir= $(prefix)/Xbae
		30	+docdir= $(datadir)/Xbae
		31	doc_DATA= NEWS README INSTALL
		32
		33	.PHONY: changelog UpdateCheck
		34	--- Makefile.in.orig Wed Oct 16 13:56:23 2002
		35	+++ Makefile.in Sat Nov 23 16:28:17 2002
		36	@@ -125,7 +125,7 @@
		37
		38	@Aclocal_TRUE@aclocal_DATA = ac_find_xbae.m4
		39
		40	-docdir = $(prefix)/Xbae
		41	+docdir = $(datadir)/Xbae
		42	doc_DATA = NEWS README INSTALL
		43
		44	#
		45	--- examples/builderXcessory/Makefile.am.orig Tue Jan 25 17:39:52 2000
		46	+++ examples/builderXcessory/Makefile.am Sat Nov 23 16:27:50 2002
		47	@@ -9,7 +9,7 @@
		48	xbae.wml \
		49	xbae_ctrl.tcl
		50
		51	-examplesdir = $(prefix)/Xbae/examples/builderXcessory
		52	+examplesdir = $(datadir)/Xbae/examples/builderXcessory
		53	examples_DATA = \
		54	XbaeCaption.col XbaeInput.col XbaeMatrix.col \
		55	XbaeCaption.pix XbaeInput.pix XbaeMatrix.pix \
		56	--- examples/builderXcessory/Makefile.in.orig Wed Oct 16 14:00:28 2002
		57	+++ examples/builderXcessory/Makefile.in Sat Nov 23 16:27:46 2002
		58	@@ -122,7 +122,7 @@
		59	xbae_ctrl.tcl
		60
		61
		62	-examplesdir = $(prefix)/Xbae/examples/builderXcessory
		63	+examplesdir = $(datadir)/Xbae/examples/builderXcessory
		64	examples_DATA = \
65	XbaeCaption.col XbaeInput.col XbaeMatrix.col \
66	XbaeCaption.pix XbaeInput.pix XbaeMatrix.pix \
67	--- doc/images/Makefile.am.orig Tue Aug 20 14:11:11 2002
68	+++ doc/images/Makefile.am Sat Nov 23 16:27:21 2002
69	@@ -10,7 +10,7 @@
70	# Lets put the informational stuff in a sub directory to avoid
71	# polluting /usr/local for default installs.
72	#
73	-imagedir= $(exec_prefix)/Xbae/images
74	+imagedir= $(datadir)/Xbae/images
75
76
77
78	--- doc/images/Makefile.in.orig Wed Oct 16 14:00:42 2002
79	+++ doc/images/Makefile.in Sat Nov 23 16:27:15 2002
80	@@ -122,7 +122,7 @@
81	# Lets put the informational stuff in a sub directory to avoid
82	# polluting /usr/local for default installs.
83	#
84	-imagedir = $(exec_prefix)/Xbae/images
85	+imagedir = $(datadir)/Xbae/images
86
87	#
88	# Cut the distribution size, don't distribute these in a source

Lines 1-15 Link Here

(-)x11-toolkits/xbae/pkg-plist (-15 / +68 lines)
1	lib/libXbae-4.8.a	1	include/Xbae/Caption.h
2	lib/libXbae.a	2	include/Xbae/CaptionP.h
3	lib/libXbae.so	3	include/Xbae/Clip.h
4	lib/libXbae.so.8	4	include/Xbae/ClipP.h
5	include/Xbae-4.8/Caption.h	5	include/Xbae/Input.h
6	include/Xbae-4.8/CaptionP.h	6	include/Xbae/InputP.h
7	include/Xbae-4.8/Input.h	7	include/Xbae/Matrix.h
8	include/Xbae-4.8/InputP.h	8	include/Xbae/MatrixP.h
9	include/Xbae-4.8/Clip.h	9	include/Xbae/patchlevel.h
10	include/Xbae-4.8/ClipP.h	10	lib/libXbae.la
11	include/Xbae-4.8/Matrix.h	11	lib/libXbae.so.4
12	include/Xbae-4.8/MatrixP.h	12	share/Xbae/FAQ.html
13	include/Xbae-4.8/patchlevel.h	13	share/Xbae/INSTALL
14	@dirrm include/Xbae-4.8	14	share/Xbae/NEWS
15	include/Xbae	15	share/Xbae/README
		16	share/Xbae/contents.html
		17	share/Xbae/coverplus.html
		18	share/Xbae/difffonts.html
		19	share/Xbae/examples/builderXcessory/XbaeCaption.col
		20	share/Xbae/examples/builderXcessory/XbaeCaption.pix
		21	share/Xbae/examples/builderXcessory/XbaeInput.col
		22	share/Xbae/examples/builderXcessory/XbaeInput.pix
		23	share/Xbae/examples/builderXcessory/XbaeMatrix.col
		24	share/Xbae/examples/builderXcessory/XbaeMatrix.pix
		25	share/Xbae/examples/builderXcessory/local.cat
		26	share/Xbae/examples/builderXcessory/xbae.wml
		27	share/Xbae/examples/builderXcessory/xbae_ctrl.tcl
		28	share/Xbae/images/LDO.jpg
		29	share/Xbae/images/add.jpg
		30	share/Xbae/images/bg.png
		31	share/Xbae/images/capfloor1.png
		32	share/Xbae/images/capfloor3.png
		33	share/Xbae/images/caption.png
		34	share/Xbae/images/choice.png
		35	share/Xbae/images/colors.jpg
		36	share/Xbae/images/coverplus.png
		37	share/Xbae/images/draw.png
		38	share/Xbae/images/fifteen.jpg
		39	share/Xbae/images/input.png
		40	share/Xbae/images/lesstif.png
		41	share/Xbae/images/list.jpg
		42	share/Xbae/images/mailbox.png
		43	share/Xbae/images/matrix.jpg
		44	share/Xbae/images/multifixed.jpg
		45	share/Xbae/images/new.png
		46	share/Xbae/images/organize.jpg
		47	share/Xbae/images/pricing.jpg
		48	share/Xbae/images/risk.jpg
		49	share/Xbae/images/select-push.jpg
		50	share/Xbae/images/taam.png
		51	share/Xbae/images/updated.png
		52	share/Xbae/images/xbasket.png
		53	share/Xbae/images/xbill2-2.png
		54	share/Xbae/images/xbum1-2.png
		55	share/Xbae/index.html
		56	share/Xbae/main.html
		57	share/Xbae/morelines.html
		58	share/Xbae/psdriver.html
		59	share/Xbae/scrolling.html
		60	share/Xbae/sites.html
		61	share/Xbae/spancells.html
		62	share/Xbae/title.html
		63	share/Xbae/users.html
		64	@dirrm share/Xbae/images
		65	@dirrm share/Xbae/examples/builderXcessory
		66	@dirrm share/Xbae/examples
		67	@dirrm share/Xbae
		68	@dirrm include/Xbae