[74355] trunk/dports/www/nostromo
ryandesign at macports.org
ryandesign at macports.org
Mon Dec 13 17:41:53 PST 2010
Revision: 74355
http://trac.macports.org/changeset/74355
Author: ryandesign at macports.org
Date: 2010-12-13 17:41:47 -0800 (Mon, 13 Dec 2010)
Log Message:
-----------
nostromo: support universal and non-default-build_arch builds; ensure we're UsingTheRightCompiler; add openssl dependency
Modified Paths:
--------------
trunk/dports/www/nostromo/Portfile
trunk/dports/www/nostromo/files/patch-src-nhttpd-GNUmakefile.diff
trunk/dports/www/nostromo/files/patch-src-tools-GNUmakefile.diff
Added Paths:
-----------
trunk/dports/www/nostromo/files/patch-src-libbsd-GNUmakefile.diff
trunk/dports/www/nostromo/files/patch-src-libmy-GNUmakefile.diff
Modified: trunk/dports/www/nostromo/Portfile
===================================================================
--- trunk/dports/www/nostromo/Portfile 2010-12-14 01:27:11 UTC (rev 74354)
+++ trunk/dports/www/nostromo/Portfile 2010-12-14 01:41:47 UTC (rev 74355)
@@ -5,6 +5,7 @@
name nostromo
version 1.9.3
+revision 1
categories www
platforms darwin
maintainers nomaintainer
@@ -19,10 +20,23 @@
checksums sha1 962085f807c7b42e615fbea13d4cc347660f8454 \
rmd160 2099287e18c7703e63d225f7e37c1cb23db2ffc2
+depends_lib port:openssl
+
use_configure no
+variant universal {}
+if {[variant_isset universal]} {
+ set archflags ${configure.universal_cflags}
+} else {
+ set archflags ${configure.cc_archflags}
+}
+
+build.args CC="${configure.cc} ${archflags}"
+
platform darwin {
- patchfiles-append patch-src-nhttpd-GNUmakefile.diff \
+ patchfiles-append patch-src-libbsd-GNUmakefile.diff \
+ patch-src-libmy-GNUmakefile.diff \
+ patch-src-nhttpd-GNUmakefile.diff \
patch-src-tools-GNUmakefile.diff
}
Added: trunk/dports/www/nostromo/files/patch-src-libbsd-GNUmakefile.diff
===================================================================
--- trunk/dports/www/nostromo/files/patch-src-libbsd-GNUmakefile.diff (rev 0)
+++ trunk/dports/www/nostromo/files/patch-src-libbsd-GNUmakefile.diff 2010-12-14 01:41:47 UTC (rev 74355)
@@ -0,0 +1,13 @@
+--- src/libbsd/GNUmakefile.orig 2006-01-14 10:04:36.000000000 -0600
++++ src/libbsd/GNUmakefile 2010-12-13 19:33:53.000000000 -0600
+@@ -5,8 +5,8 @@
+ ranlib libbsd.a
+
+ strlcpy.o: strlcpy.c
+- cc ${CCFLAGS} strlcpy.c
++ $(CC) ${CCFLAGS} strlcpy.c
+ strlcat.o: strlcat.c
+- cc ${CCFLAGS} strlcat.c
++ $(CC) ${CCFLAGS} strlcat.c
+ clean:
+ rm -f libbsd.a *.o
Added: trunk/dports/www/nostromo/files/patch-src-libmy-GNUmakefile.diff
===================================================================
--- trunk/dports/www/nostromo/files/patch-src-libmy-GNUmakefile.diff (rev 0)
+++ trunk/dports/www/nostromo/files/patch-src-libmy-GNUmakefile.diff 2010-12-14 01:41:47 UTC (rev 74355)
@@ -0,0 +1,39 @@
+--- src/libmy/GNUmakefile.orig 2005-06-04 06:51:53.000000000 -0500
++++ src/libmy/GNUmakefile 2010-12-13 19:35:30.000000000 -0600
+@@ -5,26 +5,26 @@
+ ranlib libmy.a
+
+ strcutl.o: strcutl.c
+- cc ${CCFLAGS} strcutl.c
++ $(CC) ${CCFLAGS} strcutl.c
+ strcutw.o: strcutw.c
+- cc ${CCFLAGS} strcutw.c
++ $(CC) ${CCFLAGS} strcutw.c
+ strcuts.o: strcuts.c
+- cc ${CCFLAGS} strcuts.c
++ $(CC) ${CCFLAGS} strcuts.c
+ strcuti.o: strcuti.c
+- cc ${CCFLAGS} strcuti.c
++ $(CC) ${CCFLAGS} strcuti.c
+ strcutf.o: strcutf.c
+- cc ${CCFLAGS} strcutf.c
++ $(CC) ${CCFLAGS} strcutf.c
+ strlower.o: strlower.c
+- cc ${CCFLAGS} strlower.c
++ $(CC) ${CCFLAGS} strlower.c
+ strb64d.o: strb64d.c
+- cc ${CCFLAGS} strb64d.c
++ $(CC) ${CCFLAGS} strb64d.c
+
+ flog.o: flog.c
+- cc ${CCFLAGS} flog.c
++ $(CC) ${CCFLAGS} flog.c
+ flogd.o: flogd.c
+- cc ${CCFLAGS} flogd.c
++ $(CC) ${CCFLAGS} flogd.c
+ fparse.o: fparse.c
+- cc ${CCFLAGS} fparse.c
++ $(CC) ${CCFLAGS} fparse.c
+
+ clean:
+ rm -f libmy.a *.o
Modified: trunk/dports/www/nostromo/files/patch-src-nhttpd-GNUmakefile.diff
===================================================================
--- trunk/dports/www/nostromo/files/patch-src-nhttpd-GNUmakefile.diff 2010-12-14 01:27:11 UTC (rev 74354)
+++ trunk/dports/www/nostromo/files/patch-src-nhttpd-GNUmakefile.diff 2010-12-14 01:41:47 UTC (rev 74355)
@@ -1,11 +1,25 @@
---- src/nhttpd/GNUmakefile.orig 2010-12-13 15:16:37.000000000 +0100
-+++ src/nhttpd/GNUmakefile 2010-12-13 15:16:49.000000000 +0100
-@@ -1,7 +1,7 @@
+--- src/nhttpd/GNUmakefile.orig 2009-04-06 02:48:57.000000000 -0500
++++ src/nhttpd/GNUmakefile 2010-12-13 19:36:28.000000000 -0600
+@@ -1,18 +1,18 @@
CCFLAGS = -O2 -pipe -Wall -Werror -Wstrict-prototypes -c
nhttpd: main.o http.o sys.o
- cc -L../libmy -L../libbsd -o nhttpd main.o http.o sys.o -lmy -lbsd -lssl -lcrypt
-+ cc -L../libmy -L../libbsd -o nhttpd main.o http.o sys.o -lmy -lbsd -lssl
++ $(CC) -L../libmy -L../libbsd -o nhttpd main.o http.o sys.o -lmy -lbsd -lssl
strip nhttpd
nroff -Tascii -c -mandoc nhttpd.8 > nhttpd.cat8
+ main.o: main.c
+- cc ${CCFLAGS} main.c
++ $(CC) ${CCFLAGS} main.c
+
+ http.o: http.c
+- cc ${CCFLAGS} http.c
++ $(CC) ${CCFLAGS} http.c
+
+ sys.o: sys.c
+- cc ${CCFLAGS} sys.c
++ $(CC) ${CCFLAGS} sys.c
+
+ clean:
+ rm -f nhttpd nhttpd.cat8 *.o
Modified: trunk/dports/www/nostromo/files/patch-src-tools-GNUmakefile.diff
===================================================================
--- trunk/dports/www/nostromo/files/patch-src-tools-GNUmakefile.diff 2010-12-14 01:27:11 UTC (rev 74354)
+++ trunk/dports/www/nostromo/files/patch-src-tools-GNUmakefile.diff 2010-12-14 01:41:47 UTC (rev 74355)
@@ -1,11 +1,16 @@
---- src/tools/GNUmakefile.orig 2010-12-13 15:17:04.000000000 +0100
-+++ src/tools/GNUmakefile 2010-12-13 15:18:15.000000000 +0100
-@@ -1,7 +1,7 @@
+--- src/tools/GNUmakefile.orig 2005-01-18 23:55:32.000000000 -0600
++++ src/tools/GNUmakefile 2010-12-13 19:37:11.000000000 -0600
+@@ -1,11 +1,11 @@
CCFLAGS = -O2 -pipe -Wall -Werror -Wstrict-prototypes -c
crypt: crypt.o
- cc -o crypt crypt.o -lcrypt
-+ cc -o crypt crypt.o
++ $(CC) -o crypt crypt.o
strip crypt
crypt.o: crypt.c
+- cc ${CCFLAGS} crypt.c
++ $(CC) ${CCFLAGS} crypt.c
+
+ clean:
+ rm -f crypt *.o
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20101213/930b86c9/attachment.html>
More information about the macports-changes
mailing list