aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexander Leidinger <netchild@FreeBSD.org>2006-05-01 17:28:17 +0000
committerAlexander Leidinger <netchild@FreeBSD.org>2006-05-01 17:28:17 +0000
commitc1eba2d83eb1b997b5906a1458529c5c6a6a2fa4 (patch)
treeae044c026c4c8ae63ae3e6cd375428c689780f05
parent205f4f916c424ba649de05e7db3c1c34afa55d33 (diff)
downloadports-c1eba2d83eb1b997b5906a1458529c5c6a6a2fa4.tar.gz
ports-c1eba2d83eb1b997b5906a1458529c5c6a6a2fa4.zip
Notes
-rw-r--r--accessibility/linux-atk/Makefile21
-rw-r--r--accessibility/linux-atk/distinfo.i38612
-rw-r--r--accessibility/linux-f10-atk/Makefile21
-rw-r--r--accessibility/linux-f10-atk/distinfo.i38612
-rw-r--r--accessibility/linux-f8-atk/Makefile21
-rw-r--r--accessibility/linux-f8-atk/distinfo.i38612
-rw-r--r--audio/linux-esound/Makefile18
-rw-r--r--audio/linux-esound/distinfo.alpha2
-rw-r--r--audio/linux-esound/distinfo.i38612
-rw-r--r--audio/linux-esound/pkg-plist.alpha72
-rw-r--r--audio/linux-f10-esound/Makefile18
-rw-r--r--audio/linux-f10-esound/distinfo.alpha2
-rw-r--r--audio/linux-f10-esound/distinfo.i38612
-rw-r--r--audio/linux-f10-esound/pkg-plist.alpha72
-rw-r--r--audio/linux-f10-libaudiofile/Makefile18
-rw-r--r--audio/linux-f10-libaudiofile/distinfo.alpha2
-rw-r--r--audio/linux-f10-libaudiofile/distinfo.i38612
-rw-r--r--audio/linux-f10-libaudiofile/pkg-plist.alpha28
-rw-r--r--audio/linux-f8-esound/Makefile18
-rw-r--r--audio/linux-f8-esound/distinfo.alpha2
-rw-r--r--audio/linux-f8-esound/distinfo.i38612
-rw-r--r--audio/linux-f8-esound/pkg-plist.alpha72
-rw-r--r--audio/linux-f8-libaudiofile/Makefile18
-rw-r--r--audio/linux-f8-libaudiofile/distinfo.alpha2
-rw-r--r--audio/linux-f8-libaudiofile/distinfo.i38612
-rw-r--r--audio/linux-f8-libaudiofile/pkg-plist.alpha28
-rw-r--r--audio/linux-libaudiofile/Makefile18
-rw-r--r--audio/linux-libaudiofile/distinfo.alpha2
-rw-r--r--audio/linux-libaudiofile/distinfo.i38612
-rw-r--r--audio/linux-libaudiofile/pkg-plist.alpha28
-rw-r--r--devel/linux-allegro/Makefile22
-rw-r--r--devel/linux-f10-allegro/Makefile22
-rw-r--r--devel/linux-f10-libglade/Makefile12
-rw-r--r--devel/linux-f10-libglade/distinfo.alpha2
-rw-r--r--devel/linux-f10-libglade/distinfo.i3868
-rw-r--r--devel/linux-f10-libglade/pkg-plist.alpha10
-rw-r--r--devel/linux-f10-libglade/pkg-plist.i38616
-rw-r--r--devel/linux-f10-libglade2/Makefile12
-rw-r--r--devel/linux-f10-libglade2/distinfo.alpha2
-rw-r--r--devel/linux-f10-libglade2/distinfo.i3868
-rw-r--r--devel/linux-f10-libglade2/pkg-plist.alpha10
-rw-r--r--devel/linux-f10-libglade2/pkg-plist.i38616
-rw-r--r--devel/linux-f8-allegro/Makefile22
-rw-r--r--devel/linux-f8-libglade/Makefile12
-rw-r--r--devel/linux-f8-libglade/distinfo.alpha2
-rw-r--r--devel/linux-f8-libglade/distinfo.i3868
-rw-r--r--devel/linux-f8-libglade/pkg-plist.alpha10
-rw-r--r--devel/linux-f8-libglade/pkg-plist.i38616
-rw-r--r--devel/linux-f8-libglade2/Makefile12
-rw-r--r--devel/linux-f8-libglade2/distinfo.alpha2
-rw-r--r--devel/linux-f8-libglade2/distinfo.i3868
-rw-r--r--devel/linux-f8-libglade2/pkg-plist.alpha10
-rw-r--r--devel/linux-f8-libglade2/pkg-plist.i38616
-rw-r--r--devel/linux-glib2/Makefile13
-rw-r--r--devel/linux-glib2/distinfo.i3869
-rw-r--r--devel/linux-libglade/Makefile12
-rw-r--r--devel/linux-libglade/distinfo.alpha2
-rw-r--r--devel/linux-libglade/distinfo.i3868
-rw-r--r--devel/linux-libglade/pkg-plist.alpha10
-rw-r--r--devel/linux-libglade/pkg-plist.i38616
-rw-r--r--devel/linux-libglade2/Makefile12
-rw-r--r--devel/linux-libglade2/distinfo.alpha2
-rw-r--r--devel/linux-libglade2/distinfo.i3868
-rw-r--r--devel/linux-libglade2/pkg-plist.alpha10
-rw-r--r--devel/linux-libglade2/pkg-plist.i38616
-rw-r--r--graphics/linux-f10-imlib/Makefile13
-rw-r--r--graphics/linux-f10-imlib/distinfo.alpha2
-rw-r--r--graphics/linux-f10-imlib/distinfo.i3868
-rw-r--r--graphics/linux-f10-imlib/pkg-plist.alpha21
-rw-r--r--graphics/linux-f10-imlib/pkg-plist.i38616
-rw-r--r--graphics/linux-f10-jpeg/Makefile16
-rw-r--r--graphics/linux-f10-jpeg/distinfo.i3869
-rw-r--r--graphics/linux-f10-jpeg/pkg-plist (renamed from graphics/linux-f10-jpeg/pkg-plist.i386)0
-rw-r--r--graphics/linux-f10-png/Makefile12
-rw-r--r--graphics/linux-f10-png/distinfo.i3869
-rw-r--r--graphics/linux-f10-png10/Makefile12
-rw-r--r--graphics/linux-f10-png10/distinfo.i3868
-rw-r--r--graphics/linux-f10-tiff/Makefile25
-rw-r--r--graphics/linux-f10-tiff/distinfo.i3869
-rw-r--r--graphics/linux-f10-ungif/Makefile16
-rw-r--r--graphics/linux-f10-ungif/distinfo.alpha2
-rw-r--r--graphics/linux-f10-ungif/distinfo.i3868
-rw-r--r--graphics/linux-f10-ungif/pkg-plist.alpha20
-rw-r--r--graphics/linux-f10-ungif/pkg-plist.i38634
-rw-r--r--graphics/linux-f8-imlib/Makefile13
-rw-r--r--graphics/linux-f8-imlib/distinfo.alpha2
-rw-r--r--graphics/linux-f8-imlib/distinfo.i3868
-rw-r--r--graphics/linux-f8-imlib/pkg-plist.alpha21
-rw-r--r--graphics/linux-f8-imlib/pkg-plist.i38616
-rw-r--r--graphics/linux-f8-jpeg/Makefile16
-rw-r--r--graphics/linux-f8-jpeg/distinfo.i3869
-rw-r--r--graphics/linux-f8-jpeg/pkg-plist (renamed from graphics/linux-f8-jpeg/pkg-plist.i386)0
-rw-r--r--graphics/linux-f8-png/Makefile12
-rw-r--r--graphics/linux-f8-png/distinfo.i3869
-rw-r--r--graphics/linux-f8-png10/Makefile12
-rw-r--r--graphics/linux-f8-png10/distinfo.i3868
-rw-r--r--graphics/linux-f8-tiff/Makefile25
-rw-r--r--graphics/linux-f8-tiff/distinfo.i3869
-rw-r--r--graphics/linux-f8-ungif/Makefile16
-rw-r--r--graphics/linux-f8-ungif/distinfo.alpha2
-rw-r--r--graphics/linux-f8-ungif/distinfo.i3868
-rw-r--r--graphics/linux-f8-ungif/pkg-plist.alpha20
-rw-r--r--graphics/linux-f8-ungif/pkg-plist.i38634
-rw-r--r--graphics/linux-imlib/Makefile13
-rw-r--r--graphics/linux-imlib/distinfo.alpha2
-rw-r--r--graphics/linux-imlib/distinfo.i3868
-rw-r--r--graphics/linux-imlib/pkg-plist.alpha21
-rw-r--r--graphics/linux-imlib/pkg-plist.i38616
-rw-r--r--graphics/linux-jpeg/Makefile16
-rw-r--r--graphics/linux-jpeg/distinfo.i3869
-rw-r--r--graphics/linux-jpeg/pkg-plist (renamed from graphics/linux-jpeg/pkg-plist.i386)0
-rw-r--r--graphics/linux-png/Makefile12
-rw-r--r--graphics/linux-png/distinfo.i3869
-rw-r--r--graphics/linux-png10/Makefile12
-rw-r--r--graphics/linux-png10/distinfo.i3868
-rw-r--r--graphics/linux-tiff/Makefile25
-rw-r--r--graphics/linux-tiff/distinfo.i3869
-rw-r--r--graphics/linux-ungif/Makefile16
-rw-r--r--graphics/linux-ungif/distinfo.alpha2
-rw-r--r--graphics/linux-ungif/distinfo.i3868
-rw-r--r--graphics/linux-ungif/pkg-plist.alpha20
-rw-r--r--graphics/linux-ungif/pkg-plist.i38634
-rw-r--r--japanese/linux-ttfonts/Makefile20
-rw-r--r--japanese/linux-ttfonts/distinfo9
-rw-r--r--japanese/linux-ttfonts/pkg-plist45
-rw-r--r--textproc/linux-expat/Makefile23
-rw-r--r--textproc/linux-expat/distinfo.i3869
-rw-r--r--textproc/linux-expat/pkg-plist7
-rw-r--r--textproc/linux-f10-expat/Makefile23
-rw-r--r--textproc/linux-f10-expat/distinfo.i3869
-rw-r--r--textproc/linux-f10-expat/pkg-plist7
-rw-r--r--textproc/linux-f10-libxml/Makefile17
-rw-r--r--textproc/linux-f10-libxml/distinfo.alpha2
-rw-r--r--textproc/linux-f10-libxml/distinfo.i38612
-rw-r--r--textproc/linux-f10-libxml/pkg-plist.alpha32
-rw-r--r--textproc/linux-f10-libxml2/Makefile17
-rw-r--r--textproc/linux-f10-libxml2/distinfo.alpha2
-rw-r--r--textproc/linux-f10-libxml2/distinfo.i38612
-rw-r--r--textproc/linux-f10-libxml2/pkg-plist.alpha32
-rw-r--r--textproc/linux-f8-expat/Makefile23
-rw-r--r--textproc/linux-f8-expat/distinfo.i3869
-rw-r--r--textproc/linux-f8-expat/pkg-plist7
-rw-r--r--textproc/linux-f8-libxml/Makefile17
-rw-r--r--textproc/linux-f8-libxml/distinfo.alpha2
-rw-r--r--textproc/linux-f8-libxml/distinfo.i38612
-rw-r--r--textproc/linux-f8-libxml/pkg-plist.alpha32
-rw-r--r--textproc/linux-f8-libxml2/Makefile17
-rw-r--r--textproc/linux-f8-libxml2/distinfo.alpha2
-rw-r--r--textproc/linux-f8-libxml2/distinfo.i38612
-rw-r--r--textproc/linux-f8-libxml2/pkg-plist.alpha32
-rw-r--r--textproc/linux-libxml/Makefile17
-rw-r--r--textproc/linux-libxml/distinfo.alpha2
-rw-r--r--textproc/linux-libxml/distinfo.i38612
-rw-r--r--textproc/linux-libxml/pkg-plist.alpha32
-rw-r--r--textproc/linux-libxml2/Makefile17
-rw-r--r--textproc/linux-libxml2/distinfo.alpha2
-rw-r--r--textproc/linux-libxml2/distinfo.i38612
-rw-r--r--textproc/linux-libxml2/pkg-plist.alpha32
-rw-r--r--x11-fonts/linux-f10-fontconfig/Makefile34
-rw-r--r--x11-fonts/linux-f10-fontconfig/distinfo.i3869
-rw-r--r--x11-fonts/linux-f10-fontconfig/files/pkg-install.in9
-rw-r--r--x11-fonts/linux-f10-fontconfig/pkg-install6
-rw-r--r--x11-fonts/linux-f8-fontconfig/Makefile34
-rw-r--r--x11-fonts/linux-f8-fontconfig/distinfo.i3869
-rw-r--r--x11-fonts/linux-f8-fontconfig/files/pkg-install.in9
-rw-r--r--x11-fonts/linux-f8-fontconfig/pkg-install6
-rw-r--r--x11-fonts/linux-fontconfig/Makefile34
-rw-r--r--x11-fonts/linux-fontconfig/distinfo.i3869
-rw-r--r--x11-fonts/linux-fontconfig/files/pkg-install.in9
-rw-r--r--x11-fonts/linux-fontconfig/pkg-install6
-rw-r--r--x11-fonts/linux-urw-fonts/Makefile21
-rw-r--r--x11-fonts/linux-urw-fonts/distinfo9
-rw-r--r--x11-fonts/linux-urw-fonts/files/fonts.dir582
-rw-r--r--x11-fonts/linux-urw-fonts/files/fonts.scale582
-rw-r--r--x11-fonts/linux-urw-fonts/pkg-plist80
-rw-r--r--x11-toolkits/linux-f10-gtk/Makefile82
-rw-r--r--x11-toolkits/linux-f10-gtk/distinfo.alpha2
-rw-r--r--x11-toolkits/linux-f10-gtk/distinfo.i3869
-rw-r--r--x11-toolkits/linux-f10-gtk/pkg-plist.alpha182
-rw-r--r--x11-toolkits/linux-f10-gtk/pkg-plist.i38673
-rw-r--r--x11-toolkits/linux-f10-gtk2/Makefile19
-rw-r--r--x11-toolkits/linux-f10-gtk2/distinfo.i3869
-rw-r--r--x11-toolkits/linux-f10-pango/Makefile14
-rw-r--r--x11-toolkits/linux-f10-pango/distinfo.i3869
-rw-r--r--x11-toolkits/linux-f8-gtk/Makefile82
-rw-r--r--x11-toolkits/linux-f8-gtk/distinfo.alpha2
-rw-r--r--x11-toolkits/linux-f8-gtk/distinfo.i3869
-rw-r--r--x11-toolkits/linux-f8-gtk/pkg-plist.alpha182
-rw-r--r--x11-toolkits/linux-f8-gtk/pkg-plist.i38673
-rw-r--r--x11-toolkits/linux-f8-gtk2/Makefile19
-rw-r--r--x11-toolkits/linux-f8-gtk2/distinfo.i3869
-rw-r--r--x11-toolkits/linux-f8-pango/Makefile14
-rw-r--r--x11-toolkits/linux-f8-pango/distinfo.i3869
-rw-r--r--x11-toolkits/linux-gtk/Makefile82
-rw-r--r--x11-toolkits/linux-gtk/distinfo.alpha2
-rw-r--r--x11-toolkits/linux-gtk/distinfo.i3869
-rw-r--r--x11-toolkits/linux-gtk/pkg-plist.alpha182
-rw-r--r--x11-toolkits/linux-gtk/pkg-plist.i38673
-rw-r--r--x11-toolkits/linux-gtk2/Makefile19
-rw-r--r--x11-toolkits/linux-gtk2/distinfo.i3869
-rw-r--r--x11-toolkits/linux-pango/Makefile14
-rw-r--r--x11-toolkits/linux-pango/distinfo.i3869
-rw-r--r--x11/linux-gnomelibs/Makefile15
-rw-r--r--x11/linux-gnomelibs/distinfo.alpha2
-rw-r--r--x11/linux-gnomelibs/distinfo.i3868
-rw-r--r--x11/linux-gnomelibs/pkg-plist.alpha117
-rw-r--r--x11/linux-gnomelibs/pkg-plist.i38679
207 files changed, 2345 insertions, 2777 deletions
diff --git a/accessibility/linux-atk/Makefile b/accessibility/linux-atk/Makefile
index 493d10e9a664..dcecd6c6244f 100644
--- a/accessibility/linux-atk/Makefile
+++ b/accessibility/linux-atk/Makefile
@@ -7,26 +7,19 @@
PORTNAME= atk
PORTVERSION= 1.8.0
-PORTREVISION= 1
-CATEGORIES= accessibility
-MASTER_SITES= ${MASTER_SITE_FEDORA_LINUX}
-MASTER_SITE_SUBDIR= 3/i386/os/Fedora/RPMS \
- 3/SRPMS
+PORTREVISION= 2
+CATEGORIES= accessibility linux
+DISTNAME= ${PORTNAME}-${PORTVERSION}-2
MAINTAINER= freebsd-emulation@FreeBSD.org
COMMENT= Accessibility Toolkit, Linux/i386 binary
-BUILD_DEPENDS= rpm:${PORTSDIR}/archivers/rpm
RUN_DEPENDS= ${LINUXBASE}/usr/lib/libglib-2.0.so.0:${PORTSDIR}/devel/linux-glib2
ONLY_FOR_ARCHS= i386 amd64
-PLIST= ${PKGDIR}/pkg-plist
-RPM_SET= atk-${PORTVERSION}-2.i386.rpm
+USE_LINUX_RPM= yes
+LINUX_DIST_VER= 3
+INSTALLS_SHLIB= yes
PLIST_SUB+= LIBVERSION="800.0" PORTVERSION="${PORTVERSION}"
-.include "../../x11-toolkits/linux-gtk/Makefile"
-
-.if defined(PACKAGE_BUILDING)
-DISTFILES+= atk-1.8.0-2.src.rpm
-ALWAYS_KEEP_DISTFILES= yes
-.endif
+.include <bsd.port.mk>
diff --git a/accessibility/linux-atk/distinfo.i386 b/accessibility/linux-atk/distinfo.i386
index 75c4c5f92a77..9c857c20003a 100644
--- a/accessibility/linux-atk/distinfo.i386
+++ b/accessibility/linux-atk/distinfo.i386
@@ -1,6 +1,6 @@
-MD5 (rpm/atk-1.8.0-2.i386.rpm) = c5f936956e14255f4e2c4d8c5a8989e6
-SHA256 (rpm/atk-1.8.0-2.i386.rpm) = 73264272bf39bd01c270eb3063e7474badca35f73e4dbef559b05c6d4d8246e0
-SIZE (rpm/atk-1.8.0-2.i386.rpm) = 174373
-MD5 (rpm/atk-1.8.0-2.src.rpm) = 4ac8aed13da6d41e15a1fc4f3ac031e2
-SHA256 (rpm/atk-1.8.0-2.src.rpm) = eb75ccf573bb691c3243e360ed8e69d36cca3bfa705a335ac903e50e9179857d
-SIZE (rpm/rpm/atk-1.8.0-2.src.rpm) = 509083
+MD5 (rpm/i386/fedora/3/atk-1.8.0-2.i386.rpm) = c5f936956e14255f4e2c4d8c5a8989e6
+SHA256 (rpm/i386/fedora/3/atk-1.8.0-2.i386.rpm) = 73264272bf39bd01c270eb3063e7474badca35f73e4dbef559b05c6d4d8246e0
+SIZE (rpm/i386/fedora/3/atk-1.8.0-2.i386.rpm) = 174373
+MD5 (rpm/i386/fedora/3/atk-1.8.0-2.src.rpm) = 4ac8aed13da6d41e15a1fc4f3ac031e2
+SHA256 (rpm/i386/fedora/3/atk-1.8.0-2.src.rpm) = eb75ccf573bb691c3243e360ed8e69d36cca3bfa705a335ac903e50e9179857d
+SIZE (rpm/i386/fedora/3/atk-1.8.0-2.src.rpm) = 509083
diff --git a/accessibility/linux-f10-atk/Makefile b/accessibility/linux-f10-atk/Makefile
index 493d10e9a664..dcecd6c6244f 100644
--- a/accessibility/linux-f10-atk/Makefile
+++ b/accessibility/linux-f10-atk/Makefile
@@ -7,26 +7,19 @@
PORTNAME= atk
PORTVERSION= 1.8.0
-PORTREVISION= 1
-CATEGORIES= accessibility
-MASTER_SITES= ${MASTER_SITE_FEDORA_LINUX}
-MASTER_SITE_SUBDIR= 3/i386/os/Fedora/RPMS \
- 3/SRPMS
+PORTREVISION= 2
+CATEGORIES= accessibility linux
+DISTNAME= ${PORTNAME}-${PORTVERSION}-2
MAINTAINER= freebsd-emulation@FreeBSD.org
COMMENT= Accessibility Toolkit, Linux/i386 binary
-BUILD_DEPENDS= rpm:${PORTSDIR}/archivers/rpm
RUN_DEPENDS= ${LINUXBASE}/usr/lib/libglib-2.0.so.0:${PORTSDIR}/devel/linux-glib2
ONLY_FOR_ARCHS= i386 amd64
-PLIST= ${PKGDIR}/pkg-plist
-RPM_SET= atk-${PORTVERSION}-2.i386.rpm
+USE_LINUX_RPM= yes
+LINUX_DIST_VER= 3
+INSTALLS_SHLIB= yes
PLIST_SUB+= LIBVERSION="800.0" PORTVERSION="${PORTVERSION}"
-.include "../../x11-toolkits/linux-gtk/Makefile"
-
-.if defined(PACKAGE_BUILDING)
-DISTFILES+= atk-1.8.0-2.src.rpm
-ALWAYS_KEEP_DISTFILES= yes
-.endif
+.include <bsd.port.mk>
diff --git a/accessibility/linux-f10-atk/distinfo.i386 b/accessibility/linux-f10-atk/distinfo.i386
index 75c4c5f92a77..9c857c20003a 100644
--- a/accessibility/linux-f10-atk/distinfo.i386
+++ b/accessibility/linux-f10-atk/distinfo.i386
@@ -1,6 +1,6 @@
-MD5 (rpm/atk-1.8.0-2.i386.rpm) = c5f936956e14255f4e2c4d8c5a8989e6
-SHA256 (rpm/atk-1.8.0-2.i386.rpm) = 73264272bf39bd01c270eb3063e7474badca35f73e4dbef559b05c6d4d8246e0
-SIZE (rpm/atk-1.8.0-2.i386.rpm) = 174373
-MD5 (rpm/atk-1.8.0-2.src.rpm) = 4ac8aed13da6d41e15a1fc4f3ac031e2
-SHA256 (rpm/atk-1.8.0-2.src.rpm) = eb75ccf573bb691c3243e360ed8e69d36cca3bfa705a335ac903e50e9179857d
-SIZE (rpm/rpm/atk-1.8.0-2.src.rpm) = 509083
+MD5 (rpm/i386/fedora/3/atk-1.8.0-2.i386.rpm) = c5f936956e14255f4e2c4d8c5a8989e6
+SHA256 (rpm/i386/fedora/3/atk-1.8.0-2.i386.rpm) = 73264272bf39bd01c270eb3063e7474badca35f73e4dbef559b05c6d4d8246e0
+SIZE (rpm/i386/fedora/3/atk-1.8.0-2.i386.rpm) = 174373
+MD5 (rpm/i386/fedora/3/atk-1.8.0-2.src.rpm) = 4ac8aed13da6d41e15a1fc4f3ac031e2
+SHA256 (rpm/i386/fedora/3/atk-1.8.0-2.src.rpm) = eb75ccf573bb691c3243e360ed8e69d36cca3bfa705a335ac903e50e9179857d
+SIZE (rpm/i386/fedora/3/atk-1.8.0-2.src.rpm) = 509083
diff --git a/accessibility/linux-f8-atk/Makefile b/accessibility/linux-f8-atk/Makefile
index 493d10e9a664..dcecd6c6244f 100644
--- a/accessibility/linux-f8-atk/Makefile
+++ b/accessibility/linux-f8-atk/Makefile
@@ -7,26 +7,19 @@
PORTNAME= atk
PORTVERSION= 1.8.0
-PORTREVISION= 1
-CATEGORIES= accessibility
-MASTER_SITES= ${MASTER_SITE_FEDORA_LINUX}
-MASTER_SITE_SUBDIR= 3/i386/os/Fedora/RPMS \
- 3/SRPMS
+PORTREVISION= 2
+CATEGORIES= accessibility linux
+DISTNAME= ${PORTNAME}-${PORTVERSION}-2
MAINTAINER= freebsd-emulation@FreeBSD.org
COMMENT= Accessibility Toolkit, Linux/i386 binary
-BUILD_DEPENDS= rpm:${PORTSDIR}/archivers/rpm
RUN_DEPENDS= ${LINUXBASE}/usr/lib/libglib-2.0.so.0:${PORTSDIR}/devel/linux-glib2
ONLY_FOR_ARCHS= i386 amd64
-PLIST= ${PKGDIR}/pkg-plist
-RPM_SET= atk-${PORTVERSION}-2.i386.rpm
+USE_LINUX_RPM= yes
+LINUX_DIST_VER= 3
+INSTALLS_SHLIB= yes
PLIST_SUB+= LIBVERSION="800.0" PORTVERSION="${PORTVERSION}"
-.include "../../x11-toolkits/linux-gtk/Makefile"
-
-.if defined(PACKAGE_BUILDING)
-DISTFILES+= atk-1.8.0-2.src.rpm
-ALWAYS_KEEP_DISTFILES= yes
-.endif
+.include <bsd.port.mk>
diff --git a/accessibility/linux-f8-atk/distinfo.i386 b/accessibility/linux-f8-atk/distinfo.i386
index 75c4c5f92a77..9c857c20003a 100644
--- a/accessibility/linux-f8-atk/distinfo.i386
+++ b/accessibility/linux-f8-atk/distinfo.i386
@@ -1,6 +1,6 @@
-MD5 (rpm/atk-1.8.0-2.i386.rpm) = c5f936956e14255f4e2c4d8c5a8989e6
-SHA256 (rpm/atk-1.8.0-2.i386.rpm) = 73264272bf39bd01c270eb3063e7474badca35f73e4dbef559b05c6d4d8246e0
-SIZE (rpm/atk-1.8.0-2.i386.rpm) = 174373
-MD5 (rpm/atk-1.8.0-2.src.rpm) = 4ac8aed13da6d41e15a1fc4f3ac031e2
-SHA256 (rpm/atk-1.8.0-2.src.rpm) = eb75ccf573bb691c3243e360ed8e69d36cca3bfa705a335ac903e50e9179857d
-SIZE (rpm/rpm/atk-1.8.0-2.src.rpm) = 509083
+MD5 (rpm/i386/fedora/3/atk-1.8.0-2.i386.rpm) = c5f936956e14255f4e2c4d8c5a8989e6
+SHA256 (rpm/i386/fedora/3/atk-1.8.0-2.i386.rpm) = 73264272bf39bd01c270eb3063e7474badca35f73e4dbef559b05c6d4d8246e0
+SIZE (rpm/i386/fedora/3/atk-1.8.0-2.i386.rpm) = 174373
+MD5 (rpm/i386/fedora/3/atk-1.8.0-2.src.rpm) = 4ac8aed13da6d41e15a1fc4f3ac031e2
+SHA256 (rpm/i386/fedora/3/atk-1.8.0-2.src.rpm) = eb75ccf573bb691c3243e360ed8e69d36cca3bfa705a335ac903e50e9179857d
+SIZE (rpm/i386/fedora/3/atk-1.8.0-2.src.rpm) = 509083
diff --git a/audio/linux-esound/Makefile b/audio/linux-esound/Makefile
index cff621254388..6b971c25f940 100644
--- a/audio/linux-esound/Makefile
+++ b/audio/linux-esound/Makefile
@@ -8,14 +8,8 @@
PORTNAME= esound
CATEGORIES= audio linux
PORTVERSION= 0.2.35
-PORTREVISION= 0
-MASTER_SITES= ${MASTER_SITE_FEDORA_LINUX}
-MASTER_SITE_SUBDIR= 3/i386/os/Fedora/RPMS 3/SRPMS
-
-.if defined(PACKAGE_BUILDING)
-SRC_DISTFILES+= esound-${PORTVERSION}-2.src.rpm
-ALWAYS_KEEP_DISTFILES= yes
-.endif
+PORTREVISION= 1
+DISTNAME= ${PORTNAME}-${PORTVERSION}-2
MAINTAINER= freebsd-emulation@FreeBSD.org
COMMENT= RPM of esound
@@ -24,7 +18,11 @@ NOT_FOR_ARCHS= amd64
RUN_DEPENDS= ${LINUXBASE}/usr/lib/libaudiofile.so.0:${PORTSDIR}/audio/linux-libaudiofile
-RPM_SET= esound-${PORTVERSION}-2.${MACHINE_ARCH}.rpm
+USE_LINUX_RPM= yes
+LINUX_DIST_VER= 3
+INSTALLS_SHLIB= yes
+BRANDELF_DIRS= usr/bin
+PLIST= pkg-plist.${LINUX_RPM_ARCH}
-.include "../../x11-toolkits/linux-gtk/Makefile"
+.include <bsd.port.mk>
diff --git a/audio/linux-esound/distinfo.alpha b/audio/linux-esound/distinfo.alpha
deleted file mode 100644
index a3bda61a9bfd..000000000000
--- a/audio/linux-esound/distinfo.alpha
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 (rpm/esound-0.2.22-1.alpha.rpm) = 94411e58472dbb01383a8c7784b9b4bd
-SIZE (rpm/esound-0.2.22-1.alpha.rpm) = 129522
diff --git a/audio/linux-esound/distinfo.i386 b/audio/linux-esound/distinfo.i386
index c2a1983f7355..35b5ebdcccc4 100644
--- a/audio/linux-esound/distinfo.i386
+++ b/audio/linux-esound/distinfo.i386
@@ -1,6 +1,6 @@
-MD5 (rpm/esound-0.2.35-2.i386.rpm) = a38d50fbb3a481f899ce38d403cd4f35
-SHA256 (rpm/esound-0.2.35-2.i386.rpm) = fd7c65b81cf6cc8b6d9313fe9e4325a10a65a4515fba6c0a93371acc71b1d3c0
-SIZE (rpm/esound-0.2.35-2.i386.rpm) = 123657
-MD5 (rpm/esound-0.2.35-2.src.rpm) = 96ea0ca1a379603b08ef83cd9d6858b7
-SHA256 (rpm/esound-0.2.35-2.src.rpm) = 8847dbdb22db93693542bb0d9951d58fe0faa86f7d3b560eab437ff341e56a22
-SIZE (rpm/esound-0.2.35-2.src.rpm) = 394701
+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
diff --git a/audio/linux-esound/pkg-plist.alpha b/audio/linux-esound/pkg-plist.alpha
deleted file mode 100644
index 2fd653643fb5..000000000000
--- a/audio/linux-esound/pkg-plist.alpha
+++ /dev/null
@@ -1,72 +0,0 @@
-etc/esd.conf
-usr/bin/esd
-usr/bin/esdcat
-usr/bin/esdctl
-usr/bin/esddsp
-usr/bin/esdfilt
-usr/bin/esdloop
-usr/bin/esdmon
-usr/bin/esdplay
-usr/bin/esdrec
-usr/bin/esdsample
-usr/lib/libesd.so.0.2.22
-usr/lib/libesddsp.so.0.2.22
-usr/share/doc/esound-0.2.22/AUTHORS
-usr/share/doc/esound-0.2.22/COPYING
-usr/share/doc/esound-0.2.22/ChangeLog
-usr/share/doc/esound-0.2.22/INSTALL
-usr/share/doc/esound-0.2.22/NEWS
-usr/share/doc/esound-0.2.22/README
-usr/share/doc/esound-0.2.22/TIPS
-usr/share/doc/esound-0.2.22/TODO
-usr/share/doc/esound-0.2.22/esound.ps
-usr/share/doc/esound-0.2.22/esound.sgml
-usr/share/doc/esound-0.2.22/html/anything-else.html
-usr/share/doc/esound-0.2.22/html/authentication.html
-usr/share/doc/esound-0.2.22/html/book1.html
-usr/share/doc/esound-0.2.22/html/compiling.html
-usr/share/doc/esound-0.2.22/html/deficiencies.html
-usr/share/doc/esound-0.2.22/html/design-docs.html
-usr/share/doc/esound-0.2.22/html/docbook.css
-usr/share/doc/esound-0.2.22/html/downloading-compiling-installing.html
-usr/share/doc/esound-0.2.22/html/environment-variables.html
-usr/share/doc/esound-0.2.22/html/esdcat-esdmon-esdrec.html
-usr/share/doc/esound-0.2.22/html/esdctl.html
-usr/share/doc/esound-0.2.22/html/esdsample-esdloop.html
-usr/share/doc/esound-0.2.22/html/esound-api.html
-usr/share/doc/esound-0.2.22/html/feature-additions.html
-usr/share/doc/esound-0.2.22/html/index.html
-usr/share/doc/esound-0.2.22/html/installing.html
-usr/share/doc/esound-0.2.22/html/introduction.html
-usr/share/doc/esound-0.2.22/html/ln17.html
-usr/share/doc/esound-0.2.22/html/miscellaneous.html
-usr/share/doc/esound-0.2.22/html/mpg123.html
-usr/share/doc/esound-0.2.22/html/organization.html
-usr/share/doc/esound-0.2.22/html/planned-development.html
-usr/share/doc/esound-0.2.22/html/player-type.html
-usr/share/doc/esound-0.2.22/html/r312.html
-usr/share/doc/esound-0.2.22/html/refentry-esd.html
-usr/share/doc/esound-0.2.22/html/remaining-details.html
-usr/share/doc/esound-0.2.22/html/running-esound.html
-usr/share/doc/esound-0.2.22/html/signal-path.html
-usr/share/doc/esound-0.2.22/html/stylesheet-images/caution.gif
-usr/share/doc/esound-0.2.22/html/stylesheet-images/home.gif
-usr/share/doc/esound-0.2.22/html/stylesheet-images/important.gif
-usr/share/doc/esound-0.2.22/html/stylesheet-images/next.gif
-usr/share/doc/esound-0.2.22/html/stylesheet-images/note.gif
-usr/share/doc/esound-0.2.22/html/stylesheet-images/prev.gif
-usr/share/doc/esound-0.2.22/html/stylesheet-images/tip.gif
-usr/share/doc/esound-0.2.22/html/stylesheet-images/toc-blank.gif
-usr/share/doc/esound-0.2.22/html/stylesheet-images/toc-minus.gif
-usr/share/doc/esound-0.2.22/html/stylesheet-images/toc-plus.gif
-usr/share/doc/esound-0.2.22/html/stylesheet-images/up.gif
-usr/share/doc/esound-0.2.22/html/stylesheet-images/warning.gif
-usr/share/doc/esound-0.2.22/html/supported-programs.html
-usr/share/doc/esound-0.2.22/html/x27.html
-usr/share/doc/esound-0.2.22/html/xmp.html
-usr/lib/libesd.so.0
-usr/lib/libesddsp.so
-usr/lib/libesddsp.so.0
-@dirrm usr/share/doc/esound-0.2.22/html/stylesheet-images
-@dirrm usr/share/doc/esound-0.2.22/html
-@dirrm usr/share/doc/esound-0.2.22
diff --git a/audio/linux-f10-esound/Makefile b/audio/linux-f10-esound/Makefile
index cff621254388..6b971c25f940 100644
--- a/audio/linux-f10-esound/Makefile
+++ b/audio/linux-f10-esound/Makefile
@@ -8,14 +8,8 @@
PORTNAME= esound
CATEGORIES= audio linux
PORTVERSION= 0.2.35
-PORTREVISION= 0
-MASTER_SITES= ${MASTER_SITE_FEDORA_LINUX}
-MASTER_SITE_SUBDIR= 3/i386/os/Fedora/RPMS 3/SRPMS
-
-.if defined(PACKAGE_BUILDING)
-SRC_DISTFILES+= esound-${PORTVERSION}-2.src.rpm
-ALWAYS_KEEP_DISTFILES= yes
-.endif
+PORTREVISION= 1
+DISTNAME= ${PORTNAME}-${PORTVERSION}-2
MAINTAINER= freebsd-emulation@FreeBSD.org
COMMENT= RPM of esound
@@ -24,7 +18,11 @@ NOT_FOR_ARCHS= amd64
RUN_DEPENDS= ${LINUXBASE}/usr/lib/libaudiofile.so.0:${PORTSDIR}/audio/linux-libaudiofile
-RPM_SET= esound-${PORTVERSION}-2.${MACHINE_ARCH}.rpm
+USE_LINUX_RPM= yes
+LINUX_DIST_VER= 3
+INSTALLS_SHLIB= yes
+BRANDELF_DIRS= usr/bin
+PLIST= pkg-plist.${LINUX_RPM_ARCH}
-.include "../../x11-toolkits/linux-gtk/Makefile"
+.include <bsd.port.mk>
diff --git a/audio/linux-f10-esound/distinfo.alpha b/audio/linux-f10-esound/distinfo.alpha
deleted file mode 100644
index a3bda61a9bfd..000000000000
--- a/audio/linux-f10-esound/distinfo.alpha
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 (rpm/esound-0.2.22-1.alpha.rpm) = 94411e58472dbb01383a8c7784b9b4bd
-SIZE (rpm/esound-0.2.22-1.alpha.rpm) = 129522
diff --git a/audio/linux-f10-esound/distinfo.i386 b/audio/linux-f10-esound/distinfo.i386
index c2a1983f7355..35b5ebdcccc4 100644
--- a/audio/linux-f10-esound/distinfo.i386
+++ b/audio/linux-f10-esound/distinfo.i386
@@ -1,6 +1,6 @@
-MD5 (rpm/esound-0.2.35-2.i386.rpm) = a38d50fbb3a481f899ce38d403cd4f35
-SHA256 (rpm/esound-0.2.35-2.i386.rpm) = fd7c65b81cf6cc8b6d9313fe9e4325a10a65a4515fba6c0a93371acc71b1d3c0
-SIZE (rpm/esound-0.2.35-2.i386.rpm) = 123657
-MD5 (rpm/esound-0.2.35-2.src.rpm) = 96ea0ca1a379603b08ef83cd9d6858b7
-SHA256 (rpm/esound-0.2.35-2.src.rpm) = 8847dbdb22db93693542bb0d9951d58fe0faa86f7d3b560eab437ff341e56a22
-SIZE (rpm/esound-0.2.35-2.src.rpm) = 394701
+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
diff --git a/audio/linux-f10-esound/pkg-plist.alpha b/audio/linux-f10-esound/pkg-plist.alpha
deleted file mode 100644
index 2fd653643fb5..000000000000
--- a/audio/linux-f10-esound/pkg-plist.alpha
+++ /dev/null
@@ -1,72 +0,0 @@
-etc/esd.conf
-usr/bin/esd
-usr/bin/esdcat
-usr/bin/esdctl
-usr/bin/esddsp
-usr/bin/esdfilt
-usr/bin/esdloop
-usr/bin/esdmon
-usr/bin/esdplay
-usr/bin/esdrec
-usr/bin/esdsample
-usr/lib/libesd.so.0.2.22
-usr/lib/libesddsp.so.0.2.22
-usr/share/doc/esound-0.2.22/AUTHORS
-usr/share/doc/esound-0.2.22/COPYING
-usr/share/doc/esound-0.2.22/ChangeLog
-usr/share/doc/esound-0.2.22/INSTALL
-usr/share/doc/esound-0.2.22/NEWS
-usr/share/doc/esound-0.2.22/README
-usr/share/doc/esound-0.2.22/TIPS
-usr/share/doc/esound-0.2.22/TODO
-usr/share/doc/esound-0.2.22/esound.ps
-usr/share/doc/esound-0.2.22/esound.sgml
-usr/share/doc/esound-0.2.22/html/anything-else.html
-usr/share/doc/esound-0.2.22/html/authentication.html
-usr/share/doc/esound-0.2.22/html/book1.html
-usr/share/doc/esound-0.2.22/html/compiling.html
-usr/share/doc/esound-0.2.22/html/deficiencies.html
-usr/share/doc/esound-0.2.22/html/design-docs.html
-usr/share/doc/esound-0.2.22/html/docbook.css
-usr/share/doc/esound-0.2.22/html/downloading-compiling-installing.html
-usr/share/doc/esound-0.2.22/html/environment-variables.html
-usr/share/doc/esound-0.2.22/html/esdcat-esdmon-esdrec.html
-usr/share/doc/esound-0.2.22/html/esdctl.html
-usr/share/doc/esound-0.2.22/html/esdsample-esdloop.html
-usr/share/doc/esound-0.2.22/html/esound-api.html
-usr/share/doc/esound-0.2.22/html/feature-additions.html
-usr/share/doc/esound-0.2.22/html/index.html
-usr/share/doc/esound-0.2.22/html/installing.html
-usr/share/doc/esound-0.2.22/html/introduction.html
-usr/share/doc/esound-0.2.22/html/ln17.html
-usr/share/doc/esound-0.2.22/html/miscellaneous.html
-usr/share/doc/esound-0.2.22/html/mpg123.html
-usr/share/doc/esound-0.2.22/html/organization.html
-usr/share/doc/esound-0.2.22/html/planned-development.html
-usr/share/doc/esound-0.2.22/html/player-type.html
-usr/share/doc/esound-0.2.22/html/r312.html
-usr/share/doc/esound-0.2.22/html/refentry-esd.html
-usr/share/doc/esound-0.2.22/html/remaining-details.html
-usr/share/doc/esound-0.2.22/html/running-esound.html
-usr/share/doc/esound-0.2.22/html/signal-path.html
-usr/share/doc/esound-0.2.22/html/stylesheet-images/caution.gif
-usr/share/doc/esound-0.2.22/html/stylesheet-images/home.gif
-usr/share/doc/esound-0.2.22/html/stylesheet-images/important.gif
-usr/share/doc/esound-0.2.22/html/stylesheet-images/next.gif
-usr/share/doc/esound-0.2.22/html/stylesheet-images/note.gif
-usr/share/doc/esound-0.2.22/html/stylesheet-images/prev.gif
-usr/share/doc/esound-0.2.22/html/stylesheet-images/tip.gif
-usr/share/doc/esound-0.2.22/html/stylesheet-images/toc-blank.gif
-usr/share/doc/esound-0.2.22/html/stylesheet-images/toc-minus.gif
-usr/share/doc/esound-0.2.22/html/stylesheet-images/toc-plus.gif
-usr/share/doc/esound-0.2.22/html/stylesheet-images/up.gif
-usr/share/doc/esound-0.2.22/html/stylesheet-images/warning.gif
-usr/share/doc/esound-0.2.22/html/supported-programs.html
-usr/share/doc/esound-0.2.22/html/x27.html
-usr/share/doc/esound-0.2.22/html/xmp.html
-usr/lib/libesd.so.0
-usr/lib/libesddsp.so
-usr/lib/libesddsp.so.0
-@dirrm usr/share/doc/esound-0.2.22/html/stylesheet-images
-@dirrm usr/share/doc/esound-0.2.22/html
-@dirrm usr/share/doc/esound-0.2.22
diff --git a/audio/linux-f10-libaudiofile/Makefile b/audio/linux-f10-libaudiofile/Makefile
index c1f56ea5ee2d..83b22d00f0b5 100644
--- a/audio/linux-f10-libaudiofile/Makefile
+++ b/audio/linux-f10-libaudiofile/Makefile
@@ -7,19 +7,17 @@
PORTNAME= libaudiofile
PORTVERSION= 0.2.6
-PORTREVISION= 0
+PORTREVISION= 1
CATEGORIES= audio linux
-MASTER_SITES= ${MASTER_SITE_FEDORA_LINUX}
-MASTER_SITE_SUBDIR= 3/i386/os/Fedora/RPMS 3/SRPMS
-
-.if defined(PACKAGE_BUILDING)
-SRC_DISTFILES+= audiofile-${PORTVERSION}-1.src.rpm
-ALWAYS_KEEP_DISTFILES= yes
-.endif
+DISTNAME= audiofile-${PORTVERSION}-1
MAINTAINER= freebsd-emulation@FreeBSD.org
COMMENT= RPM of audiofile
-RPM_SET= audiofile-${PORTVERSION}-1.${ARCH}.rpm
+USE_LINUX_RPM= yes
+LINUX_DIST_VER= 3
+INSTALLS_SHLIB= yes
+BRANDELF_DIRS= usr/bin
+PLIST= pkg-plist.${LINUX_RPM_ARCH}
-.include "../../x11-toolkits/linux-gtk/Makefile"
+.include <bsd.port.mk>
diff --git a/audio/linux-f10-libaudiofile/distinfo.alpha b/audio/linux-f10-libaudiofile/distinfo.alpha
deleted file mode 100644
index f9522b40aba4..000000000000
--- a/audio/linux-f10-libaudiofile/distinfo.alpha
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 (rpm/audiofile-0.1.11-1.alpha.rpm) = 852a9656ac61aec99c7a7936b0249a9d
-SIZE (rpm/audiofile-0.1.11-1.alpha.rpm) = 166874
diff --git a/audio/linux-f10-libaudiofile/distinfo.i386 b/audio/linux-f10-libaudiofile/distinfo.i386
index 32c84f559622..8b05fb77044d 100644
--- a/audio/linux-f10-libaudiofile/distinfo.i386
+++ b/audio/linux-f10-libaudiofile/distinfo.i386
@@ -1,6 +1,6 @@
-MD5 (rpm/audiofile-0.2.6-1.i386.rpm) = de7720157ee9f32ab5115c3a6c5c7df0
-SHA256 (rpm/audiofile-0.2.6-1.i386.rpm) = 170a36b5156e78b06dde42b6b1ed71546801ae048c9d1143863cec9be787d0c3
-SIZE (rpm/audiofile-0.2.6-1.i386.rpm) = 101557
-MD5 (rpm/audiofile-0.2.6-1.src.rpm) = 62a1dce5af78fa9d9d91e3767c722db5
-SHA256 (rpm/audiofile-0.2.6-1.src.rpm) = 7c44918e119b1eb69064a5ffd0d1fe84c1c8d5235eb9df3ae9b7f167be96cd4b
-SIZE (rpm/audiofile-0.2.6-1.src.rpm) = 285599
+MD5 (rpm/i386/fedora/3/audiofile-0.2.6-1.i386.rpm) = de7720157ee9f32ab5115c3a6c5c7df0
+SHA256 (rpm/i386/fedora/3/audiofile-0.2.6-1.i386.rpm) = 170a36b5156e78b06dde42b6b1ed71546801ae048c9d1143863cec9be787d0c3
+SIZE (rpm/i386/fedora/3/audiofile-0.2.6-1.i386.rpm) = 101557
+MD5 (rpm/i386/fedora/3/audiofile-0.2.6-1.src.rpm) = 62a1dce5af78fa9d9d91e3767c722db5
+SHA256 (rpm/i386/fedora/3/audiofile-0.2.6-1.src.rpm) = 7c44918e119b1eb69064a5ffd0d1fe84c1c8d5235eb9df3ae9b7f167be96cd4b
+SIZE (rpm/i386/fedora/3/audiofile-0.2.6-1.src.rpm) = 285599
diff --git a/audio/linux-f10-libaudiofile/pkg-plist.alpha b/audio/linux-f10-libaudiofile/pkg-plist.alpha
deleted file mode 100644
index 3dd95ab74feb..000000000000
--- a/audio/linux-f10-libaudiofile/pkg-plist.alpha
+++ /dev/null
@@ -1,28 +0,0 @@
-usr/bin/sfconvert
-usr/bin/sfinfo
-usr/lib/libaudiofile.so.0.0.0
-usr/share/doc/audiofile-0.1.11/COPYING
-usr/share/doc/audiofile-0.1.11/ChangeLog
-usr/share/doc/audiofile-0.1.11/README
-usr/share/doc/audiofile-0.1.11/TODO
-usr/share/doc/audiofile-0.1.11/docs/Makefile
-usr/share/doc/audiofile-0.1.11/docs/Makefile.am
-usr/share/doc/audiofile-0.1.11/docs/Makefile.in
-usr/share/doc/audiofile-0.1.11/docs/afCloseFile
-usr/share/doc/audiofile-0.1.11/docs/afGetFrameSize
-usr/share/doc/audiofile-0.1.11/docs/afGetTrackBytes
-usr/share/doc/audiofile-0.1.11/docs/afIntro
-usr/share/doc/audiofile-0.1.11/docs/afNewFileSetup
-usr/share/doc/audiofile-0.1.11/docs/afOpenFile
-usr/share/doc/audiofile-0.1.11/docs/afQuery
-usr/share/doc/audiofile-0.1.11/docs/afReadFrames
-usr/share/doc/audiofile-0.1.11/docs/afReadMisc
-usr/share/doc/audiofile-0.1.11/docs/afSeekFrame
-usr/share/doc/audiofile-0.1.11/docs/afSetErrorHandler
-usr/share/doc/audiofile-0.1.11/docs/afSetVirtualByteOrder
-usr/share/doc/audiofile-0.1.11/docs/afWriteFrames
-usr/share/doc/audiofile-0.1.11/docs/sfconvert
-usr/share/doc/audiofile-0.1.11/docs/sfinfo
-usr/lib/libaudiofile.so.0
-@dirrm usr/share/doc/audiofile-0.1.11/docs
-@dirrm usr/share/doc/audiofile-0.1.11
diff --git a/audio/linux-f8-esound/Makefile b/audio/linux-f8-esound/Makefile
index cff621254388..6b971c25f940 100644
--- a/audio/linux-f8-esound/Makefile
+++ b/audio/linux-f8-esound/Makefile
@@ -8,14 +8,8 @@
PORTNAME= esound
CATEGORIES= audio linux
PORTVERSION= 0.2.35
-PORTREVISION= 0
-MASTER_SITES= ${MASTER_SITE_FEDORA_LINUX}
-MASTER_SITE_SUBDIR= 3/i386/os/Fedora/RPMS 3/SRPMS
-
-.if defined(PACKAGE_BUILDING)
-SRC_DISTFILES+= esound-${PORTVERSION}-2.src.rpm
-ALWAYS_KEEP_DISTFILES= yes
-.endif
+PORTREVISION= 1
+DISTNAME= ${PORTNAME}-${PORTVERSION}-2
MAINTAINER= freebsd-emulation@FreeBSD.org
COMMENT= RPM of esound
@@ -24,7 +18,11 @@ NOT_FOR_ARCHS= amd64
RUN_DEPENDS= ${LINUXBASE}/usr/lib/libaudiofile.so.0:${PORTSDIR}/audio/linux-libaudiofile
-RPM_SET= esound-${PORTVERSION}-2.${MACHINE_ARCH}.rpm
+USE_LINUX_RPM= yes
+LINUX_DIST_VER= 3
+INSTALLS_SHLIB= yes
+BRANDELF_DIRS= usr/bin
+PLIST= pkg-plist.${LINUX_RPM_ARCH}
-.include "../../x11-toolkits/linux-gtk/Makefile"
+.include <bsd.port.mk>
diff --git a/audio/linux-f8-esound/distinfo.alpha b/audio/linux-f8-esound/distinfo.alpha
deleted file mode 100644
index a3bda61a9bfd..000000000000
--- a/audio/linux-f8-esound/distinfo.alpha
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 (rpm/esound-0.2.22-1.alpha.rpm) = 94411e58472dbb01383a8c7784b9b4bd
-SIZE (rpm/esound-0.2.22-1.alpha.rpm) = 129522
diff --git a/audio/linux-f8-esound/distinfo.i386 b/audio/linux-f8-esound/distinfo.i386
index c2a1983f7355..35b5ebdcccc4 100644
--- a/audio/linux-f8-esound/distinfo.i386
+++ b/audio/linux-f8-esound/distinfo.i386
@@ -1,6 +1,6 @@
-MD5 (rpm/esound-0.2.35-2.i386.rpm) = a38d50fbb3a481f899ce38d403cd4f35
-SHA256 (rpm/esound-0.2.35-2.i386.rpm) = fd7c65b81cf6cc8b6d9313fe9e4325a10a65a4515fba6c0a93371acc71b1d3c0
-SIZE (rpm/esound-0.2.35-2.i386.rpm) = 123657
-MD5 (rpm/esound-0.2.35-2.src.rpm) = 96ea0ca1a379603b08ef83cd9d6858b7
-SHA256 (rpm/esound-0.2.35-2.src.rpm) = 8847dbdb22db93693542bb0d9951d58fe0faa86f7d3b560eab437ff341e56a22
-SIZE (rpm/esound-0.2.35-2.src.rpm) = 394701
+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
diff --git a/audio/linux-f8-esound/pkg-plist.alpha b/audio/linux-f8-esound/pkg-plist.alpha
deleted file mode 100644
index 2fd653643fb5..000000000000
--- a/audio/linux-f8-esound/pkg-plist.alpha
+++ /dev/null
@@ -1,72 +0,0 @@
-etc/esd.conf
-usr/bin/esd
-usr/bin/esdcat
-usr/bin/esdctl
-usr/bin/esddsp
-usr/bin/esdfilt
-usr/bin/esdloop
-usr/bin/esdmon
-usr/bin/esdplay
-usr/bin/esdrec
-usr/bin/esdsample
-usr/lib/libesd.so.0.2.22
-usr/lib/libesddsp.so.0.2.22
-usr/share/doc/esound-0.2.22/AUTHORS
-usr/share/doc/esound-0.2.22/COPYING
-usr/share/doc/esound-0.2.22/ChangeLog
-usr/share/doc/esound-0.2.22/INSTALL
-usr/share/doc/esound-0.2.22/NEWS
-usr/share/doc/esound-0.2.22/README
-usr/share/doc/esound-0.2.22/TIPS
-usr/share/doc/esound-0.2.22/TODO
-usr/share/doc/esound-0.2.22/esound.ps
-usr/share/doc/esound-0.2.22/esound.sgml
-usr/share/doc/esound-0.2.22/html/anything-else.html
-usr/share/doc/esound-0.2.22/html/authentication.html
-usr/share/doc/esound-0.2.22/html/book1.html
-usr/share/doc/esound-0.2.22/html/compiling.html
-usr/share/doc/esound-0.2.22/html/deficiencies.html
-usr/share/doc/esound-0.2.22/html/design-docs.html
-usr/share/doc/esound-0.2.22/html/docbook.css
-usr/share/doc/esound-0.2.22/html/downloading-compiling-installing.html
-usr/share/doc/esound-0.2.22/html/environment-variables.html
-usr/share/doc/esound-0.2.22/html/esdcat-esdmon-esdrec.html
-usr/share/doc/esound-0.2.22/html/esdctl.html
-usr/share/doc/esound-0.2.22/html/esdsample-esdloop.html
-usr/share/doc/esound-0.2.22/html/esound-api.html
-usr/share/doc/esound-0.2.22/html/feature-additions.html
-usr/share/doc/esound-0.2.22/html/index.html
-usr/share/doc/esound-0.2.22/html/installing.html
-usr/share/doc/esound-0.2.22/html/introduction.html
-usr/share/doc/esound-0.2.22/html/ln17.html
-usr/share/doc/esound-0.2.22/html/miscellaneous.html
-usr/share/doc/esound-0.2.22/html/mpg123.html
-usr/share/doc/esound-0.2.22/html/organization.html
-usr/share/doc/esound-0.2.22/html/planned-development.html
-usr/share/doc/esound-0.2.22/html/player-type.html
-usr/share/doc/esound-0.2.22/html/r312.html
-usr/share/doc/esound-0.2.22/html/refentry-esd.html
-usr/share/doc/esound-0.2.22/html/remaining-details.html
-usr/share/doc/esound-0.2.22/html/running-esound.html
-usr/share/doc/esound-0.2.22/html/signal-path.html
-usr/share/doc/esound-0.2.22/html/stylesheet-images/caution.gif
-usr/share/doc/esound-0.2.22/html/stylesheet-images/home.gif
-usr/share/doc/esound-0.2.22/html/stylesheet-images/important.gif
-usr/share/doc/esound-0.2.22/html/stylesheet-images/next.gif
-usr/share/doc/esound-0.2.22/html/stylesheet-images/note.gif
-usr/share/doc/esound-0.2.22/html/stylesheet-images/prev.gif
-usr/share/doc/esound-0.2.22/html/stylesheet-images/tip.gif
-usr/share/doc/esound-0.2.22/html/stylesheet-images/toc-blank.gif
-usr/share/doc/esound-0.2.22/html/stylesheet-images/toc-minus.gif
-usr/share/doc/esound-0.2.22/html/stylesheet-images/toc-plus.gif
-usr/share/doc/esound-0.2.22/html/stylesheet-images/up.gif
-usr/share/doc/esound-0.2.22/html/stylesheet-images/warning.gif
-usr/share/doc/esound-0.2.22/html/supported-programs.html
-usr/share/doc/esound-0.2.22/html/x27.html
-usr/share/doc/esound-0.2.22/html/xmp.html
-usr/lib/libesd.so.0
-usr/lib/libesddsp.so
-usr/lib/libesddsp.so.0
-@dirrm usr/share/doc/esound-0.2.22/html/stylesheet-images
-@dirrm usr/share/doc/esound-0.2.22/html
-@dirrm usr/share/doc/esound-0.2.22
diff --git a/audio/linux-f8-libaudiofile/Makefile b/audio/linux-f8-libaudiofile/Makefile
index c1f56ea5ee2d..83b22d00f0b5 100644
--- a/audio/linux-f8-libaudiofile/Makefile
+++ b/audio/linux-f8-libaudiofile/Makefile
@@ -7,19 +7,17 @@
PORTNAME= libaudiofile
PORTVERSION= 0.2.6
-PORTREVISION= 0
+PORTREVISION= 1
CATEGORIES= audio linux
-MASTER_SITES= ${MASTER_SITE_FEDORA_LINUX}
-MASTER_SITE_SUBDIR= 3/i386/os/Fedora/RPMS 3/SRPMS
-
-.if defined(PACKAGE_BUILDING)
-SRC_DISTFILES+= audiofile-${PORTVERSION}-1.src.rpm
-ALWAYS_KEEP_DISTFILES= yes
-.endif
+DISTNAME= audiofile-${PORTVERSION}-1
MAINTAINER= freebsd-emulation@FreeBSD.org
COMMENT= RPM of audiofile
-RPM_SET= audiofile-${PORTVERSION}-1.${ARCH}.rpm
+USE_LINUX_RPM= yes
+LINUX_DIST_VER= 3
+INSTALLS_SHLIB= yes
+BRANDELF_DIRS= usr/bin
+PLIST= pkg-plist.${LINUX_RPM_ARCH}
-.include "../../x11-toolkits/linux-gtk/Makefile"
+.include <bsd.port.mk>
diff --git a/audio/linux-f8-libaudiofile/distinfo.alpha b/audio/linux-f8-libaudiofile/distinfo.alpha
deleted file mode 100644
index f9522b40aba4..000000000000
--- a/audio/linux-f8-libaudiofile/distinfo.alpha
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 (rpm/audiofile-0.1.11-1.alpha.rpm) = 852a9656ac61aec99c7a7936b0249a9d
-SIZE (rpm/audiofile-0.1.11-1.alpha.rpm) = 166874
diff --git a/audio/linux-f8-libaudiofile/distinfo.i386 b/audio/linux-f8-libaudiofile/distinfo.i386
index 32c84f559622..8b05fb77044d 100644
--- a/audio/linux-f8-libaudiofile/distinfo.i386
+++ b/audio/linux-f8-libaudiofile/distinfo.i386
@@ -1,6 +1,6 @@
-MD5 (rpm/audiofile-0.2.6-1.i386.rpm) = de7720157ee9f32ab5115c3a6c5c7df0
-SHA256 (rpm/audiofile-0.2.6-1.i386.rpm) = 170a36b5156e78b06dde42b6b1ed71546801ae048c9d1143863cec9be787d0c3
-SIZE (rpm/audiofile-0.2.6-1.i386.rpm) = 101557
-MD5 (rpm/audiofile-0.2.6-1.src.rpm) = 62a1dce5af78fa9d9d91e3767c722db5
-SHA256 (rpm/audiofile-0.2.6-1.src.rpm) = 7c44918e119b1eb69064a5ffd0d1fe84c1c8d5235eb9df3ae9b7f167be96cd4b
-SIZE (rpm/audiofile-0.2.6-1.src.rpm) = 285599
+MD5 (rpm/i386/fedora/3/audiofile-0.2.6-1.i386.rpm) = de7720157ee9f32ab5115c3a6c5c7df0
+SHA256 (rpm/i386/fedora/3/audiofile-0.2.6-1.i386.rpm) = 170a36b5156e78b06dde42b6b1ed71546801ae048c9d1143863cec9be787d0c3
+SIZE (rpm/i386/fedora/3/audiofile-0.2.6-1.i386.rpm) = 101557
+MD5 (rpm/i386/fedora/3/audiofile-0.2.6-1.src.rpm) = 62a1dce5af78fa9d9d91e3767c722db5
+SHA256 (rpm/i386/fedora/3/audiofile-0.2.6-1.src.rpm) = 7c44918e119b1eb69064a5ffd0d1fe84c1c8d5235eb9df3ae9b7f167be96cd4b
+SIZE (rpm/i386/fedora/3/audiofile-0.2.6-1.src.rpm) = 285599
diff --git a/audio/linux-f8-libaudiofile/pkg-plist.alpha b/audio/linux-f8-libaudiofile/pkg-plist.alpha
deleted file mode 100644
index 3dd95ab74feb..000000000000
--- a/audio/linux-f8-libaudiofile/pkg-plist.alpha
+++ /dev/null
@@ -1,28 +0,0 @@
-usr/bin/sfconvert
-usr/bin/sfinfo
-usr/lib/libaudiofile.so.0.0.0
-usr/share/doc/audiofile-0.1.11/COPYING
-usr/share/doc/audiofile-0.1.11/ChangeLog
-usr/share/doc/audiofile-0.1.11/README
-usr/share/doc/audiofile-0.1.11/TODO
-usr/share/doc/audiofile-0.1.11/docs/Makefile
-usr/share/doc/audiofile-0.1.11/docs/Makefile.am
-usr/share/doc/audiofile-0.1.11/docs/Makefile.in
-usr/share/doc/audiofile-0.1.11/docs/afCloseFile
-usr/share/doc/audiofile-0.1.11/docs/afGetFrameSize
-usr/share/doc/audiofile-0.1.11/docs/afGetTrackBytes
-usr/share/doc/audiofile-0.1.11/docs/afIntro
-usr/share/doc/audiofile-0.1.11/docs/afNewFileSetup
-usr/share/doc/audiofile-0.1.11/docs/afOpenFile
-usr/share/doc/audiofile-0.1.11/docs/afQuery
-usr/share/doc/audiofile-0.1.11/docs/afReadFrames
-usr/share/doc/audiofile-0.1.11/docs/afReadMisc
-usr/share/doc/audiofile-0.1.11/docs/afSeekFrame
-usr/share/doc/audiofile-0.1.11/docs/afSetErrorHandler
-usr/share/doc/audiofile-0.1.11/docs/afSetVirtualByteOrder
-usr/share/doc/audiofile-0.1.11/docs/afWriteFrames
-usr/share/doc/audiofile-0.1.11/docs/sfconvert
-usr/share/doc/audiofile-0.1.11/docs/sfinfo
-usr/lib/libaudiofile.so.0
-@dirrm usr/share/doc/audiofile-0.1.11/docs
-@dirrm usr/share/doc/audiofile-0.1.11
diff --git a/audio/linux-libaudiofile/Makefile b/audio/linux-libaudiofile/Makefile
index c1f56ea5ee2d..83b22d00f0b5 100644
--- a/audio/linux-libaudiofile/Makefile
+++ b/audio/linux-libaudiofile/Makefile
@@ -7,19 +7,17 @@
PORTNAME= libaudiofile
PORTVERSION= 0.2.6
-PORTREVISION= 0
+PORTREVISION= 1
CATEGORIES= audio linux
-MASTER_SITES= ${MASTER_SITE_FEDORA_LINUX}
-MASTER_SITE_SUBDIR= 3/i386/os/Fedora/RPMS 3/SRPMS
-
-.if defined(PACKAGE_BUILDING)
-SRC_DISTFILES+= audiofile-${PORTVERSION}-1.src.rpm
-ALWAYS_KEEP_DISTFILES= yes
-.endif
+DISTNAME= audiofile-${PORTVERSION}-1
MAINTAINER= freebsd-emulation@FreeBSD.org
COMMENT= RPM of audiofile
-RPM_SET= audiofile-${PORTVERSION}-1.${ARCH}.rpm
+USE_LINUX_RPM= yes
+LINUX_DIST_VER= 3
+INSTALLS_SHLIB= yes
+BRANDELF_DIRS= usr/bin
+PLIST= pkg-plist.${LINUX_RPM_ARCH}
-.include "../../x11-toolkits/linux-gtk/Makefile"
+.include <bsd.port.mk>
diff --git a/audio/linux-libaudiofile/distinfo.alpha b/audio/linux-libaudiofile/distinfo.alpha
deleted file mode 100644
index f9522b40aba4..000000000000
--- a/audio/linux-libaudiofile/distinfo.alpha
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 (rpm/audiofile-0.1.11-1.alpha.rpm) = 852a9656ac61aec99c7a7936b0249a9d
-SIZE (rpm/audiofile-0.1.11-1.alpha.rpm) = 166874
diff --git a/audio/linux-libaudiofile/distinfo.i386 b/audio/linux-libaudiofile/distinfo.i386
index 32c84f559622..8b05fb77044d 100644
--- a/audio/linux-libaudiofile/distinfo.i386
+++ b/audio/linux-libaudiofile/distinfo.i386
@@ -1,6 +1,6 @@
-MD5 (rpm/audiofile-0.2.6-1.i386.rpm) = de7720157ee9f32ab5115c3a6c5c7df0
-SHA256 (rpm/audiofile-0.2.6-1.i386.rpm) = 170a36b5156e78b06dde42b6b1ed71546801ae048c9d1143863cec9be787d0c3
-SIZE (rpm/audiofile-0.2.6-1.i386.rpm) = 101557
-MD5 (rpm/audiofile-0.2.6-1.src.rpm) = 62a1dce5af78fa9d9d91e3767c722db5
-SHA256 (rpm/audiofile-0.2.6-1.src.rpm) = 7c44918e119b1eb69064a5ffd0d1fe84c1c8d5235eb9df3ae9b7f167be96cd4b
-SIZE (rpm/audiofile-0.2.6-1.src.rpm) = 285599
+MD5 (rpm/i386/fedora/3/audiofile-0.2.6-1.i386.rpm) = de7720157ee9f32ab5115c3a6c5c7df0
+SHA256 (rpm/i386/fedora/3/audiofile-0.2.6-1.i386.rpm) = 170a36b5156e78b06dde42b6b1ed71546801ae048c9d1143863cec9be787d0c3
+SIZE (rpm/i386/fedora/3/audiofile-0.2.6-1.i386.rpm) = 101557
+MD5 (rpm/i386/fedora/3/audiofile-0.2.6-1.src.rpm) = 62a1dce5af78fa9d9d91e3767c722db5
+SHA256 (rpm/i386/fedora/3/audiofile-0.2.6-1.src.rpm) = 7c44918e119b1eb69064a5ffd0d1fe84c1c8d5235eb9df3ae9b7f167be96cd4b
+SIZE (rpm/i386/fedora/3/audiofile-0.2.6-1.src.rpm) = 285599
diff --git a/audio/linux-libaudiofile/pkg-plist.alpha b/audio/linux-libaudiofile/pkg-plist.alpha
deleted file mode 100644
index 3dd95ab74feb..000000000000
--- a/audio/linux-libaudiofile/pkg-plist.alpha
+++ /dev/null
@@ -1,28 +0,0 @@
-usr/bin/sfconvert
-usr/bin/sfinfo
-usr/lib/libaudiofile.so.0.0.0
-usr/share/doc/audiofile-0.1.11/COPYING
-usr/share/doc/audiofile-0.1.11/ChangeLog
-usr/share/doc/audiofile-0.1.11/README
-usr/share/doc/audiofile-0.1.11/TODO
-usr/share/doc/audiofile-0.1.11/docs/Makefile
-usr/share/doc/audiofile-0.1.11/docs/Makefile.am
-usr/share/doc/audiofile-0.1.11/docs/Makefile.in
-usr/share/doc/audiofile-0.1.11/docs/afCloseFile
-usr/share/doc/audiofile-0.1.11/docs/afGetFrameSize
-usr/share/doc/audiofile-0.1.11/docs/afGetTrackBytes
-usr/share/doc/audiofile-0.1.11/docs/afIntro
-usr/share/doc/audiofile-0.1.11/docs/afNewFileSetup
-usr/share/doc/audiofile-0.1.11/docs/afOpenFile
-usr/share/doc/audiofile-0.1.11/docs/afQuery
-usr/share/doc/audiofile-0.1.11/docs/afReadFrames
-usr/share/doc/audiofile-0.1.11/docs/afReadMisc
-usr/share/doc/audiofile-0.1.11/docs/afSeekFrame
-usr/share/doc/audiofile-0.1.11/docs/afSetErrorHandler
-usr/share/doc/audiofile-0.1.11/docs/afSetVirtualByteOrder
-usr/share/doc/audiofile-0.1.11/docs/afWriteFrames
-usr/share/doc/audiofile-0.1.11/docs/sfconvert
-usr/share/doc/audiofile-0.1.11/docs/sfinfo
-usr/lib/libaudiofile.so.0
-@dirrm usr/share/doc/audiofile-0.1.11/docs
-@dirrm usr/share/doc/audiofile-0.1.11
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%%
diff --git a/graphics/linux-f10-imlib/Makefile b/graphics/linux-f10-imlib/Makefile
index df6beaab5186..1ac1a642ea9b 100644
--- a/graphics/linux-f10-imlib/Makefile
+++ b/graphics/linux-f10-imlib/Makefile
@@ -6,13 +6,18 @@
#
PORTNAME= imlib
-PORTVERSION= 1.9.8.1
-PORTREVISION= 2
+PORTVERSION= 1.9.13
CATEGORIES= graphics linux
+DISTNAME= ${PORTNAME}-${PORTVERSION}-21
MAINTAINER= ports@FreeBSD.org
COMMENT= RPM of imlib
-RPM_SET= imlib-${PORTVERSION}-2.${ARCH}.rpm
+USE_LINUX_RPM= yes
+LINUX_DIST_VER= 3
+INSTALLS_SHLIB= yes
+BRANDELF_DIRS= usr/bin
+PLIST= pkg-plist.${LINUX_RPM_ARCH}
+PLIST_SUB= PORTVERSION="${PORTVERSION}"
-.include "../../x11-toolkits/linux-gtk/Makefile"
+.include <bsd.port.mk>
diff --git a/graphics/linux-f10-imlib/distinfo.alpha b/graphics/linux-f10-imlib/distinfo.alpha
deleted file mode 100644
index 13f2314b4a34..000000000000
--- a/graphics/linux-f10-imlib/distinfo.alpha
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 (rpm/imlib-1.9.8.1-2.alpha.rpm) = 1e55a013ac2058d1100393ec6e795fa4
-SIZE (rpm/imlib-1.9.8.1-2.alpha.rpm) = 525669
diff --git a/graphics/linux-f10-imlib/distinfo.i386 b/graphics/linux-f10-imlib/distinfo.i386
index a979248ec87a..e7a7b12e0f0e 100644
--- a/graphics/linux-f10-imlib/distinfo.i386
+++ b/graphics/linux-f10-imlib/distinfo.i386
@@ -1,2 +1,6 @@
-MD5 (rpm/imlib-1.9.8.1-2.i386.rpm) = 64a1a27bc1e276af8aecefa261ab9b3b
-SIZE (rpm/imlib-1.9.8.1-2.i386.rpm) = 162510
+MD5 (rpm/i386/fedora/3/imlib-1.9.13-21.i386.rpm) = 547f6292ad0b85281b79773ae81ec6fe
+SHA256 (rpm/i386/fedora/3/imlib-1.9.13-21.i386.rpm) = 06f59a3497e001dfa92e549c3c69db6c8827af056c0757cb488f5689e042326b
+SIZE (rpm/i386/fedora/3/imlib-1.9.13-21.i386.rpm) = 403667
+MD5 (rpm/i386/fedora/3/imlib-1.9.13-21.src.rpm) = 6925c73e807665ecb0c728b848350ee0
+SHA256 (rpm/i386/fedora/3/imlib-1.9.13-21.src.rpm) = 61e73dcf484730bf38a3ea873be30dedf08ac6793f21366ffd97e7c5a9e01ecf
+SIZE (rpm/i386/fedora/3/imlib-1.9.13-21.src.rpm) = 773178
diff --git a/graphics/linux-f10-imlib/pkg-plist.alpha b/graphics/linux-f10-imlib/pkg-plist.alpha
deleted file mode 100644
index f19ff0727e49..000000000000
--- a/graphics/linux-f10-imlib/pkg-plist.alpha
+++ /dev/null
@@ -1,21 +0,0 @@
-etc/im_palette-small.pal
-etc/im_palette-tiny.pal
-etc/im_palette.pal
-etc/imrc
-usr/lib/libImlib.so.1.9.8
-usr/lib/libgdk_imlib.so.1.9.8
-usr/lib/libimlib-bmp.so
-usr/lib/libimlib-gif.so
-usr/lib/libimlib-jpeg.so
-usr/lib/libimlib-png.so
-usr/lib/libimlib-ppm.so
-usr/lib/libimlib-ps.so
-usr/lib/libimlib-tiff.so
-usr/lib/libimlib-xpm.so
-usr/share/doc/imlib-1.9.8.1/AUTHORS
-usr/share/doc/imlib-1.9.8.1/ChangeLog
-usr/share/doc/imlib-1.9.8.1/NEWS
-usr/share/doc/imlib-1.9.8.1/README
-usr/lib/libImlib.so.1
-usr/lib/libgdk_imlib.so.1
-@dirrm usr/share/doc/imlib-1.9.8.1
diff --git a/graphics/linux-f10-imlib/pkg-plist.i386 b/graphics/linux-f10-imlib/pkg-plist.i386
index f19ff0727e49..414ff141244a 100644
--- a/graphics/linux-f10-imlib/pkg-plist.i386
+++ b/graphics/linux-f10-imlib/pkg-plist.i386
@@ -2,8 +2,8 @@ etc/im_palette-small.pal
etc/im_palette-tiny.pal
etc/im_palette.pal
etc/imrc
-usr/lib/libImlib.so.1.9.8
-usr/lib/libgdk_imlib.so.1.9.8
+usr/lib/libImlib.so.11.0.0
+usr/lib/libgdk_imlib.so.%%PORTVERSION%%
usr/lib/libimlib-bmp.so
usr/lib/libimlib-gif.so
usr/lib/libimlib-jpeg.so
@@ -12,10 +12,10 @@ usr/lib/libimlib-ppm.so
usr/lib/libimlib-ps.so
usr/lib/libimlib-tiff.so
usr/lib/libimlib-xpm.so
-usr/share/doc/imlib-1.9.8.1/AUTHORS
-usr/share/doc/imlib-1.9.8.1/ChangeLog
-usr/share/doc/imlib-1.9.8.1/NEWS
-usr/share/doc/imlib-1.9.8.1/README
-usr/lib/libImlib.so.1
+usr/share/doc/imlib-%%PORTVERSION%%/AUTHORS
+usr/share/doc/imlib-%%PORTVERSION%%/ChangeLog
+usr/share/doc/imlib-%%PORTVERSION%%/NEWS
+usr/share/doc/imlib-%%PORTVERSION%%/README
+usr/lib/libImlib.so.11
usr/lib/libgdk_imlib.so.1
-@dirrm usr/share/doc/imlib-1.9.8.1
+@dirrm usr/share/doc/imlib-%%PORTVERSION%%
diff --git a/graphics/linux-f10-jpeg/Makefile b/graphics/linux-f10-jpeg/Makefile
index 03de0fa8e4cd..b542ab05c935 100644
--- a/graphics/linux-f10-jpeg/Makefile
+++ b/graphics/linux-f10-jpeg/Makefile
@@ -7,20 +7,18 @@
PORTNAME= jpeg
PORTVERSION= 6b.33
-PORTREVISION= 0
+PORTREVISION= 1
CATEGORIES= graphics linux
-MASTER_SITES= ${MASTER_SITE_FEDORA_LINUX}
-MASTER_SITE_SUBDIR= 3/${ARCH}/os/Fedora/RPMS
+DISTNAME= libjpeg-6b-33
MAINTAINER= freebsd-emulation@FreeBSD.org
COMMENT= RPM of the JPEG lib
+USE_LINUX_RPM= yes
+LINUX_DIST_VER= 3
+INSTALLS_SHLIB= yes
ONLY_FOR_ARCHS= i386 amd64
-RPM_SET= libjpeg-6b-33.${ARCH}.rpm
-post-install:
- @${BRANDELF} -t Linux ${PREFIX}/usr/bin/cjpeg ${PREFIX}/usr/bin/djpeg \
- ${PREFIX}/usr/bin/jpegtran ${PREFIX}/usr/bin/rdjpgcom \
- ${PREFIX}/usr/bin/wrjpgcom
+BRANDELF_DIRS= usr/bin
-.include "../../x11-toolkits/linux-gtk/Makefile"
+.include <bsd.port.mk>
diff --git a/graphics/linux-f10-jpeg/distinfo.i386 b/graphics/linux-f10-jpeg/distinfo.i386
index 3de09d4b69b1..8a7321881584 100644
--- a/graphics/linux-f10-jpeg/distinfo.i386
+++ b/graphics/linux-f10-jpeg/distinfo.i386
@@ -1,3 +1,6 @@
-MD5 (rpm/libjpeg-6b-33.i386.rpm) = a7c91c619462c521ba27b6caad50bd41
-SHA256 (rpm/libjpeg-6b-33.i386.rpm) = 19f1e874b23caee40603a8dce0380eed95205fe55fd70cbbe682bfb06b7f534f
-SIZE (rpm/libjpeg-6b-33.i386.rpm) = 129589
+MD5 (rpm/i386/fedora/3/libjpeg-6b-33.i386.rpm) = a7c91c619462c521ba27b6caad50bd41
+SHA256 (rpm/i386/fedora/3/libjpeg-6b-33.i386.rpm) = 19f1e874b23caee40603a8dce0380eed95205fe55fd70cbbe682bfb06b7f534f
+SIZE (rpm/i386/fedora/3/libjpeg-6b-33.i386.rpm) = 129589
+MD5 (rpm/i386/fedora/3/libjpeg-6b-33.src.rpm) = 791bc284e9ab6a85c88734d1385dfa1d
+SHA256 (rpm/i386/fedora/3/libjpeg-6b-33.src.rpm) = bcbc4f67920dccccc93a17d4145fb14895e0b4fd565c8ce6e6fea7d82bfdffcc
+SIZE (rpm/i386/fedora/3/libjpeg-6b-33.src.rpm) = 544433
diff --git a/graphics/linux-f10-jpeg/pkg-plist.i386 b/graphics/linux-f10-jpeg/pkg-plist
index c9c21d293f90..c9c21d293f90 100644
--- a/graphics/linux-f10-jpeg/pkg-plist.i386
+++ b/graphics/linux-f10-jpeg/pkg-plist
diff --git a/graphics/linux-f10-png/Makefile b/graphics/linux-f10-png/Makefile
index f827ffa4fdbb..12332642db94 100644
--- a/graphics/linux-f10-png/Makefile
+++ b/graphics/linux-f10-png/Makefile
@@ -7,18 +7,18 @@
PORTNAME= png
PORTVERSION= 1.2.8
-PORTREVISION= 0
+PORTREVISION= 1
CATEGORIES= graphics linux
-MASTER_SITES= ${MASTER_SITE_FEDORA_LINUX}
-MASTER_SITE_SUBDIR= updates/3/${ARCH}
+DISTNAME= libpng-${PORTVERSION}-1.fc3
MAINTAINER= freebsd-emulation@FreeBSD.org
COMMENT= RPM of the PNG lib
-DIST_SUBDIR= rpm/i386/fc3
# no alpha rpm is available
ONLY_FOR_ARCHS= i386 amd64
-RPM_SET= libpng-${PORTVERSION}-1.fc3.${ARCH}.rpm
+USE_LINUX_RPM= yes
+LINUX_DIST_VER= 3
+INSTALLS_SHLIB= yes
PLIST_FILES= \
usr/lib/libpng.so.3 \
@@ -29,4 +29,4 @@ PLIST_FILES= \
DOCSDIR= ${PREFIX}/usr/share/doc/libpng-${PORTVERSION}
PORTDOCS= CHANGES LICENSE README TODO example.c libpng.txt
-.include "../../x11-toolkits/linux-gtk/Makefile"
+.include <bsd.port.mk>
diff --git a/graphics/linux-f10-png/distinfo.i386 b/graphics/linux-f10-png/distinfo.i386
index 8dec2c825a09..48ed864c0a5a 100644
--- a/graphics/linux-f10-png/distinfo.i386
+++ b/graphics/linux-f10-png/distinfo.i386
@@ -1,3 +1,6 @@
-MD5 (rpm/i386/fc3/libpng-1.2.8-1.fc3.i386.rpm) = b1dc31b8b29cefbcb304d866538f113d
-SHA256 (rpm/i386/fc3/libpng-1.2.8-1.fc3.i386.rpm) = 73cba596485ea8580e18c9950b44643064f6dc98a6f27bdbdcdcfc1540e87422
-SIZE (rpm/i386/fc3/libpng-1.2.8-1.fc3.i386.rpm) = 158945
+MD5 (rpm/i386/fedora/3/libpng-1.2.8-1.fc3.i386.rpm) = b1dc31b8b29cefbcb304d866538f113d
+SHA256 (rpm/i386/fedora/3/libpng-1.2.8-1.fc3.i386.rpm) = 73cba596485ea8580e18c9950b44643064f6dc98a6f27bdbdcdcfc1540e87422
+SIZE (rpm/i386/fedora/3/libpng-1.2.8-1.fc3.i386.rpm) = 158945
+MD5 (rpm/i386/fedora/3/libpng-1.2.8-1.fc3.src.rpm) = c8c663262abf784cb176c5efd763587d
+SHA256 (rpm/i386/fedora/3/libpng-1.2.8-1.fc3.src.rpm) = 415f069d18a88dffa4cac6e773070a0bd47204b4e1dcae194f2601b51509c080
+SIZE (rpm/i386/fedora/3/libpng-1.2.8-1.fc3.src.rpm) = 397948
diff --git a/graphics/linux-f10-png10/Makefile b/graphics/linux-f10-png10/Makefile
index 5307a31714f5..7adefa0d6c88 100644
--- a/graphics/linux-f10-png10/Makefile
+++ b/graphics/linux-f10-png10/Makefile
@@ -7,23 +7,23 @@
PORTNAME= png
PORTVERSION= 1.0.16
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= graphics linux
-MASTER_SITES= http://mirrors.xmission.com/fedora/core/3/i386/os/Fedora/RPMS/ \
- http://fedora.cat.pdx.edu/linux/core/3/i386/os/Fedora/RPMS/
+DISTNAME= libpng10-${PORTVERSION}-1
MAINTAINER= freebsd-emulation@FreeBSD.org
COMMENT= RPM of the PNG lib (old 1.0 version)
LATEST_LINK= linux-png10
-DIST_SUBDIR= rpm/i386/fc3
ONLY_FOR_ARCHS= i386
-RPM_SET= libpng10-${PORTVERSION}-1.i386.rpm
+USE_LINUX_RPM= yes
+LINUX_DIST_VER= 3
+INSTALLS_SHLIB= yes
PLIST_FILES= usr/lib/libpng.so.2.1.0.16 \
usr/lib/libpng.so.2
DOCSDIR= ${PREFIX}/usr/share/doc/libpng10-1.0.16
PORTDOCS= CHANGES LICENSE README TODO example.c libpng.txt
-.include "../../x11-toolkits/linux-gtk/Makefile"
+.include <bsd.port.mk>
diff --git a/graphics/linux-f10-png10/distinfo.i386 b/graphics/linux-f10-png10/distinfo.i386
index 3fb95b9032b2..5dc28d08c979 100644
--- a/graphics/linux-f10-png10/distinfo.i386
+++ b/graphics/linux-f10-png10/distinfo.i386
@@ -1,2 +1,6 @@
-MD5 (rpm/i386/fc3/libpng10-1.0.16-1.i386.rpm) = b9a3180c7d9038f0af92b00655bb6e11
-SIZE (rpm/i386/fc3/libpng10-1.0.16-1.i386.rpm) = 150813
+MD5 (rpm/i386/fedora/3/libpng10-1.0.16-1.i386.rpm) = b9a3180c7d9038f0af92b00655bb6e11
+SHA256 (rpm/i386/fedora/3/libpng10-1.0.16-1.i386.rpm) = 6bbcf1ed1388357e3c81e13dd13e9e853603f3399c0366c6b940c82407bf3f4f
+SIZE (rpm/i386/fedora/3/libpng10-1.0.16-1.i386.rpm) = 150813
+MD5 (rpm/i386/fedora/3/libpng10-1.0.16-1.src.rpm) = 1174c6f9c2ba2326cae9cb6c61a3aeee
+SHA256 (rpm/i386/fedora/3/libpng10-1.0.16-1.src.rpm) = 90f72ec8081e847a57e18186b8b8db1a46f442a442161ac3507a88ca4fddc186
+SIZE (rpm/i386/fedora/3/libpng10-1.0.16-1.src.rpm) = 388311
diff --git a/graphics/linux-f10-tiff/Makefile b/graphics/linux-f10-tiff/Makefile
index 736756df7463..8e98c17b8750 100644
--- a/graphics/linux-f10-tiff/Makefile
+++ b/graphics/linux-f10-tiff/Makefile
@@ -7,11 +7,9 @@
PORTNAME= tiff
PORTVERSION= 3.6.1
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= graphics linux
-MASTER_SITES= ${MASTER_SITE_FEDORA_LINUX}
-MASTER_SITE_SUBDIR= updates/3/${ARCH}
-PKGNAMEPREFIX= linux-
+DISTNAME= libtiff-${PORTVERSION}-10.fc3
MAINTAINER= freebsd-emulation@FreeBSD.org
COMMENT= TIFF library, Linux/i386 binary
@@ -19,17 +17,10 @@ COMMENT= TIFF library, Linux/i386 binary
RUN_DEPENDS= ${LINUXBASE}/usr/lib/libjpeg.so.62:${PORTSDIR}/graphics/linux-jpeg
ONLY_FOR_ARCHS= amd64 i386
-RPM_SET= libtiff-${PORTVERSION}-10.fc3.${ARCH}.rpm
+USE_LINUX_RPM= yes
+LINUX_DIST_VER= 3
+INSTALLS_SHLIB= yes
+BRANDELF_DIRS= usr/bin
+PLIST= pkg-plist.${LINUX_RPM_ARCH}
-BINFILES= fax2ps fax2tiff gif2tiff pal2rgb ppm2tiff ras2tiff raw2tiff \
- rgb2ycbcr thumbnail tiff2bw tiff2pdf tiff2ps tiff2rgba tiffcmp \
- tiffcp tiffdither tiffdump tiffinfo tiffmedian tiffset tiffsplit
-
-.for file in ${BINFILES}
-BRANDFILES+= ${PREFIX}/usr/bin/${file}
-.endfor
-
-post-install:
- @${BRANDELF} -t Linux ${BRANDFILES}
-
-.include "../../x11-toolkits/linux-gtk/Makefile"
+.include <bsd.port.mk>
diff --git a/graphics/linux-f10-tiff/distinfo.i386 b/graphics/linux-f10-tiff/distinfo.i386
index 7a27d5aee7d7..e5ae94ebb82e 100644
--- a/graphics/linux-f10-tiff/distinfo.i386
+++ b/graphics/linux-f10-tiff/distinfo.i386
@@ -1,3 +1,6 @@
-MD5 (rpm/libtiff-3.6.1-10.fc3.i386.rpm) = e53dcf1d936de0905ce9257c6a4539d0
-SHA256 (rpm/libtiff-3.6.1-10.fc3.i386.rpm) = 2b19298e98ab2e7d0ee561be613f563bfc572ab084b3790473124a108cd9b724
-SIZE (rpm/libtiff-3.6.1-10.fc3.i386.rpm) = 264682
+MD5 (rpm/i386/fedora/3/libtiff-3.6.1-10.fc3.i386.rpm) = e53dcf1d936de0905ce9257c6a4539d0
+SHA256 (rpm/i386/fedora/3/libtiff-3.6.1-10.fc3.i386.rpm) = 2b19298e98ab2e7d0ee561be613f563bfc572ab084b3790473124a108cd9b724
+SIZE (rpm/i386/fedora/3/libtiff-3.6.1-10.fc3.i386.rpm) = 264682
+MD5 (rpm/i386/fedora/3/libtiff-3.6.1-10.fc3.src.rpm) = 9d67f8e29173588835406d3eb91e33a9
+SHA256 (rpm/i386/fedora/3/libtiff-3.6.1-10.fc3.src.rpm) = eb9432f77de2d21c97381f649b903551b2b2fa492f5c2bbf8395a7e9ebd8f7be
+SIZE (rpm/i386/fedora/3/libtiff-3.6.1-10.fc3.src.rpm) = 1095994
diff --git a/graphics/linux-f10-ungif/Makefile b/graphics/linux-f10-ungif/Makefile
index c3fff197ca4c..5c8218e4fc27 100644
--- a/graphics/linux-f10-ungif/Makefile
+++ b/graphics/linux-f10-ungif/Makefile
@@ -4,19 +4,19 @@
# $FreeBSD$
#
PORTNAME= ungif
-PORTVERSION= 4.1.0
-PORTREVISION= 3
+PORTVERSION= 4.1.3
CATEGORIES= graphics linux
+DISTNAME= libungif-${PORTVERSION}-1
MAINTAINTER= maho@FreeBSD.org
COMMENT= RPM of the ungif lib
NOT_FOR_ARCHS= amd64
-.if (${MACHINE_ARCH} == "i386")
-RPM_SET= libungif-4.1.0-7.${MACHINE_ARCH}.rpm
-.else
-RPM_SET= libungif-4.1.0-8.${MACHINE_ARCH}.rpm
-.endif
+USE_LINUX_RPM= yes
+LINUX_DIST_VER= 3
+INSTALLS_SHLIB= yes
+PLIST= pkg-plist.${LINUX_RPM_ARCH}
+PLIST_SUB= PORTVERSION="${PORTVERSION}"
-.include "../../x11-toolkits/linux-gtk/Makefile"
+.include <bsd.port.mk>
diff --git a/graphics/linux-f10-ungif/distinfo.alpha b/graphics/linux-f10-ungif/distinfo.alpha
deleted file mode 100644
index 6054d65663f5..000000000000
--- a/graphics/linux-f10-ungif/distinfo.alpha
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 (rpm/libungif-4.1.0-8.alpha.rpm) = 60bdb595dcd4a7cff8943a7a513d5957
-SIZE (rpm/libungif-4.1.0-8.alpha.rpm) = 115455
diff --git a/graphics/linux-f10-ungif/distinfo.i386 b/graphics/linux-f10-ungif/distinfo.i386
index 7df2039f460a..cb837bcc44e2 100644
--- a/graphics/linux-f10-ungif/distinfo.i386
+++ b/graphics/linux-f10-ungif/distinfo.i386
@@ -1,2 +1,6 @@
-MD5 (rpm/libungif-4.1.0-7.i386.rpm) = 4cf169c6fc0b69251c2e9ddaad5e2a71
-SIZE (rpm/libungif-4.1.0-7.i386.rpm) = 44699
+MD5 (rpm/i386/fedora/3/libungif-4.1.3-1.i386.rpm) = 35af56b8b6551e3087ab2fd496f55dac
+SHA256 (rpm/i386/fedora/3/libungif-4.1.3-1.i386.rpm) = 2bd28a1c9d9e22f47f9fbeb4e9bf95a9294037eedb322f5e4cc410a43f41d65d
+SIZE (rpm/i386/fedora/3/libungif-4.1.3-1.i386.rpm) = 39722
+MD5 (rpm/i386/fedora/3/libungif-4.1.3-1.src.rpm) = a8bce6737125e66f2af311d6e6dc2997
+SHA256 (rpm/i386/fedora/3/libungif-4.1.3-1.src.rpm) = 47590b7d466edcab4bdfc58724f7c7379dc933677e9a4296eee457d0aa081b1b
+SIZE (rpm/i386/fedora/3/libungif-4.1.3-1.src.rpm) = 447818
diff --git a/graphics/linux-f10-ungif/pkg-plist.alpha b/graphics/linux-f10-ungif/pkg-plist.alpha
deleted file mode 100644
index 7962c90ed21d..000000000000
--- a/graphics/linux-f10-ungif/pkg-plist.alpha
+++ /dev/null
@@ -1,20 +0,0 @@
-usr/lib/libungif.so.3.1.0
-usr/lib/libungif.so.4.1.0
-usr/share/doc/libungif-4.1.0/COPYING
-usr/share/doc/libungif-4.1.0/NEWS
-usr/share/doc/libungif-4.1.0/ONEWS
-usr/share/doc/libungif-4.1.0/README
-usr/share/doc/libungif-4.1.0/UNCOMPRESSED_GIF
-@exec ln -sf %D/usr/lib/libgif.so.3.1.0 %D/usr/lib/libgif.so.3
-@exec ln -sf %D/usr/lib/libgif.so.4.1.0 %D/usr/lib/libgif.so.4
-@exec ln -sf %D/usr/lib/libungif.so.3.1.0 %D/usr/lib/libgif.so.3.1.0
-@exec ln -sf %D/usr/lib/libungif.so.3.1.0 %D/usr/lib/libungif.so.3
-@exec ln -sf %D/usr/lib/libungif.so.4.1.0 %D/usr/lib/libgif.so.4.1.0
-@exec ln -sf %D/usr/lib/libungif.so.4.1.0 %D/usr/lib/libungif.so.4
-@unexec rm -f %D/usr/lib/libgif.so.3
-@unexec rm -f %D/usr/lib/libgif.so.3.1.0
-@unexec rm -f %D/usr/lib/libgif.so.4
-@unexec rm -f %D/usr/lib/libgif.so.4.1.0
-@unexec rm -f %D/usr/lib/libungif.so.3
-@unexec rm -f %D/usr/lib/libungif.so.4
-@dirrm usr/share/doc/libungif-4.1.0
diff --git a/graphics/linux-f10-ungif/pkg-plist.i386 b/graphics/linux-f10-ungif/pkg-plist.i386
index 7962c90ed21d..8ec7dee5fa38 100644
--- a/graphics/linux-f10-ungif/pkg-plist.i386
+++ b/graphics/linux-f10-ungif/pkg-plist.i386
@@ -1,20 +1,14 @@
-usr/lib/libungif.so.3.1.0
-usr/lib/libungif.so.4.1.0
-usr/share/doc/libungif-4.1.0/COPYING
-usr/share/doc/libungif-4.1.0/NEWS
-usr/share/doc/libungif-4.1.0/ONEWS
-usr/share/doc/libungif-4.1.0/README
-usr/share/doc/libungif-4.1.0/UNCOMPRESSED_GIF
-@exec ln -sf %D/usr/lib/libgif.so.3.1.0 %D/usr/lib/libgif.so.3
-@exec ln -sf %D/usr/lib/libgif.so.4.1.0 %D/usr/lib/libgif.so.4
-@exec ln -sf %D/usr/lib/libungif.so.3.1.0 %D/usr/lib/libgif.so.3.1.0
-@exec ln -sf %D/usr/lib/libungif.so.3.1.0 %D/usr/lib/libungif.so.3
-@exec ln -sf %D/usr/lib/libungif.so.4.1.0 %D/usr/lib/libgif.so.4.1.0
-@exec ln -sf %D/usr/lib/libungif.so.4.1.0 %D/usr/lib/libungif.so.4
-@unexec rm -f %D/usr/lib/libgif.so.3
-@unexec rm -f %D/usr/lib/libgif.so.3.1.0
-@unexec rm -f %D/usr/lib/libgif.so.4
-@unexec rm -f %D/usr/lib/libgif.so.4.1.0
-@unexec rm -f %D/usr/lib/libungif.so.3
-@unexec rm -f %D/usr/lib/libungif.so.4
-@dirrm usr/share/doc/libungif-4.1.0
+usr/lib/libgif.so.4
+usr/lib/libgif.so.%%PORTVERSION%%
+usr/lib/libungif.so.4
+usr/lib/libungif.so.%%PORTVERSION%%
+usr/share/doc/libungif-%%PORTVERSION%%/AUTHORS
+usr/share/doc/libungif-%%PORTVERSION%%/BUGS
+usr/share/doc/libungif-%%PORTVERSION%%/COPYING
+usr/share/doc/libungif-%%PORTVERSION%%/ChangeLog
+usr/share/doc/libungif-%%PORTVERSION%%/NEWS
+usr/share/doc/libungif-%%PORTVERSION%%/ONEWS
+usr/share/doc/libungif-%%PORTVERSION%%/README
+usr/share/doc/libungif-%%PORTVERSION%%/TODO
+usr/share/doc/libungif-%%PORTVERSION%%/UNCOMPRESSED_GIF
+@dirrm usr/share/doc/libungif-%%PORTVERSION%%
diff --git a/graphics/linux-f8-imlib/Makefile b/graphics/linux-f8-imlib/Makefile
index df6beaab5186..1ac1a642ea9b 100644
--- a/graphics/linux-f8-imlib/Makefile
+++ b/graphics/linux-f8-imlib/Makefile
@@ -6,13 +6,18 @@
#
PORTNAME= imlib
-PORTVERSION= 1.9.8.1
-PORTREVISION= 2
+PORTVERSION= 1.9.13
CATEGORIES= graphics linux
+DISTNAME= ${PORTNAME}-${PORTVERSION}-21
MAINTAINER= ports@FreeBSD.org
COMMENT= RPM of imlib
-RPM_SET= imlib-${PORTVERSION}-2.${ARCH}.rpm
+USE_LINUX_RPM= yes
+LINUX_DIST_VER= 3
+INSTALLS_SHLIB= yes
+BRANDELF_DIRS= usr/bin
+PLIST= pkg-plist.${LINUX_RPM_ARCH}
+PLIST_SUB= PORTVERSION="${PORTVERSION}"
-.include "../../x11-toolkits/linux-gtk/Makefile"
+.include <bsd.port.mk>
diff --git a/graphics/linux-f8-imlib/distinfo.alpha b/graphics/linux-f8-imlib/distinfo.alpha
deleted file mode 100644
index 13f2314b4a34..000000000000
--- a/graphics/linux-f8-imlib/distinfo.alpha
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 (rpm/imlib-1.9.8.1-2.alpha.rpm) = 1e55a013ac2058d1100393ec6e795fa4
-SIZE (rpm/imlib-1.9.8.1-2.alpha.rpm) = 525669
diff --git a/graphics/linux-f8-imlib/distinfo.i386 b/graphics/linux-f8-imlib/distinfo.i386
index a979248ec87a..e7a7b12e0f0e 100644
--- a/graphics/linux-f8-imlib/distinfo.i386
+++ b/graphics/linux-f8-imlib/distinfo.i386
@@ -1,2 +1,6 @@
-MD5 (rpm/imlib-1.9.8.1-2.i386.rpm) = 64a1a27bc1e276af8aecefa261ab9b3b
-SIZE (rpm/imlib-1.9.8.1-2.i386.rpm) = 162510
+MD5 (rpm/i386/fedora/3/imlib-1.9.13-21.i386.rpm) = 547f6292ad0b85281b79773ae81ec6fe
+SHA256 (rpm/i386/fedora/3/imlib-1.9.13-21.i386.rpm) = 06f59a3497e001dfa92e549c3c69db6c8827af056c0757cb488f5689e042326b
+SIZE (rpm/i386/fedora/3/imlib-1.9.13-21.i386.rpm) = 403667
+MD5 (rpm/i386/fedora/3/imlib-1.9.13-21.src.rpm) = 6925c73e807665ecb0c728b848350ee0
+SHA256 (rpm/i386/fedora/3/imlib-1.9.13-21.src.rpm) = 61e73dcf484730bf38a3ea873be30dedf08ac6793f21366ffd97e7c5a9e01ecf
+SIZE (rpm/i386/fedora/3/imlib-1.9.13-21.src.rpm) = 773178
diff --git a/graphics/linux-f8-imlib/pkg-plist.alpha b/graphics/linux-f8-imlib/pkg-plist.alpha
deleted file mode 100644
index f19ff0727e49..000000000000
--- a/graphics/linux-f8-imlib/pkg-plist.alpha
+++ /dev/null
@@ -1,21 +0,0 @@
-etc/im_palette-small.pal
-etc/im_palette-tiny.pal
-etc/im_palette.pal
-etc/imrc
-usr/lib/libImlib.so.1.9.8
-usr/lib/libgdk_imlib.so.1.9.8
-usr/lib/libimlib-bmp.so
-usr/lib/libimlib-gif.so
-usr/lib/libimlib-jpeg.so
-usr/lib/libimlib-png.so
-usr/lib/libimlib-ppm.so
-usr/lib/libimlib-ps.so
-usr/lib/libimlib-tiff.so
-usr/lib/libimlib-xpm.so
-usr/share/doc/imlib-1.9.8.1/AUTHORS
-usr/share/doc/imlib-1.9.8.1/ChangeLog
-usr/share/doc/imlib-1.9.8.1/NEWS
-usr/share/doc/imlib-1.9.8.1/README
-usr/lib/libImlib.so.1
-usr/lib/libgdk_imlib.so.1
-@dirrm usr/share/doc/imlib-1.9.8.1
diff --git a/graphics/linux-f8-imlib/pkg-plist.i386 b/graphics/linux-f8-imlib/pkg-plist.i386
index f19ff0727e49..414ff141244a 100644
--- a/graphics/linux-f8-imlib/pkg-plist.i386
+++ b/graphics/linux-f8-imlib/pkg-plist.i386
@@ -2,8 +2,8 @@ etc/im_palette-small.pal
etc/im_palette-tiny.pal
etc/im_palette.pal
etc/imrc
-usr/lib/libImlib.so.1.9.8
-usr/lib/libgdk_imlib.so.1.9.8
+usr/lib/libImlib.so.11.0.0
+usr/lib/libgdk_imlib.so.%%PORTVERSION%%
usr/lib/libimlib-bmp.so
usr/lib/libimlib-gif.so
usr/lib/libimlib-jpeg.so
@@ -12,10 +12,10 @@ usr/lib/libimlib-ppm.so
usr/lib/libimlib-ps.so
usr/lib/libimlib-tiff.so
usr/lib/libimlib-xpm.so
-usr/share/doc/imlib-1.9.8.1/AUTHORS
-usr/share/doc/imlib-1.9.8.1/ChangeLog
-usr/share/doc/imlib-1.9.8.1/NEWS
-usr/share/doc/imlib-1.9.8.1/README
-usr/lib/libImlib.so.1
+usr/share/doc/imlib-%%PORTVERSION%%/AUTHORS
+usr/share/doc/imlib-%%PORTVERSION%%/ChangeLog
+usr/share/doc/imlib-%%PORTVERSION%%/NEWS
+usr/share/doc/imlib-%%PORTVERSION%%/README
+usr/lib/libImlib.so.11
usr/lib/libgdk_imlib.so.1
-@dirrm usr/share/doc/imlib-1.9.8.1
+@dirrm usr/share/doc/imlib-%%PORTVERSION%%
diff --git a/graphics/linux-f8-jpeg/Makefile b/graphics/linux-f8-jpeg/Makefile
index 03de0fa8e4cd..b542ab05c935 100644
--- a/graphics/linux-f8-jpeg/Makefile
+++ b/graphics/linux-f8-jpeg/Makefile
@@ -7,20 +7,18 @@
PORTNAME= jpeg
PORTVERSION= 6b.33
-PORTREVISION= 0
+PORTREVISION= 1
CATEGORIES= graphics linux
-MASTER_SITES= ${MASTER_SITE_FEDORA_LINUX}
-MASTER_SITE_SUBDIR= 3/${ARCH}/os/Fedora/RPMS
+DISTNAME= libjpeg-6b-33
MAINTAINER= freebsd-emulation@FreeBSD.org
COMMENT= RPM of the JPEG lib
+USE_LINUX_RPM= yes
+LINUX_DIST_VER= 3
+INSTALLS_SHLIB= yes
ONLY_FOR_ARCHS= i386 amd64
-RPM_SET= libjpeg-6b-33.${ARCH}.rpm
-post-install:
- @${BRANDELF} -t Linux ${PREFIX}/usr/bin/cjpeg ${PREFIX}/usr/bin/djpeg \
- ${PREFIX}/usr/bin/jpegtran ${PREFIX}/usr/bin/rdjpgcom \
- ${PREFIX}/usr/bin/wrjpgcom
+BRANDELF_DIRS= usr/bin
-.include "../../x11-toolkits/linux-gtk/Makefile"
+.include <bsd.port.mk>
diff --git a/graphics/linux-f8-jpeg/distinfo.i386 b/graphics/linux-f8-jpeg/distinfo.i386
index 3de09d4b69b1..8a7321881584 100644
--- a/graphics/linux-f8-jpeg/distinfo.i386
+++ b/graphics/linux-f8-jpeg/distinfo.i386
@@ -1,3 +1,6 @@
-MD5 (rpm/libjpeg-6b-33.i386.rpm) = a7c91c619462c521ba27b6caad50bd41
-SHA256 (rpm/libjpeg-6b-33.i386.rpm) = 19f1e874b23caee40603a8dce0380eed95205fe55fd70cbbe682bfb06b7f534f
-SIZE (rpm/libjpeg-6b-33.i386.rpm) = 129589
+MD5 (rpm/i386/fedora/3/libjpeg-6b-33.i386.rpm) = a7c91c619462c521ba27b6caad50bd41
+SHA256 (rpm/i386/fedora/3/libjpeg-6b-33.i386.rpm) = 19f1e874b23caee40603a8dce0380eed95205fe55fd70cbbe682bfb06b7f534f
+SIZE (rpm/i386/fedora/3/libjpeg-6b-33.i386.rpm) = 129589
+MD5 (rpm/i386/fedora/3/libjpeg-6b-33.src.rpm) = 791bc284e9ab6a85c88734d1385dfa1d
+SHA256 (rpm/i386/fedora/3/libjpeg-6b-33.src.rpm) = bcbc4f67920dccccc93a17d4145fb14895e0b4fd565c8ce6e6fea7d82bfdffcc
+SIZE (rpm/i386/fedora/3/libjpeg-6b-33.src.rpm) = 544433
diff --git a/graphics/linux-f8-jpeg/pkg-plist.i386 b/graphics/linux-f8-jpeg/pkg-plist
index c9c21d293f90..c9c21d293f90 100644
--- a/graphics/linux-f8-jpeg/pkg-plist.i386
+++ b/graphics/linux-f8-jpeg/pkg-plist
diff --git a/graphics/linux-f8-png/Makefile b/graphics/linux-f8-png/Makefile
index f827ffa4fdbb..12332642db94 100644
--- a/graphics/linux-f8-png/Makefile
+++ b/graphics/linux-f8-png/Makefile
@@ -7,18 +7,18 @@
PORTNAME= png
PORTVERSION= 1.2.8
-PORTREVISION= 0
+PORTREVISION= 1
CATEGORIES= graphics linux
-MASTER_SITES= ${MASTER_SITE_FEDORA_LINUX}
-MASTER_SITE_SUBDIR= updates/3/${ARCH}
+DISTNAME= libpng-${PORTVERSION}-1.fc3
MAINTAINER= freebsd-emulation@FreeBSD.org
COMMENT= RPM of the PNG lib
-DIST_SUBDIR= rpm/i386/fc3
# no alpha rpm is available
ONLY_FOR_ARCHS= i386 amd64
-RPM_SET= libpng-${PORTVERSION}-1.fc3.${ARCH}.rpm
+USE_LINUX_RPM= yes
+LINUX_DIST_VER= 3
+INSTALLS_SHLIB= yes
PLIST_FILES= \
usr/lib/libpng.so.3 \
@@ -29,4 +29,4 @@ PLIST_FILES= \
DOCSDIR= ${PREFIX}/usr/share/doc/libpng-${PORTVERSION}
PORTDOCS= CHANGES LICENSE README TODO example.c libpng.txt
-.include "../../x11-toolkits/linux-gtk/Makefile"
+.include <bsd.port.mk>
diff --git a/graphics/linux-f8-png/distinfo.i386 b/graphics/linux-f8-png/distinfo.i386
index 8dec2c825a09..48ed864c0a5a 100644
--- a/graphics/linux-f8-png/distinfo.i386
+++ b/graphics/linux-f8-png/distinfo.i386
@@ -1,3 +1,6 @@
-MD5 (rpm/i386/fc3/libpng-1.2.8-1.fc3.i386.rpm) = b1dc31b8b29cefbcb304d866538f113d
-SHA256 (rpm/i386/fc3/libpng-1.2.8-1.fc3.i386.rpm) = 73cba596485ea8580e18c9950b44643064f6dc98a6f27bdbdcdcfc1540e87422
-SIZE (rpm/i386/fc3/libpng-1.2.8-1.fc3.i386.rpm) = 158945
+MD5 (rpm/i386/fedora/3/libpng-1.2.8-1.fc3.i386.rpm) = b1dc31b8b29cefbcb304d866538f113d
+SHA256 (rpm/i386/fedora/3/libpng-1.2.8-1.fc3.i386.rpm) = 73cba596485ea8580e18c9950b44643064f6dc98a6f27bdbdcdcfc1540e87422
+SIZE (rpm/i386/fedora/3/libpng-1.2.8-1.fc3.i386.rpm) = 158945
+MD5 (rpm/i386/fedora/3/libpng-1.2.8-1.fc3.src.rpm) = c8c663262abf784cb176c5efd763587d
+SHA256 (rpm/i386/fedora/3/libpng-1.2.8-1.fc3.src.rpm) = 415f069d18a88dffa4cac6e773070a0bd47204b4e1dcae194f2601b51509c080
+SIZE (rpm/i386/fedora/3/libpng-1.2.8-1.fc3.src.rpm) = 397948
diff --git a/graphics/linux-f8-png10/Makefile b/graphics/linux-f8-png10/Makefile
index 5307a31714f5..7adefa0d6c88 100644
--- a/graphics/linux-f8-png10/Makefile
+++ b/graphics/linux-f8-png10/Makefile
@@ -7,23 +7,23 @@
PORTNAME= png
PORTVERSION= 1.0.16
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= graphics linux
-MASTER_SITES= http://mirrors.xmission.com/fedora/core/3/i386/os/Fedora/RPMS/ \
- http://fedora.cat.pdx.edu/linux/core/3/i386/os/Fedora/RPMS/
+DISTNAME= libpng10-${PORTVERSION}-1
MAINTAINER= freebsd-emulation@FreeBSD.org
COMMENT= RPM of the PNG lib (old 1.0 version)
LATEST_LINK= linux-png10
-DIST_SUBDIR= rpm/i386/fc3
ONLY_FOR_ARCHS= i386
-RPM_SET= libpng10-${PORTVERSION}-1.i386.rpm
+USE_LINUX_RPM= yes
+LINUX_DIST_VER= 3
+INSTALLS_SHLIB= yes
PLIST_FILES= usr/lib/libpng.so.2.1.0.16 \
usr/lib/libpng.so.2
DOCSDIR= ${PREFIX}/usr/share/doc/libpng10-1.0.16
PORTDOCS= CHANGES LICENSE README TODO example.c libpng.txt
-.include "../../x11-toolkits/linux-gtk/Makefile"
+.include <bsd.port.mk>
diff --git a/graphics/linux-f8-png10/distinfo.i386 b/graphics/linux-f8-png10/distinfo.i386
index 3fb95b9032b2..5dc28d08c979 100644
--- a/graphics/linux-f8-png10/distinfo.i386
+++ b/graphics/linux-f8-png10/distinfo.i386
@@ -1,2 +1,6 @@
-MD5 (rpm/i386/fc3/libpng10-1.0.16-1.i386.rpm) = b9a3180c7d9038f0af92b00655bb6e11
-SIZE (rpm/i386/fc3/libpng10-1.0.16-1.i386.rpm) = 150813
+MD5 (rpm/i386/fedora/3/libpng10-1.0.16-1.i386.rpm) = b9a3180c7d9038f0af92b00655bb6e11
+SHA256 (rpm/i386/fedora/3/libpng10-1.0.16-1.i386.rpm) = 6bbcf1ed1388357e3c81e13dd13e9e853603f3399c0366c6b940c82407bf3f4f
+SIZE (rpm/i386/fedora/3/libpng10-1.0.16-1.i386.rpm) = 150813
+MD5 (rpm/i386/fedora/3/libpng10-1.0.16-1.src.rpm) = 1174c6f9c2ba2326cae9cb6c61a3aeee
+SHA256 (rpm/i386/fedora/3/libpng10-1.0.16-1.src.rpm) = 90f72ec8081e847a57e18186b8b8db1a46f442a442161ac3507a88ca4fddc186
+SIZE (rpm/i386/fedora/3/libpng10-1.0.16-1.src.rpm) = 388311
diff --git a/graphics/linux-f8-tiff/Makefile b/graphics/linux-f8-tiff/Makefile
index 736756df7463..8e98c17b8750 100644
--- a/graphics/linux-f8-tiff/Makefile
+++ b/graphics/linux-f8-tiff/Makefile
@@ -7,11 +7,9 @@
PORTNAME= tiff
PORTVERSION= 3.6.1
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= graphics linux
-MASTER_SITES= ${MASTER_SITE_FEDORA_LINUX}
-MASTER_SITE_SUBDIR= updates/3/${ARCH}
-PKGNAMEPREFIX= linux-
+DISTNAME= libtiff-${PORTVERSION}-10.fc3
MAINTAINER= freebsd-emulation@FreeBSD.org
COMMENT= TIFF library, Linux/i386 binary
@@ -19,17 +17,10 @@ COMMENT= TIFF library, Linux/i386 binary
RUN_DEPENDS= ${LINUXBASE}/usr/lib/libjpeg.so.62:${PORTSDIR}/graphics/linux-jpeg
ONLY_FOR_ARCHS= amd64 i386
-RPM_SET= libtiff-${PORTVERSION}-10.fc3.${ARCH}.rpm
+USE_LINUX_RPM= yes
+LINUX_DIST_VER= 3
+INSTALLS_SHLIB= yes
+BRANDELF_DIRS= usr/bin
+PLIST= pkg-plist.${LINUX_RPM_ARCH}
-BINFILES= fax2ps fax2tiff gif2tiff pal2rgb ppm2tiff ras2tiff raw2tiff \
- rgb2ycbcr thumbnail tiff2bw tiff2pdf tiff2ps tiff2rgba tiffcmp \
- tiffcp tiffdither tiffdump tiffinfo tiffmedian tiffset tiffsplit
-
-.for file in ${BINFILES}
-BRANDFILES+= ${PREFIX}/usr/bin/${file}
-.endfor
-
-post-install:
- @${BRANDELF} -t Linux ${BRANDFILES}
-
-.include "../../x11-toolkits/linux-gtk/Makefile"
+.include <bsd.port.mk>
diff --git a/graphics/linux-f8-tiff/distinfo.i386 b/graphics/linux-f8-tiff/distinfo.i386
index 7a27d5aee7d7..e5ae94ebb82e 100644
--- a/graphics/linux-f8-tiff/distinfo.i386
+++ b/graphics/linux-f8-tiff/distinfo.i386
@@ -1,3 +1,6 @@
-MD5 (rpm/libtiff-3.6.1-10.fc3.i386.rpm) = e53dcf1d936de0905ce9257c6a4539d0
-SHA256 (rpm/libtiff-3.6.1-10.fc3.i386.rpm) = 2b19298e98ab2e7d0ee561be613f563bfc572ab084b3790473124a108cd9b724
-SIZE (rpm/libtiff-3.6.1-10.fc3.i386.rpm) = 264682
+MD5 (rpm/i386/fedora/3/libtiff-3.6.1-10.fc3.i386.rpm) = e53dcf1d936de0905ce9257c6a4539d0
+SHA256 (rpm/i386/fedora/3/libtiff-3.6.1-10.fc3.i386.rpm) = 2b19298e98ab2e7d0ee561be613f563bfc572ab084b3790473124a108cd9b724
+SIZE (rpm/i386/fedora/3/libtiff-3.6.1-10.fc3.i386.rpm) = 264682
+MD5 (rpm/i386/fedora/3/libtiff-3.6.1-10.fc3.src.rpm) = 9d67f8e29173588835406d3eb91e33a9
+SHA256 (rpm/i386/fedora/3/libtiff-3.6.1-10.fc3.src.rpm) = eb9432f77de2d21c97381f649b903551b2b2fa492f5c2bbf8395a7e9ebd8f7be
+SIZE (rpm/i386/fedora/3/libtiff-3.6.1-10.fc3.src.rpm) = 1095994
diff --git a/graphics/linux-f8-ungif/Makefile b/graphics/linux-f8-ungif/Makefile
index c3fff197ca4c..5c8218e4fc27 100644
--- a/graphics/linux-f8-ungif/Makefile
+++ b/graphics/linux-f8-ungif/Makefile
@@ -4,19 +4,19 @@
# $FreeBSD$
#
PORTNAME= ungif
-PORTVERSION= 4.1.0
-PORTREVISION= 3
+PORTVERSION= 4.1.3
CATEGORIES= graphics linux
+DISTNAME= libungif-${PORTVERSION}-1
MAINTAINTER= maho@FreeBSD.org
COMMENT= RPM of the ungif lib
NOT_FOR_ARCHS= amd64
-.if (${MACHINE_ARCH} == "i386")
-RPM_SET= libungif-4.1.0-7.${MACHINE_ARCH}.rpm
-.else
-RPM_SET= libungif-4.1.0-8.${MACHINE_ARCH}.rpm
-.endif
+USE_LINUX_RPM= yes
+LINUX_DIST_VER= 3
+INSTALLS_SHLIB= yes
+PLIST= pkg-plist.${LINUX_RPM_ARCH}
+PLIST_SUB= PORTVERSION="${PORTVERSION}"
-.include "../../x11-toolkits/linux-gtk/Makefile"
+.include <bsd.port.mk>
diff --git a/graphics/linux-f8-ungif/distinfo.alpha b/graphics/linux-f8-ungif/distinfo.alpha
deleted file mode 100644
index 6054d65663f5..000000000000
--- a/graphics/linux-f8-ungif/distinfo.alpha
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 (rpm/libungif-4.1.0-8.alpha.rpm) = 60bdb595dcd4a7cff8943a7a513d5957
-SIZE (rpm/libungif-4.1.0-8.alpha.rpm) = 115455
diff --git a/graphics/linux-f8-ungif/distinfo.i386 b/graphics/linux-f8-ungif/distinfo.i386
index 7df2039f460a..cb837bcc44e2 100644
--- a/graphics/linux-f8-ungif/distinfo.i386
+++ b/graphics/linux-f8-ungif/distinfo.i386
@@ -1,2 +1,6 @@
-MD5 (rpm/libungif-4.1.0-7.i386.rpm) = 4cf169c6fc0b69251c2e9ddaad5e2a71
-SIZE (rpm/libungif-4.1.0-7.i386.rpm) = 44699
+MD5 (rpm/i386/fedora/3/libungif-4.1.3-1.i386.rpm) = 35af56b8b6551e3087ab2fd496f55dac
+SHA256 (rpm/i386/fedora/3/libungif-4.1.3-1.i386.rpm) = 2bd28a1c9d9e22f47f9fbeb4e9bf95a9294037eedb322f5e4cc410a43f41d65d
+SIZE (rpm/i386/fedora/3/libungif-4.1.3-1.i386.rpm) = 39722
+MD5 (rpm/i386/fedora/3/libungif-4.1.3-1.src.rpm) = a8bce6737125e66f2af311d6e6dc2997
+SHA256 (rpm/i386/fedora/3/libungif-4.1.3-1.src.rpm) = 47590b7d466edcab4bdfc58724f7c7379dc933677e9a4296eee457d0aa081b1b
+SIZE (rpm/i386/fedora/3/libungif-4.1.3-1.src.rpm) = 447818
diff --git a/graphics/linux-f8-ungif/pkg-plist.alpha b/graphics/linux-f8-ungif/pkg-plist.alpha
deleted file mode 100644
index 7962c90ed21d..000000000000
--- a/graphics/linux-f8-ungif/pkg-plist.alpha
+++ /dev/null
@@ -1,20 +0,0 @@
-usr/lib/libungif.so.3.1.0
-usr/lib/libungif.so.4.1.0
-usr/share/doc/libungif-4.1.0/COPYING
-usr/share/doc/libungif-4.1.0/NEWS
-usr/share/doc/libungif-4.1.0/ONEWS
-usr/share/doc/libungif-4.1.0/README
-usr/share/doc/libungif-4.1.0/UNCOMPRESSED_GIF
-@exec ln -sf %D/usr/lib/libgif.so.3.1.0 %D/usr/lib/libgif.so.3
-@exec ln -sf %D/usr/lib/libgif.so.4.1.0 %D/usr/lib/libgif.so.4
-@exec ln -sf %D/usr/lib/libungif.so.3.1.0 %D/usr/lib/libgif.so.3.1.0
-@exec ln -sf %D/usr/lib/libungif.so.3.1.0 %D/usr/lib/libungif.so.3
-@exec ln -sf %D/usr/lib/libungif.so.4.1.0 %D/usr/lib/libgif.so.4.1.0
-@exec ln -sf %D/usr/lib/libungif.so.4.1.0 %D/usr/lib/libungif.so.4
-@unexec rm -f %D/usr/lib/libgif.so.3
-@unexec rm -f %D/usr/lib/libgif.so.3.1.0
-@unexec rm -f %D/usr/lib/libgif.so.4
-@unexec rm -f %D/usr/lib/libgif.so.4.1.0
-@unexec rm -f %D/usr/lib/libungif.so.3
-@unexec rm -f %D/usr/lib/libungif.so.4
-@dirrm usr/share/doc/libungif-4.1.0
diff --git a/graphics/linux-f8-ungif/pkg-plist.i386 b/graphics/linux-f8-ungif/pkg-plist.i386
index 7962c90ed21d..8ec7dee5fa38 100644
--- a/graphics/linux-f8-ungif/pkg-plist.i386
+++ b/graphics/linux-f8-ungif/pkg-plist.i386
@@ -1,20 +1,14 @@
-usr/lib/libungif.so.3.1.0
-usr/lib/libungif.so.4.1.0
-usr/share/doc/libungif-4.1.0/COPYING
-usr/share/doc/libungif-4.1.0/NEWS
-usr/share/doc/libungif-4.1.0/ONEWS
-usr/share/doc/libungif-4.1.0/README
-usr/share/doc/libungif-4.1.0/UNCOMPRESSED_GIF
-@exec ln -sf %D/usr/lib/libgif.so.3.1.0 %D/usr/lib/libgif.so.3
-@exec ln -sf %D/usr/lib/libgif.so.4.1.0 %D/usr/lib/libgif.so.4
-@exec ln -sf %D/usr/lib/libungif.so.3.1.0 %D/usr/lib/libgif.so.3.1.0
-@exec ln -sf %D/usr/lib/libungif.so.3.1.0 %D/usr/lib/libungif.so.3
-@exec ln -sf %D/usr/lib/libungif.so.4.1.0 %D/usr/lib/libgif.so.4.1.0
-@exec ln -sf %D/usr/lib/libungif.so.4.1.0 %D/usr/lib/libungif.so.4
-@unexec rm -f %D/usr/lib/libgif.so.3
-@unexec rm -f %D/usr/lib/libgif.so.3.1.0
-@unexec rm -f %D/usr/lib/libgif.so.4
-@unexec rm -f %D/usr/lib/libgif.so.4.1.0
-@unexec rm -f %D/usr/lib/libungif.so.3
-@unexec rm -f %D/usr/lib/libungif.so.4
-@dirrm usr/share/doc/libungif-4.1.0
+usr/lib/libgif.so.4
+usr/lib/libgif.so.%%PORTVERSION%%
+usr/lib/libungif.so.4
+usr/lib/libungif.so.%%PORTVERSION%%
+usr/share/doc/libungif-%%PORTVERSION%%/AUTHORS
+usr/share/doc/libungif-%%PORTVERSION%%/BUGS
+usr/share/doc/libungif-%%PORTVERSION%%/COPYING
+usr/share/doc/libungif-%%PORTVERSION%%/ChangeLog
+usr/share/doc/libungif-%%PORTVERSION%%/NEWS
+usr/share/doc/libungif-%%PORTVERSION%%/ONEWS
+usr/share/doc/libungif-%%PORTVERSION%%/README
+usr/share/doc/libungif-%%PORTVERSION%%/TODO
+usr/share/doc/libungif-%%PORTVERSION%%/UNCOMPRESSED_GIF
+@dirrm usr/share/doc/libungif-%%PORTVERSION%%
diff --git a/graphics/linux-imlib/Makefile b/graphics/linux-imlib/Makefile
index df6beaab5186..1ac1a642ea9b 100644
--- a/graphics/linux-imlib/Makefile
+++ b/graphics/linux-imlib/Makefile
@@ -6,13 +6,18 @@
#
PORTNAME= imlib
-PORTVERSION= 1.9.8.1
-PORTREVISION= 2
+PORTVERSION= 1.9.13
CATEGORIES= graphics linux
+DISTNAME= ${PORTNAME}-${PORTVERSION}-21
MAINTAINER= ports@FreeBSD.org
COMMENT= RPM of imlib
-RPM_SET= imlib-${PORTVERSION}-2.${ARCH}.rpm
+USE_LINUX_RPM= yes
+LINUX_DIST_VER= 3
+INSTALLS_SHLIB= yes
+BRANDELF_DIRS= usr/bin
+PLIST= pkg-plist.${LINUX_RPM_ARCH}
+PLIST_SUB= PORTVERSION="${PORTVERSION}"
-.include "../../x11-toolkits/linux-gtk/Makefile"
+.include <bsd.port.mk>
diff --git a/graphics/linux-imlib/distinfo.alpha b/graphics/linux-imlib/distinfo.alpha
deleted file mode 100644
index 13f2314b4a34..000000000000
--- a/graphics/linux-imlib/distinfo.alpha
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 (rpm/imlib-1.9.8.1-2.alpha.rpm) = 1e55a013ac2058d1100393ec6e795fa4
-SIZE (rpm/imlib-1.9.8.1-2.alpha.rpm) = 525669
diff --git a/graphics/linux-imlib/distinfo.i386 b/graphics/linux-imlib/distinfo.i386
index a979248ec87a..e7a7b12e0f0e 100644
--- a/graphics/linux-imlib/distinfo.i386
+++ b/graphics/linux-imlib/distinfo.i386
@@ -1,2 +1,6 @@
-MD5 (rpm/imlib-1.9.8.1-2.i386.rpm) = 64a1a27bc1e276af8aecefa261ab9b3b
-SIZE (rpm/imlib-1.9.8.1-2.i386.rpm) = 162510
+MD5 (rpm/i386/fedora/3/imlib-1.9.13-21.i386.rpm) = 547f6292ad0b85281b79773ae81ec6fe
+SHA256 (rpm/i386/fedora/3/imlib-1.9.13-21.i386.rpm) = 06f59a3497e001dfa92e549c3c69db6c8827af056c0757cb488f5689e042326b
+SIZE (rpm/i386/fedora/3/imlib-1.9.13-21.i386.rpm) = 403667
+MD5 (rpm/i386/fedora/3/imlib-1.9.13-21.src.rpm) = 6925c73e807665ecb0c728b848350ee0
+SHA256 (rpm/i386/fedora/3/imlib-1.9.13-21.src.rpm) = 61e73dcf484730bf38a3ea873be30dedf08ac6793f21366ffd97e7c5a9e01ecf
+SIZE (rpm/i386/fedora/3/imlib-1.9.13-21.src.rpm) = 773178
diff --git a/graphics/linux-imlib/pkg-plist.alpha b/graphics/linux-imlib/pkg-plist.alpha
deleted file mode 100644
index f19ff0727e49..000000000000
--- a/graphics/linux-imlib/pkg-plist.alpha
+++ /dev/null
@@ -1,21 +0,0 @@
-etc/im_palette-small.pal
-etc/im_palette-tiny.pal
-etc/im_palette.pal
-etc/imrc
-usr/lib/libImlib.so.1.9.8
-usr/lib/libgdk_imlib.so.1.9.8
-usr/lib/libimlib-bmp.so
-usr/lib/libimlib-gif.so
-usr/lib/libimlib-jpeg.so
-usr/lib/libimlib-png.so
-usr/lib/libimlib-ppm.so
-usr/lib/libimlib-ps.so
-usr/lib/libimlib-tiff.so
-usr/lib/libimlib-xpm.so
-usr/share/doc/imlib-1.9.8.1/AUTHORS
-usr/share/doc/imlib-1.9.8.1/ChangeLog
-usr/share/doc/imlib-1.9.8.1/NEWS
-usr/share/doc/imlib-1.9.8.1/README
-usr/lib/libImlib.so.1
-usr/lib/libgdk_imlib.so.1
-@dirrm usr/share/doc/imlib-1.9.8.1
diff --git a/graphics/linux-imlib/pkg-plist.i386 b/graphics/linux-imlib/pkg-plist.i386
index f19ff0727e49..414ff141244a 100644
--- a/graphics/linux-imlib/pkg-plist.i386
+++ b/graphics/linux-imlib/pkg-plist.i386
@@ -2,8 +2,8 @@ etc/im_palette-small.pal
etc/im_palette-tiny.pal
etc/im_palette.pal
etc/imrc
-usr/lib/libImlib.so.1.9.8
-usr/lib/libgdk_imlib.so.1.9.8
+usr/lib/libImlib.so.11.0.0
+usr/lib/libgdk_imlib.so.%%PORTVERSION%%
usr/lib/libimlib-bmp.so
usr/lib/libimlib-gif.so
usr/lib/libimlib-jpeg.so
@@ -12,10 +12,10 @@ usr/lib/libimlib-ppm.so
usr/lib/libimlib-ps.so
usr/lib/libimlib-tiff.so
usr/lib/libimlib-xpm.so
-usr/share/doc/imlib-1.9.8.1/AUTHORS
-usr/share/doc/imlib-1.9.8.1/ChangeLog
-usr/share/doc/imlib-1.9.8.1/NEWS
-usr/share/doc/imlib-1.9.8.1/README
-usr/lib/libImlib.so.1
+usr/share/doc/imlib-%%PORTVERSION%%/AUTHORS
+usr/share/doc/imlib-%%PORTVERSION%%/ChangeLog
+usr/share/doc/imlib-%%PORTVERSION%%/NEWS
+usr/share/doc/imlib-%%PORTVERSION%%/README
+usr/lib/libImlib.so.11
usr/lib/libgdk_imlib.so.1
-@dirrm usr/share/doc/imlib-1.9.8.1
+@dirrm usr/share/doc/imlib-%%PORTVERSION%%
diff --git a/graphics/linux-jpeg/Makefile b/graphics/linux-jpeg/Makefile
index 03de0fa8e4cd..b542ab05c935 100644
--- a/graphics/linux-jpeg/Makefile
+++ b/graphics/linux-jpeg/Makefile
@@ -7,20 +7,18 @@
PORTNAME= jpeg
PORTVERSION= 6b.33
-PORTREVISION= 0
+PORTREVISION= 1
CATEGORIES= graphics linux
-MASTER_SITES= ${MASTER_SITE_FEDORA_LINUX}
-MASTER_SITE_SUBDIR= 3/${ARCH}/os/Fedora/RPMS
+DISTNAME= libjpeg-6b-33
MAINTAINER= freebsd-emulation@FreeBSD.org
COMMENT= RPM of the JPEG lib
+USE_LINUX_RPM= yes
+LINUX_DIST_VER= 3
+INSTALLS_SHLIB= yes
ONLY_FOR_ARCHS= i386 amd64
-RPM_SET= libjpeg-6b-33.${ARCH}.rpm
-post-install:
- @${BRANDELF} -t Linux ${PREFIX}/usr/bin/cjpeg ${PREFIX}/usr/bin/djpeg \
- ${PREFIX}/usr/bin/jpegtran ${PREFIX}/usr/bin/rdjpgcom \
- ${PREFIX}/usr/bin/wrjpgcom
+BRANDELF_DIRS= usr/bin
-.include "../../x11-toolkits/linux-gtk/Makefile"
+.include <bsd.port.mk>
diff --git a/graphics/linux-jpeg/distinfo.i386 b/graphics/linux-jpeg/distinfo.i386
index 3de09d4b69b1..8a7321881584 100644
--- a/graphics/linux-jpeg/distinfo.i386
+++ b/graphics/linux-jpeg/distinfo.i386
@@ -1,3 +1,6 @@
-MD5 (rpm/libjpeg-6b-33.i386.rpm) = a7c91c619462c521ba27b6caad50bd41
-SHA256 (rpm/libjpeg-6b-33.i386.rpm) = 19f1e874b23caee40603a8dce0380eed95205fe55fd70cbbe682bfb06b7f534f
-SIZE (rpm/libjpeg-6b-33.i386.rpm) = 129589
+MD5 (rpm/i386/fedora/3/libjpeg-6b-33.i386.rpm) = a7c91c619462c521ba27b6caad50bd41
+SHA256 (rpm/i386/fedora/3/libjpeg-6b-33.i386.rpm) = 19f1e874b23caee40603a8dce0380eed95205fe55fd70cbbe682bfb06b7f534f
+SIZE (rpm/i386/fedora/3/libjpeg-6b-33.i386.rpm) = 129589
+MD5 (rpm/i386/fedora/3/libjpeg-6b-33.src.rpm) = 791bc284e9ab6a85c88734d1385dfa1d
+SHA256 (rpm/i386/fedora/3/libjpeg-6b-33.src.rpm) = bcbc4f67920dccccc93a17d4145fb14895e0b4fd565c8ce6e6fea7d82bfdffcc
+SIZE (rpm/i386/fedora/3/libjpeg-6b-33.src.rpm) = 544433
diff --git a/graphics/linux-jpeg/pkg-plist.i386 b/graphics/linux-jpeg/pkg-plist
index c9c21d293f90..c9c21d293f90 100644
--- a/graphics/linux-jpeg/pkg-plist.i386
+++ b/graphics/linux-jpeg/pkg-plist
diff --git a/graphics/linux-png/Makefile b/graphics/linux-png/Makefile
index f827ffa4fdbb..12332642db94 100644
--- a/graphics/linux-png/Makefile
+++ b/graphics/linux-png/Makefile
@@ -7,18 +7,18 @@
PORTNAME= png
PORTVERSION= 1.2.8
-PORTREVISION= 0
+PORTREVISION= 1
CATEGORIES= graphics linux
-MASTER_SITES= ${MASTER_SITE_FEDORA_LINUX}
-MASTER_SITE_SUBDIR= updates/3/${ARCH}
+DISTNAME= libpng-${PORTVERSION}-1.fc3
MAINTAINER= freebsd-emulation@FreeBSD.org
COMMENT= RPM of the PNG lib
-DIST_SUBDIR= rpm/i386/fc3
# no alpha rpm is available
ONLY_FOR_ARCHS= i386 amd64
-RPM_SET= libpng-${PORTVERSION}-1.fc3.${ARCH}.rpm
+USE_LINUX_RPM= yes
+LINUX_DIST_VER= 3
+INSTALLS_SHLIB= yes
PLIST_FILES= \
usr/lib/libpng.so.3 \
@@ -29,4 +29,4 @@ PLIST_FILES= \
DOCSDIR= ${PREFIX}/usr/share/doc/libpng-${PORTVERSION}
PORTDOCS= CHANGES LICENSE README TODO example.c libpng.txt
-.include "../../x11-toolkits/linux-gtk/Makefile"
+.include <bsd.port.mk>
diff --git a/graphics/linux-png/distinfo.i386 b/graphics/linux-png/distinfo.i386
index 8dec2c825a09..48ed864c0a5a 100644
--- a/graphics/linux-png/distinfo.i386
+++ b/graphics/linux-png/distinfo.i386
@@ -1,3 +1,6 @@
-MD5 (rpm/i386/fc3/libpng-1.2.8-1.fc3.i386.rpm) = b1dc31b8b29cefbcb304d866538f113d
-SHA256 (rpm/i386/fc3/libpng-1.2.8-1.fc3.i386.rpm) = 73cba596485ea8580e18c9950b44643064f6dc98a6f27bdbdcdcfc1540e87422
-SIZE (rpm/i386/fc3/libpng-1.2.8-1.fc3.i386.rpm) = 158945
+MD5 (rpm/i386/fedora/3/libpng-1.2.8-1.fc3.i386.rpm) = b1dc31b8b29cefbcb304d866538f113d
+SHA256 (rpm/i386/fedora/3/libpng-1.2.8-1.fc3.i386.rpm) = 73cba596485ea8580e18c9950b44643064f6dc98a6f27bdbdcdcfc1540e87422
+SIZE (rpm/i386/fedora/3/libpng-1.2.8-1.fc3.i386.rpm) = 158945
+MD5 (rpm/i386/fedora/3/libpng-1.2.8-1.fc3.src.rpm) = c8c663262abf784cb176c5efd763587d
+SHA256 (rpm/i386/fedora/3/libpng-1.2.8-1.fc3.src.rpm) = 415f069d18a88dffa4cac6e773070a0bd47204b4e1dcae194f2601b51509c080
+SIZE (rpm/i386/fedora/3/libpng-1.2.8-1.fc3.src.rpm) = 397948
diff --git a/graphics/linux-png10/Makefile b/graphics/linux-png10/Makefile
index 5307a31714f5..7adefa0d6c88 100644
--- a/graphics/linux-png10/Makefile
+++ b/graphics/linux-png10/Makefile
@@ -7,23 +7,23 @@
PORTNAME= png
PORTVERSION= 1.0.16
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= graphics linux
-MASTER_SITES= http://mirrors.xmission.com/fedora/core/3/i386/os/Fedora/RPMS/ \
- http://fedora.cat.pdx.edu/linux/core/3/i386/os/Fedora/RPMS/
+DISTNAME= libpng10-${PORTVERSION}-1
MAINTAINER= freebsd-emulation@FreeBSD.org
COMMENT= RPM of the PNG lib (old 1.0 version)
LATEST_LINK= linux-png10
-DIST_SUBDIR= rpm/i386/fc3
ONLY_FOR_ARCHS= i386
-RPM_SET= libpng10-${PORTVERSION}-1.i386.rpm
+USE_LINUX_RPM= yes
+LINUX_DIST_VER= 3
+INSTALLS_SHLIB= yes
PLIST_FILES= usr/lib/libpng.so.2.1.0.16 \
usr/lib/libpng.so.2
DOCSDIR= ${PREFIX}/usr/share/doc/libpng10-1.0.16
PORTDOCS= CHANGES LICENSE README TODO example.c libpng.txt
-.include "../../x11-toolkits/linux-gtk/Makefile"
+.include <bsd.port.mk>
diff --git a/graphics/linux-png10/distinfo.i386 b/graphics/linux-png10/distinfo.i386
index 3fb95b9032b2..5dc28d08c979 100644
--- a/graphics/linux-png10/distinfo.i386
+++ b/graphics/linux-png10/distinfo.i386
@@ -1,2 +1,6 @@
-MD5 (rpm/i386/fc3/libpng10-1.0.16-1.i386.rpm) = b9a3180c7d9038f0af92b00655bb6e11
-SIZE (rpm/i386/fc3/libpng10-1.0.16-1.i386.rpm) = 150813
+MD5 (rpm/i386/fedora/3/libpng10-1.0.16-1.i386.rpm) = b9a3180c7d9038f0af92b00655bb6e11
+SHA256 (rpm/i386/fedora/3/libpng10-1.0.16-1.i386.rpm) = 6bbcf1ed1388357e3c81e13dd13e9e853603f3399c0366c6b940c82407bf3f4f
+SIZE (rpm/i386/fedora/3/libpng10-1.0.16-1.i386.rpm) = 150813
+MD5 (rpm/i386/fedora/3/libpng10-1.0.16-1.src.rpm) = 1174c6f9c2ba2326cae9cb6c61a3aeee
+SHA256 (rpm/i386/fedora/3/libpng10-1.0.16-1.src.rpm) = 90f72ec8081e847a57e18186b8b8db1a46f442a442161ac3507a88ca4fddc186
+SIZE (rpm/i386/fedora/3/libpng10-1.0.16-1.src.rpm) = 388311
diff --git a/graphics/linux-tiff/Makefile b/graphics/linux-tiff/Makefile
index 736756df7463..8e98c17b8750 100644
--- a/graphics/linux-tiff/Makefile
+++ b/graphics/linux-tiff/Makefile
@@ -7,11 +7,9 @@
PORTNAME= tiff
PORTVERSION= 3.6.1
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= graphics linux
-MASTER_SITES= ${MASTER_SITE_FEDORA_LINUX}
-MASTER_SITE_SUBDIR= updates/3/${ARCH}
-PKGNAMEPREFIX= linux-
+DISTNAME= libtiff-${PORTVERSION}-10.fc3
MAINTAINER= freebsd-emulation@FreeBSD.org
COMMENT= TIFF library, Linux/i386 binary
@@ -19,17 +17,10 @@ COMMENT= TIFF library, Linux/i386 binary
RUN_DEPENDS= ${LINUXBASE}/usr/lib/libjpeg.so.62:${PORTSDIR}/graphics/linux-jpeg
ONLY_FOR_ARCHS= amd64 i386
-RPM_SET= libtiff-${PORTVERSION}-10.fc3.${ARCH}.rpm
+USE_LINUX_RPM= yes
+LINUX_DIST_VER= 3
+INSTALLS_SHLIB= yes
+BRANDELF_DIRS= usr/bin
+PLIST= pkg-plist.${LINUX_RPM_ARCH}
-BINFILES= fax2ps fax2tiff gif2tiff pal2rgb ppm2tiff ras2tiff raw2tiff \
- rgb2ycbcr thumbnail tiff2bw tiff2pdf tiff2ps tiff2rgba tiffcmp \
- tiffcp tiffdither tiffdump tiffinfo tiffmedian tiffset tiffsplit
-
-.for file in ${BINFILES}
-BRANDFILES+= ${PREFIX}/usr/bin/${file}
-.endfor
-
-post-install:
- @${BRANDELF} -t Linux ${BRANDFILES}
-
-.include "../../x11-toolkits/linux-gtk/Makefile"
+.include <bsd.port.mk>
diff --git a/graphics/linux-tiff/distinfo.i386 b/graphics/linux-tiff/distinfo.i386
index 7a27d5aee7d7..e5ae94ebb82e 100644
--- a/graphics/linux-tiff/distinfo.i386
+++ b/graphics/linux-tiff/distinfo.i386
@@ -1,3 +1,6 @@
-MD5 (rpm/libtiff-3.6.1-10.fc3.i386.rpm) = e53dcf1d936de0905ce9257c6a4539d0
-SHA256 (rpm/libtiff-3.6.1-10.fc3.i386.rpm) = 2b19298e98ab2e7d0ee561be613f563bfc572ab084b3790473124a108cd9b724
-SIZE (rpm/libtiff-3.6.1-10.fc3.i386.rpm) = 264682
+MD5 (rpm/i386/fedora/3/libtiff-3.6.1-10.fc3.i386.rpm) = e53dcf1d936de0905ce9257c6a4539d0
+SHA256 (rpm/i386/fedora/3/libtiff-3.6.1-10.fc3.i386.rpm) = 2b19298e98ab2e7d0ee561be613f563bfc572ab084b3790473124a108cd9b724
+SIZE (rpm/i386/fedora/3/libtiff-3.6.1-10.fc3.i386.rpm) = 264682
+MD5 (rpm/i386/fedora/3/libtiff-3.6.1-10.fc3.src.rpm) = 9d67f8e29173588835406d3eb91e33a9
+SHA256 (rpm/i386/fedora/3/libtiff-3.6.1-10.fc3.src.rpm) = eb9432f77de2d21c97381f649b903551b2b2fa492f5c2bbf8395a7e9ebd8f7be
+SIZE (rpm/i386/fedora/3/libtiff-3.6.1-10.fc3.src.rpm) = 1095994
diff --git a/graphics/linux-ungif/Makefile b/graphics/linux-ungif/Makefile
index c3fff197ca4c..5c8218e4fc27 100644
--- a/graphics/linux-ungif/Makefile
+++ b/graphics/linux-ungif/Makefile
@@ -4,19 +4,19 @@
# $FreeBSD$
#
PORTNAME= ungif
-PORTVERSION= 4.1.0
-PORTREVISION= 3
+PORTVERSION= 4.1.3
CATEGORIES= graphics linux
+DISTNAME= libungif-${PORTVERSION}-1
MAINTAINTER= maho@FreeBSD.org
COMMENT= RPM of the ungif lib
NOT_FOR_ARCHS= amd64
-.if (${MACHINE_ARCH} == "i386")
-RPM_SET= libungif-4.1.0-7.${MACHINE_ARCH}.rpm
-.else
-RPM_SET= libungif-4.1.0-8.${MACHINE_ARCH}.rpm
-.endif
+USE_LINUX_RPM= yes
+LINUX_DIST_VER= 3
+INSTALLS_SHLIB= yes
+PLIST= pkg-plist.${LINUX_RPM_ARCH}
+PLIST_SUB= PORTVERSION="${PORTVERSION}"
-.include "../../x11-toolkits/linux-gtk/Makefile"
+.include <bsd.port.mk>
diff --git a/graphics/linux-ungif/distinfo.alpha b/graphics/linux-ungif/distinfo.alpha
deleted file mode 100644
index 6054d65663f5..000000000000
--- a/graphics/linux-ungif/distinfo.alpha
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 (rpm/libungif-4.1.0-8.alpha.rpm) = 60bdb595dcd4a7cff8943a7a513d5957
-SIZE (rpm/libungif-4.1.0-8.alpha.rpm) = 115455
diff --git a/graphics/linux-ungif/distinfo.i386 b/graphics/linux-ungif/distinfo.i386
index 7df2039f460a..cb837bcc44e2 100644
--- a/graphics/linux-ungif/distinfo.i386
+++ b/graphics/linux-ungif/distinfo.i386
@@ -1,2 +1,6 @@
-MD5 (rpm/libungif-4.1.0-7.i386.rpm) = 4cf169c6fc0b69251c2e9ddaad5e2a71
-SIZE (rpm/libungif-4.1.0-7.i386.rpm) = 44699
+MD5 (rpm/i386/fedora/3/libungif-4.1.3-1.i386.rpm) = 35af56b8b6551e3087ab2fd496f55dac
+SHA256 (rpm/i386/fedora/3/libungif-4.1.3-1.i386.rpm) = 2bd28a1c9d9e22f47f9fbeb4e9bf95a9294037eedb322f5e4cc410a43f41d65d
+SIZE (rpm/i386/fedora/3/libungif-4.1.3-1.i386.rpm) = 39722
+MD5 (rpm/i386/fedora/3/libungif-4.1.3-1.src.rpm) = a8bce6737125e66f2af311d6e6dc2997
+SHA256 (rpm/i386/fedora/3/libungif-4.1.3-1.src.rpm) = 47590b7d466edcab4bdfc58724f7c7379dc933677e9a4296eee457d0aa081b1b
+SIZE (rpm/i386/fedora/3/libungif-4.1.3-1.src.rpm) = 447818
diff --git a/graphics/linux-ungif/pkg-plist.alpha b/graphics/linux-ungif/pkg-plist.alpha
deleted file mode 100644
index 7962c90ed21d..000000000000
--- a/graphics/linux-ungif/pkg-plist.alpha
+++ /dev/null
@@ -1,20 +0,0 @@
-usr/lib/libungif.so.3.1.0
-usr/lib/libungif.so.4.1.0
-usr/share/doc/libungif-4.1.0/COPYING
-usr/share/doc/libungif-4.1.0/NEWS
-usr/share/doc/libungif-4.1.0/ONEWS
-usr/share/doc/libungif-4.1.0/README
-usr/share/doc/libungif-4.1.0/UNCOMPRESSED_GIF
-@exec ln -sf %D/usr/lib/libgif.so.3.1.0 %D/usr/lib/libgif.so.3
-@exec ln -sf %D/usr/lib/libgif.so.4.1.0 %D/usr/lib/libgif.so.4
-@exec ln -sf %D/usr/lib/libungif.so.3.1.0 %D/usr/lib/libgif.so.3.1.0
-@exec ln -sf %D/usr/lib/libungif.so.3.1.0 %D/usr/lib/libungif.so.3
-@exec ln -sf %D/usr/lib/libungif.so.4.1.0 %D/usr/lib/libgif.so.4.1.0
-@exec ln -sf %D/usr/lib/libungif.so.4.1.0 %D/usr/lib/libungif.so.4
-@unexec rm -f %D/usr/lib/libgif.so.3
-@unexec rm -f %D/usr/lib/libgif.so.3.1.0
-@unexec rm -f %D/usr/lib/libgif.so.4
-@unexec rm -f %D/usr/lib/libgif.so.4.1.0
-@unexec rm -f %D/usr/lib/libungif.so.3
-@unexec rm -f %D/usr/lib/libungif.so.4
-@dirrm usr/share/doc/libungif-4.1.0
diff --git a/graphics/linux-ungif/pkg-plist.i386 b/graphics/linux-ungif/pkg-plist.i386
index 7962c90ed21d..8ec7dee5fa38 100644
--- a/graphics/linux-ungif/pkg-plist.i386
+++ b/graphics/linux-ungif/pkg-plist.i386
@@ -1,20 +1,14 @@
-usr/lib/libungif.so.3.1.0
-usr/lib/libungif.so.4.1.0
-usr/share/doc/libungif-4.1.0/COPYING
-usr/share/doc/libungif-4.1.0/NEWS
-usr/share/doc/libungif-4.1.0/ONEWS
-usr/share/doc/libungif-4.1.0/README
-usr/share/doc/libungif-4.1.0/UNCOMPRESSED_GIF
-@exec ln -sf %D/usr/lib/libgif.so.3.1.0 %D/usr/lib/libgif.so.3
-@exec ln -sf %D/usr/lib/libgif.so.4.1.0 %D/usr/lib/libgif.so.4
-@exec ln -sf %D/usr/lib/libungif.so.3.1.0 %D/usr/lib/libgif.so.3.1.0
-@exec ln -sf %D/usr/lib/libungif.so.3.1.0 %D/usr/lib/libungif.so.3
-@exec ln -sf %D/usr/lib/libungif.so.4.1.0 %D/usr/lib/libgif.so.4.1.0
-@exec ln -sf %D/usr/lib/libungif.so.4.1.0 %D/usr/lib/libungif.so.4
-@unexec rm -f %D/usr/lib/libgif.so.3
-@unexec rm -f %D/usr/lib/libgif.so.3.1.0
-@unexec rm -f %D/usr/lib/libgif.so.4
-@unexec rm -f %D/usr/lib/libgif.so.4.1.0
-@unexec rm -f %D/usr/lib/libungif.so.3
-@unexec rm -f %D/usr/lib/libungif.so.4
-@dirrm usr/share/doc/libungif-4.1.0
+usr/lib/libgif.so.4
+usr/lib/libgif.so.%%PORTVERSION%%
+usr/lib/libungif.so.4
+usr/lib/libungif.so.%%PORTVERSION%%
+usr/share/doc/libungif-%%PORTVERSION%%/AUTHORS
+usr/share/doc/libungif-%%PORTVERSION%%/BUGS
+usr/share/doc/libungif-%%PORTVERSION%%/COPYING
+usr/share/doc/libungif-%%PORTVERSION%%/ChangeLog
+usr/share/doc/libungif-%%PORTVERSION%%/NEWS
+usr/share/doc/libungif-%%PORTVERSION%%/ONEWS
+usr/share/doc/libungif-%%PORTVERSION%%/README
+usr/share/doc/libungif-%%PORTVERSION%%/TODO
+usr/share/doc/libungif-%%PORTVERSION%%/UNCOMPRESSED_GIF
+@dirrm usr/share/doc/libungif-%%PORTVERSION%%
diff --git a/japanese/linux-ttfonts/Makefile b/japanese/linux-ttfonts/Makefile
index 6d8d58fa2e74..2796e84f5022 100644
--- a/japanese/linux-ttfonts/Makefile
+++ b/japanese/linux-ttfonts/Makefile
@@ -7,24 +7,16 @@
PORTNAME= ttfonts-ja
PORTVERSION= 1.2
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= japanese x11-fonts linux
+DISTNAME= ${PORTNAME}-${PORTVERSION}-36
MAINTAINER= ports@FreeBSD.org
COMMENT= Japanese Truetype fonts for use with Linux emulation
-BASEVERSION= 9
+USE_LINUX_RPM= yes
+LINUX_DIST_VER= 3
+EXTRACT_SUFX= .noarch.rpm
MD5_FILE= ${MASTERDIR}/distinfo
-PLIST= ${WRKDIR}/plist
-RPM_SET= ttfonts-ja-1.2-21.noarch.rpm
-pre-install:
- ${RM} -rf ${WRKSRC}/tmp
- ${MKDIR} ${WRKSRC}/tmp
- cd ${WRKSRC}/tmp; \
- rpm2cpio < ${DISTDIR}/${DIST_SUBDIR}/${RPM_SET} | ${CPIO} -id; \
- ${FIND} * -type f -o -type l > ${PLIST}; \
- ${FIND} -d * -type d | ${GREP} ja | ${SED} -e 's:^:@dirrm :' \
- >> ${PLIST};
-
-.include "../../x11-toolkits/linux-gtk/Makefile"
+.include <bsd.port.mk>
diff --git a/japanese/linux-ttfonts/distinfo b/japanese/linux-ttfonts/distinfo
index ae9b0dcd1ec8..5e2b998f54eb 100644
--- a/japanese/linux-ttfonts/distinfo
+++ b/japanese/linux-ttfonts/distinfo
@@ -1,3 +1,6 @@
-MD5 (rpm/ttfonts-ja-1.2-21.noarch.rpm) = 72a26e220169e1abcba6080935fa0ebc
-SHA256 (rpm/ttfonts-ja-1.2-21.noarch.rpm) = 10c6c2141f178104189707bb14629d9776f97e111be0998fd215c3ef0f461a69
-SIZE (rpm/ttfonts-ja-1.2-21.noarch.rpm) = 6161332
+MD5 (rpm/i386/fedora/3/ttfonts-ja-1.2-36.noarch.rpm) = 5f8d5d8b2ae13f8992b3c911bd10b501
+SHA256 (rpm/i386/fedora/3/ttfonts-ja-1.2-36.noarch.rpm) = 49f007a8de25ad8b11b3d80dc4c1ad6e9936678cb5db8285e49cd678e2a67f6f
+SIZE (rpm/i386/fedora/3/ttfonts-ja-1.2-36.noarch.rpm) = 9925785
+MD5 (rpm/i386/fedora/3/ttfonts-ja-1.2-36.src.rpm) = 1054b9dafaaf23acf4c4a9066e8abf1b
+SHA256 (rpm/i386/fedora/3/ttfonts-ja-1.2-36.src.rpm) = 2b3c2e42ab9701bf403b004211a1c492f43fbde884d923e374ac60ccba2ea752
+SIZE (rpm/i386/fedora/3/ttfonts-ja-1.2-36.src.rpm) = 8410267
diff --git a/japanese/linux-ttfonts/pkg-plist b/japanese/linux-ttfonts/pkg-plist
new file mode 100644
index 000000000000..f61c7b37774f
--- /dev/null
+++ b/japanese/linux-ttfonts/pkg-plist
@@ -0,0 +1,45 @@
+usr/share/doc/ttfonts-ja-1.2/COPYING
+usr/share/doc/ttfonts-ja-1.2/README.RedHat
+usr/share/doc/ttfonts-ja-1.2/README.ja
+usr/share/doc/ttfonts-ja-1.2/docs/README
+usr/share/doc/ttfonts-ja-1.2/docs/ayu20gothic/README.txt
+usr/share/doc/ttfonts-ja-1.2/docs/k14goth/BUGS
+usr/share/doc/ttfonts-ja-1.2/docs/k14goth/Changelog
+usr/share/doc/ttfonts-ja-1.2/docs/k14goth/INSTALL
+usr/share/doc/ttfonts-ja-1.2/docs/k14goth/README
+usr/share/doc/ttfonts-ja-1.2/docs/k14goth/THANKS
+usr/share/doc/ttfonts-ja-1.2/docs/kappa20/README
+usr/share/doc/ttfonts-ja-1.2/docs/shinonome12/AUTHORS
+usr/share/doc/ttfonts-ja-1.2/docs/shinonome12/BUGS
+usr/share/doc/ttfonts-ja-1.2/docs/shinonome12/Changelog
+usr/share/doc/ttfonts-ja-1.2/docs/shinonome12/README
+usr/share/doc/ttfonts-ja-1.2/docs/shinonome12/THANKS
+usr/share/doc/ttfonts-ja-1.2/docs/shinonome12/TODO
+usr/share/doc/ttfonts-ja-1.2/docs/shinonome16/AUTHORS
+usr/share/doc/ttfonts-ja-1.2/docs/shinonome16/BUGS
+usr/share/doc/ttfonts-ja-1.2/docs/shinonome16/Changelog
+usr/share/doc/ttfonts-ja-1.2/docs/shinonome16/README
+usr/share/doc/ttfonts-ja-1.2/docs/shinonome16/THANKS
+usr/share/doc/ttfonts-ja-1.2/docs/shinonome16/TODO
+usr/share/doc/ttfonts-ja-1.2/docs/wadalab/README
+usr/share/doc/ttfonts-ja-1.2/docs/wadalab/README.ja
+usr/share/fonts/ja/TrueType/fonts.alias
+usr/share/fonts/ja/TrueType/kochi-gothic-subst.ttf
+usr/share/fonts/ja/TrueType/kochi-gothic-subst.tti
+usr/share/fonts/ja/TrueType/kochi-mincho-subst.ttf
+usr/share/fonts/ja/TrueType/kochi-mincho-subst.tti
+usr/share/ghostscript/7.07/lib/CIDFnmap.ja
+@dirrm usr/share/ghostscript/7.07/lib
+@dirrm usr/share/ghostscript/7.07
+@dirrm usr/share/ghostscript
+@dirrm usr/share/fonts/ja/TrueType
+@dirrm usr/share/fonts/ja
+@dirrmtry usr/share/fonts
+@dirrm usr/share/doc/ttfonts-ja-1.2/docs/wadalab
+@dirrm usr/share/doc/ttfonts-ja-1.2/docs/shinonome16
+@dirrm usr/share/doc/ttfonts-ja-1.2/docs/shinonome12
+@dirrm usr/share/doc/ttfonts-ja-1.2/docs/kappa20
+@dirrm usr/share/doc/ttfonts-ja-1.2/docs/k14goth
+@dirrm usr/share/doc/ttfonts-ja-1.2/docs/ayu20gothic
+@dirrm usr/share/doc/ttfonts-ja-1.2/docs
+@dirrm usr/share/doc/ttfonts-ja-1.2
diff --git a/textproc/linux-expat/Makefile b/textproc/linux-expat/Makefile
index 796bd0f432f9..0811e595abe2 100644
--- a/textproc/linux-expat/Makefile
+++ b/textproc/linux-expat/Makefile
@@ -7,27 +7,18 @@
PORTNAME= expat
PORTVERSION= 1.95.7
-PORTREVISION= 0
+PORTREVISION= 1
CATEGORIES= textproc linux
-MASTER_SITES= ${MASTER_SITE_FEDORA_LINUX}
-MASTER_SITE_SUBDIR= 3/i386/os/Fedora/RPMS
+DISTNAME= ${PORTNAME}-${PORTVERSION}-4
MAINTAINER= freebsd-emulation@FreeBSD.org
COMMENT= Linux/i386 binary port of Expat XML-parsing library
-RUN_DEPENDS=
+BRANDELF_DIRS= usr/bin
-USE_LINUX= yes
+USE_LINUX_RPM= yes
+LINUX_DIST_VER= 3
ONLY_FOR_ARCHS= i386 amd64
-PLIST= ${WRKDIR}/plist
-RPM_SET= expat-${PORTVERSION}-4.i386.rpm
+INSTALLS_SHLIB= yes
-pre-install:
- ${RM} -rf ${WRKSRC}/tmp
- ${MKDIR} ${WRKSRC}/tmp
- cd ${WRKSRC}/tmp; \
- rpm2cpio < ${DISTDIR}/${DIST_SUBDIR}/${RPM_SET} | ${CPIO} -div; \
- ${FIND} * -type f -o -type l > ${PLIST}
- ${ECHO_CMD} @dirrm usr/share/doc/expat-${PORTVERSION} >> ${PLIST}
-
-.include "../../x11-toolkits/linux-gtk/Makefile"
+.include <bsd.port.mk>
diff --git a/textproc/linux-expat/distinfo.i386 b/textproc/linux-expat/distinfo.i386
index ce74e5c67c36..5ce242202a59 100644
--- a/textproc/linux-expat/distinfo.i386
+++ b/textproc/linux-expat/distinfo.i386
@@ -1,3 +1,6 @@
-MD5 (rpm/expat-1.95.7-4.i386.rpm) = 2df48545d73e0a20c56d8c727fa606a8
-SHA256 (rpm/expat-1.95.7-4.i386.rpm) = 4813f1e179b6f32e9f9dfd9b5f457691cdbea5760836b0632f72590d1542a765
-SIZE (rpm/expat-1.95.7-4.i386.rpm) = 72430
+MD5 (rpm/i386/fedora/3/expat-1.95.7-4.i386.rpm) = 2df48545d73e0a20c56d8c727fa606a8
+SHA256 (rpm/i386/fedora/3/expat-1.95.7-4.i386.rpm) = 4813f1e179b6f32e9f9dfd9b5f457691cdbea5760836b0632f72590d1542a765
+SIZE (rpm/i386/fedora/3/expat-1.95.7-4.i386.rpm) = 72430
+MD5 (rpm/i386/fedora/3/expat-1.95.7-4.src.rpm) = c19f23c94775596de6b706c02f1c7c19
+SHA256 (rpm/i386/fedora/3/expat-1.95.7-4.src.rpm) = def1d3bf277c557fe300cc595df9e13e2768c1e3836d3b31e831a42a6be99a19
+SIZE (rpm/i386/fedora/3/expat-1.95.7-4.src.rpm) = 302783
diff --git a/textproc/linux-expat/pkg-plist b/textproc/linux-expat/pkg-plist
new file mode 100644
index 000000000000..7c093e5588ed
--- /dev/null
+++ b/textproc/linux-expat/pkg-plist
@@ -0,0 +1,7 @@
+usr/bin/xmlwf
+usr/lib/libexpat.so.0
+usr/lib/libexpat.so.0.5.0
+usr/share/doc/expat-1.95.7/COPYING
+usr/share/doc/expat-1.95.7/README
+usr/share/man/man1/xmlwf.1.gz
+@dirrm usr/share/doc/expat-1.95.7
diff --git a/textproc/linux-f10-expat/Makefile b/textproc/linux-f10-expat/Makefile
index 796bd0f432f9..0811e595abe2 100644
--- a/textproc/linux-f10-expat/Makefile
+++ b/textproc/linux-f10-expat/Makefile
@@ -7,27 +7,18 @@
PORTNAME= expat
PORTVERSION= 1.95.7
-PORTREVISION= 0
+PORTREVISION= 1
CATEGORIES= textproc linux
-MASTER_SITES= ${MASTER_SITE_FEDORA_LINUX}
-MASTER_SITE_SUBDIR= 3/i386/os/Fedora/RPMS
+DISTNAME= ${PORTNAME}-${PORTVERSION}-4
MAINTAINER= freebsd-emulation@FreeBSD.org
COMMENT= Linux/i386 binary port of Expat XML-parsing library
-RUN_DEPENDS=
+BRANDELF_DIRS= usr/bin
-USE_LINUX= yes
+USE_LINUX_RPM= yes
+LINUX_DIST_VER= 3
ONLY_FOR_ARCHS= i386 amd64
-PLIST= ${WRKDIR}/plist
-RPM_SET= expat-${PORTVERSION}-4.i386.rpm
+INSTALLS_SHLIB= yes
-pre-install:
- ${RM} -rf ${WRKSRC}/tmp
- ${MKDIR} ${WRKSRC}/tmp
- cd ${WRKSRC}/tmp; \
- rpm2cpio < ${DISTDIR}/${DIST_SUBDIR}/${RPM_SET} | ${CPIO} -div; \
- ${FIND} * -type f -o -type l > ${PLIST}
- ${ECHO_CMD} @dirrm usr/share/doc/expat-${PORTVERSION} >> ${PLIST}
-
-.include "../../x11-toolkits/linux-gtk/Makefile"
+.include <bsd.port.mk>
diff --git a/textproc/linux-f10-expat/distinfo.i386 b/textproc/linux-f10-expat/distinfo.i386
index ce74e5c67c36..5ce242202a59 100644
--- a/textproc/linux-f10-expat/distinfo.i386
+++ b/textproc/linux-f10-expat/distinfo.i386
@@ -1,3 +1,6 @@
-MD5 (rpm/expat-1.95.7-4.i386.rpm) = 2df48545d73e0a20c56d8c727fa606a8
-SHA256 (rpm/expat-1.95.7-4.i386.rpm) = 4813f1e179b6f32e9f9dfd9b5f457691cdbea5760836b0632f72590d1542a765
-SIZE (rpm/expat-1.95.7-4.i386.rpm) = 72430
+MD5 (rpm/i386/fedora/3/expat-1.95.7-4.i386.rpm) = 2df48545d73e0a20c56d8c727fa606a8
+SHA256 (rpm/i386/fedora/3/expat-1.95.7-4.i386.rpm) = 4813f1e179b6f32e9f9dfd9b5f457691cdbea5760836b0632f72590d1542a765
+SIZE (rpm/i386/fedora/3/expat-1.95.7-4.i386.rpm) = 72430
+MD5 (rpm/i386/fedora/3/expat-1.95.7-4.src.rpm) = c19f23c94775596de6b706c02f1c7c19
+SHA256 (rpm/i386/fedora/3/expat-1.95.7-4.src.rpm) = def1d3bf277c557fe300cc595df9e13e2768c1e3836d3b31e831a42a6be99a19
+SIZE (rpm/i386/fedora/3/expat-1.95.7-4.src.rpm) = 302783
diff --git a/textproc/linux-f10-expat/pkg-plist b/textproc/linux-f10-expat/pkg-plist
new file mode 100644
index 000000000000..7c093e5588ed
--- /dev/null
+++ b/textproc/linux-f10-expat/pkg-plist
@@ -0,0 +1,7 @@
+usr/bin/xmlwf
+usr/lib/libexpat.so.0
+usr/lib/libexpat.so.0.5.0
+usr/share/doc/expat-1.95.7/COPYING
+usr/share/doc/expat-1.95.7/README
+usr/share/man/man1/xmlwf.1.gz
+@dirrm usr/share/doc/expat-1.95.7
diff --git a/textproc/linux-f10-libxml/Makefile b/textproc/linux-f10-libxml/Makefile
index 80f39d9b6cb5..a0406cbb878e 100644
--- a/textproc/linux-f10-libxml/Makefile
+++ b/textproc/linux-f10-libxml/Makefile
@@ -7,19 +7,16 @@
PORTNAME= libxml
PORTVERSION= 1.8.17
-PORTREVISION= 0
+PORTREVISION= 1
CATEGORIES= textproc linux
-MASTER_SITES= ${MASTER_SITE_FEDORA_LINUX}
-MASTER_SITE_SUBDIR= 3/i386/os/Fedora/RPMS 3/SRPMS
-
-.if defined(PACKAGE_BUILDING)
-SRC_DISTFILES+= libxml-${PORTVERSION}-11.src.rpm
-ALWAYS_KEEP_DISTFILES= yes
-.endif
+DISTNAME= ${PORTNAME}-${PORTVERSION}-11
MAINTAINER= freebsd-emulation@FreeBSD.org
COMMENT= RPM of libxml
-RPM_SET= libxml-${PORTVERSION}-11.${ARCH}.rpm
+USE_LINUX_RPM= yes
+LINUX_DIST_VER= 3
+INSTALLS_SHLIB= yes
+PLIST= pkg-plist.${LINUX_RPM_ARCH}
-.include "../../x11-toolkits/linux-gtk/Makefile"
+.include <bsd.port.mk>
diff --git a/textproc/linux-f10-libxml/distinfo.alpha b/textproc/linux-f10-libxml/distinfo.alpha
deleted file mode 100644
index 9f44b61d207f..000000000000
--- a/textproc/linux-f10-libxml/distinfo.alpha
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 (rpm/libxml-1.8.10-1.alpha.rpm) = 1ab67e6081335f42063e3679e22045ed
-SIZE (rpm/libxml-1.8.10-1.alpha.rpm) = 335002
diff --git a/textproc/linux-f10-libxml/distinfo.i386 b/textproc/linux-f10-libxml/distinfo.i386
index 95ab112aa696..3f0b7b6ad7d7 100644
--- a/textproc/linux-f10-libxml/distinfo.i386
+++ b/textproc/linux-f10-libxml/distinfo.i386
@@ -1,6 +1,6 @@
-MD5 (rpm/libxml-1.8.17-11.i386.rpm) = b77a67a91be77b194f70a4e0c9a971ca
-SHA256 (rpm/libxml-1.8.17-11.i386.rpm) = 3b9b5aa206fceeda517832ef2d9044cb5b820006ee57834c904bec555843dd96
-SIZE (rpm/libxml-1.8.17-11.i386.rpm) = 224401
-MD5 (rpm/libxml-1.8.17-11.src.rpm) = 7d1ce664464aa7da9fa8c42b6945d9f1
-SHA256 (rpm/libxml-1.8.17-11.src.rpm) = f5745439d9c0a5763bc67aad98ece45cf898f35bf2cc33961edbb920bdae5ede
-SIZE (rpm/libxml-1.8.17-11.src.rpm) = 1001245
+MD5 (rpm/i386/fedora/3/libxml-1.8.17-11.i386.rpm) = b77a67a91be77b194f70a4e0c9a971ca
+SHA256 (rpm/i386/fedora/3/libxml-1.8.17-11.i386.rpm) = 3b9b5aa206fceeda517832ef2d9044cb5b820006ee57834c904bec555843dd96
+SIZE (rpm/i386/fedora/3/libxml-1.8.17-11.i386.rpm) = 224401
+MD5 (rpm/i386/fedora/3/libxml-1.8.17-11.src.rpm) = 7d1ce664464aa7da9fa8c42b6945d9f1
+SHA256 (rpm/i386/fedora/3/libxml-1.8.17-11.src.rpm) = f5745439d9c0a5763bc67aad98ece45cf898f35bf2cc33961edbb920bdae5ede
+SIZE (rpm/i386/fedora/3/libxml-1.8.17-11.src.rpm) = 1001245
diff --git a/textproc/linux-f10-libxml/pkg-plist.alpha b/textproc/linux-f10-libxml/pkg-plist.alpha
deleted file mode 100644
index 1eae478b1532..000000000000
--- a/textproc/linux-f10-libxml/pkg-plist.alpha
+++ /dev/null
@@ -1,32 +0,0 @@
-usr/lib/libxml.so.1.8.10
-usr/share/doc/libxml-1.8.10/AUTHORS
-usr/share/doc/libxml-1.8.10/COPYING
-usr/share/doc/libxml-1.8.10/COPYING.LIB
-usr/share/doc/libxml-1.8.10/ChangeLog
-usr/share/doc/libxml-1.8.10/NEWS
-usr/share/doc/libxml-1.8.10/README
-usr/share/doc/libxml-1.8.10/TODO
-usr/share/doc/libxml-1.8.10/html/book1.html
-usr/share/doc/libxml-1.8.10/html/gnome-xml-debugxml.html
-usr/share/doc/libxml-1.8.10/html/gnome-xml-encoding.html
-usr/share/doc/libxml-1.8.10/html/gnome-xml-entities.html
-usr/share/doc/libxml-1.8.10/html/gnome-xml-error.html
-usr/share/doc/libxml-1.8.10/html/gnome-xml-htmlparser.html
-usr/share/doc/libxml-1.8.10/html/gnome-xml-htmltree.html
-usr/share/doc/libxml-1.8.10/html/gnome-xml-nanoftp.html
-usr/share/doc/libxml-1.8.10/html/gnome-xml-nanohttp.html
-usr/share/doc/libxml-1.8.10/html/gnome-xml-parser.html
-usr/share/doc/libxml-1.8.10/html/gnome-xml-parserinternals.html
-usr/share/doc/libxml-1.8.10/html/gnome-xml-sax.html
-usr/share/doc/libxml-1.8.10/html/gnome-xml-tree.html
-usr/share/doc/libxml-1.8.10/html/gnome-xml-valid.html
-usr/share/doc/libxml-1.8.10/html/gnome-xml-xml-error.html
-usr/share/doc/libxml-1.8.10/html/gnome-xml-xmlio.html
-usr/share/doc/libxml-1.8.10/html/gnome-xml-xmlmemory.html
-usr/share/doc/libxml-1.8.10/html/gnome-xml-xpath.html
-usr/share/doc/libxml-1.8.10/html/index.sgml
-usr/share/doc/libxml-1.8.10/html/libxml-lib.html
-usr/share/doc/libxml-1.8.10/html/libxml-notes.html
-usr/lib/libxml.so.1
-@dirrm usr/share/doc/libxml-1.8.10/html
-@dirrm usr/share/doc/libxml-1.8.10
diff --git a/textproc/linux-f10-libxml2/Makefile b/textproc/linux-f10-libxml2/Makefile
index 80f39d9b6cb5..a0406cbb878e 100644
--- a/textproc/linux-f10-libxml2/Makefile
+++ b/textproc/linux-f10-libxml2/Makefile
@@ -7,19 +7,16 @@
PORTNAME= libxml
PORTVERSION= 1.8.17
-PORTREVISION= 0
+PORTREVISION= 1
CATEGORIES= textproc linux
-MASTER_SITES= ${MASTER_SITE_FEDORA_LINUX}
-MASTER_SITE_SUBDIR= 3/i386/os/Fedora/RPMS 3/SRPMS
-
-.if defined(PACKAGE_BUILDING)
-SRC_DISTFILES+= libxml-${PORTVERSION}-11.src.rpm
-ALWAYS_KEEP_DISTFILES= yes
-.endif
+DISTNAME= ${PORTNAME}-${PORTVERSION}-11
MAINTAINER= freebsd-emulation@FreeBSD.org
COMMENT= RPM of libxml
-RPM_SET= libxml-${PORTVERSION}-11.${ARCH}.rpm
+USE_LINUX_RPM= yes
+LINUX_DIST_VER= 3
+INSTALLS_SHLIB= yes
+PLIST= pkg-plist.${LINUX_RPM_ARCH}
-.include "../../x11-toolkits/linux-gtk/Makefile"
+.include <bsd.port.mk>
diff --git a/textproc/linux-f10-libxml2/distinfo.alpha b/textproc/linux-f10-libxml2/distinfo.alpha
deleted file mode 100644
index 9f44b61d207f..000000000000
--- a/textproc/linux-f10-libxml2/distinfo.alpha
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 (rpm/libxml-1.8.10-1.alpha.rpm) = 1ab67e6081335f42063e3679e22045ed
-SIZE (rpm/libxml-1.8.10-1.alpha.rpm) = 335002
diff --git a/textproc/linux-f10-libxml2/distinfo.i386 b/textproc/linux-f10-libxml2/distinfo.i386
index 95ab112aa696..3f0b7b6ad7d7 100644
--- a/textproc/linux-f10-libxml2/distinfo.i386
+++ b/textproc/linux-f10-libxml2/distinfo.i386
@@ -1,6 +1,6 @@
-MD5 (rpm/libxml-1.8.17-11.i386.rpm) = b77a67a91be77b194f70a4e0c9a971ca
-SHA256 (rpm/libxml-1.8.17-11.i386.rpm) = 3b9b5aa206fceeda517832ef2d9044cb5b820006ee57834c904bec555843dd96
-SIZE (rpm/libxml-1.8.17-11.i386.rpm) = 224401
-MD5 (rpm/libxml-1.8.17-11.src.rpm) = 7d1ce664464aa7da9fa8c42b6945d9f1
-SHA256 (rpm/libxml-1.8.17-11.src.rpm) = f5745439d9c0a5763bc67aad98ece45cf898f35bf2cc33961edbb920bdae5ede
-SIZE (rpm/libxml-1.8.17-11.src.rpm) = 1001245
+MD5 (rpm/i386/fedora/3/libxml-1.8.17-11.i386.rpm) = b77a67a91be77b194f70a4e0c9a971ca
+SHA256 (rpm/i386/fedora/3/libxml-1.8.17-11.i386.rpm) = 3b9b5aa206fceeda517832ef2d9044cb5b820006ee57834c904bec555843dd96
+SIZE (rpm/i386/fedora/3/libxml-1.8.17-11.i386.rpm) = 224401
+MD5 (rpm/i386/fedora/3/libxml-1.8.17-11.src.rpm) = 7d1ce664464aa7da9fa8c42b6945d9f1
+SHA256 (rpm/i386/fedora/3/libxml-1.8.17-11.src.rpm) = f5745439d9c0a5763bc67aad98ece45cf898f35bf2cc33961edbb920bdae5ede
+SIZE (rpm/i386/fedora/3/libxml-1.8.17-11.src.rpm) = 1001245
diff --git a/textproc/linux-f10-libxml2/pkg-plist.alpha b/textproc/linux-f10-libxml2/pkg-plist.alpha
deleted file mode 100644
index 1eae478b1532..000000000000
--- a/textproc/linux-f10-libxml2/pkg-plist.alpha
+++ /dev/null
@@ -1,32 +0,0 @@
-usr/lib/libxml.so.1.8.10
-usr/share/doc/libxml-1.8.10/AUTHORS
-usr/share/doc/libxml-1.8.10/COPYING
-usr/share/doc/libxml-1.8.10/COPYING.LIB
-usr/share/doc/libxml-1.8.10/ChangeLog
-usr/share/doc/libxml-1.8.10/NEWS
-usr/share/doc/libxml-1.8.10/README
-usr/share/doc/libxml-1.8.10/TODO
-usr/share/doc/libxml-1.8.10/html/book1.html
-usr/share/doc/libxml-1.8.10/html/gnome-xml-debugxml.html
-usr/share/doc/libxml-1.8.10/html/gnome-xml-encoding.html
-usr/share/doc/libxml-1.8.10/html/gnome-xml-entities.html
-usr/share/doc/libxml-1.8.10/html/gnome-xml-error.html
-usr/share/doc/libxml-1.8.10/html/gnome-xml-htmlparser.html
-usr/share/doc/libxml-1.8.10/html/gnome-xml-htmltree.html
-usr/share/doc/libxml-1.8.10/html/gnome-xml-nanoftp.html
-usr/share/doc/libxml-1.8.10/html/gnome-xml-nanohttp.html
-usr/share/doc/libxml-1.8.10/html/gnome-xml-parser.html
-usr/share/doc/libxml-1.8.10/html/gnome-xml-parserinternals.html
-usr/share/doc/libxml-1.8.10/html/gnome-xml-sax.html
-usr/share/doc/libxml-1.8.10/html/gnome-xml-tree.html
-usr/share/doc/libxml-1.8.10/html/gnome-xml-valid.html
-usr/share/doc/libxml-1.8.10/html/gnome-xml-xml-error.html
-usr/share/doc/libxml-1.8.10/html/gnome-xml-xmlio.html
-usr/share/doc/libxml-1.8.10/html/gnome-xml-xmlmemory.html
-usr/share/doc/libxml-1.8.10/html/gnome-xml-xpath.html
-usr/share/doc/libxml-1.8.10/html/index.sgml
-usr/share/doc/libxml-1.8.10/html/libxml-lib.html
-usr/share/doc/libxml-1.8.10/html/libxml-notes.html
-usr/lib/libxml.so.1
-@dirrm usr/share/doc/libxml-1.8.10/html
-@dirrm usr/share/doc/libxml-1.8.10
diff --git a/textproc/linux-f8-expat/Makefile b/textproc/linux-f8-expat/Makefile
index 796bd0f432f9..0811e595abe2 100644
--- a/textproc/linux-f8-expat/Makefile
+++ b/textproc/linux-f8-expat/Makefile
@@ -7,27 +7,18 @@
PORTNAME= expat
PORTVERSION= 1.95.7
-PORTREVISION= 0
+PORTREVISION= 1
CATEGORIES= textproc linux
-MASTER_SITES= ${MASTER_SITE_FEDORA_LINUX}
-MASTER_SITE_SUBDIR= 3/i386/os/Fedora/RPMS
+DISTNAME= ${PORTNAME}-${PORTVERSION}-4
MAINTAINER= freebsd-emulation@FreeBSD.org
COMMENT= Linux/i386 binary port of Expat XML-parsing library
-RUN_DEPENDS=
+BRANDELF_DIRS= usr/bin
-USE_LINUX= yes
+USE_LINUX_RPM= yes
+LINUX_DIST_VER= 3
ONLY_FOR_ARCHS= i386 amd64
-PLIST= ${WRKDIR}/plist
-RPM_SET= expat-${PORTVERSION}-4.i386.rpm
+INSTALLS_SHLIB= yes
-pre-install:
- ${RM} -rf ${WRKSRC}/tmp
- ${MKDIR} ${WRKSRC}/tmp
- cd ${WRKSRC}/tmp; \
- rpm2cpio < ${DISTDIR}/${DIST_SUBDIR}/${RPM_SET} | ${CPIO} -div; \
- ${FIND} * -type f -o -type l > ${PLIST}
- ${ECHO_CMD} @dirrm usr/share/doc/expat-${PORTVERSION} >> ${PLIST}
-
-.include "../../x11-toolkits/linux-gtk/Makefile"
+.include <bsd.port.mk>
diff --git a/textproc/linux-f8-expat/distinfo.i386 b/textproc/linux-f8-expat/distinfo.i386
index ce74e5c67c36..5ce242202a59 100644
--- a/textproc/linux-f8-expat/distinfo.i386
+++ b/textproc/linux-f8-expat/distinfo.i386
@@ -1,3 +1,6 @@
-MD5 (rpm/expat-1.95.7-4.i386.rpm) = 2df48545d73e0a20c56d8c727fa606a8
-SHA256 (rpm/expat-1.95.7-4.i386.rpm) = 4813f1e179b6f32e9f9dfd9b5f457691cdbea5760836b0632f72590d1542a765
-SIZE (rpm/expat-1.95.7-4.i386.rpm) = 72430
+MD5 (rpm/i386/fedora/3/expat-1.95.7-4.i386.rpm) = 2df48545d73e0a20c56d8c727fa606a8
+SHA256 (rpm/i386/fedora/3/expat-1.95.7-4.i386.rpm) = 4813f1e179b6f32e9f9dfd9b5f457691cdbea5760836b0632f72590d1542a765
+SIZE (rpm/i386/fedora/3/expat-1.95.7-4.i386.rpm) = 72430
+MD5 (rpm/i386/fedora/3/expat-1.95.7-4.src.rpm) = c19f23c94775596de6b706c02f1c7c19
+SHA256 (rpm/i386/fedora/3/expat-1.95.7-4.src.rpm) = def1d3bf277c557fe300cc595df9e13e2768c1e3836d3b31e831a42a6be99a19
+SIZE (rpm/i386/fedora/3/expat-1.95.7-4.src.rpm) = 302783
diff --git a/textproc/linux-f8-expat/pkg-plist b/textproc/linux-f8-expat/pkg-plist
new file mode 100644
index 000000000000..7c093e5588ed
--- /dev/null
+++ b/textproc/linux-f8-expat/pkg-plist
@@ -0,0 +1,7 @@
+usr/bin/xmlwf
+usr/lib/libexpat.so.0
+usr/lib/libexpat.so.0.5.0
+usr/share/doc/expat-1.95.7/COPYING
+usr/share/doc/expat-1.95.7/README
+usr/share/man/man1/xmlwf.1.gz
+@dirrm usr/share/doc/expat-1.95.7
diff --git a/textproc/linux-f8-libxml/Makefile b/textproc/linux-f8-libxml/Makefile
index 80f39d9b6cb5..a0406cbb878e 100644
--- a/textproc/linux-f8-libxml/Makefile
+++ b/textproc/linux-f8-libxml/Makefile
@@ -7,19 +7,16 @@
PORTNAME= libxml
PORTVERSION= 1.8.17
-PORTREVISION= 0
+PORTREVISION= 1
CATEGORIES= textproc linux
-MASTER_SITES= ${MASTER_SITE_FEDORA_LINUX}
-MASTER_SITE_SUBDIR= 3/i386/os/Fedora/RPMS 3/SRPMS
-
-.if defined(PACKAGE_BUILDING)
-SRC_DISTFILES+= libxml-${PORTVERSION}-11.src.rpm
-ALWAYS_KEEP_DISTFILES= yes
-.endif
+DISTNAME= ${PORTNAME}-${PORTVERSION}-11
MAINTAINER= freebsd-emulation@FreeBSD.org
COMMENT= RPM of libxml
-RPM_SET= libxml-${PORTVERSION}-11.${ARCH}.rpm
+USE_LINUX_RPM= yes
+LINUX_DIST_VER= 3
+INSTALLS_SHLIB= yes
+PLIST= pkg-plist.${LINUX_RPM_ARCH}
-.include "../../x11-toolkits/linux-gtk/Makefile"
+.include <bsd.port.mk>
diff --git a/textproc/linux-f8-libxml/distinfo.alpha b/textproc/linux-f8-libxml/distinfo.alpha
deleted file mode 100644
index 9f44b61d207f..000000000000
--- a/textproc/linux-f8-libxml/distinfo.alpha
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 (rpm/libxml-1.8.10-1.alpha.rpm) = 1ab67e6081335f42063e3679e22045ed
-SIZE (rpm/libxml-1.8.10-1.alpha.rpm) = 335002
diff --git a/textproc/linux-f8-libxml/distinfo.i386 b/textproc/linux-f8-libxml/distinfo.i386
index 95ab112aa696..3f0b7b6ad7d7 100644
--- a/textproc/linux-f8-libxml/distinfo.i386
+++ b/textproc/linux-f8-libxml/distinfo.i386
@@ -1,6 +1,6 @@
-MD5 (rpm/libxml-1.8.17-11.i386.rpm) = b77a67a91be77b194f70a4e0c9a971ca
-SHA256 (rpm/libxml-1.8.17-11.i386.rpm) = 3b9b5aa206fceeda517832ef2d9044cb5b820006ee57834c904bec555843dd96
-SIZE (rpm/libxml-1.8.17-11.i386.rpm) = 224401
-MD5 (rpm/libxml-1.8.17-11.src.rpm) = 7d1ce664464aa7da9fa8c42b6945d9f1
-SHA256 (rpm/libxml-1.8.17-11.src.rpm) = f5745439d9c0a5763bc67aad98ece45cf898f35bf2cc33961edbb920bdae5ede
-SIZE (rpm/libxml-1.8.17-11.src.rpm) = 1001245
+MD5 (rpm/i386/fedora/3/libxml-1.8.17-11.i386.rpm) = b77a67a91be77b194f70a4e0c9a971ca
+SHA256 (rpm/i386/fedora/3/libxml-1.8.17-11.i386.rpm) = 3b9b5aa206fceeda517832ef2d9044cb5b820006ee57834c904bec555843dd96
+SIZE (rpm/i386/fedora/3/libxml-1.8.17-11.i386.rpm) = 224401
+MD5 (rpm/i386/fedora/3/libxml-1.8.17-11.src.rpm) = 7d1ce664464aa7da9fa8c42b6945d9f1
+SHA256 (rpm/i386/fedora/3/libxml-1.8.17-11.src.rpm) = f5745439d9c0a5763bc67aad98ece45cf898f35bf2cc33961edbb920bdae5ede
+SIZE (rpm/i386/fedora/3/libxml-1.8.17-11.src.rpm) = 1001245
diff --git a/textproc/linux-f8-libxml/pkg-plist.alpha b/textproc/linux-f8-libxml/pkg-plist.alpha
deleted file mode 100644
index 1eae478b1532..000000000000
--- a/textproc/linux-f8-libxml/pkg-plist.alpha
+++ /dev/null
@@ -1,32 +0,0 @@
-usr/lib/libxml.so.1.8.10
-usr/share/doc/libxml-1.8.10/AUTHORS
-usr/share/doc/libxml-1.8.10/COPYING
-usr/share/doc/libxml-1.8.10/COPYING.LIB
-usr/share/doc/libxml-1.8.10/ChangeLog
-usr/share/doc/libxml-1.8.10/NEWS
-usr/share/doc/libxml-1.8.10/README
-usr/share/doc/libxml-1.8.10/TODO
-usr/share/doc/libxml-1.8.10/html/book1.html
-usr/share/doc/libxml-1.8.10/html/gnome-xml-debugxml.html
-usr/share/doc/libxml-1.8.10/html/gnome-xml-encoding.html
-usr/share/doc/libxml-1.8.10/html/gnome-xml-entities.html
-usr/share/doc/libxml-1.8.10/html/gnome-xml-error.html
-usr/share/doc/libxml-1.8.10/html/gnome-xml-htmlparser.html
-usr/share/doc/libxml-1.8.10/html/gnome-xml-htmltree.html
-usr/share/doc/libxml-1.8.10/html/gnome-xml-nanoftp.html
-usr/share/doc/libxml-1.8.10/html/gnome-xml-nanohttp.html
-usr/share/doc/libxml-1.8.10/html/gnome-xml-parser.html
-usr/share/doc/libxml-1.8.10/html/gnome-xml-parserinternals.html
-usr/share/doc/libxml-1.8.10/html/gnome-xml-sax.html
-usr/share/doc/libxml-1.8.10/html/gnome-xml-tree.html
-usr/share/doc/libxml-1.8.10/html/gnome-xml-valid.html
-usr/share/doc/libxml-1.8.10/html/gnome-xml-xml-error.html
-usr/share/doc/libxml-1.8.10/html/gnome-xml-xmlio.html
-usr/share/doc/libxml-1.8.10/html/gnome-xml-xmlmemory.html
-usr/share/doc/libxml-1.8.10/html/gnome-xml-xpath.html
-usr/share/doc/libxml-1.8.10/html/index.sgml
-usr/share/doc/libxml-1.8.10/html/libxml-lib.html
-usr/share/doc/libxml-1.8.10/html/libxml-notes.html
-usr/lib/libxml.so.1
-@dirrm usr/share/doc/libxml-1.8.10/html
-@dirrm usr/share/doc/libxml-1.8.10
diff --git a/textproc/linux-f8-libxml2/Makefile b/textproc/linux-f8-libxml2/Makefile
index 80f39d9b6cb5..a0406cbb878e 100644
--- a/textproc/linux-f8-libxml2/Makefile
+++ b/textproc/linux-f8-libxml2/Makefile
@@ -7,19 +7,16 @@
PORTNAME= libxml
PORTVERSION= 1.8.17
-PORTREVISION= 0
+PORTREVISION= 1
CATEGORIES= textproc linux
-MASTER_SITES= ${MASTER_SITE_FEDORA_LINUX}
-MASTER_SITE_SUBDIR= 3/i386/os/Fedora/RPMS 3/SRPMS
-
-.if defined(PACKAGE_BUILDING)
-SRC_DISTFILES+= libxml-${PORTVERSION}-11.src.rpm
-ALWAYS_KEEP_DISTFILES= yes
-.endif
+DISTNAME= ${PORTNAME}-${PORTVERSION}-11
MAINTAINER= freebsd-emulation@FreeBSD.org
COMMENT= RPM of libxml
-RPM_SET= libxml-${PORTVERSION}-11.${ARCH}.rpm
+USE_LINUX_RPM= yes
+LINUX_DIST_VER= 3
+INSTALLS_SHLIB= yes
+PLIST= pkg-plist.${LINUX_RPM_ARCH}
-.include "../../x11-toolkits/linux-gtk/Makefile"
+.include <bsd.port.mk>
diff --git a/textproc/linux-f8-libxml2/distinfo.alpha b/textproc/linux-f8-libxml2/distinfo.alpha
deleted file mode 100644
index 9f44b61d207f..000000000000
--- a/textproc/linux-f8-libxml2/distinfo.alpha
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 (rpm/libxml-1.8.10-1.alpha.rpm) = 1ab67e6081335f42063e3679e22045ed
-SIZE (rpm/libxml-1.8.10-1.alpha.rpm) = 335002
diff --git a/textproc/linux-f8-libxml2/distinfo.i386 b/textproc/linux-f8-libxml2/distinfo.i386
index 95ab112aa696..3f0b7b6ad7d7 100644
--- a/textproc/linux-f8-libxml2/distinfo.i386
+++ b/textproc/linux-f8-libxml2/distinfo.i386
@@ -1,6 +1,6 @@
-MD5 (rpm/libxml-1.8.17-11.i386.rpm) = b77a67a91be77b194f70a4e0c9a971ca
-SHA256 (rpm/libxml-1.8.17-11.i386.rpm) = 3b9b5aa206fceeda517832ef2d9044cb5b820006ee57834c904bec555843dd96
-SIZE (rpm/libxml-1.8.17-11.i386.rpm) = 224401
-MD5 (rpm/libxml-1.8.17-11.src.rpm) = 7d1ce664464aa7da9fa8c42b6945d9f1
-SHA256 (rpm/libxml-1.8.17-11.src.rpm) = f5745439d9c0a5763bc67aad98ece45cf898f35bf2cc33961edbb920bdae5ede
-SIZE (rpm/libxml-1.8.17-11.src.rpm) = 1001245
+MD5 (rpm/i386/fedora/3/libxml-1.8.17-11.i386.rpm) = b77a67a91be77b194f70a4e0c9a971ca
+SHA256 (rpm/i386/fedora/3/libxml-1.8.17-11.i386.rpm) = 3b9b5aa206fceeda517832ef2d9044cb5b820006ee57834c904bec555843dd96
+SIZE (rpm/i386/fedora/3/libxml-1.8.17-11.i386.rpm) = 224401
+MD5 (rpm/i386/fedora/3/libxml-1.8.17-11.src.rpm) = 7d1ce664464aa7da9fa8c42b6945d9f1
+SHA256 (rpm/i386/fedora/3/libxml-1.8.17-11.src.rpm) = f5745439d9c0a5763bc67aad98ece45cf898f35bf2cc33961edbb920bdae5ede
+SIZE (rpm/i386/fedora/3/libxml-1.8.17-11.src.rpm) = 1001245
diff --git a/textproc/linux-f8-libxml2/pkg-plist.alpha b/textproc/linux-f8-libxml2/pkg-plist.alpha
deleted file mode 100644
index 1eae478b1532..000000000000
--- a/textproc/linux-f8-libxml2/pkg-plist.alpha
+++ /dev/null
@@ -1,32 +0,0 @@
-usr/lib/libxml.so.1.8.10
-usr/share/doc/libxml-1.8.10/AUTHORS
-usr/share/doc/libxml-1.8.10/COPYING
-usr/share/doc/libxml-1.8.10/COPYING.LIB
-usr/share/doc/libxml-1.8.10/ChangeLog
-usr/share/doc/libxml-1.8.10/NEWS
-usr/share/doc/libxml-1.8.10/README
-usr/share/doc/libxml-1.8.10/TODO
-usr/share/doc/libxml-1.8.10/html/book1.html
-usr/share/doc/libxml-1.8.10/html/gnome-xml-debugxml.html
-usr/share/doc/libxml-1.8.10/html/gnome-xml-encoding.html
-usr/share/doc/libxml-1.8.10/html/gnome-xml-entities.html
-usr/share/doc/libxml-1.8.10/html/gnome-xml-error.html
-usr/share/doc/libxml-1.8.10/html/gnome-xml-htmlparser.html
-usr/share/doc/libxml-1.8.10/html/gnome-xml-htmltree.html
-usr/share/doc/libxml-1.8.10/html/gnome-xml-nanoftp.html
-usr/share/doc/libxml-1.8.10/html/gnome-xml-nanohttp.html
-usr/share/doc/libxml-1.8.10/html/gnome-xml-parser.html
-usr/share/doc/libxml-1.8.10/html/gnome-xml-parserinternals.html
-usr/share/doc/libxml-1.8.10/html/gnome-xml-sax.html
-usr/share/doc/libxml-1.8.10/html/gnome-xml-tree.html
-usr/share/doc/libxml-1.8.10/html/gnome-xml-valid.html
-usr/share/doc/libxml-1.8.10/html/gnome-xml-xml-error.html
-usr/share/doc/libxml-1.8.10/html/gnome-xml-xmlio.html
-usr/share/doc/libxml-1.8.10/html/gnome-xml-xmlmemory.html
-usr/share/doc/libxml-1.8.10/html/gnome-xml-xpath.html
-usr/share/doc/libxml-1.8.10/html/index.sgml
-usr/share/doc/libxml-1.8.10/html/libxml-lib.html
-usr/share/doc/libxml-1.8.10/html/libxml-notes.html
-usr/lib/libxml.so.1
-@dirrm usr/share/doc/libxml-1.8.10/html
-@dirrm usr/share/doc/libxml-1.8.10
diff --git a/textproc/linux-libxml/Makefile b/textproc/linux-libxml/Makefile
index 80f39d9b6cb5..a0406cbb878e 100644
--- a/textproc/linux-libxml/Makefile
+++ b/textproc/linux-libxml/Makefile
@@ -7,19 +7,16 @@
PORTNAME= libxml
PORTVERSION= 1.8.17
-PORTREVISION= 0
+PORTREVISION= 1
CATEGORIES= textproc linux
-MASTER_SITES= ${MASTER_SITE_FEDORA_LINUX}
-MASTER_SITE_SUBDIR= 3/i386/os/Fedora/RPMS 3/SRPMS
-
-.if defined(PACKAGE_BUILDING)
-SRC_DISTFILES+= libxml-${PORTVERSION}-11.src.rpm
-ALWAYS_KEEP_DISTFILES= yes
-.endif
+DISTNAME= ${PORTNAME}-${PORTVERSION}-11
MAINTAINER= freebsd-emulation@FreeBSD.org
COMMENT= RPM of libxml
-RPM_SET= libxml-${PORTVERSION}-11.${ARCH}.rpm
+USE_LINUX_RPM= yes
+LINUX_DIST_VER= 3
+INSTALLS_SHLIB= yes
+PLIST= pkg-plist.${LINUX_RPM_ARCH}
-.include "../../x11-toolkits/linux-gtk/Makefile"
+.include <bsd.port.mk>
diff --git a/textproc/linux-libxml/distinfo.alpha b/textproc/linux-libxml/distinfo.alpha
deleted file mode 100644
index 9f44b61d207f..000000000000
--- a/textproc/linux-libxml/distinfo.alpha
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 (rpm/libxml-1.8.10-1.alpha.rpm) = 1ab67e6081335f42063e3679e22045ed
-SIZE (rpm/libxml-1.8.10-1.alpha.rpm) = 335002
diff --git a/textproc/linux-libxml/distinfo.i386 b/textproc/linux-libxml/distinfo.i386
index 95ab112aa696..3f0b7b6ad7d7 100644
--- a/textproc/linux-libxml/distinfo.i386
+++ b/textproc/linux-libxml/distinfo.i386
@@ -1,6 +1,6 @@
-MD5 (rpm/libxml-1.8.17-11.i386.rpm) = b77a67a91be77b194f70a4e0c9a971ca
-SHA256 (rpm/libxml-1.8.17-11.i386.rpm) = 3b9b5aa206fceeda517832ef2d9044cb5b820006ee57834c904bec555843dd96
-SIZE (rpm/libxml-1.8.17-11.i386.rpm) = 224401
-MD5 (rpm/libxml-1.8.17-11.src.rpm) = 7d1ce664464aa7da9fa8c42b6945d9f1
-SHA256 (rpm/libxml-1.8.17-11.src.rpm) = f5745439d9c0a5763bc67aad98ece45cf898f35bf2cc33961edbb920bdae5ede
-SIZE (rpm/libxml-1.8.17-11.src.rpm) = 1001245
+MD5 (rpm/i386/fedora/3/libxml-1.8.17-11.i386.rpm) = b77a67a91be77b194f70a4e0c9a971ca
+SHA256 (rpm/i386/fedora/3/libxml-1.8.17-11.i386.rpm) = 3b9b5aa206fceeda517832ef2d9044cb5b820006ee57834c904bec555843dd96
+SIZE (rpm/i386/fedora/3/libxml-1.8.17-11.i386.rpm) = 224401
+MD5 (rpm/i386/fedora/3/libxml-1.8.17-11.src.rpm) = 7d1ce664464aa7da9fa8c42b6945d9f1
+SHA256 (rpm/i386/fedora/3/libxml-1.8.17-11.src.rpm) = f5745439d9c0a5763bc67aad98ece45cf898f35bf2cc33961edbb920bdae5ede
+SIZE (rpm/i386/fedora/3/libxml-1.8.17-11.src.rpm) = 1001245
diff --git a/textproc/linux-libxml/pkg-plist.alpha b/textproc/linux-libxml/pkg-plist.alpha
deleted file mode 100644
index 1eae478b1532..000000000000
--- a/textproc/linux-libxml/pkg-plist.alpha
+++ /dev/null
@@ -1,32 +0,0 @@
-usr/lib/libxml.so.1.8.10
-usr/share/doc/libxml-1.8.10/AUTHORS
-usr/share/doc/libxml-1.8.10/COPYING
-usr/share/doc/libxml-1.8.10/COPYING.LIB
-usr/share/doc/libxml-1.8.10/ChangeLog
-usr/share/doc/libxml-1.8.10/NEWS
-usr/share/doc/libxml-1.8.10/README
-usr/share/doc/libxml-1.8.10/TODO
-usr/share/doc/libxml-1.8.10/html/book1.html
-usr/share/doc/libxml-1.8.10/html/gnome-xml-debugxml.html
-usr/share/doc/libxml-1.8.10/html/gnome-xml-encoding.html
-usr/share/doc/libxml-1.8.10/html/gnome-xml-entities.html
-usr/share/doc/libxml-1.8.10/html/gnome-xml-error.html
-usr/share/doc/libxml-1.8.10/html/gnome-xml-htmlparser.html
-usr/share/doc/libxml-1.8.10/html/gnome-xml-htmltree.html
-usr/share/doc/libxml-1.8.10/html/gnome-xml-nanoftp.html
-usr/share/doc/libxml-1.8.10/html/gnome-xml-nanohttp.html
-usr/share/doc/libxml-1.8.10/html/gnome-xml-parser.html
-usr/share/doc/libxml-1.8.10/html/gnome-xml-parserinternals.html
-usr/share/doc/libxml-1.8.10/html/gnome-xml-sax.html
-usr/share/doc/libxml-1.8.10/html/gnome-xml-tree.html
-usr/share/doc/libxml-1.8.10/html/gnome-xml-valid.html
-usr/share/doc/libxml-1.8.10/html/gnome-xml-xml-error.html
-usr/share/doc/libxml-1.8.10/html/gnome-xml-xmlio.html
-usr/share/doc/libxml-1.8.10/html/gnome-xml-xmlmemory.html
-usr/share/doc/libxml-1.8.10/html/gnome-xml-xpath.html
-usr/share/doc/libxml-1.8.10/html/index.sgml
-usr/share/doc/libxml-1.8.10/html/libxml-lib.html
-usr/share/doc/libxml-1.8.10/html/libxml-notes.html
-usr/lib/libxml.so.1
-@dirrm usr/share/doc/libxml-1.8.10/html
-@dirrm usr/share/doc/libxml-1.8.10
diff --git a/textproc/linux-libxml2/Makefile b/textproc/linux-libxml2/Makefile
index 80f39d9b6cb5..a0406cbb878e 100644
--- a/textproc/linux-libxml2/Makefile
+++ b/textproc/linux-libxml2/Makefile
@@ -7,19 +7,16 @@
PORTNAME= libxml
PORTVERSION= 1.8.17
-PORTREVISION= 0
+PORTREVISION= 1
CATEGORIES= textproc linux
-MASTER_SITES= ${MASTER_SITE_FEDORA_LINUX}
-MASTER_SITE_SUBDIR= 3/i386/os/Fedora/RPMS 3/SRPMS
-
-.if defined(PACKAGE_BUILDING)
-SRC_DISTFILES+= libxml-${PORTVERSION}-11.src.rpm
-ALWAYS_KEEP_DISTFILES= yes
-.endif
+DISTNAME= ${PORTNAME}-${PORTVERSION}-11
MAINTAINER= freebsd-emulation@FreeBSD.org
COMMENT= RPM of libxml
-RPM_SET= libxml-${PORTVERSION}-11.${ARCH}.rpm
+USE_LINUX_RPM= yes
+LINUX_DIST_VER= 3
+INSTALLS_SHLIB= yes
+PLIST= pkg-plist.${LINUX_RPM_ARCH}
-.include "../../x11-toolkits/linux-gtk/Makefile"
+.include <bsd.port.mk>
diff --git a/textproc/linux-libxml2/distinfo.alpha b/textproc/linux-libxml2/distinfo.alpha
deleted file mode 100644
index 9f44b61d207f..000000000000
--- a/textproc/linux-libxml2/distinfo.alpha
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 (rpm/libxml-1.8.10-1.alpha.rpm) = 1ab67e6081335f42063e3679e22045ed
-SIZE (rpm/libxml-1.8.10-1.alpha.rpm) = 335002
diff --git a/textproc/linux-libxml2/distinfo.i386 b/textproc/linux-libxml2/distinfo.i386
index 95ab112aa696..3f0b7b6ad7d7 100644
--- a/textproc/linux-libxml2/distinfo.i386
+++ b/textproc/linux-libxml2/distinfo.i386
@@ -1,6 +1,6 @@
-MD5 (rpm/libxml-1.8.17-11.i386.rpm) = b77a67a91be77b194f70a4e0c9a971ca
-SHA256 (rpm/libxml-1.8.17-11.i386.rpm) = 3b9b5aa206fceeda517832ef2d9044cb5b820006ee57834c904bec555843dd96
-SIZE (rpm/libxml-1.8.17-11.i386.rpm) = 224401
-MD5 (rpm/libxml-1.8.17-11.src.rpm) = 7d1ce664464aa7da9fa8c42b6945d9f1
-SHA256 (rpm/libxml-1.8.17-11.src.rpm) = f5745439d9c0a5763bc67aad98ece45cf898f35bf2cc33961edbb920bdae5ede
-SIZE (rpm/libxml-1.8.17-11.src.rpm) = 1001245
+MD5 (rpm/i386/fedora/3/libxml-1.8.17-11.i386.rpm) = b77a67a91be77b194f70a4e0c9a971ca
+SHA256 (rpm/i386/fedora/3/libxml-1.8.17-11.i386.rpm) = 3b9b5aa206fceeda517832ef2d9044cb5b820006ee57834c904bec555843dd96
+SIZE (rpm/i386/fedora/3/libxml-1.8.17-11.i386.rpm) = 224401
+MD5 (rpm/i386/fedora/3/libxml-1.8.17-11.src.rpm) = 7d1ce664464aa7da9fa8c42b6945d9f1
+SHA256 (rpm/i386/fedora/3/libxml-1.8.17-11.src.rpm) = f5745439d9c0a5763bc67aad98ece45cf898f35bf2cc33961edbb920bdae5ede
+SIZE (rpm/i386/fedora/3/libxml-1.8.17-11.src.rpm) = 1001245
diff --git a/textproc/linux-libxml2/pkg-plist.alpha b/textproc/linux-libxml2/pkg-plist.alpha
deleted file mode 100644
index 1eae478b1532..000000000000
--- a/textproc/linux-libxml2/pkg-plist.alpha
+++ /dev/null
@@ -1,32 +0,0 @@
-usr/lib/libxml.so.1.8.10
-usr/share/doc/libxml-1.8.10/AUTHORS
-usr/share/doc/libxml-1.8.10/COPYING
-usr/share/doc/libxml-1.8.10/COPYING.LIB
-usr/share/doc/libxml-1.8.10/ChangeLog
-usr/share/doc/libxml-1.8.10/NEWS
-usr/share/doc/libxml-1.8.10/README
-usr/share/doc/libxml-1.8.10/TODO
-usr/share/doc/libxml-1.8.10/html/book1.html
-usr/share/doc/libxml-1.8.10/html/gnome-xml-debugxml.html
-usr/share/doc/libxml-1.8.10/html/gnome-xml-encoding.html
-usr/share/doc/libxml-1.8.10/html/gnome-xml-entities.html
-usr/share/doc/libxml-1.8.10/html/gnome-xml-error.html
-usr/share/doc/libxml-1.8.10/html/gnome-xml-htmlparser.html
-usr/share/doc/libxml-1.8.10/html/gnome-xml-htmltree.html
-usr/share/doc/libxml-1.8.10/html/gnome-xml-nanoftp.html
-usr/share/doc/libxml-1.8.10/html/gnome-xml-nanohttp.html
-usr/share/doc/libxml-1.8.10/html/gnome-xml-parser.html
-usr/share/doc/libxml-1.8.10/html/gnome-xml-parserinternals.html
-usr/share/doc/libxml-1.8.10/html/gnome-xml-sax.html
-usr/share/doc/libxml-1.8.10/html/gnome-xml-tree.html
-usr/share/doc/libxml-1.8.10/html/gnome-xml-valid.html
-usr/share/doc/libxml-1.8.10/html/gnome-xml-xml-error.html
-usr/share/doc/libxml-1.8.10/html/gnome-xml-xmlio.html
-usr/share/doc/libxml-1.8.10/html/gnome-xml-xmlmemory.html
-usr/share/doc/libxml-1.8.10/html/gnome-xml-xpath.html
-usr/share/doc/libxml-1.8.10/html/index.sgml
-usr/share/doc/libxml-1.8.10/html/libxml-lib.html
-usr/share/doc/libxml-1.8.10/html/libxml-notes.html
-usr/lib/libxml.so.1
-@dirrm usr/share/doc/libxml-1.8.10/html
-@dirrm usr/share/doc/libxml-1.8.10
diff --git a/x11-fonts/linux-f10-fontconfig/Makefile b/x11-fonts/linux-f10-fontconfig/Makefile
index b08e06f177c2..83e75aec9dda 100644
--- a/x11-fonts/linux-f10-fontconfig/Makefile
+++ b/x11-fonts/linux-f10-fontconfig/Makefile
@@ -7,43 +7,29 @@
PORTNAME= fontconfig
PORTVERSION= 2.2.3
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= x11-fonts linux
-MASTER_SITES= ${MASTER_SITE_FEDORA_LINUX}
-MASTER_SITE_SUBDIR=3/x86_64/os/Fedora/RPMS
+DISTNAME= ${PORTNAME}-${PORTVERSION}-5
MAINTAINER= freebsd-emulation@FreeBSD.org
COMMENT= Linux/i386 binary of Fontconfig
-EXTRACT_DEPENDS=rpm2cpio:${PORTSDIR}/archivers/rpm
RUN_DEPENDS= ${LINUXBASE}/usr/lib/libexpat.so.0:${PORTSDIR}/textproc/linux-expat
USE_REINPLACE= yes
-BASEVERSION= 9
ONLY_FOR_ARCHS= i386 amd64
-RPM_SET= fontconfig-2.2.3-5.i386.rpm
-PLIST= ${PKGDIR}/pkg-plist
+USE_LINUX_RPM= yes
+LINUX_DIST_VER= 3
+INSTALLS_SHLIB= yes
-#PKGINSTALL= ${WRKDIR}/pkg-install
-
-do-extract:
- @${RM} -rf ${WRKSRC}/tmp
- @${MKDIR} ${WRKSRC}/tmp
- @cd ${WRKSRC}/tmp; \
- rpm2cpio < ${DISTDIR}/${DIST_SUBDIR}/${RPM_SET} | ${CPIO} -id;
+BRANDELF_DIRS= usr/bin
post-patch:
@${REINPLACE_CMD} -i "" -e 's:/usr/share/fonts:${X11BASE}/lib/X11/fonts:g ; \
s:/usr/X11R6/lib/X11/fonts/OTF:${X11BASE}/lib/X11/fonts/bitstream-vera:g' \
- ${WRKSRC}/tmp/etc/fonts/fonts.conf
+ ${WRKSRC}/etc/fonts/fonts.conf
post-install:
- @${INSTALL_DATA} ${WRKSRC}/tmp/etc/fonts/fonts.conf ${PREFIX}/etc/fonts/
- @${BRANDELF} -t Linux ${PREFIX}/usr/bin/fc-cache ${PREFIX}/usr/bin/fc-list
-# @${SED} -e 's|%%PREFIX%%|${PREFIX}|g' < ${FILESDIR}/pkg-install.in \
-# > ${PKGINSTALL}
-#.if !defined(PACKAGE_BUILDING)
-# @${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
-#.endif
-
-.include "../../x11-toolkits/linux-gtk/Makefile"
+ PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
+
+.include <bsd.port.mk>
diff --git a/x11-fonts/linux-f10-fontconfig/distinfo.i386 b/x11-fonts/linux-f10-fontconfig/distinfo.i386
index a4a930434541..d637d711c0c9 100644
--- a/x11-fonts/linux-f10-fontconfig/distinfo.i386
+++ b/x11-fonts/linux-f10-fontconfig/distinfo.i386
@@ -1,3 +1,6 @@
-MD5 (rpm/fontconfig-2.2.3-5.i386.rpm) = eb0363e0c829ce9d13ba4e0c68ea8458
-SHA256 (rpm/fontconfig-2.2.3-5.i386.rpm) = 78ba916a75999b008744669e8637ba5a0ca2062340e02b878338d684442149d0
-SIZE (rpm/fontconfig-2.2.3-5.i386.rpm) = 118946
+MD5 (rpm/i386/fedora/3/fontconfig-2.2.3-5.i386.rpm) = eb0363e0c829ce9d13ba4e0c68ea8458
+SHA256 (rpm/i386/fedora/3/fontconfig-2.2.3-5.i386.rpm) = 78ba916a75999b008744669e8637ba5a0ca2062340e02b878338d684442149d0
+SIZE (rpm/i386/fedora/3/fontconfig-2.2.3-5.i386.rpm) = 118946
+MD5 (rpm/i386/fedora/3/fontconfig-2.2.3-5.src.rpm) = 73facd3c7590de1377d76a933a1e60b1
+SHA256 (rpm/i386/fedora/3/fontconfig-2.2.3-5.src.rpm) = fabdf9619833a6fa04dd5104c32eb19a00a443dc303432dcde33d1021bbf6032
+SIZE (rpm/i386/fedora/3/fontconfig-2.2.3-5.src.rpm) = 767420
diff --git a/x11-fonts/linux-f10-fontconfig/files/pkg-install.in b/x11-fonts/linux-f10-fontconfig/files/pkg-install.in
deleted file mode 100644
index 92023842a8c4..000000000000
--- a/x11-fonts/linux-f10-fontconfig/files/pkg-install.in
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/sh
-
-PATH=%%PREFIX%%/bin:%%PREFIX%%/sbin:%%PREFIX%%/usr/bin:%%PREFIX%%/usr/sbin:%%PREFIX%%/usr/X11R6/bin
-export PATH
-
-if [ "$2" = "POST-INSTALL" ]; then
- echo "Running fc-cache to build fontconfig cache..."
- %%PREFIX%%/usr/bin/fc-cache -f -v
-fi
diff --git a/x11-fonts/linux-f10-fontconfig/pkg-install b/x11-fonts/linux-f10-fontconfig/pkg-install
new file mode 100644
index 000000000000..ec594298d788
--- /dev/null
+++ b/x11-fonts/linux-f10-fontconfig/pkg-install
@@ -0,0 +1,6 @@
+#!/bin/sh
+
+if [ "$2" = "POST-INSTALL" ]; then
+ echo "Running fc-cache to build fontconfig cache..."
+ ${PKG_PREFIX}/usr/bin/fc-cache -f -v
+fi
diff --git a/x11-fonts/linux-f8-fontconfig/Makefile b/x11-fonts/linux-f8-fontconfig/Makefile
index b08e06f177c2..83e75aec9dda 100644
--- a/x11-fonts/linux-f8-fontconfig/Makefile
+++ b/x11-fonts/linux-f8-fontconfig/Makefile
@@ -7,43 +7,29 @@
PORTNAME= fontconfig
PORTVERSION= 2.2.3
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= x11-fonts linux
-MASTER_SITES= ${MASTER_SITE_FEDORA_LINUX}
-MASTER_SITE_SUBDIR=3/x86_64/os/Fedora/RPMS
+DISTNAME= ${PORTNAME}-${PORTVERSION}-5
MAINTAINER= freebsd-emulation@FreeBSD.org
COMMENT= Linux/i386 binary of Fontconfig
-EXTRACT_DEPENDS=rpm2cpio:${PORTSDIR}/archivers/rpm
RUN_DEPENDS= ${LINUXBASE}/usr/lib/libexpat.so.0:${PORTSDIR}/textproc/linux-expat
USE_REINPLACE= yes
-BASEVERSION= 9
ONLY_FOR_ARCHS= i386 amd64
-RPM_SET= fontconfig-2.2.3-5.i386.rpm
-PLIST= ${PKGDIR}/pkg-plist
+USE_LINUX_RPM= yes
+LINUX_DIST_VER= 3
+INSTALLS_SHLIB= yes
-#PKGINSTALL= ${WRKDIR}/pkg-install
-
-do-extract:
- @${RM} -rf ${WRKSRC}/tmp
- @${MKDIR} ${WRKSRC}/tmp
- @cd ${WRKSRC}/tmp; \
- rpm2cpio < ${DISTDIR}/${DIST_SUBDIR}/${RPM_SET} | ${CPIO} -id;
+BRANDELF_DIRS= usr/bin
post-patch:
@${REINPLACE_CMD} -i "" -e 's:/usr/share/fonts:${X11BASE}/lib/X11/fonts:g ; \
s:/usr/X11R6/lib/X11/fonts/OTF:${X11BASE}/lib/X11/fonts/bitstream-vera:g' \
- ${WRKSRC}/tmp/etc/fonts/fonts.conf
+ ${WRKSRC}/etc/fonts/fonts.conf
post-install:
- @${INSTALL_DATA} ${WRKSRC}/tmp/etc/fonts/fonts.conf ${PREFIX}/etc/fonts/
- @${BRANDELF} -t Linux ${PREFIX}/usr/bin/fc-cache ${PREFIX}/usr/bin/fc-list
-# @${SED} -e 's|%%PREFIX%%|${PREFIX}|g' < ${FILESDIR}/pkg-install.in \
-# > ${PKGINSTALL}
-#.if !defined(PACKAGE_BUILDING)
-# @${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
-#.endif
-
-.include "../../x11-toolkits/linux-gtk/Makefile"
+ PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
+
+.include <bsd.port.mk>
diff --git a/x11-fonts/linux-f8-fontconfig/distinfo.i386 b/x11-fonts/linux-f8-fontconfig/distinfo.i386
index a4a930434541..d637d711c0c9 100644
--- a/x11-fonts/linux-f8-fontconfig/distinfo.i386
+++ b/x11-fonts/linux-f8-fontconfig/distinfo.i386
@@ -1,3 +1,6 @@
-MD5 (rpm/fontconfig-2.2.3-5.i386.rpm) = eb0363e0c829ce9d13ba4e0c68ea8458
-SHA256 (rpm/fontconfig-2.2.3-5.i386.rpm) = 78ba916a75999b008744669e8637ba5a0ca2062340e02b878338d684442149d0
-SIZE (rpm/fontconfig-2.2.3-5.i386.rpm) = 118946
+MD5 (rpm/i386/fedora/3/fontconfig-2.2.3-5.i386.rpm) = eb0363e0c829ce9d13ba4e0c68ea8458
+SHA256 (rpm/i386/fedora/3/fontconfig-2.2.3-5.i386.rpm) = 78ba916a75999b008744669e8637ba5a0ca2062340e02b878338d684442149d0
+SIZE (rpm/i386/fedora/3/fontconfig-2.2.3-5.i386.rpm) = 118946
+MD5 (rpm/i386/fedora/3/fontconfig-2.2.3-5.src.rpm) = 73facd3c7590de1377d76a933a1e60b1
+SHA256 (rpm/i386/fedora/3/fontconfig-2.2.3-5.src.rpm) = fabdf9619833a6fa04dd5104c32eb19a00a443dc303432dcde33d1021bbf6032
+SIZE (rpm/i386/fedora/3/fontconfig-2.2.3-5.src.rpm) = 767420
diff --git a/x11-fonts/linux-f8-fontconfig/files/pkg-install.in b/x11-fonts/linux-f8-fontconfig/files/pkg-install.in
deleted file mode 100644
index 92023842a8c4..000000000000
--- a/x11-fonts/linux-f8-fontconfig/files/pkg-install.in
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/sh
-
-PATH=%%PREFIX%%/bin:%%PREFIX%%/sbin:%%PREFIX%%/usr/bin:%%PREFIX%%/usr/sbin:%%PREFIX%%/usr/X11R6/bin
-export PATH
-
-if [ "$2" = "POST-INSTALL" ]; then
- echo "Running fc-cache to build fontconfig cache..."
- %%PREFIX%%/usr/bin/fc-cache -f -v
-fi
diff --git a/x11-fonts/linux-f8-fontconfig/pkg-install b/x11-fonts/linux-f8-fontconfig/pkg-install
new file mode 100644
index 000000000000..ec594298d788
--- /dev/null
+++ b/x11-fonts/linux-f8-fontconfig/pkg-install
@@ -0,0 +1,6 @@
+#!/bin/sh
+
+if [ "$2" = "POST-INSTALL" ]; then
+ echo "Running fc-cache to build fontconfig cache..."
+ ${PKG_PREFIX}/usr/bin/fc-cache -f -v
+fi
diff --git a/x11-fonts/linux-fontconfig/Makefile b/x11-fonts/linux-fontconfig/Makefile
index b08e06f177c2..83e75aec9dda 100644
--- a/x11-fonts/linux-fontconfig/Makefile
+++ b/x11-fonts/linux-fontconfig/Makefile
@@ -7,43 +7,29 @@
PORTNAME= fontconfig
PORTVERSION= 2.2.3
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= x11-fonts linux
-MASTER_SITES= ${MASTER_SITE_FEDORA_LINUX}
-MASTER_SITE_SUBDIR=3/x86_64/os/Fedora/RPMS
+DISTNAME= ${PORTNAME}-${PORTVERSION}-5
MAINTAINER= freebsd-emulation@FreeBSD.org
COMMENT= Linux/i386 binary of Fontconfig
-EXTRACT_DEPENDS=rpm2cpio:${PORTSDIR}/archivers/rpm
RUN_DEPENDS= ${LINUXBASE}/usr/lib/libexpat.so.0:${PORTSDIR}/textproc/linux-expat
USE_REINPLACE= yes
-BASEVERSION= 9
ONLY_FOR_ARCHS= i386 amd64
-RPM_SET= fontconfig-2.2.3-5.i386.rpm
-PLIST= ${PKGDIR}/pkg-plist
+USE_LINUX_RPM= yes
+LINUX_DIST_VER= 3
+INSTALLS_SHLIB= yes
-#PKGINSTALL= ${WRKDIR}/pkg-install
-
-do-extract:
- @${RM} -rf ${WRKSRC}/tmp
- @${MKDIR} ${WRKSRC}/tmp
- @cd ${WRKSRC}/tmp; \
- rpm2cpio < ${DISTDIR}/${DIST_SUBDIR}/${RPM_SET} | ${CPIO} -id;
+BRANDELF_DIRS= usr/bin
post-patch:
@${REINPLACE_CMD} -i "" -e 's:/usr/share/fonts:${X11BASE}/lib/X11/fonts:g ; \
s:/usr/X11R6/lib/X11/fonts/OTF:${X11BASE}/lib/X11/fonts/bitstream-vera:g' \
- ${WRKSRC}/tmp/etc/fonts/fonts.conf
+ ${WRKSRC}/etc/fonts/fonts.conf
post-install:
- @${INSTALL_DATA} ${WRKSRC}/tmp/etc/fonts/fonts.conf ${PREFIX}/etc/fonts/
- @${BRANDELF} -t Linux ${PREFIX}/usr/bin/fc-cache ${PREFIX}/usr/bin/fc-list
-# @${SED} -e 's|%%PREFIX%%|${PREFIX}|g' < ${FILESDIR}/pkg-install.in \
-# > ${PKGINSTALL}
-#.if !defined(PACKAGE_BUILDING)
-# @${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
-#.endif
-
-.include "../../x11-toolkits/linux-gtk/Makefile"
+ PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
+
+.include <bsd.port.mk>
diff --git a/x11-fonts/linux-fontconfig/distinfo.i386 b/x11-fonts/linux-fontconfig/distinfo.i386
index a4a930434541..d637d711c0c9 100644
--- a/x11-fonts/linux-fontconfig/distinfo.i386
+++ b/x11-fonts/linux-fontconfig/distinfo.i386
@@ -1,3 +1,6 @@
-MD5 (rpm/fontconfig-2.2.3-5.i386.rpm) = eb0363e0c829ce9d13ba4e0c68ea8458
-SHA256 (rpm/fontconfig-2.2.3-5.i386.rpm) = 78ba916a75999b008744669e8637ba5a0ca2062340e02b878338d684442149d0
-SIZE (rpm/fontconfig-2.2.3-5.i386.rpm) = 118946
+MD5 (rpm/i386/fedora/3/fontconfig-2.2.3-5.i386.rpm) = eb0363e0c829ce9d13ba4e0c68ea8458
+SHA256 (rpm/i386/fedora/3/fontconfig-2.2.3-5.i386.rpm) = 78ba916a75999b008744669e8637ba5a0ca2062340e02b878338d684442149d0
+SIZE (rpm/i386/fedora/3/fontconfig-2.2.3-5.i386.rpm) = 118946
+MD5 (rpm/i386/fedora/3/fontconfig-2.2.3-5.src.rpm) = 73facd3c7590de1377d76a933a1e60b1
+SHA256 (rpm/i386/fedora/3/fontconfig-2.2.3-5.src.rpm) = fabdf9619833a6fa04dd5104c32eb19a00a443dc303432dcde33d1021bbf6032
+SIZE (rpm/i386/fedora/3/fontconfig-2.2.3-5.src.rpm) = 767420
diff --git a/x11-fonts/linux-fontconfig/files/pkg-install.in b/x11-fonts/linux-fontconfig/files/pkg-install.in
deleted file mode 100644
index 92023842a8c4..000000000000
--- a/x11-fonts/linux-fontconfig/files/pkg-install.in
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/sh
-
-PATH=%%PREFIX%%/bin:%%PREFIX%%/sbin:%%PREFIX%%/usr/bin:%%PREFIX%%/usr/sbin:%%PREFIX%%/usr/X11R6/bin
-export PATH
-
-if [ "$2" = "POST-INSTALL" ]; then
- echo "Running fc-cache to build fontconfig cache..."
- %%PREFIX%%/usr/bin/fc-cache -f -v
-fi
diff --git a/x11-fonts/linux-fontconfig/pkg-install b/x11-fonts/linux-fontconfig/pkg-install
new file mode 100644
index 000000000000..ec594298d788
--- /dev/null
+++ b/x11-fonts/linux-fontconfig/pkg-install
@@ -0,0 +1,6 @@
+#!/bin/sh
+
+if [ "$2" = "POST-INSTALL" ]; then
+ echo "Running fc-cache to build fontconfig cache..."
+ ${PKG_PREFIX}/usr/bin/fc-cache -f -v
+fi
diff --git a/x11-fonts/linux-urw-fonts/Makefile b/x11-fonts/linux-urw-fonts/Makefile
index 194970db3df7..041a58c879c7 100644
--- a/x11-fonts/linux-urw-fonts/Makefile
+++ b/x11-fonts/linux-urw-fonts/Makefile
@@ -6,25 +6,20 @@
#
PORTNAME= urw-fonts
-PORTVERSION= 2.0
-PORTREVISION= 4
+PORTVERSION= 2.3
CATEGORIES= x11-fonts linux
+DISTNAME= ${PORTNAME}-${PORTVERSION}-1
+EXTRACT_SUFX= .noarch.rpm
MAINTAINER= ports@FreeBSD.org
COMMENT= Truetype fonts for use with Linux programs
-BASEVERSION= 9
+USE_LINUX_RPM= yes
+LINUX_DIST_VER= 4
MD5_FILE= ${MASTERDIR}/distinfo
-PLIST= ${WRKDIR}/plist
-RPM_SET= urw-fonts-2.0-29.noarch.rpm
pre-install:
- ${RM} -rf ${WRKSRC}/tmp
- ${MKDIR} ${WRKSRC}/tmp
- cd ${WRKSRC}/tmp; \
- rpm2cpio < ${DISTDIR}/${DIST_SUBDIR}/${RPM_SET} | cpio -id; \
- ${FIND} * -type f -o -type l > ${PLIST}; \
- ${FIND} -d * -type d | ${GREP} -E 'urw|default' | \
- ${SED} -e 's:^:@dirrm :' >> ${PLIST};
+ @cd ${MASTERDIR}/files; \
+ cp fonts.* ${WRKSRC}/usr/share/fonts/default/Type1
-.include "../../x11-toolkits/linux-gtk/Makefile"
+.include <bsd.port.mk>
diff --git a/x11-fonts/linux-urw-fonts/distinfo b/x11-fonts/linux-urw-fonts/distinfo
index 92dd085c7da8..8742b0d08c26 100644
--- a/x11-fonts/linux-urw-fonts/distinfo
+++ b/x11-fonts/linux-urw-fonts/distinfo
@@ -1,3 +1,6 @@
-MD5 (rpm/urw-fonts-2.0-29.noarch.rpm) = ee7cb1339a4436bbdad2c8746eada2ee
-SHA256 (rpm/urw-fonts-2.0-29.noarch.rpm) = 1306eb360d5d5e31d76bb4ffbffbc7e77b7d3bf6d68e3de7943de145d8b0c1e4
-SIZE (rpm/urw-fonts-2.0-29.noarch.rpm) = 3894367
+MD5 (rpm/i386/fedora/4/urw-fonts-2.3-1.noarch.rpm) = c5564cbe6193a4cdd460736629a66179
+SHA256 (rpm/i386/fedora/4/urw-fonts-2.3-1.noarch.rpm) = 6ec586ee59df653c8dbebc006cb0417661776a5f3a1abe89673417f2a1367990
+SIZE (rpm/i386/fedora/4/urw-fonts-2.3-1.noarch.rpm) = 4732700
+MD5 (rpm/i386/fedora/4/urw-fonts-2.3-1.src.rpm) = aefdd916c617573471ad0550b7d50734
+SHA256 (rpm/i386/fedora/4/urw-fonts-2.3-1.src.rpm) = 56139bba306929484af2deeedd44b9f3efc73bdbd849671a527802dcd4ee9389
+SIZE (rpm/i386/fedora/4/urw-fonts-2.3-1.src.rpm) = 5281393
diff --git a/x11-fonts/linux-urw-fonts/files/fonts.dir b/x11-fonts/linux-urw-fonts/files/fonts.dir
new file mode 100644
index 000000000000..22ebcb4020fe
--- /dev/null
+++ b/x11-fonts/linux-urw-fonts/files/fonts.dir
@@ -0,0 +1,582 @@
+581
+a010013l.pfb -urw-urw gothic l-medium-r-normal--0-0-0-0-p-0-adobe-standard
+a010013l.pfb -urw-urw gothic l-medium-r-normal--0-0-0-0-p-0-ascii-0
+a010013l.pfb -urw-urw gothic l-medium-r-normal--0-0-0-0-p-0-iso10646-1
+a010013l.pfb -urw-urw gothic l-medium-r-normal--0-0-0-0-p-0-iso8859-10
+a010013l.pfb -urw-urw gothic l-medium-r-normal--0-0-0-0-p-0-iso8859-13
+a010013l.pfb -urw-urw gothic l-medium-r-normal--0-0-0-0-p-0-iso8859-1
+a010013l.pfb -urw-urw gothic l-medium-r-normal--0-0-0-0-p-0-iso8859-15
+a010013l.pfb -urw-urw gothic l-medium-r-normal--0-0-0-0-p-0-iso8859-2
+a010013l.pfb -urw-urw gothic l-medium-r-normal--0-0-0-0-p-0-iso8859-3
+a010013l.pfb -urw-urw gothic l-medium-r-normal--0-0-0-0-p-0-iso8859-4
+a010013l.pfb -urw-urw gothic l-medium-r-normal--0-0-0-0-p-0-iso8859-5
+a010013l.pfb -urw-urw gothic l-medium-r-normal--0-0-0-0-p-0-iso8859-9
+a010013l.pfb -urw-urw gothic l-medium-r-normal--0-0-0-0-p-0-koi8-e
+a010013l.pfb -urw-urw gothic l-medium-r-normal--0-0-0-0-p-0-koi8-r
+a010013l.pfb -urw-urw gothic l-medium-r-normal--0-0-0-0-p-0-koi8-ru
+a010013l.pfb -urw-urw gothic l-medium-r-normal--0-0-0-0-p-0-koi8-u
+a010013l.pfb -urw-urw gothic l-medium-r-normal--0-0-0-0-p-0-koi8-uni
+a010013l.pfb -urw-urw gothic l-medium-r-normal--0-0-0-0-p-0-microsoft-cp1252
+a010015l.pfb -urw-urw gothic l-semibold-r-normal--0-0-0-0-p-0-adobe-standard
+a010015l.pfb -urw-urw gothic l-semibold-r-normal--0-0-0-0-p-0-ascii-0
+a010015l.pfb -urw-urw gothic l-semibold-r-normal--0-0-0-0-p-0-iso10646-1
+a010015l.pfb -urw-urw gothic l-semibold-r-normal--0-0-0-0-p-0-iso8859-10
+a010015l.pfb -urw-urw gothic l-semibold-r-normal--0-0-0-0-p-0-iso8859-13
+a010015l.pfb -urw-urw gothic l-semibold-r-normal--0-0-0-0-p-0-iso8859-15
+a010015l.pfb -urw-urw gothic l-semibold-r-normal--0-0-0-0-p-0-iso8859-1
+a010015l.pfb -urw-urw gothic l-semibold-r-normal--0-0-0-0-p-0-iso8859-2
+a010015l.pfb -urw-urw gothic l-semibold-r-normal--0-0-0-0-p-0-iso8859-3
+a010015l.pfb -urw-urw gothic l-semibold-r-normal--0-0-0-0-p-0-iso8859-4
+a010015l.pfb -urw-urw gothic l-semibold-r-normal--0-0-0-0-p-0-iso8859-5
+a010015l.pfb -urw-urw gothic l-semibold-r-normal--0-0-0-0-p-0-iso8859-9
+a010015l.pfb -urw-urw gothic l-semibold-r-normal--0-0-0-0-p-0-koi8-e
+a010015l.pfb -urw-urw gothic l-semibold-r-normal--0-0-0-0-p-0-koi8-ru
+a010015l.pfb -urw-urw gothic l-semibold-r-normal--0-0-0-0-p-0-koi8-r
+a010015l.pfb -urw-urw gothic l-semibold-r-normal--0-0-0-0-p-0-koi8-uni
+a010015l.pfb -urw-urw gothic l-semibold-r-normal--0-0-0-0-p-0-koi8-u
+a010015l.pfb -urw-urw gothic l-semibold-r-normal--0-0-0-0-p-0-microsoft-cp1252
+a010033l.pfb -urw-urw gothic l-medium-o-normal--0-0-0-0-p-0-adobe-standard
+a010033l.pfb -urw-urw gothic l-medium-o-normal--0-0-0-0-p-0-ascii-0
+a010033l.pfb -urw-urw gothic l-medium-o-normal--0-0-0-0-p-0-iso10646-1
+a010033l.pfb -urw-urw gothic l-medium-o-normal--0-0-0-0-p-0-iso8859-10
+a010033l.pfb -urw-urw gothic l-medium-o-normal--0-0-0-0-p-0-iso8859-13
+a010033l.pfb -urw-urw gothic l-medium-o-normal--0-0-0-0-p-0-iso8859-15
+a010033l.pfb -urw-urw gothic l-medium-o-normal--0-0-0-0-p-0-iso8859-1
+a010033l.pfb -urw-urw gothic l-medium-o-normal--0-0-0-0-p-0-iso8859-2
+a010033l.pfb -urw-urw gothic l-medium-o-normal--0-0-0-0-p-0-iso8859-3
+a010033l.pfb -urw-urw gothic l-medium-o-normal--0-0-0-0-p-0-iso8859-4
+a010033l.pfb -urw-urw gothic l-medium-o-normal--0-0-0-0-p-0-iso8859-5
+a010033l.pfb -urw-urw gothic l-medium-o-normal--0-0-0-0-p-0-iso8859-9
+a010033l.pfb -urw-urw gothic l-medium-o-normal--0-0-0-0-p-0-koi8-e
+a010033l.pfb -urw-urw gothic l-medium-o-normal--0-0-0-0-p-0-koi8-r
+a010033l.pfb -urw-urw gothic l-medium-o-normal--0-0-0-0-p-0-koi8-ru
+a010033l.pfb -urw-urw gothic l-medium-o-normal--0-0-0-0-p-0-koi8-uni
+a010033l.pfb -urw-urw gothic l-medium-o-normal--0-0-0-0-p-0-koi8-u
+a010033l.pfb -urw-urw gothic l-medium-o-normal--0-0-0-0-p-0-microsoft-cp1252
+a010035l.pfb -urw-urw gothic l-semibold-o-normal--0-0-0-0-p-0-adobe-standard
+a010035l.pfb -urw-urw gothic l-semibold-o-normal--0-0-0-0-p-0-ascii-0
+a010035l.pfb -urw-urw gothic l-semibold-o-normal--0-0-0-0-p-0-iso10646-1
+a010035l.pfb -urw-urw gothic l-semibold-o-normal--0-0-0-0-p-0-iso8859-10
+a010035l.pfb -urw-urw gothic l-semibold-o-normal--0-0-0-0-p-0-iso8859-13
+a010035l.pfb -urw-urw gothic l-semibold-o-normal--0-0-0-0-p-0-iso8859-1
+a010035l.pfb -urw-urw gothic l-semibold-o-normal--0-0-0-0-p-0-iso8859-15
+a010035l.pfb -urw-urw gothic l-semibold-o-normal--0-0-0-0-p-0-iso8859-2
+a010035l.pfb -urw-urw gothic l-semibold-o-normal--0-0-0-0-p-0-iso8859-3
+a010035l.pfb -urw-urw gothic l-semibold-o-normal--0-0-0-0-p-0-iso8859-4
+a010035l.pfb -urw-urw gothic l-semibold-o-normal--0-0-0-0-p-0-iso8859-5
+a010035l.pfb -urw-urw gothic l-semibold-o-normal--0-0-0-0-p-0-iso8859-9
+a010035l.pfb -urw-urw gothic l-semibold-o-normal--0-0-0-0-p-0-koi8-e
+a010035l.pfb -urw-urw gothic l-semibold-o-normal--0-0-0-0-p-0-koi8-r
+a010035l.pfb -urw-urw gothic l-semibold-o-normal--0-0-0-0-p-0-koi8-ru
+a010035l.pfb -urw-urw gothic l-semibold-o-normal--0-0-0-0-p-0-koi8-u
+a010035l.pfb -urw-urw gothic l-semibold-o-normal--0-0-0-0-p-0-koi8-uni
+a010035l.pfb -urw-urw gothic l-semibold-o-normal--0-0-0-0-p-0-microsoft-cp1252
+b018012l.pfb -urw-urw bookman l-medium-r-normal--0-0-0-0-p-0-adobe-standard
+b018012l.pfb -urw-urw bookman l-medium-r-normal--0-0-0-0-p-0-ascii-0
+b018012l.pfb -urw-urw bookman l-medium-r-normal--0-0-0-0-p-0-iso10646-1
+b018012l.pfb -urw-urw bookman l-medium-r-normal--0-0-0-0-p-0-iso8859-15
+b018012l.pfb -urw-urw bookman l-medium-r-normal--0-0-0-0-p-0-iso8859-1
+b018012l.pfb -urw-urw bookman l-medium-r-normal--0-0-0-0-p-0-iso8859-10
+b018012l.pfb -urw-urw bookman l-medium-r-normal--0-0-0-0-p-0-iso8859-13
+b018012l.pfb -urw-urw bookman l-medium-r-normal--0-0-0-0-p-0-iso8859-2
+b018012l.pfb -urw-urw bookman l-medium-r-normal--0-0-0-0-p-0-iso8859-3
+b018012l.pfb -urw-urw bookman l-medium-r-normal--0-0-0-0-p-0-iso8859-4
+b018012l.pfb -urw-urw bookman l-medium-r-normal--0-0-0-0-p-0-iso8859-5
+b018012l.pfb -urw-urw bookman l-medium-r-normal--0-0-0-0-p-0-iso8859-9
+b018012l.pfb -urw-urw bookman l-medium-r-normal--0-0-0-0-p-0-koi8-e
+b018012l.pfb -urw-urw bookman l-medium-r-normal--0-0-0-0-p-0-koi8-ru
+b018012l.pfb -urw-urw bookman l-medium-r-normal--0-0-0-0-p-0-koi8-r
+b018012l.pfb -urw-urw bookman l-medium-r-normal--0-0-0-0-p-0-koi8-uni
+b018012l.pfb -urw-urw bookman l-medium-r-normal--0-0-0-0-p-0-koi8-u
+b018012l.pfb -urw-urw bookman l-medium-r-normal--0-0-0-0-p-0-microsoft-cp1252
+b018015l.pfb -urw-urw bookman l-bold-r-normal--0-0-0-0-p-0-adobe-standard
+b018015l.pfb -urw-urw bookman l-bold-r-normal--0-0-0-0-p-0-ascii-0
+b018015l.pfb -urw-urw bookman l-bold-r-normal--0-0-0-0-p-0-iso10646-1
+b018015l.pfb -urw-urw bookman l-bold-r-normal--0-0-0-0-p-0-iso8859-1
+b018015l.pfb -urw-urw bookman l-bold-r-normal--0-0-0-0-p-0-iso8859-10
+b018015l.pfb -urw-urw bookman l-bold-r-normal--0-0-0-0-p-0-iso8859-13
+b018015l.pfb -urw-urw bookman l-bold-r-normal--0-0-0-0-p-0-iso8859-15
+b018015l.pfb -urw-urw bookman l-bold-r-normal--0-0-0-0-p-0-iso8859-2
+b018015l.pfb -urw-urw bookman l-bold-r-normal--0-0-0-0-p-0-iso8859-3
+b018015l.pfb -urw-urw bookman l-bold-r-normal--0-0-0-0-p-0-iso8859-4
+b018015l.pfb -urw-urw bookman l-bold-r-normal--0-0-0-0-p-0-iso8859-5
+b018015l.pfb -urw-urw bookman l-bold-r-normal--0-0-0-0-p-0-iso8859-9
+b018015l.pfb -urw-urw bookman l-bold-r-normal--0-0-0-0-p-0-koi8-e
+b018015l.pfb -urw-urw bookman l-bold-r-normal--0-0-0-0-p-0-koi8-r
+b018015l.pfb -urw-urw bookman l-bold-r-normal--0-0-0-0-p-0-koi8-ru
+b018015l.pfb -urw-urw bookman l-bold-r-normal--0-0-0-0-p-0-koi8-uni
+b018015l.pfb -urw-urw bookman l-bold-r-normal--0-0-0-0-p-0-koi8-u
+b018015l.pfb -urw-urw bookman l-bold-r-normal--0-0-0-0-p-0-microsoft-cp1252
+b018032l.pfb -urw-urw bookman l-medium-i-normal--0-0-0-0-p-0-adobe-standard
+b018032l.pfb -urw-urw bookman l-medium-i-normal--0-0-0-0-p-0-ascii-0
+b018032l.pfb -urw-urw bookman l-medium-i-normal--0-0-0-0-p-0-iso10646-1
+b018032l.pfb -urw-urw bookman l-medium-i-normal--0-0-0-0-p-0-iso8859-10
+b018032l.pfb -urw-urw bookman l-medium-i-normal--0-0-0-0-p-0-iso8859-13
+b018032l.pfb -urw-urw bookman l-medium-i-normal--0-0-0-0-p-0-iso8859-1
+b018032l.pfb -urw-urw bookman l-medium-i-normal--0-0-0-0-p-0-iso8859-15
+b018032l.pfb -urw-urw bookman l-medium-i-normal--0-0-0-0-p-0-iso8859-2
+b018032l.pfb -urw-urw bookman l-medium-i-normal--0-0-0-0-p-0-iso8859-3
+b018032l.pfb -urw-urw bookman l-medium-i-normal--0-0-0-0-p-0-iso8859-4
+b018032l.pfb -urw-urw bookman l-medium-i-normal--0-0-0-0-p-0-iso8859-5
+b018032l.pfb -urw-urw bookman l-medium-i-normal--0-0-0-0-p-0-iso8859-9
+b018032l.pfb -urw-urw bookman l-medium-i-normal--0-0-0-0-p-0-koi8-e
+b018032l.pfb -urw-urw bookman l-medium-i-normal--0-0-0-0-p-0-koi8-ru
+b018032l.pfb -urw-urw bookman l-medium-i-normal--0-0-0-0-p-0-koi8-r
+b018032l.pfb -urw-urw bookman l-medium-i-normal--0-0-0-0-p-0-koi8-uni
+b018032l.pfb -urw-urw bookman l-medium-i-normal--0-0-0-0-p-0-koi8-u
+b018032l.pfb -urw-urw bookman l-medium-i-normal--0-0-0-0-p-0-microsoft-cp1252
+b018035l.pfb -urw-urw bookman l-bold-i-normal--0-0-0-0-p-0-adobe-standard
+b018035l.pfb -urw-urw bookman l-bold-i-normal--0-0-0-0-p-0-ascii-0
+b018035l.pfb -urw-urw bookman l-bold-i-normal--0-0-0-0-p-0-iso10646-1
+b018035l.pfb -urw-urw bookman l-bold-i-normal--0-0-0-0-p-0-iso8859-15
+b018035l.pfb -urw-urw bookman l-bold-i-normal--0-0-0-0-p-0-iso8859-1
+b018035l.pfb -urw-urw bookman l-bold-i-normal--0-0-0-0-p-0-iso8859-10
+b018035l.pfb -urw-urw bookman l-bold-i-normal--0-0-0-0-p-0-iso8859-13
+b018035l.pfb -urw-urw bookman l-bold-i-normal--0-0-0-0-p-0-iso8859-2
+b018035l.pfb -urw-urw bookman l-bold-i-normal--0-0-0-0-p-0-iso8859-3
+b018035l.pfb -urw-urw bookman l-bold-i-normal--0-0-0-0-p-0-iso8859-4
+b018035l.pfb -urw-urw bookman l-bold-i-normal--0-0-0-0-p-0-iso8859-5
+b018035l.pfb -urw-urw bookman l-bold-i-normal--0-0-0-0-p-0-iso8859-9
+b018035l.pfb -urw-urw bookman l-bold-i-normal--0-0-0-0-p-0-koi8-e
+b018035l.pfb -urw-urw bookman l-bold-i-normal--0-0-0-0-p-0-koi8-ru
+b018035l.pfb -urw-urw bookman l-bold-i-normal--0-0-0-0-p-0-koi8-r
+b018035l.pfb -urw-urw bookman l-bold-i-normal--0-0-0-0-p-0-koi8-uni
+b018035l.pfb -urw-urw bookman l-bold-i-normal--0-0-0-0-p-0-koi8-u
+b018035l.pfb -urw-urw bookman l-bold-i-normal--0-0-0-0-p-0-microsoft-cp1252
+c059013l.pfb -urw-century schoolbook l-medium-r-normal--0-0-0-0-p-0-adobe-standard
+c059013l.pfb -urw-century schoolbook l-medium-r-normal--0-0-0-0-p-0-ascii-0
+c059013l.pfb -urw-century schoolbook l-medium-r-normal--0-0-0-0-p-0-iso10646-1
+c059013l.pfb -urw-century schoolbook l-medium-r-normal--0-0-0-0-p-0-iso8859-10
+c059013l.pfb -urw-century schoolbook l-medium-r-normal--0-0-0-0-p-0-iso8859-13
+c059013l.pfb -urw-century schoolbook l-medium-r-normal--0-0-0-0-p-0-iso8859-15
+c059013l.pfb -urw-century schoolbook l-medium-r-normal--0-0-0-0-p-0-iso8859-1
+c059013l.pfb -urw-century schoolbook l-medium-r-normal--0-0-0-0-p-0-iso8859-2
+c059013l.pfb -urw-century schoolbook l-medium-r-normal--0-0-0-0-p-0-iso8859-3
+c059013l.pfb -urw-century schoolbook l-medium-r-normal--0-0-0-0-p-0-iso8859-4
+c059013l.pfb -urw-century schoolbook l-medium-r-normal--0-0-0-0-p-0-iso8859-5
+c059013l.pfb -urw-century schoolbook l-medium-r-normal--0-0-0-0-p-0-iso8859-9
+c059013l.pfb -urw-century schoolbook l-medium-r-normal--0-0-0-0-p-0-koi8-e
+c059013l.pfb -urw-century schoolbook l-medium-r-normal--0-0-0-0-p-0-koi8-ru
+c059013l.pfb -urw-century schoolbook l-medium-r-normal--0-0-0-0-p-0-koi8-r
+c059013l.pfb -urw-century schoolbook l-medium-r-normal--0-0-0-0-p-0-koi8-u
+c059013l.pfb -urw-century schoolbook l-medium-r-normal--0-0-0-0-p-0-koi8-uni
+c059013l.pfb -urw-century schoolbook l-medium-r-normal--0-0-0-0-p-0-microsoft-cp1252
+c059016l.pfb -urw-century schoolbook l-bold-r-normal--0-0-0-0-p-0-adobe-standard
+c059016l.pfb -urw-century schoolbook l-bold-r-normal--0-0-0-0-p-0-ascii-0
+c059016l.pfb -urw-century schoolbook l-bold-r-normal--0-0-0-0-p-0-iso10646-1
+c059016l.pfb -urw-century schoolbook l-bold-r-normal--0-0-0-0-p-0-iso8859-10
+c059016l.pfb -urw-century schoolbook l-bold-r-normal--0-0-0-0-p-0-iso8859-13
+c059016l.pfb -urw-century schoolbook l-bold-r-normal--0-0-0-0-p-0-iso8859-1
+c059016l.pfb -urw-century schoolbook l-bold-r-normal--0-0-0-0-p-0-iso8859-15
+c059016l.pfb -urw-century schoolbook l-bold-r-normal--0-0-0-0-p-0-iso8859-2
+c059016l.pfb -urw-century schoolbook l-bold-r-normal--0-0-0-0-p-0-iso8859-3
+c059016l.pfb -urw-century schoolbook l-bold-r-normal--0-0-0-0-p-0-iso8859-4
+c059016l.pfb -urw-century schoolbook l-bold-r-normal--0-0-0-0-p-0-iso8859-5
+c059016l.pfb -urw-century schoolbook l-bold-r-normal--0-0-0-0-p-0-iso8859-9
+c059016l.pfb -urw-century schoolbook l-bold-r-normal--0-0-0-0-p-0-koi8-e
+c059016l.pfb -urw-century schoolbook l-bold-r-normal--0-0-0-0-p-0-koi8-ru
+c059016l.pfb -urw-century schoolbook l-bold-r-normal--0-0-0-0-p-0-koi8-r
+c059016l.pfb -urw-century schoolbook l-bold-r-normal--0-0-0-0-p-0-koi8-uni
+c059016l.pfb -urw-century schoolbook l-bold-r-normal--0-0-0-0-p-0-koi8-u
+c059016l.pfb -urw-century schoolbook l-bold-r-normal--0-0-0-0-p-0-microsoft-cp1252
+c059033l.pfb -urw-century schoolbook l-medium-i-normal--0-0-0-0-p-0-adobe-standard
+c059033l.pfb -urw-century schoolbook l-medium-i-normal--0-0-0-0-p-0-ascii-0
+c059033l.pfb -urw-century schoolbook l-medium-i-normal--0-0-0-0-p-0-iso10646-1
+c059033l.pfb -urw-century schoolbook l-medium-i-normal--0-0-0-0-p-0-iso8859-10
+c059033l.pfb -urw-century schoolbook l-medium-i-normal--0-0-0-0-p-0-iso8859-13
+c059033l.pfb -urw-century schoolbook l-medium-i-normal--0-0-0-0-p-0-iso8859-15
+c059033l.pfb -urw-century schoolbook l-medium-i-normal--0-0-0-0-p-0-iso8859-1
+c059033l.pfb -urw-century schoolbook l-medium-i-normal--0-0-0-0-p-0-iso8859-2
+c059033l.pfb -urw-century schoolbook l-medium-i-normal--0-0-0-0-p-0-iso8859-3
+c059033l.pfb -urw-century schoolbook l-medium-i-normal--0-0-0-0-p-0-iso8859-4
+c059033l.pfb -urw-century schoolbook l-medium-i-normal--0-0-0-0-p-0-iso8859-5
+c059033l.pfb -urw-century schoolbook l-medium-i-normal--0-0-0-0-p-0-iso8859-9
+c059033l.pfb -urw-century schoolbook l-medium-i-normal--0-0-0-0-p-0-koi8-e
+c059033l.pfb -urw-century schoolbook l-medium-i-normal--0-0-0-0-p-0-koi8-ru
+c059033l.pfb -urw-century schoolbook l-medium-i-normal--0-0-0-0-p-0-koi8-r
+c059033l.pfb -urw-century schoolbook l-medium-i-normal--0-0-0-0-p-0-koi8-uni
+c059033l.pfb -urw-century schoolbook l-medium-i-normal--0-0-0-0-p-0-koi8-u
+c059033l.pfb -urw-century schoolbook l-medium-i-normal--0-0-0-0-p-0-microsoft-cp1252
+c059036l.pfb -urw-century schoolbook l-bold-i-normal--0-0-0-0-p-0-adobe-standard
+c059036l.pfb -urw-century schoolbook l-bold-i-normal--0-0-0-0-p-0-ascii-0
+c059036l.pfb -urw-century schoolbook l-bold-i-normal--0-0-0-0-p-0-iso10646-1
+c059036l.pfb -urw-century schoolbook l-bold-i-normal--0-0-0-0-p-0-iso8859-10
+c059036l.pfb -urw-century schoolbook l-bold-i-normal--0-0-0-0-p-0-iso8859-13
+c059036l.pfb -urw-century schoolbook l-bold-i-normal--0-0-0-0-p-0-iso8859-15
+c059036l.pfb -urw-century schoolbook l-bold-i-normal--0-0-0-0-p-0-iso8859-1
+c059036l.pfb -urw-century schoolbook l-bold-i-normal--0-0-0-0-p-0-iso8859-2
+c059036l.pfb -urw-century schoolbook l-bold-i-normal--0-0-0-0-p-0-iso8859-3
+c059036l.pfb -urw-century schoolbook l-bold-i-normal--0-0-0-0-p-0-iso8859-4
+c059036l.pfb -urw-century schoolbook l-bold-i-normal--0-0-0-0-p-0-iso8859-5
+c059036l.pfb -urw-century schoolbook l-bold-i-normal--0-0-0-0-p-0-iso8859-9
+c059036l.pfb -urw-century schoolbook l-bold-i-normal--0-0-0-0-p-0-koi8-e
+c059036l.pfb -urw-century schoolbook l-bold-i-normal--0-0-0-0-p-0-koi8-ru
+c059036l.pfb -urw-century schoolbook l-bold-i-normal--0-0-0-0-p-0-koi8-r
+c059036l.pfb -urw-century schoolbook l-bold-i-normal--0-0-0-0-p-0-koi8-uni
+c059036l.pfb -urw-century schoolbook l-bold-i-normal--0-0-0-0-p-0-koi8-u
+c059036l.pfb -urw-century schoolbook l-bold-i-normal--0-0-0-0-p-0-microsoft-cp1252
+d050000l.pfb -urw-dingbats-medium-r-normal--0-0-0-0-p-0-adobe-fontspecific
+n019003l.pfb -urw-nimbus sans l-medium-r-normal--0-0-0-0-p-0-adobe-standard
+n019003l.pfb -urw-nimbus sans l-medium-r-normal--0-0-0-0-p-0-ascii-0
+n019003l.pfb -urw-nimbus sans l-medium-r-normal--0-0-0-0-p-0-iso10646-1
+n019003l.pfb -urw-nimbus sans l-medium-r-normal--0-0-0-0-p-0-iso8859-10
+n019003l.pfb -urw-nimbus sans l-medium-r-normal--0-0-0-0-p-0-iso8859-13
+n019003l.pfb -urw-nimbus sans l-medium-r-normal--0-0-0-0-p-0-iso8859-15
+n019003l.pfb -urw-nimbus sans l-medium-r-normal--0-0-0-0-p-0-iso8859-1
+n019003l.pfb -urw-nimbus sans l-medium-r-normal--0-0-0-0-p-0-iso8859-2
+n019003l.pfb -urw-nimbus sans l-medium-r-normal--0-0-0-0-p-0-iso8859-3
+n019003l.pfb -urw-nimbus sans l-medium-r-normal--0-0-0-0-p-0-iso8859-4
+n019003l.pfb -urw-nimbus sans l-medium-r-normal--0-0-0-0-p-0-iso8859-5
+n019003l.pfb -urw-nimbus sans l-medium-r-normal--0-0-0-0-p-0-iso8859-9
+n019003l.pfb -urw-nimbus sans l-medium-r-normal--0-0-0-0-p-0-koi8-e
+n019003l.pfb -urw-nimbus sans l-medium-r-normal--0-0-0-0-p-0-koi8-r
+n019003l.pfb -urw-nimbus sans l-medium-r-normal--0-0-0-0-p-0-koi8-ru
+n019003l.pfb -urw-nimbus sans l-medium-r-normal--0-0-0-0-p-0-koi8-u
+n019003l.pfb -urw-nimbus sans l-medium-r-normal--0-0-0-0-p-0-koi8-uni
+n019003l.pfb -urw-nimbus sans l-medium-r-normal--0-0-0-0-p-0-microsoft-cp1252
+n019004l.pfb -urw-nimbus sans l-bold-r-normal--0-0-0-0-p-0-adobe-standard
+n019004l.pfb -urw-nimbus sans l-bold-r-normal--0-0-0-0-p-0-ascii-0
+n019004l.pfb -urw-nimbus sans l-bold-r-normal--0-0-0-0-p-0-iso10646-1
+n019004l.pfb -urw-nimbus sans l-bold-r-normal--0-0-0-0-p-0-iso8859-10
+n019004l.pfb -urw-nimbus sans l-bold-r-normal--0-0-0-0-p-0-iso8859-1
+n019004l.pfb -urw-nimbus sans l-bold-r-normal--0-0-0-0-p-0-iso8859-13
+n019004l.pfb -urw-nimbus sans l-bold-r-normal--0-0-0-0-p-0-iso8859-15
+n019004l.pfb -urw-nimbus sans l-bold-r-normal--0-0-0-0-p-0-iso8859-2
+n019004l.pfb -urw-nimbus sans l-bold-r-normal--0-0-0-0-p-0-iso8859-3
+n019004l.pfb -urw-nimbus sans l-bold-r-normal--0-0-0-0-p-0-iso8859-4
+n019004l.pfb -urw-nimbus sans l-bold-r-normal--0-0-0-0-p-0-iso8859-5
+n019004l.pfb -urw-nimbus sans l-bold-r-normal--0-0-0-0-p-0-iso8859-9
+n019004l.pfb -urw-nimbus sans l-bold-r-normal--0-0-0-0-p-0-koi8-e
+n019004l.pfb -urw-nimbus sans l-bold-r-normal--0-0-0-0-p-0-koi8-r
+n019004l.pfb -urw-nimbus sans l-bold-r-normal--0-0-0-0-p-0-koi8-ru
+n019004l.pfb -urw-nimbus sans l-bold-r-normal--0-0-0-0-p-0-koi8-uni
+n019004l.pfb -urw-nimbus sans l-bold-r-normal--0-0-0-0-p-0-koi8-u
+n019004l.pfb -urw-nimbus sans l-bold-r-normal--0-0-0-0-p-0-microsoft-cp1252
+n019023l.pfb -urw-nimbus sans l-medium-i-normal--0-0-0-0-p-0-adobe-standard
+n019023l.pfb -urw-nimbus sans l-medium-i-normal--0-0-0-0-p-0-ascii-0
+n019023l.pfb -urw-nimbus sans l-medium-i-normal--0-0-0-0-p-0-iso10646-1
+n019023l.pfb -urw-nimbus sans l-medium-i-normal--0-0-0-0-p-0-iso8859-10
+n019023l.pfb -urw-nimbus sans l-medium-i-normal--0-0-0-0-p-0-iso8859-1
+n019023l.pfb -urw-nimbus sans l-medium-i-normal--0-0-0-0-p-0-iso8859-13
+n019023l.pfb -urw-nimbus sans l-medium-i-normal--0-0-0-0-p-0-iso8859-15
+n019023l.pfb -urw-nimbus sans l-medium-i-normal--0-0-0-0-p-0-iso8859-2
+n019023l.pfb -urw-nimbus sans l-medium-i-normal--0-0-0-0-p-0-iso8859-3
+n019023l.pfb -urw-nimbus sans l-medium-i-normal--0-0-0-0-p-0-iso8859-4
+n019023l.pfb -urw-nimbus sans l-medium-i-normal--0-0-0-0-p-0-iso8859-5
+n019023l.pfb -urw-nimbus sans l-medium-i-normal--0-0-0-0-p-0-iso8859-9
+n019023l.pfb -urw-nimbus sans l-medium-i-normal--0-0-0-0-p-0-koi8-e
+n019023l.pfb -urw-nimbus sans l-medium-i-normal--0-0-0-0-p-0-koi8-ru
+n019023l.pfb -urw-nimbus sans l-medium-i-normal--0-0-0-0-p-0-koi8-r
+n019023l.pfb -urw-nimbus sans l-medium-i-normal--0-0-0-0-p-0-koi8-u
+n019023l.pfb -urw-nimbus sans l-medium-i-normal--0-0-0-0-p-0-koi8-uni
+n019023l.pfb -urw-nimbus sans l-medium-i-normal--0-0-0-0-p-0-microsoft-cp1252
+n019024l.pfb -urw-nimbus sans l-bold-i-normal--0-0-0-0-p-0-adobe-standard
+n019024l.pfb -urw-nimbus sans l-bold-i-normal--0-0-0-0-p-0-ascii-0
+n019024l.pfb -urw-nimbus sans l-bold-i-normal--0-0-0-0-p-0-iso10646-1
+n019024l.pfb -urw-nimbus sans l-bold-i-normal--0-0-0-0-p-0-iso8859-10
+n019024l.pfb -urw-nimbus sans l-bold-i-normal--0-0-0-0-p-0-iso8859-13
+n019024l.pfb -urw-nimbus sans l-bold-i-normal--0-0-0-0-p-0-iso8859-15
+n019024l.pfb -urw-nimbus sans l-bold-i-normal--0-0-0-0-p-0-iso8859-1
+n019024l.pfb -urw-nimbus sans l-bold-i-normal--0-0-0-0-p-0-iso8859-2
+n019024l.pfb -urw-nimbus sans l-bold-i-normal--0-0-0-0-p-0-iso8859-3
+n019024l.pfb -urw-nimbus sans l-bold-i-normal--0-0-0-0-p-0-iso8859-4
+n019024l.pfb -urw-nimbus sans l-bold-i-normal--0-0-0-0-p-0-iso8859-5
+n019024l.pfb -urw-nimbus sans l-bold-i-normal--0-0-0-0-p-0-iso8859-9
+n019024l.pfb -urw-nimbus sans l-bold-i-normal--0-0-0-0-p-0-koi8-e
+n019024l.pfb -urw-nimbus sans l-bold-i-normal--0-0-0-0-p-0-koi8-ru
+n019024l.pfb -urw-nimbus sans l-bold-i-normal--0-0-0-0-p-0-koi8-r
+n019024l.pfb -urw-nimbus sans l-bold-i-normal--0-0-0-0-p-0-koi8-uni
+n019024l.pfb -urw-nimbus sans l-bold-i-normal--0-0-0-0-p-0-koi8-u
+n019024l.pfb -urw-nimbus sans l-bold-i-normal--0-0-0-0-p-0-microsoft-cp1252
+n019043l.pfb -urw-nimbus sans l condensed-medium-r-condensed--0-0-0-0-p-0-adobe-standard
+n019043l.pfb -urw-nimbus sans l condensed-medium-r-condensed--0-0-0-0-p-0-ascii-0
+n019043l.pfb -urw-nimbus sans l condensed-medium-r-condensed--0-0-0-0-p-0-iso10646-1
+n019043l.pfb -urw-nimbus sans l condensed-medium-r-condensed--0-0-0-0-p-0-iso8859-10
+n019043l.pfb -urw-nimbus sans l condensed-medium-r-condensed--0-0-0-0-p-0-iso8859-13
+n019043l.pfb -urw-nimbus sans l condensed-medium-r-condensed--0-0-0-0-p-0-iso8859-15
+n019043l.pfb -urw-nimbus sans l condensed-medium-r-condensed--0-0-0-0-p-0-iso8859-1
+n019043l.pfb -urw-nimbus sans l condensed-medium-r-condensed--0-0-0-0-p-0-iso8859-2
+n019043l.pfb -urw-nimbus sans l condensed-medium-r-condensed--0-0-0-0-p-0-iso8859-3
+n019043l.pfb -urw-nimbus sans l condensed-medium-r-condensed--0-0-0-0-p-0-iso8859-4
+n019043l.pfb -urw-nimbus sans l condensed-medium-r-condensed--0-0-0-0-p-0-iso8859-9
+n019043l.pfb -urw-nimbus sans l condensed-medium-r-condensed--0-0-0-0-p-0-koi8-r
+n019043l.pfb -urw-nimbus sans l condensed-medium-r-condensed--0-0-0-0-p-0-koi8-u
+n019043l.pfb -urw-nimbus sans l condensed-medium-r-condensed--0-0-0-0-p-0-microsoft-cp1252
+n019044l.pfb -urw-nimbus sans l condensed-bold-r-condensed--0-0-0-0-p-0-adobe-standard
+n019044l.pfb -urw-nimbus sans l condensed-bold-r-condensed--0-0-0-0-p-0-ascii-0
+n019044l.pfb -urw-nimbus sans l condensed-bold-r-condensed--0-0-0-0-p-0-iso10646-1
+n019044l.pfb -urw-nimbus sans l condensed-bold-r-condensed--0-0-0-0-p-0-iso8859-10
+n019044l.pfb -urw-nimbus sans l condensed-bold-r-condensed--0-0-0-0-p-0-iso8859-13
+n019044l.pfb -urw-nimbus sans l condensed-bold-r-condensed--0-0-0-0-p-0-iso8859-15
+n019044l.pfb -urw-nimbus sans l condensed-bold-r-condensed--0-0-0-0-p-0-iso8859-1
+n019044l.pfb -urw-nimbus sans l condensed-bold-r-condensed--0-0-0-0-p-0-iso8859-2
+n019044l.pfb -urw-nimbus sans l condensed-bold-r-condensed--0-0-0-0-p-0-iso8859-3
+n019044l.pfb -urw-nimbus sans l condensed-bold-r-condensed--0-0-0-0-p-0-iso8859-4
+n019044l.pfb -urw-nimbus sans l condensed-bold-r-condensed--0-0-0-0-p-0-iso8859-9
+n019044l.pfb -urw-nimbus sans l condensed-bold-r-condensed--0-0-0-0-p-0-koi8-r
+n019044l.pfb -urw-nimbus sans l condensed-bold-r-condensed--0-0-0-0-p-0-koi8-u
+n019044l.pfb -urw-nimbus sans l condensed-bold-r-condensed--0-0-0-0-p-0-microsoft-cp1252
+n019063l.pfb -urw-nimbus sans l condensed-medium-i-condensed--0-0-0-0-p-0-adobe-standard
+n019063l.pfb -urw-nimbus sans l condensed-medium-i-condensed--0-0-0-0-p-0-ascii-0
+n019063l.pfb -urw-nimbus sans l condensed-medium-i-condensed--0-0-0-0-p-0-iso10646-1
+n019063l.pfb -urw-nimbus sans l condensed-medium-i-condensed--0-0-0-0-p-0-iso8859-15
+n019063l.pfb -urw-nimbus sans l condensed-medium-i-condensed--0-0-0-0-p-0-iso8859-1
+n019063l.pfb -urw-nimbus sans l condensed-medium-i-condensed--0-0-0-0-p-0-iso8859-10
+n019063l.pfb -urw-nimbus sans l condensed-medium-i-condensed--0-0-0-0-p-0-iso8859-13
+n019063l.pfb -urw-nimbus sans l condensed-medium-i-condensed--0-0-0-0-p-0-iso8859-2
+n019063l.pfb -urw-nimbus sans l condensed-medium-i-condensed--0-0-0-0-p-0-iso8859-3
+n019063l.pfb -urw-nimbus sans l condensed-medium-i-condensed--0-0-0-0-p-0-iso8859-4
+n019063l.pfb -urw-nimbus sans l condensed-medium-i-condensed--0-0-0-0-p-0-iso8859-9
+n019063l.pfb -urw-nimbus sans l condensed-medium-i-condensed--0-0-0-0-p-0-koi8-r
+n019063l.pfb -urw-nimbus sans l condensed-medium-i-condensed--0-0-0-0-p-0-koi8-u
+n019063l.pfb -urw-nimbus sans l condensed-medium-i-condensed--0-0-0-0-p-0-microsoft-cp1252
+n019064l.pfb -urw-nimbus sans l condensed-bold-i-condensed--0-0-0-0-p-0-adobe-standard
+n019064l.pfb -urw-nimbus sans l condensed-bold-i-condensed--0-0-0-0-p-0-ascii-0
+n019064l.pfb -urw-nimbus sans l condensed-bold-i-condensed--0-0-0-0-p-0-iso10646-1
+n019064l.pfb -urw-nimbus sans l condensed-bold-i-condensed--0-0-0-0-p-0-iso8859-13
+n019064l.pfb -urw-nimbus sans l condensed-bold-i-condensed--0-0-0-0-p-0-iso8859-1
+n019064l.pfb -urw-nimbus sans l condensed-bold-i-condensed--0-0-0-0-p-0-iso8859-10
+n019064l.pfb -urw-nimbus sans l condensed-bold-i-condensed--0-0-0-0-p-0-iso8859-15
+n019064l.pfb -urw-nimbus sans l condensed-bold-i-condensed--0-0-0-0-p-0-iso8859-2
+n019064l.pfb -urw-nimbus sans l condensed-bold-i-condensed--0-0-0-0-p-0-iso8859-3
+n019064l.pfb -urw-nimbus sans l condensed-bold-i-condensed--0-0-0-0-p-0-iso8859-4
+n019064l.pfb -urw-nimbus sans l condensed-bold-i-condensed--0-0-0-0-p-0-iso8859-9
+n019064l.pfb -urw-nimbus sans l condensed-bold-i-condensed--0-0-0-0-p-0-koi8-r
+n019064l.pfb -urw-nimbus sans l condensed-bold-i-condensed--0-0-0-0-p-0-koi8-u
+n019064l.pfb -urw-nimbus sans l condensed-bold-i-condensed--0-0-0-0-p-0-microsoft-cp1252
+n021003l.pfb -urw-nimbus roman no9 l-medium-r-normal--0-0-0-0-p-0-adobe-standard
+n021003l.pfb -urw-nimbus roman no9 l-medium-r-normal--0-0-0-0-p-0-ascii-0
+n021003l.pfb -urw-nimbus roman no9 l-medium-r-normal--0-0-0-0-p-0-iso10646-1
+n021003l.pfb -urw-nimbus roman no9 l-medium-r-normal--0-0-0-0-p-0-iso8859-1
+n021003l.pfb -urw-nimbus roman no9 l-medium-r-normal--0-0-0-0-p-0-iso8859-10
+n021003l.pfb -urw-nimbus roman no9 l-medium-r-normal--0-0-0-0-p-0-iso8859-13
+n021003l.pfb -urw-nimbus roman no9 l-medium-r-normal--0-0-0-0-p-0-iso8859-15
+n021003l.pfb -urw-nimbus roman no9 l-medium-r-normal--0-0-0-0-p-0-iso8859-2
+n021003l.pfb -urw-nimbus roman no9 l-medium-r-normal--0-0-0-0-p-0-iso8859-3
+n021003l.pfb -urw-nimbus roman no9 l-medium-r-normal--0-0-0-0-p-0-iso8859-4
+n021003l.pfb -urw-nimbus roman no9 l-medium-r-normal--0-0-0-0-p-0-iso8859-5
+n021003l.pfb -urw-nimbus roman no9 l-medium-r-normal--0-0-0-0-p-0-iso8859-9
+n021003l.pfb -urw-nimbus roman no9 l-medium-r-normal--0-0-0-0-p-0-koi8-e
+n021003l.pfb -urw-nimbus roman no9 l-medium-r-normal--0-0-0-0-p-0-koi8-ru
+n021003l.pfb -urw-nimbus roman no9 l-medium-r-normal--0-0-0-0-p-0-koi8-r
+n021003l.pfb -urw-nimbus roman no9 l-medium-r-normal--0-0-0-0-p-0-koi8-uni
+n021003l.pfb -urw-nimbus roman no9 l-medium-r-normal--0-0-0-0-p-0-koi8-u
+n021003l.pfb -urw-nimbus roman no9 l-medium-r-normal--0-0-0-0-p-0-microsoft-cp1252
+n021004l.pfb -urw-nimbus roman no9 l-bold-r-normal--0-0-0-0-p-0-adobe-standard
+n021004l.pfb -urw-nimbus roman no9 l-bold-r-normal--0-0-0-0-p-0-ascii-0
+n021004l.pfb -urw-nimbus roman no9 l-bold-r-normal--0-0-0-0-p-0-iso10646-1
+n021004l.pfb -urw-nimbus roman no9 l-bold-r-normal--0-0-0-0-p-0-iso8859-1
+n021004l.pfb -urw-nimbus roman no9 l-bold-r-normal--0-0-0-0-p-0-iso8859-10
+n021004l.pfb -urw-nimbus roman no9 l-bold-r-normal--0-0-0-0-p-0-iso8859-13
+n021004l.pfb -urw-nimbus roman no9 l-bold-r-normal--0-0-0-0-p-0-iso8859-15
+n021004l.pfb -urw-nimbus roman no9 l-bold-r-normal--0-0-0-0-p-0-iso8859-2
+n021004l.pfb -urw-nimbus roman no9 l-bold-r-normal--0-0-0-0-p-0-iso8859-3
+n021004l.pfb -urw-nimbus roman no9 l-bold-r-normal--0-0-0-0-p-0-iso8859-4
+n021004l.pfb -urw-nimbus roman no9 l-bold-r-normal--0-0-0-0-p-0-iso8859-5
+n021004l.pfb -urw-nimbus roman no9 l-bold-r-normal--0-0-0-0-p-0-iso8859-9
+n021004l.pfb -urw-nimbus roman no9 l-bold-r-normal--0-0-0-0-p-0-koi8-e
+n021004l.pfb -urw-nimbus roman no9 l-bold-r-normal--0-0-0-0-p-0-koi8-ru
+n021004l.pfb -urw-nimbus roman no9 l-bold-r-normal--0-0-0-0-p-0-koi8-r
+n021004l.pfb -urw-nimbus roman no9 l-bold-r-normal--0-0-0-0-p-0-koi8-uni
+n021004l.pfb -urw-nimbus roman no9 l-bold-r-normal--0-0-0-0-p-0-koi8-u
+n021004l.pfb -urw-nimbus roman no9 l-bold-r-normal--0-0-0-0-p-0-microsoft-cp1252
+n021023l.pfb -urw-nimbus roman no9 l-medium-i-normal--0-0-0-0-p-0-adobe-standard
+n021023l.pfb -urw-nimbus roman no9 l-medium-i-normal--0-0-0-0-p-0-ascii-0
+n021023l.pfb -urw-nimbus roman no9 l-medium-i-normal--0-0-0-0-p-0-iso10646-1
+n021023l.pfb -urw-nimbus roman no9 l-medium-i-normal--0-0-0-0-p-0-iso8859-1
+n021023l.pfb -urw-nimbus roman no9 l-medium-i-normal--0-0-0-0-p-0-iso8859-10
+n021023l.pfb -urw-nimbus roman no9 l-medium-i-normal--0-0-0-0-p-0-iso8859-13
+n021023l.pfb -urw-nimbus roman no9 l-medium-i-normal--0-0-0-0-p-0-iso8859-15
+n021023l.pfb -urw-nimbus roman no9 l-medium-i-normal--0-0-0-0-p-0-iso8859-2
+n021023l.pfb -urw-nimbus roman no9 l-medium-i-normal--0-0-0-0-p-0-iso8859-3
+n021023l.pfb -urw-nimbus roman no9 l-medium-i-normal--0-0-0-0-p-0-iso8859-4
+n021023l.pfb -urw-nimbus roman no9 l-medium-i-normal--0-0-0-0-p-0-iso8859-5
+n021023l.pfb -urw-nimbus roman no9 l-medium-i-normal--0-0-0-0-p-0-iso8859-9
+n021023l.pfb -urw-nimbus roman no9 l-medium-i-normal--0-0-0-0-p-0-koi8-e
+n021023l.pfb -urw-nimbus roman no9 l-medium-i-normal--0-0-0-0-p-0-koi8-ru
+n021023l.pfb -urw-nimbus roman no9 l-medium-i-normal--0-0-0-0-p-0-koi8-r
+n021023l.pfb -urw-nimbus roman no9 l-medium-i-normal--0-0-0-0-p-0-koi8-u
+n021023l.pfb -urw-nimbus roman no9 l-medium-i-normal--0-0-0-0-p-0-koi8-uni
+n021023l.pfb -urw-nimbus roman no9 l-medium-i-normal--0-0-0-0-p-0-microsoft-cp1252
+n021024l.pfb -urw-nimbus roman no9 l-bold-i-normal--0-0-0-0-p-0-adobe-standard
+n021024l.pfb -urw-nimbus roman no9 l-bold-i-normal--0-0-0-0-p-0-ascii-0
+n021024l.pfb -urw-nimbus roman no9 l-bold-i-normal--0-0-0-0-p-0-iso10646-1
+n021024l.pfb -urw-nimbus roman no9 l-bold-i-normal--0-0-0-0-p-0-iso8859-10
+n021024l.pfb -urw-nimbus roman no9 l-bold-i-normal--0-0-0-0-p-0-iso8859-1
+n021024l.pfb -urw-nimbus roman no9 l-bold-i-normal--0-0-0-0-p-0-iso8859-13
+n021024l.pfb -urw-nimbus roman no9 l-bold-i-normal--0-0-0-0-p-0-iso8859-15
+n021024l.pfb -urw-nimbus roman no9 l-bold-i-normal--0-0-0-0-p-0-iso8859-2
+n021024l.pfb -urw-nimbus roman no9 l-bold-i-normal--0-0-0-0-p-0-iso8859-3
+n021024l.pfb -urw-nimbus roman no9 l-bold-i-normal--0-0-0-0-p-0-iso8859-4
+n021024l.pfb -urw-nimbus roman no9 l-bold-i-normal--0-0-0-0-p-0-iso8859-5
+n021024l.pfb -urw-nimbus roman no9 l-bold-i-normal--0-0-0-0-p-0-iso8859-9
+n021024l.pfb -urw-nimbus roman no9 l-bold-i-normal--0-0-0-0-p-0-koi8-e
+n021024l.pfb -urw-nimbus roman no9 l-bold-i-normal--0-0-0-0-p-0-koi8-ru
+n021024l.pfb -urw-nimbus roman no9 l-bold-i-normal--0-0-0-0-p-0-koi8-r
+n021024l.pfb -urw-nimbus roman no9 l-bold-i-normal--0-0-0-0-p-0-koi8-u
+n021024l.pfb -urw-nimbus roman no9 l-bold-i-normal--0-0-0-0-p-0-koi8-uni
+n021024l.pfb -urw-nimbus roman no9 l-bold-i-normal--0-0-0-0-p-0-microsoft-cp1252
+n022003l.pfb -urw-nimbus mono l-medium-r-normal--0-0-0-0-m-0-adobe-standard
+n022003l.pfb -urw-nimbus mono l-medium-r-normal--0-0-0-0-m-0-ascii-0
+n022003l.pfb -urw-nimbus mono l-medium-r-normal--0-0-0-0-m-0-iso10646-1
+n022003l.pfb -urw-nimbus mono l-medium-r-normal--0-0-0-0-m-0-iso8859-10
+n022003l.pfb -urw-nimbus mono l-medium-r-normal--0-0-0-0-m-0-iso8859-1
+n022003l.pfb -urw-nimbus mono l-medium-r-normal--0-0-0-0-m-0-iso8859-13
+n022003l.pfb -urw-nimbus mono l-medium-r-normal--0-0-0-0-m-0-iso8859-15
+n022003l.pfb -urw-nimbus mono l-medium-r-normal--0-0-0-0-m-0-iso8859-2
+n022003l.pfb -urw-nimbus mono l-medium-r-normal--0-0-0-0-m-0-iso8859-3
+n022003l.pfb -urw-nimbus mono l-medium-r-normal--0-0-0-0-m-0-iso8859-4
+n022003l.pfb -urw-nimbus mono l-medium-r-normal--0-0-0-0-m-0-iso8859-5
+n022003l.pfb -urw-nimbus mono l-medium-r-normal--0-0-0-0-m-0-iso8859-9
+n022003l.pfb -urw-nimbus mono l-medium-r-normal--0-0-0-0-m-0-koi8-e
+n022003l.pfb -urw-nimbus mono l-medium-r-normal--0-0-0-0-m-0-koi8-r
+n022003l.pfb -urw-nimbus mono l-medium-r-normal--0-0-0-0-m-0-koi8-ru
+n022003l.pfb -urw-nimbus mono l-medium-r-normal--0-0-0-0-m-0-koi8-uni
+n022003l.pfb -urw-nimbus mono l-medium-r-normal--0-0-0-0-m-0-koi8-u
+n022003l.pfb -urw-nimbus mono l-medium-r-normal--0-0-0-0-m-0-microsoft-cp1252
+n022004l.pfb -urw-nimbus mono l-bold-r-normal--0-0-0-0-p-0-adobe-standard
+n022004l.pfb -urw-nimbus mono l-bold-r-normal--0-0-0-0-p-0-ascii-0
+n022004l.pfb -urw-nimbus mono l-bold-r-normal--0-0-0-0-p-0-iso10646-1
+n022004l.pfb -urw-nimbus mono l-bold-r-normal--0-0-0-0-p-0-iso8859-10
+n022004l.pfb -urw-nimbus mono l-bold-r-normal--0-0-0-0-p-0-iso8859-1
+n022004l.pfb -urw-nimbus mono l-bold-r-normal--0-0-0-0-p-0-iso8859-13
+n022004l.pfb -urw-nimbus mono l-bold-r-normal--0-0-0-0-p-0-iso8859-15
+n022004l.pfb -urw-nimbus mono l-bold-r-normal--0-0-0-0-p-0-iso8859-2
+n022004l.pfb -urw-nimbus mono l-bold-r-normal--0-0-0-0-p-0-iso8859-3
+n022004l.pfb -urw-nimbus mono l-bold-r-normal--0-0-0-0-p-0-iso8859-4
+n022004l.pfb -urw-nimbus mono l-bold-r-normal--0-0-0-0-p-0-iso8859-5
+n022004l.pfb -urw-nimbus mono l-bold-r-normal--0-0-0-0-p-0-iso8859-9
+n022004l.pfb -urw-nimbus mono l-bold-r-normal--0-0-0-0-p-0-koi8-e
+n022004l.pfb -urw-nimbus mono l-bold-r-normal--0-0-0-0-p-0-koi8-ru
+n022004l.pfb -urw-nimbus mono l-bold-r-normal--0-0-0-0-p-0-koi8-r
+n022004l.pfb -urw-nimbus mono l-bold-r-normal--0-0-0-0-p-0-koi8-uni
+n022004l.pfb -urw-nimbus mono l-bold-r-normal--0-0-0-0-p-0-koi8-u
+n022004l.pfb -urw-nimbus mono l-bold-r-normal--0-0-0-0-p-0-microsoft-cp1252
+n022023l.pfb -urw-nimbus mono l-medium-o-normal--0-0-0-0-p-0-adobe-standard
+n022023l.pfb -urw-nimbus mono l-medium-o-normal--0-0-0-0-p-0-ascii-0
+n022023l.pfb -urw-nimbus mono l-medium-o-normal--0-0-0-0-p-0-iso10646-1
+n022023l.pfb -urw-nimbus mono l-medium-o-normal--0-0-0-0-p-0-iso8859-10
+n022023l.pfb -urw-nimbus mono l-medium-o-normal--0-0-0-0-p-0-iso8859-1
+n022023l.pfb -urw-nimbus mono l-medium-o-normal--0-0-0-0-p-0-iso8859-13
+n022023l.pfb -urw-nimbus mono l-medium-o-normal--0-0-0-0-p-0-iso8859-15
+n022023l.pfb -urw-nimbus mono l-medium-o-normal--0-0-0-0-p-0-iso8859-2
+n022023l.pfb -urw-nimbus mono l-medium-o-normal--0-0-0-0-p-0-iso8859-3
+n022023l.pfb -urw-nimbus mono l-medium-o-normal--0-0-0-0-p-0-iso8859-4
+n022023l.pfb -urw-nimbus mono l-medium-o-normal--0-0-0-0-p-0-iso8859-5
+n022023l.pfb -urw-nimbus mono l-medium-o-normal--0-0-0-0-p-0-iso8859-9
+n022023l.pfb -urw-nimbus mono l-medium-o-normal--0-0-0-0-p-0-koi8-e
+n022023l.pfb -urw-nimbus mono l-medium-o-normal--0-0-0-0-p-0-koi8-ru
+n022023l.pfb -urw-nimbus mono l-medium-o-normal--0-0-0-0-p-0-koi8-r
+n022023l.pfb -urw-nimbus mono l-medium-o-normal--0-0-0-0-p-0-koi8-uni
+n022023l.pfb -urw-nimbus mono l-medium-o-normal--0-0-0-0-p-0-koi8-u
+n022023l.pfb -urw-nimbus mono l-medium-o-normal--0-0-0-0-p-0-microsoft-cp1252
+n022024l.pfb -urw-nimbus mono l-bold-o-normal--0-0-0-0-p-0-adobe-standard
+n022024l.pfb -urw-nimbus mono l-bold-o-normal--0-0-0-0-p-0-ascii-0
+n022024l.pfb -urw-nimbus mono l-bold-o-normal--0-0-0-0-p-0-iso10646-1
+n022024l.pfb -urw-nimbus mono l-bold-o-normal--0-0-0-0-p-0-iso8859-10
+n022024l.pfb -urw-nimbus mono l-bold-o-normal--0-0-0-0-p-0-iso8859-13
+n022024l.pfb -urw-nimbus mono l-bold-o-normal--0-0-0-0-p-0-iso8859-15
+n022024l.pfb -urw-nimbus mono l-bold-o-normal--0-0-0-0-p-0-iso8859-1
+n022024l.pfb -urw-nimbus mono l-bold-o-normal--0-0-0-0-p-0-iso8859-2
+n022024l.pfb -urw-nimbus mono l-bold-o-normal--0-0-0-0-p-0-iso8859-3
+n022024l.pfb -urw-nimbus mono l-bold-o-normal--0-0-0-0-p-0-iso8859-4
+n022024l.pfb -urw-nimbus mono l-bold-o-normal--0-0-0-0-p-0-iso8859-5
+n022024l.pfb -urw-nimbus mono l-bold-o-normal--0-0-0-0-p-0-iso8859-9
+n022024l.pfb -urw-nimbus mono l-bold-o-normal--0-0-0-0-p-0-koi8-e
+n022024l.pfb -urw-nimbus mono l-bold-o-normal--0-0-0-0-p-0-koi8-r
+n022024l.pfb -urw-nimbus mono l-bold-o-normal--0-0-0-0-p-0-koi8-ru
+n022024l.pfb -urw-nimbus mono l-bold-o-normal--0-0-0-0-p-0-koi8-u
+n022024l.pfb -urw-nimbus mono l-bold-o-normal--0-0-0-0-p-0-koi8-uni
+n022024l.pfb -urw-nimbus mono l-bold-o-normal--0-0-0-0-p-0-microsoft-cp1252
+p052003l.pfb -urw-urw palladio l-medium-r-normal--0-0-0-0-p-0-adobe-standard
+p052003l.pfb -urw-urw palladio l-medium-r-normal--0-0-0-0-p-0-ascii-0
+p052003l.pfb -urw-urw palladio l-medium-r-normal--0-0-0-0-p-0-iso10646-1
+p052003l.pfb -urw-urw palladio l-medium-r-normal--0-0-0-0-p-0-iso8859-10
+p052003l.pfb -urw-urw palladio l-medium-r-normal--0-0-0-0-p-0-iso8859-13
+p052003l.pfb -urw-urw palladio l-medium-r-normal--0-0-0-0-p-0-iso8859-15
+p052003l.pfb -urw-urw palladio l-medium-r-normal--0-0-0-0-p-0-iso8859-1
+p052003l.pfb -urw-urw palladio l-medium-r-normal--0-0-0-0-p-0-iso8859-2
+p052003l.pfb -urw-urw palladio l-medium-r-normal--0-0-0-0-p-0-iso8859-3
+p052003l.pfb -urw-urw palladio l-medium-r-normal--0-0-0-0-p-0-iso8859-4
+p052003l.pfb -urw-urw palladio l-medium-r-normal--0-0-0-0-p-0-iso8859-5
+p052003l.pfb -urw-urw palladio l-medium-r-normal--0-0-0-0-p-0-iso8859-9
+p052003l.pfb -urw-urw palladio l-medium-r-normal--0-0-0-0-p-0-koi8-e
+p052003l.pfb -urw-urw palladio l-medium-r-normal--0-0-0-0-p-0-koi8-ru
+p052003l.pfb -urw-urw palladio l-medium-r-normal--0-0-0-0-p-0-koi8-r
+p052003l.pfb -urw-urw palladio l-medium-r-normal--0-0-0-0-p-0-koi8-uni
+p052003l.pfb -urw-urw palladio l-medium-r-normal--0-0-0-0-p-0-koi8-u
+p052003l.pfb -urw-urw palladio l-medium-r-normal--0-0-0-0-p-0-microsoft-cp1252
+p052004l.pfb -urw-urw palladio l-bold-r-normal--0-0-0-0-p-0-adobe-standard
+p052004l.pfb -urw-urw palladio l-bold-r-normal--0-0-0-0-p-0-ascii-0
+p052004l.pfb -urw-urw palladio l-bold-r-normal--0-0-0-0-p-0-iso10646-1
+p052004l.pfb -urw-urw palladio l-bold-r-normal--0-0-0-0-p-0-iso8859-10
+p052004l.pfb -urw-urw palladio l-bold-r-normal--0-0-0-0-p-0-iso8859-1
+p052004l.pfb -urw-urw palladio l-bold-r-normal--0-0-0-0-p-0-iso8859-13
+p052004l.pfb -urw-urw palladio l-bold-r-normal--0-0-0-0-p-0-iso8859-15
+p052004l.pfb -urw-urw palladio l-bold-r-normal--0-0-0-0-p-0-iso8859-2
+p052004l.pfb -urw-urw palladio l-bold-r-normal--0-0-0-0-p-0-iso8859-3
+p052004l.pfb -urw-urw palladio l-bold-r-normal--0-0-0-0-p-0-iso8859-4
+p052004l.pfb -urw-urw palladio l-bold-r-normal--0-0-0-0-p-0-iso8859-5
+p052004l.pfb -urw-urw palladio l-bold-r-normal--0-0-0-0-p-0-iso8859-9
+p052004l.pfb -urw-urw palladio l-bold-r-normal--0-0-0-0-p-0-koi8-e
+p052004l.pfb -urw-urw palladio l-bold-r-normal--0-0-0-0-p-0-koi8-r
+p052004l.pfb -urw-urw palladio l-bold-r-normal--0-0-0-0-p-0-koi8-ru
+p052004l.pfb -urw-urw palladio l-bold-r-normal--0-0-0-0-p-0-koi8-uni
+p052004l.pfb -urw-urw palladio l-bold-r-normal--0-0-0-0-p-0-koi8-u
+p052004l.pfb -urw-urw palladio l-bold-r-normal--0-0-0-0-p-0-microsoft-cp1252
+p052023l.pfb -urw-urw palladio l-medium-i-normal--0-0-0-0-p-0-adobe-standard
+p052023l.pfb -urw-urw palladio l-medium-i-normal--0-0-0-0-p-0-ascii-0
+p052023l.pfb -urw-urw palladio l-medium-i-normal--0-0-0-0-p-0-iso10646-1
+p052023l.pfb -urw-urw palladio l-medium-i-normal--0-0-0-0-p-0-iso8859-10
+p052023l.pfb -urw-urw palladio l-medium-i-normal--0-0-0-0-p-0-iso8859-13
+p052023l.pfb -urw-urw palladio l-medium-i-normal--0-0-0-0-p-0-iso8859-15
+p052023l.pfb -urw-urw palladio l-medium-i-normal--0-0-0-0-p-0-iso8859-1
+p052023l.pfb -urw-urw palladio l-medium-i-normal--0-0-0-0-p-0-iso8859-2
+p052023l.pfb -urw-urw palladio l-medium-i-normal--0-0-0-0-p-0-iso8859-3
+p052023l.pfb -urw-urw palladio l-medium-i-normal--0-0-0-0-p-0-iso8859-4
+p052023l.pfb -urw-urw palladio l-medium-i-normal--0-0-0-0-p-0-iso8859-5
+p052023l.pfb -urw-urw palladio l-medium-i-normal--0-0-0-0-p-0-iso8859-9
+p052023l.pfb -urw-urw palladio l-medium-i-normal--0-0-0-0-p-0-koi8-e
+p052023l.pfb -urw-urw palladio l-medium-i-normal--0-0-0-0-p-0-koi8-r
+p052023l.pfb -urw-urw palladio l-medium-i-normal--0-0-0-0-p-0-koi8-ru
+p052023l.pfb -urw-urw palladio l-medium-i-normal--0-0-0-0-p-0-koi8-uni
+p052023l.pfb -urw-urw palladio l-medium-i-normal--0-0-0-0-p-0-koi8-u
+p052023l.pfb -urw-urw palladio l-medium-i-normal--0-0-0-0-p-0-microsoft-cp1252
+p052024l.pfb -urw-urw palladio l-bold-i-normal--0-0-0-0-p-0-adobe-standard
+p052024l.pfb -urw-urw palladio l-bold-i-normal--0-0-0-0-p-0-ascii-0
+p052024l.pfb -urw-urw palladio l-bold-i-normal--0-0-0-0-p-0-iso10646-1
+p052024l.pfb -urw-urw palladio l-bold-i-normal--0-0-0-0-p-0-iso8859-10
+p052024l.pfb -urw-urw palladio l-bold-i-normal--0-0-0-0-p-0-iso8859-13
+p052024l.pfb -urw-urw palladio l-bold-i-normal--0-0-0-0-p-0-iso8859-1
+p052024l.pfb -urw-urw palladio l-bold-i-normal--0-0-0-0-p-0-iso8859-15
+p052024l.pfb -urw-urw palladio l-bold-i-normal--0-0-0-0-p-0-iso8859-2
+p052024l.pfb -urw-urw palladio l-bold-i-normal--0-0-0-0-p-0-iso8859-3
+p052024l.pfb -urw-urw palladio l-bold-i-normal--0-0-0-0-p-0-iso8859-4
+p052024l.pfb -urw-urw palladio l-bold-i-normal--0-0-0-0-p-0-iso8859-5
+p052024l.pfb -urw-urw palladio l-bold-i-normal--0-0-0-0-p-0-iso8859-9
+p052024l.pfb -urw-urw palladio l-bold-i-normal--0-0-0-0-p-0-koi8-e
+p052024l.pfb -urw-urw palladio l-bold-i-normal--0-0-0-0-p-0-koi8-ru
+p052024l.pfb -urw-urw palladio l-bold-i-normal--0-0-0-0-p-0-koi8-r
+p052024l.pfb -urw-urw palladio l-bold-i-normal--0-0-0-0-p-0-koi8-u
+p052024l.pfb -urw-urw palladio l-bold-i-normal--0-0-0-0-p-0-koi8-uni
+p052024l.pfb -urw-urw palladio l-bold-i-normal--0-0-0-0-p-0-microsoft-cp1252
+s050000l.pfb -urw-standard symbols l-medium-r-normal--0-0-0-0-p-0-adobe-symbol
+s050000l.pfb -urw-standard symbols l-medium-r-normal--0-0-0-0-p-0-iso10646-1
+z003034l.pfb -urw-urw chancery l-medium-i-normal--0-0-0-0-p-0-adobe-standard
+z003034l.pfb -urw-urw chancery l-medium-i-normal--0-0-0-0-p-0-ascii-0
+z003034l.pfb -urw-urw chancery l-medium-i-normal--0-0-0-0-p-0-iso10646-1
+z003034l.pfb -urw-urw chancery l-medium-i-normal--0-0-0-0-p-0-iso8859-10
+z003034l.pfb -urw-urw chancery l-medium-i-normal--0-0-0-0-p-0-iso8859-13
+z003034l.pfb -urw-urw chancery l-medium-i-normal--0-0-0-0-p-0-iso8859-15
+z003034l.pfb -urw-urw chancery l-medium-i-normal--0-0-0-0-p-0-iso8859-1
+z003034l.pfb -urw-urw chancery l-medium-i-normal--0-0-0-0-p-0-iso8859-2
+z003034l.pfb -urw-urw chancery l-medium-i-normal--0-0-0-0-p-0-iso8859-3
+z003034l.pfb -urw-urw chancery l-medium-i-normal--0-0-0-0-p-0-iso8859-4
+z003034l.pfb -urw-urw chancery l-medium-i-normal--0-0-0-0-p-0-iso8859-5
+z003034l.pfb -urw-urw chancery l-medium-i-normal--0-0-0-0-p-0-iso8859-9
+z003034l.pfb -urw-urw chancery l-medium-i-normal--0-0-0-0-p-0-koi8-e
+z003034l.pfb -urw-urw chancery l-medium-i-normal--0-0-0-0-p-0-koi8-ru
+z003034l.pfb -urw-urw chancery l-medium-i-normal--0-0-0-0-p-0-koi8-r
+z003034l.pfb -urw-urw chancery l-medium-i-normal--0-0-0-0-p-0-koi8-uni
+z003034l.pfb -urw-urw chancery l-medium-i-normal--0-0-0-0-p-0-koi8-u
+z003034l.pfb -urw-urw chancery l-medium-i-normal--0-0-0-0-p-0-microsoft-cp1252
diff --git a/x11-fonts/linux-urw-fonts/files/fonts.scale b/x11-fonts/linux-urw-fonts/files/fonts.scale
new file mode 100644
index 000000000000..14103fdece8d
--- /dev/null
+++ b/x11-fonts/linux-urw-fonts/files/fonts.scale
@@ -0,0 +1,582 @@
+581
+a010013l.pfb -urw-urw gothic l-medium-r-normal--0-0-0-0-p-0-adobe-standard
+a010013l.pfb -urw-urw gothic l-medium-r-normal--0-0-0-0-p-0-ascii-0
+a010013l.pfb -urw-urw gothic l-medium-r-normal--0-0-0-0-p-0-iso10646-1
+a010013l.pfb -urw-urw gothic l-medium-r-normal--0-0-0-0-p-0-iso8859-10
+a010013l.pfb -urw-urw gothic l-medium-r-normal--0-0-0-0-p-0-iso8859-13
+a010013l.pfb -urw-urw gothic l-medium-r-normal--0-0-0-0-p-0-iso8859-1
+a010013l.pfb -urw-urw gothic l-medium-r-normal--0-0-0-0-p-0-iso8859-15
+a010013l.pfb -urw-urw gothic l-medium-r-normal--0-0-0-0-p-0-iso8859-2
+a010013l.pfb -urw-urw gothic l-medium-r-normal--0-0-0-0-p-0-iso8859-3
+a010013l.pfb -urw-urw gothic l-medium-r-normal--0-0-0-0-p-0-iso8859-4
+a010013l.pfb -urw-urw gothic l-medium-r-normal--0-0-0-0-p-0-iso8859-5
+a010013l.pfb -urw-urw gothic l-medium-r-normal--0-0-0-0-p-0-iso8859-9
+a010013l.pfb -urw-urw gothic l-medium-r-normal--0-0-0-0-p-0-koi8-e
+a010013l.pfb -urw-urw gothic l-medium-r-normal--0-0-0-0-p-0-koi8-r
+a010013l.pfb -urw-urw gothic l-medium-r-normal--0-0-0-0-p-0-koi8-ru
+a010013l.pfb -urw-urw gothic l-medium-r-normal--0-0-0-0-p-0-koi8-uni
+a010013l.pfb -urw-urw gothic l-medium-r-normal--0-0-0-0-p-0-koi8-u
+a010013l.pfb -urw-urw gothic l-medium-r-normal--0-0-0-0-p-0-microsoft-cp1252
+a010015l.pfb -urw-urw gothic l-semibold-r-normal--0-0-0-0-p-0-adobe-standard
+a010015l.pfb -urw-urw gothic l-semibold-r-normal--0-0-0-0-p-0-ascii-0
+a010015l.pfb -urw-urw gothic l-semibold-r-normal--0-0-0-0-p-0-iso10646-1
+a010015l.pfb -urw-urw gothic l-semibold-r-normal--0-0-0-0-p-0-iso8859-13
+a010015l.pfb -urw-urw gothic l-semibold-r-normal--0-0-0-0-p-0-iso8859-15
+a010015l.pfb -urw-urw gothic l-semibold-r-normal--0-0-0-0-p-0-iso8859-1
+a010015l.pfb -urw-urw gothic l-semibold-r-normal--0-0-0-0-p-0-iso8859-10
+a010015l.pfb -urw-urw gothic l-semibold-r-normal--0-0-0-0-p-0-iso8859-2
+a010015l.pfb -urw-urw gothic l-semibold-r-normal--0-0-0-0-p-0-iso8859-3
+a010015l.pfb -urw-urw gothic l-semibold-r-normal--0-0-0-0-p-0-iso8859-4
+a010015l.pfb -urw-urw gothic l-semibold-r-normal--0-0-0-0-p-0-iso8859-5
+a010015l.pfb -urw-urw gothic l-semibold-r-normal--0-0-0-0-p-0-iso8859-9
+a010015l.pfb -urw-urw gothic l-semibold-r-normal--0-0-0-0-p-0-koi8-e
+a010015l.pfb -urw-urw gothic l-semibold-r-normal--0-0-0-0-p-0-koi8-ru
+a010015l.pfb -urw-urw gothic l-semibold-r-normal--0-0-0-0-p-0-koi8-r
+a010015l.pfb -urw-urw gothic l-semibold-r-normal--0-0-0-0-p-0-koi8-uni
+a010015l.pfb -urw-urw gothic l-semibold-r-normal--0-0-0-0-p-0-koi8-u
+a010015l.pfb -urw-urw gothic l-semibold-r-normal--0-0-0-0-p-0-microsoft-cp1252
+a010033l.pfb -urw-urw gothic l-medium-o-normal--0-0-0-0-p-0-adobe-standard
+a010033l.pfb -urw-urw gothic l-medium-o-normal--0-0-0-0-p-0-ascii-0
+a010033l.pfb -urw-urw gothic l-medium-o-normal--0-0-0-0-p-0-iso10646-1
+a010033l.pfb -urw-urw gothic l-medium-o-normal--0-0-0-0-p-0-iso8859-10
+a010033l.pfb -urw-urw gothic l-medium-o-normal--0-0-0-0-p-0-iso8859-1
+a010033l.pfb -urw-urw gothic l-medium-o-normal--0-0-0-0-p-0-iso8859-13
+a010033l.pfb -urw-urw gothic l-medium-o-normal--0-0-0-0-p-0-iso8859-15
+a010033l.pfb -urw-urw gothic l-medium-o-normal--0-0-0-0-p-0-iso8859-2
+a010033l.pfb -urw-urw gothic l-medium-o-normal--0-0-0-0-p-0-iso8859-3
+a010033l.pfb -urw-urw gothic l-medium-o-normal--0-0-0-0-p-0-iso8859-4
+a010033l.pfb -urw-urw gothic l-medium-o-normal--0-0-0-0-p-0-iso8859-5
+a010033l.pfb -urw-urw gothic l-medium-o-normal--0-0-0-0-p-0-iso8859-9
+a010033l.pfb -urw-urw gothic l-medium-o-normal--0-0-0-0-p-0-koi8-e
+a010033l.pfb -urw-urw gothic l-medium-o-normal--0-0-0-0-p-0-koi8-ru
+a010033l.pfb -urw-urw gothic l-medium-o-normal--0-0-0-0-p-0-koi8-r
+a010033l.pfb -urw-urw gothic l-medium-o-normal--0-0-0-0-p-0-koi8-u
+a010033l.pfb -urw-urw gothic l-medium-o-normal--0-0-0-0-p-0-koi8-uni
+a010033l.pfb -urw-urw gothic l-medium-o-normal--0-0-0-0-p-0-microsoft-cp1252
+a010035l.pfb -urw-urw gothic l-semibold-o-normal--0-0-0-0-p-0-adobe-standard
+a010035l.pfb -urw-urw gothic l-semibold-o-normal--0-0-0-0-p-0-ascii-0
+a010035l.pfb -urw-urw gothic l-semibold-o-normal--0-0-0-0-p-0-iso10646-1
+a010035l.pfb -urw-urw gothic l-semibold-o-normal--0-0-0-0-p-0-iso8859-10
+a010035l.pfb -urw-urw gothic l-semibold-o-normal--0-0-0-0-p-0-iso8859-13
+a010035l.pfb -urw-urw gothic l-semibold-o-normal--0-0-0-0-p-0-iso8859-1
+a010035l.pfb -urw-urw gothic l-semibold-o-normal--0-0-0-0-p-0-iso8859-15
+a010035l.pfb -urw-urw gothic l-semibold-o-normal--0-0-0-0-p-0-iso8859-2
+a010035l.pfb -urw-urw gothic l-semibold-o-normal--0-0-0-0-p-0-iso8859-3
+a010035l.pfb -urw-urw gothic l-semibold-o-normal--0-0-0-0-p-0-iso8859-4
+a010035l.pfb -urw-urw gothic l-semibold-o-normal--0-0-0-0-p-0-iso8859-5
+a010035l.pfb -urw-urw gothic l-semibold-o-normal--0-0-0-0-p-0-iso8859-9
+a010035l.pfb -urw-urw gothic l-semibold-o-normal--0-0-0-0-p-0-koi8-e
+a010035l.pfb -urw-urw gothic l-semibold-o-normal--0-0-0-0-p-0-koi8-r
+a010035l.pfb -urw-urw gothic l-semibold-o-normal--0-0-0-0-p-0-koi8-ru
+a010035l.pfb -urw-urw gothic l-semibold-o-normal--0-0-0-0-p-0-koi8-uni
+a010035l.pfb -urw-urw gothic l-semibold-o-normal--0-0-0-0-p-0-koi8-u
+a010035l.pfb -urw-urw gothic l-semibold-o-normal--0-0-0-0-p-0-microsoft-cp1252
+b018012l.pfb -urw-urw bookman l-medium-r-normal--0-0-0-0-p-0-adobe-standard
+b018012l.pfb -urw-urw bookman l-medium-r-normal--0-0-0-0-p-0-ascii-0
+b018012l.pfb -urw-urw bookman l-medium-r-normal--0-0-0-0-p-0-iso10646-1
+b018012l.pfb -urw-urw bookman l-medium-r-normal--0-0-0-0-p-0-iso8859-10
+b018012l.pfb -urw-urw bookman l-medium-r-normal--0-0-0-0-p-0-iso8859-13
+b018012l.pfb -urw-urw bookman l-medium-r-normal--0-0-0-0-p-0-iso8859-1
+b018012l.pfb -urw-urw bookman l-medium-r-normal--0-0-0-0-p-0-iso8859-15
+b018012l.pfb -urw-urw bookman l-medium-r-normal--0-0-0-0-p-0-iso8859-2
+b018012l.pfb -urw-urw bookman l-medium-r-normal--0-0-0-0-p-0-iso8859-3
+b018012l.pfb -urw-urw bookman l-medium-r-normal--0-0-0-0-p-0-iso8859-4
+b018012l.pfb -urw-urw bookman l-medium-r-normal--0-0-0-0-p-0-iso8859-5
+b018012l.pfb -urw-urw bookman l-medium-r-normal--0-0-0-0-p-0-iso8859-9
+b018012l.pfb -urw-urw bookman l-medium-r-normal--0-0-0-0-p-0-koi8-e
+b018012l.pfb -urw-urw bookman l-medium-r-normal--0-0-0-0-p-0-koi8-ru
+b018012l.pfb -urw-urw bookman l-medium-r-normal--0-0-0-0-p-0-koi8-r
+b018012l.pfb -urw-urw bookman l-medium-r-normal--0-0-0-0-p-0-koi8-u
+b018012l.pfb -urw-urw bookman l-medium-r-normal--0-0-0-0-p-0-koi8-uni
+b018012l.pfb -urw-urw bookman l-medium-r-normal--0-0-0-0-p-0-microsoft-cp1252
+b018015l.pfb -urw-urw bookman l-bold-r-normal--0-0-0-0-p-0-adobe-standard
+b018015l.pfb -urw-urw bookman l-bold-r-normal--0-0-0-0-p-0-ascii-0
+b018015l.pfb -urw-urw bookman l-bold-r-normal--0-0-0-0-p-0-iso10646-1
+b018015l.pfb -urw-urw bookman l-bold-r-normal--0-0-0-0-p-0-iso8859-1
+b018015l.pfb -urw-urw bookman l-bold-r-normal--0-0-0-0-p-0-iso8859-10
+b018015l.pfb -urw-urw bookman l-bold-r-normal--0-0-0-0-p-0-iso8859-13
+b018015l.pfb -urw-urw bookman l-bold-r-normal--0-0-0-0-p-0-iso8859-15
+b018015l.pfb -urw-urw bookman l-bold-r-normal--0-0-0-0-p-0-iso8859-2
+b018015l.pfb -urw-urw bookman l-bold-r-normal--0-0-0-0-p-0-iso8859-3
+b018015l.pfb -urw-urw bookman l-bold-r-normal--0-0-0-0-p-0-iso8859-4
+b018015l.pfb -urw-urw bookman l-bold-r-normal--0-0-0-0-p-0-iso8859-5
+b018015l.pfb -urw-urw bookman l-bold-r-normal--0-0-0-0-p-0-iso8859-9
+b018015l.pfb -urw-urw bookman l-bold-r-normal--0-0-0-0-p-0-koi8-e
+b018015l.pfb -urw-urw bookman l-bold-r-normal--0-0-0-0-p-0-koi8-ru
+b018015l.pfb -urw-urw bookman l-bold-r-normal--0-0-0-0-p-0-koi8-r
+b018015l.pfb -urw-urw bookman l-bold-r-normal--0-0-0-0-p-0-koi8-uni
+b018015l.pfb -urw-urw bookman l-bold-r-normal--0-0-0-0-p-0-koi8-u
+b018015l.pfb -urw-urw bookman l-bold-r-normal--0-0-0-0-p-0-microsoft-cp1252
+b018032l.pfb -urw-urw bookman l-medium-i-normal--0-0-0-0-p-0-adobe-standard
+b018032l.pfb -urw-urw bookman l-medium-i-normal--0-0-0-0-p-0-ascii-0
+b018032l.pfb -urw-urw bookman l-medium-i-normal--0-0-0-0-p-0-iso10646-1
+b018032l.pfb -urw-urw bookman l-medium-i-normal--0-0-0-0-p-0-iso8859-10
+b018032l.pfb -urw-urw bookman l-medium-i-normal--0-0-0-0-p-0-iso8859-13
+b018032l.pfb -urw-urw bookman l-medium-i-normal--0-0-0-0-p-0-iso8859-15
+b018032l.pfb -urw-urw bookman l-medium-i-normal--0-0-0-0-p-0-iso8859-1
+b018032l.pfb -urw-urw bookman l-medium-i-normal--0-0-0-0-p-0-iso8859-2
+b018032l.pfb -urw-urw bookman l-medium-i-normal--0-0-0-0-p-0-iso8859-3
+b018032l.pfb -urw-urw bookman l-medium-i-normal--0-0-0-0-p-0-iso8859-4
+b018032l.pfb -urw-urw bookman l-medium-i-normal--0-0-0-0-p-0-iso8859-5
+b018032l.pfb -urw-urw bookman l-medium-i-normal--0-0-0-0-p-0-iso8859-9
+b018032l.pfb -urw-urw bookman l-medium-i-normal--0-0-0-0-p-0-koi8-e
+b018032l.pfb -urw-urw bookman l-medium-i-normal--0-0-0-0-p-0-koi8-ru
+b018032l.pfb -urw-urw bookman l-medium-i-normal--0-0-0-0-p-0-koi8-r
+b018032l.pfb -urw-urw bookman l-medium-i-normal--0-0-0-0-p-0-koi8-uni
+b018032l.pfb -urw-urw bookman l-medium-i-normal--0-0-0-0-p-0-koi8-u
+b018032l.pfb -urw-urw bookman l-medium-i-normal--0-0-0-0-p-0-microsoft-cp1252
+b018035l.pfb -urw-urw bookman l-bold-i-normal--0-0-0-0-p-0-adobe-standard
+b018035l.pfb -urw-urw bookman l-bold-i-normal--0-0-0-0-p-0-ascii-0
+b018035l.pfb -urw-urw bookman l-bold-i-normal--0-0-0-0-p-0-iso10646-1
+b018035l.pfb -urw-urw bookman l-bold-i-normal--0-0-0-0-p-0-iso8859-10
+b018035l.pfb -urw-urw bookman l-bold-i-normal--0-0-0-0-p-0-iso8859-13
+b018035l.pfb -urw-urw bookman l-bold-i-normal--0-0-0-0-p-0-iso8859-1
+b018035l.pfb -urw-urw bookman l-bold-i-normal--0-0-0-0-p-0-iso8859-15
+b018035l.pfb -urw-urw bookman l-bold-i-normal--0-0-0-0-p-0-iso8859-2
+b018035l.pfb -urw-urw bookman l-bold-i-normal--0-0-0-0-p-0-iso8859-3
+b018035l.pfb -urw-urw bookman l-bold-i-normal--0-0-0-0-p-0-iso8859-4
+b018035l.pfb -urw-urw bookman l-bold-i-normal--0-0-0-0-p-0-iso8859-5
+b018035l.pfb -urw-urw bookman l-bold-i-normal--0-0-0-0-p-0-iso8859-9
+b018035l.pfb -urw-urw bookman l-bold-i-normal--0-0-0-0-p-0-koi8-e
+b018035l.pfb -urw-urw bookman l-bold-i-normal--0-0-0-0-p-0-koi8-ru
+b018035l.pfb -urw-urw bookman l-bold-i-normal--0-0-0-0-p-0-koi8-r
+b018035l.pfb -urw-urw bookman l-bold-i-normal--0-0-0-0-p-0-koi8-uni
+b018035l.pfb -urw-urw bookman l-bold-i-normal--0-0-0-0-p-0-koi8-u
+b018035l.pfb -urw-urw bookman l-bold-i-normal--0-0-0-0-p-0-microsoft-cp1252
+c059013l.pfb -urw-century schoolbook l-medium-r-normal--0-0-0-0-p-0-adobe-standard
+c059013l.pfb -urw-century schoolbook l-medium-r-normal--0-0-0-0-p-0-ascii-0
+c059013l.pfb -urw-century schoolbook l-medium-r-normal--0-0-0-0-p-0-iso10646-1
+c059013l.pfb -urw-century schoolbook l-medium-r-normal--0-0-0-0-p-0-iso8859-10
+c059013l.pfb -urw-century schoolbook l-medium-r-normal--0-0-0-0-p-0-iso8859-1
+c059013l.pfb -urw-century schoolbook l-medium-r-normal--0-0-0-0-p-0-iso8859-13
+c059013l.pfb -urw-century schoolbook l-medium-r-normal--0-0-0-0-p-0-iso8859-15
+c059013l.pfb -urw-century schoolbook l-medium-r-normal--0-0-0-0-p-0-iso8859-2
+c059013l.pfb -urw-century schoolbook l-medium-r-normal--0-0-0-0-p-0-iso8859-3
+c059013l.pfb -urw-century schoolbook l-medium-r-normal--0-0-0-0-p-0-iso8859-4
+c059013l.pfb -urw-century schoolbook l-medium-r-normal--0-0-0-0-p-0-iso8859-5
+c059013l.pfb -urw-century schoolbook l-medium-r-normal--0-0-0-0-p-0-iso8859-9
+c059013l.pfb -urw-century schoolbook l-medium-r-normal--0-0-0-0-p-0-koi8-e
+c059013l.pfb -urw-century schoolbook l-medium-r-normal--0-0-0-0-p-0-koi8-ru
+c059013l.pfb -urw-century schoolbook l-medium-r-normal--0-0-0-0-p-0-koi8-r
+c059013l.pfb -urw-century schoolbook l-medium-r-normal--0-0-0-0-p-0-koi8-uni
+c059013l.pfb -urw-century schoolbook l-medium-r-normal--0-0-0-0-p-0-koi8-u
+c059013l.pfb -urw-century schoolbook l-medium-r-normal--0-0-0-0-p-0-microsoft-cp1252
+c059016l.pfb -urw-century schoolbook l-bold-r-normal--0-0-0-0-p-0-adobe-standard
+c059016l.pfb -urw-century schoolbook l-bold-r-normal--0-0-0-0-p-0-ascii-0
+c059016l.pfb -urw-century schoolbook l-bold-r-normal--0-0-0-0-p-0-iso10646-1
+c059016l.pfb -urw-century schoolbook l-bold-r-normal--0-0-0-0-p-0-iso8859-10
+c059016l.pfb -urw-century schoolbook l-bold-r-normal--0-0-0-0-p-0-iso8859-1
+c059016l.pfb -urw-century schoolbook l-bold-r-normal--0-0-0-0-p-0-iso8859-13
+c059016l.pfb -urw-century schoolbook l-bold-r-normal--0-0-0-0-p-0-iso8859-15
+c059016l.pfb -urw-century schoolbook l-bold-r-normal--0-0-0-0-p-0-iso8859-2
+c059016l.pfb -urw-century schoolbook l-bold-r-normal--0-0-0-0-p-0-iso8859-3
+c059016l.pfb -urw-century schoolbook l-bold-r-normal--0-0-0-0-p-0-iso8859-4
+c059016l.pfb -urw-century schoolbook l-bold-r-normal--0-0-0-0-p-0-iso8859-5
+c059016l.pfb -urw-century schoolbook l-bold-r-normal--0-0-0-0-p-0-iso8859-9
+c059016l.pfb -urw-century schoolbook l-bold-r-normal--0-0-0-0-p-0-koi8-e
+c059016l.pfb -urw-century schoolbook l-bold-r-normal--0-0-0-0-p-0-koi8-r
+c059016l.pfb -urw-century schoolbook l-bold-r-normal--0-0-0-0-p-0-koi8-ru
+c059016l.pfb -urw-century schoolbook l-bold-r-normal--0-0-0-0-p-0-koi8-uni
+c059016l.pfb -urw-century schoolbook l-bold-r-normal--0-0-0-0-p-0-koi8-u
+c059016l.pfb -urw-century schoolbook l-bold-r-normal--0-0-0-0-p-0-microsoft-cp1252
+c059033l.pfb -urw-century schoolbook l-medium-i-normal--0-0-0-0-p-0-adobe-standard
+c059033l.pfb -urw-century schoolbook l-medium-i-normal--0-0-0-0-p-0-ascii-0
+c059033l.pfb -urw-century schoolbook l-medium-i-normal--0-0-0-0-p-0-iso10646-1
+c059033l.pfb -urw-century schoolbook l-medium-i-normal--0-0-0-0-p-0-iso8859-10
+c059033l.pfb -urw-century schoolbook l-medium-i-normal--0-0-0-0-p-0-iso8859-1
+c059033l.pfb -urw-century schoolbook l-medium-i-normal--0-0-0-0-p-0-iso8859-13
+c059033l.pfb -urw-century schoolbook l-medium-i-normal--0-0-0-0-p-0-iso8859-15
+c059033l.pfb -urw-century schoolbook l-medium-i-normal--0-0-0-0-p-0-iso8859-2
+c059033l.pfb -urw-century schoolbook l-medium-i-normal--0-0-0-0-p-0-iso8859-3
+c059033l.pfb -urw-century schoolbook l-medium-i-normal--0-0-0-0-p-0-iso8859-4
+c059033l.pfb -urw-century schoolbook l-medium-i-normal--0-0-0-0-p-0-iso8859-5
+c059033l.pfb -urw-century schoolbook l-medium-i-normal--0-0-0-0-p-0-iso8859-9
+c059033l.pfb -urw-century schoolbook l-medium-i-normal--0-0-0-0-p-0-koi8-e
+c059033l.pfb -urw-century schoolbook l-medium-i-normal--0-0-0-0-p-0-koi8-ru
+c059033l.pfb -urw-century schoolbook l-medium-i-normal--0-0-0-0-p-0-koi8-r
+c059033l.pfb -urw-century schoolbook l-medium-i-normal--0-0-0-0-p-0-koi8-uni
+c059033l.pfb -urw-century schoolbook l-medium-i-normal--0-0-0-0-p-0-koi8-u
+c059033l.pfb -urw-century schoolbook l-medium-i-normal--0-0-0-0-p-0-microsoft-cp1252
+c059036l.pfb -urw-century schoolbook l-bold-i-normal--0-0-0-0-p-0-adobe-standard
+c059036l.pfb -urw-century schoolbook l-bold-i-normal--0-0-0-0-p-0-ascii-0
+c059036l.pfb -urw-century schoolbook l-bold-i-normal--0-0-0-0-p-0-iso10646-1
+c059036l.pfb -urw-century schoolbook l-bold-i-normal--0-0-0-0-p-0-iso8859-1
+c059036l.pfb -urw-century schoolbook l-bold-i-normal--0-0-0-0-p-0-iso8859-10
+c059036l.pfb -urw-century schoolbook l-bold-i-normal--0-0-0-0-p-0-iso8859-13
+c059036l.pfb -urw-century schoolbook l-bold-i-normal--0-0-0-0-p-0-iso8859-15
+c059036l.pfb -urw-century schoolbook l-bold-i-normal--0-0-0-0-p-0-iso8859-2
+c059036l.pfb -urw-century schoolbook l-bold-i-normal--0-0-0-0-p-0-iso8859-3
+c059036l.pfb -urw-century schoolbook l-bold-i-normal--0-0-0-0-p-0-iso8859-4
+c059036l.pfb -urw-century schoolbook l-bold-i-normal--0-0-0-0-p-0-iso8859-5
+c059036l.pfb -urw-century schoolbook l-bold-i-normal--0-0-0-0-p-0-iso8859-9
+c059036l.pfb -urw-century schoolbook l-bold-i-normal--0-0-0-0-p-0-koi8-e
+c059036l.pfb -urw-century schoolbook l-bold-i-normal--0-0-0-0-p-0-koi8-ru
+c059036l.pfb -urw-century schoolbook l-bold-i-normal--0-0-0-0-p-0-koi8-r
+c059036l.pfb -urw-century schoolbook l-bold-i-normal--0-0-0-0-p-0-koi8-uni
+c059036l.pfb -urw-century schoolbook l-bold-i-normal--0-0-0-0-p-0-koi8-u
+c059036l.pfb -urw-century schoolbook l-bold-i-normal--0-0-0-0-p-0-microsoft-cp1252
+d050000l.pfb -urw-dingbats-medium-r-normal--0-0-0-0-p-0-adobe-fontspecific
+n019003l.pfb -urw-nimbus sans l-medium-r-normal--0-0-0-0-p-0-adobe-standard
+n019003l.pfb -urw-nimbus sans l-medium-r-normal--0-0-0-0-p-0-ascii-0
+n019003l.pfb -urw-nimbus sans l-medium-r-normal--0-0-0-0-p-0-iso10646-1
+n019003l.pfb -urw-nimbus sans l-medium-r-normal--0-0-0-0-p-0-iso8859-10
+n019003l.pfb -urw-nimbus sans l-medium-r-normal--0-0-0-0-p-0-iso8859-1
+n019003l.pfb -urw-nimbus sans l-medium-r-normal--0-0-0-0-p-0-iso8859-13
+n019003l.pfb -urw-nimbus sans l-medium-r-normal--0-0-0-0-p-0-iso8859-15
+n019003l.pfb -urw-nimbus sans l-medium-r-normal--0-0-0-0-p-0-iso8859-2
+n019003l.pfb -urw-nimbus sans l-medium-r-normal--0-0-0-0-p-0-iso8859-3
+n019003l.pfb -urw-nimbus sans l-medium-r-normal--0-0-0-0-p-0-iso8859-4
+n019003l.pfb -urw-nimbus sans l-medium-r-normal--0-0-0-0-p-0-iso8859-5
+n019003l.pfb -urw-nimbus sans l-medium-r-normal--0-0-0-0-p-0-iso8859-9
+n019003l.pfb -urw-nimbus sans l-medium-r-normal--0-0-0-0-p-0-koi8-e
+n019003l.pfb -urw-nimbus sans l-medium-r-normal--0-0-0-0-p-0-koi8-ru
+n019003l.pfb -urw-nimbus sans l-medium-r-normal--0-0-0-0-p-0-koi8-r
+n019003l.pfb -urw-nimbus sans l-medium-r-normal--0-0-0-0-p-0-koi8-uni
+n019003l.pfb -urw-nimbus sans l-medium-r-normal--0-0-0-0-p-0-koi8-u
+n019003l.pfb -urw-nimbus sans l-medium-r-normal--0-0-0-0-p-0-microsoft-cp1252
+n019004l.pfb -urw-nimbus sans l-bold-r-normal--0-0-0-0-p-0-adobe-standard
+n019004l.pfb -urw-nimbus sans l-bold-r-normal--0-0-0-0-p-0-ascii-0
+n019004l.pfb -urw-nimbus sans l-bold-r-normal--0-0-0-0-p-0-iso10646-1
+n019004l.pfb -urw-nimbus sans l-bold-r-normal--0-0-0-0-p-0-iso8859-10
+n019004l.pfb -urw-nimbus sans l-bold-r-normal--0-0-0-0-p-0-iso8859-1
+n019004l.pfb -urw-nimbus sans l-bold-r-normal--0-0-0-0-p-0-iso8859-13
+n019004l.pfb -urw-nimbus sans l-bold-r-normal--0-0-0-0-p-0-iso8859-15
+n019004l.pfb -urw-nimbus sans l-bold-r-normal--0-0-0-0-p-0-iso8859-2
+n019004l.pfb -urw-nimbus sans l-bold-r-normal--0-0-0-0-p-0-iso8859-3
+n019004l.pfb -urw-nimbus sans l-bold-r-normal--0-0-0-0-p-0-iso8859-4
+n019004l.pfb -urw-nimbus sans l-bold-r-normal--0-0-0-0-p-0-iso8859-5
+n019004l.pfb -urw-nimbus sans l-bold-r-normal--0-0-0-0-p-0-iso8859-9
+n019004l.pfb -urw-nimbus sans l-bold-r-normal--0-0-0-0-p-0-koi8-e
+n019004l.pfb -urw-nimbus sans l-bold-r-normal--0-0-0-0-p-0-koi8-ru
+n019004l.pfb -urw-nimbus sans l-bold-r-normal--0-0-0-0-p-0-koi8-r
+n019004l.pfb -urw-nimbus sans l-bold-r-normal--0-0-0-0-p-0-koi8-uni
+n019004l.pfb -urw-nimbus sans l-bold-r-normal--0-0-0-0-p-0-koi8-u
+n019004l.pfb -urw-nimbus sans l-bold-r-normal--0-0-0-0-p-0-microsoft-cp1252
+n019023l.pfb -urw-nimbus sans l-medium-i-normal--0-0-0-0-p-0-adobe-standard
+n019023l.pfb -urw-nimbus sans l-medium-i-normal--0-0-0-0-p-0-ascii-0
+n019023l.pfb -urw-nimbus sans l-medium-i-normal--0-0-0-0-p-0-iso10646-1
+n019023l.pfb -urw-nimbus sans l-medium-i-normal--0-0-0-0-p-0-iso8859-10
+n019023l.pfb -urw-nimbus sans l-medium-i-normal--0-0-0-0-p-0-iso8859-13
+n019023l.pfb -urw-nimbus sans l-medium-i-normal--0-0-0-0-p-0-iso8859-1
+n019023l.pfb -urw-nimbus sans l-medium-i-normal--0-0-0-0-p-0-iso8859-15
+n019023l.pfb -urw-nimbus sans l-medium-i-normal--0-0-0-0-p-0-iso8859-2
+n019023l.pfb -urw-nimbus sans l-medium-i-normal--0-0-0-0-p-0-iso8859-3
+n019023l.pfb -urw-nimbus sans l-medium-i-normal--0-0-0-0-p-0-iso8859-4
+n019023l.pfb -urw-nimbus sans l-medium-i-normal--0-0-0-0-p-0-iso8859-5
+n019023l.pfb -urw-nimbus sans l-medium-i-normal--0-0-0-0-p-0-iso8859-9
+n019023l.pfb -urw-nimbus sans l-medium-i-normal--0-0-0-0-p-0-koi8-e
+n019023l.pfb -urw-nimbus sans l-medium-i-normal--0-0-0-0-p-0-koi8-ru
+n019023l.pfb -urw-nimbus sans l-medium-i-normal--0-0-0-0-p-0-koi8-r
+n019023l.pfb -urw-nimbus sans l-medium-i-normal--0-0-0-0-p-0-koi8-uni
+n019023l.pfb -urw-nimbus sans l-medium-i-normal--0-0-0-0-p-0-koi8-u
+n019023l.pfb -urw-nimbus sans l-medium-i-normal--0-0-0-0-p-0-microsoft-cp1252
+n019024l.pfb -urw-nimbus sans l-bold-i-normal--0-0-0-0-p-0-adobe-standard
+n019024l.pfb -urw-nimbus sans l-bold-i-normal--0-0-0-0-p-0-ascii-0
+n019024l.pfb -urw-nimbus sans l-bold-i-normal--0-0-0-0-p-0-iso10646-1
+n019024l.pfb -urw-nimbus sans l-bold-i-normal--0-0-0-0-p-0-iso8859-10
+n019024l.pfb -urw-nimbus sans l-bold-i-normal--0-0-0-0-p-0-iso8859-13
+n019024l.pfb -urw-nimbus sans l-bold-i-normal--0-0-0-0-p-0-iso8859-15
+n019024l.pfb -urw-nimbus sans l-bold-i-normal--0-0-0-0-p-0-iso8859-1
+n019024l.pfb -urw-nimbus sans l-bold-i-normal--0-0-0-0-p-0-iso8859-2
+n019024l.pfb -urw-nimbus sans l-bold-i-normal--0-0-0-0-p-0-iso8859-3
+n019024l.pfb -urw-nimbus sans l-bold-i-normal--0-0-0-0-p-0-iso8859-4
+n019024l.pfb -urw-nimbus sans l-bold-i-normal--0-0-0-0-p-0-iso8859-5
+n019024l.pfb -urw-nimbus sans l-bold-i-normal--0-0-0-0-p-0-iso8859-9
+n019024l.pfb -urw-nimbus sans l-bold-i-normal--0-0-0-0-p-0-koi8-e
+n019024l.pfb -urw-nimbus sans l-bold-i-normal--0-0-0-0-p-0-koi8-ru
+n019024l.pfb -urw-nimbus sans l-bold-i-normal--0-0-0-0-p-0-koi8-r
+n019024l.pfb -urw-nimbus sans l-bold-i-normal--0-0-0-0-p-0-koi8-u
+n019024l.pfb -urw-nimbus sans l-bold-i-normal--0-0-0-0-p-0-koi8-uni
+n019024l.pfb -urw-nimbus sans l-bold-i-normal--0-0-0-0-p-0-microsoft-cp1252
+n019043l.pfb -urw-nimbus sans l condensed-medium-r-condensed--0-0-0-0-p-0-adobe-standard
+n019043l.pfb -urw-nimbus sans l condensed-medium-r-condensed--0-0-0-0-p-0-ascii-0
+n019043l.pfb -urw-nimbus sans l condensed-medium-r-condensed--0-0-0-0-p-0-iso10646-1
+n019043l.pfb -urw-nimbus sans l condensed-medium-r-condensed--0-0-0-0-p-0-iso8859-10
+n019043l.pfb -urw-nimbus sans l condensed-medium-r-condensed--0-0-0-0-p-0-iso8859-13
+n019043l.pfb -urw-nimbus sans l condensed-medium-r-condensed--0-0-0-0-p-0-iso8859-15
+n019043l.pfb -urw-nimbus sans l condensed-medium-r-condensed--0-0-0-0-p-0-iso8859-1
+n019043l.pfb -urw-nimbus sans l condensed-medium-r-condensed--0-0-0-0-p-0-iso8859-2
+n019043l.pfb -urw-nimbus sans l condensed-medium-r-condensed--0-0-0-0-p-0-iso8859-3
+n019043l.pfb -urw-nimbus sans l condensed-medium-r-condensed--0-0-0-0-p-0-iso8859-4
+n019043l.pfb -urw-nimbus sans l condensed-medium-r-condensed--0-0-0-0-p-0-iso8859-9
+n019043l.pfb -urw-nimbus sans l condensed-medium-r-condensed--0-0-0-0-p-0-koi8-r
+n019043l.pfb -urw-nimbus sans l condensed-medium-r-condensed--0-0-0-0-p-0-koi8-u
+n019043l.pfb -urw-nimbus sans l condensed-medium-r-condensed--0-0-0-0-p-0-microsoft-cp1252
+n019044l.pfb -urw-nimbus sans l condensed-bold-r-condensed--0-0-0-0-p-0-adobe-standard
+n019044l.pfb -urw-nimbus sans l condensed-bold-r-condensed--0-0-0-0-p-0-ascii-0
+n019044l.pfb -urw-nimbus sans l condensed-bold-r-condensed--0-0-0-0-p-0-iso10646-1
+n019044l.pfb -urw-nimbus sans l condensed-bold-r-condensed--0-0-0-0-p-0-iso8859-10
+n019044l.pfb -urw-nimbus sans l condensed-bold-r-condensed--0-0-0-0-p-0-iso8859-13
+n019044l.pfb -urw-nimbus sans l condensed-bold-r-condensed--0-0-0-0-p-0-iso8859-1
+n019044l.pfb -urw-nimbus sans l condensed-bold-r-condensed--0-0-0-0-p-0-iso8859-15
+n019044l.pfb -urw-nimbus sans l condensed-bold-r-condensed--0-0-0-0-p-0-iso8859-2
+n019044l.pfb -urw-nimbus sans l condensed-bold-r-condensed--0-0-0-0-p-0-iso8859-3
+n019044l.pfb -urw-nimbus sans l condensed-bold-r-condensed--0-0-0-0-p-0-iso8859-4
+n019044l.pfb -urw-nimbus sans l condensed-bold-r-condensed--0-0-0-0-p-0-iso8859-9
+n019044l.pfb -urw-nimbus sans l condensed-bold-r-condensed--0-0-0-0-p-0-koi8-r
+n019044l.pfb -urw-nimbus sans l condensed-bold-r-condensed--0-0-0-0-p-0-koi8-u
+n019044l.pfb -urw-nimbus sans l condensed-bold-r-condensed--0-0-0-0-p-0-microsoft-cp1252
+n019063l.pfb -urw-nimbus sans l condensed-medium-i-condensed--0-0-0-0-p-0-adobe-standard
+n019063l.pfb -urw-nimbus sans l condensed-medium-i-condensed--0-0-0-0-p-0-ascii-0
+n019063l.pfb -urw-nimbus sans l condensed-medium-i-condensed--0-0-0-0-p-0-iso10646-1
+n019063l.pfb -urw-nimbus sans l condensed-medium-i-condensed--0-0-0-0-p-0-iso8859-10
+n019063l.pfb -urw-nimbus sans l condensed-medium-i-condensed--0-0-0-0-p-0-iso8859-1
+n019063l.pfb -urw-nimbus sans l condensed-medium-i-condensed--0-0-0-0-p-0-iso8859-13
+n019063l.pfb -urw-nimbus sans l condensed-medium-i-condensed--0-0-0-0-p-0-iso8859-15
+n019063l.pfb -urw-nimbus sans l condensed-medium-i-condensed--0-0-0-0-p-0-iso8859-2
+n019063l.pfb -urw-nimbus sans l condensed-medium-i-condensed--0-0-0-0-p-0-iso8859-3
+n019063l.pfb -urw-nimbus sans l condensed-medium-i-condensed--0-0-0-0-p-0-iso8859-4
+n019063l.pfb -urw-nimbus sans l condensed-medium-i-condensed--0-0-0-0-p-0-iso8859-9
+n019063l.pfb -urw-nimbus sans l condensed-medium-i-condensed--0-0-0-0-p-0-koi8-r
+n019063l.pfb -urw-nimbus sans l condensed-medium-i-condensed--0-0-0-0-p-0-koi8-u
+n019063l.pfb -urw-nimbus sans l condensed-medium-i-condensed--0-0-0-0-p-0-microsoft-cp1252
+n019064l.pfb -urw-nimbus sans l condensed-bold-i-condensed--0-0-0-0-p-0-adobe-standard
+n019064l.pfb -urw-nimbus sans l condensed-bold-i-condensed--0-0-0-0-p-0-ascii-0
+n019064l.pfb -urw-nimbus sans l condensed-bold-i-condensed--0-0-0-0-p-0-iso10646-1
+n019064l.pfb -urw-nimbus sans l condensed-bold-i-condensed--0-0-0-0-p-0-iso8859-10
+n019064l.pfb -urw-nimbus sans l condensed-bold-i-condensed--0-0-0-0-p-0-iso8859-1
+n019064l.pfb -urw-nimbus sans l condensed-bold-i-condensed--0-0-0-0-p-0-iso8859-13
+n019064l.pfb -urw-nimbus sans l condensed-bold-i-condensed--0-0-0-0-p-0-iso8859-15
+n019064l.pfb -urw-nimbus sans l condensed-bold-i-condensed--0-0-0-0-p-0-iso8859-2
+n019064l.pfb -urw-nimbus sans l condensed-bold-i-condensed--0-0-0-0-p-0-iso8859-3
+n019064l.pfb -urw-nimbus sans l condensed-bold-i-condensed--0-0-0-0-p-0-iso8859-4
+n019064l.pfb -urw-nimbus sans l condensed-bold-i-condensed--0-0-0-0-p-0-iso8859-9
+n019064l.pfb -urw-nimbus sans l condensed-bold-i-condensed--0-0-0-0-p-0-koi8-r
+n019064l.pfb -urw-nimbus sans l condensed-bold-i-condensed--0-0-0-0-p-0-koi8-u
+n019064l.pfb -urw-nimbus sans l condensed-bold-i-condensed--0-0-0-0-p-0-microsoft-cp1252
+n021003l.pfb -urw-nimbus roman no9 l-medium-r-normal--0-0-0-0-p-0-adobe-standard
+n021003l.pfb -urw-nimbus roman no9 l-medium-r-normal--0-0-0-0-p-0-ascii-0
+n021003l.pfb -urw-nimbus roman no9 l-medium-r-normal--0-0-0-0-p-0-iso10646-1
+n021003l.pfb -urw-nimbus roman no9 l-medium-r-normal--0-0-0-0-p-0-iso8859-10
+n021003l.pfb -urw-nimbus roman no9 l-medium-r-normal--0-0-0-0-p-0-iso8859-1
+n021003l.pfb -urw-nimbus roman no9 l-medium-r-normal--0-0-0-0-p-0-iso8859-13
+n021003l.pfb -urw-nimbus roman no9 l-medium-r-normal--0-0-0-0-p-0-iso8859-15
+n021003l.pfb -urw-nimbus roman no9 l-medium-r-normal--0-0-0-0-p-0-iso8859-2
+n021003l.pfb -urw-nimbus roman no9 l-medium-r-normal--0-0-0-0-p-0-iso8859-3
+n021003l.pfb -urw-nimbus roman no9 l-medium-r-normal--0-0-0-0-p-0-iso8859-4
+n021003l.pfb -urw-nimbus roman no9 l-medium-r-normal--0-0-0-0-p-0-iso8859-5
+n021003l.pfb -urw-nimbus roman no9 l-medium-r-normal--0-0-0-0-p-0-iso8859-9
+n021003l.pfb -urw-nimbus roman no9 l-medium-r-normal--0-0-0-0-p-0-koi8-e
+n021003l.pfb -urw-nimbus roman no9 l-medium-r-normal--0-0-0-0-p-0-koi8-r
+n021003l.pfb -urw-nimbus roman no9 l-medium-r-normal--0-0-0-0-p-0-koi8-ru
+n021003l.pfb -urw-nimbus roman no9 l-medium-r-normal--0-0-0-0-p-0-koi8-uni
+n021003l.pfb -urw-nimbus roman no9 l-medium-r-normal--0-0-0-0-p-0-koi8-u
+n021003l.pfb -urw-nimbus roman no9 l-medium-r-normal--0-0-0-0-p-0-microsoft-cp1252
+n021004l.pfb -urw-nimbus roman no9 l-bold-r-normal--0-0-0-0-p-0-adobe-standard
+n021004l.pfb -urw-nimbus roman no9 l-bold-r-normal--0-0-0-0-p-0-ascii-0
+n021004l.pfb -urw-nimbus roman no9 l-bold-r-normal--0-0-0-0-p-0-iso10646-1
+n021004l.pfb -urw-nimbus roman no9 l-bold-r-normal--0-0-0-0-p-0-iso8859-10
+n021004l.pfb -urw-nimbus roman no9 l-bold-r-normal--0-0-0-0-p-0-iso8859-13
+n021004l.pfb -urw-nimbus roman no9 l-bold-r-normal--0-0-0-0-p-0-iso8859-15
+n021004l.pfb -urw-nimbus roman no9 l-bold-r-normal--0-0-0-0-p-0-iso8859-1
+n021004l.pfb -urw-nimbus roman no9 l-bold-r-normal--0-0-0-0-p-0-iso8859-2
+n021004l.pfb -urw-nimbus roman no9 l-bold-r-normal--0-0-0-0-p-0-iso8859-3
+n021004l.pfb -urw-nimbus roman no9 l-bold-r-normal--0-0-0-0-p-0-iso8859-4
+n021004l.pfb -urw-nimbus roman no9 l-bold-r-normal--0-0-0-0-p-0-iso8859-5
+n021004l.pfb -urw-nimbus roman no9 l-bold-r-normal--0-0-0-0-p-0-iso8859-9
+n021004l.pfb -urw-nimbus roman no9 l-bold-r-normal--0-0-0-0-p-0-koi8-e
+n021004l.pfb -urw-nimbus roman no9 l-bold-r-normal--0-0-0-0-p-0-koi8-ru
+n021004l.pfb -urw-nimbus roman no9 l-bold-r-normal--0-0-0-0-p-0-koi8-r
+n021004l.pfb -urw-nimbus roman no9 l-bold-r-normal--0-0-0-0-p-0-koi8-uni
+n021004l.pfb -urw-nimbus roman no9 l-bold-r-normal--0-0-0-0-p-0-koi8-u
+n021004l.pfb -urw-nimbus roman no9 l-bold-r-normal--0-0-0-0-p-0-microsoft-cp1252
+n021023l.pfb -urw-nimbus roman no9 l-medium-i-normal--0-0-0-0-p-0-adobe-standard
+n021023l.pfb -urw-nimbus roman no9 l-medium-i-normal--0-0-0-0-p-0-ascii-0
+n021023l.pfb -urw-nimbus roman no9 l-medium-i-normal--0-0-0-0-p-0-iso10646-1
+n021023l.pfb -urw-nimbus roman no9 l-medium-i-normal--0-0-0-0-p-0-iso8859-10
+n021023l.pfb -urw-nimbus roman no9 l-medium-i-normal--0-0-0-0-p-0-iso8859-13
+n021023l.pfb -urw-nimbus roman no9 l-medium-i-normal--0-0-0-0-p-0-iso8859-15
+n021023l.pfb -urw-nimbus roman no9 l-medium-i-normal--0-0-0-0-p-0-iso8859-1
+n021023l.pfb -urw-nimbus roman no9 l-medium-i-normal--0-0-0-0-p-0-iso8859-2
+n021023l.pfb -urw-nimbus roman no9 l-medium-i-normal--0-0-0-0-p-0-iso8859-3
+n021023l.pfb -urw-nimbus roman no9 l-medium-i-normal--0-0-0-0-p-0-iso8859-4
+n021023l.pfb -urw-nimbus roman no9 l-medium-i-normal--0-0-0-0-p-0-iso8859-5
+n021023l.pfb -urw-nimbus roman no9 l-medium-i-normal--0-0-0-0-p-0-iso8859-9
+n021023l.pfb -urw-nimbus roman no9 l-medium-i-normal--0-0-0-0-p-0-koi8-e
+n021023l.pfb -urw-nimbus roman no9 l-medium-i-normal--0-0-0-0-p-0-koi8-r
+n021023l.pfb -urw-nimbus roman no9 l-medium-i-normal--0-0-0-0-p-0-koi8-ru
+n021023l.pfb -urw-nimbus roman no9 l-medium-i-normal--0-0-0-0-p-0-koi8-uni
+n021023l.pfb -urw-nimbus roman no9 l-medium-i-normal--0-0-0-0-p-0-koi8-u
+n021023l.pfb -urw-nimbus roman no9 l-medium-i-normal--0-0-0-0-p-0-microsoft-cp1252
+n021024l.pfb -urw-nimbus roman no9 l-bold-i-normal--0-0-0-0-p-0-adobe-standard
+n021024l.pfb -urw-nimbus roman no9 l-bold-i-normal--0-0-0-0-p-0-ascii-0
+n021024l.pfb -urw-nimbus roman no9 l-bold-i-normal--0-0-0-0-p-0-iso10646-1
+n021024l.pfb -urw-nimbus roman no9 l-bold-i-normal--0-0-0-0-p-0-iso8859-10
+n021024l.pfb -urw-nimbus roman no9 l-bold-i-normal--0-0-0-0-p-0-iso8859-13
+n021024l.pfb -urw-nimbus roman no9 l-bold-i-normal--0-0-0-0-p-0-iso8859-15
+n021024l.pfb -urw-nimbus roman no9 l-bold-i-normal--0-0-0-0-p-0-iso8859-1
+n021024l.pfb -urw-nimbus roman no9 l-bold-i-normal--0-0-0-0-p-0-iso8859-2
+n021024l.pfb -urw-nimbus roman no9 l-bold-i-normal--0-0-0-0-p-0-iso8859-3
+n021024l.pfb -urw-nimbus roman no9 l-bold-i-normal--0-0-0-0-p-0-iso8859-4
+n021024l.pfb -urw-nimbus roman no9 l-bold-i-normal--0-0-0-0-p-0-iso8859-5
+n021024l.pfb -urw-nimbus roman no9 l-bold-i-normal--0-0-0-0-p-0-iso8859-9
+n021024l.pfb -urw-nimbus roman no9 l-bold-i-normal--0-0-0-0-p-0-koi8-e
+n021024l.pfb -urw-nimbus roman no9 l-bold-i-normal--0-0-0-0-p-0-koi8-r
+n021024l.pfb -urw-nimbus roman no9 l-bold-i-normal--0-0-0-0-p-0-koi8-ru
+n021024l.pfb -urw-nimbus roman no9 l-bold-i-normal--0-0-0-0-p-0-koi8-uni
+n021024l.pfb -urw-nimbus roman no9 l-bold-i-normal--0-0-0-0-p-0-koi8-u
+n021024l.pfb -urw-nimbus roman no9 l-bold-i-normal--0-0-0-0-p-0-microsoft-cp1252
+n022003l.pfb -urw-nimbus mono l-medium-r-normal--0-0-0-0-m-0-adobe-standard
+n022003l.pfb -urw-nimbus mono l-medium-r-normal--0-0-0-0-m-0-ascii-0
+n022003l.pfb -urw-nimbus mono l-medium-r-normal--0-0-0-0-m-0-iso10646-1
+n022003l.pfb -urw-nimbus mono l-medium-r-normal--0-0-0-0-m-0-iso8859-10
+n022003l.pfb -urw-nimbus mono l-medium-r-normal--0-0-0-0-m-0-iso8859-13
+n022003l.pfb -urw-nimbus mono l-medium-r-normal--0-0-0-0-m-0-iso8859-1
+n022003l.pfb -urw-nimbus mono l-medium-r-normal--0-0-0-0-m-0-iso8859-15
+n022003l.pfb -urw-nimbus mono l-medium-r-normal--0-0-0-0-m-0-iso8859-2
+n022003l.pfb -urw-nimbus mono l-medium-r-normal--0-0-0-0-m-0-iso8859-3
+n022003l.pfb -urw-nimbus mono l-medium-r-normal--0-0-0-0-m-0-iso8859-4
+n022003l.pfb -urw-nimbus mono l-medium-r-normal--0-0-0-0-m-0-iso8859-5
+n022003l.pfb -urw-nimbus mono l-medium-r-normal--0-0-0-0-m-0-iso8859-9
+n022003l.pfb -urw-nimbus mono l-medium-r-normal--0-0-0-0-m-0-koi8-e
+n022003l.pfb -urw-nimbus mono l-medium-r-normal--0-0-0-0-m-0-koi8-ru
+n022003l.pfb -urw-nimbus mono l-medium-r-normal--0-0-0-0-m-0-koi8-r
+n022003l.pfb -urw-nimbus mono l-medium-r-normal--0-0-0-0-m-0-koi8-uni
+n022003l.pfb -urw-nimbus mono l-medium-r-normal--0-0-0-0-m-0-koi8-u
+n022003l.pfb -urw-nimbus mono l-medium-r-normal--0-0-0-0-m-0-microsoft-cp1252
+n022004l.pfb -urw-nimbus mono l-bold-r-normal--0-0-0-0-p-0-adobe-standard
+n022004l.pfb -urw-nimbus mono l-bold-r-normal--0-0-0-0-p-0-ascii-0
+n022004l.pfb -urw-nimbus mono l-bold-r-normal--0-0-0-0-p-0-iso10646-1
+n022004l.pfb -urw-nimbus mono l-bold-r-normal--0-0-0-0-p-0-iso8859-10
+n022004l.pfb -urw-nimbus mono l-bold-r-normal--0-0-0-0-p-0-iso8859-1
+n022004l.pfb -urw-nimbus mono l-bold-r-normal--0-0-0-0-p-0-iso8859-13
+n022004l.pfb -urw-nimbus mono l-bold-r-normal--0-0-0-0-p-0-iso8859-15
+n022004l.pfb -urw-nimbus mono l-bold-r-normal--0-0-0-0-p-0-iso8859-2
+n022004l.pfb -urw-nimbus mono l-bold-r-normal--0-0-0-0-p-0-iso8859-3
+n022004l.pfb -urw-nimbus mono l-bold-r-normal--0-0-0-0-p-0-iso8859-4
+n022004l.pfb -urw-nimbus mono l-bold-r-normal--0-0-0-0-p-0-iso8859-5
+n022004l.pfb -urw-nimbus mono l-bold-r-normal--0-0-0-0-p-0-iso8859-9
+n022004l.pfb -urw-nimbus mono l-bold-r-normal--0-0-0-0-p-0-koi8-e
+n022004l.pfb -urw-nimbus mono l-bold-r-normal--0-0-0-0-p-0-koi8-r
+n022004l.pfb -urw-nimbus mono l-bold-r-normal--0-0-0-0-p-0-koi8-ru
+n022004l.pfb -urw-nimbus mono l-bold-r-normal--0-0-0-0-p-0-koi8-uni
+n022004l.pfb -urw-nimbus mono l-bold-r-normal--0-0-0-0-p-0-koi8-u
+n022004l.pfb -urw-nimbus mono l-bold-r-normal--0-0-0-0-p-0-microsoft-cp1252
+n022023l.pfb -urw-nimbus mono l-medium-o-normal--0-0-0-0-p-0-adobe-standard
+n022023l.pfb -urw-nimbus mono l-medium-o-normal--0-0-0-0-p-0-ascii-0
+n022023l.pfb -urw-nimbus mono l-medium-o-normal--0-0-0-0-p-0-iso10646-1
+n022023l.pfb -urw-nimbus mono l-medium-o-normal--0-0-0-0-p-0-iso8859-10
+n022023l.pfb -urw-nimbus mono l-medium-o-normal--0-0-0-0-p-0-iso8859-13
+n022023l.pfb -urw-nimbus mono l-medium-o-normal--0-0-0-0-p-0-iso8859-1
+n022023l.pfb -urw-nimbus mono l-medium-o-normal--0-0-0-0-p-0-iso8859-15
+n022023l.pfb -urw-nimbus mono l-medium-o-normal--0-0-0-0-p-0-iso8859-2
+n022023l.pfb -urw-nimbus mono l-medium-o-normal--0-0-0-0-p-0-iso8859-3
+n022023l.pfb -urw-nimbus mono l-medium-o-normal--0-0-0-0-p-0-iso8859-4
+n022023l.pfb -urw-nimbus mono l-medium-o-normal--0-0-0-0-p-0-iso8859-5
+n022023l.pfb -urw-nimbus mono l-medium-o-normal--0-0-0-0-p-0-iso8859-9
+n022023l.pfb -urw-nimbus mono l-medium-o-normal--0-0-0-0-p-0-koi8-e
+n022023l.pfb -urw-nimbus mono l-medium-o-normal--0-0-0-0-p-0-koi8-ru
+n022023l.pfb -urw-nimbus mono l-medium-o-normal--0-0-0-0-p-0-koi8-r
+n022023l.pfb -urw-nimbus mono l-medium-o-normal--0-0-0-0-p-0-koi8-uni
+n022023l.pfb -urw-nimbus mono l-medium-o-normal--0-0-0-0-p-0-koi8-u
+n022023l.pfb -urw-nimbus mono l-medium-o-normal--0-0-0-0-p-0-microsoft-cp1252
+n022024l.pfb -urw-nimbus mono l-bold-o-normal--0-0-0-0-p-0-adobe-standard
+n022024l.pfb -urw-nimbus mono l-bold-o-normal--0-0-0-0-p-0-ascii-0
+n022024l.pfb -urw-nimbus mono l-bold-o-normal--0-0-0-0-p-0-iso10646-1
+n022024l.pfb -urw-nimbus mono l-bold-o-normal--0-0-0-0-p-0-iso8859-10
+n022024l.pfb -urw-nimbus mono l-bold-o-normal--0-0-0-0-p-0-iso8859-13
+n022024l.pfb -urw-nimbus mono l-bold-o-normal--0-0-0-0-p-0-iso8859-15
+n022024l.pfb -urw-nimbus mono l-bold-o-normal--0-0-0-0-p-0-iso8859-1
+n022024l.pfb -urw-nimbus mono l-bold-o-normal--0-0-0-0-p-0-iso8859-2
+n022024l.pfb -urw-nimbus mono l-bold-o-normal--0-0-0-0-p-0-iso8859-3
+n022024l.pfb -urw-nimbus mono l-bold-o-normal--0-0-0-0-p-0-iso8859-4
+n022024l.pfb -urw-nimbus mono l-bold-o-normal--0-0-0-0-p-0-iso8859-5
+n022024l.pfb -urw-nimbus mono l-bold-o-normal--0-0-0-0-p-0-iso8859-9
+n022024l.pfb -urw-nimbus mono l-bold-o-normal--0-0-0-0-p-0-koi8-e
+n022024l.pfb -urw-nimbus mono l-bold-o-normal--0-0-0-0-p-0-koi8-r
+n022024l.pfb -urw-nimbus mono l-bold-o-normal--0-0-0-0-p-0-koi8-ru
+n022024l.pfb -urw-nimbus mono l-bold-o-normal--0-0-0-0-p-0-koi8-u
+n022024l.pfb -urw-nimbus mono l-bold-o-normal--0-0-0-0-p-0-koi8-uni
+n022024l.pfb -urw-nimbus mono l-bold-o-normal--0-0-0-0-p-0-microsoft-cp1252
+p052003l.pfb -urw-urw palladio l-medium-r-normal--0-0-0-0-p-0-adobe-standard
+p052003l.pfb -urw-urw palladio l-medium-r-normal--0-0-0-0-p-0-ascii-0
+p052003l.pfb -urw-urw palladio l-medium-r-normal--0-0-0-0-p-0-iso10646-1
+p052003l.pfb -urw-urw palladio l-medium-r-normal--0-0-0-0-p-0-iso8859-10
+p052003l.pfb -urw-urw palladio l-medium-r-normal--0-0-0-0-p-0-iso8859-13
+p052003l.pfb -urw-urw palladio l-medium-r-normal--0-0-0-0-p-0-iso8859-15
+p052003l.pfb -urw-urw palladio l-medium-r-normal--0-0-0-0-p-0-iso8859-1
+p052003l.pfb -urw-urw palladio l-medium-r-normal--0-0-0-0-p-0-iso8859-2
+p052003l.pfb -urw-urw palladio l-medium-r-normal--0-0-0-0-p-0-iso8859-3
+p052003l.pfb -urw-urw palladio l-medium-r-normal--0-0-0-0-p-0-iso8859-4
+p052003l.pfb -urw-urw palladio l-medium-r-normal--0-0-0-0-p-0-iso8859-5
+p052003l.pfb -urw-urw palladio l-medium-r-normal--0-0-0-0-p-0-iso8859-9
+p052003l.pfb -urw-urw palladio l-medium-r-normal--0-0-0-0-p-0-koi8-e
+p052003l.pfb -urw-urw palladio l-medium-r-normal--0-0-0-0-p-0-koi8-r
+p052003l.pfb -urw-urw palladio l-medium-r-normal--0-0-0-0-p-0-koi8-ru
+p052003l.pfb -urw-urw palladio l-medium-r-normal--0-0-0-0-p-0-koi8-uni
+p052003l.pfb -urw-urw palladio l-medium-r-normal--0-0-0-0-p-0-koi8-u
+p052003l.pfb -urw-urw palladio l-medium-r-normal--0-0-0-0-p-0-microsoft-cp1252
+p052004l.pfb -urw-urw palladio l-bold-r-normal--0-0-0-0-p-0-adobe-standard
+p052004l.pfb -urw-urw palladio l-bold-r-normal--0-0-0-0-p-0-ascii-0
+p052004l.pfb -urw-urw palladio l-bold-r-normal--0-0-0-0-p-0-iso10646-1
+p052004l.pfb -urw-urw palladio l-bold-r-normal--0-0-0-0-p-0-iso8859-10
+p052004l.pfb -urw-urw palladio l-bold-r-normal--0-0-0-0-p-0-iso8859-1
+p052004l.pfb -urw-urw palladio l-bold-r-normal--0-0-0-0-p-0-iso8859-13
+p052004l.pfb -urw-urw palladio l-bold-r-normal--0-0-0-0-p-0-iso8859-15
+p052004l.pfb -urw-urw palladio l-bold-r-normal--0-0-0-0-p-0-iso8859-2
+p052004l.pfb -urw-urw palladio l-bold-r-normal--0-0-0-0-p-0-iso8859-3
+p052004l.pfb -urw-urw palladio l-bold-r-normal--0-0-0-0-p-0-iso8859-4
+p052004l.pfb -urw-urw palladio l-bold-r-normal--0-0-0-0-p-0-iso8859-5
+p052004l.pfb -urw-urw palladio l-bold-r-normal--0-0-0-0-p-0-iso8859-9
+p052004l.pfb -urw-urw palladio l-bold-r-normal--0-0-0-0-p-0-koi8-e
+p052004l.pfb -urw-urw palladio l-bold-r-normal--0-0-0-0-p-0-koi8-ru
+p052004l.pfb -urw-urw palladio l-bold-r-normal--0-0-0-0-p-0-koi8-r
+p052004l.pfb -urw-urw palladio l-bold-r-normal--0-0-0-0-p-0-koi8-u
+p052004l.pfb -urw-urw palladio l-bold-r-normal--0-0-0-0-p-0-koi8-uni
+p052004l.pfb -urw-urw palladio l-bold-r-normal--0-0-0-0-p-0-microsoft-cp1252
+p052023l.pfb -urw-urw palladio l-medium-i-normal--0-0-0-0-p-0-adobe-standard
+p052023l.pfb -urw-urw palladio l-medium-i-normal--0-0-0-0-p-0-ascii-0
+p052023l.pfb -urw-urw palladio l-medium-i-normal--0-0-0-0-p-0-iso10646-1
+p052023l.pfb -urw-urw palladio l-medium-i-normal--0-0-0-0-p-0-iso8859-10
+p052023l.pfb -urw-urw palladio l-medium-i-normal--0-0-0-0-p-0-iso8859-1
+p052023l.pfb -urw-urw palladio l-medium-i-normal--0-0-0-0-p-0-iso8859-13
+p052023l.pfb -urw-urw palladio l-medium-i-normal--0-0-0-0-p-0-iso8859-15
+p052023l.pfb -urw-urw palladio l-medium-i-normal--0-0-0-0-p-0-iso8859-2
+p052023l.pfb -urw-urw palladio l-medium-i-normal--0-0-0-0-p-0-iso8859-3
+p052023l.pfb -urw-urw palladio l-medium-i-normal--0-0-0-0-p-0-iso8859-4
+p052023l.pfb -urw-urw palladio l-medium-i-normal--0-0-0-0-p-0-iso8859-5
+p052023l.pfb -urw-urw palladio l-medium-i-normal--0-0-0-0-p-0-iso8859-9
+p052023l.pfb -urw-urw palladio l-medium-i-normal--0-0-0-0-p-0-koi8-e
+p052023l.pfb -urw-urw palladio l-medium-i-normal--0-0-0-0-p-0-koi8-r
+p052023l.pfb -urw-urw palladio l-medium-i-normal--0-0-0-0-p-0-koi8-ru
+p052023l.pfb -urw-urw palladio l-medium-i-normal--0-0-0-0-p-0-koi8-uni
+p052023l.pfb -urw-urw palladio l-medium-i-normal--0-0-0-0-p-0-koi8-u
+p052023l.pfb -urw-urw palladio l-medium-i-normal--0-0-0-0-p-0-microsoft-cp1252
+p052024l.pfb -urw-urw palladio l-bold-i-normal--0-0-0-0-p-0-adobe-standard
+p052024l.pfb -urw-urw palladio l-bold-i-normal--0-0-0-0-p-0-ascii-0
+p052024l.pfb -urw-urw palladio l-bold-i-normal--0-0-0-0-p-0-iso10646-1
+p052024l.pfb -urw-urw palladio l-bold-i-normal--0-0-0-0-p-0-iso8859-10
+p052024l.pfb -urw-urw palladio l-bold-i-normal--0-0-0-0-p-0-iso8859-1
+p052024l.pfb -urw-urw palladio l-bold-i-normal--0-0-0-0-p-0-iso8859-13
+p052024l.pfb -urw-urw palladio l-bold-i-normal--0-0-0-0-p-0-iso8859-15
+p052024l.pfb -urw-urw palladio l-bold-i-normal--0-0-0-0-p-0-iso8859-2
+p052024l.pfb -urw-urw palladio l-bold-i-normal--0-0-0-0-p-0-iso8859-3
+p052024l.pfb -urw-urw palladio l-bold-i-normal--0-0-0-0-p-0-iso8859-4
+p052024l.pfb -urw-urw palladio l-bold-i-normal--0-0-0-0-p-0-iso8859-5
+p052024l.pfb -urw-urw palladio l-bold-i-normal--0-0-0-0-p-0-iso8859-9
+p052024l.pfb -urw-urw palladio l-bold-i-normal--0-0-0-0-p-0-koi8-e
+p052024l.pfb -urw-urw palladio l-bold-i-normal--0-0-0-0-p-0-koi8-ru
+p052024l.pfb -urw-urw palladio l-bold-i-normal--0-0-0-0-p-0-koi8-r
+p052024l.pfb -urw-urw palladio l-bold-i-normal--0-0-0-0-p-0-koi8-uni
+p052024l.pfb -urw-urw palladio l-bold-i-normal--0-0-0-0-p-0-koi8-u
+p052024l.pfb -urw-urw palladio l-bold-i-normal--0-0-0-0-p-0-microsoft-cp1252
+s050000l.pfb -urw-standard symbols l-medium-r-normal--0-0-0-0-p-0-adobe-symbol
+s050000l.pfb -urw-standard symbols l-medium-r-normal--0-0-0-0-p-0-iso10646-1
+z003034l.pfb -urw-urw chancery l-medium-i-normal--0-0-0-0-p-0-adobe-standard
+z003034l.pfb -urw-urw chancery l-medium-i-normal--0-0-0-0-p-0-ascii-0
+z003034l.pfb -urw-urw chancery l-medium-i-normal--0-0-0-0-p-0-iso10646-1
+z003034l.pfb -urw-urw chancery l-medium-i-normal--0-0-0-0-p-0-iso8859-10
+z003034l.pfb -urw-urw chancery l-medium-i-normal--0-0-0-0-p-0-iso8859-13
+z003034l.pfb -urw-urw chancery l-medium-i-normal--0-0-0-0-p-0-iso8859-1
+z003034l.pfb -urw-urw chancery l-medium-i-normal--0-0-0-0-p-0-iso8859-15
+z003034l.pfb -urw-urw chancery l-medium-i-normal--0-0-0-0-p-0-iso8859-2
+z003034l.pfb -urw-urw chancery l-medium-i-normal--0-0-0-0-p-0-iso8859-3
+z003034l.pfb -urw-urw chancery l-medium-i-normal--0-0-0-0-p-0-iso8859-4
+z003034l.pfb -urw-urw chancery l-medium-i-normal--0-0-0-0-p-0-iso8859-5
+z003034l.pfb -urw-urw chancery l-medium-i-normal--0-0-0-0-p-0-iso8859-9
+z003034l.pfb -urw-urw chancery l-medium-i-normal--0-0-0-0-p-0-koi8-e
+z003034l.pfb -urw-urw chancery l-medium-i-normal--0-0-0-0-p-0-koi8-ru
+z003034l.pfb -urw-urw chancery l-medium-i-normal--0-0-0-0-p-0-koi8-r
+z003034l.pfb -urw-urw chancery l-medium-i-normal--0-0-0-0-p-0-koi8-uni
+z003034l.pfb -urw-urw chancery l-medium-i-normal--0-0-0-0-p-0-koi8-u
+z003034l.pfb -urw-urw chancery l-medium-i-normal--0-0-0-0-p-0-microsoft-cp1252
diff --git a/x11-fonts/linux-urw-fonts/pkg-plist b/x11-fonts/linux-urw-fonts/pkg-plist
new file mode 100644
index 000000000000..1ca2cb3b60d9
--- /dev/null
+++ b/x11-fonts/linux-urw-fonts/pkg-plist
@@ -0,0 +1,80 @@
+usr/share/doc/urw-fonts-2.3/COPYING
+usr/share/doc/urw-fonts-2.3/README
+usr/share/doc/urw-fonts-2.3/README.tweaks
+usr/share/doc/urw-fonts-2.3/TODO
+usr/share/fonts/default/Type1/a010013l.afm
+usr/share/fonts/default/Type1/a010013l.pfb
+usr/share/fonts/default/Type1/a010015l.afm
+usr/share/fonts/default/Type1/a010015l.pfb
+usr/share/fonts/default/Type1/a010033l.afm
+usr/share/fonts/default/Type1/a010033l.pfb
+usr/share/fonts/default/Type1/a010035l.afm
+usr/share/fonts/default/Type1/a010035l.pfb
+usr/share/fonts/default/Type1/b018012l.afm
+usr/share/fonts/default/Type1/b018012l.pfb
+usr/share/fonts/default/Type1/b018015l.afm
+usr/share/fonts/default/Type1/b018015l.pfb
+usr/share/fonts/default/Type1/b018032l.afm
+usr/share/fonts/default/Type1/b018032l.pfb
+usr/share/fonts/default/Type1/b018035l.afm
+usr/share/fonts/default/Type1/b018035l.pfb
+usr/share/fonts/default/Type1/c059013l.afm
+usr/share/fonts/default/Type1/c059013l.pfb
+usr/share/fonts/default/Type1/c059016l.afm
+usr/share/fonts/default/Type1/c059016l.pfb
+usr/share/fonts/default/Type1/c059033l.afm
+usr/share/fonts/default/Type1/c059033l.pfb
+usr/share/fonts/default/Type1/c059036l.afm
+usr/share/fonts/default/Type1/c059036l.pfb
+usr/share/fonts/default/Type1/d050000l.afm
+usr/share/fonts/default/Type1/d050000l.pfb
+usr/share/fonts/default/Type1/fonts.dir
+usr/share/fonts/default/Type1/fonts.scale
+usr/share/fonts/default/Type1/n019003l.afm
+usr/share/fonts/default/Type1/n019003l.pfb
+usr/share/fonts/default/Type1/n019004l.afm
+usr/share/fonts/default/Type1/n019004l.pfb
+usr/share/fonts/default/Type1/n019023l.afm
+usr/share/fonts/default/Type1/n019023l.pfb
+usr/share/fonts/default/Type1/n019024l.afm
+usr/share/fonts/default/Type1/n019024l.pfb
+usr/share/fonts/default/Type1/n019043l.afm
+usr/share/fonts/default/Type1/n019043l.pfb
+usr/share/fonts/default/Type1/n019044l.afm
+usr/share/fonts/default/Type1/n019044l.pfb
+usr/share/fonts/default/Type1/n019063l.afm
+usr/share/fonts/default/Type1/n019063l.pfb
+usr/share/fonts/default/Type1/n019064l.afm
+usr/share/fonts/default/Type1/n019064l.pfb
+usr/share/fonts/default/Type1/n021003l.afm
+usr/share/fonts/default/Type1/n021003l.pfb
+usr/share/fonts/default/Type1/n021004l.afm
+usr/share/fonts/default/Type1/n021004l.pfb
+usr/share/fonts/default/Type1/n021023l.afm
+usr/share/fonts/default/Type1/n021023l.pfb
+usr/share/fonts/default/Type1/n021024l.afm
+usr/share/fonts/default/Type1/n021024l.pfb
+usr/share/fonts/default/Type1/n022003l.afm
+usr/share/fonts/default/Type1/n022003l.pfb
+usr/share/fonts/default/Type1/n022004l.afm
+usr/share/fonts/default/Type1/n022004l.pfb
+usr/share/fonts/default/Type1/n022023l.afm
+usr/share/fonts/default/Type1/n022023l.pfb
+usr/share/fonts/default/Type1/n022024l.afm
+usr/share/fonts/default/Type1/n022024l.pfb
+usr/share/fonts/default/Type1/p052003l.afm
+usr/share/fonts/default/Type1/p052003l.pfb
+usr/share/fonts/default/Type1/p052004l.afm
+usr/share/fonts/default/Type1/p052004l.pfb
+usr/share/fonts/default/Type1/p052023l.afm
+usr/share/fonts/default/Type1/p052023l.pfb
+usr/share/fonts/default/Type1/p052024l.afm
+usr/share/fonts/default/Type1/p052024l.pfb
+usr/share/fonts/default/Type1/s050000l.afm
+usr/share/fonts/default/Type1/s050000l.pfb
+usr/share/fonts/default/Type1/z003034l.afm
+usr/share/fonts/default/Type1/z003034l.pfb
+@dirrm usr/share/fonts/default/Type1
+@dirrm usr/share/fonts/default
+@dirrm usr/share/fonts
+@dirrm usr/share/doc/urw-fonts-2.3
diff --git a/x11-toolkits/linux-f10-gtk/Makefile b/x11-toolkits/linux-f10-gtk/Makefile
index d3cffb4d10f5..ae2f5fa560e8 100644
--- a/x11-toolkits/linux-f10-gtk/Makefile
+++ b/x11-toolkits/linux-f10-gtk/Makefile
@@ -7,75 +7,21 @@
# $FreeBSD$
#
-PORTNAME?= gtk
-PORTVERSION?= 1.2.10
-PORTREVISION?= 0
-CATEGORIES?= x11-toolkits linux
-MASTER_SITES?= ${FEDORALEGACY_MIRRORS:S/__DIR__/${FEDORADIR}/g} ${RPM_MIRRORS:S/__DIR__/${STDDIR}/g}
-PKGNAMEPREFIX= linux-
-DISTFILES= ${RPM_SET} ${SRC_DISTFILES}
+PORTNAME= gtk
+PORTVERSION= 1.2.10
+PORTREVISION= 1
+CATEGORIES= x11-toolkits linux
+DISTNAME= gtk+-${PORTVERSION}-33
-MAINTAINER?= freebsd-emulation@FreeBSD.org
-COMMENT?= RPM of the Gtk lib
+MAINTAINER= freebsd-emulation@FreeBSD.org
+COMMENT= RPM of the Gtk lib
-BUILD_DEPENDS+= rpm:${PORTSDIR}/archivers/rpm
-# XXX: I haven't checked if every port which includes this Makefile needs
-# USE_XLIB, so let it be a RUN_DEPENDS?= until the refactoring of the
-# RPM bits.
-RUN_DEPENDS?= ${LINUXBASE}/usr/X11R6/lib/libX11.so.6:${PORTSDIR}/x11/linux-XFree86-libs
+ONLY_FOR_ARCHS= i386 amd64
-ONLY_FOR_ARCHS?= i386 alpha amd64
+USE_LINUX_RPM= yes
+LINUX_DIST_VER= 3
+INSTALLS_SHLIB= yes
+PLIST= pkg-plist.${LINUX_RPM_ARCH}
+USE_XLIB= yes
-USE_LINUX= yes
-USE_LINUX_PREFIX= yes
-
-.include <bsd.port.pre.mk>
-
-.if (${ARCH} == "amd64")
-ARCH= i386
-RPMFLAGS+= --ignorearch
-.endif
-DIST_SUBDIR?= rpm
-EXTRACT_ONLY=
-NO_BUILD= yes
-PLIST?= ${PKGDIR}/pkg-plist.${ARCH}
-MD5_FILE?= ${MASTERDIR}/distinfo.${ARCH}
-LINUX_LDCONFIG?=${LINUXBASE}/sbin/ldconfig
-
-# Let's avoid hardcoding 'en' as the language.
-LANG= en
-# Set the version of linux_base
-BASEVERSION?= 8.0
-RPM_MIRRORS= \
- ftp://ftp.redhat.com/pub/redhat/__DIR__/ \
- ftp://ftp.nluug.nl/site/ftp.redhat.com/redhat/__DIR__/
-FEDORALEGACY_MIRRORS= \
- http://download.fedoralegacy.org/redhat/__DIR__/
-STDDIR= linux/${BASEVERSION}/${LANG}/os/${ARCH}/RedHat/RPMS
-UPDDIR= linux/updates/${BASEVERSION}/${LANG}/os/${ARCH}
-FEDORADIR= ${BASEVERSION}/os/${ARCH}
-.if (${ARCH} == "i386")
-RPM_SET?= gtk+-1.2.10-22.${ARCH}.rpm
-.endif
-DBPATH= /var/lib/rpm
-RPMFLAGS+= --ignoreos --root ${PREFIX} --dbpath ${DBPATH} \
- --nodeps --replacepkgs --oldpackage
-RPMDIR= ${DISTDIR}/${DIST_SUBDIR}
-
-do-install:
- @for R in ${RPM_SET}; do \
- ${ECHO_MSG} $$R; \
- rpm -U ${RPMFLAGS} ${RPMDIR}/$$R || true ; \
- done
- @${LINUX_LDCONFIG}
-
-new-plist:
- @${RM} -rf ${WRKSRC}/tmp
- @${MKDIR} ${WRKSRC}/tmp
- @cd ${WRKSRC}/tmp; \
- rpm2cpio < ${DISTDIR}/${DIST_SUBDIR}/${RPM_SET} | ${CPIO} -id; \
- ${FIND} * -type f -o -type l > ${PLIST}.new; \
- ${FIND} -d * -type d | ${SED} -e 's:^:@dirrm :' \
- >> ${PLIST}.new
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/x11-toolkits/linux-f10-gtk/distinfo.alpha b/x11-toolkits/linux-f10-gtk/distinfo.alpha
deleted file mode 100644
index 3b30df4d412f..000000000000
--- a/x11-toolkits/linux-f10-gtk/distinfo.alpha
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 (rpm/gtk+-1.2.9-4.alpha.rpm) = 72107f3edc89e27e1481b89fd752ff82
-SIZE (rpm/gtk+-1.2.9-4.alpha.rpm) = 1166775
diff --git a/x11-toolkits/linux-f10-gtk/distinfo.i386 b/x11-toolkits/linux-f10-gtk/distinfo.i386
index 3a34cdf9f23f..40e58d497d51 100644
--- a/x11-toolkits/linux-f10-gtk/distinfo.i386
+++ b/x11-toolkits/linux-f10-gtk/distinfo.i386
@@ -1,3 +1,6 @@
-MD5 (rpm/gtk+-1.2.10-22.i386.rpm) = 1932769e2a4fc10524b77a69811f4427
-SHA256 (rpm/gtk+-1.2.10-22.i386.rpm) = 7949c5204a620056f09279e6571ae2f4bacf6c8cbbf7fc7a4e4e75c33f806c6a
-SIZE (rpm/gtk+-1.2.10-22.i386.rpm) = 948063
+MD5 (rpm/i386/fedora/3/gtk+-1.2.10-33.i386.rpm) = 6ed518519e2fba27bb5bf3cbf1ab258c
+SHA256 (rpm/i386/fedora/3/gtk+-1.2.10-33.i386.rpm) = bb3968184a73eb25ae966dd0dccc5975bdfa7734bcd24c7508ca9b52b12fc404
+SIZE (rpm/i386/fedora/3/gtk+-1.2.10-33.i386.rpm) = 856964
+MD5 (rpm/i386/fedora/3/gtk+-1.2.10-33.src.rpm) = 428f57749b40021404b67d203962e98b
+SHA256 (rpm/i386/fedora/3/gtk+-1.2.10-33.src.rpm) = 3fd4a4e9a31cd4fcd52d8fe7c97581f8bb7e0e3f7b8736b26fbc557afb0e25cf
+SIZE (rpm/i386/fedora/3/gtk+-1.2.10-33.src.rpm) = 2918540
diff --git a/x11-toolkits/linux-f10-gtk/pkg-plist.alpha b/x11-toolkits/linux-f10-gtk/pkg-plist.alpha
deleted file mode 100644
index 052e7ae60a60..000000000000
--- a/x11-toolkits/linux-f10-gtk/pkg-plist.alpha
+++ /dev/null
@@ -1,182 +0,0 @@
-etc/gtk/gtkrc
-etc/gtk/gtkrc.az
-etc/gtk/gtkrc.cp1251
-etc/gtk/gtkrc.cp1255
-etc/gtk/gtkrc.el
-etc/gtk/gtkrc.eo
-etc/gtk/gtkrc.he
-etc/gtk/gtkrc.hy
-etc/gtk/gtkrc.iso-8859-13
-etc/gtk/gtkrc.iso-8859-14
-etc/gtk/gtkrc.iso-8859-15
-etc/gtk/gtkrc.iso-8859-2
-etc/gtk/gtkrc.iso-8859-5
-etc/gtk/gtkrc.ja
-etc/gtk/gtkrc.ka_GE.georgianacademy
-etc/gtk/gtkrc.ka_GE.georgianps
-etc/gtk/gtkrc.ko
-etc/gtk/gtkrc.ru
-etc/gtk/gtkrc.th
-etc/gtk/gtkrc.tr
-etc/gtk/gtkrc.uk
-etc/gtk/gtkrc.vi_VN.tcvn
-etc/gtk/gtkrc.vi_VN.viscii
-etc/gtk/gtkrc.zh_CN
-etc/gtk/gtkrc.zh_TW.big5
-usr/lib/libgdk-1.2.so.0.9.0
-usr/lib/libgtk-1.2.so.0.9.0
-usr/share/doc/gtk+-1.2.9/AUTHORS
-usr/share/doc/gtk+-1.2.9/COPYING
-usr/share/doc/gtk+-1.2.9/ChangeLog
-usr/share/doc/gtk+-1.2.9/NEWS
-usr/share/doc/gtk+-1.2.9/README
-usr/share/doc/gtk+-1.2.9/TODO
-usr/share/locale/az/LC_MESSAGES/gtk+.mo
-usr/share/locale/ca/LC_MESSAGES/gtk+.mo
-usr/share/locale/cs/LC_MESSAGES/gtk+.mo
-usr/share/locale/da/LC_MESSAGES/gtk+.mo
-usr/share/locale/de/LC_MESSAGES/gtk+.mo
-usr/share/locale/el/LC_MESSAGES/gtk+.mo
-usr/share/locale/es/LC_MESSAGES/gtk+.mo
-usr/share/locale/et/LC_MESSAGES/gtk+.mo
-usr/share/locale/eu/LC_MESSAGES/gtk+.mo
-usr/share/locale/fi/LC_MESSAGES/gtk+.mo
-usr/share/locale/fr/LC_MESSAGES/gtk+.mo
-usr/share/locale/ga/LC_MESSAGES/gtk+.mo
-usr/share/locale/gl/LC_MESSAGES/gtk+.mo
-usr/share/locale/hr/LC_MESSAGES/gtk+.mo
-usr/share/locale/hu/LC_MESSAGES/gtk+.mo
-usr/share/locale/it/LC_MESSAGES/gtk+.mo
-usr/share/locale/ja/LC_MESSAGES/gtk+.mo
-usr/share/locale/ko/LC_MESSAGES/gtk+.mo
-usr/share/locale/lt/LC_MESSAGES/gtk+.mo
-usr/share/locale/nl/LC_MESSAGES/gtk+.mo
-usr/share/locale/nn/LC_MESSAGES/gtk+.mo
-usr/share/locale/no/LC_MESSAGES/gtk+.mo
-usr/share/locale/pl/LC_MESSAGES/gtk+.mo
-usr/share/locale/pt/LC_MESSAGES/gtk+.mo
-usr/share/locale/pt_BR/LC_MESSAGES/gtk+.mo
-usr/share/locale/ro/LC_MESSAGES/gtk+.mo
-usr/share/locale/ru/LC_MESSAGES/gtk+.mo
-usr/share/locale/sk/LC_MESSAGES/gtk+.mo
-usr/share/locale/sl/LC_MESSAGES/gtk+.mo
-usr/share/locale/sp/LC_MESSAGES/gtk+.mo
-usr/share/locale/sr/LC_MESSAGES/gtk+.mo
-usr/share/locale/sv/LC_MESSAGES/gtk+.mo
-usr/share/locale/tr/LC_MESSAGES/gtk+.mo
-usr/share/locale/uk/LC_MESSAGES/gtk+.mo
-usr/share/locale/wa/LC_MESSAGES/gtk+.mo
-usr/share/locale/zh_CN.GB2312/LC_MESSAGES/gtk+.mo
-usr/share/locale/zh_TW.Big5/LC_MESSAGES/gtk+.mo
-usr/share/themes/Default/gtk/gtkrc
-etc/gtk/gtkrc.be
-etc/gtk/gtkrc.bg
-etc/gtk/gtkrc.bg_BG.iso88595
-etc/gtk/gtkrc.cs
-etc/gtk/gtkrc.cy
-etc/gtk/gtkrc.et
-etc/gtk/gtkrc.ga
-etc/gtk/gtkrc.he_IL.cp1255
-etc/gtk/gtkrc.he_IL.microsoftcp1255
-etc/gtk/gtkrc.hr
-etc/gtk/gtkrc.hu
-etc/gtk/gtkrc.ka
-etc/gtk/gtkrc.lt
-etc/gtk/gtkrc.lv
-etc/gtk/gtkrc.mi
-etc/gtk/gtkrc.mk
-etc/gtk/gtkrc.pl
-etc/gtk/gtkrc.ro
-etc/gtk/gtkrc.ru_RU.iso88595
-etc/gtk/gtkrc.sk
-etc/gtk/gtkrc.sl
-etc/gtk/gtkrc.sp
-etc/gtk/gtkrc.sq
-etc/gtk/gtkrc.sr
-etc/gtk/gtkrc.sr.iso88595
-etc/gtk/gtkrc.vi
-etc/gtk/gtkrc.vi_VN.viscii111
-etc/gtk/gtkrc.yi
-usr/lib/libgdk-1.2.so.0
-usr/lib/libgtk-1.2.so.0
-@dirrm etc/gtk
-@dirrm usr/share/doc/gtk+-1.2.9
-@dirrm usr/share/themes/Default/gtk
-@dirrmtry usr/share/themes/Default
-@dirrmtry usr/share/themes
-@comment this port is not covered with mtree so removing locale directories.
-@dirrmtry usr/share/locale/zh_TW.Big5/LC_MESSAGES
-@dirrmtry usr/share/locale/zh_TW.Big5
-@dirrmtry usr/share/locale/zh_CN.GB2312/LC_MESSAGES
-@dirrmtry usr/share/locale/zh_CN.GB2312
-@dirrmtry usr/share/locale/wa/LC_MESSAGES
-@dirrmtry usr/share/locale/wa
-@dirrmtry usr/share/locale/uk/LC_MESSAGES
-@dirrmtry usr/share/locale/uk
-@dirrmtry usr/share/locale/tr/LC_MESSAGES
-@dirrmtry usr/share/locale/tr
-@dirrmtry usr/share/locale/sv/LC_MESSAGES
-@dirrmtry usr/share/locale/sv
-@dirrmtry usr/share/locale/sr/LC_MESSAGES
-@dirrmtry usr/share/locale/sr
-@dirrmtry usr/share/locale/sp/LC_MESSAGES
-@dirrmtry usr/share/locale/sp
-@dirrmtry usr/share/locale/sl/LC_MESSAGES
-@dirrmtry usr/share/locale/sl
-@dirrmtry usr/share/locale/sk/LC_MESSAGES
-@dirrmtry usr/share/locale/sk
-@dirrmtry usr/share/locale/ru/LC_MESSAGES
-@dirrmtry usr/share/locale/ru
-@dirrmtry usr/share/locale/ro/LC_MESSAGES
-@dirrmtry usr/share/locale/ro
-@dirrmtry usr/share/locale/pt_BR/LC_MESSAGES
-@dirrmtry usr/share/locale/pt_BR
-@dirrmtry usr/share/locale/pt/LC_MESSAGES
-@dirrmtry usr/share/locale/pt
-@dirrmtry usr/share/locale/pl/LC_MESSAGES
-@dirrmtry usr/share/locale/pl
-@dirrmtry usr/share/locale/no/LC_MESSAGES
-@dirrmtry usr/share/locale/no
-@dirrmtry usr/share/locale/nn/LC_MESSAGES
-@dirrmtry usr/share/locale/nn
-@dirrmtry usr/share/locale/nl/LC_MESSAGES
-@dirrmtry usr/share/locale/nl
-@dirrmtry usr/share/locale/lt/LC_MESSAGES
-@dirrmtry usr/share/locale/lt
-@dirrmtry usr/share/locale/ko/LC_MESSAGES
-@dirrmtry usr/share/locale/ko
-@dirrmtry usr/share/locale/ja/LC_MESSAGES
-@dirrmtry usr/share/locale/ja
-@dirrmtry usr/share/locale/it/LC_MESSAGES
-@dirrmtry usr/share/locale/it
-@dirrmtry usr/share/locale/hu/LC_MESSAGES
-@dirrmtry usr/share/locale/hu
-@dirrmtry usr/share/locale/hr/LC_MESSAGES
-@dirrmtry usr/share/locale/hr
-@dirrmtry usr/share/locale/gl/LC_MESSAGES
-@dirrmtry usr/share/locale/gl
-@dirrmtry usr/share/locale/ga/LC_MESSAGES
-@dirrmtry usr/share/locale/ga
-@dirrmtry usr/share/locale/fr/LC_MESSAGES
-@dirrmtry usr/share/locale/fr
-@dirrmtry usr/share/locale/fi/LC_MESSAGES
-@dirrmtry usr/share/locale/fi
-@dirrmtry usr/share/locale/eu/LC_MESSAGES
-@dirrmtry usr/share/locale/eu
-@dirrmtry usr/share/locale/et/LC_MESSAGES
-@dirrmtry usr/share/locale/et
-@dirrmtry usr/share/locale/es/LC_MESSAGES
-@dirrmtry usr/share/locale/es
-@dirrmtry usr/share/locale/el/LC_MESSAGES
-@dirrmtry usr/share/locale/el
-@dirrmtry usr/share/locale/de/LC_MESSAGES
-@dirrmtry usr/share/locale/de
-@dirrmtry usr/share/locale/da/LC_MESSAGES
-@dirrmtry usr/share/locale/da
-@dirrmtry usr/share/locale/cs/LC_MESSAGES
-@dirrmtry usr/share/locale/cs
-@dirrmtry usr/share/locale/ca/LC_MESSAGES
-@dirrmtry usr/share/locale/ca
-@dirrmtry usr/share/locale/az/LC_MESSAGES
-@dirrmtry usr/share/locale/az
-
diff --git a/x11-toolkits/linux-f10-gtk/pkg-plist.i386 b/x11-toolkits/linux-f10-gtk/pkg-plist.i386
index d24b9a54faef..95b28b3a31ae 100644
--- a/x11-toolkits/linux-f10-gtk/pkg-plist.i386
+++ b/x11-toolkits/linux-f10-gtk/pkg-plist.i386
@@ -24,10 +24,12 @@ etc/gtk/gtkrc.iso88595
etc/gtk/gtkrc.iso88597
etc/gtk/gtkrc.iso88599
etc/gtk/gtkrc.ja
+etc/gtk/gtkrc.ja.utf8
etc/gtk/gtkrc.ka
etc/gtk/gtkrc.ka_GE.georgianacademy
etc/gtk/gtkrc.ka_GE.georgianps
etc/gtk/gtkrc.ko
+etc/gtk/gtkrc.ko.utf8
etc/gtk/gtkrc.lt
etc/gtk/gtkrc.lv
etc/gtk/gtkrc.mi
@@ -50,7 +52,9 @@ etc/gtk/gtkrc.vi_VN.viscii
etc/gtk/gtkrc.vi_VN.viscii111
etc/gtk/gtkrc.yi
etc/gtk/gtkrc.zh_CN
+etc/gtk/gtkrc.zh_CN.utf8
etc/gtk/gtkrc.zh_TW.big5
+etc/gtk/gtkrc.zh_TW.utf8
usr/lib/libgdk-1.2.so.0
usr/lib/libgdk-1.2.so.0.9.1
usr/lib/libgtk-1.2.so.0
@@ -100,85 +104,22 @@ usr/share/locale/wa/LC_MESSAGES/gtk+.mo
usr/share/locale/zh_CN.GB2312/LC_MESSAGES/gtk+.mo
usr/share/locale/zh_TW.Big5/LC_MESSAGES/gtk+.mo
usr/share/themes/Default/gtk/gtkrc
-@dirrm etc/gtk
-@dirrm usr/share/doc/gtk+-1.2.10
-@dirrm usr/share/themes/Default/gtk
+@dirrmtry usr/share/themes/Default/gtk
@dirrmtry usr/share/themes/Default
@dirrmtry usr/share/themes
-@comment this port is not covered with mtree so removing locale directories.
@dirrmtry usr/share/locale/zh_TW.Big5/LC_MESSAGES
@dirrmtry usr/share/locale/zh_TW.Big5
-@dirrmtry usr/share/locale/zh_CN.GB2312/LC_MESSAGES
-@dirrmtry usr/share/locale/zh_CN.GB2312
-@dirrmtry usr/share/locale/wa/LC_MESSAGES
-@dirrmtry usr/share/locale/wa
@dirrmtry usr/share/locale/vi/LC_MESSAGES
@dirrmtry usr/share/locale/vi
-@dirrmtry usr/share/locale/uk/LC_MESSAGES
-@dirrmtry usr/share/locale/uk
-@dirrmtry usr/share/locale/tr/LC_MESSAGES
-@dirrmtry usr/share/locale/tr
-@dirrmtry usr/share/locale/sv/LC_MESSAGES
-@dirrmtry usr/share/locale/sv
-@dirrmtry usr/share/locale/sr/LC_MESSAGES
-@dirrmtry usr/share/locale/sr
@dirrmtry usr/share/locale/sp/LC_MESSAGES
@dirrmtry usr/share/locale/sp
-@dirrmtry usr/share/locale/sl/LC_MESSAGES
-@dirrmtry usr/share/locale/sl
-@dirrmtry usr/share/locale/sk/LC_MESSAGES
-@dirrmtry usr/share/locale/sk
-@dirrmtry usr/share/locale/ru/LC_MESSAGES
-@dirrmtry usr/share/locale/ru
-@dirrmtry usr/share/locale/ro/LC_MESSAGES
-@dirrmtry usr/share/locale/ro
-@dirrmtry usr/share/locale/pt_BR/LC_MESSAGES
-@dirrmtry usr/share/locale/pt_BR
-@dirrmtry usr/share/locale/pt/LC_MESSAGES
-@dirrmtry usr/share/locale/pt
-@dirrmtry usr/share/locale/pl/LC_MESSAGES
-@dirrmtry usr/share/locale/pl
-@dirrmtry usr/share/locale/no/LC_MESSAGES
-@dirrmtry usr/share/locale/no
@dirrmtry usr/share/locale/nn/LC_MESSAGES
@dirrmtry usr/share/locale/nn
-@dirrmtry usr/share/locale/nl/LC_MESSAGES
-@dirrmtry usr/share/locale/nl
@dirrmtry usr/share/locale/lt/LC_MESSAGES
@dirrmtry usr/share/locale/lt
-@dirrmtry usr/share/locale/ko/LC_MESSAGES
-@dirrmtry usr/share/locale/ko
-@dirrmtry usr/share/locale/ja/LC_MESSAGES
-@dirrmtry usr/share/locale/ja
-@dirrmtry usr/share/locale/it/LC_MESSAGES
-@dirrmtry usr/share/locale/it
-@dirrmtry usr/share/locale/hu/LC_MESSAGES
-@dirrmtry usr/share/locale/hu
-@dirrmtry usr/share/locale/hr/LC_MESSAGES
-@dirrmtry usr/share/locale/hr
-@dirrmtry usr/share/locale/gl/LC_MESSAGES
-@dirrmtry usr/share/locale/gl
-@dirrmtry usr/share/locale/ga/LC_MESSAGES
-@dirrmtry usr/share/locale/ga
-@dirrmtry usr/share/locale/fr/LC_MESSAGES
-@dirrmtry usr/share/locale/fr
-@dirrmtry usr/share/locale/fi/LC_MESSAGES
-@dirrmtry usr/share/locale/fi
@dirrmtry usr/share/locale/eu/LC_MESSAGES
@dirrmtry usr/share/locale/eu
-@dirrmtry usr/share/locale/et/LC_MESSAGES
-@dirrmtry usr/share/locale/et
-@dirrmtry usr/share/locale/es/LC_MESSAGES
-@dirrmtry usr/share/locale/es
-@dirrmtry usr/share/locale/el/LC_MESSAGES
-@dirrmtry usr/share/locale/el
-@dirrmtry usr/share/locale/de/LC_MESSAGES
-@dirrmtry usr/share/locale/de
-@dirrmtry usr/share/locale/da/LC_MESSAGES
-@dirrmtry usr/share/locale/da
-@dirrmtry usr/share/locale/cs/LC_MESSAGES
-@dirrmtry usr/share/locale/cs
-@dirrmtry usr/share/locale/ca/LC_MESSAGES
-@dirrmtry usr/share/locale/ca
@dirrmtry usr/share/locale/az/LC_MESSAGES
@dirrmtry usr/share/locale/az
+@dirrm usr/share/doc/gtk+-1.2.10
+@dirrm etc/gtk
diff --git a/x11-toolkits/linux-f10-gtk2/Makefile b/x11-toolkits/linux-f10-gtk2/Makefile
index 2df73bef3e89..e5ebe71571a6 100644
--- a/x11-toolkits/linux-f10-gtk2/Makefile
+++ b/x11-toolkits/linux-f10-gtk2/Makefile
@@ -7,12 +7,9 @@
PORTNAME= gtk2
PORTVERSION= 2.4.14
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= x11-toolkits linux
-MASTER_SITES= ${MASTER_SITE_FEDORA_LINUX} \
- http://distro.ibiblio.org/pub/linux/distributions/fedora/linux/core/${SUBDIR}/ \
- ftp://ftp.uni-koeln.de/mirrors/fedora/linux/core/${SUBDIR}/
-MASTER_SITE_SUBDIR= updates/3/i386
+DISTNAME= ${PORTNAME}-${PORTVERSION}-4.fc3.3
MAINTAINER= freebsd-emulation@FreeBSD.org
COMMENT= GTK+ library, version 2.X, Linux binary
@@ -27,17 +24,15 @@ RUN_DEPENDS+= ${LINUXBASE}/usr/lib/libglib-2.0.so.0:${PORTSDIR}/devel/linux-glib
${LINUXBASE}/usr/lib/libpango-1.0.so.0:${PORTSDIR}/x11-toolkits/linux-pango
ONLY_FOR_ARCHS= i386 amd64
-PLIST= ${PKGDIR}/pkg-plist
USE_XLIB= yes
-RESTRICTED= "binaries under GNU LGPL without accompanying source"
-RPM_SET= gtk2-${PORTVERSION}-4.fc3.3.${ARCH}.rpm
+USE_LINUX_RPM= yes
+LINUX_DIST_VER= 3
+INSTALLS_SHLIB= yes
+BRANDELF_DIRS= usr/bin
PLIST_SUB= LIBVERSION="400.14" PORTVERSION="${PORTVERSION}"
post-install:
-.for ii in gdk-pixbuf-query-loaders-32 gtk-demo gtk-query-immodules-2.0-32
- @${BRANDELF} -t Linux ${PREFIX}/usr/bin/${ii}
-.endfor
@chroot ${PREFIX} /usr/bin/gtk-query-immodules-2.0-32 > ${PREFIX}/etc/gtk-2.0/i386-redhat-linux-gnu/gtk.immodules
@chroot ${PREFIX} /usr/bin/gdk-pixbuf-query-loaders-32 > ${PREFIX}/etc/gtk-2.0/i386-redhat-linux-gnu/gdk-pixbuf.loaders
-.include "../linux-gtk/Makefile"
+.include <bsd.port.mk>
diff --git a/x11-toolkits/linux-f10-gtk2/distinfo.i386 b/x11-toolkits/linux-f10-gtk2/distinfo.i386
index d08be6cdf92f..e55c9461ddd5 100644
--- a/x11-toolkits/linux-f10-gtk2/distinfo.i386
+++ b/x11-toolkits/linux-f10-gtk2/distinfo.i386
@@ -1,3 +1,6 @@
-MD5 (rpm/gtk2-2.4.14-4.fc3.3.i386.rpm) = 5c55dcfe8e8854ecf26bc915c7dce15f
-SHA256 (rpm/gtk2-2.4.14-4.fc3.3.i386.rpm) = 57aedcd29c221148930363002fa5223aecb982d6d2fb1b124476ef55382f2836
-SIZE (rpm/gtk2-2.4.14-4.fc3.3.i386.rpm) = 4593031
+MD5 (rpm/i386/fedora/3/gtk2-2.4.14-4.fc3.3.i386.rpm) = 5c55dcfe8e8854ecf26bc915c7dce15f
+SHA256 (rpm/i386/fedora/3/gtk2-2.4.14-4.fc3.3.i386.rpm) = 57aedcd29c221148930363002fa5223aecb982d6d2fb1b124476ef55382f2836
+SIZE (rpm/i386/fedora/3/gtk2-2.4.14-4.fc3.3.i386.rpm) = 4593031
+MD5 (rpm/i386/fedora/3/gtk2-2.4.14-4.fc3.3.src.rpm) = 44f37d231bffc16d7e516a7798007bb1
+SHA256 (rpm/i386/fedora/3/gtk2-2.4.14-4.fc3.3.src.rpm) = b8f7e3688e344960e90cb2d09188dbf0b4450d9f0c00ab90d14745335f0827c1
+SIZE (rpm/i386/fedora/3/gtk2-2.4.14-4.fc3.3.src.rpm) = 9690086
diff --git a/x11-toolkits/linux-f10-pango/Makefile b/x11-toolkits/linux-f10-pango/Makefile
index f8cb49fb09d1..4c38c1d477b6 100644
--- a/x11-toolkits/linux-f10-pango/Makefile
+++ b/x11-toolkits/linux-f10-pango/Makefile
@@ -7,13 +7,12 @@
PORTNAME= pango
PORTVERSION= 1.6.0
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= x11-toolkits linux
+DISTNAME= ${PORTNAME}-${PORTVERSION}-7
MAINTAINER= freebsd-emulation@FreeBSD.org
COMMENT= Linux pango binary
-MASTER_SITES= ${MASTER_SITE_FEDORA_LINUX}
-MASTER_SITE_SUBDIR= 3/i386/os/Fedora/RPMS
# these libraries are required by pango-querymodules
RUN_DEPENDS= ${LINUXBASE}/usr/X11R6/lib/libX11.so.6:${PORTSDIR}/x11/linux-XFree86-libs \
@@ -23,12 +22,13 @@ RUN_DEPENDS= ${LINUXBASE}/usr/X11R6/lib/libX11.so.6:${PORTSDIR}/x11/linux-XFree8
USE_XLIB= yes
ONLY_FOR_ARCHS= i386 amd64
-PLIST= ${PKGDIR}/pkg-plist
-RPM_SET= pango-${PORTVERSION}-7.i386.rpm
+USE_LINUX_RPM= yes
+LINUX_DIST_VER= 3
+INSTALLS_SHLIB= yes
+BRANDELF_DIRS= usr/bin
PLIST_SUB+= LIBVERSION="600.0" PORTVERSION="${PORTVERSION}"
post-install:
- @${BRANDELF} -t Linux ${PREFIX}/usr/bin/pango-querymodules-32
@${PREFIX}/usr/bin/pango-querymodules-32 > ${PREFIX}/etc/pango/i386-redhat-linux-gnu/pango.modules
-.include "../linux-gtk/Makefile"
+.include <bsd.port.mk>
diff --git a/x11-toolkits/linux-f10-pango/distinfo.i386 b/x11-toolkits/linux-f10-pango/distinfo.i386
index 9cee7663d040..8009062442e7 100644
--- a/x11-toolkits/linux-f10-pango/distinfo.i386
+++ b/x11-toolkits/linux-f10-pango/distinfo.i386
@@ -1,3 +1,6 @@
-MD5 (rpm/pango-1.6.0-7.i386.rpm) = ddb36c33af419ac7993ddf5317fbb904
-SHA256 (rpm/pango-1.6.0-7.i386.rpm) = 2012a8f277e0ddda0734c9f784f4d62aff07ccf88b55da551ec073ec2718da7f
-SIZE (rpm/pango-1.6.0-7.i386.rpm) = 277273
+MD5 (rpm/i386/fedora/3/pango-1.6.0-7.i386.rpm) = ddb36c33af419ac7993ddf5317fbb904
+SHA256 (rpm/i386/fedora/3/pango-1.6.0-7.i386.rpm) = 2012a8f277e0ddda0734c9f784f4d62aff07ccf88b55da551ec073ec2718da7f
+SIZE (rpm/i386/fedora/3/pango-1.6.0-7.i386.rpm) = 277273
+MD5 (rpm/i386/fedora/3/pango-1.6.0-7.src.rpm) = 962e177a9b5e7a74c34b9204e3a5aa41
+SHA256 (rpm/i386/fedora/3/pango-1.6.0-7.src.rpm) = 8faac8c88dcc58203569d31a8881447b553bf52f26525799cfc1f54a09e1bfbe
+SIZE (rpm/i386/fedora/3/pango-1.6.0-7.src.rpm) = 879369
diff --git a/x11-toolkits/linux-f8-gtk/Makefile b/x11-toolkits/linux-f8-gtk/Makefile
index d3cffb4d10f5..ae2f5fa560e8 100644
--- a/x11-toolkits/linux-f8-gtk/Makefile
+++ b/x11-toolkits/linux-f8-gtk/Makefile
@@ -7,75 +7,21 @@
# $FreeBSD$
#
-PORTNAME?= gtk
-PORTVERSION?= 1.2.10
-PORTREVISION?= 0
-CATEGORIES?= x11-toolkits linux
-MASTER_SITES?= ${FEDORALEGACY_MIRRORS:S/__DIR__/${FEDORADIR}/g} ${RPM_MIRRORS:S/__DIR__/${STDDIR}/g}
-PKGNAMEPREFIX= linux-
-DISTFILES= ${RPM_SET} ${SRC_DISTFILES}
+PORTNAME= gtk
+PORTVERSION= 1.2.10
+PORTREVISION= 1
+CATEGORIES= x11-toolkits linux
+DISTNAME= gtk+-${PORTVERSION}-33
-MAINTAINER?= freebsd-emulation@FreeBSD.org
-COMMENT?= RPM of the Gtk lib
+MAINTAINER= freebsd-emulation@FreeBSD.org
+COMMENT= RPM of the Gtk lib
-BUILD_DEPENDS+= rpm:${PORTSDIR}/archivers/rpm
-# XXX: I haven't checked if every port which includes this Makefile needs
-# USE_XLIB, so let it be a RUN_DEPENDS?= until the refactoring of the
-# RPM bits.
-RUN_DEPENDS?= ${LINUXBASE}/usr/X11R6/lib/libX11.so.6:${PORTSDIR}/x11/linux-XFree86-libs
+ONLY_FOR_ARCHS= i386 amd64
-ONLY_FOR_ARCHS?= i386 alpha amd64
+USE_LINUX_RPM= yes
+LINUX_DIST_VER= 3
+INSTALLS_SHLIB= yes
+PLIST= pkg-plist.${LINUX_RPM_ARCH}
+USE_XLIB= yes
-USE_LINUX= yes
-USE_LINUX_PREFIX= yes
-
-.include <bsd.port.pre.mk>
-
-.if (${ARCH} == "amd64")
-ARCH= i386
-RPMFLAGS+= --ignorearch
-.endif
-DIST_SUBDIR?= rpm
-EXTRACT_ONLY=
-NO_BUILD= yes
-PLIST?= ${PKGDIR}/pkg-plist.${ARCH}
-MD5_FILE?= ${MASTERDIR}/distinfo.${ARCH}
-LINUX_LDCONFIG?=${LINUXBASE}/sbin/ldconfig
-
-# Let's avoid hardcoding 'en' as the language.
-LANG= en
-# Set the version of linux_base
-BASEVERSION?= 8.0
-RPM_MIRRORS= \
- ftp://ftp.redhat.com/pub/redhat/__DIR__/ \
- ftp://ftp.nluug.nl/site/ftp.redhat.com/redhat/__DIR__/
-FEDORALEGACY_MIRRORS= \
- http://download.fedoralegacy.org/redhat/__DIR__/
-STDDIR= linux/${BASEVERSION}/${LANG}/os/${ARCH}/RedHat/RPMS
-UPDDIR= linux/updates/${BASEVERSION}/${LANG}/os/${ARCH}
-FEDORADIR= ${BASEVERSION}/os/${ARCH}
-.if (${ARCH} == "i386")
-RPM_SET?= gtk+-1.2.10-22.${ARCH}.rpm
-.endif
-DBPATH= /var/lib/rpm
-RPMFLAGS+= --ignoreos --root ${PREFIX} --dbpath ${DBPATH} \
- --nodeps --replacepkgs --oldpackage
-RPMDIR= ${DISTDIR}/${DIST_SUBDIR}
-
-do-install:
- @for R in ${RPM_SET}; do \
- ${ECHO_MSG} $$R; \
- rpm -U ${RPMFLAGS} ${RPMDIR}/$$R || true ; \
- done
- @${LINUX_LDCONFIG}
-
-new-plist:
- @${RM} -rf ${WRKSRC}/tmp
- @${MKDIR} ${WRKSRC}/tmp
- @cd ${WRKSRC}/tmp; \
- rpm2cpio < ${DISTDIR}/${DIST_SUBDIR}/${RPM_SET} | ${CPIO} -id; \
- ${FIND} * -type f -o -type l > ${PLIST}.new; \
- ${FIND} -d * -type d | ${SED} -e 's:^:@dirrm :' \
- >> ${PLIST}.new
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/x11-toolkits/linux-f8-gtk/distinfo.alpha b/x11-toolkits/linux-f8-gtk/distinfo.alpha
deleted file mode 100644
index 3b30df4d412f..000000000000
--- a/x11-toolkits/linux-f8-gtk/distinfo.alpha
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 (rpm/gtk+-1.2.9-4.alpha.rpm) = 72107f3edc89e27e1481b89fd752ff82
-SIZE (rpm/gtk+-1.2.9-4.alpha.rpm) = 1166775
diff --git a/x11-toolkits/linux-f8-gtk/distinfo.i386 b/x11-toolkits/linux-f8-gtk/distinfo.i386
index 3a34cdf9f23f..40e58d497d51 100644
--- a/x11-toolkits/linux-f8-gtk/distinfo.i386
+++ b/x11-toolkits/linux-f8-gtk/distinfo.i386
@@ -1,3 +1,6 @@
-MD5 (rpm/gtk+-1.2.10-22.i386.rpm) = 1932769e2a4fc10524b77a69811f4427
-SHA256 (rpm/gtk+-1.2.10-22.i386.rpm) = 7949c5204a620056f09279e6571ae2f4bacf6c8cbbf7fc7a4e4e75c33f806c6a
-SIZE (rpm/gtk+-1.2.10-22.i386.rpm) = 948063
+MD5 (rpm/i386/fedora/3/gtk+-1.2.10-33.i386.rpm) = 6ed518519e2fba27bb5bf3cbf1ab258c
+SHA256 (rpm/i386/fedora/3/gtk+-1.2.10-33.i386.rpm) = bb3968184a73eb25ae966dd0dccc5975bdfa7734bcd24c7508ca9b52b12fc404
+SIZE (rpm/i386/fedora/3/gtk+-1.2.10-33.i386.rpm) = 856964
+MD5 (rpm/i386/fedora/3/gtk+-1.2.10-33.src.rpm) = 428f57749b40021404b67d203962e98b
+SHA256 (rpm/i386/fedora/3/gtk+-1.2.10-33.src.rpm) = 3fd4a4e9a31cd4fcd52d8fe7c97581f8bb7e0e3f7b8736b26fbc557afb0e25cf
+SIZE (rpm/i386/fedora/3/gtk+-1.2.10-33.src.rpm) = 2918540
diff --git a/x11-toolkits/linux-f8-gtk/pkg-plist.alpha b/x11-toolkits/linux-f8-gtk/pkg-plist.alpha
deleted file mode 100644
index 052e7ae60a60..000000000000
--- a/x11-toolkits/linux-f8-gtk/pkg-plist.alpha
+++ /dev/null
@@ -1,182 +0,0 @@
-etc/gtk/gtkrc
-etc/gtk/gtkrc.az
-etc/gtk/gtkrc.cp1251
-etc/gtk/gtkrc.cp1255
-etc/gtk/gtkrc.el
-etc/gtk/gtkrc.eo
-etc/gtk/gtkrc.he
-etc/gtk/gtkrc.hy
-etc/gtk/gtkrc.iso-8859-13
-etc/gtk/gtkrc.iso-8859-14
-etc/gtk/gtkrc.iso-8859-15
-etc/gtk/gtkrc.iso-8859-2
-etc/gtk/gtkrc.iso-8859-5
-etc/gtk/gtkrc.ja
-etc/gtk/gtkrc.ka_GE.georgianacademy
-etc/gtk/gtkrc.ka_GE.georgianps
-etc/gtk/gtkrc.ko
-etc/gtk/gtkrc.ru
-etc/gtk/gtkrc.th
-etc/gtk/gtkrc.tr
-etc/gtk/gtkrc.uk
-etc/gtk/gtkrc.vi_VN.tcvn
-etc/gtk/gtkrc.vi_VN.viscii
-etc/gtk/gtkrc.zh_CN
-etc/gtk/gtkrc.zh_TW.big5
-usr/lib/libgdk-1.2.so.0.9.0
-usr/lib/libgtk-1.2.so.0.9.0
-usr/share/doc/gtk+-1.2.9/AUTHORS
-usr/share/doc/gtk+-1.2.9/COPYING
-usr/share/doc/gtk+-1.2.9/ChangeLog
-usr/share/doc/gtk+-1.2.9/NEWS
-usr/share/doc/gtk+-1.2.9/README
-usr/share/doc/gtk+-1.2.9/TODO
-usr/share/locale/az/LC_MESSAGES/gtk+.mo
-usr/share/locale/ca/LC_MESSAGES/gtk+.mo
-usr/share/locale/cs/LC_MESSAGES/gtk+.mo
-usr/share/locale/da/LC_MESSAGES/gtk+.mo
-usr/share/locale/de/LC_MESSAGES/gtk+.mo
-usr/share/locale/el/LC_MESSAGES/gtk+.mo
-usr/share/locale/es/LC_MESSAGES/gtk+.mo
-usr/share/locale/et/LC_MESSAGES/gtk+.mo
-usr/share/locale/eu/LC_MESSAGES/gtk+.mo
-usr/share/locale/fi/LC_MESSAGES/gtk+.mo
-usr/share/locale/fr/LC_MESSAGES/gtk+.mo
-usr/share/locale/ga/LC_MESSAGES/gtk+.mo
-usr/share/locale/gl/LC_MESSAGES/gtk+.mo
-usr/share/locale/hr/LC_MESSAGES/gtk+.mo
-usr/share/locale/hu/LC_MESSAGES/gtk+.mo
-usr/share/locale/it/LC_MESSAGES/gtk+.mo
-usr/share/locale/ja/LC_MESSAGES/gtk+.mo
-usr/share/locale/ko/LC_MESSAGES/gtk+.mo
-usr/share/locale/lt/LC_MESSAGES/gtk+.mo
-usr/share/locale/nl/LC_MESSAGES/gtk+.mo
-usr/share/locale/nn/LC_MESSAGES/gtk+.mo
-usr/share/locale/no/LC_MESSAGES/gtk+.mo
-usr/share/locale/pl/LC_MESSAGES/gtk+.mo
-usr/share/locale/pt/LC_MESSAGES/gtk+.mo
-usr/share/locale/pt_BR/LC_MESSAGES/gtk+.mo
-usr/share/locale/ro/LC_MESSAGES/gtk+.mo
-usr/share/locale/ru/LC_MESSAGES/gtk+.mo
-usr/share/locale/sk/LC_MESSAGES/gtk+.mo
-usr/share/locale/sl/LC_MESSAGES/gtk+.mo
-usr/share/locale/sp/LC_MESSAGES/gtk+.mo
-usr/share/locale/sr/LC_MESSAGES/gtk+.mo
-usr/share/locale/sv/LC_MESSAGES/gtk+.mo
-usr/share/locale/tr/LC_MESSAGES/gtk+.mo
-usr/share/locale/uk/LC_MESSAGES/gtk+.mo
-usr/share/locale/wa/LC_MESSAGES/gtk+.mo
-usr/share/locale/zh_CN.GB2312/LC_MESSAGES/gtk+.mo
-usr/share/locale/zh_TW.Big5/LC_MESSAGES/gtk+.mo
-usr/share/themes/Default/gtk/gtkrc
-etc/gtk/gtkrc.be
-etc/gtk/gtkrc.bg
-etc/gtk/gtkrc.bg_BG.iso88595
-etc/gtk/gtkrc.cs
-etc/gtk/gtkrc.cy
-etc/gtk/gtkrc.et
-etc/gtk/gtkrc.ga
-etc/gtk/gtkrc.he_IL.cp1255
-etc/gtk/gtkrc.he_IL.microsoftcp1255
-etc/gtk/gtkrc.hr
-etc/gtk/gtkrc.hu
-etc/gtk/gtkrc.ka
-etc/gtk/gtkrc.lt
-etc/gtk/gtkrc.lv
-etc/gtk/gtkrc.mi
-etc/gtk/gtkrc.mk
-etc/gtk/gtkrc.pl
-etc/gtk/gtkrc.ro
-etc/gtk/gtkrc.ru_RU.iso88595
-etc/gtk/gtkrc.sk
-etc/gtk/gtkrc.sl
-etc/gtk/gtkrc.sp
-etc/gtk/gtkrc.sq
-etc/gtk/gtkrc.sr
-etc/gtk/gtkrc.sr.iso88595
-etc/gtk/gtkrc.vi
-etc/gtk/gtkrc.vi_VN.viscii111
-etc/gtk/gtkrc.yi
-usr/lib/libgdk-1.2.so.0
-usr/lib/libgtk-1.2.so.0
-@dirrm etc/gtk
-@dirrm usr/share/doc/gtk+-1.2.9
-@dirrm usr/share/themes/Default/gtk
-@dirrmtry usr/share/themes/Default
-@dirrmtry usr/share/themes
-@comment this port is not covered with mtree so removing locale directories.
-@dirrmtry usr/share/locale/zh_TW.Big5/LC_MESSAGES
-@dirrmtry usr/share/locale/zh_TW.Big5
-@dirrmtry usr/share/locale/zh_CN.GB2312/LC_MESSAGES
-@dirrmtry usr/share/locale/zh_CN.GB2312
-@dirrmtry usr/share/locale/wa/LC_MESSAGES
-@dirrmtry usr/share/locale/wa
-@dirrmtry usr/share/locale/uk/LC_MESSAGES
-@dirrmtry usr/share/locale/uk
-@dirrmtry usr/share/locale/tr/LC_MESSAGES
-@dirrmtry usr/share/locale/tr
-@dirrmtry usr/share/locale/sv/LC_MESSAGES
-@dirrmtry usr/share/locale/sv
-@dirrmtry usr/share/locale/sr/LC_MESSAGES
-@dirrmtry usr/share/locale/sr
-@dirrmtry usr/share/locale/sp/LC_MESSAGES
-@dirrmtry usr/share/locale/sp
-@dirrmtry usr/share/locale/sl/LC_MESSAGES
-@dirrmtry usr/share/locale/sl
-@dirrmtry usr/share/locale/sk/LC_MESSAGES
-@dirrmtry usr/share/locale/sk
-@dirrmtry usr/share/locale/ru/LC_MESSAGES
-@dirrmtry usr/share/locale/ru
-@dirrmtry usr/share/locale/ro/LC_MESSAGES
-@dirrmtry usr/share/locale/ro
-@dirrmtry usr/share/locale/pt_BR/LC_MESSAGES
-@dirrmtry usr/share/locale/pt_BR
-@dirrmtry usr/share/locale/pt/LC_MESSAGES
-@dirrmtry usr/share/locale/pt
-@dirrmtry usr/share/locale/pl/LC_MESSAGES
-@dirrmtry usr/share/locale/pl
-@dirrmtry usr/share/locale/no/LC_MESSAGES
-@dirrmtry usr/share/locale/no
-@dirrmtry usr/share/locale/nn/LC_MESSAGES
-@dirrmtry usr/share/locale/nn
-@dirrmtry usr/share/locale/nl/LC_MESSAGES
-@dirrmtry usr/share/locale/nl
-@dirrmtry usr/share/locale/lt/LC_MESSAGES
-@dirrmtry usr/share/locale/lt
-@dirrmtry usr/share/locale/ko/LC_MESSAGES
-@dirrmtry usr/share/locale/ko
-@dirrmtry usr/share/locale/ja/LC_MESSAGES
-@dirrmtry usr/share/locale/ja
-@dirrmtry usr/share/locale/it/LC_MESSAGES
-@dirrmtry usr/share/locale/it
-@dirrmtry usr/share/locale/hu/LC_MESSAGES
-@dirrmtry usr/share/locale/hu
-@dirrmtry usr/share/locale/hr/LC_MESSAGES
-@dirrmtry usr/share/locale/hr
-@dirrmtry usr/share/locale/gl/LC_MESSAGES
-@dirrmtry usr/share/locale/gl
-@dirrmtry usr/share/locale/ga/LC_MESSAGES
-@dirrmtry usr/share/locale/ga
-@dirrmtry usr/share/locale/fr/LC_MESSAGES
-@dirrmtry usr/share/locale/fr
-@dirrmtry usr/share/locale/fi/LC_MESSAGES
-@dirrmtry usr/share/locale/fi
-@dirrmtry usr/share/locale/eu/LC_MESSAGES
-@dirrmtry usr/share/locale/eu
-@dirrmtry usr/share/locale/et/LC_MESSAGES
-@dirrmtry usr/share/locale/et
-@dirrmtry usr/share/locale/es/LC_MESSAGES
-@dirrmtry usr/share/locale/es
-@dirrmtry usr/share/locale/el/LC_MESSAGES
-@dirrmtry usr/share/locale/el
-@dirrmtry usr/share/locale/de/LC_MESSAGES
-@dirrmtry usr/share/locale/de
-@dirrmtry usr/share/locale/da/LC_MESSAGES
-@dirrmtry usr/share/locale/da
-@dirrmtry usr/share/locale/cs/LC_MESSAGES
-@dirrmtry usr/share/locale/cs
-@dirrmtry usr/share/locale/ca/LC_MESSAGES
-@dirrmtry usr/share/locale/ca
-@dirrmtry usr/share/locale/az/LC_MESSAGES
-@dirrmtry usr/share/locale/az
-
diff --git a/x11-toolkits/linux-f8-gtk/pkg-plist.i386 b/x11-toolkits/linux-f8-gtk/pkg-plist.i386
index d24b9a54faef..95b28b3a31ae 100644
--- a/x11-toolkits/linux-f8-gtk/pkg-plist.i386
+++ b/x11-toolkits/linux-f8-gtk/pkg-plist.i386
@@ -24,10 +24,12 @@ etc/gtk/gtkrc.iso88595
etc/gtk/gtkrc.iso88597
etc/gtk/gtkrc.iso88599
etc/gtk/gtkrc.ja
+etc/gtk/gtkrc.ja.utf8
etc/gtk/gtkrc.ka
etc/gtk/gtkrc.ka_GE.georgianacademy
etc/gtk/gtkrc.ka_GE.georgianps
etc/gtk/gtkrc.ko
+etc/gtk/gtkrc.ko.utf8
etc/gtk/gtkrc.lt
etc/gtk/gtkrc.lv
etc/gtk/gtkrc.mi
@@ -50,7 +52,9 @@ etc/gtk/gtkrc.vi_VN.viscii
etc/gtk/gtkrc.vi_VN.viscii111
etc/gtk/gtkrc.yi
etc/gtk/gtkrc.zh_CN
+etc/gtk/gtkrc.zh_CN.utf8
etc/gtk/gtkrc.zh_TW.big5
+etc/gtk/gtkrc.zh_TW.utf8
usr/lib/libgdk-1.2.so.0
usr/lib/libgdk-1.2.so.0.9.1
usr/lib/libgtk-1.2.so.0
@@ -100,85 +104,22 @@ usr/share/locale/wa/LC_MESSAGES/gtk+.mo
usr/share/locale/zh_CN.GB2312/LC_MESSAGES/gtk+.mo
usr/share/locale/zh_TW.Big5/LC_MESSAGES/gtk+.mo
usr/share/themes/Default/gtk/gtkrc
-@dirrm etc/gtk
-@dirrm usr/share/doc/gtk+-1.2.10
-@dirrm usr/share/themes/Default/gtk
+@dirrmtry usr/share/themes/Default/gtk
@dirrmtry usr/share/themes/Default
@dirrmtry usr/share/themes
-@comment this port is not covered with mtree so removing locale directories.
@dirrmtry usr/share/locale/zh_TW.Big5/LC_MESSAGES
@dirrmtry usr/share/locale/zh_TW.Big5
-@dirrmtry usr/share/locale/zh_CN.GB2312/LC_MESSAGES
-@dirrmtry usr/share/locale/zh_CN.GB2312
-@dirrmtry usr/share/locale/wa/LC_MESSAGES
-@dirrmtry usr/share/locale/wa
@dirrmtry usr/share/locale/vi/LC_MESSAGES
@dirrmtry usr/share/locale/vi
-@dirrmtry usr/share/locale/uk/LC_MESSAGES
-@dirrmtry usr/share/locale/uk
-@dirrmtry usr/share/locale/tr/LC_MESSAGES
-@dirrmtry usr/share/locale/tr
-@dirrmtry usr/share/locale/sv/LC_MESSAGES
-@dirrmtry usr/share/locale/sv
-@dirrmtry usr/share/locale/sr/LC_MESSAGES
-@dirrmtry usr/share/locale/sr
@dirrmtry usr/share/locale/sp/LC_MESSAGES
@dirrmtry usr/share/locale/sp
-@dirrmtry usr/share/locale/sl/LC_MESSAGES
-@dirrmtry usr/share/locale/sl
-@dirrmtry usr/share/locale/sk/LC_MESSAGES
-@dirrmtry usr/share/locale/sk
-@dirrmtry usr/share/locale/ru/LC_MESSAGES
-@dirrmtry usr/share/locale/ru
-@dirrmtry usr/share/locale/ro/LC_MESSAGES
-@dirrmtry usr/share/locale/ro
-@dirrmtry usr/share/locale/pt_BR/LC_MESSAGES
-@dirrmtry usr/share/locale/pt_BR
-@dirrmtry usr/share/locale/pt/LC_MESSAGES
-@dirrmtry usr/share/locale/pt
-@dirrmtry usr/share/locale/pl/LC_MESSAGES
-@dirrmtry usr/share/locale/pl
-@dirrmtry usr/share/locale/no/LC_MESSAGES
-@dirrmtry usr/share/locale/no
@dirrmtry usr/share/locale/nn/LC_MESSAGES
@dirrmtry usr/share/locale/nn
-@dirrmtry usr/share/locale/nl/LC_MESSAGES
-@dirrmtry usr/share/locale/nl
@dirrmtry usr/share/locale/lt/LC_MESSAGES
@dirrmtry usr/share/locale/lt
-@dirrmtry usr/share/locale/ko/LC_MESSAGES
-@dirrmtry usr/share/locale/ko
-@dirrmtry usr/share/locale/ja/LC_MESSAGES
-@dirrmtry usr/share/locale/ja
-@dirrmtry usr/share/locale/it/LC_MESSAGES
-@dirrmtry usr/share/locale/it
-@dirrmtry usr/share/locale/hu/LC_MESSAGES
-@dirrmtry usr/share/locale/hu
-@dirrmtry usr/share/locale/hr/LC_MESSAGES
-@dirrmtry usr/share/locale/hr
-@dirrmtry usr/share/locale/gl/LC_MESSAGES
-@dirrmtry usr/share/locale/gl
-@dirrmtry usr/share/locale/ga/LC_MESSAGES
-@dirrmtry usr/share/locale/ga
-@dirrmtry usr/share/locale/fr/LC_MESSAGES
-@dirrmtry usr/share/locale/fr
-@dirrmtry usr/share/locale/fi/LC_MESSAGES
-@dirrmtry usr/share/locale/fi
@dirrmtry usr/share/locale/eu/LC_MESSAGES
@dirrmtry usr/share/locale/eu
-@dirrmtry usr/share/locale/et/LC_MESSAGES
-@dirrmtry usr/share/locale/et
-@dirrmtry usr/share/locale/es/LC_MESSAGES
-@dirrmtry usr/share/locale/es
-@dirrmtry usr/share/locale/el/LC_MESSAGES
-@dirrmtry usr/share/locale/el
-@dirrmtry usr/share/locale/de/LC_MESSAGES
-@dirrmtry usr/share/locale/de
-@dirrmtry usr/share/locale/da/LC_MESSAGES
-@dirrmtry usr/share/locale/da
-@dirrmtry usr/share/locale/cs/LC_MESSAGES
-@dirrmtry usr/share/locale/cs
-@dirrmtry usr/share/locale/ca/LC_MESSAGES
-@dirrmtry usr/share/locale/ca
@dirrmtry usr/share/locale/az/LC_MESSAGES
@dirrmtry usr/share/locale/az
+@dirrm usr/share/doc/gtk+-1.2.10
+@dirrm etc/gtk
diff --git a/x11-toolkits/linux-f8-gtk2/Makefile b/x11-toolkits/linux-f8-gtk2/Makefile
index 2df73bef3e89..e5ebe71571a6 100644
--- a/x11-toolkits/linux-f8-gtk2/Makefile
+++ b/x11-toolkits/linux-f8-gtk2/Makefile
@@ -7,12 +7,9 @@
PORTNAME= gtk2
PORTVERSION= 2.4.14
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= x11-toolkits linux
-MASTER_SITES= ${MASTER_SITE_FEDORA_LINUX} \
- http://distro.ibiblio.org/pub/linux/distributions/fedora/linux/core/${SUBDIR}/ \
- ftp://ftp.uni-koeln.de/mirrors/fedora/linux/core/${SUBDIR}/
-MASTER_SITE_SUBDIR= updates/3/i386
+DISTNAME= ${PORTNAME}-${PORTVERSION}-4.fc3.3
MAINTAINER= freebsd-emulation@FreeBSD.org
COMMENT= GTK+ library, version 2.X, Linux binary
@@ -27,17 +24,15 @@ RUN_DEPENDS+= ${LINUXBASE}/usr/lib/libglib-2.0.so.0:${PORTSDIR}/devel/linux-glib
${LINUXBASE}/usr/lib/libpango-1.0.so.0:${PORTSDIR}/x11-toolkits/linux-pango
ONLY_FOR_ARCHS= i386 amd64
-PLIST= ${PKGDIR}/pkg-plist
USE_XLIB= yes
-RESTRICTED= "binaries under GNU LGPL without accompanying source"
-RPM_SET= gtk2-${PORTVERSION}-4.fc3.3.${ARCH}.rpm
+USE_LINUX_RPM= yes
+LINUX_DIST_VER= 3
+INSTALLS_SHLIB= yes
+BRANDELF_DIRS= usr/bin
PLIST_SUB= LIBVERSION="400.14" PORTVERSION="${PORTVERSION}"
post-install:
-.for ii in gdk-pixbuf-query-loaders-32 gtk-demo gtk-query-immodules-2.0-32
- @${BRANDELF} -t Linux ${PREFIX}/usr/bin/${ii}
-.endfor
@chroot ${PREFIX} /usr/bin/gtk-query-immodules-2.0-32 > ${PREFIX}/etc/gtk-2.0/i386-redhat-linux-gnu/gtk.immodules
@chroot ${PREFIX} /usr/bin/gdk-pixbuf-query-loaders-32 > ${PREFIX}/etc/gtk-2.0/i386-redhat-linux-gnu/gdk-pixbuf.loaders
-.include "../linux-gtk/Makefile"
+.include <bsd.port.mk>
diff --git a/x11-toolkits/linux-f8-gtk2/distinfo.i386 b/x11-toolkits/linux-f8-gtk2/distinfo.i386
index d08be6cdf92f..e55c9461ddd5 100644
--- a/x11-toolkits/linux-f8-gtk2/distinfo.i386
+++ b/x11-toolkits/linux-f8-gtk2/distinfo.i386
@@ -1,3 +1,6 @@
-MD5 (rpm/gtk2-2.4.14-4.fc3.3.i386.rpm) = 5c55dcfe8e8854ecf26bc915c7dce15f
-SHA256 (rpm/gtk2-2.4.14-4.fc3.3.i386.rpm) = 57aedcd29c221148930363002fa5223aecb982d6d2fb1b124476ef55382f2836
-SIZE (rpm/gtk2-2.4.14-4.fc3.3.i386.rpm) = 4593031
+MD5 (rpm/i386/fedora/3/gtk2-2.4.14-4.fc3.3.i386.rpm) = 5c55dcfe8e8854ecf26bc915c7dce15f
+SHA256 (rpm/i386/fedora/3/gtk2-2.4.14-4.fc3.3.i386.rpm) = 57aedcd29c221148930363002fa5223aecb982d6d2fb1b124476ef55382f2836
+SIZE (rpm/i386/fedora/3/gtk2-2.4.14-4.fc3.3.i386.rpm) = 4593031
+MD5 (rpm/i386/fedora/3/gtk2-2.4.14-4.fc3.3.src.rpm) = 44f37d231bffc16d7e516a7798007bb1
+SHA256 (rpm/i386/fedora/3/gtk2-2.4.14-4.fc3.3.src.rpm) = b8f7e3688e344960e90cb2d09188dbf0b4450d9f0c00ab90d14745335f0827c1
+SIZE (rpm/i386/fedora/3/gtk2-2.4.14-4.fc3.3.src.rpm) = 9690086
diff --git a/x11-toolkits/linux-f8-pango/Makefile b/x11-toolkits/linux-f8-pango/Makefile
index f8cb49fb09d1..4c38c1d477b6 100644
--- a/x11-toolkits/linux-f8-pango/Makefile
+++ b/x11-toolkits/linux-f8-pango/Makefile
@@ -7,13 +7,12 @@
PORTNAME= pango
PORTVERSION= 1.6.0
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= x11-toolkits linux
+DISTNAME= ${PORTNAME}-${PORTVERSION}-7
MAINTAINER= freebsd-emulation@FreeBSD.org
COMMENT= Linux pango binary
-MASTER_SITES= ${MASTER_SITE_FEDORA_LINUX}
-MASTER_SITE_SUBDIR= 3/i386/os/Fedora/RPMS
# these libraries are required by pango-querymodules
RUN_DEPENDS= ${LINUXBASE}/usr/X11R6/lib/libX11.so.6:${PORTSDIR}/x11/linux-XFree86-libs \
@@ -23,12 +22,13 @@ RUN_DEPENDS= ${LINUXBASE}/usr/X11R6/lib/libX11.so.6:${PORTSDIR}/x11/linux-XFree8
USE_XLIB= yes
ONLY_FOR_ARCHS= i386 amd64
-PLIST= ${PKGDIR}/pkg-plist
-RPM_SET= pango-${PORTVERSION}-7.i386.rpm
+USE_LINUX_RPM= yes
+LINUX_DIST_VER= 3
+INSTALLS_SHLIB= yes
+BRANDELF_DIRS= usr/bin
PLIST_SUB+= LIBVERSION="600.0" PORTVERSION="${PORTVERSION}"
post-install:
- @${BRANDELF} -t Linux ${PREFIX}/usr/bin/pango-querymodules-32
@${PREFIX}/usr/bin/pango-querymodules-32 > ${PREFIX}/etc/pango/i386-redhat-linux-gnu/pango.modules
-.include "../linux-gtk/Makefile"
+.include <bsd.port.mk>
diff --git a/x11-toolkits/linux-f8-pango/distinfo.i386 b/x11-toolkits/linux-f8-pango/distinfo.i386
index 9cee7663d040..8009062442e7 100644
--- a/x11-toolkits/linux-f8-pango/distinfo.i386
+++ b/x11-toolkits/linux-f8-pango/distinfo.i386
@@ -1,3 +1,6 @@
-MD5 (rpm/pango-1.6.0-7.i386.rpm) = ddb36c33af419ac7993ddf5317fbb904
-SHA256 (rpm/pango-1.6.0-7.i386.rpm) = 2012a8f277e0ddda0734c9f784f4d62aff07ccf88b55da551ec073ec2718da7f
-SIZE (rpm/pango-1.6.0-7.i386.rpm) = 277273
+MD5 (rpm/i386/fedora/3/pango-1.6.0-7.i386.rpm) = ddb36c33af419ac7993ddf5317fbb904
+SHA256 (rpm/i386/fedora/3/pango-1.6.0-7.i386.rpm) = 2012a8f277e0ddda0734c9f784f4d62aff07ccf88b55da551ec073ec2718da7f
+SIZE (rpm/i386/fedora/3/pango-1.6.0-7.i386.rpm) = 277273
+MD5 (rpm/i386/fedora/3/pango-1.6.0-7.src.rpm) = 962e177a9b5e7a74c34b9204e3a5aa41
+SHA256 (rpm/i386/fedora/3/pango-1.6.0-7.src.rpm) = 8faac8c88dcc58203569d31a8881447b553bf52f26525799cfc1f54a09e1bfbe
+SIZE (rpm/i386/fedora/3/pango-1.6.0-7.src.rpm) = 879369
diff --git a/x11-toolkits/linux-gtk/Makefile b/x11-toolkits/linux-gtk/Makefile
index d3cffb4d10f5..ae2f5fa560e8 100644
--- a/x11-toolkits/linux-gtk/Makefile
+++ b/x11-toolkits/linux-gtk/Makefile
@@ -7,75 +7,21 @@
# $FreeBSD$
#
-PORTNAME?= gtk
-PORTVERSION?= 1.2.10
-PORTREVISION?= 0
-CATEGORIES?= x11-toolkits linux
-MASTER_SITES?= ${FEDORALEGACY_MIRRORS:S/__DIR__/${FEDORADIR}/g} ${RPM_MIRRORS:S/__DIR__/${STDDIR}/g}
-PKGNAMEPREFIX= linux-
-DISTFILES= ${RPM_SET} ${SRC_DISTFILES}
+PORTNAME= gtk
+PORTVERSION= 1.2.10
+PORTREVISION= 1
+CATEGORIES= x11-toolkits linux
+DISTNAME= gtk+-${PORTVERSION}-33
-MAINTAINER?= freebsd-emulation@FreeBSD.org
-COMMENT?= RPM of the Gtk lib
+MAINTAINER= freebsd-emulation@FreeBSD.org
+COMMENT= RPM of the Gtk lib
-BUILD_DEPENDS+= rpm:${PORTSDIR}/archivers/rpm
-# XXX: I haven't checked if every port which includes this Makefile needs
-# USE_XLIB, so let it be a RUN_DEPENDS?= until the refactoring of the
-# RPM bits.
-RUN_DEPENDS?= ${LINUXBASE}/usr/X11R6/lib/libX11.so.6:${PORTSDIR}/x11/linux-XFree86-libs
+ONLY_FOR_ARCHS= i386 amd64
-ONLY_FOR_ARCHS?= i386 alpha amd64
+USE_LINUX_RPM= yes
+LINUX_DIST_VER= 3
+INSTALLS_SHLIB= yes
+PLIST= pkg-plist.${LINUX_RPM_ARCH}
+USE_XLIB= yes
-USE_LINUX= yes
-USE_LINUX_PREFIX= yes
-
-.include <bsd.port.pre.mk>
-
-.if (${ARCH} == "amd64")
-ARCH= i386
-RPMFLAGS+= --ignorearch
-.endif
-DIST_SUBDIR?= rpm
-EXTRACT_ONLY=
-NO_BUILD= yes
-PLIST?= ${PKGDIR}/pkg-plist.${ARCH}
-MD5_FILE?= ${MASTERDIR}/distinfo.${ARCH}
-LINUX_LDCONFIG?=${LINUXBASE}/sbin/ldconfig
-
-# Let's avoid hardcoding 'en' as the language.
-LANG= en
-# Set the version of linux_base
-BASEVERSION?= 8.0
-RPM_MIRRORS= \
- ftp://ftp.redhat.com/pub/redhat/__DIR__/ \
- ftp://ftp.nluug.nl/site/ftp.redhat.com/redhat/__DIR__/
-FEDORALEGACY_MIRRORS= \
- http://download.fedoralegacy.org/redhat/__DIR__/
-STDDIR= linux/${BASEVERSION}/${LANG}/os/${ARCH}/RedHat/RPMS
-UPDDIR= linux/updates/${BASEVERSION}/${LANG}/os/${ARCH}
-FEDORADIR= ${BASEVERSION}/os/${ARCH}
-.if (${ARCH} == "i386")
-RPM_SET?= gtk+-1.2.10-22.${ARCH}.rpm
-.endif
-DBPATH= /var/lib/rpm
-RPMFLAGS+= --ignoreos --root ${PREFIX} --dbpath ${DBPATH} \
- --nodeps --replacepkgs --oldpackage
-RPMDIR= ${DISTDIR}/${DIST_SUBDIR}
-
-do-install:
- @for R in ${RPM_SET}; do \
- ${ECHO_MSG} $$R; \
- rpm -U ${RPMFLAGS} ${RPMDIR}/$$R || true ; \
- done
- @${LINUX_LDCONFIG}
-
-new-plist:
- @${RM} -rf ${WRKSRC}/tmp
- @${MKDIR} ${WRKSRC}/tmp
- @cd ${WRKSRC}/tmp; \
- rpm2cpio < ${DISTDIR}/${DIST_SUBDIR}/${RPM_SET} | ${CPIO} -id; \
- ${FIND} * -type f -o -type l > ${PLIST}.new; \
- ${FIND} -d * -type d | ${SED} -e 's:^:@dirrm :' \
- >> ${PLIST}.new
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/x11-toolkits/linux-gtk/distinfo.alpha b/x11-toolkits/linux-gtk/distinfo.alpha
deleted file mode 100644
index 3b30df4d412f..000000000000
--- a/x11-toolkits/linux-gtk/distinfo.alpha
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 (rpm/gtk+-1.2.9-4.alpha.rpm) = 72107f3edc89e27e1481b89fd752ff82
-SIZE (rpm/gtk+-1.2.9-4.alpha.rpm) = 1166775
diff --git a/x11-toolkits/linux-gtk/distinfo.i386 b/x11-toolkits/linux-gtk/distinfo.i386
index 3a34cdf9f23f..40e58d497d51 100644
--- a/x11-toolkits/linux-gtk/distinfo.i386
+++ b/x11-toolkits/linux-gtk/distinfo.i386
@@ -1,3 +1,6 @@
-MD5 (rpm/gtk+-1.2.10-22.i386.rpm) = 1932769e2a4fc10524b77a69811f4427
-SHA256 (rpm/gtk+-1.2.10-22.i386.rpm) = 7949c5204a620056f09279e6571ae2f4bacf6c8cbbf7fc7a4e4e75c33f806c6a
-SIZE (rpm/gtk+-1.2.10-22.i386.rpm) = 948063
+MD5 (rpm/i386/fedora/3/gtk+-1.2.10-33.i386.rpm) = 6ed518519e2fba27bb5bf3cbf1ab258c
+SHA256 (rpm/i386/fedora/3/gtk+-1.2.10-33.i386.rpm) = bb3968184a73eb25ae966dd0dccc5975bdfa7734bcd24c7508ca9b52b12fc404
+SIZE (rpm/i386/fedora/3/gtk+-1.2.10-33.i386.rpm) = 856964
+MD5 (rpm/i386/fedora/3/gtk+-1.2.10-33.src.rpm) = 428f57749b40021404b67d203962e98b
+SHA256 (rpm/i386/fedora/3/gtk+-1.2.10-33.src.rpm) = 3fd4a4e9a31cd4fcd52d8fe7c97581f8bb7e0e3f7b8736b26fbc557afb0e25cf
+SIZE (rpm/i386/fedora/3/gtk+-1.2.10-33.src.rpm) = 2918540
diff --git a/x11-toolkits/linux-gtk/pkg-plist.alpha b/x11-toolkits/linux-gtk/pkg-plist.alpha
deleted file mode 100644
index 052e7ae60a60..000000000000
--- a/x11-toolkits/linux-gtk/pkg-plist.alpha
+++ /dev/null
@@ -1,182 +0,0 @@
-etc/gtk/gtkrc
-etc/gtk/gtkrc.az
-etc/gtk/gtkrc.cp1251
-etc/gtk/gtkrc.cp1255
-etc/gtk/gtkrc.el
-etc/gtk/gtkrc.eo
-etc/gtk/gtkrc.he
-etc/gtk/gtkrc.hy
-etc/gtk/gtkrc.iso-8859-13
-etc/gtk/gtkrc.iso-8859-14
-etc/gtk/gtkrc.iso-8859-15
-etc/gtk/gtkrc.iso-8859-2
-etc/gtk/gtkrc.iso-8859-5
-etc/gtk/gtkrc.ja
-etc/gtk/gtkrc.ka_GE.georgianacademy
-etc/gtk/gtkrc.ka_GE.georgianps
-etc/gtk/gtkrc.ko
-etc/gtk/gtkrc.ru
-etc/gtk/gtkrc.th
-etc/gtk/gtkrc.tr
-etc/gtk/gtkrc.uk
-etc/gtk/gtkrc.vi_VN.tcvn
-etc/gtk/gtkrc.vi_VN.viscii
-etc/gtk/gtkrc.zh_CN
-etc/gtk/gtkrc.zh_TW.big5
-usr/lib/libgdk-1.2.so.0.9.0
-usr/lib/libgtk-1.2.so.0.9.0
-usr/share/doc/gtk+-1.2.9/AUTHORS
-usr/share/doc/gtk+-1.2.9/COPYING
-usr/share/doc/gtk+-1.2.9/ChangeLog
-usr/share/doc/gtk+-1.2.9/NEWS
-usr/share/doc/gtk+-1.2.9/README
-usr/share/doc/gtk+-1.2.9/TODO
-usr/share/locale/az/LC_MESSAGES/gtk+.mo
-usr/share/locale/ca/LC_MESSAGES/gtk+.mo
-usr/share/locale/cs/LC_MESSAGES/gtk+.mo
-usr/share/locale/da/LC_MESSAGES/gtk+.mo
-usr/share/locale/de/LC_MESSAGES/gtk+.mo
-usr/share/locale/el/LC_MESSAGES/gtk+.mo
-usr/share/locale/es/LC_MESSAGES/gtk+.mo
-usr/share/locale/et/LC_MESSAGES/gtk+.mo
-usr/share/locale/eu/LC_MESSAGES/gtk+.mo
-usr/share/locale/fi/LC_MESSAGES/gtk+.mo
-usr/share/locale/fr/LC_MESSAGES/gtk+.mo
-usr/share/locale/ga/LC_MESSAGES/gtk+.mo
-usr/share/locale/gl/LC_MESSAGES/gtk+.mo
-usr/share/locale/hr/LC_MESSAGES/gtk+.mo
-usr/share/locale/hu/LC_MESSAGES/gtk+.mo
-usr/share/locale/it/LC_MESSAGES/gtk+.mo
-usr/share/locale/ja/LC_MESSAGES/gtk+.mo
-usr/share/locale/ko/LC_MESSAGES/gtk+.mo
-usr/share/locale/lt/LC_MESSAGES/gtk+.mo
-usr/share/locale/nl/LC_MESSAGES/gtk+.mo
-usr/share/locale/nn/LC_MESSAGES/gtk+.mo
-usr/share/locale/no/LC_MESSAGES/gtk+.mo
-usr/share/locale/pl/LC_MESSAGES/gtk+.mo
-usr/share/locale/pt/LC_MESSAGES/gtk+.mo
-usr/share/locale/pt_BR/LC_MESSAGES/gtk+.mo
-usr/share/locale/ro/LC_MESSAGES/gtk+.mo
-usr/share/locale/ru/LC_MESSAGES/gtk+.mo
-usr/share/locale/sk/LC_MESSAGES/gtk+.mo
-usr/share/locale/sl/LC_MESSAGES/gtk+.mo
-usr/share/locale/sp/LC_MESSAGES/gtk+.mo
-usr/share/locale/sr/LC_MESSAGES/gtk+.mo
-usr/share/locale/sv/LC_MESSAGES/gtk+.mo
-usr/share/locale/tr/LC_MESSAGES/gtk+.mo
-usr/share/locale/uk/LC_MESSAGES/gtk+.mo
-usr/share/locale/wa/LC_MESSAGES/gtk+.mo
-usr/share/locale/zh_CN.GB2312/LC_MESSAGES/gtk+.mo
-usr/share/locale/zh_TW.Big5/LC_MESSAGES/gtk+.mo
-usr/share/themes/Default/gtk/gtkrc
-etc/gtk/gtkrc.be
-etc/gtk/gtkrc.bg
-etc/gtk/gtkrc.bg_BG.iso88595
-etc/gtk/gtkrc.cs
-etc/gtk/gtkrc.cy
-etc/gtk/gtkrc.et
-etc/gtk/gtkrc.ga
-etc/gtk/gtkrc.he_IL.cp1255
-etc/gtk/gtkrc.he_IL.microsoftcp1255
-etc/gtk/gtkrc.hr
-etc/gtk/gtkrc.hu
-etc/gtk/gtkrc.ka
-etc/gtk/gtkrc.lt
-etc/gtk/gtkrc.lv
-etc/gtk/gtkrc.mi
-etc/gtk/gtkrc.mk
-etc/gtk/gtkrc.pl
-etc/gtk/gtkrc.ro
-etc/gtk/gtkrc.ru_RU.iso88595
-etc/gtk/gtkrc.sk
-etc/gtk/gtkrc.sl
-etc/gtk/gtkrc.sp
-etc/gtk/gtkrc.sq
-etc/gtk/gtkrc.sr
-etc/gtk/gtkrc.sr.iso88595
-etc/gtk/gtkrc.vi
-etc/gtk/gtkrc.vi_VN.viscii111
-etc/gtk/gtkrc.yi
-usr/lib/libgdk-1.2.so.0
-usr/lib/libgtk-1.2.so.0
-@dirrm etc/gtk
-@dirrm usr/share/doc/gtk+-1.2.9
-@dirrm usr/share/themes/Default/gtk
-@dirrmtry usr/share/themes/Default
-@dirrmtry usr/share/themes
-@comment this port is not covered with mtree so removing locale directories.
-@dirrmtry usr/share/locale/zh_TW.Big5/LC_MESSAGES
-@dirrmtry usr/share/locale/zh_TW.Big5
-@dirrmtry usr/share/locale/zh_CN.GB2312/LC_MESSAGES
-@dirrmtry usr/share/locale/zh_CN.GB2312
-@dirrmtry usr/share/locale/wa/LC_MESSAGES
-@dirrmtry usr/share/locale/wa
-@dirrmtry usr/share/locale/uk/LC_MESSAGES
-@dirrmtry usr/share/locale/uk
-@dirrmtry usr/share/locale/tr/LC_MESSAGES
-@dirrmtry usr/share/locale/tr
-@dirrmtry usr/share/locale/sv/LC_MESSAGES
-@dirrmtry usr/share/locale/sv
-@dirrmtry usr/share/locale/sr/LC_MESSAGES
-@dirrmtry usr/share/locale/sr
-@dirrmtry usr/share/locale/sp/LC_MESSAGES
-@dirrmtry usr/share/locale/sp
-@dirrmtry usr/share/locale/sl/LC_MESSAGES
-@dirrmtry usr/share/locale/sl
-@dirrmtry usr/share/locale/sk/LC_MESSAGES
-@dirrmtry usr/share/locale/sk
-@dirrmtry usr/share/locale/ru/LC_MESSAGES
-@dirrmtry usr/share/locale/ru
-@dirrmtry usr/share/locale/ro/LC_MESSAGES
-@dirrmtry usr/share/locale/ro
-@dirrmtry usr/share/locale/pt_BR/LC_MESSAGES
-@dirrmtry usr/share/locale/pt_BR
-@dirrmtry usr/share/locale/pt/LC_MESSAGES
-@dirrmtry usr/share/locale/pt
-@dirrmtry usr/share/locale/pl/LC_MESSAGES
-@dirrmtry usr/share/locale/pl
-@dirrmtry usr/share/locale/no/LC_MESSAGES
-@dirrmtry usr/share/locale/no
-@dirrmtry usr/share/locale/nn/LC_MESSAGES
-@dirrmtry usr/share/locale/nn
-@dirrmtry usr/share/locale/nl/LC_MESSAGES
-@dirrmtry usr/share/locale/nl
-@dirrmtry usr/share/locale/lt/LC_MESSAGES
-@dirrmtry usr/share/locale/lt
-@dirrmtry usr/share/locale/ko/LC_MESSAGES
-@dirrmtry usr/share/locale/ko
-@dirrmtry usr/share/locale/ja/LC_MESSAGES
-@dirrmtry usr/share/locale/ja
-@dirrmtry usr/share/locale/it/LC_MESSAGES
-@dirrmtry usr/share/locale/it
-@dirrmtry usr/share/locale/hu/LC_MESSAGES
-@dirrmtry usr/share/locale/hu
-@dirrmtry usr/share/locale/hr/LC_MESSAGES
-@dirrmtry usr/share/locale/hr
-@dirrmtry usr/share/locale/gl/LC_MESSAGES
-@dirrmtry usr/share/locale/gl
-@dirrmtry usr/share/locale/ga/LC_MESSAGES
-@dirrmtry usr/share/locale/ga
-@dirrmtry usr/share/locale/fr/LC_MESSAGES
-@dirrmtry usr/share/locale/fr
-@dirrmtry usr/share/locale/fi/LC_MESSAGES
-@dirrmtry usr/share/locale/fi
-@dirrmtry usr/share/locale/eu/LC_MESSAGES
-@dirrmtry usr/share/locale/eu
-@dirrmtry usr/share/locale/et/LC_MESSAGES
-@dirrmtry usr/share/locale/et
-@dirrmtry usr/share/locale/es/LC_MESSAGES
-@dirrmtry usr/share/locale/es
-@dirrmtry usr/share/locale/el/LC_MESSAGES
-@dirrmtry usr/share/locale/el
-@dirrmtry usr/share/locale/de/LC_MESSAGES
-@dirrmtry usr/share/locale/de
-@dirrmtry usr/share/locale/da/LC_MESSAGES
-@dirrmtry usr/share/locale/da
-@dirrmtry usr/share/locale/cs/LC_MESSAGES
-@dirrmtry usr/share/locale/cs
-@dirrmtry usr/share/locale/ca/LC_MESSAGES
-@dirrmtry usr/share/locale/ca
-@dirrmtry usr/share/locale/az/LC_MESSAGES
-@dirrmtry usr/share/locale/az
-
diff --git a/x11-toolkits/linux-gtk/pkg-plist.i386 b/x11-toolkits/linux-gtk/pkg-plist.i386
index d24b9a54faef..95b28b3a31ae 100644
--- a/x11-toolkits/linux-gtk/pkg-plist.i386
+++ b/x11-toolkits/linux-gtk/pkg-plist.i386
@@ -24,10 +24,12 @@ etc/gtk/gtkrc.iso88595
etc/gtk/gtkrc.iso88597
etc/gtk/gtkrc.iso88599
etc/gtk/gtkrc.ja
+etc/gtk/gtkrc.ja.utf8
etc/gtk/gtkrc.ka
etc/gtk/gtkrc.ka_GE.georgianacademy
etc/gtk/gtkrc.ka_GE.georgianps
etc/gtk/gtkrc.ko
+etc/gtk/gtkrc.ko.utf8
etc/gtk/gtkrc.lt
etc/gtk/gtkrc.lv
etc/gtk/gtkrc.mi
@@ -50,7 +52,9 @@ etc/gtk/gtkrc.vi_VN.viscii
etc/gtk/gtkrc.vi_VN.viscii111
etc/gtk/gtkrc.yi
etc/gtk/gtkrc.zh_CN
+etc/gtk/gtkrc.zh_CN.utf8
etc/gtk/gtkrc.zh_TW.big5
+etc/gtk/gtkrc.zh_TW.utf8
usr/lib/libgdk-1.2.so.0
usr/lib/libgdk-1.2.so.0.9.1
usr/lib/libgtk-1.2.so.0
@@ -100,85 +104,22 @@ usr/share/locale/wa/LC_MESSAGES/gtk+.mo
usr/share/locale/zh_CN.GB2312/LC_MESSAGES/gtk+.mo
usr/share/locale/zh_TW.Big5/LC_MESSAGES/gtk+.mo
usr/share/themes/Default/gtk/gtkrc
-@dirrm etc/gtk
-@dirrm usr/share/doc/gtk+-1.2.10
-@dirrm usr/share/themes/Default/gtk
+@dirrmtry usr/share/themes/Default/gtk
@dirrmtry usr/share/themes/Default
@dirrmtry usr/share/themes
-@comment this port is not covered with mtree so removing locale directories.
@dirrmtry usr/share/locale/zh_TW.Big5/LC_MESSAGES
@dirrmtry usr/share/locale/zh_TW.Big5
-@dirrmtry usr/share/locale/zh_CN.GB2312/LC_MESSAGES
-@dirrmtry usr/share/locale/zh_CN.GB2312
-@dirrmtry usr/share/locale/wa/LC_MESSAGES
-@dirrmtry usr/share/locale/wa
@dirrmtry usr/share/locale/vi/LC_MESSAGES
@dirrmtry usr/share/locale/vi
-@dirrmtry usr/share/locale/uk/LC_MESSAGES
-@dirrmtry usr/share/locale/uk
-@dirrmtry usr/share/locale/tr/LC_MESSAGES
-@dirrmtry usr/share/locale/tr
-@dirrmtry usr/share/locale/sv/LC_MESSAGES
-@dirrmtry usr/share/locale/sv
-@dirrmtry usr/share/locale/sr/LC_MESSAGES
-@dirrmtry usr/share/locale/sr
@dirrmtry usr/share/locale/sp/LC_MESSAGES
@dirrmtry usr/share/locale/sp
-@dirrmtry usr/share/locale/sl/LC_MESSAGES
-@dirrmtry usr/share/locale/sl
-@dirrmtry usr/share/locale/sk/LC_MESSAGES
-@dirrmtry usr/share/locale/sk
-@dirrmtry usr/share/locale/ru/LC_MESSAGES
-@dirrmtry usr/share/locale/ru
-@dirrmtry usr/share/locale/ro/LC_MESSAGES
-@dirrmtry usr/share/locale/ro
-@dirrmtry usr/share/locale/pt_BR/LC_MESSAGES
-@dirrmtry usr/share/locale/pt_BR
-@dirrmtry usr/share/locale/pt/LC_MESSAGES
-@dirrmtry usr/share/locale/pt
-@dirrmtry usr/share/locale/pl/LC_MESSAGES
-@dirrmtry usr/share/locale/pl
-@dirrmtry usr/share/locale/no/LC_MESSAGES
-@dirrmtry usr/share/locale/no
@dirrmtry usr/share/locale/nn/LC_MESSAGES
@dirrmtry usr/share/locale/nn
-@dirrmtry usr/share/locale/nl/LC_MESSAGES
-@dirrmtry usr/share/locale/nl
@dirrmtry usr/share/locale/lt/LC_MESSAGES
@dirrmtry usr/share/locale/lt
-@dirrmtry usr/share/locale/ko/LC_MESSAGES
-@dirrmtry usr/share/locale/ko
-@dirrmtry usr/share/locale/ja/LC_MESSAGES
-@dirrmtry usr/share/locale/ja
-@dirrmtry usr/share/locale/it/LC_MESSAGES
-@dirrmtry usr/share/locale/it
-@dirrmtry usr/share/locale/hu/LC_MESSAGES
-@dirrmtry usr/share/locale/hu
-@dirrmtry usr/share/locale/hr/LC_MESSAGES
-@dirrmtry usr/share/locale/hr
-@dirrmtry usr/share/locale/gl/LC_MESSAGES
-@dirrmtry usr/share/locale/gl
-@dirrmtry usr/share/locale/ga/LC_MESSAGES
-@dirrmtry usr/share/locale/ga
-@dirrmtry usr/share/locale/fr/LC_MESSAGES
-@dirrmtry usr/share/locale/fr
-@dirrmtry usr/share/locale/fi/LC_MESSAGES
-@dirrmtry usr/share/locale/fi
@dirrmtry usr/share/locale/eu/LC_MESSAGES
@dirrmtry usr/share/locale/eu
-@dirrmtry usr/share/locale/et/LC_MESSAGES
-@dirrmtry usr/share/locale/et
-@dirrmtry usr/share/locale/es/LC_MESSAGES
-@dirrmtry usr/share/locale/es
-@dirrmtry usr/share/locale/el/LC_MESSAGES
-@dirrmtry usr/share/locale/el
-@dirrmtry usr/share/locale/de/LC_MESSAGES
-@dirrmtry usr/share/locale/de
-@dirrmtry usr/share/locale/da/LC_MESSAGES
-@dirrmtry usr/share/locale/da
-@dirrmtry usr/share/locale/cs/LC_MESSAGES
-@dirrmtry usr/share/locale/cs
-@dirrmtry usr/share/locale/ca/LC_MESSAGES
-@dirrmtry usr/share/locale/ca
@dirrmtry usr/share/locale/az/LC_MESSAGES
@dirrmtry usr/share/locale/az
+@dirrm usr/share/doc/gtk+-1.2.10
+@dirrm etc/gtk
diff --git a/x11-toolkits/linux-gtk2/Makefile b/x11-toolkits/linux-gtk2/Makefile
index 2df73bef3e89..e5ebe71571a6 100644
--- a/x11-toolkits/linux-gtk2/Makefile
+++ b/x11-toolkits/linux-gtk2/Makefile
@@ -7,12 +7,9 @@
PORTNAME= gtk2
PORTVERSION= 2.4.14
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= x11-toolkits linux
-MASTER_SITES= ${MASTER_SITE_FEDORA_LINUX} \
- http://distro.ibiblio.org/pub/linux/distributions/fedora/linux/core/${SUBDIR}/ \
- ftp://ftp.uni-koeln.de/mirrors/fedora/linux/core/${SUBDIR}/
-MASTER_SITE_SUBDIR= updates/3/i386
+DISTNAME= ${PORTNAME}-${PORTVERSION}-4.fc3.3
MAINTAINER= freebsd-emulation@FreeBSD.org
COMMENT= GTK+ library, version 2.X, Linux binary
@@ -27,17 +24,15 @@ RUN_DEPENDS+= ${LINUXBASE}/usr/lib/libglib-2.0.so.0:${PORTSDIR}/devel/linux-glib
${LINUXBASE}/usr/lib/libpango-1.0.so.0:${PORTSDIR}/x11-toolkits/linux-pango
ONLY_FOR_ARCHS= i386 amd64
-PLIST= ${PKGDIR}/pkg-plist
USE_XLIB= yes
-RESTRICTED= "binaries under GNU LGPL without accompanying source"
-RPM_SET= gtk2-${PORTVERSION}-4.fc3.3.${ARCH}.rpm
+USE_LINUX_RPM= yes
+LINUX_DIST_VER= 3
+INSTALLS_SHLIB= yes
+BRANDELF_DIRS= usr/bin
PLIST_SUB= LIBVERSION="400.14" PORTVERSION="${PORTVERSION}"
post-install:
-.for ii in gdk-pixbuf-query-loaders-32 gtk-demo gtk-query-immodules-2.0-32
- @${BRANDELF} -t Linux ${PREFIX}/usr/bin/${ii}
-.endfor
@chroot ${PREFIX} /usr/bin/gtk-query-immodules-2.0-32 > ${PREFIX}/etc/gtk-2.0/i386-redhat-linux-gnu/gtk.immodules
@chroot ${PREFIX} /usr/bin/gdk-pixbuf-query-loaders-32 > ${PREFIX}/etc/gtk-2.0/i386-redhat-linux-gnu/gdk-pixbuf.loaders
-.include "../linux-gtk/Makefile"
+.include <bsd.port.mk>
diff --git a/x11-toolkits/linux-gtk2/distinfo.i386 b/x11-toolkits/linux-gtk2/distinfo.i386
index d08be6cdf92f..e55c9461ddd5 100644
--- a/x11-toolkits/linux-gtk2/distinfo.i386
+++ b/x11-toolkits/linux-gtk2/distinfo.i386
@@ -1,3 +1,6 @@
-MD5 (rpm/gtk2-2.4.14-4.fc3.3.i386.rpm) = 5c55dcfe8e8854ecf26bc915c7dce15f
-SHA256 (rpm/gtk2-2.4.14-4.fc3.3.i386.rpm) = 57aedcd29c221148930363002fa5223aecb982d6d2fb1b124476ef55382f2836
-SIZE (rpm/gtk2-2.4.14-4.fc3.3.i386.rpm) = 4593031
+MD5 (rpm/i386/fedora/3/gtk2-2.4.14-4.fc3.3.i386.rpm) = 5c55dcfe8e8854ecf26bc915c7dce15f
+SHA256 (rpm/i386/fedora/3/gtk2-2.4.14-4.fc3.3.i386.rpm) = 57aedcd29c221148930363002fa5223aecb982d6d2fb1b124476ef55382f2836
+SIZE (rpm/i386/fedora/3/gtk2-2.4.14-4.fc3.3.i386.rpm) = 4593031
+MD5 (rpm/i386/fedora/3/gtk2-2.4.14-4.fc3.3.src.rpm) = 44f37d231bffc16d7e516a7798007bb1
+SHA256 (rpm/i386/fedora/3/gtk2-2.4.14-4.fc3.3.src.rpm) = b8f7e3688e344960e90cb2d09188dbf0b4450d9f0c00ab90d14745335f0827c1
+SIZE (rpm/i386/fedora/3/gtk2-2.4.14-4.fc3.3.src.rpm) = 9690086
diff --git a/x11-toolkits/linux-pango/Makefile b/x11-toolkits/linux-pango/Makefile
index f8cb49fb09d1..4c38c1d477b6 100644
--- a/x11-toolkits/linux-pango/Makefile
+++ b/x11-toolkits/linux-pango/Makefile
@@ -7,13 +7,12 @@
PORTNAME= pango
PORTVERSION= 1.6.0
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= x11-toolkits linux
+DISTNAME= ${PORTNAME}-${PORTVERSION}-7
MAINTAINER= freebsd-emulation@FreeBSD.org
COMMENT= Linux pango binary
-MASTER_SITES= ${MASTER_SITE_FEDORA_LINUX}
-MASTER_SITE_SUBDIR= 3/i386/os/Fedora/RPMS
# these libraries are required by pango-querymodules
RUN_DEPENDS= ${LINUXBASE}/usr/X11R6/lib/libX11.so.6:${PORTSDIR}/x11/linux-XFree86-libs \
@@ -23,12 +22,13 @@ RUN_DEPENDS= ${LINUXBASE}/usr/X11R6/lib/libX11.so.6:${PORTSDIR}/x11/linux-XFree8
USE_XLIB= yes
ONLY_FOR_ARCHS= i386 amd64
-PLIST= ${PKGDIR}/pkg-plist
-RPM_SET= pango-${PORTVERSION}-7.i386.rpm
+USE_LINUX_RPM= yes
+LINUX_DIST_VER= 3
+INSTALLS_SHLIB= yes
+BRANDELF_DIRS= usr/bin
PLIST_SUB+= LIBVERSION="600.0" PORTVERSION="${PORTVERSION}"
post-install:
- @${BRANDELF} -t Linux ${PREFIX}/usr/bin/pango-querymodules-32
@${PREFIX}/usr/bin/pango-querymodules-32 > ${PREFIX}/etc/pango/i386-redhat-linux-gnu/pango.modules
-.include "../linux-gtk/Makefile"
+.include <bsd.port.mk>
diff --git a/x11-toolkits/linux-pango/distinfo.i386 b/x11-toolkits/linux-pango/distinfo.i386
index 9cee7663d040..8009062442e7 100644
--- a/x11-toolkits/linux-pango/distinfo.i386
+++ b/x11-toolkits/linux-pango/distinfo.i386
@@ -1,3 +1,6 @@
-MD5 (rpm/pango-1.6.0-7.i386.rpm) = ddb36c33af419ac7993ddf5317fbb904
-SHA256 (rpm/pango-1.6.0-7.i386.rpm) = 2012a8f277e0ddda0734c9f784f4d62aff07ccf88b55da551ec073ec2718da7f
-SIZE (rpm/pango-1.6.0-7.i386.rpm) = 277273
+MD5 (rpm/i386/fedora/3/pango-1.6.0-7.i386.rpm) = ddb36c33af419ac7993ddf5317fbb904
+SHA256 (rpm/i386/fedora/3/pango-1.6.0-7.i386.rpm) = 2012a8f277e0ddda0734c9f784f4d62aff07ccf88b55da551ec073ec2718da7f
+SIZE (rpm/i386/fedora/3/pango-1.6.0-7.i386.rpm) = 277273
+MD5 (rpm/i386/fedora/3/pango-1.6.0-7.src.rpm) = 962e177a9b5e7a74c34b9204e3a5aa41
+SHA256 (rpm/i386/fedora/3/pango-1.6.0-7.src.rpm) = 8faac8c88dcc58203569d31a8881447b553bf52f26525799cfc1f54a09e1bfbe
+SIZE (rpm/i386/fedora/3/pango-1.6.0-7.src.rpm) = 879369
diff --git a/x11/linux-gnomelibs/Makefile b/x11/linux-gnomelibs/Makefile
index c41ab454c7fa..03e07ad0e1e6 100644
--- a/x11/linux-gnomelibs/Makefile
+++ b/x11/linux-gnomelibs/Makefile
@@ -6,15 +6,18 @@
#
PORTNAME= gnomelibs
-PORTVERSION= 1.2.8
-PORTREVISION= 4
+PORTVERSION= 1.4.1.2.90
CATEGORIES= x11 linux
+DISTNAME= gnome-libs-${PORTVERSION}-44
MAINTAINER= ports@FreeBSD.org
COMMENT= RPM of gnome-libs
-RPM_SET= gnome-libs-${PORTVERSION}-11.${ARCH}.rpm
+USE_LINUX_RPM= yes
+LINUX_DIST_VER= 3
+INSTALLS_SHLIB= yes
+PLIST= pkg-plist.${LINUX_RPM_ARCH}
+INSTALLS_SHLIB= yes
+BRANDELF_DIRS= usr/bin usr/sbin
-.include "../../x11-toolkits/linux-gtk/Makefile"
-
-MASTER_SITES+= ftp://ftp.redhat.com/pub/redhat/linux/7.1/en/os/${ARCH}/RedHat/RPMS/
+.include <bsd.port.mk>
diff --git a/x11/linux-gnomelibs/distinfo.alpha b/x11/linux-gnomelibs/distinfo.alpha
deleted file mode 100644
index 5df802896222..000000000000
--- a/x11/linux-gnomelibs/distinfo.alpha
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 (rpm/gnome-libs-1.2.8-11.alpha.rpm) = f0c13edcc03e2f034abc02b5862cf012
-SIZE (rpm/gnome-libs-1.2.8-11.alpha.rpm) = 1504221
diff --git a/x11/linux-gnomelibs/distinfo.i386 b/x11/linux-gnomelibs/distinfo.i386
index 60e2e7b9718f..ad0d22c49f8f 100644
--- a/x11/linux-gnomelibs/distinfo.i386
+++ b/x11/linux-gnomelibs/distinfo.i386
@@ -1,2 +1,6 @@
-MD5 (rpm/gnome-libs-1.2.8-11.i386.rpm) = 6352b24f9d7d7d7d9dfb3ccac356a4cb
-SIZE (rpm/gnome-libs-1.2.8-11.i386.rpm) = 1062583
+MD5 (rpm/i386/fedora/3/gnome-libs-1.4.1.2.90-44.i386.rpm) = 2c6cdb49ffa69054f0f9a52de99c3493
+SHA256 (rpm/i386/fedora/3/gnome-libs-1.4.1.2.90-44.i386.rpm) = 47ac5ac949c9ecfa1dac5569271aea872b1537c7d6ee6d1612fddcde85831cb1
+SIZE (rpm/i386/fedora/3/gnome-libs-1.4.1.2.90-44.i386.rpm) = 999699
+MD5 (rpm/i386/fedora/3/gnome-libs-1.4.1.2.90-44.src.rpm) = 6d7097387d7ce32f981393d67da9e758
+SHA256 (rpm/i386/fedora/3/gnome-libs-1.4.1.2.90-44.src.rpm) = ea909d5267300987536a2b3a2dee5dbeca16176ed282d25ff90e0e58a2afa66a
+SIZE (rpm/i386/fedora/3/gnome-libs-1.4.1.2.90-44.src.rpm) = 3904771
diff --git a/x11/linux-gnomelibs/pkg-plist.alpha b/x11/linux-gnomelibs/pkg-plist.alpha
deleted file mode 100644
index fa990faf9fdc..000000000000
--- a/x11/linux-gnomelibs/pkg-plist.alpha
+++ /dev/null
@@ -1,117 +0,0 @@
-etc/gnome/gtkrc
-etc/gnome/gtkrc.el
-etc/gnome/gtkrc.eo
-etc/gnome/gtkrc.he
-etc/gnome/gtkrc.hy
-etc/gnome/gtkrc.iso88592
-etc/gnome/gtkrc.iso88595
-etc/gnome/gtkrc.ja
-etc/gnome/gtkrc.ka_GE.georgianacademy
-etc/gnome/gtkrc.ka_GE.georgianps
-etc/gnome/gtkrc.ko
-etc/gnome/gtkrc.ru
-etc/gnome/gtkrc.th
-etc/gnome/gtkrc.tr
-etc/gnome/gtkrc.uk
-etc/gnome/gtkrc.vi_VN.tcvn
-etc/gnome/gtkrc.vi_VN.viscii
-etc/gnome/gtkrc.zh_CN
-etc/gnome/gtkrc.zh_TW.Big5
-etc/mime-magic
-etc/mime-magic.dat
-etc/paper.config
-etc/sound/events/gnome.soundlist
-etc/sound/events/gtk-events.soundlist
-usr/bin/dns-helper
-usr/bin/gconfigger
-usr/bin/gnome-bug
-usr/bin/gnome-dump-metadata
-usr/bin/gnome-gen-mimedb
-usr/bin/gnome-moz-remote
-usr/bin/gnome-name-service
-usr/bin/gnome_segv
-usr/bin/goad-browser
-usr/bin/loadshlib
-usr/lib/libart_lgpl.so.2.2.0
-usr/lib/libgnome.so.32.4.1
-usr/lib/libgnomesupport.so.0.0.0
-usr/lib/libgnomeui.so.32.12.1
-usr/lib/libgnorba.so.27.1.8
-usr/lib/libgnorbagtk.so.0.0.0
-usr/lib/libgtkxmhtml.so.1.0.1
-usr/lib/libzvt.so.2.2.9
-usr/sbin/gnome-pty-helper
-usr/share/doc/gnome-libs-1.2.8/AUTHORS
-usr/share/doc/gnome-libs-1.2.8/COPYING
-usr/share/doc/gnome-libs-1.2.8/ChangeLog
-usr/share/doc/gnome-libs-1.2.8/NEWS
-usr/share/doc/gnome-libs-1.2.8/README
-usr/share/idl/GnomeObject.idl
-usr/share/idl/Table.idl
-usr/share/idl/desktop-editor.idl
-usr/share/idl/desktop-textviewer.idl
-usr/share/idl/gnome-factory.idl
-usr/share/idl/gnome-unknown.idl
-usr/share/idl/name-service.idl
-usr/share/locale/ca/LC_MESSAGES/gnome-libs.mo
-usr/share/locale/cs/LC_MESSAGES/gnome-libs.mo
-usr/share/locale/da/LC_MESSAGES/gnome-libs.mo
-usr/share/locale/de/LC_MESSAGES/gnome-libs.mo
-usr/share/locale/el/LC_MESSAGES/gnome-libs.mo
-usr/share/locale/en_GB/LC_MESSAGES/gnome-libs.mo
-usr/share/locale/es/LC_MESSAGES/gnome-libs.mo
-usr/share/locale/et/LC_MESSAGES/gnome-libs.mo
-usr/share/locale/eu/LC_MESSAGES/gnome-libs.mo
-usr/share/locale/fi/LC_MESSAGES/gnome-libs.mo
-usr/share/locale/fr/LC_MESSAGES/gnome-libs.mo
-usr/share/locale/ga/LC_MESSAGES/gnome-libs.mo
-usr/share/locale/gl/LC_MESSAGES/gnome-libs.mo
-usr/share/locale/hr/LC_MESSAGES/gnome-libs.mo
-usr/share/locale/hu/LC_MESSAGES/gnome-libs.mo
-usr/share/locale/it/LC_MESSAGES/gnome-libs.mo
-usr/share/locale/ja/LC_MESSAGES/gnome-libs.mo
-usr/share/locale/ko/LC_MESSAGES/gnome-libs.mo
-usr/share/locale/lt/LC_MESSAGES/gnome-libs.mo
-usr/share/locale/nl/LC_MESSAGES/gnome-libs.mo
-usr/share/locale/nn/LC_MESSAGES/gnome-libs.mo
-usr/share/locale/no/LC_MESSAGES/gnome-libs.mo
-usr/share/locale/pl/LC_MESSAGES/gnome-libs.mo
-usr/share/locale/pt/LC_MESSAGES/gnome-libs.mo
-usr/share/locale/pt_BR/LC_MESSAGES/gnome-libs.mo
-usr/share/locale/ro/LC_MESSAGES/gnome-libs.mo
-usr/share/locale/ru/LC_MESSAGES/gnome-libs.mo
-usr/share/locale/sk/LC_MESSAGES/gnome-libs.mo
-usr/share/locale/sl/LC_MESSAGES/gnome-libs.mo
-usr/share/locale/sp/LC_MESSAGES/gnome-libs.mo
-usr/share/locale/sr/LC_MESSAGES/gnome-libs.mo
-usr/share/locale/sv/LC_MESSAGES/gnome-libs.mo
-usr/share/locale/tr/LC_MESSAGES/gnome-libs.mo
-usr/share/locale/wa/LC_MESSAGES/gnome-libs.mo
-usr/share/locale/zh_CN.GB2312/LC_MESSAGES/gnome-libs.mo
-usr/share/locale/zh_TW.Big5/LC_MESSAGES/gnome-libs.mo
-usr/share/mime-info/gnome.mime
-usr/share/pixmaps/calculator-font.png
-usr/share/pixmaps/gnome-default-dlg.png
-usr/share/pixmaps/gnome-error.png
-usr/share/pixmaps/gnome-info.png
-usr/share/pixmaps/gnome-question.png
-usr/share/pixmaps/gnome-warning.png
-usr/share/pixmaps/no.xpm
-usr/share/pixmaps/yes.xpm
-usr/share/type-convert/type.convert
-usr/bin/new-object
-usr/lib/libart_lgpl.so.2
-usr/lib/libgnome.so.32
-usr/lib/libgnomesupport.so.0
-usr/lib/libgnomeui.so.32
-usr/lib/libgnorba.so.27
-usr/lib/libgnorbagtk.so.0
-usr/lib/libgtkxmhtml.so.1
-usr/lib/libzvt.so.2
-@dirrm usr/share/type-convert
-@dirrm usr/share/pixmaps
-@dirrm usr/share/mime-info
-@dirrm usr/share/doc/gnome-libs-1.2.8
-@dirrm etc/sound/events
-@dirrm etc/sound
-@dirrm etc/gnome
diff --git a/x11/linux-gnomelibs/pkg-plist.i386 b/x11/linux-gnomelibs/pkg-plist.i386
index 0c58af34a8c2..044e9339dd51 100644
--- a/x11/linux-gnomelibs/pkg-plist.i386
+++ b/x11/linux-gnomelibs/pkg-plist.i386
@@ -32,20 +32,31 @@ usr/bin/gnome-name-service
usr/bin/gnome_segv
usr/bin/goad-browser
usr/bin/loadshlib
+usr/bin/new-object
+usr/lib/libart_lgpl.so.2
usr/lib/libart_lgpl.so.2.2.0
-usr/lib/libgnome.so.32.4.1
+usr/lib/libgnome.so.32
+usr/lib/libgnome.so.32.4.3
+usr/lib/libgnomesupport.so.0
usr/lib/libgnomesupport.so.0.0.0
-usr/lib/libgnomeui.so.32.12.1
+usr/lib/libgnomeui.so.32
+usr/lib/libgnomeui.so.32.14.1
+usr/lib/libgnorba.so.27
usr/lib/libgnorba.so.27.1.8
+usr/lib/libgnorbagtk.so.0
usr/lib/libgnorbagtk.so.0.0.0
+usr/lib/libgtkxmhtml.so.1
usr/lib/libgtkxmhtml.so.1.0.1
-usr/lib/libzvt.so.2.2.9
+usr/lib/libzvt.so.2
+usr/lib/libzvt.so.2.2.10
usr/sbin/gnome-pty-helper
-usr/share/doc/gnome-libs-1.2.8/AUTHORS
-usr/share/doc/gnome-libs-1.2.8/COPYING
-usr/share/doc/gnome-libs-1.2.8/ChangeLog
-usr/share/doc/gnome-libs-1.2.8/NEWS
-usr/share/doc/gnome-libs-1.2.8/README
+usr/share/doc/gnome-libs-1.4.1.2.90/AUTHORS
+usr/share/doc/gnome-libs-1.4.1.2.90/COPYING
+usr/share/doc/gnome-libs-1.4.1.2.90/ChangeLog
+usr/share/doc/gnome-libs-1.4.1.2.90/LICENSE
+usr/share/doc/gnome-libs-1.4.1.2.90/NEWS
+usr/share/doc/gnome-libs-1.4.1.2.90/README
+usr/share/doc/gnome-libs-1.4.1.2.90/changelog
usr/share/idl/GnomeObject.idl
usr/share/idl/Table.idl
usr/share/idl/desktop-editor.idl
@@ -53,6 +64,7 @@ usr/share/idl/desktop-textviewer.idl
usr/share/idl/gnome-factory.idl
usr/share/idl/gnome-unknown.idl
usr/share/idl/name-service.idl
+usr/share/locale/az/LC_MESSAGES/gnome-libs.mo
usr/share/locale/ca/LC_MESSAGES/gnome-libs.mo
usr/share/locale/cs/LC_MESSAGES/gnome-libs.mo
usr/share/locale/da/LC_MESSAGES/gnome-libs.mo
@@ -72,6 +84,8 @@ usr/share/locale/it/LC_MESSAGES/gnome-libs.mo
usr/share/locale/ja/LC_MESSAGES/gnome-libs.mo
usr/share/locale/ko/LC_MESSAGES/gnome-libs.mo
usr/share/locale/lt/LC_MESSAGES/gnome-libs.mo
+usr/share/locale/lv/LC_MESSAGES/gnome-libs.mo
+usr/share/locale/ms/LC_MESSAGES/gnome-libs.mo
usr/share/locale/nl/LC_MESSAGES/gnome-libs.mo
usr/share/locale/nn/LC_MESSAGES/gnome-libs.mo
usr/share/locale/no/LC_MESSAGES/gnome-libs.mo
@@ -85,45 +99,38 @@ usr/share/locale/sl/LC_MESSAGES/gnome-libs.mo
usr/share/locale/sp/LC_MESSAGES/gnome-libs.mo
usr/share/locale/sr/LC_MESSAGES/gnome-libs.mo
usr/share/locale/sv/LC_MESSAGES/gnome-libs.mo
+usr/share/locale/ta/LC_MESSAGES/gnome-libs.mo
usr/share/locale/tr/LC_MESSAGES/gnome-libs.mo
+usr/share/locale/uk/LC_MESSAGES/gnome-libs.mo
+usr/share/locale/vi/LC_MESSAGES/gnome-libs.mo
usr/share/locale/wa/LC_MESSAGES/gnome-libs.mo
usr/share/locale/zh_CN.GB2312/LC_MESSAGES/gnome-libs.mo
-usr/share/locale/zh_TW.Big5/LC_MESSAGES/gnome-libs.mo
+usr/share/locale/zh_TW/LC_MESSAGES/gnome-libs.mo
usr/share/mime-info/gnome.mime
usr/share/pixmaps/calculator-font.png
-usr/share/pixmaps/gnome-default-dlg.png
-usr/share/pixmaps/gnome-error.png
-usr/share/pixmaps/gnome-info.png
-usr/share/pixmaps/gnome-question.png
-usr/share/pixmaps/gnome-warning.png
usr/share/pixmaps/no.xpm
usr/share/pixmaps/yes.xpm
usr/share/type-convert/type.convert
-usr/bin/new-object
-usr/lib/libart_lgpl.so.2
-usr/lib/libgnome.so.32
-usr/lib/libgnomesupport.so.0
-usr/lib/libgnomeui.so.32
-usr/lib/libgnorba.so.27
-usr/lib/libgnorbagtk.so.0
-usr/lib/libgtkxmhtml.so.1
-usr/lib/libzvt.so.2
@dirrm usr/share/type-convert
@dirrm usr/share/mime-info
+@dirrmtry usr/share/locale/vi/LC_MESSAGES
+@dirrmtry usr/share/locale/vi
+@dirrmtry usr/share/locale/ta/LC_MESSAGES
+@dirrmtry usr/share/locale/ta
+@dirrmtry usr/share/locale/sp/LC_MESSAGES
+@dirrmtry usr/share/locale/sp
+@dirrmtry usr/share/locale/nn/LC_MESSAGES
+@dirrmtry usr/share/locale/nn
+@dirrmtry usr/share/locale/lv/LC_MESSAGES
+@dirrmtry usr/share/locale/lv
+@dirrmtry usr/share/locale/lt/LC_MESSAGES
+@dirrmtry usr/share/locale/lt
+@dirrmtry usr/share/locale/eu/LC_MESSAGES
+@dirrmtry usr/share/locale/eu
+@dirrmtry usr/share/locale/az/LC_MESSAGES
+@dirrmtry usr/share/locale/az
@dirrm usr/share/idl
-@dirrm usr/share/doc/gnome-libs-1.2.8
+@dirrm usr/share/doc/gnome-libs-1.4.1.2.90
@dirrm etc/sound/events
@dirrm etc/sound
@dirrm etc/gnome
-@dirrmtry usr/share/locale/eu/LC_MESSAGES
-@dirrmtry usr/share/locale/eu
-@dirrmtry usr/share/locale/ga/LC_MESSAGES
-@dirrmtry usr/share/locale/ga
-@dirrmtry usr/share/locale/lt/LC_MESSAGES
-@dirrmtry usr/share/locale/lt
-@dirrmtry usr/share/locale/nn/LC_MESSAGES
-@dirrmtry usr/share/locale/nn
-@dirrmtry usr/share/locale/sp/LC_MESSAGES
-@dirrmtry usr/share/locale/sp
-@dirrmtry usr/share/locale/zh_TW.Big5/LC_MESSAGES
-@dirrmtry usr/share/locale/zh_TW.Big5