diff options
| author | kwm <kwm@058c260c-8361-11dd-a0ac-aa2bafec7d09> | 2012-06-08 22:24:34 +0800 |
|---|---|---|
| committer | kwm <kwm@058c260c-8361-11dd-a0ac-aa2bafec7d09> | 2012-06-08 22:24:34 +0800 |
| commit | 648c6ec7c93a75573f4c175cde388346419fd85b (patch) | |
| tree | f9d06bea56fdc7561f1e1bd37ccd1cccb5808bcc /x11-servers/xorg-server | |
| parent | 02a4671a6c85dd64b9b85fbfba885c26d9e86130 (diff) | |
| download | xorg-devel-ports-648c6ec7c93a75573f4c175cde388346419fd85b.tar xorg-devel-ports-648c6ec7c93a75573f4c175cde388346419fd85b.tar.gz xorg-devel-ports-648c6ec7c93a75573f4c175cde388346419fd85b.tar.bz2 xorg-devel-ports-648c6ec7c93a75573f4c175cde388346419fd85b.tar.lz xorg-devel-ports-648c6ec7c93a75573f4c175cde388346419fd85b.tar.xz xorg-devel-ports-648c6ec7c93a75573f4c175cde388346419fd85b.tar.zst xorg-devel-ports-648c6ec7c93a75573f4c175cde388346419fd85b.zip | |
Fix some whitespace issues, pointed out by portlint [1].
While here port portlint some more, use XORG as mastersite use DISTNAME instead
of DISTFILES.
Submitted by: AlexKozlov ak@ [1]
git-svn-id: https://trillian.chruetertee.ch/svn/ports/trunk@520 058c260c-8361-11dd-a0ac-aa2bafec7d09
Diffstat (limited to 'x11-servers/xorg-server')
| -rw-r--r-- | x11-servers/xorg-server/Makefile | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/x11-servers/xorg-server/Makefile b/x11-servers/xorg-server/Makefile index 1bd83d9..6a76a91 100644 --- a/x11-servers/xorg-server/Makefile +++ b/x11-servers/xorg-server/Makefile @@ -10,14 +10,14 @@ PORTVERSION= ${XORG_VERSION} PORTREVISION?= ${XORG_REVISION} PORTEPOCH?= 1 CATEGORIES= x11-servers -MASTER_SITES= http://xorg.freedesktop.org/releases/individual/xserver/ -DISTFILES= xorg-server-${PORTVERSION}.tar.bz2 +MASTER_SITES= XORG +MASTER_SITE_SUBDIR= individual/xserver +DISTNAME= xorg-server-${PORTVERSION} MAINTAINER= x11@FreeBSD.org COMMENT?= X.Org X server and related programs LIB_DEPENDS= drm:${PORTSDIR}/graphics/libdrm - RUN_DEPENDS= xkeyboard-config>=2.5:${PORTSDIR}/x11/xkeyboard-config \ xkbcomp:${PORTSDIR}/x11/xkbcomp @@ -38,6 +38,7 @@ EXTRA_PATCHES+= ${FILESDIR}/extra-include_eventstr.h \ ${FILESDIR}/extra-servermd.h .endif +USE_BZIP2= yes USE_GMAKE= yes USE_GL= gl USE_XORG?= xf86driproto glproto xdmcp x11 xkbfile xxf86misc xxf86vm xaw7 \ @@ -86,7 +87,6 @@ OPTIONS_DEFAULT= AIGLX SUID HAL OPTIONS_DEFAULT:= ${OPTIONS_DEFAULT:NHAL} .endif - .if defined(WITH_OPENSSL_BASE) # The reason why I use this is cause openssl from base doesn't install a .pc file # and configure will fail trying to find it. Setting both of those variables to @@ -95,7 +95,7 @@ CONFIGURE_ENV= SHA1_LIB="-L/usr/lib -lcrypto" SHA1_CFLAGS="-I/usr/include" .endif .if ${PORT_OPTIONS:MHAL} -LIB_DEPENDS+= hal.1:${PORTSDIR}/sysutils/hal +LIB_DEPENDS+= hal:${PORTSDIR}/sysutils/hal CONFIGURE_ARGS+= --enable-config-hal=yes .else CONFIGURE_ARGS+= --enable-config-hal=no @@ -114,10 +114,10 @@ CONFIGURE_ARGS+=--enable-install-setuid=no .endif .if ${ARCH} == ia64 -PLIST_SUB+= IA64_NA="@comment " -EXTRA_PATCHES= ${.CURDIR}/files/extra-arch-ia64 +PLIST_SUB+= IA64_NA="@comment " +EXTRA_PATCHES= ${.CURDIR}/files/extra-arch-ia64 .else -PLIST_SUB+= IA64_NA="" +PLIST_SUB+= IA64_NA="" .endif .if ${ARCH} == powerpc || ${ARCH} == powerpc64 |