[36161] trunk/dports/textproc/pdftk/Portfile

[ryandesign at macports.org]

Revision: 36161
          http://trac.macosforge.org/projects/macports/changeset/36161
Author:   ryandesign at macports.org
Date:     2008-04-19 22:14:00 -0700 (Sat, 19 Apr 2008)

Log Message:
-----------
pdftk: fix all build variants other than with_gcc42 which were broken because of an over-zealous check added in r32288; see #13553. Also the with_gcj34 variant needed to be updated for gcj34 3.4.6 from r23027.

Modified Paths:
--------------
    trunk/dports/textproc/pdftk/Portfile

Modified: trunk/dports/textproc/pdftk/Portfile
===================================================================
--- trunk/dports/textproc/pdftk/Portfile	2008-04-20 01:47:23 UTC (rev 36160)
+++ trunk/dports/textproc/pdftk/Portfile	2008-04-20 05:14:00 UTC (rev 36161)
@@ -40,12 +40,16 @@
 depends_lib \
 	port:libiconv
 
+set toolpath ${prefix}/bin/
+set versuff ""
+
 pre-fetch {
-	if {![file exists ${prefix}/bin/gcj-mp-4.2]} {
+	if {![file exists ${toolpath}gcj${versuff}]} {
 		return -code error "
 
-Cannot build ${name} because ${prefix}/bin/gcj-mp-4.2 is missing,
-possibly because of this gcc bug:
+Cannot build ${name} because ${toolpath}gcj${versuff}
+is missing, possibly because of this gcc bug:
+
 http://trac.macports.org/projects/macports/ticket/13553
 "
 	}
@@ -54,6 +58,7 @@
 pre-build {
 	reinplace "s|^\\(CPPFLAGS=\\)|\\1 ${configure.cppflags}|" ${worksrcpath}/Makefile.MacOSX
 	reinplace "s|^\\(CXXFLAGS=\\)|\\1 ${configure.cxxflags} ${configure.ldflags}|" ${worksrcpath}/Makefile.MacOSX
+	build.args-append   TOOLPATH=${toolpath} VERSUFF=${versuff}
 }
 
 build.args \
@@ -70,22 +75,22 @@
 
 variant with_gcc34 conflicts with_gcj34 with_gcc41 with_gcc42 i386 description {Build using gcc34 (PowerPC only)} {
 	depends_lib-append  port:gcc34
-	build.args-append   VERSUFF=-dp-3.4
+	set versuff         -dp-3.4
 }
 
 variant with_gcj34 conflicts with_gcc34 with_gcc41 with_gcc42 i386 description {Build using gcj34 (PowerPC only)} {
 	depends_lib-append  port:gcj34
-	build.args-append   TOOLPATH=${prefix}/gcj34-3.4.5/bin/
+	set toolpath        ${prefix}/gcj34-3.4.6/bin/
 }
 
 variant with_gcc41 conflicts with_gcc34 with_gcj34 with_gcc42 i386 description {Build using gcc41 (PowerPC only)} {
 	depends_lib-append  port:gcc41
-	build.args-append   TOOLPATH=${prefix}/bin/ VERSUFF=-mp-4.1
+	set versuff         -mp-4.1
 }
 
 variant with_gcc42 conflicts with_gcc34 with_gcj34 with_gcc41 description {Build using gcc42 (default)} {
 	depends_lib-append  port:gcc42
-	build.args-append   TOOLPATH=${prefix}/bin/ VERSUFF=-mp-4.2
+	set versuff         -mp-4.2
 }
 
 platform i386 {}

-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/macports-changes/attachments/20080419/7ea02624/attachment.html