[110199] trunk/dports/www/nostromo

[jmr at macports.org]

Revision: 110199
          https://trac.macports.org/changeset/110199
Author:   jmr at macports.org
Date:     2013-08-28 03:26:22 -0700 (Wed, 28 Aug 2013)
Log Message:
-----------
nostromo: use CFLAGS without -Werror, fix build system to honour LDFLAGS

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

Modified: trunk/dports/www/nostromo/Portfile
===================================================================
--- trunk/dports/www/nostromo/Portfile	2013-08-28 10:20:00 UTC (rev 110198)
+++ trunk/dports/www/nostromo/Portfile	2013-08-28 10:26:22 UTC (rev 110199)
@@ -26,13 +26,10 @@
 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}"
+build.args              CC="${configure.cc}" \
+                        CCFLAGS="${configure.cflags} [get_canonical_archflags cc] -Wall -Wextra -Wstrict-prototypes -c" \
+                        LDFLAGS="${configure.ldflags} [get_canonical_archflags ld]"
 
 platform darwin {
     patchfiles-append   patch-src-libbsd-GNUmakefile.diff \

Modified: trunk/dports/www/nostromo/files/patch-src-nhttpd-GNUmakefile.diff
===================================================================
--- trunk/dports/www/nostromo/files/patch-src-nhttpd-GNUmakefile.diff	2013-08-28 10:20:00 UTC (rev 110198)
+++ trunk/dports/www/nostromo/files/patch-src-nhttpd-GNUmakefile.diff	2013-08-28 10:26:22 UTC (rev 110199)
@@ -1,11 +1,11 @@
---- src/nhttpd/GNUmakefile.orig	2009-04-06 02:48:57.000000000 -0500
-+++ src/nhttpd/GNUmakefile	2010-12-13 19:36:28.000000000 -0600
+--- src/nhttpd/GNUmakefile.orig	2009-04-06 17:48:57.000000000 +1000
++++ src/nhttpd/GNUmakefile	2013-08-28 20:21:27.000000000 +1000
 @@ -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 $(LDFLAGS) -o nhttpd main.o http.o sys.o -lmy -lbsd -lssl
  	strip nhttpd
  	nroff -Tascii -c -mandoc nhttpd.8 > nhttpd.cat8
  

Modified: trunk/dports/www/nostromo/files/patch-src-tools-GNUmakefile.diff
===================================================================
--- trunk/dports/www/nostromo/files/patch-src-tools-GNUmakefile.diff	2013-08-28 10:20:00 UTC (rev 110198)
+++ trunk/dports/www/nostromo/files/patch-src-tools-GNUmakefile.diff	2013-08-28 10:26:22 UTC (rev 110199)
@@ -1,11 +1,11 @@
---- src/tools/GNUmakefile.orig	2005-01-18 23:55:32.000000000 -0600
-+++ src/tools/GNUmakefile	2010-12-13 19:37:11.000000000 -0600
+--- src/tools/GNUmakefile.orig	2005-01-19 16:55:32.000000000 +1100
++++ src/tools/GNUmakefile	2013-08-28 20:20:14.000000000 +1000
 @@ -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) $(LDFLAGS) -o crypt crypt.o
  		strip crypt
  
  crypt.o:	crypt.c
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20130828/8d09bec1/attachment.html>