From owner-freebsd-ports-bugs@FreeBSD.ORG Wed May 24 10:30:17 2006 Return-Path: X-Original-To: freebsd-ports-bugs@hub.freebsd.org Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id BA38F16A429 for ; Wed, 24 May 2006 10:30:17 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 04FCF43D4C for ; Wed, 24 May 2006 10:30:17 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.13.4/8.13.4) with ESMTP id k4OAUGYA033825 for ; Wed, 24 May 2006 10:30:16 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.13.4/8.13.4/Submit) id k4OAUGNL033824; Wed, 24 May 2006 10:30:16 GMT (envelope-from gnats) Resent-Date: Wed, 24 May 2006 10:30:16 GMT Resent-Message-Id: <200605241030.k4OAUGNL033824@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Sergey Akifyev Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id C463816A421 for ; Wed, 24 May 2006 10:30:08 +0000 (UTC) (envelope-from asa@agava.mipt.ru) Received: from agava.mipt.ru (ofc2.agava.net [81.5.88.62]) by mx1.FreeBSD.org (Postfix) with ESMTP id 02ABE43D4C for ; Wed, 24 May 2006 10:30:08 +0000 (GMT) (envelope-from asa@agava.mipt.ru) Received: by agava.mipt.ru (Postfix, from userid 1076) id AA660C9C175; Wed, 24 May 2006 14:30:29 +0400 (MSD) Message-Id: <20060524103029.AA660C9C175@agava.mipt.ru> Date: Wed, 24 May 2006 14:30:29 +0400 (MSD) From: Sergey Akifyev To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: Subject: ports/97783: [maintainer] update CUPS metaport to 1.2.0 X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: Sergey Akifyev List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 24 May 2006 10:30:17 -0000 >Number: 97783 >Category: ports >Synopsis: [maintainer] update CUPS metaport to 1.2.0 >Confidential: no >Severity: non-critical >Priority: medium >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Wed May 24 10:30:16 GMT 2006 >Closed-Date: >Last-Modified: >Originator: Sergey Akifyev >Release: FreeBSD 6.1-RELEASE i386 >Organization: AGAVA Software Ltd. >Environment: XXX >Description: Update CUPS metaport to 1.2.0 The reason I'm keeping this (while removing cups-lpr) is to automatically install cups-pstoraster port with CUPS, because most printers, that users have, are non-postscript. This is dependent on my previous PR. >How-To-Repeat: N/A >Fix: --- cups.diff begins here --- diff -ruN cups.orig/Makefile cups/Makefile --- cups.orig/Makefile Thu May 18 11:02:56 2006 +++ cups/Makefile Wed May 24 14:08:01 2006 @@ -8,9 +8,7 @@ # PORTNAME= cups -PORTVERSION= ${CUPS_PORTVER} -PORTREVISION= ${CUPS_PORTREV} -PORTEPOCH= ${CUPS_PORTEPOCH} +PORTVERSION= 1.2.0 CATEGORIES= print MASTER_SITES= # empty DISTFILES= # empty @@ -19,23 +17,17 @@ MAINTAINER= asa@agava.com COMMENT= The Common UNIX Printing System: Metaport to install complete system -LIB_DEPENDS+= cups.2:${PORTSDIR}/print/cups-base -RUN_DEPENDS+= espgs:${PORTSDIR}/print/cups-pstoraster \ - ${LOCALBASE}/sbin/cupsaddsmb:${PORTSDIR}/print/cups-lpr - .if make(package) DEPENDS_TARGET="package" .endif # make(package) -USE_PERL5= yes +LIB_DEPENDS+= cups.2:${PORTSDIR}/print/cups-base +RUN_DEPENDS+= espgs:${PORTSDIR}/print/cups-pstoraster + NO_BUILD= true -do-patch: - ${DO_NADA} +do-build: do-install: - ${DO_NADA} -.include "${.CURDIR}/../../print/cups/Makefile.common" -.include -.include +.include diff -ruN cups.orig/Makefile.common cups/Makefile.common --- cups.orig/Makefile.common Thu May 18 11:02:56 2006 +++ cups/Makefile.common Thu Jan 1 03:00:00 1970 @@ -1,93 +0,0 @@ -# ex:ts=8 -*-mode: makefile-*- -# Common file for CUPS ports -# $FreeBSD: ports/print/cups/Makefile.common,v 1.24 2006/01/09 16:34:18 novel Exp $ - -CUPS_MASTER_SITES=\ - ftp://ftp.funet.fi/pub/mirrors/ftp.easysw.com/pub/cups/${CUPS_VERSION}/ \ - ftp://ftp.ntua.gr/pub/gnu/cups/${CUPS_VERSION}/ \ - ftp://ftp.easysw.com/pub/cups/${CUPS_VERSION}/ \ - ftp://ftp.fisek.com.tr/pub/cups/${CUPS_VERSION}/ \ - ftp://ftp.mpg.goe.ni.schule.de/pub/internet/printing/cups/${CUPS_VERSION}/ - -CUPS_VERSION= 1.1.23 -CUPS_REVISION= 0 -CUPS_PORTVER= ${CUPS_VERSION}.${CUPS_REVISION} -CUPS_PORTREV= 1 -CUPS_PORTEPOCH= 0 -CUPS_FILESDIR= ${.CURDIR}/../../print/cups/files -CUPS_ETCDIR= ${PREFIX}/etc/cups -CUPS_RCDIR= ${PREFIX}/etc/rc.d -CUPS_DOCSDIR= ${PREFIX}/share/doc/cups -CUPS_SPOOLDIR= /var/spool/cups - -# file, dir ownership -CUPSGRP= daemon -CUPSOWN= root - -###################################################################### -# The rest of the file is for components (cups-base, cups-lpr) only. -###################################################################### - -.if ${PORTNAME} == "cups-base" || ${PORTNAME} == "cups-lpr" - -MANLANG= "" es fr - -.if ${CUPS_REVISION} < 1 -DISTNAME= cups-${CUPS_VERSION}-source -.else -DISTNAME= cups-${CUPS_VERSION}-${CUPS_REVISION}-source -.endif # ${CUPS_REVISION} < 1 - -DISTFILES= ${DISTNAME}.tar.bz2 - -MD5_FILE= ${.CURDIR}/../../print/cups/distinfo -WRKSRC= ${WRKDIR}/cups-${CUPS_VERSION} - -LIB_DEPENDS+= jpeg.9:${PORTSDIR}/graphics/jpeg \ - png.5:${PORTSDIR}/graphics/png \ - tiff.4:${PORTSDIR}/graphics/tiff - -.if defined(WITH_PHP) -CONFIGURE_ARGS+= --with-php -RUN_DEPENDS+= php:${PORTSDIR}/lang/php4 -.endif - -.if defined(WITH_PYTHON) -CONFIGURE_ARGS+= --with-python -USE_PYTHON= yes -.endif - -.if defined(WITH_CUPS_LIBPAPER) -CONFIGURE_ARGS+= --enable-libpaper -LIB_DEPENDS+= paper.2:${PORTSDIR}/print/libpaper -.endif - -USE_BZIP2= yes -USE_GMAKE= yes -USE_PERL5_RUN= yes -GNU_CONFIGURE= yes - -CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} - -CONFIGURE_ARGS+= --localstatedir=/var \ - --disable-pam \ - --disable-slp \ - --with-cups-user=${CUPSOWN} \ - --with-cups-group=${CUPSGRP} \ - --with-docdir=${CUPS_DOCSDIR} \ - --with-rcdir=${CUPS_RCDIR} - -.if !defined(WITHOUT_GNUTLS) -CONFIGURE_ARGS+= --enable-gnutls --disable-openssl -LIB_DEPENDS+= gnutls-openssl.15:${PORTSDIR}/security/gnutls -.endif - -CONFIGURE_ARGS+= CPPFLAGS="-I.. -I${LOCALBASE}/include" -CONFIGURE_ARGS+= DSOFLAGS="-Wl,-rpath,${PREFIX}/lib -L${PREFIX}/lib" -CONFIGURE_ARGS+= LDFLAGS="-L${LOCALBASE}/lib" - -pre-configure:: - @${ECHO_MSG} Configuring CUPS with options: - @${ECHO_MSG} ${CONFIGURE_ARGS} | fmt - -.endif # ${PORTNAME} != "cups" diff -ruN cups.orig/pkg-descr cups/pkg-descr --- cups.orig/pkg-descr Thu May 18 11:02:56 2006 +++ cups/pkg-descr Wed May 24 14:07:38 2006 @@ -19,7 +19,4 @@ port. WWW: http://www.cups.org/ - -- AlanE (maintainer) -alane@freebsd.org, ports@geeksrus.net [original text by greid@ukug.uk.freebsd.org] diff -ruN cups.orig/pkg-message cups/pkg-message --- cups.orig/pkg-message Thu May 18 11:02:56 2006 +++ cups/pkg-message Wed May 24 14:06:28 2006 @@ -7,4 +7,3 @@ have been installed in %%PREFIX%%/etc/cups/ ====================================================================== - --- cups.diff ends here --- >Release-Note: >Audit-Trail: >Unformatted: