From owner-freebsd-ports Tue Jan 26 08:50:09 1999 Return-Path: Received: (from majordom@localhost) by hub.freebsd.org (8.8.8/8.8.8) id IAA29873 for freebsd-ports-outgoing; Tue, 26 Jan 1999 08:50:09 -0800 (PST) (envelope-from owner-freebsd-ports@FreeBSD.ORG) Received: from freefall.freebsd.org (freefall.FreeBSD.ORG [204.216.27.21]) by hub.freebsd.org (8.8.8/8.8.8) with ESMTP id IAA29843 for ; Tue, 26 Jan 1999 08:50:03 -0800 (PST) (envelope-from gnats@FreeBSD.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.9.2/8.9.2) id IAA03012; Tue, 26 Jan 1999 08:50:01 -0800 (PST) (envelope-from gnats@FreeBSD.org) Received: (from nobody@localhost) by hub.freebsd.org (8.8.8/8.8.8) id IAA28810; Tue, 26 Jan 1999 08:40:20 -0800 (PST) (envelope-from nobody) Message-Id: <199901261640.IAA28810@hub.freebsd.org> Date: Tue, 26 Jan 1999 08:40:20 -0800 (PST) From: pfgiffun@bachue.usc.unal.edu.co To: freebsd-gnats-submit@FreeBSD.ORG X-Send-Pr-Version: www-1.0 Subject: ports/9704: Minor fixes to olvwm Sender: owner-freebsd-ports@FreeBSD.ORG Precedence: bulk X-Loop: FreeBSD.org >Number: 9704 >Category: ports >Synopsis: Minor fixes to olvwm >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports >State: open >Quarter: >Keywords: >Date-Required: >Class: sw-bug >Submitter-Id: current-users >Arrival-Date: Tue Jan 26 08:50:01 PST 1999 >Closed-Date: >Last-Modified: >Originator: Pedro F. Giffuni >Release: 2.2.7 >Organization: >Environment: >Description: This are minor patches to olvwm, they are sort of a followup of PR 9699. I sent them to the maintainer but there has been no reply. >How-To-Repeat: >Fix: diff -rNu olvwm.orig/Makefile olvwm/Makefile --- olvwm.orig/Makefile Sun Jan 24 20:01:53 1999 +++ olvwm/Makefile Tue Jan 26 10:38:06 1999 @@ -21,7 +21,7 @@ MAINTAINER= brianfeldman@hotmail.com -LIB_DEPENDS= xview.3:${PORTSDIR}/x11-toolkits/xview-lib \ +LIB_DEPENDS= xview.3:${PORTSDIR}/x11-toolkits/xview \ Xpm.4:${PORTSDIR}/graphics/xpm NO_WRKSUBDIR= yes diff -rNu olvwm.orig/patches/patch-aa olvwm/patches/patch-aa --- olvwm.orig/patches/patch-aa Sun Jan 24 20:01:53 1999 +++ olvwm/patches/patch-aa Tue Jan 26 11:28:20 1999 @@ -8,7 +8,7 @@ +/**/#MORECCFLAGS=-DOW_I18N_L3 -DSHAPE -DSVR4 -DSYSV -DIDENT -x O4 +/**/# For FreeBSD -+MORECCFLAGS=-DOW_I18N_L3 -DSHAPE -DMAXPID=30000 -DREGEXP -DXPM ++MORECCFLAGS=-DOW_I18N_L3 -DSHAPE -DMAXPID=30000 -DREGEXP -DXPM -DXVIEW32 /**/# /**/# Set MORELDFLAGS to any link options you want. Be sure to add -lxpm if you /**/# want to include XPM support. For a generic Solaris 1.x @@ -85,30 +85,52 @@ +depend:: olvwmrc.c #include ---- defaults.c.orig Thu Jan 13 15:36:03 1994 -+++ defaults.c Mon Oct 19 12:52:39 1998 -@@ -30,9 +30,7 @@ - #include - #include - #include --#ifdef OW_I18N_L4 - #include --#endif - - #include "i18n.h" - #include "ollocale.h" -@@ -90,7 +88,11 @@ - #ifdef SVR4 - if (sysinfo(SI_HOSTNAME, hostname, sizeof(hostname)) != -1) { - #else -+#ifdef BSD -+ if (0 == gethostname(hostname, sizeof(hostname))) { -+#else - if (0 == gethostname(hostname, sizeof(hostname), &namelen)) { -+#endif - #endif - (void) strcat(filename, hostname); - fileDB = XrmGetFileDatabase(filename); +*** defaults.c.orig Thu Jan 13 16:36:03 1994 +--- defaults.c Sun Jan 24 20:50:32 1999 +*************** +*** 30,38 **** + #include + #include + #include +- #ifdef OW_I18N_L4 + #include +- #endif + + #include "i18n.h" + #include "ollocale.h" +--- 30,36 ---- +*************** +*** 90,97 **** +--- 88,99 ---- + #ifdef SVR4 + if (sysinfo(SI_HOSTNAME, hostname, sizeof(hostname)) != -1) { + #else ++ #ifdef BSD ++ if (0 == gethostname(hostname, sizeof(hostname))) { ++ #else + if (0 == gethostname(hostname, sizeof(hostname), &namelen)) { + #endif ++ #endif + (void) strcat(filename, hostname); + fileDB = XrmGetFileDatabase(filename); + } +*************** +*** 159,165 **** + return appDB; + } + +! appDB = XrmGetFileDatabase("/usr/lib/X11/app-defaults/Olwm"); + return appDB; + } + +--- 161,167 ---- + return appDB; + } + +! appDB = XrmGetFileDatabase("/usr/X11R6/lib/X11/app-defaults/Olwm"); + return appDB; + } + --- gif.c.orig Thu Jan 13 15:36:06 1994 +++ gif.c Mon Oct 19 13:46:15 1998 @@ -56,6 +56,10 @@ @@ -138,7 +160,7 @@ #include +#include -+#if !(defined(BSD) && (BSD >= 199306)) ++#ifndef __STDC__ #include +#else +#include @@ -185,30 +207,68 @@ #endif if (!deadChildren) ---- screen.c.orig Mon Oct 19 14:21:32 1998 -+++ screen.c Fri Nov 20 16:55:00 1998 -@@ -66,6 +66,13 @@ - *-------------------------------------------------------------------------*/ - List *ScreenInfoList; /* List of managed screens */ - extern Bool BoolString(); -+static updateScreenWorkspaceColor(); -+static updateScreenWindowColor(); -+static updateScreenForegroundColor(); -+static updateScreenBackgroundColor(); -+static updateScreenBorderColor(); -+static updateScreenInputFocusColor(); -+static updateScreenGlyphFont(); - - /*------------------------------------------------------------------------- - * Local Data -@@ -282,6 +289,7 @@ - case PseudoColor: - case GrayScale: - case DirectColor: -+ case TrueColor: - return True; - /*NOTREACHED*/ - break; +*** screen.c.orig Sun Jan 24 20:03:43 1999 +--- screen.c Sun Jan 24 20:58:29 1999 +*************** +*** 66,71 **** +--- 66,78 ---- + *-------------------------------------------------------------------------*/ + List *ScreenInfoList; /* List of managed screens */ + extern Bool BoolString(); ++ static updateScreenWorkspaceColor(); ++ static updateScreenWindowColor(); ++ static updateScreenForegroundColor(); ++ static updateScreenBackgroundColor(); ++ static updateScreenBorderColor(); ++ static updateScreenInputFocusColor(); ++ static updateScreenGlyphFont(); + + /*------------------------------------------------------------------------- + * Local Data +*************** +*** 282,287 **** +--- 289,295 ---- + case PseudoColor: + case GrayScale: + case DirectColor: ++ case TrueColor: + return True; + /*NOTREACHED*/ + break; +*************** +*** 523,529 **** + * Construct bitmap search path as follows: + * $OPENWINHOME/etc/workspace/patterns + * $OPENWINHOME/include/X11/include/bitmaps +! * /usr/X11/include/X11/include/bitmaps + * + * REMIND: this should be cleaned up so that it doesn't use a fixed-size + * array. +--- 531,537 ---- + * Construct bitmap search path as follows: + * $OPENWINHOME/etc/workspace/patterns + * $OPENWINHOME/include/X11/include/bitmaps +! * /usr/X11R6/include/X11/include/bitmaps + * + * REMIND: this should be cleaned up so that it doesn't use a fixed-size + * array. +*************** +*** 546,552 **** + (void)sprintf(bmPath, "%s/include/X11/bitmaps",owHome); + bitmapSearchPath[i++] = MemNewString(bmPath); + +! bitmapSearchPath[i++] = MemNewString("/usr/X11/include/X11/bitmaps"); + bitmapSearchPath[i] = (char *)NULL; + } + +--- 554,560 ---- + (void)sprintf(bmPath, "%s/include/X11/bitmaps",owHome); + bitmapSearchPath[i++] = MemNewString(bmPath); + +! bitmapSearchPath[i++] = MemNewString("/usr/X11R6/include/X11/bitmaps"); + bitmapSearchPath[i] = (char *)NULL; + } + --- st.c.orig Thu Jan 13 15:36:18 1994 +++ st.c Mon Oct 19 14:12:31 1998 @@ -14,6 +14,7 @@ diff -rNu olvwm.orig/patches/patch-ad olvwm/patches/patch-ad --- olvwm.orig/patches/patch-ad Wed Dec 31 19:00:00 1969 +++ olvwm/patches/patch-ad Sun Jan 24 21:17:12 1999 @@ -0,0 +1,57 @@ +*** fontset.c.orig Sun Jan 24 20:51:59 1999 +--- fontset.c Sun Jan 24 20:54:54 1999 +*************** +*** 210,216 **** + + if (notFound) + { +! (void) sprintf(filename, "/usr/lib/X11/app-defaults/%s/%s", + locale, FONT_SETS); + } + +--- 210,216 ---- + + if (notFound) + { +! (void) sprintf(filename, "/usr/X11R6/lib/X11/app-defaults/%s/%s", + locale, FONT_SETS); + } + +*** ol_button.413.c.orig Sun Jan 24 20:16:16 1999 +--- ol_button.413.c Sun Jan 24 20:21:00 1999 +*************** +*** 8,14 **** + * a version of olgx 3.2 (from the xview 3.2 release) and don't want to + * use this file, change the define here + */ +! #ifndef SVR4 + + /* + * Based on +--- 8,14 ---- + * a version of olgx 3.2 (from the xview 3.2 release) and don't want to + * use this file, change the define here + */ +! #if !defined(SVR4) && !defined(XVIEW32) + + /* + * Based on +*** ol_button.svr4.c.orig Sun Jan 24 20:21:22 1999 +--- ol_button.svr4.c Sun Jan 24 20:23:34 1999 +*************** +*** 12,18 **** + * + */ + +! #ifdef SVR4 + + /* + * Copyright 1989-1990 Sun Microsystems See LEGAL_NOTICE for terms of +--- 12,18 ---- + * + */ + +! #if defined(SVR4) || defined(XVIEW32) + + /* + * Copyright 1989-1990 Sun Microsystems See LEGAL_NOTICE for terms of diff -rNu olvwm.orig/patches/patch-ba olvwm/patches/patch-ba --- olvwm.orig/patches/patch-ba Wed Dec 31 19:00:00 1969 +++ olvwm/patches/patch-ba Sun Jan 24 21:13:14 1999 @@ -0,0 +1,36 @@ +*** pixmap.c.patched Sun Jan 24 20:26:03 1999 +--- pixmap.c Sun Jan 24 20:28:39 1999 +*************** +*** 466,472 **** + * Construct bitmap search path as follows: + * $OPENWINHOME/etc/workspace/patterns + * $OPENWINHOME/include/X11/include/bitmaps +! * /usr/X11/include/X11/include/bitmaps + * + * REMIND: this should be cleaned up so that it doesn't use a fixed-size + * array. +--- 466,472 ---- + * Construct bitmap search path as follows: + * $OPENWINHOME/etc/workspace/patterns + * $OPENWINHOME/include/X11/include/bitmaps +! * /usr/X11R6/include/X11/include/bitmaps + * + * REMIND: this should be cleaned up so that it doesn't use a fixed-size + * array. +*************** +*** 489,495 **** + (void)sprintf(bmPath, "%s/include/X11/bitmaps",owHome); + bitmapSearchPath[i++] = MemNewString(bmPath); + +! bitmapSearchPath[i++] = MemNewString("/usr/X11/include/X11/bitmaps"); + + bitmapSearchPath[i] = (char *)NULL; + } +--- 489,495 ---- + (void)sprintf(bmPath, "%s/include/X11/bitmaps",owHome); + bitmapSearchPath[i++] = MemNewString(bmPath); + +! bitmapSearchPath[i++] = MemNewString("/usr/X11R6/include/X11/bitmaps"); + + bitmapSearchPath[i] = (char *)NULL; + } >Release-Note: >Audit-Trail: >Unformatted: To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports" in the body of the message