Thu Apr 10 21:30:44 2008 UTC ()
+ Use the options framework instead of using FVWM_USE_* variables.

+ Convert to use PLIST_VARS instead of manually passing "@comment "
  to the plist module.

Bump the PKGREVISION to 2 due to the options changes.


(jlam)
diff -r1.11 -r1.12 pkgsrc/wm/fvwm/Makefile
diff -r0 -r1.1 pkgsrc/wm/fvwm/options.mk
cvs diff -r1.11 -r1.12 pkgsrc/wm/fvwm/Makefile (switch to unified diff)

--- pkgsrc/wm/fvwm/Makefile 2007/12/20 18:04:04 1.11
+++ pkgsrc/wm/fvwm/Makefile 2008/04/10 21:30:44 1.12
@@ -1,88 +1,76 @@ @@ -1,88 +1,76 @@
1# $NetBSD: Makefile,v 1.11 2007/12/20 18:04:04 joerg Exp $ 1# $NetBSD: Makefile,v 1.12 2008/04/10 21:30:44 jlam Exp $
2 2
3DISTNAME= fvwm-${FVWM_VER} 3DISTNAME= fvwm-${FVWM_VER}
4PKGREVISION= 1 4PKGREVISION= 2
5CATEGORIES= x11 wm 5CATEGORIES= x11 wm
6MASTER_SITES= ftp://ftp.fvwm.org/pub/fvwm/version-2/ \ 6MASTER_SITES= ftp://ftp.fvwm.org/pub/fvwm/version-2/ \
7 http://www.fvwm.org/generated/icon_download/ 7 http://www.fvwm.org/generated/icon_download/
8DISTFILES+= fvwm-${FVWM_VER}.tar.gz fvwm_icons.tgz 8DISTFILES+= fvwm-${FVWM_VER}.tar.gz fvwm_icons.tgz
9 9
10MAINTAINER= martti@NetBSD.org 10MAINTAINER= martti@NetBSD.org
11HOMEPAGE= http://www.fvwm.org/ 11HOMEPAGE= http://www.fvwm.org/
12COMMENT= Newer version of X11 Virtual window manager 12COMMENT= Newer version of X11 Virtual window manager
13#LICENSE= gnu-gpl-v2 13#LICENSE= gnu-gpl-v2
14 14
15DEPENDS+= xpmroot-2.*:../../x11/xpmroot 15DEPENDS+= xpmroot-2.*:../../x11/xpmroot
16 16
17CONFLICTS= fvwm1-[0-9]* fvwm2-[0-9]* 17CONFLICTS= fvwm1-[0-9]* fvwm2-[0-9]*
18EXTRACT_ONLY= ${DISTNAME}.tar.gz 18EXTRACT_ONLY= ${DISTNAME}.tar.gz
19FVWM_VER= 2.4.20 19FVWM_VER= 2.4.20
20 20
21USE_X11BASE= YES 21USE_X11BASE= YES
22GNU_CONFIGURE= YES 22GNU_CONFIGURE= YES
23USE_GNU_READLINE= YES 23USE_GNU_READLINE= YES
24USE_TOOLS+= perl:run tar 24USE_TOOLS+= perl:run tar
25 25
26PLIST_SUBST+= FVWM_VER=${FVWM_VER:Q} 26PLIST_SUBST+= FVWM_VER=${FVWM_VER:Q}
27 27
28INSTALLATION_DIRS+= lib/X11/fvwm2 28INSTALLATION_DIRS+= lib/X11/fvwm2
29INSTALLATION_DIRS+= lib/X11/fvwm2/pixmaps 29INSTALLATION_DIRS+= lib/X11/fvwm2/pixmaps
30 30
31EVAL_PREFIX+= XPMDIR=xpm 31EVAL_PREFIX+= XPMDIR=xpm
32CONFIGURE_ARGS+= --without-gnome 32CONFIGURE_ARGS+= --without-gnome
33CONFIGURE_ARGS+= --sysconfdir=${PREFIX:Q}/lib/X11/fvwm2 33CONFIGURE_ARGS+= --sysconfdir=${PREFIX:Q}/lib/X11/fvwm2
34CONFIGURE_ARGS+= --libexecdir=${PREFIX:Q}/lib/X11 34CONFIGURE_ARGS+= --libexecdir=${PREFIX:Q}/lib/X11
35CONFIGURE_ARGS+= --with-xpm-includes=${XPMDIR:Q}/include 35CONFIGURE_ARGS+= --with-xpm-includes=${XPMDIR:Q}/include
36CONFIGURE_ARGS+= --with-imagepath=${PREFIX:Q}/lib/X11/fvwm2/pixmaps:${X11BASE:Q}/include/X11/bitmaps:${X11BASE:Q}/include/X11/pixmaps 36CONFIGURE_ARGS+= --with-imagepath=${PREFIX:Q}/lib/X11/fvwm2/pixmaps:${X11BASE:Q}/include/X11/bitmaps:${X11BASE:Q}/include/X11/pixmaps
37 37
38# We don't want to have CPP from the buildlink directory 38# We don't want to have CPP from the buildlink directory
39CONFIGURE_ENV+= ac_cv_path_FVWM_CPP=${CPP:Q} 39CONFIGURE_ENV+= ac_cv_path_FVWM_CPP=${CPP:Q}
40 40
41post-extract: 41post-extract:
42 mkdir ${WRKDIR:Q}/icons 42 mkdir ${WRKDIR:Q}/icons
43 cd ${WRKDIR:Q}/icons && tar -xzf ${DISTDIR:Q}/fvwm_icons.tgz 43 cd ${WRKDIR:Q}/icons && tar -xzf ${DISTDIR:Q}/fvwm_icons.tgz
44 44
45post-install: 45post-install:
46 ${INSTALL_DATA} \ 46 ${INSTALL_DATA} \
47 ${WRKDIR:Q}/icons/fvwm_icons/*.xpm \ 47 ${WRKDIR:Q}/icons/fvwm_icons/*.xpm \
48 ${PREFIX:Q}/lib/X11/fvwm2/pixmaps 48 ${PREFIX:Q}/lib/X11/fvwm2/pixmaps
49 ${INSTALL_DATA} \ 49 ${INSTALL_DATA} \
50 ${WRKSRC:Q}/sample.fvwmrc/decor_examples \ 50 ${WRKSRC:Q}/sample.fvwmrc/decor_examples \
51 ${WRKSRC:Q}/sample.fvwmrc/system.fvwm2rc-sample-* \ 51 ${WRKSRC:Q}/sample.fvwmrc/system.fvwm2rc-sample-* \
52 ${PREFIX:Q}/lib/X11/fvwm2 52 ${PREFIX:Q}/lib/X11/fvwm2
53 ${INSTALL_DATA} \ 53 ${INSTALL_DATA} \
54 ${WRKSRC:Q}/sample.fvwmrc/system.fvwm2rc \ 54 ${WRKSRC:Q}/sample.fvwmrc/system.fvwm2rc \
55 ${PREFIX:Q}/lib/X11/fvwm2/system.fvwm2rc.example 55 ${PREFIX:Q}/lib/X11/fvwm2/system.fvwm2rc.example
56 ${INSTALL_SCRIPT} \ 56 ${INSTALL_SCRIPT} \
57 ${WRKSRC:Q}/utils/fvwmrc_convert \ 57 ${WRKSRC:Q}/utils/fvwmrc_convert \
58 ${PREFIX:Q}/bin/fvwmrc_convert 58 ${PREFIX:Q}/bin/fvwmrc_convert
59 if [ ! -f ${PREFIX:Q}/lib/X11/fvwm2/system.fvwm2rc ]; then \ 59 if [ ! -f ${PREFIX:Q}/lib/X11/fvwm2/system.fvwm2rc ]; then \
60 ${INSTALL_DATA} \ 60 ${INSTALL_DATA} \
61 ${PREFIX:Q}/lib/X11/fvwm2/system.fvwm2rc.example \ 61 ${PREFIX:Q}/lib/X11/fvwm2/system.fvwm2rc.example \
62 ${PREFIX:Q}/lib/X11/fvwm2/system.fvwm2rc ; \ 62 ${PREFIX:Q}/lib/X11/fvwm2/system.fvwm2rc ; \
63 fi 63 fi
64 64
65.include "../../mk/bsd.prefs.mk" 65.include "options.mk"
66 
67.if defined(FVWM2_USE_GTK) && ${FVWM2_USE_GTK} == "YES" 
68.include "../../x11/gtk/buildlink3.mk" 
69PLIST_SUBST+= GTK="" 
70.else 
71PLIST_SUBST+= GTK="@comment " 
72CONFIGURE_ARGS+= --without-gtk-prefix 
73.endif 
74 
75.if defined(FVWM2_USE_RPLAY) && ${FVWM2_USE_RPLAY} == "YES" 
76.include "../../audio/rplay/buildlink3.mk" 
77.endif 
78 66
79BUILDLINK_DEPMETHOD.libXt?= build 67BUILDLINK_DEPMETHOD.libXt?= build
80 68
81.include "../../devel/readline/buildlink3.mk" 69.include "../../devel/readline/buildlink3.mk"
82.include "../../x11/libSM/buildlink3.mk" 70.include "../../x11/libSM/buildlink3.mk"
83.include "../../x11/libXext/buildlink3.mk" 71.include "../../x11/libXext/buildlink3.mk"
84.include "../../x11/libXinerama/buildlink3.mk" 72.include "../../x11/libXinerama/buildlink3.mk"
85.include "../../x11/libXpm/buildlink3.mk" 73.include "../../x11/libXpm/buildlink3.mk"
86.include "../../x11/libXt/buildlink3.mk" 74.include "../../x11/libXt/buildlink3.mk"
87.include "../../x11/xextproto/buildlink3.mk" 75.include "../../x11/xextproto/buildlink3.mk"
88.include "../../mk/bsd.pkg.mk" 76.include "../../mk/bsd.pkg.mk"
File Added: pkgsrc/wm/fvwm/options.mk
# $NetBSD: options.mk,v 1.1 2008/04/10 21:30:44 jlam Exp $

PKG_OPTIONS_VAR=		PKG_OPTIONS.fvwm
PKG_SUPPORTED_OPTIONS=		gtk rplay
PKG_OPTIONS_LEGACY_VARS+=	FVWM2_USE_GTK:gtk
PKG_OPTIONS_LEGACY_VARS+=	FVWM2_USE_RPLAY:rplay

.include "../../mk/bsd.options.mk"

PLIST_VARS+=		gtk

.if !empty(PKG_OPTIONS:Mgtk)
.  include "../../x11/gtk/buildlink3.mk"
PLIST.gtk=		yes
.else
CONFIGURE_ARGS+=	--without-gtk-prefix
.endif

.if !empty(PKG_OPTIONS:Mrplay)
.  include "../../audio/rplay/buildlink3.mk"
.endif