From owner-svn-ports-all@FreeBSD.ORG  Thu May 29 19:29:19 2014
Return-Path: <owner-svn-ports-all@FreeBSD.ORG>
Delivered-To: svn-ports-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id C166C7CC;
 Thu, 29 May 2014 19:29:19 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 962F82ED9;
 Thu, 29 May 2014 19:29:19 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s4TJTJmM072164;
 Thu, 29 May 2014 19:29:19 GMT (envelope-from mat@svn.freebsd.org)
Received: (from mat@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s4TJTJAh072162;
 Thu, 29 May 2014 19:29:19 GMT (envelope-from mat@svn.freebsd.org)
Message-Id: <201405291929.s4TJTJAh072162@svn.freebsd.org>
From: Mathieu Arnold <mat@FreeBSD.org>
Date: Thu, 29 May 2014 19:29:19 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r355733 - head/databases/pgrouting
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-all@freebsd.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all/>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 29 May 2014 19:29:19 -0000

Author: mat
Date: Thu May 29 19:29:18 2014
New Revision: 355733
URL: http://svnweb.freebsd.org/changeset/ports/355733
QAT: https://qat.redports.org/buildarchive/r355733/

Log:
  Fix for postgresql > 9.0.
  
  Sponsored by:	Absolight

Modified:
  head/databases/pgrouting/Makefile
  head/databases/pgrouting/pkg-plist

Modified: head/databases/pgrouting/Makefile
==============================================================================
--- head/databases/pgrouting/Makefile	Thu May 29 19:18:03 2014	(r355732)
+++ head/databases/pgrouting/Makefile	Thu May 29 19:29:18 2014	(r355733)
@@ -24,27 +24,21 @@ USE_LDCONFIG=	yes
 CFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 
-PGSQL_VER=	${DEFAULT_PGSQL_VER}
+.include <bsd.port.pre.mk>
+
+.if ${PGSQL_VER} >= 9.1
+PLIST_SUB+=	OLDPG="@comment " NEWPG=""
 
-.if ${PGSQL_VER} >= 91
-EXT_FILES=	pgrouting--2.0.0.sql \
-		pgrouting.control \
-		pgrouting_dd_legacy.sql \
-		pgrouting--2.0.0.sql.in \
-		pgrouting.sql \
-		pgrouting_legacy.sql
-PLIST_DIRSTRY+=	share/postgresql/extension
-.for f in ${EXT_FILES}
-PLIST_FILES+=	share/postgresql/extension/${f}
-.endfor
-.endif
 
 post-install:
-.if ${PGSQL_VER} >= 91
 	@${MKDIR} ${STAGEDIR}${PREFIX}/share/postgresql/extension
-.for f in ${EXT_FILES}
+.for f in pgrouting--2.0.0.sql pgrouting.control pgrouting_dd_legacy.sql \
+	pgrouting--2.0.0.sql.in pgrouting.sql pgrouting_legacy.sql
 	${INSTALL_DATA} ${WRKSRC}/lib/${f} ${STAGEDIR}${PREFIX}/share/postgresql/extension/
 .endfor
+
+.else
+PLIST_SUB+=	OLDPG="" NEWPG="@comment "
 .endif
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>

Modified: head/databases/pgrouting/pkg-plist
==============================================================================
--- head/databases/pgrouting/pkg-plist	Thu May 29 19:18:03 2014	(r355732)
+++ head/databases/pgrouting/pkg-plist	Thu May 29 19:29:18 2014	(r355733)
@@ -7,11 +7,14 @@ share/postgresql/contrib/pgrouting-2.0/p
 share/postgresql/contrib/pgrouting-2.0/pgrouting.sql
 share/postgresql/contrib/pgrouting-2.0/pgrouting_dd_legacy.sql
 share/postgresql/contrib/pgrouting-2.0/pgrouting_legacy.sql
-share/postgresql/pgrouting--2.0.0.sql
-share/postgresql/pgrouting.control
-share/postgresql/pgrouting_dd_legacy.sql
-share/postgresql/pgrouting_legacy.sql
+%%OLDPG%%share/postgresql/pgrouting--2.0.0.sql
+%%OLDPG%%share/postgresql/pgrouting.control
+%%OLDPG%%share/postgresql/pgrouting_dd_legacy.sql
+%%OLDPG%%share/postgresql/pgrouting_legacy.sql
+%%NEWPG%%share/postgresql/extension/pgrouting--2.0.0.sql
+%%NEWPG%%share/postgresql/extension/pgrouting.control
+%%NEWPG%%share/postgresql/extension/pgrouting_dd_legacy.sql
+%%NEWPG%%share/postgresql/extension/pgrouting--2.0.0.sql.in
+%%NEWPG%%share/postgresql/extension/pgrouting.sql
+%%NEWPG%%share/postgresql/extension/pgrouting_legacy.sql
 @dirrmtry share/postgresql/contrib/pgrouting-2.0
-@dirrmtry share/postgresql/contrib
-@dirrmtry share/postgresql
-@dirrmtry lib/postgresql