summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--doc/CHANGES-20213
-rw-r--r--wm/Makefile3
-rw-r--r--wm/fvwm1/DESCR13
-rw-r--r--wm/fvwm1/Makefile60
-rw-r--r--wm/fvwm1/PLIST68
-rw-r--r--wm/fvwm1/distinfo13
-rw-r--r--wm/fvwm1/patches/patch-aa35
-rw-r--r--wm/fvwm1/patches/patch-ab18
-rw-r--r--wm/fvwm1/patches/patch-ac14
-rw-r--r--wm/fvwm1/patches/patch-ad12
-rw-r--r--wm/fvwm1/patches/patch-ae30
-rw-r--r--wm/fvwm1/patches/patch-af13
-rw-r--r--wm/fvwm1/patches/patch-ag13
13 files changed, 3 insertions, 292 deletions
diff --git a/doc/CHANGES-2021 b/doc/CHANGES-2021
index e47bde9e02f..4569b6cadf7 100644
--- a/doc/CHANGES-2021
+++ b/doc/CHANGES-2021
@@ -1,4 +1,4 @@
-$NetBSD: CHANGES-2021,v 1.2329 2021/04/24 18:53:19 pin Exp $
+$NetBSD: CHANGES-2021,v 1.2330 2021/04/25 04:43:31 wiz Exp $
Changes to the packages collection and infrastructure in 2021:
@@ -3666,3 +3666,4 @@ Changes to the packages collection and infrastructure in 2021:
Updated sysutils/macchina to 0.7.2 [pin 2021-04-24]
Updated www/hackernews-tui to 0.5.0 [pin 2021-04-24]
Updated security/pleaser to 0.4.0 [pin 2021-04-24]
+ Removed wm/fvwm1 successor wm/fvwm [wiz 2021-04-25]
diff --git a/wm/Makefile b/wm/Makefile
index 7ff9db81b23..bee80b40ba3 100644
--- a/wm/Makefile
+++ b/wm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.161 2021/04/24 11:13:42 wiz Exp $
+# $NetBSD: Makefile,v 1.162 2021/04/25 04:43:30 wiz Exp $
#
COMMENT= X11 window managers, configuration tools, and themes
@@ -41,7 +41,6 @@ SUBDIR+= flwm
SUBDIR+= frankenwm
SUBDIR+= fvwm
SUBDIR+= fvwm-themes
-SUBDIR+= fvwm1
SUBDIR+= fvwm3
SUBDIR+= golem
SUBDIR+= herbstluftwm
diff --git a/wm/fvwm1/DESCR b/wm/fvwm1/DESCR
deleted file mode 100644
index abfbfc2c78c..00000000000
--- a/wm/fvwm1/DESCR
+++ /dev/null
@@ -1,13 +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 is the older, smaller version of fvwm; it uses not much more
-than half the memory of version 2.
-
-IMPORTANT NOTE: This package and fvwm2 share a few files, in
-particular the xpmroot program and the manual pages for the modules.
-Don't install both at the same time, or be prepared to lose slightly
-if you do and then uninstall one.
diff --git a/wm/fvwm1/Makefile b/wm/fvwm1/Makefile
deleted file mode 100644
index df7af88bd41..00000000000
--- a/wm/fvwm1/Makefile
+++ /dev/null
@@ -1,60 +0,0 @@
-# $NetBSD: Makefile,v 1.22 2018/03/17 23:01:02 jmcneill Exp $
-
-DISTNAME= fvwm-1.24r
-PKGNAME= ${DISTNAME:S/fvwm/fvwm1/}
-PKGREVISION= 3
-CATEGORIES= x11 wm
-MASTER_SITES= ${MASTER_SITE_LOCAL}
-
-MAINTAINER= pkgsrc-users@NetBSD.org
-HOMEPAGE= http://www.fvwm.org/
-COMMENT= Virtual window manager for X
-LICENSE= gnu-gpl-v2
-
-DEPENDS+= xpmroot-2.*:../../x11/xpmroot
-
-CONFLICTS= fvwm2-* fvwm>=1
-
-NO_SRC_ON_FTP= Already in MASTER_SITE_LOCAL
-
-USE_IMAKE= YES
-
-post-extract:
- cd ${WRKSRC}/modules; \
- for FILE in Fvwm*/Imakefile; do \
- ${MV} $${FILE} $${FILE}.orig; \
- ${SED} -e 's/ComplexProgramTarget/ComplexProgramTargetNoMan/' \
- -e 's@#ifdef AlphaArchitecture@#if defined(AlphaArchitecture) \&\& !defined(NetBSDArchitecture)@' \
- <$${FILE}.orig >$${FILE}; \
- done
- ${MV} ${WRKSRC}/modules/GoodStuff/Imakefile ${WRKSRC}/modules/GoodStuff/Imakefile.orig
- ${SED} -e 's@#ifdef AlphaArchitecture@#if defined(AlphaArchitecture) \&\& !defined(NetBSDArchitecture)@' \
- <${WRKSRC}/modules/GoodStuff/Imakefile.orig >${WRKSRC}/modules/GoodStuff/Imakefile
-
-post-patch:
- cd ${WRKSRC}; \
- ${MV} configure.h configure.h.old; \
- ${SED} -e 's#$${PREFIX}#${PREFIX}#g' \
- -e 's#$${X11BASE}#${X11BASE}#g' configure.h.old >configure.h; \
- ${MV} sample.fvwmrc/system.fvwmrc sample.fvwmrc/system.fvwmrc.old; \
- ${SED} -e 's#$${PREFIX}#${PREFIX}#g' \
- -e 's#$${X11BASE}#${X11BASE}#g' sample.fvwmrc/system.fvwmrc.old >sample.fvwmrc/system.fvwmrc; \
- ${MV} sample.fvwmrc/mwm.fvwmrc sample.fvwmrc/mwm.fvwmrc.old; \
- ${SED} -e 's#$${PREFIX}#${PREFIX}#g' \
- -e 's#$${X11BASE}#${X11BASE}#g' sample.fvwmrc/mwm.fvwmrc.old >sample.fvwmrc/mwm.fvwmrc
-
-INSTALLATION_DIRS= lib/X11/fvwm/pixmaps lib/X11/fvwm/bitmaps
-
-post-install:
- ${INSTALL_DATA} ${WRKSRC}/fvwm_icons/*.xpm \
- ${DESTDIR}${PREFIX}/lib/X11/fvwm/pixmaps
- ${INSTALL_DATA} ${WRKSRC}/fvwm_icons/*.xbm \
- ${WRKSRC}/fvwm_icons/*.bitmap ${WRKSRC}/fvwm_icons/*.icon \
- ${DESTDIR}${PREFIX}/lib/X11/fvwm/bitmaps
-
-.include "../../x11/libXext/buildlink3.mk"
-.include "../../x11/libXmu/buildlink3.mk"
-.include "../../x11/libXpm/buildlink3.mk"
-.include "../../x11/libXt/buildlink3.mk"
-.include "../../x11/xbitmaps/buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/wm/fvwm1/PLIST b/wm/fvwm1/PLIST
deleted file mode 100644
index b09a079c0fa..00000000000
--- a/wm/fvwm1/PLIST
+++ /dev/null
@@ -1,68 +0,0 @@
-@comment $NetBSD: PLIST,v 1.4 2015/12/29 06:30:24 dholland Exp $
-bin/fvwm
-lib/X11/fvwm/FvwmAudio
-lib/X11/fvwm/FvwmAuto
-lib/X11/fvwm/FvwmBacker
-lib/X11/fvwm/FvwmBanner
-lib/X11/fvwm/FvwmClean
-lib/X11/fvwm/FvwmDebug
-lib/X11/fvwm/FvwmIconBox
-lib/X11/fvwm/FvwmIdent
-lib/X11/fvwm/FvwmPager
-lib/X11/fvwm/FvwmSave
-lib/X11/fvwm/FvwmSaveDesk
-lib/X11/fvwm/FvwmScroll
-lib/X11/fvwm/FvwmWinList
-lib/X11/fvwm/GoodStuff
-lib/X11/fvwm/bitmaps/ccode.icon
-lib/X11/fvwm/bitmaps/default.xbm
-lib/X11/fvwm/bitmaps/fvwm.bitmap
-lib/X11/fvwm/bitmaps/hcode.icon
-lib/X11/fvwm/bitmaps/ocode.icon
-lib/X11/fvwm/bitmaps/prog.icon
-lib/X11/fvwm/pixmaps/arrdown2.xpm
-lib/X11/fvwm/pixmaps/arrows2.xpm
-lib/X11/fvwm/pixmaps/arrup2.xpm
-lib/X11/fvwm/pixmaps/bomb.xpm
-lib/X11/fvwm/pixmaps/clamp.xpm
-lib/X11/fvwm/pixmaps/datebook.xpm
-lib/X11/fvwm/pixmaps/desk.xpm
-lib/X11/fvwm/pixmaps/dialog_box.xpm
-lib/X11/fvwm/pixmaps/editres.xpm
-lib/X11/fvwm/pixmaps/eps.xpm
-lib/X11/fvwm/pixmaps/flow_chart.xpm
-lib/X11/fvwm/pixmaps/folder2.xpm
-lib/X11/fvwm/pixmaps/folders.xpm
-lib/X11/fvwm/pixmaps/fvwm.xpm
-lib/X11/fvwm/pixmaps/fvwm2.xpm
-lib/X11/fvwm/pixmaps/graphs.xpm
-lib/X11/fvwm/pixmaps/mag_glass.xpm
-lib/X11/fvwm/pixmaps/mail1.xpm
-lib/X11/fvwm/pixmaps/mail2.xpm
-lib/X11/fvwm/pixmaps/map.xpm
-lib/X11/fvwm/pixmaps/math4.xpm
-lib/X11/fvwm/pixmaps/page.xpm
-lib/X11/fvwm/pixmaps/page2.xpm
-lib/X11/fvwm/pixmaps/ps.xpm
-lib/X11/fvwm/pixmaps/question.xpm
-lib/X11/fvwm/pixmaps/rbomb.xpm
-lib/X11/fvwm/pixmaps/rcalc.xpm
-lib/X11/fvwm/pixmaps/rterm.xpm
-lib/X11/fvwm/pixmaps/term.xpm
-lib/X11/fvwm/pixmaps/tiff2.xpm
-lib/X11/fvwm/pixmaps/toolbox.xpm
-lib/X11/fvwm/pixmaps/unknown1.xpm
-lib/X11/fvwm/pixmaps/wierd_page3.xpm
-lib/X11/fvwm/pixmaps/word_processor.xpm
-lib/X11/fvwm/pixmaps/xcalc.xpm
-lib/X11/fvwm/pixmaps/xman.xpm
-lib/X11/fvwm/pixmaps/xterm-axp.xpm
-lib/X11/fvwm/pixmaps/xterm-blank.xpm
-lib/X11/fvwm/pixmaps/xterm-dec.xpm
-lib/X11/fvwm/pixmaps/xterm-sgi.xpm
-lib/X11/fvwm/pixmaps/xterm-sol.xpm
-lib/X11/fvwm/pixmaps/xterm-sun.xpm
-lib/X11/fvwm/pixmaps/xterm.xpm
-lib/X11/fvwm/system.fvwmrc
-${IMAKE_MAN_DIR}/GoodStuff.${IMAKE_MANNEWSUFFIX}
-${IMAKE_MAN_DIR}/fvwm.${IMAKE_MANNEWSUFFIX}
diff --git a/wm/fvwm1/distinfo b/wm/fvwm1/distinfo
deleted file mode 100644
index e3ab5c61611..00000000000
--- a/wm/fvwm1/distinfo
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: distinfo,v 1.7 2017/03/23 17:07:01 joerg Exp $
-
-SHA1 (fvwm-1.24r.tar.gz) = 89de9d7f0d9f63e9adffec7ac1f8be89ecbac9f4
-RMD160 (fvwm-1.24r.tar.gz) = b38dc3440f44cc9368c087adda7c129815921b13
-SHA512 (fvwm-1.24r.tar.gz) = 12e873d5f6439efc42edd47f4e4a9cc9ce2d46d513e9b158c79122372216905b26097357fbb6fbf7711fe28f1270442e49255e2bc95eaba12eb82bf7df6a9eac
-Size (fvwm-1.24r.tar.gz) = 325480 bytes
-SHA1 (patch-aa) = 839762e930c6f97356daf842e30a51189e76dc0c
-SHA1 (patch-ab) = 755326fa2b7f25bb3990dc96982f8a2bfbf78da3
-SHA1 (patch-ac) = dd88301ae8b7f8abd0bb0c3fcfa40e69b44218ea
-SHA1 (patch-ad) = 258b376854f994a79eea8f42f38dcf6968a4f5fc
-SHA1 (patch-ae) = 2f893b61343890b8d82bf874f3314b05ce1b7dcd
-SHA1 (patch-af) = 2ab46492368e715c8dd29fd0c525511a7e495b25
-SHA1 (patch-ag) = eeff553b4c57706ba74327aa26711bc955a0b479
diff --git a/wm/fvwm1/patches/patch-aa b/wm/fvwm1/patches/patch-aa
deleted file mode 100644
index 1cd2f6badc7..00000000000
--- a/wm/fvwm1/patches/patch-aa
+++ /dev/null
@@ -1,35 +0,0 @@
-$NetBSD: patch-aa,v 1.2 2001/10/14 13:47:18 tron Exp $
-
---- configure.h~ Mon Nov 28 13:08:47 1994
-+++ configure.h Mon Mar 16 21:44:31 1998
-@@ -1,7 +1,7 @@
--#define FVWMDIR "/usr/lib/X11/fvwm"
-+#define FVWMDIR "${PREFIX}/lib/X11/fvwm"
- /* #define FVWMDIR "/local/homes/dsp/nation/modules"*/
--#define FVWM_ICONDIR "/usr/include/X11/bitmaps:/usr/include/X11/pixmaps"
--#define FVWMRC "/usr/lib/X11/fvwm/system.fvwmrc"
-+#define FVWM_ICONDIR "${PREFIX}/include/X11/bitmaps:${PREFIX}/include/X11/pixmaps"
-+#define FVWMRC "${PREFIX}/lib/X11/fvwm/system.fvwmrc"
-
- /* Imake command needed to put modules in desired target location */
- /* Use the second version if it causes grief */
-@@ -14,8 +14,8 @@
- * If you want to install it in a different directory, uncomment and
- * edit the first line */
- /* #define FVWM_BIN_DIR BINDIR=/local/homes/dsp/nation/bin/4.1.3*/
--#define FVWM_BIN_DIR BINDIR=/usr/bin/X11
--/*#define FVWM_BIN_DIR*/
-+/* #define FVWM_BIN_DIR BINDIR=/usr/bin/X11 */
-+#define FVWM_BIN_DIR
-
- /* Compiler over-ride for Imakefiles */
- /* Leave it as shown to get your default compiler */
-@@ -57,7 +57,7 @@
- ***************************************************************************/
- #define XPM
- /* linker flags needed to locate and link in the Xpm library, if you use it */
--#define XPMLIBRARY -L/usr/lib/X11 -lXpm
-+#define XPMLIBRARY -L${X11BASE}/lib -L${PREFIX}/lib -lXpm
-
- /***************************************************************************
- *#define M4
diff --git a/wm/fvwm1/patches/patch-ab b/wm/fvwm1/patches/patch-ab
deleted file mode 100644
index ae31930f3af..00000000000
--- a/wm/fvwm1/patches/patch-ab
+++ /dev/null
@@ -1,18 +0,0 @@
-$NetBSD: patch-ab,v 1.2 2001/10/14 13:47:18 tron Exp $
-
---- Imakefile.orig Fri Dec 2 20:04:20 1994
-+++ Imakefile Sun Oct 14 15:37:57 2001
-@@ -28,7 +28,7 @@
- modules/FvwmWinList
-
- #ifdef XPM
--XPMSUBDIRS = xpmroot modules/FvwmBanner
-+XPMSUBDIRS = modules/FvwmBanner
- #endif
-
- SUBDIRS = $(ALLSUBDIRS) $(XPMSUBDIRS) $(SHAPESUBDIRS)
-@@ -43,3 +43,4 @@
-
-
-
-+depend:
diff --git a/wm/fvwm1/patches/patch-ac b/wm/fvwm1/patches/patch-ac
deleted file mode 100644
index 2a16e935c4c..00000000000
--- a/wm/fvwm1/patches/patch-ac
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-ac,v 1.1.1.1 2000/12/12 02:03:48 wiz Exp $
---- fvwm/alpha_header.h.orig Wed Sep 16 08:30:50 1998
-+++ fvwm/alpha_header.h Wed Sep 16 08:31:22 1998
-@@ -11,8 +11,9 @@
- #ifdef __GNUC__
- extern size_t strlen(char *);
- #endif
--
-+/*
- extern int bzero(char *, int);
- extern int gethostname (char *, int);
-+*/
- /**************************************************************************/
-
diff --git a/wm/fvwm1/patches/patch-ad b/wm/fvwm1/patches/patch-ad
deleted file mode 100644
index 1e0241cc5a5..00000000000
--- a/wm/fvwm1/patches/patch-ad
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ad,v 1.1.1.1 2000/12/12 02:03:48 wiz Exp $
---- fvwm/Imakefile.orig Wed Sep 16 08:37:29 1998
-+++ fvwm/Imakefile Wed Sep 16 08:38:08 1998
-@@ -16,7 +16,7 @@
-
- DEPLIBS = $(DEPXLIB) ../libs/libfvwmlib.a
-
--#ifdef AlphaArchitecture
-+#if defined(AlphaArchitecture) && !defined(NetBSDArchitecture)
- LOCAL_LIBRARIES = $(XPMLIB) $(XLIB) -ldnet_stub -L../libs -lfvwmlib
- #else
- #ifdef HPArchitecture
diff --git a/wm/fvwm1/patches/patch-ae b/wm/fvwm1/patches/patch-ae
deleted file mode 100644
index bdc4e80c625..00000000000
--- a/wm/fvwm1/patches/patch-ae
+++ /dev/null
@@ -1,30 +0,0 @@
-$NetBSD: patch-ae,v 1.1 2005/12/07 15:07:23 joerg Exp $
-
---- fvwm/module.c.orig 2005-12-06 14:27:05.000000000 +0000
-+++ fvwm/module.c
-@@ -16,6 +16,7 @@
-
- #include <stdio.h>
- #include <unistd.h>
-+#include <errno.h>
- #include <signal.h>
- #include <string.h>
- #include <fcntl.h>
-@@ -596,9 +597,6 @@ void SendName(int module, unsigned long
- free(body);
- }
-
--
--
--#include <sys/errno.h>
- FVWM_INLINE int PositiveWrite(int module, unsigned long *ptr, int size)
- {
- if((pipeOn[module]<0)||(!((PipeMask[module]) & ptr[1])))
-@@ -651,7 +649,6 @@ void FlushQueue(int module)
- char *dptr;
- struct queue_buff_struct *d;
- int a;
-- extern int errno;
-
- if((pipeOn[module] <= 0)||(pipeQueue[module] == NULL))
- return;
diff --git a/wm/fvwm1/patches/patch-af b/wm/fvwm1/patches/patch-af
deleted file mode 100644
index d20f658fbb8..00000000000
--- a/wm/fvwm1/patches/patch-af
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-af,v 1.1 2012/10/29 09:46:46 cegger Exp $
-
---- sample.fvwmrc/system.fvwmrc.orig 1994-12-02 19:19:12.000000000 +0000
-+++ sample.fvwmrc/system.fvwmrc
-@@ -227,7 +227,7 @@ ButtonStyle : 4 4 50x65@1 35x35@1 65x35@
-
- Function "InitFunction"
- Module "I" FvwmBanner
-- Exec "I" xpmroot /usr/include/X11/pixmaps/fvwm.xpm &
-+ Exec "I" xpmroot ${X11BASE}/include/pixmaps/fvwm.xpm &
- Module "I" GoodStuff
- Exec "I" exec xterm -geometry 80x64+0+0 &
- Wait "I" xterm
diff --git a/wm/fvwm1/patches/patch-ag b/wm/fvwm1/patches/patch-ag
deleted file mode 100644
index ca14bf3acd9..00000000000
--- a/wm/fvwm1/patches/patch-ag
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ag,v 1.1 2012/10/29 09:46:46 cegger Exp $
-
---- sample.fvwmrc/mwm.fvwmrc.orig 1994-12-05 13:58:13.000000000 +0000
-+++ sample.fvwmrc/mwm.fvwmrc
-@@ -161,7 +161,7 @@ Style "GoodStuff" Icon toolbox.xpm
-
- Function "InitFunction"
- Module "I" FvwmBanner
-- Exec "I" xpmroot /usr/include/X11/pixmaps/fvwm.xpm &
-+ Exec "I" xpmroot ${X11BASE}/include/pixmaps/fvwm.xpm &
- Module "I" GoodStuff
- Module "I" FvwmPager 0 3
- Exec "I" exec xterm -geometry 80x64+0+0 &
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-01 23:21:57 +0000