Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 21 Mar 2014 08:15:26 +0000 (UTC)
From:      Palle Girgensohn <girgen@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r348732 - in head/databases: postgresql84-contrib postgresql84-server/files postgresql90-contrib postgresql90-server/files postgresql91-contrib postgresql91-server/files postgresql92-co...
Message-ID:  <201403210815.s2L8FQ1m096131@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: girgen
Date: Fri Mar 21 08:15:26 2014
New Revision: 348732
URL: http://svnweb.freebsd.org/changeset/ports/348732
QAT: https://qat.redports.org/buildarchive/r348732/

Log:
  Fix mistake with ossp-uuid: don't use --with-ossp-uuid, since it will need
  the ossp library present, and then we never use it.

Modified:
  head/databases/postgresql84-contrib/Makefile
  head/databases/postgresql84-server/files/patch-contrib-uuid
  head/databases/postgresql90-contrib/Makefile
  head/databases/postgresql90-server/files/patch-contrib-uuid
  head/databases/postgresql91-contrib/Makefile
  head/databases/postgresql91-server/files/patch-contrib-uuid
  head/databases/postgresql92-contrib/Makefile
  head/databases/postgresql92-server/files/patch-contrib-uuid
  head/databases/postgresql93-contrib/Makefile
  head/databases/postgresql93-server/files/patch-contrib-uuid

Modified: head/databases/postgresql84-contrib/Makefile
==============================================================================
--- head/databases/postgresql84-contrib/Makefile	Fri Mar 21 06:29:53 2014	(r348731)
+++ head/databases/postgresql84-contrib/Makefile	Fri Mar 21 08:15:26 2014	(r348732)
@@ -23,7 +23,7 @@ INSTALL_DIRS=	contrib
 
 SLAVE_ONLY=	yes
 COMPONENT=	-contrib
-CONFIGURE_ARGS+=--with-libxslt --with-libxml --with-openssl --with-ossp-uuid
+CONFIGURE_ARGS+=--with-libxslt --with-libxml --with-openssl
 
 post-install:
 	@- ${INSTALL_DATA} ${WRKSRC}/contrib/README ${STAGEDIR}${DOCSDIR}/contrib/README

Modified: head/databases/postgresql84-server/files/patch-contrib-uuid
==============================================================================
--- head/databases/postgresql84-server/files/patch-contrib-uuid	Fri Mar 21 06:29:53 2014	(r348731)
+++ head/databases/postgresql84-server/files/patch-contrib-uuid	Fri Mar 21 08:15:26 2014	(r348732)
@@ -369,3 +369,13 @@
 +	return internal_uuid_create(5, (unsigned char *)ns,
 +				VARDATA(name), VARSIZE(name) - VARHDRSZ);
  }
+--- contrib/Makefile.orig	2014-03-21 09:09:12.000000000 +0100
++++ contrib/Makefile	2014-03-21 09:09:28.000000000 +0100
+@@ -39,6 +39,7 @@
+ 		tablefunc	\
+ 		test_parser	\
+ 		tsearch2	\
++		uuid-ossp	\
+ 		vacuumlo
+ 
+ ifeq ($(with_openssl),yes)

Modified: head/databases/postgresql90-contrib/Makefile
==============================================================================
--- head/databases/postgresql90-contrib/Makefile	Fri Mar 21 06:29:53 2014	(r348731)
+++ head/databases/postgresql90-contrib/Makefile	Fri Mar 21 08:15:26 2014	(r348732)
@@ -23,7 +23,7 @@ INSTALL_DIRS=	contrib
 
 SLAVE_ONLY=	yes
 COMPONENT=	-contrib
-CONFIGURE_ARGS+=--with-libxslt --with-libxml --with-openssl --with-ossp-uuid
+CONFIGURE_ARGS+=--with-libxslt --with-libxml --with-openssl
 LDFLAGS+=	${PTHREAD_LIBS} -L${PREFIX}/lib
 
 post-install:

Modified: head/databases/postgresql90-server/files/patch-contrib-uuid
==============================================================================
--- head/databases/postgresql90-server/files/patch-contrib-uuid	Fri Mar 21 06:29:53 2014	(r348731)
+++ head/databases/postgresql90-server/files/patch-contrib-uuid	Fri Mar 21 08:15:26 2014	(r348732)
@@ -369,3 +369,13 @@
 +	return internal_uuid_create(5, (unsigned char *)ns,
 +				VARDATA(name), VARSIZE(name) - VARHDRSZ);
  }
+--- contrib/Makefile.orig	2014-03-21 08:54:03.000000000 +0100
++++ contrib/Makefile	2014-03-21 08:54:08.000000000 +0100
+@@ -43,6 +43,7 @@
+ 		tablefunc	\
+ 		test_parser	\
+ 		tsearch2	\
++		uuid-ossp	\
+ 		unaccent	\
+ 		vacuumlo
+ 

Modified: head/databases/postgresql91-contrib/Makefile
==============================================================================
--- head/databases/postgresql91-contrib/Makefile	Fri Mar 21 06:29:53 2014	(r348731)
+++ head/databases/postgresql91-contrib/Makefile	Fri Mar 21 08:15:26 2014	(r348732)
@@ -22,7 +22,7 @@ INSTALL_DIRS=	contrib
 
 SLAVE_ONLY=	yes
 COMPONENT=	-contrib
-CONFIGURE_ARGS+=--with-libxslt --with-libxml --with-openssl --with-ossp-uuid
+CONFIGURE_ARGS+=--with-libxslt --with-libxml --with-openssl
 LDFLAGS+=	${PTHREAD_LIBS} -L${PREFIX}/lib
 
 post-install:

Modified: head/databases/postgresql91-server/files/patch-contrib-uuid
==============================================================================
--- head/databases/postgresql91-server/files/patch-contrib-uuid	Fri Mar 21 06:29:53 2014	(r348731)
+++ head/databases/postgresql91-server/files/patch-contrib-uuid	Fri Mar 21 08:15:26 2014	(r348732)
@@ -391,3 +391,13 @@
 +	return internal_uuid_create(5, (unsigned char *)ns,
 +				VARDATA(name), VARSIZE(name) - VARHDRSZ);
  }
+--- contrib/Makefile.orig	2014-03-21 09:05:11.000000000 +0100
++++ contrib/Makefile	2014-03-21 09:05:29.000000000 +0100
+@@ -48,6 +48,7 @@
+ 		test_parser	\
+ 		tsearch2	\
+ 		unaccent	\
++		uuid-ossp	\
+ 		vacuumlo
+ 
+ ifeq ($(with_openssl),yes)

Modified: head/databases/postgresql92-contrib/Makefile
==============================================================================
--- head/databases/postgresql92-contrib/Makefile	Fri Mar 21 06:29:53 2014	(r348731)
+++ head/databases/postgresql92-contrib/Makefile	Fri Mar 21 08:15:26 2014	(r348732)
@@ -22,7 +22,7 @@ INSTALL_DIRS=	contrib
 
 SLAVE_ONLY=	yes
 COMPONENT=	-contrib
-CONFIGURE_ARGS+=--with-libxslt --with-libxml --with-ossp-uuid --with-openssl
+CONFIGURE_ARGS+=--with-libxslt --with-libxml --with-openssl
 LDFLAGS+=	${PTHREAD_LIBS} -L${PREFIX}/lib
 
 post-install:

Modified: head/databases/postgresql92-server/files/patch-contrib-uuid
==============================================================================
--- head/databases/postgresql92-server/files/patch-contrib-uuid	Fri Mar 21 06:29:53 2014	(r348731)
+++ head/databases/postgresql92-server/files/patch-contrib-uuid	Fri Mar 21 08:15:26 2014	(r348732)
@@ -391,3 +391,13 @@
 +	return internal_uuid_create(5, (unsigned char *)ns,
 +				VARDATA(name), VARSIZE(name) - VARHDRSZ);
  }
+--- contrib/Makefile.orig	2014-03-21 09:01:58.000000000 +0100
++++ contrib/Makefile	2014-03-21 09:02:16.000000000 +0100
+@@ -50,6 +50,7 @@
+ 		test_parser	\
+ 		tsearch2	\
+ 		unaccent	\
++		uuid-ossp	\
+ 		vacuumlo
+ 
+ ifeq ($(with_openssl),yes)

Modified: head/databases/postgresql93-contrib/Makefile
==============================================================================
--- head/databases/postgresql93-contrib/Makefile	Fri Mar 21 06:29:53 2014	(r348731)
+++ head/databases/postgresql93-contrib/Makefile	Fri Mar 21 08:15:26 2014	(r348732)
@@ -23,7 +23,7 @@ INSTALL_DIRS=	contrib
 
 SLAVE_ONLY=	yes
 COMPONENT=	-contrib
-CONFIGURE_ARGS+=--with-libxslt --with-libxml --with-openssl --with-ossp-uuid --disable-nls
+CONFIGURE_ARGS+=--with-libxslt --with-libxml --with-openssl --disable-nls
 LDFLAGS+=	${PTHREAD_LIBS} -L${PREFIX}/lib
 
 post-install:

Modified: head/databases/postgresql93-server/files/patch-contrib-uuid
==============================================================================
--- head/databases/postgresql93-server/files/patch-contrib-uuid	Fri Mar 21 06:29:53 2014	(r348731)
+++ head/databases/postgresql93-server/files/patch-contrib-uuid	Fri Mar 21 08:15:26 2014	(r348732)
@@ -397,3 +397,13 @@
 +	return internal_uuid_create(5, (unsigned char *)ns,
 +				VARDATA(name), VARSIZE(name) - VARHDRSZ);
  }
+--- contrib/Makefile.orig	2014-03-21 08:58:32.000000000 +0100
++++ contrib/Makefile	2014-03-21 08:59:13.000000000 +0100
+@@ -52,6 +52,7 @@
+ 		test_parser	\
+ 		tsearch2	\
+ 		unaccent	\
++		uuid-ossp	\
+ 		vacuumlo	\
+ 		worker_spi
+ 



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201403210815.s2L8FQ1m096131>