Attachment #226830 for bug #257020

View | Details | Raw Unified | Return to bug 257020 | Differences between
Collapse All | Expand All





PORTNAME=	wine
DISTVERSION=	6.14
PORTREVISION=	1
PORTEPOCH=	1
CATEGORIES=	emulators
MASTER_SITES=	SF/${PORTNAME}/Source \

	cd ${WRKSRC} && ${MAKE_CMD} depend

post-install:
.if ${ARCH} == i386
	${MV} ${STAGEDIR}${PREFIX}/bin/wineserver   ${STAGEDIR}${PREFIX}/bin/wineserver32
	${MV} ${STAGEDIR}${PREFIX}/bin/wine         ${STAGEDIR}${PREFIX}/bin/wine.bin
	${INSTALL_SCRIPT} ${FILESDIR}/wine.sh       ${STAGEDIR}${PREFIX}/bin/wine
.else
	${MV} ${STAGEDIR}${PREFIX}/bin/wine64       ${STAGEDIR}${PREFIX}/bin/wine64.bin
	${INSTALL_SCRIPT} ${FILESDIR}/wine.sh       ${STAGEDIR}${PREFIX}/bin/wine64
	${INSTALL_SCRIPT} ${FILESDIR}/wine-wow64.sh ${STAGEDIR}${PREFIX}/bin/wine
	${INSTALL_SCRIPT} ${FILESDIR}/pkg32.sh      ${STAGEDIR}${DATADIR}/pkg32.sh
.endif

	@${MKDIR} ${STAGEDIR}${DOCSDIR}
.for i in README ANNOUNCE AUTHORS
	${INSTALL_DATA} ${WRKSRC}/${i} ${STAGEDIR}${DOCSDIR}




#!/bin/sh -e

if [ "$(id -u)" = 0 ]
then
  echo "Don't run this script as root!"
  exit 1
fi

I386_ROOT="${WINE_i386_ROOT:-$HOME/.i386-wine-pkg}"

mkdir -p "$I386_ROOT"
ABI=$(pkg config ABI | sed s/amd64/i386/)
# Show what we're going to do, then do it.
echo pkg -o ABI="$ABI" -o INSTALL_AS_USER=true -o RUN_SCRIPTS=false --rootdir "$I386_ROOT" "$@"
exec pkg -o ABI="$ABI" -o INSTALL_AS_USER=true -o RUN_SCRIPTS=false --rootdir "$I386_ROOT" "$@"




#!/bin/sh -e

TARGET="$(realpath "$0")"
PREFIX="${TARGET%/*/*}"
LOCALBASE="${PREFIX}"

I386_ROOT="${WINE_i386_ROOT:-$HOME/.i386-wine-pkg}"

if [ ! -f "$I386_ROOT/$PREFIX/bin/wine" ]
then
  printf "%s doesn't exist!\n\n" "$I386_ROOT/$PREFIX/bin/wine"
  printf "Try installing 32-bit Wine with\n\t%s\n" "$PREFIX/share/wine/pkg32.sh install wine mesa-dri"
  exit 1
fi

WINE32_VERSION=$(env -u WINELOADERNOEXEC "$I386_ROOT/$PREFIX/bin/wine" --version)
WINE64_VERSION=$(env -u WINELOADERNOEXEC "${TARGET}64" --version)
if [ "$WINE32_VERSION" != "$WINE64_VERSION" ]
then
  printf "wine [%s] and wine64 [%s] versions do not match!\n\n" "$WINE32_VERSION" "$WINE64_VERSION"
  printf "Try updating 32-bit wine with\n\t%s\n" "$PREFIX/share/wine/pkg32.sh upgrade"
  exit 1
fi

export LIBGL_DRIVERS_PATH="${LIBGL_DRIVERS_PATH:+$LIBGL_DRIVERS_PATH:}$LOCALBASE/lib/dri:$LOCALBASE/lib32/dri:$I386_ROOT/$LOCALBASE/lib/dri"
export LD_32_LIBRARY_PATH="${LD_32_LIBRARY_PATH:+$LD_32_LIBRARY_PATH:}$I386_ROOT/$PREFIX/lib/wine:$LOCALBASE/lib32:$I386_ROOT/$LOCALBASE/lib"

for d in "$I386_ROOT/$LOCALBASE"/llvm*/lib
do
  if [ -d "$d" ]
  then
    export LD_32_LIBRARY_PATH="$LD_32_LIBRARY_PATH:$d"
  fi
done
export LD_32_LIBRARY_PATH_RPATH=y

if [ -z "$WINE_NO_WOW64" ]
then
  export WINESERVER="${TARGET}server"
fi

exec "$I386_ROOT/$PREFIX/bin/wine" "$@"




#!/bin/sh

TARGET="$(realpath "$0")"

if [ -z "$WINESERVER" ] && [ -f "${TARGET}server32" ]
then
  export WINESERVER="${TARGET}server32"
fi

# Workaround for https://bugs.winehq.org/show_bug.cgi?id=50257
export LD_BIND_NOW=1
export LD_32_BIND_NOW=1

exec "${TARGET}.bin" "$@"




bin/regedit
bin/regsvr32
bin/widl
bin/wine
%%WINE32%%bin/wine.bin
%%WINE64%%bin/wine64
%%WINE64%%bin/wine64.bin
bin/wineboot
bin/winebuild
bin/winecfg

bin/winemaker
bin/winemine
bin/winepath
%%WINE32%%bin/wineserver32
%%WINE64%%bin/wineserver
bin/wmc
bin/wrc
include/wine/debug.h

%%DATADIR%%/nls/normnfkc.nls
%%DATADIR%%/nls/normnfkd.nls
%%DATADIR%%/nls/sortdefault.nls
%%WINE64%%%%DATADIR%%/pkg32.sh
%%PORTDOCS%%%%DOCSDIR%%/ANNOUNCE
%%PORTDOCS%%%%DOCSDIR%%/AUTHORS
%%PORTDOCS%%%%DOCSDIR%%/README
- 

Return to bug 257020

Lines 2-7 Link Here

(-)b/emulators/wine-devel/Makefile (+12 lines)
2		2
3	PORTNAME= wine	3	PORTNAME= wine
4	DISTVERSION= 6.14	4	DISTVERSION= 6.14
		5	PORTREVISION= 1
5	PORTEPOCH= 1	6	PORTEPOCH= 1
6	CATEGORIES= emulators	7	CATEGORIES= emulators
7	MASTER_SITES= SF/${PORTNAME}/Source \	8	MASTER_SITES= SF/${PORTNAME}/Source \
Lines 167-172 pre-build: Link Here
167	cd ${WRKSRC} && ${MAKE_CMD} depend	168	cd ${WRKSRC} && ${MAKE_CMD} depend
168		169
169	post-install:	170	post-install:
		171	.if ${ARCH} == i386
		172	${MV} ${STAGEDIR}${PREFIX}/bin/wineserver ${STAGEDIR}${PREFIX}/bin/wineserver32
		173	${MV} ${STAGEDIR}${PREFIX}/bin/wine ${STAGEDIR}${PREFIX}/bin/wine.bin
		174	${INSTALL_SCRIPT} ${FILESDIR}/wine.sh ${STAGEDIR}${PREFIX}/bin/wine
		175	.else
		176	${MV} ${STAGEDIR}${PREFIX}/bin/wine64 ${STAGEDIR}${PREFIX}/bin/wine64.bin
		177	${INSTALL_SCRIPT} ${FILESDIR}/wine.sh ${STAGEDIR}${PREFIX}/bin/wine64
		178	${INSTALL_SCRIPT} ${FILESDIR}/wine-wow64.sh ${STAGEDIR}${PREFIX}/bin/wine
		179	${INSTALL_SCRIPT} ${FILESDIR}/pkg32.sh ${STAGEDIR}${DATADIR}/pkg32.sh
		180	.endif
		181
170	@${MKDIR} ${STAGEDIR}${DOCSDIR}	182	@${MKDIR} ${STAGEDIR}${DOCSDIR}
171	.for i in README ANNOUNCE AUTHORS	183	.for i in README ANNOUNCE AUTHORS
172	${INSTALL_DATA} ${WRKSRC}/${i} ${STAGEDIR}${DOCSDIR}	184	${INSTALL_DATA} ${WRKSRC}/${i} ${STAGEDIR}${DOCSDIR}

Added Link Here

(-)b/emulators/wine-devel/files/pkg32.sh (+15 lines)
1	#!/bin/sh -e
2
3	if [ "$(id -u)" = 0 ]
4	then
5	echo "Don't run this script as root!"
6	exit 1
7	fi
8
9	I386_ROOT="${WINE_i386_ROOT:-$HOME/.i386-wine-pkg}"
10
11	mkdir -p "$I386_ROOT"
12	ABI=$(pkg config ABI \| sed s/amd64/i386/)
13	# Show what we're going to do, then do it.
14	echo pkg -o ABI="$ABI" -o INSTALL_AS_USER=true -o RUN_SCRIPTS=false --rootdir "$I386_ROOT" "$@"
15	exec pkg -o ABI="$ABI" -o INSTALL_AS_USER=true -o RUN_SCRIPTS=false --rootdir "$I386_ROOT" "$@"

Added Link Here

(-)b/emulators/wine-devel/files/wine-wow64.sh (+42 lines)
1	#!/bin/sh -e
2
3	TARGET="$(realpath "$0")"
4	PREFIX="${TARGET%//}"
5	LOCALBASE="${PREFIX}"
6
7	I386_ROOT="${WINE_i386_ROOT:-$HOME/.i386-wine-pkg}"
8
9	if [ ! -f "$I386_ROOT/$PREFIX/bin/wine" ]
10	then
11	printf "%s doesn't exist!\n\n" "$I386_ROOT/$PREFIX/bin/wine"
12	printf "Try installing 32-bit Wine with\n\t%s\n" "$PREFIX/share/wine/pkg32.sh install wine mesa-dri"
13	exit 1
14	fi
15
16	WINE32_VERSION=$(env -u WINELOADERNOEXEC "$I386_ROOT/$PREFIX/bin/wine" --version)
17	WINE64_VERSION=$(env -u WINELOADERNOEXEC "${TARGET}64" --version)
18	if [ "$WINE32_VERSION" != "$WINE64_VERSION" ]
19	then
20	printf "wine [%s] and wine64 [%s] versions do not match!\n\n" "$WINE32_VERSION" "$WINE64_VERSION"
21	printf "Try updating 32-bit wine with\n\t%s\n" "$PREFIX/share/wine/pkg32.sh upgrade"
22	exit 1
23	fi
24
25	export LIBGL_DRIVERS_PATH="${LIBGL_DRIVERS_PATH:+$LIBGL_DRIVERS_PATH:}$LOCALBASE/lib/dri:$LOCALBASE/lib32/dri:$I386_ROOT/$LOCALBASE/lib/dri"
26	export LD_32_LIBRARY_PATH="${LD_32_LIBRARY_PATH:+$LD_32_LIBRARY_PATH:}$I386_ROOT/$PREFIX/lib/wine:$LOCALBASE/lib32:$I386_ROOT/$LOCALBASE/lib"
27
28	for d in "$I386_ROOT/$LOCALBASE"/llvm*/lib
29	do
30	if [ -d "$d" ]
31	then
32	export LD_32_LIBRARY_PATH="$LD_32_LIBRARY_PATH:$d"
33	fi
34	done
35	export LD_32_LIBRARY_PATH_RPATH=y
36
37	if [ -z "$WINE_NO_WOW64" ]
38	then
39	export WINESERVER="${TARGET}server"
40	fi
41
42	exec "$I386_ROOT/$PREFIX/bin/wine" "$@"

Added Link Here

(-)b/emulators/wine-devel/files/wine.sh (+14 lines)
1	#!/bin/sh
2
3	TARGET="$(realpath "$0")"
4
5	if [ -z "$WINESERVER" ] && [ -f "${TARGET}server32" ]
6	then
7	export WINESERVER="${TARGET}server32"
8	fi
9
10	# Workaround for https://bugs.winehq.org/show_bug.cgi?id=50257
11	export LD_BIND_NOW=1
12	export LD_32_BIND_NOW=1
13
14	exec "${TARGET}.bin" "$@"

Lines 5-12 bin/notepad Link Here

(-)b/emulators/wine-devel/pkg-plist (-3 / +6 lines)
5	bin/regedit	5	bin/regedit
6	bin/regsvr32	6	bin/regsvr32
7	bin/widl	7	bin/widl
8	%%WINE32%%bin/wine	8	bin/wine
		9	%%WINE32%%bin/wine.bin
9	%%WINE64%%bin/wine64	10	%%WINE64%%bin/wine64
		11	%%WINE64%%bin/wine64.bin
10	bin/wineboot	12	bin/wineboot
11	bin/winebuild	13	bin/winebuild
12	bin/winecfg	14	bin/winecfg
Lines 20-26 bin/winegcc Link Here
20	bin/winemaker	22	bin/winemaker
21	bin/winemine	23	bin/winemine
22	bin/winepath	24	bin/winepath
23	bin/wineserver	25	%%WINE32%%bin/wineserver32
		26	%%WINE64%%bin/wineserver
24	bin/wmc	27	bin/wmc
25	bin/wrc	28	bin/wrc
26	include/wine/debug.h	29	include/wine/debug.h
Lines 3505-3510 share/applications/wine.desktop Link Here
3505	%%DATADIR%%/nls/normnfkc.nls	3508	%%DATADIR%%/nls/normnfkc.nls
3506	%%DATADIR%%/nls/normnfkd.nls	3509	%%DATADIR%%/nls/normnfkd.nls
3507	%%DATADIR%%/nls/sortdefault.nls	3510	%%DATADIR%%/nls/sortdefault.nls
		3511	%%WINE64%%%%DATADIR%%/pkg32.sh
3508	%%PORTDOCS%%%%DOCSDIR%%/ANNOUNCE	3512	%%PORTDOCS%%%%DOCSDIR%%/ANNOUNCE
3509	%%PORTDOCS%%%%DOCSDIR%%/AUTHORS	3513	%%PORTDOCS%%%%DOCSDIR%%/AUTHORS
3510	%%PORTDOCS%%%%DOCSDIR%%/README	3514	%%PORTDOCS%%%%DOCSDIR%%/README
3511	-