Attachment #25688 for bug #43878

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

Lines 6-12 Link Here

(-)pound/Makefile (-2 / +5 lines)
6	#	6	#
7		7
8	PORTNAME= pound	8	PORTNAME= pound
9	PORTVERSION= 0.9	9	PORTVERSION= 0.11
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-21 Link Here
16	MAINTAINER= anders@FreeBSD.org	16	MAINTAINER= anders@FreeBSD.org
17		17
18	WRKSRC= ${WRKDIR}/${PORTNAME}	18	WRKSRC= ${WRKDIR}/${PORTNAME}
		19	HAS_CONFIGURE=yes
19		20
20	MAKE_ARGS+= PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \	21	MAKE_ARGS+= PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
21	PTHREAD_LIBS="${PTHREAD_LIBS}" \	22	PTHREAD_LIBS="${PTHREAD_LIBS}" \
Lines 26-30 Link Here
26	do-install:	27	do-install:
27	${INSTALL_PROGRAM} ${WRKSRC}/pound ${PREFIX}/sbin/	28	${INSTALL_PROGRAM} ${WRKSRC}/pound ${PREFIX}/sbin/
28	${INSTALL_MAN} ${WRKSRC}/pound.8 ${PREFIX}/man/man8/	29	${INSTALL_MAN} ${WRKSRC}/pound.8 ${PREFIX}/man/man8/
29		30	@${ECHO} "===> Installing ${PREFIX}/etc/rc.d/pound.sh"
		31	@${ECHO} "===> startup file as ${PREFIX}/etc/rc.d/pound.sh.sample"
		32	@${INSTALL_SCRIPT} -m 751 ${FILESDIR}/pound.sh ${PREFIX}/etc/rc.d/pound.sh.sample
30	.include <bsd.port.mk>	33	.include <bsd.port.mk>

Line 1 Link Here

(-)pound/distinfo (-1 / +1 lines)
1	MD5 (Pound-0.9.tgz) = 9080568e7ac2c7c15c60799c2c62ce33	1	MD5 (Pound-0.11.tgz) = 8e2adde959a746063232c18ad9a8949f




--- Makefile.in.orig	Wed Sep 18 17:07:24 2002
+++ Makefile.in	Wed Oct  9 23:38:01 2002
@@ -26,16 +26,17 @@
 #
 # $Id: Makefile.in,v 0.10 2002/09/05 15:30:13 roseg Exp roseg $
 
-CC=@CC@
+CC?=@CC@
 # 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=-DF_CONF=\"$(F_CONF)\" -DAEMON @CFLAGS@
+CFLAGS+= -DF_CONF=\"$(F_CONF)\" -DAEMON $(PTHREAD_CFLAGS) @CFLAGS@
 
-LIBS=@LIBS@
+LIBS= $(PTHREAD_LIBS) @LIBS@
 
-prefix=@prefix@
+PREFIX?=@prefix@
+prefix=$(PREFIX)
 exec_prefix=@exec_prefix@
 
 OBJS=pound.o http.o config.o svc.o




#!/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

exit 0

Line 1 Link Here

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

Return to bug 43878

Lines 1-27 Link Here

(-)pound/files/patch-Makefile (-22 / +19 lines)
1	--- Makefile.orig Mon Aug 19 08:19:53 2002	1	--- Makefile.in.orig Wed Sep 18 17:07:24 2002
2	+++ Makefile Mon Aug 26 22:10:35 2002	2	+++ Makefile.in Wed Oct 9 23:38:01 2002
3	@@ -26,20 +26,20 @@	3	@@ -26,16 +26,17 @@
4	#	4	#
5	# $Id: Makefile,v 0.9 2002/08/19 08:19:53 roseg Exp roseg $	5	# $Id: Makefile.in,v 0.10 2002/09/05 15:30:13 roseg Exp roseg $
6		6
7	-CC=gcc	7	-CC=@CC@
8	+#CC=gcc	8	+CC?=@CC@
9	# For GNU-less systems use:
10	#CC=cc
11		9
12	# Configuration file default; if none, look at config.c for default!	10	# Configuration file default; if none, look at config.c for default!
13	-F_CONF=/usr/local/etc/pound/pound.cfg	11	F_CONF=/usr/local/etc/pound/pound.cfg
14	+#F_CONF=/usr/local/etc/pound/pound.cfg
15		12
16	-CFLAGS=-O2 -DF_CONF=\"$(F_CONF)\" -DAEMON	13	-CFLAGS=-DF_CONF=\"$(F_CONF)\" -DAEMON @CFLAGS@
17	+CFLAGS+= -DF_CONF=\"$(F_CONF)\" -DAEMON $(PTHREAD_CFLAGS) -DNEED_STACK	14	+CFLAGS+= -DF_CONF=\"$(F_CONF)\" -DAEMON $(PTHREAD_CFLAGS) @CFLAGS@
18	# some old compilers don't like -O2; you may want to try -g for debugging	15
19	#CFLAGS=-O -DF_CONF=\"$(F_CONF)\" -DAEMON	16	-LIBS=@LIBS@
20	# For OpenBSD/FreeBSD use:	17	+LIBS= $(PTHREAD_LIBS) @LIBS@
21	#CFLAGS=-O2 -pthread -DF_CONF=\"$(F_CONF)\" -DNEED_STACK -DAEMON	18
22		19	-prefix=@prefix@
23	-LIBS=-lssl -lpthread	20	+PREFIX?=@prefix@
24	+LIBS=-lssl -lcrypto $(PTHREAD_LIBS)	21	+prefix=$(PREFIX)
25	# For SystemV/Solaris use:	22	exec_prefix=@exec_prefix@
26	#LIBS=-lssl -lpthread -lsocket -lnsl	23
27	# For OpenBSD/FreeBSD use:	24	OBJS=pound.o http.o config.o svc.o

Line 0 Link Here

(-)pound/files/pound.sh (+20 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 & ) && echo -n ' pound'
	11	;;
	12	stop)
	13	killall pound && echo -n ' pound'
	14	;;
	15	*)
	16	echo "Usage: `basename $0` {start\|stop}" >&2
	17	;;
	18	esac
	19
	20	exit 0