From citrin@citrin.ru  Mon Jun  4 14:00:43 2012
Return-Path: <citrin@citrin.ru>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id B11BC106566C;
	Mon,  4 Jun 2012 14:00:43 +0000 (UTC)
	(envelope-from citrin@citrin.ru)
Received: from mail.openstat.ru (servers-nat.spylog.net [193.169.234.5])
	by mx1.freebsd.org (Postfix) with ESMTP id 61CFF8FC0C;
	Mon,  4 Jun 2012 14:00:42 +0000 (UTC)
Received: from crawler01.prod.vega.ru ([10.25.1.3])
	by mail.openstat.ru with esmtps (TLSv1:AES256-SHA:256)
	(Exim 4.77 (FreeBSD))
	(envelope-from <citrin@citrin.ru>)
	id 1SbXiP-000BCZ-DJ; Mon, 04 Jun 2012 17:53:01 +0400
Received: from crawler01.prod.vega.ru (crawler01.prod.vega.ru [10.25.1.3])
	by crawler01.prod.vega.ru (8.14.5/8.14.5) with ESMTP id q54Dr1cm024197;
	Mon, 4 Jun 2012 13:53:01 GMT
	(envelope-from citrin@citrin.ru)
Received: (from ayuzhaninov@localhost)
	by crawler01.prod.vega.ru (8.14.5/8.14.5/Submit) id q54Dr1Kx024196;
	Mon, 4 Jun 2012 13:53:01 GMT
	(envelope-from citrin@citrin.ru)
Message-Id: <201206041353.q54Dr1Kx024196@crawler01.prod.vega.ru>
Date: Mon, 4 Jun 2012 13:53:01 GMT
From: Anton Yuzhaninov <ayuzhaninov@openstat.ru>
To: FreeBSD-gnats-submit@freebsd.org
Cc: skv@freebsd.org
Subject: [PATCH] databases/postgresql-plproxy: update to 2.4
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         168669
>Category:       ports
>Synopsis:       [PATCH] databases/postgresql-plproxy: update to 2.4
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    skv
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Mon Jun 04 14:10:05 UTC 2012
>Closed-Date:    Thu Jun 14 19:25:26 UTC 2012
>Last-Modified:  Thu Jun 14 19:30:01 UTC 2012
>Originator:     Anton Yuzhaninov
>Release:        FreeBSD 8.3-STABLE-20120601 amd64
>Organization:
>Environment:
System: FreeBSD crawler01.prod.vega.ru 8.3-STABLE-20120601 FreeBSD 8.3-STABLE-20120601 #0: Fri Jun  1 00:28:36 UTC
>Description:
- Update to 2.4
- Remove textproc/flex dependency - /usr/bin/flex from base system can be used
- Don't patch path to flex - it is useless, anyway command path/name from
  /usr/local/lib/postgresql/pgxs/src/makefiles/pgxs.mk is used by plproxy Makefile
- Starting from PostgreSQL 9.1 extensions installed in the dir share/postgresql/extension

Port maintainer (skv@FreeBSD.org) is cc'd.
>How-To-Repeat:
>Fix:

--- postgresql-plproxy-2.4.patch begins here ---
diff -ruN --exclude=CVS /usr/ports/databases/postgresql-plproxy/Makefile ./Makefile
--- /usr/ports/databases/postgresql-plproxy/Makefile	2011-02-28 01:48:00.000000000 +0000
+++ ./Makefile	2012-06-04 13:43:43.000000000 +0000
@@ -6,24 +6,35 @@
 #
 
 PORTNAME=	plproxy
-PORTVERSION=	2.2
+PORTVERSION=	2.4
 CATEGORIES=	databases
-MASTER_SITES=	http://pgfoundry.org/frs/download.php/2949/
+MASTER_SITES=	http://pgfoundry.org/frs/download.php/3274/
 PKGNAMEPREFIX=	postgresql-
 
 MAINTAINER=	skv@FreeBSD.org
 COMMENT=	PL/Proxy is database partitioning system
 
-BUILD_DEPENDS=	${LOCALBASE}/bin/flex:${PORTSDIR}/textproc/flex
-
 USE_PGSQL=	yes
 USE_GMAKE=	yes
 USE_BISON=	build
 
 PORTSCOUT=	site:http://pgfoundry.org/frs/?group_id=1000207
 
-post-patch:
-	@${REINPLACE_CMD} -e 's= flex= ${LOCALBASE}/bin/flex=g' \
-		${WRKSRC}/Makefile
+MAKE_ARGS+=	CFLAGS+=-DSYS_SOCKET_H
+
+.include <bsd.port.pre.mk>
+
+.if exists(${LOCALBASE}/bin/pg_config)
+PGSQL_VER!=	${LOCALBASE}/bin/pg_config --version | \
+		${SED} -n 's/PostgreSQL[^0-9]*\([0-9][0-9]*\)\.\([0-9][0-9]*\)[^0-9].*/\1\2/p'
+.else
+PGSQL_VER=	${DEFAULT_PGSQL_VER}
+.endif
+
+.if ${PGSQL_VER} > 91
+PLIST_SUB=	EXT_DIR=extension
+.else
+PLIST_SUB=	EXT_DIR=contrib
+.endif
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff -ruN --exclude=CVS /usr/ports/databases/postgresql-plproxy/distinfo ./distinfo
--- /usr/ports/databases/postgresql-plproxy/distinfo	2011-02-28 01:48:00.000000000 +0000
+++ ./distinfo	2012-06-04 09:34:41.000000000 +0000
@@ -1,2 +1,2 @@
-SHA256 (plproxy-2.2.tar.gz) = ce49c01fdeeb4aa496535b29f5b4a33aec766e45ff58aaf51e0d00fc41b18ba5
-SIZE (plproxy-2.2.tar.gz) = 65161
+SHA256 (plproxy-2.4.tar.gz) = 0be7b3481fa8feacec06b22e041b00b8bb146b72f5c620033e9f8c78e29f7a19
+SIZE (plproxy-2.4.tar.gz) = 75485
diff -ruN --exclude=CVS /usr/ports/databases/postgresql-plproxy/pkg-plist ./pkg-plist
--- /usr/ports/databases/postgresql-plproxy/pkg-plist	2007-07-26 21:20:37.000000000 +0000
+++ ./pkg-plist	2012-06-04 11:11:07.000000000 +0000
@@ -1,5 +1,6 @@
 lib/postgresql/plproxy.so
-share/postgresql/contrib/plproxy.sql
+share/postgresql/%%EXT_DIR%%/plproxy--2.4.0.sql
+share/postgresql/%%EXT_DIR%%/plproxy.control
 @dirrmtry lib/postgresql
-@dirrmtry share/postgresql/contrib
+@dirrmtry share/postgresql/%%EXT_DIR%%
 @dirrmtry share/postgresql
--- postgresql-plproxy-2.4.patch ends here ---

>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->skv 
Responsible-Changed-By: edwin 
Responsible-Changed-When: Tue Jun 5 12:36:49 UTC 2012 
Responsible-Changed-Why:  
Over to maintainer (via the GNATS Auto Assign Tool) 

http://www.freebsd.org/cgi/query-pr.cgi?pr=168669 
State-Changed-From-To: open->closed 
State-Changed-By: skv 
State-Changed-When: Thu Jun 14 19:25:13 UTC 2012 
State-Changed-Why:  
Committed, with some changes. 

Thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=168669 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/168669: commit references a PR
Date: Thu, 14 Jun 2012 19:25:22 +0000 (UTC)

 skv         2012-06-14 19:25:00 UTC
 
   FreeBSD ports repository
 
   Modified files:
     databases/postgresql-plproxy Makefile distinfo pkg-descr 
                                  pkg-plist 
   Log:
   Update to 2.4
   
   Changes:        http://pgfoundry.org/frs/shownotes.php?release_id=1947
   PR:             ports/168669
   Submitted by:   Anton Yuzhaninov
   
   Revision  Changes    Path
   1.8       +22 -8     ports/databases/postgresql-plproxy/Makefile
   1.5       +2 -2      ports/databases/postgresql-plproxy/distinfo
   1.2       +1 -1      ports/databases/postgresql-plproxy/pkg-descr
   1.2       +6 -2      ports/databases/postgresql-plproxy/pkg-plist
 _______________________________________________
 cvs-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/cvs-all
 To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org"
 
>Unformatted:
