Attachment #30685 for bug #51547

View | Details | Raw Unified | Return to bug 51547
Collapse All | Expand All

Lines 6-12 Link Here

(-)pound/Makefile (-2 / +7 lines)
6	#	6	#
7		7
8	PORTNAME= pound	8	PORTNAME= pound
9	PORTVERSION= 1.2	9	PORTVERSION= 1.4
10	CATEGORIES= www net	10	CATEGORIES= www net
11	MASTER_SITES= http://www.apsis.ch/pound/ \	11	MASTER_SITES= http://www.apsis.ch/pound/ \
12	ftp://ftp.nuug.no/pub/anders/distfiles/	12	ftp://ftp.nuug.no/pub/anders/distfiles/
Lines 16-23 Link Here
16	MAINTAINER= anders@FreeBSD.org	16	MAINTAINER= anders@FreeBSD.org
17	COMMENT= Reverse proxy, load balancer and HTTP(S) frontend for web servers	17	COMMENT= Reverse proxy, load balancer and HTTP(S) frontend for web servers
18		18
19	WRKSRC= ${WRKDIR}/${PORTNAME}
20	GNU_CONFIGURE= yes	19	GNU_CONFIGURE= yes
		20	USE_OPENSSL= yes
21		21
22	CONFIGURE_ENV+= PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \	22	CONFIGURE_ENV+= PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
23	PTHREAD_LIBS="${PTHREAD_LIBS}"	23	PTHREAD_LIBS="${PTHREAD_LIBS}"
Lines 25-28 Link Here
25		25
26	MAN8= pound.8	26	MAN8= pound.8
27		27
		28	post-install:
		29	@${ECHO} "===> Installing ${PREFIX}/etc/rc.d/pound.sh"
		30	@${ECHO} "===> startup file as ${PREFIX}/etc/rc.d/pound.sh.sample"
		31	@${INSTALL_SCRIPT} -m 751 ${FILESDIR}/pound.sh \
		32	${PREFIX}/etc/rc.d/pound.sh.sample
28	.include <bsd.port.mk>	33	.include <bsd.port.mk>

Line 1 Link Here

(-)pound/distinfo (-1 / +1 lines)
1	MD5 (Pound-1.2.tgz) = 1fbf9a593e5ec35ec8a790f1b53db36c	1	MD5 (Pound-1.4.tgz) = 23a4634b0f9b964ede58f5e49a30ff7e




--- configure.orig	Thu Apr 24 15:45:26 2003
+++ configure	Tue Apr 29 02:58:39 2003
@@ -1850,7 +1850,8 @@
 if test $ac_cv_lib_pthread_pthread_create = yes; then
   LIBS="-lpthread ${LIBS}"
 else
-  CPPFLAGS="${CPPFLAGS} -pthread -DNEED_STACK"; LDFLAGS="${LDFLAGS} -pthread"
+   CFLAGS="${CFLAGS} ${PTHREAD_CFLAGS} -DNEED_STACK"
+   LDFLAGS="${PTHREAD_LIBS} ${LDFLAGS}"
 fi
 
 echo "$as_me:1856: checking for socket in -lsocket" >&5




--- pound.h.orig	Thu Apr 24 15:45:26 2003
+++ pound.h	Tue Apr 29 03:19:00 2003
@@ -163,9 +163,6 @@
 #define OPENSSL_THREAD_DEFINES
 #include    <openssl/ssl.h>
 #if OPENSSL_VERSION_NUMBER >= 0x00907000L
-#ifndef OPENSSL_THREADS
-#error  "Pound requires OpenSSL with thread support"
-#endif
 #else
 #ifndef THREADS
 #error  "Pound requires OpenSSL with thread support"




#!/bin/sh

if ! PREFIX=$(expr $0 : "\(/.*\)/etc/rc\.d/$(basename $0)\$"); then
    echo "$0: Cannot determine the PREFIX" >&2
    exit 1
fi

case "$1" in
	start)
	[-x ${PREFIX}/sbin/pound ] && ( ${PREFIX}/sbin/pound & ) && 
			\echo -n ' pound'
	;;
	stop)
	killall pound && echo -n ' pound'
	;;
	*)
	echo "Usage: `basename $0` {start|stop}" >&2
	;;
esac

Line 1 Link Here

(-)pound/pkg-plist (+1 lines)
		1	etc/rc.d/pound.sh.sample
1	sbin/pound	2	sbin/pound

Return to bug 51547

Lines 1-12 Link Here

(-)pound/files/patch-configure (-7 / +7 lines)
1	--- configure.orig Fri Dec 20 08:36:29 2002	1	--- configure.orig Thu Apr 24 15:45:26 2003
2	+++ configure Mon Jan 27 23:45:29 2003	2	+++ configure Tue Apr 29 02:58:39 2003
3	@@ -1831,7 +1831,8 @@	3	@@ -1850,7 +1850,8 @@
4	if test $ac_cv_lib_pthread_pthread_create = yes; then	4	if test $ac_cv_lib_pthread_pthread_create = yes; then
5	LIBS="-lpthread ${LIBS}"	5	LIBS="-lpthread ${LIBS}"
6	else	6	else
7	- CFLAGS="${CFLAGS} -pthread -DNEED_STACK"; LDFLAGS="${LDFLAGS} -pthread"	7	- CPPFLAGS="${CPPFLAGS} -pthread -DNEED_STACK"; LDFLAGS="${LDFLAGS} -pthread"
8	+ CFLAGS="${CFLAGS} ${PTHREAD_CFLAGS} -DNEED_STACK"	8	+ CFLAGS="${CFLAGS} ${PTHREAD_CFLAGS} -DNEED_STACK"
9	+ LDFLAGS="${PTHREAD_LIBS} ${LDFLAGS}"	9	+ LDFLAGS="${PTHREAD_LIBS} ${LDFLAGS}"
10	fi	10	fi
11		11
12	echo "$as_me:1837: checking for socket in -lsocket" >&5	12	echo "$as_me:1856: checking for socket in -lsocket" >&5

Line 0 Link Here

(-)pound/files/patch-pound.h (+12 lines)
	1	--- pound.h.orig Thu Apr 24 15:45:26 2003
	2	+++ pound.h Tue Apr 29 03:19:00 2003
	3	@@ -163,9 +163,6 @@
	4	#define OPENSSL_THREAD_DEFINES
	5	#include <openssl/ssl.h>
	6	#if OPENSSL_VERSION_NUMBER >= 0x00907000L
	7	-#ifndef OPENSSL_THREADS
	8	-#error "Pound requires OpenSSL with thread support"
	9	-#endif
	10	#else
	11	#ifndef THREADS
	12	#error "Pound requires OpenSSL with thread support"

Line 0 Link Here

(-)pound/files/pound.sh (+19 lines)
	1	#!/bin/sh
	2
	3	if ! PREFIX=$(expr $0 : "\(/.*\)/etc/rc\.d/$(basename $0)\$"); then
	4	echo "$0: Cannot determine the PREFIX" >&2
	5	exit 1
	6	fi
	7
	8	case "$1" in
	9	start)
	10	[-x ${PREFIX}/sbin/pound ] && ( ${PREFIX}/sbin/pound & ) &&
	11	\echo -n ' pound'
	12	;;
	13	stop)
	14	killall pound && echo -n ' pound'
	15	;;
	16	*)
	17	echo "Usage: `basename $0` {start\|stop}" >&2
	18	;;
	19	esac