Fix libtool usage

3 files changed, 139 insertions, 1 deletions

diff --git a/security/nessus-libraries/distinfo b/security/nessus-libraries/distinfo
index 284cf8e1314..4d19d1f2adb 100644
--- a/security/nessus-libraries/distinfo
+++ b/security/nessus-libraries/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.26 2008/10/10 11:34:50 adam Exp $
+$NetBSD: distinfo,v 1.27 2009/09/15 17:56:16 joerg Exp $
 
 SHA1 (nessus-libraries-2.2.11.tar.gz) = 0e4794df390607f224057c1ca9d9ad1bcd8c0b86
 RMD160 (nessus-libraries-2.2.11.tar.gz) = 9c7a2da70ba7d64cdd2fd54e26b280d77da72661
@@ -6,3 +6,5 @@ Size (nessus-libraries-2.2.11.tar.gz) = 428265 bytes
 SHA1 (patch-aa) = c525abf1ccfe4c3921609b91e335fa19b0bcab87
 SHA1 (patch-ab) = 982846ca823fb9f83b2d670f61f78b3b61f6d704
 SHA1 (patch-ac) = ec174bd6ddb7303f53a5e474451ad0f306575682
+SHA1 (patch-ad) = e7648f88ef52b2a0cc5ceb2d28fe2f19c81f0db6
+SHA1 (patch-ae) = 44647691cc4fe4d75baf25d971929f54950e7c53
diff --git a/security/nessus-libraries/patches/patch-ad b/security/nessus-libraries/patches/patch-ad
new file mode 100644
index 00000000000..999ea300527
--- /dev/null
+++ b/security/nessus-libraries/patches/patch-ad
@@ -0,0 +1,123 @@
+$NetBSD: patch-ad,v 1.3 2009/09/15 17:56:16 joerg Exp $
+
+--- libnessus/Makefile.orig	2004-08-31 19:15:07.000000000 +0200
++++ libnessus/Makefile
+@@ -22,90 +22,90 @@ all : libnessus.la
+ 
+ 
+ getopt.o : getopt.c
+-	 $(LIBTOOL) $(CC) $(CIPHER) $(DEFS) $(INCLUDE) $(CFLAGS) -c getopt.c
++	 $(LIBTOOL) --mode=compile $(CC) $(CIPHER) $(DEFS) $(INCLUDE) $(CFLAGS) -c getopt.c
+ 
+ getopt1.o : getopt1.c
+-	 $(LIBTOOL) $(CC) $(CIPHER) $(DEFS) $(INCLUDE) $(CFLAGS) -c getopt1.c
++	 $(LIBTOOL) --mode=compile $(CC) $(CIPHER) $(DEFS) $(INCLUDE) $(CFLAGS) -c getopt1.c
+ 
+ plugutils.o : plugutils.c
+-	 $(LIBTOOL) $(CC) $(CIPHER) $(DEFS) $(INCLUDE) $(CFLAGS) -c plugutils.c
++	 $(LIBTOOL) --mode=compile $(CC) $(CIPHER) $(DEFS) $(INCLUDE) $(CFLAGS) -c plugutils.c
+ 
+ resolve.o : resolve.c resolve.h
+-	$(LIBTOOL) $(CC)  $(CIPHER) $(DEFS) $(INCLUDE) $(CFLAGS) -c resolve.c
++	$(LIBTOOL) --mode=compile $(CC)  $(CIPHER) $(DEFS) $(INCLUDE) $(CFLAGS) -c resolve.c
+ 
+ share_fd.o : share_fd.c 
+-	$(LIBTOOL) $(CC)  $(CIPHER) $(DEFS) $(INCLUDE) $(CFLAGS) -c share_fd.c
++	$(LIBTOOL) --mode=compile $(CC)  $(CIPHER) $(DEFS) $(INCLUDE) $(CFLAGS) -c share_fd.c
+ 
+ system.o : system.c system.h
+-	$(LIBTOOL) $(CC) $(CIPHER) $(DEFS) $(INCLUDE) $(CFLAGS) -c system.c 
++	$(LIBTOOL) --mode=compile $(CC) $(CIPHER) $(DEFS) $(INCLUDE) $(CFLAGS) -c system.c 
+ 
+ arglists.o : arglists.c 
+-	$(LIBTOOL) $(CC) $(CIPHER) $(DEFS) $(INCLUDE) $(CFLAGS) -c arglists.c
++	$(LIBTOOL) --mode=compile $(CC) $(CIPHER) $(DEFS) $(INCLUDE) $(CFLAGS) -c arglists.c
+ 
+ network.o : network.c network.h
+-	$(LIBTOOL) $(CC) $(CIPHER) $(DEFS) $(INCLUDE) $(CFLAGS) -c network.c
++	$(LIBTOOL) --mode=compile $(CC) $(CIPHER) $(DEFS) $(INCLUDE) $(CFLAGS) -c network.c
+ 
+ scanners_utils.o : scanners_utils.c scanners_utils.h
+-	$(LIBTOOL) $(CC) $(CIPHER) $(DEFS) $(INCLUDE) $(CFLAGS) -c scanners_utils.c
++	$(LIBTOOL) --mode=compile $(CC) $(CIPHER) $(DEFS) $(INCLUDE) $(CFLAGS) -c scanners_utils.c
+ 
+ ftp_funcs.o : ftp_funcs.c ftp_funcs.h
+-	$(LIBTOOL) $(CC) $(CIPHER) $(DEFS) $(INCLUDE) $(CFLAGS) -c ftp_funcs.c
++	$(LIBTOOL) --mode=compile $(CC) $(CIPHER) $(DEFS) $(INCLUDE) $(CFLAGS) -c ftp_funcs.c
+ www_funcs.o : www_funcs.c 
+-	$(LIBTOOL) $(CC) $(CIPHER) $(DEFS) $(INCLUDE) $(CFLAGS) -c www_funcs.c
++	$(LIBTOOL) --mode=compile $(CC) $(CIPHER) $(DEFS) $(INCLUDE) $(CFLAGS) -c www_funcs.c
+ 	
+ pcap.o : pcap.c
+-	$(LIBTOOL) $(CC) $(CIPHER) $(DEFS) $(INCLUDE) $(CFLAGS) -c pcap.c
++	$(LIBTOOL) --mode=compile $(CC) $(CIPHER) $(DEFS) $(INCLUDE) $(CFLAGS) -c pcap.c
+ 
+ hlst.o : hlst.c hlst.h
+-	$(LIBTOOL) $(CC) $(CIPHER) $(DEFS) $(INCLUDE) $(CFLAGS) -c hlst.c
++	$(LIBTOOL) --mode=compile $(CC) $(CIPHER) $(DEFS) $(INCLUDE) $(CFLAGS) -c hlst.c
+ 
+ ptycall.o : ptycall.c 
+-	$(LIBTOOL) $(CC) $(CIPHER) $(DEFS) $(INCLUDE) $(CFLAGS) -c ptycall.c
++	$(LIBTOOL) --mode=compile $(CC) $(CIPHER) $(DEFS) $(INCLUDE) $(CFLAGS) -c ptycall.c
+ 
+ harglists.o : harglists.c
+-	$(LIBTOOL) $(CC) $(CIPHER) $(DEFS) $(INCLUDE) $(CFLAGS) -c harglists.c
++	$(LIBTOOL) --mode=compile $(CC) $(CIPHER) $(DEFS) $(INCLUDE) $(CFLAGS) -c harglists.c
+ 
+ diff.o : diff.c
+-	$(LIBTOOL) $(CC) $(CIPHER) $(DEFS) $(INCLUDE) $(CFLAGS) -c diff.c
++	$(LIBTOOL) --mode=compile $(CC) $(CIPHER) $(DEFS) $(INCLUDE) $(CFLAGS) -c diff.c
+ 
+ ids_send.o : ids_send.c
+-	$(LIBTOOL) $(CC) $(CIPHER) $(DEFS) $(INCLUDE) $(CFLAGS) -c ids_send.c 
++	$(LIBTOOL) --mode=compile $(CC) $(CIPHER) $(DEFS) $(INCLUDE) $(CFLAGS) -c ids_send.c 
+ 
+ bpf_share.o: bpf_share.c
+-	$(LIBTOOL) $(CC) $(CIPHER) $(DEFS) $(INCLUDE) $(CFLAGS) -DNESSUS_STATE_DIR=\"$(localstatedir)\" -c bpf_share.c
++	$(LIBTOOL) --mode=compile $(CC) $(CIPHER) $(DEFS) $(INCLUDE) $(CFLAGS) -DNESSUS_STATE_DIR=\"$(localstatedir)\" -c bpf_share.c
+ 
+ rand.o: rand.c
+-	$(LIBTOOL) $(CC) $(CIPHER) $(DEFS) $(INCLUDE) $(CFLAGS) -c rand.c
++	$(LIBTOOL) --mode=compile $(CC) $(CIPHER) $(DEFS) $(INCLUDE) $(CFLAGS) -c rand.c
+ 
+ popen.o: popen.c
+-	$(LIBTOOL) $(CC) $(CIPHER) $(DEFS) $(INCLUDE) $(CFLAGS) -c popen.c
++	$(LIBTOOL) --mode=compile $(CC) $(CIPHER) $(DEFS) $(INCLUDE) $(CFLAGS) -c popen.c
+ 
+ services.o: services.c
+-	$(LIBTOOL) $(CC) $(CIPHER) $(DEFS) $(INCLUDE) $(CFLAGS) -DNESSUS_STATE_DIR=\"$(localstatedir)\" -c services.c
++	$(LIBTOOL) --mode=compile $(CC) $(CIPHER) $(DEFS) $(INCLUDE) $(CFLAGS) -DNESSUS_STATE_DIR=\"$(localstatedir)\" -c services.c
+ 
+ services1.o: services1.c
+-	$(LIBTOOL) $(CC) $(CIPHER) $(DEFS) $(INCLUDE) $(CFLAGS) -DNESSUS_STATE_DIR=\"$(localstatedir)\" -DCONF_DIR=\"$(sysconfdir)\" -c services1.c
++	$(LIBTOOL) --mode=compile $(CC) $(CIPHER) $(DEFS) $(INCLUDE) $(CFLAGS) -DNESSUS_STATE_DIR=\"$(localstatedir)\" -DCONF_DIR=\"$(sysconfdir)\" -c services1.c
+ 
+ proctitle.o: proctitle.c
+-	$(LIBTOOL) $(CC) $(CIPHER) $(DEFS) $(INCLUDE) $(CFLAGS) -c proctitle.c
++	$(LIBTOOL) --mode=compile $(CC) $(CIPHER) $(DEFS) $(INCLUDE) $(CFLAGS) -c proctitle.c
+ 
+ store.o: store.c
+-	$(LIBTOOL) $(CC) $(CIPHER) $(DEFS) $(INCLUDE) $(CFLAGS) -DNESSUS_STATE_DIR=\"$(localstatedir)\" -c store.c
++	$(LIBTOOL) --mode=compile $(CC) $(CIPHER) $(DEFS) $(INCLUDE) $(CFLAGS) -DNESSUS_STATE_DIR=\"$(localstatedir)\" -c store.c
+ 	
+ 	
+ kb.o: kb.c
+-	$(LIBTOOL) $(CC) $(CIPHER) $(DEFS) $(INCLUDE) $(CFLAGS) -c kb.c
++	$(LIBTOOL) --mode=compile $(CC) $(CIPHER) $(DEFS) $(INCLUDE) $(CFLAGS) -c kb.c
+ 
+ 
+ snprintf.o : snprintf.c
+-	$(LIBTOOL) $(CC) $(CIPHER) $(DEFS) $(INCLUDE) $(CFLAGS) -c snprintf.c	
++	$(LIBTOOL) --mode=compile $(CC) $(CIPHER) $(DEFS) $(INCLUDE) $(CFLAGS) -c snprintf.c	
+ libnessus.la: $(OBJS)
+-	$(LIBTOOL) $(CC) -o libnessus.la $(LO_OBJS) -rpath ${libdir} \
++	$(LIBTOOL) --mode=link $(CC) -o libnessus.la $(LO_OBJS) -rpath ${libdir} \
+ 	-version-info ${PACKAGE_VERSION}
+ 
+ install : libnessus.la
+ 	test -d $(DESTDIR)${libdir} || $(INSTALL_DIR) -m 755 $(DESTDIR)${libdir}
+-	$(LIBTOOL) --mode install $(INSTALL) libnessus.la $(DESTDIR)${libdir}/libnessus.la
++	$(LIBTOOL) --mode=install $(INSTALL) libnessus.la $(DESTDIR)${libdir}/libnessus.la
+ 	$(LIBTOOL) --finish $(DESTDIR)${libdir}
+ 
+ distclean : clean
diff --git a/security/nessus-libraries/patches/patch-ae b/security/nessus-libraries/patches/patch-ae
new file mode 100644
index 00000000000..ce0ad239612
--- /dev/null
+++ b/security/nessus-libraries/patches/patch-ae
@@ -0,0 +1,13 @@
+$NetBSD: patch-ae,v 1.3 2009/09/15 17:56:16 joerg Exp $
+
+--- libhosts_gatherer/Makefile.orig	2009-09-11 16:33:49.000000000 +0200
++++ libhosts_gatherer/Makefile
+@@ -22,7 +22,7 @@ install : libhosts_gatherer.la
+ 	$(LIBTOOL) --finish $(DESTDIR)${libdir}
+ 	
+ libhosts_gatherer.la : $(OBJS)
+-	$(LIBTOOL) $(CC) -o libhosts_gatherer.la $(LO_OBJS) -rpath ${libdir} \
++	$(LIBTOOL) --mode=link $(CC) -o libhosts_gatherer.la $(LO_OBJS) -rpath ${libdir} \
+ 	-version-info ${PACKAGE_VERSION}
+ 	        
+ hg_utils.o : hg_utils.h hosts_gatherer.h hg_utils.c