diff options
| -rw-r--r-- | x11/slim/Makefile | 4 | ||||
| -rw-r--r-- | x11/slim/distinfo | 4 | ||||
| -rw-r--r-- | x11/slim/patches/patch-CMakeLists.txt | 4 |
3 files changed, 7 insertions, 5 deletions
diff --git a/x11/slim/Makefile b/x11/slim/Makefile index 5ec2287e25d..ade2ce7c1c8 100644 --- a/x11/slim/Makefile +++ b/x11/slim/Makefile @@ -1,6 +1,7 @@ -# $NetBSD: Makefile,v 1.1 2018/05/18 14:51:17 youri Exp $ +# $NetBSD: Makefile,v 1.2 2018/10/08 17:46:07 abs Exp $ DISTNAME= slim-1.3.6 +PKGREVISION= 1 CATEGORIES= x11 MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=slim.berlios/} @@ -23,6 +24,7 @@ SUBST_CLASSES+= paths SUBST_STAGE.paths= pre-configure SUBST_FILES.paths= CMakeLists.txt slim.conf SUBST_SED.paths= -e 's,@PREFIX@,${PREFIX},' +SUBST_SED.paths= -e 's,@PKG_SYSCONFDIR@,${PKG_SYSCONFDIR},' SUBST_SED.paths+= -e 's,@X11BASE@,${X11BASE},' CONF_FILES+= share/examples/slim/slim.conf \ diff --git a/x11/slim/distinfo b/x11/slim/distinfo index 6dc19e48463..1f4f024f610 100644 --- a/x11/slim/distinfo +++ b/x11/slim/distinfo @@ -1,9 +1,9 @@ -$NetBSD: distinfo,v 1.4 2018/06/02 21:00:03 joerg Exp $ +$NetBSD: distinfo,v 1.5 2018/10/08 17:46:07 abs Exp $ SHA1 (slim-1.3.6.tar.gz) = 9407ea2ee7b2ed649f17a8ddbf1f7b26a7c7b9fb RMD160 (slim-1.3.6.tar.gz) = 1bf3269b23275c50b67ada8cb5709e093eb6764f SHA512 (slim-1.3.6.tar.gz) = 345b1dee5d6f0c3716dfa7c5c16274adbf18586bdaaa6af4f310e24c5a61f79a297ffac921a5ba545523317e9fe120916df226c36b9c9b49c2ac9c1ca21dee0c Size (slim-1.3.6.tar.gz) = 232547 bytes -SHA1 (patch-CMakeLists.txt) = 27f0222a206465e12f22f78e418b1615f7825cd4 +SHA1 (patch-CMakeLists.txt) = 8eaeba1bb48bcdb825a3809feefb62b7182fde42 SHA1 (patch-panel.cpp) = 51f87c90214cbc55fd5628f7d852d6287d763903 SHA1 (patch-slim.conf) = c85fb8f14e02e602f1dd5a72ffa20de7a34e5a13 diff --git a/x11/slim/patches/patch-CMakeLists.txt b/x11/slim/patches/patch-CMakeLists.txt index d2ffe095bb4..81311bc198e 100644 --- a/x11/slim/patches/patch-CMakeLists.txt +++ b/x11/slim/patches/patch-CMakeLists.txt @@ -1,4 +1,4 @@ -$NetBSD: patch-CMakeLists.txt,v 1.1 2018/05/18 14:51:17 youri Exp $ +$NetBSD: patch-CMakeLists.txt,v 1.2 2018/10/08 17:46:07 abs Exp $ Fix build. @@ -12,7 +12,7 @@ Fix build. +set(CMAKE_INSTALL_PREFIX "@PREFIX@" CACHE PATH "Installation Directory") set(PKGDATADIR "${CMAKE_INSTALL_PREFIX}/share/slim") -set(SYSCONFDIR "/etc") -+set(SYSCONFDIR "@PREFIX@/etc") ++set(SYSCONFDIR "@PKG_SYSCONFDIR@") set(LIBDIR "/lib") -set(MANDIR "${CMAKE_INSTALL_PREFIX}/share/man") +set(MANDIR "${CMAKE_INSTALL_PREFIX}/man") |