[pkgsrc/trunk]: pkgsrc/wm/fvwm Fixed CONFLICTS. Fixed some pkglint -Wall warn...

[martti <martti%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/5586bfac43af
branches:  trunk
changeset: 515437:5586bfac43af
user:      martti <martti%pkgsrc.org@localhost>
date:      Sun Jul 02 12:32:10 2006 +0000

description:
Fixed CONFLICTS. Fixed some pkglint -Wall warnings.

diffstat:

 wm/fvwm/Makefile |  9 +++++----
 1 files changed, 5 insertions(+), 4 deletions(-)

diffs (40 lines):

diff -r 8775228c84b4 -r 5586bfac43af wm/fvwm/Makefile
--- a/wm/fvwm/Makefile  Sun Jul 02 12:29:22 2006 +0000
+++ b/wm/fvwm/Makefile  Sun Jul 02 12:32:10 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2006/07/02 09:21:57 martti Exp $
+# $NetBSD: Makefile,v 1.2 2006/07/02 12:32:10 martti Exp $
 
 DISTNAME=      fvwm-${FVWM_VER}
 PKGREVISION=   2
@@ -14,7 +14,7 @@
 
 DEPENDS+=      xpmroot-2.*:../../x11/xpmroot
 
-CONFLICTS=     fvwm1-* fvwm>=1
+CONFLICTS=     fvwm1-[0-9]* fvwm2-[0-9]*
 EXTRACT_ONLY=  ${DISTNAME}.tar.gz
 FVWM_VER=      2.4.19
 
@@ -24,6 +24,9 @@
 
 PLIST_SUBST+=          FVWM_VER=${FVWM_VER:Q}
 
+INSTALLATION_DIRS+=    lib/X11/fvwm2
+INSTALLATION_DIRS+=    lib/X11/fvwm2/pixmaps
+
 EVAL_PREFIX+=          XPMDIR=xpm
 CONFIGURE_ARGS+=       --without-gnome
 CONFIGURE_ARGS+=       --sysconfdir=${PREFIX:Q}/lib/X11/fvwm2
@@ -39,11 +42,9 @@
        cd ${WRKDIR:Q}/icons && ${TAR} -xzf ${DISTDIR:Q}/fvwm_icons.tgz
 
 post-install:
-       ${INSTALL_DATA_DIR} ${PREFIX:Q}/lib/X11/fvwm2/pixmaps
        ${INSTALL_DATA} \
                ${WRKDIR:Q}/icons/fvwm_icons/*.xpm \
                ${PREFIX:Q}/lib/X11/fvwm2/pixmaps
-       ${INSTALL_DATA_DIR} ${PREFIX:Q}/lib/X11/fvwm2
        ${INSTALL_DATA} \
                ${WRKSRC:Q}/sample.fvwmrc/decor_examples \
                ${WRKSRC:Q}/sample.fvwmrc/system.fvwm2rc-sample-* \