diff --git a/x11/fvwm2/Makefile b/x11/fvwm2/Makefile index ccff2345684..817b4ca43d9 100644 --- a/x11/fvwm2/Makefile +++ b/x11/fvwm2/Makefile @@ -1,13 +1,13 @@ -# $OpenBSD: Makefile,v 1.43 2007/09/15 20:04:20 merdely Exp $ +# $OpenBSD: Makefile,v 1.44 2008/06/10 05:39:37 pvalchev Exp $ COMMENT-main= multiple virtual desktop window manager, with icons COMMENT-fvicons=multiple virtual desktop window manager icons COMMENT-fvwm2= multiple virtual desktop window manager, without icons -VERSION= 2.4.19 +VERSION= 2.4.20 DISTNAME= fvwm-${VERSION} -PKGNAME-main= fvwm2+fvicons-${VERSION}p0 -FULLPKGNAME-fvicons=fvicons-${VERSION}p0 +PKGNAME-main= fvwm2+fvicons-${VERSION} +FULLPKGNAME-fvicons=fvicons-${VERSION} PKGNAME-fvwm2= fvwm2-${VERSION} CATEGORIES= x11 diff --git a/x11/fvwm2/distinfo b/x11/fvwm2/distinfo index e6c2f2aedc9..9b5cd84c3af 100644 --- a/x11/fvwm2/distinfo +++ b/x11/fvwm2/distinfo @@ -1,10 +1,10 @@ -MD5 (fvwm-2.4.19.tar.gz) = ov0sBwYTA4g9a/iesrJZ/w== +MD5 (fvwm-2.4.20.tar.gz) = OsEFWEEciW86+6KFaXz0LA== MD5 (fvwm_icons.tgz) = 3mwoIvH21DoOHa3dDHqGZQ== -RMD160 (fvwm-2.4.19.tar.gz) = zG487rzNULoEBAeXcfqmurwEHKA= +RMD160 (fvwm-2.4.20.tar.gz) = xx+Mzgt9cliu75TYicGgNGwq4hs= RMD160 (fvwm_icons.tgz) = papgmU5kqrk5+UtGINeepPyxVvM= -SHA1 (fvwm-2.4.19.tar.gz) = bYgUc1YNbe02D8R6fPsbPV0wgk8= +SHA1 (fvwm-2.4.20.tar.gz) = ITChZZBGLLvxXyVaRqvouKbLRAE= SHA1 (fvwm_icons.tgz) = 1u4eUvGoTE7dcizO4PfpzHnMKks= -SHA256 (fvwm-2.4.19.tar.gz) = FtM0OWHNwhfHwMFNXp5G6xs4ge/67sOn2Zrx4+2PLAs= +SHA256 (fvwm-2.4.20.tar.gz) = NQ/QWlOTRYTdH8JCBfIYWXPfDjwhZqTmzq/Lo4cUBTk= SHA256 (fvwm_icons.tgz) = co6wyDfFhDm4ajPo3Us+2zhTcryDlyolaOb51+80QqE= -SIZE (fvwm-2.4.19.tar.gz) = 1826833 +SIZE (fvwm-2.4.20.tar.gz) = 1844688 SIZE (fvwm_icons.tgz) = 363406 diff --git a/x11/fvwm2/patches/patch-fvwm_Makefile_in b/x11/fvwm2/patches/patch-fvwm_Makefile_in index 183522630e2..1184defd3c1 100644 --- a/x11/fvwm2/patches/patch-fvwm_Makefile_in +++ b/x11/fvwm2/patches/patch-fvwm_Makefile_in @@ -1,7 +1,7 @@ -$OpenBSD: patch-fvwm_Makefile_in,v 1.4 2005/07/29 05:01:49 pvalchev Exp $ ---- fvwm/Makefile.in.orig Sun Jun 5 14:04:22 2005 -+++ fvwm/Makefile.in Sun Jun 5 14:04:32 2005 -@@ -557,9 +557,9 @@ info: info-am +$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 info-am: diff --git a/x11/fvwm2/patches/patch-utils_Makefile_in b/x11/fvwm2/patches/patch-utils_Makefile_in index 29c5ae634fc..cadaee8cbd5 100644 --- a/x11/fvwm2/patches/patch-utils_Makefile_in +++ b/x11/fvwm2/patches/patch-utils_Makefile_in @@ -1,7 +1,7 @@ -$OpenBSD: patch-utils_Makefile_in,v 1.4 2005/07/29 05:01:49 pvalchev Exp $ ---- utils/Makefile.in.orig Sun Jun 5 14:05:26 2005 -+++ utils/Makefile.in Sun Jun 5 14:05:46 2005 -@@ -511,10 +511,9 @@ info: info-am +$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: diff --git a/x11/fvwm2/pkg/PLIST-fvwm2 b/x11/fvwm2/pkg/PLIST-fvwm2 index ceddd08213b..f39cb739a74 100644 --- a/x11/fvwm2/pkg/PLIST-fvwm2 +++ b/x11/fvwm2/pkg/PLIST-fvwm2 @@ -1,53 +1,53 @@ -@comment $OpenBSD: PLIST-fvwm2,v 1.7 2004/12/30 01:20:39 espie Exp $ +@comment $OpenBSD: PLIST-fvwm2,v 1.8 2008/06/10 05:39:38 pvalchev Exp $ @conflict fvwm2+fvicons-* @conflict fvwm95-* -bin/FvwmCommand +@bin bin/FvwmCommand bin/fvwm-config bin/fvwm-menu-desktop bin/fvwm-menu-directory bin/fvwm-menu-headlines bin/fvwm-menu-xlock -bin/fvwm2 +@bin bin/fvwm2 bin/fvwm24_convert bin/fvwmbug -bin/xpmroot +@bin bin/xpmroot libexec/fvwm/ libexec/fvwm/${VERSION}/ -libexec/fvwm/${VERSION}/FvwmAnimate -libexec/fvwm/${VERSION}/FvwmAudio -libexec/fvwm/${VERSION}/FvwmAuto -libexec/fvwm/${VERSION}/FvwmBacker -libexec/fvwm/${VERSION}/FvwmBanner -libexec/fvwm/${VERSION}/FvwmButtons +@bin libexec/fvwm/${VERSION}/FvwmAnimate +@bin libexec/fvwm/${VERSION}/FvwmAudio +@bin libexec/fvwm/${VERSION}/FvwmAuto +@bin libexec/fvwm/${VERSION}/FvwmBacker +@bin libexec/fvwm/${VERSION}/FvwmBanner +@bin libexec/fvwm/${VERSION}/FvwmButtons libexec/fvwm/${VERSION}/FvwmCascade libexec/fvwm/${VERSION}/FvwmCommand.pm libexec/fvwm/${VERSION}/FvwmCommand.sh -libexec/fvwm/${VERSION}/FvwmCommandS -libexec/fvwm/${VERSION}/FvwmConsole -libexec/fvwm/${VERSION}/FvwmConsoleC +@bin libexec/fvwm/${VERSION}/FvwmCommandS +@bin libexec/fvwm/${VERSION}/FvwmConsole +@bin libexec/fvwm/${VERSION}/FvwmConsoleC libexec/fvwm/${VERSION}/FvwmConsoleC.pl -libexec/fvwm/${VERSION}/FvwmCpp -libexec/fvwm/${VERSION}/FvwmDebug -libexec/fvwm/${VERSION}/FvwmDragWell -libexec/fvwm/${VERSION}/FvwmEvent -libexec/fvwm/${VERSION}/FvwmForm -libexec/fvwm/${VERSION}/FvwmGtk -libexec/fvwm/${VERSION}/FvwmIconBox -libexec/fvwm/${VERSION}/FvwmIconMan -libexec/fvwm/${VERSION}/FvwmIdent -libexec/fvwm/${VERSION}/FvwmM4 -libexec/fvwm/${VERSION}/FvwmPager -libexec/fvwm/${VERSION}/FvwmRearrange -libexec/fvwm/${VERSION}/FvwmSave -libexec/fvwm/${VERSION}/FvwmSaveDesk -libexec/fvwm/${VERSION}/FvwmScript -libexec/fvwm/${VERSION}/FvwmScroll +@bin libexec/fvwm/${VERSION}/FvwmCpp +@bin libexec/fvwm/${VERSION}/FvwmDebug +@bin libexec/fvwm/${VERSION}/FvwmDragWell +@bin libexec/fvwm/${VERSION}/FvwmEvent +@bin libexec/fvwm/${VERSION}/FvwmForm +@bin libexec/fvwm/${VERSION}/FvwmGtk +@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 +@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}/FvwmTalk -libexec/fvwm/${VERSION}/FvwmTaskBar -libexec/fvwm/${VERSION}/FvwmTheme +@bin libexec/fvwm/${VERSION}/FvwmTaskBar +@bin libexec/fvwm/${VERSION}/FvwmTheme libexec/fvwm/${VERSION}/FvwmTile -libexec/fvwm/${VERSION}/FvwmWharf -libexec/fvwm/${VERSION}/FvwmWinList +@bin libexec/fvwm/${VERSION}/FvwmWharf +@bin libexec/fvwm/${VERSION}/FvwmWinList @man man/man1/FvwmAnimate.1 @man man/man1/FvwmAuto.1 @man man/man1/FvwmBacker.1 diff --git a/x11/fvwm2/pkg/PLIST-main b/x11/fvwm2/pkg/PLIST-main index f4db58c3fa9..d247aead40c 100644 --- a/x11/fvwm2/pkg/PLIST-main +++ b/x11/fvwm2/pkg/PLIST-main @@ -1,55 +1,55 @@ -@comment $OpenBSD: PLIST-main,v 1.2 2006/12/14 09:07:56 steven Exp $ +@comment $OpenBSD: PLIST-main,v 1.3 2008/06/10 05:39:38 pvalchev Exp $ @pkgpath ${BASE_PKGPATH} @conflict fvwm2-* @conflict fvicons-* @conflict fvwm95-* -bin/FvwmCommand +@bin bin/FvwmCommand bin/fvwm-config bin/fvwm-menu-desktop bin/fvwm-menu-directory bin/fvwm-menu-headlines bin/fvwm-menu-xlock -bin/fvwm2 +@bin bin/fvwm2 bin/fvwm24_convert bin/fvwmbug -bin/xpmroot +@bin bin/xpmroot libexec/fvwm/ libexec/fvwm/${VERSION}/ -libexec/fvwm/${VERSION}/FvwmAnimate -libexec/fvwm/${VERSION}/FvwmAudio -libexec/fvwm/${VERSION}/FvwmAuto -libexec/fvwm/${VERSION}/FvwmBacker -libexec/fvwm/${VERSION}/FvwmBanner -libexec/fvwm/${VERSION}/FvwmButtons +@bin libexec/fvwm/${VERSION}/FvwmAnimate +@bin libexec/fvwm/${VERSION}/FvwmAudio +@bin libexec/fvwm/${VERSION}/FvwmAuto +@bin libexec/fvwm/${VERSION}/FvwmBacker +@bin libexec/fvwm/${VERSION}/FvwmBanner +@bin libexec/fvwm/${VERSION}/FvwmButtons libexec/fvwm/${VERSION}/FvwmCascade libexec/fvwm/${VERSION}/FvwmCommand.pm libexec/fvwm/${VERSION}/FvwmCommand.sh -libexec/fvwm/${VERSION}/FvwmCommandS -libexec/fvwm/${VERSION}/FvwmConsole -libexec/fvwm/${VERSION}/FvwmConsoleC +@bin libexec/fvwm/${VERSION}/FvwmCommandS +@bin libexec/fvwm/${VERSION}/FvwmConsole +@bin libexec/fvwm/${VERSION}/FvwmConsoleC libexec/fvwm/${VERSION}/FvwmConsoleC.pl -libexec/fvwm/${VERSION}/FvwmCpp -libexec/fvwm/${VERSION}/FvwmDebug -libexec/fvwm/${VERSION}/FvwmDragWell -libexec/fvwm/${VERSION}/FvwmEvent -libexec/fvwm/${VERSION}/FvwmForm -libexec/fvwm/${VERSION}/FvwmGtk -libexec/fvwm/${VERSION}/FvwmIconBox -libexec/fvwm/${VERSION}/FvwmIconMan -libexec/fvwm/${VERSION}/FvwmIdent -libexec/fvwm/${VERSION}/FvwmM4 -libexec/fvwm/${VERSION}/FvwmPager -libexec/fvwm/${VERSION}/FvwmRearrange -libexec/fvwm/${VERSION}/FvwmSave -libexec/fvwm/${VERSION}/FvwmSaveDesk -libexec/fvwm/${VERSION}/FvwmScript -libexec/fvwm/${VERSION}/FvwmScroll +@bin libexec/fvwm/${VERSION}/FvwmCpp +@bin libexec/fvwm/${VERSION}/FvwmDebug +@bin libexec/fvwm/${VERSION}/FvwmDragWell +@bin libexec/fvwm/${VERSION}/FvwmEvent +@bin libexec/fvwm/${VERSION}/FvwmForm +@bin libexec/fvwm/${VERSION}/FvwmGtk +@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 +@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}/FvwmTalk -libexec/fvwm/${VERSION}/FvwmTaskBar -libexec/fvwm/${VERSION}/FvwmTheme +@bin libexec/fvwm/${VERSION}/FvwmTaskBar +@bin libexec/fvwm/${VERSION}/FvwmTheme libexec/fvwm/${VERSION}/FvwmTile -libexec/fvwm/${VERSION}/FvwmWharf -libexec/fvwm/${VERSION}/FvwmWinList +@bin libexec/fvwm/${VERSION}/FvwmWharf +@bin libexec/fvwm/${VERSION}/FvwmWinList @man man/man1/FvwmAnimate.1 @man man/man1/FvwmAuto.1 @man man/man1/FvwmBacker.1