View | Details | Raw Unified | Return to bug 245496 | Differences between
and this patch

Collapse All | Expand All

(-)Makefile (+3 lines)
Lines 9-14 Link Here
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
(-)Makefile.amd64 (-1 / +1 lines)
Lines 4-10 Link Here
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
(-)distinfo (-7 / +7 lines)
Lines 1-7 Link Here
1
TIMESTAMP = 1590229926
1
TIMESTAMP = 1592263837
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) = 83a2f737811bbf15bc2573b0bd9f8be561d7405daa7dbdb8c3ba7e3b63ff524b
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) = 72849764
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) = fd372de4a96a4e501466525561debcccdcb701fde8dc947fe86fc93067f2ce7e
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) = 73141456
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) = 8c7053bad1d19ac93ebbaac175fe4924ba7009ac7aa6bf56df39804a2fa5d28d
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) = 74894708
(-)files/binbounce (-2 / +2 lines)
Lines 10-19 Link Here
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"
(-)files/nvidia.sh (-6 lines)
Lines 115-126 Link Here
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)
(-)files/pkg-install (-8 / +2 lines)
Lines 3-22 Link Here
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)
15
    sh ${PREFIX}/share/wine/patch-nvidia.sh -d
10
    sh ${PREFIX}/share/wine/patch-nvidia.sh -d
16
    rm -r ${PREFIX}/lib32/libGL.so.1 ${PREFIX}/lib32/dri
11
    rm -r ${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
(-)pkg-plist (-2 / +2 lines)
Lines 1096-1106 Link Here
1096
lib32/libglapi.so.0
1096
lib32/libglapi.so.0
1097
lib32/libgmp.so.10
1097
lib32/libgmp.so.10
1098
lib32/libgnutls.so.30
1098
lib32/libgnutls.so.30
1099
lib32/libhogweed.so.5
1099
lib32/libhogweed.so.6
1100
lib32/libidn2.so.0
1100
lib32/libidn2.so.0
1101
%%NOOSREL13%%lib32/libjpeg.so.8
1101
%%NOOSREL13%%lib32/libjpeg.so.8
1102
lib32/liblcms2.so.2
1102
lib32/liblcms2.so.2
1103
lib32/libnettle.so.7
1103
lib32/libnettle.so.8
1104
lib32/libp11-kit.so.0
1104
lib32/libp11-kit.so.0
1105
lib32/libpciaccess.so.0
1105
lib32/libpciaccess.so.0
1106
%%NOOSREL13%%lib32/libpng16.so.16
1106
%%NOOSREL13%%lib32/libpng16.so.16

Return to bug 245496