Index: head/emulators/i386-wine/Makefile.inc =================================================================== --- head/emulators/i386-wine/Makefile.inc (revision 369777) +++ head/emulators/i386-wine/Makefile.inc (revision 369778) @@ -1,88 +1,89 @@ # Created by: David Naylor # $FreeBSD$ PORTNAME= wine PORTVERSION= 1.6.2 -PORTREVISION= 4 +PORTREVISION= 5 PORTEPOCH= 1 CATEGORIES= emulators MASTER_SITES= LOCAL/dbn/repos/wine/${DIST_SUBDIR}/${PORTVERSION} PKGNAMEPREFIX= i386- DISTNAME= ${PKGNAME} EXTRACT_SUFX= .txz DIST_SUBDIR= freebsd:${OSREL:C/\..*//}:x86:64 MAINTAINER= dbn@FreeBSD.org COMMENT= 32bit Microsoft Windows compatibility environment for 64bit 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= i386-wine-devel-[0-9]* wine-[0-9]* wine-devel-[0-9]* EXTRACT_AFTER_ARGS= -C / --exclude +COMPACT_MANIFEST --exclude +MANIFEST \ --exclude +MTREE_DIRS --exclude share/licenses/'*' \ --exclude libdata/ldconfig32/${UNIQUENAME} \ -s '|/usr/local|${STAGEDIR}${PREFIX}|gs' NO_BUILD= yes ONLY_FOR_ARCHS= i386 amd64 ONLY_FOR_ARCHS_REASON= wine only runs on x86 architecture PKGINSTALL= ${.CURDIR}/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.21-x86.msi:${PORTSDIR}/emulators/wine-gecko MONO_RUN_DEPENDS= ${DATADIR}/mono/wine-mono-0.0.8.msi:${PORTSDIR}/emulators/wine-mono PORTSCOUT= limitw:1,even # Included for OPSYS and OSVERSION .include .for osrel in 8 9 10 11 .if ${OSREL:C/\..*//} == ${osrel} PLIST_SUB+= OSREL${osrel}="" .else PLIST_SUB+= OSREL${osrel}="@comment " .endif .endfor .if ${OPSYS} != FreeBSD || (!(${OSVERSION} >= 803000 && ${OSVERSION} < 900000) && !(${OSVERSION} >= 901000 && ${OSVERSION} < 1000000) && !(${OSVERSION} >= 1000510 && ${OSVERSION} < 1100000) && !(${OSVERSION} >= 1100007 && ${OSVERSION} < 1200000)) IGNORE= binaries compiled for FreeBSD 8.3+, 9.1+, 10.0+ and -current only DISTFILES= .endif do-extract: @${RM} -rf ${WRKDIR} @${MKDIR} ${WRKDIR} ${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} ${_DISTDIR}/${EXTRACT_ONLY} -C ${WRKDIR} --include '/usr/local/share/licenses/${PKGNAME}/LICENSE' -s '|/usr/local/share/licenses/${PKGNAME}/||g' do-install: ${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} ${_DISTDIR}/${EXTRACT_ONLY} ${EXTRACT_AFTER_ARGS} ${PLIST}: fetch ${TAR} -tf ${_DISTDIR}/${EXTRACT_ONLY} ${EXTRACT_AFTER_ARGS} | ${GREP} -v '/$$' | ${SED} 's|/usr/local/||g' | sort > ${PLIST} ${TAR} -tf ${_DISTDIR}/${EXTRACT_ONLY} ${EXTRACT_AFTER_ARGS} | ${GREP} '/$$' | ${SED} -e 's|/usr/local/\(.*\)/$$|@dirrm \1|g' -e 's|/$$||g' -e 's|@dirrm man|@dirrmtry man|g' | sort -r >> ${PLIST} port-update: ${RM} -f ${.CURDIR}/distinfo ${.CURDIR}/distinfo~ ${.CURDIR}/pkg-plist.* .for osrel in 8 9 10 11 ${MAKE} fetch OSREL=${osrel} ${MAKE} makesum OSREL=${osrel} ${CAT} ${.CURDIR}/distinfo >> ${.CURDIR}/distinfo~ ${RM} ${.CURDIR}/distinfo ${MAKE} pkg-plist.${osrel} PLIST=pkg-plist.${osrel} OSREL=${osrel} .endfor ${MV} ${.CURDIR}/distinfo~ ${.CURDIR}/distinfo python ${FILESDIR}/mergeplist.py ${.CURDIR}/pkg-plist.* > ${PLIST} ${RM} ${.CURDIR}/pkg-plist.* .include Index: head/emulators/i386-wine-devel/Makefile.inc =================================================================== --- head/emulators/i386-wine-devel/Makefile.inc (revision 369777) +++ head/emulators/i386-wine-devel/Makefile.inc (revision 369778) @@ -1,89 +1,91 @@ # Created by: David Naylor # $FreeBSD$ PORTNAME= wine PORTVERSION= 1.7.27 +PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= emulators MASTER_SITES= LOCAL/dbn/repos/wine/${DIST_SUBDIR}/${PORTVERSION} PKGNAMEPREFIX= i386- PKGNAMESUFFIX?= -devel DISTNAME= ${PKGNAME} EXTRACT_SUFX= .txz DIST_SUBDIR= freebsd:${OSREL:C/\..*//}:x86:64 MAINTAINER= dbn@FreeBSD.org COMMENT?= 32bit Microsoft Windows compatibility environment for 64bit 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?= i386-wine-[0-9]* wine-[0-9]* wine-devel-[0-9]* EXTRACT_AFTER_ARGS= -C / --exclude +COMPACT_MANIFEST --exclude +MANIFEST \ --exclude +MTREE_DIRS --exclude share/licenses/'*' \ --exclude libdata/ldconfig32/${UNIQUENAME} \ -s '|/usr/local|${STAGEDIR}${PREFIX}|gs' NO_BUILD= yes ONLY_FOR_ARCHS= i386 amd64 ONLY_FOR_ARCHS_REASON= wine only runs on x86 architecture 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.24-x86.msi:${PORTSDIR}/emulators/wine-gecko-devel MONO_RUN_DEPENDS= ${DATADIR}/mono/wine-mono-4.5.2.msi:${PORTSDIR}/emulators/wine-mono-devel # Included for OPSYS and OSVERSION .include .for osrel in 8 9 10 11 .if ${OSREL:C/\..*//} == ${osrel} PLIST_SUB+= OSREL${osrel}="" .else PLIST_SUB+= OSREL${osrel}="@comment " .endif .endfor .if ${OPSYS} != FreeBSD || (!(${OSVERSION} >= 803000 && ${OSVERSION} < 900000) && !(${OSVERSION} >= 901000 && ${OSVERSION} < 1000000) && !(${OSVERSION} >= 1000510 && ${OSVERSION} < 1100000) && !(${OSVERSION} >= 1100019 && ${OSVERSION} < 1200000)) IGNORE= binaries compiled for FreeBSD 8.3+, 9.1+, 10.0+ and -current only DISTFILES= .endif do-extract: @${RM} -rf ${WRKDIR} @${MKDIR} ${WRKDIR} ${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} ${_DISTDIR}/${EXTRACT_ONLY} -C ${WRKDIR} --include '/usr/local/share/licenses/${PKGNAME}/LICENSE' -s '|/usr/local/share/licenses/${PKGNAME}/||g' do-install: ${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} ${_DISTDIR}/${EXTRACT_ONLY} ${EXTRACT_AFTER_ARGS} ${PLIST}: fetch ${TAR} -tf ${_DISTDIR}/${EXTRACT_ONLY} ${EXTRACT_AFTER_ARGS} | ${GREP} -v '/$$' | ${SED} 's|/usr/local/||g' | sort > ${PLIST} ${TAR} -tf ${_DISTDIR}/${EXTRACT_ONLY} ${EXTRACT_AFTER_ARGS} | ${GREP} '/$$' | ${SED} -e 's|/usr/local/\(.*\)/$$|@dirrm \1|g' -e 's|/$$||g' -e 's|@dirrm man|@dirrmtry man|g' | sort -r >> ${PLIST} port-update: ${RM} -f ${SLAVEDIR}/distinfo ${SLAVEDIR}/distinfo~ ${SLAVEDIR}/pkg-plist.* .for osrel in 8 9 10 11 .for suffix in -devel -compholio ${MAKE} fetch OSREL=${osrel} PKGNAMESUFFIX=${suffix} ${MAKE} makesum OSREL=${osrel} PKGNAMESUFFIX=${suffix} ${CAT} ${SLAVEDIR}/distinfo >> ${SLAVEDIR}/distinfo~ ${RM} ${SLAVEDIR}/distinfo [ "${suffix}" != "-devel" ] || ${MAKE} pkg-plist.${osrel} PLIST=pkg-plist.${osrel} OSREL=${osrel} .endfor .endfor ${MV} ${SLAVEDIR}/distinfo~ ${SLAVEDIR}/distinfo python ${FILESDIR}/mergeplist.py ${SLAVEDIR}/pkg-plist.* > ${PLIST} ${RM} ${SLAVEDIR}/pkg-plist.* .include Index: head/multimedia/plexmediaserver/Makefile =================================================================== --- head/multimedia/plexmediaserver/Makefile (revision 369777) +++ head/multimedia/plexmediaserver/Makefile (revision 369778) @@ -1,63 +1,64 @@ # Created by: KalleDK # $FreeBSD$ PORTNAME= plexmediaserver PORTVERSION= 0.9.9.13.525 +PORTREVISION= 1 CATEGORIES= multimedia MASTER_SITES= http://downloads.plexapp.com/plex-media-server/${PORTVERSION}-${PLEX_BUILD}/ DISTNAME= PlexMediaServer-${PORTVERSION}-${PLEX_BUILD}-freebsd-amd64 MAINTAINER= feld@FreeBSD.org COMMENT= The Plex Media Server component USES= tar:bzip2 PLEX_BUILD= 197d5ed NO_BUILD= yes WRKSRC= ${WRKDIR}/PlexMediaServer-${PORTVERSION}-${PLEX_BUILD} USE_RC_SUBR= plexmediaserver SUB_FILES= plexmediaserver SUB_LIST= SUPPORT_PATH=${SUPPORT_PATH} SCRIPT_PATH="${SCRIPT_PATH}" USERS=${USERS} GROUPS=${GROUPS} USERS= plex GROUPS= plex SUPPORT_PATH?= ${PREFIX}/plexdata SCRIPT_PATH?= ${DATADIR} BUNDLE_LIBS= yes ONLY_FOR_ARCHS= amd64 .include .if ${OPSYS} == FreeBSD .if ${OSVERSION} < 900000 IGNORE= supplied binaries compiled for FreeBSD 9 .endif .if ${OSVERSION} >= 1000054 RUN_DEPENDS+= ${LOCALBASE}/lib/compat/libstdc++.so.6:${PORTSDIR}/misc/compat9x .endif .endif post-patch: # binaries don't come pre-stripped ${FIND} ${WRKSRC} -name '*.so' -exec ${STRIP_CMD} {} \; ${STRIP_CMD} ${WRKSRC}/Resources/rsync ${WRKSRC}/Resources/Python/bin/python do-install: @(cd ${WRKSRC} && ${COPYTREE_SHARE} Resources ${STAGEDIR}/${SCRIPT_PATH}) ${INSTALL_PROGRAM} ${WRKSRC}/Plex\ DLNA\ Server ${STAGEDIR}/${SCRIPT_PATH} ${INSTALL_PROGRAM} ${WRKSRC}/Plex\ Media\ Scanner ${STAGEDIR}/${SCRIPT_PATH} ${INSTALL_PROGRAM} ${WRKSRC}/Plex\ Media\ Server ${STAGEDIR}/${SCRIPT_PATH} ${INSTALL_LIB} ${WRKSRC}/lib* ${STAGEDIR}/${SCRIPT_PATH} # Fix permissions to programs and db @${CHMOD} a+x ${STAGEDIR}/${SCRIPT_PATH}/Resources/rsync @${CHMOD} a+x ${STAGEDIR}/${SCRIPT_PATH}/Resources/Plex\ New\ Transcoder @${CHMOD} a+x ${STAGEDIR}/${SCRIPT_PATH}/Resources/Plex\ Transcoder @${CHMOD} a+x ${STAGEDIR}/${SCRIPT_PATH}/Resources/Python/bin/python @${CHMOD} u+w ${STAGEDIR}/${SCRIPT_PATH}/Resources/com.plexapp.plugins.library.db # Python fix @${LN} -s ${SCRIPT_PATH}/libpython2.7.so.1 ${STAGEDIR}/${SCRIPT_PATH}/libpython2.7.so .include Index: head/multimedia/plexmediaserver-plexpass/Makefile =================================================================== --- head/multimedia/plexmediaserver-plexpass/Makefile (revision 369777) +++ head/multimedia/plexmediaserver-plexpass/Makefile (revision 369778) @@ -1,65 +1,67 @@ # Created by: KalleDK # $FreeBSD$ PORTNAME= plexmediaserver PORTVERSION= 0.9.10.1.585 +PORTREVISION= 1 CATEGORIES= multimedia MASTER_SITES= http://downloads.plexapp.com/plex-media-server/${PORTVERSION}-${PLEX_BUILD}/ PKGNAMESUFFIX= -plexpass DISTNAME= PlexMediaServer-${PORTVERSION}-${PLEX_BUILD}-freebsd-amd64 MAINTAINER= feld@FreeBSD.org COMMENT= The Plex Media Server component USES= tar:bzip2 PLEX_BUILD= f31034e NO_BUILD= yes WRKSRC= ${WRKDIR}/PlexMediaServer-${PORTVERSION}-${PLEX_BUILD} +BUNDLE_LIBS= yes DATADIR= ${PREFIX}/share/${PORTNAME}${PKGNAMESUFFIX} USE_RC_SUBR= plexmediaserver_plexpass SUB_FILES= plexmediaserver_plexpass SUB_LIST= SUPPORT_PATH=${SUPPORT_PATH} SCRIPT_PATH="${SCRIPT_PATH}" USERS=${USERS} GROUPS=${GROUPS} USERS= plex GROUPS= plex SUPPORT_PATH?= ${PREFIX}/plexdata${PKGNAMESUFFIX} SCRIPT_PATH?= ${DATADIR} ONLY_FOR_ARCHS= amd64 .include .if ${OPSYS} == FreeBSD .if ${OSVERSION} < 900000 IGNORE= supplied binaries compiled for FreeBSD 9 .endif .if ${OSVERSION} >= 1000054 RUN_DEPENDS+= ${LOCALBASE}/lib/compat/libstdc++.so.6:${PORTSDIR}/misc/compat9x .endif .endif post-patch: # binaries don't come pre-stripped ${FIND} ${WRKSRC} -name '*.so' -exec ${STRIP_CMD} {} \; ${STRIP_CMD} ${WRKSRC}/Resources/rsync ${WRKSRC}/Resources/Python/bin/python do-install: @(cd ${WRKSRC} && ${COPYTREE_SHARE} Resources ${STAGEDIR}/${SCRIPT_PATH}) ${INSTALL_PROGRAM} ${WRKSRC}/Plex\ DLNA\ Server ${STAGEDIR}/${SCRIPT_PATH} ${INSTALL_PROGRAM} ${WRKSRC}/Plex\ Media\ Scanner ${STAGEDIR}/${SCRIPT_PATH} ${INSTALL_PROGRAM} ${WRKSRC}/Plex\ Media\ Server ${STAGEDIR}/${SCRIPT_PATH} ${INSTALL_LIB} ${WRKSRC}/lib* ${STAGEDIR}/${SCRIPT_PATH} # Fix permissions to programs and db @${CHMOD} a+x ${STAGEDIR}/${SCRIPT_PATH}/Resources/rsync @${CHMOD} a+x ${STAGEDIR}/${SCRIPT_PATH}/Resources/Plex\ New\ Transcoder @${CHMOD} a+x ${STAGEDIR}/${SCRIPT_PATH}/Resources/Plex\ Transcoder @${CHMOD} a+x ${STAGEDIR}/${SCRIPT_PATH}/Resources/Python/bin/python @${CHMOD} u+w ${STAGEDIR}/${SCRIPT_PATH}/Resources/com.plexapp.plugins.library.db # Python fix @${LN} -s ${SCRIPT_PATH}/libpython2.7.so.1 ${STAGEDIR}/${SCRIPT_PATH}/libpython2.7.so .include Index: head/www/opera/Makefile =================================================================== --- head/www/opera/Makefile (revision 369777) +++ head/www/opera/Makefile (revision 369778) @@ -1,110 +1,112 @@ # $FreeBSD$ PORTNAME= opera PORTVERSION= ${OPERA_VER} -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= www ipv6 MASTER_SITES= ftp://ftp.opera.com/pub/opera/${MASTER_SITES_VER_PATH}/ \ ftp://opera.inode.at/${MASTER_SITES_VER_PATH}/ \ http://gd.tuwien.ac.at/infosys/browsers/opera/${MASTER_SITES_VER_PATH}/ \ ftp://opera.ftp.fu-berlin.de/${MASTER_SITES_VER_PATH}/ \ http://ftp.ntua.gr/pub/www/Opera/${MASTER_SITES_VER_PATH}/ \ http://mirrors.dedipower.com/opera/${MASTER_SITES_VER_PATH}/ \ ftp://ftp.tiscali.nl/pub/mirrors/opera/${MASTER_SITES_VER_PATH}/ \ ${MASTER_SITE_RINGSERVER:S,%SUBDIR%,net/www/opera/${MASTER_SITES_VER_PATH}&,}/ DISTNAME= ${PORTNAME}-${OPERA_VER}-${OPERA_BUILD}.${ARCH}.freebsd MAINTAINER= ak@FreeBSD.org COMMENT= Blazingly fast, full-featured, standards-compliant browser LIB_DEPENDS= libfreetype.so:${PORTSDIR}/print/freetype2 \ libfontconfig.so:${PORTSDIR}/x11-fonts/fontconfig BUILD_DEPENDS= ${LOCALBASE}/bin/update-mime-database:${PORTSDIR}/misc/shared-mime-info RUN_DEPENDS= ${LOCALBASE}/bin/update-mime-database:${PORTSDIR}/misc/shared-mime-info + +BUNDLE_LIBS= yes ONLY_FOR_ARCHS= i386 amd64 OPERA_VER?= 12.16 OPERA_BUILD?= 1860 MASTER_SITES_VER_PATH= unix/${OPERA_VER:S/.//} USES= tar:xz desktop-file-utils shared-mime-info USE_XORG= x11 xext sm ice xft xrender REINPLACE_ARGS= -i '' # no .bak files WEBPLUGIN_SUBDIR= ${LOCALBASE}/lib/browser_plugins/symlinks/opera OPTIONS_DEFINE= CUPS VIDEO GTK2 KDE4 OPTIONS_DEFAULT= CUPS VIDEO NO_OPTIONS_SORT=yes CUPS_DESC= support for printing (requires CUPS) VIDEO_DESC= support for HTML5 video (requires GStreamer) CUPS_LIB_DEPENDS= libcups.so:${PORTSDIR}/print/cups-client VIDEO_USE= gstreamer=vorbis,ogg,theora,vp8,good GTK2_USE= gnome=gtk20,libxml2 KDE4_USE= kde4=kdelibs .include .if defined(FETCH_ALL) # distfiles for both arch .if ${ARCH} == i386 DISTFILES= ${PORTNAME}-${OPERA_VER}-${OPERA_BUILD}.amd64.freebsd${EXTRACT_SUFX} \ ${DISTNAME}${EXTRACT_SUFX} .else DISTFILES= ${DISTNAME}${EXTRACT_SUFX} \ ${PORTNAME}-${OPERA_VER}-${OPERA_BUILD}.i386.freebsd${EXTRACT_SUFX} .endif .endif .if ${PORT_OPTIONS:MGTK2} INSTALLS_ICONS= yes .endif OPERA_ARCH= ${ARCH:S,i386,intel,} .if ${OSVERSION} >= 1000054 BUILD_DEPENDS+= ${LOCALBASE}/lib/compat/libstdc++.so.6:${PORTSDIR}/misc/compat9x PLIST_SUB+= LIBSTDC="" .else PLIST_SUB+= LIBSTDC="@comment " .endif post-extract: ${GUNZIP_CMD} ${WRKSRC}/share/man/man1/opera.1.gz do-build: .if ${OSVERSION} >= 1000054 ${CP} ${LOCALBASE}/lib/compat/libstdc++.so.6 ${WRKSRC} .endif do-configure: ${MV} ${WRKSRC}/share/man ${WRKSRC}/man @${REINPLACE_CMD} -e 's|/usr/local|${PREFIX}|g' \ -e 's|share/man|man|g' ${WRKSRC}/install @${REINPLACE_CMD} -e 's|"$${0%/.}"|${PREFIX}|g' \ -e 's|/usr/local/profile|$$HOME/.opera|' \ ${WRKSRC}/opera @${REINPLACE_CMD} -e 's|@@{PREFIX}|${PREFIX}|g' \ -e 's|@@{_SUFFIX}||g' -e 's|@@{SUFFIX}||g' \ -e 's|@@{USUFFIX}||g' \ ${WRKSRC}/share/applications/opera-browser.desktop \ ${WRKSRC}/share/mime/packages/opera-extension.xml \ ${WRKSRC}/man/man1/opera.1 @${REINPLACE_CMD} -e 's|/usr/X11R6/lib/browser_plugins|${WEBPLUGIN_SUBDIR}|g' \ ${WRKSRC}/share/opera/defaults/pluginpath.ini do-install: ${INSTALL_SCRIPT} ${WRKSRC}/opera ${STAGEDIR}${PREFIX}/bin/ ${TAR} -C ${WRKSRC} -cf - lib man share | ${TAR} -C ${STAGEDIR}${PREFIX} -xf - .if ${OSVERSION} >= 1000054 ${INSTALL_LIB} ${WRKSRC}/libstdc++.so.6 ${STAGEDIR}${PREFIX}/lib/opera .endif @${MKDIR} ${STAGEDIR}${PREFIX}/etc/libmap.d ${INSTALL_DATA} ${FILESDIR}/libmap.conf \ ${STAGEDIR}${PREFIX}/etc/libmap.d/opera.conf .include