Date: Wed, 17 Jul 1996 23:39:27 -0700 (PDT) From: asami@cs.berkeley.edu (Satoshi Asami) To: jmz@cabri.obs-besancon.fr Cc: ports@freebsd.org Subject: Re: Review request: x11/XFree86 port cleanup Message-ID: <199607180639.XAA28704@baloon.mimi.com> In-Reply-To: <9607171605.AA01486@cabri.obs-besancon.fr> (message from Jean-Marc Zucconi on Wed, 17 Jul 96 17:05:57 %2B0100)
next in thread | previous in thread | raw e-mail | index | archive | help
* Looks good. Makefile.ftp is small now - what do you think about
* putting its content in Makefile and removing it?
I thought about that too.
* Patch below (untested!)
It seems to work fine. Below is the final patch, I'll commit it if
you think it's ok (or you can commit it, of course).
Satoshi
PS: use "patch -psE"
=======
Index: Makefile
===================================================================
RCS file: /usr/cvs/ports/x11/XFree86/Makefile,v
retrieving revision 1.17
diff -u -r1.17 Makefile
--- Makefile 1996/02/15 00:53:15 1.17
+++ Makefile 1996/07/18 04:30:18
@@ -13,13 +13,17 @@
#######################################################################
#
# uncomment one of the 2 lines below!
-#(X-Consortium CDROM, O'Reilly 'X-Companion' CDROM, or X by FTP (_*BIG*_)
+#
+# X11_ON_CDROM means you have either X-Consortium CDROM or O'Reilly's
+# 'X-Companion' CDROM, X11_VIA_FTP means you have the FreeBSD CDROM
+# or want to ftp the whole thing _*BIG*_)
+#
#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 = ${DISTDIR}/xc
+X11FIXES = ${DISTDIR}
#define this if you are short of space - save ~28 Mbytes
#REMOVE_NOT_ESSENTIAL = yes
@@ -35,6 +39,8 @@
MAINTAINER= jmz@FreeBSD.ORG
+DIST_SUBDIR = xc
+
.if defined(DISTDIR)
.if exists (${DISTDIR}/xc-1.tar.gz)
X11_VIA_FTP = yes
@@ -58,11 +64,9 @@
@find ${WRKSRC}/ -name '*.orig' -exec rm -f {} ';'
.endif
@(cd ${WRKSRC}; echo Good night...; make World)
- @touch ${WRKDIR}/.build_done
do-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
@@ -80,10 +84,24 @@
@rm -rf ${WRKDIR}
@mkdir -p ${WRKDIR}
@echo ${X11FIXES} > ${WRKDIR}/.cdrom
- @${TOUCH} ${TOUCH_FLAGS} ${EXTRACT_COOKIE}
.elif defined(X11_VIA_FTP)
-.include "Makefile.ftp"
+DISTFILES1 = xc-1.tar.gz xc-2.tar.gz xc-3.tar.gz
+DISTFILES2 = fix-12 \
+ XFree86-3.1.2.diff.gz \
+ 3.1.2-3.1.2-S.diff.gz
+DISTFILES = ${DISTFILES1} ${DISTFILES2}
+MASTER_SITES = \
+ ftp://ftp.x.org/pub/R6/ \
+ ftp://ftp.EU.net/X11/R6/ \
+ ftp://ftp.x.org/pub/R6/fixes/ \
+ ftp://ftp.EU.net/X11/R6/fixes/ \
+ ftp://ftp.ibp.fr/pub/X11/XFree86/XFree86-3.1.2/patches/ \
+ ftp://ftp.xfree86.org/pub/XFree86/3.1.2/patches/
+EXTRACT_ONLY = ${DISTFILES1}
+
+pre-patch:
+ @echo ${DISTDIR} > ${WRKDIR}/.ftp
.else
do-fetch:
@echo Please set one of the 2 variables X11_ON_CDROM or X11_VIA_FTP
@@ -105,4 +123,3 @@
ldconfig -m ${PREFIX}/lib
.include <bsd.port.mk>
-
Index: Makefile.ftp
===================================================================
RCS file: /usr/cvs/ports/x11/XFree86/Makefile.ftp,v
retrieving revision 1.18
diff -u -r1.18 Makefile.ftp
--- Makefile.ftp 1996/07/01 20:28:33 1.18
+++ Makefile.ftp 1996/07/18 04:30:25
@@ -1,58 +0,0 @@
-DISTDIR= ${PORTSDIR}/distfiles/xc
-DISTFILES1 = xc-1.tar.gz xc-2.tar.gz xc-3.tar.gz
-DISTFILES2 = fixes/fix-12
-XFREE_DIFFS = XFree86-3.1.2.diff.gz \
- 3.1.2-3.1.2-S.diff.gz
-DISTFILES3 = ${XFREE_DIFFS}
-DISTFILES = ${DISTFILES1} ${DISTFILES3}
-
-.if !defined(MASTER_SITE_OVERRIDE)
-MASTER_SITES = ftp://ftp.x.org/pub/R6/ ftp://ftp.EU.net/X11/R6/
-MASTER_SITES2 = ftp://ftp.ibp.fr/pub/X11/XFree86/XFree86-3.1.2/patches/ ftp://ftp.xfree86.org/pub/XFree86/3.1.2/patches/
-.else
-MASTER_SITES = ${MASTER_SITE_OVERRIDE}xc/
-MASTER_SITES2 = ${MASTER_SITE_OVERRIDE}xc/
-.endif
-
-EXTRACT_ONLY = ${DISTFILES1}
-
-do-fetch:
- @if [ ! -d ${DISTDIR} ]; then \
- mkdir -p ${DISTDIR}; \
- fi
- @cd ${DISTDIR}; \
- for file in ${DISTFILES1} ${DISTFILES2} ${XFREE_TAR}; do \
- f=`basename $$file`;\
- if [ ! -f $$f ]; then \
- echo ">> $$f doesn't seem to exist on this system."; \
- for site in ${MASTER_SITES}; do \
- ${ECHO_MSG} ">> Attempting to fetch from $${site}"; \
- (${FETCH_CMD} ${FETCH_BEFORE_ARGS} $${site}$${file} ${FETCH_AFTER_ARGS} || true); \
- if [ -f $$file -o -f `/usr/bin/basename $$file` ]; then \
- continue 2; \
- fi \
- done; \
- echo ">> Couldn't fetch it - please try to retreive this";\
- echo ">> port manually into ${DISTDIR} and try again."; \
- exit 1; \
- fi; \
- done
- @cd ${DISTDIR}; \
- for file in ${DISTFILES3}; do \
- if [ ! -f $$file ]; then \
- echo ">> $$file doesn't seem to exist on this system."; \
- for site in ${MASTER_SITES2}; do \
- ${ECHO_MSG} ">> Attempting to fetch from $${site}"; \
- (${FETCH_CMD} ${FETCH_BEFORE_ARGS} $${site}$${file} ${FETCH_AFTER_ARGS} || true); \
- if [ -f $$file -o -f `/usr/bin/basename $$file` ]; then \
- continue 2; \
- fi \
- done; \
- echo ">> Couldn't fetch it - please try to retreive this";\
- echo ">> port manually into ${DISTDIR} and try again."; \
- exit 1; \
- fi \
- done
-
-pre-patch:
- @echo ${DISTDIR} > ${WRKDIR}/.ftp
Index: files/md5
===================================================================
RCS file: /usr/cvs/ports/x11/XFree86/files/md5,v
retrieving revision 1.3
diff -u -r1.3 md5
--- md5 1995/11/07 16:16:55 1.3
+++ md5 1996/07/17 06:13:13
@@ -1,6 +1,6 @@
MD5 (xc-1.tar.gz) = b5ae499273bddce4add5b62fc2b0b810
MD5 (xc-2.tar.gz) = e81d2d235dd517c3e36f588221910b03
MD5 (xc-3.tar.gz) = 01bb42c399a542395f0e17a182ba0e96
+MD5 (fix-12) = c1c86fcb0305089ce758b92b623ab24d
MD5 (XFree86-3.1.2.diff.gz) = cbb4ca154ed0882b1ee75326089ef4b5
MD5 (3.1.2-3.1.2-S.diff.gz) = 773acfe51ebbb4e557f4a14905b28f3f
-MD5 (cfont312.tgz) = 89a8e082dbbcfc2fd09cfedc47a54ff0
Index: scripts/configure
===================================================================
RCS file: /usr/cvs/ports/x11/XFree86/scripts/configure,v
retrieving revision 1.19
diff -u -r1.19 configure
--- configure 1996/03/22 11:49:28 1.19
+++ configure 1996/07/18 04:29:09
@@ -131,8 +131,10 @@
cpwh=$FILESDIR/Wraphelp.c
else
echo "==> Wraphelp.c not found, DES support NOT enabled."
- answ=NO
+ cpwh=NO
fi
+else
+ cpwh=NO
fi
echo "#undef HadXdmAuth" >> $F
echo "#define HasXdmAuth $answ" >> $F
@@ -145,15 +147,19 @@
END
-yesno "Do you want to add the Kerberos V4 support patches? [YES] "
-k4patch=$answ
-if [ $k4patch = YES ] ; then
- echo
- yesno "Do you want to enable Kerberos V4 support? [YES] "
- echo "#undef HasKrb4" >>$F
- echo "#define HasKrb4 $answ" >>$F
+if [ ! -f /usr/lib/libkrb.a ]; then
+ echo "No kerberos library in /usr/lib. Kerberos V4 support disabled."
+ k4patch=NO
+else
+ yesno "Do you want to add the Kerberos V4 support patches? [YES] "
+ k4patch=$answ
+ if [ $k4patch = YES ] ; then
+ echo
+ yesno "Do you want to enable Kerberos V4 support? [YES] "
+ echo "#undef HasKrb4" >>$F
+ echo "#define HasKrb4 $answ" >>$F
+ fi
fi
-
echo
echo "End of configuration questions. No more user input required"
echo
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?199607180639.XAA28704>