Index: head/emulators/i386-wine/Makefile =================================================================== --- head/emulators/i386-wine/Makefile (revision 528441) +++ head/emulators/i386-wine/Makefile (revision 528442) @@ -1,12 +1,20 @@ # Created by: David Naylor (dbn@FreeBSD.org) # $FreeBSD$ # Special bootstrapper to allow: # - i386 specific port to be slave to ${PORTSDIR}/emulators/wine # - amd64 specific port to be normal port (based on binary package) +PORTNAME= wine +# define a dummy DISTVERSION to avoid errors with poudriere bulk -a +# on architectures unsupported by this port +DISTVERSION?= 0 +PKGNAMEPREFIX= i386- CATEGORIES= emulators + +MAINTAINER= salvadore@FreeBSD.org +COMMENT= 32-bit Microsoft Windows compatibility environment for 64-bit FreeBSD ONLY_FOR_ARCHS= i386 amd64 .include Index: head/emulators/i386-wine/Makefile.amd64 =================================================================== --- head/emulators/i386-wine/Makefile.amd64 (revision 528441) +++ head/emulators/i386-wine/Makefile.amd64 (revision 528442) @@ -1,82 +1,77 @@ # Created by: David Naylor # $FreeBSD$ -PORTNAME= wine -PORTVERSION= 3.0.4 +DISTVERSION= 3.0.4 PORTREVISION= 1 PORTEPOCH= 1 MASTER_SITES= LOCAL/dbn/repos/wine/${DIST_SUBDIR}/ -PKGNAMEPREFIX= i386- DISTNAME= ${PKGNAME} EXTRACT_SUFX= .txz DIST_SUBDIR= freebsd:${OSREL:C/\..*//}:x86:64 - -MAINTAINER= salvadore@FreeBSD.org -COMMENT?= 32-bit Microsoft Windows compatibility environment for 64-bit FreeBSD LICENSE= LGPL21 LGPL3 LICENSE_COMB= dual LICENSE_FILE= ${WRKDIR}/LICENSE OPTIONS_DEFINE= GECKO MONO GECKO_DESC= Bundle Gecko MSI package for Wine MONO_DESC= Bundle Mono MSI package for Wine CONFLICTS_INSTALL?= wine-[0-9]* wine-staging-[0-9]* wine-devel-[0-9]* \ i386-wine-staging-[0-9]* i386-wine-devel-[0-9]* EXTRACT_AFTER_ARGS= -C / --exclude +COMPACT_MANIFEST --exclude +MANIFEST \ --exclude +MTREE_DIRS --exclude share/licenses/'*' \ --exclude libdata/ldconfig32/${PKGNAMEPREFIX}${PORTNAME} \ -s '|/usr/local|${STAGEDIR}${PREFIX}|gs' NO_BUILD= yes SLAVEDIR?= ${.CURDIR} PKGINSTALL= ${SLAVEDIR}/files/pkg-install PKGDEINSTALL= ${PKGINSTALL} PKGMESSAGE= ${WRKDIR}/pkg-message SUB_FILES= pkg-message USE_LDCONFIG32= ${PREFIX}/lib32 ${PREFIX}/lib32/wine USES= tar:xz BUNDLE_LIBS= yes GECKO_RUN_DEPENDS= ${DATADIR}/gecko/wine-gecko-2.47.1-x86.msi:emulators/wine-gecko MONO_RUN_DEPENDS= ${DATADIR}/mono/wine-mono-4.9.4.msi:emulators/wine-mono PORTSCOUT= limitw:1,even .for osrel in 11 12 13 .if ${OSREL:C/\..*//} == ${osrel} PLIST_SUB+= OSREL${osrel}="" .else PLIST_SUB+= OSREL${osrel}="@comment " .endif .endfor .if ${OPSYS} != FreeBSD || (!(${OSVERSION} >= 1103000 && ${OSVERSION} < 1200000) && !(${OSVERSION} >= 1200086 && ${OSVERSION} < 1300000) && !(${OSVERSION} >= 1300003 && ${OSVERSION} < 1400000)) IGNORE= binaries compiled for FreeBSD 11.3+, 12.0+ and -current only DISTFILES= .endif do-extract: @${RM} -r ${WRKDIR} @${MKDIR} ${WRKDIR} ${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} ${_DISTDIR}/${EXTRACT_ONLY} -C ${WRKDIR} --include '/usr/local/share/licenses/${DISTNAME}/LICENSE' -s '|/usr/local/share/licenses/${DISTNAME}/||g' do-install: ${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} ${_DISTDIR}/${EXTRACT_ONLY} ${EXTRACT_AFTER_ARGS} ${PLIST}: checksum ${TAR} -tf ${_DISTDIR}/${EXTRACT_ONLY} ${EXTRACT_AFTER_ARGS} | ${GREP} -v '/$$\|ldconfig32' | ${SED} 's|/usr/local/||g' | sort > ${PLIST} port-update: ${RM} ${SLAVEDIR}/distinfo ${SLAVEDIR}/distinfo~ ${SLAVEDIR}/pkg-plist.* .for osrel in 11 12 13 ${MAKE} fetch OSREL=${osrel} OSVERSION=${osrel}99999 _OSRELEASE=${osrel} ${MAKE} makesum OSREL=${osrel} OSVERSION=${osrel}99999 _OSRELEASE=${osrel} ${CAT} ${SLAVEDIR}/distinfo >> ${SLAVEDIR}/distinfo~ ${RM} ${SLAVEDIR}/distinfo ${MAKE} pkg-plist.${osrel}${suffix:tu} PLIST=pkg-plist.${osrel}${suffix:tu} OSREL=${osrel} OSVERSION=${osrel}99999 _OSRELEASE=${osrel} PKGNAMESUFFIX=${suffix} .endfor ${SED} -e '2,$${' -e '/^TIMESTAMP/d' -e '}' distinfo~ > ${SLAVEDIR}/distinfo python ${FILESDIR}/mergeplist.py ${SLAVEDIR}/pkg-plist.* > ${PLIST} ${RM} ${SLAVEDIR}/distinfo~ ${SLAVEDIR}/pkg-plist.* Index: head/emulators/i386-wine/Makefile.i386 =================================================================== --- head/emulators/i386-wine/Makefile.i386 (revision 528441) +++ head/emulators/i386-wine/Makefile.i386 (revision 528442) @@ -1,79 +1,74 @@ # Created by: David Naylor # $FreeBSD$ -PKGNAMEPREFIX= i386- - -MAINTAINER= salvadore@FreeBSD.org -COMMENT?= 32-bit Microsoft Windows compatibility environment for 64-bit FreeBSD - # Use the wine port to do most of the heavy lifting SLAVEDIR?= ${.CURDIR} MASTERDIR= ${SLAVEDIR}/../wine PKGINSTALL= ${SLAVEDIR}/files/pkg-install PKGDEINSTALL= ${PKGINSTALL} RUN_DEPENDS= mesa-dri>0:graphics/mesa-dri CONFLICTS_INSTALL?= wine-[0-9]* wine-staging-[0-9]* wine-devel-[0-9]* \ i386-wine-staging-[0-9]* i386-wine-devel-[0-9]* ACTUAL-PACKAGE-DEPENDS= ${DO_NADA} WINELIBDIR= ${PREFIX}/lib32 CONFIGURE_ARGS+= --bindir=${PREFIX}/bin32 --libdir=${WINELIBDIR} PLIST_REINPLACE+= winelib PLIST_REINPLACE_WINELIB= s!lib/!lib32/!g WINE_SLAVE_BUILD= yes USE_LDCONFIG32= ${WINELIBDIR} ${WINELIBDIR}/wine BUNDLE_LIBS= yes .if !defined(WINE_CROSS_BUILD) IGNORE= This port is not for consumption on FreeBSD/i386. To cross-build for FreeBSD/amd64: make -DWINE_CROSS_BUILD .endif # Hook into post-install and do some adapting to make i386 binaries work nicely # under FreeBSD/amd64 post-install-script: # Fix pkg-plist references ${REINPLACE_CMD} -e 's!lib/!lib32/!g' ${TMPPLIST} # Install bounce script to access the 32-bit executables ${INSTALL_SCRIPT} ${SLAVEDIR}/files/binbounce ${STAGEDIR}${PREFIX}/bin/wine for i in `${GREP} ^bin ${TMPPLIST} | ${XARGS} -n1 basename` ; do \ [ "$${i}" = "wine" ] || ${LN} -f ${STAGEDIR}${PREFIX}/bin/wine ${STAGEDIR}${PREFIX}/bin/$${i} ; \ ${ECHO_CMD} bin32/$${i} >> ${TMPPLIST} ; \ done # Install libGL ${MKDIR} ${STAGEDIR}${PREFIX}/lib32/.libGL/dri ${INSTALL_DATA} ${LOCALBASE}/lib/libGL.so.1 ${STAGEDIR}${PREFIX}/lib32/.libGL/ ${ECHO_CMD} lib32/.libGL/libGL.so.1 >> ${TMPPLIST} # Install dri libraries (internal libGL requirements) for i in ${LOCALBASE}/lib/dri/*.so; do \ ${INSTALL_DATA} $${i} ${STAGEDIR}${PREFIX}/lib32/.libGL/dri/ ; \ ${ECHO_CMD} lib32/.libGL/dri/$${i##*/} >> ${TMPPLIST} ; \ done # Find all soft dependencies (via strings(1)) ${GREP} -v '[@%]' ${TMPPLIST} | ${SED} "s!^!${STAGEDIR}${PREFIX}/!g" | \ ${XARGS} -n1 file -F' ' | ${GREP} ELF | ${CUT} -f1 -d' ' | ${XARGS} strings | \ ${GREP} '^lib.*\.so' | ${SORT} -u > ${WRKDIR}/winesoftlibs for i in `${CAT} ${WRKDIR}/winesoftlibs` ; do \ if [ -e ${LOCALBASE}/lib/$${i} ] && [ -z "`${GREP} $${i} ${TMPPLIST}`" ]; then \ ${INSTALL_DATA} ${LOCALBASE}/lib/$${i} ${STAGEDIR}${PREFIX}/lib32/ ; \ ${ECHO_CMD} lib32/$${i} >> ${TMPPLIST} ; \ fi ; \ done # Find all libraries that are linked too (via ldd(1)) ${GREP} -v '[@%]' ${TMPPLIST} | ${SED} "s!^!${STAGEDIR}${PREFIX}/!g" | \ ${XARGS} -n1 file -F' ' | ${GREP} ELF | ${CUT} -f1 -d' ' | \ env LD_LIBRARY_PATH=${STAGEDIR}${PREFIX}/lib32:${LD_LIBRARY_PATH} ${XARGS} ldd -f '%p\n' \ | ${SORT} -u | ${GREP} -v '^\(/usr\)\?/lib' | ${GREP} -v "^${STAGEDIR}${PREFIX}/lib32/libwine.so" \ | ${GREP} -v "^${STAGEDIR}${PREFIX}/lib32/wine" > ${WRKDIR}/winelibs for i in `${CAT} ${WRKDIR}/winelibs` ; do \ if [ -z "`${GREP} $${i##*/} ${TMPPLIST}`" ]; then \ ${INSTALL_DATA} $${i} ${STAGEDIR}${PREFIX}/lib32/ ; \ ${ECHO_CMD} lib32/$${i##*/} >> ${TMPPLIST} ; \ fi ; \ done # Install nvidia patching script ${INSTALL_SCRIPT} ${SLAVEDIR}/files/nvidia.sh ${STAGEDIR}${DATADIR}/patch-nvidia.sh ${ECHO_CMD} ${DATADIR:S|$(PREFIX)/||}/patch-nvidia.sh >> ${TMPPLIST} .include "${MASTERDIR}/Makefile" Index: head/emulators/i386-wine-devel/Makefile =================================================================== --- head/emulators/i386-wine-devel/Makefile (revision 528441) +++ head/emulators/i386-wine-devel/Makefile (revision 528442) @@ -1,12 +1,21 @@ # Created by: David Naylor (dbn@FreeBSD.org) # $FreeBSD$ # Special bootstrapper to allow: # - i386 specific port to be slave to ${PORTSDIR}/emulators/wine-devel # - amd64 specific port to be normal port (based on binary package) +PORTNAME= wine +# define a dummy DISTVERSION to avoid errors with poudriere bulk -a +# on architectures unsupported by this port +DISTVERSION?= 0 +PKGNAMEPREFIX= i386- +PKGNAMESUFFIX= -devel CATEGORIES= emulators + +MAINTAINER= salvadore@FreeBSD.org +COMMENT= 32-bit Microsoft Windows compatibility environment for 64-bit FreeBSD ONLY_FOR_ARCHS= i386 amd64 .include Index: head/emulators/i386-wine-devel/Makefile.amd64 =================================================================== --- head/emulators/i386-wine-devel/Makefile.amd64 (revision 528441) +++ head/emulators/i386-wine-devel/Makefile.amd64 (revision 528442) @@ -1,90 +1,84 @@ # Created by: David Naylor # $FreeBSD$ -PORTNAME= wine -PORTVERSION= 4.0.r1 +DISTVERSION= 4.0.r1 PORTREVISION= 1 PORTEPOCH= 1 MASTER_SITES= LOCAL/dbn/repos/wine/${DIST_SUBDIR}/ -PKGNAMEPREFIX= i386- -PKGNAMESUFFIX= -devel DISTNAME= ${PKGNAME} EXTRACT_SUFX= .txz DIST_SUBDIR= freebsd:${OSREL:C/\..*//}:x86:64 - -MAINTAINER= salvadore@FreeBSD.org -COMMENT?= 32-bit Microsoft Windows compatibility environment for 64-bit FreeBSD LICENSE= LGPL21 LGPL3 LICENSE_COMB= dual LICENSE_FILE= ${WRKDIR}/LICENSE OPTIONS_DEFINE= GECKO MONO GECKO_DESC= Bundle Gecko MSI package for Wine MONO_DESC= Bundle Mono MSI package for Wine CONFLICTS_INSTALL?= wine-[0-9]* wine-staging-[0-9]* wine-devel-[0-9]* \ i386-wine-[0-9]* i386-wine-staging-[0-9]* EXTRACT_AFTER_ARGS= -C / --exclude +COMPACT_MANIFEST --exclude +MANIFEST \ --exclude +MTREE_DIRS --exclude share/licenses/'*' \ --exclude libdata/ldconfig32/${PKGNAMEPREFIX}${PORTNAME} \ -s '|/usr/local|${STAGEDIR}${PREFIX}|gs' NO_BUILD= yes SLAVEDIR?= ${.CURDIR} PKGINSTALL= ${SLAVEDIR}/files/pkg-install PKGDEINSTALL= ${PKGINSTALL} PKGMESSAGE= ${WRKDIR}/pkg-message SUB_FILES= pkg-message USE_LDCONFIG32= ${PREFIX}/lib32 ${PREFIX}/lib32/wine USES= tar:xz desktop-file-utils BUNDLE_LIBS= yes GECKO_RUN_DEPENDS= ${DATADIR}/gecko/wine-gecko-2.47.1-x86.msi:emulators/wine-gecko-devel MONO_RUN_DEPENDS= ${DATADIR}/mono/wine-mono-4.9.4.msi:emulators/wine-mono-devel .for osrel in 11 12 13 .if ${OSREL:C/\..*//} == ${osrel} PLIST_SUB+= OSREL${osrel}="" .if ${PKGNAMESUFFIX} == -devel PLIST_SUB+= DEVEL="" PLIST_SUB+= OSREL${osrel}-DEVEL="" .else PLIST_SUB+= DEVEL="@comment " PLIST_SUB+= OSREL${osrel}-DEVEL="@comment " .endif .else PLIST_SUB+= OSREL${osrel}="@comment " PLIST_SUB+= OSREL${osrel}-DEVEL="@comment " .endif .endfor .if ${OPSYS} != FreeBSD || (!(${OSVERSION} >= 1103000 && ${OSVERSION} < 1200000) && !(${OSVERSION} >= 1200086 && ${OSVERSION} < 1300000) && !(${OSVERSION} >= 1300003 && ${OSVERSION} < 1400000)) IGNORE= binaries compiled for FreeBSD 11.3+, 12.0+ and -current only DISTFILES= .endif do-extract: @${RM} -r ${WRKDIR} @${MKDIR} ${WRKDIR} ${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} ${_DISTDIR}/${EXTRACT_ONLY} -C ${WRKDIR} --include '/usr/local/share/licenses/${DISTNAME}/LICENSE' -s '|/usr/local/share/licenses/${DISTNAME}/||g' do-install: ${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} ${_DISTDIR}/${EXTRACT_ONLY} ${EXTRACT_AFTER_ARGS} ${PLIST}: checksum ${TAR} -tf ${_DISTDIR}/${EXTRACT_ONLY} ${EXTRACT_AFTER_ARGS} > /dev/null ${TAR} -tf ${_DISTDIR}/${EXTRACT_ONLY} ${EXTRACT_AFTER_ARGS} | ${GREP} -v '/$$\|ldconfig32' | ${SED} 's|/usr/local/||g' | sort > ${PLIST} port-update: ${RM} ${SLAVEDIR}/distinfo ${SLAVEDIR}/distinfo~ ${SLAVEDIR}/pkg-plist.* .for osrel in 11 12 13 ${MAKE} fetch OSREL=${osrel} OSVERSION=${osrel}99999 _OSRELEASE=${osrel} ${MAKE} makesum OSREL=${osrel} OSVERSION=${osrel}99999 _OSRELEASE=${osrel} ${CAT} ${SLAVEDIR}/distinfo >> ${SLAVEDIR}/distinfo~ ${RM} ${SLAVEDIR}/distinfo ${MAKE} pkg-plist.${osrel}${suffix:tu} PLIST=pkg-plist.${osrel}${suffix:tu} OSREL=${osrel} OSVERSION=${osrel}99999 _OSRELEASE=${osrel} .endfor ${SED} -e '2,$${' -e '/^TIMESTAMP/d' -e '}' distinfo~ > ${SLAVEDIR}/distinfo python ${FILESDIR}/mergeplist.py ${SLAVEDIR}/pkg-plist.* > ${PLIST} ${RM} ${SLAVEDIR}/distinfo~ ${SLAVEDIR}/pkg-plist.* Index: head/emulators/i386-wine-devel/Makefile.i386 =================================================================== --- head/emulators/i386-wine-devel/Makefile.i386 (revision 528441) +++ head/emulators/i386-wine-devel/Makefile.i386 (revision 528442) @@ -1,79 +1,74 @@ # Created by: David Naylor # $FreeBSD$ -PKGNAMEPREFIX= i386- - -MAINTAINER= salvadore@FreeBSD.org -COMMENT?= 32-bit Microsoft Windows compatibility environment for 64-bit FreeBSD - # Use the wine port to do most of the heavy lifting SLAVEDIR?= ${.CURDIR} MASTERDIR= ${SLAVEDIR}/../wine-devel PKGINSTALL= ${SLAVEDIR}/files/pkg-install PKGDEINSTALL= ${PKGINSTALL} RUN_DEPENDS= mesa-dri>0:graphics/mesa-dri CONFLICTS_INSTALL?= wine-[0-9]* wine-staging-[0-9]* wine-devel-[0-9]* \ i386-wine-[0-9]* i386-wine-staging-[0-9]* ACTUAL-PACKAGE-DEPENDS= ${DO_NADA} WINELIBDIR= ${PREFIX}/lib32 CONFIGURE_ARGS+= --bindir=${PREFIX}/bin32 --libdir=${WINELIBDIR} PLIST_REINPLACE+= winelib PLIST_REINPLACE_WINELIB= s!lib/!lib32/!g WINE_SLAVE_BUILD= yes USE_LDCONFIG32= ${WINELIBDIR} ${WINELIBDIR}/wine BUNDLE_LIBS= yes .if !defined(WINE_CROSS_BUILD) IGNORE= This port is not for consumption on FreeBSD/i386. To cross-build for FreeBSD/amd64: make -DWINE_CROSS_BUILD .endif # Hook into post-install and do some adapting to make i386 binaries work nicely # under FreeBSD/amd64 post-install-script: # Fix pkg-plist references ${REINPLACE_CMD} -e 's!lib/!lib32/!g' ${TMPPLIST} # Install bounce script to access the 32-bit executables ${INSTALL_SCRIPT} ${SLAVEDIR}/files/binbounce ${STAGEDIR}${PREFIX}/bin/wine for i in `${GREP} ^bin ${TMPPLIST} | ${XARGS} -n1 basename` ; do \ [ "$${i}" = "wine" ] || ${LN} -f ${STAGEDIR}${PREFIX}/bin/wine ${STAGEDIR}${PREFIX}/bin/$${i} ; \ ${ECHO_CMD} bin32/$${i} >> ${TMPPLIST} ; \ done # Install libGL ${MKDIR} ${STAGEDIR}${PREFIX}/lib32/.libGL/dri ${INSTALL_DATA} ${LOCALBASE}/lib/libGL.so.1 ${STAGEDIR}${PREFIX}/lib32/.libGL/ ${ECHO_CMD} lib32/.libGL/libGL.so.1 >> ${TMPPLIST} # Install dri libraries (internal libGL requirements) for i in ${LOCALBASE}/lib/dri/*.so; do \ ${INSTALL_DATA} $${i} ${STAGEDIR}${PREFIX}/lib32/.libGL/dri/ ; \ ${ECHO_CMD} lib32/.libGL/dri/$${i##*/} >> ${TMPPLIST} ; \ done # Find all soft dependencies (via strings(1)) ${GREP} -v '[@%]' ${TMPPLIST} | ${SED} "s!^!${STAGEDIR}${PREFIX}/!g" | \ ${XARGS} -n1 file -F' ' | ${GREP} ELF | ${CUT} -f1 -d' ' | ${XARGS} strings | \ ${GREP} '^lib.*\.so' | ${SORT} -u > ${WRKDIR}/winesoftlibs for i in `${CAT} ${WRKDIR}/winesoftlibs` ; do \ if [ -e ${LOCALBASE}/lib/$${i} ] && [ -z "`${GREP} $${i} ${TMPPLIST}`" ]; then \ ${INSTALL_DATA} ${LOCALBASE}/lib/$${i} ${STAGEDIR}${PREFIX}/lib32/ ; \ ${ECHO_CMD} lib32/$${i} >> ${TMPPLIST} ; \ fi ; \ done # Find all libraries that are linked too (via ldd(1)) ${GREP} -v '[@%]' ${TMPPLIST} | ${SED} "s!^!${STAGEDIR}${PREFIX}/!g" | \ ${XARGS} -n1 file -F' ' | ${GREP} ELF | ${CUT} -f1 -d' ' | \ env LD_LIBRARY_PATH=${STAGEDIR}${PREFIX}/lib32:${LD_LIBRARY_PATH} ${XARGS} ldd -f '%p\n' \ | ${SORT} -u | ${GREP} -v '^\(/usr\)\?/lib' | ${GREP} -v "^${STAGEDIR}${PREFIX}/lib32/libwine.so" \ | ${GREP} -v "^${STAGEDIR}${PREFIX}/lib32/wine" > ${WRKDIR}/winelibs for i in `${CAT} ${WRKDIR}/winelibs` ; do \ if [ -z "`${GREP} $${i##*/} ${TMPPLIST}`" ]; then \ ${INSTALL_DATA} $${i} ${STAGEDIR}${PREFIX}/lib32/ ; \ ${ECHO_CMD} lib32/$${i##*/} >> ${TMPPLIST} ; \ fi ; \ done # Install nvidia patching script ${INSTALL_SCRIPT} ${SLAVEDIR}/files/nvidia.sh ${STAGEDIR}${DATADIR}/patch-nvidia.sh ${ECHO_CMD} ${DATADIR:S|$(PREFIX)/||}/patch-nvidia.sh >> ${TMPPLIST} .include "${MASTERDIR}/Makefile"