From owner-svn-ports-head@freebsd.org Thu Nov 12 17:21:10 2015 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 1DBE1A2CC9F; Thu, 12 Nov 2015 17:21:10 +0000 (UTC) (envelope-from amdmi3@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 C042A1447; Thu, 12 Nov 2015 17:21:09 +0000 (UTC) (envelope-from amdmi3@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id tACHL8O5003965; Thu, 12 Nov 2015 17:21:08 GMT (envelope-from amdmi3@FreeBSD.org) Received: (from amdmi3@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id tACHL8ZL003964; Thu, 12 Nov 2015 17:21:08 GMT (envelope-from amdmi3@FreeBSD.org) Message-Id: <201511121721.tACHL8ZL003964@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: amdmi3 set sender to amdmi3@FreeBSD.org using -f From: Dmitry Marakasov Date: Thu, 12 Nov 2015 17:21:08 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r401375 - head/print/hpijs 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: Thu, 12 Nov 2015 17:21:10 -0000 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 @@ -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