diff options
Diffstat (limited to 'sysutils/afio/files/patch-aa')
| -rw-r--r-- | sysutils/afio/files/patch-aa | 196 |
1 files changed, 136 insertions, 60 deletions
diff --git a/sysutils/afio/files/patch-aa b/sysutils/afio/files/patch-aa index 4f46eba8cab4..e3afe85d5bac 100644 --- a/sysutils/afio/files/patch-aa +++ b/sysutils/afio/files/patch-aa @@ -1,60 +1,136 @@ ---- Makefile.orig Thu Nov 25 22:42:26 1999 -+++ Makefile Thu Jan 27 15:03:54 2000 -@@ -26,14 +26,14 @@ - c = -DHAVEMEMCMP - ## Define DEFFMTCMD to being how to format the media you use the most - ## This is the DEFault FoRMat CoManD. --d = -DDEFFMTCMD='"fdformat /dev/fd0H1440"' -+d = -DDEFFMTCMD='"/usr/bin/fdformat -f 1440 /dev/fd0.1440"' - ## Define LONGZFILE if you want .Z to be tagged on the end of a 14 char - ## file name (or longer for BSD) in the archive when the file is compressed - #e = -DLONGZFILE - - ## Define PRG_COMPRESS to get something other than `gzip'. - # you need to edit compfile.c (-G option) if you change this line. --f = -DPRG_COMPRESS='"gzip"' -+f = -DPRG_COMPRESS='"/usr/bin/gzip"' - - ## Define HAVEFNMATCH if you want to use the gnu fnmatch() routine for - # -y -Y -w -W matching. -@@ -43,6 +43,11 @@ - - g = -DHAVEFNMATCH - -+## Define HAVE_PARAM_H if your system has sys/param.h. This is used for BSD -+# detection. -+ -+h = -DHAVE_PARAM_H -+ - # fnmatch() is in the gnu C library, so it is directly available on - # Linux. If your system (e.g. SCO) does not have the gnu C library, - # unpack the archive gnu.fnmatch.tar.gz and uncomment the following -@@ -56,13 +61,14 @@ - - #CFLAGS1 = -ggdb - #CFLAGS1 = -Wall -s -g -O2 -fomit-frame-pointer --CFLAGS1 = -Wall -O2 -fomit-frame-pointer -+#CFLAGS1 = -Wall -O2 -fomit-frame-pointer -+CFLAGS1 = -fomit-frame-pointer -fno-strength-reduce - - --CC=gcc -+#CC=gcc - - --CFLAGS = ${CFLAGS1} $1 $2 $3 $4 $5 $6 $7 $8 $9 $a $b $c $d $e $f $g $I -+CFLAGS += ${CFLAGS1} $1 $2 $3 $4 $5 $6 $7 $8 $9 $a $b $c $d $e $f $g $h $I - LDFLAGS = - - afio : afio.o compfile.o exten.o match.o $M -@@ -72,8 +78,8 @@ - rm -f *.o afio - - install: afio -- cp afio /usr/bin -- cp afio.1 /usr/man/man1 -+ install -cs -o root -g wheel afio ${PREFIX}/bin -+ install -c -o root -g wheel afio.1 ${PREFIX}/man/man1 - - - afio.o : afio.h patchlevel.h +*** Makefile.orig Sun Dec 21 05:23:51 2003 +--- Makefile Sat Jan 21 17:34:53 2006 +*************** +*** 26,56 **** + #b = -UUNIXPC + ## Define HAVEMEMCMP if you have memcmp otherwise assumes bcmp + c = -DHAVEMEMCMP + ## Define DEFFMTCMD to being how to format the media you use the most + ## This is the DEFault FoRMat CoManD. +! d = -DDEFFMTCMD='"fdformat /dev/fd0H1440"' + ## Define LONGZFILE if you want .Z to be tagged on the end of a 14 char + ## file name (or longer for BSD) in the archive when the file is compressed + #e = -DLONGZFILE + + ## Define HAVE_LCHOWN is the system has an lchown call (like chown but does + ## not follow symlinks) + e2 = -DHAVE_LCHOWN + + ## Define PRG_COMPRESS to get something other than `gzip'. + # you need to edit compfile.c (-G option) if you change this line. +! f = -DPRG_COMPRESS='"gzip"' + + ## Define HAVEFNMATCH if you want to use the gnu fnmatch() routine for + # -y -Y -w -W matching. + # If it is not defined, a primitive replacement match routine is used that + # only supports patterns of the form "cccc" and "cccc*". Make sure that + # you change the manual page in this case. + + g = -DHAVEFNMATCH + + # fnmatch() is in the gnu C library, so it is directly available on + # Linux. If your system (e.g. SCO) does not have the gnu C library, + # unpack the archive gnu.fnmatch.tar.gz and uncomment the following + # two lines: + +--- 26,61 ---- + #b = -UUNIXPC + ## Define HAVEMEMCMP if you have memcmp otherwise assumes bcmp + c = -DHAVEMEMCMP + ## Define DEFFMTCMD to being how to format the media you use the most + ## This is the DEFault FoRMat CoManD. +! d = -DDEFFMTCMD='"/usr/sbin/fdformat -f 1440 /dev/fd0"' + ## Define LONGZFILE if you want .Z to be tagged on the end of a 14 char + ## file name (or longer for BSD) in the archive when the file is compressed + #e = -DLONGZFILE + + ## Define HAVE_LCHOWN is the system has an lchown call (like chown but does + ## not follow symlinks) + e2 = -DHAVE_LCHOWN + + ## Define PRG_COMPRESS to get something other than `gzip'. + # you need to edit compfile.c (-G option) if you change this line. +! f = -DPRG_COMPRESS='"/usr/bin/gzip"' + + ## Define HAVEFNMATCH if you want to use the gnu fnmatch() routine for + # -y -Y -w -W matching. + # If it is not defined, a primitive replacement match routine is used that + # only supports patterns of the form "cccc" and "cccc*". Make sure that + # you change the manual page in this case. + + g = -DHAVEFNMATCH + ++ ## Define HAVE_PARAM_H if your system has sys/param.h. This is used for BSD ++ # detection. ++ ++ h = -DHAVE_PARAM_H ++ + # fnmatch() is in the gnu C library, so it is directly available on + # Linux. If your system (e.g. SCO) does not have the gnu C library, + # unpack the archive gnu.fnmatch.tar.gz and uncomment the following + # two lines: + +*************** +*** 69,83 **** + + # even more warnings flags.. + MW= + #MW=-Wtraditional -Wcast-qual -Wcast-align -Wconversion -pedantic -Wlong-long -Wimplicit -Wuninitialized -W -Wshadow -Wsign-compare -Wstrict-prototypes -Wmissing-declarations + +! CFLAGS1 = -Wall -Wstrict-prototypes -s -O2 -fomit-frame-pointer ${LARGEFILEFLAGS} ${MW} + +! CC=gcc + +! CFLAGS = ${CFLAGS1} $1 $2 $3 $4 $5 $6 $7 $8 $9 $a $b $c $d $e ${e2} $f $g $I + LDFLAGS = + + afio : afio.o compfile.o exten.o match.o $M + ${CC} ${LDFLAGS} afio.o compfile.o exten.o match.o $M -o afio + +--- 74,91 ---- + + # even more warnings flags.. + MW= + #MW=-Wtraditional -Wcast-qual -Wcast-align -Wconversion -pedantic -Wlong-long -Wimplicit -Wuninitialized -W -Wshadow -Wsign-compare -Wstrict-prototypes -Wmissing-declarations + +! #CFLAGS1 = -Wall -Wstrict-prototypes -s -O2 -fomit-frame-pointer ${LARGEFILEFLAGS} ${MW} +! CFLAGS1 = -fomit-frame-pointer -fno-strength-reduce + +! #CC=gcc +! CC=cc + +! #CFLAGS = ${CFLAGS1} $1 $2 $3 $4 $5 $6 $7 $8 $9 $a $b $c $d $e ${e2} $f $g $I +! CFLAGS += ${CFLAGS1} $1 $2 $3 $4 $5 $6 $7 $8 $9 $a $b $c $d $e $f $g $h $I + LDFLAGS = + + afio : afio.o compfile.o exten.o match.o $M + ${CC} ${LDFLAGS} afio.o compfile.o exten.o match.o $M -o afio + +*************** +*** 86,97 **** + rm -f regtest/cmpstat regtest/makesparse + rm -f regtest/statsize regtest/statsize64 + cd regtest; /bin/sh regtest.clean + + install: afio +! cp afio /usr/local/bin +! cp afio.1 /usr/share/man/man1 + + # generate default list of -E extensions from manpage + # note: on sun, I had to change awk command below to nawk or gawk + # to get it to work. + exten_default.h : afio.1 +--- 94,106 ---- + rm -f regtest/cmpstat regtest/makesparse + rm -f regtest/statsize regtest/statsize64 + cd regtest; /bin/sh regtest.clean + + install: afio +! install -cs -o root -g wheel afio ${PREFIX}/bin +! install -c -o root -g wheel afio.1 ${PREFIX}/man/man1 +! + + # generate default list of -E extensions from manpage + # note: on sun, I had to change awk command below to nawk or gawk + # to get it to work. + exten_default.h : afio.1 |