diff options
| author | Eric Anholt <anholt@FreeBSD.org> | 2002-09-18 04:23:00 +0000 |
|---|---|---|
| committer | Eric Anholt <anholt@FreeBSD.org> | 2002-09-18 04:23:00 +0000 |
| commit | 372f7910fbb9bf67f402b842b342b3a398e76348 (patch) | |
| tree | 14f36036dbdec2be2cdc787f068586f08782f92b /x11/XFree86-4-clients | |
| parent | ab0635ddfaa1fbbab575e49262493dad2f3cb742 (diff) | |
Notes
Diffstat (limited to 'x11/XFree86-4-clients')
| -rw-r--r-- | x11/XFree86-4-clients/Makefile | 19 | ||||
| -rw-r--r-- | x11/XFree86-4-clients/pkg-plist | 2 | ||||
| -rw-r--r-- | x11/XFree86-4-clients/scripts/configure | 5 |
3 files changed, 12 insertions, 14 deletions
diff --git a/x11/XFree86-4-clients/Makefile b/x11/XFree86-4-clients/Makefile index 959798ed7cd2..b77dd5d00a35 100644 --- a/x11/XFree86-4-clients/Makefile +++ b/x11/XFree86-4-clients/Makefile @@ -7,18 +7,17 @@ PORTNAME= clients PORTVERSION= 4.2.1 +PORTREVISION= 1 CATEGORIES= x11 MASTER_SITES= ${MASTER_SITE_XFREE:S/$/:x/} \ - ${MASTER_SITE_XFREE:S/source//g:S/$/:x421patch/} \ - ${MASTER_SITE_LOCAL:S/$/:local/} + ${MASTER_SITE_XFREE:S/source//g:S/$/:x421patch/} MASTER_SITE_SUBDIR= 4.2.0/:x \ ${PORTVERSION}/patches/:x421patch \ anholt/:local PKGNAMEPREFIX= XFree86- DISTFILES= X420src-1.tgz:x \ X420src-2.tgz:x \ - 4.2.0-4.2.1.diff.gz:x421patch \ - Wraphelp.gz:local + 4.2.0-4.2.1.diff.gz:x421patch EXTRACT_ONLY= X420src-1.tgz PATCH_DIST_STRIP= -p1 @@ -41,8 +40,9 @@ SCRIPTS_ENV= InstallXdmConfig=${InstallXdmConfig} \ MAKE_ENV= PKGNAMEPREFIX=${PKGNAMEPREFIX} \ PORTNAME=${PORTNAME} \ PORTVERSION=${PORTVERSION} -ALL_TARGET= FreeBSDPortsBuild -INSTALL_TARGET= FreeBSDPortsInstall FreeBSDPortsInstall.man +XBUILD_DIRS= lib/xtrans lib/lbxutil programs fonts/util +XINSTALL_DIRS= programs fonts/util +XINSTALL_MAN_DIRS= programs # --- # XFree86 User Config: @@ -67,8 +67,6 @@ post-extract: ${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} \ ${DISTDIR}/${DIST_SUBDIR}/X420src-2.tgz \ | ${TAR} -xf - xc/fonts/util ) - ${GUNZIP_CMD} -c ${DISTDIR}/${DIST_SUBDIR}/Wraphelp.gz > \ - ${WRKSRC}/lib/Xdmcp/Wraphelp.c pre-patch: -@${GZCAT} ${DISTDIR}/${DIST_SUBDIR}/4.2.0-4.2.1.diff.gz \ | ${PATCH} ${PATCH_DIST_ARGS} --batch @@ -79,10 +77,7 @@ post-patch: ${LN} -s zh_TW.big5 $$i/zh_TW.Big5; \ done -do-configure: - cd ${.CURDIR} && ${SETENV} ${SCRIPTS_ENV} ${SH} ${SCRIPTDIR}/configure - @cd ${WRKSRC}; ${MAKE} FreeBSDPortsConfigure - +.include "${.CURDIR}/../../x11/XFree86-4-libraries/Makefile.inc" .include <bsd.port.pre.mk> .include "${FILESDIR}/manpages" .include <bsd.port.post.mk> diff --git a/x11/XFree86-4-clients/pkg-plist b/x11/XFree86-4-clients/pkg-plist index 6b7b9781e75a..f8772e3c973c 100644 --- a/x11/XFree86-4-clients/pkg-plist +++ b/x11/XFree86-4-clients/pkg-plist @@ -125,8 +125,6 @@ include/X11/bitmaps/black6 include/X11/bitmaps/box6 include/X11/bitmaps/ldblarrow include/X11/bitmaps/rdblarrow -lib/X11/XErrorDB -lib/X11/XKeysymDB lib/X11/app-defaults/Beforelight lib/X11/app-defaults/Bitmap lib/X11/app-defaults/Bitmap-color diff --git a/x11/XFree86-4-clients/scripts/configure b/x11/XFree86-4-clients/scripts/configure index c562846bc8bb..3a792aa57e49 100644 --- a/x11/XFree86-4-clients/scripts/configure +++ b/x11/XFree86-4-clients/scripts/configure @@ -70,6 +70,11 @@ configure () { echo "#define LibInstallBuild YES" >> $LOCALDEF echo "#define FreeBSDBuildXlib NO" >> $LOCALDEF echo "#define FreeBSDBuildXbin YES" >> $LOCALDEF + echo "#define StandardIncludes -I$PREFIX/include" >> $LOCALDEF + echo "#define DontUseLibPathVar YES" >> $LOCALDEF + echo "#define PreloadSetup" >> $LOCALDEF + echo "#define BuildPlugin NO" >> $LOCALDEF + echo "#define UseInstalledPrograms YES" >> $LOCALDEF # Copy ORIGDEF to DESTDEF rm -f $DESTDEF |