From owner-svn-ports-all@FreeBSD.ORG Mon Jun 23 03:35:40 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id F03D8BEF; Mon, 23 Jun 2014 03:35:40 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id D1135265C; Mon, 23 Jun 2014 03:35:40 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s5N3ZeI5058795; Mon, 23 Jun 2014 03:35:40 GMT (envelope-from zi@svn.freebsd.org) Received: (from zi@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s5N3ZemL058793; Mon, 23 Jun 2014 03:35:40 GMT (envelope-from zi@svn.freebsd.org) Message-Id: <201406230335.s5N3ZemL058793@svn.freebsd.org> From: Ryan Steinmetz Date: Mon, 23 Jun 2014 03:35:40 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r358899 - head/net-mgmt/net-snmp X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 23 Jun 2014 03:35:41 -0000 Author: zi Date: Mon Jun 23 03:35:40 2014 New Revision: 358899 URL: http://svnweb.freebsd.org/changeset/ports/358899 QAT: https://qat.redports.org/buildarchive/r358899/ Log: - Unbreak build after previous commits - Bump PORTREVISION PR: 191148 Submitted by: girgen@ Modified: head/net-mgmt/net-snmp/Makefile head/net-mgmt/net-snmp/pkg-plist Modified: head/net-mgmt/net-snmp/Makefile ============================================================================== --- head/net-mgmt/net-snmp/Makefile Mon Jun 23 03:04:13 2014 (r358898) +++ head/net-mgmt/net-snmp/Makefile Mon Jun 23 03:35:40 2014 (r358899) @@ -3,7 +3,7 @@ PORTNAME= snmp PORTVERSION= 5.7.2 -PORTREVISION= 10 +PORTREVISION= 11 CATEGORIES= net-mgmt ipv6 MASTER_SITES= SF/net-${PORTNAME}/net-${PORTNAME}/${PORTVERSION} PKGNAMEPREFIX= net- @@ -39,10 +39,11 @@ GNU_CONFIGURE= yes USE_RC_SUBR= snmpd snmptrapd USE_OPENSSL= yes USE_LDCONFIG= yes -USES= perl5 +USES= perl5 libtool USE_PERL5= build run fixpacklist CFLAGS+= -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib CONFIGURE_ENV+= PERLPROG="${PERL}" PSPROG="${PS_CMD}" SED="${SED}" CONFIGURE_ARGS+=--enable-shared --enable-internal-md5 \ --with-default-snmp-version="${DEFAULT_SNMP_VERSION}" \ @@ -68,7 +69,7 @@ RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}set BUILD_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}setuptools${PYTHON_SUFFIX}>0:${PORTSDIR}/devel/py-setuptools${PYTHON_SUFFIX} CONFIGURE_ARGS+=--with-python-modules CONFIGURE_ENV+= PYTHONPROG="${PYTHON_CMD}" -MAKE_ENV+= PYDISTUTILS_INSTALLARGS="${PYDISTUTILS_INSTALLARGS}" STAGEDIR="${STAGEDIR}" +MAKE_ENV+= PYDISTUTILS_INSTALLARGS="${PYDISTUTILS_INSTALLARGS}" STAGEDIR="${STAGEDIR}" PLIST_SUB+= WITH_PYTHON="" PYTHON_VER=${PYTHON_VER} PLIST_SUB+= PYDISTUTILS_PKGVERSION=${PYDISTUTILS_PKGVERSION} .else @@ -134,7 +135,8 @@ CONFIGURE_ARGS+=--without-root-access .endif SHLIB_VERSION= 30 -PLIST_SUB+= SHLIB_VERSION=${SHLIB_VERSION} +SHLIB_VERSION2= .0.2 +PLIST_SUB+= SHLIB_VERSION=${SHLIB_VERSION} SHLIB_VERSION2=${SHLIB_VERSION2} SCRIPTS_SUB= PREFIX=${PREFIX} PERL=${PERL} DEFAULT_SNMP_VERSION?= 3 @@ -178,7 +180,14 @@ CONFIGURE_ARGS+=--with-out-mib-modules=" .endif BIN_FILES= snmpbulkwalk snmpget snmpgetnext snmpset \ - snmpstatus snmptest snmptranslate snmptrap snmpwalk + snmpstatus snmptest snmptranslate snmptrap snmpwalk \ + snmptable snmpbulkget snmpdelta snmpdf agentxtrap \ + snmpvacm snmpusm encode_keychange snmpnetstat +LIB_FILES= libnetsnmp.so.${SHLIB_VERSION}${SHLIB_VERSION2} \ + libnetsnmpagent.so.${SHLIB_VERSION}${SHLIB_VERSION2} \ + libnetsnmpmibs.so.${SHLIB_VERSION}${SHLIB_VERSION2} \ + libnetsnmphelpers.so.${SHLIB_VERSION}${SHLIB_VERSION2} \ + libnetsnmptrapd.so.${SHLIB_VERSION}${SHLIB_VERSION2} SBIN_FILES= snmpd snmptrapd STARTUP_DIR= ${PREFIX}/etc/rc.d SCRIPT_FILES= snmpcheck.def mib2c fixproc ipf-mod.pl snmpconf \ @@ -252,9 +261,15 @@ post-build: post-install: strip-files install-config-files install-doc-files display-message @${MKDIR} ${STAGEDIR}/var/agentx + @(cd ${STAGEDIR}${PREFIX}/lib && ${LN} -sf libnetsnmp.so.${SHLIB_VERSION} libnetsnmp.so) + @(cd ${STAGEDIR}${PREFIX}/lib && ${LN} -sf libnetsnmpagent.so.${SHLIB_VERSION} libnetsnmpagent.so) + @(cd ${STAGEDIR}${PREFIX}/lib && ${LN} -sf libnetsnmphelpers.so.${SHLIB_VERSION} libnetsnmphelpers.so) + @(cd ${STAGEDIR}${PREFIX}/lib && ${LN} -sf libnetsnmpmibs.so.${SHLIB_VERSION} libnetsnmpmibs.so) + @(cd ${STAGEDIR}${PREFIX}/lib && ${LN} -sf libnetsnmptrapd.so.${SHLIB_VERSION} libnetsnmptrapd.so) strip-files: (cd ${STAGEDIR}${PREFIX}/bin; ${STRIP_CMD} ${BIN_FILES}) + (cd ${STAGEDIR}${PREFIX}/lib; ${STRIP_CMD} ${LIB_FILES}) (cd ${STAGEDIR}${PREFIX}/sbin; ${STRIP_CMD} ${SBIN_FILES}) install-config-files: Modified: head/net-mgmt/net-snmp/pkg-plist ============================================================================== --- head/net-mgmt/net-snmp/pkg-plist Mon Jun 23 03:04:13 2014 (r358898) +++ head/net-mgmt/net-snmp/pkg-plist Mon Jun 23 03:35:40 2014 (r358899) @@ -209,30 +209,25 @@ include/net-snmp/utilities.h include/net-snmp/varbind_api.h include/net-snmp/version.h lib/libnetsnmp.a -lib/libnetsnmp.la +lib/libnetsnmp.so lib/libnetsnmp.so.%%SHLIB_VERSION%% -@exec ln -fs libnetsnmp.so.%%SHLIB_VERSION%% %B/libnetsnmp.so -@unexec rm -f %B/libnetsnmp.so 2> /dev/null || true +lib/libnetsnmp.so.%%SHLIB_VERSION%%%%SHLIB_VERSION2%% lib/libnetsnmpagent.a -lib/libnetsnmpagent.la +lib/libnetsnmpagent.so lib/libnetsnmpagent.so.%%SHLIB_VERSION%% -@exec ln -fs libnetsnmpagent.so.%%SHLIB_VERSION%% %B/libnetsnmpagent.so -@unexec rm -f %B/libnetsnmpagent.so 2> /dev/null || true +lib/libnetsnmpagent.so.%%SHLIB_VERSION%%%%SHLIB_VERSION2%% lib/libnetsnmphelpers.a -lib/libnetsnmphelpers.la +lib/libnetsnmphelpers.so lib/libnetsnmphelpers.so.%%SHLIB_VERSION%% -@exec ln -fs libnetsnmphelpers.so.%%SHLIB_VERSION%% %B/libnetsnmphelpers.so -@unexec rm -f %B/libnetsnmphelpers.so 2> /dev/null || true +lib/libnetsnmphelpers.so.%%SHLIB_VERSION%%%%SHLIB_VERSION2%% lib/libnetsnmpmibs.a -lib/libnetsnmpmibs.la +lib/libnetsnmpmibs.so lib/libnetsnmpmibs.so.%%SHLIB_VERSION%% -@exec ln -fs libnetsnmpmibs.so.%%SHLIB_VERSION%% %B/libnetsnmpmibs.so -@unexec rm -f %B/libnetsnmpmibs.so 2> /dev/null || true +lib/libnetsnmpmibs.so.%%SHLIB_VERSION%%%%SHLIB_VERSION2%% lib/libnetsnmptrapd.a -lib/libnetsnmptrapd.la +lib/libnetsnmptrapd.so lib/libnetsnmptrapd.so.%%SHLIB_VERSION%% -@exec ln -fs libnetsnmptrapd.so.%%SHLIB_VERSION%% %B/libnetsnmptrapd.so -@unexec rm -f %B/libnetsnmptrapd.so 2> /dev/null || true +lib/libnetsnmptrapd.so.%%SHLIB_VERSION%%%%SHLIB_VERSION2%% man/man1/agentxtrap.1.gz man/man1/encode_keychange.1.gz man/man1/fixproc.1.gz