Attachment #11900 for bug #23226

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

Lines 6-12 Link Here

(-)math/oleo/Makefile (-3 / +13 lines)
6	#	6	#
7		7
8	PORTNAME= oleo	8	PORTNAME= oleo
9	PORTVERSION= 1.99.12	9	PORTVERSION= 1.99.14
10	CATEGORIES= math	10	CATEGORIES= math
11	MASTER_SITES= ${MASTER_SITE_GNU}	11	MASTER_SITES= ${MASTER_SITE_GNU}
12	MASTER_SITE_SUBDIR= ${PORTNAME}	12	MASTER_SITE_SUBDIR= ${PORTNAME}
Lines 14-26 Link Here
14	MAINTAINER= ports@FreeBSD.org	14	MAINTAINER= ports@FreeBSD.org
15		15
16	LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext	16	LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext
		17	.if defined(WITH_MOTIF)
		18	LIB_DEPENDS+= plot.3:${PORTSDIR}/graphics/plotutils \
		19	Xbae.7:${PORTSDIR}/x11-toolkits/xbae
		20	.endif
17		21
18	USE_XLIB= yes	22	USE_XLIB= yes
19	USE_AUTOCONF= yes	23	USE_AUTOCONF= yes
20	CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \	24	CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
21	LIBS="-L${LOCALBASE}/lib -L${X11BASE}/lib"	25	LIBS="-L${LOCALBASE}/lib -L${X11BASE}/lib"
22	CONFIGURE_ARGS= --with-x --without-motif \	26	CONFIGURE_ARGS= --with-x --without-xlt \
23	--without-xbae --without-xlt \
24	--without-xmhtml --without-SciPlot	27	--without-xmhtml --without-SciPlot
		28
		29	.if defined(WITH_MOTIF)
		30	USE_MOTIF= yes
		31	CONFIGURE_ARGS+= --with-motif
		32	.else
		33	CONFIGURE_ARGS+= --without-motif
		34	.endif
25		35
26	.include <bsd.port.mk>	36	.include <bsd.port.mk>

Line 1 Link Here

(-)math/oleo/distinfo (-1 / +1 lines)
1	MD5 (oleo-1.99.12.tar.gz) = 57ac0e2eab661685ef5f6fa6bfe5b1c5	1	MD5 (oleo-1.99.14.tar.gz) = 85c0de81f7cbabab3c26b46ba0a75779




--- aclocal.m4.orig	Thu Nov 23 05:32:03 2000
+++ aclocal.m4	Sat Dec  2 12:21:18 2000
@@ -1996,9 +1996,12 @@
 		  [CATOBJEXT=.gmo
 		   DATADIRNAME=share],
 		  [CATOBJEXT=.mo
-		   DATADIRNAME=lib])
+		   DATADIRNAME=share])
 
 AC_DEFUN(AM_WITH_NLS,
   [AC_MSG_CHECKING([whether NLS is requested])
@@ -1775,9 +1775,10 @@
 	     AC_CHECK_LIB(intl, bindtextdomain,
 	       [AC_CACHE_CHECK([for gettext in libintl],
 		 gt_cv_func_gettext_libintl,
-		 [AC_TRY_LINK([], [return (int) gettext ("")],
-		 gt_cv_func_gettext_libintl=yes,
-		 gt_cv_func_gettext_libintl=no)])])
+		 [AC_CHECK_LIB(intl, gettext,
+		  gt_cv_func_gettext_libintl=yes,
+		  gt_cv_func_gettext_libintl=no)],
+		 gt_cv_func_gettext_libintl=no)])
 	   fi
 
 	   if test "$gt_cv_func_gettext_libc" = "yes" \
@@ -1799,6 +1800,9 @@
 		INSTOBJEXT=.mo
 	      fi
+	    fi
+	    if test "$gt_cv_func_gettext_libintl" = "yes"; then
+		INTLLIBS='-lintl'
 	    fi
 	])
 
         if test "$CATOBJEXT" = "NONE"; then
@@ -1883,6 +1887,12 @@
       nls_cv_header_intl=intl/libintl.h
       nls_cv_header_libgt=intl/libgettext.h
     fi
+    AC_LINK_FILES($nls_cv_header_libgt, $nls_cv_header_intl)
+    AC_OUTPUT_COMMANDS(
+     [case "$CONFIG_FILES" in *po/Makefile.in*)
+        sed -e "/POTFILES =/r po/POTFILES" po/Makefile.in > po/Makefile
+      esac])
+
 
     # If this is used in GNU gettext we have to set USE_NLS to `yes'
     # because some of the sources are only built for this goal.
@@ -1927,9 +1937,9 @@
    AC_REQUIRE([AC_FUNC_MMAP])dnl
 
    AC_CHECK_HEADERS([argz.h limits.h locale.h nl_types.h malloc.h string.h \
-unistd.h values.h sys/param.h])
+unistd.h sys/param.h])
    AC_CHECK_FUNCS([getcwd munmap putenv setenv setlocale strchr strcasecmp \
-__argz_count __argz_stringify __argz_next])
+strdup __argz_count __argz_stringify __argz_next])
 
    if test "${ac_cv_func_stpcpy+set}" != "set"; then
      AC_CHECK_FUNCS(stpcpy)




--- configure.in.orig	Thu Nov 23 05:31:55 2000
+++ configure.in	Sat Dec  2 10:41:01 2000
@@ -208,13 +208,15 @@
 dnl	the libplot from GNU plotutils sometimes requires linking the
 dnl	X and Motif libraries
 dnl
-AC_CHECK_LIB(plot, pl_openpl_r,
+if test "$with_motif" = "yes"; then
+  AC_CHECK_LIB(plot, pl_openpl_r,
 	AC_DEFINE(HAVE_LIBPLOT)
 	LIBS="$LIBS -lplot")
 
-AC_CHECK_LIB(sciplot, sp_begin_plot)
-if test x$ac_cv_lib_sciplot_sp_begin_plot = xyes; then
+  AC_CHECK_LIB(sciplot, sp_begin_plot)
+    if test x$ac_cv_lib_sciplot_sp_begin_plot = xyes; then
 	AC_DEFINE(HAVE_LIBSCIPLOT)
+    fi
 fi
 
 dnl Checks for Guile

Lines 1-11 Link Here

(-)math/oleo/files/patch-aj (-11 lines)
1	--- po/Makefile.in.in.orig Fri Aug 28 06:15:29 1998
2	+++ po/Makefile.in.in Fri Jul 28 04:30:24 2000
3	@@ -119,7 +119,7 @@
4	for cat in $$catalogs; do \
5	cat=`basename $$cat`; \
6	case "$$cat" in \
7	- *.gmo) destdir=$(gnulocaledir);; \
8	+ *.mo) destdir=$(gnulocaledir);; \
9	*) destdir=$(localedir);; \
10	esac; \
11	lang=`echo $$cat \| sed 's/\$(CATOBJEXT)$$//'`; \




--- src/Makefile.in.orig	Thu Nov 23 05:39:58 2000
+++ src/Makefile.in	Sat Dec  2 10:44:42 2000
@@ -158,7 +158,7 @@
 @UseMotif_TRUE@MYCFL = ${X_CFLAGS}
 @UseMotif_FALSE@MYCFL = ${X_CFLAGS}
 
-oleo_LDADD = ${X_PRE_LIBS} ${MYLD} @INTLLIBS@ ../lib/liboleo.a ../intl/libintl.a ${X_LIBS}
+oleo_LDADD = ${X_PRE_LIBS} ${MYLD} @INTLLIBS@ ../lib/liboleo.a ${X_LIBS}
 INCLUDES = -I.. -I$(srcdir) -I$(top_srcdir)/lib -I../intl ${MYINC}
 CFLAGS = @CFLAGS@ -DLOCALEDIR=\"$(localedir)\" ${MYCFL} 	-DBUILD_PREFIX='"'${BUILD_PREFIX}'"'
 
@@ -251,8 +251,8 @@
 @UseMotif_FALSE@@HaveXbase_FALSE@postscript$U.o pcl$U.o epson$U.o \
 @UseMotif_FALSE@@HaveXbase_FALSE@prtext$U.o afm$U.o mdi$U.o gsl$U.o \
 @UseMotif_FALSE@@HaveXbase_FALSE@plotter$U.o legend$U.o
-@UseMotif_TRUE@oleo_DEPENDENCIES =  ../lib/liboleo.a ../intl/libintl.a
-@UseMotif_FALSE@oleo_DEPENDENCIES =  ../lib/liboleo.a ../intl/libintl.a
+@UseMotif_TRUE@oleo_DEPENDENCIES =  ../lib/liboleo.a @INTLDEPS@
+@UseMotif_FALSE@oleo_DEPENDENCIES =  ../lib/liboleo.a @INTLDEPS@
 oleo_LDFLAGS = 
 CXXCOMPILE = $(CXX) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
 CXXLD = $(CXX)




--- src/io-motif.c.orig	Thu Nov 23 05:38:22 2000
+++ src/io-motif.c	Sat Dec  2 09:47:19 2000
@@ -5995,7 +5995,11 @@
 #endif
 
 #ifdef	HAVE_LIBPLOT
+#if defined(PL_LIBPLOT_VER_STRING)
 	sprintf(xbae, "\n  GNU PlotUtils (libplot version %s)", PL_LIBPLOT_VER_STRING);
+#else
+	sprintf(xbae, "\n  GNU PlotUtils (libplot version %s)", LIBPLOT_VERSION);
+#endif
 	xms1 = xms;
 	xms2 = XmStringCreateLtoR(xbae, XmFONTLIST_DEFAULT_TAG);
 	xms = XmStringConcat(xms1, xms2);
@@ -6079,6 +6083,7 @@
 		return;
 	}
 
+#if XbaeVersion > 4007
 	if (XbaeMatrixGetCellWidget(mat, r-1, c-1) == NULL) {
 		button = XtVaCreateManagedWidget(lbl, xmPushButtonWidgetClass, mat, NULL);
 		XbaeMatrixSetCellWidget(mat, r-1, c-1, button);
@@ -6088,4 +6093,5 @@
 
 		fprintf(stderr, "MotifButton(%d,%d,%s,%s)\n", r-1, c-1, lbl, command);
 	}
+#endif
 }




bin/oleo
@unexec install-info --delete %D/info/oleo.info %D/info/dir
info/oleo.info
@exec install-info %D/info/oleo.info %D/info/dir
share/doc/Oleo/AUTHORS
share/doc/Oleo/FAQ
share/locale/en/LC_MESSAGES/oleo.mo
share/locale/fr/LC_MESSAGES/oleo.mo
share/locale/nl/LC_MESSAGES/oleo.mo
share/oleo/Oleo
share/oleo/fr/Oleo
share/oleo/nl/Oleo
share/oleo/oleo.html
share/oleo/Oleo
share/doc/Oleo/AUTHORS
share/doc/Oleo/FAQ
@unexec install-info --delete %D/info/oleo.info %D/info/dir
info/oleo.info
@exec install-info %D/info/oleo.info %D/info/dir
@dirrm share/doc/Oleo
@dirrm share/oleo/nl
@dirrm share/oleo/fr
@dirrm share/oleo
@dirrm share/doc/Oleo

Return to bug 23226

Lines 1-60 Link Here

(-)math/oleo/files/patch-ag (-54 / +10 lines)
1	--- aclocal.m4.orig Thu Feb 10 05:22:27 2000	1	--- aclocal.m4.orig Thu Nov 23 05:32:03 2000
2	+++ aclocal.m4 Fri Jul 28 19:30:42 2000	2	+++ aclocal.m4 Sat Dec 2 12:21:18 2000
3	@@ -1733,7 +1733,7 @@	3	@@ -1996,9 +1996,12 @@
4	# but which still want to provide support for the GNU gettext functionality.	4	[CATOBJEXT=.gmo
5	# Please note that the actual code is not freely available.	5	DATADIRNAME=share],
6		6	[CATOBJEXT=.mo
7	-# serial 3	7	- DATADIRNAME=lib])
8	+# serial 5	8	+ DATADIRNAME=share])
9
10	AC_DEFUN(AM_WITH_NLS,
11	[AC_MSG_CHECKING([whether NLS is requested])
12	@@ -1775,9 +1775,10 @@
13	AC_CHECK_LIB(intl, bindtextdomain,
14	[AC_CACHE_CHECK([for gettext in libintl],
15	gt_cv_func_gettext_libintl,
16	- [AC_TRY_LINK([], [return (int) gettext ("")],
17	- gt_cv_func_gettext_libintl=yes,
18	- gt_cv_func_gettext_libintl=no)])])
19	+ [AC_CHECK_LIB(intl, gettext,
20	+ gt_cv_func_gettext_libintl=yes,
21	+ gt_cv_func_gettext_libintl=no)],
22	+ gt_cv_func_gettext_libintl=no)])
23	fi
24
25	if test "$gt_cv_func_gettext_libc" = "yes" \
26	@@ -1799,6 +1800,9 @@
27	INSTOBJEXT=.mo	9	INSTOBJEXT=.mo
28	fi	10	fi
29	fi	11	+ fi
30	+ if test "$gt_cv_func_gettext_libintl" = "yes"; then	12	+ if test "$gt_cv_func_gettext_libintl" = "yes"; then
31	+ INTLLIBS='-lintl'	13	+ INTLLIBS='-lintl'
32	+ fi	14	fi
33	])	15	])
34		16
35	if test "$CATOBJEXT" = "NONE"; then
36	@@ -1883,6 +1887,12 @@
37	nls_cv_header_intl=intl/libintl.h
38	nls_cv_header_libgt=intl/libgettext.h
39	fi
40	+ AC_LINK_FILES($nls_cv_header_libgt, $nls_cv_header_intl)
41	+ AC_OUTPUT_COMMANDS(
42	+ [case "$CONFIG_FILES" in po/Makefile.in)
43	+ sed -e "/POTFILES =/r po/POTFILES" po/Makefile.in > po/Makefile
44	+ esac])
45	+
46
47	# If this is used in GNU gettext we have to set USE_NLS to `yes'
48	# because some of the sources are only built for this goal.
49	@@ -1927,9 +1937,9 @@
50	AC_REQUIRE([AC_FUNC_MMAP])dnl
51
52	AC_CHECK_HEADERS([argz.h limits.h locale.h nl_types.h malloc.h string.h \
53	-unistd.h values.h sys/param.h])
54	+unistd.h sys/param.h])
55	AC_CHECK_FUNCS([getcwd munmap putenv setenv setlocale strchr strcasecmp \
56	-__argz_count __argz_stringify __argz_next])
57	+strdup __argz_count __argz_stringify __argz_next])
58
59	if test "${ac_cv_func_stpcpy+set}" != "set"; then
60	AC_CHECK_FUNCS(stpcpy)

Lines 1-15 Link Here

(-)math/oleo/files/patch-ah (-14 / +20 lines)
1	--- configure.in.orig Tue Jul 25 21:56:32 2000	1	--- configure.in.orig Thu Nov 23 05:31:55 2000
2	+++ configure.in Fri Jul 28 02:51:24 2000	2	+++ configure.in Sat Dec 2 10:41:01 2000
3	@@ -324,12 +324,6 @@	3	@@ -208,13 +208,15 @@
4	AM_GNU_GETTEXT	4	dnl the libplot from GNU plotutils sometimes requires linking the
5		5	dnl X and Motif libraries
6	dnl	6	dnl
7	-dnl This used to cause all kinds of problems in an earlier revision	7	-AC_CHECK_LIB(plot, pl_openpl_r,
8	-dnl of oleo. (Mostly because of using earlier auto* tools.)	8	+if test "$with_motif" = "yes"; then
9	-dnl	9	+ AC_CHECK_LIB(plot, pl_openpl_r,
10	-AC_LINK_FILES($nls_cv_header_libgt, $nls_cv_header_intl)	10	AC_DEFINE(HAVE_LIBPLOT)
11	-	11	LIBS="$LIBS -lplot")
12	-dnl	12
13	dnl Pass information about where we install to the source, to be	13	-AC_CHECK_LIB(sciplot, sp_begin_plot)
14	dnl able to read AFM files. Note this doesn't work if you	14	-if test x$ac_cv_lib_sciplot_sp_begin_plot = xyes; then
15	dnl install via "make install DESTDIR=/xxx"	15	+ AC_CHECK_LIB(sciplot, sp_begin_plot)
		16	+ if test x$ac_cv_lib_sciplot_sp_begin_plot = xyes; then
		17	AC_DEFINE(HAVE_LIBSCIPLOT)
		18	+ fi
		19	fi
		20
		21	dnl Checks for Guile

Line 0 Link Here

(-)math/oleo/files/patch-ak (+22 lines)
	1	--- src/Makefile.in.orig Thu Nov 23 05:39:58 2000
	2	+++ src/Makefile.in Sat Dec 2 10:44:42 2000
	3	@@ -158,7 +158,7 @@
	4	@UseMotif_TRUE@MYCFL = ${X_CFLAGS}
	5	@UseMotif_FALSE@MYCFL = ${X_CFLAGS}
	6
	7	-oleo_LDADD = ${X_PRE_LIBS} ${MYLD} @INTLLIBS@ ../lib/liboleo.a ../intl/libintl.a ${X_LIBS}
	8	+oleo_LDADD = ${X_PRE_LIBS} ${MYLD} @INTLLIBS@ ../lib/liboleo.a ${X_LIBS}
	9	INCLUDES = -I.. -I$(srcdir) -I$(top_srcdir)/lib -I../intl ${MYINC}
	10	CFLAGS = @CFLAGS@ -DLOCALEDIR=\"$(localedir)\" ${MYCFL} -DBUILD_PREFIX='"'${BUILD_PREFIX}'"'
	11
	12	@@ -251,8 +251,8 @@
	13	@UseMotif_FALSE@@HaveXbase_FALSE@postscript$U.o pcl$U.o epson$U.o \
	14	@UseMotif_FALSE@@HaveXbase_FALSE@prtext$U.o afm$U.o mdi$U.o gsl$U.o \
	15	@UseMotif_FALSE@@HaveXbase_FALSE@plotter$U.o legend$U.o
	16	-@UseMotif_TRUE@oleo_DEPENDENCIES = ../lib/liboleo.a ../intl/libintl.a
	17	-@UseMotif_FALSE@oleo_DEPENDENCIES = ../lib/liboleo.a ../intl/libintl.a
	18	+@UseMotif_TRUE@oleo_DEPENDENCIES = ../lib/liboleo.a @INTLDEPS@
	19	+@UseMotif_FALSE@oleo_DEPENDENCIES = ../lib/liboleo.a @INTLDEPS@
	20	oleo_LDFLAGS =
	21	CXXCOMPILE = $(CXX) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
	22	CXXLD = $(CXX)

Line 0 Link Here

(-)math/oleo/files/patch-al (+28 lines)
	1	--- src/io-motif.c.orig Thu Nov 23 05:38:22 2000
	2	+++ src/io-motif.c Sat Dec 2 09:47:19 2000
	3	@@ -5995,7 +5995,11 @@
	4	#endif
	5
	6	#ifdef HAVE_LIBPLOT
	7	+#if defined(PL_LIBPLOT_VER_STRING)
	8	sprintf(xbae, "\n GNU PlotUtils (libplot version %s)", PL_LIBPLOT_VER_STRING);
	9	+#else
	10	+ sprintf(xbae, "\n GNU PlotUtils (libplot version %s)", LIBPLOT_VERSION);
	11	+#endif
	12	xms1 = xms;
	13	xms2 = XmStringCreateLtoR(xbae, XmFONTLIST_DEFAULT_TAG);
	14	xms = XmStringConcat(xms1, xms2);
	15	@@ -6079,6 +6083,7 @@
	16	return;
	17	}
	18
	19	+#if XbaeVersion > 4007
	20	if (XbaeMatrixGetCellWidget(mat, r-1, c-1) == NULL) {
	21	button = XtVaCreateManagedWidget(lbl, xmPushButtonWidgetClass, mat, NULL);
	22	XbaeMatrixSetCellWidget(mat, r-1, c-1, button);
	23	@@ -6088,4 +6093,5 @@
	24
	25	fprintf(stderr, "MotifButton(%d,%d,%s,%s)\n", r-1, c-1, lbl, command);
	26	}
	27	+#endif
	28	}

Lines 1-17 Link Here

(-)math/oleo/pkg-plist (-7 / +7 lines)
1	bin/oleo	1	bin/oleo
		2	@unexec install-info --delete %D/info/oleo.info %D/info/dir
		3	info/oleo.info
		4	@exec install-info %D/info/oleo.info %D/info/dir
		5	share/doc/Oleo/AUTHORS
		6	share/doc/Oleo/FAQ
2	share/locale/en/LC_MESSAGES/oleo.mo	7	share/locale/en/LC_MESSAGES/oleo.mo
3	share/locale/fr/LC_MESSAGES/oleo.mo	8	share/locale/fr/LC_MESSAGES/oleo.mo
4	share/locale/nl/LC_MESSAGES/oleo.mo	9	share/locale/nl/LC_MESSAGES/oleo.mo
		10	share/oleo/Oleo
5	share/oleo/fr/Oleo	11	share/oleo/fr/Oleo
6	share/oleo/nl/Oleo	12	share/oleo/nl/Oleo
7	share/oleo/oleo.html	13	share/oleo/oleo.html
8	share/oleo/Oleo
9	share/doc/Oleo/AUTHORS
10	share/doc/Oleo/FAQ
11	@unexec install-info --delete %D/info/oleo.info %D/info/dir
12	info/oleo.info
13	@exec install-info %D/info/oleo.info %D/info/dir
14	@dirrm share/doc/Oleo
15	@dirrm share/oleo/nl	14	@dirrm share/oleo/nl
16	@dirrm share/oleo/fr	15	@dirrm share/oleo/fr
17	@dirrm share/oleo	16	@dirrm share/oleo
		17	@dirrm share/doc/Oleo