ports/63148: Fix print/foomatic-db-engine

[Taoka Fumiyoshi]

>Number:         63148
>Category:       ports
>Synopsis:       Fix print/foomatic-db-engine
>Confidential:   no
>Severity:       serious
>Priority:       medium
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Fri Feb 20 11:50:12 PST 2004
>Closed-Date:
>Last-Modified:
>Originator:     Taoka Fumiyoshi
>Release:        FreeBSD 5.2-CURRENT i386
>Organization:
>Environment:
System: FreeBSD prime.quad.dyndns.org 5.2-CURRENT FreeBSD 5.2-CURRENT #116: Fri Feb 20 03:24:09 JST 2004 root@:/usr/obj/usr/src/sys/DPI533 i386

>Description:
	Can't extract the tar file and fail to patch.
>How-To-Repeat:

>Fix:

Use DISTNAME instead of PKGNAME for the tar file
as print/foomatic-db does.

--- Makefile.orig	Sat Feb 21 04:01:56 2004
+++ Makefile	Sat Feb 21 04:18:50 2004
@@ -18,7 +18,7 @@
 LIB_DEPENDS=	xml2.5:${PORTSDIR}/textproc/libxml2 \
 		curl.2:${PORTSDIR}/ftp/curl
 
-BROKEN=		"Fails to patch"
+#BROKEN=		"Fails to patch"
 
 USE_GMAKE=	yes
 USE_PERL5=	yes
@@ -47,26 +47,26 @@
 # kris at freebsd.org
 #
 do-fetch:
-	@if test ! -f ${DISTDIR}/${PKGNAME}${EXTRACT_SUFX} ; then \
-		${MKDIR} ${DISTDIR}/${PKGNAME} && \
-		cd ${DISTDIR}/${PKGNAME}; \
+	@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} ">> \"${PKGNAME}${EXTRACT_SUFX}\"."; \
-				${MV} ${PKGNAME}/${CVS_MODULE} \
-					${PKGNAME}/${CVS_MODULE:H}/${PKGNAME}; \
+				${ECHO_MSG} ">> \"${DISTNAME}${EXTRACT_SUFX}\"."; \
+				${MV} ${DISTNAME}/${CVS_MODULE} \
+					${DISTNAME}/${CVS_MODULE:H}/${DISTNAME}; \
 				${TAR} -cj \
-					-f ${PKGNAME}${EXTRACT_SUFX} \
-					-C ${PKGNAME}/${CVS_MODULE:H} \
-					${PKGNAME}; \
+					-f ${DISTNAME}${EXTRACT_SUFX} \
+					-C ${DISTNAME}/${CVS_MODULE:H} \
+					${DISTNAME}; \
 				exit; \
 			fi \
 		done; \
-		${RMDIR} ${DISTDIR}/${PKGNAME}; \
+		${RMDIR} ${DISTDIR}/${DISTNAME}; \
 		${ECHO_MSG} ">> CVS checkout failed."; \
 		exit 1; \
 	fi
>Release-Note:
>Audit-Trail:
>Unformatted:
 >> Attempting to check out from pserver:anonymous at cvs.linuxprinting.org:/usr/local/cvs.
 cvs server: Updating foomatic-db-engine
 U foomatic-db-engine/COPYING
     :
  (snip)
     :
 U foomatic-db-engine/lib/Foomatic/UIElem.pm
 >> Creating dist tarball in /usr/ports/distfiles
 >> "foomatic-db-engine-20031213_1.tar.bz2".
 ===>  Extracting for foomatic-db-engine-20031213_1
 bzip2: Can't open input file /usr/ports/distfiles//foomatic-db-engine-20031213.tar.bz2: No such file or directory.
 ===>  Patching for foomatic-db-engine-20031213_1
 ===>  Applying FreeBSD patches for foomatic-db-engine-20031213_1
 patch: **** can't cd to /usr/ports/print/foomatic-db-engine/work/foomatic-db-engine-20031213: No such file or directory
 >> Patch patch-Makefile.in failed to apply cleanly.
 *** Error code 1
 
 Stop in /usr/ports/print/foomatic-db-engine.