aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--UPDATING8
-rw-r--r--accessibility/linux-atk/Makefile8
-rw-r--r--accessibility/linux-f10-atk/Makefile8
-rw-r--r--accessibility/linux-f8-atk/Makefile8
-rw-r--r--astro/google-earth/Makefile5
-rw-r--r--audio/linux-f10-openal/Makefile2
-rw-r--r--audio/linux-f8-openal/Makefile2
-rw-r--r--audio/linux-openal/Makefile2
-rw-r--r--devel/linux-glib2/Makefile7
-rw-r--r--emulators/linux_base-fc4/Makefile9
-rw-r--r--emulators/linux_base-fc4/distinfo.i3866
-rw-r--r--emulators/linux_base-fc4/pkg-plist104
-rw-r--r--graphics/linux-XnViewMP/Makefile3
-rw-r--r--www/linux-mplayer-plugin/Makefile8
-rw-r--r--x11-toolkits/linux-f10-gtk2/Makefile7
-rw-r--r--x11-toolkits/linux-f10-pango/Makefile7
-rw-r--r--x11-toolkits/linux-f8-gtk2/Makefile7
-rw-r--r--x11-toolkits/linux-f8-pango/Makefile7
-rw-r--r--x11-toolkits/linux-gtk2/Makefile7
-rw-r--r--x11-toolkits/linux-pango/Makefile7
20 files changed, 135 insertions, 87 deletions
diff --git a/UPDATING b/UPDATING
index 7d4862dad642..5c682a9ac3d8 100644
--- a/UPDATING
+++ b/UPDATING
@@ -6,6 +6,14 @@ You should get into the habit of checking this file for changes each
time you update your ports collection, before attempting any port
upgrades.
+20090121:
+ AFFECTS: users of devel/linux-glib2, emulation/linux_base-f4
+ AUTHOR: bsam@FreeBSD.org
+
+ Glib2 now is incorporated to emulation/linux_base-fc4 (it has always
+ been a part of more recent linux base ports). All users should deinstall
+ devel/linux-glib2 and then deinstall/reinstall emulation/linux_base-f4.
+
20090119:
AFFECTS: users of mail/claws-mail, mail/claws-mail-smime
AUTHOR: netchild@FreeBSD.org
diff --git a/accessibility/linux-atk/Makefile b/accessibility/linux-atk/Makefile
index 76997bb4f9aa..dbc2265c7518 100644
--- a/accessibility/linux-atk/Makefile
+++ b/accessibility/linux-atk/Makefile
@@ -7,19 +7,13 @@
PORTNAME= atk
PORTVERSION= 1.9.1
+PORTREVISION= 1
CATEGORIES= accessibility linux
DISTNAME= ${PORTNAME}-${PORTVERSION}-1
MAINTAINER= freebsd-emulation@FreeBSD.org
COMMENT= Accessibility Toolkit, Linux/i386 binary
-.if !defined(OVERRIDE_LINUX_BASE_PORT) || \
- (${OVERRIDE_LINUX_BASE_PORT} != "fc6" && \
- ${OVERRIDE_LINUX_BASE_PORT} != "f7" && \
- ${OVERRIDE_LINUX_BASE_PORT} != "f8")
-RUN_DEPENDS= ${LINUXBASE}/usr/lib/libglib-2.0.so.0:${PORTSDIR}/devel/linux-glib2
-.endif
-
ONLY_FOR_ARCHS= i386 amd64
USE_LINUX_RPM= yes
LINUX_DIST_VER= 4
diff --git a/accessibility/linux-f10-atk/Makefile b/accessibility/linux-f10-atk/Makefile
index 76997bb4f9aa..dbc2265c7518 100644
--- a/accessibility/linux-f10-atk/Makefile
+++ b/accessibility/linux-f10-atk/Makefile
@@ -7,19 +7,13 @@
PORTNAME= atk
PORTVERSION= 1.9.1
+PORTREVISION= 1
CATEGORIES= accessibility linux
DISTNAME= ${PORTNAME}-${PORTVERSION}-1
MAINTAINER= freebsd-emulation@FreeBSD.org
COMMENT= Accessibility Toolkit, Linux/i386 binary
-.if !defined(OVERRIDE_LINUX_BASE_PORT) || \
- (${OVERRIDE_LINUX_BASE_PORT} != "fc6" && \
- ${OVERRIDE_LINUX_BASE_PORT} != "f7" && \
- ${OVERRIDE_LINUX_BASE_PORT} != "f8")
-RUN_DEPENDS= ${LINUXBASE}/usr/lib/libglib-2.0.so.0:${PORTSDIR}/devel/linux-glib2
-.endif
-
ONLY_FOR_ARCHS= i386 amd64
USE_LINUX_RPM= yes
LINUX_DIST_VER= 4
diff --git a/accessibility/linux-f8-atk/Makefile b/accessibility/linux-f8-atk/Makefile
index 76997bb4f9aa..dbc2265c7518 100644
--- a/accessibility/linux-f8-atk/Makefile
+++ b/accessibility/linux-f8-atk/Makefile
@@ -7,19 +7,13 @@
PORTNAME= atk
PORTVERSION= 1.9.1
+PORTREVISION= 1
CATEGORIES= accessibility linux
DISTNAME= ${PORTNAME}-${PORTVERSION}-1
MAINTAINER= freebsd-emulation@FreeBSD.org
COMMENT= Accessibility Toolkit, Linux/i386 binary
-.if !defined(OVERRIDE_LINUX_BASE_PORT) || \
- (${OVERRIDE_LINUX_BASE_PORT} != "fc6" && \
- ${OVERRIDE_LINUX_BASE_PORT} != "f7" && \
- ${OVERRIDE_LINUX_BASE_PORT} != "f8")
-RUN_DEPENDS= ${LINUXBASE}/usr/lib/libglib-2.0.so.0:${PORTSDIR}/devel/linux-glib2
-.endif
-
ONLY_FOR_ARCHS= i386 amd64
USE_LINUX_RPM= yes
LINUX_DIST_VER= 4
diff --git a/astro/google-earth/Makefile b/astro/google-earth/Makefile
index e6e13e33c02e..7edc3dcb45e8 100644
--- a/astro/google-earth/Makefile
+++ b/astro/google-earth/Makefile
@@ -7,7 +7,7 @@
PORTNAME= google-earth
PORTVERSION= 4.3.7284.3916
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= astro deskutils geography
MASTER_SITES= http://dl.google.com/earth/client/current/
DISTNAME= GoogleEarthLinux
@@ -19,8 +19,7 @@ MAINTAINER= nox@FreeBSD.org
COMMENT= Explore, Search and Discover
EXTRACT_DEPENDS= unmakeself:${PORTSDIR}/archivers/unmakeself
-RUN_DEPENDS= update-mime-database:${PORTSDIR}/misc/shared-mime-info \
- ${LINUXBASE}/usr/lib/libgthread-2.0.so.0:${PORTSDIR}/devel/linux-glib2
+RUN_DEPENDS= update-mime-database:${PORTSDIR}/misc/shared-mime-info
RESTRICTED= Not sure about redistribution rights
diff --git a/audio/linux-f10-openal/Makefile b/audio/linux-f10-openal/Makefile
index 8106dec4387c..17f13446e84c 100644
--- a/audio/linux-f10-openal/Makefile
+++ b/audio/linux-f10-openal/Makefile
@@ -6,6 +6,7 @@
#
PORTNAME= openal
+PORTREVISION= 1
DISTVERSION= 0.0.9-0.6.20060204cvs.fc4
CATEGORIES= audio linux
MASTER_SITE_SUBDIR= ../extras/${LINUX_DIST_VER}/${LINUX_RPM_ARCH}/
@@ -15,7 +16,6 @@ COMMENT= A 3D positional spatialized sound library (Linux version)
RUN_DEPENDS= ${LINUXBASE}/lib/libasound.so.2:${PORTSDIR}/audio/linux-alsa-lib \
${LINUXBASE}/usr/lib/libartsc.so.0:${PORTSDIR}/audio/linux-arts \
- ${LINUXBASE}/usr/lib/libglib-2.0.so.0:${PORTSDIR}/devel/linux-glib2 \
${LINUXBASE}/usr/lib/libesd.so.0:${PORTSDIR}/audio/linux-esound \
${LINUXBASE}/usr/lib/libaudiofile.so.0:${PORTSDIR}/audio/linux-libaudiofile \
${LINUXBASE}/usr/lib/libSDL-1.2.so.0:${PORTSDIR}/devel/linux-sdl12 \
diff --git a/audio/linux-f8-openal/Makefile b/audio/linux-f8-openal/Makefile
index 8106dec4387c..17f13446e84c 100644
--- a/audio/linux-f8-openal/Makefile
+++ b/audio/linux-f8-openal/Makefile
@@ -6,6 +6,7 @@
#
PORTNAME= openal
+PORTREVISION= 1
DISTVERSION= 0.0.9-0.6.20060204cvs.fc4
CATEGORIES= audio linux
MASTER_SITE_SUBDIR= ../extras/${LINUX_DIST_VER}/${LINUX_RPM_ARCH}/
@@ -15,7 +16,6 @@ COMMENT= A 3D positional spatialized sound library (Linux version)
RUN_DEPENDS= ${LINUXBASE}/lib/libasound.so.2:${PORTSDIR}/audio/linux-alsa-lib \
${LINUXBASE}/usr/lib/libartsc.so.0:${PORTSDIR}/audio/linux-arts \
- ${LINUXBASE}/usr/lib/libglib-2.0.so.0:${PORTSDIR}/devel/linux-glib2 \
${LINUXBASE}/usr/lib/libesd.so.0:${PORTSDIR}/audio/linux-esound \
${LINUXBASE}/usr/lib/libaudiofile.so.0:${PORTSDIR}/audio/linux-libaudiofile \
${LINUXBASE}/usr/lib/libSDL-1.2.so.0:${PORTSDIR}/devel/linux-sdl12 \
diff --git a/audio/linux-openal/Makefile b/audio/linux-openal/Makefile
index 8106dec4387c..17f13446e84c 100644
--- a/audio/linux-openal/Makefile
+++ b/audio/linux-openal/Makefile
@@ -6,6 +6,7 @@
#
PORTNAME= openal
+PORTREVISION= 1
DISTVERSION= 0.0.9-0.6.20060204cvs.fc4
CATEGORIES= audio linux
MASTER_SITE_SUBDIR= ../extras/${LINUX_DIST_VER}/${LINUX_RPM_ARCH}/
@@ -15,7 +16,6 @@ COMMENT= A 3D positional spatialized sound library (Linux version)
RUN_DEPENDS= ${LINUXBASE}/lib/libasound.so.2:${PORTSDIR}/audio/linux-alsa-lib \
${LINUXBASE}/usr/lib/libartsc.so.0:${PORTSDIR}/audio/linux-arts \
- ${LINUXBASE}/usr/lib/libglib-2.0.so.0:${PORTSDIR}/devel/linux-glib2 \
${LINUXBASE}/usr/lib/libesd.so.0:${PORTSDIR}/audio/linux-esound \
${LINUXBASE}/usr/lib/libaudiofile.so.0:${PORTSDIR}/audio/linux-libaudiofile \
${LINUXBASE}/usr/lib/libSDL-1.2.so.0:${PORTSDIR}/devel/linux-sdl12 \
diff --git a/devel/linux-glib2/Makefile b/devel/linux-glib2/Makefile
index 6b13698b11d8..229b1d2521fb 100644
--- a/devel/linux-glib2/Makefile
+++ b/devel/linux-glib2/Makefile
@@ -7,14 +7,17 @@
PORTNAME= glib2
PORTVERSION= 2.6.6
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= devel linux
DISTNAME= ${PORTNAME}-${PORTVERSION}-1
MAINTAINER= freebsd-emulation@FreeBSD.org
COMMENT= Version 2.X Linux/i386 binary port of GLib
-CONFLICTS= linux_base-fc6-* linux_base-f7-* linux_base-f8-*
+CONFLICTS= linux_base-*
+
+DEPRECATED= incorporated into linux base ports
+EXPIRATION_DATE= 2009-03-01
USE_LINUX_RPM= yes
LINUX_DIST_VER= 4
diff --git a/emulators/linux_base-fc4/Makefile b/emulators/linux_base-fc4/Makefile
index a0d0f51acf70..c77c41dd7d2e 100644
--- a/emulators/linux_base-fc4/Makefile
+++ b/emulators/linux_base-fc4/Makefile
@@ -8,7 +8,7 @@
PORTNAME= fc
PORTVERSION= 4
-PORTREVISION= 13
+PORTREVISION= 14
CATEGORIES= emulators linux
MASTER_SITES= ${MASTER_SITE_FEDORA_LINUX}
MASTER_SITE_SUBDIR= ${PORTVERSION}/${LINUX_RPM_ARCH}/os/Fedora/RPMS \
@@ -39,6 +39,7 @@ BIN_DISTFILES= basesystem-8.0-5.noarch.rpm \
freetype-2.1.9-2.${LINUX_RPM_ARCH}.rpm \
gdbm-1.8.0-25.${LINUX_RPM_ARCH}.rpm \
glib-1.2.10-16.${LINUX_RPM_ARCH}.rpm \
+ glib2-2.6.6-1.${LINUX_RPM_ARCH}.rpm \
glibc-2.3.6-3.${LINUX_RPM_ARCH}.rpm \
glibc-common-2.3.6-3.${LINUX_RPM_ARCH}.rpm \
grep-2.5.1-48.2.${LINUX_RPM_ARCH}.rpm \
@@ -78,6 +79,7 @@ SRC_DISTFILES+= acl-2.2.32-1.FC4.2.src.rpm \
gcc-4.0.2-8.fc4.src.rpm \
gdbm-1.8.0-25.src.rpm \
glib-1.2.10-16.src.rpm \
+ glib2-2.6.6-1.src.rpm \
glibc-2.3.6-3.src.rpm \
grep-2.5.1-48.2.src.rpm \
krb5-1.4.1-5.src.rpm \
@@ -96,9 +98,8 @@ ALWAYS_KEEP_DISTFILES= yes
.endif
LATEST_LINK= linux_base
-CONFLICTS= linux_base-7* linux_base-deb* linux_base-gentoo* \
- linux_base-rh-9* linux_base-suse-9* linux_base-8* \
- linux_base-f8 linux_base-f7 linux_base-fc6 linux_locale*
+CONFLICTS= linux_base-gentoo* linux_locale* \
+ linux_base-f8* linux_base-f7* linux_base-fc6*
ONLY_FOR_ARCHS= i386 amd64
LINUX_RPM_ARCH= i386
USE_LINUX_PREFIX= yes
diff --git a/emulators/linux_base-fc4/distinfo.i386 b/emulators/linux_base-fc4/distinfo.i386
index 38d30c982845..3d7daaf8775b 100644
--- a/emulators/linux_base-fc4/distinfo.i386
+++ b/emulators/linux_base-fc4/distinfo.i386
@@ -46,6 +46,9 @@ SIZE (rpm/i386/fedora/4/gdbm-1.8.0-25.i386.rpm) = 26786
MD5 (rpm/i386/fedora/4/glib-1.2.10-16.i386.rpm) = 7d588e9262707bef789f52857906229b
SHA256 (rpm/i386/fedora/4/glib-1.2.10-16.i386.rpm) = 71968ffcc3cdf846910ad75ab936cfec9d36cab9996161b30fdac91f3ac78d3b
SIZE (rpm/i386/fedora/4/glib-1.2.10-16.i386.rpm) = 132994
+MD5 (rpm/i386/fedora/4/glib2-2.6.6-1.i386.rpm) = eec61332ae2e1c7c4dcb48fe087b1091
+SHA256 (rpm/i386/fedora/4/glib2-2.6.6-1.i386.rpm) = 05ed8873c533b2399fe610dec01f410b7fce5f26c46c71875d2a88c2e5e8c613
+SIZE (rpm/i386/fedora/4/glib2-2.6.6-1.i386.rpm) = 582011
MD5 (rpm/i386/fedora/4/glibc-2.3.6-3.i386.rpm) = 652ca9b12d47e47594c6e44b25c52339
SHA256 (rpm/i386/fedora/4/glibc-2.3.6-3.i386.rpm) = 3cd1070439dca900245cfa29530b8b1819b279993e5469e026b2b73eafa025ac
SIZE (rpm/i386/fedora/4/glibc-2.3.6-3.i386.rpm) = 4947776
@@ -154,6 +157,9 @@ SIZE (rpm/i386/fedora/4/gdbm-1.8.0-25.src.rpm) = 144106
MD5 (rpm/i386/fedora/4/glib-1.2.10-16.src.rpm) = 6fa2087c2afa3d0116c3ce2bdf75899d
SHA256 (rpm/i386/fedora/4/glib-1.2.10-16.src.rpm) = 04b050474badd901408096357c470837528501b9c5c10f58510db866af5efe1b
SIZE (rpm/i386/fedora/4/glib-1.2.10-16.src.rpm) = 431139
+MD5 (rpm/i386/fedora/4/glib2-2.6.6-1.src.rpm) = 35ce90411c0907a8bfebf22ede7c217f
+SHA256 (rpm/i386/fedora/4/glib2-2.6.6-1.src.rpm) = 2a2e8f06eb22895c4123e0dd697bd52d31078a1744d1ad1a29ca664dd27496af
+SIZE (rpm/i386/fedora/4/glib2-2.6.6-1.src.rpm) = 2393186
MD5 (rpm/i386/fedora/4/glibc-2.3.6-3.src.rpm) = 59b05df424f4f75495456ad66624d713
SHA256 (rpm/i386/fedora/4/glibc-2.3.6-3.src.rpm) = a830d35116d1a054fe48c51eae553a895afcf7985c29162c6bbb1d86a1c4812b
SIZE (rpm/i386/fedora/4/glibc-2.3.6-3.src.rpm) = 15747320
diff --git a/emulators/linux_base-fc4/pkg-plist b/emulators/linux_base-fc4/pkg-plist
index 29def63f8ef6..dc94e9d107ce 100644
--- a/emulators/linux_base-fc4/pkg-plist
+++ b/emulators/linux_base-fc4/pkg-plist
@@ -69,6 +69,8 @@ etc/pki/rpm-gpg/RPM-GPG-KEY-rawhide
etc/profile
etc/profile.d/colorls.csh
etc/profile.d/colorls.sh
+etc/profile.d/glib2.csh
+etc/profile.d/glib2.sh
etc/redhat-release
etc/rpc
etc/securetty
@@ -596,14 +598,22 @@ usr/lib/libgdbm.so.2
usr/lib/libgdbm.so.2.0.0
usr/lib/libglib-1.2.so.0
usr/lib/libglib-1.2.so.0.0.10
+usr/lib/libglib-2.0.so.0
+usr/lib/libglib-2.0.so.0.600.6
usr/lib/libgmodule-1.2.so.0
usr/lib/libgmodule-1.2.so.0.0.10
+usr/lib/libgmodule-2.0.so.0
+usr/lib/libgmodule-2.0.so.0.600.6
+usr/lib/libgobject-2.0.so.0
+usr/lib/libgobject-2.0.so.0.600.6
usr/lib/libgssapi_krb5.so.2
usr/lib/libgssapi_krb5.so.2.2
usr/lib/libgssrpc.so.4
usr/lib/libgssrpc.so.4.0
usr/lib/libgthread-1.2.so.0
usr/lib/libgthread-1.2.so.0.0.10
+usr/lib/libgthread-2.0.so.0
+usr/lib/libgthread-2.0.so.0.600.6
usr/lib/libhistory.so.5
usr/lib/libhistory.so.5.0
usr/lib/libk5crypto.so.3
@@ -647,17 +657,17 @@ usr/lib/libpopt.so.0
usr/lib/libpopt.so.0.0.0
usr/lib/libreadline.so.5
usr/lib/libreadline.so.5.0
+usr/lib/librt.so.1
usr/lib/libslang-utf8.so.1
usr/lib/libslang-utf8.so.1.4.9
-usr/lib/libstdc++.so.5
-usr/lib/libstdc++.so.5.0.7
-usr/lib/libstdc++.so.6
-usr/lib/libstdc++.so.6.0.7
usr/lib/libstdc++-2-libc6.1-1-2.9.0.so
usr/lib/libstdc++-3-libc6.2-2-2.10.0.so
usr/lib/libstdc++-libc6.1-1.so.2
usr/lib/libstdc++-libc6.2-2.so.3
-usr/lib/librt.so.1
+usr/lib/libstdc++.so.5
+usr/lib/libstdc++.so.5.0.7
+usr/lib/libstdc++.so.6
+usr/lib/libstdc++.so.6.0.7
usr/lib/libttf.so.2
usr/lib/libttf.so.2.3.0
usr/lib/libz.so.1
@@ -5473,6 +5483,11 @@ usr/share/doc/glib-1.2.10/COPYING
usr/share/doc/glib-1.2.10/ChangeLog
usr/share/doc/glib-1.2.10/NEWS
usr/share/doc/glib-1.2.10/README
+usr/share/doc/glib2-2.6.6/AUTHORS
+usr/share/doc/glib2-2.6.6/COPYING
+usr/share/doc/glib2-2.6.6/ChangeLog
+usr/share/doc/glib2-2.6.6/NEWS
+usr/share/doc/glib2-2.6.6/README
usr/share/doc/glibc-%%GLIBCVER%%/BUGS
usr/share/doc/glibc-%%GLIBCVER%%/CONFORMANCE
usr/share/doc/glibc-%%GLIBCVER%%/COPYING
@@ -5990,88 +6005,122 @@ usr/share/info/readline.info.gz
usr/share/info/rluserman.info.gz
usr/share/locale/af/LC_MESSAGES/coreutils.mo
usr/share/locale/af/LC_TIME/coreutils.mo
+usr/share/locale/am/LC_MESSAGES/glib20.mo
+usr/share/locale/ar/LC_MESSAGES/glib20.mo
+usr/share/locale/az/LC_MESSAGES/glib20.mo
usr/share/locale/be/LC_MESSAGES/coreutils.mo
+usr/share/locale/be/LC_MESSAGES/glib20.mo
usr/share/locale/be/LC_MESSAGES/libc.mo
usr/share/locale/be/LC_TIME/coreutils.mo
+usr/share/locale/bg/LC_MESSAGES/glib20.mo
+usr/share/locale/bn/LC_MESSAGES/glib20.mo
+usr/share/locale/bs/LC_MESSAGES/glib20.mo
usr/share/locale/ca/LC_MESSAGES/coreutils.mo
+usr/share/locale/ca/LC_MESSAGES/glib20.mo
usr/share/locale/ca/LC_MESSAGES/libc.mo
usr/share/locale/ca/LC_TIME/coreutils.mo
usr/share/locale/cs/LC_MESSAGES/coreutils.mo
usr/share/locale/cs/LC_MESSAGES/e2fsprogs.mo
usr/share/locale/cs/LC_MESSAGES/freetype.mo
+usr/share/locale/cs/LC_MESSAGES/glib20.mo
usr/share/locale/cs/LC_MESSAGES/grep.mo
usr/share/locale/cs/LC_MESSAGES/libc.mo
usr/share/locale/cs/LC_MESSAGES/popt.mo
usr/share/locale/cs/LC_TIME/coreutils.mo
+usr/share/locale/cy/LC_MESSAGES/glib20.mo
usr/share/locale/da/LC_MESSAGES/coreutils.mo
+usr/share/locale/da/LC_MESSAGES/glib20.mo
usr/share/locale/da/LC_MESSAGES/libc.mo
usr/share/locale/da/LC_MESSAGES/popt.mo
usr/share/locale/da/LC_TIME/coreutils.mo
usr/share/locale/de/LC_MESSAGES/coreutils.mo
usr/share/locale/de/LC_MESSAGES/e2fsprogs.mo
usr/share/locale/de/LC_MESSAGES/freetype.mo
+usr/share/locale/de/LC_MESSAGES/glib20.mo
usr/share/locale/de/LC_MESSAGES/grep.mo
usr/share/locale/de/LC_MESSAGES/libc.mo
usr/share/locale/de/LC_MESSAGES/popt.mo
usr/share/locale/de/LC_TIME/coreutils.mo
usr/share/locale/el/LC_MESSAGES/coreutils.mo
+usr/share/locale/el/LC_MESSAGES/glib20.mo
usr/share/locale/el/LC_MESSAGES/grep.mo
usr/share/locale/el/LC_MESSAGES/libc.mo
usr/share/locale/el/LC_TIME/coreutils.mo
usr/share/locale/en@boldquot/LC_MESSAGES/bash.mo
usr/share/locale/en@quot/LC_MESSAGES/bash.mo
+usr/share/locale/en_CA/LC_MESSAGES/glib20.mo
+usr/share/locale/en_GB/LC_MESSAGES/glib20.mo
usr/share/locale/en_GB/LC_MESSAGES/libc.mo
+usr/share/locale/eo/LC_MESSAGES/glib20.mo
usr/share/locale/eo/LC_MESSAGES/grep.mo
usr/share/locale/es/LC_MESSAGES/coreutils.mo
usr/share/locale/es/LC_MESSAGES/e2fsprogs.mo
usr/share/locale/es/LC_MESSAGES/freetype.mo
+usr/share/locale/es/LC_MESSAGES/glib20.mo
usr/share/locale/es/LC_MESSAGES/grep.mo
usr/share/locale/es/LC_MESSAGES/libc.mo
usr/share/locale/es/LC_MESSAGES/popt.mo
usr/share/locale/es/LC_TIME/coreutils.mo
usr/share/locale/et/LC_MESSAGES/coreutils.mo
+usr/share/locale/et/LC_MESSAGES/glib20.mo
usr/share/locale/et/LC_MESSAGES/grep.mo
usr/share/locale/et/LC_TIME/coreutils.mo
+usr/share/locale/eu/LC_MESSAGES/glib20.mo
usr/share/locale/eu_ES/LC_MESSAGES/popt.mo
+usr/share/locale/fa/LC_MESSAGES/glib20.mo
usr/share/locale/fi/LC_MESSAGES/coreutils.mo
+usr/share/locale/fi/LC_MESSAGES/glib20.mo
usr/share/locale/fi/LC_MESSAGES/libc.mo
usr/share/locale/fi/LC_MESSAGES/popt.mo
usr/share/locale/fi/LC_TIME/coreutils.mo
usr/share/locale/fr/LC_MESSAGES/coreutils.mo
usr/share/locale/fr/LC_MESSAGES/e2fsprogs.mo
usr/share/locale/fr/LC_MESSAGES/freetype.mo
+usr/share/locale/fr/LC_MESSAGES/glib20.mo
usr/share/locale/fr/LC_MESSAGES/grep.mo
usr/share/locale/fr/LC_MESSAGES/libc.mo
usr/share/locale/fr/LC_MESSAGES/popt.mo
usr/share/locale/fr/LC_TIME/coreutils.mo
usr/share/locale/ga/LC_MESSAGES/coreutils.mo
+usr/share/locale/ga/LC_MESSAGES/glib20.mo
usr/share/locale/ga/LC_TIME/coreutils.mo
usr/share/locale/gl/LC_MESSAGES/coreutils.mo
+usr/share/locale/gl/LC_MESSAGES/glib20.mo
usr/share/locale/gl/LC_MESSAGES/grep.mo
usr/share/locale/gl/LC_MESSAGES/libc.mo
usr/share/locale/gl/LC_MESSAGES/popt.mo
usr/share/locale/gl/LC_TIME/coreutils.mo
+usr/share/locale/gu/LC_MESSAGES/glib20.mo
+usr/share/locale/he/LC_MESSAGES/glib20.mo
+usr/share/locale/hi/LC_MESSAGES/glib20.mo
+usr/share/locale/hr/LC_MESSAGES/glib20.mo
usr/share/locale/hr/LC_MESSAGES/grep.mo
usr/share/locale/hr/LC_MESSAGES/libc.mo
usr/share/locale/hu/LC_MESSAGES/coreutils.mo
+usr/share/locale/hu/LC_MESSAGES/glib20.mo
usr/share/locale/hu/LC_MESSAGES/libc.mo
usr/share/locale/hu/LC_MESSAGES/popt.mo
usr/share/locale/hu/LC_TIME/coreutils.mo
+usr/share/locale/id/LC_MESSAGES/glib20.mo
usr/share/locale/id/LC_MESSAGES/grep.mo
usr/share/locale/id/LC_MESSAGES/popt.mo
+usr/share/locale/is/LC_MESSAGES/glib20.mo
usr/share/locale/is/LC_MESSAGES/popt.mo
usr/share/locale/it/LC_MESSAGES/coreutils.mo
usr/share/locale/it/LC_MESSAGES/e2fsprogs.mo
+usr/share/locale/it/LC_MESSAGES/glib20.mo
usr/share/locale/it/LC_MESSAGES/grep.mo
usr/share/locale/it/LC_MESSAGES/libc.mo
usr/share/locale/it/LC_MESSAGES/popt.mo
usr/share/locale/it/LC_TIME/coreutils.mo
usr/share/locale/ja/LC_MESSAGES/coreutils.mo
+usr/share/locale/ja/LC_MESSAGES/glib20.mo
usr/share/locale/ja/LC_MESSAGES/grep.mo
usr/share/locale/ja/LC_MESSAGES/libc.mo
usr/share/locale/ja/LC_MESSAGES/popt.mo
usr/share/locale/ja/LC_TIME/coreutils.mo
usr/share/locale/ko/LC_MESSAGES/coreutils.mo
+usr/share/locale/ko/LC_MESSAGES/glib20.mo
usr/share/locale/ko/LC_MESSAGES/grep.mo
usr/share/locale/ko/LC_MESSAGES/libc.mo
usr/share/locale/ko/LC_MESSAGES/popt.mo
@@ -6079,71 +6128,107 @@ usr/share/locale/ko/LC_TIME/coreutils.mo
usr/share/locale/lg/LC_MESSAGES/coreutils.mo
usr/share/locale/lg/LC_TIME/coreutils.mo
usr/share/locale/locale.alias
+usr/share/locale/lt/LC_MESSAGES/glib20.mo
+usr/share/locale/lv/LC_MESSAGES/glib20.mo
+usr/share/locale/mk/LC_MESSAGES/glib20.mo
+usr/share/locale/mn/LC_MESSAGES/glib20.mo
usr/share/locale/ms/LC_MESSAGES/coreutils.mo
+usr/share/locale/ms/LC_MESSAGES/glib20.mo
usr/share/locale/ms/LC_TIME/coreutils.mo
usr/share/locale/nb/LC_MESSAGES/coreutils.mo
+usr/share/locale/nb/LC_MESSAGES/glib20.mo
usr/share/locale/nb/LC_MESSAGES/libc.mo
usr/share/locale/nb/LC_TIME/coreutils.mo
+usr/share/locale/ne/LC_MESSAGES/glib20.mo
usr/share/locale/nl/LC_MESSAGES/coreutils.mo
usr/share/locale/nl/LC_MESSAGES/e2fsprogs.mo
usr/share/locale/nl/LC_MESSAGES/freetype.mo
+usr/share/locale/nl/LC_MESSAGES/glib20.mo
usr/share/locale/nl/LC_MESSAGES/grep.mo
usr/share/locale/nl/LC_MESSAGES/libc.mo
usr/share/locale/nl/LC_TIME/coreutils.mo
+usr/share/locale/nn/LC_MESSAGES/glib20.mo
usr/share/locale/no/LC_MESSAGES/coreutils.mo
+usr/share/locale/no/LC_MESSAGES/glib20.mo
usr/share/locale/no/LC_MESSAGES/grep.mo
usr/share/locale/no/LC_MESSAGES/popt.mo
usr/share/locale/no/LC_TIME/coreutils.mo
+usr/share/locale/or/LC_MESSAGES/glib20.mo
+usr/share/locale/pa/LC_MESSAGES/glib20.mo
usr/share/locale/pl/LC_MESSAGES/coreutils.mo
usr/share/locale/pl/LC_MESSAGES/e2fsprogs.mo
+usr/share/locale/pl/LC_MESSAGES/glib20.mo
usr/share/locale/pl/LC_MESSAGES/grep.mo
usr/share/locale/pl/LC_MESSAGES/libc.mo
usr/share/locale/pl/LC_MESSAGES/popt.mo
usr/share/locale/pl/LC_TIME/coreutils.mo
usr/share/locale/pt/LC_MESSAGES/coreutils.mo
+usr/share/locale/pt/LC_MESSAGES/glib20.mo
usr/share/locale/pt/LC_MESSAGES/popt.mo
usr/share/locale/pt/LC_TIME/coreutils.mo
usr/share/locale/pt_BR/LC_MESSAGES/coreutils.mo
+usr/share/locale/pt_BR/LC_MESSAGES/glib20.mo
usr/share/locale/pt_BR/LC_MESSAGES/grep.mo
usr/share/locale/pt_BR/LC_MESSAGES/libc.mo
usr/share/locale/pt_BR/LC_MESSAGES/popt.mo
usr/share/locale/pt_BR/LC_TIME/coreutils.mo
+usr/share/locale/ro/LC_MESSAGES/glib20.mo
usr/share/locale/ro/LC_MESSAGES/popt.mo
usr/share/locale/ru/LC_MESSAGES/coreutils.mo
+usr/share/locale/ru/LC_MESSAGES/glib20.mo
usr/share/locale/ru/LC_MESSAGES/grep.mo
usr/share/locale/ru/LC_MESSAGES/libc.mo
usr/share/locale/ru/LC_MESSAGES/popt.mo
usr/share/locale/ru/LC_TIME/coreutils.mo
usr/share/locale/rw/LC_MESSAGES/e2fsprogs.mo
+usr/share/locale/rw/LC_MESSAGES/glib20.mo
usr/share/locale/rw/LC_MESSAGES/libc.mo
usr/share/locale/sk/LC_MESSAGES/coreutils.mo
+usr/share/locale/sk/LC_MESSAGES/glib20.mo
usr/share/locale/sk/LC_MESSAGES/libc.mo
usr/share/locale/sk/LC_MESSAGES/popt.mo
usr/share/locale/sk/LC_TIME/coreutils.mo
usr/share/locale/sl/LC_MESSAGES/coreutils.mo
+usr/share/locale/sl/LC_MESSAGES/glib20.mo
usr/share/locale/sl/LC_MESSAGES/grep.mo
usr/share/locale/sl/LC_MESSAGES/popt.mo
usr/share/locale/sl/LC_TIME/coreutils.mo
+usr/share/locale/sq/LC_MESSAGES/glib20.mo
+usr/share/locale/sr/LC_MESSAGES/glib20.mo
usr/share/locale/sr/LC_MESSAGES/popt.mo
+usr/share/locale/sr@Latn/LC_MESSAGES/glib20.mo
+usr/share/locale/sr@ije/LC_MESSAGES/glib20.mo
usr/share/locale/sv/LC_MESSAGES/coreutils.mo
usr/share/locale/sv/LC_MESSAGES/e2fsprogs.mo
+usr/share/locale/sv/LC_MESSAGES/glib20.mo
usr/share/locale/sv/LC_MESSAGES/grep.mo
usr/share/locale/sv/LC_MESSAGES/libc.mo
usr/share/locale/sv/LC_MESSAGES/popt.mo
usr/share/locale/sv/LC_TIME/coreutils.mo
+usr/share/locale/ta/LC_MESSAGES/glib20.mo
+usr/share/locale/te/LC_MESSAGES/glib20.mo
+usr/share/locale/tl/LC_MESSAGES/glib20.mo
usr/share/locale/tr/LC_MESSAGES/coreutils.mo
usr/share/locale/tr/LC_MESSAGES/e2fsprogs.mo
+usr/share/locale/tr/LC_MESSAGES/glib20.mo
usr/share/locale/tr/LC_MESSAGES/libc.mo
usr/share/locale/tr/LC_MESSAGES/popt.mo
usr/share/locale/tr/LC_TIME/coreutils.mo
+usr/share/locale/uk/LC_MESSAGES/glib20.mo
usr/share/locale/uk/LC_MESSAGES/popt.mo
+usr/share/locale/vi/LC_MESSAGES/glib20.mo
+usr/share/locale/wa/LC_MESSAGES/glib20.mo
usr/share/locale/wa/LC_MESSAGES/popt.mo
+usr/share/locale/xh/LC_MESSAGES/glib20.mo
+usr/share/locale/yi/LC_MESSAGES/glib20.mo
usr/share/locale/zh/LC_MESSAGES/popt.mo
usr/share/locale/zh_CN/LC_MESSAGES/coreutils.mo
+usr/share/locale/zh_CN/LC_MESSAGES/glib20.mo
usr/share/locale/zh_CN/LC_MESSAGES/libc.mo
usr/share/locale/zh_CN/LC_MESSAGES/popt.mo
usr/share/locale/zh_CN/LC_TIME/coreutils.mo
usr/share/locale/zh_TW/LC_MESSAGES/coreutils.mo
+usr/share/locale/zh_TW/LC_MESSAGES/glib20.mo
usr/share/locale/zh_TW/LC_MESSAGES/libc.mo
usr/share/locale/zh_TW/LC_MESSAGES/popt.mo
usr/share/locale/zh_TW/LC_TIME/coreutils.mo
@@ -6340,24 +6425,24 @@ usr/share/man/man8/ext2online.8.gz
usr/share/man/man8/filefrag.8.gz
usr/share/man/man8/findfs.8.gz
usr/share/man/man8/fsck.8.gz
-usr/share/man/man8/fsck.ext3.8.gz
usr/share/man/man8/fsck.ext2.8.gz
+usr/share/man/man8/fsck.ext3.8.gz
usr/share/man/man8/getenforce.8.gz
usr/share/man/man8/getsebool.8.gz
usr/share/man/man8/logsave.8.gz
usr/share/man/man8/matchpathcon.8.gz
-usr/share/man/man8/mkfs.ext3.8.gz
-usr/share/man/man8/mkfs.ext2.8.gz
usr/share/man/man8/mke2fs.8.gz
+usr/share/man/man8/mkfs.ext2.8.gz
+usr/share/man/man8/mkfs.ext3.8.gz
usr/share/man/man8/mklost+found.8.gz
usr/share/man/man8/resize2fs.8.gz
-usr/share/man/man8/tune2fs.8.gz
usr/share/man/man8/selinux.8.gz
usr/share/man/man8/selinuxenabled.8.gz
usr/share/man/man8/setenforce.8.gz
usr/share/man/man8/setsebool.8.gz
usr/share/man/man8/setserial.8.gz
usr/share/man/man8/togglesebool.8.gz
+usr/share/man/man8/tune2fs.8.gz
usr/share/tabset/std
usr/share/tabset/stdcrt
usr/share/tabset/vt100
@@ -9181,6 +9266,7 @@ var/mail
@dirrm usr/share/doc/glibc-common-%%GLIBCVER%%
@dirrm usr/share/doc/glibc-%%GLIBCVER%%
@dirrm usr/share/doc/glib-1.2.10
+@dirrm usr/share/doc/glib2-2.6.6
@dirrm usr/share/doc/gdbm-1.8.0
@dirrm usr/share/doc/freetype-2.1.9/docs/tutorial
@dirrm usr/share/doc/freetype-2.1.9/docs/reference
diff --git a/graphics/linux-XnViewMP/Makefile b/graphics/linux-XnViewMP/Makefile
index e5c997b72eb8..a0368c9a4aea 100644
--- a/graphics/linux-XnViewMP/Makefile
+++ b/graphics/linux-XnViewMP/Makefile
@@ -7,6 +7,7 @@
PORTNAME= XnViewMP
PORTVERSION= 0.015
+PORTREVISION= 1
CATEGORIES= graphics
MASTER_SITES= ftp://ftp2.xnview.com/xnview/misc/
PKGNAMEPREFIX= linux-
@@ -16,8 +17,6 @@ EXTRACT_SUFX= .tgz
MAINTAINER= petr@petrovich.kiev.ua
COMMENT= XnView Multi Platform, graphics viewer and converer
-RUN_DEPENDS= ${LINUXBASE}/usr/lib/libglib-2.0.so.0:${PORTSDIR}/devel/linux-glib2
-
NO_CDROM= For commercial use and distribution, it is necessary to register
ONLY_FOR_ARCHS= i386
NO_BUILD= yes
diff --git a/www/linux-mplayer-plugin/Makefile b/www/linux-mplayer-plugin/Makefile
index bd7c42463ba5..4434762eb6bd 100644
--- a/www/linux-mplayer-plugin/Makefile
+++ b/www/linux-mplayer-plugin/Makefile
@@ -8,7 +8,7 @@
PORTNAME= mplayerplug-in
PORTVERSION= 3.50
DISTVERSIONSUFFIX= -1.rh9.rf
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= www multimedia
MASTER_SITES= CENKES http://apt.sw.be/packages/mplayerplug-in/ \
ftp://fr2.rpmfind.net/linux/dag/redhat/9/en/i386/dag/RPMS/
@@ -21,12 +21,6 @@ RUN_DEPENDS= mplayer:${PORTSDIR}/multimedia/mplayer \
${LINUXBASE}/usr/lib/libgtk-x11-2.0.so.0:${PORTSDIR}/x11-toolkits/linux-gtk2 \
${LINUXBASE}/usr/lib/libatk-1.0.so.0:${PORTSDIR}/accessibility/linux-atk \
${LINUXBASE}/usr/lib/libpangoxft-1.0.so.0:${PORTSDIR}/x11-toolkits/linux-pango
-.if !defined(OVERRIDE_LINUX_BASE_PORT) || \
- (${OVERRIDE_LINUX_BASE_PORT} != "fc6" && \
- ${OVERRIDE_LINUX_BASE_PORT} != "f7" && \
- ${OVERRIDE_LINUX_BASE_PORT} != "f8")
-RUN_DEPENDS+= ${LINUXBASE}/usr/lib/libgobject-2.0.so.0:${PORTSDIR}/devel/linux-glib2
-.endif
NO_BUILD= yes
USE_LINUX_RPM= yes
diff --git a/x11-toolkits/linux-f10-gtk2/Makefile b/x11-toolkits/linux-f10-gtk2/Makefile
index c5f0a41d171a..1871b04d29b7 100644
--- a/x11-toolkits/linux-f10-gtk2/Makefile
+++ b/x11-toolkits/linux-f10-gtk2/Makefile
@@ -7,6 +7,7 @@
PORTNAME= gtk2
PORTVERSION= 2.6.10
+PORTREVISION= 1
CATEGORIES= x11-toolkits linux
DISTFILES= ${PORTNAME}-${PORTVERSION}-2.fc4.4.${LINUX_RPM_ARCH}.rpm \
${PORTNAME}-engines-2.6.3-2.${LINUX_RPM_ARCH}.rpm
@@ -16,12 +17,6 @@ COMMENT= GTK+ library, version 2.X, Linux binary
# these libraries are required by gtk-query-immodules-2.0 or
# gdk-pixbuf-query-loaders
-.if !defined(OVERRIDE_LINUX_BASE_PORT) || \
- (${OVERRIDE_LINUX_BASE_PORT} != "fc6" && \
- ${OVERRIDE_LINUX_BASE_PORT} != "f7" && \
- ${OVERRIDE_LINUX_BASE_PORT} != "f8")
-RUN_DEPENDS+= ${LINUXBASE}/usr/lib/libglib-2.0.so.0:${PORTSDIR}/devel/linux-glib2
-.endif
RUN_DEPENDS+= ${LINUXBASE}/usr/lib/libatk-1.0.so.0:${PORTSDIR}/accessibility/linux-atk \
${LINUXBASE}/usr/lib/libjpeg.so.62:${PORTSDIR}/graphics/linux-jpeg \
${LINUXBASE}/usr/lib/libpng12.so.0:${PORTSDIR}/graphics/linux-png \
diff --git a/x11-toolkits/linux-f10-pango/Makefile b/x11-toolkits/linux-f10-pango/Makefile
index 81b6181026b6..2f11cf41d4f3 100644
--- a/x11-toolkits/linux-f10-pango/Makefile
+++ b/x11-toolkits/linux-f10-pango/Makefile
@@ -7,6 +7,7 @@
PORTNAME= pango
PORTVERSION= 1.10.2
+PORTREVISION= 1
DISTVERSIONSUFFIX= -1.gst.1.4
CATEGORIES= x11-toolkits linux
MASTER_SITES= http://gstreamer.freedesktop.org/pkg/%SUBDIR%/ CENKES/myports
@@ -17,12 +18,6 @@ MAINTAINER= freebsd-emulation@FreeBSD.org
COMMENT= Linux pango binary
# these libraries are required by pango-querymodules
-.if !defined(OVERRIDE_LINUX_BASE_PORT) || \
- (${OVERRIDE_LINUX_BASE_PORT} != "fc6" && \
- ${OVERRIDE_LINUX_BASE_PORT} != "f7" && \
- ${OVERRIDE_LINUX_BASE_PORT} != "f8")
-RUN_DEPENDS+= ${LINUXBASE}/usr/lib/libglib-2.0.so.0:${PORTSDIR}/devel/linux-glib2
-.endif
RUN_DEPENDS+= ${LINUXBASE}/usr/lib/libfontconfig.so.1:${PORTSDIR}/x11-fonts/linux-fontconfig \
${LINUXBASE}/usr/lib/libcairo.so.2.2.3:${PORTSDIR}/graphics/linux-cairo \
${LINUXBASE}/usr/lib/libexpat.so.0:${PORTSDIR}/textproc/linux-expat
diff --git a/x11-toolkits/linux-f8-gtk2/Makefile b/x11-toolkits/linux-f8-gtk2/Makefile
index c5f0a41d171a..1871b04d29b7 100644
--- a/x11-toolkits/linux-f8-gtk2/Makefile
+++ b/x11-toolkits/linux-f8-gtk2/Makefile
@@ -7,6 +7,7 @@
PORTNAME= gtk2
PORTVERSION= 2.6.10
+PORTREVISION= 1
CATEGORIES= x11-toolkits linux
DISTFILES= ${PORTNAME}-${PORTVERSION}-2.fc4.4.${LINUX_RPM_ARCH}.rpm \
${PORTNAME}-engines-2.6.3-2.${LINUX_RPM_ARCH}.rpm
@@ -16,12 +17,6 @@ COMMENT= GTK+ library, version 2.X, Linux binary
# these libraries are required by gtk-query-immodules-2.0 or
# gdk-pixbuf-query-loaders
-.if !defined(OVERRIDE_LINUX_BASE_PORT) || \
- (${OVERRIDE_LINUX_BASE_PORT} != "fc6" && \
- ${OVERRIDE_LINUX_BASE_PORT} != "f7" && \
- ${OVERRIDE_LINUX_BASE_PORT} != "f8")
-RUN_DEPENDS+= ${LINUXBASE}/usr/lib/libglib-2.0.so.0:${PORTSDIR}/devel/linux-glib2
-.endif
RUN_DEPENDS+= ${LINUXBASE}/usr/lib/libatk-1.0.so.0:${PORTSDIR}/accessibility/linux-atk \
${LINUXBASE}/usr/lib/libjpeg.so.62:${PORTSDIR}/graphics/linux-jpeg \
${LINUXBASE}/usr/lib/libpng12.so.0:${PORTSDIR}/graphics/linux-png \
diff --git a/x11-toolkits/linux-f8-pango/Makefile b/x11-toolkits/linux-f8-pango/Makefile
index 81b6181026b6..2f11cf41d4f3 100644
--- a/x11-toolkits/linux-f8-pango/Makefile
+++ b/x11-toolkits/linux-f8-pango/Makefile
@@ -7,6 +7,7 @@
PORTNAME= pango
PORTVERSION= 1.10.2
+PORTREVISION= 1
DISTVERSIONSUFFIX= -1.gst.1.4
CATEGORIES= x11-toolkits linux
MASTER_SITES= http://gstreamer.freedesktop.org/pkg/%SUBDIR%/ CENKES/myports
@@ -17,12 +18,6 @@ MAINTAINER= freebsd-emulation@FreeBSD.org
COMMENT= Linux pango binary
# these libraries are required by pango-querymodules
-.if !defined(OVERRIDE_LINUX_BASE_PORT) || \
- (${OVERRIDE_LINUX_BASE_PORT} != "fc6" && \
- ${OVERRIDE_LINUX_BASE_PORT} != "f7" && \
- ${OVERRIDE_LINUX_BASE_PORT} != "f8")
-RUN_DEPENDS+= ${LINUXBASE}/usr/lib/libglib-2.0.so.0:${PORTSDIR}/devel/linux-glib2
-.endif
RUN_DEPENDS+= ${LINUXBASE}/usr/lib/libfontconfig.so.1:${PORTSDIR}/x11-fonts/linux-fontconfig \
${LINUXBASE}/usr/lib/libcairo.so.2.2.3:${PORTSDIR}/graphics/linux-cairo \
${LINUXBASE}/usr/lib/libexpat.so.0:${PORTSDIR}/textproc/linux-expat
diff --git a/x11-toolkits/linux-gtk2/Makefile b/x11-toolkits/linux-gtk2/Makefile
index c5f0a41d171a..1871b04d29b7 100644
--- a/x11-toolkits/linux-gtk2/Makefile
+++ b/x11-toolkits/linux-gtk2/Makefile
@@ -7,6 +7,7 @@
PORTNAME= gtk2
PORTVERSION= 2.6.10
+PORTREVISION= 1
CATEGORIES= x11-toolkits linux
DISTFILES= ${PORTNAME}-${PORTVERSION}-2.fc4.4.${LINUX_RPM_ARCH}.rpm \
${PORTNAME}-engines-2.6.3-2.${LINUX_RPM_ARCH}.rpm
@@ -16,12 +17,6 @@ COMMENT= GTK+ library, version 2.X, Linux binary
# these libraries are required by gtk-query-immodules-2.0 or
# gdk-pixbuf-query-loaders
-.if !defined(OVERRIDE_LINUX_BASE_PORT) || \
- (${OVERRIDE_LINUX_BASE_PORT} != "fc6" && \
- ${OVERRIDE_LINUX_BASE_PORT} != "f7" && \
- ${OVERRIDE_LINUX_BASE_PORT} != "f8")
-RUN_DEPENDS+= ${LINUXBASE}/usr/lib/libglib-2.0.so.0:${PORTSDIR}/devel/linux-glib2
-.endif
RUN_DEPENDS+= ${LINUXBASE}/usr/lib/libatk-1.0.so.0:${PORTSDIR}/accessibility/linux-atk \
${LINUXBASE}/usr/lib/libjpeg.so.62:${PORTSDIR}/graphics/linux-jpeg \
${LINUXBASE}/usr/lib/libpng12.so.0:${PORTSDIR}/graphics/linux-png \
diff --git a/x11-toolkits/linux-pango/Makefile b/x11-toolkits/linux-pango/Makefile
index 81b6181026b6..2f11cf41d4f3 100644
--- a/x11-toolkits/linux-pango/Makefile
+++ b/x11-toolkits/linux-pango/Makefile
@@ -7,6 +7,7 @@
PORTNAME= pango
PORTVERSION= 1.10.2
+PORTREVISION= 1
DISTVERSIONSUFFIX= -1.gst.1.4
CATEGORIES= x11-toolkits linux
MASTER_SITES= http://gstreamer.freedesktop.org/pkg/%SUBDIR%/ CENKES/myports
@@ -17,12 +18,6 @@ MAINTAINER= freebsd-emulation@FreeBSD.org
COMMENT= Linux pango binary
# these libraries are required by pango-querymodules
-.if !defined(OVERRIDE_LINUX_BASE_PORT) || \
- (${OVERRIDE_LINUX_BASE_PORT} != "fc6" && \
- ${OVERRIDE_LINUX_BASE_PORT} != "f7" && \
- ${OVERRIDE_LINUX_BASE_PORT} != "f8")
-RUN_DEPENDS+= ${LINUXBASE}/usr/lib/libglib-2.0.so.0:${PORTSDIR}/devel/linux-glib2
-.endif
RUN_DEPENDS+= ${LINUXBASE}/usr/lib/libfontconfig.so.1:${PORTSDIR}/x11-fonts/linux-fontconfig \
${LINUXBASE}/usr/lib/libcairo.so.2.2.3:${PORTSDIR}/graphics/linux-cairo \
${LINUXBASE}/usr/lib/libexpat.so.0:${PORTSDIR}/textproc/linux-expat