Date: Sun, 24 May 2015 02:10:19 +0000 (UTC) From: Gerald Pfeifer <gerald@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r387240 - in head/emulators: . i386-wine i386-wine-compholio i386-wine-devel i386-wine-staging pipelight wine wine-compholio wine-devel wine-staging Message-ID: <201505240210.t4O2AJDe049490@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: gerald Date: Sun May 24 02:10:18 2015 New Revision: 387240 URL: https://svnweb.freebsd.org/changeset/ports/387240 Log: Rename emulators/wine-compholio to emulators/wine-staging and accordingly emulators/i386-wine-compholio to emulators/i386-wine-staging. Adjust CONFLICTS across all Wine related ports. Reviewed by: dbn, kmoore Added: head/emulators/i386-wine-staging/ - copied from r387239, head/emulators/i386-wine-compholio/ head/emulators/wine-staging/ - copied from r387239, head/emulators/wine-compholio/ Deleted: head/emulators/i386-wine-compholio/ head/emulators/wine-compholio/ Modified: head/emulators/Makefile head/emulators/i386-wine-devel/Makefile.i386 head/emulators/i386-wine-devel/Makefile.inc head/emulators/i386-wine-staging/Makefile head/emulators/i386-wine/Makefile.i386 head/emulators/i386-wine/Makefile.inc head/emulators/pipelight/Makefile head/emulators/wine-devel/Makefile head/emulators/wine-staging/Makefile head/emulators/wine/Makefile Modified: head/emulators/Makefile ============================================================================== --- head/emulators/Makefile Sun May 24 00:20:11 2015 (r387239) +++ head/emulators/Makefile Sun May 24 02:10:18 2015 (r387240) @@ -57,7 +57,7 @@ SUBDIR += hugo SUBDIR += hyperv-is SUBDIR += i386-wine - SUBDIR += i386-wine-compholio + SUBDIR += i386-wine-staging SUBDIR += i386-wine-devel SUBDIR += ia64sim SUBDIR += ines @@ -154,7 +154,7 @@ SUBDIR += vmw SUBDIR += vxtools SUBDIR += wine - SUBDIR += wine-compholio + SUBDIR += wine-staging SUBDIR += wine-devel SUBDIR += wine-gecko SUBDIR += wine-gecko-devel Modified: head/emulators/i386-wine-devel/Makefile.i386 ============================================================================== --- head/emulators/i386-wine-devel/Makefile.i386 Sun May 24 00:20:11 2015 (r387239) +++ head/emulators/i386-wine-devel/Makefile.i386 Sun May 24 02:10:18 2015 (r387240) @@ -14,8 +14,8 @@ PKGDEINSTALL= ${PKGINSTALL} RUN_DEPENDS= dri>0:${PORTSDIR}/graphics/dri -CONFLICTS_INSTALL?= wine-[0-9]* wine-compholio-[0-9]* wine-devel-[0-9]* \ - i386-wine-[0-9]* i386-wine-compholio-[0-9]* +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 Modified: head/emulators/i386-wine-devel/Makefile.inc ============================================================================== --- head/emulators/i386-wine-devel/Makefile.inc Sun May 24 00:20:11 2015 (r387239) +++ head/emulators/i386-wine-devel/Makefile.inc Sun May 24 02:10:18 2015 (r387240) @@ -23,8 +23,8 @@ 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-compholio-[0-9]* wine-devel-[0-9]* \ - i386-wine-[0-9]* i386-wine-compholio-[0-9]* +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/'*' \ @@ -84,7 +84,7 @@ ${PLIST}: fetch port-update: ${RM} -f ${SLAVEDIR}/distinfo ${SLAVEDIR}/distinfo~ ${SLAVEDIR}/pkg-plist.* .for osrel in 8 9 10 11 -.for suffix in -devel -compholio +.for suffix in -devel -staging ${MAKE} fetch OSREL=${osrel} OSVERSION=${osrel}99999 UNAME_r=${osrel} PKGNAMESUFFIX=${suffix} ${MAKE} makesum OSREL=${osrel} OSVERSION=${osrel}99999 UNAME_r=${osrel} PKGNAMESUFFIX=${suffix} ${CAT} ${SLAVEDIR}/distinfo >> ${SLAVEDIR}/distinfo~ Modified: head/emulators/i386-wine-staging/Makefile ============================================================================== --- head/emulators/i386-wine-compholio/Makefile Sun May 24 00:20:11 2015 (r387239) +++ head/emulators/i386-wine-staging/Makefile Sun May 24 02:10:18 2015 (r387240) @@ -1,11 +1,11 @@ # Created by: Kris Moore <kmoore@FreeBSD.org> # $FreeBSD$ -COMMENT= 32bit Wine built with the compholio patchset for 64bit FreeBSD +COMMENT= 32bit Wine built with the Staging patchset for 64bit FreeBSD SLAVE_PORT= i386-wine-devel -CONFLICTS_INSTALL= i386-wine-[0-9]* wine-[0-9]* wine-compholio-[0-9]* i386-wine-devel-[0-9]* wine-devel-[0-9]* +CONFLICTS_INSTALL= i386-wine-[0-9]* wine-[0-9]* wine-staging-[0-9]* i386-wine-devel-[0-9]* wine-devel-[0-9]* OPTIONS_SET= LIBXSLT GNUTLS HAL STAGING X11 @@ -18,10 +18,10 @@ ARCH!= uname -p .if ${ARCH} == i386 .include "${SLAVEDIR}/Makefile.i386" -PKGNAMESUFFIX= -compholio +PKGNAMESUFFIX= -staging .else MASTERDIR= ${SLAVEDIR} -PKGNAMESUFFIX= -compholio +PKGNAMESUFFIX= -staging .include "${SLAVEDIR}/Makefile.inc" .endif Modified: head/emulators/i386-wine/Makefile.i386 ============================================================================== --- head/emulators/i386-wine/Makefile.i386 Sun May 24 00:20:11 2015 (r387239) +++ head/emulators/i386-wine/Makefile.i386 Sun May 24 02:10:18 2015 (r387240) @@ -14,8 +14,8 @@ PKGDEINSTALL= ${PKGINSTALL} RUN_DEPENDS= dri>0:${PORTSDIR}/graphics/dri -CONFLICTS_INSTALL?= wine-[0-9]* wine-compholio-[0-9]* wine-devel-[0-9]* \ - i386-wine-compholio-[0-9]* i386-wine-devel-[0-9]* +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 Modified: head/emulators/i386-wine/Makefile.inc ============================================================================== --- head/emulators/i386-wine/Makefile.inc Sun May 24 00:20:11 2015 (r387239) +++ head/emulators/i386-wine/Makefile.inc Sun May 24 02:10:18 2015 (r387240) @@ -23,8 +23,8 @@ 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-compholio-[0-9]* wine-devel-[0-9]* \ - i386-wine-compholio-[0-9]* i386-wine-devel-[0-9]* +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/'*' \ Modified: head/emulators/pipelight/Makefile ============================================================================== --- head/emulators/pipelight/Makefile Sun May 24 00:20:11 2015 (r387239) +++ head/emulators/pipelight/Makefile Sun May 24 02:10:18 2015 (r387240) @@ -49,11 +49,11 @@ SUB_FILES= pipelight-mkufs .include <bsd.port.pre.mk> .if ${ARCH} == "i386" -BUILD_DEPENDS+= ${LOCALBASE}/bin/wine:${PORTSDIR}/emulators/wine-compholio -RUN_DEPENDS+= ${LOCALBASE}/bin/wine:${PORTSDIR}/emulators/wine-compholio +BUILD_DEPENDS+= ${LOCALBASE}/bin/wine:${PORTSDIR}/emulators/wine-staging +RUN_DEPENDS+= ${LOCALBASE}/bin/wine:${PORTSDIR}/emulators/wine-staging .elif ${ARCH} == "amd64" -BUILD_DEPENDS+= ${LOCALBASE}/bin/wine:${PORTSDIR}/emulators/i386-wine-compholio -RUN_DEPENDS+= ${LOCALBASE}/bin/wine:${PORTSDIR}/emulators/i386-wine-compholio +BUILD_DEPENDS+= ${LOCALBASE}/bin/wine:${PORTSDIR}/emulators/i386-wine-staging +RUN_DEPENDS+= ${LOCALBASE}/bin/wine:${PORTSDIR}/emulators/i386-wine-staging .endif pre-configure: Modified: head/emulators/wine-devel/Makefile ============================================================================== --- head/emulators/wine-devel/Makefile Sun May 24 00:20:11 2015 (r387239) +++ head/emulators/wine-devel/Makefile Sun May 24 02:10:18 2015 (r387240) @@ -21,8 +21,8 @@ BUILD_DEPENDS= ${LOCALBASE}/bin/flex:${P prelink:${PORTSDIR}/sysutils/prelink LIB_DEPENDS= libxml2.so:${PORTSDIR}/textproc/libxml2 -CONFLICTS_INSTALL= wine-[0-9]* wine-compholio-[0-9]* i386-wine-[0-9]* \ - i386-wine-compholio-[0-9]* i386-wine-devel-[0-9]* +CONFLICTS_INSTALL= wine-[0-9]* wine-staging-[0-9]* i386-wine-[0-9]* \ + i386-wine-staging-[0-9]* i386-wine-devel-[0-9]* CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib Modified: head/emulators/wine-staging/Makefile ============================================================================== --- head/emulators/wine-compholio/Makefile Sun May 24 00:20:11 2015 (r387239) +++ head/emulators/wine-staging/Makefile Sun May 24 02:10:18 2015 (r387240) @@ -1,12 +1,12 @@ # Created by: Kris Moore <kmoore@FreeBSD.org> # $FreeBSD$ -COMMENT= Wine built with the compholio patchset +COMMENT= Wine built with the Staging patchset SLAVE_PORT= wine-devel CONFLICTS_INSTALL= wine-[0-9]* wine-devel-[0-9]* i386-wine-[0-9]* \ - i386-wine-compholio-[0-9]* i386-wine-devel-[0-9]* + i386-wine-staging-[0-9]* i386-wine-devel-[0-9]* OPTIONS_SET= LIBXSLT MPG123 HAL STAGING V4L X11 @@ -16,4 +16,4 @@ USE_AUTOTOOLS= autoconf:env .include "${MASTERDIR}/Makefile" -PKGNAMESUFFIX= -compholio +PKGNAMESUFFIX= -staging Modified: head/emulators/wine/Makefile ============================================================================== --- head/emulators/wine/Makefile Sun May 24 00:20:11 2015 (r387239) +++ head/emulators/wine/Makefile Sun May 24 02:10:18 2015 (r387240) @@ -19,8 +19,8 @@ LICENSE_FILE= ${WRKSRC}/LICENSE BUILD_DEPENDS= ${LOCALBASE}/bin/flex:${PORTSDIR}/textproc/flex LIB_DEPENDS= libxml2.so:${PORTSDIR}/textproc/libxml2 -CONFLICTS_INSTALL= wine-compholio-[0-9]* wine-devel-[0-9]* i386-wine-[0-9]* \ - i386-wine-compholio-[0-9]* i386-wine-devel-[0-9]* +CONFLICTS_INSTALL= wine-staging-[0-9]* wine-devel-[0-9]* i386-wine-[0-9]* \ + i386-wine-staging-[0-9]* i386-wine-devel-[0-9]* CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201505240210.t4O2AJDe049490>