aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--audio/linux-esound/Makefile11
-rw-r--r--audio/linux-esound/distinfo.alpha2
-rw-r--r--audio/linux-esound/distinfo.i3862
-rw-r--r--audio/linux-esound/pkg-plist.alpha72
-rw-r--r--audio/linux-esound/pkg-plist.i38672
-rw-r--r--audio/linux-f10-esound/Makefile11
-rw-r--r--audio/linux-f10-esound/distinfo.alpha2
-rw-r--r--audio/linux-f10-esound/distinfo.i3862
-rw-r--r--audio/linux-f10-esound/pkg-plist.alpha72
-rw-r--r--audio/linux-f10-esound/pkg-plist.i38672
-rw-r--r--audio/linux-f10-libaudiofile/Makefile11
-rw-r--r--audio/linux-f10-libaudiofile/distinfo.alpha2
-rw-r--r--audio/linux-f10-libaudiofile/distinfo.i3862
-rw-r--r--audio/linux-f10-libaudiofile/pkg-plist.alpha50
-rw-r--r--audio/linux-f10-libaudiofile/pkg-plist.i38644
-rw-r--r--audio/linux-f8-esound/Makefile11
-rw-r--r--audio/linux-f8-esound/distinfo.alpha2
-rw-r--r--audio/linux-f8-esound/distinfo.i3862
-rw-r--r--audio/linux-f8-esound/pkg-plist.alpha72
-rw-r--r--audio/linux-f8-esound/pkg-plist.i38672
-rw-r--r--audio/linux-f8-libaudiofile/Makefile11
-rw-r--r--audio/linux-f8-libaudiofile/distinfo.alpha2
-rw-r--r--audio/linux-f8-libaudiofile/distinfo.i3862
-rw-r--r--audio/linux-f8-libaudiofile/pkg-plist.alpha50
-rw-r--r--audio/linux-f8-libaudiofile/pkg-plist.i38644
-rw-r--r--audio/linux-libaudiofile/Makefile11
-rw-r--r--audio/linux-libaudiofile/distinfo.alpha2
-rw-r--r--audio/linux-libaudiofile/distinfo.i3862
-rw-r--r--audio/linux-libaudiofile/pkg-plist.alpha50
-rw-r--r--audio/linux-libaudiofile/pkg-plist.i38644
-rw-r--r--devel/linux-f10-libglade/Makefile8
-rw-r--r--devel/linux-f10-libglade/distinfo.alpha2
-rw-r--r--devel/linux-f10-libglade/distinfo.i3862
-rw-r--r--devel/linux-f10-libglade/pkg-plist.alpha16
-rw-r--r--devel/linux-f10-libglade/pkg-plist.i38616
-rw-r--r--devel/linux-f10-libglade2/Makefile8
-rw-r--r--devel/linux-f10-libglade2/distinfo.alpha2
-rw-r--r--devel/linux-f10-libglade2/distinfo.i3862
-rw-r--r--devel/linux-f10-libglade2/pkg-plist.alpha16
-rw-r--r--devel/linux-f10-libglade2/pkg-plist.i38616
-rw-r--r--devel/linux-f8-libglade/Makefile8
-rw-r--r--devel/linux-f8-libglade/distinfo.alpha2
-rw-r--r--devel/linux-f8-libglade/distinfo.i3862
-rw-r--r--devel/linux-f8-libglade/pkg-plist.alpha16
-rw-r--r--devel/linux-f8-libglade/pkg-plist.i38616
-rw-r--r--devel/linux-f8-libglade2/Makefile8
-rw-r--r--devel/linux-f8-libglade2/distinfo.alpha2
-rw-r--r--devel/linux-f8-libglade2/distinfo.i3862
-rw-r--r--devel/linux-f8-libglade2/pkg-plist.alpha16
-rw-r--r--devel/linux-f8-libglade2/pkg-plist.i38616
-rw-r--r--devel/linux-libglade/Makefile8
-rw-r--r--devel/linux-libglade/distinfo.alpha2
-rw-r--r--devel/linux-libglade/distinfo.i3862
-rw-r--r--devel/linux-libglade/pkg-plist.alpha16
-rw-r--r--devel/linux-libglade/pkg-plist.i38616
-rw-r--r--devel/linux-libglade2/Makefile8
-rw-r--r--devel/linux-libglade2/distinfo.alpha2
-rw-r--r--devel/linux-libglade2/distinfo.i3862
-rw-r--r--devel/linux-libglade2/pkg-plist.alpha16
-rw-r--r--devel/linux-libglade2/pkg-plist.i38616
-rw-r--r--graphics/linux-f10-imlib/Makefile9
-rw-r--r--graphics/linux-f10-imlib/distinfo.alpha2
-rw-r--r--graphics/linux-f10-imlib/distinfo.i3862
-rw-r--r--graphics/linux-f10-imlib/pkg-plist.alpha18
-rw-r--r--graphics/linux-f10-imlib/pkg-plist.i38618
-rw-r--r--graphics/linux-f10-jpeg/Makefile4
-rw-r--r--graphics/linux-f10-jpeg/distinfo.alpha2
-rw-r--r--graphics/linux-f10-jpeg/distinfo.i3862
-rw-r--r--graphics/linux-f10-jpeg/pkg-plist.alpha15
-rw-r--r--graphics/linux-f10-jpeg/pkg-plist.i38615
-rw-r--r--graphics/linux-f10-png/Makefile4
-rw-r--r--graphics/linux-f10-png/distinfo.alpha2
-rw-r--r--graphics/linux-f10-png/distinfo.i3862
-rw-r--r--graphics/linux-f10-png/pkg-plist.alpha19
-rw-r--r--graphics/linux-f10-png/pkg-plist.i38619
-rw-r--r--graphics/linux-f10-png10/Makefile4
-rw-r--r--graphics/linux-f10-png10/distinfo.alpha2
-rw-r--r--graphics/linux-f10-png10/distinfo.i3862
-rw-r--r--graphics/linux-f10-png10/pkg-plist.alpha19
-rw-r--r--graphics/linux-f10-png10/pkg-plist.i38619
-rw-r--r--graphics/linux-f10-tiff/Makefile4
-rw-r--r--graphics/linux-f10-tiff/distinfo.alpha2
-rw-r--r--graphics/linux-f10-tiff/distinfo.i3862
-rw-r--r--graphics/linux-f10-tiff/pkg-plist.alpha30
-rw-r--r--graphics/linux-f10-tiff/pkg-plist.i38630
-rw-r--r--graphics/linux-f8-imlib/Makefile9
-rw-r--r--graphics/linux-f8-imlib/distinfo.alpha2
-rw-r--r--graphics/linux-f8-imlib/distinfo.i3862
-rw-r--r--graphics/linux-f8-imlib/pkg-plist.alpha18
-rw-r--r--graphics/linux-f8-imlib/pkg-plist.i38618
-rw-r--r--graphics/linux-f8-jpeg/Makefile4
-rw-r--r--graphics/linux-f8-jpeg/distinfo.alpha2
-rw-r--r--graphics/linux-f8-jpeg/distinfo.i3862
-rw-r--r--graphics/linux-f8-jpeg/pkg-plist.alpha15
-rw-r--r--graphics/linux-f8-jpeg/pkg-plist.i38615
-rw-r--r--graphics/linux-f8-png/Makefile4
-rw-r--r--graphics/linux-f8-png/distinfo.alpha2
-rw-r--r--graphics/linux-f8-png/distinfo.i3862
-rw-r--r--graphics/linux-f8-png/pkg-plist.alpha19
-rw-r--r--graphics/linux-f8-png/pkg-plist.i38619
-rw-r--r--graphics/linux-f8-png10/Makefile4
-rw-r--r--graphics/linux-f8-png10/distinfo.alpha2
-rw-r--r--graphics/linux-f8-png10/distinfo.i3862
-rw-r--r--graphics/linux-f8-png10/pkg-plist.alpha19
-rw-r--r--graphics/linux-f8-png10/pkg-plist.i38619
-rw-r--r--graphics/linux-f8-tiff/Makefile4
-rw-r--r--graphics/linux-f8-tiff/distinfo.alpha2
-rw-r--r--graphics/linux-f8-tiff/distinfo.i3862
-rw-r--r--graphics/linux-f8-tiff/pkg-plist.alpha30
-rw-r--r--graphics/linux-f8-tiff/pkg-plist.i38630
-rw-r--r--graphics/linux-imlib/Makefile9
-rw-r--r--graphics/linux-imlib/distinfo.alpha2
-rw-r--r--graphics/linux-imlib/distinfo.i3862
-rw-r--r--graphics/linux-imlib/pkg-plist.alpha18
-rw-r--r--graphics/linux-imlib/pkg-plist.i38618
-rw-r--r--graphics/linux-jpeg/Makefile4
-rw-r--r--graphics/linux-jpeg/distinfo.alpha2
-rw-r--r--graphics/linux-jpeg/distinfo.i3862
-rw-r--r--graphics/linux-jpeg/pkg-plist.alpha15
-rw-r--r--graphics/linux-jpeg/pkg-plist.i38615
-rw-r--r--graphics/linux-png/Makefile4
-rw-r--r--graphics/linux-png/distinfo.alpha2
-rw-r--r--graphics/linux-png/distinfo.i3862
-rw-r--r--graphics/linux-png/pkg-plist.alpha19
-rw-r--r--graphics/linux-png/pkg-plist.i38619
-rw-r--r--graphics/linux-png10/Makefile4
-rw-r--r--graphics/linux-png10/distinfo.alpha2
-rw-r--r--graphics/linux-png10/distinfo.i3862
-rw-r--r--graphics/linux-png10/pkg-plist.alpha19
-rw-r--r--graphics/linux-png10/pkg-plist.i38619
-rw-r--r--graphics/linux-tiff/Makefile4
-rw-r--r--graphics/linux-tiff/distinfo.alpha2
-rw-r--r--graphics/linux-tiff/distinfo.i3862
-rw-r--r--graphics/linux-tiff/pkg-plist.alpha30
-rw-r--r--graphics/linux-tiff/pkg-plist.i38630
-rw-r--r--textproc/linux-f10-libxml/Makefile6
-rw-r--r--textproc/linux-f10-libxml/distinfo.alpha2
-rw-r--r--textproc/linux-f10-libxml/distinfo.i3862
-rw-r--r--textproc/linux-f10-libxml/pkg-plist.alpha56
-rw-r--r--textproc/linux-f10-libxml/pkg-plist.i38654
-rw-r--r--textproc/linux-f10-libxml2/Makefile6
-rw-r--r--textproc/linux-f10-libxml2/distinfo.alpha2
-rw-r--r--textproc/linux-f10-libxml2/distinfo.i3862
-rw-r--r--textproc/linux-f10-libxml2/pkg-plist.alpha56
-rw-r--r--textproc/linux-f10-libxml2/pkg-plist.i38654
-rw-r--r--textproc/linux-f8-libxml/Makefile6
-rw-r--r--textproc/linux-f8-libxml/distinfo.alpha2
-rw-r--r--textproc/linux-f8-libxml/distinfo.i3862
-rw-r--r--textproc/linux-f8-libxml/pkg-plist.alpha56
-rw-r--r--textproc/linux-f8-libxml/pkg-plist.i38654
-rw-r--r--textproc/linux-f8-libxml2/Makefile6
-rw-r--r--textproc/linux-f8-libxml2/distinfo.alpha2
-rw-r--r--textproc/linux-f8-libxml2/distinfo.i3862
-rw-r--r--textproc/linux-f8-libxml2/pkg-plist.alpha56
-rw-r--r--textproc/linux-f8-libxml2/pkg-plist.i38654
-rw-r--r--textproc/linux-libxml/Makefile6
-rw-r--r--textproc/linux-libxml/distinfo.alpha2
-rw-r--r--textproc/linux-libxml/distinfo.i3862
-rw-r--r--textproc/linux-libxml/pkg-plist.alpha56
-rw-r--r--textproc/linux-libxml/pkg-plist.i38654
-rw-r--r--textproc/linux-libxml2/Makefile6
-rw-r--r--textproc/linux-libxml2/distinfo.alpha2
-rw-r--r--textproc/linux-libxml2/distinfo.i3862
-rw-r--r--textproc/linux-libxml2/pkg-plist.alpha56
-rw-r--r--textproc/linux-libxml2/pkg-plist.i38654
-rw-r--r--x11-toolkits/linux-f10-gtk/Makefile21
-rw-r--r--x11-toolkits/linux-f10-gtk/distinfo.alpha2
-rw-r--r--x11-toolkits/linux-f10-gtk/distinfo.i3862
-rw-r--r--x11-toolkits/linux-f10-gtk/pkg-plist.alpha193
-rw-r--r--x11-toolkits/linux-f10-gtk/pkg-plist.i386143
-rw-r--r--x11-toolkits/linux-f8-gtk/Makefile21
-rw-r--r--x11-toolkits/linux-f8-gtk/distinfo.alpha2
-rw-r--r--x11-toolkits/linux-f8-gtk/distinfo.i3862
-rw-r--r--x11-toolkits/linux-f8-gtk/pkg-plist.alpha193
-rw-r--r--x11-toolkits/linux-f8-gtk/pkg-plist.i386143
-rw-r--r--x11-toolkits/linux-gtk/Makefile21
-rw-r--r--x11-toolkits/linux-gtk/distinfo.alpha2
-rw-r--r--x11-toolkits/linux-gtk/distinfo.i3862
-rw-r--r--x11-toolkits/linux-gtk/pkg-plist.alpha193
-rw-r--r--x11-toolkits/linux-gtk/pkg-plist.i386143
-rw-r--r--x11/linux-gnomelibs/Makefile13
-rw-r--r--x11/linux-gnomelibs/distinfo.alpha2
-rw-r--r--x11/linux-gnomelibs/distinfo.i3862
-rw-r--r--x11/linux-gnomelibs/pkg-plist.alpha91
-rw-r--r--x11/linux-gnomelibs/pkg-plist.i38693
185 files changed, 2391 insertions, 1422 deletions
diff --git a/audio/linux-esound/Makefile b/audio/linux-esound/Makefile
index 29698d8a781d..7bcb5c47290f 100644
--- a/audio/linux-esound/Makefile
+++ b/audio/linux-esound/Makefile
@@ -7,16 +7,7 @@
PORTNAME= esound
CATEGORIES= audio linux
-.if (${MACHINE_ARCH} == "i386")
-PORTVERSION= 0.2.14
-.elif (${MACHINE_ARCH} == "alpha")
-PORTVERSION= 0.2.17
-.endif
-.if (${MACHINE_ARCH} == "i386")
-MASTER_SITES= ftp://ftp.redhat.com/pub/redhat/linux/6.1/en/os/i386/RedHat/RPMS/
-.elif (${MACHINE_ARCH} == "alpha")
-MASTER_SITES= ftp://ftp.redhat.com/pub/redhat/linux/6.1/en/os/alpha/RedHat/RPMS/
-.endif
+PORTVERSION= 0.2.22
MAINTAINER= taoka@FreeBSD.org
diff --git a/audio/linux-esound/distinfo.alpha b/audio/linux-esound/distinfo.alpha
index 3707a963ea1d..84d7d6cb932e 100644
--- a/audio/linux-esound/distinfo.alpha
+++ b/audio/linux-esound/distinfo.alpha
@@ -1 +1 @@
-MD5 (rpm/esound-0.2.17-1.alpha.rpm) = 09cbbd8d7bc2633f99fecd75843b33e9
+MD5 (rpm/esound-0.2.22-1.alpha.rpm) = 94411e58472dbb01383a8c7784b9b4bd
diff --git a/audio/linux-esound/distinfo.i386 b/audio/linux-esound/distinfo.i386
index 56cfba6ba039..2f638f0a1ec0 100644
--- a/audio/linux-esound/distinfo.i386
+++ b/audio/linux-esound/distinfo.i386
@@ -1 +1 @@
-MD5 (rpm/esound-0.2.14-1.i386.rpm) = 2bfd09ee99fc1f01a98a33f811d09689
+MD5 (rpm/esound-0.2.22-1.i386.rpm) = c8395daab28f33d7a59ed18e484fbcc9
diff --git a/audio/linux-esound/pkg-plist.alpha b/audio/linux-esound/pkg-plist.alpha
index 6f19dfd6e603..2fd653643fb5 100644
--- a/audio/linux-esound/pkg-plist.alpha
+++ b/audio/linux-esound/pkg-plist.alpha
@@ -9,18 +9,64 @@ usr/bin/esdmon
usr/bin/esdplay
usr/bin/esdrec
usr/bin/esdsample
-usr/doc/esound-0.2.17
-usr/doc/esound-0.2.17/AUTHORS
-usr/doc/esound-0.2.17/COPYING
-usr/doc/esound-0.2.17/ChangeLog
-usr/doc/esound-0.2.17/INSTALL
-usr/doc/esound-0.2.17/NEWS
-usr/doc/esound-0.2.17/README
-usr/doc/esound-0.2.17/TIPS
-usr/doc/esound-0.2.17/TODO
-usr/doc/esound-0.2.17/esound.sgml
+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/libesd.so.0.2.17
+usr/lib/libesddsp.so
usr/lib/libesddsp.so.0
-usr/lib/libesddsp.so.0.2.17
-@dirrm /usr/doc/esound-0.2.14
+@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-esound/pkg-plist.i386 b/audio/linux-esound/pkg-plist.i386
index fcd117d381ee..2fd653643fb5 100644
--- a/audio/linux-esound/pkg-plist.i386
+++ b/audio/linux-esound/pkg-plist.i386
@@ -1,3 +1,4 @@
+etc/esd.conf
usr/bin/esd
usr/bin/esdcat
usr/bin/esdctl
@@ -8,17 +9,64 @@ usr/bin/esdmon
usr/bin/esdplay
usr/bin/esdrec
usr/bin/esdsample
-usr/doc/esound-0.2.14/AUTHORS
-usr/doc/esound-0.2.14/COPYING
-usr/doc/esound-0.2.14/ChangeLog
-usr/doc/esound-0.2.14/INSTALL
-usr/doc/esound-0.2.14/NEWS
-usr/doc/esound-0.2.14/README
-usr/doc/esound-0.2.14/TIPS
-usr/doc/esound-0.2.14/TODO
-usr/doc/esound-0.2.14/esound.sgml
+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/libesd.so.0.2.14
+usr/lib/libesddsp.so
usr/lib/libesddsp.so.0
-usr/lib/libesddsp.so.0.2.14
-@dirrm /usr/doc/esound-0.2.14
+@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 29698d8a781d..7bcb5c47290f 100644
--- a/audio/linux-f10-esound/Makefile
+++ b/audio/linux-f10-esound/Makefile
@@ -7,16 +7,7 @@
PORTNAME= esound
CATEGORIES= audio linux
-.if (${MACHINE_ARCH} == "i386")
-PORTVERSION= 0.2.14
-.elif (${MACHINE_ARCH} == "alpha")
-PORTVERSION= 0.2.17
-.endif
-.if (${MACHINE_ARCH} == "i386")
-MASTER_SITES= ftp://ftp.redhat.com/pub/redhat/linux/6.1/en/os/i386/RedHat/RPMS/
-.elif (${MACHINE_ARCH} == "alpha")
-MASTER_SITES= ftp://ftp.redhat.com/pub/redhat/linux/6.1/en/os/alpha/RedHat/RPMS/
-.endif
+PORTVERSION= 0.2.22
MAINTAINER= taoka@FreeBSD.org
diff --git a/audio/linux-f10-esound/distinfo.alpha b/audio/linux-f10-esound/distinfo.alpha
index 3707a963ea1d..84d7d6cb932e 100644
--- a/audio/linux-f10-esound/distinfo.alpha
+++ b/audio/linux-f10-esound/distinfo.alpha
@@ -1 +1 @@
-MD5 (rpm/esound-0.2.17-1.alpha.rpm) = 09cbbd8d7bc2633f99fecd75843b33e9
+MD5 (rpm/esound-0.2.22-1.alpha.rpm) = 94411e58472dbb01383a8c7784b9b4bd
diff --git a/audio/linux-f10-esound/distinfo.i386 b/audio/linux-f10-esound/distinfo.i386
index 56cfba6ba039..2f638f0a1ec0 100644
--- a/audio/linux-f10-esound/distinfo.i386
+++ b/audio/linux-f10-esound/distinfo.i386
@@ -1 +1 @@
-MD5 (rpm/esound-0.2.14-1.i386.rpm) = 2bfd09ee99fc1f01a98a33f811d09689
+MD5 (rpm/esound-0.2.22-1.i386.rpm) = c8395daab28f33d7a59ed18e484fbcc9
diff --git a/audio/linux-f10-esound/pkg-plist.alpha b/audio/linux-f10-esound/pkg-plist.alpha
index 6f19dfd6e603..2fd653643fb5 100644
--- a/audio/linux-f10-esound/pkg-plist.alpha
+++ b/audio/linux-f10-esound/pkg-plist.alpha
@@ -9,18 +9,64 @@ usr/bin/esdmon
usr/bin/esdplay
usr/bin/esdrec
usr/bin/esdsample
-usr/doc/esound-0.2.17
-usr/doc/esound-0.2.17/AUTHORS
-usr/doc/esound-0.2.17/COPYING
-usr/doc/esound-0.2.17/ChangeLog
-usr/doc/esound-0.2.17/INSTALL
-usr/doc/esound-0.2.17/NEWS
-usr/doc/esound-0.2.17/README
-usr/doc/esound-0.2.17/TIPS
-usr/doc/esound-0.2.17/TODO
-usr/doc/esound-0.2.17/esound.sgml
+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/libesd.so.0.2.17
+usr/lib/libesddsp.so
usr/lib/libesddsp.so.0
-usr/lib/libesddsp.so.0.2.17
-@dirrm /usr/doc/esound-0.2.14
+@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/pkg-plist.i386 b/audio/linux-f10-esound/pkg-plist.i386
index fcd117d381ee..2fd653643fb5 100644
--- a/audio/linux-f10-esound/pkg-plist.i386
+++ b/audio/linux-f10-esound/pkg-plist.i386
@@ -1,3 +1,4 @@
+etc/esd.conf
usr/bin/esd
usr/bin/esdcat
usr/bin/esdctl
@@ -8,17 +9,64 @@ usr/bin/esdmon
usr/bin/esdplay
usr/bin/esdrec
usr/bin/esdsample
-usr/doc/esound-0.2.14/AUTHORS
-usr/doc/esound-0.2.14/COPYING
-usr/doc/esound-0.2.14/ChangeLog
-usr/doc/esound-0.2.14/INSTALL
-usr/doc/esound-0.2.14/NEWS
-usr/doc/esound-0.2.14/README
-usr/doc/esound-0.2.14/TIPS
-usr/doc/esound-0.2.14/TODO
-usr/doc/esound-0.2.14/esound.sgml
+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/libesd.so.0.2.14
+usr/lib/libesddsp.so
usr/lib/libesddsp.so.0
-usr/lib/libesddsp.so.0.2.14
-@dirrm /usr/doc/esound-0.2.14
+@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 9148565db3b0..e62116ff5f5b 100644
--- a/audio/linux-f10-libaudiofile/Makefile
+++ b/audio/linux-f10-libaudiofile/Makefile
@@ -6,20 +6,11 @@
#
PORTNAME= libaudiofile
-PORTVERSION= 0.1.9
+PORTVERSION= 0.1.11
CATEGORIES= audio linux
-.if (${MACHINE_ARCH} == "i386")
-MASTER_SITES= ftp://ftp.redhat.com/pub/redhat/linux/6.1/en/os/i386/RedHat/RPMS/
-.elif (${MACHINE_ARCH} == "alpha")
-MASTER_SITES= ftp://ftp.redhat.com/pub/redhat/linux/6.1/en/os/alpha/RedHat/RPMS/
-.endif
MAINTAINER= taoka@FreeBSD.org
-.if (${MACHINE_ARCH} == "i386")
RPM_SET= audiofile-${PORTVERSION}-1.${MACHINE_ARCH}.rpm
-.elif (${MACHINE_ARCH} == "alpha")
-RPM_SET= audiofile-${PORTVERSION}-2.${MACHINE_ARCH}.rpm
-.endif
.include "../../x11-toolkits/linux-gtk/Makefile"
diff --git a/audio/linux-f10-libaudiofile/distinfo.alpha b/audio/linux-f10-libaudiofile/distinfo.alpha
index 1d02a187bc50..93f4eff95323 100644
--- a/audio/linux-f10-libaudiofile/distinfo.alpha
+++ b/audio/linux-f10-libaudiofile/distinfo.alpha
@@ -1 +1 @@
-MD5 (rpm/audiofile-0.1.9-2.alpha.rpm) = 4e9ee2c38abc630d9c039607ee7e0e35
+MD5 (rpm/audiofile-0.1.11-1.alpha.rpm) = 852a9656ac61aec99c7a7936b0249a9d
diff --git a/audio/linux-f10-libaudiofile/distinfo.i386 b/audio/linux-f10-libaudiofile/distinfo.i386
index 002f8d170f45..09297808a9d8 100644
--- a/audio/linux-f10-libaudiofile/distinfo.i386
+++ b/audio/linux-f10-libaudiofile/distinfo.i386
@@ -1 +1 @@
-MD5 (rpm/audiofile-0.1.9-1.i386.rpm) = ee5158bda87c1fc7601ea1467174d6da
+MD5 (rpm/audiofile-0.1.11-1.i386.rpm) = fb589f91458fd3d2b343bbed19919fd3
diff --git a/audio/linux-f10-libaudiofile/pkg-plist.alpha b/audio/linux-f10-libaudiofile/pkg-plist.alpha
index c955fe4e98b1..3dd95ab74feb 100644
--- a/audio/linux-f10-libaudiofile/pkg-plist.alpha
+++ b/audio/linux-f10-libaudiofile/pkg-plist.alpha
@@ -1,22 +1,28 @@
-/usr/bin/sfconvert
-/usr/bin/sfinfo
-/usr/doc/audiofile-0.1.9/COPYING
-/usr/doc/audiofile-0.1.9/ChangeLog
-/usr/doc/audiofile-0.1.9/README
-/usr/doc/audiofile-0.1.9/TODO
-/usr/doc/audiofile-0.1.9/docs/Makefile
-/usr/doc/audiofile-0.1.9/docs/Makefile.am
-/usr/doc/audiofile-0.1.9/docs/Makefile.in
-/usr/doc/audiofile-0.1.9/docs/afCloseFile
-/usr/doc/audiofile-0.1.9/docs/afGetFrameSize
-/usr/doc/audiofile-0.1.9/docs/afIntro
-/usr/doc/audiofile-0.1.9/docs/afNewFileSetup
-/usr/doc/audiofile-0.1.9/docs/afOpenFile
-/usr/doc/audiofile-0.1.9/docs/afReadFrames
-/usr/doc/audiofile-0.1.9/docs/afWriteFrames
-/usr/doc/audiofile-0.1.9/docs/sfconvert
-/usr/doc/audiofile-0.1.9/docs/sfinfo
-/usr/lib/libaudiofile.so.0
-/usr/lib/libaudiofile.so.0.0.0
-@dirrm /usr/doc/audiofile-0.1.9/docs
-@dirrm /usr/doc/audiofile-0.1.9
+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-f10-libaudiofile/pkg-plist.i386 b/audio/linux-f10-libaudiofile/pkg-plist.i386
index 31e014cc80cd..3dd95ab74feb 100644
--- a/audio/linux-f10-libaudiofile/pkg-plist.i386
+++ b/audio/linux-f10-libaudiofile/pkg-plist.i386
@@ -1,22 +1,28 @@
usr/bin/sfconvert
usr/bin/sfinfo
-usr/doc/audiofile-0.1.9/COPYING
-usr/doc/audiofile-0.1.9/ChangeLog
-usr/doc/audiofile-0.1.9/README
-usr/doc/audiofile-0.1.9/TODO
-usr/doc/audiofile-0.1.9/docs/Makefile
-usr/doc/audiofile-0.1.9/docs/Makefile.am
-usr/doc/audiofile-0.1.9/docs/Makefile.in
-usr/doc/audiofile-0.1.9/docs/afCloseFile
-usr/doc/audiofile-0.1.9/docs/afGetFrameSize
-usr/doc/audiofile-0.1.9/docs/afIntro
-usr/doc/audiofile-0.1.9/docs/afNewFileSetup
-usr/doc/audiofile-0.1.9/docs/afOpenFile
-usr/doc/audiofile-0.1.9/docs/afReadFrames
-usr/doc/audiofile-0.1.9/docs/afWriteFrames
-usr/doc/audiofile-0.1.9/docs/sfconvert
-usr/doc/audiofile-0.1.9/docs/sfinfo
-usr/lib/libaudiofile.so.0
usr/lib/libaudiofile.so.0.0.0
-@dirrm usr/doc/audiofile-0.1.9/docs
-@dirrm usr/doc/audiofile-0.1.9
+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 29698d8a781d..7bcb5c47290f 100644
--- a/audio/linux-f8-esound/Makefile
+++ b/audio/linux-f8-esound/Makefile
@@ -7,16 +7,7 @@
PORTNAME= esound
CATEGORIES= audio linux
-.if (${MACHINE_ARCH} == "i386")
-PORTVERSION= 0.2.14
-.elif (${MACHINE_ARCH} == "alpha")
-PORTVERSION= 0.2.17
-.endif
-.if (${MACHINE_ARCH} == "i386")
-MASTER_SITES= ftp://ftp.redhat.com/pub/redhat/linux/6.1/en/os/i386/RedHat/RPMS/
-.elif (${MACHINE_ARCH} == "alpha")
-MASTER_SITES= ftp://ftp.redhat.com/pub/redhat/linux/6.1/en/os/alpha/RedHat/RPMS/
-.endif
+PORTVERSION= 0.2.22
MAINTAINER= taoka@FreeBSD.org
diff --git a/audio/linux-f8-esound/distinfo.alpha b/audio/linux-f8-esound/distinfo.alpha
index 3707a963ea1d..84d7d6cb932e 100644
--- a/audio/linux-f8-esound/distinfo.alpha
+++ b/audio/linux-f8-esound/distinfo.alpha
@@ -1 +1 @@
-MD5 (rpm/esound-0.2.17-1.alpha.rpm) = 09cbbd8d7bc2633f99fecd75843b33e9
+MD5 (rpm/esound-0.2.22-1.alpha.rpm) = 94411e58472dbb01383a8c7784b9b4bd
diff --git a/audio/linux-f8-esound/distinfo.i386 b/audio/linux-f8-esound/distinfo.i386
index 56cfba6ba039..2f638f0a1ec0 100644
--- a/audio/linux-f8-esound/distinfo.i386
+++ b/audio/linux-f8-esound/distinfo.i386
@@ -1 +1 @@
-MD5 (rpm/esound-0.2.14-1.i386.rpm) = 2bfd09ee99fc1f01a98a33f811d09689
+MD5 (rpm/esound-0.2.22-1.i386.rpm) = c8395daab28f33d7a59ed18e484fbcc9
diff --git a/audio/linux-f8-esound/pkg-plist.alpha b/audio/linux-f8-esound/pkg-plist.alpha
index 6f19dfd6e603..2fd653643fb5 100644
--- a/audio/linux-f8-esound/pkg-plist.alpha
+++ b/audio/linux-f8-esound/pkg-plist.alpha
@@ -9,18 +9,64 @@ usr/bin/esdmon
usr/bin/esdplay
usr/bin/esdrec
usr/bin/esdsample
-usr/doc/esound-0.2.17
-usr/doc/esound-0.2.17/AUTHORS
-usr/doc/esound-0.2.17/COPYING
-usr/doc/esound-0.2.17/ChangeLog
-usr/doc/esound-0.2.17/INSTALL
-usr/doc/esound-0.2.17/NEWS
-usr/doc/esound-0.2.17/README
-usr/doc/esound-0.2.17/TIPS
-usr/doc/esound-0.2.17/TODO
-usr/doc/esound-0.2.17/esound.sgml
+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/libesd.so.0.2.17
+usr/lib/libesddsp.so
usr/lib/libesddsp.so.0
-usr/lib/libesddsp.so.0.2.17
-@dirrm /usr/doc/esound-0.2.14
+@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-esound/pkg-plist.i386 b/audio/linux-f8-esound/pkg-plist.i386
index fcd117d381ee..2fd653643fb5 100644
--- a/audio/linux-f8-esound/pkg-plist.i386
+++ b/audio/linux-f8-esound/pkg-plist.i386
@@ -1,3 +1,4 @@
+etc/esd.conf
usr/bin/esd
usr/bin/esdcat
usr/bin/esdctl
@@ -8,17 +9,64 @@ usr/bin/esdmon
usr/bin/esdplay
usr/bin/esdrec
usr/bin/esdsample
-usr/doc/esound-0.2.14/AUTHORS
-usr/doc/esound-0.2.14/COPYING
-usr/doc/esound-0.2.14/ChangeLog
-usr/doc/esound-0.2.14/INSTALL
-usr/doc/esound-0.2.14/NEWS
-usr/doc/esound-0.2.14/README
-usr/doc/esound-0.2.14/TIPS
-usr/doc/esound-0.2.14/TODO
-usr/doc/esound-0.2.14/esound.sgml
+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/libesd.so.0.2.14
+usr/lib/libesddsp.so
usr/lib/libesddsp.so.0
-usr/lib/libesddsp.so.0.2.14
-@dirrm /usr/doc/esound-0.2.14
+@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 9148565db3b0..e62116ff5f5b 100644
--- a/audio/linux-f8-libaudiofile/Makefile
+++ b/audio/linux-f8-libaudiofile/Makefile
@@ -6,20 +6,11 @@
#
PORTNAME= libaudiofile
-PORTVERSION= 0.1.9
+PORTVERSION= 0.1.11
CATEGORIES= audio linux
-.if (${MACHINE_ARCH} == "i386")
-MASTER_SITES= ftp://ftp.redhat.com/pub/redhat/linux/6.1/en/os/i386/RedHat/RPMS/
-.elif (${MACHINE_ARCH} == "alpha")
-MASTER_SITES= ftp://ftp.redhat.com/pub/redhat/linux/6.1/en/os/alpha/RedHat/RPMS/
-.endif
MAINTAINER= taoka@FreeBSD.org
-.if (${MACHINE_ARCH} == "i386")
RPM_SET= audiofile-${PORTVERSION}-1.${MACHINE_ARCH}.rpm
-.elif (${MACHINE_ARCH} == "alpha")
-RPM_SET= audiofile-${PORTVERSION}-2.${MACHINE_ARCH}.rpm
-.endif
.include "../../x11-toolkits/linux-gtk/Makefile"
diff --git a/audio/linux-f8-libaudiofile/distinfo.alpha b/audio/linux-f8-libaudiofile/distinfo.alpha
index 1d02a187bc50..93f4eff95323 100644
--- a/audio/linux-f8-libaudiofile/distinfo.alpha
+++ b/audio/linux-f8-libaudiofile/distinfo.alpha
@@ -1 +1 @@
-MD5 (rpm/audiofile-0.1.9-2.alpha.rpm) = 4e9ee2c38abc630d9c039607ee7e0e35
+MD5 (rpm/audiofile-0.1.11-1.alpha.rpm) = 852a9656ac61aec99c7a7936b0249a9d
diff --git a/audio/linux-f8-libaudiofile/distinfo.i386 b/audio/linux-f8-libaudiofile/distinfo.i386
index 002f8d170f45..09297808a9d8 100644
--- a/audio/linux-f8-libaudiofile/distinfo.i386
+++ b/audio/linux-f8-libaudiofile/distinfo.i386
@@ -1 +1 @@
-MD5 (rpm/audiofile-0.1.9-1.i386.rpm) = ee5158bda87c1fc7601ea1467174d6da
+MD5 (rpm/audiofile-0.1.11-1.i386.rpm) = fb589f91458fd3d2b343bbed19919fd3
diff --git a/audio/linux-f8-libaudiofile/pkg-plist.alpha b/audio/linux-f8-libaudiofile/pkg-plist.alpha
index c955fe4e98b1..3dd95ab74feb 100644
--- a/audio/linux-f8-libaudiofile/pkg-plist.alpha
+++ b/audio/linux-f8-libaudiofile/pkg-plist.alpha
@@ -1,22 +1,28 @@
-/usr/bin/sfconvert
-/usr/bin/sfinfo
-/usr/doc/audiofile-0.1.9/COPYING
-/usr/doc/audiofile-0.1.9/ChangeLog
-/usr/doc/audiofile-0.1.9/README
-/usr/doc/audiofile-0.1.9/TODO
-/usr/doc/audiofile-0.1.9/docs/Makefile
-/usr/doc/audiofile-0.1.9/docs/Makefile.am
-/usr/doc/audiofile-0.1.9/docs/Makefile.in
-/usr/doc/audiofile-0.1.9/docs/afCloseFile
-/usr/doc/audiofile-0.1.9/docs/afGetFrameSize
-/usr/doc/audiofile-0.1.9/docs/afIntro
-/usr/doc/audiofile-0.1.9/docs/afNewFileSetup
-/usr/doc/audiofile-0.1.9/docs/afOpenFile
-/usr/doc/audiofile-0.1.9/docs/afReadFrames
-/usr/doc/audiofile-0.1.9/docs/afWriteFrames
-/usr/doc/audiofile-0.1.9/docs/sfconvert
-/usr/doc/audiofile-0.1.9/docs/sfinfo
-/usr/lib/libaudiofile.so.0
-/usr/lib/libaudiofile.so.0.0.0
-@dirrm /usr/doc/audiofile-0.1.9/docs
-@dirrm /usr/doc/audiofile-0.1.9
+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-libaudiofile/pkg-plist.i386 b/audio/linux-f8-libaudiofile/pkg-plist.i386
index 31e014cc80cd..3dd95ab74feb 100644
--- a/audio/linux-f8-libaudiofile/pkg-plist.i386
+++ b/audio/linux-f8-libaudiofile/pkg-plist.i386
@@ -1,22 +1,28 @@
usr/bin/sfconvert
usr/bin/sfinfo
-usr/doc/audiofile-0.1.9/COPYING
-usr/doc/audiofile-0.1.9/ChangeLog
-usr/doc/audiofile-0.1.9/README
-usr/doc/audiofile-0.1.9/TODO
-usr/doc/audiofile-0.1.9/docs/Makefile
-usr/doc/audiofile-0.1.9/docs/Makefile.am
-usr/doc/audiofile-0.1.9/docs/Makefile.in
-usr/doc/audiofile-0.1.9/docs/afCloseFile
-usr/doc/audiofile-0.1.9/docs/afGetFrameSize
-usr/doc/audiofile-0.1.9/docs/afIntro
-usr/doc/audiofile-0.1.9/docs/afNewFileSetup
-usr/doc/audiofile-0.1.9/docs/afOpenFile
-usr/doc/audiofile-0.1.9/docs/afReadFrames
-usr/doc/audiofile-0.1.9/docs/afWriteFrames
-usr/doc/audiofile-0.1.9/docs/sfconvert
-usr/doc/audiofile-0.1.9/docs/sfinfo
-usr/lib/libaudiofile.so.0
usr/lib/libaudiofile.so.0.0.0
-@dirrm usr/doc/audiofile-0.1.9/docs
-@dirrm usr/doc/audiofile-0.1.9
+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 9148565db3b0..e62116ff5f5b 100644
--- a/audio/linux-libaudiofile/Makefile
+++ b/audio/linux-libaudiofile/Makefile
@@ -6,20 +6,11 @@
#
PORTNAME= libaudiofile
-PORTVERSION= 0.1.9
+PORTVERSION= 0.1.11
CATEGORIES= audio linux
-.if (${MACHINE_ARCH} == "i386")
-MASTER_SITES= ftp://ftp.redhat.com/pub/redhat/linux/6.1/en/os/i386/RedHat/RPMS/
-.elif (${MACHINE_ARCH} == "alpha")
-MASTER_SITES= ftp://ftp.redhat.com/pub/redhat/linux/6.1/en/os/alpha/RedHat/RPMS/
-.endif
MAINTAINER= taoka@FreeBSD.org
-.if (${MACHINE_ARCH} == "i386")
RPM_SET= audiofile-${PORTVERSION}-1.${MACHINE_ARCH}.rpm
-.elif (${MACHINE_ARCH} == "alpha")
-RPM_SET= audiofile-${PORTVERSION}-2.${MACHINE_ARCH}.rpm
-.endif
.include "../../x11-toolkits/linux-gtk/Makefile"
diff --git a/audio/linux-libaudiofile/distinfo.alpha b/audio/linux-libaudiofile/distinfo.alpha
index 1d02a187bc50..93f4eff95323 100644
--- a/audio/linux-libaudiofile/distinfo.alpha
+++ b/audio/linux-libaudiofile/distinfo.alpha
@@ -1 +1 @@
-MD5 (rpm/audiofile-0.1.9-2.alpha.rpm) = 4e9ee2c38abc630d9c039607ee7e0e35
+MD5 (rpm/audiofile-0.1.11-1.alpha.rpm) = 852a9656ac61aec99c7a7936b0249a9d
diff --git a/audio/linux-libaudiofile/distinfo.i386 b/audio/linux-libaudiofile/distinfo.i386
index 002f8d170f45..09297808a9d8 100644
--- a/audio/linux-libaudiofile/distinfo.i386
+++ b/audio/linux-libaudiofile/distinfo.i386
@@ -1 +1 @@
-MD5 (rpm/audiofile-0.1.9-1.i386.rpm) = ee5158bda87c1fc7601ea1467174d6da
+MD5 (rpm/audiofile-0.1.11-1.i386.rpm) = fb589f91458fd3d2b343bbed19919fd3
diff --git a/audio/linux-libaudiofile/pkg-plist.alpha b/audio/linux-libaudiofile/pkg-plist.alpha
index c955fe4e98b1..3dd95ab74feb 100644
--- a/audio/linux-libaudiofile/pkg-plist.alpha
+++ b/audio/linux-libaudiofile/pkg-plist.alpha
@@ -1,22 +1,28 @@
-/usr/bin/sfconvert
-/usr/bin/sfinfo
-/usr/doc/audiofile-0.1.9/COPYING
-/usr/doc/audiofile-0.1.9/ChangeLog
-/usr/doc/audiofile-0.1.9/README
-/usr/doc/audiofile-0.1.9/TODO
-/usr/doc/audiofile-0.1.9/docs/Makefile
-/usr/doc/audiofile-0.1.9/docs/Makefile.am
-/usr/doc/audiofile-0.1.9/docs/Makefile.in
-/usr/doc/audiofile-0.1.9/docs/afCloseFile
-/usr/doc/audiofile-0.1.9/docs/afGetFrameSize
-/usr/doc/audiofile-0.1.9/docs/afIntro
-/usr/doc/audiofile-0.1.9/docs/afNewFileSetup
-/usr/doc/audiofile-0.1.9/docs/afOpenFile
-/usr/doc/audiofile-0.1.9/docs/afReadFrames
-/usr/doc/audiofile-0.1.9/docs/afWriteFrames
-/usr/doc/audiofile-0.1.9/docs/sfconvert
-/usr/doc/audiofile-0.1.9/docs/sfinfo
-/usr/lib/libaudiofile.so.0
-/usr/lib/libaudiofile.so.0.0.0
-@dirrm /usr/doc/audiofile-0.1.9/docs
-@dirrm /usr/doc/audiofile-0.1.9
+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/pkg-plist.i386 b/audio/linux-libaudiofile/pkg-plist.i386
index 31e014cc80cd..3dd95ab74feb 100644
--- a/audio/linux-libaudiofile/pkg-plist.i386
+++ b/audio/linux-libaudiofile/pkg-plist.i386
@@ -1,22 +1,28 @@
usr/bin/sfconvert
usr/bin/sfinfo
-usr/doc/audiofile-0.1.9/COPYING
-usr/doc/audiofile-0.1.9/ChangeLog
-usr/doc/audiofile-0.1.9/README
-usr/doc/audiofile-0.1.9/TODO
-usr/doc/audiofile-0.1.9/docs/Makefile
-usr/doc/audiofile-0.1.9/docs/Makefile.am
-usr/doc/audiofile-0.1.9/docs/Makefile.in
-usr/doc/audiofile-0.1.9/docs/afCloseFile
-usr/doc/audiofile-0.1.9/docs/afGetFrameSize
-usr/doc/audiofile-0.1.9/docs/afIntro
-usr/doc/audiofile-0.1.9/docs/afNewFileSetup
-usr/doc/audiofile-0.1.9/docs/afOpenFile
-usr/doc/audiofile-0.1.9/docs/afReadFrames
-usr/doc/audiofile-0.1.9/docs/afWriteFrames
-usr/doc/audiofile-0.1.9/docs/sfconvert
-usr/doc/audiofile-0.1.9/docs/sfinfo
-usr/lib/libaudiofile.so.0
usr/lib/libaudiofile.so.0.0.0
-@dirrm usr/doc/audiofile-0.1.9/docs
-@dirrm usr/doc/audiofile-0.1.9
+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-f10-libglade/Makefile b/devel/linux-f10-libglade/Makefile
index 5fcb0bcc4d22..62e4eff07c76 100644
--- a/devel/linux-f10-libglade/Makefile
+++ b/devel/linux-f10-libglade/Makefile
@@ -6,15 +6,11 @@
#
PORTNAME= libglade
-.if (${MACHINE_ARCH} == "i386")
-PORTVERSION= 0.6
-.elif (${MACHINE_ARCH} == "alpha")
-PORTVERSION= 0.7
-.endif
+PORTVERSION= 0.14
CATEGORIES= devel linux
MAINTAINER= taoka@FreeBSD.org
-RPM_SET= libglade-${PORTVERSION}-1.${MACHINE_ARCH}.rpm
+RPM_SET= libglade-${PORTVERSION}-3.${MACHINE_ARCH}.rpm
.include "../../x11-toolkits/linux-gtk/Makefile"
diff --git a/devel/linux-f10-libglade/distinfo.alpha b/devel/linux-f10-libglade/distinfo.alpha
index bd9fd67521be..d75ecc1fac4f 100644
--- a/devel/linux-f10-libglade/distinfo.alpha
+++ b/devel/linux-f10-libglade/distinfo.alpha
@@ -1 +1 @@
-MD5 (rpm/libglade-0.7-1.alpha.rpm) = ceaef48fcdb7e0e4ac218f948b1b2e1a
+MD5 (rpm/libglade-0.14-3.alpha.rpm) = c3a9aacdc0ccada3922bfcca35cf826c
diff --git a/devel/linux-f10-libglade/distinfo.i386 b/devel/linux-f10-libglade/distinfo.i386
index 5a00c13557c2..da63281b10a2 100644
--- a/devel/linux-f10-libglade/distinfo.i386
+++ b/devel/linux-f10-libglade/distinfo.i386
@@ -1 +1 @@
-MD5 (rpm/libglade-0.6-1.i386.rpm) = ff153639d396135992d5d03ff4927240
+MD5 (rpm/libglade-0.14-3.i386.rpm) = e0b9a3f9a3e6569c90dead7835de830c
diff --git a/devel/linux-f10-libglade/pkg-plist.alpha b/devel/linux-f10-libglade/pkg-plist.alpha
index 53337fbf21c2..c5767b11deea 100644
--- a/devel/linux-f10-libglade/pkg-plist.alpha
+++ b/devel/linux-f10-libglade/pkg-plist.alpha
@@ -1,10 +1,10 @@
-usr/doc/libglade-0.7/AUTHORS
-usr/doc/libglade-0.7/COPYING
-usr/doc/libglade-0.7/ChangeLog
-usr/doc/libglade-0.7/NEWS
-usr/doc/libglade-0.7/README
+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-gnome.so.0.2.2
usr/lib/libglade.so.0
-usr/lib/libglade.so.0.2.2
-@dirrm usr/doc/libglade-0.7
+@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 ca342f780532..c5767b11deea 100644
--- a/devel/linux-f10-libglade/pkg-plist.i386
+++ b/devel/linux-f10-libglade/pkg-plist.i386
@@ -1,10 +1,10 @@
-usr/doc/libglade-0.6/AUTHORS
-usr/doc/libglade-0.6/COPYING
-usr/doc/libglade-0.6/ChangeLog
-usr/doc/libglade-0.6/NEWS
-usr/doc/libglade-0.6/README
+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-gnome.so.0.2.1
usr/lib/libglade.so.0
-usr/lib/libglade.so.0.2.1
-@dirrm usr/doc/libglade-0.6
+@dirrm usr/share/doc/libglade-0.14
diff --git a/devel/linux-f10-libglade2/Makefile b/devel/linux-f10-libglade2/Makefile
index 5fcb0bcc4d22..62e4eff07c76 100644
--- a/devel/linux-f10-libglade2/Makefile
+++ b/devel/linux-f10-libglade2/Makefile
@@ -6,15 +6,11 @@
#
PORTNAME= libglade
-.if (${MACHINE_ARCH} == "i386")
-PORTVERSION= 0.6
-.elif (${MACHINE_ARCH} == "alpha")
-PORTVERSION= 0.7
-.endif
+PORTVERSION= 0.14
CATEGORIES= devel linux
MAINTAINER= taoka@FreeBSD.org
-RPM_SET= libglade-${PORTVERSION}-1.${MACHINE_ARCH}.rpm
+RPM_SET= libglade-${PORTVERSION}-3.${MACHINE_ARCH}.rpm
.include "../../x11-toolkits/linux-gtk/Makefile"
diff --git a/devel/linux-f10-libglade2/distinfo.alpha b/devel/linux-f10-libglade2/distinfo.alpha
index bd9fd67521be..d75ecc1fac4f 100644
--- a/devel/linux-f10-libglade2/distinfo.alpha
+++ b/devel/linux-f10-libglade2/distinfo.alpha
@@ -1 +1 @@
-MD5 (rpm/libglade-0.7-1.alpha.rpm) = ceaef48fcdb7e0e4ac218f948b1b2e1a
+MD5 (rpm/libglade-0.14-3.alpha.rpm) = c3a9aacdc0ccada3922bfcca35cf826c
diff --git a/devel/linux-f10-libglade2/distinfo.i386 b/devel/linux-f10-libglade2/distinfo.i386
index 5a00c13557c2..da63281b10a2 100644
--- a/devel/linux-f10-libglade2/distinfo.i386
+++ b/devel/linux-f10-libglade2/distinfo.i386
@@ -1 +1 @@
-MD5 (rpm/libglade-0.6-1.i386.rpm) = ff153639d396135992d5d03ff4927240
+MD5 (rpm/libglade-0.14-3.i386.rpm) = e0b9a3f9a3e6569c90dead7835de830c
diff --git a/devel/linux-f10-libglade2/pkg-plist.alpha b/devel/linux-f10-libglade2/pkg-plist.alpha
index 53337fbf21c2..c5767b11deea 100644
--- a/devel/linux-f10-libglade2/pkg-plist.alpha
+++ b/devel/linux-f10-libglade2/pkg-plist.alpha
@@ -1,10 +1,10 @@
-usr/doc/libglade-0.7/AUTHORS
-usr/doc/libglade-0.7/COPYING
-usr/doc/libglade-0.7/ChangeLog
-usr/doc/libglade-0.7/NEWS
-usr/doc/libglade-0.7/README
+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-gnome.so.0.2.2
usr/lib/libglade.so.0
-usr/lib/libglade.so.0.2.2
-@dirrm usr/doc/libglade-0.7
+@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 ca342f780532..c5767b11deea 100644
--- a/devel/linux-f10-libglade2/pkg-plist.i386
+++ b/devel/linux-f10-libglade2/pkg-plist.i386
@@ -1,10 +1,10 @@
-usr/doc/libglade-0.6/AUTHORS
-usr/doc/libglade-0.6/COPYING
-usr/doc/libglade-0.6/ChangeLog
-usr/doc/libglade-0.6/NEWS
-usr/doc/libglade-0.6/README
+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-gnome.so.0.2.1
usr/lib/libglade.so.0
-usr/lib/libglade.so.0.2.1
-@dirrm usr/doc/libglade-0.6
+@dirrm usr/share/doc/libglade-0.14
diff --git a/devel/linux-f8-libglade/Makefile b/devel/linux-f8-libglade/Makefile
index 5fcb0bcc4d22..62e4eff07c76 100644
--- a/devel/linux-f8-libglade/Makefile
+++ b/devel/linux-f8-libglade/Makefile
@@ -6,15 +6,11 @@
#
PORTNAME= libglade
-.if (${MACHINE_ARCH} == "i386")
-PORTVERSION= 0.6
-.elif (${MACHINE_ARCH} == "alpha")
-PORTVERSION= 0.7
-.endif
+PORTVERSION= 0.14
CATEGORIES= devel linux
MAINTAINER= taoka@FreeBSD.org
-RPM_SET= libglade-${PORTVERSION}-1.${MACHINE_ARCH}.rpm
+RPM_SET= libglade-${PORTVERSION}-3.${MACHINE_ARCH}.rpm
.include "../../x11-toolkits/linux-gtk/Makefile"
diff --git a/devel/linux-f8-libglade/distinfo.alpha b/devel/linux-f8-libglade/distinfo.alpha
index bd9fd67521be..d75ecc1fac4f 100644
--- a/devel/linux-f8-libglade/distinfo.alpha
+++ b/devel/linux-f8-libglade/distinfo.alpha
@@ -1 +1 @@
-MD5 (rpm/libglade-0.7-1.alpha.rpm) = ceaef48fcdb7e0e4ac218f948b1b2e1a
+MD5 (rpm/libglade-0.14-3.alpha.rpm) = c3a9aacdc0ccada3922bfcca35cf826c
diff --git a/devel/linux-f8-libglade/distinfo.i386 b/devel/linux-f8-libglade/distinfo.i386
index 5a00c13557c2..da63281b10a2 100644
--- a/devel/linux-f8-libglade/distinfo.i386
+++ b/devel/linux-f8-libglade/distinfo.i386
@@ -1 +1 @@
-MD5 (rpm/libglade-0.6-1.i386.rpm) = ff153639d396135992d5d03ff4927240
+MD5 (rpm/libglade-0.14-3.i386.rpm) = e0b9a3f9a3e6569c90dead7835de830c
diff --git a/devel/linux-f8-libglade/pkg-plist.alpha b/devel/linux-f8-libglade/pkg-plist.alpha
index 53337fbf21c2..c5767b11deea 100644
--- a/devel/linux-f8-libglade/pkg-plist.alpha
+++ b/devel/linux-f8-libglade/pkg-plist.alpha
@@ -1,10 +1,10 @@
-usr/doc/libglade-0.7/AUTHORS
-usr/doc/libglade-0.7/COPYING
-usr/doc/libglade-0.7/ChangeLog
-usr/doc/libglade-0.7/NEWS
-usr/doc/libglade-0.7/README
+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-gnome.so.0.2.2
usr/lib/libglade.so.0
-usr/lib/libglade.so.0.2.2
-@dirrm usr/doc/libglade-0.7
+@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 ca342f780532..c5767b11deea 100644
--- a/devel/linux-f8-libglade/pkg-plist.i386
+++ b/devel/linux-f8-libglade/pkg-plist.i386
@@ -1,10 +1,10 @@
-usr/doc/libglade-0.6/AUTHORS
-usr/doc/libglade-0.6/COPYING
-usr/doc/libglade-0.6/ChangeLog
-usr/doc/libglade-0.6/NEWS
-usr/doc/libglade-0.6/README
+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-gnome.so.0.2.1
usr/lib/libglade.so.0
-usr/lib/libglade.so.0.2.1
-@dirrm usr/doc/libglade-0.6
+@dirrm usr/share/doc/libglade-0.14
diff --git a/devel/linux-f8-libglade2/Makefile b/devel/linux-f8-libglade2/Makefile
index 5fcb0bcc4d22..62e4eff07c76 100644
--- a/devel/linux-f8-libglade2/Makefile
+++ b/devel/linux-f8-libglade2/Makefile
@@ -6,15 +6,11 @@
#
PORTNAME= libglade
-.if (${MACHINE_ARCH} == "i386")
-PORTVERSION= 0.6
-.elif (${MACHINE_ARCH} == "alpha")
-PORTVERSION= 0.7
-.endif
+PORTVERSION= 0.14
CATEGORIES= devel linux
MAINTAINER= taoka@FreeBSD.org
-RPM_SET= libglade-${PORTVERSION}-1.${MACHINE_ARCH}.rpm
+RPM_SET= libglade-${PORTVERSION}-3.${MACHINE_ARCH}.rpm
.include "../../x11-toolkits/linux-gtk/Makefile"
diff --git a/devel/linux-f8-libglade2/distinfo.alpha b/devel/linux-f8-libglade2/distinfo.alpha
index bd9fd67521be..d75ecc1fac4f 100644
--- a/devel/linux-f8-libglade2/distinfo.alpha
+++ b/devel/linux-f8-libglade2/distinfo.alpha
@@ -1 +1 @@
-MD5 (rpm/libglade-0.7-1.alpha.rpm) = ceaef48fcdb7e0e4ac218f948b1b2e1a
+MD5 (rpm/libglade-0.14-3.alpha.rpm) = c3a9aacdc0ccada3922bfcca35cf826c
diff --git a/devel/linux-f8-libglade2/distinfo.i386 b/devel/linux-f8-libglade2/distinfo.i386
index 5a00c13557c2..da63281b10a2 100644
--- a/devel/linux-f8-libglade2/distinfo.i386
+++ b/devel/linux-f8-libglade2/distinfo.i386
@@ -1 +1 @@
-MD5 (rpm/libglade-0.6-1.i386.rpm) = ff153639d396135992d5d03ff4927240
+MD5 (rpm/libglade-0.14-3.i386.rpm) = e0b9a3f9a3e6569c90dead7835de830c
diff --git a/devel/linux-f8-libglade2/pkg-plist.alpha b/devel/linux-f8-libglade2/pkg-plist.alpha
index 53337fbf21c2..c5767b11deea 100644
--- a/devel/linux-f8-libglade2/pkg-plist.alpha
+++ b/devel/linux-f8-libglade2/pkg-plist.alpha
@@ -1,10 +1,10 @@
-usr/doc/libglade-0.7/AUTHORS
-usr/doc/libglade-0.7/COPYING
-usr/doc/libglade-0.7/ChangeLog
-usr/doc/libglade-0.7/NEWS
-usr/doc/libglade-0.7/README
+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-gnome.so.0.2.2
usr/lib/libglade.so.0
-usr/lib/libglade.so.0.2.2
-@dirrm usr/doc/libglade-0.7
+@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 ca342f780532..c5767b11deea 100644
--- a/devel/linux-f8-libglade2/pkg-plist.i386
+++ b/devel/linux-f8-libglade2/pkg-plist.i386
@@ -1,10 +1,10 @@
-usr/doc/libglade-0.6/AUTHORS
-usr/doc/libglade-0.6/COPYING
-usr/doc/libglade-0.6/ChangeLog
-usr/doc/libglade-0.6/NEWS
-usr/doc/libglade-0.6/README
+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-gnome.so.0.2.1
usr/lib/libglade.so.0
-usr/lib/libglade.so.0.2.1
-@dirrm usr/doc/libglade-0.6
+@dirrm usr/share/doc/libglade-0.14
diff --git a/devel/linux-libglade/Makefile b/devel/linux-libglade/Makefile
index 5fcb0bcc4d22..62e4eff07c76 100644
--- a/devel/linux-libglade/Makefile
+++ b/devel/linux-libglade/Makefile
@@ -6,15 +6,11 @@
#
PORTNAME= libglade
-.if (${MACHINE_ARCH} == "i386")
-PORTVERSION= 0.6
-.elif (${MACHINE_ARCH} == "alpha")
-PORTVERSION= 0.7
-.endif
+PORTVERSION= 0.14
CATEGORIES= devel linux
MAINTAINER= taoka@FreeBSD.org
-RPM_SET= libglade-${PORTVERSION}-1.${MACHINE_ARCH}.rpm
+RPM_SET= libglade-${PORTVERSION}-3.${MACHINE_ARCH}.rpm
.include "../../x11-toolkits/linux-gtk/Makefile"
diff --git a/devel/linux-libglade/distinfo.alpha b/devel/linux-libglade/distinfo.alpha
index bd9fd67521be..d75ecc1fac4f 100644
--- a/devel/linux-libglade/distinfo.alpha
+++ b/devel/linux-libglade/distinfo.alpha
@@ -1 +1 @@
-MD5 (rpm/libglade-0.7-1.alpha.rpm) = ceaef48fcdb7e0e4ac218f948b1b2e1a
+MD5 (rpm/libglade-0.14-3.alpha.rpm) = c3a9aacdc0ccada3922bfcca35cf826c
diff --git a/devel/linux-libglade/distinfo.i386 b/devel/linux-libglade/distinfo.i386
index 5a00c13557c2..da63281b10a2 100644
--- a/devel/linux-libglade/distinfo.i386
+++ b/devel/linux-libglade/distinfo.i386
@@ -1 +1 @@
-MD5 (rpm/libglade-0.6-1.i386.rpm) = ff153639d396135992d5d03ff4927240
+MD5 (rpm/libglade-0.14-3.i386.rpm) = e0b9a3f9a3e6569c90dead7835de830c
diff --git a/devel/linux-libglade/pkg-plist.alpha b/devel/linux-libglade/pkg-plist.alpha
index 53337fbf21c2..c5767b11deea 100644
--- a/devel/linux-libglade/pkg-plist.alpha
+++ b/devel/linux-libglade/pkg-plist.alpha
@@ -1,10 +1,10 @@
-usr/doc/libglade-0.7/AUTHORS
-usr/doc/libglade-0.7/COPYING
-usr/doc/libglade-0.7/ChangeLog
-usr/doc/libglade-0.7/NEWS
-usr/doc/libglade-0.7/README
+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-gnome.so.0.2.2
usr/lib/libglade.so.0
-usr/lib/libglade.so.0.2.2
-@dirrm usr/doc/libglade-0.7
+@dirrm usr/share/doc/libglade-0.14
diff --git a/devel/linux-libglade/pkg-plist.i386 b/devel/linux-libglade/pkg-plist.i386
index ca342f780532..c5767b11deea 100644
--- a/devel/linux-libglade/pkg-plist.i386
+++ b/devel/linux-libglade/pkg-plist.i386
@@ -1,10 +1,10 @@
-usr/doc/libglade-0.6/AUTHORS
-usr/doc/libglade-0.6/COPYING
-usr/doc/libglade-0.6/ChangeLog
-usr/doc/libglade-0.6/NEWS
-usr/doc/libglade-0.6/README
+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-gnome.so.0.2.1
usr/lib/libglade.so.0
-usr/lib/libglade.so.0.2.1
-@dirrm usr/doc/libglade-0.6
+@dirrm usr/share/doc/libglade-0.14
diff --git a/devel/linux-libglade2/Makefile b/devel/linux-libglade2/Makefile
index 5fcb0bcc4d22..62e4eff07c76 100644
--- a/devel/linux-libglade2/Makefile
+++ b/devel/linux-libglade2/Makefile
@@ -6,15 +6,11 @@
#
PORTNAME= libglade
-.if (${MACHINE_ARCH} == "i386")
-PORTVERSION= 0.6
-.elif (${MACHINE_ARCH} == "alpha")
-PORTVERSION= 0.7
-.endif
+PORTVERSION= 0.14
CATEGORIES= devel linux
MAINTAINER= taoka@FreeBSD.org
-RPM_SET= libglade-${PORTVERSION}-1.${MACHINE_ARCH}.rpm
+RPM_SET= libglade-${PORTVERSION}-3.${MACHINE_ARCH}.rpm
.include "../../x11-toolkits/linux-gtk/Makefile"
diff --git a/devel/linux-libglade2/distinfo.alpha b/devel/linux-libglade2/distinfo.alpha
index bd9fd67521be..d75ecc1fac4f 100644
--- a/devel/linux-libglade2/distinfo.alpha
+++ b/devel/linux-libglade2/distinfo.alpha
@@ -1 +1 @@
-MD5 (rpm/libglade-0.7-1.alpha.rpm) = ceaef48fcdb7e0e4ac218f948b1b2e1a
+MD5 (rpm/libglade-0.14-3.alpha.rpm) = c3a9aacdc0ccada3922bfcca35cf826c
diff --git a/devel/linux-libglade2/distinfo.i386 b/devel/linux-libglade2/distinfo.i386
index 5a00c13557c2..da63281b10a2 100644
--- a/devel/linux-libglade2/distinfo.i386
+++ b/devel/linux-libglade2/distinfo.i386
@@ -1 +1 @@
-MD5 (rpm/libglade-0.6-1.i386.rpm) = ff153639d396135992d5d03ff4927240
+MD5 (rpm/libglade-0.14-3.i386.rpm) = e0b9a3f9a3e6569c90dead7835de830c
diff --git a/devel/linux-libglade2/pkg-plist.alpha b/devel/linux-libglade2/pkg-plist.alpha
index 53337fbf21c2..c5767b11deea 100644
--- a/devel/linux-libglade2/pkg-plist.alpha
+++ b/devel/linux-libglade2/pkg-plist.alpha
@@ -1,10 +1,10 @@
-usr/doc/libglade-0.7/AUTHORS
-usr/doc/libglade-0.7/COPYING
-usr/doc/libglade-0.7/ChangeLog
-usr/doc/libglade-0.7/NEWS
-usr/doc/libglade-0.7/README
+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-gnome.so.0.2.2
usr/lib/libglade.so.0
-usr/lib/libglade.so.0.2.2
-@dirrm usr/doc/libglade-0.7
+@dirrm usr/share/doc/libglade-0.14
diff --git a/devel/linux-libglade2/pkg-plist.i386 b/devel/linux-libglade2/pkg-plist.i386
index ca342f780532..c5767b11deea 100644
--- a/devel/linux-libglade2/pkg-plist.i386
+++ b/devel/linux-libglade2/pkg-plist.i386
@@ -1,10 +1,10 @@
-usr/doc/libglade-0.6/AUTHORS
-usr/doc/libglade-0.6/COPYING
-usr/doc/libglade-0.6/ChangeLog
-usr/doc/libglade-0.6/NEWS
-usr/doc/libglade-0.6/README
+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-gnome.so.0.2.1
usr/lib/libglade.so.0
-usr/lib/libglade.so.0.2.1
-@dirrm usr/doc/libglade-0.6
+@dirrm usr/share/doc/libglade-0.14
diff --git a/graphics/linux-f10-imlib/Makefile b/graphics/linux-f10-imlib/Makefile
index 78f7beaccf31..ed665fb95db6 100644
--- a/graphics/linux-f10-imlib/Makefile
+++ b/graphics/linux-f10-imlib/Makefile
@@ -6,16 +6,11 @@
#
PORTNAME= imlib
-PORTVERSION= 1.9.7
+PORTVERSION= 1.9.8.1
CATEGORIES= graphics linux
-.if (${MACHINE_ARCH} == "i386")
-MASTER_SITES= ftp://ftp.redhat.com/pub/redhat/linux/6.1/en/os/i386/RedHat/RPMS/
-.elif (${MACHINE_ARCH} == "alpha")
-MASTER_SITES= ftp://ftp.redhat.com/pub/redhat/linux/6.1/en/os/alpha/RedHat/RPMS/
-.endif
MAINTAINER= taoka@FreeBSD.org
-RPM_SET= imlib-${PORTVERSION}-1.${MACHINE_ARCH}.rpm
+RPM_SET= imlib-${PORTVERSION}-2.${MACHINE_ARCH}.rpm
.include "../../x11-toolkits/linux-gtk/Makefile"
diff --git a/graphics/linux-f10-imlib/distinfo.alpha b/graphics/linux-f10-imlib/distinfo.alpha
index 05f19eb0ed43..3d507ae614b0 100644
--- a/graphics/linux-f10-imlib/distinfo.alpha
+++ b/graphics/linux-f10-imlib/distinfo.alpha
@@ -1 +1 @@
-MD5 (rpm/imlib-1.9.7-1.alpha.rpm) = 001adb68ca5ab800e605eea3c9360acc
+MD5 (rpm/imlib-1.9.8.1-2.alpha.rpm) = 1e55a013ac2058d1100393ec6e795fa4
diff --git a/graphics/linux-f10-imlib/distinfo.i386 b/graphics/linux-f10-imlib/distinfo.i386
index a1e40449bf74..c4741ffb01d8 100644
--- a/graphics/linux-f10-imlib/distinfo.i386
+++ b/graphics/linux-f10-imlib/distinfo.i386
@@ -1 +1 @@
-MD5 (rpm/imlib-1.9.7-1.i386.rpm) = 79bf35bcf4e8290f79bf435fe7d29d16
+MD5 (rpm/imlib-1.9.8.1-2.i386.rpm) = 64a1a27bc1e276af8aecefa261ab9b3b
diff --git a/graphics/linux-f10-imlib/pkg-plist.alpha b/graphics/linux-f10-imlib/pkg-plist.alpha
index 66c7b3cc8cb8..f19ff0727e49 100644
--- a/graphics/linux-f10-imlib/pkg-plist.alpha
+++ b/graphics/linux-f10-imlib/pkg-plist.alpha
@@ -2,14 +2,8 @@ etc/im_palette-small.pal
etc/im_palette-tiny.pal
etc/im_palette.pal
etc/imrc
-usr/doc/imlib-1.9.7/AUTHORS
-usr/doc/imlib-1.9.7/ChangeLog
-usr/doc/imlib-1.9.7/NEWS
-usr/doc/imlib-1.9.7/README
-usr/lib/libImlib.so.1
-usr/lib/libImlib.so.1.9.7
-usr/lib/libgdk_imlib.so.1
-usr/lib/libgdk_imlib.so.1.9.7
+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
@@ -18,4 +12,10 @@ usr/lib/libimlib-ppm.so
usr/lib/libimlib-ps.so
usr/lib/libimlib-tiff.so
usr/lib/libimlib-xpm.so
-@dirrm usr/doc/imlib-1.9.7
+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 66c7b3cc8cb8..f19ff0727e49 100644
--- a/graphics/linux-f10-imlib/pkg-plist.i386
+++ b/graphics/linux-f10-imlib/pkg-plist.i386
@@ -2,14 +2,8 @@ etc/im_palette-small.pal
etc/im_palette-tiny.pal
etc/im_palette.pal
etc/imrc
-usr/doc/imlib-1.9.7/AUTHORS
-usr/doc/imlib-1.9.7/ChangeLog
-usr/doc/imlib-1.9.7/NEWS
-usr/doc/imlib-1.9.7/README
-usr/lib/libImlib.so.1
-usr/lib/libImlib.so.1.9.7
-usr/lib/libgdk_imlib.so.1
-usr/lib/libgdk_imlib.so.1.9.7
+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
@@ -18,4 +12,10 @@ usr/lib/libimlib-ppm.so
usr/lib/libimlib-ps.so
usr/lib/libimlib-tiff.so
usr/lib/libimlib-xpm.so
-@dirrm usr/doc/imlib-1.9.7
+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-jpeg/Makefile b/graphics/linux-f10-jpeg/Makefile
index 9aa7ae22f62d..71ab949529b9 100644
--- a/graphics/linux-f10-jpeg/Makefile
+++ b/graphics/linux-f10-jpeg/Makefile
@@ -6,9 +6,9 @@
#
PORTNAME= jpeg
-PORTVERSION= 6b.9
+PORTVERSION= 6b.15
CATEGORIES= graphics linux
-RPM_SET= libjpeg-6b-9.${MACHINE_ARCH}.rpm
+RPM_SET= libjpeg-6b-15.${MACHINE_ARCH}.rpm
.include "../../x11-toolkits/linux-gtk/Makefile"
diff --git a/graphics/linux-f10-jpeg/distinfo.alpha b/graphics/linux-f10-jpeg/distinfo.alpha
index f6d00787b738..b3bdf202b77d 100644
--- a/graphics/linux-f10-jpeg/distinfo.alpha
+++ b/graphics/linux-f10-jpeg/distinfo.alpha
@@ -1 +1 @@
-MD5 (rpm/libjpeg-6b-9.alpha.rpm) = a1d1352eb4893af265a53283133818c5
+MD5 (rpm/libjpeg-6b-15.alpha.rpm) = 01eb4e440c40cd077037f5773001cd1f
diff --git a/graphics/linux-f10-jpeg/distinfo.i386 b/graphics/linux-f10-jpeg/distinfo.i386
index a882423dc85c..1f649a0955d4 100644
--- a/graphics/linux-f10-jpeg/distinfo.i386
+++ b/graphics/linux-f10-jpeg/distinfo.i386
@@ -1 +1 @@
-MD5 (rpm/libjpeg-6b-9.i386.rpm) = 453feddfadcdb1b96c2a3bb843e3ec80
+MD5 (rpm/libjpeg-6b-15.i386.rpm) = d35d32f13a16a33d30aca2a0669c2075
diff --git a/graphics/linux-f10-jpeg/pkg-plist.alpha b/graphics/linux-f10-jpeg/pkg-plist.alpha
index bbbd2df62ff1..b8922dd02b57 100644
--- a/graphics/linux-f10-jpeg/pkg-plist.alpha
+++ b/graphics/linux-f10-jpeg/pkg-plist.alpha
@@ -4,9 +4,12 @@ usr/bin/jpegtran
usr/bin/rdjpgcom
usr/bin/wrjpgcom
usr/lib/libjpeg.so.62.0.0
-usr/man/man1/cjpeg.1
-usr/man/man1/djpeg.1
-usr/man/man1/jpegtran.1
-usr/man/man1/rdjpgcom.1
-usr/man/man1/wrjpgcom.1
-usr/lib/libjpeg.so.62
+usr/share/doc/libjpeg-6b/usage.doc
+usr/share/man/man1/cjpeg.1.gz
+usr/share/man/man1/djpeg.1.gz
+usr/share/man/man1/jpegtran.1.gz
+usr/share/man/man1/rdjpgcom.1.gz
+usr/share/man/man1/wrjpgcom.1.gz
+@exec ln -sf %D/usr/lib/libjpeg.so.62.0.0 %D/usr/lib/libjpeg.so.62
+@unexec rm -f %D/usr/lib/libjpeg.so.62
+@dirrm usr/share/doc/libjpeg-6b
diff --git a/graphics/linux-f10-jpeg/pkg-plist.i386 b/graphics/linux-f10-jpeg/pkg-plist.i386
index bbbd2df62ff1..b8922dd02b57 100644
--- a/graphics/linux-f10-jpeg/pkg-plist.i386
+++ b/graphics/linux-f10-jpeg/pkg-plist.i386
@@ -4,9 +4,12 @@ usr/bin/jpegtran
usr/bin/rdjpgcom
usr/bin/wrjpgcom
usr/lib/libjpeg.so.62.0.0
-usr/man/man1/cjpeg.1
-usr/man/man1/djpeg.1
-usr/man/man1/jpegtran.1
-usr/man/man1/rdjpgcom.1
-usr/man/man1/wrjpgcom.1
-usr/lib/libjpeg.so.62
+usr/share/doc/libjpeg-6b/usage.doc
+usr/share/man/man1/cjpeg.1.gz
+usr/share/man/man1/djpeg.1.gz
+usr/share/man/man1/jpegtran.1.gz
+usr/share/man/man1/rdjpgcom.1.gz
+usr/share/man/man1/wrjpgcom.1.gz
+@exec ln -sf %D/usr/lib/libjpeg.so.62.0.0 %D/usr/lib/libjpeg.so.62
+@unexec rm -f %D/usr/lib/libjpeg.so.62
+@dirrm usr/share/doc/libjpeg-6b
diff --git a/graphics/linux-f10-png/Makefile b/graphics/linux-f10-png/Makefile
index e444c6d6df36..43acc300abd3 100644
--- a/graphics/linux-f10-png/Makefile
+++ b/graphics/linux-f10-png/Makefile
@@ -6,9 +6,9 @@
#
PORTNAME= png
-PORTVERSION= 1.0.3
+PORTVERSION= 1.0.9
CATEGORIES= graphics linux
-RPM_SET= libpng-${PORTVERSION}-4.${MACHINE_ARCH}.rpm
+RPM_SET= libpng-${PORTVERSION}-1.${MACHINE_ARCH}.rpm
.include "../../x11-toolkits/linux-gtk/Makefile"
diff --git a/graphics/linux-f10-png/distinfo.alpha b/graphics/linux-f10-png/distinfo.alpha
index d4d45c295971..8bacec00445f 100644
--- a/graphics/linux-f10-png/distinfo.alpha
+++ b/graphics/linux-f10-png/distinfo.alpha
@@ -1 +1 @@
-MD5 (rpm/libpng-1.0.3-4.alpha.rpm) = 2a62f2e8346b1b7b690b688758fb7ee0
+MD5 (rpm/libpng-1.0.9-1.alpha.rpm) = dd0e44f332ae5cb7536c54a4a28cb7ae
diff --git a/graphics/linux-f10-png/distinfo.i386 b/graphics/linux-f10-png/distinfo.i386
index c9ea29a34430..dd71716e9590 100644
--- a/graphics/linux-f10-png/distinfo.i386
+++ b/graphics/linux-f10-png/distinfo.i386
@@ -1 +1 @@
-MD5 (rpm/libpng-1.0.3-4.i386.rpm) = 97a6022e9fb046372da34eeb413ddecc
+MD5 (rpm/libpng-1.0.9-1.i386.rpm) = d903894da8b628030a8feef3d6898412
diff --git a/graphics/linux-f10-png/pkg-plist.alpha b/graphics/linux-f10-png/pkg-plist.alpha
index 825d1d3e47e1..024bfb34e766 100644
--- a/graphics/linux-f10-png/pkg-plist.alpha
+++ b/graphics/linux-f10-png/pkg-plist.alpha
@@ -1,9 +1,10 @@
-usr/doc/libpng-1.0.3/CHANGES
-usr/doc/libpng-1.0.3/README
-usr/doc/libpng-1.0.3/TODO
-usr/doc/libpng-1.0.3/example.c
-usr/doc/libpng-1.0.3/libpng.txt
-@dirrm usr/doc/libpng-1.0.3
-usr/lib/libpng.so.2.1.0.3
-usr/lib/libpng.so.2
-usr/man/man5/png.5
+usr/lib/libpng.so.2.1.0.9
+@exec ln -sf %D/usr/lib/libpng.so.2.1.0.9 %D/usr/lib/libpng.so.2
+@unexec rm -f %D/usr/lib/libpng.so.2
+usr/share/doc/libpng-1.0.9/CHANGES
+usr/share/doc/libpng-1.0.9/README
+usr/share/doc/libpng-1.0.9/TODO
+usr/share/doc/libpng-1.0.9/example.c
+usr/share/doc/libpng-1.0.9/libpng.txt
+usr/share/man/man5/png.5.gz
+@dirrm usr/share/doc/libpng-1.0.9
diff --git a/graphics/linux-f10-png/pkg-plist.i386 b/graphics/linux-f10-png/pkg-plist.i386
index 825d1d3e47e1..024bfb34e766 100644
--- a/graphics/linux-f10-png/pkg-plist.i386
+++ b/graphics/linux-f10-png/pkg-plist.i386
@@ -1,9 +1,10 @@
-usr/doc/libpng-1.0.3/CHANGES
-usr/doc/libpng-1.0.3/README
-usr/doc/libpng-1.0.3/TODO
-usr/doc/libpng-1.0.3/example.c
-usr/doc/libpng-1.0.3/libpng.txt
-@dirrm usr/doc/libpng-1.0.3
-usr/lib/libpng.so.2.1.0.3
-usr/lib/libpng.so.2
-usr/man/man5/png.5
+usr/lib/libpng.so.2.1.0.9
+@exec ln -sf %D/usr/lib/libpng.so.2.1.0.9 %D/usr/lib/libpng.so.2
+@unexec rm -f %D/usr/lib/libpng.so.2
+usr/share/doc/libpng-1.0.9/CHANGES
+usr/share/doc/libpng-1.0.9/README
+usr/share/doc/libpng-1.0.9/TODO
+usr/share/doc/libpng-1.0.9/example.c
+usr/share/doc/libpng-1.0.9/libpng.txt
+usr/share/man/man5/png.5.gz
+@dirrm usr/share/doc/libpng-1.0.9
diff --git a/graphics/linux-f10-png10/Makefile b/graphics/linux-f10-png10/Makefile
index e444c6d6df36..43acc300abd3 100644
--- a/graphics/linux-f10-png10/Makefile
+++ b/graphics/linux-f10-png10/Makefile
@@ -6,9 +6,9 @@
#
PORTNAME= png
-PORTVERSION= 1.0.3
+PORTVERSION= 1.0.9
CATEGORIES= graphics linux
-RPM_SET= libpng-${PORTVERSION}-4.${MACHINE_ARCH}.rpm
+RPM_SET= libpng-${PORTVERSION}-1.${MACHINE_ARCH}.rpm
.include "../../x11-toolkits/linux-gtk/Makefile"
diff --git a/graphics/linux-f10-png10/distinfo.alpha b/graphics/linux-f10-png10/distinfo.alpha
index d4d45c295971..8bacec00445f 100644
--- a/graphics/linux-f10-png10/distinfo.alpha
+++ b/graphics/linux-f10-png10/distinfo.alpha
@@ -1 +1 @@
-MD5 (rpm/libpng-1.0.3-4.alpha.rpm) = 2a62f2e8346b1b7b690b688758fb7ee0
+MD5 (rpm/libpng-1.0.9-1.alpha.rpm) = dd0e44f332ae5cb7536c54a4a28cb7ae
diff --git a/graphics/linux-f10-png10/distinfo.i386 b/graphics/linux-f10-png10/distinfo.i386
index c9ea29a34430..dd71716e9590 100644
--- a/graphics/linux-f10-png10/distinfo.i386
+++ b/graphics/linux-f10-png10/distinfo.i386
@@ -1 +1 @@
-MD5 (rpm/libpng-1.0.3-4.i386.rpm) = 97a6022e9fb046372da34eeb413ddecc
+MD5 (rpm/libpng-1.0.9-1.i386.rpm) = d903894da8b628030a8feef3d6898412
diff --git a/graphics/linux-f10-png10/pkg-plist.alpha b/graphics/linux-f10-png10/pkg-plist.alpha
index 825d1d3e47e1..024bfb34e766 100644
--- a/graphics/linux-f10-png10/pkg-plist.alpha
+++ b/graphics/linux-f10-png10/pkg-plist.alpha
@@ -1,9 +1,10 @@
-usr/doc/libpng-1.0.3/CHANGES
-usr/doc/libpng-1.0.3/README
-usr/doc/libpng-1.0.3/TODO
-usr/doc/libpng-1.0.3/example.c
-usr/doc/libpng-1.0.3/libpng.txt
-@dirrm usr/doc/libpng-1.0.3
-usr/lib/libpng.so.2.1.0.3
-usr/lib/libpng.so.2
-usr/man/man5/png.5
+usr/lib/libpng.so.2.1.0.9
+@exec ln -sf %D/usr/lib/libpng.so.2.1.0.9 %D/usr/lib/libpng.so.2
+@unexec rm -f %D/usr/lib/libpng.so.2
+usr/share/doc/libpng-1.0.9/CHANGES
+usr/share/doc/libpng-1.0.9/README
+usr/share/doc/libpng-1.0.9/TODO
+usr/share/doc/libpng-1.0.9/example.c
+usr/share/doc/libpng-1.0.9/libpng.txt
+usr/share/man/man5/png.5.gz
+@dirrm usr/share/doc/libpng-1.0.9
diff --git a/graphics/linux-f10-png10/pkg-plist.i386 b/graphics/linux-f10-png10/pkg-plist.i386
index 825d1d3e47e1..024bfb34e766 100644
--- a/graphics/linux-f10-png10/pkg-plist.i386
+++ b/graphics/linux-f10-png10/pkg-plist.i386
@@ -1,9 +1,10 @@
-usr/doc/libpng-1.0.3/CHANGES
-usr/doc/libpng-1.0.3/README
-usr/doc/libpng-1.0.3/TODO
-usr/doc/libpng-1.0.3/example.c
-usr/doc/libpng-1.0.3/libpng.txt
-@dirrm usr/doc/libpng-1.0.3
-usr/lib/libpng.so.2.1.0.3
-usr/lib/libpng.so.2
-usr/man/man5/png.5
+usr/lib/libpng.so.2.1.0.9
+@exec ln -sf %D/usr/lib/libpng.so.2.1.0.9 %D/usr/lib/libpng.so.2
+@unexec rm -f %D/usr/lib/libpng.so.2
+usr/share/doc/libpng-1.0.9/CHANGES
+usr/share/doc/libpng-1.0.9/README
+usr/share/doc/libpng-1.0.9/TODO
+usr/share/doc/libpng-1.0.9/example.c
+usr/share/doc/libpng-1.0.9/libpng.txt
+usr/share/man/man5/png.5.gz
+@dirrm usr/share/doc/libpng-1.0.9
diff --git a/graphics/linux-f10-tiff/Makefile b/graphics/linux-f10-tiff/Makefile
index 2c8faef3c798..a05c45a87234 100644
--- a/graphics/linux-f10-tiff/Makefile
+++ b/graphics/linux-f10-tiff/Makefile
@@ -6,11 +6,11 @@
#
PORTNAME= tiff
-PORTVERSION= 3.4
+PORTVERSION= 3.5.5
CATEGORIES= graphics linux
MAINTAINER= taoka@FreeBSD.org
-RPM_SET= libtiff-${PORTVERSION}-6.${MACHINE_ARCH}.rpm
+RPM_SET= libtiff-${PORTVERSION}-10.${MACHINE_ARCH}.rpm
.include "../../x11-toolkits/linux-gtk/Makefile"
diff --git a/graphics/linux-f10-tiff/distinfo.alpha b/graphics/linux-f10-tiff/distinfo.alpha
index 24e126d457bf..e7c0fc45d737 100644
--- a/graphics/linux-f10-tiff/distinfo.alpha
+++ b/graphics/linux-f10-tiff/distinfo.alpha
@@ -1 +1 @@
-MD5 (rpm/libtiff-3.4-6.alpha.rpm) = 16d52cb02b81b873bc80cf498d36682a
+MD5 (rpm/libtiff-3.5.5-10.alpha.rpm) = 51aaf90d967a63978f6e9a4e5c35b033
diff --git a/graphics/linux-f10-tiff/distinfo.i386 b/graphics/linux-f10-tiff/distinfo.i386
index d2d3d3c1c0bd..320116f0a7b4 100644
--- a/graphics/linux-f10-tiff/distinfo.i386
+++ b/graphics/linux-f10-tiff/distinfo.i386
@@ -1 +1 @@
-MD5 (rpm/libtiff-3.4-6.i386.rpm) = 5cd8da37f583200fe4f1af0c3028da6d
+MD5 (rpm/libtiff-3.5.5-10.i386.rpm) = 3cba6c6c4d96a9e3bf7a3345ecf535f5
diff --git a/graphics/linux-f10-tiff/pkg-plist.alpha b/graphics/linux-f10-tiff/pkg-plist.alpha
index 0d68d4bfe036..ccb4b78f1624 100644
--- a/graphics/linux-f10-tiff/pkg-plist.alpha
+++ b/graphics/linux-f10-tiff/pkg-plist.alpha
@@ -8,6 +8,7 @@ usr/bin/rgb2ycbcr
usr/bin/thumbnail
usr/bin/tiff2bw
usr/bin/tiff2ps
+usr/bin/tiff2rgba
usr/bin/tiffcmp
usr/bin/tiffcp
usr/bin/tiffdither
@@ -15,5 +16,30 @@ usr/bin/tiffdump
usr/bin/tiffinfo
usr/bin/tiffmedian
usr/bin/tiffsplit
-usr/lib/libtiff.so.3
-usr/lib/libtiff.so.3.4
+usr/lib/libtiff.so.3.5
+usr/share/doc/libtiff-3.5.5/COPYRIGHT
+usr/share/doc/libtiff-3.5.5/README
+usr/share/doc/libtiff-3.5.5/VERSION
+usr/share/man/man1/fax2ps.1.gz
+usr/share/man/man1/fax2tiff.1.gz
+usr/share/man/man1/gif2tiff.1.gz
+usr/share/man/man1/pal2rgb.1.gz
+usr/share/man/man1/ppm2tiff.1.gz
+usr/share/man/man1/ras2tiff.1.gz
+usr/share/man/man1/rgb2ycbcr.1.gz
+usr/share/man/man1/sgi2tiff.1.gz
+usr/share/man/man1/thumbnail.1.gz
+usr/share/man/man1/tiff2bw.1.gz
+usr/share/man/man1/tiff2ps.1.gz
+usr/share/man/man1/tiffcmp.1.gz
+usr/share/man/man1/tiffcp.1.gz
+usr/share/man/man1/tiffdither.1.gz
+usr/share/man/man1/tiffdump.1.gz
+usr/share/man/man1/tiffgt.1.gz
+usr/share/man/man1/tiffinfo.1.gz
+usr/share/man/man1/tiffmedian.1.gz
+usr/share/man/man1/tiffsplit.1.gz
+usr/share/man/man1/tiffsv.1.gz
+@dirrm usr/share/doc/libtiff-3.5.5
+@exec ln -sf %D/usr/lib/libtiff.so.3.5 %D/usr/lib/libtiff.so.3
+@unexec rm -f %D/usr/lib/libtiff.so.3
diff --git a/graphics/linux-f10-tiff/pkg-plist.i386 b/graphics/linux-f10-tiff/pkg-plist.i386
index 0d68d4bfe036..ccb4b78f1624 100644
--- a/graphics/linux-f10-tiff/pkg-plist.i386
+++ b/graphics/linux-f10-tiff/pkg-plist.i386
@@ -8,6 +8,7 @@ usr/bin/rgb2ycbcr
usr/bin/thumbnail
usr/bin/tiff2bw
usr/bin/tiff2ps
+usr/bin/tiff2rgba
usr/bin/tiffcmp
usr/bin/tiffcp
usr/bin/tiffdither
@@ -15,5 +16,30 @@ usr/bin/tiffdump
usr/bin/tiffinfo
usr/bin/tiffmedian
usr/bin/tiffsplit
-usr/lib/libtiff.so.3
-usr/lib/libtiff.so.3.4
+usr/lib/libtiff.so.3.5
+usr/share/doc/libtiff-3.5.5/COPYRIGHT
+usr/share/doc/libtiff-3.5.5/README
+usr/share/doc/libtiff-3.5.5/VERSION
+usr/share/man/man1/fax2ps.1.gz
+usr/share/man/man1/fax2tiff.1.gz
+usr/share/man/man1/gif2tiff.1.gz
+usr/share/man/man1/pal2rgb.1.gz
+usr/share/man/man1/ppm2tiff.1.gz
+usr/share/man/man1/ras2tiff.1.gz
+usr/share/man/man1/rgb2ycbcr.1.gz
+usr/share/man/man1/sgi2tiff.1.gz
+usr/share/man/man1/thumbnail.1.gz
+usr/share/man/man1/tiff2bw.1.gz
+usr/share/man/man1/tiff2ps.1.gz
+usr/share/man/man1/tiffcmp.1.gz
+usr/share/man/man1/tiffcp.1.gz
+usr/share/man/man1/tiffdither.1.gz
+usr/share/man/man1/tiffdump.1.gz
+usr/share/man/man1/tiffgt.1.gz
+usr/share/man/man1/tiffinfo.1.gz
+usr/share/man/man1/tiffmedian.1.gz
+usr/share/man/man1/tiffsplit.1.gz
+usr/share/man/man1/tiffsv.1.gz
+@dirrm usr/share/doc/libtiff-3.5.5
+@exec ln -sf %D/usr/lib/libtiff.so.3.5 %D/usr/lib/libtiff.so.3
+@unexec rm -f %D/usr/lib/libtiff.so.3
diff --git a/graphics/linux-f8-imlib/Makefile b/graphics/linux-f8-imlib/Makefile
index 78f7beaccf31..ed665fb95db6 100644
--- a/graphics/linux-f8-imlib/Makefile
+++ b/graphics/linux-f8-imlib/Makefile
@@ -6,16 +6,11 @@
#
PORTNAME= imlib
-PORTVERSION= 1.9.7
+PORTVERSION= 1.9.8.1
CATEGORIES= graphics linux
-.if (${MACHINE_ARCH} == "i386")
-MASTER_SITES= ftp://ftp.redhat.com/pub/redhat/linux/6.1/en/os/i386/RedHat/RPMS/
-.elif (${MACHINE_ARCH} == "alpha")
-MASTER_SITES= ftp://ftp.redhat.com/pub/redhat/linux/6.1/en/os/alpha/RedHat/RPMS/
-.endif
MAINTAINER= taoka@FreeBSD.org
-RPM_SET= imlib-${PORTVERSION}-1.${MACHINE_ARCH}.rpm
+RPM_SET= imlib-${PORTVERSION}-2.${MACHINE_ARCH}.rpm
.include "../../x11-toolkits/linux-gtk/Makefile"
diff --git a/graphics/linux-f8-imlib/distinfo.alpha b/graphics/linux-f8-imlib/distinfo.alpha
index 05f19eb0ed43..3d507ae614b0 100644
--- a/graphics/linux-f8-imlib/distinfo.alpha
+++ b/graphics/linux-f8-imlib/distinfo.alpha
@@ -1 +1 @@
-MD5 (rpm/imlib-1.9.7-1.alpha.rpm) = 001adb68ca5ab800e605eea3c9360acc
+MD5 (rpm/imlib-1.9.8.1-2.alpha.rpm) = 1e55a013ac2058d1100393ec6e795fa4
diff --git a/graphics/linux-f8-imlib/distinfo.i386 b/graphics/linux-f8-imlib/distinfo.i386
index a1e40449bf74..c4741ffb01d8 100644
--- a/graphics/linux-f8-imlib/distinfo.i386
+++ b/graphics/linux-f8-imlib/distinfo.i386
@@ -1 +1 @@
-MD5 (rpm/imlib-1.9.7-1.i386.rpm) = 79bf35bcf4e8290f79bf435fe7d29d16
+MD5 (rpm/imlib-1.9.8.1-2.i386.rpm) = 64a1a27bc1e276af8aecefa261ab9b3b
diff --git a/graphics/linux-f8-imlib/pkg-plist.alpha b/graphics/linux-f8-imlib/pkg-plist.alpha
index 66c7b3cc8cb8..f19ff0727e49 100644
--- a/graphics/linux-f8-imlib/pkg-plist.alpha
+++ b/graphics/linux-f8-imlib/pkg-plist.alpha
@@ -2,14 +2,8 @@ etc/im_palette-small.pal
etc/im_palette-tiny.pal
etc/im_palette.pal
etc/imrc
-usr/doc/imlib-1.9.7/AUTHORS
-usr/doc/imlib-1.9.7/ChangeLog
-usr/doc/imlib-1.9.7/NEWS
-usr/doc/imlib-1.9.7/README
-usr/lib/libImlib.so.1
-usr/lib/libImlib.so.1.9.7
-usr/lib/libgdk_imlib.so.1
-usr/lib/libgdk_imlib.so.1.9.7
+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
@@ -18,4 +12,10 @@ usr/lib/libimlib-ppm.so
usr/lib/libimlib-ps.so
usr/lib/libimlib-tiff.so
usr/lib/libimlib-xpm.so
-@dirrm usr/doc/imlib-1.9.7
+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 66c7b3cc8cb8..f19ff0727e49 100644
--- a/graphics/linux-f8-imlib/pkg-plist.i386
+++ b/graphics/linux-f8-imlib/pkg-plist.i386
@@ -2,14 +2,8 @@ etc/im_palette-small.pal
etc/im_palette-tiny.pal
etc/im_palette.pal
etc/imrc
-usr/doc/imlib-1.9.7/AUTHORS
-usr/doc/imlib-1.9.7/ChangeLog
-usr/doc/imlib-1.9.7/NEWS
-usr/doc/imlib-1.9.7/README
-usr/lib/libImlib.so.1
-usr/lib/libImlib.so.1.9.7
-usr/lib/libgdk_imlib.so.1
-usr/lib/libgdk_imlib.so.1.9.7
+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
@@ -18,4 +12,10 @@ usr/lib/libimlib-ppm.so
usr/lib/libimlib-ps.so
usr/lib/libimlib-tiff.so
usr/lib/libimlib-xpm.so
-@dirrm usr/doc/imlib-1.9.7
+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-jpeg/Makefile b/graphics/linux-f8-jpeg/Makefile
index 9aa7ae22f62d..71ab949529b9 100644
--- a/graphics/linux-f8-jpeg/Makefile
+++ b/graphics/linux-f8-jpeg/Makefile
@@ -6,9 +6,9 @@
#
PORTNAME= jpeg
-PORTVERSION= 6b.9
+PORTVERSION= 6b.15
CATEGORIES= graphics linux
-RPM_SET= libjpeg-6b-9.${MACHINE_ARCH}.rpm
+RPM_SET= libjpeg-6b-15.${MACHINE_ARCH}.rpm
.include "../../x11-toolkits/linux-gtk/Makefile"
diff --git a/graphics/linux-f8-jpeg/distinfo.alpha b/graphics/linux-f8-jpeg/distinfo.alpha
index f6d00787b738..b3bdf202b77d 100644
--- a/graphics/linux-f8-jpeg/distinfo.alpha
+++ b/graphics/linux-f8-jpeg/distinfo.alpha
@@ -1 +1 @@
-MD5 (rpm/libjpeg-6b-9.alpha.rpm) = a1d1352eb4893af265a53283133818c5
+MD5 (rpm/libjpeg-6b-15.alpha.rpm) = 01eb4e440c40cd077037f5773001cd1f
diff --git a/graphics/linux-f8-jpeg/distinfo.i386 b/graphics/linux-f8-jpeg/distinfo.i386
index a882423dc85c..1f649a0955d4 100644
--- a/graphics/linux-f8-jpeg/distinfo.i386
+++ b/graphics/linux-f8-jpeg/distinfo.i386
@@ -1 +1 @@
-MD5 (rpm/libjpeg-6b-9.i386.rpm) = 453feddfadcdb1b96c2a3bb843e3ec80
+MD5 (rpm/libjpeg-6b-15.i386.rpm) = d35d32f13a16a33d30aca2a0669c2075
diff --git a/graphics/linux-f8-jpeg/pkg-plist.alpha b/graphics/linux-f8-jpeg/pkg-plist.alpha
index bbbd2df62ff1..b8922dd02b57 100644
--- a/graphics/linux-f8-jpeg/pkg-plist.alpha
+++ b/graphics/linux-f8-jpeg/pkg-plist.alpha
@@ -4,9 +4,12 @@ usr/bin/jpegtran
usr/bin/rdjpgcom
usr/bin/wrjpgcom
usr/lib/libjpeg.so.62.0.0
-usr/man/man1/cjpeg.1
-usr/man/man1/djpeg.1
-usr/man/man1/jpegtran.1
-usr/man/man1/rdjpgcom.1
-usr/man/man1/wrjpgcom.1
-usr/lib/libjpeg.so.62
+usr/share/doc/libjpeg-6b/usage.doc
+usr/share/man/man1/cjpeg.1.gz
+usr/share/man/man1/djpeg.1.gz
+usr/share/man/man1/jpegtran.1.gz
+usr/share/man/man1/rdjpgcom.1.gz
+usr/share/man/man1/wrjpgcom.1.gz
+@exec ln -sf %D/usr/lib/libjpeg.so.62.0.0 %D/usr/lib/libjpeg.so.62
+@unexec rm -f %D/usr/lib/libjpeg.so.62
+@dirrm usr/share/doc/libjpeg-6b
diff --git a/graphics/linux-f8-jpeg/pkg-plist.i386 b/graphics/linux-f8-jpeg/pkg-plist.i386
index bbbd2df62ff1..b8922dd02b57 100644
--- a/graphics/linux-f8-jpeg/pkg-plist.i386
+++ b/graphics/linux-f8-jpeg/pkg-plist.i386
@@ -4,9 +4,12 @@ usr/bin/jpegtran
usr/bin/rdjpgcom
usr/bin/wrjpgcom
usr/lib/libjpeg.so.62.0.0
-usr/man/man1/cjpeg.1
-usr/man/man1/djpeg.1
-usr/man/man1/jpegtran.1
-usr/man/man1/rdjpgcom.1
-usr/man/man1/wrjpgcom.1
-usr/lib/libjpeg.so.62
+usr/share/doc/libjpeg-6b/usage.doc
+usr/share/man/man1/cjpeg.1.gz
+usr/share/man/man1/djpeg.1.gz
+usr/share/man/man1/jpegtran.1.gz
+usr/share/man/man1/rdjpgcom.1.gz
+usr/share/man/man1/wrjpgcom.1.gz
+@exec ln -sf %D/usr/lib/libjpeg.so.62.0.0 %D/usr/lib/libjpeg.so.62
+@unexec rm -f %D/usr/lib/libjpeg.so.62
+@dirrm usr/share/doc/libjpeg-6b
diff --git a/graphics/linux-f8-png/Makefile b/graphics/linux-f8-png/Makefile
index e444c6d6df36..43acc300abd3 100644
--- a/graphics/linux-f8-png/Makefile
+++ b/graphics/linux-f8-png/Makefile
@@ -6,9 +6,9 @@
#
PORTNAME= png
-PORTVERSION= 1.0.3
+PORTVERSION= 1.0.9
CATEGORIES= graphics linux
-RPM_SET= libpng-${PORTVERSION}-4.${MACHINE_ARCH}.rpm
+RPM_SET= libpng-${PORTVERSION}-1.${MACHINE_ARCH}.rpm
.include "../../x11-toolkits/linux-gtk/Makefile"
diff --git a/graphics/linux-f8-png/distinfo.alpha b/graphics/linux-f8-png/distinfo.alpha
index d4d45c295971..8bacec00445f 100644
--- a/graphics/linux-f8-png/distinfo.alpha
+++ b/graphics/linux-f8-png/distinfo.alpha
@@ -1 +1 @@
-MD5 (rpm/libpng-1.0.3-4.alpha.rpm) = 2a62f2e8346b1b7b690b688758fb7ee0
+MD5 (rpm/libpng-1.0.9-1.alpha.rpm) = dd0e44f332ae5cb7536c54a4a28cb7ae
diff --git a/graphics/linux-f8-png/distinfo.i386 b/graphics/linux-f8-png/distinfo.i386
index c9ea29a34430..dd71716e9590 100644
--- a/graphics/linux-f8-png/distinfo.i386
+++ b/graphics/linux-f8-png/distinfo.i386
@@ -1 +1 @@
-MD5 (rpm/libpng-1.0.3-4.i386.rpm) = 97a6022e9fb046372da34eeb413ddecc
+MD5 (rpm/libpng-1.0.9-1.i386.rpm) = d903894da8b628030a8feef3d6898412
diff --git a/graphics/linux-f8-png/pkg-plist.alpha b/graphics/linux-f8-png/pkg-plist.alpha
index 825d1d3e47e1..024bfb34e766 100644
--- a/graphics/linux-f8-png/pkg-plist.alpha
+++ b/graphics/linux-f8-png/pkg-plist.alpha
@@ -1,9 +1,10 @@
-usr/doc/libpng-1.0.3/CHANGES
-usr/doc/libpng-1.0.3/README
-usr/doc/libpng-1.0.3/TODO
-usr/doc/libpng-1.0.3/example.c
-usr/doc/libpng-1.0.3/libpng.txt
-@dirrm usr/doc/libpng-1.0.3
-usr/lib/libpng.so.2.1.0.3
-usr/lib/libpng.so.2
-usr/man/man5/png.5
+usr/lib/libpng.so.2.1.0.9
+@exec ln -sf %D/usr/lib/libpng.so.2.1.0.9 %D/usr/lib/libpng.so.2
+@unexec rm -f %D/usr/lib/libpng.so.2
+usr/share/doc/libpng-1.0.9/CHANGES
+usr/share/doc/libpng-1.0.9/README
+usr/share/doc/libpng-1.0.9/TODO
+usr/share/doc/libpng-1.0.9/example.c
+usr/share/doc/libpng-1.0.9/libpng.txt
+usr/share/man/man5/png.5.gz
+@dirrm usr/share/doc/libpng-1.0.9
diff --git a/graphics/linux-f8-png/pkg-plist.i386 b/graphics/linux-f8-png/pkg-plist.i386
index 825d1d3e47e1..024bfb34e766 100644
--- a/graphics/linux-f8-png/pkg-plist.i386
+++ b/graphics/linux-f8-png/pkg-plist.i386
@@ -1,9 +1,10 @@
-usr/doc/libpng-1.0.3/CHANGES
-usr/doc/libpng-1.0.3/README
-usr/doc/libpng-1.0.3/TODO
-usr/doc/libpng-1.0.3/example.c
-usr/doc/libpng-1.0.3/libpng.txt
-@dirrm usr/doc/libpng-1.0.3
-usr/lib/libpng.so.2.1.0.3
-usr/lib/libpng.so.2
-usr/man/man5/png.5
+usr/lib/libpng.so.2.1.0.9
+@exec ln -sf %D/usr/lib/libpng.so.2.1.0.9 %D/usr/lib/libpng.so.2
+@unexec rm -f %D/usr/lib/libpng.so.2
+usr/share/doc/libpng-1.0.9/CHANGES
+usr/share/doc/libpng-1.0.9/README
+usr/share/doc/libpng-1.0.9/TODO
+usr/share/doc/libpng-1.0.9/example.c
+usr/share/doc/libpng-1.0.9/libpng.txt
+usr/share/man/man5/png.5.gz
+@dirrm usr/share/doc/libpng-1.0.9
diff --git a/graphics/linux-f8-png10/Makefile b/graphics/linux-f8-png10/Makefile
index e444c6d6df36..43acc300abd3 100644
--- a/graphics/linux-f8-png10/Makefile
+++ b/graphics/linux-f8-png10/Makefile
@@ -6,9 +6,9 @@
#
PORTNAME= png
-PORTVERSION= 1.0.3
+PORTVERSION= 1.0.9
CATEGORIES= graphics linux
-RPM_SET= libpng-${PORTVERSION}-4.${MACHINE_ARCH}.rpm
+RPM_SET= libpng-${PORTVERSION}-1.${MACHINE_ARCH}.rpm
.include "../../x11-toolkits/linux-gtk/Makefile"
diff --git a/graphics/linux-f8-png10/distinfo.alpha b/graphics/linux-f8-png10/distinfo.alpha
index d4d45c295971..8bacec00445f 100644
--- a/graphics/linux-f8-png10/distinfo.alpha
+++ b/graphics/linux-f8-png10/distinfo.alpha
@@ -1 +1 @@
-MD5 (rpm/libpng-1.0.3-4.alpha.rpm) = 2a62f2e8346b1b7b690b688758fb7ee0
+MD5 (rpm/libpng-1.0.9-1.alpha.rpm) = dd0e44f332ae5cb7536c54a4a28cb7ae
diff --git a/graphics/linux-f8-png10/distinfo.i386 b/graphics/linux-f8-png10/distinfo.i386
index c9ea29a34430..dd71716e9590 100644
--- a/graphics/linux-f8-png10/distinfo.i386
+++ b/graphics/linux-f8-png10/distinfo.i386
@@ -1 +1 @@
-MD5 (rpm/libpng-1.0.3-4.i386.rpm) = 97a6022e9fb046372da34eeb413ddecc
+MD5 (rpm/libpng-1.0.9-1.i386.rpm) = d903894da8b628030a8feef3d6898412
diff --git a/graphics/linux-f8-png10/pkg-plist.alpha b/graphics/linux-f8-png10/pkg-plist.alpha
index 825d1d3e47e1..024bfb34e766 100644
--- a/graphics/linux-f8-png10/pkg-plist.alpha
+++ b/graphics/linux-f8-png10/pkg-plist.alpha
@@ -1,9 +1,10 @@
-usr/doc/libpng-1.0.3/CHANGES
-usr/doc/libpng-1.0.3/README
-usr/doc/libpng-1.0.3/TODO
-usr/doc/libpng-1.0.3/example.c
-usr/doc/libpng-1.0.3/libpng.txt
-@dirrm usr/doc/libpng-1.0.3
-usr/lib/libpng.so.2.1.0.3
-usr/lib/libpng.so.2
-usr/man/man5/png.5
+usr/lib/libpng.so.2.1.0.9
+@exec ln -sf %D/usr/lib/libpng.so.2.1.0.9 %D/usr/lib/libpng.so.2
+@unexec rm -f %D/usr/lib/libpng.so.2
+usr/share/doc/libpng-1.0.9/CHANGES
+usr/share/doc/libpng-1.0.9/README
+usr/share/doc/libpng-1.0.9/TODO
+usr/share/doc/libpng-1.0.9/example.c
+usr/share/doc/libpng-1.0.9/libpng.txt
+usr/share/man/man5/png.5.gz
+@dirrm usr/share/doc/libpng-1.0.9
diff --git a/graphics/linux-f8-png10/pkg-plist.i386 b/graphics/linux-f8-png10/pkg-plist.i386
index 825d1d3e47e1..024bfb34e766 100644
--- a/graphics/linux-f8-png10/pkg-plist.i386
+++ b/graphics/linux-f8-png10/pkg-plist.i386
@@ -1,9 +1,10 @@
-usr/doc/libpng-1.0.3/CHANGES
-usr/doc/libpng-1.0.3/README
-usr/doc/libpng-1.0.3/TODO
-usr/doc/libpng-1.0.3/example.c
-usr/doc/libpng-1.0.3/libpng.txt
-@dirrm usr/doc/libpng-1.0.3
-usr/lib/libpng.so.2.1.0.3
-usr/lib/libpng.so.2
-usr/man/man5/png.5
+usr/lib/libpng.so.2.1.0.9
+@exec ln -sf %D/usr/lib/libpng.so.2.1.0.9 %D/usr/lib/libpng.so.2
+@unexec rm -f %D/usr/lib/libpng.so.2
+usr/share/doc/libpng-1.0.9/CHANGES
+usr/share/doc/libpng-1.0.9/README
+usr/share/doc/libpng-1.0.9/TODO
+usr/share/doc/libpng-1.0.9/example.c
+usr/share/doc/libpng-1.0.9/libpng.txt
+usr/share/man/man5/png.5.gz
+@dirrm usr/share/doc/libpng-1.0.9
diff --git a/graphics/linux-f8-tiff/Makefile b/graphics/linux-f8-tiff/Makefile
index 2c8faef3c798..a05c45a87234 100644
--- a/graphics/linux-f8-tiff/Makefile
+++ b/graphics/linux-f8-tiff/Makefile
@@ -6,11 +6,11 @@
#
PORTNAME= tiff
-PORTVERSION= 3.4
+PORTVERSION= 3.5.5
CATEGORIES= graphics linux
MAINTAINER= taoka@FreeBSD.org
-RPM_SET= libtiff-${PORTVERSION}-6.${MACHINE_ARCH}.rpm
+RPM_SET= libtiff-${PORTVERSION}-10.${MACHINE_ARCH}.rpm
.include "../../x11-toolkits/linux-gtk/Makefile"
diff --git a/graphics/linux-f8-tiff/distinfo.alpha b/graphics/linux-f8-tiff/distinfo.alpha
index 24e126d457bf..e7c0fc45d737 100644
--- a/graphics/linux-f8-tiff/distinfo.alpha
+++ b/graphics/linux-f8-tiff/distinfo.alpha
@@ -1 +1 @@
-MD5 (rpm/libtiff-3.4-6.alpha.rpm) = 16d52cb02b81b873bc80cf498d36682a
+MD5 (rpm/libtiff-3.5.5-10.alpha.rpm) = 51aaf90d967a63978f6e9a4e5c35b033
diff --git a/graphics/linux-f8-tiff/distinfo.i386 b/graphics/linux-f8-tiff/distinfo.i386
index d2d3d3c1c0bd..320116f0a7b4 100644
--- a/graphics/linux-f8-tiff/distinfo.i386
+++ b/graphics/linux-f8-tiff/distinfo.i386
@@ -1 +1 @@
-MD5 (rpm/libtiff-3.4-6.i386.rpm) = 5cd8da37f583200fe4f1af0c3028da6d
+MD5 (rpm/libtiff-3.5.5-10.i386.rpm) = 3cba6c6c4d96a9e3bf7a3345ecf535f5
diff --git a/graphics/linux-f8-tiff/pkg-plist.alpha b/graphics/linux-f8-tiff/pkg-plist.alpha
index 0d68d4bfe036..ccb4b78f1624 100644
--- a/graphics/linux-f8-tiff/pkg-plist.alpha
+++ b/graphics/linux-f8-tiff/pkg-plist.alpha
@@ -8,6 +8,7 @@ usr/bin/rgb2ycbcr
usr/bin/thumbnail
usr/bin/tiff2bw
usr/bin/tiff2ps
+usr/bin/tiff2rgba
usr/bin/tiffcmp
usr/bin/tiffcp
usr/bin/tiffdither
@@ -15,5 +16,30 @@ usr/bin/tiffdump
usr/bin/tiffinfo
usr/bin/tiffmedian
usr/bin/tiffsplit
-usr/lib/libtiff.so.3
-usr/lib/libtiff.so.3.4
+usr/lib/libtiff.so.3.5
+usr/share/doc/libtiff-3.5.5/COPYRIGHT
+usr/share/doc/libtiff-3.5.5/README
+usr/share/doc/libtiff-3.5.5/VERSION
+usr/share/man/man1/fax2ps.1.gz
+usr/share/man/man1/fax2tiff.1.gz
+usr/share/man/man1/gif2tiff.1.gz
+usr/share/man/man1/pal2rgb.1.gz
+usr/share/man/man1/ppm2tiff.1.gz
+usr/share/man/man1/ras2tiff.1.gz
+usr/share/man/man1/rgb2ycbcr.1.gz
+usr/share/man/man1/sgi2tiff.1.gz
+usr/share/man/man1/thumbnail.1.gz
+usr/share/man/man1/tiff2bw.1.gz
+usr/share/man/man1/tiff2ps.1.gz
+usr/share/man/man1/tiffcmp.1.gz
+usr/share/man/man1/tiffcp.1.gz
+usr/share/man/man1/tiffdither.1.gz
+usr/share/man/man1/tiffdump.1.gz
+usr/share/man/man1/tiffgt.1.gz
+usr/share/man/man1/tiffinfo.1.gz
+usr/share/man/man1/tiffmedian.1.gz
+usr/share/man/man1/tiffsplit.1.gz
+usr/share/man/man1/tiffsv.1.gz
+@dirrm usr/share/doc/libtiff-3.5.5
+@exec ln -sf %D/usr/lib/libtiff.so.3.5 %D/usr/lib/libtiff.so.3
+@unexec rm -f %D/usr/lib/libtiff.so.3
diff --git a/graphics/linux-f8-tiff/pkg-plist.i386 b/graphics/linux-f8-tiff/pkg-plist.i386
index 0d68d4bfe036..ccb4b78f1624 100644
--- a/graphics/linux-f8-tiff/pkg-plist.i386
+++ b/graphics/linux-f8-tiff/pkg-plist.i386
@@ -8,6 +8,7 @@ usr/bin/rgb2ycbcr
usr/bin/thumbnail
usr/bin/tiff2bw
usr/bin/tiff2ps
+usr/bin/tiff2rgba
usr/bin/tiffcmp
usr/bin/tiffcp
usr/bin/tiffdither
@@ -15,5 +16,30 @@ usr/bin/tiffdump
usr/bin/tiffinfo
usr/bin/tiffmedian
usr/bin/tiffsplit
-usr/lib/libtiff.so.3
-usr/lib/libtiff.so.3.4
+usr/lib/libtiff.so.3.5
+usr/share/doc/libtiff-3.5.5/COPYRIGHT
+usr/share/doc/libtiff-3.5.5/README
+usr/share/doc/libtiff-3.5.5/VERSION
+usr/share/man/man1/fax2ps.1.gz
+usr/share/man/man1/fax2tiff.1.gz
+usr/share/man/man1/gif2tiff.1.gz
+usr/share/man/man1/pal2rgb.1.gz
+usr/share/man/man1/ppm2tiff.1.gz
+usr/share/man/man1/ras2tiff.1.gz
+usr/share/man/man1/rgb2ycbcr.1.gz
+usr/share/man/man1/sgi2tiff.1.gz
+usr/share/man/man1/thumbnail.1.gz
+usr/share/man/man1/tiff2bw.1.gz
+usr/share/man/man1/tiff2ps.1.gz
+usr/share/man/man1/tiffcmp.1.gz
+usr/share/man/man1/tiffcp.1.gz
+usr/share/man/man1/tiffdither.1.gz
+usr/share/man/man1/tiffdump.1.gz
+usr/share/man/man1/tiffgt.1.gz
+usr/share/man/man1/tiffinfo.1.gz
+usr/share/man/man1/tiffmedian.1.gz
+usr/share/man/man1/tiffsplit.1.gz
+usr/share/man/man1/tiffsv.1.gz
+@dirrm usr/share/doc/libtiff-3.5.5
+@exec ln -sf %D/usr/lib/libtiff.so.3.5 %D/usr/lib/libtiff.so.3
+@unexec rm -f %D/usr/lib/libtiff.so.3
diff --git a/graphics/linux-imlib/Makefile b/graphics/linux-imlib/Makefile
index 78f7beaccf31..ed665fb95db6 100644
--- a/graphics/linux-imlib/Makefile
+++ b/graphics/linux-imlib/Makefile
@@ -6,16 +6,11 @@
#
PORTNAME= imlib
-PORTVERSION= 1.9.7
+PORTVERSION= 1.9.8.1
CATEGORIES= graphics linux
-.if (${MACHINE_ARCH} == "i386")
-MASTER_SITES= ftp://ftp.redhat.com/pub/redhat/linux/6.1/en/os/i386/RedHat/RPMS/
-.elif (${MACHINE_ARCH} == "alpha")
-MASTER_SITES= ftp://ftp.redhat.com/pub/redhat/linux/6.1/en/os/alpha/RedHat/RPMS/
-.endif
MAINTAINER= taoka@FreeBSD.org
-RPM_SET= imlib-${PORTVERSION}-1.${MACHINE_ARCH}.rpm
+RPM_SET= imlib-${PORTVERSION}-2.${MACHINE_ARCH}.rpm
.include "../../x11-toolkits/linux-gtk/Makefile"
diff --git a/graphics/linux-imlib/distinfo.alpha b/graphics/linux-imlib/distinfo.alpha
index 05f19eb0ed43..3d507ae614b0 100644
--- a/graphics/linux-imlib/distinfo.alpha
+++ b/graphics/linux-imlib/distinfo.alpha
@@ -1 +1 @@
-MD5 (rpm/imlib-1.9.7-1.alpha.rpm) = 001adb68ca5ab800e605eea3c9360acc
+MD5 (rpm/imlib-1.9.8.1-2.alpha.rpm) = 1e55a013ac2058d1100393ec6e795fa4
diff --git a/graphics/linux-imlib/distinfo.i386 b/graphics/linux-imlib/distinfo.i386
index a1e40449bf74..c4741ffb01d8 100644
--- a/graphics/linux-imlib/distinfo.i386
+++ b/graphics/linux-imlib/distinfo.i386
@@ -1 +1 @@
-MD5 (rpm/imlib-1.9.7-1.i386.rpm) = 79bf35bcf4e8290f79bf435fe7d29d16
+MD5 (rpm/imlib-1.9.8.1-2.i386.rpm) = 64a1a27bc1e276af8aecefa261ab9b3b
diff --git a/graphics/linux-imlib/pkg-plist.alpha b/graphics/linux-imlib/pkg-plist.alpha
index 66c7b3cc8cb8..f19ff0727e49 100644
--- a/graphics/linux-imlib/pkg-plist.alpha
+++ b/graphics/linux-imlib/pkg-plist.alpha
@@ -2,14 +2,8 @@ etc/im_palette-small.pal
etc/im_palette-tiny.pal
etc/im_palette.pal
etc/imrc
-usr/doc/imlib-1.9.7/AUTHORS
-usr/doc/imlib-1.9.7/ChangeLog
-usr/doc/imlib-1.9.7/NEWS
-usr/doc/imlib-1.9.7/README
-usr/lib/libImlib.so.1
-usr/lib/libImlib.so.1.9.7
-usr/lib/libgdk_imlib.so.1
-usr/lib/libgdk_imlib.so.1.9.7
+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
@@ -18,4 +12,10 @@ usr/lib/libimlib-ppm.so
usr/lib/libimlib-ps.so
usr/lib/libimlib-tiff.so
usr/lib/libimlib-xpm.so
-@dirrm usr/doc/imlib-1.9.7
+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 66c7b3cc8cb8..f19ff0727e49 100644
--- a/graphics/linux-imlib/pkg-plist.i386
+++ b/graphics/linux-imlib/pkg-plist.i386
@@ -2,14 +2,8 @@ etc/im_palette-small.pal
etc/im_palette-tiny.pal
etc/im_palette.pal
etc/imrc
-usr/doc/imlib-1.9.7/AUTHORS
-usr/doc/imlib-1.9.7/ChangeLog
-usr/doc/imlib-1.9.7/NEWS
-usr/doc/imlib-1.9.7/README
-usr/lib/libImlib.so.1
-usr/lib/libImlib.so.1.9.7
-usr/lib/libgdk_imlib.so.1
-usr/lib/libgdk_imlib.so.1.9.7
+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
@@ -18,4 +12,10 @@ usr/lib/libimlib-ppm.so
usr/lib/libimlib-ps.so
usr/lib/libimlib-tiff.so
usr/lib/libimlib-xpm.so
-@dirrm usr/doc/imlib-1.9.7
+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-jpeg/Makefile b/graphics/linux-jpeg/Makefile
index 9aa7ae22f62d..71ab949529b9 100644
--- a/graphics/linux-jpeg/Makefile
+++ b/graphics/linux-jpeg/Makefile
@@ -6,9 +6,9 @@
#
PORTNAME= jpeg
-PORTVERSION= 6b.9
+PORTVERSION= 6b.15
CATEGORIES= graphics linux
-RPM_SET= libjpeg-6b-9.${MACHINE_ARCH}.rpm
+RPM_SET= libjpeg-6b-15.${MACHINE_ARCH}.rpm
.include "../../x11-toolkits/linux-gtk/Makefile"
diff --git a/graphics/linux-jpeg/distinfo.alpha b/graphics/linux-jpeg/distinfo.alpha
index f6d00787b738..b3bdf202b77d 100644
--- a/graphics/linux-jpeg/distinfo.alpha
+++ b/graphics/linux-jpeg/distinfo.alpha
@@ -1 +1 @@
-MD5 (rpm/libjpeg-6b-9.alpha.rpm) = a1d1352eb4893af265a53283133818c5
+MD5 (rpm/libjpeg-6b-15.alpha.rpm) = 01eb4e440c40cd077037f5773001cd1f
diff --git a/graphics/linux-jpeg/distinfo.i386 b/graphics/linux-jpeg/distinfo.i386
index a882423dc85c..1f649a0955d4 100644
--- a/graphics/linux-jpeg/distinfo.i386
+++ b/graphics/linux-jpeg/distinfo.i386
@@ -1 +1 @@
-MD5 (rpm/libjpeg-6b-9.i386.rpm) = 453feddfadcdb1b96c2a3bb843e3ec80
+MD5 (rpm/libjpeg-6b-15.i386.rpm) = d35d32f13a16a33d30aca2a0669c2075
diff --git a/graphics/linux-jpeg/pkg-plist.alpha b/graphics/linux-jpeg/pkg-plist.alpha
index bbbd2df62ff1..b8922dd02b57 100644
--- a/graphics/linux-jpeg/pkg-plist.alpha
+++ b/graphics/linux-jpeg/pkg-plist.alpha
@@ -4,9 +4,12 @@ usr/bin/jpegtran
usr/bin/rdjpgcom
usr/bin/wrjpgcom
usr/lib/libjpeg.so.62.0.0
-usr/man/man1/cjpeg.1
-usr/man/man1/djpeg.1
-usr/man/man1/jpegtran.1
-usr/man/man1/rdjpgcom.1
-usr/man/man1/wrjpgcom.1
-usr/lib/libjpeg.so.62
+usr/share/doc/libjpeg-6b/usage.doc
+usr/share/man/man1/cjpeg.1.gz
+usr/share/man/man1/djpeg.1.gz
+usr/share/man/man1/jpegtran.1.gz
+usr/share/man/man1/rdjpgcom.1.gz
+usr/share/man/man1/wrjpgcom.1.gz
+@exec ln -sf %D/usr/lib/libjpeg.so.62.0.0 %D/usr/lib/libjpeg.so.62
+@unexec rm -f %D/usr/lib/libjpeg.so.62
+@dirrm usr/share/doc/libjpeg-6b
diff --git a/graphics/linux-jpeg/pkg-plist.i386 b/graphics/linux-jpeg/pkg-plist.i386
index bbbd2df62ff1..b8922dd02b57 100644
--- a/graphics/linux-jpeg/pkg-plist.i386
+++ b/graphics/linux-jpeg/pkg-plist.i386
@@ -4,9 +4,12 @@ usr/bin/jpegtran
usr/bin/rdjpgcom
usr/bin/wrjpgcom
usr/lib/libjpeg.so.62.0.0
-usr/man/man1/cjpeg.1
-usr/man/man1/djpeg.1
-usr/man/man1/jpegtran.1
-usr/man/man1/rdjpgcom.1
-usr/man/man1/wrjpgcom.1
-usr/lib/libjpeg.so.62
+usr/share/doc/libjpeg-6b/usage.doc
+usr/share/man/man1/cjpeg.1.gz
+usr/share/man/man1/djpeg.1.gz
+usr/share/man/man1/jpegtran.1.gz
+usr/share/man/man1/rdjpgcom.1.gz
+usr/share/man/man1/wrjpgcom.1.gz
+@exec ln -sf %D/usr/lib/libjpeg.so.62.0.0 %D/usr/lib/libjpeg.so.62
+@unexec rm -f %D/usr/lib/libjpeg.so.62
+@dirrm usr/share/doc/libjpeg-6b
diff --git a/graphics/linux-png/Makefile b/graphics/linux-png/Makefile
index e444c6d6df36..43acc300abd3 100644
--- a/graphics/linux-png/Makefile
+++ b/graphics/linux-png/Makefile
@@ -6,9 +6,9 @@
#
PORTNAME= png
-PORTVERSION= 1.0.3
+PORTVERSION= 1.0.9
CATEGORIES= graphics linux
-RPM_SET= libpng-${PORTVERSION}-4.${MACHINE_ARCH}.rpm
+RPM_SET= libpng-${PORTVERSION}-1.${MACHINE_ARCH}.rpm
.include "../../x11-toolkits/linux-gtk/Makefile"
diff --git a/graphics/linux-png/distinfo.alpha b/graphics/linux-png/distinfo.alpha
index d4d45c295971..8bacec00445f 100644
--- a/graphics/linux-png/distinfo.alpha
+++ b/graphics/linux-png/distinfo.alpha
@@ -1 +1 @@
-MD5 (rpm/libpng-1.0.3-4.alpha.rpm) = 2a62f2e8346b1b7b690b688758fb7ee0
+MD5 (rpm/libpng-1.0.9-1.alpha.rpm) = dd0e44f332ae5cb7536c54a4a28cb7ae
diff --git a/graphics/linux-png/distinfo.i386 b/graphics/linux-png/distinfo.i386
index c9ea29a34430..dd71716e9590 100644
--- a/graphics/linux-png/distinfo.i386
+++ b/graphics/linux-png/distinfo.i386
@@ -1 +1 @@
-MD5 (rpm/libpng-1.0.3-4.i386.rpm) = 97a6022e9fb046372da34eeb413ddecc
+MD5 (rpm/libpng-1.0.9-1.i386.rpm) = d903894da8b628030a8feef3d6898412
diff --git a/graphics/linux-png/pkg-plist.alpha b/graphics/linux-png/pkg-plist.alpha
index 825d1d3e47e1..024bfb34e766 100644
--- a/graphics/linux-png/pkg-plist.alpha
+++ b/graphics/linux-png/pkg-plist.alpha
@@ -1,9 +1,10 @@
-usr/doc/libpng-1.0.3/CHANGES
-usr/doc/libpng-1.0.3/README
-usr/doc/libpng-1.0.3/TODO
-usr/doc/libpng-1.0.3/example.c
-usr/doc/libpng-1.0.3/libpng.txt
-@dirrm usr/doc/libpng-1.0.3
-usr/lib/libpng.so.2.1.0.3
-usr/lib/libpng.so.2
-usr/man/man5/png.5
+usr/lib/libpng.so.2.1.0.9
+@exec ln -sf %D/usr/lib/libpng.so.2.1.0.9 %D/usr/lib/libpng.so.2
+@unexec rm -f %D/usr/lib/libpng.so.2
+usr/share/doc/libpng-1.0.9/CHANGES
+usr/share/doc/libpng-1.0.9/README
+usr/share/doc/libpng-1.0.9/TODO
+usr/share/doc/libpng-1.0.9/example.c
+usr/share/doc/libpng-1.0.9/libpng.txt
+usr/share/man/man5/png.5.gz
+@dirrm usr/share/doc/libpng-1.0.9
diff --git a/graphics/linux-png/pkg-plist.i386 b/graphics/linux-png/pkg-plist.i386
index 825d1d3e47e1..024bfb34e766 100644
--- a/graphics/linux-png/pkg-plist.i386
+++ b/graphics/linux-png/pkg-plist.i386
@@ -1,9 +1,10 @@
-usr/doc/libpng-1.0.3/CHANGES
-usr/doc/libpng-1.0.3/README
-usr/doc/libpng-1.0.3/TODO
-usr/doc/libpng-1.0.3/example.c
-usr/doc/libpng-1.0.3/libpng.txt
-@dirrm usr/doc/libpng-1.0.3
-usr/lib/libpng.so.2.1.0.3
-usr/lib/libpng.so.2
-usr/man/man5/png.5
+usr/lib/libpng.so.2.1.0.9
+@exec ln -sf %D/usr/lib/libpng.so.2.1.0.9 %D/usr/lib/libpng.so.2
+@unexec rm -f %D/usr/lib/libpng.so.2
+usr/share/doc/libpng-1.0.9/CHANGES
+usr/share/doc/libpng-1.0.9/README
+usr/share/doc/libpng-1.0.9/TODO
+usr/share/doc/libpng-1.0.9/example.c
+usr/share/doc/libpng-1.0.9/libpng.txt
+usr/share/man/man5/png.5.gz
+@dirrm usr/share/doc/libpng-1.0.9
diff --git a/graphics/linux-png10/Makefile b/graphics/linux-png10/Makefile
index e444c6d6df36..43acc300abd3 100644
--- a/graphics/linux-png10/Makefile
+++ b/graphics/linux-png10/Makefile
@@ -6,9 +6,9 @@
#
PORTNAME= png
-PORTVERSION= 1.0.3
+PORTVERSION= 1.0.9
CATEGORIES= graphics linux
-RPM_SET= libpng-${PORTVERSION}-4.${MACHINE_ARCH}.rpm
+RPM_SET= libpng-${PORTVERSION}-1.${MACHINE_ARCH}.rpm
.include "../../x11-toolkits/linux-gtk/Makefile"
diff --git a/graphics/linux-png10/distinfo.alpha b/graphics/linux-png10/distinfo.alpha
index d4d45c295971..8bacec00445f 100644
--- a/graphics/linux-png10/distinfo.alpha
+++ b/graphics/linux-png10/distinfo.alpha
@@ -1 +1 @@
-MD5 (rpm/libpng-1.0.3-4.alpha.rpm) = 2a62f2e8346b1b7b690b688758fb7ee0
+MD5 (rpm/libpng-1.0.9-1.alpha.rpm) = dd0e44f332ae5cb7536c54a4a28cb7ae
diff --git a/graphics/linux-png10/distinfo.i386 b/graphics/linux-png10/distinfo.i386
index c9ea29a34430..dd71716e9590 100644
--- a/graphics/linux-png10/distinfo.i386
+++ b/graphics/linux-png10/distinfo.i386
@@ -1 +1 @@
-MD5 (rpm/libpng-1.0.3-4.i386.rpm) = 97a6022e9fb046372da34eeb413ddecc
+MD5 (rpm/libpng-1.0.9-1.i386.rpm) = d903894da8b628030a8feef3d6898412
diff --git a/graphics/linux-png10/pkg-plist.alpha b/graphics/linux-png10/pkg-plist.alpha
index 825d1d3e47e1..024bfb34e766 100644
--- a/graphics/linux-png10/pkg-plist.alpha
+++ b/graphics/linux-png10/pkg-plist.alpha
@@ -1,9 +1,10 @@
-usr/doc/libpng-1.0.3/CHANGES
-usr/doc/libpng-1.0.3/README
-usr/doc/libpng-1.0.3/TODO
-usr/doc/libpng-1.0.3/example.c
-usr/doc/libpng-1.0.3/libpng.txt
-@dirrm usr/doc/libpng-1.0.3
-usr/lib/libpng.so.2.1.0.3
-usr/lib/libpng.so.2
-usr/man/man5/png.5
+usr/lib/libpng.so.2.1.0.9
+@exec ln -sf %D/usr/lib/libpng.so.2.1.0.9 %D/usr/lib/libpng.so.2
+@unexec rm -f %D/usr/lib/libpng.so.2
+usr/share/doc/libpng-1.0.9/CHANGES
+usr/share/doc/libpng-1.0.9/README
+usr/share/doc/libpng-1.0.9/TODO
+usr/share/doc/libpng-1.0.9/example.c
+usr/share/doc/libpng-1.0.9/libpng.txt
+usr/share/man/man5/png.5.gz
+@dirrm usr/share/doc/libpng-1.0.9
diff --git a/graphics/linux-png10/pkg-plist.i386 b/graphics/linux-png10/pkg-plist.i386
index 825d1d3e47e1..024bfb34e766 100644
--- a/graphics/linux-png10/pkg-plist.i386
+++ b/graphics/linux-png10/pkg-plist.i386
@@ -1,9 +1,10 @@
-usr/doc/libpng-1.0.3/CHANGES
-usr/doc/libpng-1.0.3/README
-usr/doc/libpng-1.0.3/TODO
-usr/doc/libpng-1.0.3/example.c
-usr/doc/libpng-1.0.3/libpng.txt
-@dirrm usr/doc/libpng-1.0.3
-usr/lib/libpng.so.2.1.0.3
-usr/lib/libpng.so.2
-usr/man/man5/png.5
+usr/lib/libpng.so.2.1.0.9
+@exec ln -sf %D/usr/lib/libpng.so.2.1.0.9 %D/usr/lib/libpng.so.2
+@unexec rm -f %D/usr/lib/libpng.so.2
+usr/share/doc/libpng-1.0.9/CHANGES
+usr/share/doc/libpng-1.0.9/README
+usr/share/doc/libpng-1.0.9/TODO
+usr/share/doc/libpng-1.0.9/example.c
+usr/share/doc/libpng-1.0.9/libpng.txt
+usr/share/man/man5/png.5.gz
+@dirrm usr/share/doc/libpng-1.0.9
diff --git a/graphics/linux-tiff/Makefile b/graphics/linux-tiff/Makefile
index 2c8faef3c798..a05c45a87234 100644
--- a/graphics/linux-tiff/Makefile
+++ b/graphics/linux-tiff/Makefile
@@ -6,11 +6,11 @@
#
PORTNAME= tiff
-PORTVERSION= 3.4
+PORTVERSION= 3.5.5
CATEGORIES= graphics linux
MAINTAINER= taoka@FreeBSD.org
-RPM_SET= libtiff-${PORTVERSION}-6.${MACHINE_ARCH}.rpm
+RPM_SET= libtiff-${PORTVERSION}-10.${MACHINE_ARCH}.rpm
.include "../../x11-toolkits/linux-gtk/Makefile"
diff --git a/graphics/linux-tiff/distinfo.alpha b/graphics/linux-tiff/distinfo.alpha
index 24e126d457bf..e7c0fc45d737 100644
--- a/graphics/linux-tiff/distinfo.alpha
+++ b/graphics/linux-tiff/distinfo.alpha
@@ -1 +1 @@
-MD5 (rpm/libtiff-3.4-6.alpha.rpm) = 16d52cb02b81b873bc80cf498d36682a
+MD5 (rpm/libtiff-3.5.5-10.alpha.rpm) = 51aaf90d967a63978f6e9a4e5c35b033
diff --git a/graphics/linux-tiff/distinfo.i386 b/graphics/linux-tiff/distinfo.i386
index d2d3d3c1c0bd..320116f0a7b4 100644
--- a/graphics/linux-tiff/distinfo.i386
+++ b/graphics/linux-tiff/distinfo.i386
@@ -1 +1 @@
-MD5 (rpm/libtiff-3.4-6.i386.rpm) = 5cd8da37f583200fe4f1af0c3028da6d
+MD5 (rpm/libtiff-3.5.5-10.i386.rpm) = 3cba6c6c4d96a9e3bf7a3345ecf535f5
diff --git a/graphics/linux-tiff/pkg-plist.alpha b/graphics/linux-tiff/pkg-plist.alpha
index 0d68d4bfe036..ccb4b78f1624 100644
--- a/graphics/linux-tiff/pkg-plist.alpha
+++ b/graphics/linux-tiff/pkg-plist.alpha
@@ -8,6 +8,7 @@ usr/bin/rgb2ycbcr
usr/bin/thumbnail
usr/bin/tiff2bw
usr/bin/tiff2ps
+usr/bin/tiff2rgba
usr/bin/tiffcmp
usr/bin/tiffcp
usr/bin/tiffdither
@@ -15,5 +16,30 @@ usr/bin/tiffdump
usr/bin/tiffinfo
usr/bin/tiffmedian
usr/bin/tiffsplit
-usr/lib/libtiff.so.3
-usr/lib/libtiff.so.3.4
+usr/lib/libtiff.so.3.5
+usr/share/doc/libtiff-3.5.5/COPYRIGHT
+usr/share/doc/libtiff-3.5.5/README
+usr/share/doc/libtiff-3.5.5/VERSION
+usr/share/man/man1/fax2ps.1.gz
+usr/share/man/man1/fax2tiff.1.gz
+usr/share/man/man1/gif2tiff.1.gz
+usr/share/man/man1/pal2rgb.1.gz
+usr/share/man/man1/ppm2tiff.1.gz
+usr/share/man/man1/ras2tiff.1.gz
+usr/share/man/man1/rgb2ycbcr.1.gz
+usr/share/man/man1/sgi2tiff.1.gz
+usr/share/man/man1/thumbnail.1.gz
+usr/share/man/man1/tiff2bw.1.gz
+usr/share/man/man1/tiff2ps.1.gz
+usr/share/man/man1/tiffcmp.1.gz
+usr/share/man/man1/tiffcp.1.gz
+usr/share/man/man1/tiffdither.1.gz
+usr/share/man/man1/tiffdump.1.gz
+usr/share/man/man1/tiffgt.1.gz
+usr/share/man/man1/tiffinfo.1.gz
+usr/share/man/man1/tiffmedian.1.gz
+usr/share/man/man1/tiffsplit.1.gz
+usr/share/man/man1/tiffsv.1.gz
+@dirrm usr/share/doc/libtiff-3.5.5
+@exec ln -sf %D/usr/lib/libtiff.so.3.5 %D/usr/lib/libtiff.so.3
+@unexec rm -f %D/usr/lib/libtiff.so.3
diff --git a/graphics/linux-tiff/pkg-plist.i386 b/graphics/linux-tiff/pkg-plist.i386
index 0d68d4bfe036..ccb4b78f1624 100644
--- a/graphics/linux-tiff/pkg-plist.i386
+++ b/graphics/linux-tiff/pkg-plist.i386
@@ -8,6 +8,7 @@ usr/bin/rgb2ycbcr
usr/bin/thumbnail
usr/bin/tiff2bw
usr/bin/tiff2ps
+usr/bin/tiff2rgba
usr/bin/tiffcmp
usr/bin/tiffcp
usr/bin/tiffdither
@@ -15,5 +16,30 @@ usr/bin/tiffdump
usr/bin/tiffinfo
usr/bin/tiffmedian
usr/bin/tiffsplit
-usr/lib/libtiff.so.3
-usr/lib/libtiff.so.3.4
+usr/lib/libtiff.so.3.5
+usr/share/doc/libtiff-3.5.5/COPYRIGHT
+usr/share/doc/libtiff-3.5.5/README
+usr/share/doc/libtiff-3.5.5/VERSION
+usr/share/man/man1/fax2ps.1.gz
+usr/share/man/man1/fax2tiff.1.gz
+usr/share/man/man1/gif2tiff.1.gz
+usr/share/man/man1/pal2rgb.1.gz
+usr/share/man/man1/ppm2tiff.1.gz
+usr/share/man/man1/ras2tiff.1.gz
+usr/share/man/man1/rgb2ycbcr.1.gz
+usr/share/man/man1/sgi2tiff.1.gz
+usr/share/man/man1/thumbnail.1.gz
+usr/share/man/man1/tiff2bw.1.gz
+usr/share/man/man1/tiff2ps.1.gz
+usr/share/man/man1/tiffcmp.1.gz
+usr/share/man/man1/tiffcp.1.gz
+usr/share/man/man1/tiffdither.1.gz
+usr/share/man/man1/tiffdump.1.gz
+usr/share/man/man1/tiffgt.1.gz
+usr/share/man/man1/tiffinfo.1.gz
+usr/share/man/man1/tiffmedian.1.gz
+usr/share/man/man1/tiffsplit.1.gz
+usr/share/man/man1/tiffsv.1.gz
+@dirrm usr/share/doc/libtiff-3.5.5
+@exec ln -sf %D/usr/lib/libtiff.so.3.5 %D/usr/lib/libtiff.so.3
+@unexec rm -f %D/usr/lib/libtiff.so.3
diff --git a/textproc/linux-f10-libxml/Makefile b/textproc/linux-f10-libxml/Makefile
index 6fe21428c138..28208690e8d8 100644
--- a/textproc/linux-f10-libxml/Makefile
+++ b/textproc/linux-f10-libxml/Makefile
@@ -6,11 +6,7 @@
#
PORTNAME= libxml
-.if (${MACHINE_ARCH} == "i386")
-PORTVERSION= 1.4.0
-.elif (${MACHINE_ARCH} == "alpha")
-PORTVERSION= 1.7.3
-.endif
+PORTVERSION= 1.8.10
CATEGORIES= textproc linux
MAINTAINER= taoka@FreeBSD.org
diff --git a/textproc/linux-f10-libxml/distinfo.alpha b/textproc/linux-f10-libxml/distinfo.alpha
index 1027492a73d7..1ce207de3509 100644
--- a/textproc/linux-f10-libxml/distinfo.alpha
+++ b/textproc/linux-f10-libxml/distinfo.alpha
@@ -1 +1 @@
-MD5 (rpm/libxml-1.7.3-1.alpha.rpm) = 47e751ca9e2c23f308adec225186f7cf
+MD5 (rpm/libxml-1.8.10-1.alpha.rpm) = 1ab67e6081335f42063e3679e22045ed
diff --git a/textproc/linux-f10-libxml/distinfo.i386 b/textproc/linux-f10-libxml/distinfo.i386
index bf9358308428..de8b4f3eb900 100644
--- a/textproc/linux-f10-libxml/distinfo.i386
+++ b/textproc/linux-f10-libxml/distinfo.i386
@@ -1 +1 @@
-MD5 (rpm/libxml-1.4.0-1.i386.rpm) = dd6f59b17753b33d7a1f9e0a36f1cf7e
+MD5 (rpm/libxml-1.8.10-1.i386.rpm) = 8eeee1724345d8fc5bebb803adbdd73b
diff --git a/textproc/linux-f10-libxml/pkg-plist.alpha b/textproc/linux-f10-libxml/pkg-plist.alpha
index afce2985558d..1eae478b1532 100644
--- a/textproc/linux-f10-libxml/pkg-plist.alpha
+++ b/textproc/linux-f10-libxml/pkg-plist.alpha
@@ -1,26 +1,32 @@
-usr/doc/libxml-1.7.3/AUTHORS
-usr/doc/libxml-1.7.3/COPYING
-usr/doc/libxml-1.7.3/COPYING.LIB
-usr/doc/libxml-1.7.3/ChangeLog
-usr/doc/libxml-1.7.3/NEWS
-usr/doc/libxml-1.7.3/README
-usr/doc/libxml-1.7.3/TODO
-usr/doc/libxml-1.7.3/html/book1.html
-usr/doc/libxml-1.7.3/html/gnome-xml-entities.html
-usr/doc/libxml-1.7.3/html/gnome-xml-error.html
-usr/doc/libxml-1.7.3/html/gnome-xml-htmlparser.html
-usr/doc/libxml-1.7.3/html/gnome-xml-htmltree.html
-usr/doc/libxml-1.7.3/html/gnome-xml-nanohttp.html
-usr/doc/libxml-1.7.3/html/gnome-xml-parser.html
-usr/doc/libxml-1.7.3/html/gnome-xml-parserinternals.html
-usr/doc/libxml-1.7.3/html/gnome-xml-tree.html
-usr/doc/libxml-1.7.3/html/gnome-xml-valid.html
-usr/doc/libxml-1.7.3/html/gnome-xml-xml-error.html
-usr/doc/libxml-1.7.3/html/gnome-xml-xmlmemory.html
-usr/doc/libxml-1.7.3/html/gnome-xml-xpath.html
-usr/doc/libxml-1.7.3/html/index.sgml
-usr/doc/libxml-1.7.3/html/libxml.html
+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
-usr/lib/libxml.so.1.7.3
-@dirrm usr/doc/libxml-1.7.3/html
-@dirrm usr/doc/libxml-1.7.3
+@dirrm usr/share/doc/libxml-1.8.10/html
+@dirrm usr/share/doc/libxml-1.8.10
diff --git a/textproc/linux-f10-libxml/pkg-plist.i386 b/textproc/linux-f10-libxml/pkg-plist.i386
index 8ea390199bbc..1eae478b1532 100644
--- a/textproc/linux-f10-libxml/pkg-plist.i386
+++ b/textproc/linux-f10-libxml/pkg-plist.i386
@@ -1,24 +1,32 @@
-usr/doc/libxml-1.4.0/AUTHORS
-usr/doc/libxml-1.4.0/COPYING
-usr/doc/libxml-1.4.0/COPYING.LIB
-usr/doc/libxml-1.4.0/ChangeLog
-usr/doc/libxml-1.4.0/NEWS
-usr/doc/libxml-1.4.0/README
-usr/doc/libxml-1.4.0/TODO
-usr/doc/libxml-1.4.0/html/book1.html
-usr/doc/libxml-1.4.0/html/gnome-xml-entities.html
-usr/doc/libxml-1.4.0/html/gnome-xml-error.html
-usr/doc/libxml-1.4.0/html/gnome-xml-htmlparser.html
-usr/doc/libxml-1.4.0/html/gnome-xml-htmltree.html
-usr/doc/libxml-1.4.0/html/gnome-xml-parser.html
-usr/doc/libxml-1.4.0/html/gnome-xml-parserinternals.html
-usr/doc/libxml-1.4.0/html/gnome-xml-tree.html
-usr/doc/libxml-1.4.0/html/gnome-xml-valid.html
-usr/doc/libxml-1.4.0/html/gnome-xml-xml-error.html
-usr/doc/libxml-1.4.0/html/gnome-xml-xpath.html
-usr/doc/libxml-1.4.0/html/index.sgml
-usr/doc/libxml-1.4.0/html/libxml.html
+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
-usr/lib/libxml.so.1.4.0
-@dirrm usr/doc/libxml-1.4.0/html
-@dirrm usr/doc/libxml-1.4.0
+@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 6fe21428c138..28208690e8d8 100644
--- a/textproc/linux-f10-libxml2/Makefile
+++ b/textproc/linux-f10-libxml2/Makefile
@@ -6,11 +6,7 @@
#
PORTNAME= libxml
-.if (${MACHINE_ARCH} == "i386")
-PORTVERSION= 1.4.0
-.elif (${MACHINE_ARCH} == "alpha")
-PORTVERSION= 1.7.3
-.endif
+PORTVERSION= 1.8.10
CATEGORIES= textproc linux
MAINTAINER= taoka@FreeBSD.org
diff --git a/textproc/linux-f10-libxml2/distinfo.alpha b/textproc/linux-f10-libxml2/distinfo.alpha
index 1027492a73d7..1ce207de3509 100644
--- a/textproc/linux-f10-libxml2/distinfo.alpha
+++ b/textproc/linux-f10-libxml2/distinfo.alpha
@@ -1 +1 @@
-MD5 (rpm/libxml-1.7.3-1.alpha.rpm) = 47e751ca9e2c23f308adec225186f7cf
+MD5 (rpm/libxml-1.8.10-1.alpha.rpm) = 1ab67e6081335f42063e3679e22045ed
diff --git a/textproc/linux-f10-libxml2/distinfo.i386 b/textproc/linux-f10-libxml2/distinfo.i386
index bf9358308428..de8b4f3eb900 100644
--- a/textproc/linux-f10-libxml2/distinfo.i386
+++ b/textproc/linux-f10-libxml2/distinfo.i386
@@ -1 +1 @@
-MD5 (rpm/libxml-1.4.0-1.i386.rpm) = dd6f59b17753b33d7a1f9e0a36f1cf7e
+MD5 (rpm/libxml-1.8.10-1.i386.rpm) = 8eeee1724345d8fc5bebb803adbdd73b
diff --git a/textproc/linux-f10-libxml2/pkg-plist.alpha b/textproc/linux-f10-libxml2/pkg-plist.alpha
index afce2985558d..1eae478b1532 100644
--- a/textproc/linux-f10-libxml2/pkg-plist.alpha
+++ b/textproc/linux-f10-libxml2/pkg-plist.alpha
@@ -1,26 +1,32 @@
-usr/doc/libxml-1.7.3/AUTHORS
-usr/doc/libxml-1.7.3/COPYING
-usr/doc/libxml-1.7.3/COPYING.LIB
-usr/doc/libxml-1.7.3/ChangeLog
-usr/doc/libxml-1.7.3/NEWS
-usr/doc/libxml-1.7.3/README
-usr/doc/libxml-1.7.3/TODO
-usr/doc/libxml-1.7.3/html/book1.html
-usr/doc/libxml-1.7.3/html/gnome-xml-entities.html
-usr/doc/libxml-1.7.3/html/gnome-xml-error.html
-usr/doc/libxml-1.7.3/html/gnome-xml-htmlparser.html
-usr/doc/libxml-1.7.3/html/gnome-xml-htmltree.html
-usr/doc/libxml-1.7.3/html/gnome-xml-nanohttp.html
-usr/doc/libxml-1.7.3/html/gnome-xml-parser.html
-usr/doc/libxml-1.7.3/html/gnome-xml-parserinternals.html
-usr/doc/libxml-1.7.3/html/gnome-xml-tree.html
-usr/doc/libxml-1.7.3/html/gnome-xml-valid.html
-usr/doc/libxml-1.7.3/html/gnome-xml-xml-error.html
-usr/doc/libxml-1.7.3/html/gnome-xml-xmlmemory.html
-usr/doc/libxml-1.7.3/html/gnome-xml-xpath.html
-usr/doc/libxml-1.7.3/html/index.sgml
-usr/doc/libxml-1.7.3/html/libxml.html
+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
-usr/lib/libxml.so.1.7.3
-@dirrm usr/doc/libxml-1.7.3/html
-@dirrm usr/doc/libxml-1.7.3
+@dirrm usr/share/doc/libxml-1.8.10/html
+@dirrm usr/share/doc/libxml-1.8.10
diff --git a/textproc/linux-f10-libxml2/pkg-plist.i386 b/textproc/linux-f10-libxml2/pkg-plist.i386
index 8ea390199bbc..1eae478b1532 100644
--- a/textproc/linux-f10-libxml2/pkg-plist.i386
+++ b/textproc/linux-f10-libxml2/pkg-plist.i386
@@ -1,24 +1,32 @@
-usr/doc/libxml-1.4.0/AUTHORS
-usr/doc/libxml-1.4.0/COPYING
-usr/doc/libxml-1.4.0/COPYING.LIB
-usr/doc/libxml-1.4.0/ChangeLog
-usr/doc/libxml-1.4.0/NEWS
-usr/doc/libxml-1.4.0/README
-usr/doc/libxml-1.4.0/TODO
-usr/doc/libxml-1.4.0/html/book1.html
-usr/doc/libxml-1.4.0/html/gnome-xml-entities.html
-usr/doc/libxml-1.4.0/html/gnome-xml-error.html
-usr/doc/libxml-1.4.0/html/gnome-xml-htmlparser.html
-usr/doc/libxml-1.4.0/html/gnome-xml-htmltree.html
-usr/doc/libxml-1.4.0/html/gnome-xml-parser.html
-usr/doc/libxml-1.4.0/html/gnome-xml-parserinternals.html
-usr/doc/libxml-1.4.0/html/gnome-xml-tree.html
-usr/doc/libxml-1.4.0/html/gnome-xml-valid.html
-usr/doc/libxml-1.4.0/html/gnome-xml-xml-error.html
-usr/doc/libxml-1.4.0/html/gnome-xml-xpath.html
-usr/doc/libxml-1.4.0/html/index.sgml
-usr/doc/libxml-1.4.0/html/libxml.html
+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
-usr/lib/libxml.so.1.4.0
-@dirrm usr/doc/libxml-1.4.0/html
-@dirrm usr/doc/libxml-1.4.0
+@dirrm usr/share/doc/libxml-1.8.10/html
+@dirrm usr/share/doc/libxml-1.8.10
diff --git a/textproc/linux-f8-libxml/Makefile b/textproc/linux-f8-libxml/Makefile
index 6fe21428c138..28208690e8d8 100644
--- a/textproc/linux-f8-libxml/Makefile
+++ b/textproc/linux-f8-libxml/Makefile
@@ -6,11 +6,7 @@
#
PORTNAME= libxml
-.if (${MACHINE_ARCH} == "i386")
-PORTVERSION= 1.4.0
-.elif (${MACHINE_ARCH} == "alpha")
-PORTVERSION= 1.7.3
-.endif
+PORTVERSION= 1.8.10
CATEGORIES= textproc linux
MAINTAINER= taoka@FreeBSD.org
diff --git a/textproc/linux-f8-libxml/distinfo.alpha b/textproc/linux-f8-libxml/distinfo.alpha
index 1027492a73d7..1ce207de3509 100644
--- a/textproc/linux-f8-libxml/distinfo.alpha
+++ b/textproc/linux-f8-libxml/distinfo.alpha
@@ -1 +1 @@
-MD5 (rpm/libxml-1.7.3-1.alpha.rpm) = 47e751ca9e2c23f308adec225186f7cf
+MD5 (rpm/libxml-1.8.10-1.alpha.rpm) = 1ab67e6081335f42063e3679e22045ed
diff --git a/textproc/linux-f8-libxml/distinfo.i386 b/textproc/linux-f8-libxml/distinfo.i386
index bf9358308428..de8b4f3eb900 100644
--- a/textproc/linux-f8-libxml/distinfo.i386
+++ b/textproc/linux-f8-libxml/distinfo.i386
@@ -1 +1 @@
-MD5 (rpm/libxml-1.4.0-1.i386.rpm) = dd6f59b17753b33d7a1f9e0a36f1cf7e
+MD5 (rpm/libxml-1.8.10-1.i386.rpm) = 8eeee1724345d8fc5bebb803adbdd73b
diff --git a/textproc/linux-f8-libxml/pkg-plist.alpha b/textproc/linux-f8-libxml/pkg-plist.alpha
index afce2985558d..1eae478b1532 100644
--- a/textproc/linux-f8-libxml/pkg-plist.alpha
+++ b/textproc/linux-f8-libxml/pkg-plist.alpha
@@ -1,26 +1,32 @@
-usr/doc/libxml-1.7.3/AUTHORS
-usr/doc/libxml-1.7.3/COPYING
-usr/doc/libxml-1.7.3/COPYING.LIB
-usr/doc/libxml-1.7.3/ChangeLog
-usr/doc/libxml-1.7.3/NEWS
-usr/doc/libxml-1.7.3/README
-usr/doc/libxml-1.7.3/TODO
-usr/doc/libxml-1.7.3/html/book1.html
-usr/doc/libxml-1.7.3/html/gnome-xml-entities.html
-usr/doc/libxml-1.7.3/html/gnome-xml-error.html
-usr/doc/libxml-1.7.3/html/gnome-xml-htmlparser.html
-usr/doc/libxml-1.7.3/html/gnome-xml-htmltree.html
-usr/doc/libxml-1.7.3/html/gnome-xml-nanohttp.html
-usr/doc/libxml-1.7.3/html/gnome-xml-parser.html
-usr/doc/libxml-1.7.3/html/gnome-xml-parserinternals.html
-usr/doc/libxml-1.7.3/html/gnome-xml-tree.html
-usr/doc/libxml-1.7.3/html/gnome-xml-valid.html
-usr/doc/libxml-1.7.3/html/gnome-xml-xml-error.html
-usr/doc/libxml-1.7.3/html/gnome-xml-xmlmemory.html
-usr/doc/libxml-1.7.3/html/gnome-xml-xpath.html
-usr/doc/libxml-1.7.3/html/index.sgml
-usr/doc/libxml-1.7.3/html/libxml.html
+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
-usr/lib/libxml.so.1.7.3
-@dirrm usr/doc/libxml-1.7.3/html
-@dirrm usr/doc/libxml-1.7.3
+@dirrm usr/share/doc/libxml-1.8.10/html
+@dirrm usr/share/doc/libxml-1.8.10
diff --git a/textproc/linux-f8-libxml/pkg-plist.i386 b/textproc/linux-f8-libxml/pkg-plist.i386
index 8ea390199bbc..1eae478b1532 100644
--- a/textproc/linux-f8-libxml/pkg-plist.i386
+++ b/textproc/linux-f8-libxml/pkg-plist.i386
@@ -1,24 +1,32 @@
-usr/doc/libxml-1.4.0/AUTHORS
-usr/doc/libxml-1.4.0/COPYING
-usr/doc/libxml-1.4.0/COPYING.LIB
-usr/doc/libxml-1.4.0/ChangeLog
-usr/doc/libxml-1.4.0/NEWS
-usr/doc/libxml-1.4.0/README
-usr/doc/libxml-1.4.0/TODO
-usr/doc/libxml-1.4.0/html/book1.html
-usr/doc/libxml-1.4.0/html/gnome-xml-entities.html
-usr/doc/libxml-1.4.0/html/gnome-xml-error.html
-usr/doc/libxml-1.4.0/html/gnome-xml-htmlparser.html
-usr/doc/libxml-1.4.0/html/gnome-xml-htmltree.html
-usr/doc/libxml-1.4.0/html/gnome-xml-parser.html
-usr/doc/libxml-1.4.0/html/gnome-xml-parserinternals.html
-usr/doc/libxml-1.4.0/html/gnome-xml-tree.html
-usr/doc/libxml-1.4.0/html/gnome-xml-valid.html
-usr/doc/libxml-1.4.0/html/gnome-xml-xml-error.html
-usr/doc/libxml-1.4.0/html/gnome-xml-xpath.html
-usr/doc/libxml-1.4.0/html/index.sgml
-usr/doc/libxml-1.4.0/html/libxml.html
+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
-usr/lib/libxml.so.1.4.0
-@dirrm usr/doc/libxml-1.4.0/html
-@dirrm usr/doc/libxml-1.4.0
+@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 6fe21428c138..28208690e8d8 100644
--- a/textproc/linux-f8-libxml2/Makefile
+++ b/textproc/linux-f8-libxml2/Makefile
@@ -6,11 +6,7 @@
#
PORTNAME= libxml
-.if (${MACHINE_ARCH} == "i386")
-PORTVERSION= 1.4.0
-.elif (${MACHINE_ARCH} == "alpha")
-PORTVERSION= 1.7.3
-.endif
+PORTVERSION= 1.8.10
CATEGORIES= textproc linux
MAINTAINER= taoka@FreeBSD.org
diff --git a/textproc/linux-f8-libxml2/distinfo.alpha b/textproc/linux-f8-libxml2/distinfo.alpha
index 1027492a73d7..1ce207de3509 100644
--- a/textproc/linux-f8-libxml2/distinfo.alpha
+++ b/textproc/linux-f8-libxml2/distinfo.alpha
@@ -1 +1 @@
-MD5 (rpm/libxml-1.7.3-1.alpha.rpm) = 47e751ca9e2c23f308adec225186f7cf
+MD5 (rpm/libxml-1.8.10-1.alpha.rpm) = 1ab67e6081335f42063e3679e22045ed
diff --git a/textproc/linux-f8-libxml2/distinfo.i386 b/textproc/linux-f8-libxml2/distinfo.i386
index bf9358308428..de8b4f3eb900 100644
--- a/textproc/linux-f8-libxml2/distinfo.i386
+++ b/textproc/linux-f8-libxml2/distinfo.i386
@@ -1 +1 @@
-MD5 (rpm/libxml-1.4.0-1.i386.rpm) = dd6f59b17753b33d7a1f9e0a36f1cf7e
+MD5 (rpm/libxml-1.8.10-1.i386.rpm) = 8eeee1724345d8fc5bebb803adbdd73b
diff --git a/textproc/linux-f8-libxml2/pkg-plist.alpha b/textproc/linux-f8-libxml2/pkg-plist.alpha
index afce2985558d..1eae478b1532 100644
--- a/textproc/linux-f8-libxml2/pkg-plist.alpha
+++ b/textproc/linux-f8-libxml2/pkg-plist.alpha
@@ -1,26 +1,32 @@
-usr/doc/libxml-1.7.3/AUTHORS
-usr/doc/libxml-1.7.3/COPYING
-usr/doc/libxml-1.7.3/COPYING.LIB
-usr/doc/libxml-1.7.3/ChangeLog
-usr/doc/libxml-1.7.3/NEWS
-usr/doc/libxml-1.7.3/README
-usr/doc/libxml-1.7.3/TODO
-usr/doc/libxml-1.7.3/html/book1.html
-usr/doc/libxml-1.7.3/html/gnome-xml-entities.html
-usr/doc/libxml-1.7.3/html/gnome-xml-error.html
-usr/doc/libxml-1.7.3/html/gnome-xml-htmlparser.html
-usr/doc/libxml-1.7.3/html/gnome-xml-htmltree.html
-usr/doc/libxml-1.7.3/html/gnome-xml-nanohttp.html
-usr/doc/libxml-1.7.3/html/gnome-xml-parser.html
-usr/doc/libxml-1.7.3/html/gnome-xml-parserinternals.html
-usr/doc/libxml-1.7.3/html/gnome-xml-tree.html
-usr/doc/libxml-1.7.3/html/gnome-xml-valid.html
-usr/doc/libxml-1.7.3/html/gnome-xml-xml-error.html
-usr/doc/libxml-1.7.3/html/gnome-xml-xmlmemory.html
-usr/doc/libxml-1.7.3/html/gnome-xml-xpath.html
-usr/doc/libxml-1.7.3/html/index.sgml
-usr/doc/libxml-1.7.3/html/libxml.html
+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
-usr/lib/libxml.so.1.7.3
-@dirrm usr/doc/libxml-1.7.3/html
-@dirrm usr/doc/libxml-1.7.3
+@dirrm usr/share/doc/libxml-1.8.10/html
+@dirrm usr/share/doc/libxml-1.8.10
diff --git a/textproc/linux-f8-libxml2/pkg-plist.i386 b/textproc/linux-f8-libxml2/pkg-plist.i386
index 8ea390199bbc..1eae478b1532 100644
--- a/textproc/linux-f8-libxml2/pkg-plist.i386
+++ b/textproc/linux-f8-libxml2/pkg-plist.i386
@@ -1,24 +1,32 @@
-usr/doc/libxml-1.4.0/AUTHORS
-usr/doc/libxml-1.4.0/COPYING
-usr/doc/libxml-1.4.0/COPYING.LIB
-usr/doc/libxml-1.4.0/ChangeLog
-usr/doc/libxml-1.4.0/NEWS
-usr/doc/libxml-1.4.0/README
-usr/doc/libxml-1.4.0/TODO
-usr/doc/libxml-1.4.0/html/book1.html
-usr/doc/libxml-1.4.0/html/gnome-xml-entities.html
-usr/doc/libxml-1.4.0/html/gnome-xml-error.html
-usr/doc/libxml-1.4.0/html/gnome-xml-htmlparser.html
-usr/doc/libxml-1.4.0/html/gnome-xml-htmltree.html
-usr/doc/libxml-1.4.0/html/gnome-xml-parser.html
-usr/doc/libxml-1.4.0/html/gnome-xml-parserinternals.html
-usr/doc/libxml-1.4.0/html/gnome-xml-tree.html
-usr/doc/libxml-1.4.0/html/gnome-xml-valid.html
-usr/doc/libxml-1.4.0/html/gnome-xml-xml-error.html
-usr/doc/libxml-1.4.0/html/gnome-xml-xpath.html
-usr/doc/libxml-1.4.0/html/index.sgml
-usr/doc/libxml-1.4.0/html/libxml.html
+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
-usr/lib/libxml.so.1.4.0
-@dirrm usr/doc/libxml-1.4.0/html
-@dirrm usr/doc/libxml-1.4.0
+@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 6fe21428c138..28208690e8d8 100644
--- a/textproc/linux-libxml/Makefile
+++ b/textproc/linux-libxml/Makefile
@@ -6,11 +6,7 @@
#
PORTNAME= libxml
-.if (${MACHINE_ARCH} == "i386")
-PORTVERSION= 1.4.0
-.elif (${MACHINE_ARCH} == "alpha")
-PORTVERSION= 1.7.3
-.endif
+PORTVERSION= 1.8.10
CATEGORIES= textproc linux
MAINTAINER= taoka@FreeBSD.org
diff --git a/textproc/linux-libxml/distinfo.alpha b/textproc/linux-libxml/distinfo.alpha
index 1027492a73d7..1ce207de3509 100644
--- a/textproc/linux-libxml/distinfo.alpha
+++ b/textproc/linux-libxml/distinfo.alpha
@@ -1 +1 @@
-MD5 (rpm/libxml-1.7.3-1.alpha.rpm) = 47e751ca9e2c23f308adec225186f7cf
+MD5 (rpm/libxml-1.8.10-1.alpha.rpm) = 1ab67e6081335f42063e3679e22045ed
diff --git a/textproc/linux-libxml/distinfo.i386 b/textproc/linux-libxml/distinfo.i386
index bf9358308428..de8b4f3eb900 100644
--- a/textproc/linux-libxml/distinfo.i386
+++ b/textproc/linux-libxml/distinfo.i386
@@ -1 +1 @@
-MD5 (rpm/libxml-1.4.0-1.i386.rpm) = dd6f59b17753b33d7a1f9e0a36f1cf7e
+MD5 (rpm/libxml-1.8.10-1.i386.rpm) = 8eeee1724345d8fc5bebb803adbdd73b
diff --git a/textproc/linux-libxml/pkg-plist.alpha b/textproc/linux-libxml/pkg-plist.alpha
index afce2985558d..1eae478b1532 100644
--- a/textproc/linux-libxml/pkg-plist.alpha
+++ b/textproc/linux-libxml/pkg-plist.alpha
@@ -1,26 +1,32 @@
-usr/doc/libxml-1.7.3/AUTHORS
-usr/doc/libxml-1.7.3/COPYING
-usr/doc/libxml-1.7.3/COPYING.LIB
-usr/doc/libxml-1.7.3/ChangeLog
-usr/doc/libxml-1.7.3/NEWS
-usr/doc/libxml-1.7.3/README
-usr/doc/libxml-1.7.3/TODO
-usr/doc/libxml-1.7.3/html/book1.html
-usr/doc/libxml-1.7.3/html/gnome-xml-entities.html
-usr/doc/libxml-1.7.3/html/gnome-xml-error.html
-usr/doc/libxml-1.7.3/html/gnome-xml-htmlparser.html
-usr/doc/libxml-1.7.3/html/gnome-xml-htmltree.html
-usr/doc/libxml-1.7.3/html/gnome-xml-nanohttp.html
-usr/doc/libxml-1.7.3/html/gnome-xml-parser.html
-usr/doc/libxml-1.7.3/html/gnome-xml-parserinternals.html
-usr/doc/libxml-1.7.3/html/gnome-xml-tree.html
-usr/doc/libxml-1.7.3/html/gnome-xml-valid.html
-usr/doc/libxml-1.7.3/html/gnome-xml-xml-error.html
-usr/doc/libxml-1.7.3/html/gnome-xml-xmlmemory.html
-usr/doc/libxml-1.7.3/html/gnome-xml-xpath.html
-usr/doc/libxml-1.7.3/html/index.sgml
-usr/doc/libxml-1.7.3/html/libxml.html
+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
-usr/lib/libxml.so.1.7.3
-@dirrm usr/doc/libxml-1.7.3/html
-@dirrm usr/doc/libxml-1.7.3
+@dirrm usr/share/doc/libxml-1.8.10/html
+@dirrm usr/share/doc/libxml-1.8.10
diff --git a/textproc/linux-libxml/pkg-plist.i386 b/textproc/linux-libxml/pkg-plist.i386
index 8ea390199bbc..1eae478b1532 100644
--- a/textproc/linux-libxml/pkg-plist.i386
+++ b/textproc/linux-libxml/pkg-plist.i386
@@ -1,24 +1,32 @@
-usr/doc/libxml-1.4.0/AUTHORS
-usr/doc/libxml-1.4.0/COPYING
-usr/doc/libxml-1.4.0/COPYING.LIB
-usr/doc/libxml-1.4.0/ChangeLog
-usr/doc/libxml-1.4.0/NEWS
-usr/doc/libxml-1.4.0/README
-usr/doc/libxml-1.4.0/TODO
-usr/doc/libxml-1.4.0/html/book1.html
-usr/doc/libxml-1.4.0/html/gnome-xml-entities.html
-usr/doc/libxml-1.4.0/html/gnome-xml-error.html
-usr/doc/libxml-1.4.0/html/gnome-xml-htmlparser.html
-usr/doc/libxml-1.4.0/html/gnome-xml-htmltree.html
-usr/doc/libxml-1.4.0/html/gnome-xml-parser.html
-usr/doc/libxml-1.4.0/html/gnome-xml-parserinternals.html
-usr/doc/libxml-1.4.0/html/gnome-xml-tree.html
-usr/doc/libxml-1.4.0/html/gnome-xml-valid.html
-usr/doc/libxml-1.4.0/html/gnome-xml-xml-error.html
-usr/doc/libxml-1.4.0/html/gnome-xml-xpath.html
-usr/doc/libxml-1.4.0/html/index.sgml
-usr/doc/libxml-1.4.0/html/libxml.html
+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
-usr/lib/libxml.so.1.4.0
-@dirrm usr/doc/libxml-1.4.0/html
-@dirrm usr/doc/libxml-1.4.0
+@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 6fe21428c138..28208690e8d8 100644
--- a/textproc/linux-libxml2/Makefile
+++ b/textproc/linux-libxml2/Makefile
@@ -6,11 +6,7 @@
#
PORTNAME= libxml
-.if (${MACHINE_ARCH} == "i386")
-PORTVERSION= 1.4.0
-.elif (${MACHINE_ARCH} == "alpha")
-PORTVERSION= 1.7.3
-.endif
+PORTVERSION= 1.8.10
CATEGORIES= textproc linux
MAINTAINER= taoka@FreeBSD.org
diff --git a/textproc/linux-libxml2/distinfo.alpha b/textproc/linux-libxml2/distinfo.alpha
index 1027492a73d7..1ce207de3509 100644
--- a/textproc/linux-libxml2/distinfo.alpha
+++ b/textproc/linux-libxml2/distinfo.alpha
@@ -1 +1 @@
-MD5 (rpm/libxml-1.7.3-1.alpha.rpm) = 47e751ca9e2c23f308adec225186f7cf
+MD5 (rpm/libxml-1.8.10-1.alpha.rpm) = 1ab67e6081335f42063e3679e22045ed
diff --git a/textproc/linux-libxml2/distinfo.i386 b/textproc/linux-libxml2/distinfo.i386
index bf9358308428..de8b4f3eb900 100644
--- a/textproc/linux-libxml2/distinfo.i386
+++ b/textproc/linux-libxml2/distinfo.i386
@@ -1 +1 @@
-MD5 (rpm/libxml-1.4.0-1.i386.rpm) = dd6f59b17753b33d7a1f9e0a36f1cf7e
+MD5 (rpm/libxml-1.8.10-1.i386.rpm) = 8eeee1724345d8fc5bebb803adbdd73b
diff --git a/textproc/linux-libxml2/pkg-plist.alpha b/textproc/linux-libxml2/pkg-plist.alpha
index afce2985558d..1eae478b1532 100644
--- a/textproc/linux-libxml2/pkg-plist.alpha
+++ b/textproc/linux-libxml2/pkg-plist.alpha
@@ -1,26 +1,32 @@
-usr/doc/libxml-1.7.3/AUTHORS
-usr/doc/libxml-1.7.3/COPYING
-usr/doc/libxml-1.7.3/COPYING.LIB
-usr/doc/libxml-1.7.3/ChangeLog
-usr/doc/libxml-1.7.3/NEWS
-usr/doc/libxml-1.7.3/README
-usr/doc/libxml-1.7.3/TODO
-usr/doc/libxml-1.7.3/html/book1.html
-usr/doc/libxml-1.7.3/html/gnome-xml-entities.html
-usr/doc/libxml-1.7.3/html/gnome-xml-error.html
-usr/doc/libxml-1.7.3/html/gnome-xml-htmlparser.html
-usr/doc/libxml-1.7.3/html/gnome-xml-htmltree.html
-usr/doc/libxml-1.7.3/html/gnome-xml-nanohttp.html
-usr/doc/libxml-1.7.3/html/gnome-xml-parser.html
-usr/doc/libxml-1.7.3/html/gnome-xml-parserinternals.html
-usr/doc/libxml-1.7.3/html/gnome-xml-tree.html
-usr/doc/libxml-1.7.3/html/gnome-xml-valid.html
-usr/doc/libxml-1.7.3/html/gnome-xml-xml-error.html
-usr/doc/libxml-1.7.3/html/gnome-xml-xmlmemory.html
-usr/doc/libxml-1.7.3/html/gnome-xml-xpath.html
-usr/doc/libxml-1.7.3/html/index.sgml
-usr/doc/libxml-1.7.3/html/libxml.html
+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
-usr/lib/libxml.so.1.7.3
-@dirrm usr/doc/libxml-1.7.3/html
-@dirrm usr/doc/libxml-1.7.3
+@dirrm usr/share/doc/libxml-1.8.10/html
+@dirrm usr/share/doc/libxml-1.8.10
diff --git a/textproc/linux-libxml2/pkg-plist.i386 b/textproc/linux-libxml2/pkg-plist.i386
index 8ea390199bbc..1eae478b1532 100644
--- a/textproc/linux-libxml2/pkg-plist.i386
+++ b/textproc/linux-libxml2/pkg-plist.i386
@@ -1,24 +1,32 @@
-usr/doc/libxml-1.4.0/AUTHORS
-usr/doc/libxml-1.4.0/COPYING
-usr/doc/libxml-1.4.0/COPYING.LIB
-usr/doc/libxml-1.4.0/ChangeLog
-usr/doc/libxml-1.4.0/NEWS
-usr/doc/libxml-1.4.0/README
-usr/doc/libxml-1.4.0/TODO
-usr/doc/libxml-1.4.0/html/book1.html
-usr/doc/libxml-1.4.0/html/gnome-xml-entities.html
-usr/doc/libxml-1.4.0/html/gnome-xml-error.html
-usr/doc/libxml-1.4.0/html/gnome-xml-htmlparser.html
-usr/doc/libxml-1.4.0/html/gnome-xml-htmltree.html
-usr/doc/libxml-1.4.0/html/gnome-xml-parser.html
-usr/doc/libxml-1.4.0/html/gnome-xml-parserinternals.html
-usr/doc/libxml-1.4.0/html/gnome-xml-tree.html
-usr/doc/libxml-1.4.0/html/gnome-xml-valid.html
-usr/doc/libxml-1.4.0/html/gnome-xml-xml-error.html
-usr/doc/libxml-1.4.0/html/gnome-xml-xpath.html
-usr/doc/libxml-1.4.0/html/index.sgml
-usr/doc/libxml-1.4.0/html/libxml.html
+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
-usr/lib/libxml.so.1.4.0
-@dirrm usr/doc/libxml-1.4.0/html
-@dirrm usr/doc/libxml-1.4.0
+@dirrm usr/share/doc/libxml-1.8.10/html
+@dirrm usr/share/doc/libxml-1.8.10
diff --git a/x11-toolkits/linux-f10-gtk/Makefile b/x11-toolkits/linux-f10-gtk/Makefile
index f81bf5adb223..c09e6e4692d5 100644
--- a/x11-toolkits/linux-f10-gtk/Makefile
+++ b/x11-toolkits/linux-f10-gtk/Makefile
@@ -9,7 +9,7 @@
PORTNAME?= gtk
PORTVERSION?= 1.2
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES?= x11-toolkits linux
MASTER_SITES?= ${RPM_MIRRORS:S/__DIR__/${STDDIR}/g}
PKGNAMEPREFIX= linux-
@@ -28,13 +28,20 @@ NO_FILTER_SHLIBS= yes
PLIST= ${PKGDIR}/pkg-plist.${MACHINE_ARCH}
MD5_FILE= ${MASTERDIR}/distinfo.${MACHINE_ARCH}
-RPM_MIRRORS= ${MASTER_SITE_BACKUP}
-STDDIR= redhat-6.1/${MACHINE_ARCH}/RedHat/RPMS
-UPDDIR= updates/6.1/${MACHINE_ARCH}
+# Let's avoid hardcoding 'en' as the language.
+LANG= en
+# Set the version of linux_base
+BASEVERSION= 7.1
+RPM_MIRRORS= \
+ ftp://ftp.redhat.com/pub/redhat/__DIR__/ \
+ ftp://ftp.nluug.nl/site/ftp.redhat.com/redhat/__DIR__/ \
+ ftp://ftp.mirror.ac.uk/sites/ftp.redhat.com/pub/redhat/__DIR__/
+STDDIR= linux/${BASEVERSION}/${LANG}/os/${MACHINE_ARCH}/RedHat/RPMS
+UPDDIR= linux/updates/${BASEVERSION}/${LANG}/os/${MACHINE_ARCH}
.if (${MACHINE_ARCH} == "i386")
-RPM_SET?= gtk+-1.2.5-2.${MACHINE_ARCH}.rpm
+RPM_SET?= gtk+-1.2.9-4.${MACHINE_ARCH}.rpm
.elif (${MACHINE_ARCH} == "alpha")
-RPM_SET?= gtk+-1.2.6-1.${MACHINE_ARCH}.rpm
+RPM_SET?= gtk+-1.2.9-4.${MACHINE_ARCH}.rpm
.endif
DBPATH= /var/lib/rpm
RPMFLAGS= --ignoreos --root ${PREFIX} --dbpath ${DBPATH} \
@@ -44,7 +51,7 @@ RPMDIR= ${DISTDIR}/${DIST_SUBDIR}
do-install:
@for R in ${RPM_SET}; do \
${ECHO} $$R; \
- rpm -U ${RPMFLAGS} ${RPMDIR}/$$R; \
+ rpm -U ${RPMFLAGS} ${RPMDIR}/$$R || true ; \
done
.include <bsd.port.mk>
diff --git a/x11-toolkits/linux-f10-gtk/distinfo.alpha b/x11-toolkits/linux-f10-gtk/distinfo.alpha
index f2a98363053b..dcb408aa79b6 100644
--- a/x11-toolkits/linux-f10-gtk/distinfo.alpha
+++ b/x11-toolkits/linux-f10-gtk/distinfo.alpha
@@ -1 +1 @@
-MD5 (rpm/gtk+-1.2.6-1.alpha.rpm) = d9297097a194ef522fad4a64f8398cc0
+MD5 (rpm/gtk+-1.2.9-4.alpha.rpm) = 72107f3edc89e27e1481b89fd752ff82
diff --git a/x11-toolkits/linux-f10-gtk/distinfo.i386 b/x11-toolkits/linux-f10-gtk/distinfo.i386
index 68db97f99742..31e9fdf2b849 100644
--- a/x11-toolkits/linux-f10-gtk/distinfo.i386
+++ b/x11-toolkits/linux-f10-gtk/distinfo.i386
@@ -1 +1 @@
-MD5 (rpm/gtk+-1.2.5-2.i386.rpm) = de064ec539a1bd6f2482e3c2fecde392
+MD5 (rpm/gtk+-1.2.9-4.i386.rpm) = fbabd839e9196eec18abd0c8cc164c02
diff --git a/x11-toolkits/linux-f10-gtk/pkg-plist.alpha b/x11-toolkits/linux-f10-gtk/pkg-plist.alpha
index 467929621980..ba9995db51b5 100644
--- a/x11-toolkits/linux-f10-gtk/pkg-plist.alpha
+++ b/x11-toolkits/linux-f10-gtk/pkg-plist.alpha
@@ -1,5 +1,7 @@
etc/gtk/gtkrc
-etc/gtk/gtkrc.bg
+etc/gtk/gtkrc.az
+etc/gtk/gtkrc.cp1251
+etc/gtk/gtkrc.cp1255
etc/gtk/gtkrc.el
etc/gtk/gtkrc.eo
etc/gtk/gtkrc.he
@@ -20,15 +22,16 @@ 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/doc/gtk+-1.2.6/AUTHORS
-usr/doc/gtk+-1.2.6/COPYING
-usr/doc/gtk+-1.2.6/ChangeLog
-usr/doc/gtk+-1.2.6/NEWS
-usr/doc/gtk+-1.2.6/README
-usr/doc/gtk+-1.2.6/TODO
-usr/lib/libgdk-1.2.so.0.5.1
-usr/lib/libgtk-1.2.so.0.5.1
+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
@@ -40,12 +43,15 @@ 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
@@ -54,72 +60,123 @@ 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
-@dirrm usr/etc/gtk
-@dirrm usr/doc/gtk+-1.2.6
+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
@unexec rmdir %D/usr/share/themes/Default 2>/dev/null || true
@unexec rmdir %D/usr/share/themes 2>/dev/null || true
@comment this port is not covered with mtree so removing locale directories.
-@unexec rmdir %D/usr/share/locale/ca/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/ca 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/cs/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/cs 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/da/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/da 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/de/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/de 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/el/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/el 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/es/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/es 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/et/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/et 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/eu/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/eu 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/fi/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/fi 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/fr/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/fr 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/ga/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/ga 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/hr/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/hr 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/hu/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/hu 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/it/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/it 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/ja/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/ja 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/ko/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/ko 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/nl/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/nl 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/no/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/no 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/pl/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/pl 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/pt/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/pt 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/pt_BR/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/pt_BR 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/ro/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/ro 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/ru/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/ru 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/sk/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/sk 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/sl/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/sl 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/sv/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/sv 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/uk/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/uk 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/wa/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/wa 2>/dev/null || true
@unexec rmdir %D/usr/share/locale/zh_TW.Big5/LC_MESSAGES 2>/dev/null || true
@unexec rmdir %D/usr/share/locale/zh_TW.Big5 2>/dev/null || true
+@unexec rmdir %D/usr/share/locale/zh_CN.GB2312/LC_MESSAGES 2>/dev/null || true
+@unexec rmdir %D/usr/share/locale/zh_CN.GB2312 2>/dev/null || true
+@unexec rmdir %D/usr/share/locale/wa/LC_MESSAGES 2>/dev/null || true
+@unexec rmdir %D/usr/share/locale/wa 2>/dev/null || true
+@unexec rmdir %D/usr/share/locale/uk/LC_MESSAGES 2>/dev/null || true
+@unexec rmdir %D/usr/share/locale/uk 2>/dev/null || true
+@unexec rmdir %D/usr/share/locale/tr/LC_MESSAGES 2>/dev/null || true
+@unexec rmdir %D/usr/share/locale/tr 2>/dev/null || true
+@unexec rmdir %D/usr/share/locale/sv/LC_MESSAGES 2>/dev/null || true
+@unexec rmdir %D/usr/share/locale/sv 2>/dev/null || true
+@unexec rmdir %D/usr/share/locale/sr/LC_MESSAGES 2>/dev/null || true
+@unexec rmdir %D/usr/share/locale/sr 2>/dev/null || true
+@unexec rmdir %D/usr/share/locale/sp/LC_MESSAGES 2>/dev/null || true
+@unexec rmdir %D/usr/share/locale/sp 2>/dev/null || true
+@unexec rmdir %D/usr/share/locale/sl/LC_MESSAGES 2>/dev/null || true
+@unexec rmdir %D/usr/share/locale/sl 2>/dev/null || true
+@unexec rmdir %D/usr/share/locale/sk/LC_MESSAGES 2>/dev/null || true
+@unexec rmdir %D/usr/share/locale/sk 2>/dev/null || true
+@unexec rmdir %D/usr/share/locale/ru/LC_MESSAGES 2>/dev/null || true
+@unexec rmdir %D/usr/share/locale/ru 2>/dev/null || true
+@unexec rmdir %D/usr/share/locale/ro/LC_MESSAGES 2>/dev/null || true
+@unexec rmdir %D/usr/share/locale/ro 2>/dev/null || true
+@unexec rmdir %D/usr/share/locale/pt_BR/LC_MESSAGES 2>/dev/null || true
+@unexec rmdir %D/usr/share/locale/pt_BR 2>/dev/null || true
+@unexec rmdir %D/usr/share/locale/pt/LC_MESSAGES 2>/dev/null || true
+@unexec rmdir %D/usr/share/locale/pt 2>/dev/null || true
+@unexec rmdir %D/usr/share/locale/pl/LC_MESSAGES 2>/dev/null || true
+@unexec rmdir %D/usr/share/locale/pl 2>/dev/null || true
+@unexec rmdir %D/usr/share/locale/no/LC_MESSAGES 2>/dev/null || true
+@unexec rmdir %D/usr/share/locale/no 2>/dev/null || true
+@unexec rmdir %D/usr/share/locale/nn/LC_MESSAGES 2>/dev/null || true
+@unexec rmdir %D/usr/share/locale/nn 2>/dev/null || true
+@unexec rmdir %D/usr/share/locale/nl/LC_MESSAGES 2>/dev/null || true
+@unexec rmdir %D/usr/share/locale/nl 2>/dev/null || true
+@unexec rmdir %D/usr/share/locale/lt/LC_MESSAGES 2>/dev/null || true
+@unexec rmdir %D/usr/share/locale/lt 2>/dev/null || true
+@unexec rmdir %D/usr/share/locale/ko/LC_MESSAGES 2>/dev/null || true
+@unexec rmdir %D/usr/share/locale/ko 2>/dev/null || true
+@unexec rmdir %D/usr/share/locale/ja/LC_MESSAGES 2>/dev/null || true
+@unexec rmdir %D/usr/share/locale/ja 2>/dev/null || true
+@unexec rmdir %D/usr/share/locale/it/LC_MESSAGES 2>/dev/null || true
+@unexec rmdir %D/usr/share/locale/it 2>/dev/null || true
+@unexec rmdir %D/usr/share/locale/hu/LC_MESSAGES 2>/dev/null || true
+@unexec rmdir %D/usr/share/locale/hu 2>/dev/null || true
+@unexec rmdir %D/usr/share/locale/hr/LC_MESSAGES 2>/dev/null || true
+@unexec rmdir %D/usr/share/locale/hr 2>/dev/null || true
+@unexec rmdir %D/usr/share/locale/gl/LC_MESSAGES 2>/dev/null || true
+@unexec rmdir %D/usr/share/locale/gl 2>/dev/null || true
+@unexec rmdir %D/usr/share/locale/ga/LC_MESSAGES 2>/dev/null || true
+@unexec rmdir %D/usr/share/locale/ga 2>/dev/null || true
+@unexec rmdir %D/usr/share/locale/fr/LC_MESSAGES 2>/dev/null || true
+@unexec rmdir %D/usr/share/locale/fr 2>/dev/null || true
+@unexec rmdir %D/usr/share/locale/fi/LC_MESSAGES 2>/dev/null || true
+@unexec rmdir %D/usr/share/locale/fi 2>/dev/null || true
+@unexec rmdir %D/usr/share/locale/eu/LC_MESSAGES 2>/dev/null || true
+@unexec rmdir %D/usr/share/locale/eu 2>/dev/null || true
+@unexec rmdir %D/usr/share/locale/et/LC_MESSAGES 2>/dev/null || true
+@unexec rmdir %D/usr/share/locale/et 2>/dev/null || true
+@unexec rmdir %D/usr/share/locale/es/LC_MESSAGES 2>/dev/null || true
+@unexec rmdir %D/usr/share/locale/es 2>/dev/null || true
+@unexec rmdir %D/usr/share/locale/el/LC_MESSAGES 2>/dev/null || true
+@unexec rmdir %D/usr/share/locale/el 2>/dev/null || true
+@unexec rmdir %D/usr/share/locale/de/LC_MESSAGES 2>/dev/null || true
+@unexec rmdir %D/usr/share/locale/de 2>/dev/null || true
+@unexec rmdir %D/usr/share/locale/da/LC_MESSAGES 2>/dev/null || true
+@unexec rmdir %D/usr/share/locale/da 2>/dev/null || true
+@unexec rmdir %D/usr/share/locale/cs/LC_MESSAGES 2>/dev/null || true
+@unexec rmdir %D/usr/share/locale/cs 2>/dev/null || true
+@unexec rmdir %D/usr/share/locale/ca/LC_MESSAGES 2>/dev/null || true
+@unexec rmdir %D/usr/share/locale/ca 2>/dev/null || true
+@unexec rmdir %D/usr/share/locale/az/LC_MESSAGES 2>/dev/null || true
+@unexec rmdir %D/usr/share/locale/az 2>/dev/null || true
+
diff --git a/x11-toolkits/linux-f10-gtk/pkg-plist.i386 b/x11-toolkits/linux-f10-gtk/pkg-plist.i386
index cbeb41a0631a..bfff3d2d83bf 100644
--- a/x11-toolkits/linux-f10-gtk/pkg-plist.i386
+++ b/x11-toolkits/linux-f10-gtk/pkg-plist.i386
@@ -1,29 +1,37 @@
etc/gtk/gtkrc
-etc/gtk/gtkrc.cs
-etc/gtk/gtkrc.hr
-etc/gtk/gtkrc.hu
+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-9
+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.pl
-etc/gtk/gtkrc.ro
etc/gtk/gtkrc.ru
-etc/gtk/gtkrc.sk
-etc/gtk/gtkrc.sl
-etc/gtk/gtkrc.sr
+etc/gtk/gtkrc.th
etc/gtk/gtkrc.tr
etc/gtk/gtkrc.uk
-usr/doc/gtk+-1.2.5/AUTHORS
-usr/doc/gtk+-1.2.5/COPYING
-usr/doc/gtk+-1.2.5/ChangeLog
-usr/doc/gtk+-1.2.5/NEWS
-usr/doc/gtk+-1.2.5/README
-usr/doc/gtk+-1.2.5/TODO
-usr/lib/libgdk-1.2.so.0.5.0
-usr/lib/libgdk-1.2.so.0
-usr/lib/libgtk-1.2.so.0.5.0
-usr/lib/libgtk-1.2.so.0
+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
@@ -35,35 +43,108 @@ 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/doc/gtk+-1.2.5
+@dirrm usr/share/doc/gtk+-1.2.9
@dirrm usr/share/themes/Default/gtk
-@comment this port is not covered with mtree so removing locale directories.
-@unexec rmdir %D/usr/share/themes/Default 2>/dev/null || true
-@unexec rmdir %D/usr/share/themes 2>/dev/null || true
@unexec rmdir %D/usr/share/themes/Default 2>/dev/null || true
@unexec rmdir %D/usr/share/themes 2>/dev/null || true
+@comment this port is not covered with mtree so removing locale directories.
@unexec rmdir %D/usr/share/locale/zh_TW.Big5/LC_MESSAGES 2>/dev/null || true
@unexec rmdir %D/usr/share/locale/zh_TW.Big5 2>/dev/null || true
+@unexec rmdir %D/usr/share/locale/zh_CN.GB2312/LC_MESSAGES 2>/dev/null || true
+@unexec rmdir %D/usr/share/locale/zh_CN.GB2312 2>/dev/null || true
@unexec rmdir %D/usr/share/locale/wa/LC_MESSAGES 2>/dev/null || true
@unexec rmdir %D/usr/share/locale/wa 2>/dev/null || true
+@unexec rmdir %D/usr/share/locale/uk/LC_MESSAGES 2>/dev/null || true
+@unexec rmdir %D/usr/share/locale/uk 2>/dev/null || true
+@unexec rmdir %D/usr/share/locale/tr/LC_MESSAGES 2>/dev/null || true
+@unexec rmdir %D/usr/share/locale/tr 2>/dev/null || true
+@unexec rmdir %D/usr/share/locale/sv/LC_MESSAGES 2>/dev/null || true
+@unexec rmdir %D/usr/share/locale/sv 2>/dev/null || true
+@unexec rmdir %D/usr/share/locale/sr/LC_MESSAGES 2>/dev/null || true
+@unexec rmdir %D/usr/share/locale/sr 2>/dev/null || true
+@unexec rmdir %D/usr/share/locale/sp/LC_MESSAGES 2>/dev/null || true
+@unexec rmdir %D/usr/share/locale/sp 2>/dev/null || true
+@unexec rmdir %D/usr/share/locale/sl/LC_MESSAGES 2>/dev/null || true
+@unexec rmdir %D/usr/share/locale/sl 2>/dev/null || true
+@unexec rmdir %D/usr/share/locale/sk/LC_MESSAGES 2>/dev/null || true
+@unexec rmdir %D/usr/share/locale/sk 2>/dev/null || true
+@unexec rmdir %D/usr/share/locale/ru/LC_MESSAGES 2>/dev/null || true
+@unexec rmdir %D/usr/share/locale/ru 2>/dev/null || true
+@unexec rmdir %D/usr/share/locale/ro/LC_MESSAGES 2>/dev/null || true
+@unexec rmdir %D/usr/share/locale/ro 2>/dev/null || true
+@unexec rmdir %D/usr/share/locale/pt_BR/LC_MESSAGES 2>/dev/null || true
+@unexec rmdir %D/usr/share/locale/pt_BR 2>/dev/null || true
+@unexec rmdir %D/usr/share/locale/pt/LC_MESSAGES 2>/dev/null || true
+@unexec rmdir %D/usr/share/locale/pt 2>/dev/null || true
+@unexec rmdir %D/usr/share/locale/pl/LC_MESSAGES 2>/dev/null || true
+@unexec rmdir %D/usr/share/locale/pl 2>/dev/null || true
+@unexec rmdir %D/usr/share/locale/no/LC_MESSAGES 2>/dev/null || true
+@unexec rmdir %D/usr/share/locale/no 2>/dev/null || true
+@unexec rmdir %D/usr/share/locale/nn/LC_MESSAGES 2>/dev/null || true
+@unexec rmdir %D/usr/share/locale/nn 2>/dev/null || true
+@unexec rmdir %D/usr/share/locale/nl/LC_MESSAGES 2>/dev/null || true
+@unexec rmdir %D/usr/share/locale/nl 2>/dev/null || true
+@unexec rmdir %D/usr/share/locale/lt/LC_MESSAGES 2>/dev/null || true
+@unexec rmdir %D/usr/share/locale/lt 2>/dev/null || true
+@unexec rmdir %D/usr/share/locale/ko/LC_MESSAGES 2>/dev/null || true
+@unexec rmdir %D/usr/share/locale/ko 2>/dev/null || true
@unexec rmdir %D/usr/share/locale/ja/LC_MESSAGES 2>/dev/null || true
@unexec rmdir %D/usr/share/locale/ja 2>/dev/null || true
@unexec rmdir %D/usr/share/locale/it/LC_MESSAGES 2>/dev/null || true
@@ -72,13 +153,29 @@ usr/share/themes/Default/gtk/gtkrc
@unexec rmdir %D/usr/share/locale/hu 2>/dev/null || true
@unexec rmdir %D/usr/share/locale/hr/LC_MESSAGES 2>/dev/null || true
@unexec rmdir %D/usr/share/locale/hr 2>/dev/null || true
+@unexec rmdir %D/usr/share/locale/gl/LC_MESSAGES 2>/dev/null || true
+@unexec rmdir %D/usr/share/locale/gl 2>/dev/null || true
@unexec rmdir %D/usr/share/locale/ga/LC_MESSAGES 2>/dev/null || true
@unexec rmdir %D/usr/share/locale/ga 2>/dev/null || true
+@unexec rmdir %D/usr/share/locale/fr/LC_MESSAGES 2>/dev/null || true
+@unexec rmdir %D/usr/share/locale/fr 2>/dev/null || true
+@unexec rmdir %D/usr/share/locale/fi/LC_MESSAGES 2>/dev/null || true
+@unexec rmdir %D/usr/share/locale/fi 2>/dev/null || true
@unexec rmdir %D/usr/share/locale/eu/LC_MESSAGES 2>/dev/null || true
@unexec rmdir %D/usr/share/locale/eu 2>/dev/null || true
@unexec rmdir %D/usr/share/locale/et/LC_MESSAGES 2>/dev/null || true
@unexec rmdir %D/usr/share/locale/et 2>/dev/null || true
+@unexec rmdir %D/usr/share/locale/es/LC_MESSAGES 2>/dev/null || true
+@unexec rmdir %D/usr/share/locale/es 2>/dev/null || true
+@unexec rmdir %D/usr/share/locale/el/LC_MESSAGES 2>/dev/null || true
+@unexec rmdir %D/usr/share/locale/el 2>/dev/null || true
+@unexec rmdir %D/usr/share/locale/de/LC_MESSAGES 2>/dev/null || true
+@unexec rmdir %D/usr/share/locale/de 2>/dev/null || true
@unexec rmdir %D/usr/share/locale/da/LC_MESSAGES 2>/dev/null || true
@unexec rmdir %D/usr/share/locale/da 2>/dev/null || true
+@unexec rmdir %D/usr/share/locale/cs/LC_MESSAGES 2>/dev/null || true
+@unexec rmdir %D/usr/share/locale/cs 2>/dev/null || true
@unexec rmdir %D/usr/share/locale/ca/LC_MESSAGES 2>/dev/null || true
@unexec rmdir %D/usr/share/locale/ca 2>/dev/null || true
+@unexec rmdir %D/usr/share/locale/az/LC_MESSAGES 2>/dev/null || true
+@unexec rmdir %D/usr/share/locale/az 2>/dev/null || true
diff --git a/x11-toolkits/linux-f8-gtk/Makefile b/x11-toolkits/linux-f8-gtk/Makefile
index f81bf5adb223..c09e6e4692d5 100644
--- a/x11-toolkits/linux-f8-gtk/Makefile
+++ b/x11-toolkits/linux-f8-gtk/Makefile
@@ -9,7 +9,7 @@
PORTNAME?= gtk
PORTVERSION?= 1.2
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES?= x11-toolkits linux
MASTER_SITES?= ${RPM_MIRRORS:S/__DIR__/${STDDIR}/g}
PKGNAMEPREFIX= linux-
@@ -28,13 +28,20 @@ NO_FILTER_SHLIBS= yes
PLIST= ${PKGDIR}/pkg-plist.${MACHINE_ARCH}
MD5_FILE= ${MASTERDIR}/distinfo.${MACHINE_ARCH}
-RPM_MIRRORS= ${MASTER_SITE_BACKUP}
-STDDIR= redhat-6.1/${MACHINE_ARCH}/RedHat/RPMS
-UPDDIR= updates/6.1/${MACHINE_ARCH}
+# Let's avoid hardcoding 'en' as the language.
+LANG= en
+# Set the version of linux_base
+BASEVERSION= 7.1
+RPM_MIRRORS= \
+ ftp://ftp.redhat.com/pub/redhat/__DIR__/ \
+ ftp://ftp.nluug.nl/site/ftp.redhat.com/redhat/__DIR__/ \
+ ftp://ftp.mirror.ac.uk/sites/ftp.redhat.com/pub/redhat/__DIR__/
+STDDIR= linux/${BASEVERSION}/${LANG}/os/${MACHINE_ARCH}/RedHat/RPMS
+UPDDIR= linux/updates/${BASEVERSION}/${LANG}/os/${MACHINE_ARCH}
.if (${MACHINE_ARCH} == "i386")
-RPM_SET?= gtk+-1.2.5-2.${MACHINE_ARCH}.rpm
+RPM_SET?= gtk+-1.2.9-4.${MACHINE_ARCH}.rpm
.elif (${MACHINE_ARCH} == "alpha")
-RPM_SET?= gtk+-1.2.6-1.${MACHINE_ARCH}.rpm
+RPM_SET?= gtk+-1.2.9-4.${MACHINE_ARCH}.rpm
.endif
DBPATH= /var/lib/rpm
RPMFLAGS= --ignoreos --root ${PREFIX} --dbpath ${DBPATH} \
@@ -44,7 +51,7 @@ RPMDIR= ${DISTDIR}/${DIST_SUBDIR}
do-install:
@for R in ${RPM_SET}; do \
${ECHO} $$R; \
- rpm -U ${RPMFLAGS} ${RPMDIR}/$$R; \
+ rpm -U ${RPMFLAGS} ${RPMDIR}/$$R || true ; \
done
.include <bsd.port.mk>
diff --git a/x11-toolkits/linux-f8-gtk/distinfo.alpha b/x11-toolkits/linux-f8-gtk/distinfo.alpha
index f2a98363053b..dcb408aa79b6 100644
--- a/x11-toolkits/linux-f8-gtk/distinfo.alpha
+++ b/x11-toolkits/linux-f8-gtk/distinfo.alpha
@@ -1 +1 @@
-MD5 (rpm/gtk+-1.2.6-1.alpha.rpm) = d9297097a194ef522fad4a64f8398cc0
+MD5 (rpm/gtk+-1.2.9-4.alpha.rpm) = 72107f3edc89e27e1481b89fd752ff82
diff --git a/x11-toolkits/linux-f8-gtk/distinfo.i386 b/x11-toolkits/linux-f8-gtk/distinfo.i386
index 68db97f99742..31e9fdf2b849 100644
--- a/x11-toolkits/linux-f8-gtk/distinfo.i386
+++ b/x11-toolkits/linux-f8-gtk/distinfo.i386
@@ -1 +1 @@
-MD5 (rpm/gtk+-1.2.5-2.i386.rpm) = de064ec539a1bd6f2482e3c2fecde392
+MD5 (rpm/gtk+-1.2.9-4.i386.rpm) = fbabd839e9196eec18abd0c8cc164c02
diff --git a/x11-toolkits/linux-f8-gtk/pkg-plist.alpha b/x11-toolkits/linux-f8-gtk/pkg-plist.alpha
index 467929621980..ba9995db51b5 100644
--- a/x11-toolkits/linux-f8-gtk/pkg-plist.alpha
+++ b/x11-toolkits/linux-f8-gtk/pkg-plist.alpha
@@ -1,5 +1,7 @@
etc/gtk/gtkrc
-etc/gtk/gtkrc.bg
+etc/gtk/gtkrc.az
+etc/gtk/gtkrc.cp1251
+etc/gtk/gtkrc.cp1255
etc/gtk/gtkrc.el
etc/gtk/gtkrc.eo
etc/gtk/gtkrc.he
@@ -20,15 +22,16 @@ 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/doc/gtk+-1.2.6/AUTHORS
-usr/doc/gtk+-1.2.6/COPYING
-usr/doc/gtk+-1.2.6/ChangeLog
-usr/doc/gtk+-1.2.6/NEWS
-usr/doc/gtk+-1.2.6/README
-usr/doc/gtk+-1.2.6/TODO
-usr/lib/libgdk-1.2.so.0.5.1
-usr/lib/libgtk-1.2.so.0.5.1
+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
@@ -40,12 +43,15 @@ 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
@@ -54,72 +60,123 @@ 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
-@dirrm usr/etc/gtk
-@dirrm usr/doc/gtk+-1.2.6
+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
@unexec rmdir %D/usr/share/themes/Default 2>/dev/null || true
@unexec rmdir %D/usr/share/themes 2>/dev/null || true
@comment this port is not covered with mtree so removing locale directories.
-@unexec rmdir %D/usr/share/locale/ca/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/ca 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/cs/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/cs 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/da/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/da 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/de/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/de 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/el/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/el 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/es/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/es 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/et/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/et 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/eu/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/eu 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/fi/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/fi 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/fr/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/fr 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/ga/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/ga 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/hr/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/hr 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/hu/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/hu 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/it/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/it 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/ja/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/ja 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/ko/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/ko 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/nl/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/nl 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/no/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/no 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/pl/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/pl 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/pt/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/pt 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/pt_BR/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/pt_BR 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/ro/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/ro 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/ru/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/ru 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/sk/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/sk 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/sl/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/sl 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/sv/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/sv 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/uk/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/uk 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/wa/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/wa 2>/dev/null || true
@unexec rmdir %D/usr/share/locale/zh_TW.Big5/LC_MESSAGES 2>/dev/null || true
@unexec rmdir %D/usr/share/locale/zh_TW.Big5 2>/dev/null || true
+@unexec rmdir %D/usr/share/locale/zh_CN.GB2312/LC_MESSAGES 2>/dev/null || true
+@unexec rmdir %D/usr/share/locale/zh_CN.GB2312 2>/dev/null || true
+@unexec rmdir %D/usr/share/locale/wa/LC_MESSAGES 2>/dev/null || true
+@unexec rmdir %D/usr/share/locale/wa 2>/dev/null || true
+@unexec rmdir %D/usr/share/locale/uk/LC_MESSAGES 2>/dev/null || true
+@unexec rmdir %D/usr/share/locale/uk 2>/dev/null || true
+@unexec rmdir %D/usr/share/locale/tr/LC_MESSAGES 2>/dev/null || true
+@unexec rmdir %D/usr/share/locale/tr 2>/dev/null || true
+@unexec rmdir %D/usr/share/locale/sv/LC_MESSAGES 2>/dev/null || true
+@unexec rmdir %D/usr/share/locale/sv 2>/dev/null || true
+@unexec rmdir %D/usr/share/locale/sr/LC_MESSAGES 2>/dev/null || true
+@unexec rmdir %D/usr/share/locale/sr 2>/dev/null || true
+@unexec rmdir %D/usr/share/locale/sp/LC_MESSAGES 2>/dev/null || true
+@unexec rmdir %D/usr/share/locale/sp 2>/dev/null || true
+@unexec rmdir %D/usr/share/locale/sl/LC_MESSAGES 2>/dev/null || true
+@unexec rmdir %D/usr/share/locale/sl 2>/dev/null || true
+@unexec rmdir %D/usr/share/locale/sk/LC_MESSAGES 2>/dev/null || true
+@unexec rmdir %D/usr/share/locale/sk 2>/dev/null || true
+@unexec rmdir %D/usr/share/locale/ru/LC_MESSAGES 2>/dev/null || true
+@unexec rmdir %D/usr/share/locale/ru 2>/dev/null || true
+@unexec rmdir %D/usr/share/locale/ro/LC_MESSAGES 2>/dev/null || true
+@unexec rmdir %D/usr/share/locale/ro 2>/dev/null || true
+@unexec rmdir %D/usr/share/locale/pt_BR/LC_MESSAGES 2>/dev/null || true
+@unexec rmdir %D/usr/share/locale/pt_BR 2>/dev/null || true
+@unexec rmdir %D/usr/share/locale/pt/LC_MESSAGES 2>/dev/null || true
+@unexec rmdir %D/usr/share/locale/pt 2>/dev/null || true
+@unexec rmdir %D/usr/share/locale/pl/LC_MESSAGES 2>/dev/null || true
+@unexec rmdir %D/usr/share/locale/pl 2>/dev/null || true
+@unexec rmdir %D/usr/share/locale/no/LC_MESSAGES 2>/dev/null || true
+@unexec rmdir %D/usr/share/locale/no 2>/dev/null || true
+@unexec rmdir %D/usr/share/locale/nn/LC_MESSAGES 2>/dev/null || true
+@unexec rmdir %D/usr/share/locale/nn 2>/dev/null || true
+@unexec rmdir %D/usr/share/locale/nl/LC_MESSAGES 2>/dev/null || true
+@unexec rmdir %D/usr/share/locale/nl 2>/dev/null || true
+@unexec rmdir %D/usr/share/locale/lt/LC_MESSAGES 2>/dev/null || true
+@unexec rmdir %D/usr/share/locale/lt 2>/dev/null || true
+@unexec rmdir %D/usr/share/locale/ko/LC_MESSAGES 2>/dev/null || true
+@unexec rmdir %D/usr/share/locale/ko 2>/dev/null || true
+@unexec rmdir %D/usr/share/locale/ja/LC_MESSAGES 2>/dev/null || true
+@unexec rmdir %D/usr/share/locale/ja 2>/dev/null || true
+@unexec rmdir %D/usr/share/locale/it/LC_MESSAGES 2>/dev/null || true
+@unexec rmdir %D/usr/share/locale/it 2>/dev/null || true
+@unexec rmdir %D/usr/share/locale/hu/LC_MESSAGES 2>/dev/null || true
+@unexec rmdir %D/usr/share/locale/hu 2>/dev/null || true
+@unexec rmdir %D/usr/share/locale/hr/LC_MESSAGES 2>/dev/null || true
+@unexec rmdir %D/usr/share/locale/hr 2>/dev/null || true
+@unexec rmdir %D/usr/share/locale/gl/LC_MESSAGES 2>/dev/null || true
+@unexec rmdir %D/usr/share/locale/gl 2>/dev/null || true
+@unexec rmdir %D/usr/share/locale/ga/LC_MESSAGES 2>/dev/null || true
+@unexec rmdir %D/usr/share/locale/ga 2>/dev/null || true
+@unexec rmdir %D/usr/share/locale/fr/LC_MESSAGES 2>/dev/null || true
+@unexec rmdir %D/usr/share/locale/fr 2>/dev/null || true
+@unexec rmdir %D/usr/share/locale/fi/LC_MESSAGES 2>/dev/null || true
+@unexec rmdir %D/usr/share/locale/fi 2>/dev/null || true
+@unexec rmdir %D/usr/share/locale/eu/LC_MESSAGES 2>/dev/null || true
+@unexec rmdir %D/usr/share/locale/eu 2>/dev/null || true
+@unexec rmdir %D/usr/share/locale/et/LC_MESSAGES 2>/dev/null || true
+@unexec rmdir %D/usr/share/locale/et 2>/dev/null || true
+@unexec rmdir %D/usr/share/locale/es/LC_MESSAGES 2>/dev/null || true
+@unexec rmdir %D/usr/share/locale/es 2>/dev/null || true
+@unexec rmdir %D/usr/share/locale/el/LC_MESSAGES 2>/dev/null || true
+@unexec rmdir %D/usr/share/locale/el 2>/dev/null || true
+@unexec rmdir %D/usr/share/locale/de/LC_MESSAGES 2>/dev/null || true
+@unexec rmdir %D/usr/share/locale/de 2>/dev/null || true
+@unexec rmdir %D/usr/share/locale/da/LC_MESSAGES 2>/dev/null || true
+@unexec rmdir %D/usr/share/locale/da 2>/dev/null || true
+@unexec rmdir %D/usr/share/locale/cs/LC_MESSAGES 2>/dev/null || true
+@unexec rmdir %D/usr/share/locale/cs 2>/dev/null || true
+@unexec rmdir %D/usr/share/locale/ca/LC_MESSAGES 2>/dev/null || true
+@unexec rmdir %D/usr/share/locale/ca 2>/dev/null || true
+@unexec rmdir %D/usr/share/locale/az/LC_MESSAGES 2>/dev/null || true
+@unexec rmdir %D/usr/share/locale/az 2>/dev/null || true
+
diff --git a/x11-toolkits/linux-f8-gtk/pkg-plist.i386 b/x11-toolkits/linux-f8-gtk/pkg-plist.i386
index cbeb41a0631a..bfff3d2d83bf 100644
--- a/x11-toolkits/linux-f8-gtk/pkg-plist.i386
+++ b/x11-toolkits/linux-f8-gtk/pkg-plist.i386
@@ -1,29 +1,37 @@
etc/gtk/gtkrc
-etc/gtk/gtkrc.cs
-etc/gtk/gtkrc.hr
-etc/gtk/gtkrc.hu
+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-9
+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.pl
-etc/gtk/gtkrc.ro
etc/gtk/gtkrc.ru
-etc/gtk/gtkrc.sk
-etc/gtk/gtkrc.sl
-etc/gtk/gtkrc.sr
+etc/gtk/gtkrc.th
etc/gtk/gtkrc.tr
etc/gtk/gtkrc.uk
-usr/doc/gtk+-1.2.5/AUTHORS
-usr/doc/gtk+-1.2.5/COPYING
-usr/doc/gtk+-1.2.5/ChangeLog
-usr/doc/gtk+-1.2.5/NEWS
-usr/doc/gtk+-1.2.5/README
-usr/doc/gtk+-1.2.5/TODO
-usr/lib/libgdk-1.2.so.0.5.0
-usr/lib/libgdk-1.2.so.0
-usr/lib/libgtk-1.2.so.0.5.0
-usr/lib/libgtk-1.2.so.0
+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
@@ -35,35 +43,108 @@ 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/doc/gtk+-1.2.5
+@dirrm usr/share/doc/gtk+-1.2.9
@dirrm usr/share/themes/Default/gtk
-@comment this port is not covered with mtree so removing locale directories.
-@unexec rmdir %D/usr/share/themes/Default 2>/dev/null || true
-@unexec rmdir %D/usr/share/themes 2>/dev/null || true
@unexec rmdir %D/usr/share/themes/Default 2>/dev/null || true
@unexec rmdir %D/usr/share/themes 2>/dev/null || true
+@comment this port is not covered with mtree so removing locale directories.
@unexec rmdir %D/usr/share/locale/zh_TW.Big5/LC_MESSAGES 2>/dev/null || true
@unexec rmdir %D/usr/share/locale/zh_TW.Big5 2>/dev/null || true
+@unexec rmdir %D/usr/share/locale/zh_CN.GB2312/LC_MESSAGES 2>/dev/null || true
+@unexec rmdir %D/usr/share/locale/zh_CN.GB2312 2>/dev/null || true
@unexec rmdir %D/usr/share/locale/wa/LC_MESSAGES 2>/dev/null || true
@unexec rmdir %D/usr/share/locale/wa 2>/dev/null || true
+@unexec rmdir %D/usr/share/locale/uk/LC_MESSAGES 2>/dev/null || true
+@unexec rmdir %D/usr/share/locale/uk 2>/dev/null || true
+@unexec rmdir %D/usr/share/locale/tr/LC_MESSAGES 2>/dev/null || true
+@unexec rmdir %D/usr/share/locale/tr 2>/dev/null || true
+@unexec rmdir %D/usr/share/locale/sv/LC_MESSAGES 2>/dev/null || true
+@unexec rmdir %D/usr/share/locale/sv 2>/dev/null || true
+@unexec rmdir %D/usr/share/locale/sr/LC_MESSAGES 2>/dev/null || true
+@unexec rmdir %D/usr/share/locale/sr 2>/dev/null || true
+@unexec rmdir %D/usr/share/locale/sp/LC_MESSAGES 2>/dev/null || true
+@unexec rmdir %D/usr/share/locale/sp 2>/dev/null || true
+@unexec rmdir %D/usr/share/locale/sl/LC_MESSAGES 2>/dev/null || true
+@unexec rmdir %D/usr/share/locale/sl 2>/dev/null || true
+@unexec rmdir %D/usr/share/locale/sk/LC_MESSAGES 2>/dev/null || true
+@unexec rmdir %D/usr/share/locale/sk 2>/dev/null || true
+@unexec rmdir %D/usr/share/locale/ru/LC_MESSAGES 2>/dev/null || true
+@unexec rmdir %D/usr/share/locale/ru 2>/dev/null || true
+@unexec rmdir %D/usr/share/locale/ro/LC_MESSAGES 2>/dev/null || true
+@unexec rmdir %D/usr/share/locale/ro 2>/dev/null || true
+@unexec rmdir %D/usr/share/locale/pt_BR/LC_MESSAGES 2>/dev/null || true
+@unexec rmdir %D/usr/share/locale/pt_BR 2>/dev/null || true
+@unexec rmdir %D/usr/share/locale/pt/LC_MESSAGES 2>/dev/null || true
+@unexec rmdir %D/usr/share/locale/pt 2>/dev/null || true
+@unexec rmdir %D/usr/share/locale/pl/LC_MESSAGES 2>/dev/null || true
+@unexec rmdir %D/usr/share/locale/pl 2>/dev/null || true
+@unexec rmdir %D/usr/share/locale/no/LC_MESSAGES 2>/dev/null || true
+@unexec rmdir %D/usr/share/locale/no 2>/dev/null || true
+@unexec rmdir %D/usr/share/locale/nn/LC_MESSAGES 2>/dev/null || true
+@unexec rmdir %D/usr/share/locale/nn 2>/dev/null || true
+@unexec rmdir %D/usr/share/locale/nl/LC_MESSAGES 2>/dev/null || true
+@unexec rmdir %D/usr/share/locale/nl 2>/dev/null || true
+@unexec rmdir %D/usr/share/locale/lt/LC_MESSAGES 2>/dev/null || true
+@unexec rmdir %D/usr/share/locale/lt 2>/dev/null || true
+@unexec rmdir %D/usr/share/locale/ko/LC_MESSAGES 2>/dev/null || true
+@unexec rmdir %D/usr/share/locale/ko 2>/dev/null || true
@unexec rmdir %D/usr/share/locale/ja/LC_MESSAGES 2>/dev/null || true
@unexec rmdir %D/usr/share/locale/ja 2>/dev/null || true
@unexec rmdir %D/usr/share/locale/it/LC_MESSAGES 2>/dev/null || true
@@ -72,13 +153,29 @@ usr/share/themes/Default/gtk/gtkrc
@unexec rmdir %D/usr/share/locale/hu 2>/dev/null || true
@unexec rmdir %D/usr/share/locale/hr/LC_MESSAGES 2>/dev/null || true
@unexec rmdir %D/usr/share/locale/hr 2>/dev/null || true
+@unexec rmdir %D/usr/share/locale/gl/LC_MESSAGES 2>/dev/null || true
+@unexec rmdir %D/usr/share/locale/gl 2>/dev/null || true
@unexec rmdir %D/usr/share/locale/ga/LC_MESSAGES 2>/dev/null || true
@unexec rmdir %D/usr/share/locale/ga 2>/dev/null || true
+@unexec rmdir %D/usr/share/locale/fr/LC_MESSAGES 2>/dev/null || true
+@unexec rmdir %D/usr/share/locale/fr 2>/dev/null || true
+@unexec rmdir %D/usr/share/locale/fi/LC_MESSAGES 2>/dev/null || true
+@unexec rmdir %D/usr/share/locale/fi 2>/dev/null || true
@unexec rmdir %D/usr/share/locale/eu/LC_MESSAGES 2>/dev/null || true
@unexec rmdir %D/usr/share/locale/eu 2>/dev/null || true
@unexec rmdir %D/usr/share/locale/et/LC_MESSAGES 2>/dev/null || true
@unexec rmdir %D/usr/share/locale/et 2>/dev/null || true
+@unexec rmdir %D/usr/share/locale/es/LC_MESSAGES 2>/dev/null || true
+@unexec rmdir %D/usr/share/locale/es 2>/dev/null || true
+@unexec rmdir %D/usr/share/locale/el/LC_MESSAGES 2>/dev/null || true
+@unexec rmdir %D/usr/share/locale/el 2>/dev/null || true
+@unexec rmdir %D/usr/share/locale/de/LC_MESSAGES 2>/dev/null || true
+@unexec rmdir %D/usr/share/locale/de 2>/dev/null || true
@unexec rmdir %D/usr/share/locale/da/LC_MESSAGES 2>/dev/null || true
@unexec rmdir %D/usr/share/locale/da 2>/dev/null || true
+@unexec rmdir %D/usr/share/locale/cs/LC_MESSAGES 2>/dev/null || true
+@unexec rmdir %D/usr/share/locale/cs 2>/dev/null || true
@unexec rmdir %D/usr/share/locale/ca/LC_MESSAGES 2>/dev/null || true
@unexec rmdir %D/usr/share/locale/ca 2>/dev/null || true
+@unexec rmdir %D/usr/share/locale/az/LC_MESSAGES 2>/dev/null || true
+@unexec rmdir %D/usr/share/locale/az 2>/dev/null || true
diff --git a/x11-toolkits/linux-gtk/Makefile b/x11-toolkits/linux-gtk/Makefile
index f81bf5adb223..c09e6e4692d5 100644
--- a/x11-toolkits/linux-gtk/Makefile
+++ b/x11-toolkits/linux-gtk/Makefile
@@ -9,7 +9,7 @@
PORTNAME?= gtk
PORTVERSION?= 1.2
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES?= x11-toolkits linux
MASTER_SITES?= ${RPM_MIRRORS:S/__DIR__/${STDDIR}/g}
PKGNAMEPREFIX= linux-
@@ -28,13 +28,20 @@ NO_FILTER_SHLIBS= yes
PLIST= ${PKGDIR}/pkg-plist.${MACHINE_ARCH}
MD5_FILE= ${MASTERDIR}/distinfo.${MACHINE_ARCH}
-RPM_MIRRORS= ${MASTER_SITE_BACKUP}
-STDDIR= redhat-6.1/${MACHINE_ARCH}/RedHat/RPMS
-UPDDIR= updates/6.1/${MACHINE_ARCH}
+# Let's avoid hardcoding 'en' as the language.
+LANG= en
+# Set the version of linux_base
+BASEVERSION= 7.1
+RPM_MIRRORS= \
+ ftp://ftp.redhat.com/pub/redhat/__DIR__/ \
+ ftp://ftp.nluug.nl/site/ftp.redhat.com/redhat/__DIR__/ \
+ ftp://ftp.mirror.ac.uk/sites/ftp.redhat.com/pub/redhat/__DIR__/
+STDDIR= linux/${BASEVERSION}/${LANG}/os/${MACHINE_ARCH}/RedHat/RPMS
+UPDDIR= linux/updates/${BASEVERSION}/${LANG}/os/${MACHINE_ARCH}
.if (${MACHINE_ARCH} == "i386")
-RPM_SET?= gtk+-1.2.5-2.${MACHINE_ARCH}.rpm
+RPM_SET?= gtk+-1.2.9-4.${MACHINE_ARCH}.rpm
.elif (${MACHINE_ARCH} == "alpha")
-RPM_SET?= gtk+-1.2.6-1.${MACHINE_ARCH}.rpm
+RPM_SET?= gtk+-1.2.9-4.${MACHINE_ARCH}.rpm
.endif
DBPATH= /var/lib/rpm
RPMFLAGS= --ignoreos --root ${PREFIX} --dbpath ${DBPATH} \
@@ -44,7 +51,7 @@ RPMDIR= ${DISTDIR}/${DIST_SUBDIR}
do-install:
@for R in ${RPM_SET}; do \
${ECHO} $$R; \
- rpm -U ${RPMFLAGS} ${RPMDIR}/$$R; \
+ rpm -U ${RPMFLAGS} ${RPMDIR}/$$R || true ; \
done
.include <bsd.port.mk>
diff --git a/x11-toolkits/linux-gtk/distinfo.alpha b/x11-toolkits/linux-gtk/distinfo.alpha
index f2a98363053b..dcb408aa79b6 100644
--- a/x11-toolkits/linux-gtk/distinfo.alpha
+++ b/x11-toolkits/linux-gtk/distinfo.alpha
@@ -1 +1 @@
-MD5 (rpm/gtk+-1.2.6-1.alpha.rpm) = d9297097a194ef522fad4a64f8398cc0
+MD5 (rpm/gtk+-1.2.9-4.alpha.rpm) = 72107f3edc89e27e1481b89fd752ff82
diff --git a/x11-toolkits/linux-gtk/distinfo.i386 b/x11-toolkits/linux-gtk/distinfo.i386
index 68db97f99742..31e9fdf2b849 100644
--- a/x11-toolkits/linux-gtk/distinfo.i386
+++ b/x11-toolkits/linux-gtk/distinfo.i386
@@ -1 +1 @@
-MD5 (rpm/gtk+-1.2.5-2.i386.rpm) = de064ec539a1bd6f2482e3c2fecde392
+MD5 (rpm/gtk+-1.2.9-4.i386.rpm) = fbabd839e9196eec18abd0c8cc164c02
diff --git a/x11-toolkits/linux-gtk/pkg-plist.alpha b/x11-toolkits/linux-gtk/pkg-plist.alpha
index 467929621980..ba9995db51b5 100644
--- a/x11-toolkits/linux-gtk/pkg-plist.alpha
+++ b/x11-toolkits/linux-gtk/pkg-plist.alpha
@@ -1,5 +1,7 @@
etc/gtk/gtkrc
-etc/gtk/gtkrc.bg
+etc/gtk/gtkrc.az
+etc/gtk/gtkrc.cp1251
+etc/gtk/gtkrc.cp1255
etc/gtk/gtkrc.el
etc/gtk/gtkrc.eo
etc/gtk/gtkrc.he
@@ -20,15 +22,16 @@ 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/doc/gtk+-1.2.6/AUTHORS
-usr/doc/gtk+-1.2.6/COPYING
-usr/doc/gtk+-1.2.6/ChangeLog
-usr/doc/gtk+-1.2.6/NEWS
-usr/doc/gtk+-1.2.6/README
-usr/doc/gtk+-1.2.6/TODO
-usr/lib/libgdk-1.2.so.0.5.1
-usr/lib/libgtk-1.2.so.0.5.1
+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
@@ -40,12 +43,15 @@ 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
@@ -54,72 +60,123 @@ 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
-@dirrm usr/etc/gtk
-@dirrm usr/doc/gtk+-1.2.6
+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
@unexec rmdir %D/usr/share/themes/Default 2>/dev/null || true
@unexec rmdir %D/usr/share/themes 2>/dev/null || true
@comment this port is not covered with mtree so removing locale directories.
-@unexec rmdir %D/usr/share/locale/ca/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/ca 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/cs/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/cs 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/da/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/da 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/de/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/de 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/el/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/el 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/es/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/es 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/et/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/et 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/eu/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/eu 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/fi/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/fi 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/fr/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/fr 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/ga/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/ga 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/hr/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/hr 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/hu/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/hu 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/it/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/it 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/ja/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/ja 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/ko/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/ko 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/nl/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/nl 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/no/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/no 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/pl/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/pl 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/pt/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/pt 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/pt_BR/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/pt_BR 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/ro/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/ro 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/ru/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/ru 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/sk/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/sk 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/sl/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/sl 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/sv/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/sv 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/uk/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/uk 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/wa/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/usr/share/locale/wa 2>/dev/null || true
@unexec rmdir %D/usr/share/locale/zh_TW.Big5/LC_MESSAGES 2>/dev/null || true
@unexec rmdir %D/usr/share/locale/zh_TW.Big5 2>/dev/null || true
+@unexec rmdir %D/usr/share/locale/zh_CN.GB2312/LC_MESSAGES 2>/dev/null || true
+@unexec rmdir %D/usr/share/locale/zh_CN.GB2312 2>/dev/null || true
+@unexec rmdir %D/usr/share/locale/wa/LC_MESSAGES 2>/dev/null || true
+@unexec rmdir %D/usr/share/locale/wa 2>/dev/null || true
+@unexec rmdir %D/usr/share/locale/uk/LC_MESSAGES 2>/dev/null || true
+@unexec rmdir %D/usr/share/locale/uk 2>/dev/null || true
+@unexec rmdir %D/usr/share/locale/tr/LC_MESSAGES 2>/dev/null || true
+@unexec rmdir %D/usr/share/locale/tr 2>/dev/null || true
+@unexec rmdir %D/usr/share/locale/sv/LC_MESSAGES 2>/dev/null || true
+@unexec rmdir %D/usr/share/locale/sv 2>/dev/null || true
+@unexec rmdir %D/usr/share/locale/sr/LC_MESSAGES 2>/dev/null || true
+@unexec rmdir %D/usr/share/locale/sr 2>/dev/null || true
+@unexec rmdir %D/usr/share/locale/sp/LC_MESSAGES 2>/dev/null || true
+@unexec rmdir %D/usr/share/locale/sp 2>/dev/null || true
+@unexec rmdir %D/usr/share/locale/sl/LC_MESSAGES 2>/dev/null || true
+@unexec rmdir %D/usr/share/locale/sl 2>/dev/null || true
+@unexec rmdir %D/usr/share/locale/sk/LC_MESSAGES 2>/dev/null || true
+@unexec rmdir %D/usr/share/locale/sk 2>/dev/null || true
+@unexec rmdir %D/usr/share/locale/ru/LC_MESSAGES 2>/dev/null || true
+@unexec rmdir %D/usr/share/locale/ru 2>/dev/null || true
+@unexec rmdir %D/usr/share/locale/ro/LC_MESSAGES 2>/dev/null || true
+@unexec rmdir %D/usr/share/locale/ro 2>/dev/null || true
+@unexec rmdir %D/usr/share/locale/pt_BR/LC_MESSAGES 2>/dev/null || true
+@unexec rmdir %D/usr/share/locale/pt_BR 2>/dev/null || true
+@unexec rmdir %D/usr/share/locale/pt/LC_MESSAGES 2>/dev/null || true
+@unexec rmdir %D/usr/share/locale/pt 2>/dev/null || true
+@unexec rmdir %D/usr/share/locale/pl/LC_MESSAGES 2>/dev/null || true
+@unexec rmdir %D/usr/share/locale/pl 2>/dev/null || true
+@unexec rmdir %D/usr/share/locale/no/LC_MESSAGES 2>/dev/null || true
+@unexec rmdir %D/usr/share/locale/no 2>/dev/null || true
+@unexec rmdir %D/usr/share/locale/nn/LC_MESSAGES 2>/dev/null || true
+@unexec rmdir %D/usr/share/locale/nn 2>/dev/null || true
+@unexec rmdir %D/usr/share/locale/nl/LC_MESSAGES 2>/dev/null || true
+@unexec rmdir %D/usr/share/locale/nl 2>/dev/null || true
+@unexec rmdir %D/usr/share/locale/lt/LC_MESSAGES 2>/dev/null || true
+@unexec rmdir %D/usr/share/locale/lt 2>/dev/null || true
+@unexec rmdir %D/usr/share/locale/ko/LC_MESSAGES 2>/dev/null || true
+@unexec rmdir %D/usr/share/locale/ko 2>/dev/null || true
+@unexec rmdir %D/usr/share/locale/ja/LC_MESSAGES 2>/dev/null || true
+@unexec rmdir %D/usr/share/locale/ja 2>/dev/null || true
+@unexec rmdir %D/usr/share/locale/it/LC_MESSAGES 2>/dev/null || true
+@unexec rmdir %D/usr/share/locale/it 2>/dev/null || true
+@unexec rmdir %D/usr/share/locale/hu/LC_MESSAGES 2>/dev/null || true
+@unexec rmdir %D/usr/share/locale/hu 2>/dev/null || true
+@unexec rmdir %D/usr/share/locale/hr/LC_MESSAGES 2>/dev/null || true
+@unexec rmdir %D/usr/share/locale/hr 2>/dev/null || true
+@unexec rmdir %D/usr/share/locale/gl/LC_MESSAGES 2>/dev/null || true
+@unexec rmdir %D/usr/share/locale/gl 2>/dev/null || true
+@unexec rmdir %D/usr/share/locale/ga/LC_MESSAGES 2>/dev/null || true
+@unexec rmdir %D/usr/share/locale/ga 2>/dev/null || true
+@unexec rmdir %D/usr/share/locale/fr/LC_MESSAGES 2>/dev/null || true
+@unexec rmdir %D/usr/share/locale/fr 2>/dev/null || true
+@unexec rmdir %D/usr/share/locale/fi/LC_MESSAGES 2>/dev/null || true
+@unexec rmdir %D/usr/share/locale/fi 2>/dev/null || true
+@unexec rmdir %D/usr/share/locale/eu/LC_MESSAGES 2>/dev/null || true
+@unexec rmdir %D/usr/share/locale/eu 2>/dev/null || true
+@unexec rmdir %D/usr/share/locale/et/LC_MESSAGES 2>/dev/null || true
+@unexec rmdir %D/usr/share/locale/et 2>/dev/null || true
+@unexec rmdir %D/usr/share/locale/es/LC_MESSAGES 2>/dev/null || true
+@unexec rmdir %D/usr/share/locale/es 2>/dev/null || true
+@unexec rmdir %D/usr/share/locale/el/LC_MESSAGES 2>/dev/null || true
+@unexec rmdir %D/usr/share/locale/el 2>/dev/null || true
+@unexec rmdir %D/usr/share/locale/de/LC_MESSAGES 2>/dev/null || true
+@unexec rmdir %D/usr/share/locale/de 2>/dev/null || true
+@unexec rmdir %D/usr/share/locale/da/LC_MESSAGES 2>/dev/null || true
+@unexec rmdir %D/usr/share/locale/da 2>/dev/null || true
+@unexec rmdir %D/usr/share/locale/cs/LC_MESSAGES 2>/dev/null || true
+@unexec rmdir %D/usr/share/locale/cs 2>/dev/null || true
+@unexec rmdir %D/usr/share/locale/ca/LC_MESSAGES 2>/dev/null || true
+@unexec rmdir %D/usr/share/locale/ca 2>/dev/null || true
+@unexec rmdir %D/usr/share/locale/az/LC_MESSAGES 2>/dev/null || true
+@unexec rmdir %D/usr/share/locale/az 2>/dev/null || true
+
diff --git a/x11-toolkits/linux-gtk/pkg-plist.i386 b/x11-toolkits/linux-gtk/pkg-plist.i386
index cbeb41a0631a..bfff3d2d83bf 100644
--- a/x11-toolkits/linux-gtk/pkg-plist.i386
+++ b/x11-toolkits/linux-gtk/pkg-plist.i386
@@ -1,29 +1,37 @@
etc/gtk/gtkrc
-etc/gtk/gtkrc.cs
-etc/gtk/gtkrc.hr
-etc/gtk/gtkrc.hu
+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-9
+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.pl
-etc/gtk/gtkrc.ro
etc/gtk/gtkrc.ru
-etc/gtk/gtkrc.sk
-etc/gtk/gtkrc.sl
-etc/gtk/gtkrc.sr
+etc/gtk/gtkrc.th
etc/gtk/gtkrc.tr
etc/gtk/gtkrc.uk
-usr/doc/gtk+-1.2.5/AUTHORS
-usr/doc/gtk+-1.2.5/COPYING
-usr/doc/gtk+-1.2.5/ChangeLog
-usr/doc/gtk+-1.2.5/NEWS
-usr/doc/gtk+-1.2.5/README
-usr/doc/gtk+-1.2.5/TODO
-usr/lib/libgdk-1.2.so.0.5.0
-usr/lib/libgdk-1.2.so.0
-usr/lib/libgtk-1.2.so.0.5.0
-usr/lib/libgtk-1.2.so.0
+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
@@ -35,35 +43,108 @@ 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/doc/gtk+-1.2.5
+@dirrm usr/share/doc/gtk+-1.2.9
@dirrm usr/share/themes/Default/gtk
-@comment this port is not covered with mtree so removing locale directories.
-@unexec rmdir %D/usr/share/themes/Default 2>/dev/null || true
-@unexec rmdir %D/usr/share/themes 2>/dev/null || true
@unexec rmdir %D/usr/share/themes/Default 2>/dev/null || true
@unexec rmdir %D/usr/share/themes 2>/dev/null || true
+@comment this port is not covered with mtree so removing locale directories.
@unexec rmdir %D/usr/share/locale/zh_TW.Big5/LC_MESSAGES 2>/dev/null || true
@unexec rmdir %D/usr/share/locale/zh_TW.Big5 2>/dev/null || true
+@unexec rmdir %D/usr/share/locale/zh_CN.GB2312/LC_MESSAGES 2>/dev/null || true
+@unexec rmdir %D/usr/share/locale/zh_CN.GB2312 2>/dev/null || true
@unexec rmdir %D/usr/share/locale/wa/LC_MESSAGES 2>/dev/null || true
@unexec rmdir %D/usr/share/locale/wa 2>/dev/null || true
+@unexec rmdir %D/usr/share/locale/uk/LC_MESSAGES 2>/dev/null || true
+@unexec rmdir %D/usr/share/locale/uk 2>/dev/null || true
+@unexec rmdir %D/usr/share/locale/tr/LC_MESSAGES 2>/dev/null || true
+@unexec rmdir %D/usr/share/locale/tr 2>/dev/null || true
+@unexec rmdir %D/usr/share/locale/sv/LC_MESSAGES 2>/dev/null || true
+@unexec rmdir %D/usr/share/locale/sv 2>/dev/null || true
+@unexec rmdir %D/usr/share/locale/sr/LC_MESSAGES 2>/dev/null || true
+@unexec rmdir %D/usr/share/locale/sr 2>/dev/null || true
+@unexec rmdir %D/usr/share/locale/sp/LC_MESSAGES 2>/dev/null || true
+@unexec rmdir %D/usr/share/locale/sp 2>/dev/null || true
+@unexec rmdir %D/usr/share/locale/sl/LC_MESSAGES 2>/dev/null || true
+@unexec rmdir %D/usr/share/locale/sl 2>/dev/null || true
+@unexec rmdir %D/usr/share/locale/sk/LC_MESSAGES 2>/dev/null || true
+@unexec rmdir %D/usr/share/locale/sk 2>/dev/null || true
+@unexec rmdir %D/usr/share/locale/ru/LC_MESSAGES 2>/dev/null || true
+@unexec rmdir %D/usr/share/locale/ru 2>/dev/null || true
+@unexec rmdir %D/usr/share/locale/ro/LC_MESSAGES 2>/dev/null || true
+@unexec rmdir %D/usr/share/locale/ro 2>/dev/null || true
+@unexec rmdir %D/usr/share/locale/pt_BR/LC_MESSAGES 2>/dev/null || true
+@unexec rmdir %D/usr/share/locale/pt_BR 2>/dev/null || true
+@unexec rmdir %D/usr/share/locale/pt/LC_MESSAGES 2>/dev/null || true
+@unexec rmdir %D/usr/share/locale/pt 2>/dev/null || true
+@unexec rmdir %D/usr/share/locale/pl/LC_MESSAGES 2>/dev/null || true
+@unexec rmdir %D/usr/share/locale/pl 2>/dev/null || true
+@unexec rmdir %D/usr/share/locale/no/LC_MESSAGES 2>/dev/null || true
+@unexec rmdir %D/usr/share/locale/no 2>/dev/null || true
+@unexec rmdir %D/usr/share/locale/nn/LC_MESSAGES 2>/dev/null || true
+@unexec rmdir %D/usr/share/locale/nn 2>/dev/null || true
+@unexec rmdir %D/usr/share/locale/nl/LC_MESSAGES 2>/dev/null || true
+@unexec rmdir %D/usr/share/locale/nl 2>/dev/null || true
+@unexec rmdir %D/usr/share/locale/lt/LC_MESSAGES 2>/dev/null || true
+@unexec rmdir %D/usr/share/locale/lt 2>/dev/null || true
+@unexec rmdir %D/usr/share/locale/ko/LC_MESSAGES 2>/dev/null || true
+@unexec rmdir %D/usr/share/locale/ko 2>/dev/null || true
@unexec rmdir %D/usr/share/locale/ja/LC_MESSAGES 2>/dev/null || true
@unexec rmdir %D/usr/share/locale/ja 2>/dev/null || true
@unexec rmdir %D/usr/share/locale/it/LC_MESSAGES 2>/dev/null || true
@@ -72,13 +153,29 @@ usr/share/themes/Default/gtk/gtkrc
@unexec rmdir %D/usr/share/locale/hu 2>/dev/null || true
@unexec rmdir %D/usr/share/locale/hr/LC_MESSAGES 2>/dev/null || true
@unexec rmdir %D/usr/share/locale/hr 2>/dev/null || true
+@unexec rmdir %D/usr/share/locale/gl/LC_MESSAGES 2>/dev/null || true
+@unexec rmdir %D/usr/share/locale/gl 2>/dev/null || true
@unexec rmdir %D/usr/share/locale/ga/LC_MESSAGES 2>/dev/null || true
@unexec rmdir %D/usr/share/locale/ga 2>/dev/null || true
+@unexec rmdir %D/usr/share/locale/fr/LC_MESSAGES 2>/dev/null || true
+@unexec rmdir %D/usr/share/locale/fr 2>/dev/null || true
+@unexec rmdir %D/usr/share/locale/fi/LC_MESSAGES 2>/dev/null || true
+@unexec rmdir %D/usr/share/locale/fi 2>/dev/null || true
@unexec rmdir %D/usr/share/locale/eu/LC_MESSAGES 2>/dev/null || true
@unexec rmdir %D/usr/share/locale/eu 2>/dev/null || true
@unexec rmdir %D/usr/share/locale/et/LC_MESSAGES 2>/dev/null || true
@unexec rmdir %D/usr/share/locale/et 2>/dev/null || true
+@unexec rmdir %D/usr/share/locale/es/LC_MESSAGES 2>/dev/null || true
+@unexec rmdir %D/usr/share/locale/es 2>/dev/null || true
+@unexec rmdir %D/usr/share/locale/el/LC_MESSAGES 2>/dev/null || true
+@unexec rmdir %D/usr/share/locale/el 2>/dev/null || true
+@unexec rmdir %D/usr/share/locale/de/LC_MESSAGES 2>/dev/null || true
+@unexec rmdir %D/usr/share/locale/de 2>/dev/null || true
@unexec rmdir %D/usr/share/locale/da/LC_MESSAGES 2>/dev/null || true
@unexec rmdir %D/usr/share/locale/da 2>/dev/null || true
+@unexec rmdir %D/usr/share/locale/cs/LC_MESSAGES 2>/dev/null || true
+@unexec rmdir %D/usr/share/locale/cs 2>/dev/null || true
@unexec rmdir %D/usr/share/locale/ca/LC_MESSAGES 2>/dev/null || true
@unexec rmdir %D/usr/share/locale/ca 2>/dev/null || true
+@unexec rmdir %D/usr/share/locale/az/LC_MESSAGES 2>/dev/null || true
+@unexec rmdir %D/usr/share/locale/az 2>/dev/null || true
diff --git a/x11/linux-gnomelibs/Makefile b/x11/linux-gnomelibs/Makefile
index dfd9fc7b4f96..832e78fc82f0 100644
--- a/x11/linux-gnomelibs/Makefile
+++ b/x11/linux-gnomelibs/Makefile
@@ -6,22 +6,17 @@
#
PORTNAME= gnomelibs
-.if (${MACHINE_ARCH} == "i386")
-PORTVERSION= 1.0.40
-.elif (${MACHINE_ARCH} == "alpha")
-PORTVERSION= 1.0.54
-.endif
-
+PORTVERSION= 1.2.8
CATEGORIES= x11 linux
MAINTAINER= taoka@FreeBSD.org
-RPM_SET= gnome-libs-${PORTVERSION}-1.${MACHINE_ARCH}.rpm
+RPM_SET= gnome-libs-${PORTVERSION}-11.${MACHINE_ARCH}.rpm
.include "../../x11-toolkits/linux-gtk/Makefile"
.if (${MACHINE_ARCH} == "i386")
-MASTER_SITES= ftp://ftp.redhat.com/pub/redhat/linux/6.1/en/os/i386/RedHat/RPMS/
+MASTER_SITES+= ftp://ftp.redhat.com/pub/redhat/linux/7.1/en/os/i386/RedHat/RPMS/
.elif (${MACHINE_ARCH} == "alpha")
-MASTER_SITES= ftp://ftp.redhat.com/pub/redhat/linux/6.1/en/os/alpha/RedHat/RPMS/
+MASTER_SITES+= ftp://ftp.redhat.com/pub/redhat/linux/7.1/en/os/alpha/RedHat/RPMS/
.endif
diff --git a/x11/linux-gnomelibs/distinfo.alpha b/x11/linux-gnomelibs/distinfo.alpha
index ffe652940688..f078942a5d4a 100644
--- a/x11/linux-gnomelibs/distinfo.alpha
+++ b/x11/linux-gnomelibs/distinfo.alpha
@@ -1 +1 @@
-MD5 (rpm/gnome-libs-1.0.54-1.alpha.rpm) = 81d5bbd4f2fa44b0e6cc1c5fae0fa5f4
+MD5 (rpm/gnome-libs-1.2.8-11.alpha.rpm) = f0c13edcc03e2f034abc02b5862cf012
diff --git a/x11/linux-gnomelibs/distinfo.i386 b/x11/linux-gnomelibs/distinfo.i386
index 923e0af93a6b..e6c4817b17a5 100644
--- a/x11/linux-gnomelibs/distinfo.i386
+++ b/x11/linux-gnomelibs/distinfo.i386
@@ -1 +1 @@
-MD5 (rpm/gnome-libs-1.0.40-1.i386.rpm) = 3132ff6485f44f323961206e1c446c39
+MD5 (rpm/gnome-libs-1.2.8-11.i386.rpm) = 6352b24f9d7d7d7d9dfb3ccac356a4cb
diff --git a/x11/linux-gnomelibs/pkg-plist.alpha b/x11/linux-gnomelibs/pkg-plist.alpha
index 439caa5b6b64..fa990faf9fdc 100644
--- a/x11/linux-gnomelibs/pkg-plist.alpha
+++ b/x11/linux-gnomelibs/pkg-plist.alpha
@@ -1,3 +1,22 @@
+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
@@ -13,48 +32,20 @@ usr/bin/gnome-name-service
usr/bin/gnome_segv
usr/bin/goad-browser
usr/bin/loadshlib
-usr/bin/new-object
-usr/doc/gnome-libs-1.0.54/AUTHORS
-usr/doc/gnome-libs-1.0.54/COPYING
-usr/doc/gnome-libs-1.0.54/ChangeLog
-usr/doc/gnome-libs-1.0.54/NEWS
-usr/doc/gnome-libs-1.0.54/README
-usr/lib/libart_lgpl.so.2
-usr/lib/libart_lgpl.so.2.1.0
-usr/lib/libgnome.so.32
-usr/lib/libgnome.so.32.3.8
-usr/lib/libgnomesupport.so.0
+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
-usr/lib/libgnomeui.so.32.10.3
-usr/lib/libgnorba.so.27
+usr/lib/libgnomeui.so.32.12.1
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
-usr/lib/libzvt.so.2.2.6
+usr/lib/libzvt.so.2.2.9
usr/sbin/gnome-pty-helper
-usr/share/gtkrc
-usr/share/gtkrc.el
-usr/share/gtkrc.eo
-usr/share/gtkrc.he
-usr/share/gtkrc.hy
-usr/share/gtkrc.iso88592
-usr/share/gtkrc.iso88595
-usr/share/gtkrc.ja
-usr/share/gtkrc.ka_GE.georgianacademy
-usr/share/gtkrc.ka_GE.georgianps
-usr/share/gtkrc.ko
-usr/share/gtkrc.ru
-usr/share/gtkrc.th
-usr/share/gtkrc.tr
-usr/share/gtkrc.uk
-usr/share/gtkrc.vi_VN.tcvn
-usr/share/gtkrc.vi_VN.viscii
-usr/share/gtkrc.zh_CN
-usr/share/gtkrc.zh_TW.Big5
+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
@@ -80,15 +71,23 @@ 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
@@ -100,9 +99,19 @@ 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 usr/doc/gnome-libs-1.0.40
-@dirrm usr/share/mime-info
-@dirrm usr/share/pixmaps
-@dirrm usr/share/type-convert
+@dirrm etc/gnome
diff --git a/x11/linux-gnomelibs/pkg-plist.i386 b/x11/linux-gnomelibs/pkg-plist.i386
index 70d3a4599b60..9f3fbc95a4de 100644
--- a/x11/linux-gnomelibs/pkg-plist.i386
+++ b/x11/linux-gnomelibs/pkg-plist.i386
@@ -1,3 +1,22 @@
+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
@@ -13,48 +32,20 @@ usr/bin/gnome-name-service
usr/bin/gnome_segv
usr/bin/goad-browser
usr/bin/loadshlib
-usr/bin/new-object
-usr/doc/gnome-libs-1.0.40/AUTHORS
-usr/doc/gnome-libs-1.0.40/COPYING
-usr/doc/gnome-libs-1.0.40/ChangeLog
-usr/doc/gnome-libs-1.0.40/NEWS
-usr/doc/gnome-libs-1.0.40/README
-usr/lib/libart_lgpl.so.2
-usr/lib/libart_lgpl.so.2.1.0
-usr/lib/libgnome.so.32
-usr/lib/libgnome.so.32.3.7
-usr/lib/libgnomesupport.so.0
+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
-usr/lib/libgnomeui.so.32.10.3
-usr/lib/libgnorba.so.27
+usr/lib/libgnomeui.so.32.12.1
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
-usr/lib/libzvt.so.2.2.6
+usr/lib/libzvt.so.2.2.9
usr/sbin/gnome-pty-helper
-usr/share/gtkrc
-usr/share/gtkrc.el
-usr/share/gtkrc.eo
-usr/share/gtkrc.he
-usr/share/gtkrc.hy
-usr/share/gtkrc.iso88592
-usr/share/gtkrc.iso88595
-usr/share/gtkrc.ja
-usr/share/gtkrc.ka_GE.georgianacademy
-usr/share/gtkrc.ka_GE.georgianps
-usr/share/gtkrc.ko
-usr/share/gtkrc.ru
-usr/share/gtkrc.th
-usr/share/gtkrc.tr
-usr/share/gtkrc.uk
-usr/share/gtkrc.vi_VN.tcvn
-usr/share/gtkrc.vi_VN.viscii
-usr/share/gtkrc.zh_CN
-usr/share/gtkrc.zh_TW.Big5
+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
@@ -74,20 +65,29 @@ 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
@@ -99,9 +99,20 @@ 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/idl
+@dirrm usr/share/doc/gnome-libs-1.2.8
@dirrm etc/sound/events
@dirrm etc/sound
-@dirrm usr/doc/gnome-libs-1.0.40
-@dirrm usr/share/mime-info
-@dirrm usr/share/pixmaps
-@dirrm usr/share/type-convert
+@dirrm etc/gnome