aboutsummaryrefslogtreecommitdiff
path: root/x11-servers/XFree86-4-FontServer
diff options
context:
space:
mode:
authorEric Anholt <anholt@FreeBSD.org>2002-07-18 20:30:22 +0000
committerEric Anholt <anholt@FreeBSD.org>2002-07-18 20:30:22 +0000
commita5596482c6ab677399ec6caa872847fb08a36bcd (patch)
treeb964abf535bc03854ad6684d05872c74c936bf8f /x11-servers/XFree86-4-FontServer
parentb4b23fe6b8b83e2f81e86d26fc88d98f022f98da (diff)
downloadports-a5596482c6ab677399ec6caa872847fb08a36bcd.tar.gz
ports-a5596482c6ab677399ec6caa872847fb08a36bcd.zip
Notes
Diffstat (limited to 'x11-servers/XFree86-4-FontServer')
-rw-r--r--x11-servers/XFree86-4-FontServer/Makefile12
-rw-r--r--x11-servers/XFree86-4-FontServer/distinfo1
-rw-r--r--x11-servers/XFree86-4-FontServer/scripts/configure14
3 files changed, 19 insertions, 8 deletions
diff --git a/x11-servers/XFree86-4-FontServer/Makefile b/x11-servers/XFree86-4-FontServer/Makefile
index 119d217f81a5..3c2b77d3f155 100644
--- a/x11-servers/XFree86-4-FontServer/Makefile
+++ b/x11-servers/XFree86-4-FontServer/Makefile
@@ -8,10 +8,15 @@
PORTNAME= FontServer
PORTVERSION= 4.2.0
CATEGORIES= x11-servers x11-fonts
-MASTER_SITES= ${MASTER_SITE_XFREE}
+MASTER_SITES= ${MASTER_SITE_XFREE} \
+ ftp://psych.psy.uq.oz.au/pub/X11R5/:wrap \
+ ftp://ftp.internat.freebsd.org/pub/FreeBSD/X11-Crypto/:wrap \
+ ftp://ftp3.za.freebsd.org/pub/FreeBSD/X11-Crypto/:wrap
MASTER_SITE_SUBDIR= ${PORTVERSION}
PKGNAMEPREFIX= XFree86-
-DISTFILES= X${PORTVERSION:S/.//g}src-1.tgz
+DISTFILES= X${PORTVERSION:S/.//g}src-1.tgz Wraphelp.c:wrap
+EXTRACT_ONLY= X${PORTVERSION:S/.//g}src-1.tgz
+IGNOREFILES= Wraphelp.c
MAINTAINER= anholt@freebsd.org
@@ -25,6 +30,9 @@ ALL_TARGET= FreeBSDPortsBuild
INSTALL_TARGET= FreeBSDPortsInstall installXserver.man
MAN1= Xserver.1 xfs.1
+post-extract:
+ ${CP} ${DISTDIR}/${DIST_SUBDIR}/Wraphelp.c ${WRKSRC}/lib/Xdmcp/
+
do-configure:
cd ${.CURDIR} && ${SETENV} ${SCRIPTS_ENV} ${SH} ${SCRIPTDIR}/configure
@cd ${WRKSRC}; ${MAKE} FreeBSDPortsConfigure
diff --git a/x11-servers/XFree86-4-FontServer/distinfo b/x11-servers/XFree86-4-FontServer/distinfo
index df48626099b2..4766fc3aff79 100644
--- a/x11-servers/XFree86-4-FontServer/distinfo
+++ b/x11-servers/XFree86-4-FontServer/distinfo
@@ -1 +1,2 @@
MD5 (xc/X420src-1.tgz) = ad43a8e9e39703322005cd6f7145b77f
+MD5 (xc/Wraphelp.c) = IGNORE
diff --git a/x11-servers/XFree86-4-FontServer/scripts/configure b/x11-servers/XFree86-4-FontServer/scripts/configure
index a6a53f321679..3eabe6a46cd4 100644
--- a/x11-servers/XFree86-4-FontServer/scripts/configure
+++ b/x11-servers/XFree86-4-FontServer/scripts/configure
@@ -1,14 +1,14 @@
#!/bin/sh
-# This scripts work as following:
-# (1) cp current xf86site.def (it may be created by imake-4 ports)
+# This script does the following:
+# (1) cp current xf86site.def (it is created by the imake-4 port)
# to ${WRKDIR}/xc/config/cf.
-# this means this ports use imake-4's config defaultly.
+# this means this port uses imake-4's config for defaults.
# (2) Generate temporal config for compiling.
# Some configs, such as `ForceNormalLib', `FreeBSDBuildXprog', are
-# used for compiling this ports localy. so these configs will be generated
-# this scripts. these configs will be stored to `host.def' file.
-# but this host.def will never install. use local only.
+# used locally for compiling this port, so these configs will be generated
+# by this script. These configs will be stored to the `host.def' file,
+# but this host.def will never be installed.
ORIGDEF=$PREFIX/lib/X11/config/xf86site.def
DESTDEF=$WRKDIR/xc/config/cf/xf86site.def
@@ -58,6 +58,8 @@ configure () {
echo "#define InstallFSConfig $InstallFSConfig" >> $LOCALDEF
echo "#define FreeBSDBuildXfs YES" >> $LOCALDEF
+ # Copy ORIGDEF to DESTDEF
+ rm -f $DESTDEF
cp -f $ORIGDEF $DESTDEF
# copy generated config to host.def