mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2024-10-20 20:09:11 +00:00
Code Issues Releases Activity

- Only set XFREE86_HTML_MAN if there are going to be manpages installed

Browse Source 
(XMAN_DIRS is set).
- Remove spammed-in configure.gen.pre
- Pass thread flags/libs to configure like should have been done
- Add changes to config/cf/* for the fonts ports.
This commit is contained in:
Eric Anholt 2004-05-31 02:56:22 +00:00
parent d826c52421
commit 62e4243072
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=110443
8 changed files with 68 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
x11-servers/xorg-server-snap/Makefile.inc
View File

@ -18,10 +18,16 @@ USE_X_PREFIX?= no
PREFIX?= ${X11BASE}
USE_IMAKE= YES
.if defined(XMAN_DIRS)
XFREE86_HTML_MAN?= yes
.else
XFREE86_HTML_MAN?= no
.endif
SCRIPTS_ENV+= CC="${CC}" \
CXX="${CXX}" \
CFLAGS="${CFLAGS}" \
PTHREAD_LIBS="${PTHREAD_LIBS}" \
PTHREAD_CFLAGS="${PTHREAD_CLFAGS}"
XINSTALL_DIRS?= ${XBUILD_DIRS}
_XINCLUDE_DIRS= include ${XBUILD_DIRS} ${XINCLUDE_DIRS}
@ -30,6 +36,7 @@ CF_PATCHES= ${PORTSDIR}/x11-servers/xorg-server/files/patch-FreeBSD.cf \
${PORTSDIR}/x11-servers/xorg-server/files/patch-Imake.rules \
${PORTSDIR}/x11-servers/xorg-server/files/patch-Imake.tmpl \
${PORTSDIR}/x11-servers/xorg-server/files/patch-Library.tmpl \
${PORTSDIR}/x11-servers/xorg-server/files/patch-X11.rules \
${PORTSDIR}/x11-servers/xorg-server/files/patch-X11.tmpl
.if !target(do-configure)

17
x11-servers/xorg-server-snap/files/patch-X11.rules Normal file
View File

@ -0,0 +1,17 @@
--- config/cf/X11.rules.orig Sun May 30 12:49:38 2004
+++ config/cf/X11.rules Sun May 30 12:50:02 2004
@@ -23,6 +23,14 @@
# define UseInstalledX11 YES
#endif
+#ifndef UseInstalledPrograms
+# define UseInstalledPrograms NO
+#endif
+
+#ifndef UseInstalledClients
+# define UseInstalledClients NO
+#endif
+
#ifndef ImportX11
# ifdef UseImports
# define ImportX11 YES

11
x11-servers/xorg-server-snap/files/patch-X11.tmpl
View File

@ -1,5 +1,5 @@
--- config/cf/X11.tmpl.orig Fri Apr 2 13:47:10 2004
+++ config/cf/X11.tmpl Thu May 27 20:52:39 2004
+++ config/cf/X11.tmpl Sun May 30 12:46:35 2004
@@ -576,7 +576,7 @@
#define BuildXft1Library BuildRenderLibrary
#endif
@ -24,3 +24,12 @@
#endif
#ifndef ResourceConfigurationManagement
@@ -1615,7 +1622,7 @@
INSTAPPFLAGS = $(INSTDATFLAGS) /* XXX - this should go away - XXX */
-#if UseInstalledX11
+#if UseInstalledX11 || UseInstalledClients
RGB = $(BINDIR)/rgb
FONTC = $(BINDIR)/bdftopcf
MKFONTSCALE = $(BINDIR)/mkfontscale

14
x11-servers/xorg-server-snap/scripts/configure.gen.pre
View File

@ -1,14 +0,0 @@
#!/bin/sh
# This script does the following:
# (1) cp xf86site.def, installed by imake-4 port,
# to ${WRKDIR}/xc/config/cf.
# this provides settings for the ports system.
# (2) Create a host.def for this specific port, using
# host.def as a base.
ORIGDEF=$PREFIX/lib/X11/config/xf86site.def
DESTDEF=$WRKDIR/xc/config/cf/xorgsite.def
ORIGHOSTDEF=$PREFIX/lib/X11/config/host.def
LOCALDEF=$WRKDIR/.config
HOSTDEF=$WRKDIR/xc/config/cf/host.def

7
x11-servers/xorg-server/Makefile.inc
View File

@ -18,10 +18,16 @@ USE_X_PREFIX?= no
PREFIX?= ${X11BASE}
USE_IMAKE= YES
.if defined(XMAN_DIRS)
XFREE86_HTML_MAN?= yes
.else
XFREE86_HTML_MAN?= no
.endif
SCRIPTS_ENV+= CC="${CC}" \
CXX="${CXX}" \
CFLAGS="${CFLAGS}" \
PTHREAD_LIBS="${PTHREAD_LIBS}" \
PTHREAD_CFLAGS="${PTHREAD_CLFAGS}"
XINSTALL_DIRS?= ${XBUILD_DIRS}
_XINCLUDE_DIRS= include ${XBUILD_DIRS} ${XINCLUDE_DIRS}
@ -30,6 +36,7 @@ CF_PATCHES= ${PORTSDIR}/x11-servers/xorg-server/files/patch-FreeBSD.cf \
${PORTSDIR}/x11-servers/xorg-server/files/patch-Imake.rules \
${PORTSDIR}/x11-servers/xorg-server/files/patch-Imake.tmpl \
${PORTSDIR}/x11-servers/xorg-server/files/patch-Library.tmpl \
${PORTSDIR}/x11-servers/xorg-server/files/patch-X11.rules \
${PORTSDIR}/x11-servers/xorg-server/files/patch-X11.tmpl
.if !target(do-configure)

17
x11-servers/xorg-server/files/patch-X11.rules Normal file
View File

@ -0,0 +1,17 @@
--- config/cf/X11.rules.orig Sun May 30 12:49:38 2004
+++ config/cf/X11.rules Sun May 30 12:50:02 2004
@@ -23,6 +23,14 @@
# define UseInstalledX11 YES
#endif
+#ifndef UseInstalledPrograms
+# define UseInstalledPrograms NO
+#endif
+
+#ifndef UseInstalledClients
+# define UseInstalledClients NO
+#endif
+
#ifndef ImportX11
# ifdef UseImports
# define ImportX11 YES

11
x11-servers/xorg-server/files/patch-X11.tmpl
View File

@ -1,5 +1,5 @@
--- config/cf/X11.tmpl.orig Fri Apr 2 13:47:10 2004
+++ config/cf/X11.tmpl Thu May 27 20:52:39 2004
+++ config/cf/X11.tmpl Sun May 30 12:46:35 2004
@@ -576,7 +576,7 @@
#define BuildXft1Library BuildRenderLibrary
#endif
@ -24,3 +24,12 @@
#endif
#ifndef ResourceConfigurationManagement
@@ -1615,7 +1622,7 @@
INSTAPPFLAGS = $(INSTDATFLAGS) /* XXX - this should go away - XXX */
-#if UseInstalledX11
+#if UseInstalledX11 || UseInstalledClients
RGB = $(BINDIR)/rgb
FONTC = $(BINDIR)/bdftopcf
MKFONTSCALE = $(BINDIR)/mkfontscale

14
x11-servers/xorg-server/scripts/configure.gen.pre
View File

@ -1,14 +0,0 @@
#!/bin/sh
# This script does the following:
# (1) cp xf86site.def, installed by imake-4 port,
# to ${WRKDIR}/xc/config/cf.
# this provides settings for the ports system.
# (2) Create a host.def for this specific port, using
# host.def as a base.
ORIGDEF=$PREFIX/lib/X11/config/xf86site.def
DESTDEF=$WRKDIR/xc/config/cf/xorgsite.def
ORIGHOSTDEF=$PREFIX/lib/X11/config/host.def
LOCALDEF=$WRKDIR/.config
HOSTDEF=$WRKDIR/xc/config/cf/host.def