From fefeeef4436afb47dff4d809e3a44f15c08f4c50 Mon Sep 17 00:00:00 2001 From: obache Date: Sat, 25 Aug 2007 15:41:32 +0000 Subject: Remove bogus ${PREFIX}/etc/icewm handling in PLIST. Specify PKG_SYSCONFSUBDIR instead. Problem noticed in PR 36289. Bump PKGREVISION. --- wm/icewm-imlib/Makefile | 3 ++- wm/icewm/Makefile | 3 ++- wm/icewm/Makefile.common | 4 +++- wm/icewm/PLIST | 4 +--- 4 files changed, 8 insertions(+), 6 deletions(-) diff --git a/wm/icewm-imlib/Makefile b/wm/icewm-imlib/Makefile index a4db646652e..059b6bc17c7 100644 --- a/wm/icewm-imlib/Makefile +++ b/wm/icewm-imlib/Makefile @@ -1,6 +1,7 @@ -# $NetBSD: Makefile,v 1.27 2007/01/09 08:40:46 joerg Exp $ +# $NetBSD: Makefile,v 1.28 2007/08/25 15:41:33 obache Exp $ PKGNAME= ${DISTNAME:S/-/-imlib-/} +PKGREVISION= 1 COMMENT= Small, fast and light-weight window manager (imlib version) CONFLICTS+= icewm-[0-9]* icewm-gnome-[0-9]* diff --git a/wm/icewm/Makefile b/wm/icewm/Makefile index 9b1eefb43d9..5d3eda8e341 100644 --- a/wm/icewm/Makefile +++ b/wm/icewm/Makefile @@ -1,5 +1,6 @@ -# $NetBSD: Makefile,v 1.37 2006/12/27 13:37:41 joerg Exp $ +# $NetBSD: Makefile,v 1.38 2007/08/25 15:41:32 obache Exp $ +PKGREVISION= 1 COMMENT= Small, fast and light-weight window manager CONFLICTS+= icewm-gnome-[0-9]* icewm-imlib-[0-9]* diff --git a/wm/icewm/Makefile.common b/wm/icewm/Makefile.common index 6f6b39684e7..8af0ef01eef 100644 --- a/wm/icewm/Makefile.common +++ b/wm/icewm/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.59 2007/08/05 16:03:38 obache Exp $ +# $NetBSD: Makefile.common,v 1.60 2007/08/25 15:41:32 obache Exp $ DISTNAME= icewm-1.2.27 CATEGORIES= x11 wm @@ -20,6 +20,8 @@ CONFIGURE_ARGS+= --enable-antialiasing USE_LANGUAGES= c c++ +PKG_SYSCONFSUBDIR= icewm + .include "../../mk/bsd.prefs.mk" CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q} diff --git a/wm/icewm/PLIST b/wm/icewm/PLIST index 4e050f70b44..20c7edb95b6 100644 --- a/wm/icewm/PLIST +++ b/wm/icewm/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.20 2006/10/02 11:13:22 ghen Exp $ +@comment $NetBSD: PLIST,v 1.21 2007/08/25 15:41:32 obache Exp $ bin/icehelp bin/icesh bin/icewm @@ -390,5 +390,3 @@ share/locale/zh_TW/LC_MESSAGES/icewm.mo @dirrm share/icewm @dirrm share/doc/icewm/html @dirrm share/doc/icewm -@exec ${MKDIR} %D/etc/icewm -@dirrm etc/icewm -- cgit v1.2.3