Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 12 Nov 2015 17:21:08 +0000 (UTC)
From:      Dmitry Marakasov <amdmi3@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r401375 - head/print/hpijs
Message-ID:  <201511121721.tACHL8ZL003964@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: amdmi3
Date: Thu Nov 12 17:21:08 2015
New Revision: 401375
URL: https://svnweb.freebsd.org/changeset/ports/401375

Log:
  - Switch to OPTIONS_SUB
  - Switch to options helpers
  - Unsilence installation

Modified:
  head/print/hpijs/Makefile

Modified: head/print/hpijs/Makefile
==============================================================================
--- head/print/hpijs/Makefile	Thu Nov 12 17:20:59 2015	(r401374)
+++ head/print/hpijs/Makefile	Thu Nov 12 17:21:08 2015	(r401375)
@@ -12,14 +12,16 @@ COMMENT=	Drivers and support resources f
 CONFLICTS=	hplip-[0-9]*
 
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=		--disable-dependency-tracking
+CONFIGURE_ARGS=	--disable-dependency-tracking
 USES=		ghostscript:run jpeg
 
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 
 OPTIONS_DEFINE=	CUPS DOCS FOOMATIC
-OPTIONS_DEFAULT=	CUPS FOOMATIC
+OPTIONS_DEFAULT=CUPS FOOMATIC
+OPTIONS_SUB=	yes
+
 FOOMATIC_DESC=	Install foomatic-rip and PPD files
 INSTALL_TARGET=	install-exec install-foomatic
 
@@ -29,21 +31,17 @@ INSTALL_TARGET=	install-exec install-foo
 CONFLICTS+=		foomatic-filters-*
 USES+=			perl5 shebangfix
 CONFIGURE_ARGS+=	--enable-foomatic-install
-PLIST_SUB+=		FOOMATIC=""
 SHEBANG_FILES=		foomatic-rip
 .else
 CONFIGURE_ARGS+=	--disable-foomatic-install
-PLIST_SUB+=		FOOMATIC="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MCUPS}
 BUILD_DEPENDS+=		cups-base>0:${PORTSDIR}/print/cups-base
 RUN_DEPENDS+=		cups-base>0:${PORTSDIR}/print/cups-base
 CONFIGURE_ARGS+=	--enable-cups-install
-PLIST_SUB+=		CUPS=""
 .else
 CONFIGURE_ARGS+=	--disable-cups-install
-PLIST_SUB+=		CUPS="@comment "
 .endif
 
 .include <bsd.port.options.mk>
@@ -58,9 +56,9 @@ do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/hpijs ${STAGEDIR}${PREFIX}/bin
 .endif
 
-post-install:
+post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
-	@${INSTALL_DATA} ${WRKSRC}/gs_hpijs.png ${STAGEDIR}${DOCSDIR}
-	@${INSTALL_DATA} ${WRKSRC}/hpijs_readme.html ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/gs_hpijs.png ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/hpijs_readme.html ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>



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