Modified: trunk/dports/graphics/dcraw/Portfile (39643 => 39644)
--- trunk/dports/graphics/dcraw/Portfile 2008-08-27 20:25:22 UTC (rev 39643)
+++ trunk/dports/graphics/dcraw/Portfile 2008-08-27 20:57:01 UTC (rev 39644)
@@ -12,7 +12,6 @@
master_sites ${homepage}archive/
worksrcdir $name
dist_subdir ${name}/${version}-${distfile_date}
-use_configure no
use_parallel_build yes
description \
@@ -32,14 +31,19 @@
port:jpeg \
port:lcms
-variant universal {}
+post-extract {
+ xinstall -W ${filespath} Makefile.in ${worksrcpath}/Makefile
+}
-build {
- if {[variant_isset universal]} {
- system "cd ${worksrcpath} && cc -o dcraw ${configure.cflags} ${configure.universal_cflags} dcraw.c -ljpeg -llcms -lintl -liconv ${configure.cppflags} ${configure.ldflags} -DLOCALEDIR=\\\"${prefix}/share/locale/\\\""
- } else {
- system "cd ${worksrcpath} && cc -o dcraw ${configure.cflags} dcraw.c -ljpeg -llcms -lintl -liconv ${configure.cppflags} ${configure.ldflags} -DLOCALEDIR=\\\"${prefix}/share/locale/\\\""
- }
+# configure.cc doesn't get set until the default configure phase runs
+configure.cmd true
+
+post-configure {
+ reinplace "s|@CC@|${configure.cc}|g" ${worksrcpath}/Makefile
+ reinplace "s|@CFLAGS@|${configure.cflags}|g" ${worksrcpath}/Makefile
+ reinplace "s|@CPPFLAGS@|${configure.cppflags}|g" ${worksrcpath}/Makefile
+ reinplace "s|@LDFLAGS@|${configure.ldflags}|g" ${worksrcpath}/Makefile
+ reinplace "s|@PREFIX@|${prefix}|g" ${worksrcpath}/Makefile
}
destroot {
Added: trunk/dports/graphics/dcraw/files/Makefile.in (0 => 39644)
--- trunk/dports/graphics/dcraw/files/Makefile.in (rev 0)
+++ trunk/dports/graphics/dcraw/files/Makefile.in 2008-08-27 20:57:01 UTC (rev 39644)
@@ -0,0 +1,10 @@
+CC = @CC@
+CFLAGS = @CFLAGS@
+CPPFLAGS = @CPPFLAGS@
+LDFLAGS = @LDFLAGS@
+PREFIX = @PREFIX@
+
+all: dcraw
+
+dcraw:
+ $(CC) -o dcraw $(CFLAGS) dcraw.c -ljpeg -llcms -lintl -liconv $(CPPFLAGS) $(LDFLAGS) -DLOCALEDIR=\"$(PREFIX)/share/locale/\"