Attachment 30685 Details for Bug 51547 – pound.diff

[patch] pound.diff

pound.diff (text/plain), 3.39 KB, created by Clement Laforet on 2003-04-29 03:20:06 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Clement Laforet

Created: 2003-04-29 03:20:06 UTC

Size: 3.39 KB

patch

obsolete

>diff -Nru pound.orig/Makefile pound/Makefile
>--- pound.orig/Makefile	Tue Apr 29 03:26:05 2003
>+++ pound/Makefile	Tue Apr 29 03:22:39 2003
>@@ -6,7 +6,7 @@
> #
> 
> PORTNAME=	pound
>-PORTVERSION=	1.2
>+PORTVERSION=	1.4
> CATEGORIES=	www net
> MASTER_SITES=	http://www.apsis.ch/pound/ \
> 		ftp://ftp.nuug.no/pub/anders/distfiles/
>@@ -16,8 +16,8 @@
> MAINTAINER=	anders@FreeBSD.org
> COMMENT=	Reverse proxy, load balancer and HTTP(S) frontend for web servers
> 
>-WRKSRC=		${WRKDIR}/${PORTNAME}
> GNU_CONFIGURE=	yes
>+USE_OPENSSL=	yes
> 
> CONFIGURE_ENV+=	PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
> 		PTHREAD_LIBS="${PTHREAD_LIBS}"
>@@ -25,4 +25,9 @@
> 
> MAN8=	pound.8
> 
>+post-install:
>+	@${ECHO} "===>  Installing ${PREFIX}/etc/rc.d/pound.sh"
>+	@${ECHO} "===>  startup file as ${PREFIX}/etc/rc.d/pound.sh.sample"
>+	@${INSTALL_SCRIPT} -m 751 ${FILESDIR}/pound.sh \
>+			${PREFIX}/etc/rc.d/pound.sh.sample
> .include <bsd.port.mk>
>diff -Nru pound.orig/distinfo pound/distinfo
>--- pound.orig/distinfo	Tue Apr 29 03:26:05 2003
>+++ pound/distinfo	Tue Apr 29 02:53:31 2003
>@@ -1 +1 @@
>-MD5 (Pound-1.2.tgz) = 1fbf9a593e5ec35ec8a790f1b53db36c
>+MD5 (Pound-1.4.tgz) = 23a4634b0f9b964ede58f5e49a30ff7e
>diff -Nru pound.orig/files/patch-configure pound/files/patch-configure
>--- pound.orig/files/patch-configure	Tue Apr 29 03:26:05 2003
>+++ pound/files/patch-configure	Tue Apr 29 02:58:54 2003
>@@ -1,12 +1,12 @@
>---- configure.orig	Fri Dec 20 08:36:29 2002
>-+++ configure	Mon Jan 27 23:45:29 2003
>-@@ -1831,7 +1831,8 @@
>+--- 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
>--  CFLAGS="${CFLAGS} -pthread -DNEED_STACK"; LDFLAGS="${LDFLAGS} -pthread"
>-+  CFLAGS="${CFLAGS} ${PTHREAD_CFLAGS} -DNEED_STACK"
>-+  LDFLAGS="${PTHREAD_LIBS} ${LDFLAGS}"
>+-  CPPFLAGS="${CPPFLAGS} -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
>+ echo "$as_me:1856: checking for socket in -lsocket" >&5
>diff -Nru pound.orig/files/patch-pound.h pound/files/patch-pound.h
>--- pound.orig/files/patch-pound.h	Thu Jan  1 01:00:00 1970
>+++ pound/files/patch-pound.h	Tue Apr 29 03:19:20 2003
>@@ -0,0 +1,12 @@
>+--- 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"
>diff -Nru pound.orig/files/pound.sh pound/files/pound.sh
>--- pound.orig/files/pound.sh	Thu Jan  1 01:00:00 1970
>+++ pound/files/pound.sh	Tue Apr 29 03:07:32 2003
>@@ -0,0 +1,19 @@
>+#!/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
>diff -Nru pound.orig/pkg-plist pound/pkg-plist
>--- pound.orig/pkg-plist	Tue Apr 29 03:26:05 2003
>+++ pound/pkg-plist	Tue Apr 29 03:24:01 2003
>@@ -1 +1,2 @@
>+etc/rc.d/pound.sh.sample
> sbin/pound

Actions: View | Diff

Attachments on bug 51547: 30685