diff options
author | mef <mef@pkgsrc.org> | 2013-01-20 06:53:53 +0000 |
---|---|---|
committer | mef <mef@pkgsrc.org> | 2013-01-20 06:53:53 +0000 |
commit | a8670d3760a12a36061008af44facb02b2f2a18f (patch) | |
tree | 55b199e8940a3c52c97da7f10ba1b5e21e3a2b2a /wm | |
parent | ca805d167cb8c2a3df30d0725af114a540cefe03 (diff) | |
download | pkgsrc-a8670d3760a12a36061008af44facb02b2f2a18f.tar.gz |
(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)
Diffstat (limited to 'wm')
-rw-r--r-- | wm/fvwm/Makefile | 20 | ||||
-rw-r--r-- | wm/fvwm/PLIST | 70 | ||||
-rw-r--r-- | wm/fvwm/distinfo | 16 | ||||
-rw-r--r-- | wm/fvwm/options.mk | 25 | ||||
-rw-r--r-- | wm/fvwm/patches/patch-ab | 15 | ||||
-rw-r--r-- | wm/fvwm/patches/patch-ad | 14 | ||||
-rw-r--r-- | wm/fvwm/patches/patch-configure | 19 |
7 files changed, 144 insertions, 35 deletions
diff --git a/wm/fvwm/Makefile b/wm/fvwm/Makefile index 0db562cc019..fa869566b97 100644 --- a/wm/fvwm/Makefile +++ b/wm/fvwm/Makefile @@ -1,7 +1,6 @@ -# $NetBSD: Makefile,v 1.22 2013/01/12 11:24:43 marino Exp $ +# $NetBSD: Makefile,v 1.23 2013/01/20 06:53:53 mef Exp $ DISTNAME= fvwm-${FVWM_VER} -PKGREVISION= 5 CATEGORIES= x11 wm MASTER_SITES= ftp://ftp.fvwm.org/pub/fvwm/version-2/ \ http://www.fvwm.org/generated/icon_download/ @@ -12,11 +11,11 @@ HOMEPAGE= http://www.fvwm.org/ COMMENT= Newer version of X11 Virtual window manager LICENSE= gnu-gpl-v2 -DEPENDS+= xpmroot-2.*:../../x11/xpmroot +#DEPENDS+= xpmroot-2.*:../../x11/xpmroot -CONFLICTS= fvwm1-[0-9]* fvwm2-[0-9]* metisse-[0-9]* +CONFLICTS= fvwm1-[0-9]* fvwm2-[0-9]* metisse-[0-9]* xpmroot-[0-9]* EXTRACT_ONLY= ${DISTNAME}.tar.gz -FVWM_VER= 2.4.20 +FVWM_VER= 2.6.5 USE_X11BASE= YES GNU_CONFIGURE= YES @@ -38,8 +37,8 @@ CONFIGURE_ARGS+= --with-imagepath=${PREFIX:Q}/lib/X11/fvwm2/pixmaps:${X11BASE:Q} # We don't want to have CPP from the buildlink directory CONFIGURE_ENV+= ac_cv_path_FVWM_CPP=${CPP:Q} - -LDFLAGS.DragonFly+= -lX11 +# To avoid ${WRKDIR} is included in perl script +CONFIGURE_ENV+= ac_cv_path_PERL=${PERL5:Q} post-extract: mkdir ${WRKDIR:Q}/icons @@ -56,9 +55,6 @@ post-install: ${INSTALL_DATA} \ ${WRKSRC:Q}/sample.fvwmrc/system.fvwm2rc \ ${DESTDIR}${PREFIX:Q}/lib/X11/fvwm2/system.fvwm2rc.example - ${INSTALL_SCRIPT} \ - ${WRKSRC:Q}/utils/fvwmrc_convert \ - ${DESTDIR}${PREFIX:Q}/bin/fvwmrc_convert if [ ! -f ${DESTDIR}${PREFIX:Q}/lib/X11/fvwm2/system.fvwm2rc ]; then \ ${INSTALL_DATA} \ ${DESTDIR}${PREFIX:Q}/lib/X11/fvwm2/system.fvwm2rc.example \ @@ -70,6 +66,10 @@ post-install: BUILDLINK_DEPMETHOD.libXt?= build .include "../../devel/readline/buildlink3.mk" +# DragonFly does not have built-in gettext +.if ${OPSYS} == "DragonFly" +.include "../../devel/gettext-lib/buildlink3.mk" +.endif .include "../../x11/libSM/buildlink3.mk" .include "../../x11/libXext/buildlink3.mk" .include "../../x11/libXinerama/buildlink3.mk" diff --git a/wm/fvwm/PLIST b/wm/fvwm/PLIST index ff7fe315171..3f2a10bf55e 100644 --- a/wm/fvwm/PLIST +++ b/wm/fvwm/PLIST @@ -1,16 +1,18 @@ -@comment $NetBSD: PLIST,v 1.3 2009/06/14 18:18:58 joerg Exp $ +@comment $NetBSD: PLIST,v 1.4 2013/01/20 06:53:53 mef Exp $ bin/FvwmCommand bin/fvwm +bin/fvwm-bug bin/fvwm-config +bin/fvwm-convert-2.4 +bin/fvwm-convert-2.6 bin/fvwm-menu-desktop bin/fvwm-menu-directory bin/fvwm-menu-headlines bin/fvwm-menu-xlock +bin/fvwm-perllib bin/fvwm-root bin/fvwm2 -bin/fvwm24_convert -bin/fvwmbug -bin/fvwmrc_convert +bin/xpmroot lib/X11/fvwm2/${FVWM_VER}/FvwmAnimate lib/X11/fvwm2/${FVWM_VER}/FvwmAudio lib/X11/fvwm2/${FVWM_VER}/FvwmAuto @@ -30,22 +32,27 @@ lib/X11/fvwm2/${FVWM_VER}/FvwmDragWell lib/X11/fvwm2/${FVWM_VER}/FvwmEvent lib/X11/fvwm2/${FVWM_VER}/FvwmForm ${PLIST.gtk}lib/X11/fvwm2/${FVWM_VER}/FvwmGtk +lib/X11/fvwm2/${FVWM_VER}/FvwmGtkDebug lib/X11/fvwm2/${FVWM_VER}/FvwmIconBox lib/X11/fvwm2/${FVWM_VER}/FvwmIconMan lib/X11/fvwm2/${FVWM_VER}/FvwmIdent lib/X11/fvwm2/${FVWM_VER}/FvwmM4 lib/X11/fvwm2/${FVWM_VER}/FvwmPager +lib/X11/fvwm2/${FVWM_VER}/FvwmPerl +lib/X11/fvwm2/${FVWM_VER}/FvwmProxy lib/X11/fvwm2/${FVWM_VER}/FvwmRearrange lib/X11/fvwm2/${FVWM_VER}/FvwmSave lib/X11/fvwm2/${FVWM_VER}/FvwmSaveDesk lib/X11/fvwm2/${FVWM_VER}/FvwmScript lib/X11/fvwm2/${FVWM_VER}/FvwmScroll +lib/X11/fvwm2/${FVWM_VER}/FvwmTabs lib/X11/fvwm2/${FVWM_VER}/FvwmTalk lib/X11/fvwm2/${FVWM_VER}/FvwmTaskBar lib/X11/fvwm2/${FVWM_VER}/FvwmTheme lib/X11/fvwm2/${FVWM_VER}/FvwmTile lib/X11/fvwm2/${FVWM_VER}/FvwmWharf lib/X11/fvwm2/${FVWM_VER}/FvwmWinList +lib/X11/fvwm2/${FVWM_VER}/FvwmWindowMenu lib/X11/fvwm2/decor_examples lib/X11/fvwm2/pixmaps/Jlock.xpm lib/X11/fvwm2/pixmaps/Jnews.xpm @@ -382,31 +389,38 @@ man/man1/FvwmDragWell.1 man/man1/FvwmEvent.1 man/man1/FvwmForm.1 ${PLIST.gtk}man/man1/FvwmGtk.1 +man/man1/FvwmGtkDebug.1 man/man1/FvwmIconBox.1 man/man1/FvwmIconMan.1 man/man1/FvwmIdent.1 man/man1/FvwmM4.1 man/man1/FvwmPager.1 +man/man1/FvwmPerl.1 +man/man1/FvwmProxy.1 man/man1/FvwmRearrange.1 man/man1/FvwmSave.1 man/man1/FvwmSaveDesk.1 man/man1/FvwmScript.1 man/man1/FvwmScroll.1 +man/man1/FvwmTabs.1 man/man1/FvwmTaskBar.1 man/man1/FvwmTheme.1 man/man1/FvwmWharf.1 man/man1/FvwmWinList.1 +man/man1/FvwmWindowMenu.1 +man/man1/fvwm-bug.1 man/man1/fvwm-config.1 +man/man1/fvwm-convert-2.4.1 +man/man1/fvwm-convert-2.6.1 man/man1/fvwm-menu-desktop.1 man/man1/fvwm-menu-directory.1 man/man1/fvwm-menu-headlines.1 man/man1/fvwm-menu-xlock.1 +man/man1/fvwm-perllib.1 man/man1/fvwm-root.1 man/man1/fvwm.1 man/man1/fvwm2.1 -man/man1/fvwm24_convert.1 -man/man1/fvwmbug.1 -man/man1/fvwmrc_convert.1 +man/man1/xpmroot.1 share/fvwm2/ConfigFvwmBacker share/fvwm2/ConfigFvwmButtons share/fvwm2/ConfigFvwmDefaults @@ -414,11 +428,14 @@ share/fvwm2/ConfigFvwmIconBox share/fvwm2/ConfigFvwmIconMan share/fvwm2/ConfigFvwmIdent share/fvwm2/ConfigFvwmPager +share/fvwm2/ConfigFvwmProxyDefaults share/fvwm2/ConfigFvwmScroll share/fvwm2/ConfigFvwmSetup +share/fvwm2/ConfigFvwmTabs share/fvwm2/ConfigFvwmTaskBar share/fvwm2/ConfigFvwmWinList share/fvwm2/FvwmForm-Capture +share/fvwm2/FvwmForm-Desktop share/fvwm2/FvwmForm-Form share/fvwm2/FvwmForm-QuitVerify share/fvwm2/FvwmForm-Rlogin @@ -441,6 +458,45 @@ share/fvwm2/FvwmScript-ScreenDump share/fvwm2/FvwmScript-ScreenSetup share/fvwm2/FvwmScript-Setup95 share/fvwm2/FvwmScript-WidgetDemo +share/fvwm2/FvwmTabs-DefaultSetup share/fvwm2/fvwm-script-ComExample.pl share/fvwm2/fvwm-script-setup95.pl +share/fvwm2/perllib/FVWM/Commands.pm +share/fvwm2/perllib/FVWM/Constants.pm +share/fvwm2/perllib/FVWM/Event.pm +share/fvwm2/perllib/FVWM/EventNames.pm +share/fvwm2/perllib/FVWM/Module.pm +share/fvwm2/perllib/FVWM/Module/Gtk.pm +share/fvwm2/perllib/FVWM/Module/Gtk2.pm +share/fvwm2/perllib/FVWM/Module/Terminal.pm +share/fvwm2/perllib/FVWM/Module/Tk.pm +share/fvwm2/perllib/FVWM/Module/Toolkit.pm +share/fvwm2/perllib/FVWM/Tracker.pm +share/fvwm2/perllib/FVWM/Tracker/Colorsets.pm +share/fvwm2/perllib/FVWM/Tracker/GlobalConfig.pm +share/fvwm2/perllib/FVWM/Tracker/ModuleConfig.pm +share/fvwm2/perllib/FVWM/Tracker/PageInfo.pm +share/fvwm2/perllib/FVWM/Tracker/Scheduler.pm +share/fvwm2/perllib/FVWM/Tracker/WindowList.pm +share/fvwm2/perllib/General/FileSystem.pm +share/fvwm2/perllib/General/Parse.pm share/fvwm2/system.fvwm2rc-sample-95 +share/locale/ar/LC_MESSAGES/FvwmScript.mo +share/locale/ar/LC_MESSAGES/FvwmTaskBar.mo +share/locale/ar/LC_MESSAGES/fvwm.mo +share/locale/de/LC_MESSAGES/FvwmScript.mo +share/locale/de/LC_MESSAGES/FvwmTaskBar.mo +share/locale/de/LC_MESSAGES/fvwm.mo +share/locale/fr/LC_MESSAGES/FvwmScript.mo +share/locale/fr/LC_MESSAGES/FvwmTaskBar.mo +share/locale/fr/LC_MESSAGES/fvwm.mo +share/locale/sv_SE/LC_MESSAGES/FvwmScript.mo +share/locale/sv_SE/LC_MESSAGES/FvwmTaskBar.mo +share/locale/sv_SE/LC_MESSAGES/fvwm.mo +share/locale/zh_CN/LC_MESSAGES/FvwmScript.mo +share/locale/zh_CN/LC_MESSAGES/FvwmTaskBar.mo +share/locale/zh_CN/LC_MESSAGES/fvwm.mo +@pkgdir share/doc/fvwm2/modules/images/FvwmTabs +@pkgdir share/doc/fvwm2/images/svg_rendering +@pkgdir share/doc/fvwm2/fvwm +@pkgdir share/doc/fvwm2/commands diff --git a/wm/fvwm/distinfo b/wm/fvwm/distinfo index f0bdc1bdf4a..63ac7df1bd0 100644 --- a/wm/fvwm/distinfo +++ b/wm/fvwm/distinfo @@ -1,13 +1,11 @@ -$NetBSD: distinfo,v 1.3 2006/12/12 06:57:59 martti Exp $ +$NetBSD: distinfo,v 1.4 2013/01/20 06:53:53 mef Exp $ -SHA1 (fvwm-2.4.20.tar.gz) = 2130a16590462cbbf15f255a46abe8b8a6cb4401 -RMD160 (fvwm-2.4.20.tar.gz) = c71f8cce0b7d7258aeef94d889c1a0346c2ae21b -Size (fvwm-2.4.20.tar.gz) = 1844688 bytes +SHA1 (fvwm-2.6.5.tar.gz) = c200e9647d11d1a8b4938c419a987fea4aec6606 +RMD160 (fvwm-2.6.5.tar.gz) = 39f3154b4ae71d935bfbb8715eb2b5dc76cccb23 +Size (fvwm-2.6.5.tar.gz) = 3449177 bytes SHA1 (fvwm_icons.tgz) = d6ee1e52f1a84c4edd722ccee0f7e9cc79cc2a4b RMD160 (fvwm_icons.tgz) = a5aa60994e64aab939f94b4620d79ea4fcb156f3 Size (fvwm_icons.tgz) = 363406 bytes -SHA1 (patch-aa) = 3170577a6c2e13d452fb1bf970ab3299b53c3706 -SHA1 (patch-ab) = 85616cadc56fa4e061c29d21f38f074ae084b152 -SHA1 (patch-ac) = b9009cad82a5f286e54964fc770c8281cefc35d8 -SHA1 (patch-ad) = 6f440b6ddf723ef5ff522e837e0b48ed03d278ac -SHA1 (patch-ae) = 09460e67c977d261b21e75be9a790841527d4117 +SHA1 (patch-ab) = b3f3a75e252102854952f45c52b442bd4da81d08 +SHA1 (patch-ad) = 4a36153af9cab68746d097e83599d5f39764f46f +SHA1 (patch-configure) = e0e26fa168603d6ff08873098579ab9f7df38c05 diff --git a/wm/fvwm/options.mk b/wm/fvwm/options.mk index 2cdef51a61f..f33c7afea99 100644 --- a/wm/fvwm/options.mk +++ b/wm/fvwm/options.mk @@ -1,7 +1,7 @@ -# $NetBSD: options.mk,v 1.1 2008/04/10 21:30:44 jlam Exp $ +# $NetBSD: options.mk,v 1.2 2013/01/20 06:53:53 mef Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.fvwm -PKG_SUPPORTED_OPTIONS= gtk rplay +PKG_SUPPORTED_OPTIONS= gtk rplay xrender xcursor xft2 PKG_OPTIONS_LEGACY_VARS+= FVWM2_USE_GTK:gtk PKG_OPTIONS_LEGACY_VARS+= FVWM2_USE_RPLAY:rplay @@ -19,3 +19,24 @@ CONFIGURE_ARGS+= --without-gtk-prefix .if !empty(PKG_OPTIONS:Mrplay) . include "../../audio/rplay/buildlink3.mk" .endif + +.if !empty(PKG_OPTIONS:Mxcursor) +CONFIGURE_ARGS+= --enable-xcursor +.include "../../x11/libXcursor/buildlink3.mk" +.else +CONFIGURE_ARGS+= --disable-xcursor +.endif + +.if !empty(PKG_OPTIONS:Mxft2) +CONFIGURE_ARGS+= --enable-xft +.include "../../x11/libXft/buildlink3.mk" +.else +CONFIGURE_ARGS+= --disable-xft +.endif + +.if !empty(PKG_OPTIONS:Mxrender) +CONFIGURE_ARGS+= --enable-xrender +.include "../../x11/libXrender/buildlink3.mk" +.else +CONFIGURE_ARGS+= --disable-xrender +.endif diff --git a/wm/fvwm/patches/patch-ab b/wm/fvwm/patches/patch-ab index f00f2118d7f..bb651979687 100644 --- a/wm/fvwm/patches/patch-ab +++ b/wm/fvwm/patches/patch-ab @@ -1,13 +1,18 @@ -$NetBSD: patch-ab,v 1.2 2006/12/12 06:57:59 martti Exp $ +$NetBSD: patch-ab,v 1.3 2013/01/20 06:53:53 mef Exp $ ---- configure.orig 2006-12-09 11:54:30.000000000 +0000 -+++ configure 2006-12-12 08:51:55.000000000 +0000 -@@ -2121,7 +2121,7 @@ +Convert install path from fvwm to fvwm2 +This can not be done with +CONFIGURE_ARGS+= --datarootdir=${PREFIX:Q}/share/fvwm2 +this will install fvwm2/fvwm. + +--- configure.orig 2013-01-06 10:03:11.000000000 +0900 ++++ configure 2013-01-06 10:08:01.000000000 +0900 +@@ -3179,7 +3179,7 @@ fi # Define the identity of the package. - PACKAGE=fvwm + PACKAGE=fvwm2 - VERSION=2.4.20 + VERSION=${version} diff --git a/wm/fvwm/patches/patch-ad b/wm/fvwm/patches/patch-ad index 812d1898eb8..6691fa8d89a 100644 --- a/wm/fvwm/patches/patch-ad +++ b/wm/fvwm/patches/patch-ad @@ -1,4 +1,14 @@ -$NetBSD: patch-ad,v 1.2 2006/12/12 06:57:59 martti Exp $ +$NetBSD: patch-ad,v 1.3 2013/01/20 06:53:53 mef Exp $ + +Avoid following problem: + ---- +In file included from gravity.c:19:0: +../config.h:562:9: warning: conflicting types for built-in function 'alloca' +In file included from ../config.h:577:0, + from gravity.c:19: +/usr/include/stdlib.h:250:7: error: conflicting types for 'alloca' +../config.h:562:9: note: previous declaration of 'alloca' was here + ---- --- config.h.in.orig 2006-12-09 11:54:06.000000000 +0000 +++ config.h.in 2006-12-12 08:52:22.000000000 +0000 @@ -10,4 +20,4 @@ $NetBSD: patch-ad,v 1.2 2006/12/12 06:57:59 martti Exp $ +# include <stdlib.h> # else # ifndef alloca /* predefined by HP cc +Olibcalls */ - char *alloca (); + char *alloca (); diff --git a/wm/fvwm/patches/patch-configure b/wm/fvwm/patches/patch-configure new file mode 100644 index 00000000000..7057e7d54b2 --- /dev/null +++ b/wm/fvwm/patches/patch-configure @@ -0,0 +1,19 @@ +$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; + } |