Attachment 165650 Details for Bug 206304 – Patch to make libpkg support optional

[patch] Patch to make libpkg support optional

net-snmp-optionalize-libpkg.diff (text/plain), 3.03 KB, created by Adam McDougall on 2016-01-16 04:43:15 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Adam McDougall

Created: 2016-01-16 04:43:15 UTC

Size: 3.03 KB

patch

obsolete

>diff -urN net-snmp.orig/Makefile net-snmp/Makefile
>--- net-snmp/Makefile	2016-01-15 21:44:29.083503486 -0500
>+++ net-snmp/Makefile	2016-01-15 22:25:59.380332028 -0500
>@@ -3,7 +3,7 @@
> 
> PORTNAME=	snmp
> PORTVERSION=	5.7.3
>-PORTREVISION=	11
>+PORTREVISION=	12
> CATEGORIES=	net-mgmt ipv6
> MASTER_SITES=	SF/net-${PORTNAME}/net-${PORTNAME}/${PORTVERSION}
> PKGNAMEPREFIX=	net-
>@@ -16,8 +16,8 @@
> LICENSE_FILE=	${WRKSRC}/COPYING
> 
> OPTIONS_DEFINE=	IPV6 MFD_REWRITES PERL PERL_EMBEDDED PYTHON DUMMY TKMIB \
>-		MYSQL AX_SOCKONLY UNPRIVILEGED SMUX DOCS JAIL
>-OPTIONS_DEFAULT=IPV6 PERL PERL_EMBEDDED DUMMY SMUX
>+		MYSQL AX_SOCKONLY UNPRIVILEGED SMUX DOCS JAIL LIBPKG
>+OPTIONS_DEFAULT=IPV6 PERL PERL_EMBEDDED DUMMY SMUX LIBPKG
> 
> MFD_REWRITES_DESC=	Build with 64-bit Interface Counters
> PERL_EMBEDDED_DESC=	Build embedded perl
>@@ -28,6 +28,7 @@
> UNPRIVILEGED_DESC=	Allow unprivileged users to execute net-snmp
> SMUX_DESC=		Build with SNMP multiplexing (SMUX) support
> JAIL_DESC=		Options for running snmpd within a jail(8)
>+LIBPKG_DESC=		Integrate with libpkg
> 
> MAKE_JOBS_UNSAFE=	yes
> 
>@@ -187,6 +188,10 @@
> CONFIGURE_ARGS+=--with-out-mib-modules="${NET_SNMP_WITHOUT_MIB_MODULE_LIST}"
> .endif
> 
>+.if ${PORT_OPTIONS:MLIBPKG}
>+EXTRA_PATCHES+=	${PATCHDIR}/extra-patch-agent_Makefile.in
>+.endif
>+
> BIN_FILES=	snmpbulkwalk snmpget snmpgetnext snmpset \
> 		snmpstatus snmptest snmptranslate snmptrap snmpwalk \
> 		snmptable snmpbulkget snmpdelta snmpdf agentxtrap \
>diff -urN net-snmp.orig/files/extra-patch-agent_Makefile.in net-snmp/files/extra-patch-agent_Makefile.in
>--- net-snmp/files/extra-patch-agent_Makefile.in	1969-12-31 19:00:00.000000000 -0500
>+++ net-snmp/files/extra-patch-agent_Makefile.in	2016-01-15 21:42:33.664511986 -0500
>@@ -0,0 +1,11 @@
>+--- agent/Makefile.in.orig	2015-01-19 16:46:08 UTC
>++++ agent/Makefile.in
>+@@ -120,7 +120,7 @@ LMIBLIBS	= @LMIBLIBS@
>+ VAL_LIBS	= @VAL_LIBS@
>+ PERLLDOPTS_FOR_APPS = @PERLLDOPTS_FOR_APPS@
>+ PERLLDOPTS_FOR_LIBS = @PERLLDOPTS_FOR_LIBS@
>+-LIBS		= $(USELIBS) @AGENTLIBS@ $(PERLLDOPTS_FOR_APPS) $(VAL_LIBS)
>++LIBS		= $(USELIBS) @AGENTLIBS@ $(PERLLDOPTS_FOR_APPS) $(VAL_LIBS) -lpkg
>+ OUR_AGENT_LIBS	= $(AGENTLIB) $(MIBLIB) $(LIBS) @DLLIBS@
>+ CPPFLAGS	= $(TOP_INCLUDES) -I. $(AGENT_INCLUDES) $(MIBGROUP_INCLUDES) \
>+ 		  $(SNMPLIB_INCLUDES) @CPPFLAGS@ 
>diff -urN net-snmp.orig/files/patch-agent_Makefile.in net-snmp/files/patch-agent_Makefile.in
>--- net-snmp/files/patch-agent_Makefile.in	2016-01-15 21:42:51.674507963 -0500
>+++ net-snmp/files/patch-agent_Makefile.in	1969-12-31 19:00:00.000000000 -0500
>@@ -1,11 +0,0 @@
>---- agent/Makefile.in.orig	2015-01-19 16:46:08 UTC
>-+++ agent/Makefile.in
>-@@ -120,7 +120,7 @@ LMIBLIBS	= @LMIBLIBS@
>- VAL_LIBS	= @VAL_LIBS@
>- PERLLDOPTS_FOR_APPS = @PERLLDOPTS_FOR_APPS@
>- PERLLDOPTS_FOR_LIBS = @PERLLDOPTS_FOR_LIBS@
>--LIBS		= $(USELIBS) @AGENTLIBS@ $(PERLLDOPTS_FOR_APPS) $(VAL_LIBS)
>-+LIBS		= $(USELIBS) @AGENTLIBS@ $(PERLLDOPTS_FOR_APPS) $(VAL_LIBS) -lpkg
>- OUR_AGENT_LIBS	= $(AGENTLIB) $(MIBLIB) $(LIBS) @DLLIBS@
>- CPPFLAGS	= $(TOP_INCLUDES) -I. $(AGENT_INCLUDES) $(MIBGROUP_INCLUDES) \
>- 		  $(SNMPLIB_INCLUDES) @CPPFLAGS@

Actions: View | Diff

Attachments on bug 206304: 165650 | 165651 | 165652 | 167342