From owner-svn-ports-head@freebsd.org Wed Jan 20 20:50:27 2016 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 6546DA8A3AC; Wed, 20 Jan 2016 20:50:27 +0000 (UTC) (envelope-from pawel@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::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 1DB5E1E43; Wed, 20 Jan 2016 20:50:27 +0000 (UTC) (envelope-from pawel@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u0KKoQNr012852; Wed, 20 Jan 2016 20:50:26 GMT (envelope-from pawel@FreeBSD.org) Received: (from pawel@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u0KKoQ5s012851; Wed, 20 Jan 2016 20:50:26 GMT (envelope-from pawel@FreeBSD.org) Message-Id: <201601202050.u0KKoQ5s012851@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: pawel set sender to pawel@FreeBSD.org using -f From: Pawel Pekala Date: Wed, 20 Jan 2016 20:50:26 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r406806 - 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-head@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 20 Jan 2016 20:50:27 -0000 Author: pawel Date: Wed Jan 20 20:50:25 2016 New Revision: 406806 URL: https://svnweb.freebsd.org/changeset/ports/406806 Log: - Improve options descriptions - Switch to USES=localbase - Use options helpers Modified: head/archivers/liborange/Makefile Modified: head/archivers/liborange/Makefile ============================================================================== --- head/archivers/liborange/Makefile Wed Jan 20 20:48:43 2016 (r406805) +++ head/archivers/liborange/Makefile Wed Jan 20 20:50:25 2016 (r406806) @@ -16,17 +16,16 @@ RUN_DEPENDS= cabextract:${PORTSDIR}/arch 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 +LIBSYNCE_DESC= WinCE communication support via libsynce +LIBDYNAMITE_DESC= PKWARE data compression support via libdynamite +LIBUNSHIELD_DESC= InstallShield support via libunshield +INNO_DESC= Expermential Inno Setup support +VISE_DESC= Expermential VISE support +MSI_DESC= Expermential MSI support GNU_CONFIGURE= yes -USES= iconv libtool pathfix pkgconfig -CFLAGS+= -I${LOCALBASE}/include -LDFLAGS+= -L${LOCALBASE}/lib -lgsf-1 +USES= iconv libtool localbase pathfix pkgconfig +LIBS+= -lgsf-1 USE_LDCONFIG= yes INSTALL_TARGET= install-strip @@ -34,12 +33,15 @@ CONFIGURE_ARGS+= --with-libgsf LIBSYNCE_LIB_DEPENDS= libsynce.so:${PORTSDIR}/palm/synce-libsynce LIBSYNCE_CONFIGURE_WITH= libsynce +LIBSYNCE_VARS= REQUIRES+=libsynce LIBDYNAMITE_LIB_DEPENDS= libdynamite.so:${PORTSDIR}/archivers/libdynamite LIBDYNAMITE_CONFIGURE_WITH= libdynamite +LIBDYNAMITE_VARS= REQUIRES+=libdynamite LIBUNSHIELD_LIB_DEPENDS= libunshield.so:${PORTSDIR}/archivers/unshield LIBUNSHIELD_CONFIGURE_WITH= libunshield +LIBUNSHIELD_VARS= REQUIRES+=libunshield INNO_CONFIGURE_ENABLE= inno @@ -47,20 +49,6 @@ VISE_CONFIGURE_ENABLE= vise MSI_CONFIGURE_ENABLE= msi -.include - -.if ${PORT_OPTIONS:MLIBSYNCE} -REQUIRES+= libsynce -.endif - -.if ${PORT_OPTIONS:MLIBDYNAMITE} -REQUIRES+= libdynamite -.endif - -.if ${PORT_OPTIONS:MLIBUNSHIELD} -REQUIRES+= libunshield -.endif - post-patch: .for req in ${REQUIRES} @${REINPLACE_CMD} -e 's|${req}||' ${WRKSRC}/${PORTNAME}.pc.in