diff options
Diffstat (limited to 'x11/XFree86-4-libraries')
21 files changed, 398 insertions, 150 deletions
diff --git a/x11/XFree86-4-libraries/Makefile b/x11/XFree86-4-libraries/Makefile index bdfc9abb8ea8..719cc5e94b37 100644 --- a/x11/XFree86-4-libraries/Makefile +++ b/x11/XFree86-4-libraries/Makefile @@ -6,37 +6,35 @@ # PORTNAME= libraries -PORTVERSION= 4.0 +PORTVERSION= 4.0.1 CATEGORIES= x11 -MASTER_SITES= ftp://ftp.xfree86.org/pub/XFree86/4.0/source/ \ - ftp://ftp.freesoftware.com/pub/XFree86/4.0/source/ \ - ftp://ftp.lip6.fr/pub/X11/XFree86/XFree86-4.0/source/ \ - ftp://ftp.cs.tu-berlin.de/pub/X/XFree86/4.0/source/ \ - ftp://sunsite.doc.ic.ac.uk/packages/XFree86/4.0/source/ +MASTER_SITES= ftp://ftp.xfree86.org/pub/XFree86/${PORTVERSION}/source/ \ + ftp://ftp.freesoftware.com/pub/XFree86/${PORTVERSION}/source/ \ + ftp://ftp.lip6.fr/pub/X11/XFree86/XFree86-${PORTVERSION}/source/ \ + ftp://ftp.cs.tu-berlin.de/pub/X/XFree86/${PORTVERSION}/source/ \ + ftp://sunsite.doc.ic.ac.uk/packages/XFree86/${PORTVERSION}/source/ PKGNAMEPREFIX= XFree86- -DISTFILES= X400src-1.tgz +DISTFILES= X401src-1.tgz MAINTAINER= taguchi@tohoku.iij.ad.jp BUILD_DEPENDS= imake:${PORTSDIR}/devel/imake-4 -PREFIX?= ${X11BASE} -INSTALLS_SHLIB= yes -MTREE_FILE= /etc/mtree/BSD.x11.dist -DIST_SUBDIR= xc -WRKSRC= ${WRKDIR}/xc -SCRIPTS_ENV+= PREFIX=${PREFIX} X11BASE=${X11BASE} \ - WRKDIR=${WRKDIR} DISTDIR=${DISTDIR} -ALL_TARGET= FreeBSDPortsBuild -.if defined(NO_INSTALL_MANPAGES) -INSTALL_TARGET= FreeBSDPortsInstall installXlib -.else +XFREE86_VERSION= 4 +PREFIX?= ${X11BASE} +MTREE_FILE= /etc/mtree/BSD.x11-4.dist +INSTALLS_SHLIB= yes +DIST_SUBDIR= xc +WRKSRC= ${WRKDIR}/xc +SCRIPTS_ENV+= PREFIX=${PREFIX} \ + X11BASE=${X11BASE} \ + WRKDIR=${WRKDIR} \ + DISTDIR=${DISTDIR} +ALL_TARGET= FreeBSDPortsBuild INSTALL_TARGET= FreeBSDPortsInstall FreeBSDPortsInstall.man installXlib MANCOMPRESSED= yes -MAN1= bdftopcf.1 \ - mkfontdir.1 +MAN1= libxrx.1 MAN3= Xaw.3 -.endif .if defined(XDM_DES) .if ${USA_RESIDENT} == YES @@ -47,7 +45,7 @@ pre-fetch: MASTER_SITES+= ftp://psych.psy.uq.oz.au/pub/X11R5/ \ ftp://ftp.internat.freebsd.org/pub/FreeBSD/X11-Crypto/ \ ftp://ftp3.za.freebsd.org/pub/FreeBSD/X11-Crypto/ -EXTRACT_ONLY= X400src-1.tgz +EXTRACT_ONLY= X401src-1.tgz DISTFILES+= Wraphelp.c IGNOREFILES= Wraphelp.c .endif diff --git a/x11/XFree86-4-libraries/distinfo b/x11/XFree86-4-libraries/distinfo index 32a647072af5..e9125a5f32c4 100644 --- a/x11/XFree86-4-libraries/distinfo +++ b/x11/XFree86-4-libraries/distinfo @@ -1 +1 @@ -MD5 (xc/X400src-1.tgz) = a93f407ee0dd7ed806a97370c2ae637d +MD5 (xc/X401src-1.tgz) = b2ad4a077ac7c09d85e6a0fc0728a536 diff --git a/x11/XFree86-4-libraries/files/patch-d b/x11/XFree86-4-libraries/files/patch-d index 6be66663dfb1..a6f67765d897 100644 --- a/x11/XFree86-4-libraries/files/patch-d +++ b/x11/XFree86-4-libraries/files/patch-d @@ -1,6 +1,25 @@ ---- config/cf/FreeBSD.cf.orig Thu Feb 17 18:09:43 2000 -+++ config/cf/FreeBSD.cf Sat Mar 18 19:42:06 2000 -@@ -336,14 +336,14 @@ +--- config/cf/FreeBSD.cf.orig Sat Jun 24 21:15:53 2000 ++++ config/cf/FreeBSD.cf Tue Aug 1 15:19:44 2000 +@@ -135,6 +135,18 @@ + #endif + #endif + ++#ifndef HasAgpGart ++# ifdef i386Architecture ++# if OSMajorVersion >= 5 || (OSMajorVersion == 4 && OSMinorVersion >= 1) ++# define HasAgpGart YES ++# else ++# define HasAgpGart NO ++# endif ++# else ++# define HasAgpGart NO ++# endif ++#endif ++ + /* + * This doesn't work the way it does on every other system. On FreeBSD it's + * only a "hint, not a demand", whatever that means. Note that this is not +@@ -356,14 +368,14 @@ /* The GCC strength-reduce bug is fixed for FreeBSD 2.1.5 and later */ #ifndef DefaultGcc2i386Opt #if OSMajorVersion > 2 || (OSMajorVersion == 2 && OSMinorVersion > 1) || (OSMajorVersion == 2 && OSMinorVersion == 1 && OSTeenyVersion >= 5) @@ -17,14 +36,3 @@ #endif #ifndef PreIncDir -@@ -463,8 +463,9 @@ - /* - * A hack to work around an optimisation problem with the compiler on - * FreeBSD 4.0-current in late 1999/early 2000. -+ * (and FreeBSD 5.0-current in early 2000) - */ --#if OSMajorVersion == 4 && OSMinorVersion == 0 && OSTeenyVersion == 0 -+#if (OSMajorVersion == 4 || OSMajorVersion == 5) - #define FreeBSDGccOptBug - #endif - diff --git a/x11/XFree86-4-libraries/files/patch-s01 b/x11/XFree86-4-libraries/files/patch-s01 index fa7a41a83513..6447aea41198 100644 --- a/x11/XFree86-4-libraries/files/patch-s01 +++ b/x11/XFree86-4-libraries/files/patch-s01 @@ -1,13 +1,11 @@ ---- programs/Xserver/xkb/xkbInit.c.orig Mon Oct 5 05:02:55 1998 -+++ programs/Xserver/xkb/xkbInit.c Tue May 23 16:52:19 2000 -@@ -910,7 +910,8 @@ - return 1; - } - else if (strncmp(argv[i], "-xkbmap", 7) == 0) { -- if(++i < argc) { -+ i++; -+ if ((i < argc) && (strlen(argv[i]) < PATH_MAX)) { - XkbInitialMap= argv[i]; - return 2; - } - +--- config/cf/xfree86.cf.orig Fri Jul 28 11:35:18 2000 ++++ config/cf/xfree86.cf Fri Jul 28 11:35:50 2000 +@@ -555,7 +555,7 @@ + */ + #if !defined(i386MachArchitecture) && !defined(OS2Architecture) + # ifndef InstallXserverSetUID +-# define InstallXserverSetUID YES ++# define InstallXserverSetUID NO + # endif + #endif + diff --git a/x11/XFree86-4-libraries/files/patch-s02 b/x11/XFree86-4-libraries/files/patch-s02 index d0d323e13b30..6aea4c5f3d81 100644 --- a/x11/XFree86-4-libraries/files/patch-s02 +++ b/x11/XFree86-4-libraries/files/patch-s02 @@ -1,55 +1,11 @@ ---- extras/X-TrueType/xttcconv.c.xtt Mon May 8 16:28:29 2000 -+++ extras/X-TrueType/xttcconv.c Mon May 8 16:28:33 2000 -@@ -505,17 +505,19 @@ codeconv_search_code_converter(char cons - - { - char **l; -- char **tryItFirst = NULL; -+ char **tryItFirst = NULL; - - for (l=list; *l ; l++) { -- if(!mystrcasecmp(*l,moduleArg.charSetHints->charsetStdName)) -- tryItFirst = l; -- } -+ if(!mystrcasecmp(*l,moduleArg.charSetHints->charsetStdName)) { -+ tryItFirst = l; -+ break; -+ } -+ } - -- if(tryItFirst) -- l = tryItFirst; -- else -- l = list; -+ if(tryItFirst) -+ l = tryItFirst; -+ else -+ l = list; - - while(*l && !isFound) { - /* load and call module */ ---- extras/X-TrueType/xttfuncs.c.xtt Mon May 8 16:28:29 2000 -+++ extras/X-TrueType/xttfuncs.c Mon May 8 16:28:33 2000 -@@ -702,7 +702,7 @@ get_metrics(FreeTypeFont *ft, int c, str - - if ((entry = FontCacheGetEntry()) == NULL) { - charInfo = &nocharinfo; -- fprintf(stderr, "can't get cache entry\n"); -+ fprintf(stderr, "get_metrics: can't get cache entry\n"); - goto next; - } - FC_TT_SETVFUNC(entry); -@@ -790,10 +790,9 @@ get_glyph(FreeTypeFont *ft, int c, int s - char_width.pixel = char_width.raw = 0; - get_metrics(ft, c, char_width); - /* Retry to get it created in get_metrics(). */ -- FontCacheSearchEntry(ft->cache, c, &entry); -- if (!charInfo) { -+ if (!FontCacheSearchEntry(ft->cache, c, &entry)) { - charInfo = &nocharinfo; -- fprintf(stderr, "can't get cache entry\n"); -+ fprintf(stderr, "get_glyph: can't get cache entry\n"); - goto next; - } - } - +--- programs/Xserver/GL/dri/Imakefile.ORIG Tue Aug 8 15:42:21 2000 ++++ programs/Xserver/GL/dri/Imakefile Tue Aug 8 15:43:34 2000 +@@ -14,7 +14,7 @@ + INCLUDES = -I$(SERVERSRC)/include -I$(XTOP)/include -I$(EXTINCSRC) \ + -I$(XF86OSSRC) -I$(XF86COMSRC) \ + -I../include -I../glx -I$(LIBSRC)/GL/include \ +- -I$(SERVERSRC)/mi -I$(FONTINCSRC) ++ -I$(SERVERSRC)/mi -I$(FONTINCSRC) -I$(XF86OSSRC)/bus + DEFINES = $(GLX_DEFINES) + + LinkSourceFile(xf86dri.h,$(LIBSRC)/GL/dri) diff --git a/x11/XFree86-4-libraries/files/patch-z02 b/x11/XFree86-4-libraries/files/patch-z02 index 7979d7adea7a..5a086db27a1e 100644 --- a/x11/XFree86-4-libraries/files/patch-z02 +++ b/x11/XFree86-4-libraries/files/patch-z02 @@ -1,6 +1,6 @@ ---- Imakefile.orig Tue Oct 6 20:26:47 1998 -+++ Imakefile Wed May 31 14:11:50 2000 -@@ -18,8 +18,27 @@ +--- Imakefile.orig Thu Jun 15 04:36:13 2000 ++++ Imakefile Fri Aug 18 14:40:02 2000 +@@ -18,8 +18,26 @@ #endif #endif @@ -8,13 +8,12 @@ + SUBDIRS = include config lib $(NLSSUBDIR) \ + programs/Xserver/include \ + programs/Xserver/hw/xfree86/parser \ -+ programs/mkfontdir \ -+ programs/bdftopcf ++ programs/proxymngr programs/xrx +#else +#if defined(FreeBSDBuildXbin) && FreeBSDBuildXbin + SUBDIRS = include config lib $(NLSSUBDIR) \ -+ programs/Xserver/include \ -+ programs ++ programs/Xserver/include programs/Xserver/hw/xfree86/parser \ ++ programs programs/Xserver/hw/xfree86/xf86cfg +#else +#if defined(FreeBSDBuildXfs) && FreeBSDBuildXfs + SUBDIRS = include config lib $(NLSSUBDIR) \ @@ -28,21 +27,21 @@ LNINSTALLDIRS = lib #if HasParallelMake -@@ -202,3 +221,73 @@ +@@ -206,3 +224,97 @@ #undef BootstrapCleanSubdirs #define BootstrapCleanSubdirs BOOTSTRAPSUBDIRS="$(BOOTSTRAPSUBDIRS)" BOOTSTRAPSUBDIRS = imake makedepend + +#if defined(FreeBSDBuildXlib) && FreeBSDBuildXlib -+FreeBSDPortsInstallDir = include lib programs/Xserver/include \ -+ programs/Xserver/hw/xfree86/parser \ -+ programs/bdftopcf programs/mkfontdir ++FreeBSDPortsInstallDir = include lib nls programs/Xserver/include \ ++ programs/xrx/plugin \ ++ programs/Xserver/hw/xfree86/parser +#else +#if defined(FreeBSDBuildXbin) && FreeBSDBuildXbin -+FreeBSDPortsInstallDir = lib nls programs ++FreeBSDPortsInstallDir = lib programs programs programs/Xserver/hw/xfree86/xf86cfg +#else +#if defined(FreeBSDBuildXxserv) && FreeBSDBuildXxserv -+FreeBSDPortsInstallDir = programs ++FreeBSDPortsInstallDir = programs lib/font lib/GL/mesa/src/drv +#else +#if defined(FreeBSDBuildXfs) && FreeBSDBuildXfs +FreeBSDPortsInstallDir = programs/xfs @@ -72,10 +71,34 @@ + (cd $$dir && $(MAKE) $(MFLAGS) $(PARALLELMFLAGS) install.man); \ + done + ++# followings are in XBMPICS and XPMPICS at programs/Xserver/hw/xfree86/xf86cfg ++XLIBADDFILES1= \ ++ card.xbm\ ++ keyboard.xbm\ ++ monitor.xbm\ ++ mouse.xbm\ ++ left.xbm\ ++ right.xbm\ ++ up.xbm\ ++ down.xbm\ ++ wider.xbm\ ++ narrower.xbm\ ++ shorter.xbm\ ++ taller.xbm ++XLIBADDFILES2= \ ++ card.xpm\ ++ computer.xpm\ ++ keyboard.xpm\ ++ monitor.xpm\ ++ mouse.xpm ++ +installXlib:: + (cd programs/proxymngr && \ + $(INSTALL) -c $(INSTINCFLAGS) PM.h $(INCROOT)/X11/PM && \ + $(INSTALL) -c $(INSTINCFLAGS) PMproto.h $(INCROOT)/X11/PM) ++ (cd programs/Xserver/hw/xfree86/xf86cfg && \ ++ $(INSTALL) -c $(INSTINCFLAGS) $(XLIBADDFILES1) $(INCROOT)/X11/bitmaps && \ ++ $(INSTALL) -c $(INSTINCFLAGS) $(XLIBADDFILES2) $(INCROOT)/X11/pixmaps) + +installXnest:: + (cd programs/Xserver && \ diff --git a/x11/XFree86-4-libraries/files/patch-z03 b/x11/XFree86-4-libraries/files/patch-z03 index edac5d7fcd69..cbae345baefc 100644 --- a/x11/XFree86-4-libraries/files/patch-z03 +++ b/x11/XFree86-4-libraries/files/patch-z03 @@ -1,5 +1,5 @@ ---- config/cf/Library.tmpl.ORIG Sun May 7 21:06:16 2000 -+++ config/cf/Library.tmpl Sun May 7 21:11:44 2000 +--- config/cf/Library.tmpl.orig Wed Oct 13 13:20:41 1999 ++++ config/cf/Library.tmpl Wed Jul 19 09:15:07 2000 @@ -434,10 +434,14 @@ # ifdef IncSubdir # ifdef IncSubSubdir diff --git a/x11/XFree86-4-libraries/files/patch-z04 b/x11/XFree86-4-libraries/files/patch-z04 index 3709b6eeb639..f533ae8a2688 100644 --- a/x11/XFree86-4-libraries/files/patch-z04 +++ b/x11/XFree86-4-libraries/files/patch-z04 @@ -1,12 +1,14 @@ ---- lib/X11/Imakefile.orig Sat Feb 12 15:24:39 2000 -+++ lib/X11/Imakefile Tue May 23 11:37:14 2000 -@@ -946,8 +946,10 @@ +--- lib/X11/Imakefile.orig Sun Jun 18 03:41:29 2000 ++++ lib/X11/Imakefile Tue Jul 18 22:01:12 2000 +@@ -950,8 +950,12 @@ #if InstallXcmsTxt InstallNonExecFile(Xcms.txt,$(LIBDIR)) #endif +#if !defined(FreeBSDBuildXlib) || !FreeBSDBuildXlib InstallNonExecFile(XErrorDB,$(LIBDIR)) InstallNonExecFile(XKeysymDB,$(LIBDIR)) ++test: ++ _LinkBuildLibrary($@) +#endif InstallLintLibrary(X11,$(LINTLIBDIR)) diff --git a/x11/XFree86-4-libraries/files/patch-z06 b/x11/XFree86-4-libraries/files/patch-z06 index d321ac5c0ede..127e554324c6 100644 --- a/x11/XFree86-4-libraries/files/patch-z06 +++ b/x11/XFree86-4-libraries/files/patch-z06 @@ -1,11 +1,11 @@ ---- programs/Xserver/hw/xfree86/os-support/Imakefile.orig Wed Apr 19 09:46:44 2000 -+++ programs/Xserver/hw/xfree86/os-support/Imakefile Wed Apr 19 09:48:15 2000 -@@ -107,6 +107,8 @@ +--- programs/Xserver/hw/xfree86/os-support/Imakefile.orig Sat Jul 1 08:39:11 2000 ++++ programs/Xserver/hw/xfree86/os-support/Imakefile Sun Jul 16 21:38:29 2000 +@@ -109,6 +109,8 @@ SRCS = $(OS_SUBDIR)/?*.c $(BUS_SUBDIR)/?*.c misc/?*.c vbe/?*.c $(DRM_SRC) OBJS = $(OS_SUBDIR)/?*.o $(BUS_SUBDIR)/?*.o misc/?*.o vbe/?*.o $(DRM_OBJ) +HEADERS = xf86_ansic.h + - DONES = $(OS_SUBDIR)/DONE $(BUS_SUBDIR)/DONE misc/DONE vbe/DONE + DONES = $(OS_SUBDIR)/DONE $(BUS_SUBDIR)/DONE misc/DONE vbe/DONE $(DRM_DONES) #if HasParallelMake diff --git a/x11/XFree86-4-libraries/files/patch-z07 b/x11/XFree86-4-libraries/files/patch-z07 index 92b022fb889f..090c07cbc828 100644 --- a/x11/XFree86-4-libraries/files/patch-z07 +++ b/x11/XFree86-4-libraries/files/patch-z07 @@ -1,6 +1,6 @@ ---- programs/Xserver/hw/xfree86/common/Imakefile.orig Wed Apr 19 09:49:39 2000 -+++ programs/Xserver/hw/xfree86/common/Imakefile Wed Apr 19 09:50:25 2000 -@@ -151,6 +151,8 @@ +--- programs/Xserver/hw/xfree86/common/Imakefile.orig Sat Jul 1 08:38:03 2000 ++++ programs/Xserver/hw/xfree86/common/Imakefile Sun Jul 16 21:39:40 2000 +@@ -158,6 +158,8 @@ -I$(XF86SRC)/scanpci -I$(XF86OSSRC)/vbe -I$(XF86SRC)/int10 \ -I$(XF86SRC)/ddc diff --git a/x11/XFree86-4-libraries/files/patch-z13 b/x11/XFree86-4-libraries/files/patch-z13 index 6b6df3571951..1d524a91ec48 100644 --- a/x11/XFree86-4-libraries/files/patch-z13 +++ b/x11/XFree86-4-libraries/files/patch-z13 @@ -1,6 +1,6 @@ ---- programs/Imakefile.orig Sat Feb 26 14:37:07 2000 -+++ programs/Imakefile Wed May 31 15:13:17 2000 -@@ -63,7 +63,11 @@ +--- programs/Imakefile.orig Sun Jun 18 03:42:14 2000 ++++ programs/Imakefile Sun Jul 16 21:40:39 2000 +@@ -65,7 +65,11 @@ XPMCLIENTDIRS = cxpm sxpm #if BuildServersOnly diff --git a/x11/XFree86-4-libraries/files/patch-z21 b/x11/XFree86-4-libraries/files/patch-z21 index cd5494eaf3f8..1eb5bbc2032d 100644 --- a/x11/XFree86-4-libraries/files/patch-z21 +++ b/x11/XFree86-4-libraries/files/patch-z21 @@ -1,12 +1,11 @@ ---- programs/Xserver/hw/xnest/Imakefile.ORIG Mon May 8 16:57:25 2000 -+++ programs/Xserver/hw/xnest/Imakefile Mon May 8 16:58:49 2000 -@@ -52,7 +52,8 @@ +--- programs/Xserver/hw/xnest/Imakefile.orig Sun Jul 16 22:51:45 2000 ++++ programs/Xserver/hw/xnest/Imakefile Sun Jul 16 22:49:18 2000 +@@ -52,7 +52,7 @@ INCLUDES = -I. -I$(XBUILDINCDIR) -I$(FONTINCSRC) \ -I../../mi -I../../include -I../../os \ - -I$(EXTINCSRC) -I$(XINCLUDESRC) -+ -I$(EXTINCSRC) -I$(XINCLUDESRC) \ -+ -I../xfree86/loader - - all:: $(OBJS) ++ -I$(EXTINCSRC) -I$(XINCLUDESRC) -I../xfree86/loader + DEFINES = $(OS_DEFINES) -UXINPUT -UXF86VIDMODE -UXFreeXDGA -UXF86MISC \ + -UMITSHM -UXF86DRI -UXFree86LOADER diff --git a/x11/XFree86-4-libraries/files/patch-z30 b/x11/XFree86-4-libraries/files/patch-z30 new file mode 100644 index 000000000000..ef13579fb010 --- /dev/null +++ b/x11/XFree86-4-libraries/files/patch-z30 @@ -0,0 +1,13 @@ +--- lib/GL/mesa/src/drv/Imakefile~ Sat Jul 1 08:35:56 2000 ++++ lib/GL/mesa/src/drv/Imakefile Tue Jul 18 16:52:39 2000 +@@ -59,6 +59,10 @@ + #endif + #endif + ++#if (defined(FreeBSDBuildXlib) && FreeBSDBuildXlib) || (defined(ModuleInstall) && !ModuleInstall) ++SUBDIRS = common ++#endif ++ + MakeSubdirs($(SUBDIRS)) + DependSubdirs($(SUBDIRS)) + diff --git a/x11/XFree86-4-libraries/files/patch-z31 b/x11/XFree86-4-libraries/files/patch-z31 new file mode 100644 index 000000000000..263d2ece5950 --- /dev/null +++ b/x11/XFree86-4-libraries/files/patch-z31 @@ -0,0 +1,35 @@ +--- lib/GL/Imakefile.orig Thu Jul 27 16:05:37 2000 ++++ lib/GL/Imakefile Thu Jul 27 16:08:01 2000 +@@ -283,10 +283,13 @@ + + #if NormalLibGlx + NormalDepLibraryTarget($(LIBNAME),$(GLXSUBDIRS) $(DONES),$(UOBJS)) ++#if !defined(LibInstall) || LibInstall + InstallLibrary($(LIBNAME),$(USRLIBDIR)) + #endif ++#endif + #if SharedLibGlx + SharedDepLibraryTarget($(LIBNAME),$(SOREV),$(GLXSUBDIRS) $(DONES),$(OBJS) $(THREADOBJS),.,.) ++#if !defined(LibInstall) || LibInstall + InstallSharedLibrary($(LIBNAME),$(SOREV),$(SHLIBDIR)) + #if LinkGLToUsrLib && AlternateUsrLibDir + install:: +@@ -296,13 +299,18 @@ + $(LN) $(SHLIBDIR)/lib$(LIBNAME).so.1 $(DESTDIR)$(SYSTEMUSRLIBDIR)/lib$(LIBNAME).so.1 + #endif + #endif ++#endif + #if DebugLibGlx + DebuggedDepLibraryTarget($(LIBNAME),$(GLXSUBDIRS) $(DONES),$(DOBJS)) ++#if !defined(LibInstall) || LibInstall + InstallLibrary($(LIBNAME)_d,$(USRLIBDIR)) + #endif ++#endif + #if ProfileLibGlx + ProfiledDepLibraryTarget($(LIBNAME),$(GLXSUBDIRS) $(DONES),$(POBJS)) ++#if !defined(LibInstall) || LibInstall + InstallLibrary($(LIBNAME)_p,$(USRLIBDIR)) ++#endif + #endif + + XCOMM libOSmesa needs libGL, so build it now diff --git a/x11/XFree86-4-libraries/files/patch-z32 b/x11/XFree86-4-libraries/files/patch-z32 new file mode 100644 index 000000000000..b24439066535 --- /dev/null +++ b/x11/XFree86-4-libraries/files/patch-z32 @@ -0,0 +1,12 @@ +--- lib/GL/mesa/src/OSmesa/Imakefile.orig Thu Jul 27 16:09:32 2000 ++++ lib/GL/mesa/src/OSmesa/Imakefile Thu Jul 27 16:10:11 2000 +@@ -243,7 +243,8 @@ + /*InstallLibrary($(LIBNAME),$(USRLIBDIR))*/ + + SharedDepLibraryTarget($(LIBNAME),$(SOREV), $(DONES), $(OBJS), ., .) ++#if !defined(LibInstall) || LibInstall + InstallSharedLibrary($(LIBNAME),$(SOREV),$(SHLIBDIR)) +- ++#endif + + DependTarget() diff --git a/x11/XFree86-4-libraries/files/patch-z33 b/x11/XFree86-4-libraries/files/patch-z33 new file mode 100644 index 000000000000..5c5d7498a63e --- /dev/null +++ b/x11/XFree86-4-libraries/files/patch-z33 @@ -0,0 +1,20 @@ +--- config/cf/Imake.rules.orig Thu Jul 27 15:15:59 2000 ++++ config/cf/Imake.rules Thu Jul 27 16:21:00 2000 +@@ -2266,7 +2266,7 @@ + #endif + + #ifndef LinkBuildLibrary +-#ifdef UseInstalled ++#if defined(UseInstalled) || (defined(LibInstall) && !defined(LibInstallBuild) && !LibInstall) || (defined(LibInstallBuild) && !LibInstallBuild) + #define LinkBuildLibrary(lib) $(_NULLCMD_) + #else + #define LinkBuildLibrary(lib) MakeDir($(BUILDLIBDIR)) @@\ +@@ -3205,7 +3205,7 @@ + #endif + + #ifndef InstallLibraryModule +-#if !DoLoadableServer ++#if !DoLoadableServer || (defined(ModuleInstall) && !ModuleInstall) + #define InstallLibraryModule(module,dest,subdir) /**/ + #else + #if MakeDllModules diff --git a/x11/XFree86-4-libraries/files/patch-z34 b/x11/XFree86-4-libraries/files/patch-z34 new file mode 100644 index 000000000000..1e19d6e99592 --- /dev/null +++ b/x11/XFree86-4-libraries/files/patch-z34 @@ -0,0 +1,33 @@ +--- lib/font/Imakefile~ Sun Feb 13 15:15:23 2000 ++++ lib/font/Imakefile Thu Jul 27 16:26:42 2000 +@@ -120,22 +120,30 @@ + + #if NormalLibFont + NormalDepLibraryTarget($(LIBNAME),$(SUBDIRS) $(DONES),$(STATIC_OBJS)) ++#if !defined(LibInstall) || LibInstall + InstallLibrary($(LIBNAME),$(USRLIBDIR)) ++#endif + #endif /* NormalLibFont */ + + #if SharedLibFont + SharedDepLibraryTarget($(LIBNAME),$(SOREV),$(SUBDIRS) $(DONES),$(SHARED_OBJS),.,.) ++#if !defined(LibInstall) || LibInstall + InstallSharedLibrary($(LIBNAME),$(SOREV),$(SHLIBDIR)) ++#endif + #endif /* SharedLibFont */ + + #if DebugLibFont + DebuggedDepLibraryTarget(Xfont,$(SUBDIRS) $(DONES),$(DEBUG_OBJS)) ++#if !defined(LibInstall) || LibInstall + InstallLibrary($(LIBNAME)_d,$(USRLIBDIR)) ++#endif + #endif /* DebugLibFont */ + + #if ProfileLibFont + ProfiledDepLibraryTarget(Xfont,$(SUBDIRS) $(DONES),$(PROFILE_OBJS)) ++#if !defined(LibInstall) || LibInstall + InstallLibrary($(LIBNAME)_p,$(USRLIBDIR)) ++#endif + #endif /* ProfileLibFont */ + + #if DoLoadableServer diff --git a/x11/XFree86-4-libraries/files/patch-z35 b/x11/XFree86-4-libraries/files/patch-z35 new file mode 100644 index 000000000000..ffcd2cac7cdd --- /dev/null +++ b/x11/XFree86-4-libraries/files/patch-z35 @@ -0,0 +1,12 @@ +--- lib/font/stubs/Imakefile.orig Thu Jul 27 17:02:54 2000 ++++ lib/font/stubs/Imakefile Thu Jul 27 17:03:24 2000 +@@ -18,7 +18,9 @@ + NormalLibraryObjectRule() + NormalLibraryTarget(fntstubs,$(OBJS)) + LintLibraryTarget(fntstubs,$(SRCS)) ++#if !defined(LibInstall) || LibInstall + InstallLibrary(fntstubs,$(USRLIBDIR)) ++#endif + NormalLintTarget($(SRCS)) + DependTarget() + diff --git a/x11/XFree86-4-libraries/files/patch-z37 b/x11/XFree86-4-libraries/files/patch-z37 new file mode 100644 index 000000000000..4f6e5a12a07c --- /dev/null +++ b/x11/XFree86-4-libraries/files/patch-z37 @@ -0,0 +1,24 @@ +--- programs/Xserver/hw/xfree86/xf86cfg/Imakefile.orig Thu Jun 15 04:42:20 2000 ++++ programs/Xserver/hw/xfree86/xf86cfg/Imakefile Sat Aug 19 18:09:24 2000 +@@ -2,6 +2,10 @@ + + XCOMM CDEBUGFLAGS=-g -Wall -ansi -pedantic + ++#if defined(FreeBSDBuildXbin) && FreeBSDBuildXbin ++INCLUDES = -I../parser ++#endif ++ + SRCS =\ + accessx.c\ + card-cfg.c\ +@@ -67,8 +71,10 @@ + + NormalProgramTarget($(PROG),$(OBJS),,$(LOCAL_LIBRARIES),) + InstallProgramWithFlags($(PROG),$(BINDIR),NullParameter) ++#if !defined(LibHeaders) || LibHeaders + InstallMultipleFlags($(XBMPICS),$(INCDIR)/X11/bitmaps,$(INSTINCFLAGS)) + InstallMultipleFlags($(XPMPICS),$(INCDIR)/X11/pixmaps,$(INSTINCFLAGS)) ++#endif + InstallAppDefaults(XF86Cfg) + InstallManPage(xf86cfg,$(MANDIR)) + diff --git a/x11/XFree86-4-libraries/pkg-plist b/x11/XFree86-4-libraries/pkg-plist index 208add084424..9ef39456ce5a 100644 --- a/x11/XFree86-4-libraries/pkg-plist +++ b/x11/XFree86-4-libraries/pkg-plist @@ -1,5 +1,3 @@ -bin/bdftopcf -bin/mkfontdir include/DPS/ColorSB.h include/DPS/ColorSBP.h include/DPS/DPSScrollW.h @@ -29,10 +27,8 @@ include/DPS/psops.h include/GL/gl.h include/GL/glext.h include/GL/glx.h -include/GL/glxint.h -include/GL/glxmd.h -include/GL/glxproto.h include/GL/glxtokens.h +include/GL/osmesa.h include/X11/Composite.h include/X11/CompositeP.h include/X11/ConstrainP.h @@ -195,12 +191,14 @@ include/X11/bitmaps/2x2 include/X11/bitmaps/black include/X11/bitmaps/boxes include/X11/bitmaps/calculator +include/X11/bitmaps/card.xbm include/X11/bitmaps/cntr_ptr include/X11/bitmaps/cntr_ptrmsk include/X11/bitmaps/cross_weave include/X11/bitmaps/dimple1 include/X11/bitmaps/dimple3 include/X11/bitmaps/dot +include/X11/bitmaps/down.xbm include/X11/bitmaps/dropbar7 include/X11/bitmaps/dropbar8 include/X11/bitmaps/escherknot @@ -217,7 +215,9 @@ include/X11/bitmaps/grid8 include/X11/bitmaps/hlines2 include/X11/bitmaps/hlines3 include/X11/bitmaps/icon +include/X11/bitmaps/keyboard.xbm include/X11/bitmaps/keyboard16 +include/X11/bitmaps/left.xbm include/X11/bitmaps/left_ptr include/X11/bitmaps/left_ptrmsk include/X11/bitmaps/letters @@ -232,25 +232,33 @@ include/X11/bitmaps/menu12 include/X11/bitmaps/menu16 include/X11/bitmaps/menu6 include/X11/bitmaps/menu8 +include/X11/bitmaps/monitor.xbm +include/X11/bitmaps/mouse.xbm +include/X11/bitmaps/narrower.xbm include/X11/bitmaps/noletters include/X11/bitmaps/opendot include/X11/bitmaps/opendotMask include/X11/bitmaps/plaid +include/X11/bitmaps/right.xbm include/X11/bitmaps/right_ptr include/X11/bitmaps/right_ptrmsk include/X11/bitmaps/root_weave include/X11/bitmaps/scales +include/X11/bitmaps/shorter.xbm include/X11/bitmaps/sipb include/X11/bitmaps/star include/X11/bitmaps/starMask include/X11/bitmaps/stipple +include/X11/bitmaps/taller.xbm include/X11/bitmaps/target include/X11/bitmaps/terminal include/X11/bitmaps/tie_fighter +include/X11/bitmaps/up.xbm include/X11/bitmaps/vlines2 include/X11/bitmaps/vlines3 include/X11/bitmaps/weird_size include/X11/bitmaps/wide_weave +include/X11/bitmaps/wider.xbm include/X11/bitmaps/wingdogs include/X11/bitmaps/woman include/X11/bitmaps/xfd_icon @@ -345,9 +353,107 @@ include/X11/fonts/codeconv/xttversion.h include/X11/fonts/fsmasks.h include/X11/keysym.h include/X11/keysymdef.h +include/X11/pixmaps/card.xpm +include/X11/pixmaps/computer.xpm +include/X11/pixmaps/keyboard.xpm +include/X11/pixmaps/monitor.xpm +include/X11/pixmaps/mouse.xpm include/X11/xpm.h -include/xf86Parser.h include/xf86Optrec.h +include/xf86Parser.h +lib/X11/doc/html/Xaw.3.html +lib/X11/doc/html/libxrx.1.html +lib/X11/locale/C/XLC_LOCALE +lib/X11/locale/armscii-8/Compose +lib/X11/locale/armscii-8/XLC_LOCALE +lib/X11/locale/compose.dir +lib/X11/locale/en_US.UTF-8/XLC_LOCALE +lib/X11/locale/en_US.utf/Compose +lib/X11/locale/en_US.utf/XLC_LOCALE +lib/X11/locale/georgian-academy/Compose +lib/X11/locale/georgian-academy/XLC_LOCALE +lib/X11/locale/georgian-ps/Compose +lib/X11/locale/georgian-ps/XLC_LOCALE +lib/X11/locale/ibm-cp1133/Compose +lib/X11/locale/ibm-cp1133/XLC_LOCALE +lib/X11/locale/iso8859-1/Compose +lib/X11/locale/iso8859-1/XLC_LOCALE +lib/X11/locale/iso8859-10/Compose +lib/X11/locale/iso8859-10/XLC_LOCALE +lib/X11/locale/iso8859-14/Compose +lib/X11/locale/iso8859-14/XLC_LOCALE +lib/X11/locale/iso8859-15/Compose +lib/X11/locale/iso8859-15/XLC_LOCALE +lib/X11/locale/iso8859-2/Compose +lib/X11/locale/iso8859-2/XLC_LOCALE +lib/X11/locale/iso8859-3/Compose +lib/X11/locale/iso8859-3/XLC_LOCALE +lib/X11/locale/iso8859-4/Compose +lib/X11/locale/iso8859-4/XLC_LOCALE +lib/X11/locale/iso8859-5/Compose +lib/X11/locale/iso8859-5/XLC_LOCALE +lib/X11/locale/iso8859-6/Compose +lib/X11/locale/iso8859-6/XLC_LOCALE +lib/X11/locale/iso8859-7/Compose +lib/X11/locale/iso8859-7/XLC_LOCALE +lib/X11/locale/iso8859-8/Compose +lib/X11/locale/iso8859-8/XLC_LOCALE +lib/X11/locale/iso8859-9/Compose +lib/X11/locale/iso8859-9/XLC_LOCALE +lib/X11/locale/ja.JIS/Compose +lib/X11/locale/ja.JIS/XLC_LOCALE +lib/X11/locale/ja.SJIS/Compose +lib/X11/locale/ja.SJIS/XLC_LOCALE +lib/X11/locale/ja/Compose +lib/X11/locale/ja/XLC_LOCALE +lib/X11/locale/ko/Compose +lib/X11/locale/ko/XLC_LOCALE +lib/X11/locale/koi8-r/Compose +lib/X11/locale/koi8-r/XLC_LOCALE +lib/X11/locale/koi8-u/Compose +lib/X11/locale/koi8-u/XLC_LOCALE +lib/X11/locale/locale.alias +lib/X11/locale/locale.dir +lib/X11/locale/mulelao-1/Compose +lib/X11/locale/mulelao-1/XLC_LOCALE +lib/X11/locale/tbl_data/gb2312 +lib/X11/locale/tbl_data/jis0201 +lib/X11/locale/tbl_data/jis0208 +lib/X11/locale/tbl_data/ksc5601 +lib/X11/locale/tbl_data/tab8859_1 +lib/X11/locale/tbl_data/tab8859_10 +lib/X11/locale/tbl_data/tab8859_14 +lib/X11/locale/tbl_data/tab8859_15 +lib/X11/locale/tbl_data/tab8859_2 +lib/X11/locale/tbl_data/tab8859_3 +lib/X11/locale/tbl_data/tab8859_4 +lib/X11/locale/tbl_data/tab8859_5 +lib/X11/locale/tbl_data/tab8859_6 +lib/X11/locale/tbl_data/tab8859_7 +lib/X11/locale/tbl_data/tab8859_8 +lib/X11/locale/tbl_data/tab8859_9 +lib/X11/locale/tbl_data/tabarmscii_8 +lib/X11/locale/tbl_data/tabgeorgian_academy +lib/X11/locale/tbl_data/tabgeorgian_ps +lib/X11/locale/tbl_data/tabibm_cp1133 +lib/X11/locale/tbl_data/tabkoi8_r +lib/X11/locale/tbl_data/tabkoi8_u +lib/X11/locale/tbl_data/tabmulelao_1 +lib/X11/locale/tbl_data/tabtcvn +lib/X11/locale/tbl_data/tabtis620 +lib/X11/locale/tbl_data/tabviscii +lib/X11/locale/th_TH.TACTIS/Compose +lib/X11/locale/th_TH.TACTIS/XLC_LOCALE +lib/X11/locale/vi_VN.tcvn/Compose +lib/X11/locale/vi_VN.tcvn/XLC_LOCALE +lib/X11/locale/vi_VN.viscii/Compose +lib/X11/locale/vi_VN.viscii/XLC_LOCALE +lib/X11/locale/zh/Compose +lib/X11/locale/zh/XLC_LOCALE +lib/X11/locale/zh_TW.Big5/Compose +lib/X11/locale/zh_TW.Big5/XLC_LOCALE +lib/X11/locale/zh_TW/Compose +lib/X11/locale/zh_TW/XLC_LOCALE lib/libFS.a lib/libGL.a lib/libGL.so @@ -355,6 +461,8 @@ lib/libGL.so.1 lib/libICE.a lib/libICE.so lib/libICE.so.6 +lib/libOSMesa.so +lib/libOSMesa.so.3 lib/libPEX5.a lib/libPEX5.so lib/libPEX5.so.6 @@ -420,6 +528,5 @@ lib/libpsres.so.1 lib/libxf86config.a lib/libxkbfile.a lib/libxkbui.a -@dirrm include/DPS -@dirrm include/GL -@dirrm include/X11/fonts/codeconv +lib/libxrx.so +lib/libxrx.so.6 diff --git a/x11/XFree86-4-libraries/scripts/configure b/x11/XFree86-4-libraries/scripts/configure index b83db75bcfec..715c6eededff 100644 --- a/x11/XFree86-4-libraries/scripts/configure +++ b/x11/XFree86-4-libraries/scripts/configure @@ -22,8 +22,16 @@ configure () { grep -v '#define.*ProjectRoot' $ORIGHOSTDEF >> $LOCALDEF echo "#define ProjectRoot $PREFIX" >> $LOCALDEF + # It's good for FreeBSD ports/packages system. + echo "#define NothingOutsideProjectRoot YES" >> $LOCALDEF + + # I want to set this line. + # but the probrem is too deep. not yet done. + # echo "#define InstallXserverSetUID NO" >> $LOCALDEF + # disable some configs: there are not used this ports - for i in InstallXdmConfig \ + for i in \ + InstallXdmConfig \ InstallXinitConfig \ InstallFSConfig \ InstallAppDefFiles \ |