Attachment 11900 Details for Bug 23226 – file.diff

[patch] file.diff

file.diff (text/plain), 8.84 KB, created by tkato on 2000-12-02 03:40:01 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: tkato

Created: 2000-12-02 03:40:01 UTC

Size: 8.84 KB

patch

obsolete

>diff -urN /usr/ports/math/oleo/Makefile math/oleo/Makefile
>--- /usr/ports/math/oleo/Makefile	Thu Aug  3 21:22:53 2000
>+++ math/oleo/Makefile	Sat Dec  2 12:23:00 2000
>@@ -6,7 +6,7 @@
> #
> 
> PORTNAME=	oleo
>-PORTVERSION=	1.99.12
>+PORTVERSION=	1.99.14
> CATEGORIES=	math
> MASTER_SITES=	${MASTER_SITE_GNU}
> MASTER_SITE_SUBDIR=	${PORTNAME}
>@@ -14,13 +14,23 @@
> MAINTAINER=	ports@FreeBSD.org
> 
> LIB_DEPENDS=	intl.1:${PORTSDIR}/devel/gettext
>+.if defined(WITH_MOTIF)
>+LIB_DEPENDS+=	plot.3:${PORTSDIR}/graphics/plotutils \
>+		Xbae.7:${PORTSDIR}/x11-toolkits/xbae
>+.endif
> 
> USE_XLIB=	yes
> USE_AUTOCONF=	yes
> CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
> 		LIBS="-L${LOCALBASE}/lib -L${X11BASE}/lib"
>-CONFIGURE_ARGS=	--with-x --without-motif \
>-		--without-xbae --without-xlt \
>+CONFIGURE_ARGS=	--with-x --without-xlt \
> 		--without-xmhtml --without-SciPlot
>+
>+.if defined(WITH_MOTIF)
>+USE_MOTIF=	yes
>+CONFIGURE_ARGS+=	--with-motif
>+.else
>+CONFIGURE_ARGS+=	--without-motif
>+.endif
> 
> .include <bsd.port.mk>
>diff -urN /usr/ports/math/oleo/distinfo math/oleo/distinfo
>--- /usr/ports/math/oleo/distinfo	Wed Aug  2 09:05:10 2000
>+++ math/oleo/distinfo	Sat Dec  2 06:27:32 2000
>@@ -1 +1 @@
>-MD5 (oleo-1.99.12.tar.gz) = 57ac0e2eab661685ef5f6fa6bfe5b1c5
>+MD5 (oleo-1.99.14.tar.gz) = 85c0de81f7cbabab3c26b46ba0a75779
>diff -urN /usr/ports/math/oleo/files/patch-ag math/oleo/files/patch-ag
>--- /usr/ports/math/oleo/files/patch-ag	Wed Aug  2 09:05:11 2000
>+++ math/oleo/files/patch-ag	Sat Dec  2 12:21:26 2000
>@@ -1,60 +1,16 @@
>---- aclocal.m4.orig	Thu Feb 10 05:22:27 2000
>-+++ aclocal.m4	Fri Jul 28 19:30:42 2000
>-@@ -1733,7 +1733,7 @@
>- # but which still want to provide support for the GNU gettext functionality.
>- # Please note that the actual code is *not* freely available.
>- 
>--# serial 3
>-+# serial 5
>- 
>- 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 @@
>+--- 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])
>  		INSTOBJEXT=.mo
>  	      fi
>- 	    fi
>++	    fi
> +	    if test "$gt_cv_func_gettext_libintl" = "yes"; then
> +		INTLLIBS='-lintl'
>-+	    fi
>+ 	    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)
>diff -urN /usr/ports/math/oleo/files/patch-ah math/oleo/files/patch-ah
>--- /usr/ports/math/oleo/files/patch-ah	Wed Aug  2 09:05:11 2000
>+++ math/oleo/files/patch-ah	Sat Dec  2 10:41:10 2000
>@@ -1,15 +1,21 @@
>---- configure.in.orig	Tue Jul 25 21:56:32 2000
>-+++ configure.in	Fri Jul 28 02:51:24 2000
>-@@ -324,12 +324,6 @@
>- AM_GNU_GETTEXT
>- 
>+--- 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
>--dnl This used to cause all kinds of problems in an earlier revision
>--dnl	of oleo. (Mostly because of using earlier auto* tools.)
>--dnl
>--AC_LINK_FILES($nls_cv_header_libgt, $nls_cv_header_intl)
>--
>--dnl
>- dnl Pass information about where we install to the source, to be
>- dnl	able to read AFM files. Note this doesn't work if you
>- dnl	install via "make install DESTDIR=/xxx"
>+-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
>diff -urN /usr/ports/math/oleo/files/patch-aj math/oleo/files/patch-aj
>--- /usr/ports/math/oleo/files/patch-aj	Wed Aug  2 09:05:11 2000
>+++ math/oleo/files/patch-aj	Thu Jan  1 09:00:00 1970
>@@ -1,11 +0,0 @@
>---- po/Makefile.in.in.orig	Fri Aug 28 06:15:29 1998
>-+++ po/Makefile.in.in	Fri Jul 28 04:30:24 2000
>-@@ -119,7 +119,7 @@
>- 	for cat in $$catalogs; do \
>- 	  cat=`basename $$cat`; \
>- 	  case "$$cat" in \
>--	    *.gmo) destdir=$(gnulocaledir);; \
>-+	    *.mo) destdir=$(gnulocaledir);; \
>- 	    *)     destdir=$(localedir);; \
>- 	  esac; \
>- 	  lang=`echo $$cat | sed 's/\$(CATOBJEXT)$$//'`; \
>diff -urN /usr/ports/math/oleo/files/patch-ak math/oleo/files/patch-ak
>--- /usr/ports/math/oleo/files/patch-ak	Thu Jan  1 09:00:00 1970
>+++ math/oleo/files/patch-ak	Sat Dec  2 11:50:34 2000
>@@ -0,0 +1,22 @@
>+--- 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)
>diff -urN /usr/ports/math/oleo/files/patch-al math/oleo/files/patch-al
>--- /usr/ports/math/oleo/files/patch-al	Thu Jan  1 09:00:00 1970
>+++ math/oleo/files/patch-al	Sat Dec  2 10:16:36 2000
>@@ -0,0 +1,28 @@
>+--- 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
>+ }
>diff -urN /usr/ports/math/oleo/pkg-plist math/oleo/pkg-plist
>--- /usr/ports/math/oleo/pkg-plist	Wed Aug  2 09:05:11 2000
>+++ math/oleo/pkg-plist	Sat Dec  2 12:19:08 2000
>@@ -1,17 +1,17 @@
> 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

Actions: View | Diff

Attachments on bug 23226: 11900