Changeset 79779

Timestamp:

06/25/11 11:59:14 (4 years ago)

Author:

jmr@…

Message:

freepops: partly fix build

Location:

trunk/dports/mail/freepops

Files:

• Portfile (modified) (3 diffs)
• files/patch-darwin (modified) (4 diffs)

trunk/dports/mail/freepops/Portfile

@@ -1 +1 @@
 # $Id$
+
 PortSystem              1.0
 
@@ -21 +22 @@
 platforms               darwin
 
-depends_lib             lib:libcurl.2:curl \
-                                lib:libexpat:expat \
-                                lib:libcrypto.0.9:openssl \
-                                lib:libz.1:zlib
+depends_lib             port:curl \
+                                port:expat \
+                                port:openssl
 
 patchfiles              patch-darwin
@@ -32 +32 @@
         reinplace "s%@PREFIX@%${prefix}%g" \
                 ${worksrcpath}/${name}.sh \
-                ${worksrcpath}/configure.sh \
                 ${worksrcpath}/doc/freepopsd.1 \
                 ${worksrcpath}/src/freepops.h \
                 ${worksrcpath}/src/lua/freepops.lua
+        reinplace "s|@ARCHFLAGS@|${configure.cc_archflags}|" \
+            ${worksrcpath}/configure.sh
 }
 configure.cmd           ./configure.sh
 configure.pre_args      osx
 
-build.args                      WHERE=${prefix}/
+use_parallel_build  no
+build.args                      WHERE=${prefix}/ \
+                    H=
 
-destroot.args           WHERE=${prefix}/
+destroot.args           ${build.args}
 post-destroot {
         xinstall -d -m 0755 ${destroot}${prefix}/etc/rc.d
         xinstall -m 0755 ${worksrcpath}/${name}.sh ${destroot}${prefix}/etc/rc.d
 }
-

trunk/dports/mail/freepops/files/patch-darwin

@@ -30 +30 @@
         $(H)rmdir $(PREFIX)share/doc/freepops/
         $(H)rmdir $(PREFIX)share/freepops/lua/
-diff -ur ../freepops-0.0.18.orig/configure.sh ./configure.sh
---- ../freepops-0.0.18.orig/configure.sh        Sat Sep 18 03:46:34 2004
-+++ ./configure.sh      Tue Oct  5 23:04:58 2004
-@@ -51,10 +51,10 @@
- set_osx() {
- set_default
- OS=Darwin
--CFLAGS="$CFLAGS -I/sw/include -DMACOSX"
--HCFLAGS="$HCFLAGS -I/sw/include -DMACOSX"
--LDFLAGS="$LDFLAGS -L/usr/lib -L/sw/lib -bind_at_load -framework Carbon"
--HLDFLAGS="$HLDFLAGS -L/usr/lib -L/sw/lib -bind_at_load"
-+CFLAGS="$CFLAGS -I@PREFIX@/include -I/usr/X11R6/include -DMACOSX"
-+HCFLAGS="$HCFLAGS -I@PREFIX@/include -I/usr/X11R6/include -DMACOSX"
-+LDFLAGS="$LDFLAGS -L@PREFIX@/lib -L/usr/lib -L/usr/X11R6/lib -bind_at_load -framework Carbon"
-+HLDFLAGS="$HLDFLAGS -L@PREFIX@/lib -L/usr/lib -L/usr/X11R6/lib -bind_at_load"
- }
- 
- set_osx_static() {
 diff -ur ../freepops-0.0.18.orig/doc/freepopsd.1 ./doc/freepopsd.1
 --- ../freepops-0.0.18.orig/doc/freepopsd.1     Tue Sep 14 05:17:47 2004
@@ -72 +54 @@
         -lregularexp -llog -llist \
 -       -L/sw/lib/ -lexpat -lcurl -lcrypto -lreadline -lhistory \
-+       -L$(PREFIX)/lib -L/usr/X11R6/lib -lexpat -lcurl -lcrypto -lreadline -lhistory \
++       -lexpat -lcurl -lcrypto -lreadline -lhistory \
         #-lcurses #-lncurses
  else
@@ -84 +66 @@
                 -lgetopt -lm \
 -               -lpthread -L/usr/lib -L/sw/lib -lexpat -lcurl \
-+               -lpthread -L$(PREFIX)/lib -L/usr/lib -L/usr/X11R6/lib -lexpat -lcurl \
++               -lpthread -lexpat -lcurl \
                 -lcrypto -ldl -lssl -lcrypto -lz 
  else
@@ -112 +94 @@
                 os.getenv("FREEPOPSLUA_PATH") or "./" ,
         }
+--- configure.sh.orig   2004-09-18 20:46:34.000000000 +1000
++++ configure.sh        2011-06-25 18:28:17.000000000 +1000
+@@ -21,7 +21,6 @@
+ }
+ 
+ set_default() {
+-CC=gcc
+ LD=ld
+ AR=ar
+ STRIP=strip
+@@ -34,7 +33,7 @@
+ EXEEXTENSION=
+ STATICEXTENSION=.a
+ SHAREDEXTENSION=.so
+-CFLAGS="-O2 -g3 -Wall -DHAVE_CONFIG_H -I$PWD"
++CFLAGS="-O2 -Wall -DHAVE_CONFIG_H -I$PWD"
+ HCFLAGS=$CFLAGS
+ LDFLAGS=""
+ HLDFLAGS=$LDFLAGS
+@@ -51,10 +50,10 @@
+ set_osx() {
+ set_default
+ OS=Darwin
+-CFLAGS="$CFLAGS -I/sw/include -DMACOSX"
+-HCFLAGS="$HCFLAGS -I/sw/include -DMACOSX"
+-LDFLAGS="$LDFLAGS -L/usr/lib -L/sw/lib -bind_at_load -framework Carbon"
+-HLDFLAGS="$HLDFLAGS -L/usr/lib -L/sw/lib -bind_at_load"
++CFLAGS="$CFLAGS -DMACOSX @ARCHFLAGS@"
++HCFLAGS="$HCFLAGS -DMACOSX @ARCHFLAGS@"
++LDFLAGS="$LDFLAGS @ARCHFLAGS@ -bind_at_load -framework Carbon"
++HLDFLAGS="$HLDFLAGS @ARCHFLAGS@ -bind_at_load"
+ }
+ 
+ set_osx_static() {
+--- modules/src/curl_lua/Makefile.orig  2004-09-26 19:58:52.000000000 +1000
++++ modules/src/curl_lua/Makefile       2011-06-25 18:41:30.000000000 +1000
+@@ -57,7 +57,7 @@
+ 
+ curl_authopt.h:$(HEADER)
+        $(H)cat $(HEADER) | grep "CURLAUTH_" | \
+-               sed "s/#define *CURL/{\"/" | sed "s/ *\/\*.*\*\///" | \
++               sed "s/#define *CURL/{\"/" | sed -E "s/ *\/\*.*\*?\/?//" | \
+                sed "s/ /\",/" | sed "s/$$/},/" > curl_authopt.h
+ 
+ curl_form.h: $(HEADER)