Sun Aug 10 17:40:00 2008 UTC ()
Use patch --suffix instead of -b, the latter will be problematic when
PR  11220 gets addressed.


(joerg)
diff -r1.30 -r1.31 pkgsrc/mk/platform/NetBSD.mk
cvs diff -r1.30 -r1.31 pkgsrc/mk/platform/NetBSD.mk (expand / switch to unified diff)

--- pkgsrc/mk/platform/NetBSD.mk 2008/04/03 14:07:51 1.30
+++ pkgsrc/mk/platform/NetBSD.mk 2008/08/10 17:40:00 1.31
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: NetBSD.mk,v 1.30 2008/04/03 14:07:51 joerg Exp $ 1# $NetBSD: NetBSD.mk,v 1.31 2008/08/10 17:40:00 joerg Exp $
2# 2#
3# Variable definitions for the NetBSD operating system. 3# Variable definitions for the NetBSD operating system.
4 4
5# Needed for 1.6.1 and earlier due to rpcgen bugs and paths 5# Needed for 1.6.1 and earlier due to rpcgen bugs and paths
6.if defined(CPP) && ${CPP} == "cpp" 6.if defined(CPP) && ${CPP} == "cpp"
7CPP= /usr/bin/cpp 7CPP= /usr/bin/cpp
8.endif 8.endif
9ECHO_N?= ${ECHO} -n 9ECHO_N?= ${ECHO} -n
10IMAKE_MAKE?= ${MAKE} # program which gets invoked by imake 10IMAKE_MAKE?= ${MAKE} # program which gets invoked by imake
11PKGLOCALEDIR?= share 11PKGLOCALEDIR?= share
12PS?= /bin/ps 12PS?= /bin/ps
13SU?= /usr/bin/su 13SU?= /usr/bin/su
14TYPE?= type # Shell builtin 14TYPE?= type # Shell builtin
@@ -77,27 +77,27 @@ _OPSYS_SYSTEM_RPATH?= /usr/lib @@ -77,27 +77,27 @@ _OPSYS_SYSTEM_RPATH?= /usr/lib
77 77
78.if exists(/usr/include/netinet6) 78.if exists(/usr/include/netinet6)
79_OPSYS_HAS_INET6= yes # IPv6 is standard 79_OPSYS_HAS_INET6= yes # IPv6 is standard
80.else 80.else
81_OPSYS_HAS_INET6= no # IPv6 is not standard 81_OPSYS_HAS_INET6= no # IPv6 is not standard
82.endif 82.endif
83_OPSYS_HAS_JAVA= no # Java is not standard 83_OPSYS_HAS_JAVA= no # Java is not standard
84_OPSYS_HAS_MANZ= yes # MANZ controls gzipping of man pages 84_OPSYS_HAS_MANZ= yes # MANZ controls gzipping of man pages
85_OPSYS_HAS_OSSAUDIO= yes # libossaudio is available 85_OPSYS_HAS_OSSAUDIO= yes # libossaudio is available
86_OPSYS_PERL_REQD= # no base version of perl required 86_OPSYS_PERL_REQD= # no base version of perl required
87_OPSYS_PTHREAD_AUTO= no # -lpthread needed for pthreads 87_OPSYS_PTHREAD_AUTO= no # -lpthread needed for pthreads
88_OPSYS_SHLIB_TYPE= ELF/a.out # shared lib type 88_OPSYS_SHLIB_TYPE= ELF/a.out # shared lib type
89_PATCH_CAN_BACKUP= yes # native patch(1) can make backups 89_PATCH_CAN_BACKUP= yes # native patch(1) can make backups
90_PATCH_BACKUP_ARG?= -V simple -b # switch to patch(1) for backup suffix 90_PATCH_BACKUP_ARG?= -V simple --suffix # switch to patch(1) for backup suffix
91_USE_RPATH= yes # add rpath to LDFLAGS 91_USE_RPATH= yes # add rpath to LDFLAGS
92 92
93# flags passed to the linker to extract all symbols from static archives. 93# flags passed to the linker to extract all symbols from static archives.
94# this is GNU ld. 94# this is GNU ld.
95_OPSYS_WHOLE_ARCHIVE_FLAG= -Wl,--whole-archive 95_OPSYS_WHOLE_ARCHIVE_FLAG= -Wl,--whole-archive
96_OPSYS_NO_WHOLE_ARCHIVE_FLAG= -Wl,--no-whole-archive 96_OPSYS_NO_WHOLE_ARCHIVE_FLAG= -Wl,--no-whole-archive
97 97
98# for programs which use dlopen() 98# for programs which use dlopen()
99# not necessary since 1.6 (shared libs are linked against libgcc_pic) 99# not necessary since 1.6 (shared libs are linked against libgcc_pic)
100.if !empty(OS_VERSION:M1.5*) 100.if !empty(OS_VERSION:M1.5*)
101LINK_ALL_LIBGCC_HACK= -Wl,--whole-archive -lgcc -Wl,--no-whole-archive 101LINK_ALL_LIBGCC_HACK= -Wl,--whole-archive -lgcc -Wl,--no-whole-archive
102.endif 102.endif
103 103