[72473] trunk/dports/lang/antlr

jmr at macports.org jmr at macports.org
Sat Oct 16 22:27:08 PDT 2010


Revision: 72473
          http://trac.macports.org/changeset/72473
Author:   jmr at macports.org
Date:     2010-10-16 22:27:04 -0700 (Sat, 16 Oct 2010)
Log Message:
-----------
antlr: fix destdir issues (#17629), respect build_arch (#24346)

Modified Paths:
--------------
    trunk/dports/lang/antlr/Portfile

Added Paths:
-----------
    trunk/dports/lang/antlr/files/antlr-DESTDIR.patch

Modified: trunk/dports/lang/antlr/Portfile
===================================================================
--- trunk/dports/lang/antlr/Portfile	2010-10-17 03:46:28 UTC (rev 72472)
+++ trunk/dports/lang/antlr/Portfile	2010-10-17 05:27:04 UTC (rev 72473)
@@ -5,6 +5,7 @@
 
 name			antlr
 version			2.7.7
+revision		1
 categories		lang java
 platforms		darwin
 maintainers		landonf openmaintainer
@@ -21,23 +22,17 @@
 checksums		md5    01cc9a2a454dd33dcd8c856ec89af090         \
             sha1   802655c343cc7806aaf1ec2177a0e663ff209de1 \
             rmd160 0b7951a28b748e912721fe0f6de4095d9f8da57d
-patchfiles		patch-configure.diff
+patchfiles		patch-configure.diff antlr-DESTDIR.patch
 
 configure.env		CLASSPATH=.
-configure.pre_args	--prefix=${destroot}${prefix}
 configure.args		--disable-csharp
 
 if {[variant_isset universal]} {
      build.args "CXXFLAGS=\"${configure.cxxflags} ${configure.universal_cxxflags}\" LDFLAGS=\"${configure.ldflags} ${configure.universal_ldflags}\""
+} else {
+     build.args "CXXFLAGS=\"${configure.cxxflags} ${configure.cxx_archflags}\" LDFLAGS=\"${configure.ldflags} ${configure.ld_archflags}\""
 }
 
-destroot.args	versioneddir=java
-post-destroot	{
-	reinplace "s|antlr-2.7.3/|java/|g" ${destroot}${prefix}/bin/antlr
-	reinplace "s|^prefix=.*|prefix=\"${prefix}\"|g" \
-		${destroot}${prefix}/bin/antlr
-}
-
 livecheck.type  regex
 livecheck.url   ${homepage}download.html
 livecheck.regex ${name}-(\\d+(?:\\.\\d+)*)

Added: trunk/dports/lang/antlr/files/antlr-DESTDIR.patch
===================================================================
--- trunk/dports/lang/antlr/files/antlr-DESTDIR.patch	                        (rev 0)
+++ trunk/dports/lang/antlr/files/antlr-DESTDIR.patch	2010-10-17 05:27:04 UTC (rev 72473)
@@ -0,0 +1,178 @@
+diff -uNr antlr/Makefile.in antlr/Makefile.in
+--- antlr/Makefile.in	2006-11-01 22:37:17.000000000 +0100
++++ antlr/Makefile.in	2006-11-07 23:21:49.133211249 +0100
+@@ -321,11 +321,11 @@
+ 
+ ## install antlr.jar in libdirectory if exists
+ install ::	@ANTLR_JAR@ 
+-	-$(MKDIR) -p "$(libdir)"
+-	-$(MKDIR) -p "$(datadir)/$(versioneddir)"
++	-$(MKDIR) -p "$(DESTDIR)$(libdir)"
++	-$(MKDIR) -p "$(DESTDIR)$(datadir)/$(versioneddir)"
+ 	-test -f @ANTLR_JAR@ && {\
+-	 $(INSTALL) -m 444 @ANTLR_JAR@ "$(datadir)/$(versioneddir)" ; \
+-	 $(INSTALL) -m 444 @ANTLR_JAR@ "$(libdir)" ; \
++	 $(INSTALL) -m 444 @ANTLR_JAR@ "$(DESTDIR)$(datadir)/$(versioneddir)" ; \
++	 $(INSTALL) -m 444 @ANTLR_JAR@ "$(DESTDIR)$(libdir)" ; \
+ 	}
+ 
+ distclean :: clean
+diff -uNr doc/Makefile.in doc/Makefile.in
+--- doc/Makefile.in	2006-11-01 22:37:17.000000000 +0100
++++ doc/Makefile.in	2006-11-07 23:21:49.133211249 +0100
+@@ -43,12 +43,12 @@
+ 	$(eol)
+ 
+ install ::
+-	@$(MKDIR) -p "$(antlr_doc_DIR)"
++	@$(MKDIR) -p "$(DESTDIR)$(antlr_doc_DIR)"
+ 	@@ECHO@ "install doc files .. "
+ 	@for f in $(antlr_doc_FILES) ; do \
+ 		@ECHO@ "install $${f}" ; \
+ 		if test -f "$${f}" ; then \
+-			$(INSTALL) -m 444 "$${f}" "$(antlr_doc_DIR)" ; \
++			$(INSTALL) -m 444 "$${f}" "$(DESTDIR)$(antlr_doc_DIR)" ; \
+ 		fi ;\
+ 	done
+ 
+diff -uNr lib/cpp/antlr/Makefile.in lib/cpp/antlr/Makefile.in
+--- lib/cpp/antlr/Makefile.in	2006-11-01 22:37:17.000000000 +0100
++++ lib/cpp/antlr/Makefile.in	2006-11-07 23:21:49.133211249 +0100
+@@ -75,11 +75,11 @@
+ 
+ install:
+ 	@@ECHO@ "install hpp files .. "
+-	@$(MKDIR) -p "$(includedir)/antlr"
++	@$(MKDIR) -p "$(DESTDIR)$(includedir)/antlr"
+ 	@for f in $(antlr_hpp_FILES) ; do \
+ 		@ECHO@ "install $${f}" ; \
+ 		if test -f "$${f}" ; then \
+-			$(INSTALL) -m 444 "$${f}" "$(includedir)/antlr" ; \
++			$(INSTALL) -m 444 "$${f}" "$(DESTDIR)$(includedir)/antlr" ; \
+ 		fi ;\
+ 	done
+ 
+diff -uNr lib/cpp/src/Makefile.in lib/cpp/src/Makefile.in
+--- lib/cpp/src/Makefile.in	2006-11-01 22:37:17.000000000 +0100
++++ lib/cpp/src/Makefile.in	2006-11-07 23:21:49.133211249 +0100
+@@ -114,12 +114,12 @@
+   $(eol)
+ 
+ this-install: @ANTLR_LIB@ 
+-	@$(MKDIR) -p "$(libdir)"
++	@$(MKDIR) -p "$(DESTDIR)$(libdir)"
+ 	@@ECHO@ "install C++ core files .. "
+ 	@for f in $(antlr_lib_FILES) ; do \
+ 		@ECHO@ "install $${f}" ; \
+ 		if test -f "$${f}" ; then \
+-			$(INSTALL) -m 444 "$${f}" "$(libdir)" ; \
++			$(INSTALL) -m 444 "$${f}" "$(DESTDIR)$(libdir)" ; \
+ 		fi ;\
+ 	done
+ 
+diff -uNr lib/csharp/antlr.astframe/Makefile.in lib/csharp/antlr.astframe/Makefile.in
+--- lib/csharp/antlr.astframe/Makefile.in	2006-11-01 22:37:17.000000000 +0100
++++ lib/csharp/antlr.astframe/Makefile.in	2006-11-07 23:21:49.133211249 +0100
+@@ -45,13 +45,13 @@
+ 
+ ## install our target ..
+ install :: @ASTFRAME_NET@ 
+-	@$(MKDIR) -p "$(libdir)"
++	@$(MKDIR) -p "$(DESTDIR)$(libdir)"
+ 	@@ECHO@ "install C# core files .. "
+ 	@for f in @ASTFRAME_NET@  ; do \
+ 		@ECHO@ "install $${f}" ; \
+ 		if test -f "$${f}" ; then \
+-			$(INSTALL) -m 444 "$${f}" "$(libdir)" ; \
+-			$(INSTALL) -m 444 "$${f}" "$(datadir)/$(versioneddir)" ; \
++			$(INSTALL) -m 444 "$${f}" "$(DESTDIR)$(libdir)" ; \
++			$(INSTALL) -m 444 "$${f}" "$(DESTDIR)$(datadir)/$(versioneddir)" ; \
+ 		fi ;\
+ 	done
+ 
+diff -uNr lib/csharp/antlr.runtime/Makefile.in lib/csharp/antlr.runtime/Makefile.in
+--- lib/csharp/antlr.runtime/Makefile.in	2006-11-01 22:37:17.000000000 +0100
++++ lib/csharp/antlr.runtime/Makefile.in	2006-11-07 23:22:25.147461999 +0100
+@@ -135,13 +135,13 @@
+ 	@RMF@ Makefile
+ 
+ install :: @ANTLR_NET@ 
+-	@$(MKDIR) -p "$(libdir)"
++	@$(MKDIR) -p "$(DESTDIR)$(libdir)"
+ 	@@ECHO@ "install C# core files .. "
+ 	@for f in @ANTLR_NET@  ; do \
+ 		@ECHO@ "install $${f}" ; \
+ 		if test -f "$${f}" ; then \
+-			$(INSTALL) -m 444 "$${f}" "$(libdir)" ; \
+-			$(INSTALL) -m 444 "$${f}" "$(datadir)/$(versioneddir)" ; \
++			$(INSTALL) -m 444 "$${f}" "$(DESTDIR)$(libdir)" ; \
++			$(INSTALL) -m 444 "$${f}" "$(DESTDIR)$(datadir)/$(versioneddir)" ; \
+ 		fi ;\
+ 	done
+ 
+diff -uNr lib/python/Makefile.in lib/python/Makefile.in
+--- lib/python/Makefile.in	2006-11-01 22:37:17.000000000 +0100
++++ lib/python/Makefile.in	2006-11-07 23:21:49.133211249 +0100
+@@ -41,26 +41,26 @@
+ extradir = $(datadir)/$(versioneddir)
+ 
+ install-this:
+-	$(MKDIR) -p "$(antlr_py_DIR)"
+-	$(MKDIR) -p "$(libdir)"
++	$(MKDIR) -p "$(DESTDIR)$(antlr_py_DIR)"
++	$(MKDIR) -p "$(DESTDIR)$(libdir)"
+ 	@@ECHO@ "install python files .. "
+ 	@for f in $(antlr_py_FILES) ; do \
+ 		@ECHO@ "install $${f}" ; \
+ 		if test -f "$${f}" ; then \
+-			$(INSTALL) -m 444 "$${f}" "$(libdir)" ; \
++			$(INSTALL) -m 444 "$${f}" "$(DESTDIR)$(libdir)" ; \
+ 		fi ;\
+ 	done
+ 	@for f in $(antlr_py1_FILES) ; do \
+ 		@ECHO@ "install $${f}" ; \
+ 		if test -f "$${f}" ; then \
+-			$(INSTALL) -m 444 "$${f}" "$(antlr_py_DIR)" ; \
++			$(INSTALL) -m 444 "$${f}" "$(DESTDIR)$(antlr_py_DIR)" ; \
+ 		fi ;\
+ 	done
+ 	@f="$(objdir)/scripts/pyantlr.sh"; \
+ 	if test -f "$${f}" ; then \
+ 			@ECHO@ "install Python installer" ; \
+-			$(MKDIR) -p "$(sbindir)" ; \
+-			$(INSTALL) -m 555 "$${f}" "$(sbindir)" ; \
++			$(MKDIR) -p "$(DESTDIR)$(sbindir)" ; \
++			$(INSTALL) -m 555 "$${f}" "$(DESTDIR)$(sbindir)" ; \
+ 	fi
+ 
+ 
+diff -uNr Makefile.in Makefile.in
+--- Makefile.in	2006-11-01 22:37:18.000000000 +0100
++++ Makefile.in	2006-11-07 23:21:49.133211249 +0100
+@@ -124,16 +124,16 @@
+ extradir = $(datadir)/$(versioneddir)
+ 
+ install ::
+-	$(MKDIR) -p "$(bindir)"
+-	$(MKDIR) -p "$(extradir)"
+-	$(MKDIR) -p "$(docdir)"
+-	$(INSTALL) -m 755 scripts/run-antlr                          "$(bindir)/antlr"
+-	$(INSTALL) -m 755 scripts/antlr-config                       "$(bindir)/antlr-config"
+-	$(INSTALL) -m 444 @abs_top_srcdir@/extras/antlr-mode.el      "$(extradir)"
+-	$(INSTALL) -m 444 @abs_top_srcdir@/extras/antlr-jedit.xml    "$(extradir)"
+-	$(INSTALL) -m 444 @abs_top_srcdir@/LICENSE.txt               "$(docdir)"
+-	$(INSTALL) -m 444 @abs_top_srcdir@/README.txt                "$(docdir)"
+-	$(INSTALL) -m 444 @abs_top_srcdir@/INSTALL.txt               "$(docdir)"
++	$(MKDIR) -p "$(DESTDIR)$(bindir)"
++	$(MKDIR) -p "$(DESTDIR)$(extradir)"
++	$(MKDIR) -p "$(DESTDIR)$(docdir)"
++	$(INSTALL) -m 755 scripts/run-antlr                          "$(DESTDIR)$(bindir)/antlr"
++	$(INSTALL) -m 755 scripts/antlr-config                       "$(DESTDIR)$(bindir)/antlr-config"
++	$(INSTALL) -m 444 @abs_top_srcdir@/extras/antlr-mode.el      "$(DESTDIR)$(extradir)"
++	$(INSTALL) -m 444 @abs_top_srcdir@/extras/antlr-jedit.xml    "$(DESTDIR)$(extradir)"
++	$(INSTALL) -m 444 @abs_top_srcdir@/LICENSE.txt               "$(DESTDIR)$(docdir)"
++	$(INSTALL) -m 444 @abs_top_srcdir@/README.txt                "$(DESTDIR)$(docdir)"
++	$(INSTALL) -m 444 @abs_top_srcdir@/INSTALL.txt               "$(DESTDIR)$(docdir)"
+ 
+ install ::
+ 	@ECHO@ "installation done"
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20101016/e3d1db37/attachment.html>


More information about the macports-changes mailing list