Attachment 10455 Details for Bug 20975 – file.diff

[patch] file.diff

file.diff (text/plain), 10.34 KB, created by shuhei on 2000-08-31 21:40:01 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: shuhei

Created: 2000-08-31 21:40:01 UTC

Size: 10.34 KB

patch

obsolete

>diff -uNr /usr/ports/math/grace/Makefile grace/Makefile
>--- /usr/ports/math/grace/Makefile	Mon Aug  7 09:42:55 2000
>+++ grace/Makefile	Thu Aug 31 01:08:45 2000
>@@ -6,7 +6,7 @@
> #
> 
> PORTNAME=	grace
>-PORTVERSION=	5.0.3g
>+PORTVERSION=	5.1.1
> CATEGORIES=	math print
> #
> # You never know when and why this caotic team moves it to ../src/old/   :-)
>@@ -17,15 +17,13 @@
> 		ftp://abragam.med.utoronto.ca/pub/mirrors/grace/src/old/ \
> 		ftp://linux.mathematik.tu-darmstadt.de/pub/linux/mirrors/misc/grace/src/old/ \
> 		ftp://linux.mathematik.tu-darmstadt.de/pub/linux/mirrors/misc/grace/src/
>-DISTNAME=	grace-5.0.3gamma
> 
> MAINTAINER=	Lars.Koeller@Uni-Bielefeld.DE
> 
>-BUILD_DEPENDS=  ${X11BASE}/lib/libhlpclient.a:${PORTSDIR}/x11/libhelp
> LIB_DEPENDS=	Xbae.7:${PORTSDIR}/x11-toolkits/xbae 	\
>+		XmHTML.1:${PORTSDIR}/x11-toolkits/xmhtml	\
> 		netcdf.1:${PORTSDIR}/math/netcdf	\
> 		fftw.2:${PORTSDIR}/math/fftw		\
>-		pdf.2:${PORTSDIR}/print/pdflib		\
> 		tiff.4:${PORTSDIR}/graphics/tiff	\
> 		jpeg.9:${PORTSDIR}/graphics/jpeg	\
> 		png.4:${PORTSDIR}/graphics/png		\
>@@ -34,18 +32,14 @@
> MAN1=		grace.1 xmgrace.1 gracebat.1 grconvert.1
> 
> USE_X_PREFIX=	YES
>-USE_XPM=	yes
> USE_GMAKE=	YES
> REQUIRES_MOTIF=	YES
>-HAS_CONFIGURE=	YES
>-CONFIGURE_ARGS=	-prefix=${X11BASE} \
>-	--enable-extra-incpath=${X11BASE}/include/X11:${LOCALBASE}/include:${LOCALBASE}/include/gd \
>-	--enable-libhelp \
>-	--enable-extra-ldpath=${LOCALBASE}/lib \
>-	--enable-grace-home=${X11BASE}/lib/X11/grace \
>-	--enable-config=generic
>+GNU_CONFIGURE=	YES
>+CONFIGURE_ARGS=	--prefix=${PREFIX} \
>+	--with-extra-incpath=${X11BASE}/include/X11:${LOCALBASE}/include:${LOCALBASE}/include/gd \
>+	--with-extra-ldpath=${LOCALBASE}/lib \
>+	--enable-grace-home=${X11BASE}/lib/X11/grace
> 
>-ALL_TARGET=
> INSTALL_TARGET= install links
> 
> post-patch:
>diff -uNr /usr/ports/math/grace/files/freebsd grace/files/freebsd
>--- /usr/ports/math/grace/files/freebsd	Thu Mar 18 08:41:40 1999
>+++ grace/files/freebsd	Thu Jan  1 01:00:00 1970
>@@ -1,27 +0,0 @@
>-#****************************************
>-#* Intel Linux with X11R6 and Motif 2.0 *
>-#****************************************
>-
>-###############################
>-# Compiler
>-#
>-CC="gcc"
>-###############################
>-
>-###############################
>-# C flags
>-#
>-CFLAGS="-Wall -pedantic"
>-###############################
>-
>-###############################
>-# Misc optimization flags
>-#
>-OPTIMIZE="-O2"
>-###############################
>-
>-###############################
>-# Flags used for debugging
>-#
>-DEBUG="-g -O2"
>-###############################
>diff -uNr /usr/ports/math/grace/files/md5 grace/files/md5
>--- /usr/ports/math/grace/files/md5	Fri Sep 10 17:39:13 1999
>+++ grace/files/md5	Fri Aug 11 23:49:17 2000
>@@ -1 +1 @@
>-MD5 (grace-5.0.3gamma.tar.gz) = fe200b1fe353afa3cd0cb580ef9d2106
>+MD5 (grace-5.1.1.tar.gz) = 03884dab948e5382169037753b008fbb
>diff -uNr /usr/ports/math/grace/patches/patch-aa grace/patches/patch-aa
>--- /usr/ports/math/grace/patches/patch-aa	Fri Sep 10 17:39:13 1999
>+++ grace/patches/patch-aa	Thu Aug 31 00:22:06 2000
>@@ -1,40 +1,11 @@
>-*** configure.orig	Sun Aug 22 12:11:35 1999
>---- configure	Fri Sep 10 16:22:17 1999
>-***************
>-*** 1096,1106 ****
>-  
>-  if test "x${GCC}" = "xyes"
>-  then
>--     case "${host}" in
>--     i?86-*-linux-*) CFLAGS="-m486 -malign-double $CFLAGS";;
>--     i?86-*) CFLAGS="-m486 $CFLAGS";;
>--   esac
>-- 
>-      echo $ac_n "checking "for gcc strength-reduce bug"""... $ac_c" 1>&6
>-  echo "configure:1106: checking "for gcc strength-reduce bug"" >&5
>-  if eval "test \"`echo '$''{'ac_cv_c_gcc_strength_bug'+set}'`\" = set"; then
>---- 1096,1101 ----
>-***************
>-*** 1832,1838 ****
>-  # It thinks the first close brace ends the variable substitution.
>-  test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}'
>-  
>-! test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}'
>-  
>-  test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
>-  
>---- 1827,1833 ----
>-  # It thinks the first close brace ends the variable substitution.
>-  test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}'
>-  
>-! test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL} -m 555'
>-  
>-  test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
>-  
>-***************
>-*** 8939,8942 ****
>-  chmod +x $CONFIG_STATUS
>-  rm -fr confdefs* $ac_clean_files
>-  test "$no_create" = yes || ${CONFIG_SHELL-/bin/sh} $CONFIG_STATUS || exit 1
>-- 
>---- 8934,8936 ----
>+--- src/Makefile.orig	Wed May 17 20:01:33 2000
>++++ src/Makefile	Thu Aug 31 00:21:32 2000
>+@@ -60,7 +60,7 @@
>+ 
>+ install : $(GRACE)
>+ 	$(MKINSTALLDIRS) $(GRACE_HOME)/bin
>+-	$(INSTALL_PROGRAM) -s $(GRACE) $(GRACE_HOME)/bin/$(GRACE)
>++	$(INSTALL_PROGRAM) $(GRACE) $(GRACE_HOME)/bin/$(GRACE)
>+ 	cd $(GRACE_HOME)/bin; $(RM) $(GRBATCH); $(LN_S) $(GRACE) $(GRBATCH)
>+ 
>+ tests : dummy
>diff -uNr /usr/ports/math/grace/patches/patch-ab grace/patches/patch-ab
>--- /usr/ports/math/grace/patches/patch-ab	Fri Sep 10 17:39:13 1999
>+++ grace/patches/patch-ab	Thu Aug 31 00:03:09 2000
>@@ -1,19 +1,10 @@
>-*** conf/Make.conf.in.org	Fri Sep 10 09:32:03 1999
>---- conf/Make.conf.in	Fri Sep 10 09:32:27 1999
>-***************
>-*** 93,98 ****
>---- 93,99 ----
>-  # BSD install
>-  INSTALL=@INSTALL@
>-  INSTALL_PROGRAM=@INSTALL_PROGRAM@
>-+ INSTALL_SCRIPT=@INSTALL_SCRIPT@
>-  INSTALL_DATA=@INSTALL_DATA@
>-  MKINSTALLDIRS=@MKINSTALLDIRS@
>-  
>-***************
>-*** 119,122 ****
>-  
>-  # HTML help viewer command
>-  HELPVIEWER=@HELPVIEWER@
>-- 
>---- 120,122 ----
>+--- ac-tools/Make.conf.in.orig	Sun Feb 20 00:49:12 2000
>++++ ac-tools/Make.conf.in	Thu Aug 31 00:02:00 2000
>+@@ -90,6 +90,7 @@
>+ # BSD install
>+ INSTALL=@INSTALL@
>+ INSTALL_PROGRAM=@INSTALL_PROGRAM@
>++INSTALL_SCRIPT=@INSTALL_SCRIPT@
>+ INSTALL_DATA=@INSTALL_DATA@
>+ MKINSTALLDIRS=@MKINSTALLDIRS@
>+ 
>diff -uNr /usr/ports/math/grace/patches/patch-ae grace/patches/patch-ae
>--- /usr/ports/math/grace/patches/patch-ae	Fri Sep 10 17:39:13 1999
>+++ grace/patches/patch-ae	Wed Aug 30 23:53:51 2000
>@@ -1,16 +1,20 @@
>---- conf/generic.orig	Mon Mar 29 01:02:41 1999
>-+++ conf/generic	Fri Sep 10 16:10:36 1999
>-@@ -17,11 +17,11 @@
>- ###############################
>- # Misc optimization flags
>- #
>--OPTIMIZE="-O"
>-+#OPTIMIZE="-O"
>- ###############################
>+--- auxiliary/Makefile.orig	Sat Dec 25 23:20:47 1999
>++++ auxiliary/Makefile	Wed Aug 30 23:52:40 2000
>+@@ -9,7 +9,8 @@
>+ include $(TOP)/Make.conf
>+ 
>+ AUXILIARIES = README convcal.c magic.grace
>+-PROGRAMS = fdf2fit convcal$(EXE)
>++PROGRAMS = convcal$(EXE)
>++SCRIPTS = fdf2fit
>+ 
>+ all : convcal$(EXE)
>+ 
>+@@ -27,6 +28,7 @@
>+ 	$(MKINSTALLDIRS) $(GRACE_HOME)/auxiliary
>+ 	for i in $(AUXILIARIES); do $(INSTALL_DATA) $$i $(GRACE_HOME)/auxiliary; done
>+ 	for i in $(PROGRAMS); do $(INSTALL_PROGRAM) $$i $(GRACE_HOME)/bin; done
>++	for i in $(SCRIPTS); do $(INSTALL_SCRIPT) $$i $(GRACE_HOME)/bin; done
>+ 
>+ tests : dummy
>  
>- ###############################
>- # Flags used for debugging
>- #
>--DEBUG="-g"
>-+#DEBUG="-g"
>- ###############################
>diff -uNr /usr/ports/math/grace/patches/patch-af grace/patches/patch-af
>--- /usr/ports/math/grace/patches/patch-af	Thu Jan  1 01:00:00 1970
>+++ grace/patches/patch-af	Thu Aug 31 00:29:05 2000
>@@ -0,0 +1,18 @@
>+--- grconvert/Makefile.orig	Sat Sep 11 02:31:49 1999
>++++ grconvert/Makefile	Thu Aug 31 00:28:43 2000
>+@@ -36,13 +36,13 @@
>+ 
>+ distclean :
>+ 	$(RM) $(PROG) $(OBJS)
>+-	
>++
>+ devclean :
>+ 	$(RM) $(PROG) $(OBJS)
>+ 
>+ install : $(PROG)
>+ 	$(MKINSTALLDIRS) $(GRACE_HOME)/bin
>+-	$(INSTALL_PROGRAM) -s $(PROG) $(GRACE_HOME)/bin/$(PROG)
>++	$(INSTALL_PROGRAM) $(PROG) $(GRACE_HOME)/bin/$(PROG)
>+ 
>+ dummy :
>+ 
>diff -uNr /usr/ports/math/grace/pkg/DESCR grace/pkg/DESCR
>--- /usr/ports/math/grace/pkg/DESCR	Fri Sep 10 17:39:13 1999
>+++ grace/pkg/DESCR	Fri Aug 11 23:49:18 2000
>@@ -11,3 +11,5 @@
> While grace has a convenient point-and-click interface, most parameter settings
> and operations are available through a command line interface (found in
> Data/Commands).
>+
>+WWW: http://plasma-gate.weizmann.ac.il/Grace/
>diff -uNr /usr/ports/math/grace/pkg/PLIST grace/pkg/PLIST
>--- /usr/ports/math/grace/pkg/PLIST	Tue Feb 22 17:07:13 2000
>+++ grace/pkg/PLIST	Wed Aug 30 23:41:02 2000
>@@ -1,3 +1,4 @@
>+bin/grace
> bin/gracebat
> bin/xmgrace
> include/grace_np.h
>@@ -5,6 +6,7 @@
> lib/X11/grace/auxiliary/convcal.c
> lib/X11/grace/auxiliary/magic.grace
> lib/X11/grace/bin/convcal
>+lib/X11/grace/bin/fdf2fit
> lib/X11/grace/bin/gracebat
> lib/X11/grace/bin/grconvert
> lib/X11/grace/bin/xmgrace
>@@ -28,7 +30,7 @@
> lib/X11/grace/doc/grace.1
> lib/X11/grace/doc/gracebat.1
> lib/X11/grace/doc/grconvert.1
>-lib/X11/grace/doc/mygraph.gif
>+lib/X11/grace/doc/mygraph.png
> lib/X11/grace/doc/nohelp.html
> lib/X11/grace/doc/philosophical-gnu-sm.jpg
> lib/X11/grace/doc/shiftdata.sh
>@@ -38,6 +40,7 @@
> lib/X11/grace/examples/au.agr
> lib/X11/grace/examples/axes.agr
> lib/X11/grace/examples/bar.agr
>+lib/X11/grace/examples/boxplot.agr
> lib/X11/grace/examples/brw.dat
> lib/X11/grace/examples/chartebar.agr
> lib/X11/grace/examples/charts.agr
>@@ -52,14 +55,16 @@
> lib/X11/grace/examples/log2.agr
> lib/X11/grace/examples/logistic.agr
> lib/X11/grace/examples/logistic.fit
>+lib/X11/grace/examples/logit.agr
> lib/X11/grace/examples/logtest.par
> lib/X11/grace/examples/manygraphs.agr
> lib/X11/grace/examples/mlo.dat
>-lib/X11/grace/examples/moresyms.agr
> lib/X11/grace/examples/motif.agr
>+lib/X11/grace/examples/pie.agr
> lib/X11/grace/examples/polar.agr
> lib/X11/grace/examples/props.agr
> lib/X11/grace/examples/regions.par
>+lib/X11/grace/examples/spectrum.agr
> lib/X11/grace/examples/stackedb.agr
> lib/X11/grace/examples/symslines.agr
> lib/X11/grace/examples/terr.agr
>@@ -74,12 +79,20 @@
> lib/X11/grace/examples/tlog.agr
> lib/X11/grace/examples/tmc.c
> lib/X11/grace/examples/tstack.agr
>+lib/X11/grace/examples/txttrans.agr
> lib/X11/grace/examples/txyr.agr
> lib/X11/grace/examples/typeset.agr
>+lib/X11/grace/examples/vmap.agr
>+lib/X11/grace/examples/xysize.agr
> lib/X11/grace/examples/xyz.agr
> lib/X11/grace/fonts/FontDataBase
> lib/X11/grace/fonts/enc/IsoLatin1.enc
> lib/X11/grace/fonts/enc/IsoLatin2.enc
>+lib/X11/grace/fonts/enc/IsoLatin9.enc
>+lib/X11/grace/fonts/enc/MacRoman.enc
>+lib/X11/grace/fonts/enc/PDFDoc.enc
>+lib/X11/grace/fonts/enc/PSLatin1.enc
>+lib/X11/grace/fonts/enc/WinAnsi.enc
> lib/X11/grace/fonts/type1/d050000l.afm
> lib/X11/grace/fonts/type1/d050000l.pfb
> lib/X11/grace/fonts/type1/n019003l.afm
>diff -uNr /usr/ports/math/grace/scripts/configure grace/scripts/configure
>--- /usr/ports/math/grace/scripts/configure	Thu Mar 18 08:41:40 1999
>+++ grace/scripts/configure	Thu Jan  1 01:00:00 1970
>@@ -1,3 +0,0 @@
>-#! /bin/sh
>-
>-cp ${FILESDIR}/freebsd ${WRKSRC}/conf/freebsd

Actions: View | Diff

Attachments on bug 20975: 10455