[Midnightbsd-cvs] mports: xorg-libraries/files: Removed xorg 6.9 patches.
ctriv at midnightbsd.org
ctriv at midnightbsd.org
Fri Oct 5 16:06:08 EDT 2007
Log Message:
-----------
Removed xorg 6.9 patches.
Removed Files:
-------------
mports/x11/xorg-libraries/files:
XThrStub-Imakefile
nls-Compose-microsoft-cp1251
patch-Compose-Imakefile
patch-GL-GL-Imakefile
patch-GL-Imakefile
patch-GL-dri-drm-Imakefile
patch-GL-glx-Imakefile
patch-X11-Imakefile
patch-Xau-Imakefile
patch-Xcomposite-Imakefile
patch-Xcursor-Imakefile
patch-Xdamage-Imakefile
patch-Xdmcp-Imakefile
patch-Xevie-Imakefile
patch-Xfixes-Imakefile
patch-XlcDL.c
patch-Xrender-Imakefile
patch-dps-Imakefile
patch-lib-Imakefile
-------------- next part --------------
--- x11/xorg-libraries/files/patch-Xcomposite-Imakefile
+++ /dev/null
@@ -1,11 +0,0 @@
---- lib/Xcomposite/Imakefile.orig Fri Oct 1 17:42:38 2004
-+++ lib/Xcomposite/Imakefile Fri Oct 1 17:43:22 2004
-@@ -61,7 +61,7 @@
- RemoveFile($@)
- sh ../Xcursor/config-subst $(SUBSTVARS) < xcomposite.pc.in > $@
-
--InstallNonExecFile(xcomposite.pc,$(USRLIBDIR)/pkgconfig)
-+InstallNonExecFile(xcomposite.pc,$(PROJECTROOT)/libdata/pkgconfig)
-
- clean::
- RemoveFile(xcomposite.pc)
--- x11/xorg-libraries/files/patch-Xau-Imakefile
+++ /dev/null
@@ -1,11 +0,0 @@
---- lib/Xau/Imakefile.orig Wed Apr 14 19:40:56 2004
-+++ lib/Xau/Imakefile Wed Apr 14 19:42:08 2004
-@@ -11,6 +11,8 @@
- #define DoDebugLib DebugLibXau
- #define DoProfileLib ProfileLibXau
- #define LibName Xau
-+#define DoSharedLib YES
-+SOXAUTHREV = 0.0
- #define SoRev SOXAUTHREV
- #define IncSubdir X11
-
--- x11/xorg-libraries/files/patch-XlcDL.c
+++ /dev/null
@@ -1,16 +0,0 @@
---- lib/X11/XlcDL.c.orig Mon Aug 15 21:55:16 2005
-+++ lib/X11/XlcDL.c Mon Aug 15 21:56:02 2005
-@@ -56,11 +56,13 @@
- #include "XlcPublic.h"
- #include "XlcPubI.h"
-
-+#if !defined(__FreeBSD__)
- #if defined(_LP64) && defined(__sparcv9)
- # define _MACH64_NAME "sparcv9"
- #else
- # undef _MACH64_NAME
- #endif /* defined(_LP64) && defined(__sparcv9) */
-+#endif
-
- #ifdef _MACH64_NAME
- # define _MACH64_NAME_LEN (sizeof (_MACH64_NAME) - 1)
--- x11/xorg-libraries/files/patch-Xfixes-Imakefile
+++ /dev/null
@@ -1,11 +0,0 @@
---- lib/Xfixes/Imakefile.orig Fri Oct 1 17:42:54 2004
-+++ lib/Xfixes/Imakefile Fri Oct 1 17:44:58 2004
-@@ -68,7 +68,7 @@
- RemoveFile($@)
- sh ../Xcursor/config-subst $(SUBSTVARS) < xfixes.pc.in > $@
-
--InstallNonExecFile(xfixes.pc,$(USRLIBDIR)/pkgconfig)
-+InstallNonExecFile(xfixes.pc,$(PROJECTROOT)/libdata/pkgconfig)
-
- clean::
- RemoveFile(xfixes.pc)
--- x11/xorg-libraries/files/patch-dps-Imakefile
+++ /dev/null
@@ -1,30 +0,0 @@
---- lib/dps/Imakefile.orig Mon May 24 12:06:58 2004
-+++ lib/dps/Imakefile Fri Sep 10 22:12:26 2004
-@@ -201,8 +201,6 @@
-
- includes:: $(DPSOPSCFILES) $(PSOPSCFILES) $(HEADERS)
-
--$(DPSOPSCFILES) $(PSOPSCFILES): HostProgramTargetName($(PSWRAP))
--
- SRCS = \
- ${COMMONSOURCEFILES} \
- ${XSOURCEFILES} \
-@@ -224,16 +222,11 @@
-
- .SUFFIXES: .psw .h
-
--.psw.c : HostProgramTargetName($(PSWRAP))
-+.psw.c :
- RunProgram(PSWRAP,-a -o $*.c -h $*.h $<)
-
--.psw.h : HostProgramTargetName($(PSWRAP))
-+.psw.h :
- RunProgram(PSWRAP,-a -h $*.h $< > /dev/null)
--
--HostProgramTargetName($(PSWRAP)):
-- @echo "checking $@ over in $(PSWRAPSRC) first..."; \
-- test -d $(PSWRAPSRC) && cd $(PSWRAPSRC) && $(MAKE) pswraponly; \
-- echo "okay, continuing in $(CURRENT_DIR)"
-
- includes :: $(HEADERS)
- depend :: $(DPSOPSCFILES) $(PSOPSCFILES)
--- x11/xorg-libraries/files/nls-Compose-microsoft-cp1251
+++ /dev/null
@@ -1,15 +0,0 @@
-XCOMM
-XCOMM microsoft-cp1251 Compose Sequence
-XCOMM
-XCOMM Sequence Definition
-XCOMM
-XCOMM $XFree86$
-XCOMM
-XCOMM This file currently has no entries. It appears that a compose file (even
-XCOMM just an empty one) is required for the appropriate keysyms to work for
-XCOMM this encoding.
-XCOMM
-XCOMM <Multi_key> Means <Compose>
-XCOMM Special Character
-
-XCOMM End of Sequence Definition
--- x11/xorg-libraries/files/patch-Xcursor-Imakefile
+++ /dev/null
@@ -1,11 +0,0 @@
---- lib/Xcursor/Imakefile.orig Fri May 28 11:20:24 2004
-+++ lib/Xcursor/Imakefile Fri May 28 11:20:43 2004
-@@ -87,7 +87,7 @@
- RemoveFile($@)
- sh config-subst $(SUBSTVARS) < xcursor.pc.in > $@
-
--InstallNonExecFile(xcursor.pc,$(USRLIBDIR)/pkgconfig)
-+InstallNonExecFile(xcursor.pc,$(PROJECTROOT)/libdata/pkgconfig)
-
- clean::
- RemoveFile(xcursor.pc)
--- x11/xorg-libraries/files/XThrStub-Imakefile
+++ /dev/null
@@ -1,35 +0,0 @@
-#define DoNormalLib NormalLibXThrStub
-#define DoSharedLib SharedLibXThrStub
-#define DoExtraLib SharedLibXThrStub
-#define DoDebugLib DebugLibXThrStub
-#define DoProfileLib ProfileLibXThrStub
-#define LibName XThrStub
-#define SoRev SOXTHRSTUBREV
-#define LibHeaders NO
-
-#include <Threads.tmpl>
-
-#ifdef SharedXThrStubReqs
-REQUIREDLIBS = SharedXThrStubReqs
-#endif
-
-#if NeedUIThrStubs
-STUBSRCS = UIThrStubs.c
-STUBOBJS = UIThrStubs.o
-#endif
-
-#if Malloc0ReturnsNull
-ALLOC_DEFINES = -DMALLOC_0_RETURNS_NULL
-#endif
-
- DEFINES = $(ALLOC_DEFINES)
- INCLUDES =
- SRCS = $(STUBSRCS)
- OBJS = $(STUBOBJS)
- LINTLIBS = $(LINTXLIB)
-
-#include <Library.tmpl>
-
-DependTarget()
-
-LinkSourceFile(UIThrStubs.c,$(XTOP)/lib/X11)
--- x11/xorg-libraries/files/patch-GL-glx-Imakefile
+++ /dev/null
@@ -1,10 +0,0 @@
---- lib/GL/glx/Imakefile.orig Sat Dec 24 00:52:20 2005
-+++ lib/GL/glx/Imakefile Sat Dec 24 00:54:30 2005
-@@ -212,6 +212,7 @@
- -I$(MESASRCDIR)/src/mesa/drivers/x11 \
- -I$(MESASRCDIR)/src/mesa/$(ASM_DIR) \
- -I$(XF86OSSRC) \
-+ -I$(LOCALBASE)/include \
- -I$(DRMSRCDIR)/shared-core \
- $(DRI_INCS)
-
--- x11/xorg-libraries/files/patch-GL-dri-drm-Imakefile
+++ /dev/null
@@ -1,11 +0,0 @@
---- lib/GL/dri/drm/Imakefile.orig Sat Dec 24 01:07:33 2005
-+++ lib/GL/dri/drm/Imakefile Sat Dec 24 01:08:59 2005
-@@ -16,7 +16,7 @@
- -I$(XF86OSSRC)/$(OS_SUBDIR)/drm \
- -I$(DRMSRCDIR)/$(OS_SUBDIR)-core \
- -I$(DRMSRCDIR)/$(OS_SUBDIR2)-core \
-- -I$(XF86OSSRC) -I$(DRMSRCDIR)/shared-core
-+ -I$(XF86OSSRC) -I$(DRMSRCDIR)/shared-core -I$(LOCALBASE)/include
- SRCS = xf86drm.c xf86drmHash.c xf86drmRandom.c xf86drmSL.c
- OBJS = xf86drm.o xf86drmHash.o xf86drmRandom.o xf86drmSL.o
-
--- x11/xorg-libraries/files/patch-Xdamage-Imakefile
+++ /dev/null
@@ -1,11 +0,0 @@
---- lib/Xdamage/Imakefile.orig Fri Oct 1 17:42:44 2004
-+++ lib/Xdamage/Imakefile Fri Oct 1 17:44:54 2004
-@@ -61,7 +61,7 @@
- RemoveFile($@)
- sh ../Xcursor/config-subst $(SUBSTVARS) < xdamage.pc.in > $@
-
--InstallNonExecFile(xdamage.pc,$(USRLIBDIR)/pkgconfig)
-+InstallNonExecFile(xdamage.pc,$(PROJECTROOT)/libdata/pkgconfig)
-
- clean::
- RemoveFile(xdamage.pc)
--- x11/xorg-libraries/files/patch-Compose-Imakefile
+++ /dev/null
@@ -1,10 +0,0 @@
---- nls/Compose/Imakefile.orig Mon Jun 3 22:19:43 2002
-+++ nls/Compose/Imakefile Sat Jan 11 01:00:46 2003
-@@ -54,6 +54,7 @@
- ComposeTarget(koi8-r)
- ComposeTarget(koi8-u)
- ComposeTarget(koi8-c)
-+ComposeTarget(microsoft-cp1251)
- ComposeTarget(mulelao-1)
- ComposeTarget(vi_VN.tcvn)
- ComposeTarget(vi_VN.viscii)
--- x11/xorg-libraries/files/patch-Xdmcp-Imakefile
+++ /dev/null
@@ -1,17 +0,0 @@
---- lib/Xdmcp/Imakefile.orig Thu May 27 23:35:23 2004
-+++ lib/Xdmcp/Imakefile Thu May 27 23:36:09 2004
-@@ -6,12 +6,13 @@
- XCOMM $XFree86: xc/lib/Xdmcp/Imakefile,v 3.4 1999/04/17 09:08:12 dawes Exp $
-
- #define DoNormalLib NormalLibXdmcp
--#define DoSharedLib SharedLibXdmcp
-+#define DoSharedLib YES
- #define DoExtraLib SharedLibXdmcp
- #define DoDebugLib DebugLibXdmcp
- #define DoProfileLib ProfileLibXdmcp
- #define LibName Xdmcp
- #define SoRev SOXDMCPREV
-+SOXDMCPREV = 0.0
- #define IncSubdir X11
-
- #if HasXdmAuth
--- x11/xorg-libraries/files/patch-X11-Imakefile
+++ /dev/null
@@ -1,12 +0,0 @@
---- lib/X11/Imakefile.orig Wed Dec 29 13:44:54 2004
-+++ lib/X11/Imakefile Wed Dec 29 13:46:19 2004
-@@ -126,8 +126,7 @@
- K5INCL = Krb5Includes
- K5DEFS = Krb5Defines
- #endif
--#if (defined(FreeBSDArchitecture) && OSRelVersion < 500016) || \
-- defined(OpenBSDArchitecture)
-+#if (defined(OpenBSDArchitecture))
- THRSTUBSRCS = UIThrStubs.c
- THRSTUBOBJS = UIThrStubs.o
- #endif
--- x11/xorg-libraries/files/patch-GL-GL-Imakefile
+++ /dev/null
@@ -1,20 +0,0 @@
-Index: lib/GL/GL/Imakefile
-===================================================================
-RCS file: /cvs/xorg/xc/lib/GL/GL/Imakefile,v
-retrieving revision 1.5
-diff -u -r1.5 Imakefile
---- lib/GL/GL/Imakefile 23 Jul 2004 05:25:39 -0000 1.5
-+++ lib/GL/GL/Imakefile 29 Dec 2004 20:51:25 -0000
-@@ -209,8 +209,12 @@
- POBJS = $(GLXPOBJS) $(DRIPOBJS) $(DRVPOBJS) $(DRMPOBJS)
-
- #if LocalThreads
-+#if NeedUIThrStubs
-+ THREADOBJS = $(LDPRELIB) $(XTHRSTUBLIB)
-+#else
- THREADOBJS = $(THREADS_LIBS)
- #endif
-+#endif
-
- #include <Library.tmpl>
-
--- x11/xorg-libraries/files/patch-lib-Imakefile
+++ /dev/null
@@ -1,22 +0,0 @@
---- lib/Imakefile.orig Wed Sep 1 18:10:28 2004
-+++ lib/Imakefile Wed Dec 29 13:43:31 2004
-@@ -36,6 +36,10 @@
- XKBUILIBDIR = xkbui
- #endif
-
-+#if BuildThreadStubLibrary && BuildLibraries
-+THRSTUBLIBDIR = XThrStub
-+#endif
-+
- #if BuildXInputLib
- XINPUTLIBDIR = Xi
- #endif
-@@ -223,7 +227,7 @@
- #endif
-
-
--LINTSUBDIRS = $(XAULIBDIR) $(XDMCPLIBDIR) $(X11LIBDIR) \
-+LINTSUBDIRS = $(XAULIBDIR) $(XDMCPLIBDIR) $(THRSTUBLIBDIR) $(X11LIBDIR) \
- $(OLDXLIBDIR) $(ICELIBDIR) $(SMLIBDIR) $(XEXTLIBDIR) $(XTLIBDIR) \
- $(SSLIBDIR) $(XF86MISCLIBDIR) $(XF86VMLIBDIR) $(XF86DGALIBDIR) \
- $(XF86RUSHLIBDIR) $(XMULIBDIR) $(XMUULIBDIR) $(XPMLIBDIR) \
--- x11/xorg-libraries/files/patch-Xevie-Imakefile
+++ /dev/null
@@ -1,11 +0,0 @@
---- lib/Xevie/Imakefile.orig Fri Oct 1 17:42:49 2004
-+++ lib/Xevie/Imakefile Fri Oct 1 17:44:51 2004
-@@ -66,7 +66,7 @@
- RemoveFile($@)
- sh ../Xcursor/config-subst $(SUBSTVARS) < xevie.pc.in > $@
-
--InstallNonExecFile(xevie.pc,$(USRLIBDIR)/pkgconfig)
-+InstallNonExecFile(xevie.pc,$(PROJECTROOT)/libdata/pkgconfig)
-
- clean::
- RemoveFile(xevie.pc)
--- x11/xorg-libraries/files/patch-Xrender-Imakefile
+++ /dev/null
@@ -1,11 +0,0 @@
---- lib/Xrender/Imakefile.orig Sat Oct 16 15:41:02 2004
-+++ lib/Xrender/Imakefile Sat Oct 16 15:42:35 2004
-@@ -161,7 +161,7 @@
- RemoveFile($@)
- sh ../Xcursor/config-subst $(SUBSTVARS) < xrender.pc.in > $@
-
--InstallNonExecFile(xrender.pc,$(USRLIBDIR)/pkgconfig)
-+InstallNonExecFile(xrender.pc,$(PROJECTROOT)/libdata/pkgconfig)
-
- clean::
- RemoveFile(xrender.pc)
--- x11/xorg-libraries/files/patch-GL-Imakefile
+++ /dev/null
@@ -1,11 +0,0 @@
---- lib/GL/Imakefile.orig Fri May 28 00:23:23 2004
-+++ lib/GL/Imakefile Fri May 28 00:23:52 2004
-@@ -110,7 +110,7 @@
- #if BuildXF86DRI && GlxUseBuiltInDRIDriver
- SUBDIRS = $(MESADIRS) $(DRIDIRS) $(DRIVERDIRS) $(GLXDIRS) $(LIBGLBUILDDIR) $(OSMESADIRS)
- #else
--SUBDIRS = $(MESADIRS) $(GLXDIRS) $(DRIDIRS) $(LIBGLBUILDDIR) $(OSMESADIRS) $(DRIVERDIRS)
-+SUBDIRS = $(MESADIRS) $(GLXDIRS) $(DRIDIRS) $(LIBGLBUILDDIR) $(OSMESADIRS)
- #endif
-
- MakeSubdirs($(SUBDIRS))
More information about the Midnightbsd-cvs
mailing list