Index: Makefile =================================================================== RCS file: /home/ncvs/ports/x11-servers/XFree86-4-Server/Makefile,v retrieving revision 1.150 diff -u -r1.150 Makefile --- Makefile 9 Nov 2003 08:27:26 -0000 1.150 +++ Makefile 9 Nov 2003 10:51:53 -0000 @@ -7,18 +7,12 @@ PORTNAME= Server PORTVERSION= 4.3.0 -PORTREVISION= 12 +PORTREVISION= 13 CATEGORIES= x11-servers -MASTER_SITES= ${MASTER_SITE_XFREE:S/$/:x/} \ - ${MASTER_SITE_LOCAL:S/$/:local/} -MASTER_SITE_SUBDIR= ${PORTVERSION}/:x \ - anholt/:local +MASTER_SITES= ${MASTER_SITE_XFREE} +MASTER_SITE_SUBDIR= ${PORTVERSION} PKGNAMEPREFIX= XFree86- -DISTFILES= X430src-1.tgz:x \ - X430src-2.tgz:x \ - X430src-3.tgz:x \ - Wraphelp2.gz:local -EXTRACT_ONLY= X430src-1.tgz \ +DISTFILES= X430src-1.tgz \ X430src-2.tgz \ X430src-3.tgz @@ -31,7 +25,7 @@ patch-radeon_cursor.c patch-radeon_reg.h patch-smi \ patch-libc_wrapper.c patch-xf86-common-Imakefile patch-loader-Imakefile \ patch-loader-elfloader.c patch-bsd-Imakefile patch-bsd-bsdResource.c \ - patch-bus-Imakefile \ + patch-bus-Imakefile patch-Xserver-os-Imakefile patch-os-utils.c \ patch-compiler.h patch-os-support_Imakefile patch-bsd_Imakefile \ patch-freebsdPci.c patch-bus_Imakefile patch-xf86Sbus.h patch-loader.c \ patch-Sbus.c patch-elfloader.c patch-xfree86.cf patch-FreeBSD.cf \ @@ -86,9 +80,11 @@ wacom.4 MAN5= XF86Config.5 PKGMESSAGE= ${WRKDIR}/.pkg-message -XBUILD_DIRS= lib/font lib/lbxutil lib/Xdmcp lib/Xau programs/Xserver +USE_REINPLACE= yes + +XBUILD_DIRS= lib/font lib/lbxutil programs/Xserver XINCLUDE_DIRS= lib/xkbfile lib/xtrans -XINSTALL_DIRS= lib/font programs/Xserver +XINSTALL_DIRS= programs/Xserver XINSTALL_MAN_DIRS= programs/Xserver NOT_FOR_ARCHS= ia64 @@ -149,10 +145,13 @@ PLIST_SUB+= I386="@comment " .endif -post-extract:: - ${GUNZIP_CMD} -c ${DISTDIR}/${DIST_SUBDIR}/Wraphelp2.gz > \ - ${WRKSRC}/lib/Xdmcp/Wraphelp.c - +post-patch: + ${REINPLACE_CMD} -e 's|include "Xtrans|include "X11/Xtrans/Xtrans|g ; \ + s|X11/Xtrans.h|X11/Xtrans/Xtrans.h|g' \ + ${WRKSRC}/lib/font/fc/*.[ch] \ + ${WRKSRC}/programs/Xserver/os/*.c \ + ${WRKSRC}/programs/Xserver/Xext/appgroup.c \ + ${WRKSRC}/programs/Xserver/Xext/xf86misc.c post-build: @${RM} -f ${PKGMESSAGE} @${CAT} ${.CURDIR}/pkg-message >> ${PKGMESSAGE} Index: files/patch-Xserver-Imakefile =================================================================== RCS file: files/patch-Xserver-Imakefile diff -N files/patch-Xserver-Imakefile --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ files/patch-Xserver-Imakefile 9 Nov 2003 06:17:55 -0000 @@ -0,0 +1,20 @@ +--- programs/Xserver/Imakefile.orig Sat Nov 8 22:12:51 2003 ++++ programs/Xserver/Imakefile Sat Nov 8 22:17:22 2003 +@@ -219,7 +219,7 @@ + #if BuildLBX || GzipFontCompression + ZLIB = GzipLibrary + #endif +- OS = os/LibraryTargetName(os) $(DEPXAUTHLIB) $(DEPXDMCPLIB) ++ OS = os/LibraryTargetName(os) -L${X11BASE}/lib -lXau -lXdmcp + BSDEMUL = $(DEPXBSDLIB) + #if DoLoadableServer + MFB = mfb/ModuleLibraryTargetName(mfb) +@@ -269,7 +269,7 @@ + #if XserverStaticFontLib + FONT = $(FONTLIBSRC)/LibraryTargetName(Xfont) $(FREETYPE2LIB) + #else +- FONT = $(LDPRELIB) $(XFONTLIB) ++ FONT = -L${X11BASE}/lib $(XFONTLIB) + #endif + #if FontLibSharedFreeType + SERVERFT2 = $(FREETYPE2LIB) Index: files/patch-Xserver-os-Imakefile =================================================================== RCS file: files/patch-Xserver-os-Imakefile diff -N files/patch-Xserver-os-Imakefile --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ files/patch-Xserver-os-Imakefile 9 Nov 2003 11:17:27 -0000 @@ -0,0 +1,29 @@ +--- programs/Xserver/os/Imakefile.orig Thu Nov 14 13:01:21 2002 ++++ programs/Xserver/os/Imakefile Sun Nov 9 03:16:53 2003 +@@ -114,14 +114,14 @@ + #if HasPam && HasPamMisc + PAM_DEFINES = -DUSE_PAM + #endif +- DEFINES = -DXSERV_t -DTRANS_SERVER $(CONNECTION_FLAGS) $(MEM_DEFINES) \ ++ DEFINES = -DXSERV_t -DTRANS_SERVER $(MEM_DEFINES) \ + $(XDMAUTHDEFS) $(RPCDEFS) $(SIGNAL_DEFINES) $(OS_DEFINES) \ + $(KRB5_DEFINES) $(RGB_DEFINES) $(GETPEEREID_DEFINES) + INCLUDES = -I. -I../include -I$(XINCLUDESRC) -I$(EXTINCSRC) \ + -I$(SERVERSRC)/Xext -I$(FONTINCSRC) -I$(SERVERSRC)/render \ +- -I$(TOP)/lib/Xau -I../lbx Krb5Includes ++ -I${X11BASE}/include/X11 -I../lbx Krb5Includes + DEPEND_DEFINES = $(DBM_DEFINES) $(XDMCP_DEFINES) $(EXT_DEFINES) \ +- $(TRANS_INCLUDES) $(CONNECTION_FLAGS) DependDefines ++ $(CONNECTION_FLAGS) DependDefines + LINTLIBS = ../dix/llib-ldix.ln + + #ifdef NEED_ALLOCA_FROM_LIBPW +@@ -149,7 +149,7 @@ + SpecialCObjectRule(xdmcp,$(ICONFIGFILES),$(SOCK_DEFINES) $(XDMCP_DEFINES)) + SpecialCObjectRule(connection,$(ICONFIGFILES),$(SOCK_DEFINES) $(XDMCP_DEFINES)) + SpecialCObjectRule(transport,$(ICONFIGFILES),$(TRANS_INCLUDES) $(CONN_DEFINES) $(SOCK_DEFINES)) +-LinkSourceFile(transport.c,$(TRANSCOMMSRC)) ++LinkSourceFile(transport.c,${X11BASE}/include/X11/Xtrans) + SpecialCObjectRule(osinit,$(ICONFIGFILES),$(ADM_DEFINES)) + SpecialCObjectRule(WaitFor,$(ICONFIGFILES),$(EXT_DEFINES)) + SpecialCObjectRule(io,$(ICONFIGFILES),$(EXT_DEFINES)) Index: files/patch-os-utils.c =================================================================== RCS file: files/patch-os-utils.c diff -N files/patch-os-utils.c --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ files/patch-os-utils.c 9 Nov 2003 10:29:16 -0000 @@ -0,0 +1,11 @@ +--- programs/Xserver/os/utils.c.orig Sun Nov 9 02:26:04 2003 ++++ programs/Xserver/os/utils.c Sun Nov 9 02:26:41 2003 +@@ -95,6 +95,8 @@ + + #include /* for malloc() */ + ++#include ++ + #if defined(TCPCONN) || defined(STREAMSCONN) + # ifndef WIN32 + # include Index: scripts/configure =================================================================== RCS file: /home/ncvs/ports/x11-servers/XFree86-4-Server/scripts/configure,v retrieving revision 1.78 diff -u -r1.78 configure --- scripts/configure 9 Nov 2003 08:27:26 -0000 1.78 +++ scripts/configure 9 Nov 2003 10:09:46 -0000 @@ -17,6 +17,7 @@ rm -f $LOCALDEF grep -v '#define.*ProjectRoot' $ORIGHOSTDEF >> $LOCALDEF echo "#define ProjectRoot $PREFIX" >> $LOCALDEF +echo "#define X11ProjectRoot $PREFIX" >> $LOCALDEF # This is also defined in xf86site.def, but doesn't get # picked up for some reason. @@ -42,6 +43,7 @@ BuildType1Fonts \ BuildCIDFonts \ BuildCyrillicFonts \ + BuildFontLib \ JoystickSupport \ XnestServer \ BuildFontServer \ @@ -50,6 +52,7 @@ LibHeaders \ LibInstall \ ForceNormalLib \ + XserverStaticFontLib \ XTrueTypeInstallCConvHeaders do \ echo "#define $i NO" >> $LOCALDEF @@ -62,6 +65,7 @@ echo "#define BuildServersOnly YES" >> $LOCALDEF echo "#define BuildGLXLibrary YES" >> $LOCALDEF echo "#define BuildXFree86ConfigTools YES" >> $LOCALDEF +echo "#define UseInstalled YES" >> $LOCALDEF echo "#define UseInstalledPrograms YES" >> $LOCALDEF echo "#define StandardIncludes -I${PREFIX}/include" >> $LOCALDEF