Attachment #226663 for bug #257284




	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
	@${MV} -f ${STAGEDIR}${WINELIBDIR}/libwine.so.1.0 \
	          ${STAGEDIR}${WINELIBDIR}/libwine.so.1
	@${LN} -sf libwine.so.1 ${STAGEDIR}/${WINELIBDIR}/libwine.so




#!/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/)
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 257284

Lines 154-159 pre-build: Link Here

(-)b/emulators/wine/Makefile (+10 lines)
154	cd ${WRKSRC} && ${MAKE_CMD} depend	154	cd ${WRKSRC} && ${MAKE_CMD} depend
155		155
156	post-install:	156	post-install:
		157	.if ${ARCH} == i386
		158	${MV} ${STAGEDIR}${PREFIX}/bin/wineserver ${STAGEDIR}${PREFIX}/bin/wineserver32
		159	${MV} ${STAGEDIR}${PREFIX}/bin/wine ${STAGEDIR}${PREFIX}/bin/wine.bin
		160	${INSTALL_SCRIPT} ${FILESDIR}/wine.sh ${STAGEDIR}${PREFIX}/bin/wine
		161	.else
		162	${MV} ${STAGEDIR}${PREFIX}/bin/wine64 ${STAGEDIR}${PREFIX}/bin/wine64.bin
		163	${INSTALL_SCRIPT} ${FILESDIR}/wine.sh ${STAGEDIR}${PREFIX}/bin/wine64
		164	${INSTALL_SCRIPT} ${FILESDIR}/wine-wow64.sh ${STAGEDIR}${PREFIX}/bin/wine
		165	${INSTALL_SCRIPT} ${FILESDIR}/pkg32.sh ${STAGEDIR}${DATADIR}/pkg32.sh
		166	.endif
157	@${MV} -f ${STAGEDIR}${WINELIBDIR}/libwine.so.1.0 \	167	@${MV} -f ${STAGEDIR}${WINELIBDIR}/libwine.so.1.0 \
158	${STAGEDIR}${WINELIBDIR}/libwine.so.1	168	${STAGEDIR}${WINELIBDIR}/libwine.so.1
159	@${LN} -sf libwine.so.1 ${STAGEDIR}/${WINELIBDIR}/libwine.so	169	@${LN} -sf libwine.so.1 ${STAGEDIR}/${WINELIBDIR}/libwine.so

Added Link Here

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

Added Link Here

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

Added Link Here

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

Lines 5-12 bin/notepad Link Here

(-)b/emulators/wine/pkg-plist (-2 / +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 3367-3372 share/applications/wine.desktop Link Here
3367	%%DATADIR%%/nls/normnfkc.nls	3370	%%DATADIR%%/nls/normnfkc.nls
3368	%%DATADIR%%/nls/normnfkd.nls	3371	%%DATADIR%%/nls/normnfkd.nls
3369	%%DATADIR%%/nls/sortdefault.nls	3372	%%DATADIR%%/nls/sortdefault.nls
		3373	%%WINE64%%%%DATADIR%%/pkg32.sh
3370	%%PORTDOCS%%%%DOCSDIR%%/ANNOUNCE	3374	%%PORTDOCS%%%%DOCSDIR%%/ANNOUNCE
3371	%%PORTDOCS%%%%DOCSDIR%%/AUTHORS	3375	%%PORTDOCS%%%%DOCSDIR%%/AUTHORS
3372	%%PORTDOCS%%%%DOCSDIR%%/README	3376	%%PORTDOCS%%%%DOCSDIR%%/README