Attachment 66083 Details for Bug 97783 – cups.diff

[patch] cups.diff

cups.diff (text/plain), 4.43 KB, created by Sergey Akifyev on 2006-05-24 11:30:16 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Sergey Akifyev

Created: 2006-05-24 11:30:16 UTC

Size: 4.43 KB

patch

obsolete

>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 <bsd.port.pre.mk>
>-.include <bsd.port.post.mk>
>+.include <bsd.port.mk>
>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/
> 
> ======================================================================
>-

Actions: View | Diff

Attachments on bug 97783: 66083