- Update to 0.76 (bugfix release, see NEWS for the list of changes)

- Remove patches that have now been integrated upstream [1],[3]

PR:		ports/70156 [1],
		ports/70300 [2],
		ports/71363 [3],
		ports/94055 [4]
Submitted by:	Cheng-Lung Sung <clsung@dragon2.net> [1],
		Janos Mohacsi <janos.mohacsi@bsd.hu> [2],
		Yen-Ming Lee <leeym@utopia.leeym.com> [3],
		Diane Bruce <db@net.net> [4]

4 files changed, 6 insertions, 56 deletions

diff --git a/devel/porttools/Makefile b/devel/porttools/Makefile
index 5eac3800017..5e86f2919f6 100644
--- a/devel/porttools/Makefile
+++ b/devel/porttools/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	porttools
-PORTVERSION=	0.75
+PORTVERSION=	0.76
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -18,10 +18,8 @@ RUN_DEPENDS=	portlint:${PORTSDIR}/devel/portlint \
 		cdiff:${PORTSDIR}/textproc/cdiff \
 		sudo:${PORTSDIR}/security/sudo
 
-.include <bsd.port.pre.mk>
-
 .if !defined(WITHOUT_NEWFILE)
-RUN_DEPENDS+=	${LOCALBASE}/bin/newfile:${PORTSDIR}/devel/newfile
+RUN_DEPENDS+=	newfile:${PORTSDIR}/devel/newfile
 .endif
 
 .if !defined(NOPORTDOCS)
@@ -32,4 +30,4 @@ MAKE_ENV=	DATADIR="${DATADIR}" DOCSDIR="${DOCSDIR}"
 MAN1=		port.1
 MAN5=		porttools.5
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/devel/porttools/distinfo b/devel/porttools/distinfo
index 08e13fbdfb8..d1b25122a20 100644
--- a/devel/porttools/distinfo
+++ b/devel/porttools/distinfo
@@ -1,3 +1,3 @@
-MD5 (porttools-0.75.tar.gz) = 9a7f9bb48924beb1affe5dd0ec912c58
-SHA256 (porttools-0.75.tar.gz) = 0364d2e76a4b1e7983189843482af439d9dd04b5a906177e2536ced899359c34
-SIZE (porttools-0.75.tar.gz) = 18455
+MD5 (porttools-0.76.tar.gz) = 8bd87dae72fee823a9eb422a78ef4d05
+SHA256 (porttools-0.76.tar.gz) = b7c8149ba6e4001a95ea5fa28ffac4a5d1e802c9bd5a5521fdcdcdac6391e63f
+SIZE (porttools-0.76.tar.gz) = 18999
diff --git a/devel/porttools/files/patch-cmd_test.in b/devel/porttools/files/patch-cmd_test.in
deleted file mode 100644
index f5c918f2754..00000000000
--- a/devel/porttools/files/patch-cmd_test.in
+++ /dev/null
@@ -1,30 +0,0 @@
---- cmd_test.in.orig	Sat Aug  7 06:10:14 2004
-+++ cmd_test.in	Tue Sep  7 01:25:08 2004
-@@ -178,7 +178,7 @@
- done
- 
- # Check for extra files left
--echo "===> Extra files check"
-+echo "===> Extra files and directories check"
- if [ -d ${PREFIX} -a "${USE_X_PREFIX}" != "yes" ]
- then
- 	# Remove PREFIX from the extra files list
-@@ -186,6 +186,9 @@
- 	find ${PREFIX} ! -type d | \
- 		egrep -v "${PREFIX}/share/nls/(POSIX|en_US.US-ASCII)"  | \
- 		sed -e "s,^${PREFIX}/,,"
-+	sudo find ${LOCALBASE}/ -type d | sed "s,^${LOCALBASE}/,," | sort > ${PREFIX}.PLIST_DIRS.before
-+	sudo find ${PREFIX}/ -type d | sed "s,^${PREFIX}/,," | sort > ${PREFIX}.PLIST_DIRS.after
-+	comm -13 ${PREFIX}.PLIST_DIRS.before ${PREFIX}.PLIST_DIRS.after | sort -r | awk '{print "@dirrmtry "$1}'
- fi
- 
- # Finish with a clean workspace
-@@ -196,7 +199,7 @@
- 	if [ "${USE_X_PREFIX}" != "yes" -a -d ${PREFIX} ] 
- 	then
- 		echo "===>  Removing existing ${PREFIX} dir"
-- 		[ "${PREFIX}" != "${LOCALBASE}" ] && sudo rm -rf ${PREFIX}
-+ 		[ "${PREFIX}" != "${LOCALBASE}" ] && sudo rm -rf ${PREFIX} ${PREFIX}.PLIST_DIRS.before ${PREFIX}.PLIST_DIRS.after
- 	fi
- 	sudo rm -rf ${PKG_DBDIR}
- fi
diff --git a/devel/porttools/files/patch-util_diff.in b/devel/porttools/files/patch-util_diff.in
deleted file mode 100644
index bfa8d365048..00000000000
--- a/devel/porttools/files/patch-util_diff.in
+++ /dev/null
@@ -1,18 +0,0 @@
---- util_diff.in.orig	Sat Aug  7 06:10:14 2004
-+++ util_diff.in	Sun Aug  8 16:26:26 2004
-@@ -70,10 +70,12 @@
- 			# -d <dir> have been specified
- 			# it should be Ports tree location
- 			CATEGORY="`make -V CATEGORIES | sed -E 's/^([^ ]+).*$/\1/'`"
--			PKGNAMEPREFIX="`make -V PKGNAMEPREFIX`"
-+			PYTHON_SUFFIX="`make -V PYTHON_SUFFIX`"
-+			RUBY_SUFFIX="`make -V RUBY_SUFFIX`"
-+			PKGNAMEPREFIX="`make -V PKGNAMEPREFIX | sed -E "s,py${PYTHON_SUFFIX}-,py-," | sed -E "s,ruby${RUBY_SUFFIX}-,ruby-,"`"
- 			PKGNAMESUFFIX="`make -V PKGNAMESUFFIX`"
--			PORTNAME="`make -V PORTNAME`"
--			ORIG_DIR="${DIFF_MODE}/${CATEGORY}/${PKGNAMEPREFIX}${PORTNAME}${PKGNAMESUFFIX}"
-+			PORTNAME="${PKGNAMEPREFIX}`make -V PORTNAME`${PKGNAMESUFFIX}"
-+			ORIG_DIR="${DIFF_MODE}/${CATEGORY}/${PORTNAME}"
- 		else 
- 			# -d <pattern> have been specified
- 			# <pattern> is used to determine original port location