From 1ae079219e1cea5e0a97c31d9bcee6436aecad53 Mon Sep 17 00:00:00 2001
From: simon <simon@openbsd.org>
Date: Mon, 24 Mar 2008 17:25:49 +0000
Subject: [PATCH] Remove -pgsql subpackage to avoid an endless loop as the next
 version of postgresql will provide native uuid support, which depends on
 uuid.

Except a few function names your databases will need no changes.

For the list of new functions look at the postgresql-docs package or
http://www.postgresql.org/docs/8.3/static/uuid-ossp.html.

tests & ok mbalmer@
---
 devel/uuid/Makefile        | 17 +++-----------
 devel/uuid/files/Makefile  | 48 --------------------------------------
 devel/uuid/pkg/DESCR-pgsql |  2 --
 devel/uuid/pkg/PLIST-pgsql |  7 ------
 4 files changed, 3 insertions(+), 71 deletions(-)
 delete mode 100644 devel/uuid/files/Makefile
 delete mode 100644 devel/uuid/pkg/DESCR-pgsql
 delete mode 100644 devel/uuid/pkg/PLIST-pgsql

diff --git a/devel/uuid/Makefile b/devel/uuid/Makefile
index 8a12b7cf3a9..664b7b2037d 100644
--- a/devel/uuid/Makefile
+++ b/devel/uuid/Makefile
@@ -1,16 +1,14 @@
-# $OpenBSD: Makefile,v 1.29 2007/09/16 02:53:14 merdely Exp $
+# $OpenBSD: Makefile,v 1.30 2008/03/24 17:25:49 simon Exp $
 
 SHARED_ONLY=	Yes
 
 COMMENT-main=	ISO-C API and CLI for generating UUIDs
 COMMENT-perl=	UUID modules for Perl
-COMMENT-pgsql=	UUID extension for PostgreSQL
 
 VERSION=		1.6.0
 DISTNAME=		uuid-${VERSION}
 FULLPKGNAME-main=	uuid-${VERSION}
 FULLPKGNAME-perl= 	p5-UUID-${VERSION}p0
-FULLPKGNAME-pgsql= 	postgresql-uuid-${VERSION}
 CATEGORIES=		devel
 SHARED_LIBS=		uuid	13.22 \
 			uuid++	14.21
@@ -26,7 +24,7 @@ PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
 
-MULTI_PACKAGES=		-main -perl -pgsql
+MULTI_PACKAGES=		-main -perl
 
 WANTLIB-main=		c
 
@@ -34,19 +32,10 @@ CATEGORIES-perl=	devel perl5
 WANTLIB-perl=
 LIB_DEPENDS-perl=	uuid.>=12::devel/uuid
 
-CATEGORIES-pgsql=	devel databases
-WANTLIB-pgsql=		c
-LIB_DEPENDS-pgsql=	uuid.>=12::devel/uuid
-RUN_DEPENDS-pgsql=	:postgresql-server-*:databases/postgresql,-server
-BUILD_DEPENDS+=		${RUN_DEPENDS-pgsql}
-
 USE_LIBTOOL=		Yes
 
 CONFIGURE_STYLE=	gnu
 CONFIGURE_ARGS+=	--with-perl --with-cxx \
-			--without-php --with-pgsql
-
-pre-build:
-	@cp ${FILESDIR}/Makefile ${WRKSRC}/pgsql
+			--without-php --without-pgsql
 
 .include <bsd.port.mk>
diff --git a/devel/uuid/files/Makefile b/devel/uuid/files/Makefile
deleted file mode 100644
index c1c86739263..00000000000
--- a/devel/uuid/files/Makefile
+++ /dev/null
@@ -1,48 +0,0 @@
-
-LIB=		uuid
-
-PG_CONFIG?=	pg_config
-PG_CFLAGS!=	${PG_CONFIG} --cflags
-PG_CPPFLAGS!=	${PG_CONFIG} --cppflags
-PG_INCDIR!=	${PG_CONFIG} --pkgincludedir
-PG_LIBDIR!=	${PG_CONFIG} --pkglibdir
-PG_SHAREDIR!=	${PG_CONFIG} --sharedir
-PG_DOCDIR!=	${PG_CONFIG} --docdir
-
-CFLAGS=		${PG_CFLAGS}
-CPPFLAGS=	${PG_CPPFLAGS} -I.. -I${PG_INCDIR}/server -I${PG_INCDIR}/internal
-
-LDFLAGS=	-L../.libs -L${PG_LIBDIR}
-LDADD=		-luuid -lc
-
-.SUFFIXES: .sql .sql.in .c .o .so
-
-all: ${LIB:=.sql} ${LIB:=.so}
-
-.sql.in.sql:
-	sed -e 's,MODULE_PATHNAME,$$libdir/$*,g' $< >$@
-
-.c.o:
-	${COMPILE.c} ${PICFLAG} -DPIC ${.IMPSRC} -o ${.TARGET}
-
-.o.so:
-	${AR} cr ${LIB}.a uuid.o
-	${RANLIB} ${LIB}.a
-	${CC} ${CFLAGS} ${PICFLAG} -DPIC -shared -Wl,-x ${.IMPSRC} \
-	    ${LDFLAGS} ${LDADD} -o ${.TARGET}
-
-install: all
-	${INSTALL} -d ${DESTDIR}${PG_LIBDIR}
-	${INSTALL} ${LIB:=.so} ${DESTDIR}${PG_LIBDIR}/${LIB:=.so}
-	${INSTALL} -d ${DESTDIR}${PG_SHAREDIR}
-	${INSTALL} uuid.sql ${DESTDIR}${PG_SHAREDIR}/uuid.sql
-	${INSTALL} -d ${DESTDIR}${PG_DOCDIR}
-	${INSTALL} uuid.txt ${DESTDIR}${PG_DOCDIR}/uuid.txt
-
-clean:
-	rm -f a.out [Ee]rrs mklog core *.core
-	rm -f ${LIB:=.sql} ${LIB}*.{a,o,so}
-
-.PHONY: clean
-
-.include <bsd.own.mk>
diff --git a/devel/uuid/pkg/DESCR-pgsql b/devel/uuid/pkg/DESCR-pgsql
deleted file mode 100644
index 30b1b067850..00000000000
--- a/devel/uuid/pkg/DESCR-pgsql
+++ /dev/null
@@ -1,2 +0,0 @@
-This is the OSSP uuid binding for the PostgreSQL RDBMS, providing
-native UUID data type support.
diff --git a/devel/uuid/pkg/PLIST-pgsql b/devel/uuid/pkg/PLIST-pgsql
deleted file mode 100644
index 4d8758e9fcf..00000000000
--- a/devel/uuid/pkg/PLIST-pgsql
+++ /dev/null
@@ -1,7 +0,0 @@
-@comment $OpenBSD: PLIST-pgsql,v 1.1 2007/06/19 16:09:12 simon Exp $
-lib/postgresql/
-lib/postgresql/uuid.so
-share/doc/postgresql/
-share/doc/postgresql/uuid.txt
-share/postgresql/
-share/postgresql/uuid.sql