Ticket #19849: Portfile.diff

Portfile

@@ -3 +3 @@
 PortSystem 1.0
 name            libgeotiff
 version         1.2.1
+revision        1
 set libver      1
 categories      graphics
 maintainers     dementia.org:shadow
@@ -24 +25 @@
 configure.args  --with-zip=${prefix} --with-jpeg=${prefix} \
                 --with-proj=${prefix} --enable-incode-epsg
 
+post-configure {
+    reinplace "s|-lgeotiff|../libgeotiff.a|" ${worksrcpath}/bin/Makefile
+}
+
 destroot.destdir
-build.env       DESTDIR=${destroot}
+build.env       DESTDIR=${destroot} GEOTIFFDIR=${worksrcpath}
 destroot.env    DESTDIR=${destroot}
 
-post-build      { system "cd ${worksrcpath} && cc -dynamiclib -all_load \
+post-build      {set ldflags_universal ""
+                 if {[variant_isset universal]} {
+                     set ldflags_universal ${configure.universal_ldflags}
+                 }
+                 system "cd ${worksrcpath} && cc -dynamiclib ${ldflags_universal} -all_load \
                   -install_name ${prefix}/lib/libgeotiff.${version}.dylib \
                   -compatibility_version ${version} \
                   -o libgeotiff.${version}.dylib libgeotiff.a -L${prefix}/lib \
@@ -39 +48 @@
 post-destroot   { delete ${destroot}${prefix}/lib/libgeotiff.a
                   xinstall -m 755 -d ${destroot}${prefix}/lib
                   xinstall -m 644 -W ${worksrcpath} \
+                    libgeotiff.a ${destroot}${prefix}/lib
+                  xinstall -m 644 -W ${worksrcpath} \
                     libgeotiff.${version}.dylib \
                     ${destroot}${prefix}/lib
                   ln -sf libgeotiff.${version}.dylib \