Correct patching on all versions of FreeBSD.

Reported by:	Pascal Hofstee <caelian@gmail.com>


git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@4426 df743ca5-7f9a-e211-a948-0013205c9059

4 files changed, 38 insertions, 13 deletions

diff --git a/devel/libgtop2/Makefile b/devel/libgtop2/Makefile
index 60c726440..b298fbc26 100644
--- a/devel/libgtop2/Makefile
+++ b/devel/libgtop2/Makefile
@@ -3,7 +3,7 @@
 # Whom:				Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/devel/libgtop2/Makefile,v 1.45 2005/08/01 19:31:11 marcus Exp $
+#   $MCom: ports/devel/libgtop2/Makefile,v 1.46 2005/08/08 19:21:28 marcus Exp $
 #
 
 PORTNAME=	libgtop2
@@ -36,7 +36,9 @@ INFO=		libgtop2
 
 .if ${OSVERSION} >= 600000
 PKGMESSAGE=	${FILESDIR}/pkg-message
-EXTRA_PATCHES+=	${FILESDIR}/extra-patch-sysdeps_freebsd_Makefile.in
+EXTRA_PATCHES+=	${FILESDIR}/extra-67-patch-sysdeps_freebsd_Makefile.in
+.else
+EXTRA_PATCHES+=	${FILESDIR}/extra-45-patch-sysdeps_freebsd_Makefile.in
 .endif
 
 post-patch:
diff --git a/devel/libgtop2/files/patch-sysdeps_freebsd_Makefile.in b/devel/libgtop2/files/extra-45-patch-sysdeps_freebsd_Makefile.in
index dea0aec82..dea0aec82 100644
--- a/devel/libgtop2/files/patch-sysdeps_freebsd_Makefile.in
+++ b/devel/libgtop2/files/extra-45-patch-sysdeps_freebsd_Makefile.in
diff --git a/devel/libgtop2/files/extra-67-patch-sysdeps_freebsd_Makefile.in b/devel/libgtop2/files/extra-67-patch-sysdeps_freebsd_Makefile.in
new file mode 100644
index 000000000..8168ecb6d
--- /dev/null
+++ b/devel/libgtop2/files/extra-67-patch-sysdeps_freebsd_Makefile.in
@@ -0,0 +1,34 @@
+--- sysdeps/freebsd/Makefile.in.orig	Mon Aug  8 20:25:56 2005
++++ sysdeps/freebsd/Makefile.in	Mon Aug  8 20:28:06 2005
+@@ -143,12 +143,11 @@
+ 
+ noinst_LTLIBRARIES = libgtop_sysdeps-2.0.la libgtop_sysdeps_suid-2.0.la
+ 
+-libgtop_sysdeps_2_0_la_SOURCES = nosuid.c siglist.c
++libgtop_sysdeps_2_0_la_SOURCES = nosuid.c siglist.c netlist.c
+ 
+ libgtop_sysdeps_2_0_la_LDFLAGS = $(LT_VERSION_INFO)
+ 
+-libgtop_sysdeps_suid_2_0_la_SOURCES = open.c close.c cpu.c mem.c swap.c 				  uptime.c loadavg.c shm_limits.c msg_limits.c 				  sem_limits.c proclist.c procstate.c procuid.c 				  proctime.c procmem.c procsignal.c prockernel.c 				  procsegment.c procargs.c procmap.c netlist.c 				  netload.c ppp.c procopenfiles.c fsusage.c
+-
++libgtop_sysdeps_suid_2_0_la_SOURCES = open.c close.c cpu.c mem.c swap.c 				  uptime.c loadavg.c shm_limits.c msg_limits.c 				  sem_limits.c proclist.c procstate.c procuid.c 				  proctime.c procmem.c procsignal.c prockernel.c 				  procsegment.c procargs.c procmap.c 				  netload.c ppp.c procopenfiles.c fsusage.c sysinfo.c
+ 
+ libgtop_sysdeps_suid_2_0_la_LDFLAGS = $(LT_VERSION_INFO)
+ 
+@@ -171,13 +170,13 @@
+ X_EXTRA_LIBS = @X_EXTRA_LIBS@
+ X_PRE_LIBS = @X_PRE_LIBS@
+ libgtop_sysdeps_2_0_la_LIBADD = 
+-libgtop_sysdeps_2_0_la_OBJECTS =  nosuid.lo siglist.lo
+-libgtop_sysdeps_suid_2_0_la_LIBADD = 
++libgtop_sysdeps_2_0_la_OBJECTS =  nosuid.lo siglist.lo netlist.lo
++libgtop_sysdeps_suid_2_0_la_LIBADD =  -lgeom -ldevstat
+ libgtop_sysdeps_suid_2_0_la_OBJECTS =  open.lo close.lo cpu.lo mem.lo \
+ swap.lo uptime.lo loadavg.lo shm_limits.lo msg_limits.lo sem_limits.lo \
+ proclist.lo procstate.lo procuid.lo proctime.lo procmem.lo \
+ procsignal.lo prockernel.lo procsegment.lo procargs.lo procmap.lo \
+-netlist.lo netload.lo ppp.lo procopenfiles.lo fsusage.lo
++netload.lo ppp.lo procopenfiles.lo fsusage.lo sysinfo.lo
+ CFLAGS = @CFLAGS@
+ COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+ LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
diff --git a/devel/libgtop2/files/extra-patch-sysdeps_freebsd_Makefile.in b/devel/libgtop2/files/extra-patch-sysdeps_freebsd_Makefile.in
deleted file mode 100644
index aba76a3db..000000000
--- a/devel/libgtop2/files/extra-patch-sysdeps_freebsd_Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- sysdeps/freebsd/Makefile.in.orig	Mon Aug  8 15:18:16 2005
-+++ sysdeps/freebsd/Makefile.in	Mon Aug  8 15:18:59 2005
-@@ -171,7 +171,7 @@
- X_PRE_LIBS = @X_PRE_LIBS@
- libgtop_sysdeps_2_0_la_LIBADD = 
- libgtop_sysdeps_2_0_la_OBJECTS =  nosuid.lo siglist.lo netlist.lo
--libgtop_sysdeps_suid_2_0_la_LIBADD = 
-+libgtop_sysdeps_suid_2_0_la_LIBADD =  -lgeom -ldevstat
- libgtop_sysdeps_suid_2_0_la_OBJECTS =  open.lo close.lo cpu.lo mem.lo \
- swap.lo uptime.lo loadavg.lo shm_limits.lo msg_limits.lo sem_limits.lo \
- proclist.lo procstate.lo procuid.lo proctime.lo procmem.lo \