[112036] trunk/dports/net/junkbuster

[ryandesign at macports.org]

Revision: 112036
          https://trac.macports.org/changeset/112036
Author:   ryandesign at macports.org
Date:     2013-10-09 19:39:56 -0700 (Wed, 09 Oct 2013)
Log Message:
-----------
junkbuster: fix build with newer compilers courtesy of FreeBSD ports; use -arch flags and add universal variant; fix destroot to not assume cwd is worksrcpath; simplify installing blockfiles

Modified Paths:
--------------
    trunk/dports/net/junkbuster/Portfile
    trunk/dports/net/junkbuster/files/patch-Makefile
    trunk/dports/net/junkbuster/files/patch-jcc.h

Modified: trunk/dports/net/junkbuster/Portfile
===================================================================
--- trunk/dports/net/junkbuster/Portfile	2013-10-10 02:32:38 UTC (rev 112035)
+++ trunk/dports/net/junkbuster/Portfile	2013-10-10 02:39:56 UTC (rev 112036)
@@ -34,10 +34,6 @@
 startupitem.name       junkbuster
 startupitem.executable ${prefix}/sbin/junkbuster
 
-platform darwin powerpc {
-	configure.compiler	gcc-3.3
-}
-
 pre-patch {
 	foreach  file [glob ${worksrcpath}/*.ini] { reinplace "s%\r%%g" $file }
 }
@@ -57,15 +53,18 @@
 				patch-socks4.c \
 				patch-ssplit.c \
 				patch-win32.c
+
 post-patch {
 	reinplace "s%__PREFIX%${prefix}%g" ${worksrcpath}/junkbstr.ini
-	reinplace "s|^CC.*|CC=${configure.cc}|g" ${worksrcpath}/Makefile
 }
 
 use_configure	no
 
-build.args		PREFIX=${prefix}
+variant universal {}
 
+build.args		PREFIX=${prefix} \
+				CC="${configure.cc} [get_canonical_archflags cc]"
+
 destroot.keepdirs	${destroot}${prefix}/var/log \
 					${destroot}${prefix}/var/run/junkbuster
 destroot {
@@ -88,10 +87,8 @@
 	
 	set docdir ${destroot}${prefix}/share/doc/junkbuster
 	xinstall -d -m 0755 ${docdir}
-	xinstall -m 0644 README gpl.html ijbman.html ijbfaq.html ${docdir}
-	foreach blockfile [glob ${filespath}/blockfile.*] {
-		xinstall -m 0644 ${blockfile} ${docdir}
-	}
+	xinstall -W ${worksrcpath} -m 0644 README gpl.html ijbman.html ijbfaq.html ${docdir}
+	eval xinstall -m 0644 [glob ${filespath}/blockfile.*] ${docdir}
 	
 #	reinplace "s%__PREFIX%${prefix}%g" \
 #		${rcddir}/junkbuster.sh \

Modified: trunk/dports/net/junkbuster/files/patch-Makefile
===================================================================
--- trunk/dports/net/junkbuster/files/patch-Makefile	2013-10-10 02:32:38 UTC (rev 112035)
+++ trunk/dports/net/junkbuster/files/patch-Makefile	2013-10-10 02:39:56 UTC (rev 112036)
@@ -1,7 +1,6 @@
-diff -urN ../ijb-zlib-11.orig/Makefile ./Makefile
---- ../ijb-zlib-11.orig/Makefile	Fri Aug  4 05:40:15 2000
-+++ ./Makefile	Thu Jan  6 16:07:39 2005
-@@ -1,22 +1,27 @@
+--- Makefile.orig	2000-08-04 07:40:15.000000000 -0500
++++ Makefile	2013-10-09 21:36:34.000000000 -0500
+@@ -1,22 +1,26 @@
  # Internet Junkbuster makefile
  
 +PREFIX = /usr/local
@@ -26,7 +25,6 @@
  LDFLAGS = -lz
  
 +# use this for MacPorts
-+CC           = /usr/bin/gcc-3.3
 +MORE_CFLAGS += -I$(PREFIX)/include
 +ifeq ($(shell uname -s),Darwin)
 +LDFLAGS     += -multiply_defined suppress
@@ -36,7 +34,7 @@
  # use this for Solaris 2.x
  #LDFLAGS = -lnsl -lsocket -lz
  
-@@ -66,10 +71,10 @@
+@@ -66,10 +70,10 @@
  CFLAGS  = $(DEFAULT_CFLAGS) $(MORE_CFLAGS)
  
  OBJS =	jcc.$(O) parsers.$(O) filters.$(O) loaders.$(O) bind.$(O) conn.$(O) \

Modified: trunk/dports/net/junkbuster/files/patch-jcc.h
===================================================================
--- trunk/dports/net/junkbuster/files/patch-jcc.h	2013-10-10 02:32:38 UTC (rev 112035)
+++ trunk/dports/net/junkbuster/files/patch-jcc.h	2013-10-10 02:39:56 UTC (rev 112036)
@@ -1,6 +1,29 @@
-diff -urN ../ijb-zlib-11.orig/jcc.h ./jcc.h
---- ../ijb-zlib-11.orig/jcc.h	Thu Aug  3 23:39:31 2000
-+++ ./jcc.h	Thu Jan  6 15:39:42 2005
+--- jcc.h.orig	Thu Aug  3 23:39:31 2000
++++ jcc.h	Thu Dec 14 06:48:47 2006
+@@ -43,11 +43,6 @@
+ extern char *uagent;
+ extern char *from;
+ 
+-extern struct list       wafer_list[];
+-extern struct list        xtra_list[];
+-extern struct list       trust_info[];
+-extern struct url_spec * trust_list[];
+-
+ extern int add_forwarded;
+ 
+ typedef struct http_request	*dummy_predecl1;
+@@ -100,6 +95,11 @@
+ 	struct list *last;
+ 	struct list *next;
+ };
++
++extern struct list       wafer_list[];
++extern struct list        xtra_list[];
++extern struct list       trust_info[];
++extern struct url_spec * trust_list[];
+ 
+ #define IOB_PEEK(CSP) ((CSP->iob->cur > CSP->iob->eod) ? (CSP->iob->eod - CSP->iob->cur) : 0)
+ #define IOB_RESET(CSP) if(CSP->iob->buf) free(CSP->iob->buf); memset(CSP->iob, '\0', sizeof(CSP->iob));
 @@ -339,6 +339,7 @@
  extern void client_cookie_adder(struct client_state *csp);
  extern void client_xtra_adder(struct client_state *csp);
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20131009/04642fce/attachment.html>