Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 20 Jan 2016 20:50:26 +0000 (UTC)
From:      Pawel Pekala <pawel@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r406806 - head/archivers/liborange
Message-ID:  <201601202050.u0KKoQ5s012851@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
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 <bsd.port.options.mk>
-
-.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



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