From a95cce19a773ebac5803fbd94d727358a52ac5d3 Mon Sep 17 00:00:00 2001 From: kevlo Date: Mon, 7 May 2001 15:41:33 +0000 Subject: Upgrade to version 1.1 PR: 27060 Submitted by: MAINTAINER --- net-mgmt/sing/Makefile | 9 ++++-- net-mgmt/sing/distinfo | 2 +- net-mgmt/sing/files/patch-Makefile.in | 45 +++++++++++++++++++++++++++++ net-mgmt/sing/files/patch-aa | 45 ----------------------------- net-mgmt/sing/files/patch-ab | 13 --------- net-mgmt/sing/files/patch-configure | 53 +++++++++++++++++++++++++++++++++++ 6 files changed, 106 insertions(+), 61 deletions(-) create mode 100644 net-mgmt/sing/files/patch-Makefile.in delete mode 100644 net-mgmt/sing/files/patch-aa delete mode 100644 net-mgmt/sing/files/patch-ab create mode 100644 net-mgmt/sing/files/patch-configure (limited to 'net-mgmt') diff --git a/net-mgmt/sing/Makefile b/net-mgmt/sing/Makefile index 051d68e..7030ac1 100644 --- a/net-mgmt/sing/Makefile +++ b/net-mgmt/sing/Makefile @@ -6,7 +6,7 @@ # PORTNAME= sing -PORTVERSION= 1.0 +PORTVERSION= 1.1 CATEGORIES= net security MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= ${PORTNAME} @@ -15,10 +15,15 @@ EXTRACT_SUFX= .tgz MAINTAINER= roman@xpert.com +BUILD_DEPENDS= ${LOCALBASE}/lib/libnet.a:${PORTSDIR}/net/libnet \ + +CONFIGURE_ENV= LIBS="-L${LOCALBASE}/lib" +CONFIGURE_ARGS+= --with-libnet-prefix=${LOCALBASE} --with-libpcap-prefix=/usr GNU_CONFIGURE= yes MAN8= sing.8 post-extract: - @${RM} -rf ${WRKSRC}/libpcap* + @${RM} -rf ${WRKSRC}/libpcap-* ;\ + ${RM} -rf ${WRKSRC}/Libnet-* .include diff --git a/net-mgmt/sing/distinfo b/net-mgmt/sing/distinfo index e9dbbf3..f0b9313 100644 --- a/net-mgmt/sing/distinfo +++ b/net-mgmt/sing/distinfo @@ -1 +1 @@ -MD5 (SING-1.0.tgz) = 0e478a271068eefc6e26e45d236e7694 +MD5 (SING-1.1.tgz) = f9f649c4b40174a983601d46e4a3daac diff --git a/net-mgmt/sing/files/patch-Makefile.in b/net-mgmt/sing/files/patch-Makefile.in new file mode 100644 index 0000000..89198ec --- /dev/null +++ b/net-mgmt/sing/files/patch-Makefile.in @@ -0,0 +1,45 @@ +--- Makefile.in.orig Wed Apr 18 14:11:06 2001 ++++ Makefile.in Thu May 3 16:01:19 2001 +@@ -76,7 +76,7 @@ + libnetdir = @libnetdir@ + libpcapdir = @libpcapdir@ + +-INCLUDES = -I$(includedir) -I$(libpcapdir) -I$(libnetdir)/include ++INCLUDES = -I$(includedir) #-I$(libpcapdir) -I$(libnetdir)/include + + LIBS = @LIBS@ -lpcap -lnet + +@@ -111,7 +111,7 @@ + SOURCES = $(sing_SOURCES) + OBJECTS = $(sing_OBJECTS) + +-all: libpcap libnet all-redirect ++all: all-redirect + .SUFFIXES: + .SUFFIXES: .S .c .o .s + +@@ -152,11 +152,11 @@ + + install-binPROGRAMS: $(bin_PROGRAMS) + @$(NORMAL_INSTALL) +- $(mkinstalldirs) $(DESTDIR)$(bindir) ++ $(mkinstalldirs) $(DESTDIR)$(sbindir) + @list='$(bin_PROGRAMS)'; for p in $$list; do \ + if test -f $$p; then \ +- echo " $(INSTALL_PROGRAM) $$p $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`"; \ +- $(INSTALL_PROGRAM) $$p $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \ ++ echo " $(INSTALL_PROGRAM) $$p $(DESTDIR)$(sbindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`"; \ ++ $(INSTALL_PROGRAM) $$p $(DESTDIR)$(sbindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \ + else :; fi; \ + done + +@@ -226,8 +226,7 @@ + + + help.o: help.c config.h +-sing.o: sing.c config.h libpcap-0.4/pcap.h libpcap-0.4/net/bpf.h \ +- sing.h ipcompat.h misc.h packet.h dev_struct.h ++sing.o: sing.c config.h sing.h ipcompat.h misc.h packet.h dev_struct.h + ip_options.o: ip_options.c config.h ip_options.h ipcompat.h packet.h \ + misc.h + device.o: device.c config.h device.h misc.h packet.h dev_struct.h diff --git a/net-mgmt/sing/files/patch-aa b/net-mgmt/sing/files/patch-aa deleted file mode 100644 index 40c157d..0000000 --- a/net-mgmt/sing/files/patch-aa +++ /dev/null @@ -1,45 +0,0 @@ ---- Makefile.in.orig Sat Sep 16 13:03:43 2000 -+++ Makefile.in Fri Oct 6 01:17:29 2000 -@@ -72,7 +72,7 @@ - getopt_SOURCES = @getopt_SOURCES@ - libpcapdir = @libpcapdir@ - --INCLUDES = -I$(includedir) -I$(libpcapdir) -+INCLUDES = -I$(includedir) # -I$(libpcapdir) - - LIBS = @LIBS@ -lpcap - -@@ -108,7 +108,7 @@ - SOURCES = $(sing_SOURCES) - OBJECTS = $(sing_OBJECTS) - --all: libpcap all-redirect -+all: all-redirect - .SUFFIXES: - .SUFFIXES: .S .c .o .s - -@@ -149,11 +149,11 @@ - - install-binPROGRAMS: $(bin_PROGRAMS) - @$(NORMAL_INSTALL) -- $(mkinstalldirs) $(DESTDIR)$(bindir) -+ $(mkinstalldirs) $(DESTDIR)$(sbindir) - @list='$(bin_PROGRAMS)'; for p in $$list; do \ - if test -f $$p; then \ -- echo " $(INSTALL_PROGRAM) $$p $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`"; \ -- $(INSTALL_PROGRAM) $$p $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \ -+ echo " $(INSTALL_PROGRAM) $$p $(DESTDIR)$(sbindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`"; \ -+ $(INSTALL_PROGRAM) $$p $(DESTDIR)$(sbindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \ - else :; fi; \ - done - -@@ -223,8 +223,7 @@ - - - help.o: help.c config.h --sing.o: sing.c config.h libpcap-0.4/pcap.h libpcap-0.4/net/bpf.h \ -- sing.h ipcompat.h misc.h packet.h dev_struct.h -+sing.o: sing.c config.h sing.h ipcompat.h misc.h packet.h dev_struct.h - ip_options.o: ip_options.c config.h ip_options.h ipcompat.h packet.h \ - misc.h - device.o: device.c config.h device.h misc.h packet.h dev_struct.h diff --git a/net-mgmt/sing/files/patch-ab b/net-mgmt/sing/files/patch-ab deleted file mode 100644 index 2934e73..0000000 --- a/net-mgmt/sing/files/patch-ab +++ /dev/null @@ -1,13 +0,0 @@ ---- configure.orig Fri Oct 6 01:19:57 2000 -+++ configure Fri Oct 6 01:20:05 2000 -@@ -1097,10 +1097,6 @@ - fi - fi - --if test -n "$GCC"; then -- CFLAGS="-O3 -Wall" --fi -- - echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6 - echo "configure:1104: checking how to run the C preprocessor" >&5 - # On Suns, sometimes $CPP names a directory. diff --git a/net-mgmt/sing/files/patch-configure b/net-mgmt/sing/files/patch-configure new file mode 100644 index 0000000..44c0c18 --- /dev/null +++ b/net-mgmt/sing/files/patch-configure @@ -0,0 +1,53 @@ +--- configure.orig Thu May 3 17:44:18 2001 ++++ configure Thu May 3 16:33:56 2001 +@@ -11,6 +11,10 @@ + ac_help= + ac_default_prefix=/usr/local + # Any additions from configure.in: ++ac_help="$ac_help ++ --with-libnet-prefix=PATH path for libnet-config" ++ac_help="$ac_help ++ --with-libpcap-prefix=PATH path for libpcap" + + # Initialize some variables set by options. + # The variables have the same names as the options, with +@@ -526,8 +530,23 @@ + + + +-libpcapdir=libpcap-0.4 +-libnetdir=Libnet-1.0.1b ++# Check whether --with-libnet-prefix or --without-libnet-prefix was given. ++if test "${with_libnet_prefix+set}" = set; then ++ withval="$with_libnet_prefix/bin" ++ libnetdir="$withval" ++else ++ libnetdir="Libnet-1.0.1b" ++fi ++ ++ ++# Check whether --with-libpcap-prefix or --without-libpcap-prefix was given. ++if test "${with_libpcap_prefix+set}" = set; then ++ withval="$with_libpcap_prefix" ++ libpcapdir="$withval" ++else ++ libpcapdir="libpcap-0.4" ++fi ++ + + + +@@ -1097,12 +1116,9 @@ + fi + fi + +-if test -n "$GCC"; then +- CFLAGS="-O3 -Wall" +-fi + + echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6 +-echo "configure:1106: checking how to run the C preprocessor" >&5 ++echo "configure:1122: checking how to run the C preprocessor" >&5 + # On Suns, sometimes $CPP names a directory. + if test -n "$CPP" && test -d "$CPP"; then + CPP= -- cgit v1.1