diff options
| author | lev <lev@FreeBSD.org> | 2018-04-20 23:38:58 +0800 |
|---|---|---|
| committer | lev <lev@FreeBSD.org> | 2018-04-20 23:38:58 +0800 |
| commit | 1cacabd4359623a48aa7ece9573aaad8f59d718c (patch) | |
| tree | d2de83590d5631adfcaeb7b2dfe6a4634815da6e /security/subversion-kwallet | |
| parent | 902877dfdf3e785e214272e6f32d52885190f90e (diff) | |
| download | freebsd-ports-graphics-1cacabd4359623a48aa7ece9573aaad8f59d718c.tar.gz freebsd-ports-graphics-1cacabd4359623a48aa7ece9573aaad8f59d718c.tar.zst freebsd-ports-graphics-1cacabd4359623a48aa7ece9573aaad8f59d718c.zip | |
(1) Remove devel/subversion18
(2) Intoroduce devel/subversion19 from latest pre-1.10 devel/subversion
(3) Rework all addons to unify versioning code.
FLAVORS is not used because it will conflict with Python FLAVORS
(4) Restore mod_dontdothat for www/mod_dav_svn
Diffstat (limited to 'security/subversion-kwallet')
| -rw-r--r-- | security/subversion-kwallet/Makefile | 22 | ||||
| -rw-r--r-- | security/subversion-kwallet/pkg-plist | 1 |
2 files changed, 10 insertions, 13 deletions
diff --git a/security/subversion-kwallet/Makefile b/security/subversion-kwallet/Makefile index 035ad0d3e6c..47350ce6f56 100644 --- a/security/subversion-kwallet/Makefile +++ b/security/subversion-kwallet/Makefile @@ -2,28 +2,24 @@ # $FreeBSD$ PKGNAMESUFFIX= -kwallet -PORTREVISION= 5 CATEGORIES= security kde MAINTAINER= lev@FreeBSD.org COMMENT= KDE KWallet integration for Version control system -.if defined(WITH_SUBVERSION_VER) && ${WITH_SUBVERSION_VER} == 18 -PORTREVISION= 2 -MASTERDIR= ${.CURDIR}/../../devel/subversion18 -.else -MASTERDIR= ${.CURDIR}/../../devel/subversion -.endif -PKGDIR= ${.CURDIR} - -SVN_BUILD_ADDONS= yes +USE_KDE= kdelibs runtime +USES+= kde:4 -USE_KDE= kdelibs runtime -USES+= kde:4 +PORTREVISION_110= 6 +PORTREVISION_19= 0 -.include "${MASTERDIR}/Makefile.common" +.include "${.CURDIR}/../../devel/subversion/Makefile.addons" +.if ${WITH_SUBVERSION_VER} == 19 +CONFIGURE_ARGS+= --with-kwallet=${KDE_PREFIX} +.else CONFIGURE_ARGS+= --with-kwallet=${KDE_PREFIX}/include/kde4:${KDE_PREFIX}/lib +.endif ALL_TARGET= kwallet-lib INSTALL_TARGET= install-kwallet-lib diff --git a/security/subversion-kwallet/pkg-plist b/security/subversion-kwallet/pkg-plist index 289332ae459..7fa3d4cb1af 100644 --- a/security/subversion-kwallet/pkg-plist +++ b/security/subversion-kwallet/pkg-plist @@ -1,3 +1,4 @@ +%%SVN19%%lib/libsvn_auth_kwallet-1.a lib/libsvn_auth_kwallet-1.so lib/libsvn_auth_kwallet-1.so.0 lib/libsvn_auth_kwallet-1.so.0.0.0 |