3 files changed, 93 insertions, 9 deletions

diff --git a/databases/libmemcache/Makefile b/databases/libmemcache/Makefile
index 79d2f645f404..953f11869ba7 100644
--- a/databases/libmemcache/Makefile
+++ b/databases/libmemcache/Makefile
@@ -7,30 +7,31 @@
 
 PORTNAME=	libmemcache
 PORTVERSION=	1.2.3
+PORTREVISION=	1
 CATEGORIES=	databases
 MASTER_SITES=	http://people.FreeBSD.org/~seanc/ports/libmemcache/
 
 MAINTAINER=	seanc@FreeBSD.org
 COMMENT=	The C library for accessing a memcache cluster
 
-NO_FILTER_SHLIBS=	yes
-BUILD_DEPENDS+=	pmk:${PORTSDIR}/devel/pmk
+BUILD_DEPENDS=	pmk:${PORTSDIR}/devel/pmk
 
 USE_BZIP2=	yes
 
-OPTIONS=	DEBUG	"Build with debugging turned on" off
+INSTALLS_SHLIB=	yes
+NO_FILTER_SHLIBS=	yes
 
-.include <bsd.port.pre.mk>
+OPTIONS=	DEBUG	"Build with debugging turned on" off
 
 .if defined(WITH_DEBUG)
 PMKARGS=	-e debug
 .endif
 
-.if ${OSVERSION} < 500000
-BROKEN=		"Does not compile on FreeBSD 4.x"
-.endif
-
 do-configure:
 	cd ${WRKSRC}; ${LOCALBASE}/bin/pmk ${PMKARGS}
 
-.include <bsd.port.post.mk>
+post-install:
+	# only files named lib*.so.[0-9] enter ld-elf.so.hints
+	${LN} -sf ${PREFIX}/lib/libmemcache.so.1.2 ${PREFIX}/lib/libmemcache.so.1
+
+.include <bsd.port.mk>
diff --git a/databases/libmemcache/files/patch-pmkfile b/databases/libmemcache/files/patch-pmkfile
new file mode 100644
index 000000000000..aa83653bafb6
--- /dev/null
+++ b/databases/libmemcache/files/patch-pmkfile
@@ -0,0 +1,82 @@
+--- pmkfile.orig	Wed Apr 27 14:54:44 2005
++++ pmkfile	Wed Apr 27 11:35:47 2005
+@@ -16,13 +16,13 @@
+ 
+ IF(!debug) {
+ 	DEFINE {
+-		CFLAGS = "-std=c99 -pipe -O3"
++		CFLAGS = "-pipe -O3"
+ 	}
+ }
+ 
+ IF(debug) {
+ 	DEFINE {
+-		CFLAGS = "-std=c99 -g -Wall -Wunused -Wshadow -Wpointer-arith -Wbad-function-cast -Wcast-qual -Wcast-align -Wwrite-strings -Wsign-compare -Waggregate-return -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations -Wmissing-noreturn -Wformat -Wpacked -Wdeprecated-declarations -Wredundant-decls -Wnested-externs -Winline -Wdisabled-optimization -pipe -pedantic"
++		CFLAGS = "-g -Wall -Wunused -Wshadow -Wpointer-arith -Wbad-function-cast -Wcast-qual -Wcast-align -Wwrite-strings -Wsign-compare -Waggregate-return -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations -Wmissing-noreturn -Wformat -Wpacked -Wdeprecated-declarations -Wredundant-decls -Wnested-externs -Winline -Wdisabled-optimization -pipe -pedantic"
+ 	}
+ }
+ 
+@@ -121,24 +121,6 @@
+ 	NAME="unistd.h"
+ }
+ 
+-CHECK_HEADER(include_socket) {
+-	REQUIRED=TRUE
+-	FUNCTION="socket"
+-	NAME="sys/socket.h"
+-}
+-
+-CHECK_HEADER(include_setsockopt) {
+-	REQUIRED=TRUE
+-	FUNCTION="setsockopt"
+-	NAME="sys/socket.h"
+-}
+-
+-CHECK_HEADER(include_connect) {
+-	REQUIRED=TRUE
+-	FUNCTION="setsockopt"
+-	NAME="sys/socket.h"
+-}
+-
+ CHECK_HEADER(include_freeaddrinfo) {
+ 	REQUIRED=TRUE
+ 	FUNCTION="freeaddrinfo"
+@@ -170,12 +152,6 @@
+ 	NAME="ctype.h"
+ }
+ 
+-CHECK_HEADER(include_readv) {
+-	REQUIRED=TRUE
+-	FUNCTION="readv"
+-	NAME="sys/uio.h"
+-}
+-
+ CHECK_HEADER(include_errno) {
+ 	REQUIRED=FALSE
+ 	FUNCTION="errno"
+@@ -194,12 +170,6 @@
+ 	NAME="unistd.h"
+ }
+ 
+-CHECK_HEADER(include_writev) {
+-	REQUIRED=TRUE
+-	FUNCTION="writev"
+-	NAME="sys/uio.h"
+-}
+-
+ CHECK_HEADER(include_snprintf) {
+ 	REQUIRED=TRUE
+ 	FUNCTION="snprintf"
+@@ -281,12 +251,6 @@
+ 	REQUIRED=TRUE
+ 	FUNCTION="bzero"
+ 	NAME="strings.h"
+-}
+-
+-CHECK_HEADER(include_select) {
+-	REQUIRED=TRUE
+-	FUNCTIOn="select"
+-	NAME="sys/select.h"
+ }
+ 
+ CHECK_HEADER(include_strdup) {
diff --git a/databases/libmemcache/pkg-plist b/databases/libmemcache/pkg-plist
index 116e7eb92f29..cb1b73ef439b 100644
--- a/databases/libmemcache/pkg-plist
+++ b/databases/libmemcache/pkg-plist
@@ -1,4 +1,5 @@
 include/memcache.h
 lib/libmemcache.so.1.2
+lib/libmemcache.so.1
 lib/libmemcache.so
 lib/libmemcache.a