svn commit: r304112 - in head/databases: spatialite spatialite_gui

[Pawel Pekala]

Author: pawel
Date: Tue Sep 11 17:49:21 2012
New Revision: 304112
URL: http://svn.freebsd.org/changeset/ports/304112

Log:
  - spatialite: install pc file in correct place [1]
  - spatialite_gui: unbreak, now configures properly and is able to
    find libspatialite installed by databases/spatialite
  
  PR:		ports/170893 [1]
  Submitted by:	myself [1]
  Approved by:	maintainer timeout

Modified:
  head/databases/spatialite/Makefile
  head/databases/spatialite/pkg-plist
  head/databases/spatialite_gui/Makefile

Modified: head/databases/spatialite/Makefile
==============================================================================
--- head/databases/spatialite/Makefile	Tue Sep 11 17:34:09 2012	(r304111)
+++ head/databases/spatialite/Makefile	Tue Sep 11 17:49:21 2012	(r304112)
@@ -7,6 +7,7 @@
 
 PORTNAME=	spatialite
 PORTVERSION=	3.0.1
+PORTREVISION=	1
 CATEGORIES=	databases geography
 MASTER_SITES=	http://www.gaia-gis.it/gaia-sins/
 DISTNAME=	lib${PORTNAME}-${PORTVERSION}
@@ -34,6 +35,8 @@ post-patch:
 	@${REINPLACE_CMD} -e 's|-ldl| |' ${WRKSRC}/src/Makefile.am
 	@${REINPLACE_CMD} -e 's|-ldl| |' ${WRKSRC}/src/Makefile.in
 	@${REINPLACE_CMD} -e 's|-ldl| |' ${WRKSRC}/configure
+	@${REINPLACE_CMD} -e 's|$$(libdir)/pkgconfig|$$(prefix)/libdata/pkgconfig|' \
+		${WRKSRC}/Makefile.in
 
 .include <bsd.port.pre.mk>
 

Modified: head/databases/spatialite/pkg-plist
==============================================================================
--- head/databases/spatialite/pkg-plist	Tue Sep 11 17:34:09 2012	(r304111)
+++ head/databases/spatialite/pkg-plist	Tue Sep 11 17:49:21 2012	(r304112)
@@ -14,6 +14,6 @@ lib/libspatialite.a
 lib/libspatialite.la
 lib/libspatialite.so
 lib/libspatialite.so.4
-lib/pkgconfig/spatialite.pc
- at dirrm lib/pkgconfig
+libdata/pkgconfig/spatialite.pc
+ at dirrmtry libdata/pkgconfig
 @dirrm include/spatialite

Modified: head/databases/spatialite_gui/Makefile
==============================================================================
--- head/databases/spatialite_gui/Makefile	Tue Sep 11 17:34:09 2012	(r304111)
+++ head/databases/spatialite_gui/Makefile	Tue Sep 11 17:49:21 2012	(r304112)
@@ -18,8 +18,6 @@ LIB_DEPENDS=	gaiagraphics:${PORTSDIR}/gr
 		freexl:${PORTSDIR}/textproc/freexl \
 		spatialite:${PORTSDIR}/databases/spatialite
 
-BROKEN=		does not configure
-
 USE_WX=		2.8
 WANT_UNICODE=	yes
 GNU_CONFIGURE=	yes