Makefiles have been simplified, and most of the work is now done in

configure. In particular patches are now done by the script.
The port is now interactive, (ask for servers to be build, if you want
to build fonts, etc) This time I have build it (successfully) from a cdrom.

1 files changed, 29 insertions, 9 deletions

diff --git a/x11/XFree86-4-libraries/Makefile b/x11/XFree86-4-libraries/Makefile
index 8dd186298ab1..ebda54445823 100644
--- a/x11/XFree86-4-libraries/Makefile
+++ b/x11/XFree86-4-libraries/Makefile
@@ -1,23 +1,28 @@
-DISTNAME	=	xc
-PKGNAME		= 	XFree86-3.1.1
-WRKDIR?=                ${.CURDIR}/work
-BUILD_COOKIE?=		${WRKDIR}/.build_done
-PATCH_STRIP	=	-p1
-
 # uncomment one of the 2 lines below!
 #X11_ON_CDROM	=	yes
 X11_VIA_FTP	=	yes
 
+#if you are compiling from a cdrom, set the directory where the
+# the patch files are
+#X11FIXES = /home/X11R6
+
 #define this if you are short of space - save ~28 Mbytes
 #REMOVE_NOT_ESSENTIAL	=	yes
 
+#######################################################################
+DISTNAME	=	xc
+PKGNAME		= 	XFree86-3.1.1
+WRKDIR?=                ${.CURDIR}/work
+BUILD_COOKIE?=		${WRKDIR}/.build_done
+EXTRACT_COOKIE?=	${WRKDIR}/.extract_done
+IS_INTERACTIVE=		yes
 
 .if defined(X11_ON_CDROM) || defined(X11_VIA_FTP)
+
 build: configure ${BUILD_COOKIE}
 
 ${BUILD_COOKIE}:
 	@echo "===>  Building for ${DISTNAME}"
-	@${MAKE} ${.MAKEFLAGS} pre-build
 .if defined(REMOVE_NOT_ESSENTIAL)
 	@rm -rf ${WRKSRC}/test ${WRKSRC}/doc/hardcopy ${WRKSRC}/doc/specs
 	@find ${WRKSRC}/ -name '*.orig' -exec rm -f {} ';'
@@ -28,10 +33,25 @@ ${BUILD_COOKIE}:
 install:
 	@(cd ${WRKSRC}; make install; make install.man)
 	@touch ${WRKDIR}/.install_done
+.if defined(X11_ON_CDROM) 
+	@find /usr/X11R6/ -name 00_TRANS.TBL -exec rm -f {} ';'
+.endif
 .endif
 
 .if defined(X11_ON_CDROM)
-.include "Makefile.cdrom"
+.if !defined (X11FIXES)
+configure:
+	@echo Edit the makefile and set X11FIXES !!!!
+	@exit 1;
+.endif
+fetch:
+	@echo -n
+${EXTRACT_COOKIE}:
+	@rm -rf ${WRKDIR}
+	@mkdir -p ${WRKDIR}
+	@echo ${X11FIXES} > ${WRKDIR}/.cdrom
+	@${TOUCH} ${TOUCH_FLAGS} ${EXTRACT_COOKIE}
+
 .elif defined(X11_VIA_FTP)
 .include "Makefile.ftp"
 .else
@@ -49,4 +69,4 @@ install:
 	@echo -n
 .endif
 
-
+.include <bsd.port.mk>