Attachment #242453 for bug #271686

View | Details | Raw Unified | Return to bug 271686
Collapse All | Expand All




PORTNAME=	xorg
PORTVERSION=	21.1.8
PORTREVISION=	3
PORTEPOCH=	1
CATEGORIES=	x11-servers
MASTER_SITES=	XORG/individual/xserver

PORTNAME=	xephyr
.elif  ${FLAVOR} == xorg
PKGNAMESUFFIX=	-server
SUB_FILES=	pkg-post-deinstall pkg-post-install
PKGPOSTINSTALL= ${WRKDIR}/pkg-post-install
PKGPOSTDEINSTALL=	${WRKDIR}/pkg-post-deinstall
.elif ${FLAVOR} == xnest
PORTEPOCH=	2
PKGNAMESUFFIX= -nestserver


.if ${FLAVOR} == xorg
post-install:
	# Avoid conflict with nvidia-driver, move libglx.so into .xorg directory
	@${MKDIR} ${STAGEDIR}${PREFIX}/lib/xorg/modules/extensions/.xorg
	${MV} ${STAGEDIR}${PREFIX}/lib/xorg/modules/extensions/libglx.so \
		${STAGEDIR}${PREFIX}/lib/xorg/modules/extensions/.xorg/
	@${MKDIR} ${STAGEDIR}${PREFIX}/etc/X11/xorg.conf.d
	@${MKDIR} ${STAGEDIR}${FONTPATHD}
	@${MKDIR} ${STAGEDIR}${PREFIX}/share/X11/xorg.conf.d

Removed Link Here

(-)a/x11-servers/xorg-server/files/pkg-post-deinstall.in (-1 lines)
1	rm -f ${PKG_ROOTDIR}${PKG_PREFIX}/lib/xorg/modules/extensions/libglx.so

Removed Link Here

(-)a/x11-servers/xorg-server/files/pkg-post-install.in (-6 lines)
1	#!/bin/sh
2
3	PREFIX=${PKG_PREFIX-/usr/local}
4
5	install -l rs ${PKG_ROOTDIR}${PREFIX}/lib/xorg/modules/extensions/.xorg/libglx.so \
6	${PKG_ROOTDIR}${PREFIX}/lib/xorg/modules/extensions/libglx.so

Lines 160-166 include/xorg/xvdix.h Link Here

(-)b/x11-servers/xorg-server/pkg-plist (-1 / +1 lines)
160	include/xorg/xvmcext.h	160	include/xorg/xvmcext.h
161	include/xorg/xf86-input-inputtest-protocol.h	161	include/xorg/xf86-input-inputtest-protocol.h
162	lib/xorg/modules/drivers/modesetting_drv.so	162	lib/xorg/modules/drivers/modesetting_drv.so
163	lib/xorg/modules/extensions/.xorg/libglx.so	163	lib/xorg/modules/extensions/libglx.so
164	lib/xorg/modules/input/inputtest_drv.so	164	lib/xorg/modules/input/inputtest_drv.so
165	lib/xorg/modules/libexa.so	165	lib/xorg/modules/libexa.so
166	lib/xorg/modules/libglamoregl.so	166	lib/xorg/modules/libglamoregl.so

Lines 1-6 Link Here

(-)b/x11/nvidia-driver-304/Makefile (-1 / +1 lines)
1	DISTVERSION= 304.137	1	DISTVERSION= 304.137
2	# Explicitly set PORTREVISION as it can be overridden by the master port	2	# Explicitly set PORTREVISION as it can be overridden by the master port
3	PORTREVISION= 9	3	PORTREVISION= 10
4		4
5	MASTERDIR= ${.CURDIR}/../nvidia-driver	5	MASTERDIR= ${.CURDIR}/../nvidia-driver
6	PKGNAMESUFFIX= -304	6	PKGNAMESUFFIX= -304

Lines 1-6 Link Here

(-)b/x11/nvidia-driver-340/Makefile (-1 / +1 lines)
1	DISTVERSION= 340.108	1	DISTVERSION= 340.108
2	# Explicitly set PORTREVISION as it can be overridden by the master port	2	# Explicitly set PORTREVISION as it can be overridden by the master port
3	PORTREVISION= 3	3	PORTREVISION= 4
4		4
5	MASTERDIR= ${.CURDIR}/../nvidia-driver	5	MASTERDIR= ${.CURDIR}/../nvidia-driver
6	PKGNAMESUFFIX= -340	6	PKGNAMESUFFIX= -340

Lines 1-6 Link Here

(-)b/x11/nvidia-driver-390/Makefile (-1 / +1 lines)
1	DISTVERSION= 390.154	1	DISTVERSION= 390.154
2	# Explicitly set PORTREVISION as it can be overridden by the master port	2	# Explicitly set PORTREVISION as it can be overridden by the master port
3	PORTREVISION= 0	3	PORTREVISION= 1
4		4
5	MASTERDIR= ${.CURDIR}/../nvidia-driver	5	MASTERDIR= ${.CURDIR}/../nvidia-driver
6	PKGNAMESUFFIX= -390	6	PKGNAMESUFFIX= -390

Lines 1-6 Link Here

(-)b/x11/nvidia-driver-470/Makefile (-1 / +1 lines)
1	DISTVERSION= 470.161.03	1	DISTVERSION= 470.161.03
2	# Explicitly set PORTREVISION as it can be overridden by the master port	2	# Explicitly set PORTREVISION as it can be overridden by the master port
3	PORTREVISION= 0	3	PORTREVISION= 1
4		4
5	MASTERDIR= ${.CURDIR}/../nvidia-driver	5	MASTERDIR= ${.CURDIR}/../nvidia-driver
6	PKGNAMESUFFIX= -470	6	PKGNAMESUFFIX= -470




PORTNAME?=	nvidia-driver
DISTVERSION?=	525.116.03
# Always try to set PORTREVISION as it can be overridden by the slave ports
PORTREVISION?=	1
CATEGORIES=	x11
MASTER_SITES=	NVIDIA/XFree86/FreeBSD-${ARCH_SUFX}/${DISTVERSION}
DISTNAME=	NVIDIA-FreeBSD-${ARCH_SUFX}-${DISTVERSION}

.if !defined(LIBGLDIR)
SUB_FILES+=	nvidia.conf
.endif
.if ${NVVERSION} < 410.057
SUB_FILES+=	pkg-deinstall pkg-install
.endif
SUB_PATCHES=	extra-patch-src-Makefile \
		extra-patch-src-nv-freebsd.h \
		extra-patch-src-nvidia_subr.c

Lines 3-8 Link Here

(-)b/x11/nvidia-driver/files/nvidia.conf.in (+2 lines)
3	libGL.so libGL-NVIDIA.so	3	libGL.so libGL-NVIDIA.so
4	libGL.so.1 libGL-NVIDIA.so.1	4	libGL.so.1 libGL-NVIDIA.so.1
5		5
		6	%%PREFIX%%/lib/xorg/modules/extensions/libglx.so %%PREFIX%%/lib/xorg/modules/extensions/.nvidia/libglx.so
		7
6	%%NVGL%%libEGL.so libEGL-NVIDIA.so	8	%%NVGL%%libEGL.so libEGL-NVIDIA.so
7	%%NVGL%%libEGL.so.1 libEGL-NVIDIA.so.1	9	%%NVGL%%libEGL.so.1 libEGL-NVIDIA.so.1
8		10




#!/bin/sh

PREFIX=${PKG_PREFIX-/usr/local}

case $2 in
DEINSTALL)
	/bin/rm -f ${PREFIX}/lib/xorg/modules/extensions/libglx.so*

	/bin/ln -f ${PREFIX}/lib/xorg/modules/extensions/.xorg/libglx.so \
		${PREFIX}/lib/xorg/modules/extensions/libglx.so
	;;
esac

Removed Link Here

(-)a/x11/nvidia-driver/files/pkg-install.in (-10 lines)
1	#!/bin/sh
2
3	PREFIX=${PKG_PREFIX-/usr/local}
4
5	case $2 in
6	POST-INSTALL)
7	/bin/ln -f ${PREFIX}/lib/xorg/modules/extensions/.nvidia/libglx.so.1 \
8	${PREFIX}/lib/xorg/modules/extensions/libglx.so
9	;;
10	esac

Return to bug 271686

Lines 1-6 Link Here

(-)b/x11-servers/xorg-server/Makefile (-8 / +1 lines)
1	PORTNAME= xorg	1	PORTNAME= xorg
2	PORTVERSION= 21.1.8	2	PORTVERSION= 21.1.8
3	PORTREVISION= 2	3	PORTREVISION= 3
4	PORTEPOCH= 1	4	PORTEPOCH= 1
5	CATEGORIES= x11-servers	5	CATEGORIES= x11-servers
6	MASTER_SITES= XORG/individual/xserver	6	MASTER_SITES= XORG/individual/xserver
Lines 24-32 USE_GL= gl Link Here
24	PORTNAME= xephyr	24	PORTNAME= xephyr
25	.elif ${FLAVOR} == xorg	25	.elif ${FLAVOR} == xorg
26	PKGNAMESUFFIX= -server	26	PKGNAMESUFFIX= -server
27	SUB_FILES= pkg-post-deinstall pkg-post-install
28	PKGPOSTINSTALL= ${WRKDIR}/pkg-post-install
29	PKGPOSTDEINSTALL= ${WRKDIR}/pkg-post-deinstall
30	.elif ${FLAVOR} == xnest	27	.elif ${FLAVOR} == xnest
31	PORTEPOCH= 2	28	PORTEPOCH= 2
32	PKGNAMESUFFIX= -nestserver	29	PKGNAMESUFFIX= -nestserver
Lines 133-142 PLIST_SUB+= SPARC64="@comment " Link Here
133		130
134	.if ${FLAVOR} == xorg	131	.if ${FLAVOR} == xorg
135	post-install:	132	post-install:
136	# Avoid conflict with nvidia-driver, move libglx.so into .xorg directory
137	@${MKDIR} ${STAGEDIR}${PREFIX}/lib/xorg/modules/extensions/.xorg
138	${MV} ${STAGEDIR}${PREFIX}/lib/xorg/modules/extensions/libglx.so \
139	${STAGEDIR}${PREFIX}/lib/xorg/modules/extensions/.xorg/
140	@${MKDIR} ${STAGEDIR}${PREFIX}/etc/X11/xorg.conf.d	133	@${MKDIR} ${STAGEDIR}${PREFIX}/etc/X11/xorg.conf.d
141	@${MKDIR} ${STAGEDIR}${FONTPATHD}	134	@${MKDIR} ${STAGEDIR}${FONTPATHD}
142	@${MKDIR} ${STAGEDIR}${PREFIX}/share/X11/xorg.conf.d	135	@${MKDIR} ${STAGEDIR}${PREFIX}/share/X11/xorg.conf.d

Lines 14-20 Link Here

(-)b/x11/nvidia-driver/Makefile (-4 / +1 lines)
14	PORTNAME?= nvidia-driver	14	PORTNAME?= nvidia-driver
15	DISTVERSION?= 525.116.03	15	DISTVERSION?= 525.116.03
16	# Always try to set PORTREVISION as it can be overridden by the slave ports	16	# Always try to set PORTREVISION as it can be overridden by the slave ports
17	PORTREVISION?= 0	17	PORTREVISION?= 1
18	CATEGORIES= x11	18	CATEGORIES= x11
19	MASTER_SITES= NVIDIA/XFree86/FreeBSD-${ARCH_SUFX}/${DISTVERSION}	19	MASTER_SITES= NVIDIA/XFree86/FreeBSD-${ARCH_SUFX}/${DISTVERSION}
20	DISTNAME= NVIDIA-FreeBSD-${ARCH_SUFX}-${DISTVERSION}	20	DISTNAME= NVIDIA-FreeBSD-${ARCH_SUFX}-${DISTVERSION}
Lines 64-72 SUB_FILES= pkg-message Link Here
64	.if !defined(LIBGLDIR)	64	.if !defined(LIBGLDIR)
65	SUB_FILES+= nvidia.conf	65	SUB_FILES+= nvidia.conf
66	.endif	66	.endif
67	.if ${NVVERSION} < 410.057
68	SUB_FILES+= pkg-deinstall pkg-install
69	.endif
70	SUB_PATCHES= extra-patch-src-Makefile \	67	SUB_PATCHES= extra-patch-src-Makefile \
71	extra-patch-src-nv-freebsd.h \	68	extra-patch-src-nv-freebsd.h \
72	extra-patch-src-nvidia_subr.c	69	extra-patch-src-nvidia_subr.c

Removed Link Here

(-)a/x11/nvidia-driver/files/pkg-deinstall.in (-12 lines)
1	#!/bin/sh
2
3	PREFIX=${PKG_PREFIX-/usr/local}
4
5	case $2 in
6	DEINSTALL)
7	/bin/rm -f ${PREFIX}/lib/xorg/modules/extensions/libglx.so*
8
9	/bin/ln -f ${PREFIX}/lib/xorg/modules/extensions/.xorg/libglx.so \
10	${PREFIX}/lib/xorg/modules/extensions/libglx.so
11	;;
12	esac