diff options
| -rw-r--r-- | www/pound/Makefile | 13 | ||||
| -rw-r--r-- | www/pound/distinfo | 2 | ||||
| -rw-r--r-- | www/pound/files/patch-Makefile | 27 | ||||
| -rw-r--r-- | www/pound/files/patch-configure | 12 |
4 files changed, 18 insertions, 36 deletions
diff --git a/www/pound/Makefile b/www/pound/Makefile index 8d98a9d6c29d..f4bc16055f92 100644 --- a/www/pound/Makefile +++ b/www/pound/Makefile @@ -6,7 +6,7 @@ # PORTNAME= pound -PORTVERSION= 0.9 +PORTVERSION= 1.2 CATEGORIES= www net MASTER_SITES= http://www.apsis.ch/pound/ \ ftp://ftp.nuug.no/pub/anders/distfiles/ @@ -16,15 +16,12 @@ EXTRACT_SUFX= .tgz MAINTAINER= anders@FreeBSD.org WRKSRC= ${WRKDIR}/${PORTNAME} +GNU_CONFIGURE= yes -MAKE_ARGS+= PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \ - PTHREAD_LIBS="${PTHREAD_LIBS}" \ - F_CONF=${PREFIX}/etc/pound.cfg +CONFIGURE_ENV+= PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \ + PTHREAD_LIBS="${PTHREAD_LIBS}" +MAKE_ARGS+= F_CONF=${PREFIX}/etc/pound.cfg MAN8= pound.8 -do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/pound ${PREFIX}/sbin/ - ${INSTALL_MAN} ${WRKSRC}/pound.8 ${PREFIX}/man/man8/ - .include <bsd.port.mk> diff --git a/www/pound/distinfo b/www/pound/distinfo index 2086e3abe8a8..e76a868862f0 100644 --- a/www/pound/distinfo +++ b/www/pound/distinfo @@ -1 +1 @@ -MD5 (Pound-0.9.tgz) = 9080568e7ac2c7c15c60799c2c62ce33 +MD5 (Pound-1.2.tgz) = 1fbf9a593e5ec35ec8a790f1b53db36c diff --git a/www/pound/files/patch-Makefile b/www/pound/files/patch-Makefile deleted file mode 100644 index adf7537603fc..000000000000 --- a/www/pound/files/patch-Makefile +++ /dev/null @@ -1,27 +0,0 @@ ---- Makefile.orig Mon Aug 19 08:19:53 2002 -+++ Makefile Mon Aug 26 22:10:35 2002 -@@ -26,20 +26,20 @@ - # - # $Id: Makefile,v 0.9 2002/08/19 08:19:53 roseg Exp roseg $ - --CC=gcc -+#CC=gcc - # For GNU-less systems use: - #CC=cc - - # Configuration file default; if none, look at config.c for default! --F_CONF=/usr/local/etc/pound/pound.cfg -+#F_CONF=/usr/local/etc/pound/pound.cfg - --CFLAGS=-O2 -DF_CONF=\"$(F_CONF)\" -DAEMON -+CFLAGS+= -DF_CONF=\"$(F_CONF)\" -DAEMON $(PTHREAD_CFLAGS) -DNEED_STACK - # some old compilers don't like -O2; you may want to try -g for debugging - #CFLAGS=-O -DF_CONF=\"$(F_CONF)\" -DAEMON - # For OpenBSD/FreeBSD use: - #CFLAGS=-O2 -pthread -DF_CONF=\"$(F_CONF)\" -DNEED_STACK -DAEMON - --LIBS=-lssl -lpthread -+LIBS=-lssl -lcrypto $(PTHREAD_LIBS) - # For SystemV/Solaris use: - #LIBS=-lssl -lpthread -lsocket -lnsl - # For OpenBSD/FreeBSD use: diff --git a/www/pound/files/patch-configure b/www/pound/files/patch-configure new file mode 100644 index 000000000000..cc5312ae4ecd --- /dev/null +++ b/www/pound/files/patch-configure @@ -0,0 +1,12 @@ +--- configure.orig Fri Dec 20 08:36:29 2002 ++++ configure Mon Jan 27 23:45:29 2003 +@@ -1831,7 +1831,8 @@ + if test $ac_cv_lib_pthread_pthread_create = yes; then + LIBS="-lpthread ${LIBS}" + else +- CFLAGS="${CFLAGS} -pthread -DNEED_STACK"; LDFLAGS="${LDFLAGS} -pthread" ++ CFLAGS="${CFLAGS} ${PTHREAD_CFLAGS} -DNEED_STACK" ++ LDFLAGS="${PTHREAD_LIBS} ${LDFLAGS}" + fi + + echo "$as_me:1837: checking for socket in -lsocket" >&5 |