diff options
| author | Eric Anholt <anholt@FreeBSD.org> | 2003-05-14 07:02:07 +0000 |
|---|---|---|
| committer | Eric Anholt <anholt@FreeBSD.org> | 2003-05-14 07:02:07 +0000 |
| commit | 346aa455734970204e32ec95a9141b42597309e0 (patch) | |
| tree | 6e46b377672d64895c631cc3bea2c73c76851eb9 /x11-servers/XFree86-4-Server/Makefile | |
| parent | Whoops, remove commented out code from the previous version. (diff) | |
[1] Make the HTML manpages get put into the packages again.
[2] Check that XFREE86_VERSION=4 is set when building, rather than setting it.
[3] Move many common Makefile bits to XFree86-4-libraries/Makefile.inc
[4] Make the XFree86-4-Server port not install libXfont.so.
[5] Move the xcursor.pc file to its proper location in ${X11BASE}/libdata/pkgconfig
[6] Don't explicitly link libGL.so against libc, for the sake of 4.x's pthreads.
Submitted by: [5,6] Ports Fury
Notes
Notes:
svn path=/head/; revision=80962
Diffstat (limited to 'x11-servers/XFree86-4-Server/Makefile')
| -rw-r--r-- | x11-servers/XFree86-4-Server/Makefile | 15 |
1 files changed, 3 insertions, 12 deletions
diff --git a/x11-servers/XFree86-4-Server/Makefile b/x11-servers/XFree86-4-Server/Makefile index 81aafd038c59..b9183e954c58 100644 --- a/x11-servers/XFree86-4-Server/Makefile +++ b/x11-servers/XFree86-4-Server/Makefile @@ -7,7 +7,7 @@ PORTNAME= Server PORTVERSION= 4.3.0 -PORTREVISION= 7 +PORTREVISION= 8 CATEGORIES= x11-servers MASTER_SITES= ${MASTER_SITE_XFREE:S/$/:x/} \ ${MASTER_SITE_LOCAL:S/$/:local/} @@ -25,12 +25,6 @@ EXTRACT_ONLY= X430src-1.tgz \ MAINTAINER= anholt@freebsd.org COMMENT= XFree86-4 X server and related programs -XFREE86_VERSION= 4 -USE_IMAKE= YES -INSTALLS_SHLIB= YES -DIST_SUBDIR= xc -WRKSRC= ${WRKDIR}/xc -PATCHDIR= ${.CURDIR}/../../x11/XFree86-4-libraries/files .for pf in patch-savage-pci-id patch-alpha_video.c patch-Pci.h patch-radeondri \ patch-r128_driver.c patch-mga_driver.c patch-xkbInit.c patch-radeon_dri.c \ patch-mga_dri.c patch-nv_driver.c patch-nv_setup.c patch-int10-generic.c \ @@ -39,10 +33,7 @@ EXTRA_PATCHES+= ${FILESDIR}/${pf} .endfor SCRIPTS_ENV= OSVERSION=${OSVERSION} \ BuildXF86DRI=${BuildXF86DRI} \ - WITH_DEBUG="${WITH_DEBUG}" \ - CC="${CC}" \ - CXX="${CXX}" \ - CFLAGS="${CFLAGS}" + WITH_DEBUG="${WITH_DEBUG}" MAN1= XFree86.1 \ Xserver.1 \ gtf.1 \ @@ -101,6 +92,7 @@ XINCLUDE_DIRS= lib/xkbfile lib/xtrans XINSTALL_DIRS= lib/font programs/Xserver XINSTALL_MAN_DIRS= programs/Xserver +.include "${.CURDIR}/../../x11/XFree86-4-libraries/Makefile.inc" .include <bsd.port.pre.mk> .if ${ARCH} == i386 || ${ARCH} == alpha @@ -166,5 +158,4 @@ post-install:: ${LN} -sf Xwrapper-4 ${PREFIX}/bin/X; \ fi; -.include "${.CURDIR}/../../x11/XFree86-4-libraries/Makefile.inc" .include <bsd.port.post.mk> |