diff options
author | tron <tron@pkgsrc.org> | 1998-07-03 20:46:43 +0000 |
---|---|---|
committer | tron <tron@pkgsrc.org> | 1998-07-03 20:46:43 +0000 |
commit | f904fa462dca006da8748ecc94d925460a930a4f (patch) | |
tree | dcfbbb723f86d3ccc5624745c97966d025b0997d /x11/xview-config/patches | |
parent | 49e451283d4c9d5b62bc7a961fa8698e79c84784 (diff) | |
download | pkgsrc-f904fa462dca006da8748ecc94d925460a930a4f.tar.gz |
Initial commit of FreeBSD's "xview-config" port:
OpenLook Toolkit config files.
Diffstat (limited to 'x11/xview-config/patches')
-rw-r--r-- | x11/xview-config/patches/patch-aa | 20 | ||||
-rw-r--r-- | x11/xview-config/patches/patch-ab | 88 | ||||
-rw-r--r-- | x11/xview-config/patches/patch-ac | 72 | ||||
-rw-r--r-- | x11/xview-config/patches/patch-ad | 24 | ||||
-rw-r--r-- | x11/xview-config/patches/patch-ae | 111 |
5 files changed, 315 insertions, 0 deletions
diff --git a/x11/xview-config/patches/patch-aa b/x11/xview-config/patches/patch-aa new file mode 100644 index 00000000000..ce8a18a346c --- /dev/null +++ b/x11/xview-config/patches/patch-aa @@ -0,0 +1,20 @@ +diff -rc ../old/xview3.2p1-X11R6/config/Imakefile Imakefile +*** ../old/xview3.2p1-X11R6/config/Imakefile Tue Jun 29 01:13:19 1993 +--- Imakefile Sun Nov 20 13:38:58 1994 +*************** +*** 8,14 **** + /**/# config directory + /**/# @(#)Imakefile 1.9 28 Jun 1993 SMI + +! XVFILES = XView.cf XView.lib XView.obj XView.rules XView.tmpl library.tmpl + CFFILES = $(XVFILES) $(HEADERS) + + InstallMultipleDestFlags(install,$(CFFILES),$(CONFIGDIR),$(INSTDATFLAGS)) +--- 8,14 ---- + /**/# config directory + /**/# @(#)Imakefile 1.9 28 Jun 1993 SMI + +! XVFILES = XView.cf XView.lib XView.obj XView.rules XView.tmpl XView.prog + CFFILES = $(XVFILES) $(HEADERS) + + InstallMultipleDestFlags(install,$(CFFILES),$(CONFIGDIR),$(INSTDATFLAGS)) diff --git a/x11/xview-config/patches/patch-ab b/x11/xview-config/patches/patch-ab new file mode 100644 index 00000000000..f8e411ed635 --- /dev/null +++ b/x11/xview-config/patches/patch-ab @@ -0,0 +1,88 @@ +diff -rc ../old/xview3.2p1-X11R6/config/XView.cf XView.cf +*** ../old/xview3.2p1-X11R6/config/XView.cf Sun Jun 26 22:09:19 1994 +--- XView.cf Sun Nov 20 13:38:58 1994 +*************** +*** 101,107 **** + * the appropriate value. + */ + #ifndef XVDestDir +! #define XVDestDir /usr/X11/xview + #endif + /* + * Command to add object modules to the library. +--- 101,107 ---- + * the appropriate value. + */ + #ifndef XVDestDir +! #define XVDestDir /usr/X11R6 + #endif + /* + * Command to add object modules to the library. +*************** +*** 139,145 **** + * installed in $(DESTDIR)/lib/X11/config (aka $(CONFIGDIR)). + */ + #ifndef OnlyNeedsNewXViewConfigInstalled +! #define OnlyNeedsNewXViewConfigInstalled NO + #endif + /* + * If you would like the XView man pages to be installed in +--- 139,145 ---- + * installed in $(DESTDIR)/lib/X11/config (aka $(CONFIGDIR)). + */ + #ifndef OnlyNeedsNewXViewConfigInstalled +! #define OnlyNeedsNewXViewConfigInstalled YES + #endif + /* + * If you would like the XView man pages to be installed in +*************** +*** 305,311 **** + * malloc() and read() will be used instead. + */ + #ifndef OsHasMmap +! #define OsHasMmap YES + #endif + /* + * The implementation of internationalization support in XView depends +--- 305,311 ---- + * malloc() and read() will be used instead. + */ + #ifndef OsHasMmap +! #define OsHasMmap NO + #endif + /* + * The implementation of internationalization support in XView depends +*************** +*** 315,321 **** + * features disabled. + */ + #ifndef OsHasLocale +! #define OsHasLocale YES + #endif + /* + * There are number of memory allocation macros in lib/libxview/base.h +--- 315,321 ---- + * features disabled. + */ + #ifndef OsHasLocale +! #define OsHasLocale NO + #endif + /* + * There are number of memory allocation macros in lib/libxview/base.h +*************** +*** 360,366 **** + * be defined as -PIC + */ + #ifndef PositionIndependentCodeFlag +! #define PositionIndependentCodeFlag -PIC + #endif + + /* +--- 360,366 ---- + * be defined as -PIC + */ + #ifndef PositionIndependentCodeFlag +! #define PositionIndependentCodeFlag -fpic + #endif + + /* diff --git a/x11/xview-config/patches/patch-ac b/x11/xview-config/patches/patch-ac new file mode 100644 index 00000000000..746d9f937f6 --- /dev/null +++ b/x11/xview-config/patches/patch-ac @@ -0,0 +1,72 @@ +diff -rc ../old/xview3.2p1-X11R6/config/XView.obj XView.obj +*** ../old/xview3.2p1-X11R6/config/XView.obj Tue Jun 29 01:13:20 1993 +--- XView.obj Sun Nov 20 13:38:59 1994 +*************** +*** 15,21 **** + STD_DEFINES = StandardDefines LibXViewDefines + #endif + HEADERS= ${HDRSPUBLIC} ${HDRSPRIVATE} +! INCLUDES= -I$(BUILDINCDIR)$(INCDIR) + OBJS = $(TEXT_OBJS) $(DATA_OBJS) $(SPECIAL_OBJS) + #if !NotLibXView + ALLFILES = $(SRCS) $(HEADERS) +--- 15,21 ---- + STD_DEFINES = StandardDefines LibXViewDefines + #endif + HEADERS= ${HDRSPUBLIC} ${HDRSPRIVATE} +! INCLUDES= -I$(BUILDINCDIR)/$(INCDIR) + OBJS = $(TEXT_OBJS) $(DATA_OBJS) $(SPECIAL_OBJS) + #if !NotLibXView + ALLFILES = $(SRCS) $(HEADERS) +*************** +*** 85,98 **** + + #if SubdirHasPublicHeaders + # if NotLibXView +! BuildIncludes($(HDRSPUBLIC),$(PUB_INCDIR),/**/) + + install:: + $(MKDIRHIER) $(PUB_HEADER_DEST) + + InstallMultiple($(HDRSPUBLIC),$(PUB_HEADER_DEST)) + # else +! BuildIncludes($(HDRSPUBLIC),$(XVPUB_INCDIR),/**/) + + install:: + $(MKDIRHIER) $(XVPUB_HEADER_DEST) +--- 85,98 ---- + + #if SubdirHasPublicHeaders + # if NotLibXView +! BuildIncludes($(HDRSPUBLIC),$(PUB_INCDIR),.) + + install:: + $(MKDIRHIER) $(PUB_HEADER_DEST) + + InstallMultiple($(HDRSPUBLIC),$(PUB_HEADER_DEST)) + # else +! BuildIncludes($(HDRSPUBLIC),$(XVPUB_INCDIR),.) + + install:: + $(MKDIRHIER) $(XVPUB_HEADER_DEST) +*************** +*** 103,111 **** + + #if SubdirHasPrivateHeaders + # if NotLibXView +! BuildIncludes($(HDRSPRIVATE),$(PRI_INCDIR),/**/) + # else +! BuildIncludes($(HDRSPRIVATE),$(XVPRI_INCDIR),/**/) + # endif + # if InstallPrivateHeaders + # if NotLibXView +--- 103,111 ---- + + #if SubdirHasPrivateHeaders + # if NotLibXView +! BuildIncludes($(HDRSPRIVATE),$(PRI_INCDIR),.) + # else +! BuildIncludes($(HDRSPRIVATE),$(XVPRI_INCDIR),.) + # endif + # if InstallPrivateHeaders + # if NotLibXView diff --git a/x11/xview-config/patches/patch-ad b/x11/xview-config/patches/patch-ad new file mode 100644 index 00000000000..f2e5ed35f1b --- /dev/null +++ b/x11/xview-config/patches/patch-ad @@ -0,0 +1,24 @@ +diff -rc ../old/xview3.2p1-X11R6/config/XView.rules XView.rules +*** ../old/xview3.2p1-X11R6/config/XView.rules Tue Jun 29 01:13:20 1993 +--- XView.rules Sun Nov 20 13:38:59 1994 +*************** +*** 366,374 **** + #ifndef InstallSharedLibraryNoBuild + #define InstallSharedLibraryNoBuild(libname,rev,dest) @@\ + install:: @@\ +! $(RM) /dest/lib/**/libname.so @@\ + $(INSTALL) -c $(INSTSHAREDLIBFLAGS) lib/**/libname.so.rev dest @@\ +! (cd dest; $(LN) lib/**/libname.so.rev lib/**/libname.so) + + #endif /* InstallSharedLibraryNoBuild */ + +--- 366,374 ---- + #ifndef InstallSharedLibraryNoBuild + #define InstallSharedLibraryNoBuild(libname,rev,dest) @@\ + install:: @@\ +! $(RM) /dest/lib/**/libname.so @@\ + $(INSTALL) -c $(INSTSHAREDLIBFLAGS) lib/**/libname.so.rev dest @@\ +! (cd dest; $(LN) lib/**/libname.so.rev lib/**/libname.so) + + #endif /* InstallSharedLibraryNoBuild */ + diff --git a/x11/xview-config/patches/patch-ae b/x11/xview-config/patches/patch-ae new file mode 100644 index 00000000000..88f7c326ac2 --- /dev/null +++ b/x11/xview-config/patches/patch-ae @@ -0,0 +1,111 @@ +*** XView.tmpl.orig Sun Jun 26 21:10:00 1994 +--- XView.tmpl Sun May 3 22:09:02 1998 +*************** +*** 96,102 **** + * Work around small conflict with Project.tmpl file + */ + #if UseInstalled +! MKDIRHIER = BourneShell BinDir/mkdirhier + #endif + + #if OsHasLocale +--- 96,102 ---- + * Work around small conflict with Project.tmpl file + */ + #if UseInstalled +! MKDIRHIER = mkdirhier + #endif + + #if OsHasLocale +*************** +*** 192,205 **** + AS = as + */ + /* +- * use the same trick X11R5 does for defining rules for installed libs +- */ +- #ifdef UseInstalled +- #define _Use(a,b) a +- #else +- #define _Use(a,b) b +- #endif +- /* + * Temporary directory used during build process before the include + * files are installed. This is just a place where symbolic links are + * placed to point back to the actual files in the build hierarchy to +--- 192,197 ---- +*************** +*** 224,230 **** + * afterwards. + */ + #ifndef XVIncludeDirName +! #define XVIncludeDirName /include + #endif + INCDIR = XVIncludeDirName + /* +--- 216,222 ---- + * afterwards. + */ + #ifndef XVIncludeDirName +! #define XVIncludeDirName include + #endif + INCDIR = XVIncludeDirName + /* +*************** +*** 356,365 **** + + #if SystemV4 + SYSV_CLIENT_LIB = -lintl -ldl +! XVCLIENTSYSDEFINES = -DSVR4 -DSYSV + #else + SYSV_CLIENT_LIB = +! XVCLIENTSYSDEFINES = -DSUNOS41 + #endif + + /* +--- 348,357 ---- + + #if SystemV4 + SYSV_CLIENT_LIB = -lintl -ldl +! XVCLIENTSYSDEFINES = -DSVR4 -DSYSV + #else + SYSV_CLIENT_LIB = +! XVCLIENTSYSDEFINES = -DSUNOS41 + #endif + + /* +*************** +*** 371,386 **** + */ + + #if XvI18nLevel == 4 +! XVCLIENTI18NDEFINES = -DOW_I18N_L4 -DOW_I18N_L3 -DOW_I18N -DFULL_R5 +! XVCLIENTMISCLIB = -lw +! XVCLIENTINCLUDES = -I$(OPENWINHOME)/include + #else +! XVCLIENTI18NDEFINES = -DOW_I18N_L3 +! XVCLIENTMISCLIB = +! XVCLIENTINCLUDES = + #endif + +! XVCLIENTDEFINES = $(XVCLIENTSYSDEFINES) $(XVCLIENTI18NDEFINES) + + /* + * Define libraries for XView clients +--- 363,378 ---- + */ + + #if XvI18nLevel == 4 +! XVCLIENTI18NDEFINES = -DOW_I18N_L4 -DOW_I18N_L3 -DOW_I18N -DFULL_R5 +! XVCLIENTMISCLIB = -lw +! XVCLIENTINCLUDES = -I$(OPENWINHOME)/include + #else +! XVCLIENTI18NDEFINES = -DOW_I18N_L3 +! XVCLIENTMISCLIB = +! XVCLIENTINCLUDES = + #endif + +! XVCLIENTDEFINES = $(XVCLIENTSYSDEFINES) $(XVCLIENTI18NDEFINES) + + /* + * Define libraries for XView clients |