35 files changed, 180 insertions, 196 deletions

diff --git a/devel/linux-allegro/Makefile b/devel/linux-allegro/Makefile
index 3926708da4c9..e19998825d5c 100644
--- a/devel/linux-allegro/Makefile
+++ b/devel/linux-allegro/Makefile
@@ -7,23 +7,25 @@
 
 PORTNAME=	allegro
 PORTVERSION=	4.0.3
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel linux
 MASTER_SITES=	http://membres.lycos.fr/ebotcazou/allegro/
-PKGNAMEPREFIX=	linux-
+DISTNAME=	${PORTNAME}-${PORTVERSION}-1
 
 MAINTAINER=	freebsd-emulation@FreeBSD.org
 COMMENT=	Cross-platform game programming library (linux version)
 
-BUILD_DEPENDS=	rpm:${PORTSDIR}/archivers/rpm
-RUN_DEPENDS=
-
-USE_LINUX=		yes
-USE_LINUX_PREFIX=	yes
+USE_LINUX_RPM=		yes
 ONLY_FOR_ARCHS=		i386 amd64
+DIST_SUBDIR=		rpm
+INSTALLS_SHLIB=		yes
+USE_XLIB=		yes
+SRC_DISTFILES=
 
-RPM_SET=	${PORTNAME}-${PORTVERSION}-1.${ARCH}.rpm
-PLIST=		${MASTERDIR}/pkg-plist
 MD5_FILE=	${MASTERDIR}/distinfo
 
-.include "../../x11-toolkits/linux-gtk/Makefile"
+post-extract:
+	@cd ${WRKSRC}/usr/lib; \
+	${LN} -s liballeg-4.0.3.so liballeg.so.4.0
+
+.include <bsd.port.mk>
diff --git a/devel/linux-f10-allegro/Makefile b/devel/linux-f10-allegro/Makefile
index 3926708da4c9..e19998825d5c 100644
--- a/devel/linux-f10-allegro/Makefile
+++ b/devel/linux-f10-allegro/Makefile
@@ -7,23 +7,25 @@
 
 PORTNAME=	allegro
 PORTVERSION=	4.0.3
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel linux
 MASTER_SITES=	http://membres.lycos.fr/ebotcazou/allegro/
-PKGNAMEPREFIX=	linux-
+DISTNAME=	${PORTNAME}-${PORTVERSION}-1
 
 MAINTAINER=	freebsd-emulation@FreeBSD.org
 COMMENT=	Cross-platform game programming library (linux version)
 
-BUILD_DEPENDS=	rpm:${PORTSDIR}/archivers/rpm
-RUN_DEPENDS=
-
-USE_LINUX=		yes
-USE_LINUX_PREFIX=	yes
+USE_LINUX_RPM=		yes
 ONLY_FOR_ARCHS=		i386 amd64
+DIST_SUBDIR=		rpm
+INSTALLS_SHLIB=		yes
+USE_XLIB=		yes
+SRC_DISTFILES=
 
-RPM_SET=	${PORTNAME}-${PORTVERSION}-1.${ARCH}.rpm
-PLIST=		${MASTERDIR}/pkg-plist
 MD5_FILE=	${MASTERDIR}/distinfo
 
-.include "../../x11-toolkits/linux-gtk/Makefile"
+post-extract:
+	@cd ${WRKSRC}/usr/lib; \
+	${LN} -s liballeg-4.0.3.so liballeg.so.4.0
+
+.include <bsd.port.mk>
diff --git a/devel/linux-f10-libglade/Makefile b/devel/linux-f10-libglade/Makefile
index 3b2d4549be63..b9d8402ebe5c 100644
--- a/devel/linux-f10-libglade/Makefile
+++ b/devel/linux-f10-libglade/Makefile
@@ -6,13 +6,17 @@
 #
 
 PORTNAME=	libglade
-PORTVERSION=	0.14
-PORTREVISION=	3
+PORTVERSION=	0.17
 CATEGORIES=	devel linux
+DISTNAME=	${PORTNAME}-${PORTVERSION}-15
 
 MAINTAINER=	freebsd-emulation@FreeBSD.org
 COMMENT=	RPM of libglade
 
-RPM_SET=	libglade-${PORTVERSION}-3.${ARCH}.rpm
+USE_LINUX_RPM=	yes
+LINUX_DIST_VER=	3
+INSTALLS_SHLIB=	yes
+PLIST=		pkg-plist.${LINUX_RPM_ARCH}
+PLIST_SUB=	LIBVERSION="0.4.2" PORTVERSION="${PORTVERSION}"
 
-.include "../../x11-toolkits/linux-gtk/Makefile"
+.include <bsd.port.mk>
diff --git a/devel/linux-f10-libglade/distinfo.alpha b/devel/linux-f10-libglade/distinfo.alpha
deleted file mode 100644
index edca3e1882c2..000000000000
--- a/devel/linux-f10-libglade/distinfo.alpha
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 (rpm/libglade-0.14-3.alpha.rpm) = c3a9aacdc0ccada3922bfcca35cf826c
-SIZE (rpm/libglade-0.14-3.alpha.rpm) = 181497
diff --git a/devel/linux-f10-libglade/distinfo.i386 b/devel/linux-f10-libglade/distinfo.i386
index 47b650aa52c0..3316be9b05eb 100644
--- a/devel/linux-f10-libglade/distinfo.i386
+++ b/devel/linux-f10-libglade/distinfo.i386
@@ -1,2 +1,6 @@
-MD5 (rpm/libglade-0.14-3.i386.rpm) = e0b9a3f9a3e6569c90dead7835de830c
-SIZE (rpm/libglade-0.14-3.i386.rpm) = 103807
+MD5 (rpm/i386/fedora/3/libglade-0.17-15.i386.rpm) = c527e8e71514e708764f3722ed689e4f
+SHA256 (rpm/i386/fedora/3/libglade-0.17-15.i386.rpm) = cb03dafc4e4ecde1fc4d892ee6772cd63c55e22c0fd88ba1b725d81b0ce5a811
+SIZE (rpm/i386/fedora/3/libglade-0.17-15.i386.rpm) = 99959
+MD5 (rpm/i386/fedora/3/libglade-0.17-15.src.rpm) = e995b33d8c7bdb17a1fa406906b337a0
+SHA256 (rpm/i386/fedora/3/libglade-0.17-15.src.rpm) = badbd9cdc21645bf532ab28e28fd827f7071df968dc7173deceefa7fb8f04e1c
+SIZE (rpm/i386/fedora/3/libglade-0.17-15.src.rpm) = 430111
diff --git a/devel/linux-f10-libglade/pkg-plist.alpha b/devel/linux-f10-libglade/pkg-plist.alpha
deleted file mode 100644
index c5767b11deea..000000000000
--- a/devel/linux-f10-libglade/pkg-plist.alpha
+++ /dev/null
@@ -1,10 +0,0 @@
-usr/lib/libglade-gnome.so.0.4.0
-usr/lib/libglade.so.0.4.0
-usr/share/doc/libglade-0.14/AUTHORS
-usr/share/doc/libglade-0.14/COPYING
-usr/share/doc/libglade-0.14/ChangeLog
-usr/share/doc/libglade-0.14/NEWS
-usr/share/doc/libglade-0.14/README
-usr/lib/libglade-gnome.so.0
-usr/lib/libglade.so.0
-@dirrm usr/share/doc/libglade-0.14
diff --git a/devel/linux-f10-libglade/pkg-plist.i386 b/devel/linux-f10-libglade/pkg-plist.i386
index c5767b11deea..6fd063534468 100644
--- a/devel/linux-f10-libglade/pkg-plist.i386
+++ b/devel/linux-f10-libglade/pkg-plist.i386
@@ -1,10 +1,10 @@
-usr/lib/libglade-gnome.so.0.4.0
-usr/lib/libglade.so.0.4.0
-usr/share/doc/libglade-0.14/AUTHORS
-usr/share/doc/libglade-0.14/COPYING
-usr/share/doc/libglade-0.14/ChangeLog
-usr/share/doc/libglade-0.14/NEWS
-usr/share/doc/libglade-0.14/README
+usr/lib/libglade-gnome.so.%%LIBVERSION%%
+usr/lib/libglade.so.%%LIBVERSION%%
+usr/share/doc/libglade-%%PORTVERSION%%/AUTHORS
+usr/share/doc/libglade-%%PORTVERSION%%/COPYING
+usr/share/doc/libglade-%%PORTVERSION%%/ChangeLog
+usr/share/doc/libglade-%%PORTVERSION%%/NEWS
+usr/share/doc/libglade-%%PORTVERSION%%/README
 usr/lib/libglade-gnome.so.0
 usr/lib/libglade.so.0
-@dirrm usr/share/doc/libglade-0.14
+@dirrm usr/share/doc/libglade-%%PORTVERSION%%
diff --git a/devel/linux-f10-libglade2/Makefile b/devel/linux-f10-libglade2/Makefile
index 3b2d4549be63..b9d8402ebe5c 100644
--- a/devel/linux-f10-libglade2/Makefile
+++ b/devel/linux-f10-libglade2/Makefile
@@ -6,13 +6,17 @@
 #
 
 PORTNAME=	libglade
-PORTVERSION=	0.14
-PORTREVISION=	3
+PORTVERSION=	0.17
 CATEGORIES=	devel linux
+DISTNAME=	${PORTNAME}-${PORTVERSION}-15
 
 MAINTAINER=	freebsd-emulation@FreeBSD.org
 COMMENT=	RPM of libglade
 
-RPM_SET=	libglade-${PORTVERSION}-3.${ARCH}.rpm
+USE_LINUX_RPM=	yes
+LINUX_DIST_VER=	3
+INSTALLS_SHLIB=	yes
+PLIST=		pkg-plist.${LINUX_RPM_ARCH}
+PLIST_SUB=	LIBVERSION="0.4.2" PORTVERSION="${PORTVERSION}"
 
-.include "../../x11-toolkits/linux-gtk/Makefile"
+.include <bsd.port.mk>
diff --git a/devel/linux-f10-libglade2/distinfo.alpha b/devel/linux-f10-libglade2/distinfo.alpha
deleted file mode 100644
index edca3e1882c2..000000000000
--- a/devel/linux-f10-libglade2/distinfo.alpha
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 (rpm/libglade-0.14-3.alpha.rpm) = c3a9aacdc0ccada3922bfcca35cf826c
-SIZE (rpm/libglade-0.14-3.alpha.rpm) = 181497
diff --git a/devel/linux-f10-libglade2/distinfo.i386 b/devel/linux-f10-libglade2/distinfo.i386
index 47b650aa52c0..3316be9b05eb 100644
--- a/devel/linux-f10-libglade2/distinfo.i386
+++ b/devel/linux-f10-libglade2/distinfo.i386
@@ -1,2 +1,6 @@
-MD5 (rpm/libglade-0.14-3.i386.rpm) = e0b9a3f9a3e6569c90dead7835de830c
-SIZE (rpm/libglade-0.14-3.i386.rpm) = 103807
+MD5 (rpm/i386/fedora/3/libglade-0.17-15.i386.rpm) = c527e8e71514e708764f3722ed689e4f
+SHA256 (rpm/i386/fedora/3/libglade-0.17-15.i386.rpm) = cb03dafc4e4ecde1fc4d892ee6772cd63c55e22c0fd88ba1b725d81b0ce5a811
+SIZE (rpm/i386/fedora/3/libglade-0.17-15.i386.rpm) = 99959
+MD5 (rpm/i386/fedora/3/libglade-0.17-15.src.rpm) = e995b33d8c7bdb17a1fa406906b337a0
+SHA256 (rpm/i386/fedora/3/libglade-0.17-15.src.rpm) = badbd9cdc21645bf532ab28e28fd827f7071df968dc7173deceefa7fb8f04e1c
+SIZE (rpm/i386/fedora/3/libglade-0.17-15.src.rpm) = 430111
diff --git a/devel/linux-f10-libglade2/pkg-plist.alpha b/devel/linux-f10-libglade2/pkg-plist.alpha
deleted file mode 100644
index c5767b11deea..000000000000
--- a/devel/linux-f10-libglade2/pkg-plist.alpha
+++ /dev/null
@@ -1,10 +0,0 @@
-usr/lib/libglade-gnome.so.0.4.0
-usr/lib/libglade.so.0.4.0
-usr/share/doc/libglade-0.14/AUTHORS
-usr/share/doc/libglade-0.14/COPYING
-usr/share/doc/libglade-0.14/ChangeLog
-usr/share/doc/libglade-0.14/NEWS
-usr/share/doc/libglade-0.14/README
-usr/lib/libglade-gnome.so.0
-usr/lib/libglade.so.0
-@dirrm usr/share/doc/libglade-0.14
diff --git a/devel/linux-f10-libglade2/pkg-plist.i386 b/devel/linux-f10-libglade2/pkg-plist.i386
index c5767b11deea..6fd063534468 100644
--- a/devel/linux-f10-libglade2/pkg-plist.i386
+++ b/devel/linux-f10-libglade2/pkg-plist.i386
@@ -1,10 +1,10 @@
-usr/lib/libglade-gnome.so.0.4.0
-usr/lib/libglade.so.0.4.0
-usr/share/doc/libglade-0.14/AUTHORS
-usr/share/doc/libglade-0.14/COPYING
-usr/share/doc/libglade-0.14/ChangeLog
-usr/share/doc/libglade-0.14/NEWS
-usr/share/doc/libglade-0.14/README
+usr/lib/libglade-gnome.so.%%LIBVERSION%%
+usr/lib/libglade.so.%%LIBVERSION%%
+usr/share/doc/libglade-%%PORTVERSION%%/AUTHORS
+usr/share/doc/libglade-%%PORTVERSION%%/COPYING
+usr/share/doc/libglade-%%PORTVERSION%%/ChangeLog
+usr/share/doc/libglade-%%PORTVERSION%%/NEWS
+usr/share/doc/libglade-%%PORTVERSION%%/README
 usr/lib/libglade-gnome.so.0
 usr/lib/libglade.so.0
-@dirrm usr/share/doc/libglade-0.14
+@dirrm usr/share/doc/libglade-%%PORTVERSION%%
diff --git a/devel/linux-f8-allegro/Makefile b/devel/linux-f8-allegro/Makefile
index 3926708da4c9..e19998825d5c 100644
--- a/devel/linux-f8-allegro/Makefile
+++ b/devel/linux-f8-allegro/Makefile
@@ -7,23 +7,25 @@
 
 PORTNAME=	allegro
 PORTVERSION=	4.0.3
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel linux
 MASTER_SITES=	http://membres.lycos.fr/ebotcazou/allegro/
-PKGNAMEPREFIX=	linux-
+DISTNAME=	${PORTNAME}-${PORTVERSION}-1
 
 MAINTAINER=	freebsd-emulation@FreeBSD.org
 COMMENT=	Cross-platform game programming library (linux version)
 
-BUILD_DEPENDS=	rpm:${PORTSDIR}/archivers/rpm
-RUN_DEPENDS=
-
-USE_LINUX=		yes
-USE_LINUX_PREFIX=	yes
+USE_LINUX_RPM=		yes
 ONLY_FOR_ARCHS=		i386 amd64
+DIST_SUBDIR=		rpm
+INSTALLS_SHLIB=		yes
+USE_XLIB=		yes
+SRC_DISTFILES=
 
-RPM_SET=	${PORTNAME}-${PORTVERSION}-1.${ARCH}.rpm
-PLIST=		${MASTERDIR}/pkg-plist
 MD5_FILE=	${MASTERDIR}/distinfo
 
-.include "../../x11-toolkits/linux-gtk/Makefile"
+post-extract:
+	@cd ${WRKSRC}/usr/lib; \
+	${LN} -s liballeg-4.0.3.so liballeg.so.4.0
+
+.include <bsd.port.mk>
diff --git a/devel/linux-f8-libglade/Makefile b/devel/linux-f8-libglade/Makefile
index 3b2d4549be63..b9d8402ebe5c 100644
--- a/devel/linux-f8-libglade/Makefile
+++ b/devel/linux-f8-libglade/Makefile
@@ -6,13 +6,17 @@
 #
 
 PORTNAME=	libglade
-PORTVERSION=	0.14
-PORTREVISION=	3
+PORTVERSION=	0.17
 CATEGORIES=	devel linux
+DISTNAME=	${PORTNAME}-${PORTVERSION}-15
 
 MAINTAINER=	freebsd-emulation@FreeBSD.org
 COMMENT=	RPM of libglade
 
-RPM_SET=	libglade-${PORTVERSION}-3.${ARCH}.rpm
+USE_LINUX_RPM=	yes
+LINUX_DIST_VER=	3
+INSTALLS_SHLIB=	yes
+PLIST=		pkg-plist.${LINUX_RPM_ARCH}
+PLIST_SUB=	LIBVERSION="0.4.2" PORTVERSION="${PORTVERSION}"
 
-.include "../../x11-toolkits/linux-gtk/Makefile"
+.include <bsd.port.mk>
diff --git a/devel/linux-f8-libglade/distinfo.alpha b/devel/linux-f8-libglade/distinfo.alpha
deleted file mode 100644
index edca3e1882c2..000000000000
--- a/devel/linux-f8-libglade/distinfo.alpha
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 (rpm/libglade-0.14-3.alpha.rpm) = c3a9aacdc0ccada3922bfcca35cf826c
-SIZE (rpm/libglade-0.14-3.alpha.rpm) = 181497
diff --git a/devel/linux-f8-libglade/distinfo.i386 b/devel/linux-f8-libglade/distinfo.i386
index 47b650aa52c0..3316be9b05eb 100644
--- a/devel/linux-f8-libglade/distinfo.i386
+++ b/devel/linux-f8-libglade/distinfo.i386
@@ -1,2 +1,6 @@
-MD5 (rpm/libglade-0.14-3.i386.rpm) = e0b9a3f9a3e6569c90dead7835de830c
-SIZE (rpm/libglade-0.14-3.i386.rpm) = 103807
+MD5 (rpm/i386/fedora/3/libglade-0.17-15.i386.rpm) = c527e8e71514e708764f3722ed689e4f
+SHA256 (rpm/i386/fedora/3/libglade-0.17-15.i386.rpm) = cb03dafc4e4ecde1fc4d892ee6772cd63c55e22c0fd88ba1b725d81b0ce5a811
+SIZE (rpm/i386/fedora/3/libglade-0.17-15.i386.rpm) = 99959
+MD5 (rpm/i386/fedora/3/libglade-0.17-15.src.rpm) = e995b33d8c7bdb17a1fa406906b337a0
+SHA256 (rpm/i386/fedora/3/libglade-0.17-15.src.rpm) = badbd9cdc21645bf532ab28e28fd827f7071df968dc7173deceefa7fb8f04e1c
+SIZE (rpm/i386/fedora/3/libglade-0.17-15.src.rpm) = 430111
diff --git a/devel/linux-f8-libglade/pkg-plist.alpha b/devel/linux-f8-libglade/pkg-plist.alpha
deleted file mode 100644
index c5767b11deea..000000000000
--- a/devel/linux-f8-libglade/pkg-plist.alpha
+++ /dev/null
@@ -1,10 +0,0 @@
-usr/lib/libglade-gnome.so.0.4.0
-usr/lib/libglade.so.0.4.0
-usr/share/doc/libglade-0.14/AUTHORS
-usr/share/doc/libglade-0.14/COPYING
-usr/share/doc/libglade-0.14/ChangeLog
-usr/share/doc/libglade-0.14/NEWS
-usr/share/doc/libglade-0.14/README
-usr/lib/libglade-gnome.so.0
-usr/lib/libglade.so.0
-@dirrm usr/share/doc/libglade-0.14
diff --git a/devel/linux-f8-libglade/pkg-plist.i386 b/devel/linux-f8-libglade/pkg-plist.i386
index c5767b11deea..6fd063534468 100644
--- a/devel/linux-f8-libglade/pkg-plist.i386
+++ b/devel/linux-f8-libglade/pkg-plist.i386
@@ -1,10 +1,10 @@
-usr/lib/libglade-gnome.so.0.4.0
-usr/lib/libglade.so.0.4.0
-usr/share/doc/libglade-0.14/AUTHORS
-usr/share/doc/libglade-0.14/COPYING
-usr/share/doc/libglade-0.14/ChangeLog
-usr/share/doc/libglade-0.14/NEWS
-usr/share/doc/libglade-0.14/README
+usr/lib/libglade-gnome.so.%%LIBVERSION%%
+usr/lib/libglade.so.%%LIBVERSION%%
+usr/share/doc/libglade-%%PORTVERSION%%/AUTHORS
+usr/share/doc/libglade-%%PORTVERSION%%/COPYING
+usr/share/doc/libglade-%%PORTVERSION%%/ChangeLog
+usr/share/doc/libglade-%%PORTVERSION%%/NEWS
+usr/share/doc/libglade-%%PORTVERSION%%/README
 usr/lib/libglade-gnome.so.0
 usr/lib/libglade.so.0
-@dirrm usr/share/doc/libglade-0.14
+@dirrm usr/share/doc/libglade-%%PORTVERSION%%
diff --git a/devel/linux-f8-libglade2/Makefile b/devel/linux-f8-libglade2/Makefile
index 3b2d4549be63..b9d8402ebe5c 100644
--- a/devel/linux-f8-libglade2/Makefile
+++ b/devel/linux-f8-libglade2/Makefile
@@ -6,13 +6,17 @@
 #
 
 PORTNAME=	libglade
-PORTVERSION=	0.14
-PORTREVISION=	3
+PORTVERSION=	0.17
 CATEGORIES=	devel linux
+DISTNAME=	${PORTNAME}-${PORTVERSION}-15
 
 MAINTAINER=	freebsd-emulation@FreeBSD.org
 COMMENT=	RPM of libglade
 
-RPM_SET=	libglade-${PORTVERSION}-3.${ARCH}.rpm
+USE_LINUX_RPM=	yes
+LINUX_DIST_VER=	3
+INSTALLS_SHLIB=	yes
+PLIST=		pkg-plist.${LINUX_RPM_ARCH}
+PLIST_SUB=	LIBVERSION="0.4.2" PORTVERSION="${PORTVERSION}"
 
-.include "../../x11-toolkits/linux-gtk/Makefile"
+.include <bsd.port.mk>
diff --git a/devel/linux-f8-libglade2/distinfo.alpha b/devel/linux-f8-libglade2/distinfo.alpha
deleted file mode 100644
index edca3e1882c2..000000000000
--- a/devel/linux-f8-libglade2/distinfo.alpha
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 (rpm/libglade-0.14-3.alpha.rpm) = c3a9aacdc0ccada3922bfcca35cf826c
-SIZE (rpm/libglade-0.14-3.alpha.rpm) = 181497
diff --git a/devel/linux-f8-libglade2/distinfo.i386 b/devel/linux-f8-libglade2/distinfo.i386
index 47b650aa52c0..3316be9b05eb 100644
--- a/devel/linux-f8-libglade2/distinfo.i386
+++ b/devel/linux-f8-libglade2/distinfo.i386
@@ -1,2 +1,6 @@
-MD5 (rpm/libglade-0.14-3.i386.rpm) = e0b9a3f9a3e6569c90dead7835de830c
-SIZE (rpm/libglade-0.14-3.i386.rpm) = 103807
+MD5 (rpm/i386/fedora/3/libglade-0.17-15.i386.rpm) = c527e8e71514e708764f3722ed689e4f
+SHA256 (rpm/i386/fedora/3/libglade-0.17-15.i386.rpm) = cb03dafc4e4ecde1fc4d892ee6772cd63c55e22c0fd88ba1b725d81b0ce5a811
+SIZE (rpm/i386/fedora/3/libglade-0.17-15.i386.rpm) = 99959
+MD5 (rpm/i386/fedora/3/libglade-0.17-15.src.rpm) = e995b33d8c7bdb17a1fa406906b337a0
+SHA256 (rpm/i386/fedora/3/libglade-0.17-15.src.rpm) = badbd9cdc21645bf532ab28e28fd827f7071df968dc7173deceefa7fb8f04e1c
+SIZE (rpm/i386/fedora/3/libglade-0.17-15.src.rpm) = 430111
diff --git a/devel/linux-f8-libglade2/pkg-plist.alpha b/devel/linux-f8-libglade2/pkg-plist.alpha
deleted file mode 100644
index c5767b11deea..000000000000
--- a/devel/linux-f8-libglade2/pkg-plist.alpha
+++ /dev/null
@@ -1,10 +0,0 @@
-usr/lib/libglade-gnome.so.0.4.0
-usr/lib/libglade.so.0.4.0
-usr/share/doc/libglade-0.14/AUTHORS
-usr/share/doc/libglade-0.14/COPYING
-usr/share/doc/libglade-0.14/ChangeLog
-usr/share/doc/libglade-0.14/NEWS
-usr/share/doc/libglade-0.14/README
-usr/lib/libglade-gnome.so.0
-usr/lib/libglade.so.0
-@dirrm usr/share/doc/libglade-0.14
diff --git a/devel/linux-f8-libglade2/pkg-plist.i386 b/devel/linux-f8-libglade2/pkg-plist.i386
index c5767b11deea..6fd063534468 100644
--- a/devel/linux-f8-libglade2/pkg-plist.i386
+++ b/devel/linux-f8-libglade2/pkg-plist.i386
@@ -1,10 +1,10 @@
-usr/lib/libglade-gnome.so.0.4.0
-usr/lib/libglade.so.0.4.0
-usr/share/doc/libglade-0.14/AUTHORS
-usr/share/doc/libglade-0.14/COPYING
-usr/share/doc/libglade-0.14/ChangeLog
-usr/share/doc/libglade-0.14/NEWS
-usr/share/doc/libglade-0.14/README
+usr/lib/libglade-gnome.so.%%LIBVERSION%%
+usr/lib/libglade.so.%%LIBVERSION%%
+usr/share/doc/libglade-%%PORTVERSION%%/AUTHORS
+usr/share/doc/libglade-%%PORTVERSION%%/COPYING
+usr/share/doc/libglade-%%PORTVERSION%%/ChangeLog
+usr/share/doc/libglade-%%PORTVERSION%%/NEWS
+usr/share/doc/libglade-%%PORTVERSION%%/README
 usr/lib/libglade-gnome.so.0
 usr/lib/libglade.so.0
-@dirrm usr/share/doc/libglade-0.14
+@dirrm usr/share/doc/libglade-%%PORTVERSION%%
diff --git a/devel/linux-glib2/Makefile b/devel/linux-glib2/Makefile
index 64b635ce795e..dcc852d3f8e0 100644
--- a/devel/linux-glib2/Makefile
+++ b/devel/linux-glib2/Makefile
@@ -7,19 +7,18 @@
 
 PORTNAME=	glib2
 PORTVERSION=	2.4.8
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel linux
-MASTER_SITES=	${MASTER_SITE_FEDORA_LINUX}
-MASTER_SITE_SUBDIR=	updates/3/i386
+DISTNAME=	${PORTNAME}-${PORTVERSION}-1.fc3
 
 MAINTAINER=	freebsd-emulation@FreeBSD.org
 COMMENT=	Version 2.X Linux/i386 binary port of GLib
 
+USE_LINUX_RPM=	yes
+LINUX_DIST_VER=	3
+INSTALLS_SHLIB=	yes
 ONLY_FOR_ARCHS=	i386 amd64
-PLIST=		${PKGDIR}/pkg-plist
-RESTRICTED=	"binary under GNU LGPL without accompanying source"
-RPM_SET=	glib2-${PORTVERSION}-1.fc3.i386.rpm
 
 PLIST_SUB+=	LIBVERSION="400.8" PORTVERSION="${PORTVERSION}"
 
-.include "../../x11-toolkits/linux-gtk/Makefile"
+.include <bsd.port.mk>
diff --git a/devel/linux-glib2/distinfo.i386 b/devel/linux-glib2/distinfo.i386
index fdb8957032bf..b5799d4f2b0e 100644
--- a/devel/linux-glib2/distinfo.i386
+++ b/devel/linux-glib2/distinfo.i386
@@ -1,3 +1,6 @@
-MD5 (rpm/glib2-2.4.8-1.fc3.i386.rpm) = 989f41fb5bb1c2ef166916dc9d5e7a59
-SHA256 (rpm/glib2-2.4.8-1.fc3.i386.rpm) = 13d869469afa0b498750f7832b64c777198d4ad532aac03e6a0de9d6d46f7a24
-SIZE (rpm/glib2-2.4.8-1.fc3.i386.rpm) = 488888
+MD5 (rpm/i386/fedora/3/glib2-2.4.8-1.fc3.i386.rpm) = 989f41fb5bb1c2ef166916dc9d5e7a59
+SHA256 (rpm/i386/fedora/3/glib2-2.4.8-1.fc3.i386.rpm) = 13d869469afa0b498750f7832b64c777198d4ad532aac03e6a0de9d6d46f7a24
+SIZE (rpm/i386/fedora/3/glib2-2.4.8-1.fc3.i386.rpm) = 488888
+MD5 (rpm/i386/fedora/3/glib2-2.4.8-1.fc3.src.rpm) = 4e5e474cf8feb35307d645eb9f8dbfa4
+SHA256 (rpm/i386/fedora/3/glib2-2.4.8-1.fc3.src.rpm) = c45711fa46ffd149ac0c56fb8337eb56404844d594e033d0958fe2b3b542bf39
+SIZE (rpm/i386/fedora/3/glib2-2.4.8-1.fc3.src.rpm) = 2159065
diff --git a/devel/linux-libglade/Makefile b/devel/linux-libglade/Makefile
index 3b2d4549be63..b9d8402ebe5c 100644
--- a/devel/linux-libglade/Makefile
+++ b/devel/linux-libglade/Makefile
@@ -6,13 +6,17 @@
 #
 
 PORTNAME=	libglade
-PORTVERSION=	0.14
-PORTREVISION=	3
+PORTVERSION=	0.17
 CATEGORIES=	devel linux
+DISTNAME=	${PORTNAME}-${PORTVERSION}-15
 
 MAINTAINER=	freebsd-emulation@FreeBSD.org
 COMMENT=	RPM of libglade
 
-RPM_SET=	libglade-${PORTVERSION}-3.${ARCH}.rpm
+USE_LINUX_RPM=	yes
+LINUX_DIST_VER=	3
+INSTALLS_SHLIB=	yes
+PLIST=		pkg-plist.${LINUX_RPM_ARCH}
+PLIST_SUB=	LIBVERSION="0.4.2" PORTVERSION="${PORTVERSION}"
 
-.include "../../x11-toolkits/linux-gtk/Makefile"
+.include <bsd.port.mk>
diff --git a/devel/linux-libglade/distinfo.alpha b/devel/linux-libglade/distinfo.alpha
deleted file mode 100644
index edca3e1882c2..000000000000
--- a/devel/linux-libglade/distinfo.alpha
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 (rpm/libglade-0.14-3.alpha.rpm) = c3a9aacdc0ccada3922bfcca35cf826c
-SIZE (rpm/libglade-0.14-3.alpha.rpm) = 181497
diff --git a/devel/linux-libglade/distinfo.i386 b/devel/linux-libglade/distinfo.i386
index 47b650aa52c0..3316be9b05eb 100644
--- a/devel/linux-libglade/distinfo.i386
+++ b/devel/linux-libglade/distinfo.i386
@@ -1,2 +1,6 @@
-MD5 (rpm/libglade-0.14-3.i386.rpm) = e0b9a3f9a3e6569c90dead7835de830c
-SIZE (rpm/libglade-0.14-3.i386.rpm) = 103807
+MD5 (rpm/i386/fedora/3/libglade-0.17-15.i386.rpm) = c527e8e71514e708764f3722ed689e4f
+SHA256 (rpm/i386/fedora/3/libglade-0.17-15.i386.rpm) = cb03dafc4e4ecde1fc4d892ee6772cd63c55e22c0fd88ba1b725d81b0ce5a811
+SIZE (rpm/i386/fedora/3/libglade-0.17-15.i386.rpm) = 99959
+MD5 (rpm/i386/fedora/3/libglade-0.17-15.src.rpm) = e995b33d8c7bdb17a1fa406906b337a0
+SHA256 (rpm/i386/fedora/3/libglade-0.17-15.src.rpm) = badbd9cdc21645bf532ab28e28fd827f7071df968dc7173deceefa7fb8f04e1c
+SIZE (rpm/i386/fedora/3/libglade-0.17-15.src.rpm) = 430111
diff --git a/devel/linux-libglade/pkg-plist.alpha b/devel/linux-libglade/pkg-plist.alpha
deleted file mode 100644
index c5767b11deea..000000000000
--- a/devel/linux-libglade/pkg-plist.alpha
+++ /dev/null
@@ -1,10 +0,0 @@
-usr/lib/libglade-gnome.so.0.4.0
-usr/lib/libglade.so.0.4.0
-usr/share/doc/libglade-0.14/AUTHORS
-usr/share/doc/libglade-0.14/COPYING
-usr/share/doc/libglade-0.14/ChangeLog
-usr/share/doc/libglade-0.14/NEWS
-usr/share/doc/libglade-0.14/README
-usr/lib/libglade-gnome.so.0
-usr/lib/libglade.so.0
-@dirrm usr/share/doc/libglade-0.14
diff --git a/devel/linux-libglade/pkg-plist.i386 b/devel/linux-libglade/pkg-plist.i386
index c5767b11deea..6fd063534468 100644
--- a/devel/linux-libglade/pkg-plist.i386
+++ b/devel/linux-libglade/pkg-plist.i386
@@ -1,10 +1,10 @@
-usr/lib/libglade-gnome.so.0.4.0
-usr/lib/libglade.so.0.4.0
-usr/share/doc/libglade-0.14/AUTHORS
-usr/share/doc/libglade-0.14/COPYING
-usr/share/doc/libglade-0.14/ChangeLog
-usr/share/doc/libglade-0.14/NEWS
-usr/share/doc/libglade-0.14/README
+usr/lib/libglade-gnome.so.%%LIBVERSION%%
+usr/lib/libglade.so.%%LIBVERSION%%
+usr/share/doc/libglade-%%PORTVERSION%%/AUTHORS
+usr/share/doc/libglade-%%PORTVERSION%%/COPYING
+usr/share/doc/libglade-%%PORTVERSION%%/ChangeLog
+usr/share/doc/libglade-%%PORTVERSION%%/NEWS
+usr/share/doc/libglade-%%PORTVERSION%%/README
 usr/lib/libglade-gnome.so.0
 usr/lib/libglade.so.0
-@dirrm usr/share/doc/libglade-0.14
+@dirrm usr/share/doc/libglade-%%PORTVERSION%%
diff --git a/devel/linux-libglade2/Makefile b/devel/linux-libglade2/Makefile
index 3b2d4549be63..b9d8402ebe5c 100644
--- a/devel/linux-libglade2/Makefile
+++ b/devel/linux-libglade2/Makefile
@@ -6,13 +6,17 @@
 #
 
 PORTNAME=	libglade
-PORTVERSION=	0.14
-PORTREVISION=	3
+PORTVERSION=	0.17
 CATEGORIES=	devel linux
+DISTNAME=	${PORTNAME}-${PORTVERSION}-15
 
 MAINTAINER=	freebsd-emulation@FreeBSD.org
 COMMENT=	RPM of libglade
 
-RPM_SET=	libglade-${PORTVERSION}-3.${ARCH}.rpm
+USE_LINUX_RPM=	yes
+LINUX_DIST_VER=	3
+INSTALLS_SHLIB=	yes
+PLIST=		pkg-plist.${LINUX_RPM_ARCH}
+PLIST_SUB=	LIBVERSION="0.4.2" PORTVERSION="${PORTVERSION}"
 
-.include "../../x11-toolkits/linux-gtk/Makefile"
+.include <bsd.port.mk>
diff --git a/devel/linux-libglade2/distinfo.alpha b/devel/linux-libglade2/distinfo.alpha
deleted file mode 100644
index edca3e1882c2..000000000000
--- a/devel/linux-libglade2/distinfo.alpha
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 (rpm/libglade-0.14-3.alpha.rpm) = c3a9aacdc0ccada3922bfcca35cf826c
-SIZE (rpm/libglade-0.14-3.alpha.rpm) = 181497
diff --git a/devel/linux-libglade2/distinfo.i386 b/devel/linux-libglade2/distinfo.i386
index 47b650aa52c0..3316be9b05eb 100644
--- a/devel/linux-libglade2/distinfo.i386
+++ b/devel/linux-libglade2/distinfo.i386
@@ -1,2 +1,6 @@
-MD5 (rpm/libglade-0.14-3.i386.rpm) = e0b9a3f9a3e6569c90dead7835de830c
-SIZE (rpm/libglade-0.14-3.i386.rpm) = 103807
+MD5 (rpm/i386/fedora/3/libglade-0.17-15.i386.rpm) = c527e8e71514e708764f3722ed689e4f
+SHA256 (rpm/i386/fedora/3/libglade-0.17-15.i386.rpm) = cb03dafc4e4ecde1fc4d892ee6772cd63c55e22c0fd88ba1b725d81b0ce5a811
+SIZE (rpm/i386/fedora/3/libglade-0.17-15.i386.rpm) = 99959
+MD5 (rpm/i386/fedora/3/libglade-0.17-15.src.rpm) = e995b33d8c7bdb17a1fa406906b337a0
+SHA256 (rpm/i386/fedora/3/libglade-0.17-15.src.rpm) = badbd9cdc21645bf532ab28e28fd827f7071df968dc7173deceefa7fb8f04e1c
+SIZE (rpm/i386/fedora/3/libglade-0.17-15.src.rpm) = 430111
diff --git a/devel/linux-libglade2/pkg-plist.alpha b/devel/linux-libglade2/pkg-plist.alpha
deleted file mode 100644
index c5767b11deea..000000000000
--- a/devel/linux-libglade2/pkg-plist.alpha
+++ /dev/null
@@ -1,10 +0,0 @@
-usr/lib/libglade-gnome.so.0.4.0
-usr/lib/libglade.so.0.4.0
-usr/share/doc/libglade-0.14/AUTHORS
-usr/share/doc/libglade-0.14/COPYING
-usr/share/doc/libglade-0.14/ChangeLog
-usr/share/doc/libglade-0.14/NEWS
-usr/share/doc/libglade-0.14/README
-usr/lib/libglade-gnome.so.0
-usr/lib/libglade.so.0
-@dirrm usr/share/doc/libglade-0.14
diff --git a/devel/linux-libglade2/pkg-plist.i386 b/devel/linux-libglade2/pkg-plist.i386
index c5767b11deea..6fd063534468 100644
--- a/devel/linux-libglade2/pkg-plist.i386
+++ b/devel/linux-libglade2/pkg-plist.i386
@@ -1,10 +1,10 @@
-usr/lib/libglade-gnome.so.0.4.0
-usr/lib/libglade.so.0.4.0
-usr/share/doc/libglade-0.14/AUTHORS
-usr/share/doc/libglade-0.14/COPYING
-usr/share/doc/libglade-0.14/ChangeLog
-usr/share/doc/libglade-0.14/NEWS
-usr/share/doc/libglade-0.14/README
+usr/lib/libglade-gnome.so.%%LIBVERSION%%
+usr/lib/libglade.so.%%LIBVERSION%%
+usr/share/doc/libglade-%%PORTVERSION%%/AUTHORS
+usr/share/doc/libglade-%%PORTVERSION%%/COPYING
+usr/share/doc/libglade-%%PORTVERSION%%/ChangeLog
+usr/share/doc/libglade-%%PORTVERSION%%/NEWS
+usr/share/doc/libglade-%%PORTVERSION%%/README
 usr/lib/libglade-gnome.so.0
 usr/lib/libglade.so.0
-@dirrm usr/share/doc/libglade-0.14
+@dirrm usr/share/doc/libglade-%%PORTVERSION%%