1. Upgrade linux infrostructure ports from FC3 to FC4.

2. Introduce gtk2-engines into x11-toolkits/linux-gtk2.     [1]

Requested by:	netchild [1]
Approved by:	netchild (mentor, implicit)

3 files changed, 21 insertions, 22 deletions

diff --git a/audio/linux-f8-esound/Makefile b/audio/linux-f8-esound/Makefile
index 6b971c25f940..ae5afa0f3b79 100644
--- a/audio/linux-f8-esound/Makefile
+++ b/audio/linux-f8-esound/Makefile
@@ -7,9 +7,8 @@
 
 PORTNAME=	esound
 CATEGORIES=	audio linux
-PORTVERSION=	0.2.35
-PORTREVISION=	1
-DISTNAME=	${PORTNAME}-${PORTVERSION}-2
+PORTVERSION=	0.2.36
+DISTNAME=	${PORTNAME}-${PORTVERSION}-0.fc4.1
 
 MAINTAINER=	freebsd-emulation@FreeBSD.org
 COMMENT=	RPM of esound
@@ -19,10 +18,10 @@ NOT_FOR_ARCHS=	amd64
 RUN_DEPENDS=	${LINUXBASE}/usr/lib/libaudiofile.so.0:${PORTSDIR}/audio/linux-libaudiofile
 
 USE_LINUX_RPM=	yes
-LINUX_DIST_VER=	3
+LINUX_DIST_VER=	4
 INSTALLS_SHLIB=	yes
 BRANDELF_DIRS=	usr/bin
 PLIST=		pkg-plist.${LINUX_RPM_ARCH}
+PLIST_SUB+=	ESOUND_VERSION="${PORTVERSION}"
 
 .include <bsd.port.mk>
-
diff --git a/audio/linux-f8-esound/distinfo.i386 b/audio/linux-f8-esound/distinfo.i386
index 35b5ebdcccc4..88212813e036 100644
--- a/audio/linux-f8-esound/distinfo.i386
+++ b/audio/linux-f8-esound/distinfo.i386
@@ -1,6 +1,6 @@
-MD5 (rpm/i386/fedora/3/esound-0.2.35-2.i386.rpm) = a38d50fbb3a481f899ce38d403cd4f35
-SHA256 (rpm/i386/fedora/3/esound-0.2.35-2.i386.rpm) = fd7c65b81cf6cc8b6d9313fe9e4325a10a65a4515fba6c0a93371acc71b1d3c0
-SIZE (rpm/i386/fedora/3/esound-0.2.35-2.i386.rpm) = 123657
-MD5 (rpm/i386/fedora/3/esound-0.2.35-2.src.rpm) = 96ea0ca1a379603b08ef83cd9d6858b7
-SHA256 (rpm/i386/fedora/3/esound-0.2.35-2.src.rpm) = 8847dbdb22db93693542bb0d9951d58fe0faa86f7d3b560eab437ff341e56a22
-SIZE (rpm/i386/fedora/3/esound-0.2.35-2.src.rpm) = 394701
+MD5 (rpm/i386/fedora/4/esound-0.2.36-0.fc4.1.i386.rpm) = 73d3123847d096524c1fc3fea676d397
+SHA256 (rpm/i386/fedora/4/esound-0.2.36-0.fc4.1.i386.rpm) = 0f4cff63f273837453e1c32c44f117423a09a19846c48c83dc376f5b99804942
+SIZE (rpm/i386/fedora/4/esound-0.2.36-0.fc4.1.i386.rpm) = 129865
+MD5 (rpm/i386/fedora/4/esound-0.2.36-0.fc4.1.src.rpm) = 50a30e1bafcb0e87aebffbed340def23
+SHA256 (rpm/i386/fedora/4/esound-0.2.36-0.fc4.1.src.rpm) = d3ee4b7dd19302abc037ea21bc89015486ab49890c05be75b56e651e3652d7f2
+SIZE (rpm/i386/fedora/4/esound-0.2.36-0.fc4.1.src.rpm) = 381415
diff --git a/audio/linux-f8-esound/pkg-plist.i386 b/audio/linux-f8-esound/pkg-plist.i386
index 011591161438..3352eddb2624 100644
--- a/audio/linux-f8-esound/pkg-plist.i386
+++ b/audio/linux-f8-esound/pkg-plist.i386
@@ -10,17 +10,17 @@ usr/bin/esdplay
 usr/bin/esdrec
 usr/bin/esdsample
 usr/lib/libesd.so.0
-usr/lib/libesd.so.0.2.35
+usr/lib/libesd.so.%%ESOUND_VERSION%%
 usr/lib/libesddsp.so.0
-usr/lib/libesddsp.so.0.2.35
-usr/share/doc/esound-0.2.35/AUTHORS
-usr/share/doc/esound-0.2.35/COPYING
-usr/share/doc/esound-0.2.35/ChangeLog
-usr/share/doc/esound-0.2.35/NEWS
-usr/share/doc/esound-0.2.35/README
-usr/share/doc/esound-0.2.35/TIPS
-usr/share/doc/esound-0.2.35/TODO
-usr/share/doc/esound-0.2.35/esound.sgml
+usr/lib/libesddsp.so.%%ESOUND_VERSION%%
+usr/share/doc/esound-%%ESOUND_VERSION%%/AUTHORS
+usr/share/doc/esound-%%ESOUND_VERSION%%/COPYING.LIB
+usr/share/doc/esound-%%ESOUND_VERSION%%/ChangeLog
+usr/share/doc/esound-%%ESOUND_VERSION%%/NEWS
+usr/share/doc/esound-%%ESOUND_VERSION%%/README
+usr/share/doc/esound-%%ESOUND_VERSION%%/TIPS
+usr/share/doc/esound-%%ESOUND_VERSION%%/TODO
+usr/share/doc/esound-%%ESOUND_VERSION%%/esound.sgml
 usr/share/man/man1/esd-config.1.gz
 usr/share/man/man1/esd.1.gz
 usr/share/man/man1/esdcat.1.gz
@@ -32,4 +32,4 @@ usr/share/man/man1/esdmon.1.gz
 usr/share/man/man1/esdplay.1.gz
 usr/share/man/man1/esdrec.1.gz
 usr/share/man/man1/esdsample.1.gz
-@dirrm usr/share/doc/esound-0.2.35
+@dirrm usr/share/doc/esound-%%ESOUND_VERSION%%