diff options
| author | marcus <marcus@FreeBSD.org> | 2004-02-21 03:54:33 +0800 |
|---|---|---|
| committer | marcus <marcus@FreeBSD.org> | 2004-02-21 03:54:33 +0800 |
| commit | 0afced2f345495c54018b4778b4026931bf8ec32 (patch) | |
| tree | d9a6dd0bc3f9664ee4cc654aa6197a1cefce4939 | |
| parent | ff64d40e415ea5d2bc7931144bfda888edcfc90b (diff) | |
| download | freebsd-ports-gnome-0afced2f345495c54018b4778b4026931bf8ec32.tar.gz freebsd-ports-gnome-0afced2f345495c54018b4778b4026931bf8ec32.tar.zst freebsd-ports-gnome-0afced2f345495c54018b4778b4026931bf8ec32.zip | |
Fix make patch after gettext PORTREVISION bump by using DISTNAME instead of
PKGNAME for the tarball and WRKSRC.
PR: 63148
Submitted by: Taoka Fumiyoshi <fmysh@iijmio-mail.jp>
| -rw-r--r-- | print/foomatic-db-engine/Makefile | 22 |
1 files changed, 10 insertions, 12 deletions
diff --git a/print/foomatic-db-engine/Makefile b/print/foomatic-db-engine/Makefile index 48b0b46b06a3..d4c6fa2afef1 100644 --- a/print/foomatic-db-engine/Makefile +++ b/print/foomatic-db-engine/Makefile @@ -18,8 +18,6 @@ BUILD_DEPENDS= aclocal:${PORTSDIR}/devel/automake LIB_DEPENDS= xml2.5:${PORTSDIR}/textproc/libxml2 \ curl.2:${PORTSDIR}/ftp/curl -BROKEN= "Fails to patch" - USE_GMAKE= yes USE_PERL5= yes USE_BZIP2= yes @@ -47,26 +45,26 @@ MAN8= foomatic-preferred-driver.8 \ # kris@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 |