svn commit: r355733 - head/databases/pgrouting

[Mathieu Arnold]

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
- at dirrmtry share/postgresql/contrib
- at dirrmtry share/postgresql
- at dirrmtry lib/postgresql