Sun Jan 20 06:53:54 2013 UTC ()
(1) Bump version  2.4.20 to 2.6.5 based on PR pkg/47409.
     The changes between them are too big, see NEWS
     in source tar ball. The release dates in between
     are recorded below.

(2) patches/patch-a[ace] are removed, assuming
    they are included in upstream.

(3) patches/patch-configure is added for modifying
    install path from fvwm to fvwm2.

(4) patches/patch-ad: Add comment lines.

(5) Add options xrender xcursor xft2, thanks
    Vitaly Shevtsov.

                CVS HEAD (20-Apr-2012)
    stable release 2.6.4 (01-Feb-2012)
    stable release 2.6.3 (30-Sept-2011)
    stable release 2.6.2 (06-Aug-2011)
    stable release 2.6.1 (16-Apr-2011)
    stable release 2.6.0 (15-Apr-2011)

      beta release 2.5.31 (09-Aug-2010)
      beta release 2.5.30 (09-May-2010)
      beta release 2.5.29 (03-Apr-2010)
      beta release 2.5.28 (20-Sep-2009)
      beta release 2.5.27 (23-Feb-2009)
      beta release 2.5.26 (7-May-2008)
      beta release 2.5.25 (26-Feb-2008)
      beta release 2.5.24 (24-Nov-2007)
      beta release 2.5.23 (1-Sep-2007)
      beta release 2.5.22 (29-Aug-2007)
      beta release 2.5.21 (20-Jan-2007)
      beta release 2.5.20 (15-Jan-2007)

    stable release 2.4.20 (6-Dec-2006)


(mef)
diff -r1.22 -r1.23 pkgsrc/wm/fvwm/Makefile
diff -r1.3 -r1.4 pkgsrc/wm/fvwm/PLIST
diff -r1.3 -r1.4 pkgsrc/wm/fvwm/distinfo
diff -r1.1 -r1.2 pkgsrc/wm/fvwm/options.mk
diff -r1.2 -r1.3 pkgsrc/wm/fvwm/patches/patch-ab
diff -r1.2 -r1.3 pkgsrc/wm/fvwm/patches/patch-ad
diff -r0 -r1.1 pkgsrc/wm/fvwm/patches/patch-configure
cvs diff -r1.22 -r1.23 pkgsrc/wm/fvwm/Makefile (expand / switch to unified diff)

--- pkgsrc/wm/fvwm/Makefile 2013/01/12 11:24:43 1.22
+++ pkgsrc/wm/fvwm/Makefile 2013/01/20 06:53:53 1.23
@@ -1,78 +1,78 @@ @@ -1,78 +1,78 @@
1# $NetBSD: Makefile,v 1.22 2013/01/12 11:24:43 marino Exp $ 1# $NetBSD: Makefile,v 1.23 2013/01/20 06:53:53 mef Exp $
2 2
3DISTNAME= fvwm-${FVWM_VER} 3DISTNAME= fvwm-${FVWM_VER}
4PKGREVISION= 5 
5CATEGORIES= x11 wm 4CATEGORIES= x11 wm
6MASTER_SITES= ftp://ftp.fvwm.org/pub/fvwm/version-2/ \ 5MASTER_SITES= ftp://ftp.fvwm.org/pub/fvwm/version-2/ \
7 http://www.fvwm.org/generated/icon_download/ 6 http://www.fvwm.org/generated/icon_download/
8DISTFILES+= fvwm-${FVWM_VER}.tar.gz fvwm_icons.tgz 7DISTFILES+= fvwm-${FVWM_VER}.tar.gz fvwm_icons.tgz
9 8
10MAINTAINER= pkgsrc-users@NetBSD.org 9MAINTAINER= pkgsrc-users@NetBSD.org
11HOMEPAGE= http://www.fvwm.org/ 10HOMEPAGE= http://www.fvwm.org/
12COMMENT= Newer version of X11 Virtual window manager 11COMMENT= Newer version of X11 Virtual window manager
13LICENSE= gnu-gpl-v2 12LICENSE= gnu-gpl-v2
14 13
15DEPENDS+= xpmroot-2.*:../../x11/xpmroot 14#DEPENDS+= xpmroot-2.*:../../x11/xpmroot
16 15
17CONFLICTS= fvwm1-[0-9]* fvwm2-[0-9]* metisse-[0-9]* 16CONFLICTS= fvwm1-[0-9]* fvwm2-[0-9]* metisse-[0-9]* xpmroot-[0-9]*
18EXTRACT_ONLY= ${DISTNAME}.tar.gz 17EXTRACT_ONLY= ${DISTNAME}.tar.gz
19FVWM_VER= 2.4.20 18FVWM_VER= 2.6.5
20 19
21USE_X11BASE= YES 20USE_X11BASE= YES
22GNU_CONFIGURE= YES 21GNU_CONFIGURE= YES
23USE_GNU_READLINE= YES 22USE_GNU_READLINE= YES
24USE_TOOLS+= perl:run tar 23USE_TOOLS+= perl:run tar
25 24
26PLIST_SUBST+= FVWM_VER=${FVWM_VER:Q} 25PLIST_SUBST+= FVWM_VER=${FVWM_VER:Q}
27 26
28INSTALLATION_DIRS+= lib/X11/fvwm2 27INSTALLATION_DIRS+= lib/X11/fvwm2
29INSTALLATION_DIRS+= lib/X11/fvwm2/pixmaps 28INSTALLATION_DIRS+= lib/X11/fvwm2/pixmaps
30INSTALLATION_DIRS+= ${PKGMANDIR}/man1 29INSTALLATION_DIRS+= ${PKGMANDIR}/man1
31 30
32EVAL_PREFIX+= XPMDIR=xpm 31EVAL_PREFIX+= XPMDIR=xpm
33CONFIGURE_ARGS+= --without-gnome 32CONFIGURE_ARGS+= --without-gnome
34CONFIGURE_ARGS+= --sysconfdir=${PREFIX:Q}/lib/X11/fvwm2 33CONFIGURE_ARGS+= --sysconfdir=${PREFIX:Q}/lib/X11/fvwm2
35CONFIGURE_ARGS+= --libexecdir=${PREFIX:Q}/lib/X11 34CONFIGURE_ARGS+= --libexecdir=${PREFIX:Q}/lib/X11
36CONFIGURE_ARGS+= --with-xpm-includes=${XPMDIR:Q}/include 35CONFIGURE_ARGS+= --with-xpm-includes=${XPMDIR:Q}/include
37CONFIGURE_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
38 37
39# We don't want to have CPP from the buildlink directory 38# We don't want to have CPP from the buildlink directory
40CONFIGURE_ENV+= ac_cv_path_FVWM_CPP=${CPP:Q} 39CONFIGURE_ENV+= ac_cv_path_FVWM_CPP=${CPP:Q}
41 40# To avoid ${WRKDIR} is included in perl script
42LDFLAGS.DragonFly+= -lX11 41CONFIGURE_ENV+= ac_cv_path_PERL=${PERL5:Q}
43 42
44post-extract: 43post-extract:
45 mkdir ${WRKDIR:Q}/icons 44 mkdir ${WRKDIR:Q}/icons
46 cd ${WRKDIR:Q}/icons && tar -xzf ${DISTDIR:Q}/fvwm_icons.tgz 45 cd ${WRKDIR:Q}/icons && tar -xzf ${DISTDIR:Q}/fvwm_icons.tgz
47 46
48post-install: 47post-install:
49 ${INSTALL_DATA} \ 48 ${INSTALL_DATA} \
50 ${WRKDIR:Q}/icons/fvwm_icons/*.xpm \ 49 ${WRKDIR:Q}/icons/fvwm_icons/*.xpm \
51 ${DESTDIR}${PREFIX:Q}/lib/X11/fvwm2/pixmaps 50 ${DESTDIR}${PREFIX:Q}/lib/X11/fvwm2/pixmaps
52 ${INSTALL_DATA} \ 51 ${INSTALL_DATA} \
53 ${WRKSRC:Q}/sample.fvwmrc/decor_examples \ 52 ${WRKSRC:Q}/sample.fvwmrc/decor_examples \
54 ${WRKSRC:Q}/sample.fvwmrc/system.fvwm2rc-sample-* \ 53 ${WRKSRC:Q}/sample.fvwmrc/system.fvwm2rc-sample-* \
55 ${DESTDIR}${PREFIX:Q}/lib/X11/fvwm2 54 ${DESTDIR}${PREFIX:Q}/lib/X11/fvwm2
56 ${INSTALL_DATA} \ 55 ${INSTALL_DATA} \
57 ${WRKSRC:Q}/sample.fvwmrc/system.fvwm2rc \ 56 ${WRKSRC:Q}/sample.fvwmrc/system.fvwm2rc \
58 ${DESTDIR}${PREFIX:Q}/lib/X11/fvwm2/system.fvwm2rc.example 57 ${DESTDIR}${PREFIX:Q}/lib/X11/fvwm2/system.fvwm2rc.example
59 ${INSTALL_SCRIPT} \ 
60 ${WRKSRC:Q}/utils/fvwmrc_convert \ 
61 ${DESTDIR}${PREFIX:Q}/bin/fvwmrc_convert 
62 if [ ! -f ${DESTDIR}${PREFIX:Q}/lib/X11/fvwm2/system.fvwm2rc ]; then \ 58 if [ ! -f ${DESTDIR}${PREFIX:Q}/lib/X11/fvwm2/system.fvwm2rc ]; then \
63 ${INSTALL_DATA} \ 59 ${INSTALL_DATA} \
64 ${DESTDIR}${PREFIX:Q}/lib/X11/fvwm2/system.fvwm2rc.example \ 60 ${DESTDIR}${PREFIX:Q}/lib/X11/fvwm2/system.fvwm2rc.example \
65 ${DESTDIR}${PREFIX:Q}/lib/X11/fvwm2/system.fvwm2rc ; \ 61 ${DESTDIR}${PREFIX:Q}/lib/X11/fvwm2/system.fvwm2rc ; \
66 fi 62 fi
67 63
68.include "options.mk" 64.include "options.mk"
69 65
70BUILDLINK_DEPMETHOD.libXt?= build 66BUILDLINK_DEPMETHOD.libXt?= build
71 67
72.include "../../devel/readline/buildlink3.mk" 68.include "../../devel/readline/buildlink3.mk"
 69# DragonFly does not have built-in gettext
 70.if ${OPSYS} == "DragonFly"
 71.include "../../devel/gettext-lib/buildlink3.mk"
 72.endif
73.include "../../x11/libSM/buildlink3.mk" 73.include "../../x11/libSM/buildlink3.mk"
74.include "../../x11/libXext/buildlink3.mk" 74.include "../../x11/libXext/buildlink3.mk"
75.include "../../x11/libXinerama/buildlink3.mk" 75.include "../../x11/libXinerama/buildlink3.mk"
76.include "../../x11/libXpm/buildlink3.mk" 76.include "../../x11/libXpm/buildlink3.mk"
77.include "../../x11/libXt/buildlink3.mk" 77.include "../../x11/libXt/buildlink3.mk"
78.include "../../mk/bsd.pkg.mk" 78.include "../../mk/bsd.pkg.mk"
cvs diff -r1.3 -r1.4 pkgsrc/wm/fvwm/PLIST (expand / switch to unified diff)

--- pkgsrc/wm/fvwm/PLIST 2009/06/14 18:18:58 1.3
+++ pkgsrc/wm/fvwm/PLIST 2013/01/20 06:53:53 1.4
@@ -1,61 +1,68 @@ @@ -1,61 +1,68 @@
1@comment $NetBSD: PLIST,v 1.3 2009/06/14 18:18:58 joerg Exp $ 1@comment $NetBSD: PLIST,v 1.4 2013/01/20 06:53:53 mef Exp $
2bin/FvwmCommand 2bin/FvwmCommand
3bin/fvwm 3bin/fvwm
 4bin/fvwm-bug
4bin/fvwm-config 5bin/fvwm-config
 6bin/fvwm-convert-2.4
 7bin/fvwm-convert-2.6
5bin/fvwm-menu-desktop 8bin/fvwm-menu-desktop
6bin/fvwm-menu-directory 9bin/fvwm-menu-directory
7bin/fvwm-menu-headlines 10bin/fvwm-menu-headlines
8bin/fvwm-menu-xlock 11bin/fvwm-menu-xlock
 12bin/fvwm-perllib
9bin/fvwm-root 13bin/fvwm-root
10bin/fvwm2 14bin/fvwm2
11bin/fvwm24_convert 15bin/xpmroot
12bin/fvwmbug 
13bin/fvwmrc_convert 
14lib/X11/fvwm2/${FVWM_VER}/FvwmAnimate 16lib/X11/fvwm2/${FVWM_VER}/FvwmAnimate
15lib/X11/fvwm2/${FVWM_VER}/FvwmAudio 17lib/X11/fvwm2/${FVWM_VER}/FvwmAudio
16lib/X11/fvwm2/${FVWM_VER}/FvwmAuto 18lib/X11/fvwm2/${FVWM_VER}/FvwmAuto
17lib/X11/fvwm2/${FVWM_VER}/FvwmBacker 19lib/X11/fvwm2/${FVWM_VER}/FvwmBacker
18lib/X11/fvwm2/${FVWM_VER}/FvwmBanner 20lib/X11/fvwm2/${FVWM_VER}/FvwmBanner
19lib/X11/fvwm2/${FVWM_VER}/FvwmButtons 21lib/X11/fvwm2/${FVWM_VER}/FvwmButtons
20lib/X11/fvwm2/${FVWM_VER}/FvwmCascade 22lib/X11/fvwm2/${FVWM_VER}/FvwmCascade
21lib/X11/fvwm2/${FVWM_VER}/FvwmCommand.pm 23lib/X11/fvwm2/${FVWM_VER}/FvwmCommand.pm
22lib/X11/fvwm2/${FVWM_VER}/FvwmCommand.sh 24lib/X11/fvwm2/${FVWM_VER}/FvwmCommand.sh
23lib/X11/fvwm2/${FVWM_VER}/FvwmCommandS 25lib/X11/fvwm2/${FVWM_VER}/FvwmCommandS
24lib/X11/fvwm2/${FVWM_VER}/FvwmConsole 26lib/X11/fvwm2/${FVWM_VER}/FvwmConsole
25lib/X11/fvwm2/${FVWM_VER}/FvwmConsoleC 27lib/X11/fvwm2/${FVWM_VER}/FvwmConsoleC
26lib/X11/fvwm2/${FVWM_VER}/FvwmConsoleC.pl 28lib/X11/fvwm2/${FVWM_VER}/FvwmConsoleC.pl
27lib/X11/fvwm2/${FVWM_VER}/FvwmCpp 29lib/X11/fvwm2/${FVWM_VER}/FvwmCpp
28lib/X11/fvwm2/${FVWM_VER}/FvwmDebug 30lib/X11/fvwm2/${FVWM_VER}/FvwmDebug
29lib/X11/fvwm2/${FVWM_VER}/FvwmDragWell 31lib/X11/fvwm2/${FVWM_VER}/FvwmDragWell
30lib/X11/fvwm2/${FVWM_VER}/FvwmEvent 32lib/X11/fvwm2/${FVWM_VER}/FvwmEvent
31lib/X11/fvwm2/${FVWM_VER}/FvwmForm 33lib/X11/fvwm2/${FVWM_VER}/FvwmForm
32${PLIST.gtk}lib/X11/fvwm2/${FVWM_VER}/FvwmGtk 34${PLIST.gtk}lib/X11/fvwm2/${FVWM_VER}/FvwmGtk
 35lib/X11/fvwm2/${FVWM_VER}/FvwmGtkDebug
33lib/X11/fvwm2/${FVWM_VER}/FvwmIconBox 36lib/X11/fvwm2/${FVWM_VER}/FvwmIconBox
34lib/X11/fvwm2/${FVWM_VER}/FvwmIconMan 37lib/X11/fvwm2/${FVWM_VER}/FvwmIconMan
35lib/X11/fvwm2/${FVWM_VER}/FvwmIdent 38lib/X11/fvwm2/${FVWM_VER}/FvwmIdent
36lib/X11/fvwm2/${FVWM_VER}/FvwmM4 39lib/X11/fvwm2/${FVWM_VER}/FvwmM4
37lib/X11/fvwm2/${FVWM_VER}/FvwmPager 40lib/X11/fvwm2/${FVWM_VER}/FvwmPager
 41lib/X11/fvwm2/${FVWM_VER}/FvwmPerl
 42lib/X11/fvwm2/${FVWM_VER}/FvwmProxy
38lib/X11/fvwm2/${FVWM_VER}/FvwmRearrange 43lib/X11/fvwm2/${FVWM_VER}/FvwmRearrange
39lib/X11/fvwm2/${FVWM_VER}/FvwmSave 44lib/X11/fvwm2/${FVWM_VER}/FvwmSave
40lib/X11/fvwm2/${FVWM_VER}/FvwmSaveDesk 45lib/X11/fvwm2/${FVWM_VER}/FvwmSaveDesk
41lib/X11/fvwm2/${FVWM_VER}/FvwmScript 46lib/X11/fvwm2/${FVWM_VER}/FvwmScript
42lib/X11/fvwm2/${FVWM_VER}/FvwmScroll 47lib/X11/fvwm2/${FVWM_VER}/FvwmScroll
 48lib/X11/fvwm2/${FVWM_VER}/FvwmTabs
43lib/X11/fvwm2/${FVWM_VER}/FvwmTalk 49lib/X11/fvwm2/${FVWM_VER}/FvwmTalk
44lib/X11/fvwm2/${FVWM_VER}/FvwmTaskBar 50lib/X11/fvwm2/${FVWM_VER}/FvwmTaskBar
45lib/X11/fvwm2/${FVWM_VER}/FvwmTheme 51lib/X11/fvwm2/${FVWM_VER}/FvwmTheme
46lib/X11/fvwm2/${FVWM_VER}/FvwmTile 52lib/X11/fvwm2/${FVWM_VER}/FvwmTile
47lib/X11/fvwm2/${FVWM_VER}/FvwmWharf 53lib/X11/fvwm2/${FVWM_VER}/FvwmWharf
48lib/X11/fvwm2/${FVWM_VER}/FvwmWinList 54lib/X11/fvwm2/${FVWM_VER}/FvwmWinList
 55lib/X11/fvwm2/${FVWM_VER}/FvwmWindowMenu
49lib/X11/fvwm2/decor_examples 56lib/X11/fvwm2/decor_examples
50lib/X11/fvwm2/pixmaps/Jlock.xpm 57lib/X11/fvwm2/pixmaps/Jlock.xpm
51lib/X11/fvwm2/pixmaps/Jnews.xpm 58lib/X11/fvwm2/pixmaps/Jnews.xpm
52lib/X11/fvwm2/pixmaps/Jrecycle.xpm 59lib/X11/fvwm2/pixmaps/Jrecycle.xpm
53lib/X11/fvwm2/pixmaps/Jxlock.xpm 60lib/X11/fvwm2/pixmaps/Jxlock.xpm
54lib/X11/fvwm2/pixmaps/Monitor.xpm 61lib/X11/fvwm2/pixmaps/Monitor.xpm
55lib/X11/fvwm2/pixmaps/Mosaic.xpm 62lib/X11/fvwm2/pixmaps/Mosaic.xpm
56lib/X11/fvwm2/pixmaps/Xfm.xpm 63lib/X11/fvwm2/pixmaps/Xfm.xpm
57lib/X11/fvwm2/pixmaps/arrdown2.xpm 64lib/X11/fvwm2/pixmaps/arrdown2.xpm
58lib/X11/fvwm2/pixmaps/arrows2.xpm 65lib/X11/fvwm2/pixmaps/arrows2.xpm
59lib/X11/fvwm2/pixmaps/arrup2.xpm 66lib/X11/fvwm2/pixmaps/arrup2.xpm
60lib/X11/fvwm2/pixmaps/banner.fvwm_blue_cursive.xpm 67lib/X11/fvwm2/pixmaps/banner.fvwm_blue_cursive.xpm
61lib/X11/fvwm2/pixmaps/banner.fvwm_bracket.xpm 68lib/X11/fvwm2/pixmaps/banner.fvwm_bracket.xpm
@@ -372,75 +379,124 @@ man/man1/FvwmAnimate.1 @@ -372,75 +379,124 @@ man/man1/FvwmAnimate.1
372man/man1/FvwmAuto.1 379man/man1/FvwmAuto.1
373man/man1/FvwmBacker.1 380man/man1/FvwmBacker.1
374man/man1/FvwmBanner.1 381man/man1/FvwmBanner.1
375man/man1/FvwmButtons.1 382man/man1/FvwmButtons.1
376man/man1/FvwmCommand.1 383man/man1/FvwmCommand.1
377man/man1/FvwmConsole.1 384man/man1/FvwmConsole.1
378man/man1/FvwmConsoleC.pl.1 385man/man1/FvwmConsoleC.pl.1
379man/man1/FvwmCpp.1 386man/man1/FvwmCpp.1
380man/man1/FvwmDebug.1 387man/man1/FvwmDebug.1
381man/man1/FvwmDragWell.1 388man/man1/FvwmDragWell.1
382man/man1/FvwmEvent.1 389man/man1/FvwmEvent.1
383man/man1/FvwmForm.1 390man/man1/FvwmForm.1
384${PLIST.gtk}man/man1/FvwmGtk.1 391${PLIST.gtk}man/man1/FvwmGtk.1
 392man/man1/FvwmGtkDebug.1
385man/man1/FvwmIconBox.1 393man/man1/FvwmIconBox.1
386man/man1/FvwmIconMan.1 394man/man1/FvwmIconMan.1
387man/man1/FvwmIdent.1 395man/man1/FvwmIdent.1
388man/man1/FvwmM4.1 396man/man1/FvwmM4.1
389man/man1/FvwmPager.1 397man/man1/FvwmPager.1
 398man/man1/FvwmPerl.1
 399man/man1/FvwmProxy.1
390man/man1/FvwmRearrange.1 400man/man1/FvwmRearrange.1
391man/man1/FvwmSave.1 401man/man1/FvwmSave.1
392man/man1/FvwmSaveDesk.1 402man/man1/FvwmSaveDesk.1
393man/man1/FvwmScript.1 403man/man1/FvwmScript.1
394man/man1/FvwmScroll.1 404man/man1/FvwmScroll.1
 405man/man1/FvwmTabs.1
395man/man1/FvwmTaskBar.1 406man/man1/FvwmTaskBar.1
396man/man1/FvwmTheme.1 407man/man1/FvwmTheme.1
397man/man1/FvwmWharf.1 408man/man1/FvwmWharf.1
398man/man1/FvwmWinList.1 409man/man1/FvwmWinList.1
 410man/man1/FvwmWindowMenu.1
 411man/man1/fvwm-bug.1
399man/man1/fvwm-config.1 412man/man1/fvwm-config.1
 413man/man1/fvwm-convert-2.4.1
 414man/man1/fvwm-convert-2.6.1
400man/man1/fvwm-menu-desktop.1 415man/man1/fvwm-menu-desktop.1
401man/man1/fvwm-menu-directory.1 416man/man1/fvwm-menu-directory.1
402man/man1/fvwm-menu-headlines.1 417man/man1/fvwm-menu-headlines.1
403man/man1/fvwm-menu-xlock.1 418man/man1/fvwm-menu-xlock.1
 419man/man1/fvwm-perllib.1
404man/man1/fvwm-root.1 420man/man1/fvwm-root.1
405man/man1/fvwm.1 421man/man1/fvwm.1
406man/man1/fvwm2.1 422man/man1/fvwm2.1
407man/man1/fvwm24_convert.1 423man/man1/xpmroot.1
408man/man1/fvwmbug.1 
409man/man1/fvwmrc_convert.1 
410share/fvwm2/ConfigFvwmBacker 424share/fvwm2/ConfigFvwmBacker
411share/fvwm2/ConfigFvwmButtons 425share/fvwm2/ConfigFvwmButtons
412share/fvwm2/ConfigFvwmDefaults 426share/fvwm2/ConfigFvwmDefaults
413share/fvwm2/ConfigFvwmIconBox 427share/fvwm2/ConfigFvwmIconBox
414share/fvwm2/ConfigFvwmIconMan 428share/fvwm2/ConfigFvwmIconMan
415share/fvwm2/ConfigFvwmIdent 429share/fvwm2/ConfigFvwmIdent
416share/fvwm2/ConfigFvwmPager 430share/fvwm2/ConfigFvwmPager
 431share/fvwm2/ConfigFvwmProxyDefaults
417share/fvwm2/ConfigFvwmScroll 432share/fvwm2/ConfigFvwmScroll
418share/fvwm2/ConfigFvwmSetup 433share/fvwm2/ConfigFvwmSetup
 434share/fvwm2/ConfigFvwmTabs
419share/fvwm2/ConfigFvwmTaskBar 435share/fvwm2/ConfigFvwmTaskBar
420share/fvwm2/ConfigFvwmWinList 436share/fvwm2/ConfigFvwmWinList
421share/fvwm2/FvwmForm-Capture 437share/fvwm2/FvwmForm-Capture
 438share/fvwm2/FvwmForm-Desktop
422share/fvwm2/FvwmForm-Form 439share/fvwm2/FvwmForm-Form
423share/fvwm2/FvwmForm-QuitVerify 440share/fvwm2/FvwmForm-QuitVerify
424share/fvwm2/FvwmForm-Rlogin 441share/fvwm2/FvwmForm-Rlogin
425share/fvwm2/FvwmForm-RootCursor 442share/fvwm2/FvwmForm-RootCursor
426share/fvwm2/FvwmForm-Setup 443share/fvwm2/FvwmForm-Setup
427share/fvwm2/FvwmForm-Talk 444share/fvwm2/FvwmForm-Talk
428share/fvwm2/FvwmForm-TalkHelp 445share/fvwm2/FvwmForm-TalkHelp
429share/fvwm2/FvwmScript-BaseConfig 446share/fvwm2/FvwmScript-BaseConfig
430share/fvwm2/FvwmScript-BellSetup 447share/fvwm2/FvwmScript-BellSetup
431share/fvwm2/FvwmScript-Buttons 448share/fvwm2/FvwmScript-Buttons
432share/fvwm2/FvwmScript-Colorset 449share/fvwm2/FvwmScript-Colorset
433share/fvwm2/FvwmScript-ComExample 450share/fvwm2/FvwmScript-ComExample
434share/fvwm2/FvwmScript-Date 451share/fvwm2/FvwmScript-Date
435share/fvwm2/FvwmScript-FileBrowser 452share/fvwm2/FvwmScript-FileBrowser
436share/fvwm2/FvwmScript-Find 453share/fvwm2/FvwmScript-Find
437share/fvwm2/FvwmScript-KeyboardSetup 454share/fvwm2/FvwmScript-KeyboardSetup
438share/fvwm2/FvwmScript-PointerSetup 455share/fvwm2/FvwmScript-PointerSetup
439share/fvwm2/FvwmScript-Quit 456share/fvwm2/FvwmScript-Quit
440share/fvwm2/FvwmScript-ScreenDump 457share/fvwm2/FvwmScript-ScreenDump
441share/fvwm2/FvwmScript-ScreenSetup 458share/fvwm2/FvwmScript-ScreenSetup
442share/fvwm2/FvwmScript-Setup95 459share/fvwm2/FvwmScript-Setup95
443share/fvwm2/FvwmScript-WidgetDemo 460share/fvwm2/FvwmScript-WidgetDemo
 461share/fvwm2/FvwmTabs-DefaultSetup
444share/fvwm2/fvwm-script-ComExample.pl 462share/fvwm2/fvwm-script-ComExample.pl
445share/fvwm2/fvwm-script-setup95.pl 463share/fvwm2/fvwm-script-setup95.pl
 464share/fvwm2/perllib/FVWM/Commands.pm
 465share/fvwm2/perllib/FVWM/Constants.pm
 466share/fvwm2/perllib/FVWM/Event.pm
 467share/fvwm2/perllib/FVWM/EventNames.pm
 468share/fvwm2/perllib/FVWM/Module.pm
 469share/fvwm2/perllib/FVWM/Module/Gtk.pm
 470share/fvwm2/perllib/FVWM/Module/Gtk2.pm
 471share/fvwm2/perllib/FVWM/Module/Terminal.pm
 472share/fvwm2/perllib/FVWM/Module/Tk.pm
 473share/fvwm2/perllib/FVWM/Module/Toolkit.pm
 474share/fvwm2/perllib/FVWM/Tracker.pm
 475share/fvwm2/perllib/FVWM/Tracker/Colorsets.pm
 476share/fvwm2/perllib/FVWM/Tracker/GlobalConfig.pm
 477share/fvwm2/perllib/FVWM/Tracker/ModuleConfig.pm
 478share/fvwm2/perllib/FVWM/Tracker/PageInfo.pm
 479share/fvwm2/perllib/FVWM/Tracker/Scheduler.pm
 480share/fvwm2/perllib/FVWM/Tracker/WindowList.pm
 481share/fvwm2/perllib/General/FileSystem.pm
 482share/fvwm2/perllib/General/Parse.pm
446share/fvwm2/system.fvwm2rc-sample-95 483share/fvwm2/system.fvwm2rc-sample-95
 484share/locale/ar/LC_MESSAGES/FvwmScript.mo
 485share/locale/ar/LC_MESSAGES/FvwmTaskBar.mo
 486share/locale/ar/LC_MESSAGES/fvwm.mo
 487share/locale/de/LC_MESSAGES/FvwmScript.mo
 488share/locale/de/LC_MESSAGES/FvwmTaskBar.mo
 489share/locale/de/LC_MESSAGES/fvwm.mo
 490share/locale/fr/LC_MESSAGES/FvwmScript.mo
 491share/locale/fr/LC_MESSAGES/FvwmTaskBar.mo
 492share/locale/fr/LC_MESSAGES/fvwm.mo
 493share/locale/sv_SE/LC_MESSAGES/FvwmScript.mo
 494share/locale/sv_SE/LC_MESSAGES/FvwmTaskBar.mo
 495share/locale/sv_SE/LC_MESSAGES/fvwm.mo
 496share/locale/zh_CN/LC_MESSAGES/FvwmScript.mo
 497share/locale/zh_CN/LC_MESSAGES/FvwmTaskBar.mo
 498share/locale/zh_CN/LC_MESSAGES/fvwm.mo
 499@pkgdir share/doc/fvwm2/modules/images/FvwmTabs
 500@pkgdir share/doc/fvwm2/images/svg_rendering
 501@pkgdir share/doc/fvwm2/fvwm
 502@pkgdir share/doc/fvwm2/commands
cvs diff -r1.3 -r1.4 pkgsrc/wm/fvwm/distinfo (expand / switch to unified diff)

--- pkgsrc/wm/fvwm/distinfo 2006/12/12 06:57:59 1.3
+++ pkgsrc/wm/fvwm/distinfo 2013/01/20 06:53:53 1.4
@@ -1,13 +1,11 @@ @@ -1,13 +1,11 @@
1$NetBSD: distinfo,v 1.3 2006/12/12 06:57:59 martti Exp $ 1$NetBSD: distinfo,v 1.4 2013/01/20 06:53:53 mef Exp $
2 2
3SHA1 (fvwm-2.4.20.tar.gz) = 2130a16590462cbbf15f255a46abe8b8a6cb4401 3SHA1 (fvwm-2.6.5.tar.gz) = c200e9647d11d1a8b4938c419a987fea4aec6606
4RMD160 (fvwm-2.4.20.tar.gz) = c71f8cce0b7d7258aeef94d889c1a0346c2ae21b 4RMD160 (fvwm-2.6.5.tar.gz) = 39f3154b4ae71d935bfbb8715eb2b5dc76cccb23
5Size (fvwm-2.4.20.tar.gz) = 1844688 bytes 5Size (fvwm-2.6.5.tar.gz) = 3449177 bytes
6SHA1 (fvwm_icons.tgz) = d6ee1e52f1a84c4edd722ccee0f7e9cc79cc2a4b 6SHA1 (fvwm_icons.tgz) = d6ee1e52f1a84c4edd722ccee0f7e9cc79cc2a4b
7RMD160 (fvwm_icons.tgz) = a5aa60994e64aab939f94b4620d79ea4fcb156f3 7RMD160 (fvwm_icons.tgz) = a5aa60994e64aab939f94b4620d79ea4fcb156f3
8Size (fvwm_icons.tgz) = 363406 bytes 8Size (fvwm_icons.tgz) = 363406 bytes
9SHA1 (patch-aa) = 3170577a6c2e13d452fb1bf970ab3299b53c3706 9SHA1 (patch-ab) = b3f3a75e252102854952f45c52b442bd4da81d08
10SHA1 (patch-ab) = 85616cadc56fa4e061c29d21f38f074ae084b152 10SHA1 (patch-ad) = 4a36153af9cab68746d097e83599d5f39764f46f
11SHA1 (patch-ac) = b9009cad82a5f286e54964fc770c8281cefc35d8 11SHA1 (patch-configure) = e0e26fa168603d6ff08873098579ab9f7df38c05
12SHA1 (patch-ad) = 6f440b6ddf723ef5ff522e837e0b48ed03d278ac 
13SHA1 (patch-ae) = 09460e67c977d261b21e75be9a790841527d4117 
cvs diff -r1.1 -r1.2 pkgsrc/wm/fvwm/options.mk (expand / switch to unified diff)

--- pkgsrc/wm/fvwm/options.mk 2008/04/10 21:30:44 1.1
+++ pkgsrc/wm/fvwm/options.mk 2013/01/20 06:53:53 1.2
@@ -1,21 +1,42 @@ @@ -1,21 +1,42 @@
1# $NetBSD: options.mk,v 1.1 2008/04/10 21:30:44 jlam Exp $ 1# $NetBSD: options.mk,v 1.2 2013/01/20 06:53:53 mef Exp $
2 2
3PKG_OPTIONS_VAR= PKG_OPTIONS.fvwm 3PKG_OPTIONS_VAR= PKG_OPTIONS.fvwm
4PKG_SUPPORTED_OPTIONS= gtk rplay 4PKG_SUPPORTED_OPTIONS= gtk rplay xrender xcursor xft2
5PKG_OPTIONS_LEGACY_VARS+= FVWM2_USE_GTK:gtk 5PKG_OPTIONS_LEGACY_VARS+= FVWM2_USE_GTK:gtk
6PKG_OPTIONS_LEGACY_VARS+= FVWM2_USE_RPLAY:rplay 6PKG_OPTIONS_LEGACY_VARS+= FVWM2_USE_RPLAY:rplay
7 7
8.include "../../mk/bsd.options.mk" 8.include "../../mk/bsd.options.mk"
9 9
10PLIST_VARS+= gtk 10PLIST_VARS+= gtk
11 11
12.if !empty(PKG_OPTIONS:Mgtk) 12.if !empty(PKG_OPTIONS:Mgtk)
13. include "../../x11/gtk/buildlink3.mk" 13. include "../../x11/gtk/buildlink3.mk"
14PLIST.gtk= yes 14PLIST.gtk= yes
15.else 15.else
16CONFIGURE_ARGS+= --without-gtk-prefix 16CONFIGURE_ARGS+= --without-gtk-prefix
17.endif 17.endif
18 18
19.if !empty(PKG_OPTIONS:Mrplay) 19.if !empty(PKG_OPTIONS:Mrplay)
20. include "../../audio/rplay/buildlink3.mk" 20. include "../../audio/rplay/buildlink3.mk"
21.endif 21.endif
 22
 23.if !empty(PKG_OPTIONS:Mxcursor)
 24CONFIGURE_ARGS+= --enable-xcursor
 25.include "../../x11/libXcursor/buildlink3.mk"
 26.else
 27CONFIGURE_ARGS+= --disable-xcursor
 28.endif
 29
 30.if !empty(PKG_OPTIONS:Mxft2)
 31CONFIGURE_ARGS+= --enable-xft
 32.include "../../x11/libXft/buildlink3.mk"
 33.else
 34CONFIGURE_ARGS+= --disable-xft
 35.endif
 36
 37.if !empty(PKG_OPTIONS:Mxrender)
 38CONFIGURE_ARGS+= --enable-xrender
 39.include "../../x11/libXrender/buildlink3.mk"
 40.else
 41CONFIGURE_ARGS+= --disable-xrender
 42.endif
cvs diff -r1.2 -r1.3 pkgsrc/wm/fvwm/patches/Attic/patch-ab (expand / switch to unified diff)

--- pkgsrc/wm/fvwm/patches/Attic/patch-ab 2006/12/12 06:57:59 1.2
+++ pkgsrc/wm/fvwm/patches/Attic/patch-ab 2013/01/20 06:53:53 1.3
@@ -1,13 +1,18 @@ @@ -1,13 +1,18 @@
1$NetBSD: patch-ab,v 1.2 2006/12/12 06:57:59 martti Exp $ 1$NetBSD: patch-ab,v 1.3 2013/01/20 06:53:53 mef Exp $
2 2
3--- configure.orig 2006-12-09 11:54:30.000000000 +0000 3Convert install path from fvwm to fvwm2
4+++ configure 2006-12-12 08:51:55.000000000 +0000 4This can not be done with
5@@ -2121,7 +2121,7 @@ 5CONFIGURE_ARGS+= --datarootdir=${PREFIX:Q}/share/fvwm2
 6this will install fvwm2/fvwm.
 7
 8--- configure.orig 2013-01-06 10:03:11.000000000 +0900
 9+++ configure 2013-01-06 10:08:01.000000000 +0900
 10@@ -3179,7 +3179,7 @@ fi
6  11
7  12
8 # Define the identity of the package. 13 # Define the identity of the package.
9- PACKAGE=fvwm 14- PACKAGE=fvwm
10+ PACKAGE=fvwm2 15+ PACKAGE=fvwm2
11 VERSION=2.4.20 16 VERSION=${version}
12  17
13  18
cvs diff -r1.2 -r1.3 pkgsrc/wm/fvwm/patches/Attic/patch-ad (expand / switch to unified diff)

--- pkgsrc/wm/fvwm/patches/Attic/patch-ad 2006/12/12 06:57:59 1.2
+++ pkgsrc/wm/fvwm/patches/Attic/patch-ad 2013/01/20 06:53:53 1.3
@@ -1,13 +1,23 @@ @@ -1,13 +1,23 @@
1$NetBSD: patch-ad,v 1.2 2006/12/12 06:57:59 martti Exp $ 1$NetBSD: patch-ad,v 1.3 2013/01/20 06:53:53 mef Exp $
 2
 3Avoid following problem:
 4 ----
 5In file included from gravity.c:19:0:
 6../config.h:562:9: warning: conflicting types for built-in function 'alloca'
 7In file included from ../config.h:577:0,
 8 from gravity.c:19:
 9/usr/include/stdlib.h:250:7: error: conflicting types for 'alloca'
 10../config.h:562:9: note: previous declaration of 'alloca' was here
 11 ----
2 12
3--- config.h.in.orig 2006-12-09 11:54:06.000000000 +0000 13--- config.h.in.orig 2006-12-09 11:54:06.000000000 +0000
4+++ config.h.in 2006-12-12 08:52:22.000000000 +0000 14+++ config.h.in 2006-12-12 08:52:22.000000000 +0000
5@@ -432,6 +432,8 @@ 15@@ -432,6 +432,8 @@
6 #else 16 #else
7 # ifdef _AIX 17 # ifdef _AIX
8 #pragma alloca 18 #pragma alloca
9+# elif defined(__DragonFly__) || defined(__FreeBSD__) || defined(__NetBSD__) 19+# elif defined(__DragonFly__) || defined(__FreeBSD__) || defined(__NetBSD__)
10+# include <stdlib.h> 20+# include <stdlib.h>
11 # else 21 # else
12 # ifndef alloca /* predefined by HP cc +Olibcalls */ 22 # ifndef alloca /* predefined by HP cc +Olibcalls */
13 char *alloca (); 23 char *alloca ();
File Added: pkgsrc/wm/fvwm/patches/patch-configure
$NetBSD: patch-configure,v 1.1 2013/01/20 06:53:53 mef Exp $
Avoid following problem on NetBSD/amd64 6.99.16 with clang
+-----------------
| conftest.c:38:3: error: non-void function 'main' should return a value [-Wreturn-type]
|   return;
|   ^
+-----------------

--- configure.orig	2013-01-15 09:54:13.000000000 +0900
+++ configure	2013-01-15 10:04:58.000000000 +0900
@@ -6492,7 +6492,7 @@ int i; static j; int *p; char *c;
   switch (*p = p = *c) { case 0: printf("%Q", c, p); }
   *c = &i; c = p;
   while (1 || (unsigned int)3 >= 0 || ((int)-1) == ((unsigned int)1));
-  return;
+  return -1;
   ;
   return 0;
 }