On Mon, Apr 25, 2011 at 03:44:08PM +0200, Jasper Lievisse Adriaanse wrote:
> On Thu, Apr 21, 2011 at 08:36:24PM +0600, Alexandr Shadchin wrote:
> > On Wed, Apr 20, 2011 at 07:28:51PM +0200, Jasper Lievisse Adriaanse wrote:
> > > On Wed, Apr 20, 2011 at 09:34:53PM +0600, Alexandr Shadchin wrote:
> > > > On Fri, Apr 15, 2011 at 06:22:55PM +0200, Rafael Sadowski wrote:
> > > > > On Thu Apr 07, 2011 at 11:23:41PM +0600, Alexandr Shadchin wrote:
> > > > > >
> > > > > > Ok. Try this, fix @pkgpath in PLIST-* (based on comment pvalchev@)
> > > > > >
> > > > >
> > > > > OK, some new infos fvwm 2.6.0 has been released. Result:
> > > > >
> > > > > Latest Stable Release: 2.6.0
> > > > > Latest Unstable Release: 2.7.0
> > > > >
> > > > > I will try it with this versions!
> > > > >
> > > > > Rafael
> > > > >
> > > > > --
> > > > > http://www.sizeofvoid.org - raf...@sizeofvoid.org
> > > > > XMPP: z...@jabber.ccc.de
> > > > > Key fingerprint: BDDD 91E9 28CB 3A52 3E99 61B0 C359 2691 BAC6 A3B1
> > > >
> > > > I prepare diff for fvwm2 2.6.1.
> > > > Now do not see any reason to divide into -stable and -snapshots
> > > > ?ackages.
> > > >
> > > > OK?
> > > Since you removed a flavor, you will need to add the corresponding
> > > @pkgpath
> > > markers in PLIST.
> > >
> >
> > fix, thanks
> You only added one, where I think you have to add all the possible flavor
> combinations. like x11/fvwm2,-fvwm2,rplay,i18n etc.
add all the possible flavor combinations in @pkgpath, thanks
--
Alexandr Shadchin
Index: Makefile
===================================================================
RCS file: /cvs/ports/x11/fvwm2/Makefile,v
retrieving revision 1.51
diff -u -p -r1.51 Makefile
--- Makefile 18 Jan 2011 20:00:56 -0000 1.51
+++ Makefile 25 Apr 2011 14:05:42 -0000
@@ -4,19 +4,15 @@ COMMENT-main= multiple virtual desktop w
COMMENT-fvicons=multiple virtual desktop window manager icons
COMMENT-fvwm2= multiple virtual desktop window manager, without icons
-VERSION= 2.4.20
+VERSION= 2.6.1
DISTNAME= fvwm-${VERSION}
PKGNAME-main= fvwm2+fvicons-${VERSION}
FULLPKGNAME-fvicons=fvicons-${VERSION}
PKGNAME-fvwm2= fvwm2-${VERSION}
-REVISION-main= 3
-REVISION-fvicons= 1
-REVISION-fvwm2= 2
-
CATEGORIES= x11
-DISTFILES= ${DISTNAME}${EXTRACT_SUFX} fvwm_icons.tgz:0
+DISTFILES= ${DISTNAME}${EXTRACT_SUFX} fvwm_icons-20070101.tar.gz
HOMEPAGE= http://www.fvwm.org/
@@ -28,16 +24,23 @@ PERMIT_PACKAGE_FTP= Yes
PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes
-WANTLIB += ICE SM X11 Xext Xinerama Xpm c m readline termcap
+WANTLIB += GL ICE SM X11 Xau Xcursor Xdamage Xdmcp Xext Xfixes
+WANTLIB += Xft Xinerama Xpm Xrender Xxf86vm c cairo drm expat
+WANTLIB += fontconfig freetype gdk_pixbuf-2.0 gio-2.0 glib-2.0
+WANTLIB += gmodule-2.0 gobject-2.0 gthread-2.0 m pixman-1 png
+WANTLIB += pthread pthread-stubs readline rsvg-2 termcap xcb xcb-render
+WANTLIB += xcb-shm z
MODULES= devel/gettext
MASTER_SITES= ftp://ftp.fvwm.org/pub/fvwm/version-2/
-MASTER_SITES0= http://www.fvwm.org/generated/icon_download/
+
+LIB_DEPENDS+= graphics/png \
+ x11/gnome/librsvg
MULTI_PACKAGES= -main -fvwm2 -fvicons
-FLAVORS= rplay debug i18n
+FLAVORS= rplay debug
FLAVOR?=
.if ${FLAVOR:L:Mrplay}
@@ -46,20 +49,13 @@ CONFIGURE_ARGS+= --with-rplay-includes="
--with-rplay-library="${LOCALBASE}/lib"
WANTLIB += rplay
.else
-CONFIGURE_ARGS+= --without-rplay
+CONFIGURE_ARGS+= --without-rplay-library
.endif
.if ${FLAVOR:L:Mdebug}
CONFIGURE_ARGS+= --enable-debug-msgs
.endif
-.if ${FLAVOR:L:Mi18n}
-# the multibyte character support is experimental
-CONFIGURE_ARGS+= --enable-multibyte
-.else
-CONFIGURE_ARGS+= --disable-multibyte
-.endif
-
PKG_ARCH-fvicons= *
LIB_DEPENDS-fvicons=
WANTLIB-fvicons=
@@ -71,13 +67,17 @@ USE_GROFF = Yes
SEPARATE_BUILD= concurrent
CONFIGURE_STYLE= gnu
-CONFIGURE_ARGS+= --enable-extras \
- --without-gnome \
- --disable-gtk
+CONFIGURE_ARGS += --disable-bidi \
+ --disable-gtk \
+ --without-gnome \
+ --without-stroke-library \
+ --with-png-includes="${LOCALBASE}/include/libpng"
+CONFIGURE_ENV += CFLAGS="${CFLAGS} -I${LOCALBASE}/include
-I${X11BASE}/include" \
+ LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib -L${X11BASE}/lib"
post-install:
${INSTALL_DATA_DIR} ${PREFIX}/share/pixmaps/fvwm
- ${INSTALL_DATA} ${WRKDIR}/fvwm_icons/*.xpm ${PREFIX}/share/pixmaps/fvwm/
+ ${INSTALL_DATA} ${WRKDIR}/fvwm_icons-20070101/*.xpm
${PREFIX}/share/pixmaps/fvwm/
${INSTALL_DATA} ${WRKSRC}/sample.fvwmrc/system.fvwm2rc
${PREFIX}/share/fvwm
.include <bsd.port.mk>
Index: distinfo
===================================================================
RCS file: /cvs/ports/x11/fvwm2/distinfo,v
retrieving revision 1.11
diff -u -p -r1.11 distinfo
--- distinfo 10 Jun 2008 05:39:38 -0000 1.11
+++ distinfo 25 Apr 2011 14:05:42 -0000
@@ -1,10 +1,10 @@
-MD5 (fvwm-2.4.20.tar.gz) = OsEFWEEciW86+6KFaXz0LA==
-MD5 (fvwm_icons.tgz) = 3mwoIvH21DoOHa3dDHqGZQ==
-RMD160 (fvwm-2.4.20.tar.gz) = xx+Mzgt9cliu75TYicGgNGwq4hs=
-RMD160 (fvwm_icons.tgz) = papgmU5kqrk5+UtGINeepPyxVvM=
-SHA1 (fvwm-2.4.20.tar.gz) = ITChZZBGLLvxXyVaRqvouKbLRAE=
-SHA1 (fvwm_icons.tgz) = 1u4eUvGoTE7dcizO4PfpzHnMKks=
-SHA256 (fvwm-2.4.20.tar.gz) = NQ/QWlOTRYTdH8JCBfIYWXPfDjwhZqTmzq/Lo4cUBTk=
-SHA256 (fvwm_icons.tgz) = co6wyDfFhDm4ajPo3Us+2zhTcryDlyolaOb51+80QqE=
-SIZE (fvwm-2.4.20.tar.gz) = 1844688
-SIZE (fvwm_icons.tgz) = 363406
+MD5 (fvwm-2.6.1.tar.gz) = yDwYXUJBc52LYWGTPoECYA==
+MD5 (fvwm_icons-20070101.tar.gz) = xtmISWgKHDBgZ6oIVRnkbA==
+RMD160 (fvwm-2.6.1.tar.gz) = iteLp+DoeH6YgAg/UXd4Q/I+M/w=
+RMD160 (fvwm_icons-20070101.tar.gz) = Iinvu8842B0TZuUtQ3AYwa7ceTQ=
+SHA1 (fvwm-2.6.1.tar.gz) = toxKFXvclYlscL8jd+UjXgbVZP4=
+SHA1 (fvwm_icons-20070101.tar.gz) = URxxt3kjx7poza8L73mSfwu1KDI=
+SHA256 (fvwm-2.6.1.tar.gz) = jS01S0s7qj5C8nDl6XS/xfU5jbWPgs2PdSoK8tD6kJ8=
+SHA256 (fvwm_icons-20070101.tar.gz) =
oL5qSSCzjVj/7+QwdYvB2QEtfHSrZWDL1udYpb3q6yw=
+SIZE (fvwm-2.6.1.tar.gz) = 3452832
+SIZE (fvwm_icons-20070101.tar.gz) = 363286
Index: patches/patch-bin_Makefile_in
===================================================================
RCS file: patches/patch-bin_Makefile_in
diff -N patches/patch-bin_Makefile_in
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-bin_Makefile_in 25 Apr 2011 14:05:42 -0000
@@ -0,0 +1,20 @@
+$OpenBSD$
+--- bin/Makefile.in.orig Fri Mar 4 08:47:50 2011
++++ bin/Makefile.in Fri Mar 4 08:48:13 2011
+@@ -710,14 +710,13 @@ info: info-am
+
+ info-am:
+
+-install-data-am: install-data-local install-man
++install-data-am: install-man
+
+ install-dvi: install-dvi-am
+
+ install-dvi-am:
+
+-install-exec-am: install-binPROGRAMS install-binSCRIPTS \
+- install-exec-local
++install-exec-am: install-binPROGRAMS install-binSCRIPTS
+
+ install-html: install-html-am
+
Index: patches/patch-config_h_in
===================================================================
RCS file: /cvs/ports/x11/fvwm2/patches/patch-config_h_in,v
retrieving revision 1.1
diff -u -p -r1.1 patch-config_h_in
--- patches/patch-config_h_in 19 May 2010 07:25:12 -0000 1.1
+++ patches/patch-config_h_in 25 Apr 2011 14:05:42 -0000
@@ -1,12 +1,12 @@
$OpenBSD: patch-config_h_in,v 1.1 2010/05/19 07:25:12 espie Exp $
---- config.h.in.orig Wed May 19 09:18:44 2010
-+++ config.h.in Wed May 19 09:19:25 2010
-@@ -434,7 +434,9 @@
+--- config.h.in.orig Mon Aug 9 18:30:50 2010
++++ config.h.in Thu Mar 3 21:36:48 2011
+@@ -558,7 +558,9 @@
#pragma alloca
# else
# ifndef alloca /* predefined by HP cc +Olibcalls */
+# ifndef __OpenBSD__
- char *alloca ();
+ char *alloca ();
+# endif
# endif
# endif
Index: patches/patch-configure
===================================================================
RCS file: patches/patch-configure
diff -N patches/patch-configure
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-configure 25 Apr 2011 14:05:42 -0000
@@ -0,0 +1,12 @@
+$OpenBSD$
+--- configure.orig Sun Apr 17 02:35:43 2011
++++ configure Wed Apr 20 15:50:16 2011
+@@ -11025,7 +11025,7 @@ if test "${with_intl_library+set}" = set; then :
+ else
+
+ with_intl=maybe
+- intl_LIBS="-l${smr_lib}"
++ intl_LIBS="-l${smr_lib} -liconv"
+
+ fi
+
Index: patches/patch-fvwm_Makefile_in
===================================================================
RCS file: /cvs/ports/x11/fvwm2/patches/patch-fvwm_Makefile_in,v
retrieving revision 1.5
diff -u -p -r1.5 patch-fvwm_Makefile_in
--- patches/patch-fvwm_Makefile_in 10 Jun 2008 05:39:38 -0000 1.5
+++ patches/patch-fvwm_Makefile_in 25 Apr 2011 14:05:42 -0000
@@ -1,15 +1,30 @@
$OpenBSD: patch-fvwm_Makefile_in,v 1.5 2008/06/10 05:39:38 pvalchev Exp $
---- fvwm/Makefile.in.orig Sat Dec 9 05:11:00 2006
-+++ fvwm/Makefile.in Mon Jun 9 23:00:18 2008
-@@ -565,9 +565,9 @@ info: info-am
+--- fvwm/Makefile.in.orig Mon Aug 9 18:28:55 2010
++++ fvwm/Makefile.in Fri Mar 4 08:25:05 2011
+@@ -35,7 +35,7 @@ PRE_UNINSTALL = :
+ POST_UNINSTALL = :
+ build_triplet = @build@
+ host_triplet = @host@
+-bin_PROGRAMS = fvwm$(EXEEXT)
++bin_PROGRAMS = fvwm2$(EXEEXT)
+ subdir = fvwm
+ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+@@ -449,7 +449,7 @@ uninstall-binPROGRAMS:
- info-am:
+ clean-binPROGRAMS:
+ -test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS)
+-fvwm$(EXEEXT): $(fvwm_OBJECTS) $(fvwm_DEPENDENCIES)
++fvwm2$(EXEEXT): $(fvwm_OBJECTS) $(fvwm_DEPENDENCIES)
+ @rm -f fvwm$(EXEEXT)
+ $(LINK) $(fvwm_OBJECTS) $(fvwm_LDADD) $(LIBS)
--install-data-am: install-configDATA install-data-local install-man
-+install-data-am: install-configDATA install-man
+@@ -687,7 +687,7 @@ install-dvi: install-dvi-am
+
+ install-dvi-am:
-install-exec-am: install-binPROGRAMS install-exec-local
+install-exec-am: install-binPROGRAMS
- install-info: install-info-am
+ install-html: install-html-am
Index: patches/patch-utils_Makefile_in
===================================================================
RCS file: patches/patch-utils_Makefile_in
diff -N patches/patch-utils_Makefile_in
--- patches/patch-utils_Makefile_in 10 Jun 2008 05:39:38 -0000 1.5
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,16 +0,0 @@
-$OpenBSD: patch-utils_Makefile_in,v 1.5 2008/06/10 05:39:38 pvalchev Exp $
---- utils/Makefile.in.orig Sat Dec 9 05:11:12 2006
-+++ utils/Makefile.in Mon Jun 9 23:00:18 2008
-@@ -534,10 +534,9 @@ info: info-am
-
- info-am:
-
--install-data-am: install-data-local install-man
-+install-data-am: install-man
-
--install-exec-am: install-binPROGRAMS install-binSCRIPTS \
-- install-exec-local
-+install-exec-am: install-binPROGRAMS install-binSCRIPTS
-
- install-info: install-info-am
-
Index: pkg/DESCR-fvwm2
===================================================================
RCS file: /cvs/ports/x11/fvwm2/pkg/DESCR-fvwm2,v
retrieving revision 1.3
diff -u -p -r1.3 DESCR-fvwm2
--- pkg/DESCR-fvwm2 15 Dec 2003 21:55:44 -0000 1.3
+++ pkg/DESCR-fvwm2 25 Apr 2011 14:05:42 -0000
@@ -10,5 +10,3 @@ Packages can be built with additional FL
This FLAVOR requires the rplay package.
debug: turn on debugging messages
-
- i18n: enable experimental multibyte character support
Index: pkg/DESCR-main
===================================================================
RCS file: /cvs/ports/x11/fvwm2/pkg/DESCR-main,v
retrieving revision 1.1
diff -u -p -r1.1 DESCR-main
--- pkg/DESCR-main 25 Nov 2006 07:55:25 -0000 1.1
+++ pkg/DESCR-main 25 Apr 2011 14:05:42 -0000
@@ -12,5 +12,3 @@ Packages can be built with additional FL
This FLAVOR requires the rplay package.
debug: turn on debugging messages
-
- i18n: enable experimental multibyte character support
Index: pkg/PLIST-fvwm2
===================================================================
RCS file: /cvs/ports/x11/fvwm2/pkg/PLIST-fvwm2,v
retrieving revision 1.9
diff -u -p -r1.9 PLIST-fvwm2
--- pkg/PLIST-fvwm2 18 Jan 2011 20:00:56 -0000 1.9
+++ pkg/PLIST-fvwm2 25 Apr 2011 14:05:42 -0000
@@ -1,16 +1,22 @@
@comment $OpenBSD: PLIST-fvwm2,v 1.9 2011/01/18 20:00:56 jasper Exp $
@conflict fvwm2+fvicons-*
@conflict fvwm95-*
+@pkgpath x11/fvwm2,-fvwm2,i18n
+@pkgpath x11/fvwm2,-fvwm2,i18n,rplay
+@pkgpath x11/fvwm2,-fvwm2,i18n,debug
+@pkgpath x11/fvwm2,-fvwm2,i18n,rplay,debug
@bin bin/FvwmCommand
+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 bin/fvwm-root
@bin bin/fvwm2
-bin/fvwm24_convert
-bin/fvwmbug
-@bin bin/xpmroot
libexec/fvwm/
libexec/fvwm/${VERSION}/
@bin libexec/fvwm/${VERSION}/FvwmAnimate
@@ -27,26 +33,31 @@ libexec/fvwm/${VERSION}/FvwmCommand.sh
@bin libexec/fvwm/${VERSION}/FvwmConsoleC
libexec/fvwm/${VERSION}/FvwmConsoleC.pl
@bin libexec/fvwm/${VERSION}/FvwmCpp
-@bin libexec/fvwm/${VERSION}/FvwmDebug
+libexec/fvwm/${VERSION}/FvwmDebug
@bin libexec/fvwm/${VERSION}/FvwmDragWell
@bin libexec/fvwm/${VERSION}/FvwmEvent
@bin libexec/fvwm/${VERSION}/FvwmForm
+libexec/fvwm/${VERSION}/FvwmGtkDebug
@bin libexec/fvwm/${VERSION}/FvwmIconBox
@bin libexec/fvwm/${VERSION}/FvwmIconMan
@bin libexec/fvwm/${VERSION}/FvwmIdent
@bin libexec/fvwm/${VERSION}/FvwmM4
@bin libexec/fvwm/${VERSION}/FvwmPager
+libexec/fvwm/${VERSION}/FvwmPerl
+@bin libexec/fvwm/${VERSION}/FvwmProxy
@bin libexec/fvwm/${VERSION}/FvwmRearrange
@bin libexec/fvwm/${VERSION}/FvwmSave
@bin libexec/fvwm/${VERSION}/FvwmSaveDesk
@bin libexec/fvwm/${VERSION}/FvwmScript
@bin libexec/fvwm/${VERSION}/FvwmScroll
+libexec/fvwm/${VERSION}/FvwmTabs
libexec/fvwm/${VERSION}/FvwmTalk
@bin libexec/fvwm/${VERSION}/FvwmTaskBar
@bin libexec/fvwm/${VERSION}/FvwmTheme
libexec/fvwm/${VERSION}/FvwmTile
@bin libexec/fvwm/${VERSION}/FvwmWharf
@bin libexec/fvwm/${VERSION}/FvwmWinList
+libexec/fvwm/${VERSION}/FvwmWindowMenu
@man man/man1/FvwmAnimate.1
@man man/man1/FvwmAuto.1
@man man/man1/FvwmBacker.1
@@ -60,30 +71,45 @@ libexec/fvwm/${VERSION}/FvwmTile
@man man/man1/FvwmDragWell.1
@man man/man1/FvwmEvent.1
@man man/man1/FvwmForm.1
+@man man/man1/FvwmGtkDebug.1
@man man/man1/FvwmIconBox.1
@man man/man1/FvwmIconMan.1
@man man/man1/FvwmIdent.1
@man man/man1/FvwmM4.1
@man man/man1/FvwmPager.1
+@man man/man1/FvwmPerl.1
+@man man/man1/FvwmProxy.1
@man man/man1/FvwmRearrange.1
@man man/man1/FvwmSave.1
@man man/man1/FvwmSaveDesk.1
@man man/man1/FvwmScript.1
@man man/man1/FvwmScroll.1
+@man man/man1/FvwmTabs.1
@man man/man1/FvwmTaskBar.1
@man man/man1/FvwmTheme.1
@man man/man1/FvwmWharf.1
@man man/man1/FvwmWinList.1
+@man man/man1/FvwmWindowMenu.1
+@man man/man1/fvwm-bug.1
@man man/man1/fvwm-config.1
+@man man/man1/fvwm-convert-2.4.1
+@man man/man1/fvwm-convert-2.6.1
@man man/man1/fvwm-menu-desktop.1
@man man/man1/fvwm-menu-directory.1
@man man/man1/fvwm-menu-headlines.1
@man man/man1/fvwm-menu-xlock.1
+@man man/man1/fvwm-perllib.1
+@man man/man1/fvwm-root.1
+@man man/man1/fvwm.1
@man man/man1/fvwm2.1
-@man man/man1/fvwm24_convert.1
-@man man/man1/fvwmbug.1
-@man man/man1/fvwmrc_convert.1
-@man man/man1/xpmroot.1
+share/doc/fvwm/
+share/doc/fvwm/commands/
+share/doc/fvwm/fvwm/
+share/doc/fvwm/images/
+share/doc/fvwm/images/svg_rendering/
+share/doc/fvwm/modules/
+share/doc/fvwm/modules/images/
+share/doc/fvwm/modules/images/FvwmTabs/
share/fvwm/
share/fvwm/ConfigFvwmBacker
share/fvwm/ConfigFvwmButtons
@@ -92,11 +118,14 @@ share/fvwm/ConfigFvwmIconBox
share/fvwm/ConfigFvwmIconMan
share/fvwm/ConfigFvwmIdent
share/fvwm/ConfigFvwmPager
+share/fvwm/ConfigFvwmProxyDefaults
share/fvwm/ConfigFvwmScroll
share/fvwm/ConfigFvwmSetup
+share/fvwm/ConfigFvwmTabs
share/fvwm/ConfigFvwmTaskBar
share/fvwm/ConfigFvwmWinList
share/fvwm/FvwmForm-Capture
+share/fvwm/FvwmForm-Desktop
share/fvwm/FvwmForm-Form
share/fvwm/FvwmForm-QuitVerify
share/fvwm/FvwmForm-Rlogin
@@ -119,7 +148,51 @@ share/fvwm/FvwmScript-ScreenDump
share/fvwm/FvwmScript-ScreenSetup
share/fvwm/FvwmScript-Setup95
share/fvwm/FvwmScript-WidgetDemo
+share/fvwm/FvwmTabs-DefaultSetup
share/fvwm/fvwm-script-ComExample.pl
share/fvwm/fvwm-script-setup95.pl
+share/fvwm/perllib/
+share/fvwm/perllib/FVWM/
+share/fvwm/perllib/FVWM/Commands.pm
+share/fvwm/perllib/FVWM/Constants.pm
+share/fvwm/perllib/FVWM/Event.pm
+share/fvwm/perllib/FVWM/EventNames.pm
+share/fvwm/perllib/FVWM/Module/
+share/fvwm/perllib/FVWM/Module.pm
+share/fvwm/perllib/FVWM/Module/Gtk.pm
+share/fvwm/perllib/FVWM/Module/Gtk2.pm
+share/fvwm/perllib/FVWM/Module/Terminal.pm
+share/fvwm/perllib/FVWM/Module/Tk.pm
+share/fvwm/perllib/FVWM/Module/Toolkit.pm
+share/fvwm/perllib/FVWM/Tracker/
+share/fvwm/perllib/FVWM/Tracker.pm
+share/fvwm/perllib/FVWM/Tracker/Colorsets.pm
+share/fvwm/perllib/FVWM/Tracker/GlobalConfig.pm
+share/fvwm/perllib/FVWM/Tracker/ModuleConfig.pm
+share/fvwm/perllib/FVWM/Tracker/PageInfo.pm
+share/fvwm/perllib/FVWM/Tracker/Scheduler.pm
+share/fvwm/perllib/FVWM/Tracker/WindowList.pm
+share/fvwm/perllib/General/
+share/fvwm/perllib/General/FileSystem.pm
+share/fvwm/perllib/General/Parse.pm
share/fvwm/system.fvwm2rc
share/fvwm/system.fvwm2rc-sample-95
+share/locale/ar/
+share/locale/ar/LC_MESSAGES/
+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/
+share/locale/sv_SE/LC_MESSAGES/
+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
Index: pkg/PLIST-main
===================================================================
RCS file: /cvs/ports/x11/fvwm2/pkg/PLIST-main,v
retrieving revision 1.4
diff -u -p -r1.4 PLIST-main
--- pkg/PLIST-main 18 Jan 2011 20:00:56 -0000 1.4
+++ pkg/PLIST-main 25 Apr 2011 14:05:42 -0000
@@ -3,16 +3,22 @@
@conflict fvicons-*
@conflict fvwm95-*
@pkgpath ${BASE_PKGPATH}
+@pkgpath x11/fvwm2,-main,i18n
+@pkgpath x11/fvwm2,-main,i18n,rplay
+@pkgpath x11/fvwm2,-main,i18n,debug
+@pkgpath x11/fvwm2,-main,i18n,rplay,debug
@bin bin/FvwmCommand
+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 bin/fvwm-root
@bin bin/fvwm2
-bin/fvwm24_convert
-bin/fvwmbug
-@bin bin/xpmroot
libexec/fvwm/
libexec/fvwm/${VERSION}/
@bin libexec/fvwm/${VERSION}/FvwmAnimate
@@ -29,26 +35,31 @@ libexec/fvwm/${VERSION}/FvwmCommand.sh
@bin libexec/fvwm/${VERSION}/FvwmConsoleC
libexec/fvwm/${VERSION}/FvwmConsoleC.pl
@bin libexec/fvwm/${VERSION}/FvwmCpp
-@bin libexec/fvwm/${VERSION}/FvwmDebug
+libexec/fvwm/${VERSION}/FvwmDebug
@bin libexec/fvwm/${VERSION}/FvwmDragWell
@bin libexec/fvwm/${VERSION}/FvwmEvent
@bin libexec/fvwm/${VERSION}/FvwmForm
+libexec/fvwm/${VERSION}/FvwmGtkDebug
@bin libexec/fvwm/${VERSION}/FvwmIconBox
@bin libexec/fvwm/${VERSION}/FvwmIconMan
@bin libexec/fvwm/${VERSION}/FvwmIdent
@bin libexec/fvwm/${VERSION}/FvwmM4
@bin libexec/fvwm/${VERSION}/FvwmPager
+libexec/fvwm/${VERSION}/FvwmPerl
+@bin libexec/fvwm/${VERSION}/FvwmProxy
@bin libexec/fvwm/${VERSION}/FvwmRearrange
@bin libexec/fvwm/${VERSION}/FvwmSave
@bin libexec/fvwm/${VERSION}/FvwmSaveDesk
@bin libexec/fvwm/${VERSION}/FvwmScript
@bin libexec/fvwm/${VERSION}/FvwmScroll
+libexec/fvwm/${VERSION}/FvwmTabs
libexec/fvwm/${VERSION}/FvwmTalk
@bin libexec/fvwm/${VERSION}/FvwmTaskBar
@bin libexec/fvwm/${VERSION}/FvwmTheme
libexec/fvwm/${VERSION}/FvwmTile
@bin libexec/fvwm/${VERSION}/FvwmWharf
@bin libexec/fvwm/${VERSION}/FvwmWinList
+libexec/fvwm/${VERSION}/FvwmWindowMenu
@man man/man1/FvwmAnimate.1
@man man/man1/FvwmAuto.1
@man man/man1/FvwmBacker.1
@@ -62,30 +73,45 @@ libexec/fvwm/${VERSION}/FvwmTile
@man man/man1/FvwmDragWell.1
@man man/man1/FvwmEvent.1
@man man/man1/FvwmForm.1
+@man man/man1/FvwmGtkDebug.1
@man man/man1/FvwmIconBox.1
@man man/man1/FvwmIconMan.1
@man man/man1/FvwmIdent.1
@man man/man1/FvwmM4.1
@man man/man1/FvwmPager.1
+@man man/man1/FvwmPerl.1
+@man man/man1/FvwmProxy.1
@man man/man1/FvwmRearrange.1
@man man/man1/FvwmSave.1
@man man/man1/FvwmSaveDesk.1
@man man/man1/FvwmScript.1
@man man/man1/FvwmScroll.1
+@man man/man1/FvwmTabs.1
@man man/man1/FvwmTaskBar.1
@man man/man1/FvwmTheme.1
@man man/man1/FvwmWharf.1
@man man/man1/FvwmWinList.1
+@man man/man1/FvwmWindowMenu.1
+@man man/man1/fvwm-bug.1
@man man/man1/fvwm-config.1
+@man man/man1/fvwm-convert-2.4.1
+@man man/man1/fvwm-convert-2.6.1
@man man/man1/fvwm-menu-desktop.1
@man man/man1/fvwm-menu-directory.1
@man man/man1/fvwm-menu-headlines.1
@man man/man1/fvwm-menu-xlock.1
+@man man/man1/fvwm-perllib.1
+@man man/man1/fvwm-root.1
+@man man/man1/fvwm.1
@man man/man1/fvwm2.1
-@man man/man1/fvwm24_convert.1
-@man man/man1/fvwmbug.1
-@man man/man1/fvwmrc_convert.1
-@man man/man1/xpmroot.1
+share/doc/fvwm/
+share/doc/fvwm/commands/
+share/doc/fvwm/fvwm/
+share/doc/fvwm/images/
+share/doc/fvwm/images/svg_rendering/
+share/doc/fvwm/modules/
+share/doc/fvwm/modules/images/
+share/doc/fvwm/modules/images/FvwmTabs/
share/fvwm/
share/fvwm/ConfigFvwmBacker
share/fvwm/ConfigFvwmButtons
@@ -94,11 +120,14 @@ share/fvwm/ConfigFvwmIconBox
share/fvwm/ConfigFvwmIconMan
share/fvwm/ConfigFvwmIdent
share/fvwm/ConfigFvwmPager
+share/fvwm/ConfigFvwmProxyDefaults
share/fvwm/ConfigFvwmScroll
share/fvwm/ConfigFvwmSetup
+share/fvwm/ConfigFvwmTabs
share/fvwm/ConfigFvwmTaskBar
share/fvwm/ConfigFvwmWinList
share/fvwm/FvwmForm-Capture
+share/fvwm/FvwmForm-Desktop
share/fvwm/FvwmForm-Form
share/fvwm/FvwmForm-QuitVerify
share/fvwm/FvwmForm-Rlogin
@@ -121,10 +150,54 @@ share/fvwm/FvwmScript-ScreenDump
share/fvwm/FvwmScript-ScreenSetup
share/fvwm/FvwmScript-Setup95
share/fvwm/FvwmScript-WidgetDemo
+share/fvwm/FvwmTabs-DefaultSetup
share/fvwm/fvwm-script-ComExample.pl
share/fvwm/fvwm-script-setup95.pl
+share/fvwm/perllib/
+share/fvwm/perllib/FVWM/
+share/fvwm/perllib/FVWM/Commands.pm
+share/fvwm/perllib/FVWM/Constants.pm
+share/fvwm/perllib/FVWM/Event.pm
+share/fvwm/perllib/FVWM/EventNames.pm
+share/fvwm/perllib/FVWM/Module/
+share/fvwm/perllib/FVWM/Module.pm
+share/fvwm/perllib/FVWM/Module/Gtk.pm
+share/fvwm/perllib/FVWM/Module/Gtk2.pm
+share/fvwm/perllib/FVWM/Module/Terminal.pm
+share/fvwm/perllib/FVWM/Module/Tk.pm
+share/fvwm/perllib/FVWM/Module/Toolkit.pm
+share/fvwm/perllib/FVWM/Tracker/
+share/fvwm/perllib/FVWM/Tracker.pm
+share/fvwm/perllib/FVWM/Tracker/Colorsets.pm
+share/fvwm/perllib/FVWM/Tracker/GlobalConfig.pm
+share/fvwm/perllib/FVWM/Tracker/ModuleConfig.pm
+share/fvwm/perllib/FVWM/Tracker/PageInfo.pm
+share/fvwm/perllib/FVWM/Tracker/Scheduler.pm
+share/fvwm/perllib/FVWM/Tracker/WindowList.pm
+share/fvwm/perllib/General/
+share/fvwm/perllib/General/FileSystem.pm
+share/fvwm/perllib/General/Parse.pm
share/fvwm/system.fvwm2rc
share/fvwm/system.fvwm2rc-sample-95
+share/locale/ar/
+share/locale/ar/LC_MESSAGES/
+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/
+share/locale/sv_SE/LC_MESSAGES/
+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
share/pixmaps/
share/pixmaps/fvwm/
share/pixmaps/fvwm/Jlock.xpm
