Attachment 128572 Details for Bug 172438 – xorp-devel-2009120801_1.patch

[patch] xorp-devel-2009120801_1.patch

xorp-devel-2009120801_1.patch (text/plain), 3.41 KB, created by Michael Gmelin on 2012-10-07 05:20:21 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Michael Gmelin

Created: 2012-10-07 05:20:21 UTC

Size: 3.41 KB

patch

obsolete

>diff -ruN --exclude=CVS ../xorp-devel.orig/Makefile ./Makefile
>--- ../xorp-devel.orig/Makefile	2012-10-06 23:34:45.058995344 +0200
>+++ ./Makefile	2012-10-07 01:53:17.535414274 +0200
>@@ -1,42 +1,39 @@
>-# New ports collection makefile for:	xorp
>-# Date created:		22nd September 2006
>-# Whom:			Bruce M Simpson <bms@FreeBSD.org>
>-#
>-# $FreeBSD: ports/net/xorp-devel/Makefile,v 1.6 2011/11/01 20:46:06 dougb Exp $
>-#
>+# Created by: Bruce M Simpson <bms@FreeBSD.org>
>+# $FreeBSD: $
> 
>-PORTNAME=	xorp-devel
>-PORTVERSION=	2009120801
>-PORTREVISION=	1
>-CATEGORIES=	net
>-MASTER_SITES=	${MASTER_SITE_LOCAL}
>+PORTNAME=		xorp-devel
>+PORTVERSION=		2009120801
>+PORTREVISION=		1
>+CATEGORIES=		net
>+MASTER_SITES=		${MASTER_SITE_LOCAL}
> MASTER_SITE_SUBDIR=	bms
>-DISTNAME=	xorp-${PORTVERSION}
>+DISTNAME=		xorp-${PORTVERSION}
> 
>-MAINTAINER=	ports@FreeBSD.org
>-COMMENT=	Open source network routing platform, development branch
>+MAINTAINER=		ports@FreeBSD.org
>+COMMENT=		Open source network routing platform, development branch
> 
> # Uses libcurses, libcrypto, librt from base system.
>-BUILD_DEPENDS=	${LOCALBASE}/include/boost/version.hpp:${PORTSDIR}/devel/boost-libs
>-LIB_DEPENDS=	boost_regex.4:${PORTSDIR}/devel/boost-libs \
>-		pcap.1:${PORTSDIR}/net/libpcap
>-
>-CONFLICTS=	xorp-1*
>-
>-NOMAN=		defined
>-
>-USE_BZIP2=	yes
>-USE_GCC=	4.2+
>-USE_SCONS=	yes
>-#USE_OPENSSL=	yes
>-MAKE_JOBS_SAFE=	defined
>-
>-OPTIONS=								\
>-	    OPTIMIZE	 "Build with optimization" On			\
>-	    ORIGIN	 "Use ORIGIN with shared libraries" On		\
>-	    SHARED	 "Build with shared libraries" On		\
>-	    STRIP	 "Strip binaries before installing" On		\
>-	    TCP_RPC	 "Use TCP as RPC transport (defaults to AF_LOCAL)" Off
>+BUILD_DEPENDS=		${LOCALBASE}/include/boost/version.hpp:${PORTSDIR}/devel/boost-libs
>+LIB_DEPENDS=		boost_regex.4:${PORTSDIR}/devel/boost-libs \
>+			pcap.1:${PORTSDIR}/net/libpcap
>+
>+CONFLICTS=		xorp-1*
>+
>+NOMAN=			defined
>+
>+USE_BZIP2=		yes
>+USE_GCC=		4.2+
>+USE_SCONS=		yes
>+#USE_OPENSSL=		yes
>+MAKE_JOBS_SAFE=		defined
>+
>+OPTIONS_DEFINE=		OPTIMIZE ORIGIN SHARED STRIP TCP_RPC
>+OPTIONS_DEFAULT=	OPTIMIZE ORIGIN SHARED STRIP
>+OPTIMIZE_DESC=		Build with optimization
>+ORIGIN_DESC=		Use ORIGIN with shared libraries
>+SHARED_DESC=		Build with shared libraries
>+STRIP_DESC=		Strip binaries before installing
>+TCP_RPC_DESC=		Use TCP as RPC transport (defaults to AF_LOCAL)
> 
> #
> # To roll snapshot: as bms: make BOOTSTRAP=defined fetch
>@@ -57,40 +54,40 @@
> .endif
> .endif # defined(BOOTSTRAP)
> 
>-.include <bsd.port.pre.mk>
>+.include <bsd.port.options.mk>
> 
> XORP_GROUP=	xorp
> USE_RC_SUBR=	xorp
> 
> SCONS_ARGS+=	prefix=${PREFIX}
> 
>-.if defined(WITHOUT_OPTIMIZE)
>+.if !${PORT_OPTIONS:MOPTIMIZE}
> SCONS_ARGS+=	optimize=no
> .else
> SCONS_ARGS+=	optimize=yes
> .endif
> 
>-.if defined(WITHOUT_SHARED)
>+.if !${PORT_OPTIONS:MSHARED}
> SCONS_ARGS+=	shared=false
> PLIST_SUB+=	XORP_SHLIB="@comment "
> .else
> SCONS_ARGS+=	shared=true
> PLIST_SUB+=	XORP_SHLIB=""
> USE_LDCONFIG=	${PREFIX}/lib/xorp/lib
>-. if defined (WITHOUT_ORIGIN)
>+.if !${PORT_OPTIONS:MORIGIN}
> SCONS_ARGS+=	origin=false
> . else
> SCONS_ARGS+=	origin=true
> . endif
> .endif
> 
>-.if defined(WITHOUT_STRIP)
>+.if !${PORT_OPTIONS:MSTRIP}
> SCONS_ARGS+=	strip=false
> .else
> SCONS_ARGS+=	strip=true
> .endif
> 
>-.if defined(WITH_TCP_RPC)
>+.if ${PORT_OPTIONS:MTCP_RPC}
> SCONS_ARGS+=	transport=tcp
> .else
> SCONS_ARGS+=	transport=local
>@@ -103,4 +100,4 @@
> post-install:
> 	${SETENV} ${SCRIPTS_ENV} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
> 
>-.include <bsd.port.post.mk>
>+.include <bsd.port.mk>

Actions: View | Diff

Attachments on bug 172438: 128572