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-servers/XFree86-4-NestServer | |
parent | remove bogus dependence to bash1 (diff) |
Update XFree86-4-* ports which share XFree86-4-libraries's patches:
- Reduce build times by not rebuilding some programs/libraries in each port.
- Move some files from -clients to -libraries and from -libraries to -server.
- Make package-building in XFree86-4 more intuitive
PR: 41606 (package building)
Notes
Notes:
svn path=/head/; revision=66552
Diffstat (limited to 'x11-servers/XFree86-4-NestServer')
-rw-r--r-- | x11-servers/XFree86-4-NestServer/Makefile | 12 | ||||
-rw-r--r-- | x11-servers/XFree86-4-NestServer/scripts/configure | 1 |
2 files changed, 6 insertions, 7 deletions
diff --git a/x11-servers/XFree86-4-NestServer/Makefile b/x11-servers/XFree86-4-NestServer/Makefile index d158fba086b6..f7a348973303 100644 --- a/x11-servers/XFree86-4-NestServer/Makefile +++ b/x11-servers/XFree86-4-NestServer/Makefile @@ -23,18 +23,16 @@ USE_IMAKE= YES DIST_SUBDIR= xc WRKSRC= ${WRKDIR}/xc PATCHDIR= ${.CURDIR}/../../x11/XFree86-4-libraries/files -MAKE_ENV= MAN_INSTALL_TARGET=installXnest.man -ALL_TARGET= FreeBSDPortsBuild -INSTALL_TARGET= installXnest installXserver.man MANCOMPRESSED= yes MAN1= Xnest.1 Xserver.1 +XBUILD_DIRS= lib/font lib/lbxutil lib/Xdmcp lib/Xau programs/Xserver +XINCLUDE_DIRS= lib/xkbfile lib/xtrans +XINSTALL_DIRS= programs/Xserver +XINSTALL_MAN_DIRS= ${XINSTALL_DIRS} post-extract: ${GUNZIP_CMD} -c ${DISTDIR}/${DIST_SUBDIR}/Wraphelp.gz > \ ${WRKSRC}/lib/Xdmcp/Wraphelp.c -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.mk> diff --git a/x11-servers/XFree86-4-NestServer/scripts/configure b/x11-servers/XFree86-4-NestServer/scripts/configure index a7ac5359f3be..a05984bb5a3a 100644 --- a/x11-servers/XFree86-4-NestServer/scripts/configure +++ b/x11-servers/XFree86-4-NestServer/scripts/configure @@ -48,6 +48,7 @@ configure () { echo "#define BuildServer YES" >> $LOCALDEF echo "#define XnestServer YES" >> $LOCALDEF echo "#define BuildServersOnly YES" >> $LOCALDEF + echo "#define UseInstalledPrograms YES" >> $LOCALDEF # Copy ORIGDEF to DESTDEF rm -f $DESTDEF |