kpriv/pkgsrc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
pkgsrc/devel/spiff/patches/patch-aa

60 lines
1.4 KiB
Text
Raw Normal View History

Fix a segfault on NetBSD/amd64 (at least): - Include standard headers (stdlib.h, string.h, stdio.h) in misc.h to avoid conflicts with built-in declarations of functions. - Change CFLAGS= in Makefile to CFLAGS+= to use pkgsrc-provided CFLAGS. - Include termcap.buildlink3.mk to handle termcap properly. - Add DESTDIR support, use AUTO_MKDIRS. - Bump PKGREVISION. Now I can actually use it! ;)
2008-07-09 07:02:06 +02:00
$NetBSD: patch-aa,v 1.2 2008/07/09 05:02:06 bjs Exp $
Initial import of spiff-1.0 into the Packages Collection. Spiff compares the contents of file1 and file2 and prints a description of the important differences between the files. White space is ignored except to separate other objects. Spiff maintains tolerances below which differences between two floating point numbers are ignored. Differences in floating point notation (such as 3.4 3.40 and 3.4e01) are treated as unimportant. User specified delimited strings (i.e. comments) can also be ignored. Inside other user specified delimited strings (i.e. quoted strings) whitespace can be significant. Taken from a hint by Alan Barrett.
2001-10-15 12:12:08 +02:00
Fix a segfault on NetBSD/amd64 (at least): - Include standard headers (stdlib.h, string.h, stdio.h) in misc.h to avoid conflicts with built-in declarations of functions. - Change CFLAGS= in Makefile to CFLAGS+= to use pkgsrc-provided CFLAGS. - Include termcap.buildlink3.mk to handle termcap properly. - Add DESTDIR support, use AUTO_MKDIRS. - Bump PKGREVISION. Now I can actually use it! ;)
2008-07-09 07:02:06 +02:00
--- Makefile.orig 1994-05-01 18:51:17.000000000 -0400
+++ Makefile
Initial import of spiff-1.0 into the Packages Collection. Spiff compares the contents of file1 and file2 and prints a description of the important differences between the files. White space is ignored except to separate other objects. Spiff maintains tolerances below which differences between two floating point numbers are ignored. Differences in floating point notation (such as 3.4 3.40 and 3.4e01) are treated as unimportant. User specified delimited strings (i.e. comments) can also be ignored. Inside other user specified delimited strings (i.e. quoted strings) whitespace can be significant. Taken from a hint by Alan Barrett.
2001-10-15 12:12:08 +02:00
@@ -7,7 +7,7 @@
# name of the directory into which the binary should be installed
# used only when you use 'make install'
#
-INSDIR=/usr/local/bin
Fix a segfault on NetBSD/amd64 (at least): - Include standard headers (stdlib.h, string.h, stdio.h) in misc.h to avoid conflicts with built-in declarations of functions. - Change CFLAGS= in Makefile to CFLAGS+= to use pkgsrc-provided CFLAGS. - Include termcap.buildlink3.mk to handle termcap properly. - Add DESTDIR support, use AUTO_MKDIRS. - Bump PKGREVISION. Now I can actually use it! ;)
2008-07-09 07:02:06 +02:00
+INSDIR=${DESTDIR}${PREFIX}
Initial import of spiff-1.0 into the Packages Collection. Spiff compares the contents of file1 and file2 and prints a description of the important differences between the files. White space is ignored except to separate other objects. Spiff maintains tolerances below which differences between two floating point numbers are ignored. Differences in floating point notation (such as 3.4 3.40 and 3.4e01) are treated as unimportant. User specified delimited strings (i.e. comments) can also be ignored. Inside other user specified delimited strings (i.e. quoted strings) whitespace can be significant. Taken from a hint by Alan Barrett.
2001-10-15 12:12:08 +02:00
#
# choose one from each of 1) 2) and 3) below
Fix a segfault on NetBSD/amd64 (at least): - Include standard headers (stdlib.h, string.h, stdio.h) in misc.h to avoid conflicts with built-in declarations of functions. - Change CFLAGS= in Makefile to CFLAGS+= to use pkgsrc-provided CFLAGS. - Include termcap.buildlink3.mk to handle termcap properly. - Add DESTDIR support, use AUTO_MKDIRS. - Bump PKGREVISION. Now I can actually use it! ;)
2008-07-09 07:02:06 +02:00
@@ -18,21 +18,21 @@ INSDIR=/usr/local/bin
Initial import of spiff-1.0 into the Packages Collection. Spiff compares the contents of file1 and file2 and prints a description of the important differences between the files. White space is ignored except to separate other objects. Spiff maintains tolerances below which differences between two floating point numbers are ignored. Differences in floating point notation (such as 3.4 3.40 and 3.4e01) are treated as unimportant. User specified delimited strings (i.e. comments) can also be ignored. Inside other user specified delimited strings (i.e. quoted strings) whitespace can be significant. Taken from a hint by Alan Barrett.
2001-10-15 12:12:08 +02:00
# choose a) b) or c)
#
# a) for BSD derivitives, enable the following line
-#OSFLAG=
+OSFLAG=
# b) for XENIX systems, enable the following line
#OSFLAG=-DXENIX
# b) for other A.T.&T. UNIX derivitives, enable the following line
-OSFLAG=-DATT
+#OSFLAG=-DATT
#
# 2) SELECTION OF TERMINAL CONTROL LIBRARY
# choose either of a) b) or c)
#
# a) if you use termcap, enable the following lines
-#TFLAG=-DM_TERMCAP
-#TLIB=termcap
+TFLAG=-DM_TERMCAP
+TLIB=termcap
# b) if you are using terminfo on a XENIX machine, enable the following lines
#TFLAG=-DM_TERMINFO
Fix a segfault on NetBSD/amd64 (at least): - Include standard headers (stdlib.h, string.h, stdio.h) in misc.h to avoid conflicts with built-in declarations of functions. - Change CFLAGS= in Makefile to CFLAGS+= to use pkgsrc-provided CFLAGS. - Include termcap.buildlink3.mk to handle termcap properly. - Add DESTDIR support, use AUTO_MKDIRS. - Bump PKGREVISION. Now I can actually use it! ;)
2008-07-09 07:02:06 +02:00
@@ -44,8 +44,8 @@ OSFLAG=-DATT
Initial import of spiff-1.0 into the Packages Collection. Spiff compares the contents of file1 and file2 and prints a description of the important differences between the files. White space is ignored except to separate other objects. Spiff maintains tolerances below which differences between two floating point numbers are ignored. Differences in floating point notation (such as 3.4 3.40 and 3.4e01) are treated as unimportant. User specified delimited strings (i.e. comments) can also be ignored. Inside other user specified delimited strings (i.e. quoted strings) whitespace can be significant. Taken from a hint by Alan Barrett.
2001-10-15 12:12:08 +02:00
#TLIB=curses
# d) NONE OF THE ABOVE
-TFLAG=
-TLIB=m # just a link to mathlib; quick hack to avoid fixing Makefile
+#TFLAG=
+#TLIB=m # just a link to mathlib; quick hack to avoid fixing Makefile
#
# 3) SELECTION OF WINDOW MANAGER AVAILABILITY
Fix a segfault on NetBSD/amd64 (at least): - Include standard headers (stdlib.h, string.h, stdio.h) in misc.h to avoid conflicts with built-in declarations of functions. - Change CFLAGS= in Makefile to CFLAGS+= to use pkgsrc-provided CFLAGS. - Include termcap.buildlink3.mk to handle termcap properly. - Add DESTDIR support, use AUTO_MKDIRS. - Bump PKGREVISION. Now I can actually use it! ;)
2008-07-09 07:02:06 +02:00
@@ -80,7 +80,7 @@ MANPAGE=spiff.1
# disable this line iff you like being honked at.
DEFS = -DNOCHATTER
-CFLAGS=-O $(OSFLAG) $(TFLAG) $(VISFLAG) $(DEFS)
+CFLAGS+=$(OSFLAG) $(TFLAG) $(VISFLAG) $(DEFS)
default: spiff
Reference in a new issue Copy permalink