From owner-svn-ports-all@freebsd.org Sun Feb 19 06:45:11 2017 Return-Path: Delivered-To: svn-ports-all@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 A7719CE59EB; Sun, 19 Feb 2017 06:45:11 +0000 (UTC) (envelope-from cy@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 5EE98199C; Sun, 19 Feb 2017 06:45:11 +0000 (UTC) (envelope-from cy@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v1J6jAjQ044134; Sun, 19 Feb 2017 06:45:10 GMT (envelope-from cy@FreeBSD.org) Received: (from cy@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v1J6jAQ1044133; Sun, 19 Feb 2017 06:45:10 GMT (envelope-from cy@FreeBSD.org) Message-Id: <201702190645.v1J6jAQ1044133@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: cy set sender to cy@FreeBSD.org using -f From: Cy Schubert Date: Sun, 19 Feb 2017 06:45:10 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r434395 - head/print/apsfilter 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.23 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 19 Feb 2017 06:45:11 -0000 Author: cy Date: Sun Feb 19 06:45:10 2017 New Revision: 434395 URL: https://svnweb.freebsd.org/changeset/ports/434395 Log: Revert r421265. hplip is not a drop-in replacement for hpijs. Pointy hat to: cy (yours truly) Discovered by: cy Modified: head/print/apsfilter/Makefile Modified: head/print/apsfilter/Makefile ============================================================================== --- head/print/apsfilter/Makefile Sun Feb 19 02:31:56 2017 (r434394) +++ head/print/apsfilter/Makefile Sun Feb 19 06:45:10 2017 (r434395) @@ -3,7 +3,7 @@ PORTNAME= apsfilter PORTVERSION= 7.2.8 -PORTREVISION= 17 +PORTREVISION= 18 CATEGORIES= print MASTER_SITES= http://www.apsfilter.org/download/ DIST_SUBDIR= apsfilter @@ -16,9 +16,8 @@ LICENSE_NAME= Postcard License LICENSE_FILE= ${WRKSRC}/LICENSE LICENSE_PERMS= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept -BROKEN= wrong run depends - -RUN_DEPENDS= bash:shells/bash +RUN_DEPENDS= bash:shells/bash \ + hpijs:print/hpijs USES= tar:bzip2 USE_SUBMAKE= yes @@ -29,10 +28,9 @@ SUB_FILES= pkg-message OPTIONS_DEFINE=DOCS X11 GS PSUTILS ASCII CONVERT DVIPS FIG2DEV HTML2PS \ ATALK SAMBA COMPRESS MP3 OGG WAV -OPTIONS_DEFAULT=X11 GS PSUTILS ASCII CONVERT A4 HPLIP -OPTIONS_SINGLE=PAPERSIZE HP_SUPPORT +OPTIONS_DEFAULT=X11 GS PSUTILS ASCII CONVERT A4 +OPTIONS_SINGLE=PAPERSIZE OPTIONS_SINGLE_PAPERSIZE=A4 LETTER LETTERDJ -OPTIONS_SINGLE_HP_SUPPORT=HPIJS HPLIP NO_OPTIONS_SORT=yes PAPERSIZE_DESC= papersize A4_DESC= A4 papersize @@ -48,9 +46,6 @@ HTML2PS_DESC= HTML documents ATALK_DESC= remote printing on AppleTalk remote printer SAMBA_DESC= remote printing on Windows remote printer COMPRESS_DESC= print compressed documents -HP_SUPPORT_DESC= HP Print Support -HPIJS_DESC= Depend on hpijs port -HPLIP_DESC= Depend on hplip port DOCS_MAKE_ARGS= -DDOCS PORTDOCS= ANNOUNCE FAQ HOWTO-BUGREPORTS apsfilter4.png \ @@ -81,11 +76,6 @@ PSUFX= -letter .elif !empty(PORT_OPTIONS:MLETTERDJ) PSUFX= -letterdj .endif -.if !empty(PORT_OPTIONS:MHPIJS) -RUN_DEPENDS+= hpijs:print/hpijs -.elif !empty(PORT_OPTIONS:MHPLIP) -RUN_DEPENDS+= hpijs:print/hplip -.endif _DEPENDS_ASCII= a2ps:print/a2ps \ enscript:print/enscript${PSUFX} \