From owner-svn-ports-all@FreeBSD.ORG  Sat Oct 13 06:56:26 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 7898A4C9;
 Sat, 13 Oct 2012 06:56:26 +0000 (UTC)
 (envelope-from dinoex@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
 by mx1.freebsd.org (Postfix) with ESMTP id 61E688FC08;
 Sat, 13 Oct 2012 06:56:26 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
 by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q9D6uQQ9058776;
 Sat, 13 Oct 2012 06:56:26 GMT (envelope-from dinoex@svn.freebsd.org)
Received: (from dinoex@localhost)
 by svn.freebsd.org (8.14.4/8.14.4/Submit) id q9D6uQqd058774;
 Sat, 13 Oct 2012 06:56:26 GMT (envelope-from dinoex@svn.freebsd.org)
Message-Id: <201210130656.q9D6uQqd058774@svn.freebsd.org>
From: Dirk Meyer <dinoex@FreeBSD.org>
Date: Sat, 13 Oct 2012 06:56:26 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r305816 - head/print/cups-base
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: Sat, 13 Oct 2012 06:56:26 -0000

Author: dinoex
Date: Sat Oct 13 06:56:25 2012
New Revision: 305816
URL: http://svn.freebsd.org/changeset/ports/305816

Log:
  - fix option XPDF
  PR:		172579
  Submitted by:	Kris Moore
  Feature safe: yes
  
  - cleanup comments

Modified:
  head/print/cups-base/Makefile

Modified: head/print/cups-base/Makefile
==============================================================================
--- head/print/cups-base/Makefile	Sat Oct 13 06:38:03 2012	(r305815)
+++ head/print/cups-base/Makefile	Sat Oct 13 06:56:25 2012	(r305816)
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	cups
-# Date created:		2003-01-22
-# Whom:			Alan Eldridge <alane@geeksrus.net>
-#
+# created by: Alan Eldridge <alane@geeksrus.net>
 # $FreeBSD$
-#
 
 PORTNAME=	cups
 PORTVERSION=	1.5.2
@@ -45,6 +41,7 @@ CUPS_ETCDIR=	${PREFIX}/etc/cups
 CUPS_CACHEDIR?=	/var/db/cups
 CUPS_SPOOLDIR=	/var/spool/cups
 CUPS_SOCKET?=	/var/run/cups.sock
+CUPS_PDFTOPS?=	${LOCALBASE}/libexec/xpdf/pdftops
 WRKSRC=		${WRKDIR}/${PORTNAME}-${DISTVERSION}
 
 # file, dir ownership
@@ -155,9 +152,9 @@ USE_GHOSTSCRIPT=	yes
 CONFIGURE_ARGS+=	--enable-pdftops --with-pdftops=${LOCALBASE}/bin/gs
 PLIST_SUB+=		WITH_PDFTOPS=""
 .elif !defined(CUPS_CLIENT) && !defined(CUPS_IMAGE) && ${PORT_OPTIONS:MXPDF}
-BUILD_DEPENDS+=		pdftops:${PORTSDIR}/graphics/xpdf
-RUN_DEPENDS+=		pdftops:${PORTSDIR}/graphics/xpdf
-CONFIGURE_ARGS+=	--enable-pdftops --with-pdftops=${LOCALBASE}/libexec/xpdf/pdftops
+BUILD_DEPENDS+=		${CUPS_PDFTOPS}:${PORTSDIR}/graphics/xpdf
+RUN_DEPENDS+=		${CUPS_PDFTOPS}:${PORTSDIR}/graphics/xpdf
+CONFIGURE_ARGS+=	--enable-pdftops --with-pdftops=${CUPS_PDFTOPS}
 PLIST_SUB+=		WITH_PDFTOPS=""
 .else
 PLIST_SUB+=		WITH_PDFTOPS="@comment "