diff options
| author | Eric Anholt <anholt@FreeBSD.org> | 2004-05-29 23:08:07 +0000 |
|---|---|---|
| committer | Eric Anholt <anholt@FreeBSD.org> | 2004-05-29 23:08:07 +0000 |
| commit | f0b648cca2a31e3f097a17cc6596ddbbeddb4bf9 (patch) | |
| tree | 88ee3a9aeda6cac6a3fbce20d6966bc0743f7156 /x11-servers | |
| parent | 9fb7698f7f820beef04186b1a476058d36ed5117 (diff) | |
| download | ports-f0b648cca2a31e3f097a17cc6596ddbbeddb4bf9.tar.gz ports-f0b648cca2a31e3f097a17cc6596ddbbeddb4bf9.zip | |
- Depend on xorg-libraries by default instead of the modular libraries.
- Don't install Xserver.1 (a manpage for all X servers), which is provided by
xorg-manpages.
Notes
Notes:
svn path=/head/; revision=110334
Diffstat (limited to 'x11-servers')
| -rw-r--r-- | x11-servers/xorg-server-snap/Makefile | 7 | ||||
| -rw-r--r-- | x11-servers/xorg-server-snap/files/patch-Xserver-Imakefile | 8 | ||||
| -rw-r--r-- | x11-servers/xorg-server/Makefile | 7 | ||||
| -rw-r--r-- | x11-servers/xorg-server/files/patch-Xserver-Imakefile | 8 |
4 files changed, 26 insertions, 4 deletions
diff --git a/x11-servers/xorg-server-snap/Makefile b/x11-servers/xorg-server-snap/Makefile index a3e24c28394f..c289d47611a7 100644 --- a/x11-servers/xorg-server-snap/Makefile +++ b/x11-servers/xorg-server-snap/Makefile @@ -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 \ diff --git a/x11-servers/xorg-server-snap/files/patch-Xserver-Imakefile b/x11-servers/xorg-server-snap/files/patch-Xserver-Imakefile new file mode 100644 index 000000000000..5dab87bd4828 --- /dev/null +++ b/x11-servers/xorg-server-snap/files/patch-Xserver-Imakefile @@ -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)) diff --git a/x11-servers/xorg-server/Makefile b/x11-servers/xorg-server/Makefile index a3e24c28394f..c289d47611a7 100644 --- a/x11-servers/xorg-server/Makefile +++ b/x11-servers/xorg-server/Makefile @@ -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 \ diff --git a/x11-servers/xorg-server/files/patch-Xserver-Imakefile b/x11-servers/xorg-server/files/patch-Xserver-Imakefile new file mode 100644 index 000000000000..5dab87bd4828 --- /dev/null +++ b/x11-servers/xorg-server/files/patch-Xserver-Imakefile @@ -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)) |