Index: head/math/ngraph/Makefile =================================================================== --- head/math/ngraph/Makefile (revision 434961) +++ head/math/ngraph/Makefile (revision 434962) @@ -1,19 +1,19 @@ # Created by: nobu@rd.isac.co.jp # $FreeBSD$ PORTNAME= ngraph PORTVERSION= 6.3.54 CATEGORIES= math MASTER_SITES= http://www2e.biglobe.ne.jp/~isizaka/bin/ \ PORTS_JP DISTNAME= Ngraph-${PORTVERSION}-src MAINTAINER= ports@FreeBSD.org COMMENT= XY plotting tool for students, scientists, and engineers -LICENSE= GPLv2 +LICENSE= GPLv2+ LICENSE_FILE= ${WRKSRC}/gpl.txt USES= gmake motif .include Index: head/math/ngraph/files/patch-Makefile =================================================================== --- head/math/ngraph/files/patch-Makefile (revision 434961) +++ head/math/ngraph/files/patch-Makefile (revision 434962) @@ -1,73 +1,73 @@ ---- Makefile.orig 2015-07-13 12:31:19.000000000 +0900 -+++ Makefile 2015-07-18 08:34:18.463818755 +0900 -@@ -3,26 +3,26 @@ +--- Makefile.orig 2015-07-13 03:31:19 UTC ++++ Makefile +@@ -3,26 +3,26 @@ MAINVERSION = '"6.03"' GUIVERSION = '".54"' VERSION=6.3.54 ALIGNSIZE = 8 -LIBDIR = '"/usr/local/lib/Ngraph"' -INSTALLDIR = /usr/local/lib/Ngraph -BINDIR = /usr/local/bin +LIBDIR = '"${PREFIX}/lib/Ngraph"' +INSTALLDIR = ${DESTDIR}${PREFIX}/lib/Ngraph +BINDIR = ${DESTDIR}${PREFIX}/bin # # ############################################################################### # # Linux + Open Motif 2.1 [dynamic link] # -CC = gcc -CCOPTION = -O2 -MAKE = make -AR = ar -RANLIB = ranlib -STRIP = strip -DEFS = -DJAPANESE -PLATFORM = '"for X11 [Linux(glibc2) + Open Motif]"' -X11INCLUDE = -STATICLINK = -X11LIB = -L/usr/X11R6/lib -lm -lXm -lXext -lXt -lXp -lX11 -lICE -lSM +#CC = gcc +#CCOPTION = -O2 +#MAKE = make +#AR = ar +#RANLIB = ranlib +#STRIP = strip +#DEFS = -DJAPANESE +##PLATFORM = '"for X11 [Linux(glibc2) + Open Motif]"' +#X11INCLUDE = +#STATICLINK = +#X11LIB = -L/usr/X11R6/lib -lm -lXm -lXext -lXt -lXp -lX11 -lICE -lSM # # ############################################################################### -@@ -150,17 +150,18 @@ +@@ -150,17 +150,18 @@ X11LIB = -L/usr/X11R6/lib -lm -lXm -lXex # # (Thanks to MIHIRA Sanpei Yoshiro ) # -#CC = gcc -#CCOPTION = ${CFLAGS} -#MAKE = gmake -#AR = ar -#RANLIB = ranlib -#STRIP = strip -#DEFS = -DJAPANESE -#PLATFORM = '"for X11 [FreeBSD+Motif2.1]"' -#X11INCLUDE = -I/usr/X11R6/include -I/usr/dt/include -#STATICLINK = /usr/dt/lib/libXm.a -#X11LIB = -L/usr/X11R6/lib -L/usr/dt/lib -lm -lXext -lXt -lXp -lX11 -lICE -lSM -lxpg4 +CC ?= gcc +CFLAGS ?= -O -pipe +CCOPTION = ${CFLAGS} +MAKE = gmake +AR = ar +RANLIB = ranlib +STRIP = strip +DEFS = -DJAPANESE +PLATFORM = '"for X11 [FreeBSD+Motif2.1]"' +X11INCLUDE = -I${LOCALBASE}/include -I/usr/dt/include +STATICLINK = +X11LIB = ${MOTIFLIB} -lm -L${LOCALBASE}/lib -lXext -lXt -lXp -lX11 -lICE -lSM # ############################################################################### Index: head/math/ngraph/files/patch-install.sh =================================================================== --- head/math/ngraph/files/patch-install.sh (revision 434961) +++ head/math/ngraph/files/patch-install.sh (revision 434962) @@ -1,30 +1,30 @@ ---- install.sh.orig 2009-10-15 20:17:47.000000000 +0900 -+++ install.sh 2014-06-20 21:40:11.532930042 +0900 +--- install.sh.orig 2015-07-13 03:31:19 UTC ++++ install.sh @@ -2,6 +2,7 @@ INSTALLDIR=${INSTALLDIR:-/usr/local/lib/Ngraph} BINDIR=${BINDIR:-/usr/local/bin} +LIBDIR=${PREFIX}/lib/Ngraph TEXTFILES="Ngraph.ini .Ngraph .Ngraph.ngp .fit.ngp INSTALL.jis gpl.txt gpl.ja.txt" ADDINFILES="append.nsc math.nsc text-in.nsc \ -@@ -26,8 +27,8 @@ +@@ -26,8 +27,8 @@ if [ ! -f ./org/Ngraph.ini ] then cp Ngraph.ini ./org fi -sed -e "s?INSTALLDIR?${INSTALLDIR}?" ./org/ngraph.sh > ngraph.sh -sed -e "s?INSTALLDIR?${INSTALLDIR}?" ./org/Ngraph.ini > Ngraph.ini +sed -e "s?INSTALLDIR?${LIBDIR}?" ./org/ngraph.sh > ngraph.sh +sed -e "s?INSTALLDIR?${LIBDIR}?" ./org/Ngraph.ini > Ngraph.ini echo "Making directories in ${INSTALLDIR}" if [ ! -d ${INSTALLDIR} ] -@@ -90,7 +91,7 @@ +@@ -112,7 +113,7 @@ echo "Copying documents to ${INSTALLDIR} if [ ! -h ${BINDIR}/ngraph ] then echo "Making a symbolic link ${BINDIR}/ngraph" - ln -s ${INSTALLDIR}/ngraph.sh ${BINDIR}/ngraph + ln -s ${LIBDIR}/ngraph.sh ${BINDIR}/ngraph fi if [ -f ./org/ngraph.sh ]