aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormarcus <marcus@FreeBSD.org>2003-03-05 05:45:05 +0800
committermarcus <marcus@FreeBSD.org>2003-03-05 05:45:05 +0800
commit10937f3dd05944d085cfdc6c06211d6bb87c84bc (patch)
treec0d4211ae9694100559b5289e9c75830a99d8a07
parent6f2b0033ed64457f1480384b8e6a75fed704f6fc (diff)
downloadfreebsd-ports-gnome-10937f3dd05944d085cfdc6c06211d6bb87c84bc.tar.gz
freebsd-ports-gnome-10937f3dd05944d085cfdc6c06211d6bb87c84bc.tar.zst
freebsd-ports-gnome-10937f3dd05944d085cfdc6c06211d6bb87c84bc.zip
* Fix build once and for all. Tested with -STABLE, 5.0-RELEASE-p3, and
-CURRENT * Take maintainership as I need this version for one of my applications PR: 48932 Submitted by: Oliver Lehmann <lehmann@ans-netz.de> Thanks to: ade, marcus Reported by: Will Mitayai Keeso Rowe <mit@dreamlabs.com>
-rw-r--r--net-mgmt/net-snmp4/Makefile16
-rw-r--r--net/net-snmp4/Makefile16
2 files changed, 8 insertions, 24 deletions
diff --git a/net-mgmt/net-snmp4/Makefile b/net-mgmt/net-snmp4/Makefile
index fb17a481a2be..c6489a3d0b56 100644
--- a/net-mgmt/net-snmp4/Makefile
+++ b/net-mgmt/net-snmp4/Makefile
@@ -15,7 +15,7 @@ MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} \
ftp://ftp.win.ne.jp/pub/network/snmp/ucd-snmp/
MASTER_SITE_SUBDIR= net-snmp
-MAINTAINER= ports@FreeBSD.org
+MAINTAINER= marcus@FreeBSD.org
COMMENT= An extendable SNMP implementation
USE_AUTOCONF_VER=213
@@ -71,17 +71,9 @@ CONFIGURE_ARGS+= --enable-ipv6
.if defined(WITHOUT_SSL)
CONFIGURE_ARGS+= --without-openssl
.else
-.if defined(WITH_PORTSSL) || ${OSVERSION} >= 500100 || (${OSVERSION} >= 470103 && ${OSREL} == 4)
-.if ${OSVERSION} >= 500100 || (${OSVERSION} >= 470103 && ${OSREL} == 4)
-LIB_DEPENDS+= crypto.4:${PORTSDIR}/security/openssl
-.else
-LIB_DEPENDS+= crypto.3:${PORTSDIR}/security/openssl
-.endif
-CONFIGURE_ARGS+= --with-openssl=${LOCALBASE}
-CFLAGS+= -DOPENSSL_DES_LIBDES_COMPATIBILITY
-.else
+USE_OPENSSL= YES
CONFIGURE_ARGS+= --with-openssl=/usr
-.endif
+CFLAGS+= -DOPENSSL_DES_LIBDES_COMPATIBILITY
.endif
SHLIB_VERSION= 4
@@ -89,7 +81,7 @@ PLIST_SUB+= shlib=${SHLIB_VERSION}
pre-everything::
@${ECHO} ""
- @${ECHO} "You may use the following build options:"
+ @${ECHO} "You may use the following build option(s):"
@${ECHO} ""
@${ECHO} " WITH_PORTSSL=yes Use the OpenSSL Version delivered by the ports."
@${ECHO} " With FreeBSD 5, net-snmp4 requires automaticly"
diff --git a/net/net-snmp4/Makefile b/net/net-snmp4/Makefile
index fb17a481a2be..c6489a3d0b56 100644
--- a/net/net-snmp4/Makefile
+++ b/net/net-snmp4/Makefile
@@ -15,7 +15,7 @@ MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} \
ftp://ftp.win.ne.jp/pub/network/snmp/ucd-snmp/
MASTER_SITE_SUBDIR= net-snmp
-MAINTAINER= ports@FreeBSD.org
+MAINTAINER= marcus@FreeBSD.org
COMMENT= An extendable SNMP implementation
USE_AUTOCONF_VER=213
@@ -71,17 +71,9 @@ CONFIGURE_ARGS+= --enable-ipv6
.if defined(WITHOUT_SSL)
CONFIGURE_ARGS+= --without-openssl
.else
-.if defined(WITH_PORTSSL) || ${OSVERSION} >= 500100 || (${OSVERSION} >= 470103 && ${OSREL} == 4)
-.if ${OSVERSION} >= 500100 || (${OSVERSION} >= 470103 && ${OSREL} == 4)
-LIB_DEPENDS+= crypto.4:${PORTSDIR}/security/openssl
-.else
-LIB_DEPENDS+= crypto.3:${PORTSDIR}/security/openssl
-.endif
-CONFIGURE_ARGS+= --with-openssl=${LOCALBASE}
-CFLAGS+= -DOPENSSL_DES_LIBDES_COMPATIBILITY
-.else
+USE_OPENSSL= YES
CONFIGURE_ARGS+= --with-openssl=/usr
-.endif
+CFLAGS+= -DOPENSSL_DES_LIBDES_COMPATIBILITY
.endif
SHLIB_VERSION= 4
@@ -89,7 +81,7 @@ PLIST_SUB+= shlib=${SHLIB_VERSION}
pre-everything::
@${ECHO} ""
- @${ECHO} "You may use the following build options:"
+ @${ECHO} "You may use the following build option(s):"
@${ECHO} ""
@${ECHO} " WITH_PORTSSL=yes Use the OpenSSL Version delivered by the ports."
@${ECHO} " With FreeBSD 5, net-snmp4 requires automaticly"