From owner-svn-ports-head@FreeBSD.ORG  Tue Sep 11 17:49:22 2012
Return-Path: <owner-svn-ports-head@FreeBSD.ORG>
Delivered-To: svn-ports-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 6A768106566C;
	Tue, 11 Sep 2012 17:49:22 +0000 (UTC)
	(envelope-from pawel@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 013B58FC15;
	Tue, 11 Sep 2012 17:49:22 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q8BHnLvs000644;
	Tue, 11 Sep 2012 17:49:21 GMT (envelope-from pawel@svn.freebsd.org)
Received: (from pawel@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q8BHnLwe000640;
	Tue, 11 Sep 2012 17:49:21 GMT (envelope-from pawel@svn.freebsd.org)
Message-Id: <201209111749.q8BHnLwe000640@svn.freebsd.org>
From: Pawel Pekala <pawel@FreeBSD.org>
Date: Tue, 11 Sep 2012 17:49:21 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
	svn-ports-head@freebsd.org
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r304112 - in head/databases: spatialite spatialite_gui
X-BeenThere: svn-ports-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the ports tree for head
	<svn-ports-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-head>, 
	<mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
	<mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 11 Sep 2012 17:49:22 -0000

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
-@dirrm lib/pkgconfig
+libdata/pkgconfig/spatialite.pc
+@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