pkgsrc-Bugs archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

pkg/47409: [PATCH] wm/fvwm 2.6.0

>Number:         47409
>Category:       pkg
>Synopsis:       wm/fvwm 2.6.0 (15-Apr-2011)
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    pkg-manager
>State:          open
>Class:          support
>Submitter-Id:   net
>Arrival-Date:   Sun Jan 06 02:10:01 +0000 2013
>Originator:     Makoto Fujiwara
>Release:        NetBSD 6.0
>Organization:
KINU Corporation
>Environment:
        
        
System: NetBSD modena 6.0 NetBSD 6.0 (GENERIC) amd64
Architecture: x86_64
Machine: amd64
>Description:
        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)
>How-To-Repeat:
        (cd /usr/pkgsrc/wm/fvwm/; make package)
>Fix:
rm patches/patch-[ace]

Index: wm/fvwm/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/wm/fvwm/Makefile,v
retrieving revision 1.21
diff -u -r1.21 Makefile
--- wm/fvwm/Makefile    23 Oct 2012 10:24:14 -0000      1.21
+++ wm/fvwm/Makefile    6 Jan 2013 01:55:53 -0000
@@ -1,7 +1,6 @@
 # $NetBSD: Makefile,v 1.21 2012/10/23 10:24:14 wiz 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/
@@ -16,7 +15,7 @@
 
 CONFLICTS=     fvwm1-[0-9]* fvwm2-[0-9]* metisse-[0-9]*
 EXTRACT_ONLY=  ${DISTNAME}.tar.gz
-FVWM_VER=      2.4.20
+FVWM_VER=      2.6.0
 
 USE_X11BASE=           YES
 GNU_CONFIGURE=         YES
@@ -38,6 +37,8 @@
 
 # We don't want to have CPP from the buildlink directory
 CONFIGURE_ENV+=                ac_cv_path_FVWM_CPP=${CPP:Q}
+# To avoid ${WRKDIR} is included in perl script
+CONFIGURE_ENV+=         ac_cv_path_PERL=${PERL5:Q}
 
 post-extract:
        mkdir ${WRKDIR:Q}/icons
@@ -54,9 +55,9 @@
        ${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
+#      ${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 \
Index: wm/fvwm/PLIST
===================================================================
RCS file: /cvsroot/pkgsrc/wm/fvwm/PLIST,v
retrieving revision 1.3
diff -u -r1.3 PLIST
--- wm/fvwm/PLIST       14 Jun 2009 18:18:58 -0000      1.3
+++ wm/fvwm/PLIST       6 Jan 2013 01:55:53 -0000
@@ -1,16 +1,18 @@
-@comment $NetBSD: PLIST,v 1.3 2009/06/14 18:18:58 joerg Exp $
+@comment $NetBSD$
 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}/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
@@ -381,32 +388,39 @@
 man/man1/FvwmDragWell.1
 man/man1/FvwmEvent.1
 man/man1/FvwmForm.1
+man/man1/FvwmGtkDebug.1
 ${PLIST.gtk}man/man1/FvwmGtk.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/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-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
Index: wm/fvwm/distinfo
===================================================================
RCS file: /cvsroot/pkgsrc/wm/fvwm/distinfo,v
retrieving revision 1.3
diff -u -r1.3 distinfo
--- wm/fvwm/distinfo    12 Dec 2006 06:57:59 -0000      1.3
+++ wm/fvwm/distinfo    6 Jan 2013 01:55:53 -0000
@@ -1,13 +1,10 @@
 $NetBSD: distinfo,v 1.3 2006/12/12 06:57:59 martti 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.0.tar.gz) = 294e2b24ce3f4bb0f090d62117907c07356688db
+RMD160 (fvwm-2.6.0.tar.gz) = 8961cbb9caaca5dbea877ffff36c04f22df9447a
+Size (fvwm-2.6.0.tar.gz) = 3453723 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) = c6a233e1ce65dbe2efe1abd107e1b436f23ba3ec
Index: wm/fvwm/patches/patch-ab
===================================================================
RCS file: /cvsroot/pkgsrc/wm/fvwm/patches/patch-ab,v
retrieving revision 1.2
diff -u -r1.2 patch-ab
--- wm/fvwm/patches/patch-ab    12 Dec 2006 06:57:59 -0000      1.2
+++ wm/fvwm/patches/patch-ab    6 Jan 2013 01:55:53 -0000
@@ -1,13 +1,18 @@
 $NetBSD: patch-ab,v 1.2 2006/12/12 06:57:59 martti 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}
  
  
Index: wm/fvwm/patches/patch-ad
===================================================================
RCS file: /cvsroot/pkgsrc/wm/fvwm/patches/patch-ad,v
retrieving revision 1.2
diff -u -r1.2 patch-ad
--- wm/fvwm/patches/patch-ad    12 Dec 2006 06:57:59 -0000      1.2
+++ wm/fvwm/patches/patch-ad    6 Jan 2013 01:55:53 -0000
@@ -10,4 +10,5 @@
 +#     include <stdlib.h>
  #  else
  #    ifndef alloca /* predefined by HP cc +Olibcalls */
-          char *alloca ();
+        char *alloca ();
+ 

>Unformatted:
Home | Main Index | Thread Index | Old Index