Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 21 Nov 2012 22:55:08 GMT
From:      Chris Petrik <c.petrik.sosa@gmail.com>
To:        freebsd-gnats-submit@FreeBSD.org
Subject:   ports/173808: [PATCH] archivers/liborange optionsng
Message-ID:  <201211212255.qALMt8Ft029366@red.freebsd.org>
Resent-Message-ID: <201211212300.qALN00Ft042907@freefall.freebsd.org>

next in thread | raw e-mail | index | archive | help

>Number:         173808
>Category:       ports
>Synopsis:       [PATCH] archivers/liborange optionsng
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Wed Nov 21 23:00:00 UTC 2012
>Closed-Date:
>Last-Modified:
>Originator:     Chris Petrik
>Release:        
>Organization:
na
>Environment:
>Description:
Options NG Changes
>How-To-Repeat:

>Fix:


Patch attached with submission follows:

Index: liborange/Makefile
===================================================================
--- liborange/Makefile	(revision 305486)
+++ liborange/Makefile	(working copy)
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	orange
-# Date Created:				January 2005
-# Whom:					Sam Lawrance <boris@brooknet.com.au>
-#
+# Created by: Sam Lawrance <boris@brooknet.com.au>
 # $FreeBSD$
-#
 
 PORTNAME=	liborange
 PORTVERSION=	0.4
@@ -16,12 +12,14 @@
 RUN_DEPENDS=	cabextract:${PORTSDIR}/archivers/cabextract \
 		unzip:${PORTSDIR}/archivers/unzip
 
-OPTIONS=	LIBSYNCE	"Build with libsynce support"			on \
-		LIBDYNAMITE	"Build with libdynamite support"		on \
-		LIBUNSHIELD	"Build with libunshield support"		on \
-		INNO		"Build with expermential Inno Setup support"	off \
-		VISE		"Build with expermential VISE support"		off \
-		MSI		"Build with expermential MSI support"		off
+OPTIONS_DEFINE=	LIBSYNCE LIBDYNAMITE LIBUNSHIELD INNO VISE MSI
+OPTIONS_DEFAULT=	LIBSYNCE LIBDYNAMITE LIBUNSHIELD
+LIBSYNCE_DESC=		Build with libsynce support
+LIBDYNAMITE_DESC=	Build with libdynamite support
+LIBUNSHIELD_DESC=	Build with libunshield support
+INNO_DESC=		Build with expermential Inno Setup support
+VISE_DESC=		Build with expermential VISE support
+MSI_DESC=		Build with expermential MSI support
 
 MAKE_JOBS_SAFE=	yes
 
@@ -37,7 +35,7 @@
 
 .include <bsd.port.pre.mk>
 
-.if !defined(WITH_LIBSYNCE)
+.if ${PORT_OPTIONS:MLIBSYNCE}
 CONFIGURE_ARGS+=	--without-libsynce
 REQUIRES+=	libsynce
 .else
@@ -45,31 +43,31 @@
 CONFIGURE_ARGS+=	--with-libsynce
 .endif
 
-.if !defined(WITH_LIBDYNAMITE)
+.if ${PORT_OPTIONS:MLIBDYNAMITE}
 CONFIGURE_ARGS+=	--without-libdynamite
 REQUIRES+=	libdynamite
 .else
-LIB_DEPENDS+=		dynamite.0:${PORTSDIR}/archivers/libdynamite
+LIB_DEPENDS+=		dynamite:${PORTSDIR}/archivers/libdynamite
 CONFIGURE_ARGS+=	--with-libdynamite
 .endif
 
-.if !defined(WITH_LIBUNSHIELD)
+.if ${PORT_OPTIONS:MLIBUNSHIELD}
 CONFIGURE_ARGS+=	--without-libunshield
 REQUIRES+=	libunshield
 .else
-LIB_DEPENDS+=		unshield.0:${PORTSDIR}/archivers/unshield
+LIB_DEPENDS+=		unshield:${PORTSDIR}/archivers/unshield
 CONFIGURE_ARGS+=	--with-libunshield
 .endif
 
-.if defined(WITH_INNO)
+.if ${PORT_OPTIONS:MINNO}
 CONFIGURE_ARGS+=	--enable-inno
 .endif
 
-.if defined(WITH_VISE)
+.if ${PORT_OPTIONS:MVISE}
 CONFIGURE_ARGS+=	--enable-vise
 .endif
 
-.if defined(WITH_MSI)
+.if ${PORT_OPTIONS:MMSI}
 CONFIGURE_ARGS+=	--enable-msi --with-libgsf
 LIB_DEPENDS+=		gsf-1.114:${PORTSDIR}/devel/libgsf
 .endif


>Release-Note:
>Audit-Trail:
>Unformatted:



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201211212255.qALMt8Ft029366>