From d1cfd61b2dbd018498de837178e68416bbc3a46a Mon Sep 17 00:00:00 2001 From: wiz Date: Tue, 12 Dec 2000 02:03:46 +0000 Subject: Add new category wm for window managers, and move lots of package from x11 here. Only changes are: `wm' in category added and some paths fixed. --- wm/olvwm/Makefile | 21 +++++++++++++++++++ wm/olvwm/files/md5 | 3 +++ wm/olvwm/files/patch-sum | 14 +++++++++++++ wm/olvwm/patches/patch-aa | 53 +++++++++++++++++++++++++++++++++++++++++++++++ wm/olvwm/patches/patch-ab | 33 +++++++++++++++++++++++++++++ wm/olvwm/patches/patch-ac | 16 ++++++++++++++ wm/olvwm/patches/patch-ad | 21 +++++++++++++++++++ wm/olvwm/patches/patch-ae | 18 ++++++++++++++++ wm/olvwm/patches/patch-af | 20 ++++++++++++++++++ wm/olvwm/patches/patch-ag | 13 ++++++++++++ wm/olvwm/patches/patch-ah | 24 +++++++++++++++++++++ wm/olvwm/patches/patch-ai | 12 +++++++++++ wm/olvwm/patches/patch-aj | 15 ++++++++++++++ wm/olvwm/patches/patch-ak | 30 +++++++++++++++++++++++++++ wm/olvwm/patches/patch-al | 13 ++++++++++++ wm/olvwm/pkg/COMMENT | 1 + wm/olvwm/pkg/DESCR | 6 ++++++ wm/olvwm/pkg/PLIST | 5 +++++ 18 files changed, 318 insertions(+) create mode 100644 wm/olvwm/Makefile create mode 100644 wm/olvwm/files/md5 create mode 100644 wm/olvwm/files/patch-sum create mode 100644 wm/olvwm/patches/patch-aa create mode 100644 wm/olvwm/patches/patch-ab create mode 100644 wm/olvwm/patches/patch-ac create mode 100644 wm/olvwm/patches/patch-ad create mode 100644 wm/olvwm/patches/patch-ae create mode 100644 wm/olvwm/patches/patch-af create mode 100644 wm/olvwm/patches/patch-ag create mode 100644 wm/olvwm/patches/patch-ah create mode 100644 wm/olvwm/patches/patch-ai create mode 100644 wm/olvwm/patches/patch-aj create mode 100644 wm/olvwm/patches/patch-ak create mode 100644 wm/olvwm/patches/patch-al create mode 100644 wm/olvwm/pkg/COMMENT create mode 100644 wm/olvwm/pkg/DESCR create mode 100644 wm/olvwm/pkg/PLIST (limited to 'wm/olvwm') diff --git a/wm/olvwm/Makefile b/wm/olvwm/Makefile new file mode 100644 index 00000000000..0badd54bd11 --- /dev/null +++ b/wm/olvwm/Makefile @@ -0,0 +1,21 @@ +# $NetBSD: Makefile,v 1.1.1.1 2000/12/12 02:03:48 wiz Exp $ +# + +DISTNAME= olvwm4.src4 +PKGNAME= olvwm-4.4 +CATEGORIES= x11 wm +MASTER_SITES= http://www.akula.com/~jadler/sdo/olvwm/ + +MAINTAINER= w.wnuk@zodiac.mimuw.edu.pl +HOMEPAGE= http://www.akula.com/~jadler/sdo/olvwm/index.html + +DEPENDS+= xview-lib>=3.2.1nb1:../../x11/xview-lib +DEPENDS+= xview-clients>=3.2.1:../../x11/xview-clients + +USE_X11BASE= # defined +USE_XPM= # defined +USE_IMAKE= # defined + +NO_WRKSUBDIR= # defined + +.include "../../mk/bsd.pkg.mk" diff --git a/wm/olvwm/files/md5 b/wm/olvwm/files/md5 new file mode 100644 index 00000000000..5dd19e70b26 --- /dev/null +++ b/wm/olvwm/files/md5 @@ -0,0 +1,3 @@ +$NetBSD: md5,v 1.1.1.1 2000/12/12 02:03:48 wiz Exp $ + +MD5 (olvwm4.src4.tar.gz) = 9eb292e28214345abd8c6493c800282b diff --git a/wm/olvwm/files/patch-sum b/wm/olvwm/files/patch-sum new file mode 100644 index 00000000000..97e0a174061 --- /dev/null +++ b/wm/olvwm/files/patch-sum @@ -0,0 +1,14 @@ +$NetBSD: patch-sum,v 1.1.1.1 2000/12/12 02:03:48 wiz Exp $ + +MD5 (patch-aa) = d9360f9a984c17bdf04c872eb6befc1b +MD5 (patch-ab) = 62aa3edc690b24cf6351a09e3249a137 +MD5 (patch-ac) = 24c588b113c9ef4426853493f05acc5b +MD5 (patch-ad) = 9bf85e99c01a8c4d4b08312eb05f4df5 +MD5 (patch-ae) = 708843f2743d34dac6ce5e00584b5e85 +MD5 (patch-af) = 8c021e4daca62ddcd259b40aaac92e59 +MD5 (patch-ag) = 4113faf5439ac6202c1c82b4acc0db7b +MD5 (patch-ah) = f103769d75102ae35765346d86f96588 +MD5 (patch-ai) = eaecbbf3b85bc781f794cba0c0c90f0d +MD5 (patch-aj) = 62e1eb37af59d0ad1d83ab274350389e +MD5 (patch-ak) = 96c1896453ccc2b3ee5cb10c364c302e +MD5 (patch-al) = 2917ff9f602404b4310a433d19d9f16b diff --git a/wm/olvwm/patches/patch-aa b/wm/olvwm/patches/patch-aa new file mode 100644 index 00000000000..8d81b34d89f --- /dev/null +++ b/wm/olvwm/patches/patch-aa @@ -0,0 +1,53 @@ +$NetBSD: patch-aa,v 1.1.1.1 2000/12/12 02:03:48 wiz Exp $ + +--- Imakefile.orig Tue Jan 13 16:23:54 1998 ++++ Imakefile +@@ -48,7 +48,11 @@ + /**/#MORECCFLAGS=-DOW_I18N_L3 -DSHAPE -DIDENT + + /**/# For a generic Solaris 2.x system, I'd suggest +-MORECCFLAGS=-DOW_I18N_L3 -DSHAPE -DSVR4 -DSYSV -DIDENT -x O4 ++/**/#MORECCFLAGS=-DOW_I18N_L3 -DSHAPE -DSVR4 -DSYSV -DIDENT -x O4 ++ ++/**/# For NetBSD the following is fine ++MORECCFLAGS=-DOW_I18N_L3 -DSHAPE -DREGEXP -DXPM -DIDENT -DMAXPID=30000 \ ++ -DPREFIX=\"${PREFIX}\" + + /**/# + /**/# Set MORELDFLAGS to any link options you want. Be sure to add -lxpm if you +@@ -57,8 +61,10 @@ + /**/#MORELDFLAGS=-L${OPENWINHOME}/lib + /**/# + /**/# For Solaris 2.x, I'd suggest +-MORELDFLAGS=-L${OPENWINHOME}/lib -R ${OPENWINHOME}/lib -lintl ++/**/#MORELDFLAGS=-L${OPENWINHOME}/lib -R ${OPENWINHOME}/lib -lintl + ++/**/# For NetBSD the following is fine ++MORELDFLAGS=-lcompat -lXpm + + /**/# No more changes needed + +@@ -93,7 +99,7 @@ + SRCS = atom.c client.c cmdstream.c cursors.c debug.c defaults.c dsdm.c \ + environ.c error.c evbind.c events.c fontset.c gettext.c gif.c group.c \ + helpsend.c i18n.c images.c info.c kbdfuncs.c list.c mem.c menu.c \ +- moveresize.c notice.c ol_button.413.c ol_button.svr4.c olvwmrc.c \ ++ moveresize.c notice.c ol_button.413.c ol_button.svr4.c \ + olwm.c pixmap.c properties.c reduce.c resources.c screen.c \ + selection.c services.c slave.c slots.c st.c states.c usermenu.c \ + usleep.c virtual.c win.c winbusy.c winbutton.c wincolor.c winframe.c \ +@@ -136,13 +142,6 @@ + clean:: + /bin/rm -f parse.c olvwmrc.c version.c + +-install.man:: $(MANPAGES) +- @if [ -d $(DESTDIR)$(MANDIR) ]; then set +x; \ +- else (set -x; $(MKDIRHIER) $(DESTDIR)$(MANDIR)); fi +- @for i in $(MANPAGES) ;\ +- do \ +- echo "installing $$i"; \ +- $(INSTALL) -c $(INSTMANFLAGS) $$i $(DESTDIR)$(MANDIR)/`basename $$i .man`.$(MANSUFFIX) ; \ +- done ++InstallManPage(olvwmrc,$(FILEMANDIR)) + + #include diff --git a/wm/olvwm/patches/patch-ab b/wm/olvwm/patches/patch-ab new file mode 100644 index 00000000000..04e516c3d1e --- /dev/null +++ b/wm/olvwm/patches/patch-ab @@ -0,0 +1,33 @@ +$NetBSD: patch-ab,v 1.1.1.1 2000/12/12 02:03:48 wiz Exp $ + +--- defaults.c.orig Thu Mar 2 22:44:29 2000 ++++ defaults.c Tue Jun 6 19:33:36 2000 +@@ -30,9 +30,7 @@ + #include + #include + #include +-#ifdef OW_I18N_L4 + #include +-#endif + + #include "i18n.h" + #include "ollocale.h" +@@ -89,6 +87,9 @@ + (void) strcat(filename, "/.Xdefaults-"); + #ifdef SVR4 + if (sysinfo(SI_HOSTNAME, hostname, sizeof(hostname)) != -1) { ++#endif ++#ifdef BSD ++ if (0 == gethostname(hostname, sizeof(hostname))) { + #else + if (0 == gethostname(hostname, sizeof(hostname), &namelen)) { + #endif +@@ -159,7 +160,7 @@ + return appDB; + } + +- appDB = XrmGetFileDatabase("/usr/lib/X11/app-defaults/Olwm"); ++ appDB = XrmGetFileDatabase(PREFIX "/lib/X11/app-defaults/Olwm"); + return appDB; + } + diff --git a/wm/olvwm/patches/patch-ac b/wm/olvwm/patches/patch-ac new file mode 100644 index 00000000000..678e72c5837 --- /dev/null +++ b/wm/olvwm/patches/patch-ac @@ -0,0 +1,16 @@ +$NetBSD: patch-ac,v 1.1.1.1 2000/12/12 02:03:48 wiz Exp $ + +--- gif.c.orig Sat Jan 8 00:19:38 2000 ++++ gif.c Sat Jan 8 00:20:25 2000 +@@ -56,7 +56,10 @@ + int disposal; + } Gif89 = { -1, -1, -1, 0 }; + +-extern XImage* ReadImage(); ++static XImage* ReadImage(); ++static int ReadColorMap(); ++static int DoExtension(); ++static int GetDataBlock(); + + XImage *ReadGIF(dpy, fd, pNcolors, pColors) + Display *dpy; diff --git a/wm/olvwm/patches/patch-ad b/wm/olvwm/patches/patch-ad new file mode 100644 index 00000000000..b173e79115d --- /dev/null +++ b/wm/olvwm/patches/patch-ad @@ -0,0 +1,21 @@ +$NetBSD: patch-ad,v 1.1.1.1 2000/12/12 02:03:48 wiz Exp $ + +--- olvwmrc.y.orig Wed Apr 28 23:27:20 1999 ++++ olvwmrc.y Sat Jan 8 00:46:36 2000 +@@ -37,7 +37,7 @@ + char *LookupToken(); + char *FindOlvwmRC(); + void resetKeys(); +-char *strexpand(); ++static char *strexpand(); + + typedef struct progscreen { + char *target; +@@ -527,7 +527,6 @@ + } + %% + /* Programs */ +-#define YYDEBUG 1 + #include "parse.c" + + extern List *ActiveClientList; diff --git a/wm/olvwm/patches/patch-ae b/wm/olvwm/patches/patch-ae new file mode 100644 index 00000000000..196098620c8 --- /dev/null +++ b/wm/olvwm/patches/patch-ae @@ -0,0 +1,18 @@ +$NetBSD: patch-ae,v 1.1.1.1 2000/12/12 02:03:48 wiz Exp $ + +--- olwm.c.orig Sat Jan 8 00:25:00 2000 ++++ olwm.c Sat Jan 8 00:25:06 2000 +@@ -675,12 +675,11 @@ + { + #ifdef SYSV + pid_t pid; +- int status; + #else + int oldmask; + int pid; +- union wait status; + #endif ++ int status; + + if (!deadChildren) + return; diff --git a/wm/olvwm/patches/patch-af b/wm/olvwm/patches/patch-af new file mode 100644 index 00000000000..32acabe91f8 --- /dev/null +++ b/wm/olvwm/patches/patch-af @@ -0,0 +1,20 @@ +$NetBSD: patch-af,v 1.1.1.1 2000/12/12 02:03:48 wiz Exp $ + +--- screen.c.orig Sat Jan 8 00:34:00 2000 ++++ screen.c Sat Jan 8 00:34:05 2000 +@@ -157,6 +157,15 @@ + * Local Functions + *-------------------------------------------------------------------------*/ + ++static updateScreenWorkspaceColor(); ++static updateScreenWindowColor(); ++static updateScreenForegroundColor(); ++static updateScreenBackgroundColor(); ++static updateScreenBorderColor(); ++static updateScreenInputFocusColor(); ++static updateScreenGlyphFont(); ++ ++ + /* + * makeScreenQuarks -- set up quarks for screen resources + */ diff --git a/wm/olvwm/patches/patch-ag b/wm/olvwm/patches/patch-ag new file mode 100644 index 00000000000..df7689fd5df --- /dev/null +++ b/wm/olvwm/patches/patch-ag @@ -0,0 +1,13 @@ +$NetBSD: patch-ag,v 1.1.1.1 2000/12/12 02:03:48 wiz Exp $ + +--- st.c.orig Sat Jan 8 00:34:44 2000 ++++ st.c Sat Jan 8 00:35:22 2000 +@@ -44,6 +44,8 @@ + (table->hash == ST_NUMHASH) ? ((int) (key) % table->num_bins) :\ + (*table->hash)((key), table->num_bins))*/ + ++static rehash(); ++ + st_table *st_init_table_with_params(compare, hash, size, density, grow_factor, + reorder_flag) + int (*compare)(); diff --git a/wm/olvwm/patches/patch-ah b/wm/olvwm/patches/patch-ah new file mode 100644 index 00000000000..e7efe598e1d --- /dev/null +++ b/wm/olvwm/patches/patch-ah @@ -0,0 +1,24 @@ +$NetBSD: patch-ah,v 1.1.1.1 2000/12/12 02:03:48 wiz Exp $ + +--- virtual.c.orig Sat Jan 8 00:36:29 2000 ++++ virtual.c Sat Jan 8 00:37:54 2000 +@@ -69,6 +69,9 @@ + + extern char *ExpandPath(); + ++static int rexMatch(); ++static int rexInit(); ++ + /* + * Semantic action associated with each of the buttons above. These must + * be in the same order as the button array; it would be better if the Button +@@ -2108,7 +2111,9 @@ + } + } + ++#ifndef REGEXP + static char expbuf[256]; ++#endif + + static + rexMatch(string) diff --git a/wm/olvwm/patches/patch-ai b/wm/olvwm/patches/patch-ai new file mode 100644 index 00000000000..7c616f0aed3 --- /dev/null +++ b/wm/olvwm/patches/patch-ai @@ -0,0 +1,12 @@ +$NetBSD: patch-ai,v 1.1.1.1 2000/12/12 02:03:48 wiz Exp $ + +--- winframe.c.orig Sat Jan 8 00:38:12 2000 ++++ winframe.c Sat Jan 8 00:38:49 2000 +@@ -84,6 +84,7 @@ + static void setIMStatusText(); + #endif + static void updateResizePositions(); ++static int headerHeight(); + + /*************************************************************************** + * sizing and decoration positioning functions diff --git a/wm/olvwm/patches/patch-aj b/wm/olvwm/patches/patch-aj new file mode 100644 index 00000000000..6ba7c83414c --- /dev/null +++ b/wm/olvwm/patches/patch-aj @@ -0,0 +1,15 @@ +$NetBSD: patch-aj,v 1.1.1.1 2000/12/12 02:03:48 wiz Exp $ + +--- winicon.c.orig Sat Jan 8 00:39:24 2000 ++++ winicon.c Sat Jan 8 00:40:50 2000 +@@ -52,6 +52,10 @@ + * forward-declared functions + ***************************************************************************/ + ++static int heightTopIcon(); ++static int heightBottomIcon(); ++static int widthBothIcon(); ++ + /*************************************************************************** + * private event functions + ***************************************************************************/ diff --git a/wm/olvwm/patches/patch-ak b/wm/olvwm/patches/patch-ak new file mode 100644 index 00000000000..62bc96e2223 --- /dev/null +++ b/wm/olvwm/patches/patch-ak @@ -0,0 +1,30 @@ +$NetBSD: patch-ak,v 1.1.1.1 2000/12/12 02:03:48 wiz Exp $ + +--- usermenu.c.orig Thu Mar 2 22:41:31 2000 ++++ usermenu.c Tue Jun 6 19:24:12 2000 +@@ -884,7 +884,7 @@ + home = "."; + + if ((owHome = getenv("OPENWINHOME")) == NULL) +- owHome = "/usr/openwin"; ++ owHome = PREFIX; + + menuSearchPath = (char **)MemAlloc(NUM_SEARCH_PATH*sizeof(char *)); + +@@ -899,16 +899,6 @@ + /* $HOME/. */ + sprintf(buf, "%s/.%%s", home); + menuSearchPath[i++] = MemNewString(buf); +- +-#ifdef OW_I18N_L3 +- /* $OPENWINHOME/share/locale//olwm/ */ +- sprintf(buf, "%s/share/locale/%%2$s/olwm/%%1$s", owHome); +- menuSearchPath[i++] = MemNewString(buf); +- +- /* $OPENWINHOME/lib/. */ +- sprintf(buf, "%s/lib/%%1$s.%%2$s", owHome); +- menuSearchPath[i++] = MemNewString(buf); +-#endif + + /* $OPENWINHOME/lib/ */ + sprintf(buf, "%s/lib/%%s", owHome); diff --git a/wm/olvwm/patches/patch-al b/wm/olvwm/patches/patch-al new file mode 100644 index 00000000000..89810445946 --- /dev/null +++ b/wm/olvwm/patches/patch-al @@ -0,0 +1,13 @@ +$NetBSD: patch-al,v 1.1.1.1 2000/12/12 02:03:48 wiz Exp $ + +--- cursors.c.orig Sat Jan 8 02:13:12 2000 ++++ cursors.c Sat Jan 8 02:12:21 2000 +@@ -278,7 +278,7 @@ + if (our_copy[0] == 'X') + font_file = "cursor"; + else if (our_copy[0] == 'O') +- font_file = "-sun-open look cursor-----12-120-75-75-p-455-sunolcursor-1"; ++ font_file = "olcursor"; + createCursor(dpy, cmap, pointer, cursor_id, font_file, end, ptr); + } + else { diff --git a/wm/olvwm/pkg/COMMENT b/wm/olvwm/pkg/COMMENT new file mode 100644 index 00000000000..60cbeab8692 --- /dev/null +++ b/wm/olvwm/pkg/COMMENT @@ -0,0 +1 @@ +Open Look Virtual Window Manager diff --git a/wm/olvwm/pkg/DESCR b/wm/olvwm/pkg/DESCR new file mode 100644 index 00000000000..660e10e54fd --- /dev/null +++ b/wm/olvwm/pkg/DESCR @@ -0,0 +1,6 @@ +What Is OLVWM: +------------ +Olvwm (OPEN LOOK virtual window manager) is an ICCCM compliant window manager +supplied for use with the XView toolkit. It is derived from olwm, the +OPEN LOOK window manager supplied with the XView release. This version of +olvwm is based on version 3 of the XView release. diff --git a/wm/olvwm/pkg/PLIST b/wm/olvwm/pkg/PLIST new file mode 100644 index 00000000000..78f2ae0cfed --- /dev/null +++ b/wm/olvwm/pkg/PLIST @@ -0,0 +1,5 @@ +@comment $NetBSD: PLIST,v 1.1.1.1 2000/12/12 02:03:48 wiz Exp $ +bin/olvwm +lib/help/olvwm.info +man/cat1/olvwm.0 +man/cat5/olvwmrc.0 -- cgit v1.2.3