diff options
| author | marcus <marcus@FreeBSD.org> | 2004-02-08 14:42:23 +0800 |
|---|---|---|
| committer | marcus <marcus@FreeBSD.org> | 2004-02-08 14:42:23 +0800 |
| commit | 2c07ab148e1b7807d4720b723c2f7022bc3913ef (patch) | |
| tree | c785e8c96a9fff10728c01a55466989fdec46662 /print | |
| parent | c9e0fe6ec82d24c0073a98d3f29a3c31926a603f (diff) | |
| download | freebsd-ports-gnome-2c07ab148e1b7807d4720b723c2f7022bc3913ef.tar.gz freebsd-ports-gnome-2c07ab148e1b7807d4720b723c2f7022bc3913ef.tar.zst freebsd-ports-gnome-2c07ab148e1b7807d4720b723c2f7022bc3913ef.zip | |
Fix extraction by using DISTNAME instead of PKGNAME for the name of the
generated tar file.
Reported by: bento via kris
Diffstat (limited to 'print')
| -rw-r--r-- | print/foomatic-db/Makefile | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/print/foomatic-db/Makefile b/print/foomatic-db/Makefile index 040a5feaea1b..ce580d0a4b12 100644 --- a/print/foomatic-db/Makefile +++ b/print/foomatic-db/Makefile @@ -36,27 +36,27 @@ CVS_MODULE= foomatic-db # 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 \ -X ${FILESDIR}/tarignore \ - -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 |