CVS Update: mystuff

[Jim Dew <jdew@cleannorth.org>]

Log Message:
-----------
Update to latest version, and add *LIBS=

Modified Files:
--------------
    mystuff/www/haproxy:
        Makefile
        distinfo
    mystuff/www/haproxy/patches:
        patch-Makefile_bsd

Revision Data
-------------
Index: Makefile
===================================================================
RCS file: /cvs/mystuff/www/haproxy/Makefile,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -Lwww/haproxy/Makefile -Lwww/haproxy/Makefile -u -r1.1.1.1 -r1.2
--- www/haproxy/Makefile
+++ www/haproxy/Makefile
@@ -1,12 +1,12 @@
 
-DISTNAME=			haproxy-1.2.15
+DISTNAME=		haproxy-1.2.18
 CATEGORIES=		www
-MASTER_SITES=	http://haproxy.1wt.eu/download/1.2/src/
+MASTER_SITES=		http://haproxy.1wt.eu/download/1.2/src/
 
-MAINTAINER=	Jim Dew <jdew@yggdrasil.ca>
+MAINTAINER=		Jim Dew <jdew@yggdrasil.ca>
 COMMENT=		High-performance and highly-robust TCP/HTTP load balancer
 
-#GPL
+#License: GPLv2
 PERMIT_PACKAGE_CDROM=   Yes
 PERMIT_PACKAGE_FTP=     Yes
 PERMIT_DISTFILES_CDROM= Yes
@@ -15,8 +15,13 @@
 USE_GMAKE=		Yes
 MAKE_FILE=		${WRKSRC}/Makefile.bsd
 MAKE_FLAGS+= 	REGEX=pcre \
-							DEBUG= \
-							COPTS.generic="-Os -fomit-frame-pointer"
+		DEBUG= \
+		COPTS.generic="-Os -fomit-frame-pointer"
+
+LIB_DEPENDS+= 	pcre::devel/pcre \
+		pcreposix::devel/pcre
+
+WANTLIB += c
 
 #Makefile.bsd  is rigged for OpenBSD
 #do-build:
@@ -30,9 +35,5 @@
 	#docs
 	mkdir ${WRKINST}/usr/local/share/doc/haproxy/
 	mv ${WRKSRC}/doc/* ${WRKINST}/usr/local/share/doc/haproxy/
-
-BUILD_DEPENDS=  ${RUN_DEPENDS}
-RUN_DEPENDS=    ::devel/pcre
-
 
 .include <bsd.port.mk>
Index: distinfo
===================================================================
RCS file: /cvs/mystuff/www/haproxy/distinfo,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -Lwww/haproxy/distinfo -Lwww/haproxy/distinfo -u -r1.1.1.1 -r1.2
--- www/haproxy/distinfo
+++ www/haproxy/distinfo
@@ -1,4 +1,5 @@
-MD5 (haproxy-1.2.15.tar.gz) = 7461a3deeda099a6ee190f99e9763fea
-RMD160 (haproxy-1.2.15.tar.gz) = 47cc98f2cca5fbfd78825388ca8a24931b5d7e08
-SHA1 (haproxy-1.2.15.tar.gz) = ffad754aeea1c674e54a10451da37b301fb4907f
-SIZE (haproxy-1.2.15.tar.gz) = 248300
+MD5 (haproxy-1.2.18.tar.gz) = qhiEy7si+rLo/wvrN9sfiw==
+RMD160 (haproxy-1.2.18.tar.gz) = sMZEYd0cyRvtcJV1VL1TWvxW66c=
+SHA1 (haproxy-1.2.18.tar.gz) = DP26eVmWhk6ASvmgz7uQr4ZG6hE=
+SHA256 (haproxy-1.2.18.tar.gz) = 4O8GGA+uXjqWcSuGSGeIoPlhRZZA/ZTZk4lUjfUKqcA=
+SIZE (haproxy-1.2.18.tar.gz) = 206287
Index: patch-Makefile_bsd
===================================================================
RCS file: /cvs/mystuff/www/haproxy/patches/patch-Makefile_bsd,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -Lwww/haproxy/patches/patch-Makefile_bsd -Lwww/haproxy/patches/patch-Makefile_bsd -u -r1.1.1.1 -r1.2
--- www/haproxy/patches/patch-Makefile_bsd
+++ www/haproxy/patches/patch-Makefile_bsd
@@ -1,12 +1,12 @@
 $OpenBSD$
---- Makefile.bsd.orig	Fri Sep  8 11:08:50 2006
-+++ Makefile.bsd	Fri Sep  8 11:09:03 2006
-@@ -81,7 +81,7 @@ LDFLAGS = -g
- all: haproxy
+--- Makefile.bsd.orig	Sun May 25 16:10:43 2008
++++ Makefile.bsd	Thu Jul 10 14:40:13 2008
+@@ -82,7 +82,7 @@ all: haproxy
  
- haproxy: src/list.o src/chtbl.o src/hashpjw.o haproxy.o src/base64.o src/uri_auth.o
+ haproxy: src/list.o src/chtbl.o src/hashpjw.o haproxy.o src/base64.o \
+ 	 src/uri_auth.o src/rbtree.o
 -	$(LD) $(LDFLAGS) -o $@ $> $(LIBS)
-+	$(LD) $(LDFLAGS) -o $@ src/list.o src/chtbl.o src/hashpjw.o haproxy.o src/base64.o src/uri_auth.o $(LIBS)
++	$(LD) $(LDFLAGS) -o $@ src/list.o src/chtbl.o src/hashpjw.o haproxy.o src/base64.o src/uri_auth.o src/rbtree.o $(LIBS)
  
- src/base64.o:	src/base64.c
+ src/rbtree.o:	src/rbtree.c
  	$(CC) $(CFLAGS) -c -o $@ $<