Revision: 110348 https://trac.macports.org/changeset/110348 Author: jmr@macports.org Date: 2013-08-30 04:16:56 -0700 (Fri, 30 Aug 2013) Log Message: ----------- nessus-libraries: try to fix glibtool usage Modified Paths: -------------- trunk/dports/net/nessus-libraries/Portfile Added Paths: ----------- trunk/dports/net/nessus-libraries/files/ trunk/dports/net/nessus-libraries/files/libtool_mode.patch Modified: trunk/dports/net/nessus-libraries/Portfile =================================================================== --- trunk/dports/net/nessus-libraries/Portfile 2013-08-30 11:01:36 UTC (rev 110347) +++ trunk/dports/net/nessus-libraries/Portfile 2013-08-30 11:16:56 UTC (rev 110348) @@ -25,6 +25,8 @@ sha1 7552cb5c48ace2e38537d8b58a1c7968172399cc worksrcdir ${name}/ +patchfiles libtool_mode.patch + configure.args --mandir=\\\${prefix}/share/man \ --infodir=\\\${prefix}/share/info \ --enable-cipher \ Added: trunk/dports/net/nessus-libraries/files/libtool_mode.patch =================================================================== --- trunk/dports/net/nessus-libraries/files/libtool_mode.patch (rev 0) +++ trunk/dports/net/nessus-libraries/files/libtool_mode.patch 2013-08-30 11:16:56 UTC (rev 110348) @@ -0,0 +1,146 @@ +--- libhosts_gatherer/Makefile.orig 2003-04-07 12:06:49.000000000 +1000 ++++ libhosts_gatherer/Makefile 2013-02-19 15:08:19.000000000 +1100 +@@ -22,7 +22,7 @@ + $(LIBTOOL) --finish $(DESTDIR)${libdir} + + libhosts_gatherer.la : $(OBJS) +- $(LIBTOOL) $(CC) -o libhosts_gatherer.la $(LO_OBJS) -rpath ${libdir} \ ++ $(LIBTOOL) --mode=link $(CC) $(CFLAGS) -o libhosts_gatherer.la $(LO_OBJS) -rpath ${libdir} \ + -version-info ${PACKAGE_VERSION} + + hg_utils.o : hg_utils.h hosts_gatherer.h hg_utils.c +--- libnessus/Makefile.orig 2004-09-01 03:15:07.000000000 +1000 ++++ libnessus/Makefile 2013-02-19 15:12:52.000000000 +1100 +@@ -22,85 +22,85 @@ + + + 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) $(CFLAGS) -o libnessus.la $(LO_OBJS) -rpath ${libdir} \ + -version-info ${PACKAGE_VERSION} + + install : libnessus.la +--- libpcap-nessus/Makefile.in.orig 2004-01-09 03:12:55.000000000 +1100 ++++ libpcap-nessus/Makefile.in 2013-02-19 15:17:50.000000000 +1100 +@@ -31,7 +31,7 @@ + # You shouldn't need to edit anything below. + # + +-COMPILE = $(LIBTOOL) $(CC) ++COMPILE = $(LIBTOOL) --mode=compile $(CC) + CCOPT = @V_CCOPT@ + INCLS = -I. @V_INCLS@ -I../../include + ### Solaris make does not like += (jordan) +@@ -89,7 +89,7 @@ + + libpcap-nessus.la: $(OBJ) + @rm -f $@ +- $(LIBTOOL) $(CC) -o libpcap-nessus.la $(LO_OBJ) -rpath ${libdir} \ ++ $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(CCOPT) -o libpcap-nessus.la $(LO_OBJ) -rpath ${libdir} \ + -version-info ${PACKAGE_VERSION} + + scanner.c: $(srcdir)/scanner.l
participants (1)
-
jmr@macports.org