diff options
| author | martti <martti> | 2006-07-02 12:32:10 +0000 |
|---|---|---|
| committer | martti <martti> | 2006-07-02 12:32:10 +0000 |
| commit | b5f9fed37e82d99619e4a5e7d3a3034eba904001 (patch) | |
| tree | eccb4d7dff580cdc3480d12bf7e27ea7ecc711e9 /wm/fvwm | |
| parent | ba49bfd82de882241007638139a40a6662556d50 (diff) | |
| download | pkgsrc-b5f9fed37e82d99619e4a5e7d3a3034eba904001.tar.gz | |
Fixed CONFLICTS. Fixed some pkglint -Wall warnings.
Diffstat (limited to 'wm/fvwm')
| -rw-r--r-- | wm/fvwm/Makefile | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/wm/fvwm/Makefile b/wm/fvwm/Makefile index 74a9f693cb8..8ea7552a19b 100644 --- a/wm/fvwm/Makefile +++ b/wm/fvwm/Makefile @@ -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 @@ COMMENT= Newer version of X11 Virtual window manager 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 @@ USE_GNU_READLINE= YES 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 @@ post-extract: 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-* \ |