Date: Wed, 4 Nov 1998 18:32:01 -0500 (EST) From: Don Croyle <croyle@gelemna.ft-wayne.in.us> To: FreeBSD-gnats-submit@FreeBSD.ORG Subject: ports/8575: Update x11-wm/blackbox to 0.40.12 Message-ID: <199811042332.SAA16967@emerson.gelemna.ft-wayne.in.us>
next in thread | raw e-mail | index | archive | help
>Number: 8575 >Category: ports >Synopsis: Update x11-wm/blackbox to 0.40.12 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Wed Nov 4 15:40:00 PST 1998 >Last-Modified: >Originator: Don Croyle >Organization: >Release: FreeBSD 3.0-CURRENT i386 >Environment: >Description: These diffs update the x11-wm/blackbox port to use the latest distfile. The new file patches/patch-ad was obtained from a post by Graeme Cross <gcross@netspace.net.au> on the blackbox mailing list. >How-To-Repeat: >Fix: Apply this patch. Note that it adds two new files: patches/patch-ac and patches/patch-ad. diff -ruN blackbox.old/Makefile blackbox/Makefile --- blackbox.old/Makefile Thu Oct 22 04:37:18 1998 +++ blackbox/Makefile Wed Nov 4 06:23:21 1998 @@ -1,12 +1,12 @@ # New ports collection makefile for: Blackbox -# Version required: 0.40.11 +# Version required: 0.40.12 # Date created: June 15, 1998 # Whom: Brian Handy <handy@physics.montana.edu> # # $Id: Makefile,v 1.11 1998/10/22 09:37:18 jkoshy Exp $ # -DISTNAME= blackbox-0.40.11 +DISTNAME= blackbox-0.40.12 CATEGORIES= x11-wm MASTER_SITES= http://linux.wiw.org/blackbox/sources/ diff -ruN blackbox.old/files/md5 blackbox/files/md5 --- blackbox.old/files/md5 Thu Oct 22 04:37:19 1998 +++ blackbox/files/md5 Wed Nov 4 06:25:35 1998 @@ -1 +1 @@ -MD5 (blackbox-0.40.11.tar.gz) = c7e00eedcd1b8b05cadb71d12ac5e0ae +MD5 (blackbox-0.40.12.tar.gz) = f846e47c69647cfc501dc79d65e02a8c diff -ruN blackbox.old/patches/patch-aa blackbox/patches/patch-aa --- blackbox.old/patches/patch-aa Fri Oct 9 22:38:49 1998 +++ blackbox/patches/patch-aa Wed Nov 4 16:29:08 1998 @@ -1,11 +1,19 @@ ---- src/Image.cc.orig Tue Sep 22 10:06:56 1998 -+++ src/Image.cc Tue Sep 22 21:41:55 1998 -@@ -27,7 +27,7 @@ - #include "Image.hh" +--- src/Image.cc.orig Wed Nov 4 02:11:26 1998 ++++ src/Image.cc Wed Nov 4 16:22:37 1998 +@@ -34,10 +34,13 @@ + # include <stdio.h> + #endif - #include <stdio.h> --#include <malloc.h> -+#include <stdlib.h> +-#if HAVE_MALLOC_H +-# include <malloc.h> ++#if HAVE_STDLIB_H ++# include <stdlib.h> ++#else ++# if HAVE_MALLOC_H ++# include <malloc.h> ++# endif + #endif +- - #ifdef GradientHack - # include <math.h> + // ************************************************************************* + // Graphics engine class code diff -ruN blackbox.old/patches/patch-ab blackbox/patches/patch-ab --- blackbox.old/patches/patch-ab Thu Oct 22 04:37:19 1998 +++ blackbox/patches/patch-ab Wed Nov 4 16:34:01 1998 @@ -1,10 +1,11 @@ ---- configure.orig Wed Oct 21 01:00:32 1998 -+++ configure Wed Oct 21 23:45:52 1998 -@@ -1903,7 +1903,7 @@ - test x$x_libraries = "x" && x_libraries="/usr/lib" +--- configure.orig Wed Nov 4 02:15:37 1998 ++++ configure Wed Nov 4 16:33:00 1998 +@@ -1346,7 +1346,7 @@ - cat >> confdefs.h <<EOF --#define XAPPLOADDIR "$x_libraries/lib/X11/app-defaults" -+#define XAPPLOADDIR "$x_libraries/X11/app-defaults" - EOF - + fi + +-for ac_hdr in fcntl.h malloc.h process.h signal.h stdio.h time.h unistd.h sys/param.h sys/select.h sys/time.h sys/types.h ++for ac_hdr in fcntl.h malloc.h process.h signal.h stdio.h stdlib.h time.h unistd.h sys/param.h sys/select.h sys/time.h sys/types.h + do + ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` + echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 diff -ruN blackbox.old/patches/patch-ac blackbox/patches/patch-ac --- blackbox.old/patches/patch-ac Wed Dec 31 19:00:00 1969 +++ blackbox/patches/patch-ac Wed Nov 4 17:06:26 1998 @@ -0,0 +1,12 @@ +--- config.h.in.orig Wed Nov 4 02:15:30 1998 ++++ config.h.in Wed Nov 4 17:05:45 1998 +@@ -40,6 +40,9 @@ + /* Define if you have the <stdio.h> header file. */ + #undef HAVE_STDIO_H + ++/* Define if you have the <stdlib.h> header file. */ ++#undef HAVE_STDLIB_H ++ + /* Define if you have the <sys/param.h> header file. */ + #undef HAVE_SYS_PARAM_H + diff -ruN blackbox.old/patches/patch-ad blackbox/patches/patch-ad --- blackbox.old/patches/patch-ad Wed Dec 31 19:00:00 1969 +++ blackbox/patches/patch-ad Wed Nov 4 15:28:45 1998 @@ -0,0 +1,28 @@ +*** src.orig/blackbox.cc Wed Nov 4 18:07:56 1998 +--- src/blackbox.cc Wed Nov 4 22:02:54 1998 +*************** +*** 82,87 **** +--- 82,105 ---- + + + // ************************************************************************* ++ // this is taken from the GNU liberty codebase ++ // ************************************************************************* ++ ++ char * ++ basename (const char *name) ++ { ++ const char *base = name; ++ ++ while (*name) { ++ if (*name++ == '/') { ++ base = name; ++ } ++ } ++ return (char *) base; ++ } ++ ++ ++ // ************************************************************************* + // signal handler to allow for proper and gentle shutdown + // ************************************************************************* diff -ruN blackbox.old/pkg/PLIST blackbox/pkg/PLIST --- blackbox.old/pkg/PLIST Mon Aug 31 09:13:55 1998 +++ blackbox/pkg/PLIST Wed Nov 4 17:16:06 1998 @@ -1,4 +1,5 @@ bin/blackbox -lib/X11/app-defaults/Blackbox -lib/X11/app-defaults/Blackbox-menu -lib/X11/app-defaults/Blackbox-style +share/Blackbox/rc +share/Blackbox/menu +share/Blackbox/style +@dirrm share/Blackbox >Audit-Trail: >Unformatted: To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?199811042332.SAA16967>