diff options
author | Thomas Gellekum <tg@FreeBSD.org> | 1998-04-09 08:13:33 +0000 |
---|---|---|
committer | Thomas Gellekum <tg@FreeBSD.org> | 1998-04-09 08:13:33 +0000 |
commit | 7b804361b042acf5438f8b4b333139d0b29b0b2a (patch) | |
tree | df1970ac47dca73ed554f57da45bca66fee33f02 /x11/libhelp/files | |
parent | 5a030ce7c51bfcc02bdc3323388b22130c85712b (diff) | |
download | ports-7b804361b042acf5438f8b4b333139d0b29b0b2a.tar.gz ports-7b804361b042acf5438f8b4b333139d0b29b0b2a.zip |
Notes
Diffstat (limited to 'x11/libhelp/files')
-rw-r--r-- | x11/libhelp/files/patch-aa | 48 | ||||
-rw-r--r-- | x11/libhelp/files/patch-ab | 15 | ||||
-rw-r--r-- | x11/libhelp/files/patch-ac | 13 | ||||
-rw-r--r-- | x11/libhelp/files/patch-ad | 31 | ||||
-rw-r--r-- | x11/libhelp/files/patch-ae | 16 | ||||
-rw-r--r-- | x11/libhelp/files/patch-af | 15 | ||||
-rw-r--r-- | x11/libhelp/files/patch-ag | 15 | ||||
-rw-r--r-- | x11/libhelp/files/patch-ah | 13 | ||||
-rw-r--r-- | x11/libhelp/files/patch-ai | 23 | ||||
-rw-r--r-- | x11/libhelp/files/patch-aj | 20 | ||||
-rw-r--r-- | x11/libhelp/files/patch-ak | 41 | ||||
-rw-r--r-- | x11/libhelp/files/patch-al | 24 | ||||
-rw-r--r-- | x11/libhelp/files/patch-am | 22 |
13 files changed, 296 insertions, 0 deletions
diff --git a/x11/libhelp/files/patch-aa b/x11/libhelp/files/patch-aa new file mode 100644 index 000000000000..ae370adaf28c --- /dev/null +++ b/x11/libhelp/files/patch-aa @@ -0,0 +1,48 @@ +*** ../../../libhelp-1.8.1/Imakefile Tue Apr 4 17:21:02 1995 +--- Imakefile Mon Oct 20 22:13:28 1997 +*************** +*** 27,33 **** + XCOMM remove libhtmlw from LIBDIRS + XCOMM -------------------------------------------------------------------- + +! LIBDIRS = libhelp libButtFace libhtmlw + + XCOMM -------------------------------------------------------------------- + XCOMM Additional Definitions +--- 27,33 ---- + XCOMM remove libhtmlw from LIBDIRS + XCOMM -------------------------------------------------------------------- + +! LIBDIRS = libhelp libButtFace libhtmlw libhlpclient + + XCOMM -------------------------------------------------------------------- + XCOMM Additional Definitions +*************** +*** 36,42 **** + CC = gcc -ansi + COPT = -O2 + INCS = +! DEFS = + LIBS = + + #define IHaveSubdirs +--- 36,42 ---- + CC = gcc -ansi + COPT = -O2 + INCS = +! DEFS = -DHELP_PATH=\"$(X11BASE)/lib/X11/xmhelp/help:$(X11BASE)/lib/X11/xmhelp/pixmaps\" + LIBS = + + #define IHaveSubdirs +*************** +*** 52,60 **** + MakeSubdirs($(SUBDIRS)) + DependSubdirs($(SUBDIRS)) + CleanSubdirs($(SUBDIRS)) +- +- +- +- +- +- +--- 52,54 ---- diff --git a/x11/libhelp/files/patch-ab b/x11/libhelp/files/patch-ab new file mode 100644 index 000000000000..52cb4d5a1c51 --- /dev/null +++ b/x11/libhelp/files/patch-ab @@ -0,0 +1,15 @@ +diff -cb ../../../libhelp-1.8.1/libhelp/Imakefile libhelp/Imakefile +*** ../../../libhelp-1.8.1/libhelp/Imakefile Wed Jun 28 14:59:58 1995 +--- libhelp/Imakefile Mon Oct 20 21:25:05 1997 +*************** +*** 99,104 **** +--- 99,107 ---- + XCOMM libhelp.a + + NormalLibraryTarget($(LIBHELP),$(OBJS)) ++ InstallLibrary($(LIBHELP),$(USRLIBDIR)) ++ ++ InstallNonExecFile(help.h,$(INCDIR)) + + XCOMM thelp (only for testing, not distributed) + diff --git a/x11/libhelp/files/patch-ac b/x11/libhelp/files/patch-ac new file mode 100644 index 000000000000..43548d6af5e8 --- /dev/null +++ b/x11/libhelp/files/patch-ac @@ -0,0 +1,13 @@ +diff -cb ../../../libhelp-1.8.1/libButtFace/Center.c libButtFace/Center.c +*** ../../../libhelp-1.8.1/libButtFace/Center.c Fri Feb 24 13:28:28 1995 +--- libButtFace/Center.c Mon Oct 20 19:00:11 1997 +*************** +*** 31,36 **** +--- 31,37 ---- + */ + #include <X11/IntrinsicP.h> + #include <X11/StringDefs.h> ++ #include <Xm/ManagerP.h> + #include "CenterP.h" + + diff --git a/x11/libhelp/files/patch-ad b/x11/libhelp/files/patch-ad new file mode 100644 index 000000000000..1e3f3048b2a8 --- /dev/null +++ b/x11/libhelp/files/patch-ad @@ -0,0 +1,31 @@ +diff -cb ../../../libhelp-1.8.1/libhtmlw/HTML-PSformat.c libhtmlw/HTML-PSformat.c +*** ../../../libhelp-1.8.1/libhtmlw/HTML-PSformat.c Mon Dec 26 12:15:57 1994 +--- libhtmlw/HTML-PSformat.c Mon Oct 20 19:00:12 1997 +*************** +*** 47,53 **** + #include <stdio.h> + #include <ctype.h> + #include <math.h> +! #include <malloc.h> + #include "HTMLP.h" + + /* Fix thanks to robm. */ +--- 47,57 ---- + #include <stdio.h> + #include <ctype.h> + #include <math.h> +! #ifdef __FreeBSD__ +! # include <stdlib.h> +! #else +! # include <malloc.h> +! #endif + #include "HTMLP.h" + + /* Fix thanks to robm. */ +*************** +*** 1507,1510 **** + + return( PS_string); + } +- +--- 1511,1513 ---- diff --git a/x11/libhelp/files/patch-ae b/x11/libhelp/files/patch-ae new file mode 100644 index 000000000000..bfd79f8ead3c --- /dev/null +++ b/x11/libhelp/files/patch-ae @@ -0,0 +1,16 @@ +diff -cb ../../../libhelp-1.8.1/libhlpclient/Imakefile libhlpclient/Imakefile +*** ../../../libhelp-1.8.1/libhlpclient/Imakefile Sat Jun 17 13:52:05 1995 +--- libhlpclient/Imakefile Mon Oct 20 21:18:41 1997 +*************** +*** 87,91 **** + SYSTEM_LIBS = $(SYSLIBS) $(ADDLIBS) + + NormalLibraryTarget($(LIBHELP),$(OBJS)) + NormalProgramTarget(chelp,$(TESTOBJ),$(HLIB),$(HELPLIBS),$(SYSTEM_LIBS)) +- +--- 87,91 ---- + SYSTEM_LIBS = $(SYSLIBS) $(ADDLIBS) + + NormalLibraryTarget($(LIBHELP),$(OBJS)) ++ InstallLibrary($(LIBHELP),$(USRLIBDIR)) + NormalProgramTarget(chelp,$(TESTOBJ),$(HLIB),$(HELPLIBS),$(SYSTEM_LIBS)) diff --git a/x11/libhelp/files/patch-af b/x11/libhelp/files/patch-af new file mode 100644 index 000000000000..6af616aab60f --- /dev/null +++ b/x11/libhelp/files/patch-af @@ -0,0 +1,15 @@ +diff -cb ../../../libhelp-1.8.1/libhelp/load.c libhelp/load.c +*** ../../../libhelp-1.8.1/libhelp/load.c Wed Jun 28 15:00:15 1995 +--- libhelp/load.c Mon Oct 20 19:00:11 1997 +*************** +*** 37,42 **** +--- 37,45 ---- + /*----------------------------------------------------------------------* + *g include section + **----------------------------------------------------------------------*/ ++ #ifdef __FreeBSD__ ++ #include <sys/types.h> ++ #endif __FreeBSD__ + #include <dirent.h> + #include <sys/stat.h> + #include <unistd.h> diff --git a/x11/libhelp/files/patch-ag b/x11/libhelp/files/patch-ag new file mode 100644 index 000000000000..c3005674d9a9 --- /dev/null +++ b/x11/libhelp/files/patch-ag @@ -0,0 +1,15 @@ +diff -cb ../../../libhelp-1.8.1/libhelp/util.c libhelp/util.c +*** ../../../libhelp-1.8.1/libhelp/util.c Wed Jun 28 15:00:19 1995 +--- libhelp/util.c Mon Oct 20 19:00:11 1997 +*************** +*** 45,50 **** +--- 45,53 ---- + ** -------------------------------------------------------------------- */ + #include <sys/stat.h> + #include <ctype.h> ++ #ifdef __FreeBSD__ ++ #include <sys/types.h> ++ #endif __FreeBSD__ + #include <dirent.h> + + #include "helpp.h" diff --git a/x11/libhelp/files/patch-ah b/x11/libhelp/files/patch-ah new file mode 100644 index 000000000000..0352c6524b7e --- /dev/null +++ b/x11/libhelp/files/patch-ah @@ -0,0 +1,13 @@ +diff -cb ../../../libhelp-1.8.1/libButtFace/Imakefile libButtFace/Imakefile +*** ../../../libhelp-1.8.1/libButtFace/Imakefile Sat May 27 13:07:41 1995 +--- libButtFace/Imakefile Mon Oct 20 21:17:29 1997 +*************** +*** 77,80 **** +--- 77,82 ---- + XCOMM -------------------------------------------------------------------- + + NormalLibraryTarget($(LIBHELP),$(OBJS)) ++ InstallLibrary($(LIBHELP),$(USRLIBDIR)) ++ + DependTarget() + diff --git a/x11/libhelp/files/patch-ai b/x11/libhelp/files/patch-ai new file mode 100644 index 000000000000..a2b2cb6e5719 --- /dev/null +++ b/x11/libhelp/files/patch-ai @@ -0,0 +1,23 @@ +diff -cb ../../../libhelp-1.8.1/libButtFace/resource.c libButtFace/resource.c +*** ../../../libhelp-1.8.1/libButtFace/resource.c Fri Feb 24 13:28:28 1995 +--- libButtFace/resource.c Mon Oct 20 19:00:11 1997 +*************** +*** 27,33 **** + */ + + #include <string.h> +! #include <malloc.h> + #include <ctype.h> + #include <X11/StringDefs.h> + +--- 27,37 ---- + */ + + #include <string.h> +! #ifdef __FreeBSD__ +! # include <stdlib.h> +! #else +! # include <malloc.h> +! #endif + #include <ctype.h> + #include <X11/StringDefs.h> diff --git a/x11/libhelp/files/patch-aj b/x11/libhelp/files/patch-aj new file mode 100644 index 000000000000..6412fa774fce --- /dev/null +++ b/x11/libhelp/files/patch-aj @@ -0,0 +1,20 @@ +diff -cb ../../../libhelp-1.8.1/libhtmlw/HTML.c libhtmlw/HTML.c +*** ../../../libhelp-1.8.1/libhtmlw/HTML.c Mon Dec 26 12:15:57 1994 +--- libhtmlw/HTML.c Mon Oct 20 19:00:12 1997 +*************** +*** 57,62 **** +--- 57,63 ---- + #ifdef MOTIF + #include <Xm/DrawingA.h> + #include <Xm/ScrollBar.h> ++ #include <Xm/ManagerP.h> + #else + #include "DrawingArea.h" + #include <X11/Xaw/Scrollbar.h> +*************** +*** 6109,6112 **** + return(-1); + } + } +- +--- 6112,6114 ---- diff --git a/x11/libhelp/files/patch-ak b/x11/libhelp/files/patch-ak new file mode 100644 index 000000000000..d76b9ad17676 --- /dev/null +++ b/x11/libhelp/files/patch-ak @@ -0,0 +1,41 @@ +diff -cb ../../../libhelp-1.8.1/libhtmlw/HTML.h libhtmlw/HTML.h +*** ../../../libhelp-1.8.1/libhtmlw/HTML.h Mon Dec 26 12:15:58 1994 +--- libhtmlw/HTML.h Mon Oct 20 19:00:12 1997 +*************** +*** 56,68 **** + #define HTML_H + + #ifdef MOTIF +! #include <Xm/Xm.h> +! #if (XmVERSION == 1)&&(XmREVISION >= 2) +! #define MOTIF1_2 +! #endif + #else +! #include <X11/Intrinsic.h> +! #include <X11/Constraint.h> + #endif /* MOTIF */ + #include <X11/StringDefs.h> + +--- 56,70 ---- + #define HTML_H + + #ifdef MOTIF +! # include <Xm/Xm.h> +! # if (XmVERSION == 1)&&(XmREVISION >= 2) +! # define MOTIF1_2 +! # elif (XmVERSION == 2) +! # define MOTIF2 +! # endif + #else +! # include <X11/Intrinsic.h> +! # include <X11/Constraint.h> + #endif /* MOTIF */ + #include <X11/StringDefs.h> + +*************** +*** 483,486 **** + + + #endif /* HTML_H */ +- +--- 485,487 ---- diff --git a/x11/libhelp/files/patch-al b/x11/libhelp/files/patch-al new file mode 100644 index 000000000000..de4f3b797056 --- /dev/null +++ b/x11/libhelp/files/patch-al @@ -0,0 +1,24 @@ +diff -cb ../../../libhelp-1.8.1/libhtmlw/HTMLP.h libhtmlw/HTMLP.h +*** ../../../libhelp-1.8.1/libhtmlw/HTMLP.h Mon Dec 26 12:15:58 1994 +--- libhtmlw/HTMLP.h Mon Oct 20 19:00:12 1997 +*************** +*** 59,67 **** + + #ifdef MOTIF + #include <Xm/XmP.h> +! # ifdef MOTIF1_2 + # include <Xm/ManagerP.h> +! # endif /* MOTIF1_2 */ + #else + #include <X11/IntrinsicP.h> + #include <X11/ConstrainP.h> +--- 59,67 ---- + + #ifdef MOTIF + #include <Xm/XmP.h> +! # if defined(MOTIF1_2) || defined(MOTIF2) + # include <Xm/ManagerP.h> +! # endif /* MOTIF1_2 || MOTIF2*/ + #else + #include <X11/IntrinsicP.h> + #include <X11/ConstrainP.h> diff --git a/x11/libhelp/files/patch-am b/x11/libhelp/files/patch-am new file mode 100644 index 000000000000..e2088e4401bd --- /dev/null +++ b/x11/libhelp/files/patch-am @@ -0,0 +1,22 @@ +diff -cb ../../../libhelp-1.8.1/libhtmlw/Imakefile libhtmlw/Imakefile +*** ../../../libhelp-1.8.1/libhtmlw/Imakefile Sat May 27 13:06:58 1995 +--- libhtmlw/Imakefile Mon Oct 20 21:18:03 1997 +*************** +*** 35,44 **** + HTMLlists.o HTMLparse.o HTMLwidgets.o + + NormalLibraryTarget(htmlw,$(OBJS)) +! DependTarget() +! +! +! +! +! + +--- 35,40 ---- + HTMLlists.o HTMLparse.o HTMLwidgets.o + + NormalLibraryTarget(htmlw,$(OBJS)) +! InstallLibrary(htmlw,$(USRLIBDIR)) + ++ DependTarget() |