[92924] trunk/dports/graphics/openjpeg

[ryandesign at macports.org]

Revision: 92924
          https://trac.macports.org/changeset/92924
Author:   ryandesign at macports.org
Date:     2012-05-10 15:02:07 -0700 (Thu, 10 May 2012)
Log Message:
-----------
openjpeg: remove now-unnecessary patchfile which caused patch failure on Leopard and earlier, along with other directives that had been there to accommodate openjpeg's hand-made Makefiles, which are no longer necessary now that openjpeg uses autoconfed Makefiles; add pre-activate check for manpages inadvertently installed directly into  by previous versions of the port which would cause activation failure on upgrade; see #34388

Modified Paths:
--------------
    trunk/dports/graphics/openjpeg/Portfile

Removed Paths:
-------------
    trunk/dports/graphics/openjpeg/files/

Modified: trunk/dports/graphics/openjpeg/Portfile
===================================================================
--- trunk/dports/graphics/openjpeg/Portfile	2012-05-10 21:30:54 UTC (rev 92923)
+++ trunk/dports/graphics/openjpeg/Portfile	2012-05-10 22:02:07 UTC (rev 92924)
@@ -5,6 +5,7 @@
 
 name             openjpeg
 version          1.5.0
+revision            1
 categories       graphics
 license          BSD
 maintainers      mcalhoun openmaintainer
@@ -32,24 +33,18 @@
                  port:zlib \
                  port:jbigkit
 
-use_parallel_build no
-
-if { ![variant_isset universal] } {
-    build.args-append "COMPILERFLAGS='${configure.cflags} ${configure.cc_archflags}'"
-} else {
-    build.args-append "COMPILERFLAGS='${configure.cflags} ${configure.universal_cflags}'"
+pre-activate {
+    # openjpeg < 1.5.0 accidentally installed items directly into
+    # ${prefix}/share/man bypassing ${destroot}; remove them if found.
+    foreach m {man1/image_to_j2k.1.gz man1/j2k_dump.1.gz man1/j2k_to_image.1.gz man3/libopenjpeg.3.gz} {
+        set filepath ${prefix}/share/man/${m}
+        if {[file exists ${filepath}]} {
+            if {[catch {delete ${filepath}}]} {
+                ui_warn "Cannot delete ${filepath}; please remove it manually"
+            }
+        }
+    }
 }
 
-post-patch {
-    reinplace \
-        "s|pkgconf_dir = /usr/lib/pkgconfig|pkgconf_dir = \$(DESTDIR)${prefix}/lib/pkgconfig|g" \
-        ${worksrcpath}/Makefile.in
-}
-
-if {${os.platform} == "darwin" && ${os.major} < 10} {
-    # See #29193
-    patchfiles-append patch-libopenjpeg-Makefile.in.diff 
-}
-
 livecheck.url    ${homepage}
 livecheck.regex "${name}-(\\d+(?:\\.\\d+)*)"
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20120510/46d37c5f/attachment.html>