diff options
| author | jperkin <jperkin@pkgsrc.org> | 2016-03-11 16:51:33 +0000 |
|---|---|---|
| committer | jperkin <jperkin@pkgsrc.org> | 2016-03-11 16:51:33 +0000 |
| commit | 7c1665e4d1a66c14cbd1ebe1fe92cd069d2ef3b4 (patch) | |
| tree | 66d48628f7d04c30852db7fc6eaf53ea48c2b807 | |
| parent | b244ba79e18bb1d984350b0e59f3dd0cbf459b37 (diff) | |
| download | pkgsrc-7c1665e4d1a66c14cbd1ebe1fe92cd069d2ef3b4.tar.gz | |
Rather than remove the library completely, just fix the path to use the
installed version. Clean up some variable assignment while here.
Ride the previous PKGREVISION bump.
| -rw-r--r-- | x11/kdelibs4/Makefile | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/x11/kdelibs4/Makefile b/x11/kdelibs4/Makefile index 175fb0ce65f..8e69d567d62 100644 --- a/x11/kdelibs4/Makefile +++ b/x11/kdelibs4/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.84 2016/03/11 11:40:52 jperkin Exp $ +# $NetBSD: Makefile,v 1.85 2016/03/11 16:51:33 jperkin Exp $ DISTNAME= kdelibs-4.14.15 PKGNAME= ${DISTNAME:S/-4/4-4/} @@ -54,18 +54,17 @@ CHECK_PORTABILITY_SKIP+=kate/tests/hl/highlight.sh SUBST_CLASSES+= kdelibsfix SUBST_STAGE.kdelibsfix= pre-configure SUBST_MESSAGE.kdelibsfix= Fixing hardcoded paths. -SUBST_FILES.kdelibsfix= \ - kde3support/kdeui/k3sconfig.cpp \ - kio/kssl/kopenssl.cpp +SUBST_FILES.kdelibsfix= kde3support/kdeui/k3sconfig.cpp +SUBST_FILES.kdelibsfix+= kio/kssl/kopenssl.cpp SUBST_SED.kdelibsfix= -e 's:@LOCALBASE@:${LOCALBASE}:g' -# XXX this is an ugly hack to avoid the WRKDIR path in the installed cmake file +# Avoid the WRKDIR path in the installed cmake file SUBST_CLASSES+= phononrelpath SUBST_STAGE.phononrelpath= post-configure SUBST_MESSAGE.phononrelpath= Fixing phonon RELWITHDEBINFO path -SUBST_FILES.phononrelpath= _KDE_build/CMakeFiles/Export/${LOCALBASE:S^/^_^}/share/kde/apps/cmake/modules/KDELibs4LibraryTargets-${TARGET_NAME}.cmake \ - _KDE_build/experimental/libkdeclarative/CMakeFiles/Export/${LOCALBASE:S^/^_^}/lib/cmake/KDeclarative/KDeclarativeLibraryTargets-${TARGET_NAME}.cmake -SUBST_SED.phononrelpath= -E -e 's:[^"]*/\.buildlink/lib/libphonon\.(dylib|so)::' +SUBST_FILES.phononrelpath= _KDE_build/CMakeFiles/Export/${LOCALBASE:S^/^_^}/share/kde/apps/cmake/modules/KDELibs4LibraryTargets-${TARGET_NAME}.cmake +SUBST_FILES.phononrelpath+= _KDE_build/experimental/libkdeclarative/CMakeFiles/Export/${LOCALBASE:S^/^_^}/lib/cmake/KDeclarative/KDeclarativeLibraryTargets-${TARGET_NAME}.cmake +SUBST_SED.phononrelpath= -e 's:${BUILDLINK_DIR}:${PREFIX}:' USE_TOOLS+= flex gmake PLIST_VARS+= kgrantpty mac notmac |