From owner-svn-ports-all@FreeBSD.ORG Sat Dec 29 23:00:18 2012 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 84B2CE7; Sat, 29 Dec 2012 23:00:18 +0000 (UTC) (envelope-from bapt@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 5FDE88FC0A; Sat, 29 Dec 2012 23:00:18 +0000 (UTC) Received: from svn.freebsd.org (svn.FreeBSD.org [8.8.178.70]) by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qBTN0IdY067072; Sat, 29 Dec 2012 23:00:18 GMT (envelope-from bapt@svn.freebsd.org) Received: (from bapt@localhost) by svn.freebsd.org (8.14.5/8.14.5/Submit) id qBTN0IeC067071; Sat, 29 Dec 2012 23:00:18 GMT (envelope-from bapt@svn.freebsd.org) Message-Id: <201212292300.qBTN0IeC067071@svn.freebsd.org> From: Baptiste Daroussin Date: Sat, 29 Dec 2012 23:00:18 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r309639 - head/archivers/liborange 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.14 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: Sat, 29 Dec 2012 23:00:18 -0000 Author: bapt Date: Sat Dec 29 23:00:17 2012 New Revision: 309639 URL: http://svnweb.freebsd.org/changeset/ports/309639 Log: - Convert to new options framework - Add an explicit built dependency on pkgconf - Trim headers PR: ports/173808 Submitted by: Chris Petrik Approved by: maintainer timeout (1 month) Modified: head/archivers/liborange/Makefile Modified: head/archivers/liborange/Makefile ============================================================================== --- head/archivers/liborange/Makefile Sat Dec 29 22:43:30 2012 (r309638) +++ head/archivers/liborange/Makefile Sat Dec 29 23:00:17 2012 (r309639) @@ -1,9 +1,5 @@ -# New ports collection makefile for: orange -# Date Created: January 2005 -# Whom: Sam Lawrance -# +# Created by: Sam Lawrance # $FreeBSD$ -# PORTNAME= liborange PORTVERSION= 0.4 @@ -16,18 +12,21 @@ COMMENT= Library to extract CAB files fr 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 USE_AUTOTOOLS= libtool GNU_CONFIGURE= yes USE_GNOME= gnomehack +ISE_PKGCONFIG= build USE_ICONV= yes CFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib @@ -35,9 +34,9 @@ USE_LDCONFIG= yes MAN1= orange.1 -.include +.include -.if !defined(WITH_LIBSYNCE) +.if ${PORT_OPTIONS:MLIBSYNCE} CONFIGURE_ARGS+= --without-libsynce REQUIRES+= libsynce .else @@ -45,31 +44,31 @@ LIB_DEPENDS+= synce.0:${PORTSDIR}/palm/ 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 @@ -79,4 +78,4 @@ post-patch: @${REINPLACE_CMD} -e 's|${req}||' ${WRKSRC}/${PORTNAME}.pc.in .endfor -.include +.include