diff options
Diffstat (limited to 'math/capc-calc/patches/patch-aa')
| -rw-r--r-- | math/capc-calc/patches/patch-aa | 116 |
1 files changed, 67 insertions, 49 deletions
diff --git a/math/capc-calc/patches/patch-aa b/math/capc-calc/patches/patch-aa index bafffccbc25..faacb9a8075 100644 --- a/math/capc-calc/patches/patch-aa +++ b/math/capc-calc/patches/patch-aa @@ -1,39 +1,45 @@ -$NetBSD: patch-aa,v 1.2 2001/05/16 20:28:41 jlam Exp $ +$NetBSD: patch-aa,v 1.3 2003/01/03 20:35:29 wiz Exp $ ---- Makefile.orig Sun Dec 17 08:09:39 2000 +--- Makefile.orig Sun Dec 29 08:14:00 2002 +++ Makefile -@@ -348,18 +348,18 @@ - # ${CUSTOMHELPDIR} where custom help files are installed. - # ${SCRIPTDIR} where calc shell scripts are installed. - # --BINDIR= /usr/local/bin -+BINDIR= ${PREFIX}/bin - #BINDIR= /usr/bin - #BINDIR= /usr/contrib/bin - # --TOPDIR= /usr/local/lib -+TOPDIR= ${PREFIX}/lib - #TOPDIR= /usr/lib - #TOPDIR= /usr/libdata - #TOPDIR= /usr/contrib/lib - # - LIBDIR= ${TOPDIR}/calc - HELPDIR= ${LIBDIR}/help --INCDIR= /usr/local/include +@@ -556,7 +556,7 @@ HAVE_UNISTD_H= + + #INCDIR= /usr/local/include + #INCDIR= /dev/env/DJDIR/include +-INCDIR= /usr/include +INCDIR= ${PREFIX}/include - INCDIRCALC= ${INCDIR}/calc - CUSTOMLIBDIR= ${LIBDIR}/custom - CUSTOMHELPDIR= ${HELPDIR}/custhelp -@@ -369,7 +369,7 @@ + + # Where to install calc realted things # - # Use MANDIR= to disable installation of the calc man (source) page. +@@ -583,15 +583,15 @@ INCDIR= /usr/include # --MANDIR= -+MANDIR= ${PREFIX}/man/man1 + #BINDIR= /usr/local/bin + #BINDIR= /dev/env/DJDIR/bin +-BINDIR= /usr/bin ++BINDIR= ${PREFIX}/bin + + #LIBDIR= /usr/local/lib + #LIBDIR= /dev/env/DJDIR/lib +-LIBDIR= /usr/lib ++LIBDIR= ${PREFIX}/lib + + #CALC_SHAREDIR= /usr/local/lib/calc + #CALC_SHAREDIR= /dev/env/DJDIR/share/calc +-CALC_SHAREDIR= /usr/share/calc ++CALC_SHAREDIR= ${PREFIX}/share/calc + + #CALC_INCDIR= /usr/local/include/calc + #CALC_INCDIR= /dev/env/DJDIR/include/calc +@@ -665,7 +665,7 @@ T= + #MANDIR= #MANDIR= /usr/local/man/man1 #MANDIR= /usr/man/man1 - #MANDIR= /usr/share/man/man1 -@@ -380,7 +380,7 @@ +-MANDIR= /usr/share/man/man1 ++MANDIR= ${PREFIX}/man/man1 + #MANDIR= /dev/env/DJDIR/man/man1 + #MANDIR= /usr/man/u_man/man1 + #MANDIR= /usr/contrib/man/man1 +@@ -676,7 +676,7 @@ MANDIR= /usr/share/man/man1 # # Use CATDIR= to disable installation of the calc cat (formatted) page. # @@ -42,18 +48,30 @@ $NetBSD: patch-aa,v 1.2 2001/05/16 20:28:41 jlam Exp $ #CATDIR= /usr/local/man/cat1 #CATDIR= /usr/local/catman/cat1 #CATDIR= /usr/man/cat1 -@@ -399,8 +399,8 @@ +@@ -697,9 +697,9 @@ MANEXT= 1 # # This is ignored if CATDIR is empty. # -CATEXT= 1 --#CATEXT= 0 +#CATEXT= 1 + #CATEXT= 1.gz +-#CATEXT= 0 +CATEXT= 0 #CATEXT= l # how to format a man page -@@ -456,10 +456,10 @@ +@@ -725,8 +725,8 @@ CATEXT= 1 + # and CATDIR to empty and ignore the NROFF, NROFF_ARG and MANMAKE + # lines below. + # +-#NROFF= nroff +-NROFF= ++NROFF= nroff ++#NROFF= + #NROFF= groff + NROFF_ARG= -man + #NROFF_ARG= -mandoc +@@ -770,10 +770,10 @@ CALCRC= ${CALC_SHAREDIR}/startup:~/.calc # # If in doubt, set USE_READLINE, READLINE_LIB and READLINE_INCLUDE to nothing. # @@ -64,12 +82,12 @@ $NetBSD: patch-aa,v 1.2 2001/05/16 20:28:41 jlam Exp $ # -READLINE_LIB= +READLINE_LIB= -lreadline -ltermcap - #READLINE_LIB= -L/usr/gnu/lib -lreadline -lhistory - #READLINE_LIB= -lreadline -lhistory - #READLINE_LIB= -L/usr/local/lib -lreadline -lhistory -@@ -470,10 +470,10 @@ - - # If $PAGER is not set, use this program to display a help file + #READLINE_LIB= -lreadline -lhistory -lncurses + #READLINE_LIB= -L/usr/gnu/lib -lreadline -lhistory -lncurses + #READLINE_LIB= -L/usr/local/lib -lreadline -lhistory -lncurses +@@ -786,10 +786,10 @@ READLINE_INCLUDE= + # + # Select CALCPAGER= less.exe -ci for DJGPP. # -CALCPAGER= more +#CALCPAGER= more @@ -77,26 +95,26 @@ $NetBSD: patch-aa,v 1.2 2001/05/16 20:28:41 jlam Exp $ #CALCPAGER= cat -#CALCPAGER= less +CALCPAGER= less + #CALCPAGER= less.exe -ci # Debug/Optimize options for ${CC} and ${LCC} - # -@@ -489,7 +489,7 @@ +@@ -807,7 +807,7 @@ CALCPAGER= more + #DEBUG= -O1 -g3 # #DEBUG= -O2 - #DEBUG= -O2 -g --DEBUG= -O2 -g3 -+#DEBUG= -O2 -g3 +-DEBUG= -O2 -g ++#DEBUG= -O2 -g + #DEBUG= -O2 -g3 #DEBUG= -O2 -ipa #DEBUG= -O2 -g3 -ipa - # -@@ -636,10 +636,10 @@ +@@ -959,10 +959,10 @@ CCWARN= -Wall -Wno-implicit -Wno-comment CCOPT= ${DEBUG} ${NO_SHARED} CCMISC= # --CFLAGS= ${CCWARN} ${CCOPT} ${CCMISC} --ICFLAGS= ${CCWARN} ${CCMISC} -+CFLAGS= ${CCWARN} ${CCOPT} ${CCMISC} ${CPPFLAGS} -+ICFLAGS= ${CCWARN} ${CCMISC} ${CPPFLAGS} +-CFLAGS= -DCALC_SRC ${CCWARN} ${CCOPT} ${CCMISC} +-ICFLAGS= -DCALC_SRC ${CCWARN} ${CCMISC} ++CFLAGS= -DCALC_SRC ${CCWARN} ${CCOPT} ${CCMISC} ${CPPFLAGS} ++ICFLAGS= -DCALC_SRC ${CCWARN} ${CCMISC} ${CPPFLAGS} # -LDFLAGS= ${NO_SHARED} ${LD_NO_SHARED} +LDFLAGS+= ${NO_SHARED} ${LD_NO_SHARED} |