Attachment 47182 Details for Bug 72325 – file.diff

[patch] file.diff

file.diff (text/plain), 6.46 KB, created by tkato432 on 2004-10-04 18:10:33 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: tkato432

Created: 2004-10-04 18:10:33 UTC

Size: 6.46 KB

patch

obsolete

>diff -urN /usr/ports/print/foomatic-db-engine/Makefile print/foomatic-db-engine/Makefile
>--- /usr/ports/print/foomatic-db-engine/Makefile	Sun Sep 19 13:08:20 2004
>+++ print/foomatic-db-engine/Makefile	Fri Oct  1 19:18:18 2004
>@@ -6,35 +6,24 @@
> #
> 
> PORTNAME=	foomatic-db-engine
>-PORTVERSION=	20031213
>-PORTREVISION=	2
>+PORTVERSION=	3.0.2
>+PORTEPOCH=	1
> CATEGORIES=	print
>-MASTER_SITES=	#
>+MASTER_SITES=	http://www.linuxprinting.org/download/foomatic/%SUBDIR%/
>+MASTER_SITE_SUBDIR=	. oldstuff
> 
> MAINTAINER=	ports@FreeBSD.org
> COMMENT=	Foomatic database engine
> 
>-LIB_DEPENDS=	xml2.5:${PORTSDIR}/textproc/libxml2 \
>-		curl.3:${PORTSDIR}/ftp/curl
>+BUILD_DEPENDS=	curl:${PORTSDIR}/ftp/curl
>+RUN_DEPENDS=	curl:${PORTSDIR}/ftp/curl
> 
>-BROKEN=		"Configure fails"
>-
>-USE_GMAKE=	yes
>+USE_GNOME=	libxml2
> USE_PERL5=	yes
>-USE_BZIP2=	yes
>-WANT_AUTOMAKE_VER=	15
>-USE_AUTOCONF_VER=	253
>+USE_GMAKE=	yes
> GNU_CONFIGURE=	yes
>-NO_CHECKSUM=	yes	# the tarball is created on the fly from CVS
>-CONFIGURE_ARGS=	--prefix=${PREFIX}
> CONFIGURE_ENV=	PERL=${PERL} LIBDIR=${PREFIX}/share/foomatic/
> 
>-.include <bsd.port.pre.mk>
>-CVS_CMD?=	cvs -z3
>-CVS_DATE=	${PORTVERSION}
>-CVS_SITES?=	pserver:anonymous@cvs.linuxprinting.org:/usr/local/cvs
>-CVS_MODULE=	foomatic-db-engine
>-
> MAN1=		foomatic-printjob.1 foomatic-ppdfile.1 foomatic-perl-data.1 \
> 		foomatic-configure.1 foomatic-compiledb.1 foomatic-combo-xml.1 \
> 		foomatic-ppd-options.1
>@@ -42,39 +31,16 @@
> 		foomatic-kitload.8 foomatic-getpjloptions.8 \
> 		foomatic-addpjloptions.8
> 
>-#
>-# CVS checkout stuff mostly stolen from security/openssh-askpass port by
>-# kris@freebsd.org
>-#
>-do-fetch:
>-	@if test ! -f ${DISTDIR}/${DISTNAME}${EXTRACT_SUFX} ; then \
>-		${MKDIR} ${DISTDIR}/${DISTNAME} && \
>-		cd ${DISTDIR}/${DISTNAME}; \
>-		for CVS_SITE in ${CVS_SITES}; do \
>-			${ECHO_MSG} ">> Attempting to check out from $${CVS_SITE}."; \
>-			if ${CVS_CMD} -d:$${CVS_SITE} co -D "${CVS_DATE}" ${CVS_MODULE}; \
>-			    then \
>-				cd ${DISTDIR}; \
>-				${ECHO_MSG} ">> Creating dist tarball in ${DISTDIR}"; \
>-				${ECHO_MSG} ">> \"${DISTNAME}${EXTRACT_SUFX}\"."; \
>-				${MV} ${DISTNAME}/${CVS_MODULE} \
>-					${DISTNAME}/${CVS_MODULE:H}/${DISTNAME}; \
>-				${TAR} -cj \
>-					-f ${DISTNAME}${EXTRACT_SUFX} \
>-					-C ${DISTNAME}/${CVS_MODULE:H} \
>-					${DISTNAME}; \
>-				exit; \
>-			fi \
>-		done; \
>-		${RMDIR} ${DISTDIR}/${DISTNAME}; \
>-		${ECHO_MSG} ">> CVS checkout failed."; \
>-		exit 1; \
>-	fi
>-
>-#pre-configure:
>-#	@cd ${WRKSRC} && ${SETENV} ${SCRIPTS_ENV} ./make_configure
>-
>-post-build:
>-	@${CHMOD} +x ${WRKSRC}/mkinstalldirs
>+post-patch:
>+	@${PERL} -pi.bak -e \
>+		"s,sysconfdir=/etc,sysconfdir=\'${PREFIX}/etc\',g ; \
>+		 s,/usr/local/etc:,${PREFIX}/etc:,g" ${WRKSRC}/configure
>+	@${PERL} -pi.bak -e \
>+		"s,/usr/local/bin:,${PREFIX}/bin:,g" ${WRKSRC}/Makefile.in
>+
>+post-install:
>+.for file in foomatic-combo-xml foomatic-perl-data
>+	@${STRIP_CMD} ${PREFIX}/bin/${file}
>+.endfor
> 
>-.include <bsd.port.post.mk>
>+.include <bsd.port.mk>
>diff -urN /usr/ports/print/foomatic-db-engine/distinfo print/foomatic-db-engine/distinfo
>--- /usr/ports/print/foomatic-db-engine/distinfo	Wed Oct  8 21:52:42 2003
>+++ print/foomatic-db-engine/distinfo	Fri Oct  1 18:40:07 2004
>@@ -1 +1,2 @@
>-Data is retrieved via CVS
>+MD5 (foomatic-db-engine-3.0.2.tar.gz) = 3061b8d3f7870467e6fbeae8d4399211
>+SIZE (foomatic-db-engine-3.0.2.tar.gz) = 286367
>diff -urN /usr/ports/print/foomatic-db-engine/files/patch-Makefile.in print/foomatic-db-engine/files/patch-Makefile.in
>--- /usr/ports/print/foomatic-db-engine/files/patch-Makefile.in	Thu Jul  8 13:44:31 2004
>+++ print/foomatic-db-engine/files/patch-Makefile.in	Thu Jan  1 09:00:00 1970
>@@ -1,29 +0,0 @@
>---- Makefile.in.orig	Thu Nov 20 21:08:05 2003
>-+++ Makefile.in	Wed Jul  7 16:27:06 2004
>-@@ -53,7 +53,7 @@
>- ## C settings
>- CC=@CC@
>- CFLAGS=@CFLAGS@
>--XML_CFLAGS=@XML_CFLAGS@
>-+XML_CPPFLAGS=@XML_CPPFLAGS@
>- XML_LIBS=@XML_LIBS@
>- 
>- ## Settings for Perl
>-@@ -64,7 +64,7 @@
>- PERL_INSTALLDIRS=@PERL_INSTALLDIRS@
>- 
>- # Genereal paths for all filter scripts
>--EXEC_PATH=/usr/local/bin:/usr/bin:/bin
>-+EXEC_PATH=${LOCALBASE}/bin:/usr/bin:/bin
>- LOG_PATH=/tmp
>- 
>- # Paths for LPD and LPRng
>-@@ -221,7 +221,7 @@
>- 	$(CC) $(CFLAGS) -o foomatic-combo-xml foomatic-combo-xml.c
>- 
>- foomatic-perl-data: foomatic-perl-data.c
>--	$(CC) $(CFLAGS) $(XML_CFLAGS) $(XML_LIBS) -o foomatic-perl-data foomatic-perl-data.c
>-+	$(CC) $(CFLAGS) $(XML_CPPFLAGS) $(XML_LIBS) -o foomatic-perl-data foomatic-perl-data.c
>- 
>- man:
>- 	chmod a+rx ./makeMan
>diff -urN /usr/ports/print/foomatic-db-engine/files/patch-configure.in print/foomatic-db-engine/files/patch-configure.in
>--- /usr/ports/print/foomatic-db-engine/files/patch-configure.in	Wed Jul  7 14:48:18 2004
>+++ print/foomatic-db-engine/files/patch-configure.in	Thu Jan  1 09:00:00 1970
>@@ -1,15 +0,0 @@
>---- configure.in.orig	Wed Jul  7 05:46:16 2004
>-+++ configure.in	Wed Jul  7 05:45:39 2004
>-@@ -18,9 +18,9 @@
>- dnl LIBS="$LIBS"
>- 
>- AM_PATH_XML2(2.0.0)
>--if test ! -n "$XML_LIBS" ; then
>--  AM_PATH_XML(1.8.17)
>--fi
>-+dnl if test ! -n "$XML_LIBS" ; then
>-+dnl  AM_PATH_XML(1.8.17)
>-+dnl fi
>- dnl CFLAGS="$CFLAGS $XML_CFLAGS"
>- dnl LIBS="$LIBS $XML_LIBS"
>- 
>diff -urN /usr/ports/print/foomatic-db-engine/files/patch-make_configure print/foomatic-db-engine/files/patch-make_configure
>--- /usr/ports/print/foomatic-db-engine/files/patch-make_configure	Wed Aug  4 07:36:51 2004
>+++ print/foomatic-db-engine/files/patch-make_configure	Thu Jan  1 09:00:00 1970
>@@ -1,10 +0,0 @@
>---- make_configure.orig	Fri Oct 11 01:16:34 2002
>-+++ make_configure	Wed Jul  7 18:23:05 2004
>-@@ -1,3 +1,3 @@
>--aclocal
>--autoconf
>--perl -p -i -e "s=\#include <xmlversion.h>=\#include <libxml/xmlversion.h>=g" configure
>-\ No newline at end of file
>-+aclocal15
>-+autoconf253
>-+perl -p -i -e "s=\#include <xmlversion.h>=\#include <libxml/xmlversion.h>=g" configure
>diff -urN /usr/ports/print/foomatic-db-engine/pkg-plist print/foomatic-db-engine/pkg-plist
>--- /usr/ports/print/foomatic-db-engine/pkg-plist	Sun Dec 14 12:29:12 2003
>+++ print/foomatic-db-engine/pkg-plist	Fri Oct  1 18:56:42 2004
>@@ -17,6 +17,7 @@
> sbin/foomatic-kitload
> sbin/foomatic-nonumericalids
> sbin/foomatic-preferred-driver
>+sbin/foomatic-printermap-to-gimp-print-xml
> sbin/foomatic-replaceoldprinterids
> share/foomatic/templates/pjl_enum_choice.xml
> share/foomatic/templates/pjl_enum_option.xml
>@@ -24,4 +25,6 @@
> @dirrm %%SITE_PERL%%/Foomatic
> @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Foomatic
> @dirrm share/foomatic/templates
>-@dirrm share/foomatic
>+@unexec rmdir %D/share/foomatic 2>/dev/null || true
>+@unexec rmdir %D/etc/foomatic
>+@exec mkdir -p %D/etc/foomatic

Actions: View | Diff

Attachments on bug 72325: 47182