sync/ports
1
0
Fork 0
mirror of https://git.freebsd.org/ports.git synced 2025-07-18 17:59:20 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

- Depend on xorg-libraries by default instead of the modular libraries.

Browse source 
- Don't install Xserver.1 (a manpage for all X servers), which is provided by
  xorg-manpages.
This commit is contained in:
Eric Anholt 2004-05-29 23:08:07 +00:00
parent 9fb7698f7f
commit f0b648cca2
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=110334
4 changed files with 26 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
x11-servers/xorg-server-snap/Makefile
View file

@ -7,7 +7,7 @@
PORTNAME= server
PORTVERSION= 6.7.0
PORTREVISION= 2
PORTREVISION= 3
CATEGORIES= x11-servers
MASTER_SITES= http://freedesktop.org/~xorg/X11R6.7.0/src/
PKGNAMEPREFIX= xorg-
@ -17,6 +17,9 @@ DISTFILES= X11R6.7.0-src1.tar.gz \
MAINTAINER= x11@FreeBSD.org
COMMENT= X.Org X server and related programs
.if !defined(WITH_MODULAR)
WITH_XLIB= yes
.else
LIB_PC_DEPENDS= ${X11BASE}/libdata/pkgconfig/xdmcp.pc:${PORTSDIR}/x11/libXdmcp \
${X11BASE}/libdata/pkgconfig/xau.pc:${PORTSDIR}/x11/libXau
LIB_DEPENDS= freetype.9:${PORTSDIR}/print/freetype2 \
@ -24,12 +27,12 @@ LIB_DEPENDS= freetype.9:${PORTSDIR}/print/freetype2 \
BUILD_DEPENDS= ${X11BASE}/include/X11/extensions/XKMformat.h:${PORTSDIR}/x11/libxkbfile \
${LIB_PC_DEPENDS}
RUN_DEPENDS= ${LIB_PC_DEPENDS}
.endif
CONFLICTS= XFree86-Server-*
SCRIPTS_ENV= WITH_DEBUG="${WITH_DEBUG}"
MAN1= Xorg.1 \
Xserver.1 \
getconfig.1 \
gtf.1 \
kbd_mode.1 \

8
x11-servers/xorg-server-snap/files/patch-Xserver-Imakefile Normal file
View file

@ -0,0 +1,8 @@
--- programs/Xserver/Imakefile.orig Sat May 29 14:12:45 2004
+++ programs/Xserver/Imakefile Sat May 29 14:12:16 2004
@@ -1095,5 +1095,3 @@
DEFAULTFONTPATH = DefaultFontPath
EXTRAMANDEFS = -D__default_font_path__="`echo $(DEFAULTFONTPATH) | sed -e 's/,/, /g'`"
-
-InstallManPage(Xserver,$(MANDIR))

7
x11-servers/xorg-server/Makefile
View file

@ -7,7 +7,7 @@
PORTNAME= server
PORTVERSION= 6.7.0
PORTREVISION= 2
PORTREVISION= 3
CATEGORIES= x11-servers
MASTER_SITES= http://freedesktop.org/~xorg/X11R6.7.0/src/
PKGNAMEPREFIX= xorg-
@ -17,6 +17,9 @@ DISTFILES= X11R6.7.0-src1.tar.gz \
MAINTAINER= x11@FreeBSD.org
COMMENT= X.Org X server and related programs
.if !defined(WITH_MODULAR)
WITH_XLIB= yes
.else
LIB_PC_DEPENDS= ${X11BASE}/libdata/pkgconfig/xdmcp.pc:${PORTSDIR}/x11/libXdmcp \
${X11BASE}/libdata/pkgconfig/xau.pc:${PORTSDIR}/x11/libXau
LIB_DEPENDS= freetype.9:${PORTSDIR}/print/freetype2 \
@ -24,12 +27,12 @@ LIB_DEPENDS= freetype.9:${PORTSDIR}/print/freetype2 \
BUILD_DEPENDS= ${X11BASE}/include/X11/extensions/XKMformat.h:${PORTSDIR}/x11/libxkbfile \
${LIB_PC_DEPENDS}
RUN_DEPENDS= ${LIB_PC_DEPENDS}
.endif
CONFLICTS= XFree86-Server-*
SCRIPTS_ENV= WITH_DEBUG="${WITH_DEBUG}"
MAN1= Xorg.1 \
Xserver.1 \
getconfig.1 \
gtf.1 \
kbd_mode.1 \

8
x11-servers/xorg-server/files/patch-Xserver-Imakefile Normal file
View file

@ -0,0 +1,8 @@
--- programs/Xserver/Imakefile.orig Sat May 29 14:12:45 2004
+++ programs/Xserver/Imakefile Sat May 29 14:12:16 2004
@@ -1095,5 +1095,3 @@
DEFAULTFONTPATH = DefaultFontPath
EXTRAMANDEFS = -D__default_font_path__="`echo $(DEFAULTFONTPATH) | sed -e 's/,/, /g'`"
-
-InstallManPage(Xserver,$(MANDIR))