antlr: Clean up

[Jason Bacon <bacon4000%gmail.com@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Jason Bacon <bacon4000%gmail.com@localhost>
Pushed By:	outpaddling
Date:		Fri Mar 31 12:45:40 2017 -0500
Changeset:	ba6d9f50e7f8220bdf0f7d2ca07948100fa535c1

Modified Files:
	antlr/Makefile
	antlr/distinfo
	antlr/patches/patch-configure
	antlr/patches/patch-lib__cpp__antlr__ANTLRException.hpp
	antlr/patches/patch-lib_cpp_antlr_CharScanner.hpp

Log Message:
antlr: Clean up

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=ba6d9f50e7f8220bdf0f7d2ca07948100fa535c1

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 antlr/Makefile                                     | 28 +++++-----------------
 antlr/distinfo                                     |  6 ++---
 antlr/patches/patch-configure                      |  2 +-
 .../patch-lib__cpp__antlr__ANTLRException.hpp      |  2 ++
 antlr/patches/patch-lib_cpp_antlr_CharScanner.hpp  |  2 ++
 5 files changed, 14 insertions(+), 26 deletions(-)

diffs:
diff --git a/antlr/Makefile b/antlr/Makefile
index 3118f958a2..585f1121f3 100644
--- a/antlr/Makefile
+++ b/antlr/Makefile
@@ -14,7 +14,6 @@
 #SUB_FILES=	antlr.sh
 #OPTIONS_DEFINE=	PYTHON DOCS
 #OPTIONS_SUB=	yes
-#.include <bsd.port.options.mk>
 #.if ${PORT_OPTIONS:MPYTHON}
 # Unknown tool: USE_TOOLS=	python
 #PORTDOCS+=	python-runtime.html
@@ -43,10 +42,10 @@ CATEGORIES=	devel
 MASTER_SITES=	http://www.antlr2.org/download/
 
 MAINTAINER=	bacon4000%gmail.com@localhost
-HOMEPAGE=	http://www.antlr2.org
+HOMEPAGE=	http://www.antlr2.org/
 
 COMMENT=	ANother Tool for Language Recognition
-#LICENSE=	
+LICENSE=	public-domain
 
 HAS_CONFIGURE=	yes
 # Needs java and javac or gcj?
@@ -55,11 +54,6 @@ HAS_CONFIGURE=	yes
 # FIXME: Add a check here to notify users trying to install
 USE_JAVA=	yes
 
-# Pessimistic assumption.  Test and change if possible.
-MAKE_JOBS_SAFE=	no
-
-#ONLY_FOR_PLATFORM=	
-
 # Just assuming C and C++: Adjust this!
 USE_LANGUAGES=	c c++
 USE_TOOLS+=	gmake
@@ -69,7 +63,6 @@ CONFIGURE_ENV=	JAVAC="${JAVAC}" JAR="${JAR}" JAVA="${JAVA}" CLASSPATH="${PORT_CL
 CONFIGURE_ARGS=	--disable-csharp --prefix=${PREFIX}
 
 PORTVERSION=	2.7.7
-DATADIR=	${PREFIX}/share/antlr
 DOCSDIR=	${PREFIX}/share/doc/antlr
 PORTDOCS=	ANTLRException.gif closure.gif cpp-runtime.html \
 		csharp-runtime.html err.html glossary.html hidden.stream.gif \
@@ -89,31 +82,22 @@ JAVA_VERSION=	1.6
 SUBST_CLASSES+=	sh
 SUBST_FILES.sh=	${WRKDIR}/antlr.sh
 SUBST_STAGE.sh=	post-patch
-SUBST_SED.sh=	-e 's|%%JAVA_VERSION%%|${JAVA_VERSION}|' \
-		-e 's|%%LOCALBASE%%/bin/java|java|' \
-		-e 's|%%JAVAJARDIR%%|${JAVAJARDIR}|'
-
-# Keep this if there are user-selectable options.
-#.include "options.mk"
+SUBST_SED.sh=	-e 's|%%JAVA_VERSION%%|${JAVA_VERSION}|'
+SUBST_SED.sh+=	-e 's|%%LOCALBASE%%/bin/java|java|'
+SUBST_SED.sh+=	-e 's|%%JAVAJARDIR%%|${JAVAJARDIR}|'
 
-# Note: Depends on PLIST.
-#AUTO_MKDIRS=	yes
+INSTALLATION_DIRS=	${JAVAJARDIR} bin include/antlr lib ${DOCSDIR}
 
 post-extract:
 	(cd ${WRKSRC} && ${CP} antlr.jar antlrall.jar)
 	cp ${FILESDIR}/antlr.sh.in ${WRKDIR}/antlr.sh
 
 do-install:
-	@${MKDIR} ${DESTDIR}${JAVAJARDIR}
-	@${MKDIR} ${DESTDIR}${PREFIX}/bin
 	${INSTALL_DATA} ${WRKSRC}/antlr.jar ${DESTDIR}${JAVAJARDIR}
 	${INSTALL_SCRIPT} ${WRKDIR}/antlr.sh ${DESTDIR}${PREFIX}/bin/antlr
-	@${MKDIR} ${DESTDIR}${PREFIX}/include/antlr
 	${INSTALL_DATA} ${WRKSRC}/lib/cpp/antlr/*.hpp \
 		${DESTDIR}${PREFIX}/include/antlr
-	@${MKDIR} ${DESTDIR}${PREFIX}/lib
 	${INSTALL_DATA} ${WRKSRC}/lib/cpp/src/libantlr.a ${DESTDIR}${PREFIX}/lib
-	@${MKDIR} ${DESTDIR}${DOCSDIR}
 	(cd ${WRKSRC}/doc && ${INSTALL_DATA} ${PORTDOCS} ${DESTDIR}${DOCSDIR})
 
 .include "../../lang/python/application.mk"
diff --git a/antlr/distinfo b/antlr/distinfo
index 941e05b263..24f654e543 100644
--- a/antlr/distinfo
+++ b/antlr/distinfo
@@ -4,6 +4,6 @@ SHA1 (antlr-2.7.7.tar.gz) = 802655c343cc7806aaf1ec2177a0e663ff209de1
 RMD160 (antlr-2.7.7.tar.gz) = 0b7951a28b748e912721fe0f6de4095d9f8da57d
 SHA512 (antlr-2.7.7.tar.gz) = faa72d2ddcba434ef1233e70c1549e63eba67c00793966322e821cf7f015cccb804448cb92d8fbef0429f59928fad65ec954f8ffbda0acbb8e983de0806d349d
 Size (antlr-2.7.7.tar.gz) = 1816180 bytes
-SHA1 (patch-configure) = a5d6e045c92aad831e508e09a2f2d0e3beb6a01a
-SHA1 (patch-lib__cpp__antlr__ANTLRException.hpp) = 709c99df34c490746dad430c622d826ede8c617f
-SHA1 (patch-lib_cpp_antlr_CharScanner.hpp) = f92641d734ecf85043fb09e6f6750413adfac039
+SHA1 (patch-configure) = 41a7e86c32560eef26d0ba54357c5d58d50be63d
+SHA1 (patch-lib__cpp__antlr__ANTLRException.hpp) = 81761161d3cbff6c30675c8eb75daaef26b9751b
+SHA1 (patch-lib_cpp_antlr_CharScanner.hpp) = 845bacc8698fca5252069471f8bf2c1a6384730a
diff --git a/antlr/patches/patch-configure b/antlr/patches/patch-configure
index 27960e9f9f..7c79106a8d 100644
--- a/antlr/patches/patch-configure
+++ b/antlr/patches/patch-configure
@@ -1,6 +1,6 @@
 $NetBSD$
 
-$FreeBSD: head/devel/antlr/files/patch-configure 340725 2014-01-22 17:40:44Z mat $
+# Non-portable == in shell script
 
 --- configure.orig	2006-11-01 21:37:18.000000000 +0000
 +++ configure
diff --git a/antlr/patches/patch-lib__cpp__antlr__ANTLRException.hpp b/antlr/patches/patch-lib__cpp__antlr__ANTLRException.hpp
index 0ec824fad4..18581d8079 100644
--- a/antlr/patches/patch-lib__cpp__antlr__ANTLRException.hpp
+++ b/antlr/patches/patch-lib__cpp__antlr__ANTLRException.hpp
@@ -1,5 +1,7 @@
 $NetBSD$
 
+# Missing header
+
 --- lib/cpp/antlr/ANTLRException.hpp.orig	2006-11-01 21:37:17.000000000 +0000
 +++ lib/cpp/antlr/ANTLRException.hpp
 @@ -9,6 +9,7 @@
diff --git a/antlr/patches/patch-lib_cpp_antlr_CharScanner.hpp b/antlr/patches/patch-lib_cpp_antlr_CharScanner.hpp
index 93dcbb8102..ffd966cbc9 100644
--- a/antlr/patches/patch-lib_cpp_antlr_CharScanner.hpp
+++ b/antlr/patches/patch-lib_cpp_antlr_CharScanner.hpp
@@ -1,5 +1,7 @@
 $NetBSD$
 
+# Missing headers
+
 --- lib/cpp/antlr/CharScanner.hpp.orig	2006-11-01 21:37:17.000000000 +0000
 +++ lib/cpp/antlr/CharScanner.hpp
 @@ -24,6 +24,9 @@