Attachment #215302 for bug #245496

Lines 9-14 Link Here

(-)Makefile (-1 / +3 lines)
9	# define a dummy DISTVERSION to avoid errors with poudriere bulk -a	9	# define a dummy DISTVERSION to avoid errors with poudriere bulk -a
10	# on architectures unsupported by this port	10	# on architectures unsupported by this port
11	DISTVERSION?= 0	11	DISTVERSION?= 0
		12	# define PORTREVISION with ?= to allow it to be overriden by
		13	# wine-devel's PORTREVISION when cross building
		14	PORTREVISION?= 1
12	PKGNAMEPREFIX= i386-	15	PKGNAMEPREFIX= i386-
13	PKGNAMESUFFIX= -devel	16	PKGNAMESUFFIX= -devel
14	CATEGORIES= emulators	17	CATEGORIES= emulators
Lines 26-32 Link Here
26	distinfo-update:	29	distinfo-update:
27	${RM} ${.CURDIR}/distinfo~	30	${RM} ${.CURDIR}/distinfo~
28	.for osrel in 11 12 13	31	.for osrel in 11 12 13
29	${MAKE} fetch OSREL=${osrel} OSVERSION=${osrel}99999 _OSRELEASE=${osrel}
30	${MAKE} makesum OSREL=${osrel} OSVERSION=${osrel}99999 _OSRELEASE=${osrel}	32	${MAKE} makesum OSREL=${osrel} OSVERSION=${osrel}99999 _OSRELEASE=${osrel}
31	${CAT} ${.CURDIR}/distinfo >> ${.CURDIR}/distinfo~	33	${CAT} ${.CURDIR}/distinfo >> ${.CURDIR}/distinfo~
32	.endfor	34	.endfor

Lines 4-10 Link Here

(-)Makefile.amd64 (-1 / +1 lines)
4	DISTVERSION= 5.8	4	DISTVERSION= 5.8
5	PORTEPOCH= 1	5	PORTEPOCH= 1
6	MASTER_SITES= LOCAL/salvadore/i386-wine-devel/${DIST_SUBDIR}/	6	MASTER_SITES= LOCAL/salvadore/i386-wine-devel/${DIST_SUBDIR}/
7	DISTNAME= ${PKGNAMEPREFIX}${PORTNAME}${PKGNAMESUFFIX}-${DISTVERSION},${PORTEPOCH}	7	DISTNAME= ${PKGNAMEPREFIX}${PORTNAME}${PKGNAMESUFFIX}-${PKGVERSION}
8	DIST_SUBDIR= FreeBSD:${OSREL:C/\..*//}:amd64	8	DIST_SUBDIR= FreeBSD:${OSREL:C/\..*//}:amd64
9		9
10	LICENSE= LGPL21 LGPL3	10	LICENSE= LGPL21 LGPL3

Lines 1-7 Link Here

(-)distinfo (-7 / +7 lines)
1	TIMESTAMP = 1590229926	1	TIMESTAMP = 1591392659
2	SHA256 (FreeBSD:11:amd64/i386-wine-devel-5.8,1.txz) = bbb31835ff02a80cc6113ee5adda82723ed2e37dde77c07d7200d40cb9f7e7f3	2	SHA256 (FreeBSD:11:amd64/i386-wine-devel-5.8_1,1.txz) = 4382d51799af3fa418d306ea76f2bc66b32e299b68065452e43901a7afcbe200
3	SIZE (FreeBSD:11:amd64/i386-wine-devel-5.8,1.txz) = 72862352	3	SIZE (FreeBSD:11:amd64/i386-wine-devel-5.8_1,1.txz) = 2680666
4	SHA256 (FreeBSD:12:amd64/i386-wine-devel-5.8,1.txz) = 929e0d6366afb0ffe1be5051ef5e1df86e37d9ccbcc7c0db660a98ccff7aab65	4	SHA256 (FreeBSD:12:amd64/i386-wine-devel-5.8_1,1.txz) = ecaea30d19bcf54a6bc4e0ab1111cde9e8af6acdb543b71ff70627fd75a254e0
5	SIZE (FreeBSD:12:amd64/i386-wine-devel-5.8,1.txz) = 73104324	5	SIZE (FreeBSD:12:amd64/i386-wine-devel-5.8_1,1.txz) = 6236842
6	SHA256 (FreeBSD:13:amd64/i386-wine-devel-5.8,1.txz) = 22e78c3e39c473179742d8b5e2f08c8f3274d46bca1fa5d01db882633c912896	6	SHA256 (FreeBSD:13:amd64/i386-wine-devel-5.8_1,1.txz) = d6be456ad12927df43d3c900e4259463f94a802ebc75acbbd77149acc644ea72
7	SIZE (FreeBSD:13:amd64/i386-wine-devel-5.8,1.txz) = 75179216	7	SIZE (FreeBSD:13:amd64/i386-wine-devel-5.8_1,1.txz) = 31588352

Lines 10-19 Link Here

(-)files/binbounce (-2 / +2 lines)
10	export LIBGL_DRIVERS_PATH=$LOCALBASE/lib32/dri	10	export LIBGL_DRIVERS_PATH=$LOCALBASE/lib32/dri
11	if [ `uname -p` = i386 ]	11	if [ `uname -p` = i386 ]
12	then	12	then
13	export LD_LIBRARY_PATH="$LOCALBASE/lib32":"$LOCALBASE/lib32/wine":"$LD_LIBRARY_PATH"	13	export LD_LIBRARY_PATH="$LOCALBASE/lib32":"$LOCALBASE/lib32/wine":"$LD_LIBRARY_PATH":"$LOCALBASE/lib32/.libGL"
14	export LD_LIBRARY_PATH_RPATH=y	14	export LD_LIBRARY_PATH_RPATH=y
15	else	15	else
16	export LD_32_LIBRARY_PATH="$LOCALBASE/lib32":"$LOCALBASE/lib32/wine":"$LD_32_LIBRARY_PATH":/usr/lib32	16	export LD_32_LIBRARY_PATH="$LOCALBASE/lib32":"$LOCALBASE/lib32/wine":"$LD_32_LIBRARY_PATH":"$LOCALBASE/lib32/.libGL":/usr/lib32
17	export LD_32_LIBRARY_PATH_RPATH=y	17	export LD_32_LIBRARY_PATH_RPATH=y
18	fi	18	fi
19	export PATH="$LOCALBASE/bin32":"$PATH"	19	export PATH="$LOCALBASE/bin32":"$PATH"




      rm -f ${PREFIX}/lib32/libGLcore.so.1 ${PREFIX}/lib32/libnvidia-tls.so.1 
      rm -f ${PREFIX}/lib32/libnvidia-glcore.so.1 ${PREFIX}/lib32/libnvidia-tls.so.1
      rm -rf  ${PREFIX}/lib32/.nvidia/
      if [ -d ${PREFIX}/lib32/.libGL-new ]
      then
        ln -s .libGL-new/libGL.so.1 ${PREFIX}/lib32/libGL.so.1
      else
        ln -s .libGL/libGL.so.1 ${PREFIX}/lib32/libGL.so.1
      fi
      exit 0
      ;;
    -n)




export PREFIX=${PKG_PREFIX:-/usr/local}
export WINE=$1

LIBGLDIR=.libGL
then
    LIBGLDIR=.libGL-new
else
    LIBGLDIR=.libGL
fi

case "$2" in
  DEINSTALL)

    rm -r ${PREFIX}/lib32/libGL.so.1 ${PREFIX}/lib32/dri
    ;;
  POST-INSTALL)
    ln -s ${LIBGLDIR}/libGL.so.1 ${PREFIX}/lib32/libGL.so.1
    mkdir -p ${PREFIX}/lib32/dri
    for dri in $(cd ${PREFIX}/lib32/${LIBGLDIR}/dri/; echo *.so)
    do

Return to bug 245496

Lines 115-126 Link Here

(-)files/nvidia.sh (-6 lines)
115	rm -f ${PREFIX}/lib32/libGLcore.so.1 ${PREFIX}/lib32/libnvidia-tls.so.1	115	rm -f ${PREFIX}/lib32/libGLcore.so.1 ${PREFIX}/lib32/libnvidia-tls.so.1
116	rm -f ${PREFIX}/lib32/libnvidia-glcore.so.1 ${PREFIX}/lib32/libnvidia-tls.so.1	116	rm -f ${PREFIX}/lib32/libnvidia-glcore.so.1 ${PREFIX}/lib32/libnvidia-tls.so.1
117	rm -rf ${PREFIX}/lib32/.nvidia/	117	rm -rf ${PREFIX}/lib32/.nvidia/
118	if [ -d ${PREFIX}/lib32/.libGL-new ]
119	then
120	ln -s .libGL-new/libGL.so.1 ${PREFIX}/lib32/libGL.so.1
121	else
122	ln -s .libGL/libGL.so.1 ${PREFIX}/lib32/libGL.so.1
123	fi
124	exit 0	118	exit 0
125	;;	119	;;
126	-n)	120	-n)

Lines 3-14 Link Here

(-)files/pkg-install (-7 / +1 lines)
3	export PREFIX=${PKG_PREFIX:-/usr/local}	3	export PREFIX=${PKG_PREFIX:-/usr/local}
4	export WINE=$1	4	export WINE=$1
5		5
6	if [ -d ${PREFIX}/lib32/.libGL-new ]	6	LIBGLDIR=.libGL
7	then
8	LIBGLDIR=.libGL-new
9	else
10	LIBGLDIR=.libGL
11	fi
12		7
13	case "$2" in	8	case "$2" in
14	DEINSTALL)	9	DEINSTALL)
Lines 16-22 Link Here
16	rm -r ${PREFIX}/lib32/libGL.so.1 ${PREFIX}/lib32/dri	11	rm -r ${PREFIX}/lib32/libGL.so.1 ${PREFIX}/lib32/dri
17	;;	12	;;
18	POST-INSTALL)	13	POST-INSTALL)
19	ln -s ${LIBGLDIR}/libGL.so.1 ${PREFIX}/lib32/libGL.so.1
20	mkdir -p ${PREFIX}/lib32/dri	14	mkdir -p ${PREFIX}/lib32/dri
21	for dri in $(cd ${PREFIX}/lib32/${LIBGLDIR}/dri/; echo *.so)	15	for dri in $(cd ${PREFIX}/lib32/${LIBGLDIR}/dri/; echo *.so)
22	do	16	do