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

[1] Make the HTML manpages get put into the packages again.

Browse Source 
[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
This commit is contained in:
Eric Anholt 2003-05-14 07:02:07 +00:00
parent f45d10e746
commit 346aa45573
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=80962
13 changed files with 65 additions and 86 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
x11-servers/XFree86-4-FontServer/Makefile
View File

@ -7,6 +7,7 @@
PORTNAME= FontServer
PORTVERSION= 4.3.0
PORTREVISION= 1
CATEGORIES= x11-servers x11-fonts
MASTER_SITES= ${MASTER_SITE_XFREE}
MASTER_SITE_SUBDIR= ${PORTVERSION}
@ -18,14 +19,6 @@ DISTFILES= X430src-1.tgz \
MAINTAINER= anholt@freebsd.org
COMMENT= XFree86-4 font server
XFREE86_VERSION= 4
USE_IMAKE= YES
DIST_SUBDIR= xc
WRKSRC= ${WRKDIR}/xc
SCRIPTS_ENV= CC="${CC}" \
CXX="${CXX}" \
CFLAGS="${CFLAGS}"
PATCHDIR= ${.CURDIR}/../../x11/XFree86-4-libraries/files
MAN1= Xserver.1 xfs.1
XBUILD_DIRS= programs/xfs
XINCLUDE_DIRS= lib/xtrans programs/Xserver

10
x11-servers/XFree86-4-NestServer/Makefile
View File

@ -7,6 +7,7 @@
PORTNAME= NestServer
PORTVERSION= 4.3.0
PORTREVISION= 1
CATEGORIES= x11-servers
MASTER_SITES= ${MASTER_SITE_XFREE:S/$/:x/} \
${MASTER_SITE_LOCAL:S/$/:local/}
@ -24,15 +25,6 @@ EXTRACT_ONLY= X430src-1.tgz \
MAINTAINER= anholt@freebsd.org
COMMENT= XFree86-4 nested X server
XFREE86_VERSION= 4
USE_IMAKE= YES
DIST_SUBDIR= xc
WRKSRC= ${WRKDIR}/xc
SCRIPTS_ENV= CC="${CC}" \
CXX="${CXX}" \
CFLAGS="${CFLAGS}"
PATCHDIR= ${.CURDIR}/../../x11/XFree86-4-libraries/files
MANCOMPRESSED= yes
MAN1= Xnest.1 Xserver.1
XBUILD_DIRS= lib/font lib/lbxutil lib/Xdmcp lib/Xau programs/Xserver
XINCLUDE_DIRS= lib/xkbfile lib/xtrans

8
x11-servers/XFree86-4-PrintServer/Makefile
View File

@ -24,14 +24,6 @@ EXTRACT_ONLY= X430src-1.tgz \
MAINTAINER= anholt@freebsd.org
COMMENT= XFree86-4 print server
XFREE86_VERSION= 4
USE_IMAKE= YES
DIST_SUBDIR= xc
WRKSRC= ${WRKDIR}/xc
SCRIPTS_ENV= CC="${CC}" \
CXX="${CXX}" \
CFLAGS="${CFLAGS}"
PATCHDIR= ${.CURDIR}/../../x11/XFree86-4-libraries/files
XBUILD_DIRS= lib/font lib/lbxutil lib/Xdmcp lib/Xau programs/Xserver
XINCLUDE_DIRS= lib/xkbfile lib/xtrans
XINSTALL_DIRS= programs/Xserver

15
x11-servers/XFree86-4-Server-snap/Makefile
View File

@ -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>

15
x11-servers/XFree86-4-Server/Makefile
View File

@ -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>

9
x11-servers/XFree86-4-VirtualFramebufferServer/Makefile
View File

@ -7,6 +7,7 @@
PORTNAME= VirtualFramebufferServer
PORTVERSION= 4.3.0
PORTREVISION= 1
CATEGORIES= x11-servers
MASTER_SITES= ${MASTER_SITE_XFREE:S/$/:x/} \
${MASTER_SITE_LOCAL:S/$/:local/}
@ -28,14 +29,6 @@ RUN_DEPENDS= ${FONT}:${PORTSDIR}/x11-fonts/XFree86-4-fontDefaultBitmaps
FONT= ${X11BASE}/lib/X11/fonts/misc/cursor.pcf.gz
XFREE86_VERSION= 4
USE_IMAKE= YES
DIST_SUBDIR= xc
WRKSRC= ${WRKDIR}/xc
SCRIPTS_ENV= CC="${CC}" \
CXX="${CXX}" \
CFLAGS="${CFLAGS}"
PATCHDIR= ${.CURDIR}/../../x11/XFree86-4-libraries/files
MAN1= Xserver.1 Xvfb.1
XBUILD_DIRS= lib/font lib/lbxutil/ lib/Xdmcp lib/Xau programs/Xserver
XINCLUDE_DIRS= lib/xkbfile lib/xtrans

13
x11/XFree86-4-clients/Makefile
View File

@ -7,7 +7,7 @@
PORTNAME= clients
PORTVERSION= 4.3.0
PORTREVISION= 1
PORTREVISION= 2
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITE_XFREE}
MASTER_SITE_SUBDIR= 4.3.0
@ -25,17 +25,10 @@ LIB_DEPENDS= freetype.9:${PORTSDIR}/print/freetype2 \
png.5:${PORTSDIR}/graphics/png \
Xft.2:${PORTSDIR}/x11-fonts/Xft
XFREE86_VERSION= 4
USE_IMAKE= YES
DIST_SUBDIR= xc
WRKSRC= ${WRKDIR}/xc
PATCHDIR= ${.CURDIR}/../XFree86-4-libraries/files
SCRIPTS_ENV= InstallXdmConfig=${InstallXdmConfig} \
InstallXinitConfig=${InstallXinitConfig} \
InstallAppDefFiles=${InstallAppDefFiles} \
CC="${CC}" \
CXX="${CXX}" \
CFLAGS="${CFLAGS}"
InstallAppDefFiles=${InstallAppDefFiles}
MAKE_ENV= PKGNAMEPREFIX=${PKGNAMEPREFIX} \
PORTNAME=${PORTNAME} \
PORTVERSION=${PORTVERSION}

24
x11/XFree86-4-libraries/Makefile
View File

@ -7,7 +7,7 @@
PORTNAME= libraries
PORTVERSION= 4.3.0
PORTREVISION= 3
PORTREVISION= 4
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITE_XFREE:S/$/:x/} \
${MASTER_SITE_LOCAL:S/$/:local/}
@ -25,23 +25,14 @@ EXTRACT_ONLY= X430src-1.tgz \
MAINTAINER= anholt@freebsd.org
COMMENT= XFree86-4 libraries and headers
BUILD_DEPENDS= ${X11BASE}/lib/X11/config/date.def:${PORTSDIR}/devel/imake-4
LIB_DEPENDS= freetype.9:${PORTSDIR}/print/freetype2
LIB_DEPENDS= fontconfig.1:${PORTSDIR}/x11-fonts/fontconfig
RUN_DEPENDS= mkhtmlindex:${PORTSDIR}/devel/imake-4
LIB_DEPENDS= freetype.9:${PORTSDIR}/print/freetype2 \
fontconfig.1:${PORTSDIR}/x11-fonts/fontconfig
XFREE86_VERSION= 4
USE_X_PREFIX= no
PREFIX?= ${X11BASE}
MANCOMPRESSED= yes
XFREE86_HTML_MAN= yes
MTREE_FILE= /etc/mtree/BSD.x11-4.dist
INSTALLS_SHLIB= yes
DIST_SUBDIR= xc
WRKSRC= ${WRKDIR}/xc
SCRIPTS_ENV= DebuggableLibraries=${DebuggableLibraries} \
CC="${CC}" \
CXX="${CXX}" \
CFLAGS="${CFLAGS}"
SCRIPTS_ENV= DebuggableLibraries=${DebuggableLibraries}
MAN3= Xaw.3 Xcursor.3 Xrandr.3
XBUILD_DIRS= lib nls programs/Xserver/include \
programs/Xserver/hw/xfree86/parser
@ -60,6 +51,7 @@ DebuggableLibraries?= NO
.error You have `USE_XLIB' variable defined either in environment or in make(1) arguments. Please undefine and try again.
.endif
.include "Makefile.inc"
.include <bsd.port.pre.mk>
# BuildXF86DRI is false for FreeBSD < 4.1
@ -88,6 +80,8 @@ post-install:
${PREFIX}/include/X11/PM
${INSTALL_DATA} ${WRKSRC}/programs/proxymngr/PMproto.h \
${PREFIX}/include/X11/PM
${MKDIR} ${PREFIX}/libdata/pkgconfig
${INSTALL_DATA} ${WRKSRC}/lib/Xcursor/xcursor.pc \
${PREFIX}/libdata/pkgconfig
.include "Makefile.inc"
.include <bsd.port.post.mk>

22
x11/XFree86-4-libraries/Makefile.inc
View File

@ -1,4 +1,7 @@
# include for XFree86-4 ports which share XFree86-4-libraries's patches.
# Include before bsd.port.pre.mk for XFree86-4 ports which share
# XFree86-4-libraries's patches.
# The purpose of this file is to reduce the duplicated code among the XFree86-4
# ports which each do only part of a standard XFree86 build.
#
# XBUILD_DIRS is the group of directories under ${WRKSRC} that will
# be built in.
@ -9,11 +12,26 @@
# XINSTALL_MAN_DIRS is the group of directories which will have
# their install.man targets run.
DIST_SUBDIR= xc
WRKSRC?= ${WRKDIR}/xc
USE_IMAKE= YES
XFREE86_HTML_MAN= yes
PATCHDIR= ${.CURDIR}/../../x11/XFree86-4-libraries/files
SCRIPTS_ENV+= CC="${CC}" \
CXX="${CXX}" \
CFLAGS="${CFLAGS}"
MAKE_ENV+= FBSDCC="${CC}" FBSDCXX="${CXX}"
_XBUILD_DIRS= include ${XBUILD_DIRS}
XINSTALL_DIRS?= ${XBUILD_DIRS}
_XINCLUDE_DIRS= ${_XBUILD_DIRS} ${XINCLUDE_DIRS}
XFREE86_HTML_MAN?= no
pre-everything::
@if [ "x${XFREE86_VERSION}" != "x4" ]; then \
${ECHO_MSG} "If you use the XFree86-4 ports you must have XFREE86_VERSION=4"; \
${ECHO_MSG} "set in your /etc/make.conf."; \
${FALSE}; \
fi;
.if !target(do-configure)
do-configure:

11
x11/XFree86-4-libraries/files/patch-Xcursor-Imakefile Normal file
View File

@ -0,0 +1,11 @@
--- lib/Xcursor/Imakefile.orig Tue May 13 14:34:23 2003
+++ lib/Xcursor/Imakefile Tue May 13 14:34:34 2003
@@ -69,8 +69,6 @@
RemoveFile($@)
sh config-subst $(SUBSTVARS) < xcursor.pc.in > $@
-InstallNonExecFile(xcursor.pc,$(USRLIBDIR)/pkgconfig)
-
clean::
RemoveFile(xcursor.pc)

11
x11/XFree86-4-libraries/files/patch-bsdLib.tmpl Normal file
View File

@ -0,0 +1,11 @@
--- config/cf/bsdLib.tmpl.orig Tue May 13 12:37:22 2003
+++ config/cf/bsdLib.tmpl Tue May 13 12:37:23 2003
@@ -65,7 +65,7 @@
#define SharedXieReqs $(LDPRELIBS) $(XLIBONLY)
#define SharedXvReqs $(LDPRELIB) $(XLIB)
#define SharedSMReqs $(LDPRELIBS) $(ICELIB)
-#define SharedGLReqs $(LDPRELIBS) $(XLIB) -lc
+#define SharedGLReqs $(LDPRELIBS) $(XLIB)
#define SharedGLUReqs $(LDPRELIB) $(XLIB) $(GLXLIB)
#define SharedXcursorReqs $(LDPRELIB) $(XRENDERLIB) $(XLIB)

2
x11/XFree86-4-libraries/files/patch-z34
View File

@ -5,7 +5,7 @@
#endif
-#if BuildLibraries
+#if BuildLibraries && !FreeBSDBuildXbin
+#if BuildLibraries && FreeBSDBuildXlib
#define LibInstall YES
#else
#define LibInstall NO

2
x11/XFree86-4-libraries/pkg-plist
View File

@ -619,4 +619,4 @@ lib/libpsres.so.1
lib/libxf86config.a
lib/libxkbfile.a
lib/libxkbui.a
lib/pkgconfig/xcursor.pc
libdata/pkgconfig/xcursor.pc