[46406] trunk/dports/net/bsflite

[toby at macports.org]

Revision: 46406
          http://trac.macports.org/changeset/46406
Author:   toby at macports.org
Date:     2009-02-03 23:54:43 -0800 (Tue, 03 Feb 2009)
Log Message:
-----------
enable universal build

Modified Paths:
--------------
    trunk/dports/net/bsflite/Portfile
    trunk/dports/net/bsflite/files/patch-Makefile
    trunk/dports/net/bsflite/files/patch-imcomm__Makefile

Modified: trunk/dports/net/bsflite/Portfile
===================================================================
--- trunk/dports/net/bsflite/Portfile	2009-02-04 07:52:18 UTC (rev 46405)
+++ trunk/dports/net/bsflite/Portfile	2009-02-04 07:54:43 UTC (rev 46406)
@@ -22,6 +22,12 @@
 patchfiles       patch-Makefile \
                  patch-imcomm__Makefile
 
-use_configure    no
+configure {
+	reinplace "s|__PREFIX__|${prefix}|" ${worksrcpath}/Makefile
+	reinplace "s|__CC__|${configure.cc}|" ${worksrcpath}/Makefile
+	reinplace "s|__CFLAGS__|${configure.cflags}|" ${worksrcpath}/Makefile
+	reinplace "s|__LDFLAGS__|${configure.ldflags}|" ${worksrcpath}/Makefile
 
-destroot.destdir INSTALL_PREFIX=${destroot}${prefix}
+	reinplace "s|__CC__|${configure.cc}|" ${worksrcpath}/imcomm/Makefile
+	reinplace "s|__CFLAGS__|${configure.cflags}|" ${worksrcpath}/imcomm/Makefile
+}

Modified: trunk/dports/net/bsflite/files/patch-Makefile
===================================================================
--- trunk/dports/net/bsflite/files/patch-Makefile	2009-02-04 07:52:18 UTC (rev 46405)
+++ trunk/dports/net/bsflite/files/patch-Makefile	2009-02-04 07:54:43 UTC (rev 46406)
@@ -1,23 +1,39 @@
---- Makefile.orig	2008-10-19 07:19:47.000000000 -0700
-+++ Makefile	2009-02-03 23:37:19.000000000 -0800
-@@ -9,7 +9,7 @@
+--- Makefile.orig	2009-02-03 23:48:30.000000000 -0800
++++ Makefile	2009-02-03 23:49:21.000000000 -0800
+@@ -2,28 +2,28 @@
+ #EXEC=bsflite.exe
+ #CC=i586-pc-msdosdjgpp-gcc
+ #CC=mingw32-gcc
+-CC=gcc
++CC=__CC__
+ #
+ # Add -DDUMP_PROFILE to dump all HTML profiles to a file.
+ # 	Edit PROFILE_DUMP_PATH in bsf.h to set the path.
  # 	(This is useful if you'd like to see profiles properly
  # 	 formatted with your web browser.)
  #
 -CFLAGS=-Os -pipe
-+CFLAGS=-Os -pipe -Wall
++CFLAGS=-pipe -Wall __CFLAGS__
  #CFLAGS+=-I/usr/local/cross-tools/watt/inc
  #
  # Add -lsocket -lnsl for Solaris
-@@ -19,7 +19,7 @@
- LIBS=-limcomm
+ # Add -lsocket -lbind for Zeta R1 (and potentially BeOS)
+ #     (thanks to Brennan Cleveland)
+ #
+-LIBS=-limcomm
++LIBS=-Limcomm -limcomm
  #LIBS+=-lwatt
  #LIBS+=-lwsock32
 -LDFLAGS=-Limcomm/ -s
-+LDFLAGS=-Limcomm
++LDFLAGS=__LDFLAGS__
  #LDFLAGS+=-L/usr/local/cross-tools/watt/lib
  
  INSTALL=/usr/bin/install
+-INSTALL_PREFIX=/usr/local
++INSTALL_PREFIX=$(DESTDIR)__PREFIX__
+ 
+ SOURCES=aim.c away.c bsf.c cleaner.c config.c conn.c input.c log.c out.c queue.c util.c
+ OBJECTS=aim.o away.o bsf.o cleaner.o config.o conn.o input.o log.o out.o queue.o util.o
 @@ -44,7 +44,7 @@
  
  install:

Modified: trunk/dports/net/bsflite/files/patch-imcomm__Makefile
===================================================================
--- trunk/dports/net/bsflite/files/patch-imcomm__Makefile	2009-02-04 07:52:18 UTC (rev 46405)
+++ trunk/dports/net/bsflite/files/patch-imcomm__Makefile	2009-02-04 07:54:43 UTC (rev 46406)
@@ -1,11 +1,13 @@
---- imcomm/Makefile.orig	2009-02-03 23:33:59.000000000 -0800
-+++ imcomm/Makefile	2009-02-03 23:34:04.000000000 -0800
-@@ -9,7 +9,7 @@
+--- imcomm/Makefile.orig	2009-02-03 23:51:13.000000000 -0800
++++ imcomm/Makefile	2009-02-03 23:51:46.000000000 -0800
+@@ -8,8 +8,8 @@
+ LIB=libimcomm.a
  #CC=i586-pc-msdosdjgpp-gcc
  #CC=mingw32-gcc
- CC=gcc
+-CC=gcc
 -CFLAGS=-Os -pipe
-+CFLAGS=-Os -pipe -Wall
++CC=__CC__
++CFLAGS=-pipe -Wall __CFLAGS__
  RM=rm -f
  #CFLAGS+=-I/usr/local/cross-tools/watt/inc
  #
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20090203/5add79a2/attachment-0001.html>