[Midnightbsd-cvs] mports [15824] trunk/devel/subversion/Makefile.common: fix fetch

[laffer1 at midnightbsd.org]

Revision: 15824
          http://svnweb.midnightbsd.org/mports/?rev=15824
Author:   laffer1
Date:     2014-01-06 10:11:55 -0500 (Mon, 06 Jan 2014)
Log Message:
-----------
fix fetch

Modified Paths:
--------------
    trunk/devel/subversion/Makefile.common

Modified: trunk/devel/subversion/Makefile.common
===================================================================
--- trunk/devel/subversion/Makefile.common	2014-01-06 04:17:41 UTC (rev 15823)
+++ trunk/devel/subversion/Makefile.common	2014-01-06 15:11:55 UTC (rev 15824)
@@ -4,14 +4,14 @@
 PORTVERSION=	1.8.5
 PORTREVISION?=	0
 CATEGORIES+=	devel
-MASTER_SITES=	${MASTER_SITE_APACHE:S/$/:main/} \
-DISTFILES=	${DISTNAME}${EXTRACT_SUFX}:main
+MASTER_SITES=	${MASTER_SITE_APACHE}
 DIST_SUBDIR=	subversion18
-MASTER_SITE_SUBDIR=	subversion/:main
+MASTER_SITE_SUBDIR=	subversion
 
 USE_BZIP2=	yes
 USE_AUTOTOOLS=	libtool
 USE_KDE4=	# Used below if KWallet support is enabled
+USES+=		pkgconfig
 
 CONFLICTS_INSTALL+=	${PKGNAMEPREFIX}${PORTNAME}${PKGNAMESUFFIX}-1.[6|7].[0-9]*
 
@@ -20,7 +20,7 @@
 
 CONFIGURE_ARGS+=	--without-swig \
 			--with-sqlite=${LOCALBASE} \
-			--with-expat=/usr/local/include:/usr/local/lib:expat
+			--with-expat=${LOCALBASE}/include:${LOCALBASE}/lib:expat
 
 .if defined(SVN_BUILD_BINDINGS)
 CONFLICTS_BUILD+=	${PORTNAME}-1.[6|7].[0-9]*