aboutsummaryrefslogtreecommitdiffstats
path: root/net-mgmt
diff options
context:
space:
mode:
authorsylvio <sylvio@FreeBSD.org>2010-05-17 03:42:27 +0800
committersylvio <sylvio@FreeBSD.org>2010-05-17 03:42:27 +0800
commit7ec03cfb75057dd5363d2134759e94b7e4af27c8 (patch)
tree61a5ed1de0f2b9798b49b3f19a1a62a54de04077 /net-mgmt
parente024c31048bf5b740a809caf1d33d2bb65130f60 (diff)
downloadfreebsd-ports-gnome-7ec03cfb75057dd5363d2134759e94b7e4af27c8.tar.gz
freebsd-ports-gnome-7ec03cfb75057dd5363d2134759e94b7e4af27c8.tar.zst
freebsd-ports-gnome-7ec03cfb75057dd5363d2134759e94b7e4af27c8.zip
- Tweak CONFIGURE_ARGS to pass appropriate flags to ld
- Fix PLIST when WITHOUT_PERL_EMBEDDED=yes PR: ports/146559[1] ports/146268[2] ports/146084[3] ports/146490[4] Submitted by: sahil@ [1] Josh Carroll <josh.carroll@gmail.com> [2] Anton Gorlov <gorlov.a@gmail.com> [3] Heino Tiedemann <rotkap@gmx.de> [4]
Diffstat (limited to 'net-mgmt')
-rw-r--r--net-mgmt/net-snmp/Makefile4
-rw-r--r--net-mgmt/net-snmp/pkg-plist2
2 files changed, 4 insertions, 2 deletions
diff --git a/net-mgmt/net-snmp/Makefile b/net-mgmt/net-snmp/Makefile
index e5635215e1c9..481d8b3ee594 100644
--- a/net-mgmt/net-snmp/Makefile
+++ b/net-mgmt/net-snmp/Makefile
@@ -40,7 +40,7 @@ CONFIGURE_ARGS+=--enable-shared --enable-internal-md5 \
--with-sys-location="${NET_SNMP_SYS_LOCATION}" \
--with-logfile="${NET_SNMP_LOGFILE}" \
--with-persistent-directory="${NET_SNMP_PERSISTENTDIR}" \
- --with-gnu-ld --with-libwrap --with-libs="-lm -lkvm -ldevstat"
+ --with-gnu-ld --with-libwrap --with-ldflags="-lm -lkvm -ldevstat"
.if defined(BATCH)
CONFIGURE_ARGS+=--with-defaults
@@ -66,8 +66,10 @@ USE_PERL5= yes
CONFIGURE_ARGS+=--with-perl-modules
.if defined(WITHOUT_PERL_EMBEDDED)
CONFIGURE_ARGS+=--disable-embedded-perl
+PLIST_SUB+= WITH_PERL_EMBEDDED="@comment "
.else
CONFIGURE_ARGS+=--enable-embedded-perl
+PLIST_SUB+= WITH_PERL_EMBEDDED=""
.endif
PLIST_SUB+= WITH_PERL=""
.else
diff --git a/net-mgmt/net-snmp/pkg-plist b/net-mgmt/net-snmp/pkg-plist
index 0bfc8f4e6016..1c3179d6a6cf 100644
--- a/net-mgmt/net-snmp/pkg-plist
+++ b/net-mgmt/net-snmp/pkg-plist
@@ -398,7 +398,7 @@ sbin/snmptrapd
%%DATADIR%%/mibs/UCD-SNMP-MIB.txt
%%DATADIR%%/mibs/UDP-MIB.txt
@unexec rm -f %D/%%DATADIR%%/mibs/.index 2>/dev/null || true
-%%WITH_PERL%%%%DATADIR%%/snmp_perl.pl
+%%WITH_PERL_EMBEDDED%%%%DATADIR%%/snmp_perl.pl
%%DATADIR%%/snmpconf-data/snmp-data/authopts
%%DATADIR%%/snmpconf-data/snmp-data/debugging
%%DATADIR%%/snmpconf-data/snmp-data/mibs