diff options
| author | erwin <erwin@FreeBSD.org> | 2010-10-29 05:00:21 +0800 |
|---|---|---|
| committer | erwin <erwin@FreeBSD.org> | 2010-10-29 05:00:21 +0800 |
| commit | 1af20d9d71a5dcaa30978a44c9cc813dd4439bca (patch) | |
| tree | 72856003d9c3fbf140cf5bc68a59e0d88a260f74 | |
| parent | 4b2251c46afa012cabc252f4ec002ca314544bc2 (diff) | |
| download | freebsd-ports-gnome-1af20d9d71a5dcaa30978a44c9cc813dd4439bca.tar.gz freebsd-ports-gnome-1af20d9d71a5dcaa30978a44c9cc813dd4439bca.tar.zst freebsd-ports-gnome-1af20d9d71a5dcaa30978a44c9cc813dd4439bca.zip | |
Deprecate md5 in favour of sha256 checksums. md5 checksums will no longer
be generated or checked, and will be silently ignored for now. Also,
generalize the MD5_FILE macro to DISTINFO_FILO.
PR: 149657
Submitted by: rene
Approved by: portmgr
Tested on: pointyhat i386 7-exp
107 files changed, 136 insertions, 138 deletions
diff --git a/Mk/bsd.linux-rpm.mk b/Mk/bsd.linux-rpm.mk index 21a89143a92b..a18bf567eb9c 100644 --- a/Mk/bsd.linux-rpm.mk +++ b/Mk/bsd.linux-rpm.mk @@ -1,7 +1,7 @@ #-*- mode: Makefile; tab-width: 4; -*- # ex:ts=4 # -# $FreeBSD: /tmp/pcvs/ports/Mk/bsd.linux-rpm.mk,v 1.23 2009-12-13 19:29:34 bsam Exp $ +# $FreeBSD: /tmp/pcvs/ports/Mk/bsd.linux-rpm.mk,v 1.24 2010-10-28 21:00:06 erwin Exp $ # # Variables: @@ -148,7 +148,7 @@ EXTRACT_CMD?= ${RPM2CPIO} EXTRACT_BEFORE_ARGS?= EXTRACT_AFTER_ARGS?= | ${CPIO} -id --quiet -MD5_FILE?= ${MASTERDIR}/distinfo.${LINUX_RPM_ARCH} +DISTINFO_FILE?= ${MASTERDIR}/distinfo.${LINUX_RPM_ARCH} BRANDELF_DIRS?= BRANDELF_FILES?= diff --git a/Mk/bsd.port.mk b/Mk/bsd.port.mk index 6eaaba968e5b..26775d04176c 100644 --- a/Mk/bsd.port.mk +++ b/Mk/bsd.port.mk @@ -1123,7 +1123,7 @@ FreeBSD_MAINTAINER= portmgr@FreeBSD.org # - Different checksum algorithms to check for verifying the # integrity of the distfiles. The absence of the algorithm # in distinfo doesn't make it fail. -# Default: md5 sha256 +# Default: sha256 (md5 is deprecated, allowed but unused) # NO_CHECKSUM - Don't verify the checksum. Typically used when # when you noticed the distfile you just fetched has # a different checksum and you intend to verify if @@ -2267,17 +2267,16 @@ DO_NADA?= ${TRUE} # Use this as the first operand to always build dependency. NONEXISTENT?= /nonexistent -CHECKSUM_ALGORITHMS?= md5 sha256 +CHECKSUM_ALGORITHMS?= sha256 -MD5_FILE?= ${MASTERDIR}/distinfo +DISTINFO_FILE?= ${MASTERDIR}/distinfo MAKE_FLAGS?= -f MAKEFILE?= Makefile MAKE_ENV+= PREFIX=${PREFIX} \ LOCALBASE=${LOCALBASE} X11BASE=${X11BASE} \ MOTIFLIB="${MOTIFLIB}" LIBDIR="${LIBDIR}" \ - CC="${CC}" CPP="${CPP}" CXX="${CXX}" \ - CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}" \ + CC="${CC}" CFLAGS="${CFLAGS}" CXX="${CXX}" CXXFLAGS="${CXXFLAGS}" \ MANPREFIX="${MANPREFIX}" # Add -fno-strict-aliasing to CFLAGS with optimization level -O2 or higher. @@ -3519,10 +3518,10 @@ check-vulnerable: fi .endif -# set alg to any of SIZE, MD5, SHA256 (or any other checksum algorithm): -DISTINFO_DATA?= if [ \( -n "${DISABLE_SIZE}" -a -n "${NO_CHECKSUM}" \) -o ! -f "${MD5_FILE}" ]; then exit; fi; \ +# set alg to any of SIZE, SHA256 (or any other checksum algorithm): +DISTINFO_DATA?= if [ \( -n "${DISABLE_SIZE}" -a -n "${NO_CHECKSUM}" \) -o ! -f "${DISTINFO_FILE}" ]; then exit; fi; \ DIR=${DIST_SUBDIR}; ${AWK} -v alg=$$alg -v file=$${DIR:+$$DIR/}$${file} \ - '$$1 == alg && $$2 == "(" file ")" {print $$4}' ${MD5_FILE} + '$$1 == alg && $$2 == "(" file ")" {print $$4}' ${DISTINFO_FILE} # Fetch @@ -3553,11 +3552,11 @@ do-fetch: ${ECHO_MSG} "=> Please correct this problem and try again."; \ exit 1; \ fi; \ - if [ -f ${MD5_FILE} -a "x${NO_CHECKSUM}" = "x" ]; then \ - _md5sum=`alg=MD5; ${DISTINFO_DATA}`; \ - if [ -z "$$_md5sum" ]; then \ - ${ECHO_MSG} "=> $${DIR:+$$DIR/}$$file is not in ${MD5_FILE}."; \ - ${ECHO_MSG} "=> Either ${MD5_FILE} is out of date, or"; \ + if [ -f ${DISTINFO_FILE} -a "x${NO_CHECKSUM}" = "x" ]; then \ + _sha256sum=`alg=SHA256; ${DISTINFO_DATA}`; \ + if [ -z "$$_sha256sum" ]; then \ + ${ECHO_MSG} "=> $${DIR:+$$DIR/}$$file is not in ${DISTINFO_FILE}."; \ + ${ECHO_MSG} "=> Either ${DISTINFO_FILE} is out of date, or"; \ ${ECHO_MSG} "=> $${DIR:+$$DIR/}$$file is spelled incorrectly."; \ exit 1; \ fi; \ @@ -3782,7 +3781,7 @@ do-configure: .if defined(HAS_CONFIGURE) @(cd ${CONFIGURE_WRKSRC} && \ ${SET_LATE_CONFIGURE_ARGS} \ - if ! ${SETENV} CC="${CC}" CPP="${CPP}" CXX="${CXX}" \ + if ! ${SETENV} CC="${CC}" CXX="${CXX}" \ CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}" \ INSTALL="/usr/bin/install -c ${_BINOWNGRP}" \ INSTALL_DATA="${INSTALL_DATA}" \ @@ -4757,7 +4756,7 @@ fetch-url-list-int: fi ; \ for site in `eval $$SORTED_MASTER_SITES_CMD_TMP ${_RANDOMIZE_SITES}`; do \ DIR=${DIST_SUBDIR}; \ - CKSIZE=`${GREP} "^SIZE ($${DIR:+$$DIR/}$$file)" ${MD5_FILE} | ${AWK} '{print $$4}'`; \ + CKSIZE=`${GREP} "^SIZE ($${DIR:+$$DIR/}$$file)" ${DISTINFO_FILE} | ${AWK} '{print $$4}'`; \ case $${file} in \ */*) args="-o $${file} $${site}$${file}";; \ *) args=$${site}$${file};; \ @@ -4788,7 +4787,7 @@ fetch-url-list-int: fi ; \ for site in `eval $$SORTED_PATCH_SITES_CMD_TMP ${_RANDOMIZE_SITES}`; do \ DIR=${DIST_SUBDIR}; \ - CKSIZE=`${GREP} "^SIZE ($${DIR:+$$DIR/}$$file)" ${MD5_FILE} | ${AWK} '{print $$4}'`; \ + CKSIZE=`${GREP} "^SIZE ($${DIR:+$$DIR/}$$file)" ${DISTINFO_FILE} | ${AWK} '{print $$4}'`; \ case $${file} in \ */*) args="-o $${file} $${site}$${file}";; \ *) args=$${site}$${file};; \ @@ -4846,7 +4845,7 @@ checksum_init=\ makesum: check-checksum-algorithms @cd ${.CURDIR} && ${MAKE} ${__softMAKEFLAGS} fetch NO_CHECKSUM=yes \ DISABLE_SIZE=yes - @if [ -f ${MD5_FILE} ]; then ${CAT} /dev/null > ${MD5_FILE}; fi + @if [ -f ${DISTINFO_FILE} ]; then ${CAT} /dev/null > ${DISTINFO_FILE}; fi @( \ cd ${DISTDIR}; \ \ @@ -4857,17 +4856,17 @@ makesum: check-checksum-algorithms eval alg_executable=\$$$$alg; \ \ if [ $$alg_executable != "NO" ]; then \ - $$alg_executable $$file >> ${MD5_FILE}; \ + $$alg_executable $$file >> ${DISTINFO_FILE}; \ fi; \ done; \ if [ -z "${NO_SIZE}" ]; then \ - ${ECHO_CMD} "SIZE ($$file) = "`${LS} -ALln $$file | ${AWK} '{print $$5}'` >> ${MD5_FILE}; \ + ${ECHO_CMD} "SIZE ($$file) = "`${LS} -ALln $$file | ${AWK} '{print $$5}'` >> ${DISTINFO_FILE}; \ fi; \ done \ ) @for file in ${_IGNOREFILES}; do \ for alg in ${CHECKSUM_ALGORITHMS:U}; do \ - ${ECHO_CMD} "$$alg ($$file) = IGNORE" >> ${MD5_FILE}; \ + ${ECHO_CMD} "$$alg ($$file) = IGNORE" >> ${DISTINFO_FILE}; \ done; \ done .endif @@ -4875,7 +4874,7 @@ makesum: check-checksum-algorithms .if !target(checksum) checksum: fetch check-checksum-algorithms @${checksum_init} \ - if [ -f ${MD5_FILE} ]; then \ + if [ -f ${DISTINFO_FILE} ]; then \ cd ${DISTDIR}; OK="";\ for file in ${_CKSUMFILES}; do \ ignored="true"; \ @@ -4979,7 +4978,7 @@ checksum: fetch check-checksum-algorithms \ if [ "$$OK" != "true" -a ${FETCH_REGET} -eq 0 ]; then \ ${ECHO_MSG} "===> Giving up on fetching files: $$refetchlist"; \ - ${ECHO_MSG} "Make sure the Makefile and distinfo file (${MD5_FILE})"; \ + ${ECHO_MSG} "Make sure the Makefile and distinfo file (${DISTINFO_FILE})"; \ ${ECHO_MSG} "are up to date. If you are absolutely sure you want to override this"; \ ${ECHO_MSG} "check, type \"make NO_CHECKSUM=yes [other args]\"."; \ exit 1; \ @@ -4988,7 +4987,7 @@ checksum: fetch check-checksum-algorithms exit 1; \ fi; \ elif [ -n "${_CKSUMFILES:M*}" ]; then \ - ${ECHO_MSG} "=> No checksum file (${MD5_FILE})."; \ + ${ECHO_MSG} "=> No checksum file (${DISTINFO_FILE})."; \ fi .endif @@ -5375,7 +5374,7 @@ FETCH_LIST?= for i in $$deps; do \ continue; \ fi;; \ esac; \ - echo cd $$dir; cd $$dir; ${MAKE} $$targ; \ + echo cd $$dir; ${MAKE} $$targ; \ done .if !target(fetch-required) diff --git a/Mk/bsd.qt.mk b/Mk/bsd.qt.mk index 0b6dca5184fe..69d0d2edb3bc 100644 --- a/Mk/bsd.qt.mk +++ b/Mk/bsd.qt.mk @@ -31,7 +31,7 @@ MAKE_ENV+= QMAKESPEC="${QMAKESPEC}" .endif # !defined(QT_NONSTANDARD) .if defined(QT_DIST) -MD5_FILE= ${PORTSDIR}/devel/qt4/distinfo +DISTINFO_FILE= ${PORTSDIR}/devel/qt4/distinfo MASTER_SITES= ${MASTER_SITE_QT} DISTNAME= qt-everywhere-opensource-src-${QT4_VERSION} DIST_SUBDIR= KDE diff --git a/accessibility/jovie/Makefile b/accessibility/jovie/Makefile index 28fb1a88c822..dc0da05f74a4 100644 --- a/accessibility/jovie/Makefile +++ b/accessibility/jovie/Makefile @@ -25,7 +25,7 @@ USE_KDE4= kdeprefix kdelibs automoc4 USE_QT_VER= 4 QT_COMPONENTS= qmake_build moc_build uic_build rcc_build USE_LDCONFIG= yes -MD5_FILE= ${PORTSDIR}/accessibility/kdeaccessibility4/distinfo +DISTINFO_FILE= ${PORTSDIR}/accessibility/kdeaccessibility4/distinfo MAKE_JOBS_SAFE= yes CMAKE_ARGS+= -DKDE4_JOVIE_ALSA:BOOL=OFF diff --git a/accessibility/ktts/Makefile b/accessibility/ktts/Makefile index 28fb1a88c822..dc0da05f74a4 100644 --- a/accessibility/ktts/Makefile +++ b/accessibility/ktts/Makefile @@ -25,7 +25,7 @@ USE_KDE4= kdeprefix kdelibs automoc4 USE_QT_VER= 4 QT_COMPONENTS= qmake_build moc_build uic_build rcc_build USE_LDCONFIG= yes -MD5_FILE= ${PORTSDIR}/accessibility/kdeaccessibility4/distinfo +DISTINFO_FILE= ${PORTSDIR}/accessibility/kdeaccessibility4/distinfo MAKE_JOBS_SAFE= yes CMAKE_ARGS+= -DKDE4_JOVIE_ALSA:BOOL=OFF diff --git a/astro/marble/Makefile b/astro/marble/Makefile index 6d0cd3c047e4..d9547b55d5ae 100644 --- a/astro/marble/Makefile +++ b/astro/marble/Makefile @@ -25,7 +25,7 @@ USE_KDE4= kdelibs kdeprefix kdehier automoc4 USE_QT_VER= 4 QT_COMPONENTS= qmake_build moc_build rcc_build uic_build USE_LDCONFIG= yes -MD5_FILE= ${PORTSDIR}/misc/kdeedu4/distinfo +DISTINFO_FILE= ${PORTSDIR}/misc/kdeedu4/distinfo MAKE_JOBS_UNSAFE= yes CMAKE_SOURCE_PATH= ${WRKSRC}/marble diff --git a/audio/festvox-us1-mbrola/Makefile b/audio/festvox-us1-mbrola/Makefile index a267c6dbd5fe..c98d21dfd647 100644 --- a/audio/festvox-us1-mbrola/Makefile +++ b/audio/festvox-us1-mbrola/Makefile @@ -30,7 +30,7 @@ VOICEDIR_REL= ${VOICEDIR:S|^${PREFIX}/||} PLIST_SUB= VOICE="${VOICE}" VOICEDIR_REL="${VOICEDIR_REL}" -MD5_FILE= ${.CURDIR}/distinfo +DISTINFO_FILE= ${.CURDIR}/distinfo .include <bsd.port.pre.mk> diff --git a/audio/py-musicbrainz/Makefile b/audio/py-musicbrainz/Makefile index a5a7c7787a2c..d2b1ed32f328 100644 --- a/audio/py-musicbrainz/Makefile +++ b/audio/py-musicbrainz/Makefile @@ -33,7 +33,7 @@ PYDISTUTILS_PKGNAME= python-musicbrainz PYDISTUTILS_BUILDARGS= build_ext -I${LOCALBASE}/include -L${LOCALBASE}/lib DESCR= ${PORTSDIR}/audio/libmusicbrainz/pkg-descr -MD5_FILE= ${PORTSDIR}/audio/libmusicbrainz/distinfo +DISTINFO_FILE= ${PORTSDIR}/audio/libmusicbrainz/distinfo PLIST_FILES= %%PYTHON_SITELIBDIR%%/musicbrainz.py \ %%PYTHON_SITELIBDIR%%/musicbrainz.pyc \ %%PYTHON_SITELIBDIR%%/musicbrainz.pyo diff --git a/chinese/acroread8-zh_CN/Makefile b/chinese/acroread8-zh_CN/Makefile index 61be444cad80..8ce50c96b5c5 100644 --- a/chinese/acroread8-zh_CN/Makefile +++ b/chinese/acroread8-zh_CN/Makefile @@ -9,7 +9,7 @@ CATEGORIES= chinese print linux PKGNAMEPREFIX= zh_CN- MASTERDIR= ${.CURDIR}/../../print/acroread8 -MD5_FILE= ${.CURDIR}/distinfo +DISTINFO_FILE= ${.CURDIR}/distinfo ADOBE_LANG= CHS diff --git a/chinese/acroread8-zh_TW/Makefile b/chinese/acroread8-zh_TW/Makefile index 4b70908f00e7..cd4fe0f32a24 100644 --- a/chinese/acroread8-zh_TW/Makefile +++ b/chinese/acroread8-zh_TW/Makefile @@ -9,7 +9,7 @@ CATEGORIES= chinese print linux PKGNAMEPREFIX= zh_TW- MASTERDIR= ${.CURDIR}/../../print/acroread8 -MD5_FILE= ${.CURDIR}/distinfo +DISTINFO_FILE= ${.CURDIR}/distinfo ADOBE_LANG= CHT diff --git a/chinese/joe/Makefile b/chinese/joe/Makefile index b2769ba28523..0a5c0a4843c2 100644 --- a/chinese/joe/Makefile +++ b/chinese/joe/Makefile @@ -18,6 +18,6 @@ MAINTAINER= ports@FreeBSD.org LATEST_LINK= ${PKGNAMEPREFIX}joe MASTERDIR= ${.CURDIR}/../../editors/joe -MD5_FILE= ${.CURDIR}/distinfo +DISTINFO_FILE= ${.CURDIR}/distinfo .include "${MASTERDIR}/Makefile" diff --git a/chinese/joe2/Makefile b/chinese/joe2/Makefile index c606219045a0..4c52b0e9cee2 100644 --- a/chinese/joe2/Makefile +++ b/chinese/joe2/Makefile @@ -17,6 +17,6 @@ MAINTAINER= ports@FreeBSD.org LATEST_LINK= ${PKGNAMEPREFIX}joe2 MASTERDIR= ${.CURDIR}/../../editors/joe2 -MD5_FILE= ${.CURDIR}/distinfo +DISTINFO_FILE= ${.CURDIR}/distinfo .include "${MASTERDIR}/Makefile" diff --git a/databases/db41-nocrypto/Makefile b/databases/db41-nocrypto/Makefile index 22d8ea495339..58e937cf8ddb 100644 --- a/databases/db41-nocrypto/Makefile +++ b/databases/db41-nocrypto/Makefile @@ -9,6 +9,6 @@ PKGNAMESUFFIX= -nocrypto DISTNAME= db-${PORTVERSION}.NC MASTERDIR= ${.CURDIR}/../db41 -MD5_FILE= ${.CURDIR}/distinfo +DISTINFO_FILE= ${.CURDIR}/distinfo .include "${MASTERDIR}/Makefile" diff --git a/databases/db42-nocrypto/Makefile b/databases/db42-nocrypto/Makefile index 1e10d72567f0..713e6e97a5db 100644 --- a/databases/db42-nocrypto/Makefile +++ b/databases/db42-nocrypto/Makefile @@ -11,6 +11,6 @@ DISTNAME= db-${PORTVERSION}.NC MAINTAINER= mandree@FreeBSD.org MASTERDIR= ${.CURDIR}/../db42 -MD5_FILE= ${.CURDIR}/distinfo +DISTINFO_FILE= ${.CURDIR}/distinfo .include "${MASTERDIR}/Makefile" diff --git a/databases/linux-oracle-instantclient-basic/Makefile b/databases/linux-oracle-instantclient-basic/Makefile index be7559c501df..39adbaeedcc6 100644 --- a/databases/linux-oracle-instantclient-basic/Makefile +++ b/databases/linux-oracle-instantclient-basic/Makefile @@ -20,7 +20,7 @@ COMMENT= Oracle 10 InstantClient basics. Works with Oracle RDBMS 8.1.2+ ONLY_FOR_ARCHS= i386 # amd64(not yet on own) NO_BUILD= yes -MD5_FILE= ${MASTERDIR}/distinfo.${ARCH} +DISTINFO_FILE= ${MASTERDIR}/distinfo.${ARCH} RESTRICTED= Packaging prohibited by Oracle license diff --git a/databases/linux-oracle-instantclient-sdk/Makefile b/databases/linux-oracle-instantclient-sdk/Makefile index 4aaaaeeb06ac..2632644c8e65 100644 --- a/databases/linux-oracle-instantclient-sdk/Makefile +++ b/databases/linux-oracle-instantclient-sdk/Makefile @@ -21,7 +21,7 @@ RUN_DEPENDS= ${LINUXBASE}/usr/lib/oracle/${ORACLEVERSION}/client/lib/libocci.so ONLY_FOR_ARCHS= i386 # amd64(not yet on own) NO_BUILD= yes -MD5_FILE= ${MASTERDIR}/distinfo.${ARCH} +DISTINFO_FILE= ${MASTERDIR}/distinfo.${ARCH} RESTRICTED= Packaging prohibited by Oracle license diff --git a/databases/linux-oracle-instantclient-sqlplus/Makefile b/databases/linux-oracle-instantclient-sqlplus/Makefile index b1f1d7362f76..49d4ca5323ce 100644 --- a/databases/linux-oracle-instantclient-sqlplus/Makefile +++ b/databases/linux-oracle-instantclient-sqlplus/Makefile @@ -22,7 +22,7 @@ RUN_DEPENDS= ${LINUXBASE}/usr/lib/oracle/${ORACLEVERSION}/client/lib/libocci.so ONLY_FOR_ARCHS= i386 # amd64(not yet on own) NO_BUILD= yes -MD5_FILE= ${MASTERDIR}/distinfo.${ARCH} +DISTINFO_FILE= ${MASTERDIR}/distinfo.${ARCH} RESTRICTED= Packaging prohibited by Oracle license diff --git a/databases/mysql-workbench52/Makefile b/databases/mysql-workbench52/Makefile index f63a7014322c..7ca45b9080e2 100644 --- a/databases/mysql-workbench52/Makefile +++ b/databases/mysql-workbench52/Makefile @@ -14,7 +14,7 @@ MAINTAINER= gelraen.ua@gmail.com LIB_DEPENDS= sqlite3:${PORTSDIR}/databases/sqlite3 MASTERDIR= ${.CURDIR}/../mysql-workbench51 -MD5_FILE= ${.CURDIR}/distinfo +DISTINFO_FILE= ${.CURDIR}/distinfo EXTRA_PATCHES= ${.CURDIR}/files/52-patch-frontend__linux__workbench__Makefile.am \ ${.CURDIR}/files/52-patch-configure.in \ ${.CURDIR}/files/52-patch-ext__ctemplate__ctemplate-src__configure.ac \ diff --git a/databases/py-bsddb/Makefile b/databases/py-bsddb/Makefile index 90f231ba2198..bc11689c0947 100644 --- a/databases/py-bsddb/Makefile +++ b/databases/py-bsddb/Makefile @@ -24,7 +24,7 @@ PYDISTUTILS_PKGNAME= _bsddb PYDISTUTILS_PKGVERSION= 0.0.0 DIST_SUBDIR= python WRKSRC= ${PYTHON_WRKSRC}/Modules -MD5_FILE= ${PORTSDIR}/lang/python${PYTHON_SUFFIX}/distinfo +DISTINFO_FILE= ${PORTSDIR}/lang/python${PYTHON_SUFFIX}/distinfo MAKE_ENV= BSDDB_VERSION=${BDB_LIB_NAME} PLIST_FILES= %%PYTHON_SITELIBDIR%%/_bsddb.so diff --git a/databases/py-gdbm/Makefile b/databases/py-gdbm/Makefile index eb12c64ff1d0..e9ef0024f328 100644 --- a/databases/py-gdbm/Makefile +++ b/databases/py-gdbm/Makefile @@ -24,7 +24,7 @@ USE_PYTHON= yes USE_PYDISTUTILS=yes PYDISTUTILS_PKGVERSION= 0.0.0 WRKSRC= ${PYTHON_WRKSRC}/Modules -MD5_FILE= ${PORTSDIR}/lang/python${PYTHON_SUFFIX}/distinfo +DISTINFO_FILE= ${PORTSDIR}/lang/python${PYTHON_SUFFIX}/distinfo .include <bsd.port.pre.mk> diff --git a/databases/py-sqlite3/Makefile b/databases/py-sqlite3/Makefile index bfbc9972c2f9..a98bb7f932d4 100644 --- a/databases/py-sqlite3/Makefile +++ b/databases/py-sqlite3/Makefile @@ -24,7 +24,7 @@ DIST_SUBDIR= python USE_PYTHON= 2.5+ USE_PYDISTUTILS=yes WRKSRC= ${PYTHON_WRKSRC}/Modules -MD5_FILE= ${PORTSDIR}/lang/python${PYTHON_SUFFIX}/distinfo +DISTINFO_FILE= ${PORTSDIR}/lang/python${PYTHON_SUFFIX}/distinfo PYDISTUTILS_NOEGGINFO= yes diff --git a/databases/qt4-sqlite3-plugin/Makefile b/databases/qt4-sqlite3-plugin/Makefile index 9f7dff7d2d64..d367c9a2652c 100644 --- a/databases/qt4-sqlite3-plugin/Makefile +++ b/databases/qt4-sqlite3-plugin/Makefile @@ -14,7 +14,7 @@ MAINTAINER= kde@FreeBSD.org COMMENT= Qt SQLite 3.x database plugin DB= sqlite -MD5_FILE= ${PORTSDIR}/devel/qt4/distinfo +DISTINFO_FILE= ${PORTSDIR}/devel/qt4/distinfo LIB_DEPENDS+= sqlite3:${PORTSDIR}/databases/sqlite3 diff --git a/deskutils/multisync-backup/Makefile b/deskutils/multisync-backup/Makefile index 04c82ec51177..3460d46845d9 100644 --- a/deskutils/multisync-backup/Makefile +++ b/deskutils/multisync-backup/Makefile @@ -11,7 +11,7 @@ COMMENT= Multisync backup plugin RUN_DEPENDS= multisync:${PORTSDIR}/deskutils/multisync -MD5_FILE= ${MASTERDIR}/distinfo +DISTINFO_FILE= ${MASTERDIR}/distinfo PATCHDIR= ${.CURDIR}/files PLIST= ${.CURDIR}/pkg-plist diff --git a/deskutils/multisync-syncml/Makefile b/deskutils/multisync-syncml/Makefile index c5f1deae9912..c4d7dd6b5716 100644 --- a/deskutils/multisync-syncml/Makefile +++ b/deskutils/multisync-syncml/Makefile @@ -11,7 +11,7 @@ COMMENT= Multisync plugin for SyncML targets RUN_DEPENDS= multisync:${PORTSDIR}/deskutils/multisync -MD5_FILE= ${MASTERDIR}/distinfo +DISTINFO_FILE= ${MASTERDIR}/distinfo PATCHDIR= ${.CURDIR}/files PLIST= ${.CURDIR}/pkg-plist diff --git a/devel/glib20-reference/bsd.gnome-reference.mk b/devel/glib20-reference/bsd.gnome-reference.mk index 3a0b065035b6..682328ed9902 100644 --- a/devel/glib20-reference/bsd.gnome-reference.mk +++ b/devel/glib20-reference/bsd.gnome-reference.mk @@ -26,7 +26,7 @@ LATEST_LINK:= ${LATEST_LINK}-reference COMMENT= Programming reference for ${REFERENCE_PORT} -MD5_FILE= ${PARENTDIR}/distinfo +DISTINFO_FILE= ${PARENTDIR}/distinfo REFERENCE_SRC?= ${WRKSRC}/docs/reference BOOKS?= . diff --git a/devel/linux-allegro/Makefile b/devel/linux-allegro/Makefile index 8b9c36b86471..58d5f862e7e8 100644 --- a/devel/linux-allegro/Makefile +++ b/devel/linux-allegro/Makefile @@ -25,7 +25,7 @@ DIST_SUBDIR= rpm USE_LDCONFIG= yes SRC_DISTFILES= -MD5_FILE= ${MASTERDIR}/distinfo +DISTINFO_FILE= ${MASTERDIR}/distinfo post-extract: @cd ${WRKSRC}/usr/lib; \ diff --git a/devel/p4/Makefile b/devel/p4/Makefile index 7b499023f3a2..32ec3675aa07 100644 --- a/devel/p4/Makefile +++ b/devel/p4/Makefile @@ -21,7 +21,7 @@ ONLY_FOR_ARCHS= amd64 i386 sparc64 P4VERSION= r${PORTVERSION:S/^20//:C/\.[0-9]+$//} DIST_SUBDIR= perforce/${PORTVERSION}/bin.${PLATFORM} -MD5_FILE= ${MASTERDIR}/distinfo.${PLATFORM} +DISTINFO_FILE= ${MASTERDIR}/distinfo.${PLATFORM} RESTRICTED= Restricted distribution diff --git a/devel/p4d/Makefile b/devel/p4d/Makefile index e022ecd2dee9..73825b1634b6 100644 --- a/devel/p4d/Makefile +++ b/devel/p4d/Makefile @@ -23,7 +23,7 @@ ONLY_FOR_ARCHS= amd64 i386 sparc64 P4VERSION= r${PORTVERSION:S/^20//:C/\.[0-9]+$//} DIST_SUBDIR= perforce/${PORTVERSION}/bin.${PLATFORM} -MD5_FILE= ${MASTERDIR}/distinfo.${PLATFORM} +DISTINFO_FILE= ${MASTERDIR}/distinfo.${PLATFORM} RESTRICTED= Restricted distribution diff --git a/devel/p4ftpd/Makefile b/devel/p4ftpd/Makefile index 0482ee6598f9..0d02b048cfa5 100644 --- a/devel/p4ftpd/Makefile +++ b/devel/p4ftpd/Makefile @@ -21,7 +21,7 @@ ONLY_FOR_ARCHS= amd64 i386 sparc64 P4VERSION= r${PORTVERSION:S/^20//:C/\.[0-9]+$//} DIST_SUBDIR= perforce/${PORTVERSION}/bin.${PLATFORM} -MD5_FILE= ${MASTERDIR}/distinfo.${PLATFORM} +DISTINFO_FILE= ${MASTERDIR}/distinfo.${PLATFORM} RESTRICTED= Restricted distribution diff --git a/devel/p4p/Makefile b/devel/p4p/Makefile index 852f0e1c2eb6..f5c87647e79d 100644 --- a/devel/p4p/Makefile +++ b/devel/p4p/Makefile @@ -23,7 +23,7 @@ ONLY_FOR_ARCHS= amd64 i386 sparc64 P4VERSION= r${PORTVERSION:S/^20//:C/\.[0-9]+$//} DIST_SUBDIR= perforce/${PORTVERSION}/bin.${PLATFORM} -MD5_FILE= ${MASTERDIR}/distinfo.${PLATFORM} +DISTINFO_FILE= ${MASTERDIR}/distinfo.${PLATFORM} RESTRICTED= Restricted distribution diff --git a/devel/p4v/Makefile b/devel/p4v/Makefile index 7f63e98784db..8b4373e5fc6a 100644 --- a/devel/p4v/Makefile +++ b/devel/p4v/Makefile @@ -28,7 +28,7 @@ USE_LDCONFIG= yes WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} -MD5_FILE= ${MASTERDIR}/distinfo.${MACHINE_ARCH} +DISTINFO_FILE= ${MASTERDIR}/distinfo.${MACHINE_ARCH} .include <bsd.port.pre.mk> diff --git a/devel/p4web/Makefile b/devel/p4web/Makefile index 78831858e466..1200f2690e09 100644 --- a/devel/p4web/Makefile +++ b/devel/p4web/Makefile @@ -21,7 +21,7 @@ ONLY_FOR_ARCHS= amd64 i386 sparc64 P4VERSION= r${PORTVERSION:S/^20//:C/\.[0-9]+$//} DIST_SUBDIR= perforce/${PORTVERSION}/bin.${PLATFORM} -MD5_FILE= ${MASTERDIR}/distinfo.${PLATFORM} +DISTINFO_FILE= ${MASTERDIR}/distinfo.${PLATFORM} RESTRICTED= Restricted distribution diff --git a/devel/subversion-freebsd/Makefile b/devel/subversion-freebsd/Makefile index e69e8ba46dc2..7af4ad90c3fe 100644 --- a/devel/subversion-freebsd/Makefile +++ b/devel/subversion-freebsd/Makefile @@ -18,6 +18,6 @@ WITH_FREEBSD_SUBVERSION= yes CONFLICTS?= subversion-[0-9]* -MD5_FILE= ${MASTERDIR}/distinfo +DISTINFO_FILE= ${MASTERDIR}/distinfo .include "${MASTERDIR}/Makefile" diff --git a/emulators/linux_base-c6/Makefile b/emulators/linux_base-c6/Makefile index 3cf86089984b..6bf6ad73277b 100644 --- a/emulators/linux_base-c6/Makefile +++ b/emulators/linux_base-c6/Makefile @@ -110,7 +110,7 @@ ONLY_FOR_ARCHS= i386 amd64 LINUX_RPM_ARCH= i386 USE_LINUX_PREFIX= yes NO_WRKSUBDIR= yes -MD5_FILE?= ${MASTERDIR}/distinfo.${LINUX_RPM_ARCH} +DISTINFO_FILE?= ${MASTERDIR}/distinfo.${LINUX_RPM_ARCH} PLIST_SUB= GLIBCVER="2.9" RPM2CPIO?= ${LOCALBASE}/bin/rpm2cpio diff --git a/emulators/linux_base-f10/Makefile b/emulators/linux_base-f10/Makefile index 3cf86089984b..6bf6ad73277b 100644 --- a/emulators/linux_base-f10/Makefile +++ b/emulators/linux_base-f10/Makefile @@ -110,7 +110,7 @@ ONLY_FOR_ARCHS= i386 amd64 LINUX_RPM_ARCH= i386 USE_LINUX_PREFIX= yes NO_WRKSUBDIR= yes -MD5_FILE?= ${MASTERDIR}/distinfo.${LINUX_RPM_ARCH} +DISTINFO_FILE?= ${MASTERDIR}/distinfo.${LINUX_RPM_ARCH} PLIST_SUB= GLIBCVER="2.9" RPM2CPIO?= ${LOCALBASE}/bin/rpm2cpio diff --git a/emulators/linux_base-f7/Makefile b/emulators/linux_base-f7/Makefile index c1d85a46e0fe..0ae66e6461e9 100644 --- a/emulators/linux_base-f7/Makefile +++ b/emulators/linux_base-f7/Makefile @@ -101,7 +101,7 @@ ONLY_FOR_ARCHS= i386 amd64 LINUX_RPM_ARCH= i386 USE_LINUX_PREFIX= yes NO_WRKSUBDIR= yes -MD5_FILE?= ${MASTERDIR}/distinfo.${LINUX_RPM_ARCH} +DISTINFO_FILE?= ${MASTERDIR}/distinfo.${LINUX_RPM_ARCH} PLIST_SUB= GLIBCVER="2.6" RPM2CPIO?= ${LOCALBASE}/bin/rpm2cpio diff --git a/emulators/linux_base-f8/Makefile b/emulators/linux_base-f8/Makefile index 9495d9bffff1..d7b5a5678572 100644 --- a/emulators/linux_base-f8/Makefile +++ b/emulators/linux_base-f8/Makefile @@ -108,7 +108,7 @@ ONLY_FOR_ARCHS= i386 amd64 LINUX_RPM_ARCH= i386 USE_LINUX_PREFIX= yes NO_WRKSUBDIR= yes -MD5_FILE?= ${MASTERDIR}/distinfo.${LINUX_RPM_ARCH} +DISTINFO_FILE?= ${MASTERDIR}/distinfo.${LINUX_RPM_ARCH} PLIST_SUB= GLIBCVER="2.7" RPM2CPIO?= ${LOCALBASE}/bin/rpm2cpio diff --git a/emulators/linux_base-f9/Makefile b/emulators/linux_base-f9/Makefile index 5e2e59a900e2..2ccd1c3aaa89 100644 --- a/emulators/linux_base-f9/Makefile +++ b/emulators/linux_base-f9/Makefile @@ -116,7 +116,7 @@ ONLY_FOR_ARCHS= i386 amd64 LINUX_RPM_ARCH= i386 USE_LINUX_PREFIX= yes NO_WRKSUBDIR= yes -MD5_FILE?= ${MASTERDIR}/distinfo.${LINUX_RPM_ARCH} +DISTINFO_FILE?= ${MASTERDIR}/distinfo.${LINUX_RPM_ARCH} PLIST_SUB= GLIBCVER="2.8" RPM2CPIO?= ${LOCALBASE}/bin/rpm2cpio diff --git a/emulators/linux_base-fc4/Makefile b/emulators/linux_base-fc4/Makefile index 6747ec92e478..db8f9e4696e8 100644 --- a/emulators/linux_base-fc4/Makefile +++ b/emulators/linux_base-fc4/Makefile @@ -104,7 +104,7 @@ ONLY_FOR_ARCHS= i386 amd64 LINUX_RPM_ARCH= i386 USE_LINUX_PREFIX= yes NO_WRKSUBDIR= yes -MD5_FILE?= ${MASTERDIR}/distinfo.${LINUX_RPM_ARCH} +DISTINFO_FILE?= ${MASTERDIR}/distinfo.${LINUX_RPM_ARCH} PLIST_SUB= GLIBCVER="2.3.6" RPM2CPIO?= ${LOCALBASE}/bin/rpm2cpio diff --git a/emulators/linux_base-fc6/Makefile b/emulators/linux_base-fc6/Makefile index 74769b820940..18f40e6559ee 100644 --- a/emulators/linux_base-fc6/Makefile +++ b/emulators/linux_base-fc6/Makefile @@ -103,7 +103,7 @@ ONLY_FOR_ARCHS= i386 amd64 LINUX_RPM_ARCH= i386 USE_LINUX_PREFIX= yes NO_WRKSUBDIR= yes -MD5_FILE?= ${MASTERDIR}/distinfo.${LINUX_RPM_ARCH} +DISTINFO_FILE?= ${MASTERDIR}/distinfo.${LINUX_RPM_ARCH} PLIST_SUB= GLIBCVER="2.5" RPM2CPIO?= ${LOCALBASE}/bin/rpm2cpio diff --git a/emulators/mupen64-base/Makefile.common b/emulators/mupen64-base/Makefile.common index 18a4802f5cbe..ed375e50c602 100644 --- a/emulators/mupen64-base/Makefile.common +++ b/emulators/mupen64-base/Makefile.common @@ -73,7 +73,7 @@ EXTRACT_AFTER_ARGS+= ${DISTNAME}/rsp_hle .if ${PKGNAMESUFFIX} == "-glide" ALL_TARGET= plugins/Glide64.so -MD5_FILE= ${.CURDIR}/distinfo +DISTINFO_FILE= ${.CURDIR}/distinfo DISTNAME= ${PKGNAMESUFFIX:S/-//:S/$/64/}-${PORTVERSION:S/$/.SP8/} EXTRACT_AFTER_ARGS= | ${TAR} -xf - @@ -83,7 +83,7 @@ EXTRA_PATCHES= # .if ${PKGNAMESUFFIX} == "-tr64" ALL_TARGET= plugins/tr64gl.so -MD5_FILE= ${.CURDIR}/distinfo +DISTINFO_FILE= ${.CURDIR}/distinfo DISTNAME= ${PKGNAMESUFFIX:S/-//}_ogl_gtk2-${PORTVERSION} EXTRACT_AFTER_ARGS= | ${TAR} -xf - diff --git a/french/acroread8/Makefile b/french/acroread8/Makefile index 1d3da01c5cd4..b842c9567da4 100644 --- a/french/acroread8/Makefile +++ b/french/acroread8/Makefile @@ -8,7 +8,7 @@ CATEGORIES= french print linux MASTERDIR= ${.CURDIR}/../../print/acroread8 -MD5_FILE= ${.CURDIR}/distinfo +DISTINFO_FILE= ${.CURDIR}/distinfo ADOBE_LANG= FRA diff --git a/french/acroread9/Makefile b/french/acroread9/Makefile index 3e92816d6416..e3fb4237614e 100644 --- a/french/acroread9/Makefile +++ b/french/acroread9/Makefile @@ -8,7 +8,7 @@ CATEGORIES= french print linux MASTERDIR= ${.CURDIR}/../../print/acroread9 -MD5_FILE= ${.CURDIR}/distinfo +DISTINFO_FILE= ${.CURDIR}/distinfo ADOBE_LANG= FRA diff --git a/french/aster/bsd.aster.mk b/french/aster/bsd.aster.mk index 7d5716683132..b536ee3d5e0a 100644 --- a/french/aster/bsd.aster.mk +++ b/french/aster/bsd.aster.mk @@ -9,7 +9,7 @@ DISTVERSIONPREFIX= full-src- DISTVERSIONSUFFIX= .noarch MASTER_SITES= http://www.code-aster.org/V2/UPLOAD/DOC/Telechargement/ DISTNAME= aster-${DISTVERSIONPREFIX}${ASTER_DISTVERSION}${DISTVERSIONSUFFIX} -MD5_FILE= ${.CURDIR}/../../french/aster/distinfo +DISTINFO_FILE= ${.CURDIR}/../../french/aster/distinfo ASTER_VER= 10.2.0 ASTER_DISTVERSION= ${ASTER_VER}-2 diff --git a/french/mozilla-flp/Makefile b/french/mozilla-flp/Makefile index 6eaa204cf7df..5a3da5c402cb 100644 --- a/french/mozilla-flp/Makefile +++ b/french/mozilla-flp/Makefile @@ -47,7 +47,7 @@ PLIST_SUB+= MOZ="" .else MOZVERSION= 1.1.18 DISTURL= /SeaMonkey -MD5_FILE= ${MASTERDIR}/distinfo.seamonkey +DISTINFO_FILE= ${MASTERDIR}/distinfo.seamonkey PLIST_SUB+= MOZ="@comment " .endif diff --git a/games/gnushogi/Makefile.common b/games/gnushogi/Makefile.common index b3815b54bed2..0ab9ac7b840e 100644 --- a/games/gnushogi/Makefile.common +++ b/games/gnushogi/Makefile.common @@ -8,4 +8,4 @@ GNUSHOGI_MASTER_SITES= ${MASTER_SITE_GNU} GNUSHOGI_MASTER_SITE_SUBDIR= ${GNUSHOGI_PORTNAME} GNUSHOGI_DISTNAME= ${GNUSHOGI_PORTNAME}-${GNUSHOGI_PORTVERSION} -MD5_FILE= ${.CURDIR}/../../games/gnushogi/distinfo +DISTINFO_FILE= ${.CURDIR}/../../games/gnushogi/distinfo diff --git a/german/acroread8/Makefile b/german/acroread8/Makefile index 654e30cdf138..d897d27eb6f4 100644 --- a/german/acroread8/Makefile +++ b/german/acroread8/Makefile @@ -8,7 +8,7 @@ CATEGORIES= german print linux MASTERDIR= ${.CURDIR}/../../print/acroread8 -MD5_FILE= ${.CURDIR}/distinfo +DISTINFO_FILE= ${.CURDIR}/distinfo ADOBE_LANG= DEU diff --git a/german/acroread9/Makefile b/german/acroread9/Makefile index 64841f8d59d5..3f9d390b3891 100644 --- a/german/acroread9/Makefile +++ b/german/acroread9/Makefile @@ -8,7 +8,7 @@ CATEGORIES= german print linux MASTERDIR= ${.CURDIR}/../../print/acroread9 -MD5_FILE= ${.CURDIR}/distinfo +DISTINFO_FILE= ${.CURDIR}/distinfo ADOBE_LANG= DEU diff --git a/graphics/linux-gdk-pixbuf/Makefile b/graphics/linux-gdk-pixbuf/Makefile index e8a8e85baf9e..0bdeb6914d26 100644 --- a/graphics/linux-gdk-pixbuf/Makefile +++ b/graphics/linux-gdk-pixbuf/Makefile @@ -21,6 +21,6 @@ LINUX_DIST_VER= 4 ONLY_FOR_ARCHS= i386 amd64 USE_LDCONFIG= yes PLIST_SUB= VERSION=${PORTVERSION:C/^([^\.]+\.[^\.]+\.[^\.]+).+/\1/} -MD5_FILE?= ${PKGDIR}/distinfo +DISTINFO_FILE?= ${PKGDIR}/distinfo .include <bsd.port.mk> diff --git a/graphics/linux-sdl_image/Makefile b/graphics/linux-sdl_image/Makefile index 35303049b5b3..eac9fca2db96 100644 --- a/graphics/linux-sdl_image/Makefile +++ b/graphics/linux-sdl_image/Makefile @@ -25,7 +25,7 @@ INSTALL_SHLIB= yes ONLY_FOR_ARCHS= i386 amd64 DIST_SUBDIR= rpm PLIST_SUB+= SDLIMVER=${PORTVERSION} -MD5_FILE= ${PKGDIR}/distinfo +DISTINFO_FILE= ${PKGDIR}/distinfo LINUX_NAME= SDL_image PLIST_FILES= usr/lib/libSDL_image-1.2.so.0 usr/lib/libSDL_image-1.2.so.0.1.4 diff --git a/japanese/acroread8/Makefile b/japanese/acroread8/Makefile index a7fb8773b9a1..78037d6758c8 100644 --- a/japanese/acroread8/Makefile +++ b/japanese/acroread8/Makefile @@ -8,7 +8,7 @@ CATEGORIES= japanese print MASTERDIR= ${.CURDIR}/../../print/acroread8 -MD5_FILE= ${.CURDIR}/distinfo +DISTINFO_FILE= ${.CURDIR}/distinfo ADOBE_LANG= JPN diff --git a/japanese/acroread9/Makefile b/japanese/acroread9/Makefile index c6afed8a57ca..2d86bd971873 100644 --- a/japanese/acroread9/Makefile +++ b/japanese/acroread9/Makefile @@ -8,7 +8,7 @@ CATEGORIES= japanese print MASTERDIR= ${.CURDIR}/../../print/acroread9 -MD5_FILE= ${.CURDIR}/distinfo +DISTINFO_FILE= ${.CURDIR}/distinfo ADOBE_LANG= JPN diff --git a/japanese/ical/Makefile b/japanese/ical/Makefile index 7ccef100b98e..9386a46984de 100644 --- a/japanese/ical/Makefile +++ b/japanese/ical/Makefile @@ -26,7 +26,7 @@ LIB_DEPENDS= tk80jp:${PORTSDIR}/japanese/tk80 EXTRA_PATCHES= ${.CURDIR}/files/patch-* MASTERDIR= ${.CURDIR}/../../deskutils/ical -MD5_FILE= ${.CURDIR}/distinfo +DISTINFO_FILE= ${.CURDIR}/distinfo USE_XORG= x11 GNU_CONFIGURE= yes diff --git a/japanese/kanji26/Makefile b/japanese/kanji26/Makefile index 24209ad2f3e6..c64b73965d70 100644 --- a/japanese/kanji26/Makefile +++ b/japanese/kanji26/Makefile @@ -12,7 +12,7 @@ DISTFILES?= 793.gz 794.gz 795.gz 796.gz 797.gz 798.gz 799.gz \ FILESDIR= ${.CURDIR}/files PKGDIR= ${.CURDIR} MASTERDIR= ${.CURDIR}/../kanji18 -MD5_FILE= ${.CURDIR}/distinfo +DISTINFO_FILE= ${.CURDIR}/distinfo README_FILE?= 793.gz RESIZESED_FILE?= 26to24.sed RESIZED_ALIAS_FILE?= kanji24.alias diff --git a/japanese/p5-Text-ChaSen/Makefile b/japanese/p5-Text-ChaSen/Makefile index 3eec070069f3..dc8c33b00cfe 100644 --- a/japanese/p5-Text-ChaSen/Makefile +++ b/japanese/p5-Text-ChaSen/Makefile @@ -17,7 +17,7 @@ COMMENT= ChaSen library module for Perl5 LIB_DEPENDS= chasen.2:${PORTSDIR}/japanese/chasen-base -MD5_FILE= ${.CURDIR}/../chasen-base/distinfo +DISTINFO_FILE= ${.CURDIR}/../chasen-base/distinfo CHASEN_VERSION= 2.4.4 diff --git a/japanese/roundcube/Makefile b/japanese/roundcube/Makefile index ea8c19f9fcdf..29c5228b7ee1 100644 --- a/japanese/roundcube/Makefile +++ b/japanese/roundcube/Makefile @@ -15,7 +15,7 @@ MAINTAINER= nork@FreeBSD.org CONFLICTS= roundcube-[0-9]* MASTERDIR= ${.CURDIR}/../../mail/roundcube -MD5_FILE= ${.CURDIR}/distinfo +DISTINFO_FILE= ${.CURDIR}/distinfo BROKEN= bad distinfo diff --git a/japanese/ruby-man/Makefile b/japanese/ruby-man/Makefile index 63182d792a78..85928cd0f3af 100644 --- a/japanese/ruby-man/Makefile +++ b/japanese/ruby-man/Makefile @@ -12,7 +12,7 @@ CATEGORIES= japanese MAINTAINER= ruby@FreeBSD.org COMMENT= Ruby reference manual (Japanese version), in HTML format -MD5_FILE= ${.CURDIR}/distinfo +DISTINFO_FILE= ${.CURDIR}/distinfo PKGDIR= ${.CURDIR} LANGSUFFIX= -jp diff --git a/korean/acroread8/Makefile b/korean/acroread8/Makefile index 7c8496133066..7c018d9feb20 100644 --- a/korean/acroread8/Makefile +++ b/korean/acroread8/Makefile @@ -8,7 +8,7 @@ CATEGORIES= korean print linux MASTERDIR= ${.CURDIR}/../../print/acroread8 -MD5_FILE= ${.CURDIR}/distinfo +DISTINFO_FILE= ${.CURDIR}/distinfo ADOBE_LANG= KOR diff --git a/lang/php_doc/Makefile b/lang/php_doc/Makefile index b9699c0ec050..a618b7265e29 100644 --- a/lang/php_doc/Makefile +++ b/lang/php_doc/Makefile @@ -76,14 +76,13 @@ do-install: # Download the files from http://au.php.net/distributions/manual/ # makesum: - @> ${MD5_FILE} + @> ${DISTINFO_FILE} .for l in ${PHP_LANGS} @f=php_manual_${l}-${PORTVERSION}${EXTRACT_SUFX}; \ ${ECHO_CMD} makesum on $${f}; \ cd ${DISTDIR}; \ - ${MD5} $${f} >> ${MD5_FILE}; \ - ${SHA256} $${f} >> ${MD5_FILE}; \ - ${ECHO_CMD} "SIZE ($${f}) = "`${LS} -ALln $${f} | ${AWK} '{print $$5}'` >> ${MD5_FILE} + ${SHA256} $${f} >> ${DISTINFO_FILE}; \ + ${ECHO_CMD} "SIZE ($${f}) = "`${LS} -ALln $${f} | ${AWK} '{print $$5}'` >> ${DISTINFO_FILE} .endfor fetchdist: diff --git a/math/dislin/Makefile b/math/dislin/Makefile index 717c1783009d..294e662d504c 100644 --- a/math/dislin/Makefile +++ b/math/dislin/Makefile @@ -24,7 +24,7 @@ USE_XORG= x11 NO_BUILD= yes WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} -MD5_FILE= ${MASTERDIR}/distinfo${BINVER} +DISTINFO_FILE= ${MASTERDIR}/distinfo${BINVER} PLIST_SUB+= VER=${PORTVERSION} MAJ=${MAJ} SUB_FILES= dislin.sh pkg-message SUB_LIST+= DISLIN_DIR=${DISLIN_DIR} diff --git a/math/vtk-data/Makefile b/math/vtk-data/Makefile index 52b5c4dca4bb..d7cd3bea15dc 100644 --- a/math/vtk-data/Makefile +++ b/math/vtk-data/Makefile @@ -12,7 +12,7 @@ COMMENT= The Visualization Toolkit examples data MASTERDIR= ${.CURDIR}/../vtk -MD5_FILE= ${.CURDIR}/distinfo +DISTINFO_FILE= ${.CURDIR}/distinfo WRKSRC= ${WRKDIR}/VTKData-release-${PORTVERSION} SUB_FILES= pkg-message PKGMESSAGE= ${WRKDIR}/pkg-message diff --git a/misc/dnetc/Makefile b/misc/dnetc/Makefile index 3c580d91e93c..82909e8d9f3f 100644 --- a/misc/dnetc/Makefile +++ b/misc/dnetc/Makefile @@ -21,7 +21,7 @@ COMMENT= Distributed.net distributed computing project client # These are architecture dependent WRKSRC= ${WRKDIR}/dnetc${PORTVERSION:E}-freebsd-${ARCH:S/i386/x86/}-elf -MD5_FILE= ${MASTERDIR}/distinfo.${ARCH} +DISTINFO_FILE= ${MASTERDIR}/distinfo.${ARCH} ONLY_FOR_ARCHS= i386 sparc64 amd64 diff --git a/net-im/licq/Makefile.inc b/net-im/licq/Makefile.inc index 2e60c902fdc3..7fd6387973ee 100644 --- a/net-im/licq/Makefile.inc +++ b/net-im/licq/Makefile.inc @@ -13,7 +13,7 @@ MASTER_SITES= SF/licq/licq/${LICQ_VER} DISTNAME= ${PKGNAMEPREFIX}${LICQ_VER} DISTFILES= ${DISTNAME}.tar.bz2 GNU_CONFIGURE= yes -MD5_FILE?= ${PORTSDIR}/${LICQ_PORT}/distinfo +DISTINFO_FILE?= ${PORTSDIR}/${LICQ_PORT}/distinfo USE_GMAKE= yes USE_BZIP2= yes WRKSRC?= ${WRKDIR}/${DISTNAME}/plugins/${PORTNAME} diff --git a/net-p2p/libtorrent-devel/Makefile b/net-p2p/libtorrent-devel/Makefile index db60a028aa31..3067b2b150e7 100644 --- a/net-p2p/libtorrent-devel/Makefile +++ b/net-p2p/libtorrent-devel/Makefile @@ -15,7 +15,7 @@ COMMENT= BitTorrent Library written in C++ (development version) MASTERDIR= ${.CURDIR}/../libtorrent PATCHDIR= ${.CURDIR}/files/ -MD5_FILE= ${.CURDIR}/distinfo +DISTINFO_FILE= ${.CURDIR}/distinfo PLIST= ${.CURDIR}/pkg-plist DESCR= ${MASTERDIR}/pkg-descr diff --git a/net-p2p/rtorrent-devel/Makefile b/net-p2p/rtorrent-devel/Makefile index 81e1f97ce6f9..06ba3d53c813 100644 --- a/net-p2p/rtorrent-devel/Makefile +++ b/net-p2p/rtorrent-devel/Makefile @@ -18,7 +18,7 @@ RUN_DEPENDS= libtorrent-devel=0.12.6_1:${PORTSDIR}/net-p2p/libtorrent-devel MASTERDIR= ${.CURDIR}/../rtorrent PATCHDIR= ${.CURDIR}/files/ -MD5_FILE= ${.CURDIR}/distinfo +DISTINFO_FILE= ${.CURDIR}/distinfo PLIST= ${.CURDIR}/pkg-plist DESCR= ${MASTERDIR}/pkg-descr diff --git a/net/AquaGatekeeper/Makefile b/net/AquaGatekeeper/Makefile index cd0b799b7a6f..d6dd6e53d193 100644 --- a/net/AquaGatekeeper/Makefile +++ b/net/AquaGatekeeper/Makefile @@ -20,7 +20,7 @@ WRKSRC= ${WRKDIR}/${PORTNAME} CONFLICTS= AquaGatekeeper-2.* NO_BUILD= yes ONLY_FOR_ARCHS= amd64 i386 -MD5_FILE= ${MASTERDIR}/distinfo.${ARCH} +DISTINFO_FILE= ${MASTERDIR}/distinfo.${ARCH} RESTRICTED= No commercial redistribution SUB_FILES= pkg-message diff --git a/net/AquaGatekeeper2/Makefile b/net/AquaGatekeeper2/Makefile index 3ca34662241a..0be425ebd06c 100644 --- a/net/AquaGatekeeper2/Makefile +++ b/net/AquaGatekeeper2/Makefile @@ -21,7 +21,7 @@ CONFLICTS= AquaGatekeeper-1.* LATEST_LINK= ${PKGNAMEPREFIX}${PORTNAME}2${PKGNAMESUFFIX} NO_BUILD= yes ONLY_FOR_ARCHS= amd64 i386 -MD5_FILE= ${MASTERDIR}/distinfo.${ARCH} +DISTINFO_FILE= ${MASTERDIR}/distinfo.${ARCH} RESTRICTED= No commercial redistribution SUB_FILES= pkg-message diff --git a/net/iwi-firmware-kmod/Makefile b/net/iwi-firmware-kmod/Makefile index a82a5edbec2f..2536953250fb 100644 --- a/net/iwi-firmware-kmod/Makefile +++ b/net/iwi-firmware-kmod/Makefile @@ -13,7 +13,7 @@ MAINTAINER= flz@FreeBSD.org COMMENT= Intel PRO/Wireless 2200 Firmware Kernel Module MASTERDIR= ${.CURDIR}/../ipw-firmware-kmod -MD5_FILE= ${.CURDIR}/distinfo +DISTINFO_FILE= ${.CURDIR}/distinfo PLIST= ${.CURDIR}/pkg-plist DESCR= ${.CURDIR}/pkg-descr diff --git a/net/iwi-firmware/Makefile b/net/iwi-firmware/Makefile index 5e019a38bb81..300a4aa9d155 100644 --- a/net/iwi-firmware/Makefile +++ b/net/iwi-firmware/Makefile @@ -15,7 +15,7 @@ MAINTAINER= flz@FreeBSD.org COMMENT= Intel PRO/Wireless 2200 Driver Firmware MASTERDIR= ${.CURDIR}/../ipw-firmware -MD5_FILE= ${.CURDIR}/distinfo +DISTINFO_FILE= ${.CURDIR}/distinfo PLIST= ${.CURDIR}/pkg-plist DESCR= ${.CURDIR}/pkg-descr FILESDIR= ${.CURDIR}/files diff --git a/ports-mgmt/portlint/src/portlint.pl b/ports-mgmt/portlint/src/portlint.pl index fa880bf2c3ae..47bc79c8a396 100644 --- a/ports-mgmt/portlint/src/portlint.pl +++ b/ports-mgmt/portlint/src/portlint.pl @@ -195,7 +195,7 @@ my @varlist = qw( DISTNAME DISTFILES CATEGORIES MASTERDIR MAINTAINER MASTER_SITES WRKDIR WRKSRC NO_WRKSUBDIR PATCHDIR SCRIPTDIR FILESDIR PKGDIR COMMENT DESCR PLIST PKGCATEGORY PKGINSTALL PKGDEINSTALL - PKGREQ PKGMESSAGE MD5_FILE .CURDIR USE_LDCONFIG USE_AUTOTOOLS + PKGREQ PKGMESSAGE DISTINFO_FILE .CURDIR USE_LDCONFIG USE_AUTOTOOLS INDEXFILE PKGORIGIN CONFLICTS PKG_VERSION PKGINSTALLVER PLIST_FILES OPTIONS INSTALLS_OMF USE_GETTEXT USE_RC_SUBR DIST_SUBDIR ALLFILES IGNOREFILES CHECKSUM_ALGORITHMS INSTALLS_ICONS @@ -269,11 +269,11 @@ close(IN); # # check for files. # -my @checker = ($makevar{DESCR}, 'Makefile', $makevar{MD5_FILE}); +my @checker = ($makevar{DESCR}, 'Makefile', $makevar{DISTINFO_FILE}); my %checker = ( $makevar{DESCR} => \&checkdescr, 'Makefile' => \&checkmakefile, - $makevar{MD5_FILE} => \&checkdistinfo + $makevar{DISTINFO_FILE} => \&checkdistinfo ); if ($extrafile) { my @files = ( @@ -311,7 +311,7 @@ foreach my $i (<$makevar{PATCHDIR}/patch-*>) { foreach my $i (@checker) { print "OK: checking $i.\n" if ($verbose); if (! -f "$i") { - &perror("FATAL", "", -1, "no $i in \"$portdir\".") unless $i eq $makevar{MD5_FILE} && $makevar{DISTFILES} eq ""; + &perror("FATAL", "", -1, "no $i in \"$portdir\".") unless $i eq $makevar{DISTINFO_FILE} && $makevar{DISTFILES} eq ""; } else { my $proc = $checker{$i}; &$proc($i) || &perror("", "", -1, "Cannot open the file $i\n"); diff --git a/portuguese/acroread8/Makefile b/portuguese/acroread8/Makefile index f941e454c676..9a157ea1068b 100644 --- a/portuguese/acroread8/Makefile +++ b/portuguese/acroread8/Makefile @@ -9,7 +9,7 @@ CATEGORIES= portuguese print linux PKGNAMEPREFIX= pt_BR- MASTERDIR= ${.CURDIR}/../../print/acroread8 -MD5_FILE= ${.CURDIR}/distinfo +DISTINFO_FILE= ${.CURDIR}/distinfo ADOBE_LANG= PTB diff --git a/print/bjfiltercom/Makefile b/print/bjfiltercom/Makefile index ebb25531ca4c..106a5bbcd889 100644 --- a/print/bjfiltercom/Makefile +++ b/print/bjfiltercom/Makefile @@ -36,7 +36,7 @@ PLIST_SUB+= PORTVERSION=${PORTVERSION}${_SUF1}${_SUF2} DIST_SUBDIR= bjfilter PLIST= ${.CURDIR}/pkg-plist DESCR= ${.CURDIR}/pkg-descr -MD5_FILE= ${.CURDIR}/distinfo +DISTINFO_FILE= ${.CURDIR}/distinfo ONLY_FOR_ARCHS= i386 USE_LINUX= yes NO_MTREE= yes diff --git a/print/dk-acroread8/Makefile b/print/dk-acroread8/Makefile index d243f3a5f676..aa9446a06ee5 100644 --- a/print/dk-acroread8/Makefile +++ b/print/dk-acroread8/Makefile @@ -8,7 +8,7 @@ PKGNAMEPREFIX= dk- MASTERDIR= ${.CURDIR}/../../print/acroread8 -MD5_FILE= ${.CURDIR}/distinfo +DISTINFO_FILE= ${.CURDIR}/distinfo ADOBE_LANG= DAN diff --git a/print/es-acroread8/Makefile b/print/es-acroread8/Makefile index 146bac20a28f..5e9e9040afd5 100644 --- a/print/es-acroread8/Makefile +++ b/print/es-acroread8/Makefile @@ -8,7 +8,7 @@ PKGNAMEPREFIX= es- MASTERDIR= ${.CURDIR}/../../print/acroread8 -MD5_FILE= ${.CURDIR}/distinfo +DISTINFO_FILE= ${.CURDIR}/distinfo ADOBE_LANG= ESP diff --git a/print/fi-acroread8/Makefile b/print/fi-acroread8/Makefile index 3592a7881533..ce421bb4720d 100644 --- a/print/fi-acroread8/Makefile +++ b/print/fi-acroread8/Makefile @@ -8,7 +8,7 @@ PKGNAMEPREFIX= fi- MASTERDIR= ${.CURDIR}/../../print/acroread8 -MD5_FILE= ${.CURDIR}/distinfo +DISTINFO_FILE= ${.CURDIR}/distinfo ADOBE_LANG= SUO diff --git a/print/it-acroread8/Makefile b/print/it-acroread8/Makefile index 4524ed183d14..01ff869cad96 100644 --- a/print/it-acroread8/Makefile +++ b/print/it-acroread8/Makefile @@ -8,7 +8,7 @@ PKGNAMEPREFIX= it- MASTERDIR= ${.CURDIR}/../acroread8 -MD5_FILE= ${.CURDIR}/distinfo +DISTINFO_FILE= ${.CURDIR}/distinfo ADOBE_LANG= ITA diff --git a/print/kdeutils4-printer-applet/Makefile b/print/kdeutils4-printer-applet/Makefile index 0991d3c0086e..9dd21876353e 100644 --- a/print/kdeutils4-printer-applet/Makefile +++ b/print/kdeutils4-printer-applet/Makefile @@ -26,7 +26,7 @@ USE_KDE4= kdeprefix pimlibs automoc4 pykde4 pykdeuic4 USE_QT_VER= 4 QT_COMPONENTS= qmake_build moc_build uic_build rcc_build USE_PYTHON= 2.5+ -MD5_FILE= ${PORTSDIR}/misc/kdeutils4/distinfo +DISTINFO_FILE= ${PORTSDIR}/misc/kdeutils4/distinfo CMAKE_ARGS+= -DINSTALL_PRINTER_APPLET:Bool=On BUILD_WRKSRC= ${WRKSRC}/${PORTNAME} diff --git a/print/nl-acroread8/Makefile b/print/nl-acroread8/Makefile index aa1af4dae9e4..0a13aeda6b34 100644 --- a/print/nl-acroread8/Makefile +++ b/print/nl-acroread8/Makefile @@ -8,7 +8,7 @@ PKGNAMEPREFIX= nl- MASTERDIR= ${.CURDIR}/../../print/acroread8 -MD5_FILE= ${.CURDIR}/distinfo +DISTINFO_FILE= ${.CURDIR}/distinfo ADOBE_LANG= NLD diff --git a/print/no-acroread8/Makefile b/print/no-acroread8/Makefile index 8884d079892a..16237631d14b 100644 --- a/print/no-acroread8/Makefile +++ b/print/no-acroread8/Makefile @@ -8,7 +8,7 @@ PKGNAMEPREFIX= no- MASTERDIR= ${.CURDIR}/../../print/acroread8 -MD5_FILE= ${.CURDIR}/distinfo +DISTINFO_FILE= ${.CURDIR}/distinfo ADOBE_LANG= NOR diff --git a/print/pips800/Makefile.pips b/print/pips800/Makefile.pips index 35d11e6deb4d..6205bba5df20 100644 --- a/print/pips800/Makefile.pips +++ b/print/pips800/Makefile.pips @@ -71,7 +71,7 @@ ONLY_FOR_ARCHS= i386 PKGNAMESUFFIX= -cups .endif DISTNAME= ${PORTNAME}${PKGNAMESUFFIX}-${PORTVERSION} -MD5_FILE= ${.CURDIR}/distinfo +DISTINFO_FILE= ${.CURDIR}/distinfo DESCR= ${.CURDIR}/pkg-descr GNU_CONFIGURE= yes diff --git a/print/sv-acroread8/Makefile b/print/sv-acroread8/Makefile index a325c2ab089a..b9ac4b2707b7 100644 --- a/print/sv-acroread8/Makefile +++ b/print/sv-acroread8/Makefile @@ -8,7 +8,7 @@ PKGNAMEPREFIX= sv- MASTERDIR= ${.CURDIR}/../../print/acroread8 -MD5_FILE= ${.CURDIR}/distinfo +DISTINFO_FILE= ${.CURDIR}/distinfo ADOBE_LANG= SVE diff --git a/print/system-config-printer-kde/Makefile b/print/system-config-printer-kde/Makefile index fda36529d384..b7e7e63b3445 100644 --- a/print/system-config-printer-kde/Makefile +++ b/print/system-config-printer-kde/Makefile @@ -25,7 +25,7 @@ USE_KDE4= kdeprefix pimlibs automoc4 pykde4 pykdeuic4 USE_QT_VER= 4 QT_COMPONENTS= qmake_build moc_build uic_build rcc_build USE_PYTHON= 2.5+ -MD5_FILE= ${PORTSDIR}/sysutils/kdeadmin4/distinfo +DISTINFO_FILE= ${PORTSDIR}/sysutils/kdeadmin4/distinfo CMAKE_ARGS+= -DINSTALL_SYSTEM_CONFIG_PRINTER:BOOL=On BUILD_WRKSRC= ${WRKSRC}/${PORTNAME} diff --git a/security/cyrus-sasl2-ldapdb/Makefile b/security/cyrus-sasl2-ldapdb/Makefile index 97a52f55f9f8..1dcf1a9e4ee3 100644 --- a/security/cyrus-sasl2-ldapdb/Makefile +++ b/security/cyrus-sasl2-ldapdb/Makefile @@ -22,7 +22,7 @@ COMMENT= SASL LDAPDB auxprop plugin LIB_DEPENDS= sasl2.2:${PORTSDIR}/security/cyrus-sasl2 CYRUS_SASL2_DIR=${MASTERDIR}/../cyrus-sasl2 -MD5_FILE= ${CYRUS_SASL2_DIR}/distinfo +DISTINFO_FILE= ${CYRUS_SASL2_DIR}/distinfo PATCHDIR= ${CYRUS_SASL2_DIR}/files INSTALL_WRKSRC= ${WRKDIR}/${DISTNAME}/plugins diff --git a/security/cyrus-sasl2-saslauthd/Makefile b/security/cyrus-sasl2-saslauthd/Makefile index 9feef81d7e68..9b0a8ba2b247 100644 --- a/security/cyrus-sasl2-saslauthd/Makefile +++ b/security/cyrus-sasl2-saslauthd/Makefile @@ -22,7 +22,7 @@ COMMENT= SASL authentication server for cyrus-sasl2 LIB_DEPENDS= sasl2.2:${PORTSDIR}/security/cyrus-sasl2 CYRUS_SASL2_DIR=${MASTERDIR}/../cyrus-sasl2 -MD5_FILE= ${CYRUS_SASL2_DIR}/distinfo +DISTINFO_FILE= ${CYRUS_SASL2_DIR}/distinfo PATCHDIR= ${CYRUS_SASL2_DIR}/files INSTALL_WRKSRC= ${WRKDIR}/${DISTNAME}/saslauthd DOCSDIR= ${PREFIX}/share/doc/cyrus-sasl2 diff --git a/sysutils/rsyslog3/bsd.rsyslog.mk b/sysutils/rsyslog3/bsd.rsyslog.mk index ee4362e29fdf..db42e31c3242 100644 --- a/sysutils/rsyslog3/bsd.rsyslog.mk +++ b/sysutils/rsyslog3/bsd.rsyslog.mk @@ -20,7 +20,7 @@ RUN_DEPENDS= rsyslog>=${PORTVERSION}:${PORTSDIR}/sysutils/rsyslog3 PLIST_FILES= ${MTYPES:S|^|lib/rsyslog/|:S|$|${MNAME}.so|} PLIST= "" DESCR?= ${.CURDIR}/../rsyslog3/pkg-descr -MD5_FILE?= ${.CURDIR}/../rsyslog3/distinfo +DISTINFO_FILE?= ${.CURDIR}/../rsyslog3/distinfo do-install: @${INSTALL} -d ${PREFIX}/lib/rsyslog/ diff --git a/sysutils/rsyslog4-devel/Makefile b/sysutils/rsyslog4-devel/Makefile index b8fba6a76ff4..d37cab069c94 100644 --- a/sysutils/rsyslog4-devel/Makefile +++ b/sysutils/rsyslog4-devel/Makefile @@ -82,7 +82,7 @@ IGNORE= with gssapi module is only supported on FreeBSD 7.x or later CONFIGURE_ARGS+= --disable-rsyslogd --disable-klog DESCR?= ${.CURDIR}/../rsyslog4-devel/pkg-descr -MD5_FILE?= ${.CURDIR}/../rsyslog4-devel/distinfo +DISTINFO_FILE?= ${.CURDIR}/../rsyslog4-devel/distinfo .endif .include <bsd.port.post.mk> diff --git a/sysutils/rsyslog4/Makefile b/sysutils/rsyslog4/Makefile index ce5d79916d3e..05c5a56e7dcb 100644 --- a/sysutils/rsyslog4/Makefile +++ b/sysutils/rsyslog4/Makefile @@ -82,7 +82,7 @@ IGNORE= with gssapi module is only supported on FreeBSD 7.x or later CONFIGURE_ARGS+= --disable-rsyslogd --disable-klog DESCR?= ${.CURDIR}/../rsyslog4/pkg-descr -MD5_FILE?= ${.CURDIR}/../rsyslog4/distinfo +DISTINFO_FILE?= ${.CURDIR}/../rsyslog4/distinfo .endif .include <bsd.port.post.mk> diff --git a/sysutils/rsyslog5-devel/Makefile b/sysutils/rsyslog5-devel/Makefile index d572cfdb2a0b..fa4446833526 100644 --- a/sysutils/rsyslog5-devel/Makefile +++ b/sysutils/rsyslog5-devel/Makefile @@ -78,7 +78,7 @@ IGNORE= with gssapi module is only supported on FreeBSD 7.x or later CONFIGURE_ARGS+= --disable-rsyslogd --disable-klog DESCR?= ${.CURDIR}/../rsyslog5-devel/pkg-descr -MD5_FILE?= ${.CURDIR}/../rsyslog5-devel/distinfo +DISTINFO_FILE?= ${.CURDIR}/../rsyslog5-devel/distinfo .endif .if ${OSVERSION} < 700042 diff --git a/sysutils/rsyslog5/Makefile b/sysutils/rsyslog5/Makefile index de708447aa48..f0bf19df0eac 100644 --- a/sysutils/rsyslog5/Makefile +++ b/sysutils/rsyslog5/Makefile @@ -86,7 +86,7 @@ IGNORE= with gssapi module is only supported on FreeBSD 7.x or later CONFIGURE_ARGS+= --disable-rsyslogd --disable-klog DESCR?= ${.CURDIR}/../rsyslog5/pkg-descr -MD5_FILE?= ${.CURDIR}/../rsyslog5/distinfo +DISTINFO_FILE?= ${.CURDIR}/../rsyslog5/distinfo .endif .if ${OSVERSION} < 700042 diff --git a/sysutils/rsyslog6-devel/Makefile b/sysutils/rsyslog6-devel/Makefile index 57a506b7631d..038180846b5e 100644 --- a/sysutils/rsyslog6-devel/Makefile +++ b/sysutils/rsyslog6-devel/Makefile @@ -87,7 +87,7 @@ IGNORE= with gssapi module is only supported on FreeBSD 7.x or later CONFIGURE_ARGS+= --disable-rsyslogd --disable-klog DESCR?= ${.CURDIR}/../rsyslog6-devel/pkg-descr -MD5_FILE?= ${.CURDIR}/../rsyslog6-devel/distinfo +DISTINFO_FILE?= ${.CURDIR}/../rsyslog6-devel/distinfo .endif .if ${OSVERSION} < 700042 diff --git a/textproc/jdictionary/Makefile.plugin b/textproc/jdictionary/Makefile.plugin index 81762f228a1b..09dfd4a66fa3 100644 --- a/textproc/jdictionary/Makefile.plugin +++ b/textproc/jdictionary/Makefile.plugin @@ -25,7 +25,7 @@ NO_BUILD= yes DATADIR= ${JAVASHAREDIR}/jdictionary/Plugins PLIST= ${MASTERDIR}/pkg-plist.plugin -MD5_FILE= ${.CURDIR}/distinfo +DISTINFO_FILE= ${.CURDIR}/distinfo DESCR= ${.CURDIR}/pkg-descr PLIST_SUB+= DISTNAME=${DISTNAME} diff --git a/textproc/linux-aspell/Makefile b/textproc/linux-aspell/Makefile index b3967290246f..ee0d4a12b145 100644 --- a/textproc/linux-aspell/Makefile +++ b/textproc/linux-aspell/Makefile @@ -27,7 +27,7 @@ USE_LINUX_RPM= yes ONLY_FOR_ARCHS= i386 amd64 LINUX_DIST_VER= 4 USE_GMAKE= yes -MD5_FILE= ${MASTERDIR}/distinfo +DISTINFO_FILE= ${MASTERDIR}/distinfo DIST_SUBDIR= rpm BRANDELF_DIRS= usr/bin diff --git a/textproc/linux-scim-gtk/Makefile b/textproc/linux-scim-gtk/Makefile index abb643e77e86..fd5c8e0b3e8d 100644 --- a/textproc/linux-scim-gtk/Makefile +++ b/textproc/linux-scim-gtk/Makefile @@ -26,7 +26,7 @@ USE_LINUX_RPM= yes USE_LINUX_APPS= gtk2 scimlibs USE_LDCONFIG= yes PLIST_SUB= LINUX_RPM_ARCH=${LINUX_RPM_ARCH} -MD5_FILE= ${PKGDIR}/distinfo.${LINUX_RPM_ARCH}.fc${LINUX_DIST_VER} +DISTINFO_FILE= ${PKGDIR}/distinfo.${LINUX_RPM_ARCH}.fc${LINUX_DIST_VER} .if defined(OVERRIDE_LINUX_BASE_PORT) && ${OVERRIDE_LINUX_BASE_PORT} == f8 PORTVERSION= 1.4.7 diff --git a/textproc/linux-scim-libs/Makefile b/textproc/linux-scim-libs/Makefile index 0533e34e1b20..67bf06d173b4 100644 --- a/textproc/linux-scim-libs/Makefile +++ b/textproc/linux-scim-libs/Makefile @@ -27,7 +27,7 @@ USE_LINUX_APPS= gtk2 USE_LDCONFIG= yes PLIST_SUB= LINUX_RPM_ARCH=${LINUX_RPM_ARCH} PLIST= ${PKGDIR}/pkg-plist.fc${LINUX_DIST_VER} -MD5_FILE= ${PKGDIR}/distinfo.${LINUX_RPM_ARCH}.fc${LINUX_DIST_VER} +DISTINFO_FILE= ${PKGDIR}/distinfo.${LINUX_RPM_ARCH}.fc${LINUX_DIST_VER} .if defined(OVERRIDE_LINUX_BASE_PORT) && ${OVERRIDE_LINUX_BASE_PORT} == f8 PORTVERSION= 1.4.7 diff --git a/textproc/py-expat/Makefile b/textproc/py-expat/Makefile index 6b2abcc2efda..810c3f855599 100644 --- a/textproc/py-expat/Makefile +++ b/textproc/py-expat/Makefile @@ -26,7 +26,7 @@ USE_PYDISTUTILS=yes PYDISTUTILS_PKGNAME= pyexpat PYDISTUTILS_PKGVERSION= 0.0.0 WRKSRC= ${PYTHON_WRKSRC}/Modules -MD5_FILE= ${PORTSDIR}/lang/python${PYTHON_SUFFIX}/distinfo +DISTINFO_FILE= ${PORTSDIR}/lang/python${PYTHON_SUFFIX}/distinfo post-extract: @${CP} ${FILESDIR}/setup.py ${WRKSRC} diff --git a/www/mod_pubcookie/Makefile b/www/mod_pubcookie/Makefile index 71c8665ea857..7354b759f3d1 100644 --- a/www/mod_pubcookie/Makefile +++ b/www/mod_pubcookie/Makefile @@ -20,7 +20,7 @@ MAKE_JOBS_UNSAFE= yes CONFLICTS= pubcookie-login-server-[0-9]* FILESDIR= ${.CURDIR}/../pubcookie-login-server/files -MD5_FILE= ${.CURDIR}/../pubcookie-login-server/distinfo +DISTINFO_FILE= ${.CURDIR}/../pubcookie-login-server/distinfo PATCHDIR= ${.CURDIR}/../pubcookie-login-server/files HAS_CONFIGURE= YES diff --git a/www/openacs-dotlrn/Makefile b/www/openacs-dotlrn/Makefile index 81d10a29aec2..3a993db31bf7 100644 --- a/www/openacs-dotlrn/Makefile +++ b/www/openacs-dotlrn/Makefile @@ -24,7 +24,7 @@ OPENACSNAME= .LRN BASE_INSTALL= bin content-repository-content-files log packages tcl www install.xml DESCR= ${.CURDIR}/pkg-descr -MD5_FILE= ${.CURDIR}/distinfo +DISTINFO_FILE= ${.CURDIR}/distinfo MASTERDIR= ${.CURDIR}/../openacs diff --git a/x11-themes/gtk-aluminumalloy-cryogenic-theme/Makefile b/x11-themes/gtk-aluminumalloy-cryogenic-theme/Makefile index a19e449299e0..b146e27b954c 100644 --- a/x11-themes/gtk-aluminumalloy-cryogenic-theme/Makefile +++ b/x11-themes/gtk-aluminumalloy-cryogenic-theme/Makefile @@ -11,7 +11,7 @@ FLAVOR= cryogenic MASTERDIR= ${.CURDIR}/../gtk-aluminumalloy-volcanic-theme -MD5_FILE= ${.CURDIR}/../gtk-aluminumalloy-cryogenic-theme/distinfo +DISTINFO_FILE= ${.CURDIR}/../gtk-aluminumalloy-cryogenic-theme/distinfo PLIST= ${.CURDIR}/../gtk-aluminumalloy-cryogenic-theme/pkg-plist .include "${MASTERDIR}/Makefile" diff --git a/x11-themes/gtk-aluminumalloy-smog-theme/Makefile b/x11-themes/gtk-aluminumalloy-smog-theme/Makefile index 687947e10e4d..8415cb98e932 100644 --- a/x11-themes/gtk-aluminumalloy-smog-theme/Makefile +++ b/x11-themes/gtk-aluminumalloy-smog-theme/Makefile @@ -11,7 +11,7 @@ FLAVOR= smog MASTERDIR= ${.CURDIR}/../gtk-aluminumalloy-volcanic-theme -MD5_FILE= ${.CURDIR}/../gtk-aluminumalloy-smog-theme/distinfo +DISTINFO_FILE= ${.CURDIR}/../gtk-aluminumalloy-smog-theme/distinfo PLIST= ${.CURDIR}/../gtk-aluminumalloy-smog-theme/pkg-plist .include "${MASTERDIR}/Makefile" diff --git a/x11-themes/gtk-aluminumalloy-toxic-theme/Makefile b/x11-themes/gtk-aluminumalloy-toxic-theme/Makefile index d2730b5f5e5a..4a8452fcd4ba 100644 --- a/x11-themes/gtk-aluminumalloy-toxic-theme/Makefile +++ b/x11-themes/gtk-aluminumalloy-toxic-theme/Makefile @@ -11,7 +11,7 @@ FLAVOR= toxic MASTERDIR= ${.CURDIR}/../gtk-aluminumalloy-volcanic-theme -MD5_FILE= ${.CURDIR}/../gtk-aluminumalloy-toxic-theme/distinfo +DISTINFO_FILE= ${.CURDIR}/../gtk-aluminumalloy-toxic-theme/distinfo PLIST= ${.CURDIR}/../gtk-aluminumalloy-toxic-theme/pkg-plist .include "${MASTERDIR}/Makefile" diff --git a/x11-toolkits/linux-f10-openmotif/Makefile b/x11-toolkits/linux-f10-openmotif/Makefile index 5f4041c8d64f..f757abe7bdc9 100644 --- a/x11-toolkits/linux-f10-openmotif/Makefile +++ b/x11-toolkits/linux-f10-openmotif/Makefile @@ -25,7 +25,7 @@ USE_LINUX_APPS= xorglibs LINUX_DIST_VER= 10 USE_LDCONFIG= yes SRC_DISTFILES= -MD5_FILE= ${MASTERDIR}/distinfo.i386 +DISTINFO_FILE= ${MASTERDIR}/distinfo.i386 post-extract: @${RM} -r ${WRKSRC}/etc ${WRKSRC}/usr/bin ${WRKSRC}/usr/include \ diff --git a/x11-toolkits/linux-f8-openmotif/Makefile b/x11-toolkits/linux-f8-openmotif/Makefile index 496c06359052..dc8d8ab73636 100644 --- a/x11-toolkits/linux-f8-openmotif/Makefile +++ b/x11-toolkits/linux-f8-openmotif/Makefile @@ -26,7 +26,7 @@ USE_LINUX_APPS= xorglibs LINUX_DIST_VER= 8 USE_LDCONFIG= yes SRC_DISTFILES= -MD5_FILE= ${MASTERDIR}/distinfo.i386 +DISTINFO_FILE= ${MASTERDIR}/distinfo.i386 post-extract: @${RM} -r ${WRKSRC}/etc ${WRKSRC}/usr/bin ${WRKSRC}/usr/include \ diff --git a/x11-toolkits/py-tkinter/Makefile b/x11-toolkits/py-tkinter/Makefile index 85cd0a2a1e4e..2ea1ab301b1f 100644 --- a/x11-toolkits/py-tkinter/Makefile +++ b/x11-toolkits/py-tkinter/Makefile @@ -25,7 +25,7 @@ PYDISTUTILS_PKGNAME= Tkinter PYDISTUTILS_PKGVERSION= 0.0.0 USE_TK= 82+ WRKSRC= ${PYTHON_WRKSRC}/Modules -MD5_FILE= ${PORTSDIR}/lang/python${PYTHON_SUFFIX}/distinfo +DISTINFO_FILE= ${PORTSDIR}/lang/python${PYTHON_SUFFIX}/distinfo .include <bsd.port.pre.mk> diff --git a/x11-wm/libwraster/Makefile b/x11-wm/libwraster/Makefile index 817843d512c7..2ceac06d681d 100644 --- a/x11-wm/libwraster/Makefile +++ b/x11-wm/libwraster/Makefile @@ -42,7 +42,7 @@ CONFIGURE_ARGS= --with-pixmapdir=${PREFIX}/include/X11/pixmaps \ USE_LDCONFIG= yes PATCHDIR= ${.CURDIR}/../windowmaker/files -MD5_FILE= ${.CURDIR}/../windowmaker/distinfo +DISTINFO_FILE= ${.CURDIR}/../windowmaker/distinfo CONFLICTS= windowmaker-0.* diff --git a/x11/plasma-scriptengine-python/Makefile b/x11/plasma-scriptengine-python/Makefile index 11152e74c6d2..379adb22b7b6 100644 --- a/x11/plasma-scriptengine-python/Makefile +++ b/x11/plasma-scriptengine-python/Makefile @@ -22,7 +22,7 @@ USE_KDE4= kdeprefix kdelibs automoc4 pykde4 USE_QT_VER= 4 QT_COMPONENTS= qmake_build moc_build uic_build rcc_build USE_PYTHON= 2.5+ -MD5_FILE= ${PORTSDIR}/x11/kdebase4-workspace/distinfo +DISTINFO_FILE= ${PORTSDIR}/x11/kdebase4-workspace/distinfo CMAKE_SOURCE_PATH= ${WRKSRC}/plasma/generic/scriptengines/python CMAKE_OUTSOURCE= yes diff --git a/x11/plasma-scriptengine-ruby/Makefile b/x11/plasma-scriptengine-ruby/Makefile index fbbab317019d..fdd8b9b0a6db 100644 --- a/x11/plasma-scriptengine-ruby/Makefile +++ b/x11/plasma-scriptengine-ruby/Makefile @@ -24,7 +24,7 @@ USE_KDE4= kdeprefix kdelibs automoc4 USE_QT_VER= 4 QT_COMPONENTS= qmake_build moc_build uic_build rcc_build USE_RUBY= yes -MD5_FILE= ${PORTSDIR}/x11/kdebase4-workspace/distinfo +DISTINFO_FILE= ${PORTSDIR}/x11/kdebase4-workspace/distinfo CMAKE_SOURCE_PATH= ${WRKSRC}/plasma/generic/scriptengines/ruby CMAKE_OUTSOURCE= yes diff --git a/x11/ruby-gnome2/Makefile.common b/x11/ruby-gnome2/Makefile.common index ba8d2c9f2e74..0cb21ff97e0f 100644 --- a/x11/ruby-gnome2/Makefile.common +++ b/x11/ruby-gnome2/Makefile.common @@ -23,7 +23,7 @@ RUBY_GNOME_WRKSRC= ${WRKDIR}/${RUBY_GNOME_DISTNAME} .endif RUBY_GNOME_PORTDIR= ${PORTSDIR}/x11/ruby-gnome2 -MD5_FILE= ${RUBY_GNOME_PORTDIR}/distinfo +DISTINFO_FILE= ${RUBY_GNOME_PORTDIR}/distinfo general-patch: @${FIND} ${WRKDIR} -name mkmf-gnome2.rb | ${XARGS} ${REINPLACE_CMD} -e \ |