fvwm-devel: remove

This is older than wm/fvwm which packages the same major version, or
fvwm3, which is a newer major version.

11 files changed, 3 insertions, 363 deletions

diff --git a/doc/CHANGES-2021 b/doc/CHANGES-2021
index 4ce2a06769e..7eacdf274a8 100644
--- a/doc/CHANGES-2021
+++ b/doc/CHANGES-2021
@@ -1,4 +1,4 @@
-$NetBSD: CHANGES-2021,v 1.2323 2021/04/24 11:02:51 wiz Exp $
+$NetBSD: CHANGES-2021,v 1.2324 2021/04/24 11:13:42 wiz Exp $
 
 Changes to the packages collection and infrastructure in 2021:
 
@@ -3660,3 +3660,4 @@ Changes to the packages collection and infrastructure in 2021:
 	Removed misc/molden [wiz 2021-04-24]
 	Removed www/mMosaic [wiz 2021-04-24]
 	Removed security/pam-dbm [wiz 2021-04-24]
+	Removed wm/fvwm-devel successor wm/fvwm [wiz 2021-04-24]
diff --git a/wm/Makefile b/wm/Makefile
index d56725a83cf..7ff9db81b23 100644
--- a/wm/Makefile
+++ b/wm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.160 2021/01/29 07:37:07 pin Exp $
+# $NetBSD: Makefile,v 1.161 2021/04/24 11:13:42 wiz Exp $
 #
 
 COMMENT=	X11 window managers, configuration tools, and themes
@@ -40,7 +40,6 @@ SUBDIR+=	fluxter
 SUBDIR+=	flwm
 SUBDIR+=	frankenwm
 SUBDIR+=	fvwm
-SUBDIR+=	fvwm-devel
 SUBDIR+=	fvwm-themes
 SUBDIR+=	fvwm1
 SUBDIR+=	fvwm3
diff --git a/wm/fvwm-devel/DESCR b/wm/fvwm-devel/DESCR
deleted file mode 100644
index 8b319dfb097..00000000000
--- a/wm/fvwm-devel/DESCR
+++ /dev/null
@@ -1,8 +0,0 @@
-Fvwm is a very famous window manager for X, which provides a
-virtual/multiple disjoint desktop, a 3-D look for windows decorations,
-shaped/color icons. It gives a very good emulation of mwm. A nice
-button-bar can be used to provide convenient access to frequently used
-functions or programs.
-
-This package is based on the unstable 2.5.x series of fvwm.  Do not
-use it unless comfortable running beta software.
diff --git a/wm/fvwm-devel/Makefile b/wm/fvwm-devel/Makefile
deleted file mode 100644
index cdb5234f93b..00000000000
--- a/wm/fvwm-devel/Makefile
+++ /dev/null
@@ -1,71 +0,0 @@
-# $NetBSD: Makefile,v 1.58 2020/08/31 18:12:29 wiz Exp $
-
-DISTNAME=	fvwm-${FVWM_VER}
-PKGREVISION=	16
-CATEGORIES=	x11 wm
-MASTER_SITES=	ftp://ftp.fvwm.org/pub/fvwm/version-2/
-EXTRACT_SUFX=	.tar.bz2
-
-MAINTAINER=	pkgsrc-users@NetBSD.org
-HOMEPAGE=	http://www.fvwm.org/
-COMMENT=	Development version of X11 Virtual window manager
-LICENSE=	gnu-gpl-v2
-
-CONFLICTS=	fvwm1-[0-9]* fvwm2-[0-9]*
-FVWM_VER=	2.5.31
-
-USE_PKGLOCALEDIR=	YES
-GNU_CONFIGURE=		YES
-USE_TOOLS+=		perl:run
-
-PLIST_SUBST+=		FVWM_VER=${FVWM_VER:Q}
-
-INSTALLATION_DIRS+=	share/examples/fvwm
-
-CONFIGURE_ARGS+=	--disable-bidi
-CONFIGURE_ARGS+=	--without-gnome
-CONFIGURE_ARGS+=	--without-rplay-library
-CONFIGURE_ARGS+=	--without-stroke-library
-
-SUBST_CLASSES+=		perl
-SUBST_STAGE.perl=	post-build
-SUBST_MESSAGE.perl=	Fixing path to perl
-SUBST_FILES.perl+=	bin/fvwm-convert-2.4
-SUBST_FILES.perl+=	bin/fvwm-convert-2.6
-SUBST_FILES.perl+=	bin/fvwm-menu-desktop
-SUBST_FILES.perl+=	bin/fvwm-menu-directory
-SUBST_FILES.perl+=	bin/fvwm-menu-headlines
-SUBST_FILES.perl+=	bin/fvwm-menu-xlock
-SUBST_FILES.perl+=	bin/fvwm-perllib
-SUBST_FILES.perl+=	modules/FvwmConsole/FvwmConsoleC.pl
-SUBST_FILES.perl+=	modules/FvwmDebug/FvwmDebug
-SUBST_FILES.perl+=	modules/FvwmDebug/FvwmGtkDebug
-SUBST_FILES.perl+=	modules/FvwmPerl/FvwmPerl
-SUBST_FILES.perl+=	modules/FvwmTabs/FvwmTabs
-SUBST_FILES.perl+=	modules/FvwmWindowMenu/FvwmWindowMenu
-SUBST_FILES.perl+=	modules/FvwmScript/Scripts/FvwmScript-ComExample
-SUBST_FILES.perl+=	modules/FvwmScript/Scripts/FvwmScript-Setup95
-SUBST_SED.perl=		-e "s|${TOOLS_CMD.perl}|${PERL5}|"
-
-SUBST_CLASSES+=		mail
-SUBST_STAGE.mail=	pre-configure
-SUBST_MESSAGE.mail=	Fixing mail address
-SUBST_FILES.mail+=	bin/fvwm-bug.in
-SUBST_VARS.mail=	MAINTAINER
-
-post-install:
-	cd ${WRKSRC}/sample.fvwmrc && ${INSTALL_DATA} \
-		`ls | grep -v Makefile` ${DESTDIR}${PREFIX}/share/examples/fvwm
-
-BUILDLINK_DEPMETHOD.libXt?=	build
-
-.include "../../devel/gettext-lib/buildlink3.mk"
-.include "../../devel/readline/buildlink3.mk"
-.include "../../graphics/png/buildlink3.mk"
-.include "../../x11/libSM/buildlink3.mk"
-.include "../../x11/libX11/buildlink3.mk"
-.include "../../x11/libXext/buildlink3.mk"
-.include "../../x11/libXft/buildlink3.mk"
-.include "../../x11/libXpm/buildlink3.mk"
-.include "../../x11/libXt/buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/wm/fvwm-devel/PLIST b/wm/fvwm-devel/PLIST
deleted file mode 100644
index fc9e2592a9d..00000000000
--- a/wm/fvwm-devel/PLIST
+++ /dev/null
@@ -1,179 +0,0 @@
-@comment $NetBSD: PLIST,v 1.10 2009/06/14 18:18:58 joerg 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
-libexec/fvwm/${FVWM_VER}/FvwmAnimate
-libexec/fvwm/${FVWM_VER}/FvwmAudio
-libexec/fvwm/${FVWM_VER}/FvwmAuto
-libexec/fvwm/${FVWM_VER}/FvwmBacker
-libexec/fvwm/${FVWM_VER}/FvwmBanner
-libexec/fvwm/${FVWM_VER}/FvwmButtons
-libexec/fvwm/${FVWM_VER}/FvwmCascade
-libexec/fvwm/${FVWM_VER}/FvwmCommand.pm
-libexec/fvwm/${FVWM_VER}/FvwmCommand.sh
-libexec/fvwm/${FVWM_VER}/FvwmCommandS
-libexec/fvwm/${FVWM_VER}/FvwmConsole
-libexec/fvwm/${FVWM_VER}/FvwmConsoleC
-libexec/fvwm/${FVWM_VER}/FvwmConsoleC.pl
-libexec/fvwm/${FVWM_VER}/FvwmCpp
-libexec/fvwm/${FVWM_VER}/FvwmDebug
-libexec/fvwm/${FVWM_VER}/FvwmDragWell
-libexec/fvwm/${FVWM_VER}/FvwmEvent
-libexec/fvwm/${FVWM_VER}/FvwmForm
-libexec/fvwm/${FVWM_VER}/FvwmGtkDebug
-libexec/fvwm/${FVWM_VER}/FvwmIconBox
-libexec/fvwm/${FVWM_VER}/FvwmIconMan
-libexec/fvwm/${FVWM_VER}/FvwmIdent
-libexec/fvwm/${FVWM_VER}/FvwmM4
-libexec/fvwm/${FVWM_VER}/FvwmPager
-libexec/fvwm/${FVWM_VER}/FvwmPerl
-libexec/fvwm/${FVWM_VER}/FvwmProxy
-libexec/fvwm/${FVWM_VER}/FvwmRearrange
-libexec/fvwm/${FVWM_VER}/FvwmSave
-libexec/fvwm/${FVWM_VER}/FvwmSaveDesk
-libexec/fvwm/${FVWM_VER}/FvwmScript
-libexec/fvwm/${FVWM_VER}/FvwmScroll
-libexec/fvwm/${FVWM_VER}/FvwmTabs
-libexec/fvwm/${FVWM_VER}/FvwmTalk
-libexec/fvwm/${FVWM_VER}/FvwmTaskBar
-libexec/fvwm/${FVWM_VER}/FvwmTheme
-libexec/fvwm/${FVWM_VER}/FvwmTile
-libexec/fvwm/${FVWM_VER}/FvwmWharf
-libexec/fvwm/${FVWM_VER}/FvwmWinList
-libexec/fvwm/${FVWM_VER}/FvwmWindowMenu
-man/man1/FvwmAnimate.1
-man/man1/FvwmAuto.1
-man/man1/FvwmBacker.1
-man/man1/FvwmBanner.1
-man/man1/FvwmButtons.1
-man/man1/FvwmCommand.1
-man/man1/FvwmConsole.1
-man/man1/FvwmConsoleC.pl.1
-man/man1/FvwmCpp.1
-man/man1/FvwmDebug.1
-man/man1/FvwmDragWell.1
-man/man1/FvwmEvent.1
-man/man1/FvwmForm.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
-share/examples/fvwm/DecorMwm
-share/examples/fvwm/DecorWin95
-share/examples/fvwm/decor_examples
-share/examples/fvwm/new-features
-share/examples/fvwm/system.fvwm2rc
-share/examples/fvwm/system.fvwm2rc-sample-1
-share/examples/fvwm/system.fvwm2rc-sample-2
-share/examples/fvwm/system.fvwm2rc-sample-95
-share/fvwm/ConfigFvwmBacker
-share/fvwm/ConfigFvwmButtons
-share/fvwm/ConfigFvwmDefaults
-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-Form
-share/fvwm/FvwmForm-QuitVerify
-share/fvwm/FvwmForm-Rlogin
-share/fvwm/FvwmForm-RootCursor
-share/fvwm/FvwmForm-Setup
-share/fvwm/FvwmForm-Talk
-share/fvwm/FvwmForm-TalkHelp
-share/fvwm/FvwmScript-BaseConfig
-share/fvwm/FvwmScript-BellSetup
-share/fvwm/FvwmScript-Buttons
-share/fvwm/FvwmScript-Colorset
-share/fvwm/FvwmScript-ComExample
-share/fvwm/FvwmScript-Date
-share/fvwm/FvwmScript-FileBrowser
-share/fvwm/FvwmScript-Find
-share/fvwm/FvwmScript-KeyboardSetup
-share/fvwm/FvwmScript-PointerSetup
-share/fvwm/FvwmScript-Quit
-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/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.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.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/FileSystem.pm
-share/fvwm/perllib/General/Parse.pm
-share/fvwm/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
diff --git a/wm/fvwm-devel/distinfo b/wm/fvwm-devel/distinfo
deleted file mode 100644
index 69ac13ec678..00000000000
--- a/wm/fvwm-devel/distinfo
+++ /dev/null
@@ -1,11 +0,0 @@
-$NetBSD: distinfo,v 1.24 2015/11/02 23:42:52 agc Exp $
-
-SHA1 (fvwm-2.5.31.tar.bz2) = 0a59ac1c17f37dbfb1e042f4df3f86a5eb2d719c
-RMD160 (fvwm-2.5.31.tar.bz2) = 1361aec9b2738f8f00d3a8a2798d6535b41e8c39
-SHA512 (fvwm-2.5.31.tar.bz2) = 5dcfce1380c92a5ff84bb9addf9820728599dd029bd864e099b440f53d17c8504c7b57b00d46eec68b25442f66905bf7791e61fe02ad2893938294dc81d67e3a
-Size (fvwm-2.5.31.tar.bz2) = 2575660 bytes
-SHA1 (patch-aa) = 6796b71fbc4c94e1d44938ab050b10b5f24a78a7
-SHA1 (patch-ab) = ebc58a6c58e6c09ce0c270c0a1d8d861f2dcdab1
-SHA1 (patch-ac) = 9741995ea491250406683c4b25d91c39ec3d9d58
-SHA1 (patch-ad) = c7bff2ba51be7e60ac2694e96684c34ce0ef4c4f
-SHA1 (patch-configure) = 10feea66b318eaf931fdb227c2bcfdfb15caf9fe
diff --git a/wm/fvwm-devel/patches/patch-aa b/wm/fvwm-devel/patches/patch-aa
deleted file mode 100644
index d1879b7de2a..00000000000
--- a/wm/fvwm-devel/patches/patch-aa
+++ /dev/null
@@ -1,21 +0,0 @@
-$NetBSD: patch-aa,v 1.9 2010/05/28 09:33:12 martti Exp $
-
-We have a separate package for xpmroot
-
---- bin/Makefile.in.orig	2010-05-28 12:28:07.000000000 +0300
-+++ bin/Makefile.in	2010-05-28 12:28:14.000000000 +0300
-@@ -819,14 +819,8 @@
- 	_fvwm-perllib.1
- 
- install-exec-local:
--	@rm -f $(DESTDIR)$(bindir)/xpmroot
--	@$(LN_S) fvwm-root $(DESTDIR)$(bindir)/xpmroot || \
--		echo "Minor warning: $(bindir)/xpmroot symlink was not created"
- 
- install-data-local:
--	@rm -f $(DESTDIR)$(mandir)/man1/xpmroot.1
--	@$(LN_S) fvwm-root.1 $(DESTDIR)$(mandir)/man1/xpmroot.1 || \
--		echo "Minor warning: $(mandir)/man1/xpmroot.1 symlink was not created"
- 
- # Tell versions [3.59,3.63) of GNU make to not export all variables.
- # Otherwise a system limit (for SysV at least) may be exceeded.
diff --git a/wm/fvwm-devel/patches/patch-ab b/wm/fvwm-devel/patches/patch-ab
deleted file mode 100644
index 78e2101ff3a..00000000000
--- a/wm/fvwm-devel/patches/patch-ab
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-ab,v 1.4 2008/02/27 16:58:18 martti Exp $
-
-Fixed return type
-
---- config.h.in.orig	2007-09-01 10:31:54.000000000 +0000
-+++ config.h.in	2007-11-07 08:14:53.000000000 +0000
-@@ -530,7 +530,7 @@
-        #pragma alloca
- #  else
- #    ifndef alloca /* predefined by HP cc +Olibcalls */
--	 char *alloca ();
-+	 void *alloca ();
- #    endif
- #  endif
- #endif
diff --git a/wm/fvwm-devel/patches/patch-ac b/wm/fvwm-devel/patches/patch-ac
deleted file mode 100644
index 3e667135108..00000000000
--- a/wm/fvwm-devel/patches/patch-ac
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-ac,v 1.3 2010/02/24 12:37:04 martti Exp $
-
-Use the package maintainer as the source of this problem.
-
---- bin/fvwm-bug.in.orig	2010-02-24 08:37:14.000000000 +0200
-+++ bin/fvwm-bug.in	2010-02-24 08:38:08.000000000 +0200
-@@ -130,7 +130,7 @@
- 
- 
- cat > $TEMP <<EOF
--From: ${USER}
-+From: @MAINTAINER@
- To: ${BUGADDR}
- Subject: [50 character or so descriptive subject here (for reference)]
- 
diff --git a/wm/fvwm-devel/patches/patch-ad b/wm/fvwm-devel/patches/patch-ad
deleted file mode 100644
index 060c0b4f5b1..00000000000
--- a/wm/fvwm-devel/patches/patch-ad
+++ /dev/null
@@ -1,26 +0,0 @@
-$NetBSD: patch-ad,v 1.1 2011/01/28 22:05:03 jmmv Exp $
-
-Fix build with png-1.5.
-
---- libs/PictureImageLoader.c.orig	2007-07-19 09:30:21.000000000 +0000
-+++ libs/PictureImageLoader.c
-@@ -458,16 +458,16 @@ Bool PImageLoadPng(FIMAGE_CMD_ARGS)
- 	{
- 		Fpng_set_expand(Fpng_ptr);
- 	}
--	if (Finfo_ptr->color_type == FPNG_COLOR_TYPE_RGB_ALPHA)
-+	if (png_get_color_type(Fpng_ptr, Finfo_ptr) == FPNG_COLOR_TYPE_RGB_ALPHA)
- 	{
- 		hasa = 1;
- 	}
--	if (Finfo_ptr->color_type == FPNG_COLOR_TYPE_GRAY_ALPHA)
-+	if (png_get_color_type(Fpng_ptr, Finfo_ptr) == FPNG_COLOR_TYPE_GRAY_ALPHA)
- 	{
- 		hasa = 1;
- 		hasg = 1;
- 	}
--	if (Finfo_ptr->color_type == FPNG_COLOR_TYPE_GRAY)
-+	if (png_get_color_type(Fpng_ptr, Finfo_ptr) == FPNG_COLOR_TYPE_GRAY)
- 	{
- 		hasg = 1;
- 	}
diff --git a/wm/fvwm-devel/patches/patch-configure b/wm/fvwm-devel/patches/patch-configure
deleted file mode 100644
index 2ae0de73a68..00000000000
--- a/wm/fvwm-devel/patches/patch-configure
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-configure,v 1.1 2012/11/11 22:30:50 joerg Exp $
-
---- configure.orig	2012-11-09 14:39:55.000000000 +0000
-+++ configure
-@@ -6477,8 +6477,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;
- }
- _ACEOF