From owner-svn-ports-all@FreeBSD.ORG  Thu Dec  6 10:57:15 2012
Return-Path: <owner-svn-ports-all@FreeBSD.ORG>
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 A7EE3CA0;
 Thu,  6 Dec 2012 10:57:15 +0000 (UTC)
 (envelope-from rene@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 8A22A8FC08;
 Thu,  6 Dec 2012 10:57:15 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qB6AvFhp024935;
 Thu, 6 Dec 2012 10:57:15 GMT (envelope-from rene@svn.freebsd.org)
Received: (from rene@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id qB6AvFUH024934;
 Thu, 6 Dec 2012 10:57:15 GMT (envelope-from rene@svn.freebsd.org)
Message-Id: <201212061057.qB6AvFUH024934@svn.freebsd.org>
From: Rene Ladan <rene@FreeBSD.org>
Date: Thu, 6 Dec 2012 10:57:15 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r308380 - 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-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 06 Dec 2012 10:57:15 -0000

Author: rene
Date: Thu Dec  6 10:57:14 2012
New Revision: 308380
URL: http://svnweb.freebsd.org/changeset/ports/308380

Log:
  - Convert to optionsNG (fold two same-condition blocks into one while here)
  - Strip library version numbers
  Feature safe:	yes

Modified:
  head/print/hpijs/Makefile   (contents, props changed)

Modified: head/print/hpijs/Makefile
==============================================================================
--- head/print/hpijs/Makefile	Thu Dec  6 10:36:50 2012	(r308379)
+++ head/print/hpijs/Makefile	Thu Dec  6 10:57:14 2012	(r308380)
@@ -9,7 +9,7 @@ MASTER_SITES=	SF/hpinkjet/${PORTNAME}/${
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Drivers and support resources for HP Inkjet Printers
 
-LIB_DEPENDS=	jpeg.11:${PORTSDIR}/graphics/jpeg
+LIB_DEPENDS=	jpeg:${PORTSDIR}/graphics/jpeg
 
 CONFLICTS=	hplip-[0-9]*
 
@@ -21,25 +21,16 @@ WANT_PERL=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 
-OPTIONS=	CUPS		"install support for cups" on \
-		FOOMATIC	"install foomatic-rip and ppd files" on
+OPTIONS_DEFINE=	CUPS DOCS FOOMATIC
+OPTIONS_DEFAULT=	CUPS FOOMATIC
+FOOMATIC_DESC=	Install foomatic-rip and PPD files
 
 .include <bsd.port.pre.mk>
 
-.if defined(WITH_CUPS) || defined(WITH_FOOMATIC)
-CONFLICTS+=	foomatic-filters-*
-.endif
-
-.if !defined(WITHOUT_CUPS)
-LIB_DEPENDS+=		cups.2:${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>
 
-.if !defined(WITHOUT_FOOMATIC) || !defined(WITHOUT_CUPS)
+.if ${PORT_OPTIONS:MCUPS} || ${PORT_OPTIONS:MFOOMATIC}
+CONFLICTS+=		foomatic-filters-*
 USE_PERL5=		true
 CONFIGURE_ARGS+=	--enable-foomatic-install
 PLIST_SUB+=		FOOMATIC=""
@@ -48,12 +39,21 @@ CONFIGURE_ARGS+=	--disable-foomatic-inst
 PLIST_SUB+=		FOOMATIC="@comment "
 .endif
 
+.if ${PORT_OPTIONS:MCUPS}
+LIB_DEPENDS+=		cups:${PORTSDIR}/print/cups-base
+CONFIGURE_ARGS+=	--enable-cups-install
+PLIST_SUB+=		CUPS=""
+.else
+CONFIGURE_ARGS+=	--disable-cups-install
+PLIST_SUB+=		CUPS="@comment "
+.endif
+
 post-patch:
 	@${REINPLACE_CMD} -e 's|/usr/local/share/cups|${LOCALBASE}/share/cups|g ; \
 		s|/usr/lib/cups/filter|${LOCALBASE}/libexec/cups/filter|g' \
 			${WRKSRC}/configure
 
-.if defined(WITHOUT_CUPS) && defined(WITHOUT_FOOMATIC)
+.if empty(PORT_OPTIONS:MCUPS) && empty(PORT_OPTIONS:MFOOMATIC)
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/hpijs ${PREFIX}/bin
 .else
@@ -61,11 +61,11 @@ INSTALL_TARGET=	install-exec install-foo
 .endif
 
 post-install:
-.if !defined(WITHOUT_CUPS)
+.if ${PORT_OPTIONS:MCUPS}
 	@${LN} -s ${PREFIX}/bin/foomatic-rip ${LOCALBASE}/libexec/cups/filter/foomatic-rip
 	@${LN} -s ${PREFIX}/share/ppd ${LOCALBASE}/share/cups/model/foomatic-ppds
 .endif
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 	@${MKDIR} ${DOCSDIR}
 	@${INSTALL_DATA} ${WRKSRC}/gs_hpijs.png ${DOCSDIR}
 	@${INSTALL_DATA} ${WRKSRC}/hpijs_readme.html ${DOCSDIR}