summaryrefslogtreecommitdiff
path: root/devel/libnet10
diff options
context:
space:
mode:
authorjperkin <jperkin>2014-01-09 11:00:14 +0000
committerjperkin <jperkin>2014-01-09 11:00:14 +0000
commit7bce9fdc0c3204ac69b4606a2b3f0a7135ab808e (patch)
tree0a7ba2574033f73fa9ae00ab1dd008715d6371de /devel/libnet10
parent4da947774cec029f80df541d7f573ad76503611e (diff)
downloadpkgsrc-7bce9fdc0c3204ac69b4606a2b3f0a7135ab808e.tar.gz
Do not append libnet10 subdirectory directly to LIBNET_CONFIG_LIBS, when
additional libraries are specified you end up with e.g. '-lnsl/libnet10'. Bump PKGREVISION.
Diffstat (limited to 'devel/libnet10')
-rw-r--r--devel/libnet10/Makefile14
-rw-r--r--devel/libnet10/distinfo4
-rw-r--r--devel/libnet10/patches/patch-ad4
3 files changed, 11 insertions, 11 deletions
diff --git a/devel/libnet10/Makefile b/devel/libnet10/Makefile
index a0a61c734ce..4f1d76ecca4 100644
--- a/devel/libnet10/Makefile
+++ b/devel/libnet10/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.4 2012/10/31 11:17:18 asau Exp $
+# $NetBSD: Makefile,v 1.5 2014/01/09 11:00:14 jperkin Exp $
#
DISTNAME= libnet-1.0.2a
PKGNAME= ${DISTNAME:S/libnet/libnet10/}
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= devel net
MASTER_SITES= http://www.packetfactory.net/libnet/dist/deprecated/
@@ -22,11 +22,11 @@ GNU_CONFIGURE= yes
CONFIGURE_ENV+= LIBNET_CONFIG_CFLAGS="-I${PREFIX}/include/libnet10" \
LIBNET_CONFIG_LIBS=${LDFLAGS:M*:Q}
-SUBST_CLASSES+= man
-SUBST_STAGE.man= pre-configure
-SUBST_FILES.man= Makefile.in
-SUBST_SED.man= -e 's,@MAN_PREFIX@,${PREFIX}/${PKGMANDIR}/man3,g'
-SUBST_MESSAGE.man= Fixing path to man files.
+SUBST_CLASSES+= vars
+SUBST_STAGE.vars= pre-configure
+SUBST_FILES.vars= Makefile.in libnet-config.in
+SUBST_SED.vars= -e 's,@MAN_PREFIX@,${PREFIX}/${PKGMANDIR}/man3,g'
+SUBST_SED.vars+= -e 's!@COMPILER_RPATH_FLAG@!${COMPILER_RPATH_FLAG}!g'
INSTALLATION_DIRS= bin lib share/examples ${PKGMANDIR}/man3
diff --git a/devel/libnet10/distinfo b/devel/libnet10/distinfo
index 8837bf9b4d3..e51c9bca687 100644
--- a/devel/libnet10/distinfo
+++ b/devel/libnet10/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.4 2013/02/22 21:12:25 jperkin Exp $
+$NetBSD: distinfo,v 1.5 2014/01/09 11:00:14 jperkin Exp $
SHA1 (libnet-1.0.2a.tar.gz) = 804eaf43bb90f93e505d46a9668c914a112bf136
RMD160 (libnet-1.0.2a.tar.gz) = 43dd2edc31e56b42792727b88d81342dc26d3308
@@ -6,5 +6,5 @@ Size (libnet-1.0.2a.tar.gz) = 140191 bytes
SHA1 (patch-aa) = fa71db191c421aa1b36d1107236645fdde0bc8f9
SHA1 (patch-ab) = 56a2cb8b214529fdaacdbc6154ec2fc88edfa1c8
SHA1 (patch-ac) = 73c68c9e6ca1dfc751cf8d5b00444fa38ae87e70
-SHA1 (patch-ad) = 44256848f62919540893913469d88f5a7177d742
+SHA1 (patch-ad) = 237a8caae854df28790b3038c0b782b95b336004
SHA1 (patch-ae) = 12777de08a91b76d1b0194b39551215bab74222f
diff --git a/devel/libnet10/patches/patch-ad b/devel/libnet10/patches/patch-ad
index 74984f65b45..2b267fa5571 100644
--- a/devel/libnet10/patches/patch-ad
+++ b/devel/libnet10/patches/patch-ad
@@ -1,4 +1,4 @@
-$NetBSD: patch-ad,v 1.2 2007/03/02 09:26:10 adrianp Exp $
+$NetBSD: patch-ad,v 1.3 2014/01/09 11:00:14 jperkin Exp $
--- libnet-config.in.orig 2000-12-12 18:33:42.000000000 +0000
+++ libnet-config.in
@@ -7,7 +7,7 @@ $NetBSD: patch-ad,v 1.2 2007/03/02 09:26:10 adrianp Exp $
libnet_defines="@LIBNET_CONFIG_DEFINES@"
libnet_cflags="@LIBNET_CONFIG_CFLAGS@"
-libnet_libs="@LIBNET_CONFIG_LIBS@ -lnet"
-+libnet_libs="@LIBNET_CONFIG_LIBS@/libnet10 -L@prefix@/lib/libnet10 -lnet"
++libnet_libs="@LIBNET_CONFIG_LIBS@ @COMPILER_RPATH_FLAG@@prefix@/lib/libnet10 -L@prefix@/lib/libnet10 -lnet"
usage()
{