diff --git a/devel/subversion16/Makefile.common b/devel/subversion16/Makefile.common index 63c997b17745..560ae596106e 100644 --- a/devel/subversion16/Makefile.common +++ b/devel/subversion16/Makefile.common @@ -5,6 +5,7 @@ PORTNAME= subversion PORTVERSION= #please edit Makefile.inc for PORTVERSION, so ../svnmerge can stay in sync. PORTREVISION?= 2 CATEGORIES+= devel +PKGNAMESUFFIX= 16 MASTER_SITES= http://subversion.tigris.org/downloads/ DIST_SUBDIR= subversion @@ -19,8 +20,6 @@ LICENSE= APACHE20 CONFLICTS_INSTALL+= ${PKGNAMEPREFIX}${PORTNAME}${PKGNAMESUFFIX}-1.[^6].[0-9]* -LATEST_LINK= ${PKGNAMEPREFIX}${PORTNAME}16${PKGNAMESUFFIX} - LIB_DEPENDS+= libapr-1.so:${PORTSDIR}/devel/apr1 \ libsqlite3.so:${PORTSDIR}/databases/sqlite3 \ libexpat.so:${PORTSDIR}/textproc/expat2 diff --git a/devel/subversion17/Makefile.common b/devel/subversion17/Makefile.common index 04a62d3bbd4e..0a1442238267 100644 --- a/devel/subversion17/Makefile.common +++ b/devel/subversion17/Makefile.common @@ -7,12 +7,9 @@ PORTREVISION?= 0 CATEGORIES+= devel MASTER_SITES= ${MASTER_SITE_APACHE} DIST_SUBDIR= subversion17 +PKGNAMESUFFIX= 17 MASTER_SITE_SUBDIR= subversion -#·setting·PKGSUFFIX·not·possible·wo.·having·a·Mk/Uses·file·and·fixing·a·bunch·of·ports -#PKGNAMESUFFIX= 17 - - USE_BZIP2= yes USE_AUTOTOOLS= libtool USE_KDE4= # Used below if KWallet support is enabled @@ -21,7 +18,6 @@ USES+= pkgconfig LICENSE= APACHE20 CONFLICTS_INSTALL+= ${PKGNAMEPREFIX}${PORTNAME}${PKGNAMESUFFIX}-1.[^7].[0-9]* -LATEST_LINK= ${PKGNAMEPREFIX}${PORTNAME}17${PKGNAMESUFFIX} LIB_DEPENDS+= libapr-1.so:${PORTSDIR}/devel/apr1 \ libsqlite3.so:${PORTSDIR}/databases/sqlite3 \