Attachment #102970 for bug #142820

View | Details | Raw Unified | Return to bug 142820
Collapse All | Expand All




#

PORTNAME=	libpqxx
PORTVERSION=	3.0.2
PORTREVISION=	1
CATEGORIES=	databases
MASTER_SITES=	http://pqxx.org/download/software/libpqxx/
PKGNAMEPREFIX=	postgresql-

MAINTAINER=	girgen@FreeBSD.org
COMMENT=	A new C++ interface for PostgreSQL

CONFLICTS=	postgresql-libpqxx-[12].*

USE_PGSQL=	yes
USE_GMAKE=	yes
GNU_CONFIGURE=	yes
USE_LDCONFIG=	yes
PLIST_SUB=	SHLIBVERSION=3.0

CONFIGURE_ARGS=	--enable-shared
		--enable-shared \
		--with-postgres-include=${LOCALBASE}/include/postgresql

.include <bsd.port.mk>

Lines 1-3 Link Here

(-)databases/postgresql-libpqxx30/distinfo (-3 / +3 lines)
1	MD5 (postgresql/libpqxx-2.6.9.tar.gz) = 0b0c64af41dfdeea8556dc359994e1cb	1	MD5 (postgresql/libpqxx-3.0.2.tar.gz) = 3baa257e851b773fa1d693bbe185a418
2	SHA256 (postgresql/libpqxx-2.6.9.tar.gz) = 2b2ef5dfb852667299e50727419075cf333bbbeffadaa398d96dc93bac6f7b6a	2	SHA256 (postgresql/libpqxx-3.0.2.tar.gz) = de265ab5d397ace7596c3b6d19a0057ce2ba58477315acf9165b0a97facab6ca
3	SIZE (postgresql/libpqxx-2.6.9.tar.gz) = 1639557	3	SIZE (postgresql/libpqxx-3.0.2.tar.gz) = 1565644

Lines 1-9 Link Here

(-)databases/postgresql-libpqxx30/files/patch-Makefile.in (-5 / +5 lines)
1	--- Makefile.in~ Sat May 27 12:46:50 2006	1	--- Makefile.in 2009-08-14 10:16:35.000000000 -0700
2	+++ Makefile.in Sun May 28 17:51:23 2006	2	+++ Makefile.in.new 2010-01-13 23:09:39.000000000 -0800
3	@@ -212,7 +212,7 @@	3	@@ -226,7 +226,7 @@
		4	MAINTAINERCLEANFILES = Makefile.in aclocal.m4 config.h.in config.log configure \
		5	stamp-h.in
4		6
5
6	#includedir=$(prefix)/include
7	-pkgconfigdir = $(libdir)/pkgconfig	7	-pkgconfigdir = $(libdir)/pkgconfig
8	+pkgconfigdir = $(prefix)/libdata/pkgconfig	8	+pkgconfigdir = $(prefix)/libdata/pkgconfig
9	pkgconfig_DATA = libpqxx.pc	9	pkgconfig_DATA = libpqxx.pc




diff -urN libpqxx-3.0.2.dist/libpqxx.spec.in libpqxx-3.0.2/libpqxx.spec.in
--- libpqxx.spec.in	2009-07-03 22:38:38.000000000 -0700
+++ libpqxx.spec.in.new	2010-01-13 21:24:41.000000000 -0800
@@ -58,7 +58,7 @@
 %files devel
 %defattr(-, root, root)
 %{_libdir}/*a
-%{_libdir}/pkgconfig/libpqxx.pc
+%{_prefix}/libdata/pkgconfig/libpqxx.pc
 %{_includedir}/*
 %{_bindir}/pqxx-config
 

Lines 3-9 Link Here

(-)databases/postgresql-libpqxx30/pkg-plist (-3 / +4 lines)
3	include/pqxx/basic_connection.hxx	3	include/pqxx/basic_connection.hxx
4	include/pqxx/binarystring	4	include/pqxx/binarystring
5	include/pqxx/binarystring.hxx	5	include/pqxx/binarystring.hxx
6	include/pqxx/cachedresult.h
7	include/pqxx/compiler-internal-post.hxx	6	include/pqxx/compiler-internal-post.hxx
8	include/pqxx/compiler-internal-pre.hxx	7	include/pqxx/compiler-internal-pre.hxx
9	include/pqxx/compiler-public.hxx	8	include/pqxx/compiler-public.hxx
Lines 15-21 Link Here
15	include/pqxx/connectionpolicy	14	include/pqxx/connectionpolicy
16	include/pqxx/connectionpolicy.hxx	15	include/pqxx/connectionpolicy.hxx
17	include/pqxx/cursor	16	include/pqxx/cursor
18	include/pqxx/cursor.h
19	include/pqxx/cursor.hxx	17	include/pqxx/cursor.hxx
20	include/pqxx/dbtransaction	18	include/pqxx/dbtransaction
21	include/pqxx/dbtransaction.hxx	19	include/pqxx/dbtransaction.hxx
Lines 28-33 Link Here
28	include/pqxx/libpq-forward.hxx	26	include/pqxx/libpq-forward.hxx
29	include/pqxx/nontransaction	27	include/pqxx/nontransaction
30	include/pqxx/nontransaction.hxx	28	include/pqxx/nontransaction.hxx
		29	include/pqxx/notify-listen
		30	include/pqxx/notify-listen.hxx
31	include/pqxx/pipeline	31	include/pqxx/pipeline
32	include/pqxx/pipeline.hxx	32	include/pqxx/pipeline.hxx
33	include/pqxx/pqxx	33	include/pqxx/pqxx
Lines 55-61 Link Here
55	include/pqxx/trigger.hxx	55	include/pqxx/trigger.hxx
56	include/pqxx/util	56	include/pqxx/util
57	include/pqxx/util.hxx	57	include/pqxx/util.hxx
58	lib/libpqxx-%%PORTVERSION%%.so	58	include/pqxx/version.hxx
		59	lib/libpqxx-%%SHLIBVERSION%%.so
59	lib/libpqxx.a	60	lib/libpqxx.a
60	lib/libpqxx.la	61	lib/libpqxx.la
61	lib/libpqxx.so	62	lib/libpqxx.so

Return to bug 142820

Lines 6-13 Link Here

(-)databases/postgresql-libpqxx30/Makefile (-6 / +5 lines)
6	#	6	#
7		7
8	PORTNAME= libpqxx	8	PORTNAME= libpqxx
9	PORTVERSION= 2.6.9	9	PORTVERSION= 3.0.2
10	PORTREVISION= 1
11	CATEGORIES= databases	10	CATEGORIES= databases
12	MASTER_SITES= http://pqxx.org/download/software/libpqxx/	11	MASTER_SITES= http://pqxx.org/download/software/libpqxx/
13	PKGNAMEPREFIX= postgresql-	12	PKGNAMEPREFIX= postgresql-
Lines 16-29 Link Here
16	MAINTAINER= girgen@FreeBSD.org	15	MAINTAINER= girgen@FreeBSD.org
17	COMMENT= A new C++ interface for PostgreSQL	16	COMMENT= A new C++ interface for PostgreSQL
18		17
		18	CONFLICTS= postgresql-libpqxx-[12].*
		19
19	USE_PGSQL= yes	20	USE_PGSQL= yes
20	USE_GMAKE= yes	21	USE_GMAKE= yes
21	GNU_CONFIGURE= yes	22	GNU_CONFIGURE= yes
22	USE_LDCONFIG= yes	23	USE_LDCONFIG= yes
23	PLIST_SUB= PORTVERSION=${PORTVERSION}	24	PLIST_SUB= SHLIBVERSION=3.0
24		25
25	CONFIGURE_ARGS= --with-postgres=${LOCALBASE} \	26	CONFIGURE_ARGS= --enable-shared
26	--enable-shared \
27	--with-postgres-include=${LOCALBASE}/include/postgresql
28		27
29	.include <bsd.port.mk>	28	.include <bsd.port.mk>

Line 0 Link Here

(-)databases/postgresql-libpqxx30/files/patch-libpqxx.spec.in (+12 lines)
	1	diff -urN libpqxx-3.0.2.dist/libpqxx.spec.in libpqxx-3.0.2/libpqxx.spec.in
	2	--- libpqxx.spec.in 2009-07-03 22:38:38.000000000 -0700
	3	+++ libpqxx.spec.in.new 2010-01-13 21:24:41.000000000 -0800
	4	@@ -58,7 +58,7 @@
	5	%files devel
	6	%defattr(-, root, root)
	7	%{_libdir}/*a
	8	-%{_libdir}/pkgconfig/libpqxx.pc
	9	+%{_prefix}/libdata/pkgconfig/libpqxx.pc
	10	%{_includedir}/*
	11	%{_bindir}/pqxx-config
	12