any tests/comments/oks? I'm in two minds whether to install
libnet-config (either as well as, or instead of, libnet-config-1.1)..
for now I've gone with the status quo and left it as just installing
libnet-config-1.1 (with an explicit @comment so update-plist doesn't
re-add it).
Index: Makefile.inc
===================================================================
RCS file: /cvs/ports/net/libnet/Makefile.inc,v
retrieving revision 1.2
diff -u -p -r1.2 Makefile.inc
--- Makefile.inc 15 Sep 2007 22:36:55 -0000 1.2
+++ Makefile.inc 9 Apr 2010 23:15:37 -0000
@@ -5,7 +5,7 @@ COMMENT= raw IP packet construction libr
DISTNAME= libnet-${VERSION}
CATEGORIES= net
-HOMEPAGE= http://www.packetfactory.net/projects/libnet/
+HOMEPAGE?= http://www.packetfactory.net/projects/libnet/
PERMIT_PACKAGE_CDROM= Yes
Index: 1.1/Makefile
===================================================================
RCS file: /cvs/ports/net/libnet/1.1/Makefile,v
retrieving revision 1.5
diff -u -p -r1.5 Makefile
--- 1.1/Makefile 8 Nov 2008 22:17:41 -0000 1.5
+++ 1.1/Makefile 9 Apr 2010 23:15:37 -0000
@@ -1,14 +1,16 @@
# $OpenBSD: Makefile,v 1.5 2008/11/08 22:17:41 sthen Exp $
REVISION= 1.1
-VERSION= ${REVISION}.2.1
-PKGNAME= ${DISTNAME}p0
+VERSION= ${REVISION}.4
SHARED_LIBS= net 11.0
-WRKDIST= ${WRKDIR}/libnet
-MASTER_SITES= http://www.packetfactory.net/libnet/dist/
+HOMEPAGE= http://github.com/sam-github/libnet/
+
+MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=libnet-dev/}
+
+AUTOCONF_VERSION= 2.61
+USE_LIBTOOL= Yes
-AUTOCONF_VERSION= 2.59
MAKE_FLAGS= LIBnet_VERSION=${LIBnet_VERSION}
CONFIGURE_ENV= LIBNET_CONFIG_LIBS="-L${LOCALBASE}/lib/libnet-1.1" \
LIBNET_CONFIG_CFLAGS="-I${LOCALBASE}/include/libnet-1.1"
Index: 1.1/distinfo
===================================================================
RCS file: /cvs/ports/net/libnet/1.1/distinfo,v
retrieving revision 1.3
diff -u -p -r1.3 distinfo
--- 1.1/distinfo 5 Apr 2007 16:20:10 -0000 1.3
+++ 1.1/distinfo 9 Apr 2010 23:15:37 -0000
@@ -1,5 +1,5 @@
-MD5 (libnet-1.1.2.1.tar.gz) = voRcQRcNcsfbUk80EbUCVg==
-RMD160 (libnet-1.1.2.1.tar.gz) = LY2Hkw0Jp0qzab18JAr0tUJq44A=
-SHA1 (libnet-1.1.2.1.tar.gz) = dgeDoq29hFtzHiAAqvo82cOwKNU=
-SHA256 (libnet-1.1.2.1.tar.gz) = qwGIKj0FVhdgGMCTQs0HMffLyOaHeVAJiUwzJpQsdv8=
-SIZE (libnet-1.1.2.1.tar.gz) = 1021236
+MD5 (libnet-1.1.4.tar.gz) = xeBkGKicxCCfZ3p3anmP2Q==
+RMD160 (libnet-1.1.4.tar.gz) = 6d0gJqyRkeYmRuyX60iWcDtEVoU=
+SHA1 (libnet-1.1.4.tar.gz) = hqL3W1LFsV29QcPgM1YWfenIg+Q=
+SHA256 (libnet-1.1.4.tar.gz) = 3pginZ7KALZsJss2jlgpAc92hFYyFwO8OCNeOzR7US0=
+SIZE (libnet-1.1.4.tar.gz) = 1204502
Index: 1.1/patches/patch-Makefile_in
===================================================================
RCS file: /cvs/ports/net/libnet/1.1/patches/patch-Makefile_in,v
retrieving revision 1.1
diff -u -p -r1.1 patch-Makefile_in
--- 1.1/patches/patch-Makefile_in 23 May 2005 23:50:40 -0000 1.1
+++ 1.1/patches/patch-Makefile_in 9 Apr 2010 23:15:37 -0000
@@ -1,16 +1,16 @@
$OpenBSD: patch-Makefile_in,v 1.1 2005/05/23 23:50:40 msf Exp $
---- Makefile.in.orig Thu Mar 11 13:50:20 2004
-+++ Makefile.in Fri Sep 10 12:22:20 2004
-@@ -43,10 +43,10 @@ datadir = @datadir@
- sysconfdir = @sysconfdir@
- sharedstatedir = @sharedstatedir@
- localstatedir = @localstatedir@
--libdir = @libdir@
-+libdir = @libdir@/libnet-1.1
- infodir = @infodir@
- mandir = @mandir@
+--- Makefile.in.orig Wed Jun 10 00:13:21 2009
++++ Makefile.in Fri Apr 9 23:42:52 2010
+@@ -186,10 +186,10 @@ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
+ htmldir = @htmldir@
-includedir = @includedir@
+includedir = @includedir@/libnet-1.1
- oldincludedir = /usr/include
- pkgdatadir = $(datadir)/@PACKAGE@
- pkglibdir = $(libdir)/@PACKAGE@
+ infodir = @infodir@
+ install_sh = @install_sh@
+-libdir = @libdir@
++libdir = @libdir@/libnet-1.1
+ libexecdir = @libexecdir@
+ localedir = @localedir@
+ localstatedir = @localstatedir@
Index: 1.1/patches/patch-include_Makefile_in
===================================================================
RCS file: /cvs/ports/net/libnet/1.1/patches/patch-include_Makefile_in,v
retrieving revision 1.1
diff -u -p -r1.1 patch-include_Makefile_in
--- 1.1/patches/patch-include_Makefile_in 23 May 2005 23:50:40 -0000
1.1
+++ 1.1/patches/patch-include_Makefile_in 9 Apr 2010 23:15:37 -0000
@@ -1,16 +1,16 @@
$OpenBSD: patch-include_Makefile_in,v 1.1 2005/05/23 23:50:40 msf Exp $
---- include/Makefile.in.orig Thu Mar 11 13:50:20 2004
-+++ include/Makefile.in Fri Sep 10 12:22:44 2004
-@@ -37,10 +37,10 @@ datadir = @datadir@
- sysconfdir = @sysconfdir@
- sharedstatedir = @sharedstatedir@
- localstatedir = @localstatedir@
--libdir = @libdir@
-+libdir = @libdir@/libnet-1.1
- infodir = @infodir@
- mandir = @mandir@
+--- include/Makefile.in.orig Wed Jun 10 00:13:20 2009
++++ include/Makefile.in Fri Apr 9 23:44:57 2010
+@@ -172,10 +172,10 @@ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
+ htmldir = @htmldir@
-includedir = @includedir@
+includedir = @includedir@/libnet-1.1
- oldincludedir = /usr/include
- pkgdatadir = $(datadir)/@PACKAGE@
- pkglibdir = $(libdir)/@PACKAGE@
+ infodir = @infodir@
+ install_sh = @install_sh@
+-libdir = @libdir@
++libdir = @libdir@/libnet-1.1
+ libexecdir = @libexecdir@
+ localedir = @localedir@
+ localstatedir = @localstatedir@
Index: 1.1/patches/patch-include_libnet_Makefile_in
===================================================================
RCS file: /cvs/ports/net/libnet/1.1/patches/patch-include_libnet_Makefile_in,v
retrieving revision 1.1
diff -u -p -r1.1 patch-include_libnet_Makefile_in
--- 1.1/patches/patch-include_libnet_Makefile_in 23 May 2005 23:50:40
-0000 1.1
+++ 1.1/patches/patch-include_libnet_Makefile_in 9 Apr 2010 23:15:37
-0000
@@ -1,12 +1,16 @@
$OpenBSD: patch-include_libnet_Makefile_in,v 1.1 2005/05/23 23:50:40 msf Exp $
---- include/libnet/Makefile.in.orig Fri Sep 10 14:02:13 2004
-+++ include/libnet/Makefile.in Fri Sep 10 14:02:26 2004
-@@ -40,7 +40,7 @@ localstatedir = @localstatedir@
- libdir = @libdir@
- infodir = @infodir@
- mandir = @mandir@
+--- include/libnet/Makefile.in.orig Wed Jun 10 00:13:21 2009
++++ include/libnet/Makefile.in Fri Apr 9 23:45:28 2010
+@@ -161,10 +161,10 @@ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
+ htmldir = @htmldir@
-includedir = @includedir@
+includedir = @includedir@/libnet-1.1
- oldincludedir = /usr/include
- pkgdatadir = $(datadir)/@PACKAGE@
- pkglibdir = $(libdir)/@PACKAGE@
+ infodir = @infodir@
+ install_sh = @install_sh@
+-libdir = @libdir@
++libdir = @libdir@/libnet-1.1
+ libexecdir = @libexecdir@
+ localedir = @localedir@
+ localstatedir = @localstatedir@
Index: 1.1/patches/patch-src_Makefile_in
===================================================================
RCS file: /cvs/ports/net/libnet/1.1/patches/patch-src_Makefile_in,v
retrieving revision 1.4
diff -u -p -r1.4 patch-src_Makefile_in
--- 1.1/patches/patch-src_Makefile_in 8 Nov 2008 22:09:40 -0000 1.4
+++ 1.1/patches/patch-src_Makefile_in 9 Apr 2010 23:15:37 -0000
@@ -1,76 +1,16 @@
$OpenBSD: patch-src_Makefile_in,v 1.4 2008/11/08 22:09:40 sthen Exp $
---- src/Makefile.in.orig Thu Mar 11 18:50:20 2004
-+++ src/Makefile.in Sat Nov 8 22:07:59 2008
-@@ -43,10 +43,10 @@ datadir = @datadir@
- sysconfdir = @sysconfdir@
- sharedstatedir = @sharedstatedir@
- localstatedir = @localstatedir@
--libdir = @libdir@
-+libdir = @libdir@/libnet-1.1
- infodir = @infodir@
- mandir = @mandir@
+--- src/Makefile.in.orig Wed Jun 10 00:13:21 2009
++++ src/Makefile.in Fri Apr 9 23:44:40 2010
+@@ -202,10 +202,10 @@ host_cpu = @host_cpu@
+ host_os = @host_os@
+ host_vendor = @host_vendor@
+ htmldir = @htmldir@
-includedir = @includedir@
+includedir = @includedir@/libnet-1.1
- oldincludedir = /usr/include
- pkgdatadir = $(datadir)/@PACKAGE@
- pkglibdir = $(libdir)/@PACKAGE@
-@@ -109,8 +109,10 @@ AUTOMAKE_OPTIONS = foreign no-dependencies
-
- DISTCLEANFILES = *~
-
--lib_LIBRARIES = libnet.a
-+SHLIB= libnet.so.$(LIBnet_VERSION)
-
-+lib_LIBRARIES = libnet.a $(SHLIB)
-+
- libnet_a_SOURCES = libnet_asn1.c \
- libnet_build_802.1q.c \
- libnet_build_802.1x.c \
-@@ -203,6 +205,8 @@ am_libnet_a_OBJECTS = libnet_asn1.$(OBJEXT) \
- libnet_raw.$(OBJEXT) libnet_resolve.$(OBJEXT) \
- libnet_version.$(OBJEXT) libnet_write.$(OBJEXT)
- libnet_a_OBJECTS = $(am_libnet_a_OBJECTS)
-+SHOBJECTS= $(am_libnet_a_OBJECTS:S/.o/.so/) $(libnet_a_LIBADD:S/.o/.so/)
-+PICFLAG= -fPIC
-
- DEFS = @DEFS@
- DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)/include
-@@ -226,7 +230,7 @@ SOURCES = $(libnet_a_SOURCES) $(EXTRA_libnet_a_SOURCES
- all: all-am
-
- .SUFFIXES:
--.SUFFIXES: .c .o .obj
-+.SUFFIXES: .c .o .so .obj
- $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am
$(top_srcdir)/Makefile.am.common $(top_srcdir)/configure.in $(ACLOCAL_M4)
- cd $(top_srcdir) && \
- $(AUTOMAKE) --foreign src/Makefile
-@@ -249,8 +253,6 @@ install-libLIBRARIES: $(lib_LIBRARIES)
- @list='$(lib_LIBRARIES)'; for p in $$list; do \
- if test -f $$p; then \
- p="`echo $$p | sed -e 's|^.*/||'`"; \
-- echo " $(RANLIB) $(DESTDIR)$(libdir)/$$p"; \
-- $(RANLIB) $(DESTDIR)$(libdir)/$$p; \
- else :; fi; \
- done
-
-@@ -269,6 +271,10 @@ libnet.a: $(libnet_a_OBJECTS) $(libnet_a_DEPENDENCIES)
- $(libnet_a_AR) libnet.a $(libnet_a_OBJECTS) $(libnet_a_LIBADD)
- $(RANLIB) libnet.a
-
-+$(SHLIB): $(SHOBJECTS) $(libnet_a_DEPENDENCIES)
-+ -rm -f $(SHLIB)
-+ $(CC) -shared $(PICFLAG) -o $(SHLIB) $(SHOBJECTS)
-+
- mostlyclean-compile:
- -rm -f *.$(OBJEXT) core *.core
-
-@@ -277,6 +283,9 @@ distclean-compile:
-
- .c.o:
- $(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$<
-+
-+.c.so:
-+ $(COMPILE) $(PICFLAG) -DPIC -c `test -f '$<' || echo '$(srcdir)/'`$< -o
$@
-
- .c.obj:
- $(COMPILE) -c `cygpath -w $<`
+ infodir = @infodir@
+ install_sh = @install_sh@
+-libdir = @libdir@
++libdir = @libdir@/libnet-1.1
+ libexecdir = @libexecdir@
+ localedir = @localedir@
+ localstatedir = @localstatedir@
Index: 1.1/pkg/PLIST
===================================================================
RCS file: /cvs/ports/net/libnet/1.1/pkg/PLIST,v
retrieving revision 1.1
diff -u -p -r1.1 PLIST
--- 1.1/pkg/PLIST 23 May 2005 23:50:40 -0000 1.1
+++ 1.1/pkg/PLIST 9 Apr 2010 23:15:37 -0000
@@ -2,6 +2,7 @@
@option no-default-conflict
@conflict libnet-1.1->=1.1
%%SHARED%%
+...@comment bin/libnet-config
bin/libnet-config-1.1
include/libnet-1.1/
include/libnet-1.1/libnet/
@@ -14,3 +15,7 @@ include/libnet-1.1/libnet/libnet-structu
include/libnet-1.1/libnet/libnet-types.h
lib/libnet-1.1/
lib/libnet-1.1/libnet.a
+lib/libnet-1.1/libnet.la
+...@man man/man3/libnet-functions.h.3
+...@man man/man3/libnet-macros.h.3
+...@man man/man3/libnet.h.3
