diff options
| author | petef <petef@FreeBSD.org> | 2002-06-09 01:34:40 +0000 |
|---|---|---|
| committer | petef <petef@FreeBSD.org> | 2002-06-09 01:34:40 +0000 |
| commit | 902ff360aaaed17f65a7737c0e3ce5c2541da3f8 (patch) | |
| tree | 7e65195d273f3865254bf09f185cbd3273524dcb /www | |
| parent | 3a6ea17e46c564f8ab9e6cc1998228bcc45c9095 (diff) | |
| download | FreeBSD-ports-902ff360aaaed17f65a7737c0e3ce5c2541da3f8.zip FreeBSD-ports-902ff360aaaed17f65a7737c0e3ce5c2541da3f8.tar.gz | |
Unbreak: add a patch to let this build on -current with gcc 3.1.
While I'm here, make the port respect CC/CXX/CFLAGS/CXXFLAGS.
Diffstat (limited to 'www')
| -rw-r--r-- | www/larbin/Makefile | 8 | ||||
| -rw-r--r-- | www/larbin/files/patch-aa | 16 | ||||
| -rw-r--r-- | www/larbin/files/patch-utils::SyncFifo.h | 13 |
3 files changed, 32 insertions, 5 deletions
diff --git a/www/larbin/Makefile b/www/larbin/Makefile index 03572c2..99b18ef 100644 --- a/www/larbin/Makefile +++ b/www/larbin/Makefile @@ -12,12 +12,16 @@ MASTER_SITES= ftp://ftp.sourceforge.net/pub/sourceforge/larbin/ MAINTAINER= hiten@uk.FreeBSD.org -BROKEN= "Does not build" - USE_GMAKE= yes GNU_CONFIGURE= yes PATCH_WRKSRC= ${WRKSRC}/src +MAKE_ARGS= CXX=${CXX} + +post-patch: + @${SED} -e 's,CC=,CC?=,' -e 's,CFLAGS=-O3,CFLAGS+=,' < \ + ${WRKSRC}/adns/Makefile > ${WRKSRC}/adns/Makefile.new + @${MV} ${WRKSRC}/adns/Makefile.new ${WRKSRC}/adns/Makefile do-install: @${INSTALL_PROGRAM} ${WRKSRC}/larbin ${PREFIX}/bin/ diff --git a/www/larbin/files/patch-aa b/www/larbin/files/patch-aa index c516087..9476a1b 100644 --- a/www/larbin/files/patch-aa +++ b/www/larbin/files/patch-aa @@ -1,6 +1,16 @@ ---- larbin.make~ Mon Mar 4 11:47:28 2002 -+++ larbin.make Tue Mar 26 21:17:01 2002 -@@ -37,5 +37,3 @@ +--- larbin.make.orig Mon Mar 4 06:47:28 2002 ++++ larbin.make Sat Jun 8 21:27:26 2002 +@@ -13,8 +13,7 @@ + ABS-MAIN-OBJ:=$(MAIN-OBJ) + + MAKE:=gmake +-CXX:=g++ +-CPPFLAGS:=-Wall -O3 -D_REENTRANT -I- -I$(BASEDIR) -I$(ADNSDIR) ++CPPFLAGS= ${CXXFLAGS} -Wall -D_REENTRANT -I- -I$(BASEDIR) -I$(ADNSDIR) + RM:=rm -f + + first: all +@@ -37,5 +36,3 @@ prof-in: CPPFLAGS += -pg -DPROF prof-in: redo-in diff --git a/www/larbin/files/patch-utils::SyncFifo.h b/www/larbin/files/patch-utils::SyncFifo.h new file mode 100644 index 0000000..2a59e88 --- /dev/null +++ b/www/larbin/files/patch-utils::SyncFifo.h @@ -0,0 +1,13 @@ +$FreeBSD$ + +--- utils/SyncFifo.h.orig Sat Jun 8 21:29:43 2002 ++++ utils/SyncFifo.h Sat Jun 8 21:31:09 2002 +@@ -45,7 +45,7 @@ + }; + + template <class T> +-SyncFifo<T>::SyncFifo (uint size = std_size) { ++SyncFifo<T>::SyncFifo (uint size) { + tab = new T*[size]; + this->size = size; + in = 0; |
