- Replace Mk/bsd.linux-apps.mk and Mk/bsd.linux-rpm.mk with

  Mk/Uses/linux.mk.
- Replace USE_LINUX=yes with USES+=linux and USE_LINUX=(.*) with
  USES+=linux:\1 in all ports.
- Replace USE_LINUX_APPS with USE_LINUX in all ports.
- Use INSTALL_SCRIPT instead of INSTALL_PROGRAM to install scripts in some
  ports.
- When USE_LINUX_RPM is defined, simplify the way DISTFILES and EXTRACT_ONLY
  are defined.
- Remove BRANDELF_DIRS and BRANDELF_FILES handling.  In the very rare cases
  that it is still necessary ports can run ${BRANDELF} from post-patch.
- Remove AUTOMATIC_PLIST handling.  Only one port used it.
- Fix Linux MASTER_SITES.
- Replace OVERRIDE_LINUX_BASE_PORT and OVERRIDE_LINUX_NONBASE_PORTS with
  default versions framework.
- bsd.port.mk:
  - Move Linux related bits to Uses/linux.mk, except USE_LINUX_PREFIX.
  - Put USE_LINUX_PREFIX handling after USES processing.
  - Define DOCSDIR, DATADIR, etc. after handling USE_LINUX_PREFIX so it can
    give these variables a different default value.
  - When a package needs to run Linux ldconfig check before installation if
    Linux support is enabled.
- emulators/linux_base-*:
  - Use USES=linux and remove duplication.
  - Remove files/lp.  FreeBSD or CUPS lp(1) should work.
  - Remove files/yp.conf.  No longer seems to be used.
  - Remove pkg-deinstall and move pkg-install into pkg-plist.
  - Update pkg-descr and pkg-message.
  - Fix handling of ldconfig cache in pkg-plist.
- devel/fb-adb: Use a Linux shell to run a Linux script but patch the script
  to use FreeBSD mkdir so mkdir -p $path creates $path and not
  /compat/linux/$path.

PR:		211645
Exp-run by:	antoine
Approved by:	portmgr (antoine)

17 files changed, 399 insertions, 428 deletions

diff --git a/x11-toolkits/linux-c6-gtk2/Makefile b/x11-toolkits/linux-c6-gtk2/Makefile
index 3c657f8bf03d..7bb8cc07a434 100644
--- a/x11-toolkits/linux-c6-gtk2/Makefile
+++ b/x11-toolkits/linux-c6-gtk2/Makefile
@@ -5,28 +5,22 @@ PORTNAME=	gtk2
 PORTVERSION=	2.24.23
 PORTREVISION=	4
 CATEGORIES=	x11-toolkits linux
-DISTFILES=	#
-LIB_DISTFILES=	${DISTNAME}.${LINUX_RPM_ARCH}.rpm \
-		${PORTNAME}-immodules-${PORTVERSION}-${RPMVERSION}.${LINUX_RPM_ARCH}.rpm \
-		${PORTNAME}-engines-2.18.4-5.el6.${LINUX_DIST}.${LINUX_RPM_ARCH}.rpm
+LIB_DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \
+		${PORTNAME}-engines-2.18.4-5.el6.centos${EXTRACT_SUFX} \
+		${PORTNAME}-immodules-${PORTVERSION}-${RPMVERSION}${EXTRACT_SUFX}
+SRC_DISTFILES=	${DISTNAME}${SRC_SUFX}:SOURCE
 
 MAINTAINER=	emulation@FreeBSD.org
-COMMENT=	GTK+ library, version 2.X  (Linux CentOS ${LINUX_DIST_VER})
+COMMENT=	GTK+ library, version 2.X (Linux CentOS ${LINUX_DIST_VER})
 
 CONFLICTS=	linux-gtk2-[0-9]* linux-f8-gtk2-[0-9]* linux-f10-gtk2-[0-9]*
 
-ONLY_FOR_ARCHS=	i386 amd64
-USE_LINUX=	c6
-USE_LINUX_APPS=	atk gdkpixbuf2 pango xorglibs
-USE_LINUX_RPM=	yes
 RPMVERSION=	8.el6
-BRANDELF_DIRS=	usr/bin
+USES=		linux:c6
 USE_LDCONFIG=	yes
+USE_LINUX=	atk gdkpixbuf2 pango xorglibs
+USE_LINUX_RPM=	yes
 
 DESCR=		${.CURDIR}/../${PORTNAME}0/pkg-descr
 
-.if defined(PACKAGE_BUILDING)
-SRC_DISTFILES=	gtk2-${PORTVERSION}-${RPMVERSION}.src.rpm:SOURCE
-.endif
-
 .include <bsd.port.mk>
diff --git a/x11-toolkits/linux-c6-gtk2/pkg-plist.i386 b/x11-toolkits/linux-c6-gtk2/pkg-plist.i386
index e401635c673c..db75dc3cd48a 100644
--- a/x11-toolkits/linux-c6-gtk2/pkg-plist.i386
+++ b/x11-toolkits/linux-c6-gtk2/pkg-plist.i386
@@ -34,14 +34,14 @@ usr/lib/libgdk-x11-2.0.so.0
 usr/lib/libgdk-x11-2.0.so.0.2400.23
 usr/lib/libgtk-x11-2.0.so.0
 usr/lib/libgtk-x11-2.0.so.0.2400.23
-%%PORTDOCS%%usr/%%DOCSDIR%%-2.24.23/AUTHORS
-%%PORTDOCS%%usr/%%DOCSDIR%%-2.24.23/COPYING
-%%PORTDOCS%%usr/%%DOCSDIR%%-2.24.23/NEWS
-%%PORTDOCS%%usr/%%DOCSDIR%%-2.24.23/README
-%%PORTDOCS%%usr/%%DOCSDIR%%-engines-2.18.4/AUTHORS
-%%PORTDOCS%%usr/%%DOCSDIR%%-engines-2.18.4/COPYING
-%%PORTDOCS%%usr/%%DOCSDIR%%-engines-2.18.4/NEWS
-%%PORTDOCS%%usr/%%DOCSDIR%%-engines-2.18.4/README
+%%PORTDOCS%%%%DOCSDIR%%/AUTHORS
+%%PORTDOCS%%%%DOCSDIR%%/COPYING
+%%PORTDOCS%%%%DOCSDIR%%/NEWS
+%%PORTDOCS%%%%DOCSDIR%%/README
+%%PORTDOCS%%usr/share/doc/gtk2-engines-2.18.4/AUTHORS
+%%PORTDOCS%%usr/share/doc/gtk2-engines-2.18.4/COPYING
+%%PORTDOCS%%usr/share/doc/gtk2-engines-2.18.4/NEWS
+%%PORTDOCS%%usr/share/doc/gtk2-engines-2.18.4/README
 usr/share/gtk-engines/clearlooks.xml
 usr/share/gtk-engines/crux-engine.xml
 usr/share/gtk-engines/glide.xml
diff --git a/x11-toolkits/linux-c6-gtk2/pkg-plist.x86_64 b/x11-toolkits/linux-c6-gtk2/pkg-plist.x86_64
index d8fb63c64f66..43cb5fc9c0f1 100644
--- a/x11-toolkits/linux-c6-gtk2/pkg-plist.x86_64
+++ b/x11-toolkits/linux-c6-gtk2/pkg-plist.x86_64
@@ -66,14 +66,14 @@ usr/lib64/libgdk-x11-2.0.so.0
 usr/lib64/libgdk-x11-2.0.so.0.2400.23
 usr/lib64/libgtk-x11-2.0.so.0
 usr/lib64/libgtk-x11-2.0.so.0.2400.23
-%%PORTDOCS%%usr/%%DOCSDIR%%-2.24.23/AUTHORS
-%%PORTDOCS%%usr/%%DOCSDIR%%-2.24.23/COPYING
-%%PORTDOCS%%usr/%%DOCSDIR%%-2.24.23/NEWS
-%%PORTDOCS%%usr/%%DOCSDIR%%-2.24.23/README
-%%PORTDOCS%%usr/%%DOCSDIR%%-engines-2.18.4/AUTHORS
-%%PORTDOCS%%usr/%%DOCSDIR%%-engines-2.18.4/COPYING
-%%PORTDOCS%%usr/%%DOCSDIR%%-engines-2.18.4/NEWS
-%%PORTDOCS%%usr/%%DOCSDIR%%-engines-2.18.4/README
+%%PORTDOCS%%%%DOCSDIR%%/AUTHORS
+%%PORTDOCS%%%%DOCSDIR%%/COPYING
+%%PORTDOCS%%%%DOCSDIR%%/NEWS
+%%PORTDOCS%%%%DOCSDIR%%/README
+%%PORTDOCS%%usr/share/doc/gtk2-engines-2.18.4/AUTHORS
+%%PORTDOCS%%usr/share/doc/gtk2-engines-2.18.4/COPYING
+%%PORTDOCS%%usr/share/doc/gtk2-engines-2.18.4/NEWS
+%%PORTDOCS%%usr/share/doc/gtk2-engines-2.18.4/README
 usr/share/gtk-engines/clearlooks.xml
 usr/share/gtk-engines/crux-engine.xml
 usr/share/gtk-engines/glide.xml
diff --git a/x11-toolkits/linux-c6-openmotif/Makefile b/x11-toolkits/linux-c6-openmotif/Makefile
index bbb4be556c5b..da78198b1a0c 100644
--- a/x11-toolkits/linux-c6-openmotif/Makefile
+++ b/x11-toolkits/linux-c6-openmotif/Makefile
@@ -11,11 +11,10 @@ COMMENT=	Motif toolkit libraries (Linux CentOS ${LINUX_DIST_VER})
 
 CONFLICTS=	linux-openmotif-[0-9]* linux-f8-openmotif-[0-9]*
 
-ONLY_FOR_ARCHS=	i386 amd64
-USE_LINUX=	c6
+USES=		linux:c6
 RPMVERSION=	8.el6
 USE_LINUX_RPM=	yes
-USE_LINUX_APPS=	xorglibs
+USE_LINUX=	xorglibs
 USE_LDCONFIG=	yes
 DESCR=	${.CURDIR}/../open-motif/pkg-descr
 
diff --git a/x11-toolkits/linux-c6-pango/Makefile b/x11-toolkits/linux-c6-pango/Makefile
index 75e99a0f31b8..8cbc773ec8c5 100644
--- a/x11-toolkits/linux-c6-pango/Makefile
+++ b/x11-toolkits/linux-c6-pango/Makefile
@@ -8,22 +8,15 @@ CATEGORIES=	x11-toolkits linux
 
 MAINTAINER=	emulation@FreeBSD.org
 
-COMMENT=	Pango library (Linux  CentOS ${LINUX_DIST_VER})
+COMMENT=	Pango library (Linux CentOS ${LINUX_DIST_VER})
 
 CONFLICTS=	linux-pango-[0-9]* linux-f10-pango-[0-9]*
 
-ONLY_FOR_ARCHS=	i386 amd64
-USE_LINUX=	c6
-USE_LINUX_APPS=	cairo expat fontconfig libthai xorglibs
-USE_LINUX_RPM=	yes
 RPMVERSION=	11.el6
-
-BRANDELF_FILES=	usr/bin/pango-querymodules-32
-.if defined(OVERRIDE_LINUX_NONBASE_PORTS) && ${OVERRIDE_LINUX_NONBASE_PORTS} == "c6_64"
-BRANDELF_FILES+=	usr/bin/pango-querymodules-64
-.endif
-
+USES=		linux:c6
 USE_LDCONFIG=	yes
+USE_LINUX=	cairo expat fontconfig libthai xorglibs
+USE_LINUX_RPM=	yes
 
 DESCR=		${.CURDIR}/../${PORTNAME}/pkg-descr
 
diff --git a/x11-toolkits/linux-c6-pango/pkg-plist.i386 b/x11-toolkits/linux-c6-pango/pkg-plist.i386
index fcb01fff3704..2ddca1b5d89d 100644
--- a/x11-toolkits/linux-c6-pango/pkg-plist.i386
+++ b/x11-toolkits/linux-c6-pango/pkg-plist.i386
@@ -1,5 +1,5 @@
 @postexec %D/usr/bin/pango-querymodules-32 > %D/etc/pango/i386-redhat-linux-gnu/pango.modules
-@preunexec rm -f %D/etc/pango/i386-redhat-linux-gnu/pango.modules
+@rmtry etc/pango/i386-redhat-linux-gnu/pango.modules
 etc/pango/pangox.aliases
 usr/bin/pango-querymodules-32
 usr/bin/pango-view
diff --git a/x11-toolkits/linux-c6-pango/pkg-plist.x86_64 b/x11-toolkits/linux-c6-pango/pkg-plist.x86_64
index 87bfe3b143ef..72e5ad2b6ad5 100644
--- a/x11-toolkits/linux-c6-pango/pkg-plist.x86_64
+++ b/x11-toolkits/linux-c6-pango/pkg-plist.x86_64
@@ -1,8 +1,8 @@
 @postexec %D/usr/bin/pango-querymodules-32 > %D/etc/pango/i386-redhat-linux-gnu/pango.modules
-@preunexec rm -f %D/etc/pango/i386-redhat-linux-gnu/pango.modules
+@rmtry etc/pango/i386-redhat-linux-gnu/pango.modules
 etc/pango/pangox.aliases
 @postexec %D/usr/bin/pango-querymodules-64 > %D/etc/pango/x86_64-redhat-linux-gnu/pango.modules
-@preunexec rm -f %D/etc/pango/x86_64-redhat-linux-gnu/pango.modules
+@rmtry etc/pango/x86_64-redhat-linux-gnu/pango.modules
 usr/bin/pango-querymodules-32
 usr/bin/pango-querymodules-64
 usr/bin/pango-view
diff --git a/x11-toolkits/linux-c6-qt47-x11/Makefile b/x11-toolkits/linux-c6-qt47-x11/Makefile
index 39409423603c..53018b52561b 100644
--- a/x11-toolkits/linux-c6-qt47-x11/Makefile
+++ b/x11-toolkits/linux-c6-qt47-x11/Makefile
@@ -13,21 +13,19 @@ DIST_SUBDIR=	rpm/${LINUX_RPM_ARCH}/atrpms/6
 MAINTAINER=	emulation@FreeBSD.org
 COMMENT=	RPM of QT4 (Linux CentOS 6)
 
-ONLY_FOR_ARCHS=	i386 amd64
-SRC_DISTFILES:=		# unretrievable.
+SRC_DISTFILES=	# unretrievable.
 
-USE_LINUX=	c6
+RPMVERSION=	1_18.el6
+USES=		linux:c6
 USE_LDCONFIG=	yes
+USE_LINUX=	fontconfig png xorglibs png alsalib jpeg tiff qt47 openssl
+USE_LINUX_RPM=	yes
 
 OPTIONS_DEFINE=	NVIDIA_GL
 
 NVIDIA_GL_RUN_DEPENDS=	${LINUXBASE}/usr/lib/libGL.so.1:x11/nvidia-driver \
 			linux-c6-libGLU>0:graphics/linux-c6-libGLU
-NVIDIA_GL_USE_OFF=	linux_apps=dri
-
-USE_LINUX_APPS=	fontconfig png xorglibs png alsalib jpeg tiff qt47 openssl
-USE_LINUX_RPM=	yes
-RPMVERSION=	1_18.el6
+NVIDIA_GL_USE_OFF=	LINUX=dri
 
 DESCR=	${.CURDIR}/../../devel/qt4/pkg-descr
 
diff --git a/x11-toolkits/linux-c6-tk85/Makefile b/x11-toolkits/linux-c6-tk85/Makefile
index 8a2cbf40d0f3..d3b8ae046ba6 100644
--- a/x11-toolkits/linux-c6-tk85/Makefile
+++ b/x11-toolkits/linux-c6-tk85/Makefile
@@ -12,15 +12,14 @@ COMMENT=	Graphical toolkit for TCL (Linux CentOS ${LINUX_DIST_VER})
 
 CONFLICTS=	linux-f10-tk85-[0-9]*
 
-USE_LINUX=	c6
-USE_LINUX_RPM=	yes
-USE_LINUX_RPM_BAD_PERMS=	yes
-USE_LINUX_APPS=	xorglibs
-
 RPMVERSION=	5.el6
-BRANDELF_FILES=	#usr/bin/wish8.5
+USES=		linux:c6
 USE_LDCONFIG=	yes
+USE_LINUX=	xorglibs
+USE_LINUX_RPM=	yes
+USE_LINUX_RPM_BAD_PERMS=	yes
 
+DATADIR=	${PREFIX}/usr/share/tk${PORTVERSION:R}
 DESCR=		${.CURDIR}/../${PORTNAME}${PKGNAMESUFFIX}/pkg-descr
 
 .include <bsd.port.mk>
diff --git a/x11-toolkits/linux-c6-tk85/pkg-plist.i386 b/x11-toolkits/linux-c6-tk85/pkg-plist.i386
index 281547fceaad..fff9d7f18966 100644
--- a/x11-toolkits/linux-c6-tk85/pkg-plist.i386
+++ b/x11-toolkits/linux-c6-tk85/pkg-plist.i386
@@ -97,164 +97,164 @@ usr/share/man/mann/ttk_treeview.n.gz
 usr/share/man/mann/ttk_widget.n.gz
 usr/share/man/mann/winfo.n.gz
 usr/share/man/mann/wm.n.gz
-usr/%%DATADIR%%8.5/bgerror.tcl
-usr/%%DATADIR%%8.5/button.tcl
-usr/%%DATADIR%%8.5/choosedir.tcl
-usr/%%DATADIR%%8.5/clrpick.tcl
-usr/%%DATADIR%%8.5/comdlg.tcl
-usr/%%DATADIR%%8.5/console.tcl
-usr/%%DATADIR%%8.5/demos/README
-usr/%%DATADIR%%8.5/demos/anilabel.tcl
-usr/%%DATADIR%%8.5/demos/aniwave.tcl
-usr/%%DATADIR%%8.5/demos/arrow.tcl
-usr/%%DATADIR%%8.5/demos/bind.tcl
-usr/%%DATADIR%%8.5/demos/bitmap.tcl
-usr/%%DATADIR%%8.5/demos/browse
-usr/%%DATADIR%%8.5/demos/button.tcl
-usr/%%DATADIR%%8.5/demos/check.tcl
-usr/%%DATADIR%%8.5/demos/clrpick.tcl
-usr/%%DATADIR%%8.5/demos/colors.tcl
-usr/%%DATADIR%%8.5/demos/combo.tcl
-usr/%%DATADIR%%8.5/demos/cscroll.tcl
-usr/%%DATADIR%%8.5/demos/ctext.tcl
-usr/%%DATADIR%%8.5/demos/dialog1.tcl
-usr/%%DATADIR%%8.5/demos/dialog2.tcl
-usr/%%DATADIR%%8.5/demos/en.msg
-usr/%%DATADIR%%8.5/demos/entry1.tcl
-usr/%%DATADIR%%8.5/demos/entry2.tcl
-usr/%%DATADIR%%8.5/demos/entry3.tcl
-usr/%%DATADIR%%8.5/demos/filebox.tcl
-usr/%%DATADIR%%8.5/demos/floor.tcl
-usr/%%DATADIR%%8.5/demos/form.tcl
-usr/%%DATADIR%%8.5/demos/goldberg.tcl
-usr/%%DATADIR%%8.5/demos/hello
-usr/%%DATADIR%%8.5/demos/hscale.tcl
-usr/%%DATADIR%%8.5/demos/icon.tcl
-usr/%%DATADIR%%8.5/demos/image1.tcl
-usr/%%DATADIR%%8.5/demos/image2.tcl
-usr/%%DATADIR%%8.5/demos/images/earth.gif
-usr/%%DATADIR%%8.5/demos/images/earthris.gif
-usr/%%DATADIR%%8.5/demos/images/face.xbm
-usr/%%DATADIR%%8.5/demos/images/flagdown.xbm
-usr/%%DATADIR%%8.5/demos/images/flagup.xbm
-usr/%%DATADIR%%8.5/demos/images/gray25.xbm
-usr/%%DATADIR%%8.5/demos/images/letters.xbm
-usr/%%DATADIR%%8.5/demos/images/noletter.xbm
-usr/%%DATADIR%%8.5/demos/images/pattern.xbm
-usr/%%DATADIR%%8.5/demos/images/tcllogo.gif
-usr/%%DATADIR%%8.5/demos/images/teapot.ppm
-usr/%%DATADIR%%8.5/demos/items.tcl
-usr/%%DATADIR%%8.5/demos/ixset
-usr/%%DATADIR%%8.5/demos/knightstour.tcl
-usr/%%DATADIR%%8.5/demos/label.tcl
-usr/%%DATADIR%%8.5/demos/labelframe.tcl
-usr/%%DATADIR%%8.5/demos/license.terms
-usr/%%DATADIR%%8.5/demos/mclist.tcl
-usr/%%DATADIR%%8.5/demos/menu.tcl
-usr/%%DATADIR%%8.5/demos/menubu.tcl
-usr/%%DATADIR%%8.5/demos/msgbox.tcl
-usr/%%DATADIR%%8.5/demos/nl.msg
-usr/%%DATADIR%%8.5/demos/paned1.tcl
-usr/%%DATADIR%%8.5/demos/paned2.tcl
-usr/%%DATADIR%%8.5/demos/pendulum.tcl
-usr/%%DATADIR%%8.5/demos/plot.tcl
-usr/%%DATADIR%%8.5/demos/puzzle.tcl
-usr/%%DATADIR%%8.5/demos/radio.tcl
-usr/%%DATADIR%%8.5/demos/rmt
-usr/%%DATADIR%%8.5/demos/rolodex
-usr/%%DATADIR%%8.5/demos/ruler.tcl
-usr/%%DATADIR%%8.5/demos/sayings.tcl
-usr/%%DATADIR%%8.5/demos/search.tcl
-usr/%%DATADIR%%8.5/demos/spin.tcl
-usr/%%DATADIR%%8.5/demos/square
-usr/%%DATADIR%%8.5/demos/states.tcl
-usr/%%DATADIR%%8.5/demos/style.tcl
-usr/%%DATADIR%%8.5/demos/tclIndex
-usr/%%DATADIR%%8.5/demos/tcolor
-usr/%%DATADIR%%8.5/demos/text.tcl
-usr/%%DATADIR%%8.5/demos/textpeer.tcl
-usr/%%DATADIR%%8.5/demos/timer
-usr/%%DATADIR%%8.5/demos/toolbar.tcl
-usr/%%DATADIR%%8.5/demos/tree.tcl
-usr/%%DATADIR%%8.5/demos/ttkbut.tcl
-usr/%%DATADIR%%8.5/demos/ttkmenu.tcl
-usr/%%DATADIR%%8.5/demos/ttknote.tcl
-usr/%%DATADIR%%8.5/demos/ttkpane.tcl
-usr/%%DATADIR%%8.5/demos/ttkprogress.tcl
-usr/%%DATADIR%%8.5/demos/twind.tcl
-usr/%%DATADIR%%8.5/demos/unicodeout.tcl
-usr/%%DATADIR%%8.5/demos/vscale.tcl
-usr/%%DATADIR%%8.5/demos/widget
-usr/%%DATADIR%%8.5/dialog.tcl
-usr/%%DATADIR%%8.5/entry.tcl
-usr/%%DATADIR%%8.5/focus.tcl
-usr/%%DATADIR%%8.5/images/README
-usr/%%DATADIR%%8.5/images/logo.eps
-usr/%%DATADIR%%8.5/images/logo100.gif
-usr/%%DATADIR%%8.5/images/logo64.gif
-usr/%%DATADIR%%8.5/images/logoLarge.gif
-usr/%%DATADIR%%8.5/images/logoMed.gif
-usr/%%DATADIR%%8.5/images/pwrdLogo.eps
-usr/%%DATADIR%%8.5/images/pwrdLogo100.gif
-usr/%%DATADIR%%8.5/images/pwrdLogo150.gif
-usr/%%DATADIR%%8.5/images/pwrdLogo175.gif
-usr/%%DATADIR%%8.5/images/pwrdLogo200.gif
-usr/%%DATADIR%%8.5/images/pwrdLogo75.gif
-usr/%%DATADIR%%8.5/images/tai-ku.gif
-usr/%%DATADIR%%8.5/listbox.tcl
-usr/%%DATADIR%%8.5/menu.tcl
-usr/%%DATADIR%%8.5/mkpsenc.tcl
-usr/%%DATADIR%%8.5/msgbox.tcl
-usr/%%DATADIR%%8.5/msgs/cs.msg
-usr/%%DATADIR%%8.5/msgs/da.msg
-usr/%%DATADIR%%8.5/msgs/de.msg
-usr/%%DATADIR%%8.5/msgs/el.msg
-usr/%%DATADIR%%8.5/msgs/en.msg
-usr/%%DATADIR%%8.5/msgs/en_gb.msg
-usr/%%DATADIR%%8.5/msgs/eo.msg
-usr/%%DATADIR%%8.5/msgs/es.msg
-usr/%%DATADIR%%8.5/msgs/fr.msg
-usr/%%DATADIR%%8.5/msgs/hu.msg
-usr/%%DATADIR%%8.5/msgs/it.msg
-usr/%%DATADIR%%8.5/msgs/nl.msg
-usr/%%DATADIR%%8.5/msgs/pl.msg
-usr/%%DATADIR%%8.5/msgs/pt.msg
-usr/%%DATADIR%%8.5/msgs/ru.msg
-usr/%%DATADIR%%8.5/msgs/sv.msg
-usr/%%DATADIR%%8.5/obsolete.tcl
-usr/%%DATADIR%%8.5/optMenu.tcl
-usr/%%DATADIR%%8.5/palette.tcl
-usr/%%DATADIR%%8.5/panedwindow.tcl
-usr/%%DATADIR%%8.5/safetk.tcl
-usr/%%DATADIR%%8.5/scale.tcl
-usr/%%DATADIR%%8.5/scrlbar.tcl
-usr/%%DATADIR%%8.5/spinbox.tcl
-usr/%%DATADIR%%8.5/tclIndex
-usr/%%DATADIR%%8.5/tearoff.tcl
-usr/%%DATADIR%%8.5/text.tcl
-usr/%%DATADIR%%8.5/tk.tcl
-usr/%%DATADIR%%8.5/tkfbox.tcl
-usr/%%DATADIR%%8.5/ttk/altTheme.tcl
-usr/%%DATADIR%%8.5/ttk/aquaTheme.tcl
-usr/%%DATADIR%%8.5/ttk/button.tcl
-usr/%%DATADIR%%8.5/ttk/clamTheme.tcl
-usr/%%DATADIR%%8.5/ttk/classicTheme.tcl
-usr/%%DATADIR%%8.5/ttk/combobox.tcl
-usr/%%DATADIR%%8.5/ttk/cursors.tcl
-usr/%%DATADIR%%8.5/ttk/defaults.tcl
-usr/%%DATADIR%%8.5/ttk/entry.tcl
-usr/%%DATADIR%%8.5/ttk/fonts.tcl
-usr/%%DATADIR%%8.5/ttk/menubutton.tcl
-usr/%%DATADIR%%8.5/ttk/notebook.tcl
-usr/%%DATADIR%%8.5/ttk/panedwindow.tcl
-usr/%%DATADIR%%8.5/ttk/progress.tcl
-usr/%%DATADIR%%8.5/ttk/scale.tcl
-usr/%%DATADIR%%8.5/ttk/scrollbar.tcl
-usr/%%DATADIR%%8.5/ttk/sizegrip.tcl
-usr/%%DATADIR%%8.5/ttk/treeview.tcl
-usr/%%DATADIR%%8.5/ttk/ttk.tcl
-usr/%%DATADIR%%8.5/ttk/utils.tcl
-usr/%%DATADIR%%8.5/ttk/winTheme.tcl
-usr/%%DATADIR%%8.5/ttk/xpTheme.tcl
-usr/%%DATADIR%%8.5/unsupported.tcl
-usr/%%DATADIR%%8.5/xmfbox.tcl
+%%DATADIR%%/bgerror.tcl
+%%DATADIR%%/button.tcl
+%%DATADIR%%/choosedir.tcl
+%%DATADIR%%/clrpick.tcl
+%%DATADIR%%/comdlg.tcl
+%%DATADIR%%/console.tcl
+%%DATADIR%%/demos/README
+%%DATADIR%%/demos/anilabel.tcl
+%%DATADIR%%/demos/aniwave.tcl
+%%DATADIR%%/demos/arrow.tcl
+%%DATADIR%%/demos/bind.tcl
+%%DATADIR%%/demos/bitmap.tcl
+%%DATADIR%%/demos/browse
+%%DATADIR%%/demos/button.tcl
+%%DATADIR%%/demos/check.tcl
+%%DATADIR%%/demos/clrpick.tcl
+%%DATADIR%%/demos/colors.tcl
+%%DATADIR%%/demos/combo.tcl
+%%DATADIR%%/demos/cscroll.tcl
+%%DATADIR%%/demos/ctext.tcl
+%%DATADIR%%/demos/dialog1.tcl
+%%DATADIR%%/demos/dialog2.tcl
+%%DATADIR%%/demos/en.msg
+%%DATADIR%%/demos/entry1.tcl
+%%DATADIR%%/demos/entry2.tcl
+%%DATADIR%%/demos/entry3.tcl
+%%DATADIR%%/demos/filebox.tcl
+%%DATADIR%%/demos/floor.tcl
+%%DATADIR%%/demos/form.tcl
+%%DATADIR%%/demos/goldberg.tcl
+%%DATADIR%%/demos/hello
+%%DATADIR%%/demos/hscale.tcl
+%%DATADIR%%/demos/icon.tcl
+%%DATADIR%%/demos/image1.tcl
+%%DATADIR%%/demos/image2.tcl
+%%DATADIR%%/demos/images/earth.gif
+%%DATADIR%%/demos/images/earthris.gif
+%%DATADIR%%/demos/images/face.xbm
+%%DATADIR%%/demos/images/flagdown.xbm
+%%DATADIR%%/demos/images/flagup.xbm
+%%DATADIR%%/demos/images/gray25.xbm
+%%DATADIR%%/demos/images/letters.xbm
+%%DATADIR%%/demos/images/noletter.xbm
+%%DATADIR%%/demos/images/pattern.xbm
+%%DATADIR%%/demos/images/tcllogo.gif
+%%DATADIR%%/demos/images/teapot.ppm
+%%DATADIR%%/demos/items.tcl
+%%DATADIR%%/demos/ixset
+%%DATADIR%%/demos/knightstour.tcl
+%%DATADIR%%/demos/label.tcl
+%%DATADIR%%/demos/labelframe.tcl
+%%DATADIR%%/demos/license.terms
+%%DATADIR%%/demos/mclist.tcl
+%%DATADIR%%/demos/menu.tcl
+%%DATADIR%%/demos/menubu.tcl
+%%DATADIR%%/demos/msgbox.tcl
+%%DATADIR%%/demos/nl.msg
+%%DATADIR%%/demos/paned1.tcl
+%%DATADIR%%/demos/paned2.tcl
+%%DATADIR%%/demos/pendulum.tcl
+%%DATADIR%%/demos/plot.tcl
+%%DATADIR%%/demos/puzzle.tcl
+%%DATADIR%%/demos/radio.tcl
+%%DATADIR%%/demos/rmt
+%%DATADIR%%/demos/rolodex
+%%DATADIR%%/demos/ruler.tcl
+%%DATADIR%%/demos/sayings.tcl
+%%DATADIR%%/demos/search.tcl
+%%DATADIR%%/demos/spin.tcl
+%%DATADIR%%/demos/square
+%%DATADIR%%/demos/states.tcl
+%%DATADIR%%/demos/style.tcl
+%%DATADIR%%/demos/tclIndex
+%%DATADIR%%/demos/tcolor
+%%DATADIR%%/demos/text.tcl
+%%DATADIR%%/demos/textpeer.tcl
+%%DATADIR%%/demos/timer
+%%DATADIR%%/demos/toolbar.tcl
+%%DATADIR%%/demos/tree.tcl
+%%DATADIR%%/demos/ttkbut.tcl
+%%DATADIR%%/demos/ttkmenu.tcl
+%%DATADIR%%/demos/ttknote.tcl
+%%DATADIR%%/demos/ttkpane.tcl
+%%DATADIR%%/demos/ttkprogress.tcl
+%%DATADIR%%/demos/twind.tcl
+%%DATADIR%%/demos/unicodeout.tcl
+%%DATADIR%%/demos/vscale.tcl
+%%DATADIR%%/demos/widget
+%%DATADIR%%/dialog.tcl
+%%DATADIR%%/entry.tcl
+%%DATADIR%%/focus.tcl
+%%DATADIR%%/images/README
+%%DATADIR%%/images/logo.eps
+%%DATADIR%%/images/logo100.gif
+%%DATADIR%%/images/logo64.gif
+%%DATADIR%%/images/logoLarge.gif
+%%DATADIR%%/images/logoMed.gif
+%%DATADIR%%/images/pwrdLogo.eps
+%%DATADIR%%/images/pwrdLogo100.gif
+%%DATADIR%%/images/pwrdLogo150.gif
+%%DATADIR%%/images/pwrdLogo175.gif
+%%DATADIR%%/images/pwrdLogo200.gif
+%%DATADIR%%/images/pwrdLogo75.gif
+%%DATADIR%%/images/tai-ku.gif
+%%DATADIR%%/listbox.tcl
+%%DATADIR%%/menu.tcl
+%%DATADIR%%/mkpsenc.tcl
+%%DATADIR%%/msgbox.tcl
+%%DATADIR%%/msgs/cs.msg
+%%DATADIR%%/msgs/da.msg
+%%DATADIR%%/msgs/de.msg
+%%DATADIR%%/msgs/el.msg
+%%DATADIR%%/msgs/en.msg
+%%DATADIR%%/msgs/en_gb.msg
+%%DATADIR%%/msgs/eo.msg
+%%DATADIR%%/msgs/es.msg
+%%DATADIR%%/msgs/fr.msg
+%%DATADIR%%/msgs/hu.msg
+%%DATADIR%%/msgs/it.msg
+%%DATADIR%%/msgs/nl.msg
+%%DATADIR%%/msgs/pl.msg
+%%DATADIR%%/msgs/pt.msg
+%%DATADIR%%/msgs/ru.msg
+%%DATADIR%%/msgs/sv.msg
+%%DATADIR%%/obsolete.tcl
+%%DATADIR%%/optMenu.tcl
+%%DATADIR%%/palette.tcl
+%%DATADIR%%/panedwindow.tcl
+%%DATADIR%%/safetk.tcl
+%%DATADIR%%/scale.tcl
+%%DATADIR%%/scrlbar.tcl
+%%DATADIR%%/spinbox.tcl
+%%DATADIR%%/tclIndex
+%%DATADIR%%/tearoff.tcl
+%%DATADIR%%/text.tcl
+%%DATADIR%%/tk.tcl
+%%DATADIR%%/tkfbox.tcl
+%%DATADIR%%/ttk/altTheme.tcl
+%%DATADIR%%/ttk/aquaTheme.tcl
+%%DATADIR%%/ttk/button.tcl
+%%DATADIR%%/ttk/clamTheme.tcl
+%%DATADIR%%/ttk/classicTheme.tcl
+%%DATADIR%%/ttk/combobox.tcl
+%%DATADIR%%/ttk/cursors.tcl
+%%DATADIR%%/ttk/defaults.tcl
+%%DATADIR%%/ttk/entry.tcl
+%%DATADIR%%/ttk/fonts.tcl
+%%DATADIR%%/ttk/menubutton.tcl
+%%DATADIR%%/ttk/notebook.tcl
+%%DATADIR%%/ttk/panedwindow.tcl
+%%DATADIR%%/ttk/progress.tcl
+%%DATADIR%%/ttk/scale.tcl
+%%DATADIR%%/ttk/scrollbar.tcl
+%%DATADIR%%/ttk/sizegrip.tcl
+%%DATADIR%%/ttk/treeview.tcl
+%%DATADIR%%/ttk/ttk.tcl
+%%DATADIR%%/ttk/utils.tcl
+%%DATADIR%%/ttk/winTheme.tcl
+%%DATADIR%%/ttk/xpTheme.tcl
+%%DATADIR%%/unsupported.tcl
+%%DATADIR%%/xmfbox.tcl
diff --git a/x11-toolkits/linux-c6-tk85/pkg-plist.x86_64 b/x11-toolkits/linux-c6-tk85/pkg-plist.x86_64
index acb77ea729b9..7f6fbfabebc2 100644
--- a/x11-toolkits/linux-c6-tk85/pkg-plist.x86_64
+++ b/x11-toolkits/linux-c6-tk85/pkg-plist.x86_64
@@ -99,164 +99,164 @@ usr/share/man/mann/ttk_treeview.n.gz
 usr/share/man/mann/ttk_widget.n.gz
 usr/share/man/mann/winfo.n.gz
 usr/share/man/mann/wm.n.gz
-usr/%%DATADIR%%8.5/bgerror.tcl
-usr/%%DATADIR%%8.5/button.tcl
-usr/%%DATADIR%%8.5/choosedir.tcl
-usr/%%DATADIR%%8.5/clrpick.tcl
-usr/%%DATADIR%%8.5/comdlg.tcl
-usr/%%DATADIR%%8.5/console.tcl
-usr/%%DATADIR%%8.5/demos/README
-usr/%%DATADIR%%8.5/demos/anilabel.tcl
-usr/%%DATADIR%%8.5/demos/aniwave.tcl
-usr/%%DATADIR%%8.5/demos/arrow.tcl
-usr/%%DATADIR%%8.5/demos/bind.tcl
-usr/%%DATADIR%%8.5/demos/bitmap.tcl
-usr/%%DATADIR%%8.5/demos/browse
-usr/%%DATADIR%%8.5/demos/button.tcl
-usr/%%DATADIR%%8.5/demos/check.tcl
-usr/%%DATADIR%%8.5/demos/clrpick.tcl
-usr/%%DATADIR%%8.5/demos/colors.tcl
-usr/%%DATADIR%%8.5/demos/combo.tcl
-usr/%%DATADIR%%8.5/demos/cscroll.tcl
-usr/%%DATADIR%%8.5/demos/ctext.tcl
-usr/%%DATADIR%%8.5/demos/dialog1.tcl
-usr/%%DATADIR%%8.5/demos/dialog2.tcl
-usr/%%DATADIR%%8.5/demos/en.msg
-usr/%%DATADIR%%8.5/demos/entry1.tcl
-usr/%%DATADIR%%8.5/demos/entry2.tcl
-usr/%%DATADIR%%8.5/demos/entry3.tcl
-usr/%%DATADIR%%8.5/demos/filebox.tcl
-usr/%%DATADIR%%8.5/demos/floor.tcl
-usr/%%DATADIR%%8.5/demos/form.tcl
-usr/%%DATADIR%%8.5/demos/goldberg.tcl
-usr/%%DATADIR%%8.5/demos/hello
-usr/%%DATADIR%%8.5/demos/hscale.tcl
-usr/%%DATADIR%%8.5/demos/icon.tcl
-usr/%%DATADIR%%8.5/demos/image1.tcl
-usr/%%DATADIR%%8.5/demos/image2.tcl
-usr/%%DATADIR%%8.5/demos/images/earth.gif
-usr/%%DATADIR%%8.5/demos/images/earthris.gif
-usr/%%DATADIR%%8.5/demos/images/face.xbm
-usr/%%DATADIR%%8.5/demos/images/flagdown.xbm
-usr/%%DATADIR%%8.5/demos/images/flagup.xbm
-usr/%%DATADIR%%8.5/demos/images/gray25.xbm
-usr/%%DATADIR%%8.5/demos/images/letters.xbm
-usr/%%DATADIR%%8.5/demos/images/noletter.xbm
-usr/%%DATADIR%%8.5/demos/images/pattern.xbm
-usr/%%DATADIR%%8.5/demos/images/tcllogo.gif
-usr/%%DATADIR%%8.5/demos/images/teapot.ppm
-usr/%%DATADIR%%8.5/demos/items.tcl
-usr/%%DATADIR%%8.5/demos/ixset
-usr/%%DATADIR%%8.5/demos/knightstour.tcl
-usr/%%DATADIR%%8.5/demos/label.tcl
-usr/%%DATADIR%%8.5/demos/labelframe.tcl
-usr/%%DATADIR%%8.5/demos/license.terms
-usr/%%DATADIR%%8.5/demos/mclist.tcl
-usr/%%DATADIR%%8.5/demos/menu.tcl
-usr/%%DATADIR%%8.5/demos/menubu.tcl
-usr/%%DATADIR%%8.5/demos/msgbox.tcl
-usr/%%DATADIR%%8.5/demos/nl.msg
-usr/%%DATADIR%%8.5/demos/paned1.tcl
-usr/%%DATADIR%%8.5/demos/paned2.tcl
-usr/%%DATADIR%%8.5/demos/pendulum.tcl
-usr/%%DATADIR%%8.5/demos/plot.tcl
-usr/%%DATADIR%%8.5/demos/puzzle.tcl
-usr/%%DATADIR%%8.5/demos/radio.tcl
-usr/%%DATADIR%%8.5/demos/rmt
-usr/%%DATADIR%%8.5/demos/rolodex
-usr/%%DATADIR%%8.5/demos/ruler.tcl
-usr/%%DATADIR%%8.5/demos/sayings.tcl
-usr/%%DATADIR%%8.5/demos/search.tcl
-usr/%%DATADIR%%8.5/demos/spin.tcl
-usr/%%DATADIR%%8.5/demos/square
-usr/%%DATADIR%%8.5/demos/states.tcl
-usr/%%DATADIR%%8.5/demos/style.tcl
-usr/%%DATADIR%%8.5/demos/tclIndex
-usr/%%DATADIR%%8.5/demos/tcolor
-usr/%%DATADIR%%8.5/demos/text.tcl
-usr/%%DATADIR%%8.5/demos/textpeer.tcl
-usr/%%DATADIR%%8.5/demos/timer
-usr/%%DATADIR%%8.5/demos/toolbar.tcl
-usr/%%DATADIR%%8.5/demos/tree.tcl
-usr/%%DATADIR%%8.5/demos/ttkbut.tcl
-usr/%%DATADIR%%8.5/demos/ttkmenu.tcl
-usr/%%DATADIR%%8.5/demos/ttknote.tcl
-usr/%%DATADIR%%8.5/demos/ttkpane.tcl
-usr/%%DATADIR%%8.5/demos/ttkprogress.tcl
-usr/%%DATADIR%%8.5/demos/twind.tcl
-usr/%%DATADIR%%8.5/demos/unicodeout.tcl
-usr/%%DATADIR%%8.5/demos/vscale.tcl
-usr/%%DATADIR%%8.5/demos/widget
-usr/%%DATADIR%%8.5/dialog.tcl
-usr/%%DATADIR%%8.5/entry.tcl
-usr/%%DATADIR%%8.5/focus.tcl
-usr/%%DATADIR%%8.5/images/README
-usr/%%DATADIR%%8.5/images/logo.eps
-usr/%%DATADIR%%8.5/images/logo100.gif
-usr/%%DATADIR%%8.5/images/logo64.gif
-usr/%%DATADIR%%8.5/images/logoLarge.gif
-usr/%%DATADIR%%8.5/images/logoMed.gif
-usr/%%DATADIR%%8.5/images/pwrdLogo.eps
-usr/%%DATADIR%%8.5/images/pwrdLogo100.gif
-usr/%%DATADIR%%8.5/images/pwrdLogo150.gif
-usr/%%DATADIR%%8.5/images/pwrdLogo175.gif
-usr/%%DATADIR%%8.5/images/pwrdLogo200.gif
-usr/%%DATADIR%%8.5/images/pwrdLogo75.gif
-usr/%%DATADIR%%8.5/images/tai-ku.gif
-usr/%%DATADIR%%8.5/listbox.tcl
-usr/%%DATADIR%%8.5/menu.tcl
-usr/%%DATADIR%%8.5/mkpsenc.tcl
-usr/%%DATADIR%%8.5/msgbox.tcl
-usr/%%DATADIR%%8.5/msgs/cs.msg
-usr/%%DATADIR%%8.5/msgs/da.msg
-usr/%%DATADIR%%8.5/msgs/de.msg
-usr/%%DATADIR%%8.5/msgs/el.msg
-usr/%%DATADIR%%8.5/msgs/en.msg
-usr/%%DATADIR%%8.5/msgs/en_gb.msg
-usr/%%DATADIR%%8.5/msgs/eo.msg
-usr/%%DATADIR%%8.5/msgs/es.msg
-usr/%%DATADIR%%8.5/msgs/fr.msg
-usr/%%DATADIR%%8.5/msgs/hu.msg
-usr/%%DATADIR%%8.5/msgs/it.msg
-usr/%%DATADIR%%8.5/msgs/nl.msg
-usr/%%DATADIR%%8.5/msgs/pl.msg
-usr/%%DATADIR%%8.5/msgs/pt.msg
-usr/%%DATADIR%%8.5/msgs/ru.msg
-usr/%%DATADIR%%8.5/msgs/sv.msg
-usr/%%DATADIR%%8.5/obsolete.tcl
-usr/%%DATADIR%%8.5/optMenu.tcl
-usr/%%DATADIR%%8.5/palette.tcl
-usr/%%DATADIR%%8.5/panedwindow.tcl
-usr/%%DATADIR%%8.5/safetk.tcl
-usr/%%DATADIR%%8.5/scale.tcl
-usr/%%DATADIR%%8.5/scrlbar.tcl
-usr/%%DATADIR%%8.5/spinbox.tcl
-usr/%%DATADIR%%8.5/tclIndex
-usr/%%DATADIR%%8.5/tearoff.tcl
-usr/%%DATADIR%%8.5/text.tcl
-usr/%%DATADIR%%8.5/tk.tcl
-usr/%%DATADIR%%8.5/tkfbox.tcl
-usr/%%DATADIR%%8.5/ttk/altTheme.tcl
-usr/%%DATADIR%%8.5/ttk/aquaTheme.tcl
-usr/%%DATADIR%%8.5/ttk/button.tcl
-usr/%%DATADIR%%8.5/ttk/clamTheme.tcl
-usr/%%DATADIR%%8.5/ttk/classicTheme.tcl
-usr/%%DATADIR%%8.5/ttk/combobox.tcl
-usr/%%DATADIR%%8.5/ttk/cursors.tcl
-usr/%%DATADIR%%8.5/ttk/defaults.tcl
-usr/%%DATADIR%%8.5/ttk/entry.tcl
-usr/%%DATADIR%%8.5/ttk/fonts.tcl
-usr/%%DATADIR%%8.5/ttk/menubutton.tcl
-usr/%%DATADIR%%8.5/ttk/notebook.tcl
-usr/%%DATADIR%%8.5/ttk/panedwindow.tcl
-usr/%%DATADIR%%8.5/ttk/progress.tcl
-usr/%%DATADIR%%8.5/ttk/scale.tcl
-usr/%%DATADIR%%8.5/ttk/scrollbar.tcl
-usr/%%DATADIR%%8.5/ttk/sizegrip.tcl
-usr/%%DATADIR%%8.5/ttk/treeview.tcl
-usr/%%DATADIR%%8.5/ttk/ttk.tcl
-usr/%%DATADIR%%8.5/ttk/utils.tcl
-usr/%%DATADIR%%8.5/ttk/winTheme.tcl
-usr/%%DATADIR%%8.5/ttk/xpTheme.tcl
-usr/%%DATADIR%%8.5/unsupported.tcl
-usr/%%DATADIR%%8.5/xmfbox.tcl
+%%DATADIR%%/bgerror.tcl
+%%DATADIR%%/button.tcl
+%%DATADIR%%/choosedir.tcl
+%%DATADIR%%/clrpick.tcl
+%%DATADIR%%/comdlg.tcl
+%%DATADIR%%/console.tcl
+%%DATADIR%%/demos/README
+%%DATADIR%%/demos/anilabel.tcl
+%%DATADIR%%/demos/aniwave.tcl
+%%DATADIR%%/demos/arrow.tcl
+%%DATADIR%%/demos/bind.tcl
+%%DATADIR%%/demos/bitmap.tcl
+%%DATADIR%%/demos/browse
+%%DATADIR%%/demos/button.tcl
+%%DATADIR%%/demos/check.tcl
+%%DATADIR%%/demos/clrpick.tcl
+%%DATADIR%%/demos/colors.tcl
+%%DATADIR%%/demos/combo.tcl
+%%DATADIR%%/demos/cscroll.tcl
+%%DATADIR%%/demos/ctext.tcl
+%%DATADIR%%/demos/dialog1.tcl
+%%DATADIR%%/demos/dialog2.tcl
+%%DATADIR%%/demos/en.msg
+%%DATADIR%%/demos/entry1.tcl
+%%DATADIR%%/demos/entry2.tcl
+%%DATADIR%%/demos/entry3.tcl
+%%DATADIR%%/demos/filebox.tcl
+%%DATADIR%%/demos/floor.tcl
+%%DATADIR%%/demos/form.tcl
+%%DATADIR%%/demos/goldberg.tcl
+%%DATADIR%%/demos/hello
+%%DATADIR%%/demos/hscale.tcl
+%%DATADIR%%/demos/icon.tcl
+%%DATADIR%%/demos/image1.tcl
+%%DATADIR%%/demos/image2.tcl
+%%DATADIR%%/demos/images/earth.gif
+%%DATADIR%%/demos/images/earthris.gif
+%%DATADIR%%/demos/images/face.xbm
+%%DATADIR%%/demos/images/flagdown.xbm
+%%DATADIR%%/demos/images/flagup.xbm
+%%DATADIR%%/demos/images/gray25.xbm
+%%DATADIR%%/demos/images/letters.xbm
+%%DATADIR%%/demos/images/noletter.xbm
+%%DATADIR%%/demos/images/pattern.xbm
+%%DATADIR%%/demos/images/tcllogo.gif
+%%DATADIR%%/demos/images/teapot.ppm
+%%DATADIR%%/demos/items.tcl
+%%DATADIR%%/demos/ixset
+%%DATADIR%%/demos/knightstour.tcl
+%%DATADIR%%/demos/label.tcl
+%%DATADIR%%/demos/labelframe.tcl
+%%DATADIR%%/demos/license.terms
+%%DATADIR%%/demos/mclist.tcl
+%%DATADIR%%/demos/menu.tcl
+%%DATADIR%%/demos/menubu.tcl
+%%DATADIR%%/demos/msgbox.tcl
+%%DATADIR%%/demos/nl.msg
+%%DATADIR%%/demos/paned1.tcl
+%%DATADIR%%/demos/paned2.tcl
+%%DATADIR%%/demos/pendulum.tcl
+%%DATADIR%%/demos/plot.tcl
+%%DATADIR%%/demos/puzzle.tcl
+%%DATADIR%%/demos/radio.tcl
+%%DATADIR%%/demos/rmt
+%%DATADIR%%/demos/rolodex
+%%DATADIR%%/demos/ruler.tcl
+%%DATADIR%%/demos/sayings.tcl
+%%DATADIR%%/demos/search.tcl
+%%DATADIR%%/demos/spin.tcl
+%%DATADIR%%/demos/square
+%%DATADIR%%/demos/states.tcl
+%%DATADIR%%/demos/style.tcl
+%%DATADIR%%/demos/tclIndex
+%%DATADIR%%/demos/tcolor
+%%DATADIR%%/demos/text.tcl
+%%DATADIR%%/demos/textpeer.tcl
+%%DATADIR%%/demos/timer
+%%DATADIR%%/demos/toolbar.tcl
+%%DATADIR%%/demos/tree.tcl
+%%DATADIR%%/demos/ttkbut.tcl
+%%DATADIR%%/demos/ttkmenu.tcl
+%%DATADIR%%/demos/ttknote.tcl
+%%DATADIR%%/demos/ttkpane.tcl
+%%DATADIR%%/demos/ttkprogress.tcl
+%%DATADIR%%/demos/twind.tcl
+%%DATADIR%%/demos/unicodeout.tcl
+%%DATADIR%%/demos/vscale.tcl
+%%DATADIR%%/demos/widget
+%%DATADIR%%/dialog.tcl
+%%DATADIR%%/entry.tcl
+%%DATADIR%%/focus.tcl
+%%DATADIR%%/images/README
+%%DATADIR%%/images/logo.eps
+%%DATADIR%%/images/logo100.gif
+%%DATADIR%%/images/logo64.gif
+%%DATADIR%%/images/logoLarge.gif
+%%DATADIR%%/images/logoMed.gif
+%%DATADIR%%/images/pwrdLogo.eps
+%%DATADIR%%/images/pwrdLogo100.gif
+%%DATADIR%%/images/pwrdLogo150.gif
+%%DATADIR%%/images/pwrdLogo175.gif
+%%DATADIR%%/images/pwrdLogo200.gif
+%%DATADIR%%/images/pwrdLogo75.gif
+%%DATADIR%%/images/tai-ku.gif
+%%DATADIR%%/listbox.tcl
+%%DATADIR%%/menu.tcl
+%%DATADIR%%/mkpsenc.tcl
+%%DATADIR%%/msgbox.tcl
+%%DATADIR%%/msgs/cs.msg
+%%DATADIR%%/msgs/da.msg
+%%DATADIR%%/msgs/de.msg
+%%DATADIR%%/msgs/el.msg
+%%DATADIR%%/msgs/en.msg
+%%DATADIR%%/msgs/en_gb.msg
+%%DATADIR%%/msgs/eo.msg
+%%DATADIR%%/msgs/es.msg
+%%DATADIR%%/msgs/fr.msg
+%%DATADIR%%/msgs/hu.msg
+%%DATADIR%%/msgs/it.msg
+%%DATADIR%%/msgs/nl.msg
+%%DATADIR%%/msgs/pl.msg
+%%DATADIR%%/msgs/pt.msg
+%%DATADIR%%/msgs/ru.msg
+%%DATADIR%%/msgs/sv.msg
+%%DATADIR%%/obsolete.tcl
+%%DATADIR%%/optMenu.tcl
+%%DATADIR%%/palette.tcl
+%%DATADIR%%/panedwindow.tcl
+%%DATADIR%%/safetk.tcl
+%%DATADIR%%/scale.tcl
+%%DATADIR%%/scrlbar.tcl
+%%DATADIR%%/spinbox.tcl
+%%DATADIR%%/tclIndex
+%%DATADIR%%/tearoff.tcl
+%%DATADIR%%/text.tcl
+%%DATADIR%%/tk.tcl
+%%DATADIR%%/tkfbox.tcl
+%%DATADIR%%/ttk/altTheme.tcl
+%%DATADIR%%/ttk/aquaTheme.tcl
+%%DATADIR%%/ttk/button.tcl
+%%DATADIR%%/ttk/clamTheme.tcl
+%%DATADIR%%/ttk/classicTheme.tcl
+%%DATADIR%%/ttk/combobox.tcl
+%%DATADIR%%/ttk/cursors.tcl
+%%DATADIR%%/ttk/defaults.tcl
+%%DATADIR%%/ttk/entry.tcl
+%%DATADIR%%/ttk/fonts.tcl
+%%DATADIR%%/ttk/menubutton.tcl
+%%DATADIR%%/ttk/notebook.tcl
+%%DATADIR%%/ttk/panedwindow.tcl
+%%DATADIR%%/ttk/progress.tcl
+%%DATADIR%%/ttk/scale.tcl
+%%DATADIR%%/ttk/scrollbar.tcl
+%%DATADIR%%/ttk/sizegrip.tcl
+%%DATADIR%%/ttk/treeview.tcl
+%%DATADIR%%/ttk/ttk.tcl
+%%DATADIR%%/ttk/utils.tcl
+%%DATADIR%%/ttk/winTheme.tcl
+%%DATADIR%%/ttk/xpTheme.tcl
+%%DATADIR%%/unsupported.tcl
+%%DATADIR%%/xmfbox.tcl
diff --git a/x11-toolkits/linux-f10-blt/Makefile b/x11-toolkits/linux-f10-blt/Makefile
index 4fe004fd2685..6271346b1fb8 100644
--- a/x11-toolkits/linux-f10-blt/Makefile
+++ b/x11-toolkits/linux-f10-blt/Makefile
@@ -9,9 +9,9 @@ CATEGORIES=	x11-toolkits linux
 MAINTAINER=	devel@stasyan.com
 COMMENT=	BLT widget extension to Tcl/Tk scripting language development (Linux Fedora 10)
 
-USE_LINUX=	f10
+USES=		linux:f10
 USE_LINUX_RPM=	yes
-USE_LINUX_APPS=	tcl85 tk85 xorglibs
+USE_LINUX=	tcl85 tk85 xorglibs
 
 RPMVERSION=	28.z.fc10
 USE_LDCONFIG=	yes
diff --git a/x11-toolkits/linux-f10-gtk2/Makefile b/x11-toolkits/linux-f10-gtk2/Makefile
index 4e3074859dd9..72282a8adc2e 100644
--- a/x11-toolkits/linux-f10-gtk2/Makefile
+++ b/x11-toolkits/linux-f10-gtk2/Makefile
@@ -5,48 +5,43 @@ PORTNAME=	gtk2
 PORTVERSION=	2.14.7
 PORTREVISION=	5
 CATEGORIES=	x11-toolkits linux
-MASTER_SITES=	LOCAL/ehaupt/rpm/${LINUX_RPM_ARCH}/fedora/${LINUX_DIST_VER}
-
-DISTFILES=	${DISTNAME}.${LINUX_RPM_ARCH}.rpm \
-		${PORTNAME}-engines-2.16.1-1.fc10.${LINUX_RPM_ARCH}.rpm \
-		gtk-murrine-engine-0.53.1-3.fc10.${LINUX_RPM_ARCH}.rpm \
-		gtk-nodoka-engine-0.7.2-1.fc10.${LINUX_RPM_ARCH}.rpm \
-		gtk-qt-engine-1.1-2.fc10.${LINUX_RPM_ARCH}.rpm \
-		gtk-rezlooks-engine-0.6-6.fc9.${LINUX_RPM_ARCH}.rpm \
-		gtk-xfce-engine-2.4.3-1.fc10.${LINUX_RPM_ARCH}.rpm \
-		pixman-0.12.0-3.fc10.${LINUX_RPM_ARCH}.rpm \
-		jasper-libs-1.900.1-8.fc9.${LINUX_RPM_ARCH}.rpm
+BIN_DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \
+		${PORTNAME}-engines-2.16.1-1.fc10${EXTRACT_SUFX} \
+		gtk-murrine-engine-0.53.1-3.fc10${EXTRACT_SUFX} \
+		gtk-nodoka-engine-0.7.2-1.fc10${EXTRACT_SUFX} \
+		gtk-qt-engine-1.1-2.fc10${EXTRACT_SUFX} \
+		gtk-rezlooks-engine-0.6-6.fc9${EXTRACT_SUFX} \
+		gtk-xfce-engine-2.4.3-1.fc10${EXTRACT_SUFX} \
+		pixman-0.12.0-3.fc10${EXTRACT_SUFX} \
+		jasper-libs-1.900.1-8.fc9${EXTRACT_SUFX}
 
 MAINTAINER=	emulation@FreeBSD.org
 COMMENT=	GTK+ library, version 2.X (Linux Fedora 10)
 
 CONFLICTS=	linux-gtk2-[0-9]* linux-f8-gtk2-[0-9]*
 
-ONLY_FOR_ARCHS=	i386 amd64
-USE_LINUX=	f10
-USE_LINUX_RPM=	yes
+USES=		linux:f10
 # these libraries are required by gtk-query-immodules-2.0 or
 # gdk-pixbuf-query-loaders
-USE_LINUX_APPS=	atk jpeg pango png tiff xorglibs
+USE_LINUX=	atk jpeg pango png tiff xorglibs
+USE_LINUX_RPM=	nolib
 
 RPMVERSION=	9.fc10
-BRANDELF_DIRS=	usr/bin
 USE_LDCONFIG=	yes
 
 DESCR=		${.CURDIR}/../${PORTNAME}0/pkg-descr
-SRC_DISTFILES=	${DISTNAME}.src.rpm \
-		${PORTNAME}-engines-2.16.1-1.fc10.src.rpm \
-		gtk-murrine-engine-0.53.1-3.fc10.src.rpm \
-		gtk-nodoka-engine-0.7.2-1.fc10.src.rpm \
-		gtk-qt-engine-1.1-2.fc10.src.rpm \
-		gtk-rezlooks-engine-0.6-6.fc9.src.rpm \
-		gtk-xfce-engine-2.4.3-1.fc10.src.rpm \
-		pixman-0.12.0-3.fc10.src.rpm \
-		jasper-1.900.1-8.fc9.src.rpm
+SRC_DISTFILES=	${DISTNAME}${SRC_SUFX}:SOURCE \
+		${PORTNAME}-engines-2.16.1-1.fc10.src.rpm:SOURCE \
+		gtk-murrine-engine-0.53.1-3.fc10.src.rpm:SOURCE \
+		gtk-nodoka-engine-0.7.2-1.fc10.src.rpm:SOURCE \
+		gtk-qt-engine-1.1-2.fc10.src.rpm:SOURCE \
+		gtk-rezlooks-engine-0.6-6.fc9.src.rpm:SOURCE \
+		gtk-xfce-engine-2.4.3-1.fc10.src.rpm:SOURCE \
+		pixman-0.12.0-3.fc10.src.rpm:SOURCE \
+		jasper-1.900.1-8.fc9.src.rpm:SOURCE
 
 post-install:
 	${RM} ${STAGEDIR}${PREFIX}/usr/lib/gtk-2.0/modules/libferret.la
 	${RM} ${STAGEDIR}${PREFIX}/usr/lib/gtk-2.0/modules/libgail.la
 
-
 .include <bsd.port.mk>
diff --git a/x11-toolkits/linux-f10-openmotif/Makefile b/x11-toolkits/linux-f10-openmotif/Makefile
index f0e2c830af2d..b0d9d4a77f61 100644
--- a/x11-toolkits/linux-f10-openmotif/Makefile
+++ b/x11-toolkits/linux-f10-openmotif/Makefile
@@ -12,11 +12,10 @@ COMMENT=	Motif toolkit Linux libraries
 
 CONFLICTS=	linux-openmotif-[0-9]* linux-f8-openmotif-[0-9]*
 
-ONLY_FOR_ARCHS=	i386 amd64
-USE_LINUX=	f10
+USES=		linux:f10
 RPMVERSION=	1.fc10
 USE_LINUX_RPM=	yes
-USE_LINUX_APPS=	xorglibs
+USE_LINUX=	xorglibs
 USE_LDCONFIG=	yes
 SRC_DISTFILES=
 DISTINFO_FILE=	${MASTERDIR}/distinfo.i386
diff --git a/x11-toolkits/linux-f10-pango/Makefile b/x11-toolkits/linux-f10-pango/Makefile
index 30f2c1391eec..1df9b0a5bbaf 100644
--- a/x11-toolkits/linux-f10-pango/Makefile
+++ b/x11-toolkits/linux-f10-pango/Makefile
@@ -5,20 +5,18 @@ PORTNAME=	pango
 PORTVERSION=	1.28.3
 PORTREVISION=	1
 CATEGORIES=	x11-toolkits linux
-MASTER_SITES=	LOCAL/netchild/rpms/${LINUX_DIST}${LINUX_DIST_VER}
+MASTER_SITES=	LOCAL/netchild/rpms/fedora10
 
 MAINTAINER=	emulation@FreeBSD.org
 COMMENT=	Pango library (Linux Fedora 10)
 
 CONFLICTS=	linux-pango-[0-9]* linux-f8-pango-[0-9]*
 
-ONLY_FOR_ARCHS=	i386 amd64
-USE_LINUX=	f10
+USES=		linux:f10
 USE_LINUX_RPM=	yes
 # these libraries are required by pango-querymodules
-USE_LINUX_APPS=	cairo expat fontconfig xorglibs
+USE_LINUX=	cairo expat fontconfig xorglibs
 RPMVERSION=	1.fc10
-BRANDELF_FILES=	usr/bin/pango-querymodules-32
 USE_LDCONFIG=	yes
 
 DESCR=		${.CURDIR}/../${PORTNAME}/pkg-descr
diff --git a/x11-toolkits/linux-f10-qt45/Makefile b/x11-toolkits/linux-f10-qt45/Makefile
index 18a9acee8346..31062a74c2fc 100644
--- a/x11-toolkits/linux-f10-qt45/Makefile
+++ b/x11-toolkits/linux-f10-qt45/Makefile
@@ -1,20 +1,18 @@
 # $FreeBSD$
 
-PORTNAME=	${LINUX_NAME}45
+PORTNAME=	qt45
 PORTVERSION=	4.5.3
 CATEGORIES=	x11-toolkits linux
 MASTER_SITES=	http://archives.fedoraproject.org/pub/archive/fedora/linux/updates/10/i386/ \
 		http://archives.fedoraproject.org/pub/archive/fedora/linux/updates/10/SRPMS/
 DISTNAME=	qt-${PORTVERSION}-${RPMVERSION}
 
-
 MAINTAINER=	emulation@FreeBSD.org
 COMMENT=	RPM of QT4 (Linux Fedora 10)
 
-USE_LINUX=	f10
+USES=		linux:f10
 USE_LINUX_RPM=	yes
-USE_LINUX_APPS=	fontconfig libmng png
-LINUX_NAME=	qt
+USE_LINUX=	fontconfig libmng png
 
 RPMVERSION=	9.fc10
 USE_LDCONFIG=	yes
diff --git a/x11-toolkits/linux-f10-tk85/Makefile b/x11-toolkits/linux-f10-tk85/Makefile
index a6c6ae61b2a0..345df4520db3 100644
--- a/x11-toolkits/linux-f10-tk85/Makefile
+++ b/x11-toolkits/linux-f10-tk85/Makefile
@@ -5,7 +5,6 @@ PORTNAME=	tk
 PORTVERSION=	8.5.3
 PORTREVISION=	2
 CATEGORIES=	x11-toolkits linux
-MASTER_SITES=	LOCAL/ehaupt/rpm/${LINUX_RPM_ARCH}/fedora/${LINUX_DIST_VER}
 
 PKGNAMESUFFIX=	85
 
@@ -14,13 +13,12 @@ COMMENT=	Graphical toolkit for TCL (Linux Fedora 10)
 
 CONFLICTS=	linux-f8-tk84-[0-9]*
 
-USE_LINUX=	f10
+USES=		linux:f10
 USE_LINUX_RPM=	yes
 USE_LINUX_RPM_BAD_PERMS=	yes
-USE_LINUX_APPS=	xorglibs
+USE_LINUX=	xorglibs
 
 RPMVERSION=	5.fc10
-BRANELF_FILES=	usr/bin/wish8.5
 USE_LDCONFIG=	yes
 
 DESCR=		${.CURDIR}/../${PORTNAME}${PKGNAMESUFFIX}/pkg-descr