[45603] trunk/dports

jeremyhu at macports.org jeremyhu at macports.org
Sun Jan 18 12:52:44 PST 2009


Revision: 45603
          http://trac.macports.org/changeset/45603
Author:   jeremyhu at macports.org
Date:     2009-01-18 12:52:41 -0800 (Sun, 18 Jan 2009)
Log Message:
-----------
x11 dependent ports: Force port: based X11 dependencies

As mentioned over the past month and a half on macports-dev:
http://lists.macosforge.org/pipermail/macports-dev/2008-December/006818.html
http://lists.macosforge.org/pipermail/macports-dev/2009-January/006870.html
http://lists.macosforge.org/pipermail/macports-dev/2009-January/007003.html

This should address the underlying problem in tickets:
http://trac.macports.org/ticket/17356
http://trac.macports.org/ticket/17558
http://trac.macports.org/ticket/17631

This commit updates all ports explicitly depending on X11.  These ports now 
explicitly rely on X11 libraries in MacPorts rather than using lib: based 
dependencies satisfied by X11 libraries in $x11prefix.  The former policy was 
devised due to the difficulty of providing such libs easily to the MacPorts 
community under the old monolythic X distribution.  Due to the X.org project's 
transition to the autoconf build system and modularization of the project as 
well as the XQuartz projects efforts to make these new releases work on OSX, 
MacPorts can now have more control over its offerings and provide users with 
better consistency and stability.

Other ports that "inherited" the X11 dependency may still require a revision 
bump to link against the new libs.  If you find a binary or library linking 
against $x11prefix/lib/lib*.dylib after 'sudo port upgrade outdated' (and 
you're not using the +system_x11 variant), please report that, so we can get 
it fixed.

Modified Paths:
--------------
    trunk/dports/aqua/osx2x/Portfile
    trunk/dports/audio/arts/Portfile
    trunk/dports/devel/allegro/Portfile
    trunk/dports/devel/dbus/Portfile
    trunk/dports/devel/ddd/Portfile
    trunk/dports/devel/gtkglext/Portfile
    trunk/dports/devel/inventor/Portfile
    trunk/dports/devel/libast/Portfile
    trunk/dports/devel/libgdiplus/Portfile
    trunk/dports/devel/libsdl/Portfile
    trunk/dports/devel/mono/Portfile
    trunk/dports/devel/ode/Portfile
    trunk/dports/devel/pnetlib/Portfile
    trunk/dports/devel/rdesktop-devel/Portfile
    trunk/dports/devel/t1lib/Portfile
    trunk/dports/editors/TeXmacs/Portfile
    trunk/dports/editors/aee/Portfile
    trunk/dports/editors/efte/Portfile
    trunk/dports/editors/elvis/Portfile
    trunk/dports/editors/emacs/Portfile
    trunk/dports/editors/vim/Portfile
    trunk/dports/editors/yudit/Portfile
    trunk/dports/emulators/basiliskii/Portfile
    trunk/dports/emulators/freesci/Portfile
    trunk/dports/emulators/pearpc/Portfile
    trunk/dports/emulators/spim/Portfile
    trunk/dports/emulators/vice/Portfile
    trunk/dports/games/angband/Portfile
    trunk/dports/games/cannonsmash/Portfile
    trunk/dports/games/gnushogi/Portfile
    trunk/dports/games/lincity/Portfile
    trunk/dports/games/lincity-ng/Portfile
    trunk/dports/games/qthello/Portfile
    trunk/dports/games/teg/Portfile
    trunk/dports/games/wesnoth/Portfile
    trunk/dports/games/xbill/Portfile
    trunk/dports/games/xboard/Portfile
    trunk/dports/games/xdigger/Portfile
    trunk/dports/games/xmahjongg/Portfile
    trunk/dports/games/xmj/Portfile
    trunk/dports/games/xskat/Portfile
    trunk/dports/gnome/eog/Portfile
    trunk/dports/gnome/gnome-desktop/Portfile
    trunk/dports/gnome/gnome-mag/Portfile
    trunk/dports/gnome/startup-notification/Portfile
    trunk/dports/graphics/Coin/Portfile
    trunk/dports/graphics/ImageMagick/Portfile
    trunk/dports/graphics/SimGear/Portfile
    trunk/dports/graphics/aalib/Portfile
    trunk/dports/graphics/antigraingeometry/Portfile
    trunk/dports/graphics/cairo/Portfile
    trunk/dports/graphics/cairo-devel/Portfile
    trunk/dports/graphics/fnlib/Portfile
    trunk/dports/graphics/fontforge/Portfile
    trunk/dports/graphics/gd2/Portfile
    trunk/dports/graphics/glitz/Portfile
    trunk/dports/graphics/glut/Portfile
    trunk/dports/graphics/graphviz/Portfile
    trunk/dports/graphics/graphviz-devel/Portfile
    trunk/dports/graphics/imlib2/Portfile
    trunk/dports/graphics/jasper/Portfile
    trunk/dports/graphics/libcaca/Portfile
    trunk/dports/graphics/libungif/Portfile
    trunk/dports/graphics/libwmf/Portfile
    trunk/dports/graphics/magicpoint/Portfile
    trunk/dports/graphics/pgplot/Portfile
    trunk/dports/graphics/plotutils/Portfile
    trunk/dports/graphics/povray/Portfile
    trunk/dports/graphics/tgif/Portfile
    trunk/dports/graphics/vtk/Portfile
    trunk/dports/graphics/vtk5/Portfile
    trunk/dports/graphics/xaos/Portfile
    trunk/dports/graphics/xli/Portfile
    trunk/dports/graphics/xpdf/Portfile
    trunk/dports/graphics/xv/Portfile
    trunk/dports/kde/kdelibs3/Portfile
    trunk/dports/lang/mit-scheme/Portfile
    trunk/dports/lang/polyml/Portfile
    trunk/dports/lang/squeak/Portfile
    trunk/dports/lang/swi-prolog/Portfile
    trunk/dports/lang/swi-prolog-devel/Portfile
    trunk/dports/lang/yabasic/Portfile
    trunk/dports/math/R/Portfile
    trunk/dports/math/gnuplot/Portfile
    trunk/dports/math/oleo/Portfile
    trunk/dports/math/ploticus/Portfile
    trunk/dports/multimedia/MPlayer/Portfile
    trunk/dports/multimedia/emotion/Portfile
    trunk/dports/multimedia/mpeg2vidcodec/Portfile
    trunk/dports/multimedia/xine-lib/Portfile
    trunk/dports/net/gpsd/Portfile
    trunk/dports/net/rdesktop/Portfile
    trunk/dports/net/scotty/Portfile
    trunk/dports/net/wap11gui/Portfile
    trunk/dports/perl/p5-term-gnuplot/Portfile
    trunk/dports/print/espgs/Portfile
    trunk/dports/print/ghostscript/Portfile
    trunk/dports/print/gv/Portfile
    trunk/dports/print/teTeX/Portfile
    trunk/dports/science/geomview/Portfile
    trunk/dports/science/molden/Portfile
    trunk/dports/science/rasmol/Portfile
    trunk/dports/science/tempo/Portfile
    trunk/dports/science/triangle/Portfile
    trunk/dports/science/xastir/Portfile
    trunk/dports/security/pwsafe/Portfile
    trunk/dports/sysutils/wmcpuload/Portfile
    trunk/dports/sysutils/wmmemmon/Portfile
    trunk/dports/tex/pTeX/Portfile
    trunk/dports/tex/texlive_base/Portfile
    trunk/dports/textproc/most/Portfile
    trunk/dports/textproc/tkman/Portfile
    trunk/dports/www/links/Portfile
    trunk/dports/x11/Eterm/Portfile
    trunk/dports/x11/SoXt/Portfile
    trunk/dports/x11/Xaw3d/Portfile
    trunk/dports/x11/abclock/Portfile
    trunk/dports/x11/advi/Portfile
    trunk/dports/x11/appres/Portfile
    trunk/dports/x11/aterm/Portfile
    trunk/dports/x11/awesome/Portfile
    trunk/dports/x11/bdftopcf/Portfile
    trunk/dports/x11/bitmap/Portfile
    trunk/dports/x11/blackbox/Portfile
    trunk/dports/x11/blt/Portfile
    trunk/dports/x11/desklaunch/Portfile
    trunk/dports/x11/editres/Portfile
    trunk/dports/x11/emiclock/Portfile
    trunk/dports/x11/enlightenment/Portfile
    trunk/dports/x11/evilwm/Portfile
    trunk/dports/x11/eyeclock/Portfile
    trunk/dports/x11/fireworkx/Portfile
    trunk/dports/x11/fluxbox/Portfile
    trunk/dports/x11/fonttosfnt/Portfile
    trunk/dports/x11/fox/Portfile
    trunk/dports/x11/fslsfonts/Portfile
    trunk/dports/x11/fstobdf/Portfile
    trunk/dports/x11/fvwm/Portfile
    trunk/dports/x11/fvwm2/Portfile
    trunk/dports/x11/glw/Portfile
    trunk/dports/x11/grace/Portfile
    trunk/dports/x11/gtk1/Portfile
    trunk/dports/x11/gtk2/Portfile
    trunk/dports/x11/gtk28/Portfile
    trunk/dports/x11/iceauth/Portfile
    trunk/dports/x11/icewm/Portfile
    trunk/dports/x11/ico/Portfile
    trunk/dports/x11/keylaunch/Portfile
    trunk/dports/x11/kinput2-macim/Portfile
    trunk/dports/x11/lesstif/Portfile
    trunk/dports/x11/listres/Portfile
    trunk/dports/x11/luit/Portfile
    trunk/dports/x11/mesa/Portfile
    trunk/dports/x11/mkfontscale/Portfile
    trunk/dports/x11/mlterm/Portfile
    trunk/dports/x11/mrxvt/Portfile
    trunk/dports/x11/neXtaw/Portfile
    trunk/dports/x11/oclock/Portfile
    trunk/dports/x11/openbox/Portfile
    trunk/dports/x11/openmotif/Portfile
    trunk/dports/x11/oroborus/Portfile
    trunk/dports/x11/pango/Portfile
    trunk/dports/x11/pango-devel/Portfile
    trunk/dports/x11/qt3/Portfile
    trunk/dports/x11/qt4-x11/Portfile
    trunk/dports/x11/ratpoison/Portfile
    trunk/dports/x11/rxvt/Portfile
    trunk/dports/x11/rxvt-unicode/Portfile
    trunk/dports/x11/setxkbmap/Portfile
    trunk/dports/x11/showfont/Portfile
    trunk/dports/x11/tightvnc/Portfile
    trunk/dports/x11/tk/Portfile
    trunk/dports/x11/twm/Portfile
    trunk/dports/x11/unclutter/Portfile
    trunk/dports/x11/viewres/Portfile
    trunk/dports/x11/vnc/Portfile
    trunk/dports/x11/vtwm/Portfile
    trunk/dports/x11/windowmaker/Portfile
    trunk/dports/x11/wine/Portfile
    trunk/dports/x11/wine-devel/Portfile
    trunk/dports/x11/wmcalclock/Portfile
    trunk/dports/x11/wmclock/Portfile
    trunk/dports/x11/wmcube/Portfile
    trunk/dports/x11/wmii/Portfile
    trunk/dports/x11/x11perf/Portfile
    trunk/dports/x11/xauth/Portfile
    trunk/dports/x11/xcalc/Portfile
    trunk/dports/x11/xcb/Portfile
    trunk/dports/x11/xclipboard/Portfile
    trunk/dports/x11/xclock/Portfile
    trunk/dports/x11/xconsole/Portfile
    trunk/dports/x11/xcursorgen/Portfile
    trunk/dports/x11/xditview/Portfile
    trunk/dports/x11/xdm/Portfile
    trunk/dports/x11/xdpyinfo/Portfile
    trunk/dports/x11/xearth/Portfile
    trunk/dports/x11/xedit/Portfile
    trunk/dports/x11/xev/Portfile
    trunk/dports/x11/xeyes/Portfile
    trunk/dports/x11/xfd/Portfile
    trunk/dports/x11/xfontsel/Portfile
    trunk/dports/x11/xforms/Portfile
    trunk/dports/x11/xfs/Portfile
    trunk/dports/x11/xfsinfo/Portfile
    trunk/dports/x11/xgc/Portfile
    trunk/dports/x11/xhost/Portfile
    trunk/dports/x11/xinit/Portfile
    trunk/dports/x11/xinput/Portfile
    trunk/dports/x11/xkbcomp/Portfile
    trunk/dports/x11/xkbevd/Portfile
    trunk/dports/x11/xkbprint/Portfile
    trunk/dports/x11/xkbutils/Portfile
    trunk/dports/x11/xkill/Portfile
    trunk/dports/x11/xload/Portfile
    trunk/dports/x11/xlogo/Portfile
    trunk/dports/x11/xlsatoms/Portfile
    trunk/dports/x11/xlsclients/Portfile
    trunk/dports/x11/xlsfonts/Portfile
    trunk/dports/x11/xmag/Portfile
    trunk/dports/x11/xman/Portfile
    trunk/dports/x11/xmessage/Portfile
    trunk/dports/x11/xmh/Portfile
    trunk/dports/x11/xmodmap/Portfile
    trunk/dports/x11/xmore/Portfile
    trunk/dports/x11/xnee/Portfile
    trunk/dports/x11/xping/Portfile
    trunk/dports/x11/xplanet/Portfile
    trunk/dports/x11/xpr/Portfile
    trunk/dports/x11/xprop/Portfile
    trunk/dports/x11/xrandr/Portfile
    trunk/dports/x11/xrdb/Portfile
    trunk/dports/x11/xrefresh/Portfile
    trunk/dports/x11/xrender/Portfile
    trunk/dports/x11/xrmap/Portfile
    trunk/dports/x11/xroot/Portfile
    trunk/dports/x11/xruskb/Portfile
    trunk/dports/x11/xsel/Portfile
    trunk/dports/x11/xset/Portfile
    trunk/dports/x11/xsetmode/Portfile
    trunk/dports/x11/xsetpointer/Portfile
    trunk/dports/x11/xsetroot/Portfile
    trunk/dports/x11/xsm/Portfile
    trunk/dports/x11/xstdcmap/Portfile
    trunk/dports/x11/xteddy/Portfile
    trunk/dports/x11/xterm/Portfile
    trunk/dports/x11/xtrap/Portfile
    trunk/dports/x11/xvinfo/Portfile
    trunk/dports/x11/xwd/Portfile
    trunk/dports/x11/xwininfo/Portfile
    trunk/dports/x11/xwud/Portfile
    trunk/dports/xfce/libxfce4mcs/Portfile
    trunk/dports/xfce/xfwm4/Portfile

Modified: trunk/dports/aqua/osx2x/Portfile
===================================================================
--- trunk/dports/aqua/osx2x/Portfile	2009-01-18 19:52:04 UTC (rev 45602)
+++ trunk/dports/aqua/osx2x/Portfile	2009-01-18 20:52:41 UTC (rev 45603)
@@ -6,6 +6,7 @@
 
 name            osx2x
 version         2.4.0
+revision        1
 set git_hash    3cc708236898ab789bb99a5fba7420ff76ede9f7
 platforms       darwin
 maintainers     nomaintainer
@@ -39,7 +40,7 @@
     reinplace s|@X11_PREFIX@|$x11prefix| $worksrcpath/osx2x.xcodeproj/project.pbxproj
 }
 
-depends_lib     lib:libX11:xorg \
+depends_lib     port:xorg-libs \
                 port:openssl
 
 set library_search_path "LIBRARY_SEARCH_PATHS='$prefix/lib $x11prefix/lib'"

Modified: trunk/dports/audio/arts/Portfile
===================================================================
--- trunk/dports/audio/arts/Portfile	2009-01-18 19:52:04 UTC (rev 45602)
+++ trunk/dports/audio/arts/Portfile	2009-01-18 20:52:41 UTC (rev 45603)
@@ -3,7 +3,7 @@
 PortSystem 1.0
 name            arts
 version         1.1.2
-revision        5
+revision        6
 categories      audio
 maintainers     nomaintainer
 description     analog realtime synthesizer
@@ -39,7 +39,7 @@
                 port:libpng \
                 port:qt3 \
                 port:libvorbis \
-                lib:libX11.6:XFree86
+                port:xorg-libs
 depends_build   bin:pkg-config:pkgconfig
 
 checksums       arts-${version}${extract.suffix} md5 5d5a1858f8dcf0d88600291899dff75b \

Modified: trunk/dports/devel/allegro/Portfile
===================================================================
--- trunk/dports/devel/allegro/Portfile	2009-01-18 19:52:04 UTC (rev 45602)
+++ trunk/dports/devel/allegro/Portfile	2009-01-18 20:52:41 UTC (rev 45603)
@@ -4,6 +4,7 @@
 
 name            allegro
 version         4.2.2
+revision        1
 description     A game programming library for C/C++ developers.
 long_description \
                 Allegro is a game programming library for \
@@ -17,7 +18,7 @@
 homepage        http://alleg.sourceforge.net/
 master_sites    sourceforge:alleg
 checksums       md5 87ffb1def034e0ec29a9ad4a595cda7e
-depends_lib     lib:libX11:XFree86
+depends_lib     port:xorg-libs
 patchfiles      patch-makefile.osx
 
 configure    {

Modified: trunk/dports/devel/dbus/Portfile
===================================================================
--- trunk/dports/devel/dbus/Portfile	2009-01-18 19:52:04 UTC (rev 45602)
+++ trunk/dports/devel/dbus/Portfile	2009-01-18 20:52:41 UTC (rev 45603)
@@ -5,7 +5,7 @@
 
 name            dbus
 version         1.2.12
-revision        2
+revision        3
 maintainers     nomaintainer
 categories      devel
 platforms       darwin
@@ -49,7 +49,7 @@
     patchfiles              patch-dbus-launch-x11.c.diff \
                             patch-dbus-sysdeps-util-unix.c.diff
 
-    depends_lib-append      lib:libX11:xorg-libX11
+    depends_lib-append      port:xorg-libX11
 
     configure.args-delete   --without-x \
                             --enable-launchd

Modified: trunk/dports/devel/ddd/Portfile
===================================================================
--- trunk/dports/devel/ddd/Portfile	2009-01-18 19:52:04 UTC (rev 45602)
+++ trunk/dports/devel/ddd/Portfile	2009-01-18 20:52:41 UTC (rev 45603)
@@ -4,7 +4,7 @@
 
 name            ddd
 version         3.3.11
-revision        1
+revision        2
 categories      devel
 platforms       darwin
 maintainers     nomaintainer
@@ -23,8 +23,8 @@
 depends_lib \
 	port:ncurses \
 	lib:libXm:openmotif \
-	lib:libXaw:xorg-libXaw \
-	lib:libXp.6:xorg-libXp
+	port:xorg-libXaw \
+	port:xorg-libXp
 
 configure.args  --infodir=${prefix}/share/info \
                 --mandir=${prefix}/share/man \

Modified: trunk/dports/devel/gtkglext/Portfile
===================================================================
--- trunk/dports/devel/gtkglext/Portfile	2009-01-18 19:52:04 UTC (rev 45602)
+++ trunk/dports/devel/gtkglext/Portfile	2009-01-18 20:52:41 UTC (rev 45603)
@@ -3,6 +3,7 @@
 PortSystem 1.0
 name		gtkglext
 version		1.2.0
+revision        1
 categories	devel
 maintainers	jd at lifehertz.com
 description	OpenGL Extension to GTK
@@ -17,7 +18,7 @@
 
 depends_lib \
 	lib:libGLU.1:mesa \
-	lib:libXmu.6:xorg-libXmu \
+	port:xorg-libXmu \
 	port:gtk2
 
 configure.cppflags-append "-I${x11prefix}/include"

Modified: trunk/dports/devel/inventor/Portfile
===================================================================
--- trunk/dports/devel/inventor/Portfile	2009-01-18 19:52:04 UTC (rev 45602)
+++ trunk/dports/devel/inventor/Portfile	2009-01-18 20:52:41 UTC (rev 45603)
@@ -4,7 +4,7 @@
 
 name	   inventor
 version	   2.1.5-10
-revision	4
+revision	5
 categories	devel graphics x11
 platforms	darwin
 maintainers	css
@@ -24,7 +24,7 @@
 distname	    ${name}-${version}.src
 worksrcdir	    ${name}
 
-depends_lib	    lib:libX11.6:XFree86 \
+depends_lib	    port:xorg-libs \
 		    port:freetype \
 		    lib:libjpeg.62:jpeg \
 		    lib:libdl:dlcompat \

Modified: trunk/dports/devel/libast/Portfile
===================================================================
--- trunk/dports/devel/libast/Portfile	2009-01-18 19:52:04 UTC (rev 45602)
+++ trunk/dports/devel/libast/Portfile	2009-01-18 20:52:41 UTC (rev 45603)
@@ -2,7 +2,7 @@
 PortSystem 1.0
 name		libast
 version		0.7
-revision    2
+revision        3
 description	LibAST is the Library of Assorted Spiffy Things.
 long_description	LibAST is the Library of Assorted Spiffy Things. \
 			It contains manyspiffy things, and it is a library. \
@@ -25,7 +25,7 @@
 	port:libtool 
 
 depends_lib \
-	lib:libSM.6:xorg-libsm \
+	port:xorg-libsm \
 	port:imlib2 \
 	port:pcre \
 	port:freetype

Modified: trunk/dports/devel/libgdiplus/Portfile
===================================================================
--- trunk/dports/devel/libgdiplus/Portfile	2009-01-18 19:52:04 UTC (rev 45602)
+++ trunk/dports/devel/libgdiplus/Portfile	2009-01-18 20:52:41 UTC (rev 45603)
@@ -4,7 +4,7 @@
 
 name		libgdiplus
 version		2.0
-revision	1
+revision	2
 categories	devel
 platforms	darwin
 maintainers	stechert at macports.org
@@ -31,8 +31,8 @@
 		port:libiconv \
 		port:libexif \
 		port:glib2 \
-		lib:libSM.6:xorg-libsm \
-		lib:libXrender.1:xrender
+		port:xorg-libsm \
+		port:xrender
 
 configure.cppflags-append -I${x11prefix}/include
 

Modified: trunk/dports/devel/libsdl/Portfile
===================================================================
--- trunk/dports/devel/libsdl/Portfile	2009-01-18 19:52:04 UTC (rev 45602)
+++ trunk/dports/devel/libsdl/Portfile	2009-01-18 20:52:41 UTC (rev 45603)
@@ -5,7 +5,7 @@
 name            libsdl
 set my_name     SDL
 version         1.2.13
-revision        4
+revision        5
 categories      devel multimedia
 platforms       macosx freebsd
 maintainers     nox openmaintainer
@@ -27,9 +27,9 @@
                 rmd160 ed8825fc98f4b3759cf9e5cf8357d71c50df9925
 
 depends_lib \
-	lib:libXext.6:xorg-libXext \
-	lib:libXrandr.2:xorg-libXrandr \
-	lib:libXrender.1:xrender
+	port:xorg-libXext \
+	port:xorg-libXrandr \
+	port:xrender
 
 configure.args  --enable-shared \
                 --mandir=${prefix}/share/man \
@@ -38,9 +38,9 @@
 variant no_x11 {
         configure.args-append --without-x
         depends_lib-delete \
-            lib:libXext.6:xorg-libXext \
-            lib:libXrandr.2:xorg-libXrandr \
-            lib:libXrender.1:xrender
+            port:xorg-libXext \
+            port:xorg-libXrandr \
+            port:xrender
 }
 
 use_parallel_build  yes

Modified: trunk/dports/devel/mono/Portfile
===================================================================
--- trunk/dports/devel/mono/Portfile	2009-01-18 19:52:04 UTC (rev 45602)
+++ trunk/dports/devel/mono/Portfile	2009-01-18 20:52:41 UTC (rev 45603)
@@ -4,6 +4,7 @@
 
 name             mono
 version          2.0.1
+revision         1
 categories       devel lang mono
 platforms        darwin
 maintainers      mww
@@ -22,7 +23,7 @@
 
 depends_build    port:pkgconfig port:gawk
 depends_lib      port:gettext port:glib2 port:icu \
-                 port:libiconv port:zlib port:libgdiplus lib:libX11.6:XFree86
+                 port:libiconv port:zlib port:libgdiplus port:xorg-libs
 
 patchfiles       patch-configure.diff
 

Modified: trunk/dports/devel/ode/Portfile
===================================================================
--- trunk/dports/devel/ode/Portfile	2009-01-18 19:52:04 UTC (rev 45602)
+++ trunk/dports/devel/ode/Portfile	2009-01-18 20:52:41 UTC (rev 45603)
@@ -4,6 +4,7 @@
 
 name		ode
 version		0.9
+revision        1
 categories	devel
 platforms	darwin
 maintainers	nomaintainer
@@ -24,7 +25,7 @@
 use_zip		yes
 patchfiles	patch-configure.diff
 
-depends_lib	lib:libGL:XFree86
+depends_lib	port:xorg-libs
 
 worksrcdir	${name}-${version}
 configure.args	--with-trimesh=opcode --enable-double-precision \

Modified: trunk/dports/devel/pnetlib/Portfile
===================================================================
--- trunk/dports/devel/pnetlib/Portfile	2009-01-18 19:52:04 UTC (rev 45602)
+++ trunk/dports/devel/pnetlib/Portfile	2009-01-18 20:52:41 UTC (rev 45603)
@@ -2,6 +2,7 @@
 PortSystem 1.0
 name            pnetlib
 version         0.7.4
+revision        1
 categories      devel
 maintainers     nomaintainer
 platforms       darwin
@@ -13,7 +14,7 @@
 			.NET development efforts also.
 master_sites    http://www.southern-storm.com.au/download
 checksums       sha1 289432378c5783be8f3c8880efec14c7cc4d3ef6
-depends_lib	lib:libILAsm.a:pnet lib:libX11:XFree86
+depends_lib	lib:libILAsm.a:pnet port:xorg-libs
 configure.args	--enable-shared --with-x 
 
 #platform darwin 7 {

Modified: trunk/dports/devel/rdesktop-devel/Portfile
===================================================================
--- trunk/dports/devel/rdesktop-devel/Portfile	2009-01-18 19:52:04 UTC (rev 45602)
+++ trunk/dports/devel/rdesktop-devel/Portfile	2009-01-18 20:52:41 UTC (rev 45603)
@@ -5,7 +5,7 @@
 name		rdesktop-devel
 version		cvs
 set myversion	20080225
-revision	0
+revision	1
 categories	devel
 maintainers	reiffert at macports.org openmaintainer
 description	Windows Terminal Server Client CVS Version
@@ -17,7 +17,7 @@
 distname	rdesktop-${version}-${myversion}
 homepage	http://rdesktop.sourceforge.net/
 master_sites	http://svn.macports.org/repository/macports/distfiles/rdesktop-devel/
-depends_lib	lib:libX11.6:XFree86 \
+depends_lib	port:xorg-libs \
 		port:openssl \
 		port:libiconv \
 		port:libao

Modified: trunk/dports/devel/t1lib/Portfile
===================================================================
--- trunk/dports/devel/t1lib/Portfile	2009-01-18 19:52:04 UTC (rev 45602)
+++ trunk/dports/devel/t1lib/Portfile	2009-01-18 20:52:41 UTC (rev 45603)
@@ -4,6 +4,7 @@
 
 name				t1lib
 version				5.1.2
+revision                        1
 categories			devel graphics fonts
 maintainers			nomaintainer
 use_parallel_build	yes
@@ -34,7 +35,7 @@
 build.target		without_doc
 
 variant x11 description {use the X Window System} {
-	depends_lib-append		lib:libX11:xorg-libX11
+	depends_lib-append		port:xorg-libX11
 	configure.args-delete	--without-x
 	configure.args-append	--with-x
 }

Modified: trunk/dports/editors/TeXmacs/Portfile
===================================================================
--- trunk/dports/editors/TeXmacs/Portfile	2009-01-18 19:52:04 UTC (rev 45602)
+++ trunk/dports/editors/TeXmacs/Portfile	2009-01-18 20:52:41 UTC (rev 45603)
@@ -4,6 +4,7 @@
 
 name		TeXmacs
 version		1.0.7
+revision        1
 distname	${distname}-src
 categories	editors
 maintainers	gwright
@@ -60,7 +61,7 @@
 depends_lib	port:guile		\
 		port:libiconv		\
 		port:texlive		\
-		lib:libX11:XFree86
+		port:xorg-libs
 depends_run	bin:gs:ghostscript
 
 extract.only	${name}-${version}-src${extract.suffix}

Modified: trunk/dports/editors/aee/Portfile
===================================================================
--- trunk/dports/editors/aee/Portfile	2009-01-18 19:52:04 UTC (rev 45602)
+++ trunk/dports/editors/aee/Portfile	2009-01-18 20:52:41 UTC (rev 45603)
@@ -4,6 +4,7 @@
 
 name             aee
 version          2.2.15b
+revision         1
 categories       editors
 maintainers      nomaintainer
 description      easy to use text editor
@@ -53,5 +54,5 @@
 
 variant x11 {
 	build.target        both
-	depends_lib-append  lib:libX11:XFree86
+	depends_lib-append  port:xorg-libs
 }

Modified: trunk/dports/editors/efte/Portfile
===================================================================
--- trunk/dports/editors/efte/Portfile	2009-01-18 19:52:04 UTC (rev 45602)
+++ trunk/dports/editors/efte/Portfile	2009-01-18 20:52:41 UTC (rev 45603)
@@ -4,7 +4,7 @@
 
 name            efte
 version         0.96
-revision	2
+revision	3
 categories      editors
 platforms       darwin
 maintainers     reiffert at macports.org openmaintainer
@@ -18,7 +18,7 @@
 master_sites    http://downloads.sourceforge.net/sourceforge/efte/
 checksums       efte-${version}.tar.gz md5 ae60a3056e73d4655569f455e4c6283e
 depends_build   bin:cmake:cmake \
-		lib:libX11:XFree86
+		port:xorg-libs
 
 configure.args  -DCMAKE_BUIL_TYPE=Release \
                 -DCMAKE_INSTALL_PREFIX:PATH=${prefix} \
@@ -29,7 +29,7 @@
 }
 
 variant no_x11 description {Does not build the X11 variant.} {
-    depends_build-delete    lib:libX11:XFree86
+    depends_build-delete    port:xorg-libs
     configure.args-append   "-DBUILD_X=OFF"
     configure.args-delete   "-DBUILD_X=ON"
 }

Modified: trunk/dports/editors/elvis/Portfile
===================================================================
--- trunk/dports/editors/elvis/Portfile	2009-01-18 19:52:04 UTC (rev 45602)
+++ trunk/dports/editors/elvis/Portfile	2009-01-18 20:52:41 UTC (rev 45603)
@@ -4,7 +4,7 @@
 
 name            elvis
 version         2.2_0
-revision        2
+revision        3
 homepage        http://elvis.the-little-red-haired-girl.org/
 description     A vi/ex clone
 categories      editors
@@ -18,7 +18,7 @@
 checksums       md5 6831b8df3e4a530395e66c2889783752
 configure.args  --without-x
 
-variant         x11 {  depends_lib lib:libX11.6:XFree86
+variant         x11 {  depends_lib port:xorg-libs
                        configure.args-delete --without-x
                        configure.args-append --with-x }
 pre-destroot {

Modified: trunk/dports/editors/emacs/Portfile
===================================================================
--- trunk/dports/editors/emacs/Portfile	2009-01-18 19:52:04 UTC (rev 45602)
+++ trunk/dports/editors/emacs/Portfile	2009-01-18 20:52:41 UTC (rev 45603)
@@ -4,6 +4,7 @@
 
 name            emacs
 version         22.3
+revision        1
 categories      editors
 maintainers     gmail.com:darren.bane
 description     The GNU Emacs text editor (command line only)
@@ -53,8 +54,8 @@
                             --with-tiff \
                             --with-gif \
                             --with-png
-    depends_lib-append      lib:libX11:XFree86 \
-                            lib:libXpm:XFree86 \
+    depends_lib-append      port:xorg-libs \
+                            port:xorg-libs \
                             lib:libjpeg:jpeg \
                             lib:libtiff:tiff \
                             path:include/gif_lib.h:giflib \

Modified: trunk/dports/editors/vim/Portfile
===================================================================
--- trunk/dports/editors/vim/Portfile	2009-01-18 19:52:04 UTC (rev 45602)
+++ trunk/dports/editors/vim/Portfile	2009-01-18 20:52:41 UTC (rev 45603)
@@ -6,6 +6,7 @@
 set vim_version     7.2
 set vim_patchlevel  077
 version             ${vim_version}.${vim_patchlevel}
+revision            1
 categories          editors
 maintainers         raimue
 description         Vi \"workalike\" with many additional features
@@ -78,7 +79,7 @@
 variant athena description {Build GUI version using Athena widgets} conflicts gtk1 gtk2 motif {
     configure.args-delete   --enable-gui=no --without-x
     configure.args-append   --enable-gui=athena --with-x --disable-darwin
-    depends_lib-append      lib:libX11:XFree86
+    depends_lib-append      port:xorg-libs
 }
 variant gtk1 description {Build GUI version using GTK 1.x widgets} conflicts athena gtk2 motif {
     configure.args-delete   --enable-gui=no --without-x

Modified: trunk/dports/editors/yudit/Portfile
===================================================================
--- trunk/dports/editors/yudit/Portfile	2009-01-18 19:52:04 UTC (rev 45602)
+++ trunk/dports/editors/yudit/Portfile	2009-01-18 20:52:41 UTC (rev 45603)
@@ -3,6 +3,7 @@
 PortSystem 1.0
 name             yudit
 version          2.7.6
+revision         1
 categories       editors
 maintainers      nomaintainer
 description      unicode text editor for X
@@ -18,4 +19,4 @@
 platforms        darwin
 master_sites     sunsite:apps/editors/X
 checksums        md5 f6bd9b937268dd0234b9c18ff5b167b4
-depends_lib      lib:libX11:XFree86
+depends_lib      port:xorg-libs

Modified: trunk/dports/emulators/basiliskii/Portfile
===================================================================
--- trunk/dports/emulators/basiliskii/Portfile	2009-01-18 19:52:04 UTC (rev 45602)
+++ trunk/dports/emulators/basiliskii/Portfile	2009-01-18 20:52:41 UTC (rev 45603)
@@ -4,6 +4,7 @@
 
 name                    basiliskii
 version                 0.9
+revision                1
 categories              emulators
 maintainers             nomaintainer
 description             Opensource 68k Mac emulator
@@ -16,7 +17,7 @@
 master_sites            sourceforge:basilisk
 checksums               md5 5017e21226c27a4a029da0486dcf04e1
 depends_lib             port:libtool \
-                        lib:libX11.6:XFree86 \
+                        port:xorg-libs \
                         lib:libgtk.1:gtk1
 worksrcdir              BasiliskII-${version}/src/Unix
 configure.args          --without-esd \

Modified: trunk/dports/emulators/freesci/Portfile
===================================================================
--- trunk/dports/emulators/freesci/Portfile	2009-01-18 19:52:04 UTC (rev 45602)
+++ trunk/dports/emulators/freesci/Portfile	2009-01-18 20:52:41 UTC (rev 45603)
@@ -3,6 +3,7 @@
 PortSystem          1.0
 name                freesci
 version             0.6.4
+revision            1
 categories          emulators
 maintainers         blb
 description         Interpreter for SCI (old Sierra Online) games
@@ -30,18 +31,18 @@
                     --with-x --without-sdl
 
 depends_lib \
-	lib:libXi.6:xorg-libXi \
-	lib:libXinerama.1:xorg-libXinerama \
-	lib:libXrender.1:xrender \
+	port:xorg-libXi \
+	port:xorg-libXinerama \
+	port:xrender \
 	port:fontconfig \
 	port:libpng \
 	port:ncurses
 
 variant sdl description {Use the SDL interface instead of X11} {
    depends_lib-delete \
-    	lib:libXi.6:xorg-libXi \
-	lib:libXinerama.1:xorg-libXinerama \
-	lib:libXrender.1:xrender \
+    	port:xorg-libXi \
+	port:xorg-libXinerama \
+	port:xrender \
 	port:fontconfig \
 	port:libpng
    depends_lib-append      port:libsdl

Modified: trunk/dports/emulators/pearpc/Portfile
===================================================================
--- trunk/dports/emulators/pearpc/Portfile	2009-01-18 19:52:04 UTC (rev 45602)
+++ trunk/dports/emulators/pearpc/Portfile	2009-01-18 20:52:41 UTC (rev 45603)
@@ -4,6 +4,7 @@
 
 name			pearpc
 version			0.4
+revision                1
 categories		emulators
 platforms		darwin
 maintainers		shadow at dementia.org
@@ -18,7 +19,7 @@
 checksums               md5 cc317b19d61a49987f2265e885fa6301
 use_bzip2               yes
 
-depends_lib		lib:libX11.6:XFree86
+depends_lib		port:xorg-libs
 
 #fetch.type		cvs
 #cvs.root		:pserver:anonymous at cvs.sourceforge.net:/cvsroot/pearpc

Modified: trunk/dports/emulators/spim/Portfile
===================================================================
--- trunk/dports/emulators/spim/Portfile	2009-01-18 19:52:04 UTC (rev 45602)
+++ trunk/dports/emulators/spim/Portfile	2009-01-18 20:52:41 UTC (rev 45603)
@@ -3,6 +3,7 @@
 PortSystem 1.0
 name            spim
 version         7.4
+revision        1
 categories      emulators devel lang x11
 maintainers     nomaintainer
 description     an assembly language MIPS R2000/R3000 simulator
@@ -29,7 +30,7 @@
 		sha1 e929fc5c2e258818a2325b1378740b3dd68dd5b6 \
 		rmd160 6fbce1b50fb669ec068ac7000b88a899d447dec0
 
-depends_lib     lib:libXaw:xorg-libXaw lib:libXp.6:xorg-libXp
+depends_lib     port:xorg-libXaw port:xorg-libXp
 
 depends_build   port:rman port:flex port:bison bin:xmkmf:imake
 

Modified: trunk/dports/emulators/vice/Portfile
===================================================================
--- trunk/dports/emulators/vice/Portfile	2009-01-18 19:52:04 UTC (rev 45602)
+++ trunk/dports/emulators/vice/Portfile	2009-01-18 20:52:41 UTC (rev 45603)
@@ -3,6 +3,7 @@
 PortSystem 1.0
 name            vice
 version         1.14
+revision        1
 categories      emulators
 maintainers     nomaintainer
 description     emulator for programs intended for the old 8-bit computers
@@ -10,5 +11,5 @@
 homepage        http://www.viceteam.org/
 master_sites    http://www.nic.funet.fi/pub/cbm/crossplatform/emulators/VICE/
 checksums       md5 f25df1b8de2bbb536facbc05fcfa1db2
-depends_lib	lib:libX11.6:XFree86
+depends_lib	port:xorg-libs
 patchfiles	patch-src-Makefile.in

Modified: trunk/dports/games/angband/Portfile
===================================================================
--- trunk/dports/games/angband/Portfile	2009-01-18 19:52:04 UTC (rev 45602)
+++ trunk/dports/games/angband/Portfile	2009-01-18 20:52:41 UTC (rev 45603)
@@ -3,6 +3,7 @@
 
 name				angband
 version				3.0.6
+revision                        1
 categories			games
 maintainers			amonre at amonre.org
 description			a rogue-like dungeon exploration game (curses-based)
@@ -36,7 +37,7 @@
                         distfiles-append ${name}-graf.zip:extras
                         checksums-append ${name}-graf.zip md5 488320ea35e3542d959543dd3c0dacec
                         
-                        depends_lib-append lib:libX11:XFree86
+                        depends_lib-append port:xorg-libs
                         configure.args-delete --without-x
                         configure.args-append --with-x
                         

Modified: trunk/dports/games/cannonsmash/Portfile
===================================================================
--- trunk/dports/games/cannonsmash/Portfile	2009-01-18 19:52:04 UTC (rev 45602)
+++ trunk/dports/games/cannonsmash/Portfile	2009-01-18 20:52:41 UTC (rev 45603)
@@ -3,7 +3,7 @@
 PortSystem          1.0
 name                cannonsmash
 version             0.6.6
-revision            1
+revision            2
 categories          games
 maintainers         blb
 description         3D tabletennis game
@@ -18,7 +18,7 @@
 checksums           md5 bcf2eddd0f04d58e5dac6d767f41d9af
 
 depends_lib         port:libsdl_mixer port:libsdl_image \
-                    port:gtk2 lib:libGL:XFree86
+                    port:gtk2 port:xorg-libs
 
 patchfiles          patch-loadparts.cpp patch-matrix patch-configure
 

Modified: trunk/dports/games/gnushogi/Portfile
===================================================================
--- trunk/dports/games/gnushogi/Portfile	2009-01-18 19:52:04 UTC (rev 45602)
+++ trunk/dports/games/gnushogi/Portfile	2009-01-18 20:52:41 UTC (rev 45603)
@@ -4,6 +4,7 @@
 
 name            gnushogi
 version         1.3.2
+revision        1
 categories      games
 maintainers     takanori openmaintainer
 description     GNU version of Shogi, a game of Japanese chess.
@@ -17,7 +18,7 @@
                 sha1 6135ec3eb84917d0dc2cab9ac982818ed41aad87 \
                 rmd160 b177d2843f42490d33665f3a167068c64bc64214
 
-depends_lib     lib:libX11:XFree86 \
+depends_lib     port:xorg-libs \
                 port:ncurses
 
 configure.args  --with-x --with-xshogi

Modified: trunk/dports/games/lincity/Portfile
===================================================================
--- trunk/dports/games/lincity/Portfile	2009-01-18 19:52:04 UTC (rev 45602)
+++ trunk/dports/games/lincity/Portfile	2009-01-18 20:52:41 UTC (rev 45603)
@@ -3,6 +3,7 @@
 PortSystem       1.0
 name             lincity
 version          1.13.0
+revision         1
 categories       games
 maintainers      nomaintainer
 description      city simulation game
@@ -18,7 +19,7 @@
 master_sites     sourceforge
 checksums        md5 007159a2e6cce680c629a73f97fe96f2
 
-depends_lib      lib:libX11.6:XFree86 port:libpng port:gettext
+depends_lib      port:xorg-libs port:libpng port:gettext
 
 patchfiles       patch-readpng.c
 

Modified: trunk/dports/games/lincity-ng/Portfile
===================================================================
--- trunk/dports/games/lincity-ng/Portfile	2009-01-18 19:52:04 UTC (rev 45602)
+++ trunk/dports/games/lincity-ng/Portfile	2009-01-18 20:52:41 UTC (rev 45603)
@@ -4,6 +4,7 @@
 
 name				lincity-ng
 version				1.1.2
+revision                        2
 categories			games
 maintainers			pguyot at kallisys.net openmaintainer
 description			3D city simulation game
@@ -26,7 +27,7 @@
 	configure.args-append	--with-apple-opengl-framework
 }
 
-depends_lib			lib:libX11.6:XFree86 \
+depends_lib			port:xorg-libs \
 					port:libxml2 \
 					bin:sdl-config:libsdl \
 					port:pkgconfig \

Modified: trunk/dports/games/qthello/Portfile
===================================================================
--- trunk/dports/games/qthello/Portfile	2009-01-18 19:52:04 UTC (rev 45602)
+++ trunk/dports/games/qthello/Portfile	2009-01-18 20:52:41 UTC (rev 45603)
@@ -3,6 +3,7 @@
 PortSystem 1.0
 name			qthello
 version			1.0
+revision                1
 categories		games x11
 maintainers		nomaintainer
 homepage		http://qthello.sourceforge.net/
@@ -14,7 +15,7 @@
 			completely random to tree search with Alpha-Beta \
 			pruning. 
 
-depends_lib		lib:libqt-mt.3:qt3 lib:libX11.6:XFree86
+depends_lib		lib:libqt-mt.3:qt3 port:xorg-libs
 
 platforms		darwin
 master_sites		http://download.sourceforge.net/qthello/

Modified: trunk/dports/games/teg/Portfile
===================================================================
--- trunk/dports/games/teg/Portfile	2009-01-18 19:52:04 UTC (rev 45602)
+++ trunk/dports/games/teg/Portfile	2009-01-18 20:52:41 UTC (rev 45603)
@@ -4,6 +4,7 @@
 
 name            teg
 version         0.11.2
+revision        1
 categories      games
 maintainers     pguyot at kallisys.net
 description     Tenes Empanadas Graciela - A risk clone
@@ -44,8 +45,8 @@
 	lib:libpopt:popt \
 	lib:libreadline:readline \
 	lib:libtiff.3:tiff \
-	lib:libXft2:Xft2 \
-	lib:libXrender:xrender \
+	port:Xft2 \
+	port:xrender \
 	lib:libz:zlib \
 	lib:ligtiff:tiff \
 	port:audiofile \

Modified: trunk/dports/games/wesnoth/Portfile
===================================================================
--- trunk/dports/games/wesnoth/Portfile	2009-01-18 19:52:04 UTC (rev 45602)
+++ trunk/dports/games/wesnoth/Portfile	2009-01-18 20:52:41 UTC (rev 45603)
@@ -4,6 +4,7 @@
 
 name		wesnoth
 version		1.4.4
+revision        1
 categories	games
 platforms	darwin
 maintainers	nomaintainer
@@ -22,7 +23,7 @@
 master_sites	sourceforge
 use_bzip2	yes
 use_parallel_build	yes
-depends_lib	lib:libX11.6:XFree86 \
+depends_lib	port:xorg-libs \
 		port:boost \
 		port:libsdl \
 		port:libsdl_image \

Modified: trunk/dports/games/xbill/Portfile
===================================================================
--- trunk/dports/games/xbill/Portfile	2009-01-18 19:52:04 UTC (rev 45602)
+++ trunk/dports/games/xbill/Portfile	2009-01-18 20:52:41 UTC (rev 45603)
@@ -3,7 +3,7 @@
 PortSystem       1.0
 name             xbill
 version          2.1
-revision         1
+revision         2
 categories       games
 maintainers      nomaintainer
 description      Save your computers from the evil clutches of Bill
@@ -23,7 +23,7 @@
 master_sites     ${homepage}download/
 checksums        md5 585e4866b15255a24203db9959407b2f
 
-depends_lib      lib:libXaw:XFree86
+depends_lib      port:xorg-libs
 
 patch {
 	reinplace "s|install:|install: all|" ${worksrcpath}/Makefile.in

Modified: trunk/dports/games/xboard/Portfile
===================================================================
--- trunk/dports/games/xboard/Portfile	2009-01-18 19:52:04 UTC (rev 45602)
+++ trunk/dports/games/xboard/Portfile	2009-01-18 20:52:41 UTC (rev 45603)
@@ -4,7 +4,7 @@
 
 name		xboard
 version		4.2.6
-revision	2
+revision	3
 categories	games
 maintainers	nomaintainer
 description	X frontend for Crafty, GNUChess, Internet Chess Servers, or e-mail chess
@@ -16,7 +16,7 @@
 platforms	darwin
 master_sites	gnu
 checksums	md5 1d6e38c61277eed6ad7af352586b37d5
-depends_lib	lib:libX11.6:XFree86
+depends_lib	port:xorg-libs
 
 configure.args		--enable-zippy
 destroot.destdir	prefix=${destroot}${prefix} mandir=${destroot}${prefix}/share/man

Modified: trunk/dports/games/xdigger/Portfile
===================================================================
--- trunk/dports/games/xdigger/Portfile	2009-01-18 19:52:04 UTC (rev 45602)
+++ trunk/dports/games/xdigger/Portfile	2009-01-18 20:52:41 UTC (rev 45603)
@@ -4,6 +4,7 @@
 
 name		xdigger
 version		1.0.10
+revision        1
 categories	games x11
 platforms	darwin
 maintainers	nomaintainer
@@ -18,7 +19,7 @@
 patchfiles	patch-configure.h.diff \
 		patch-drawpixmaps.c.patch
 
-depends_lib	lib:libX11.6:XFree86
+depends_lib	port:xorg-libs
 
 post-patch	{
 	reinplace "s|__PREFIX__|${prefix}|g" ${worksrcpath}/configure.h

Modified: trunk/dports/games/xmahjongg/Portfile
===================================================================
--- trunk/dports/games/xmahjongg/Portfile	2009-01-18 19:52:04 UTC (rev 45602)
+++ trunk/dports/games/xmahjongg/Portfile	2009-01-18 20:52:41 UTC (rev 45603)
@@ -3,7 +3,7 @@
 PortSystem 1.0
 name		xmahjongg
 version		3.7
-revision	1
+revision	2
 categories	games
 maintainers	nomaintainer
 description	X graphical mahjongg solitaire game
@@ -16,7 +16,7 @@
 checksums	md5 9db5bf1b329b410220b7976cd9b3d374 \
 		sha1 2693a0a90d9cb127f7b98cbeca9a2b832b3bb718 \
 		rmd160 41b584ca39dcb80f96ea19b4a29c237f3919f785
-depends_lib	lib:libX11.6:XFree86 lib:libfreetype.6:freetype
+depends_lib	port:xorg-libs lib:libfreetype.6:freetype
 
 configure.args	--mandir=${prefix}/share/man
 

Modified: trunk/dports/games/xmj/Portfile
===================================================================
--- trunk/dports/games/xmj/Portfile	2009-01-18 19:52:04 UTC (rev 45602)
+++ trunk/dports/games/xmj/Portfile	2009-01-18 20:52:41 UTC (rev 45603)
@@ -4,6 +4,7 @@
 
 name		xmj
 version		1.9
+revision        2
 categories	games x11
 platforms	darwin
 maintainers	mmoll
@@ -18,7 +19,7 @@
 checksums	md5 6cf88b7cbe25e99c12addd28e6b76164 \
 		sha1 de8368a8c0bda6cb29db20bfdf76c6f778181468 \
 		rmd160 d001ff72a2101d4dcf115e98594370f9208ddc14
-depends_lib	lib:libX11.6:XFree86 lib:libgtk:gtk1
+depends_lib	port:xorg-libs lib:libgtk:gtk1
 use_configure   no
 build.args	CDEBUGFLAGS=-O2
 destroot.target	install install.man

Modified: trunk/dports/games/xskat/Portfile
===================================================================
--- trunk/dports/games/xskat/Portfile	2009-01-18 19:52:04 UTC (rev 45602)
+++ trunk/dports/games/xskat/Portfile	2009-01-18 20:52:41 UTC (rev 45603)
@@ -4,6 +4,7 @@
 
 name		xskat
 version		4.0
+revision        1
 categories	games x11
 platforms	darwin
 maintainers	mww
@@ -12,7 +13,7 @@
 homepage	http://www.xskat.de/
 master_sites	http://www.xskat.de/
 checksums	sha1 b90859742b62369273d2683bd69006713e1e214d
-depends_lib	lib:libX11.6:XFree86
+depends_lib	port:xorg-libs
 
 destroot.target-append	install.man
 destroot.destdir-append	BINDIR=${prefix}/bin MANPATH=${prefix}/share/man

Modified: trunk/dports/gnome/eog/Portfile
===================================================================
--- trunk/dports/gnome/eog/Portfile	2009-01-18 19:52:04 UTC (rev 45602)
+++ trunk/dports/gnome/eog/Portfile	2009-01-18 20:52:41 UTC (rev 45603)
@@ -4,6 +4,7 @@
 
 name		eog
 version		2.24.1
+revision        1
 set branch	[join [lrange [split ${version} .] 0 1] .]
 description	An image viewing program.
 long_description        This is the Eye of Gnome, an image viewer program. \
@@ -20,7 +21,7 @@
 
 depends_lib port:gnome-platform-suite \
         lib:libiconv.2:libiconv port:fontconfig \
-        lib:libXft.2.1.2:Xft2 lib:libaudiofile:audiofile \
+        port:Xft2 lib:libaudiofile:audiofile \
         port:fontconfig port:gnome-keyring \
         lib:libexpat:expat \
         bin:perl:perl5 \

Modified: trunk/dports/gnome/gnome-desktop/Portfile
===================================================================
--- trunk/dports/gnome/gnome-desktop/Portfile	2009-01-18 19:52:04 UTC (rev 45602)
+++ trunk/dports/gnome/gnome-desktop/Portfile	2009-01-18 20:52:41 UTC (rev 45603)
@@ -5,6 +5,7 @@
 
 name            gnome-desktop
 version         2.24.3
+revision        1
 set branch      [join [lrange [split ${version} .] 0 1] .]
 maintainers     nomaintainer
 categories      gnome
@@ -93,7 +94,7 @@
 }
 
 variant x11 conflicts quartz description {Enable rendering in X11 (default)} {
-    depends_lib-append      lib:libX11:xorg
+    depends_lib-append      port:xorg-libs
 }
 
 variant no_x11 {

Modified: trunk/dports/gnome/gnome-mag/Portfile
===================================================================
--- trunk/dports/gnome/gnome-mag/Portfile	2009-01-18 19:52:04 UTC (rev 45602)
+++ trunk/dports/gnome/gnome-mag/Portfile	2009-01-18 20:52:41 UTC (rev 45603)
@@ -5,6 +5,7 @@
 
 name		gnome-mag
 version		0.15.4
+revision        1
 set branch  [join [lrange [split ${version} .] 0 1] .]
 description	GNOME magnifier.
 long_description       ${description}
@@ -17,10 +18,10 @@
             sha1 1fa498210a27f182dd3c161e2c20e1f36db7fea7 \
             rmd160 b2116bc8dd54344a89e276a7a1fc9df9152d6680
 depends_lib port:at-spi \
-            lib:libXdamage:xorg-libXdamage \
-            lib:libXfixes:xorg-libXfixes \
-            lib:libXext:xorg-libXext \
-            lib:libXcomposite:xorg-libXcomposite
+            port:xorg-libXdamage \
+            port:xorg-libXfixes \
+            port:xorg-libXext \
+            port:xorg-libXcomposite
 use_bzip2 	yes
 
 livecheck.check regex

Modified: trunk/dports/gnome/startup-notification/Portfile
===================================================================
--- trunk/dports/gnome/startup-notification/Portfile	2009-01-18 19:52:04 UTC (rev 45602)
+++ trunk/dports/gnome/startup-notification/Portfile	2009-01-18 20:52:41 UTC (rev 45603)
@@ -4,6 +4,7 @@
 
 name            startup-notification
 version         0.9
+revision        1
 set branch      [join [lrange [split ${version} .] 0 1] .]
 maintainers     nomaintainer
 categories      gnome
@@ -29,8 +30,8 @@
 	port:libtool
 
 depends_lib \
-	lib:libSM.6:xorg-libsm \
-	lib:libX11.6:xorg-libX11
+	port:xorg-libsm \
+	port:xorg-libX11
 
 use_autoreconf yes
 autoreconf.args -fvi

Modified: trunk/dports/graphics/Coin/Portfile
===================================================================
--- trunk/dports/graphics/Coin/Portfile	2009-01-18 19:52:04 UTC (rev 45602)
+++ trunk/dports/graphics/Coin/Portfile	2009-01-18 20:52:41 UTC (rev 45603)
@@ -4,7 +4,7 @@
 
 name			Coin
 version			2.5.0
-revision		1
+revision		2
 description		cross platform C++ OpenGL scene graph library
 long_description	Coin is a high-level 3D graphics library with a   \
 	C++ Application Programming Interface. Coin uses scene-graph data \
@@ -20,8 +20,8 @@
 			sha1 19dc61398d843bff120aec9c640ea814c827b577
 
 depends_lib		port:simage \
-			lib:libSM.6:xorg-libsm \
-			lib:libXext.6:xorg-libXext
+			port:xorg-libsm \
+			port:xorg-libXext
 
 use_configure		yes
 configure.args		--with-simage=${prefix} --mandir=${prefix}/share/man
@@ -33,8 +33,8 @@
 variant aqua requires darwin {
 	configure.args-delete	--without-framework --enable-darwin-x11
 	configure.args-append	--with-framework=${destroot}/Library/Frameworks  --without-x
-	depends_lib-delete	lib:libSM.6:xorg-libsm \
-				lib:libXext.6:xorg-libXext
+	depends_lib-delete	port:xorg-libsm \
+				port:xorg-libXext
 }
 
 variant devel description {Activate developer features, including debug libraries.} {

Modified: trunk/dports/graphics/ImageMagick/Portfile
===================================================================
--- trunk/dports/graphics/ImageMagick/Portfile	2009-01-18 19:52:04 UTC (rev 45602)
+++ trunk/dports/graphics/ImageMagick/Portfile	2009-01-18 20:52:41 UTC (rev 45603)
@@ -4,6 +4,7 @@
 
 name                    ImageMagick
 version                 6.4.8-1
+revision                1
 set reasonable_version  [lindex [split ${version} -] 0]
 homepage                http://www.imagemagick.org/
 categories              graphics devel
@@ -42,7 +43,7 @@
     rmd160  b4e1610ca917ce34576ab47cd5c1be24a525afc4
 
 depends_lib \
-    lib:libX11.6:XFree86 \
+    port:xorg-libs \
     port:bzip2 \
     port:jpeg \
     port:libpng \
@@ -210,7 +211,7 @@
 
 variant no_x11 {
     depends_lib-delete \
-        lib:libX11.6:XFree86
+        port:xorg-libs
     configure.args-delete \
         --with-x
     configure.args-append \

Modified: trunk/dports/graphics/SimGear/Portfile
===================================================================
--- trunk/dports/graphics/SimGear/Portfile	2009-01-18 19:52:04 UTC (rev 45602)
+++ trunk/dports/graphics/SimGear/Portfile	2009-01-18 20:52:41 UTC (rev 45603)
@@ -4,6 +4,7 @@
 
 name			SimGear
 version			1.0.0
+revision                1
 categories		graphics devel
 platforms		darwin
 maintainers		nomaintainer
@@ -23,7 +24,7 @@
 depends_lib		port:plib \
 				port:zlib \
 				port:openal \
-				lib:libX11.6:XFree86
+				port:xorg-libs
 
 configure.args	--with-x
 configure.cppflags-append	"-I${x11prefix}/include"

Modified: trunk/dports/graphics/aalib/Portfile
===================================================================
--- trunk/dports/graphics/aalib/Portfile	2009-01-18 19:52:04 UTC (rev 45602)
+++ trunk/dports/graphics/aalib/Portfile	2009-01-18 20:52:41 UTC (rev 45603)
@@ -3,7 +3,7 @@
 name                        aalib
 version                     1.4rc5
 categories                  graphics
-revision                    3
+revision                    4
 maintainers                 tim at ccc.de
 description                 Portable ascii art GFX library
 long_description            AA-lib is a low level gfx library just as many other libraries are. \
@@ -40,7 +40,7 @@
 
 variant x11 {
         depends_lib \
-                lib:libX11.6:xorg-libX11
+                port:xorg-libX11
         configure.args-delete   --with-x=no
         configure.args-append   --with-x
 }

Modified: trunk/dports/graphics/antigraingeometry/Portfile
===================================================================
--- trunk/dports/graphics/antigraingeometry/Portfile	2009-01-18 19:52:04 UTC (rev 45602)
+++ trunk/dports/graphics/antigraingeometry/Portfile	2009-01-18 20:52:41 UTC (rev 45603)
@@ -3,6 +3,7 @@
 PortSystem          1.0
 name                antigraingeometry
 version             2.5
+revision            1
 categories          graphics devel
 maintainers         nomaintainer
 description         A high quality rendering engine for C++
@@ -27,7 +28,7 @@
                     sha1 08f23da64da40b90184a0414369f450115cdb328 \
                     rmd160 fac24d8ea56ee0a87307189f73c432b07b6d3c50
 
-depends_lib         port:freetype lib:libX11:XFree86
+depends_lib         port:freetype port:xorg-libs
 depends_build       port:automake port:autoconf port:pkgconfig
 
 # These patchfiles hack out sdl support, it can't be done with a

Modified: trunk/dports/graphics/cairo/Portfile
===================================================================
--- trunk/dports/graphics/cairo/Portfile	2009-01-18 19:52:04 UTC (rev 45602)
+++ trunk/dports/graphics/cairo/Portfile	2009-01-18 20:52:41 UTC (rev 45603)
@@ -5,7 +5,7 @@
 name                    cairo
 set my_name             cairo
 version                 1.8.6
-revision                2
+revision                3
 categories              graphics
 maintainers             ryandesign
 homepage                http://cairographics.org/
@@ -33,7 +33,7 @@
 
 depends_lib \
     path:lib/pkgconfig/pixman-1.pc:libpixman \
-    lib:libXrender.1:xrender \
+    port:xrender \
     port:fontconfig \
     port:freetype \
     port:libpng \
@@ -98,7 +98,7 @@
 
 variant no_x11 conflicts glitz x11_xcb {
     depends_lib-delete \
-        lib:libXrender.1:xrender
+        port:xrender
     configure.args-delete \
         --enable-xlib \
         --enable-xlib-xrender \
@@ -113,7 +113,7 @@
     configure.args-delete --disable-xcb
     configure.args-append --enable-xcb
     depends_lib-append \
-        lib:libxcb-render-util.0:xorg-xcb-util
+        port:xorg-xcb-util
 }
 
 platform macosx {

Modified: trunk/dports/graphics/cairo-devel/Portfile
===================================================================
--- trunk/dports/graphics/cairo-devel/Portfile	2009-01-18 19:52:04 UTC (rev 45602)
+++ trunk/dports/graphics/cairo-devel/Portfile	2009-01-18 20:52:41 UTC (rev 45603)
@@ -5,7 +5,7 @@
 name                    cairo-devel
 set my_name             cairo
 version                 1.7.6
-revision                2
+revision                3
 categories              graphics
 maintainers             ryandesign
 homepage                http://cairographics.org/
@@ -33,7 +33,7 @@
 
 depends_lib \
     path:lib/pkgconfig/pixman-1.pc:libpixman \
-    lib:libXrender.1:xrender \
+    port:xrender \
     port:fontconfig \
     port:freetype \
     port:libpng \
@@ -77,7 +77,7 @@
 
 variant no_x11 conflicts glitz x11_xcb {
     depends_lib-delete \
-        lib:libXrender.1:xrender
+        port:xrender
     configure.args-delete \
         --enable-xlib \
         --enable-xlib-xrender \
@@ -92,7 +92,7 @@
     configure.args-delete --disable-xcb
     configure.args-append --enable-xcb
     depends_lib-append \
-        lib:libxcb-render-util.0:xorg-xcb-util
+        port:xorg-xcb-util
 }
 
 platform macosx {

Modified: trunk/dports/graphics/fnlib/Portfile
===================================================================
--- trunk/dports/graphics/fnlib/Portfile	2009-01-18 19:52:04 UTC (rev 45602)
+++ trunk/dports/graphics/fnlib/Portfile	2009-01-18 20:52:41 UTC (rev 45603)
@@ -3,7 +3,7 @@
 PortSystem 1.0
 name		fnlib
 version		0.5
-revision	1
+revision	2
 description	Fonts and font libraries necessary for Enlightenment
 long_description        This is a set of fonts and font libraries necessary \
 			for the latest release of Enlightenment.
@@ -13,7 +13,7 @@
 homepage	http://www.enlightenment.org/
 master_sites 	sourceforge:enlightenment/
 checksums	md5 99e9558739b97c82b728e408d9cb1f01
-depends_lib	lib:libX11.6:XFree86 lib:libjpeg.62:jpeg lib:libpng.3:libpng \
+depends_lib	port:xorg-libs lib:libjpeg.62:jpeg lib:libpng.3:libpng \
 		lib:libtiff.3:tiff lib:libImlib:imlib
 configure.args	 --host=mac
 

Modified: trunk/dports/graphics/fontforge/Portfile
===================================================================
--- trunk/dports/graphics/fontforge/Portfile	2009-01-18 19:52:04 UTC (rev 45602)
+++ trunk/dports/graphics/fontforge/Portfile	2009-01-18 20:52:41 UTC (rev 45603)
@@ -5,6 +5,7 @@
 
 name            fontforge
 version         20080927
+revision        1
 set ftversion   2.3.7
 categories      graphics fonts
 platforms       darwin
@@ -82,8 +83,8 @@
 }
 
 depends_lib \
-                lib:libXi.6:xorg-libXi \
-                lib:libxkbui.1:xorg-libxkbui \
+                port:xorg-libXi \
+                port:xorg-libxkbui \
                 port:freetype \
                 port:gettext \
                 port:giflib \

Modified: trunk/dports/graphics/gd2/Portfile
===================================================================
--- trunk/dports/graphics/gd2/Portfile	2009-01-18 19:52:04 UTC (rev 45602)
+++ trunk/dports/graphics/gd2/Portfile	2009-01-18 20:52:41 UTC (rev 45603)
@@ -4,7 +4,7 @@
 
 name                    gd2
 version                 2.0.35
-revision                2
+revision                3
 categories              graphics
 maintainers             ryandesign
 homepage                http://www.libgd.org/
@@ -51,7 +51,7 @@
     port:fontconfig \
     port:libiconv \
     port:expat \
-    lib:libX11.6:XFree86
+    port:xorg-libs
 
 patchfiles \
     patch-gdft.c.diff \
@@ -87,7 +87,7 @@
 
 variant no_x11 {
     depends_lib-delete \
-        lib:libX11.6:XFree86
+        port:xorg-libs
     configure.args-append \
         --without-x
 }

Modified: trunk/dports/graphics/glitz/Portfile
===================================================================
--- trunk/dports/graphics/glitz/Portfile	2009-01-18 19:52:04 UTC (rev 45602)
+++ trunk/dports/graphics/glitz/Portfile	2009-01-18 20:52:41 UTC (rev 45603)
@@ -4,7 +4,7 @@
 
 name        glitz
 version     0.5.6
-revision    1
+revision    2
 maintainers nomaintainer
 categories  graphics devel x11
 platforms   darwin 
@@ -19,7 +19,7 @@
 homepage    http://www.freedesktop.org/Software/glitz/
 master_sites    http://cairographics.org/snapshots/
 
-depends_lib     lib:libX11.6:XFree86
+depends_lib     port:xorg-libs
 
 checksums       md5 c507f140ecccc06aed8888c958edda4c \
                 sha1 81604bf02ceda85ea32b52423f78a883aaec6dc6 \

Modified: trunk/dports/graphics/glut/Portfile
===================================================================
--- trunk/dports/graphics/glut/Portfile	2009-01-18 19:52:04 UTC (rev 45602)
+++ trunk/dports/graphics/glut/Portfile	2009-01-18 20:52:41 UTC (rev 45603)
@@ -5,7 +5,7 @@
 
 name		glut
 version		3.7
-revision	1
+revision	2
 description	The OpenGL Utility Toolkit (GLUT)
 long_description An indispensible toolkit for OpenGL programmers, this provides many of the windowing and input management primitives that OpenGL itself does not deal with.
 maintainers    nomaintainer
@@ -16,7 +16,7 @@
 checksums	md5 dc932666e2a1c8a0b148a4c32d111ef3
 patchfiles	patch-glutbitmap.h patch-round_cap.c patch-segment.c
 
-depends_lib	lib:libGL.1:XFree86 lib:libX11.6:XFree86
+depends_lib	port:xorg-libs port:xorg-libs
 depends_build  port:imake
 
 configure {

Modified: trunk/dports/graphics/graphviz/Portfile
===================================================================
--- trunk/dports/graphics/graphviz/Portfile	2009-01-18 19:52:04 UTC (rev 45602)
+++ trunk/dports/graphics/graphviz/Portfile	2009-01-18 20:52:41 UTC (rev 45603)
@@ -5,6 +5,7 @@
 name                    graphviz
 set my_name             graphviz
 version                 2.20.3
+revision                1
 categories              graphics
 maintainers             ryandesign
 homepage                http://www.graphviz.org/
@@ -63,7 +64,7 @@
 }
 
 depends_lib \
-    lib:libX11.6:XFree86 \
+    port:xorg-libs \
     port:cairo \
     path:lib/pkgconfig/pango.pc:pango \
     port:jpeg \
@@ -355,7 +356,7 @@
 
 variant no_x11 requires no_pangocairo description {Remove X11 support (removes lefty; implies no_pangocairo)} {
     depends_lib-delete \
-        lib:libX11.6:XFree86
+        port:xorg-libs
     configure.args-append \
         --without-x
 }

Modified: trunk/dports/graphics/graphviz-devel/Portfile
===================================================================
--- trunk/dports/graphics/graphviz-devel/Portfile	2009-01-18 19:52:04 UTC (rev 45602)
+++ trunk/dports/graphics/graphviz-devel/Portfile	2009-01-18 20:52:41 UTC (rev 45603)
@@ -5,6 +5,7 @@
 name                    graphviz-devel
 set my_name             graphviz
 version                 2.21.20090106.0545
+revision                1
 categories              graphics
 maintainers             ryandesign
 homepage                http://www.graphviz.org/
@@ -63,7 +64,7 @@
 }
 
 depends_lib \
-    lib:libX11.6:XFree86 \
+    port:xorg-libs \
     port:cairo \
     path:lib/pkgconfig/pango.pc:pango \
     port:jpeg \
@@ -355,7 +356,7 @@
 
 variant no_x11 requires no_pangocairo description {Remove X11 support (removes lefty; implies no_pangocairo)} {
     depends_lib-delete \
-        lib:libX11.6:XFree86
+        port:xorg-libs
     configure.args-append \
         --without-x
 }

Modified: trunk/dports/graphics/imlib2/Portfile
===================================================================
--- trunk/dports/graphics/imlib2/Portfile	2009-01-18 19:52:04 UTC (rev 45602)
+++ trunk/dports/graphics/imlib2/Portfile	2009-01-18 20:52:41 UTC (rev 45603)
@@ -4,6 +4,7 @@
 
 name				imlib2
 version				1.4.1
+revision                        1
 categories			graphics devel
 maintainers			nomaintainer
 description			Image loading and rendering library
@@ -29,8 +30,8 @@
 	port:libtool
 
 depends_lib	\
-	lib:libX11.6:xorg-libX11 \
-	lib:libXext.6:xorg-libXext \
+	port:xorg-libX11 \
+	port:xorg-libXext \
 	port:libpng \
 	port:jpeg \
 	port:libpng \

Modified: trunk/dports/graphics/jasper/Portfile
===================================================================
--- trunk/dports/graphics/jasper/Portfile	2009-01-18 19:52:04 UTC (rev 45602)
+++ trunk/dports/graphics/jasper/Portfile	2009-01-18 20:52:41 UTC (rev 45603)
@@ -4,7 +4,7 @@
 
 name            jasper
 version         1.900.1
-revision        2
+revision        3
 categories      graphics
 platforms       darwin
 maintainers     nomaintainer
@@ -46,7 +46,7 @@
 
 variant jiv description {build a basic viewer as well} {
     depends_lib-append          lib:libglut:glut \
-                                lib:libX11:xorg-libX11
+                                port:xorg-libX11
 
     configure.args-delete       --disable-opengl
     configure.args-append       --enable-opengl

Modified: trunk/dports/graphics/libcaca/Portfile
===================================================================
--- trunk/dports/graphics/libcaca/Portfile	2009-01-18 19:52:04 UTC (rev 45602)
+++ trunk/dports/graphics/libcaca/Portfile	2009-01-18 20:52:41 UTC (rev 45603)
@@ -5,6 +5,7 @@
 
 name             libcaca
 version          0.9
+revision         1
 categories       graphics
 maintainers      nomaintainer
 description      Colour AsCii Art library
@@ -27,7 +28,7 @@
 # add Imlib2 support once Imlib2 is ported
 
 variant	x11 description {Add X11 driver support} {
-	depends_lib-append	lib:libX11.6:XFree86
+	depends_lib-append	port:xorg-libs
 	configure.args-append	--enable-x11
 }
 

Modified: trunk/dports/graphics/libungif/Portfile
===================================================================
--- trunk/dports/graphics/libungif/Portfile	2009-01-18 19:52:04 UTC (rev 45602)
+++ trunk/dports/graphics/libungif/Portfile	2009-01-18 20:52:41 UTC (rev 45603)
@@ -4,7 +4,7 @@
 
 name            libungif
 version         4.1.4
-revision        3
+revision        4
 categories      graphics
 platforms       darwin
 maintainers     ryandesign
@@ -55,8 +55,8 @@
     autoconf.args -fvi
 
     depends_lib-append \
-	lib:libSM.6:xorg-libsm \
-	lib:libX11.6:xorg-libX11
+	port:xorg-libsm \
+	port:xorg-libX11
     configure.args-delete   --without-x
 }
 

Modified: trunk/dports/graphics/libwmf/Portfile
===================================================================
--- trunk/dports/graphics/libwmf/Portfile	2009-01-18 19:52:04 UTC (rev 45602)
+++ trunk/dports/graphics/libwmf/Portfile	2009-01-18 20:52:41 UTC (rev 45603)
@@ -5,7 +5,7 @@
 
 name				libwmf
 version				0.2.8.4
-revision			1
+revision			2
 categories			graphics fonts
 maintainers			nomaintainer
 description			Library for converting WMF (Window Metafile Format) files
@@ -53,7 +53,7 @@
 }
 
 variant x11 description {Enable X11 support} {
-	depends_lib-append	lib:libX11.6:xorg-libX11
+	depends_lib-append	port:xorg-libX11
 	depends_build-append	port:mkfontdir
 
 	configure.args-delete	--without-x

Modified: trunk/dports/graphics/magicpoint/Portfile
===================================================================
--- trunk/dports/graphics/magicpoint/Portfile	2009-01-18 19:52:04 UTC (rev 45602)
+++ trunk/dports/graphics/magicpoint/Portfile	2009-01-18 20:52:41 UTC (rev 45603)
@@ -3,6 +3,7 @@
 
 name		magicpoint
 version		1.10a
+revision        1
 categories	graphics
 maintainers	fenner at macports.org
 homepage	http://www.mew.org/mgp/
@@ -22,7 +23,7 @@
 depends_build	port:pkgconfig \
 		bin:xmkmf:imake
 
-depends_lib	lib:libXft.2:Xft2 \
+depends_lib	port:Xft2 \
 		lib:libpng12.0:libpng \
 		lib:libungif.4:libungif
 

Modified: trunk/dports/graphics/pgplot/Portfile
===================================================================
--- trunk/dports/graphics/pgplot/Portfile	2009-01-18 19:52:04 UTC (rev 45602)
+++ trunk/dports/graphics/pgplot/Portfile	2009-01-18 20:52:41 UTC (rev 45603)
@@ -3,7 +3,7 @@
 PortSystem			1.0
 name				pgplot
 version				5.2.2
-revision			3
+revision			4
 categories			graphics devel
 maintainers			nomaintainer
 description			C/Fortran graphics library
@@ -96,7 +96,7 @@
 default_variants +x11 +aqt
 
 variant x11 {
-	depends_lib-append	lib:libX11:XFree86
+	depends_lib-append	port:xorg-libs
 
 	patchfiles-append	patch-drivers_x11.list
 

Modified: trunk/dports/graphics/plotutils/Portfile
===================================================================
--- trunk/dports/graphics/plotutils/Portfile	2009-01-18 19:52:04 UTC (rev 45602)
+++ trunk/dports/graphics/plotutils/Portfile	2009-01-18 20:52:41 UTC (rev 45603)
@@ -4,6 +4,7 @@
 
 name             plotutils
 version          2.5.1
+revision         1
 categories       graphics
 platforms        darwin
 maintainers      ram openmaintainer
@@ -30,7 +31,7 @@
                  --infodir=${prefix}/share/info
 
 variant x11 description "Enable X11 support" {
-  depends_lib-append      lib:libX11:XFree86
+  depends_lib-append      port:xorg-libs
   configure.args-delete   --without-x
   configure.args-append   --with-x
 }

Modified: trunk/dports/graphics/povray/Portfile
===================================================================
--- trunk/dports/graphics/povray/Portfile	2009-01-18 19:52:04 UTC (rev 45602)
+++ trunk/dports/graphics/povray/Portfile	2009-01-18 20:52:41 UTC (rev 45603)
@@ -4,6 +4,7 @@
 
 name			povray
 version			3.6.1
+revision                1
 maintainers		nomaintainer
 categories		graphics
 platforms		darwin
@@ -17,7 +18,7 @@
 checksums		md5 b5789bb7eeaed0809c5c82d0efda571d
 use_bzip2		yes
 
-depends_lib		lib:libX11.6:XFree86 \
+depends_lib		port:xorg-libs \
 				lib:libpng.3:libpng \
 				lib:libjpeg:jpeg \
 				lib:libz.1:zlib \

Modified: trunk/dports/graphics/tgif/Portfile
===================================================================
--- trunk/dports/graphics/tgif/Portfile	2009-01-18 19:52:04 UTC (rev 45602)
+++ trunk/dports/graphics/tgif/Portfile	2009-01-18 20:52:41 UTC (rev 45603)
@@ -3,7 +3,7 @@
 PortSystem 1.0
 name		tgif
 version		4.1.42
-revision	1
+revision	2
 description	Basic vector drawing package
 categories	graphics x11
 maintainers	mdales at mac.com
@@ -19,8 +19,8 @@
 
 depends_build   bin:xmkmf:imake
 
-depends_lib	lib:libXext.6:xorg-libXext \
-                lib:libX11.6:xorg-libX11
+depends_lib	port:xorg-libXext \
+                port:xorg-libX11
 
 destroot.args	INSTALLFLAGS=-c
 destroot.target	install install.man

Modified: trunk/dports/graphics/vtk/Portfile
===================================================================
--- trunk/dports/graphics/vtk/Portfile	2009-01-18 19:52:04 UTC (rev 45602)
+++ trunk/dports/graphics/vtk/Portfile	2009-01-18 20:52:41 UTC (rev 45603)
@@ -3,7 +3,7 @@
 PortSystem 1.0
 name		VTK
 version		4.2.6
-revision	2
+revision	3
 categories	graphics
 maintainers	css
 description	3D visualization toolkit
@@ -65,7 +65,7 @@
 }
 
 variant x11 {
-	depends_build-append	lib:libX11:XFree86
+	depends_build-append	port:xorg-libs
 	configure.args-delete	"-D VTK_USE_COCOA:BOOL=ON"
 	configure.args-append	-D VTK_USE_COCOA:BOOL=OFF \
 				-D VTK_USE_X:BOOL=ON \

Modified: trunk/dports/graphics/vtk5/Portfile
===================================================================
--- trunk/dports/graphics/vtk5/Portfile	2009-01-18 19:52:04 UTC (rev 45602)
+++ trunk/dports/graphics/vtk5/Portfile	2009-01-18 20:52:41 UTC (rev 45603)
@@ -4,6 +4,7 @@
 
 name		vtk5
 version		5.2.0
+revision        1
 set branch	[join [lrange [split ${version} .] 0 1] .]
 categories	graphics devel
 maintainers	nomaintainer
@@ -75,7 +76,7 @@
 }
 
 variant x11 {
-	depends_build-append	lib:libX11:XFree86
+	depends_build-append	port:xorg-libs
 	configure.args-delete	"-D VTK_USE_COCOA:BOOL=ON"
 	configure.args-append	-DVTK_USE_COCOA:BOOL=OFF \
 				-DVTK_USE_X:BOOL=ON \

Modified: trunk/dports/graphics/xaos/Portfile
===================================================================
--- trunk/dports/graphics/xaos/Portfile	2009-01-18 19:52:04 UTC (rev 45602)
+++ trunk/dports/graphics/xaos/Portfile	2009-01-18 20:52:41 UTC (rev 45603)
@@ -4,6 +4,7 @@
 
 name                    xaos
 version                 3.4
+revision                1
 categories              graphics
 maintainers             nomaintainer
 homepage                http://xaos.sourceforge.net/
@@ -32,7 +33,7 @@
                  rmd160  37ce4728940e80c2876792650aa656236893d5f7
 
 depends_lib \
-	lib:libX11.6:XFree86 \
+	port:xorg-libs \
 	port:libpng
 
 configure.cflags-append "-I${prefix}/include"

Modified: trunk/dports/graphics/xli/Portfile
===================================================================
--- trunk/dports/graphics/xli/Portfile	2009-01-18 19:52:04 UTC (rev 45602)
+++ trunk/dports/graphics/xli/Portfile	2009-01-18 20:52:41 UTC (rev 45603)
@@ -3,9 +3,9 @@
 
 name		xli
 version		1.17.0
-revision	1
+revision	2
 categories	graphics
-depends_lib	lib:libX11.6:XFree86 lib:png:libpng lib:jpeg:jpeg
+depends_lib	port:xorg-libs lib:png:libpng lib:jpeg:jpeg
 master_sites	http://pantransit.reptiles.org/prog/
 homepage	http://pantransit.reptiles.org/prog/index.html#xli
 checksums	md5 996d8cd0b2be2071332412c6802852e6

Modified: trunk/dports/graphics/xpdf/Portfile
===================================================================
--- trunk/dports/graphics/xpdf/Portfile	2009-01-18 19:52:04 UTC (rev 45602)
+++ trunk/dports/graphics/xpdf/Portfile	2009-01-18 20:52:41 UTC (rev 45603)
@@ -4,7 +4,7 @@
 
 name         xpdf
 version      3.02
-revision     3
+revision     4
 description  Xpdf is a viewer for PDF files.
 long_description \
     Xpdf is a viewer for Portable Document Format \
@@ -43,7 +43,7 @@
              xpdf-3.02pl2.patch 3a5cb165ae66781e0b21e6219ae06795
 extract.only ${xpdfmain}
 
-depends_lib	 lib:libX11.6:XFree86 lib:libfreetype.6:freetype \
+depends_lib	 port:xorg-libs lib:libfreetype.6:freetype \
 		     port:libpaper port:openmotif port:t1lib
 depends_run  path:share/ghostscript/fonts:ghostscript
 

Modified: trunk/dports/graphics/xv/Portfile
===================================================================
--- trunk/dports/graphics/xv/Portfile	2009-01-18 19:52:04 UTC (rev 45602)
+++ trunk/dports/graphics/xv/Portfile	2009-01-18 20:52:41 UTC (rev 45603)
@@ -5,7 +5,7 @@
 name                    xv
 version                 3.10a
 set jumbo_version       20070520
-revision                3
+revision                4
 categories              graphics x11
 maintainers             raimue
 
@@ -35,14 +35,14 @@
                         md5 2d4fbeec1561304362781cc8e2f7f72d \
                         ${distname}-jumbo-patches-${jumbo_version}${extract.suffix} \
                         md5 9fb2d0ec320498105cafeba38a588472
-depends_lib             lib:libX11.6:XFree86 \
+depends_lib             port:xorg-libs \
                         port:jpeg \
                         port:tiff \
                         port:libpng \
                         port:jasper \
                         port:giflib \
                         port:zlib \
-                        lib:libXpm.4:xpm
+                        port:xpm
 
 patch {
     system "cd '${worksrcpath}' && patch -p1 < ${workpath}/${distname}-jumbo-fix-enh-patch-${jumbo_version}.txt"

Modified: trunk/dports/kde/kdelibs3/Portfile
===================================================================
--- trunk/dports/kde/kdelibs3/Portfile	2009-01-18 19:52:04 UTC (rev 45602)
+++ trunk/dports/kde/kdelibs3/Portfile	2009-01-18 20:52:41 UTC (rev 45603)
@@ -5,7 +5,7 @@
 PortSystem 1.0
 name		kdelibs3
 version		3.5.8
-revision	3
+revision	4
 set kdeadmin	kde-admindir-1024
 categories	kde
 maintainers	nomaintainer
@@ -27,7 +27,7 @@
 		port:pkgconfig \
 		port:unsermake
 depends_lib	lib:libpoll:poll-emulator \
-		lib:libX11.6:XFree86 \
+		port:xorg-libs \
 		port:aspell \
 		port:bzip2 \
 		port:expat \

Modified: trunk/dports/lang/mit-scheme/Portfile
===================================================================
--- trunk/dports/lang/mit-scheme/Portfile	2009-01-18 19:52:04 UTC (rev 45602)
+++ trunk/dports/lang/mit-scheme/Portfile	2009-01-18 20:52:41 UTC (rev 45603)
@@ -5,7 +5,7 @@
 
 name                    mit-scheme
 version                 20080130
-revision                1
+revision                2
 categories              lang
 platforms               darwin
 maintainers             nomaintainer
@@ -26,7 +26,7 @@
 checksums               md5 75e11fcba96c9efd49cd283b43d6839a
 
 depends_lib \
-    lib:libX11.6:XFree86
+    port:xorg-libs
 
 post-patch  {
     reinplace "s|/usr/local|${prefix}|g" \

Modified: trunk/dports/lang/polyml/Portfile
===================================================================
--- trunk/dports/lang/polyml/Portfile	2009-01-18 19:52:04 UTC (rev 45602)
+++ trunk/dports/lang/polyml/Portfile	2009-01-18 20:52:41 UTC (rev 45603)
@@ -4,6 +4,7 @@
 
 name			polyml
 version			5.2.1
+revision                1
 set distfile_date	20080623181636
 categories		lang ml
 platforms		darwin
@@ -20,7 +21,7 @@
 distname		${name}.${version}
 checksums		sha1 39cc9451113d41ca9c491167cf3973dfd55b7446
 
-depends_lib		lib:libX11.6:XFree86
+depends_lib		port:xorg-libs
 
 #post-extract { system "chmod 755 ${worksrcpath}/install-sh" }
 

Modified: trunk/dports/lang/squeak/Portfile
===================================================================
--- trunk/dports/lang/squeak/Portfile	2009-01-18 19:52:04 UTC (rev 45602)
+++ trunk/dports/lang/squeak/Portfile	2009-01-18 20:52:41 UTC (rev 45603)
@@ -4,6 +4,7 @@
 
 name			squeak
 version			3.9
+revision                1
 categories		lang squeak
 maintainers		nomaintainer
 description		Full, portable, Smalltalk-80 system
@@ -105,7 +106,7 @@
 }
 
 variant x11 	{
-	depends_lib-append	lib:libX11:XFree86
+	depends_lib-append	port:xorg-libs
 	configure.args-delete	--without-x
 	configure.args-append	--with-x
 }

Modified: trunk/dports/lang/swi-prolog/Portfile
===================================================================
--- trunk/dports/lang/swi-prolog/Portfile	2009-01-18 19:52:04 UTC (rev 45602)
+++ trunk/dports/lang/swi-prolog/Portfile	2009-01-18 20:52:41 UTC (rev 45603)
@@ -4,6 +4,7 @@
 
 name		swi-prolog
 version		5.6.63
+revision        1
 epoch		20051223
 
 categories	lang
@@ -41,7 +42,7 @@
 	port:libmcrypt		\
 	port:gmp		\
 	port:zlib		\
-	lib:libX11.6:XFree86
+	port:xorg-libs
 
 platform darwin 6 {
 	depends_lib-append port:dlcompat

Modified: trunk/dports/lang/swi-prolog-devel/Portfile
===================================================================
--- trunk/dports/lang/swi-prolog-devel/Portfile	2009-01-18 19:52:04 UTC (rev 45602)
+++ trunk/dports/lang/swi-prolog-devel/Portfile	2009-01-18 20:52:41 UTC (rev 45603)
@@ -4,6 +4,7 @@
 
 name		swi-prolog-devel
 version		5.7.4
+revision        1
 epoch		20051223
 
 categories	lang
@@ -41,7 +42,7 @@
 	port:libmcrypt		\
 	port:gmp		\
 	port:zlib		\
-	lib:libX11.6:XFree86
+	port:xorg-libs
 
 platform darwin 6 {
 	depends_lib-append port:dlcompat

Modified: trunk/dports/lang/yabasic/Portfile
===================================================================
--- trunk/dports/lang/yabasic/Portfile	2009-01-18 19:52:04 UTC (rev 45602)
+++ trunk/dports/lang/yabasic/Portfile	2009-01-18 20:52:41 UTC (rev 45603)
@@ -4,6 +4,7 @@
 
 name			yabasic
 version			2.763
+revision                1
 categories		lang
 platforms		darwin
 maintainers		nomaintainer
@@ -17,7 +18,7 @@
 master_sites	${homepage}/download/
 checksums		md5 98f0cb59db973b89753abcc24b2c5ec2
 
-depends_lib		lib:libX11.6:XFree86
+depends_lib		port:xorg-libs
 
 configure.args	--mandir=${prefix}/share/man
 

Modified: trunk/dports/math/R/Portfile
===================================================================
--- trunk/dports/math/R/Portfile	2009-01-18 19:52:04 UTC (rev 45602)
+++ trunk/dports/math/R/Portfile	2009-01-18 20:52:41 UTC (rev 45603)
@@ -4,6 +4,7 @@
 
 name             R
 version          2.8.1
+revision         1
 categories       math science
 maintainers      kjell.konis at epfl.ch
 platforms        darwin
@@ -37,8 +38,8 @@
                  port:tcl \
                  port:tk \
                  port:tiff \
-                 lib:libXmu.6:xorg-libXmu \
-                 lib:libXss.1:xorg-libXScrnSaver
+                 port:xorg-libXmu \
+                 port:xorg-libXScrnSaver
 
 universal_variant no
 

Modified: trunk/dports/math/gnuplot/Portfile
===================================================================
--- trunk/dports/math/gnuplot/Portfile	2009-01-18 19:52:04 UTC (rev 45602)
+++ trunk/dports/math/gnuplot/Portfile	2009-01-18 20:52:41 UTC (rev 45603)
@@ -4,6 +4,7 @@
 
 name			gnuplot
 version			4.2.4
+revision                1
 categories		math science
 maintainers		pguyot at kallisys.net openmaintainer
 description		A command-driven interactive function plotting program
@@ -38,7 +39,7 @@
 				port:libpng \
 				port:ncurses \
 				port:readline \
-				lib:libX11.6:XFree86 \
+				port:xorg-libs \
 				port:zlib
 
 patchfiles		patch-share-LaTeX-Makefile.in
@@ -65,7 +66,7 @@
 				--disable-wxwidgets
 
 variant no_x11 {
-	depends_lib-delete		lib:libX11.6:XFree86
+	depends_lib-delete		port:xorg-libs
 	configure.args-delete	--with-x
 	configure.args-append	--without-x
 }

Modified: trunk/dports/math/oleo/Portfile
===================================================================
--- trunk/dports/math/oleo/Portfile	2009-01-18 19:52:04 UTC (rev 45602)
+++ trunk/dports/math/oleo/Portfile	2009-01-18 20:52:41 UTC (rev 45603)
@@ -3,7 +3,7 @@
 PortSystem			1.0
 name				oleo
 version				1.99.16
-revision			1
+revision			2
 categories			math
 maintainers			nomaintainer
 description			Lightweight spreadsheet program
@@ -40,7 +40,7 @@
 }
 
 variant x11 {
-	depends_lib-append		lib:libX11:XFree86
+	depends_lib-append		port:xorg-libs
 	configure.args-delete	--without-x
 	configure.args-append	--with-x
 }

Modified: trunk/dports/math/ploticus/Portfile
===================================================================
--- trunk/dports/math/ploticus/Portfile	2009-01-18 19:52:04 UTC (rev 45602)
+++ trunk/dports/math/ploticus/Portfile	2009-01-18 20:52:41 UTC (rev 45603)
@@ -6,6 +6,7 @@
 set major_version 2
 set minor_version 40
 version          ${major_version}.${minor_version}
+revision         1
 categories       math
 maintainers      nomaintainer
 description      plot generation program
@@ -26,7 +27,7 @@
                  sha1 824860a41a46ad15cc8c6cb37fa6f59176f4e01e \
                  rmd160 4e36b4cff635042213a4693a44fb03298782edfc
 
-depends_lib      lib:libX11:XFree86 port:libpng port:zlib \
+depends_lib      port:xorg-libs port:libpng port:zlib \
                  port:gd2 port:jpeg port:freetype
 
 patchfiles       patch-src-Makefile.diff

Modified: trunk/dports/multimedia/MPlayer/Portfile
===================================================================
--- trunk/dports/multimedia/MPlayer/Portfile	2009-01-18 19:52:04 UTC (rev 45602)
+++ trunk/dports/multimedia/MPlayer/Portfile	2009-01-18 20:52:41 UTC (rev 45603)
@@ -6,7 +6,7 @@
 
 name                MPlayer
 version             1.0rc2
-revision            2
+revision            3
 categories          multimedia
 maintainers         ecronin \
                     openmaintainer
@@ -304,7 +304,7 @@
 }
 
 variant x11 {
-    depends_lib-append      lib:libX11.6:XFree86
+    depends_lib-append      port:xorg-libs
     configure.args-delete   --disable-x11
     configure.env-append    PKG_CONFIG_PATH=${prefix}/lib/pkgconfig:${x11prefix}/lib/pkgconfig
 }

Modified: trunk/dports/multimedia/emotion/Portfile
===================================================================
--- trunk/dports/multimedia/emotion/Portfile	2009-01-18 19:52:04 UTC (rev 45602)
+++ trunk/dports/multimedia/emotion/Portfile	2009-01-18 20:52:41 UTC (rev 45603)
@@ -2,6 +2,7 @@
 PortSystem 1.0
 name		emotion
 version		0.0.1
+revision        1
 description	A Evas smart-object library for video capabilities.
 long_description        Emotion is an Evas smart-object library providing \
 			video capabilities. Emotion leverages libxine 1.0 \
@@ -15,7 +16,7 @@
 homepage	http://evidence.sf.net
 master_sites    sourceforge:enlightenment
 checksums	md5 6f2f60520883ad6faed6d5475f244e1d
-depends_lib	lib:libX11.6:XFree86 lib:libjpeg.62:jpeg \
+depends_lib	port:xorg-libs lib:libjpeg.62:jpeg \
 		lib:libpng.3:libpng lib:libtiff.3:tiff \
 		lib:libImlib2:imlib2 lib:libesd:esound \
 		lib:libintl:gettext lib:libxine:xine-lib \

Modified: trunk/dports/multimedia/mpeg2vidcodec/Portfile
===================================================================
--- trunk/dports/multimedia/mpeg2vidcodec/Portfile	2009-01-18 19:52:04 UTC (rev 45602)
+++ trunk/dports/multimedia/mpeg2vidcodec/Portfile	2009-01-18 20:52:41 UTC (rev 45603)
@@ -5,6 +5,7 @@
 
 name		mpeg2vidcodec
 version		1.2
+revision        1
 categories	multimedia
 maintainers	nomaintainer
 description	MPEG-2 Video Encoder / Decoder
@@ -23,7 +24,7 @@
 default_variants	+x11
 
 variant x11 description {Enable X11 support} {
-                  depends_lib	lib:libX11:XFree86
+                  depends_lib	port:xorg-libs
 		  build.args	USE_DISP=-DDISPLAY \
 			  	USE_SHMEM=-DSH_MEM \
 				LIBS="-lXext -lX11" \

Modified: trunk/dports/multimedia/xine-lib/Portfile
===================================================================
--- trunk/dports/multimedia/xine-lib/Portfile	2009-01-18 19:52:04 UTC (rev 45602)
+++ trunk/dports/multimedia/xine-lib/Portfile	2009-01-18 20:52:41 UTC (rev 45603)
@@ -4,6 +4,7 @@
 
 name		xine-lib
 version		1.1.16
+revision        1
 description	xine-lib is a free multimedia engine, released under the GPL.
 long_description        ${description}
 maintainers	nomaintainer
@@ -15,7 +16,7 @@
 checksums   md5     acd1a210c5a6444e8fd44696469352bb \
             sha1    b7a8d159ac81befe2a2cc0df20a4c0a00cef4ad7 \
             rmd160  2fc35e0c5f6dc3f00be0396fecd40e5a2fb388f5
-depends_lib lib:libX11.6:XFree86 \
+depends_lib port:xorg-libs \
             port:aalib	\
             port:esound \
             port:faad2 \

Modified: trunk/dports/net/gpsd/Portfile
===================================================================
--- trunk/dports/net/gpsd/Portfile	2009-01-18 19:52:04 UTC (rev 45602)
+++ trunk/dports/net/gpsd/Portfile	2009-01-18 20:52:41 UTC (rev 45603)
@@ -4,6 +4,7 @@
 
 name		gpsd
 version		2.30
+revision        1
 categories	net
 maintainers	shadow at dementia.org
 description	gps multiplexor daemon
@@ -14,6 +15,6 @@
 platforms	darwin
 master_sites	http://download.berlios.de/gpsd/
 checksums	md5 dde177174878e8ae6db15f8010da46dd
-depends_lib	lib:libX11.6:XFree86 lib:libXm.4:openmotif
+depends_lib	port:xorg-libs lib:libXm.4:openmotif
 
 configure.args	--mandir=${prefix}/share/man

Modified: trunk/dports/net/rdesktop/Portfile
===================================================================
--- trunk/dports/net/rdesktop/Portfile	2009-01-18 19:52:04 UTC (rev 45602)
+++ trunk/dports/net/rdesktop/Portfile	2009-01-18 20:52:41 UTC (rev 45603)
@@ -4,7 +4,7 @@
 
 name		rdesktop
 version		1.6.0
-revision		1
+revision		2
 categories	net
 maintainers	cshbell at gmail.com noses at noses.com
 description	Windows Terminal Server Client
@@ -28,7 +28,7 @@
 
 depends_build	port:autoconf port:automake port:pkgconfig
 
-depends_lib	lib:libX11.6:xorg-libX11 \
+depends_lib	port:xorg-libX11 \
 		port:openssl \
 		port:libiconv \
 		port:libao

Modified: trunk/dports/net/scotty/Portfile
===================================================================
--- trunk/dports/net/scotty/Portfile	2009-01-18 19:52:04 UTC (rev 45602)
+++ trunk/dports/net/scotty/Portfile	2009-01-18 20:52:41 UTC (rev 45603)
@@ -4,7 +4,7 @@
 
 name                    scotty
 version                 3.0.0
-revision		4
+revision		5
 categories              net
 maintainers             markd
 description             Network management extensions to Tcl that enables \
@@ -24,7 +24,7 @@
 #svn.url                https://subversion.eecs.iu-bremen.de/svn/schoenw/src/scotty
 #depends_build          port:subversion
 
-depends_lib             lib:libX11.6:XFree86 \
+depends_lib             port:xorg-libs \
 			port:tcl \
 			port:tk
 

Modified: trunk/dports/net/wap11gui/Portfile
===================================================================
--- trunk/dports/net/wap11gui/Portfile	2009-01-18 19:52:04 UTC (rev 45602)
+++ trunk/dports/net/wap11gui/Portfile	2009-01-18 20:52:41 UTC (rev 45603)
@@ -3,7 +3,7 @@
 
 name			wap11gui
 version			0.12
-revision		3
+revision		4
 categories		net
 maintainers		nomaintainer
 description		Linksys WAP11 Unix Configuration Utility
@@ -21,7 +21,7 @@
 				lib:libpng:libpng \
 				path:include/qt3/qt_x11.h:qt3 \
 				lib:libssl.0.9:openssl \
-				lib:libX11.6:XFree86 \
+				port:xorg-libs \
 				lib:libz.1:zlib
 
 patchfiles		patch-configure \

Modified: trunk/dports/perl/p5-term-gnuplot/Portfile
===================================================================
--- trunk/dports/perl/p5-term-gnuplot/Portfile	2009-01-18 19:52:04 UTC (rev 45602)
+++ trunk/dports/perl/p5-term-gnuplot/Portfile	2009-01-18 20:52:41 UTC (rev 45603)
@@ -4,6 +4,7 @@
 PortGroup perl5 1.0
 
 perl5.setup         Term-Gnuplot 0.90380905
+revision            1
 maintainers         vincent-opdarw at vinc17.org
 categories-append   math
 description         Low-level graphics using Gnuplot drawing routines
@@ -12,7 +13,7 @@
 checksums           md5 ceccd4e30deb6291ebecce176e715208 \
                     sha1 4d05ffb45d28f949c7ae8fde40bfe7addbeb9f69
 platforms           darwin
-depends_lib-append  port:libpng port:gd2 lib:libX11.6:XFree86
+depends_lib-append  port:libpng port:gd2 port:xorg-libs
 
 configure.env       C_INCLUDE_PATH="${prefix}/include" \
                     LIBRARY_PATH="${prefix}/lib"

Modified: trunk/dports/print/espgs/Portfile
===================================================================
--- trunk/dports/print/espgs/Portfile	2009-01-18 19:52:04 UTC (rev 45602)
+++ trunk/dports/print/espgs/Portfile	2009-01-18 20:52:41 UTC (rev 45603)
@@ -4,6 +4,7 @@
 
 name                espgs
 version             7.07.1
+revision            1
 categories          print textproc
 platforms           darwin
 maintainers         nomaintainer
@@ -69,6 +70,6 @@
 
 
 variant x11 {
-    depends_lib-append      lib:libX11:XFree86
+    depends_lib-append      port:xorg-libs
     configure.args-append   --with-x
 }

Modified: trunk/dports/print/ghostscript/Portfile
===================================================================
--- trunk/dports/print/ghostscript/Portfile	2009-01-18 19:52:04 UTC (rev 45602)
+++ trunk/dports/print/ghostscript/Portfile	2009-01-18 20:52:41 UTC (rev 45603)
@@ -4,6 +4,7 @@
 
 name            ghostscript
 version         8.63
+revision        1
 categories      print
 maintainers     takanori openmaintainer
 description     GPL Ghostscript, An interpreter for PostScript and PDF
@@ -25,8 +26,8 @@
                 ghostscript-fonts-std-8.11.tar.gz md5 6865682b095f8c4500c54b285ff05ef6 \
                 ghostscript-fonts-other-6.0.tar.gz md5 1a643ae62ef166562e4d422b1a601272
 
-depends_lib     lib:libXext.6:xorg-libXext \
-                lib:libXt.6:xorg-libXt \
+depends_lib     port:xorg-libXext \
+                port:xorg-libXt \
                 path:lib/pkgconfig/cairo.pc:cairo \
                 port:expat \
                 port:fontconfig \

Modified: trunk/dports/print/gv/Portfile
===================================================================
--- trunk/dports/print/gv/Portfile	2009-01-18 19:52:04 UTC (rev 45602)
+++ trunk/dports/print/gv/Portfile	2009-01-18 20:52:41 UTC (rev 45603)
@@ -4,7 +4,7 @@
 
 name                    gv
 version                 3.6.6
-revision                1
+revision                2
 categories              print
 maintainers             ryandesign openmaintainer
 homepage                http://www.gnu.org/software/gv/
@@ -29,7 +29,7 @@
                         port:automake \
                         port:libtool
 
-depends_lib             lib:libXinerama.1:xorg-libXinerama \
+depends_lib             port:xorg-libXinerama \
                         port:Xaw3d \
                         port:bzip2
 

Modified: trunk/dports/print/teTeX/Portfile
===================================================================
--- trunk/dports/print/teTeX/Portfile	2009-01-18 19:52:04 UTC (rev 45602)
+++ trunk/dports/print/teTeX/Portfile	2009-01-18 20:52:41 UTC (rev 45603)
@@ -3,7 +3,7 @@
 PortSystem 1.0
 name			teTeX
 version			3.0
-revision		5
+revision		6
 epoch			20080130
 categories		print textproc
 maintainers		gwright at macports.org
@@ -65,7 +65,7 @@
 
 depends_build		port:gawk		\
 			port:gsed
-depends_lib		lib:libX11:XFree86
+depends_lib		port:xorg-libs
 depends_run		port:ghostscript	\
 			port:texinfo		\
 			port:texi2html
@@ -78,7 +78,7 @@
 			--without-texi2html				\
 			--disable-multiplatform	
 
-variant nox11	{ depends_lib-delete lib:libX11:XFree86
+variant nox11	{ depends_lib-delete port:xorg-libs
 		  configure.args-append --without-x11 \
 					--without-oxdvik \
 					--without-xdvik \

Modified: trunk/dports/science/geomview/Portfile
===================================================================
--- trunk/dports/science/geomview/Portfile	2009-01-18 19:52:04 UTC (rev 45602)
+++ trunk/dports/science/geomview/Portfile	2009-01-18 20:52:41 UTC (rev 45603)
@@ -4,6 +4,7 @@
 
 name                geomview
 version             1.9.4
+revision            1
 categories          science graphics x11
 maintainers         ira.uka.de:raphael openmaintainer
 description         interactive 3D viewing program
@@ -35,7 +36,7 @@
                     --with-pdfviewer=open
 depends_lib         port:openmotif \
                     port:zlib \
-                    lib:libX11.6:XFree86
+                    port:xorg-libs
 depends_build       path:${prefix}/bin/tex:texlive \
                     port:texinfo
 

Modified: trunk/dports/science/molden/Portfile
===================================================================
--- trunk/dports/science/molden/Portfile	2009-01-18 19:52:04 UTC (rev 45602)
+++ trunk/dports/science/molden/Portfile	2009-01-18 20:52:41 UTC (rev 45603)
@@ -12,7 +12,7 @@
 
 name                molden
 version             4.6
-revision            12
+revision            13
 categories          science graphics
 maintainers         openmaintainer jochen
 homepage            http://www.cmbi.ru.nl/molden/molden.html
@@ -35,7 +35,7 @@
 
 platforms           darwin
 depends_build       port:gmake
-depends_lib         port:gcc43 lib:libX11.6:XFree86
+depends_lib         port:gcc43 port:xorg-libs
 patchfiles          patch-makefile.diff
 use_parallel_build  yes
 use_configure       no

Modified: trunk/dports/science/rasmol/Portfile
===================================================================
--- trunk/dports/science/rasmol/Portfile	2009-01-18 19:52:04 UTC (rev 45602)
+++ trunk/dports/science/rasmol/Portfile	2009-01-18 20:52:41 UTC (rev 45603)
@@ -4,14 +4,14 @@
 
 name                rasmol
 version             2.7.1.1
-revision            2
+revision            3
 description         Molecular graphics visualisation tool
 categories          science graphics
 maintainers         nomaintainer
 distname            RasMol_${version}
 master_sites        http://www.bernstein-plus-sons.com/software/
 checksums           md5 0d5c99eeda079d8cbf413944d284740b 
-depends_lib         lib:libX11.6:XFree86
+depends_lib         port:xorg-libs
 patchfiles          patch-Imakefile.diff
 post-patch          { reinplace "s|@PREFIX@|${prefix}|g" ${worksrcpath}/Imakefile }
 worksrcdir          ${distname}/src

Modified: trunk/dports/science/tempo/Portfile
===================================================================
--- trunk/dports/science/tempo/Portfile	2009-01-18 19:52:04 UTC (rev 45602)
+++ trunk/dports/science/tempo/Portfile	2009-01-18 20:52:41 UTC (rev 45603)
@@ -3,6 +3,7 @@
 PortSystem		1.0
 name			tempo
 version			1.1.4
+revision                1
 categories		science
 maintainers		jd at lifehertz.com
 platforms		darwin
@@ -21,7 +22,7 @@
 
 depends_lib		lib:libgtkglext-x11-1.0:gtkglext \
 			lib:libgnome-2:libgnome \
-			lib:libX11.6:XFree86
+			port:xorg-libs
 
 patchfiles		patch-tempo.c.diff
 

Modified: trunk/dports/science/triangle/Portfile
===================================================================
--- trunk/dports/science/triangle/Portfile	2009-01-18 19:52:04 UTC (rev 45602)
+++ trunk/dports/science/triangle/Portfile	2009-01-18 20:52:41 UTC (rev 45603)
@@ -4,6 +4,7 @@
 
 name			triangle
 version			1.6
+revision                1
 categories		science
 maintainers		jwa openmaintainer
 description		A Two-Dimensional Quality Mesh Generator and Delaunay Triangulator
@@ -38,7 +39,7 @@
     reinplace "s|CC = cc|CC = ${configure.cc}|g" ${worksrcpath}/makefile
 }
 
-depends_lib		lib:libX11:xorg
+depends_lib		port:xorg-libs
 
 use_configure		no
 

Modified: trunk/dports/science/xastir/Portfile
===================================================================
--- trunk/dports/science/xastir/Portfile	2009-01-18 19:52:04 UTC (rev 45602)
+++ trunk/dports/science/xastir/Portfile	2009-01-18 20:52:41 UTC (rev 45603)
@@ -3,7 +3,7 @@
 PortSystem 1.0
 name		xastir
 version		1.8.4
-revision        1
+revision        2
 categories	science
 maintainers	shadow at dementia.org
 description	Amateur Radio APRS tracking software
@@ -12,7 +12,7 @@
 master_sites	sourceforge
 checksums	md5 10fcf7a63b0696ab6fefc40f1a80fd1d
 
-depends_lib     lib:libX11.6:XFree86 port:openmotif \
+depends_lib     port:xorg-libs port:openmotif \
 		port:libgeotiff port:freetype port:ImageMagick port:gdal \
 		port:pcre port:db44 port:tiff port:proj port:shapelib
 

Modified: trunk/dports/security/pwsafe/Portfile
===================================================================
--- trunk/dports/security/pwsafe/Portfile	2009-01-18 19:52:04 UTC (rev 45602)
+++ trunk/dports/security/pwsafe/Portfile	2009-01-18 20:52:41 UTC (rev 45603)
@@ -4,7 +4,7 @@
 
 name                    pwsafe
 version                 0.2.0
-revision                1
+revision                2
 categories              security
 maintainers             nomaintainer
 platforms               darwin
@@ -21,7 +21,7 @@
     port:readline \
     port:openssl \
     port:ncurses \
-    lib:libX11.6:XFree86
+    port:xorg-libs
 
 configure.args \
     --mandir=${prefix}/share/man \

Modified: trunk/dports/sysutils/wmcpuload/Portfile
===================================================================
--- trunk/dports/sysutils/wmcpuload/Portfile	2009-01-18 19:52:04 UTC (rev 45602)
+++ trunk/dports/sysutils/wmcpuload/Portfile	2009-01-18 20:52:41 UTC (rev 45603)
@@ -3,7 +3,7 @@
 PortSystem 1.0
 name		wmcpuload
 version		1.0.1
-revision	1
+revision	2
 categories	sysutils x11
 maintainers    nomaintainer
 description	An "lcd" dockapp that displays the current cpuload
@@ -17,4 +17,4 @@
 master_sites	http://www.sh.rim.or.jp/~ssato/src/
 checksums	md5 93a28a62d31d4b283edd78fffafb0835
 
-depends_build   lib:libX11.6:XFree86
+depends_build   port:xorg-libs

Modified: trunk/dports/sysutils/wmmemmon/Portfile
===================================================================
--- trunk/dports/sysutils/wmmemmon/Portfile	2009-01-18 19:52:04 UTC (rev 45602)
+++ trunk/dports/sysutils/wmmemmon/Portfile	2009-01-18 20:52:41 UTC (rev 45603)
@@ -3,6 +3,7 @@
 PortSystem 1.0
 name            wmmemmon
 version         1.0.1
+revision        1
 categories      sysutils x11
 maintainers     nomaintainer
 platforms       darwin freebsd
@@ -18,7 +19,7 @@
 use_bzip2       yes
 checksums       md5 fc3127a322351ec6eaf0aba5bfd30185
 configure.args  --mandir=${prefix}/share/man
-depends_build   lib:libX11.6:XFree86
+depends_build   port:xorg-libs
 
 test.run        yes
 test.target     check

Modified: trunk/dports/tex/pTeX/Portfile
===================================================================
--- trunk/dports/tex/pTeX/Portfile	2009-01-18 19:52:04 UTC (rev 45602)
+++ trunk/dports/tex/pTeX/Portfile	2009-01-18 20:52:41 UTC (rev 45603)
@@ -4,6 +4,7 @@
 
 name            pTeX
 version         20080616
+revision        1
 epoch           ${version}
 categories      tex print textproc japanese
 maintainers     takanori openmaintainer
@@ -51,7 +52,7 @@
 
 depends_lib     bin:gs:ghostscript \
                 bin:perl:perl5 \
-                lib:libX11:XFree86 \
+                port:xorg-libs \
                 lib:libXm:openmotif \
                 port:fontconfig \
                 port:freetype \
@@ -204,7 +205,7 @@
 variant utf8 conflicts euc sjis description {Set default character set to UTF-8} {}
 
 variant nox11 conflicts motif xaw xaw3d nextaw description {Do not use X11} {
-    depends_lib-delete lib:libX11:XFree86 lib:libXm:openmotif port:fontconfig port:freetype port:gd2 port:jpeg port:libiconv
+    depends_lib-delete port:xorg-libs lib:libXm:openmotif port:fontconfig port:freetype port:gd2 port:jpeg port:libiconv
     # gd2 requires X11
     configure.args-delete --with-system-gd --with-xdvi-x-toolkit=motif
     configure.args-append --without-system-gd --without-x --without-xdvik
@@ -212,7 +213,7 @@
 variant motif conflicts nox11 xaw xaw3d nextaw description {Use motif (default)} {}
 variant xaw conflicts nox11 motif xaw3d nextaw description {Use xaw} {
     depends_lib-delete lib:libXm:openmotif
-    depends_lib-append lib:libXaw:XFree86
+    depends_lib-append port:xorg-libs
     configure.args-delete --with-xdvi-x-toolkit=motif
     configure.args-append --with-xdvi-x-toolkit=xaw
 }

Modified: trunk/dports/tex/texlive_base/Portfile
===================================================================
--- trunk/dports/tex/texlive_base/Portfile	2009-01-18 19:52:04 UTC (rev 45602)
+++ trunk/dports/tex/texlive_base/Portfile	2009-01-18 20:52:41 UTC (rev 45603)
@@ -4,7 +4,7 @@
 
 name            texlive_base
 version         2007
-revision        4
+revision        5
 categories      tex
 maintainers     milosh openmaintainer
 description     TeX Live Binaries.
@@ -30,7 +30,7 @@
                 sha1 f6f0192c200473c361aedfa8d34691a99e4f7065
 depends_lib     port:freetype port:fontconfig port:ncurses port:zlib \
                 port:libpng port:texinfo port:texi2html port:ghostscript \
-                lib:libX11:XFree86 port:texlive_texmf-minimal \
+                port:xorg-libs port:texlive_texmf-minimal \
                 port:texlive_texmf-full
 
 depends_build   path:bin/perl:perl5

Modified: trunk/dports/textproc/most/Portfile
===================================================================
--- trunk/dports/textproc/most/Portfile	2009-01-18 19:52:04 UTC (rev 45602)
+++ trunk/dports/textproc/most/Portfile	2009-01-18 20:52:41 UTC (rev 45603)
@@ -4,6 +4,7 @@
 
 name            most
 version         5.0.0a
+revision        1
 categories      textproc
 platforms       darwin
 maintainers     nox openmaintainer
@@ -28,7 +29,7 @@
 destroot.args   DOC_DIR=${prefix}/share/doc/${name}-${version}
 
 variant x11 description {Enable X11 support} {
-    depends_lib-append      lib:libX11.6:XFree86
+    depends_lib-append      port:xorg-libs
     configure.args-append   --with-x
 }
 

Modified: trunk/dports/textproc/tkman/Portfile
===================================================================
--- trunk/dports/textproc/tkman/Portfile	2009-01-18 19:52:04 UTC (rev 45602)
+++ trunk/dports/textproc/tkman/Portfile	2009-01-18 20:52:41 UTC (rev 45603)
@@ -3,6 +3,7 @@
 PortSystem 1.0
 name             tkman
 version          2.2
+revision         1
 description      TK-based GUI for manpage viewing.
 long_description \
     A TK Based Manpage viewer.  TkMan offers indexing, \
@@ -15,7 +16,7 @@
 patchfiles       patch-Makefile
 checksums        md5 0e81735c93ab2500d6105ff33095c3e8
 depends_lib      bin:rman:rman bin:agrep:glimpse \
-                 lib:libX11.6:XFree86 lib:libtk8.4:tk
+                 port:xorg-libs lib:libtk8.4:tk
 
 configure {
     cd ${worksrcpath}

Modified: trunk/dports/www/links/Portfile
===================================================================
--- trunk/dports/www/links/Portfile	2009-01-18 19:52:04 UTC (rev 45602)
+++ trunk/dports/www/links/Portfile	2009-01-18 20:52:41 UTC (rev 45603)
@@ -3,6 +3,7 @@
 PortSystem 1.0
 name		links
 version		2.2
+revision        1
 description	Lynx-like WWW browser that supports tables, menus, etc
 
 long_description \
@@ -32,6 +33,6 @@
 
 variant x11 {
 	depends_lib-append	port:libpng port:jpeg \
-				lib:libX11:XFree86
+				port:xorg-libs
 	configure.args-append	--enable-graphics --with-x
 }

Modified: trunk/dports/x11/Eterm/Portfile
===================================================================
--- trunk/dports/x11/Eterm/Portfile	2009-01-18 19:52:04 UTC (rev 45602)
+++ trunk/dports/x11/Eterm/Portfile	2009-01-18 20:52:41 UTC (rev 45603)
@@ -4,6 +4,7 @@
 
 name		Eterm
 version		0.9.5
+revision        1
 maintainers	nomaintainer
 categories	x11
 platforms	darwin
@@ -43,10 +44,10 @@
 
 depends_lib \
 	port:libast \
-	lib:libXRes.1:xorg-libXRes \
-	lib:libXext.6:xorg-libXext \
-	lib:libXmu.6:xorg-libXmu \
-	lib:libXt.6:xorg-libXt
+	port:xorg-libXRes \
+	port:xorg-libXext \
+	port:xorg-libXmu \
+	port:xorg-libXt
 
 use_autoconf yes
 autoconf.cmd autoreconf

Modified: trunk/dports/x11/SoXt/Portfile
===================================================================
--- trunk/dports/x11/SoXt/Portfile	2009-01-18 19:52:04 UTC (rev 45602)
+++ trunk/dports/x11/SoXt/Portfile	2009-01-18 20:52:41 UTC (rev 45603)
@@ -3,6 +3,7 @@
 PortSystem		1.0
 name			SoXt
 version			1.2.2
+revision                1
 description		Xt/Motif glue library for Coin
 long_description	SoXt provides the programmer with a high-level \
 	application programmer's interface (API) in C++. The library   \
@@ -22,10 +23,10 @@
 
 depends_lib \
 	lib:libGL.1:mesa \
-	lib:libXi.6:xorg-libXi \
-	lib:libXmu.6:xorg-libXmu \
-	lib:libXp.6:xorg-libXp \
-	lib:libXpm.4:xpm \
+	port:xorg-libXi \
+	port:xorg-libXmu \
+	port:xorg-libXp \
+	port:xpm \
 	lib:libXm:openmotif \
 	port:Coin
 

Modified: trunk/dports/x11/Xaw3d/Portfile
===================================================================
--- trunk/dports/x11/Xaw3d/Portfile	2009-01-18 19:52:04 UTC (rev 45602)
+++ trunk/dports/x11/Xaw3d/Portfile	2009-01-18 20:52:41 UTC (rev 45603)
@@ -4,7 +4,7 @@
 
 name                    Xaw3d
 version                 1.5E
-revision                1
+revision                2
 categories              x11
 maintainers             nomaintainer
 
@@ -35,12 +35,12 @@
 	bin:xmkmf:imake
 
 depends_lib \
-	lib:libSM.6:xorg-libsm \
-	lib:libXext.6:xorg-libXext \
-	lib:libXmu.6:xorg-libXmu \
-	lib:libXp.6:xorg-libXp \
-	lib:libXpm.4:xpm \
-	lib:libXt.6:xorg-libXt
+	port:xorg-libsm \
+	port:xorg-libXext \
+	port:xorg-libXmu \
+	port:xorg-libXp \
+	port:xpm \
+	port:xorg-libXt
 
 worksrcdir              xc/lib/${name}
 

Modified: trunk/dports/x11/abclock/Portfile
===================================================================
--- trunk/dports/x11/abclock/Portfile	2009-01-18 19:52:04 UTC (rev 45602)
+++ trunk/dports/x11/abclock/Portfile	2009-01-18 20:52:41 UTC (rev 45603)
@@ -3,7 +3,7 @@
 PortSystem 1.0
 name             abclock
 version          1.0d
-revision         1
+revision         2
 categories       x11
 maintainers      nomaintainer
 description      analog clock for X
@@ -28,7 +28,7 @@
 }
 
 depends_lib \
-	lib:libX11.6:xorg-libX11
+	port:xorg-libX11
 
 variant universal {
 	build.target-append OPT="${configure.cflags} ${configure.universal_cflags}"

Modified: trunk/dports/x11/advi/Portfile
===================================================================
--- trunk/dports/x11/advi/Portfile	2009-01-18 19:52:04 UTC (rev 45602)
+++ trunk/dports/x11/advi/Portfile	2009-01-18 20:52:41 UTC (rev 45603)
@@ -4,7 +4,7 @@
 
 name		advi
 version     	1.6.0
-revision	1
+revision	2
 categories  	x11 graphics
 maintainers 	nomaintainer
 platforms   	darwin
@@ -33,8 +33,8 @@
 depends_lib \
 	port:ocaml \
 	port:camlimages \
-	lib:libXinerama.1:xorg-libXinerama \
-	lib:libXpm.4:xpm \
+	port:xorg-libXinerama \
+	port:xpm \
 	port:freetype
 
 destroot {

Modified: trunk/dports/x11/appres/Portfile
===================================================================
--- trunk/dports/x11/appres/Portfile	2009-01-18 19:52:04 UTC (rev 45602)
+++ trunk/dports/x11/appres/Portfile	2009-01-18 20:52:41 UTC (rev 45603)
@@ -3,6 +3,7 @@
 PortSystem          1.0
 name                appres
 version             1.0.1
+revision            1
 categories          x11
 maintainers         blb openmaintainer
 description         Show resources seen by an X11 application
@@ -25,7 +26,7 @@
 depends_build       port:pkgconfig
 
 depends_lib \
-	lib:libXt.6:xorg-libXt
+	port:xorg-libXt
 
 livecheck.check     regex
 livecheck.regex     ${name}-(\[\\d.\]+)${extract.suffix}

Modified: trunk/dports/x11/aterm/Portfile
===================================================================
--- trunk/dports/x11/aterm/Portfile	2009-01-18 19:52:04 UTC (rev 45602)
+++ trunk/dports/x11/aterm/Portfile	2009-01-18 20:52:41 UTC (rev 45603)
@@ -3,6 +3,7 @@
 PortSystem 1.0
 name           aterm
 version        1.0.0
+revision       1
 categories     x11
 maintainers    nomaintainer
 description    Color vt102 terminal emu w/transparency support
@@ -18,8 +19,8 @@
 use_bzip2      yes
 checksums      md5 ceb64c62ae243a7fc3ddb0d6f9a19faa
 depends_lib \
-	lib:libSM.6:xorg-libsm \
-	lib:libXext.6:xorg-libXext
+	port:xorg-libsm \
+	port:xorg-libXext
 
 configure.args --enable-background-image --disable-backspace-key \
                --disable-delete-key --enable-fading \

Modified: trunk/dports/x11/awesome/Portfile
===================================================================
--- trunk/dports/x11/awesome/Portfile	2009-01-18 19:52:04 UTC (rev 45602)
+++ trunk/dports/x11/awesome/Portfile	2009-01-18 20:52:41 UTC (rev 45603)
@@ -4,7 +4,7 @@
 
 name              awesome
 version           2.0
-revision          1
+revision          2
 categories        x11 x11-wm
 maintainers       milosh openmaintainer
 platforms         darwin
@@ -31,10 +31,10 @@
 	port:pkgconfig
 
 depends_lib \
-        lib:libXext.6:xorg-libXext \
-        lib:libXft.2:Xft2 \
-        lib:libXinerama.1:xorg-libXinerama \
-        lib:libXrandr.2:xorg-libXrandr \
+        port:xorg-libXext \
+        port:Xft2 \
+        port:xorg-libXinerama \
+        port:xorg-libXrandr \
         port:cairo \
         port:libconfuse
 

Modified: trunk/dports/x11/bdftopcf/Portfile
===================================================================
--- trunk/dports/x11/bdftopcf/Portfile	2009-01-18 19:52:04 UTC (rev 45602)
+++ trunk/dports/x11/bdftopcf/Portfile	2009-01-18 20:52:41 UTC (rev 45603)
@@ -4,6 +4,7 @@
 
 name                bdftopcf
 version             1.0.1
+revision            1
 categories          x11
 platforms           darwin
 maintainers         jeremyhu
@@ -25,7 +26,7 @@
 	port:automake
 
 depends_lib \
-	lib:libXfont.1:xorg-libXfont
+	port:xorg-libXfont
 
 livecheck.check regex
 livecheck.url   [lindex ${master_sites} 0]?C=M&O=D
@@ -38,7 +39,7 @@
 platform macosx {
 	if {${os.major} < 9} {
 		# Tiger's X11 SDK doesn't have the X11/fonts/*.h
-		depends_lib-delete lib:libXfont.1:xorg-libXfont
+		depends_lib-delete port:xorg-libXfont
 		depends_lib-append port:xorg-libXfont
 	}
 }

Modified: trunk/dports/x11/bitmap/Portfile
===================================================================
--- trunk/dports/x11/bitmap/Portfile	2009-01-18 19:52:04 UTC (rev 45602)
+++ trunk/dports/x11/bitmap/Portfile	2009-01-18 20:52:41 UTC (rev 45603)
@@ -3,6 +3,7 @@
 PortSystem          1.0
 name                bitmap
 version             1.0.3
+revision            1
 categories          x11 graphics
 maintainers         blb openmaintainer
 description         Bitmap editor and converter utilities for X11
@@ -21,7 +22,7 @@
 depends_build       port:pkgconfig
 
 depends_lib \
-	lib:libXaw:xorg-libXaw
+	port:xorg-libXaw
 
 # Xquartz ships with XAW8 but current libXaw no longer supports it, so
 # this makes sure the MacPorts libXaw can satisfy bitmap

Modified: trunk/dports/x11/blackbox/Portfile
===================================================================
--- trunk/dports/x11/blackbox/Portfile	2009-01-18 19:52:04 UTC (rev 45602)
+++ trunk/dports/x11/blackbox/Portfile	2009-01-18 20:52:41 UTC (rev 45603)
@@ -4,6 +4,7 @@
 
 name		blackbox
 version		0.70.1
+revision        1
 categories	x11 x11-wm
 maintainers	pmq
 platforms	darwin freebsd
@@ -23,8 +24,8 @@
 livecheck.regex	"Latest release: <em>(\[0-9a-z.\]+)</em>"
 
 depends_lib \
-	lib:libXext.6:xorg-libXext \
-	lib:libXft.2:Xft2 \
+	port:xorg-libXext \
+	port:Xft2 \
 	port:expat \
 	port:libiconv
 

Modified: trunk/dports/x11/blt/Portfile
===================================================================
--- trunk/dports/x11/blt/Portfile	2009-01-18 19:52:04 UTC (rev 45602)
+++ trunk/dports/x11/blt/Portfile	2009-01-18 20:52:41 UTC (rev 45603)
@@ -3,7 +3,7 @@
 
 name                    blt
 version                 2.4z
-revision		1
+revision		2
 categories              x11
 maintainers             markd at macports.org
 description             BLT is an extension to the Tk toolkit, adding new widgets, \
@@ -17,7 +17,7 @@
 distname		BLT${version}
 checksums               md5 aa2ed73080f3005d9c2a3b5e57ab1eff
 
-depends_build           lib:libX11.6:XFree86 \
+depends_build           port:xorg-libs \
 			port:tcl \
 			port:tk
 

Modified: trunk/dports/x11/desklaunch/Portfile
===================================================================
--- trunk/dports/x11/desklaunch/Portfile	2009-01-18 19:52:04 UTC (rev 45602)
+++ trunk/dports/x11/desklaunch/Portfile	2009-01-18 20:52:41 UTC (rev 45603)
@@ -3,7 +3,7 @@
 PortSystem 1.0
 name	 	desklaunch	
 version	       	1.1.5
-revision	1
+revision	2
 description     DeskLaunch is a small utility for creating desktop icons.	
 long_description	DeskLaunch is a small utility for creating desktop icons using pixmaps.  A simple click will launch the desired application.  DeskLaunch itself runs unter X11 and uses a small configuration file to decide which icons to create.  It is meant to supplement the Oroborus \"minimalistic window manager\".
 homepage	http://www.oroborus.org/
@@ -16,8 +16,8 @@
 checksums	md5 502c8799e3972561589534b7e06214c6
 		# not verified -- upstream does not publish signatures!
 depends_lib \
-        lib:libXext.6:xorg-libXext \
-        lib:libXpm.4:xpm
+        port:xorg-libXext \
+        port:xpm
 
 patchfiles	patch-Makefile
 worksrcdir	${name}-${version}

Modified: trunk/dports/x11/editres/Portfile
===================================================================
--- trunk/dports/x11/editres/Portfile	2009-01-18 19:52:04 UTC (rev 45602)
+++ trunk/dports/x11/editres/Portfile	2009-01-18 20:52:41 UTC (rev 45603)
@@ -3,6 +3,7 @@
 PortSystem          1.0
 name                editres
 version             1.0.3
+revision            1
 categories          x11 graphics
 maintainers         blb openmaintainer
 description         Dynamic resource editor for X11 Toolkit applications
@@ -27,7 +28,7 @@
 
 depends_build       port:pkgconfig
 
-depends_lib         lib:libXaw:xorg-libXaw
+depends_lib         port:xorg-libXaw
 
 configure.args      --disable-xprint
 

Modified: trunk/dports/x11/emiclock/Portfile
===================================================================
--- trunk/dports/x11/emiclock/Portfile	2009-01-18 19:52:04 UTC (rev 45602)
+++ trunk/dports/x11/emiclock/Portfile	2009-01-18 20:52:41 UTC (rev 45603)
@@ -3,6 +3,7 @@
 PortSystem       1.0
 name             emiclock
 version          2.0.2
+revision         1
 categories       x11
 maintainers      nomaintainer
 description      Hyper-animated face analog clock for X11
@@ -22,11 +23,11 @@
 depends_build bin:xmkmf:imake
 
 depends_lib \
-	lib:libSM.6:xorg-libsm \
-	lib:libXaw.7:xorg-libXaw \
-	lib:libXmu.6:xorg-libXmu \
-	lib:libXp.6:xorg-libXp \
-	lib:libXpm.4:xpm
+	port:xorg-libsm \
+	port:xorg-libXaw \
+	port:xorg-libXmu \
+	port:xorg-libXp \
+	port:xpm
 
 build.target-append DESTDIR=${destroot} \
                     BINDIR=${prefix}/bin \

Modified: trunk/dports/x11/enlightenment/Portfile
===================================================================
--- trunk/dports/x11/enlightenment/Portfile	2009-01-18 19:52:04 UTC (rev 45602)
+++ trunk/dports/x11/enlightenment/Portfile	2009-01-18 20:52:41 UTC (rev 45603)
@@ -2,6 +2,7 @@
 PortSystem 1.0
 name		enlightenment
 version		0.16.8
+revision        1
 description	Enlightenment is a highly configurable windowmanager.
 long_description        Enlightenment is a completely themeable, \
 			highly configurable Window Manager for i \
@@ -19,12 +20,12 @@
 	port:pkgconfig
 
 depends_lib \
-	lib:libSM.6:xorg-libsm \
-	lib:libXcomposite.1:xorg-libXcomposite \
-	lib:libXdamage.1:xorg-libXdamage \
-	lib:libXinerama.1:xorg-libXinerama \
-	lib:libXrandr.2:xorg-libXrandr \
-	lib:libXxf86vm.1:xorg-libXxf86vm \
+	port:xorg-libsm \
+	port:xorg-libXcomposite \
+	port:xorg-libXdamage \
+	port:xorg-libXinerama \
+	port:xorg-libXrandr \
+	port:xorg-libXxf86vm \
 	port:freetype \
 	port:imlib2 \
 	port:esound \

Modified: trunk/dports/x11/evilwm/Portfile
===================================================================
--- trunk/dports/x11/evilwm/Portfile	2009-01-18 19:52:04 UTC (rev 45602)
+++ trunk/dports/x11/evilwm/Portfile	2009-01-18 20:52:41 UTC (rev 45603)
@@ -2,7 +2,7 @@
 PortSystem 1.0
 name		evilwm
 version		0.99.21
-revision	2
+revision	3
 description	A minimalist window manager for the X Window System.
 long_description	${description}
 maintainers	nomaintainer
@@ -13,7 +13,7 @@
 checksums	md5 092dff2f7c1151af6823029db8fa4d62
 use_parallel_build yes
 depends_lib \
-	lib:libXext.6:xorg-libXext
+	port:xorg-libXext
 
 configure {
 	if {[file exists ${prefix}/lib/pkgconfig/xext]} {

Modified: trunk/dports/x11/eyeclock/Portfile
===================================================================
--- trunk/dports/x11/eyeclock/Portfile	2009-01-18 19:52:04 UTC (rev 45602)
+++ trunk/dports/x11/eyeclock/Portfile	2009-01-18 20:52:41 UTC (rev 45603)
@@ -3,7 +3,7 @@
 PortSystem       1.0
 name             eyeclock
 version          2.0
-revision         1
+revision         2
 categories       x11
 maintainers      nomaintainer
 description      A clock with eyes following the mouse pointer
@@ -18,8 +18,8 @@
 patchfiles       patch-Makefile
 
 depends_lib \
-	lib:libXpm.4:xpm \
-	lib:libXt.6:xorg-libXt
+	port:xpm \
+	port:xorg-libXt
 
 use_configure    no
 use_parallel_build yes

Modified: trunk/dports/x11/fireworkx/Portfile
===================================================================
--- trunk/dports/x11/fireworkx/Portfile	2009-01-18 19:52:04 UTC (rev 45602)
+++ trunk/dports/x11/fireworkx/Portfile	2009-01-18 20:52:41 UTC (rev 45603)
@@ -4,7 +4,7 @@
 
 name			fireworkx
 version			1.3
-revision		1
+revision		2
 categories		x11
 platforms		darwin
 maintainers		nomaintainer
@@ -18,7 +18,7 @@
 patchfiles		patch-Makefile
 
 depends_lib \
-	lib:libX11.6:xorg-libX11
+	port:xorg-libX11
 
 worksrcdir		${name}-${version}
 

Modified: trunk/dports/x11/fluxbox/Portfile
===================================================================
--- trunk/dports/x11/fluxbox/Portfile	2009-01-18 19:52:04 UTC (rev 45602)
+++ trunk/dports/x11/fluxbox/Portfile	2009-01-18 20:52:41 UTC (rev 45603)
@@ -4,6 +4,7 @@
 
 name		fluxbox
 version		1.1.0.1
+revision        1
 categories	x11 x11-wm
 maintainers	pmq
 platforms	darwin freebsd
@@ -27,11 +28,11 @@
 	port:libtool
 
 depends_lib \
-	lib:libSM.6:xorg-libsm \
-	lib:libXft.2:Xft2 \
-	lib:libXinerama.1:xorg-libXinerama \
-	lib:libXpm.4:xpm \
-	lib:libXrandr.2:xorg-libXrandr
+	port:xorg-libsm \
+	port:Xft2 \
+	port:xorg-libXinerama \
+	port:xpm \
+	port:xorg-libXrandr
 
 livecheck.url   ${homepage}/download.php
 livecheck.regex "The latest stable release is <b>v(\[0-9a-z.\]+)</b>."

Modified: trunk/dports/x11/fonttosfnt/Portfile
===================================================================
--- trunk/dports/x11/fonttosfnt/Portfile	2009-01-18 19:52:04 UTC (rev 45602)
+++ trunk/dports/x11/fonttosfnt/Portfile	2009-01-18 20:52:41 UTC (rev 45603)
@@ -3,6 +3,7 @@
 PortSystem          1.0
 name                fonttosfnt
 version             1.0.4
+revision            1
 categories          x11 graphics
 maintainers         blb openmaintainer
 description         Wrap a bitmap font in a sfnt (TrueType) wrapper
@@ -22,7 +23,7 @@
 
 depends_build       port:pkgconfig
 
-depends_lib         lib:libfontenc:xorg-libfontenc port:freetype
+depends_lib         port:xorg-libfontenc port:freetype
 
 livecheck.check     regex
 livecheck.regex     ${name}-(\[\\d.\]+)${extract.suffix}

Modified: trunk/dports/x11/fox/Portfile
===================================================================
--- trunk/dports/x11/fox/Portfile	2009-01-18 19:52:04 UTC (rev 45602)
+++ trunk/dports/x11/fox/Portfile	2009-01-18 20:52:41 UTC (rev 45603)
@@ -4,6 +4,7 @@
 
 name                fox
 version             1.6.34
+revision            1
 description         The FOX GUI toolkit
 long_description    FOX is a C++ based Toolkit for developing Graphical \
                     User Interfaces easily and effectively.
@@ -24,9 +25,9 @@
 	port:tiff \
 	port:libpng \
 	port:jpeg \
-	lib:libXcursor.1:xorg-libXcursor \
-	lib:libXft.2:Xft2 \
-	lib:libXrandr.2:xorg-libXrandr \
+	port:xorg-libXcursor \
+	port:Xft2 \
+	port:xorg-libXrandr \
 	port:freetype
 
 configure.cppflags-append	"-I${x11prefix}/include"

Modified: trunk/dports/x11/fslsfonts/Portfile
===================================================================
--- trunk/dports/x11/fslsfonts/Portfile	2009-01-18 19:52:04 UTC (rev 45602)
+++ trunk/dports/x11/fslsfonts/Portfile	2009-01-18 20:52:41 UTC (rev 45603)
@@ -3,6 +3,7 @@
 PortSystem          1.0
 name                fslsfonts
 version             1.0.2
+revision            1
 categories          x11 graphics
 maintainers         blb openmaintainer
 description         List fonts served by X11 font server
@@ -20,7 +21,7 @@
 
 depends_build       port:pkgconfig
 
-depends_lib         lib:libFS:xorg-libFS lib:libX11:xorg-libX11
+depends_lib         port:xorg-libFS port:xorg-libX11
 
 livecheck.check     regex
 livecheck.regex     ${name}-(\[\\d.\]+)${extract.suffix}

Modified: trunk/dports/x11/fstobdf/Portfile
===================================================================
--- trunk/dports/x11/fstobdf/Portfile	2009-01-18 19:52:04 UTC (rev 45602)
+++ trunk/dports/x11/fstobdf/Portfile	2009-01-18 20:52:41 UTC (rev 45603)
@@ -3,6 +3,7 @@
 PortSystem          1.0
 name                fstobdf
 version             1.0.3
+revision            1
 categories          x11 graphics
 maintainers         blb openmaintainer
 description         Convert font from X11 server to BDF
@@ -24,7 +25,7 @@
 
 depends_build       port:pkgconfig
 
-depends_lib         lib:libX11.6:xorg-libX11 lib:libFS:xorg-libFS
+depends_lib         port:xorg-libX11 port:xorg-libFS
 
 livecheck.check     regex
 livecheck.regex     ${name}-(\[\\d.\]+)${extract.suffix}

Modified: trunk/dports/x11/fvwm/Portfile
===================================================================
--- trunk/dports/x11/fvwm/Portfile	2009-01-18 19:52:04 UTC (rev 45602)
+++ trunk/dports/x11/fvwm/Portfile	2009-01-18 20:52:41 UTC (rev 45603)
@@ -3,7 +3,7 @@
 PortSystem 1.0
 name		fvwm
 version		1.24r
-revision	2
+revision	3
 description	A very simple window manager supporting a pager
 
 long_description One of the earlier paging window managers with what is still considered to be a very elegant and minimal feature set yet highly configurable and expandable via plug-ins.
@@ -25,8 +25,8 @@
 	bin:xmkmf:imake
 
 depends_lib \
-	lib:libXext.6:xorg-libXext \
-	lib:libXpm.4:xpm
+	port:xorg-libXext \
+	port:xpm
 
 destroot.destdir \
 	DESTDIR=${destroot} \

Modified: trunk/dports/x11/fvwm2/Portfile
===================================================================
--- trunk/dports/x11/fvwm2/Portfile	2009-01-18 19:52:04 UTC (rev 45602)
+++ trunk/dports/x11/fvwm2/Portfile	2009-01-18 20:52:41 UTC (rev 45603)
@@ -2,6 +2,7 @@
 PortSystem			1.0
 name				fvwm2
 version				2.5.21
+revision                        1
 description			Version 2.x of FVWM, an X11 window manager.
 long_description	FVWM 2.x is an extremely powerful ICCCM-compliant multiple virtual \
 					desktop window manager for the X Window system.
@@ -25,10 +26,10 @@
 	port:libtool
 
 depends_lib \
-	lib:libSM.6:xorg-libsm \
-	lib:libXft.2:Xft2 \
-	lib:libXinerama.1:xorg-libXinerama \
-	lib:libXpm.4:xpm \
+	port:xorg-libsm \
+	port:Xft2 \
+	port:xorg-libXinerama \
+	port:xpm \
 	port:libpng \
 	port:gtk1 \
 	port:readline \

Modified: trunk/dports/x11/glw/Portfile
===================================================================
--- trunk/dports/x11/glw/Portfile	2009-01-18 19:52:04 UTC (rev 45602)
+++ trunk/dports/x11/glw/Portfile	2009-01-18 20:52:41 UTC (rev 45603)
@@ -4,6 +4,7 @@
 
 name		glw
 version		7.2
+revision        1
 categories	x11 devel graphics
 maintainers	css
 description	Mesa OpenGL widget library
@@ -22,7 +23,7 @@
 
 universal_variant no
 
-depends_lib	lib:libSM.6:xorg-libsm \
+depends_lib	port:xorg-libsm \
 		lib:libXm:openmotif
 
 post-extract	{ file mkdir "${worksrcpath}/lib" }

Modified: trunk/dports/x11/grace/Portfile
===================================================================
--- trunk/dports/x11/grace/Portfile	2009-01-18 19:52:04 UTC (rev 45602)
+++ trunk/dports/x11/grace/Portfile	2009-01-18 20:52:41 UTC (rev 45603)
@@ -5,7 +5,7 @@
 
 name			    grace
 version			    5.1.22
-revision		    2
+revision		    3
 categories		    x11 math science print
 platforms		    darwin
 maintainers		    nomaintainer
@@ -27,9 +27,9 @@
                     rmd160 ca7b1abe240de7cd3dbdc52d5182020c410b9772 
 
 depends_lib \
-	lib:libXmu.6:xorg-libXmu \
-	lib:libXp.6:xorg-libXp \
-	lib:libXpm.4:xpm \
+	port:xorg-libXmu \
+	port:xorg-libXp \
+	port:xpm \
 	port:libpng \
 	lib:libXm:openmotif \
 	port:pdflib \

Modified: trunk/dports/x11/gtk1/Portfile
===================================================================
--- trunk/dports/x11/gtk1/Portfile	2009-01-18 19:52:04 UTC (rev 45602)
+++ trunk/dports/x11/gtk1/Portfile	2009-01-18 20:52:41 UTC (rev 45603)
@@ -5,7 +5,7 @@
 
 name		gtk1
 version		1.2.10
-revision	7
+revision	8
 categories	x11
 maintainers	nomaintainer
 description	Gimp Tool Kit
@@ -28,7 +28,7 @@
 		ltmain13 md5 e094ae92724c4015dbab97de151c2525
 extract.only	${filename}
 
-depends_lib	port:gettext port:glib1 lib:libXext.6:xorg-libXext
+depends_lib	port:gettext port:glib1 port:xorg-libXext
 
 patchfiles	patch-config.guess patch-config.sub \
 			patch-gtk.m4.diff

Modified: trunk/dports/x11/gtk2/Portfile
===================================================================
--- trunk/dports/x11/gtk2/Portfile	2009-01-18 19:52:04 UTC (rev 45602)
+++ trunk/dports/x11/gtk2/Portfile	2009-01-18 20:52:41 UTC (rev 45603)
@@ -5,6 +5,7 @@
 
 name            gtk2
 version         2.14.7
+revision        1
 set branch      [join [lrange [split ${version} .] 0 1] .]
 categories      x11
 maintainers     nox openmaintainer
@@ -130,16 +131,14 @@
 
 variant x11 conflicts quartz description {Enable rendering in X11 (default)} {
     depends_lib-append \
-        lib:libXi.6:xorg-libXi \
-        lib:libXrandr.2:xorg-libXrandr \
-        lib:libXcursor.1:xorg-libXcursor \
-        lib:libXinerama.1:xorg-libXinerama
+        port:xorg-libXi \
+        port:xorg-libXrandr \
+        port:xorg-libXcursor \
+        port:xorg-libXinerama \
+        port:xorg-libXdamage \
+        port:xorg-libXcomposite \
+        port:xorg-libXfixes
 
-        # Leaving these out to avoid pulling them in on Tiger and triggering X11 library conflicts between macports and ${x11prefix}
-        #lib:libXdamage.1:xorg-libXdamage \
-        #lib:libXcomposite.1:xorg-libXcomposite \
-        #lib:libXfixes.3:xorg-libXfixes \
-
     configure.args-append      --with-xinput --enable-xinerama
 
     # This block helps us link correctly and setup our pc files correctly when we are

Modified: trunk/dports/x11/gtk28/Portfile
===================================================================
--- trunk/dports/x11/gtk28/Portfile	2009-01-18 19:52:04 UTC (rev 45602)
+++ trunk/dports/x11/gtk28/Portfile	2009-01-18 20:52:41 UTC (rev 45603)
@@ -3,6 +3,7 @@
 PortSystem 1.0
 name		gtk28
 version		2.8.20
+revision        1
 categories	x11
 maintainers	nomaintainer
 description	Gimp ToolKit version 2
@@ -24,7 +25,7 @@
 use_bzip2	yes
 
 depends_lib	path:lib/pkgconfig/glib-2.0.pc:glib2 port:tiff port:libpng port:atk path:lib/pkgconfig/pango.pc:pango \
-		port:gettext lib:libX11.6:XFree86
+		port:gettext port:xorg-libs
 
 configure.ldflags-append	"-lpango-1.0"
 configure.cppflags-append	"-no-cpp-precomp -DX_LOCALE"

Modified: trunk/dports/x11/iceauth/Portfile
===================================================================
--- trunk/dports/x11/iceauth/Portfile	2009-01-18 19:52:04 UTC (rev 45602)
+++ trunk/dports/x11/iceauth/Portfile	2009-01-18 20:52:41 UTC (rev 45603)
@@ -3,6 +3,7 @@
 PortSystem          1.0
 name                iceauth
 version             1.0.2
+revision            1
 categories          x11
 maintainers         blb openmaintainer
 description         ICE authority file utility
@@ -25,7 +26,7 @@
 
 depends_build       port:pkgconfig
 
-depends_lib         lib:libICE.6:xorg-libice
+depends_lib         port:xorg-libice
 
 livecheck.check     regex
 livecheck.regex     ${name}-(\[\\d.\]+)${extract.suffix}

Modified: trunk/dports/x11/icewm/Portfile
===================================================================
--- trunk/dports/x11/icewm/Portfile	2009-01-18 19:52:04 UTC (rev 45602)
+++ trunk/dports/x11/icewm/Portfile	2009-01-18 20:52:41 UTC (rev 45603)
@@ -4,6 +4,7 @@
 
 name        icewm
 version     1.2.32
+revision    1
 categories  x11 x11-wm
 maintainers saispo at macports.org
 platforms   darwin
@@ -19,17 +20,17 @@
 patchfiles  01-fix_leopard_deprecated_in_stdlib.patch
 
 depends_lib \
-        lib:libICE.6:xorg-libice \
-        lib:libSM.6:xorg-libsm \
-        lib:libX11.6:xorg-libX11 \
-        lib:libXau.6:xorg-libXau \
-        lib:libXdmcp.6:xorg-libXdmcp \
-        lib:libXext.6:xorg-libXext \
-        lib:libXft.2:Xft2 \
-        lib:libXinerama.1:xorg-libXinerama \
-        lib:libXpm.4:xpm \
-        lib:libXrandr.2:xorg-libXrandr \
-        lib:libXrender.1:xrender \
+        port:xorg-libice \
+        port:xorg-libsm \
+        port:xorg-libX11 \
+        port:xorg-libXau \
+        port:xorg-libXdmcp \
+        port:xorg-libXext \
+        port:Xft2 \
+        port:xorg-libXinerama \
+        port:xpm \
+        port:xorg-libXrandr \
+        port:xrender \
         port:fontconfig \
         port:freetype
 

Modified: trunk/dports/x11/ico/Portfile
===================================================================
--- trunk/dports/x11/ico/Portfile	2009-01-18 19:52:04 UTC (rev 45602)
+++ trunk/dports/x11/ico/Portfile	2009-01-18 20:52:41 UTC (rev 45603)
@@ -3,6 +3,7 @@
 PortSystem          1.0
 name                ico
 version             1.0.2
+revision            1
 categories          x11 graphics
 maintainers         blb openmaintainer
 description         Animate an icosahedron or other polyhedron
@@ -24,7 +25,7 @@
 
 depends_build       port:pkgconfig
 
-depends_lib         lib:libX11.6:xorg-libX11
+depends_lib         port:xorg-libX11
 
 livecheck.check     regex
 livecheck.regex     ${name}-(\[\\d.\]+)${extract.suffix}

Modified: trunk/dports/x11/keylaunch/Portfile
===================================================================
--- trunk/dports/x11/keylaunch/Portfile	2009-01-18 19:52:04 UTC (rev 45602)
+++ trunk/dports/x11/keylaunch/Portfile	2009-01-18 20:52:41 UTC (rev 45603)
@@ -3,6 +3,7 @@
 PortSystem 1.0
 name	 	keylaunch	
 version	       	1.3.6
+revision        1
 description	KeyLaunch is a small utility for binding commands to a hot key.	
 long_description	${description}
 homepage	http://www.oroborus.org/
@@ -21,7 +22,7 @@
 	port:pkgconfig
 
 depends_lib \
-	lib:libX11.6:xorg-libX11
+	port:xorg-libX11
 
 configure.args-append INSTALL=${prefix}/bin/ginstall
 

Modified: trunk/dports/x11/kinput2-macim/Portfile
===================================================================
--- trunk/dports/x11/kinput2-macim/Portfile	2009-01-18 19:52:04 UTC (rev 45602)
+++ trunk/dports/x11/kinput2-macim/Portfile	2009-01-18 20:52:41 UTC (rev 45603)
@@ -4,7 +4,7 @@
 
 name            kinput2-macim
 version         3.1.20050629
-revision        3
+revision        4
 categories      x11 japanese
 maintainers     takanori openmaintainer
 description     Input server for easy input of Japanese text, using Kotoeri
@@ -41,7 +41,7 @@
                                                      sha1 d015835436a29807d8d72bca5e50a84bd0eb9395 \
                                                      rmd160 20a1788f2464dffaa74fc075d8f54ddbd9358e53
 
-depends_lib     lib:libX11.6:XFree86
+depends_lib     port:xorg-libs
 depends_build	bin:xmkmf:imake
 
 pre-fetch {

Modified: trunk/dports/x11/lesstif/Portfile
===================================================================
--- trunk/dports/x11/lesstif/Portfile	2009-01-18 19:52:04 UTC (rev 45602)
+++ trunk/dports/x11/lesstif/Portfile	2009-01-18 20:52:41 UTC (rev 45603)
@@ -3,7 +3,7 @@
 PortSystem 1.0
 name		lesstif
 version		0.95.0
-revision        2
+revision        3
 categories	x11
 maintainers	lomion at mac.com
 description 	An Open Source implementation of OSF/Motif.
@@ -22,14 +22,14 @@
 	port:libtool
 
 depends_lib \
-        lib:libICE.6:xorg-libice \
-        lib:libSM.6:xorg-libsm \
-        lib:libX11.6:xorg-libX11 \
-        lib:libXau.6:xorg-libXau \
-        lib:libXdmcp.6:xorg-libXdmcp \
-        lib:libXext.6:xorg-libXext \
-        lib:libXp.6:xorg-libXp \
-        lib:libXt.6:xorg-libXt
+        port:xorg-libice \
+        port:xorg-libsm \
+        port:xorg-libX11 \
+        port:xorg-libXau \
+        port:xorg-libXdmcp \
+        port:xorg-libXext \
+        port:xorg-libXp \
+        port:xorg-libXt
 
 variant motif12	{ configure.args-append --enable-build-12 }
 variant motif20	{ configure.args-append --enable-build-20 }

Modified: trunk/dports/x11/listres/Portfile
===================================================================
--- trunk/dports/x11/listres/Portfile	2009-01-18 19:52:04 UTC (rev 45602)
+++ trunk/dports/x11/listres/Portfile	2009-01-18 20:52:41 UTC (rev 45603)
@@ -3,6 +3,7 @@
 PortSystem          1.0
 name                listres
 version             1.0.1
+revision            1
 categories          x11 graphics
 maintainers         blb openmaintainer
 description         List resources in X11 widgets
@@ -25,7 +26,7 @@
 
 depends_build       port:pkgconfig
 
-depends_lib         lib:libXaw:xorg-libXaw
+depends_lib         port:xorg-libXaw
 
 configure.args      --mandir=${prefix}/share/man --disable-xprint
 

Modified: trunk/dports/x11/luit/Portfile
===================================================================
--- trunk/dports/x11/luit/Portfile	2009-01-18 19:52:04 UTC (rev 45602)
+++ trunk/dports/x11/luit/Portfile	2009-01-18 20:52:41 UTC (rev 45603)
@@ -4,6 +4,7 @@
 
 name                luit
 version             1.0.3
+revision            1
 categories          x11
 platforms           darwin
 maintainers         jeremyhu
@@ -26,8 +27,8 @@
 	port:pkgconfig
 
 depends_lib \
-	lib:libX11.6:xorg-libX11 \
-	lib:libfontenc.1:xorg-libfontenc
+	port:xorg-libX11 \
+	port:xorg-libfontenc
 
 livecheck.check regex
 livecheck.url   [lindex ${master_sites} 0]?C=M&O=D

Modified: trunk/dports/x11/mesa/Portfile
===================================================================
--- trunk/dports/x11/mesa/Portfile	2009-01-18 19:52:04 UTC (rev 45602)
+++ trunk/dports/x11/mesa/Portfile	2009-01-18 20:52:41 UTC (rev 45603)
@@ -4,6 +4,7 @@
 
 name                mesa
 version             7.2
+revision            1
 categories          x11 graphics
 maintainers         jeremyhu andrea.damore
 description         Mesa 3D Graphics Library
@@ -31,7 +32,7 @@
 	port:xorg-glproto
 
 depends_lib \
-	lib:libXext.6:xorg-libXext
+	port:xorg-libXext
 
 use_configure  no
 

Modified: trunk/dports/x11/mkfontscale/Portfile
===================================================================
--- trunk/dports/x11/mkfontscale/Portfile	2009-01-18 19:52:04 UTC (rev 45602)
+++ trunk/dports/x11/mkfontscale/Portfile	2009-01-18 20:52:41 UTC (rev 45603)
@@ -4,6 +4,7 @@
 
 name                mkfontscale
 version             1.0.6
+revision            1
 categories          x11
 platforms           darwin
 maintainers         jeremyhu
@@ -28,7 +29,7 @@
 	port:xorg-xproto
 
 depends_lib \
-	lib:libfontenc.1:xorg-libfontenc \
+	port:xorg-libfontenc \
 	port:freetype \
 	port:bzip2 \
 	port:zlib

Modified: trunk/dports/x11/mlterm/Portfile
===================================================================
--- trunk/dports/x11/mlterm/Portfile	2009-01-18 19:52:04 UTC (rev 45602)
+++ trunk/dports/x11/mlterm/Portfile	2009-01-18 20:52:41 UTC (rev 45603)
@@ -5,6 +5,7 @@
 
 name				mlterm
 version				2.9.4
+revision                        1
 categories			x11
 maintainers			nomaintainer
 description			Multi-lingual X11 terminal emulator
@@ -32,8 +33,8 @@
 depends_build \
 	port:autoconf
 depends_lib \
-	lib:libSM.6:xorg-libsm \
-	lib:libXft.2:Xft2
+	port:xorg-libsm \
+	port:Xft2
 
 use_autoconf		yes
 

Modified: trunk/dports/x11/mrxvt/Portfile
===================================================================
--- trunk/dports/x11/mrxvt/Portfile	2009-01-18 19:52:04 UTC (rev 45602)
+++ trunk/dports/x11/mrxvt/Portfile	2009-01-18 20:52:41 UTC (rev 45603)
@@ -4,6 +4,7 @@
 
 name                mrxvt
 version             0.5.3
+revision            1
 categories          x11
 platforms           darwin
 maintainers         boeyms openmaintainer
@@ -29,9 +30,9 @@
                         sha1    303de6d33aa76892f24c6fac7b93ac21a945fda5 \
                         rmd160  0b05e382fe8736617961d8790786ba0341945caf
 depends_lib \
-	lib:libSM.6:xorg-libsm \
-	lib:libXft.2:Xft2 \
-	lib:libXpm.4:xpm \
+	port:xorg-libsm \
+	port:Xft2 \
+	port:xpm \
 	port:libpng \
 	port:ncurses
 configure.args      --mandir=${prefix}/share/man \

Modified: trunk/dports/x11/neXtaw/Portfile
===================================================================
--- trunk/dports/x11/neXtaw/Portfile	2009-01-18 19:52:04 UTC (rev 45602)
+++ trunk/dports/x11/neXtaw/Portfile	2009-01-18 20:52:41 UTC (rev 45603)
@@ -2,6 +2,7 @@
 PortSystem 1.0
 name		neXtaw
 version		0.15.1
+revision        1
 description	A replacement library for the Athena (libXaw) widget set.
 long_description   	neXtaw is a replacement library for the \
 			Athena (libXaw) widget set. It is based on Xaw3d, \
@@ -21,7 +22,7 @@
 	port:libtool
 
 depends_lib \
-	lib:libXmu.6:xorg-libXmu
+	port:xorg-libXmu
 
 use_autoreconf yes
 autoreconf.args -fvi

Modified: trunk/dports/x11/oclock/Portfile
===================================================================
--- trunk/dports/x11/oclock/Portfile	2009-01-18 19:52:04 UTC (rev 45602)
+++ trunk/dports/x11/oclock/Portfile	2009-01-18 20:52:41 UTC (rev 45603)
@@ -3,6 +3,7 @@
 PortSystem          1.0
 name                oclock
 version             1.0.1
+revision            1
 categories          x11
 maintainers         blb openmaintainer
 description         Round X11 clock
@@ -21,7 +22,7 @@
 
 depends_build       port:pkgconfig
 
-depends_lib         lib:libXmu.6:xorg-libXmu
+depends_lib         port:xorg-libXmu
 
 configure.args      --mandir=${prefix}/share/man
 

Modified: trunk/dports/x11/openbox/Portfile
===================================================================
--- trunk/dports/x11/openbox/Portfile	2009-01-18 19:52:04 UTC (rev 45602)
+++ trunk/dports/x11/openbox/Portfile	2009-01-18 20:52:41 UTC (rev 45603)
@@ -4,6 +4,7 @@
 
 name		openbox
 version		3.4.5
+revision        1
 categories	x11
 maintainers	afb at macports.org openmaintainer
 platforms	darwin freebsd linux
@@ -21,10 +22,10 @@
 	port:pkgconfig
 
 depends_lib \
-	lib:libSM.6:xorg-libsm \
-	lib:libXcursor.1:xorg-libXcursor \
-	lib:libXinerama.1:xorg-libXinerama \
-	lib:libXrandr.2:xorg-libXrandr \
+	port:xorg-libsm \
+	port:xorg-libXcursor \
+	port:xorg-libXinerama \
+	port:xorg-libXrandr \
 	path:lib/pkgconfig/pango.pc:pango \
 	port:libxml2 \
 	port:startup-notification

Modified: trunk/dports/x11/openmotif/Portfile
===================================================================
--- trunk/dports/x11/openmotif/Portfile	2009-01-18 19:52:04 UTC (rev 45602)
+++ trunk/dports/x11/openmotif/Portfile	2009-01-18 20:52:41 UTC (rev 45603)
@@ -4,6 +4,7 @@
 
 name            openmotif
 version         2.3.1-1
+revision        1
 set branch      [join [lrange [split ${version} .] 0 1] .]
 set subdir      [lindex [split ${version} -] 0]
 worksrcdir      ${name}-${subdir}
@@ -32,12 +33,12 @@
 	port:jpeg \
 	port:libpng \
 	port:libiconv \
-	lib:libSM.6:xorg-libsm \
-	lib:libXext.6:xorg-libXext \
-	lib:libXft.2:Xft2 \
-	lib:libXmu.6:xorg-libXmu \
-	lib:libXp.6:xorg-libXp \
-	lib:libXt.6:xorg-libXt
+	port:xorg-libsm \
+	port:xorg-libXext \
+	port:Xft2 \
+	port:xorg-libXmu \
+	port:xorg-libXp \
+	port:xorg-libXt
 
 patchfiles      patch-demos-programs-peridoc-Makefile.in.diff \
                 patch-lib-Mrm-Makefile.in.diff

Modified: trunk/dports/x11/oroborus/Portfile
===================================================================
--- trunk/dports/x11/oroborus/Portfile	2009-01-18 19:52:04 UTC (rev 45602)
+++ trunk/dports/x11/oroborus/Portfile	2009-01-18 20:52:41 UTC (rev 45603)
@@ -3,6 +3,7 @@
 PortSystem 1.0
 name	 	oroborus	
 version	        2.0.18
+revision        1
 description	Oroborus basically is a really minimalistic window manager.
 long_description	Oroborus is a really minimalistic window manager.  It is highly configurable, small and mostly \
 			KDE and GNOME compatible.
@@ -15,7 +16,7 @@
 checksums	md5 d9b94935d6b904ddeadb9b83f2159565
 		# not verified -- upstream does not publish signatures!
 depends_lib \
-	lib:libSM.6:xorg-libsm \
-	lib:libXext.6:xorg-libXext \
-	lib:libXpm.4:xpm
+	port:xorg-libsm \
+	port:xorg-libXext \
+	port:xpm
 worksrcdir	${name}-${version}

Modified: trunk/dports/x11/pango/Portfile
===================================================================
--- trunk/dports/x11/pango/Portfile	2009-01-18 19:52:04 UTC (rev 45602)
+++ trunk/dports/x11/pango/Portfile	2009-01-18 20:52:41 UTC (rev 45603)
@@ -4,6 +4,7 @@
 
 name                    pango
 version                 1.22.4
+revision                1
 set branch              [join [lrange [split ${version} .] 0 1] .]
 categories              x11
 maintainers             ryandesign
@@ -31,7 +32,7 @@
 
 depends_lib \
     path:lib/pkgconfig/glib-2.0.pc:glib2 \
-    lib:libXft.2:Xft2 \
+    port:Xft2 \
     path:lib/pkgconfig/cairo.pc:cairo \
 
 patchfiles \
@@ -83,7 +84,7 @@
 
 variant no_x11 {
     depends_lib-delete \
-        lib:libXft.2:Xft2
+        port:Xft2
     configure.args-append \
         --without-x
 }

Modified: trunk/dports/x11/pango-devel/Portfile
===================================================================
--- trunk/dports/x11/pango-devel/Portfile	2009-01-18 19:52:04 UTC (rev 45602)
+++ trunk/dports/x11/pango-devel/Portfile	2009-01-18 20:52:41 UTC (rev 45603)
@@ -5,7 +5,7 @@
 name                    pango-devel
 set my_name             pango
 version                 1.21.6
-revision                1
+revision                2
 set branch              [join [lrange [split ${version} .] 0 1] .]
 categories              x11
 maintainers             ryandesign
@@ -35,7 +35,7 @@
 
 depends_lib \
     path:lib/pkgconfig/glib-2.0.pc:glib2 \
-    lib:libXft.2:Xft2 \
+    port:Xft2 \
     path:lib/pkgconfig/cairo.pc:cairo \
 
 patchfiles \
@@ -70,7 +70,7 @@
 
 variant no_x11 {
     depends_lib-delete \
-        lib:libXft.2:Xft2
+        port:Xft2
     configure.args-append \
         --without-x
 }

Modified: trunk/dports/x11/qt3/Portfile
===================================================================
--- trunk/dports/x11/qt3/Portfile	2009-01-18 19:52:04 UTC (rev 45602)
+++ trunk/dports/x11/qt3/Portfile	2009-01-18 20:52:41 UTC (rev 45603)
@@ -5,7 +5,7 @@
 PortSystem 1.0
 name		qt3
 version		3.3.8
-revision	3
+revision	4
 categories	x11
 maintainers	nomaintainer
 description	Qt Tool Kit
@@ -25,8 +25,8 @@
 		port:jpeg \
 		port:libpng \
 		path:bin/perl:perl5 \
-		lib:libXft.2:Xft2 \
-		lib:libXrender.1:xrender \
+		port:Xft2 \
+		port:xrender \
 		port:zlib
 
 checksums	${distname}.tar.bz2 md5 cf3c43a7dfde5bfb76f8001102fe6e85 \

Modified: trunk/dports/x11/qt4-x11/Portfile
===================================================================
--- trunk/dports/x11/qt4-x11/Portfile	2009-01-18 19:52:04 UTC (rev 45602)
+++ trunk/dports/x11/qt4-x11/Portfile	2009-01-18 20:52:41 UTC (rev 45603)
@@ -5,6 +5,7 @@
 
 name                qt4-x11
 version             4.4.3
+revision            1
 categories	        x11
 maintainers         mcalhoun
 homepage            http://www.trolltech.com/
@@ -41,10 +42,10 @@
     port:openssl                           \
     port:fontconfig                        \
     port:gettext                           \
-    lib:libXrender.1:xrender               \
-    lib:libSM.6:xorg-libsm                 \
-    lib:libXi.6:xorg-libXi                 \
-    lib:libXrandr.2:xorg-libXrandr         \
+    port:xrender               \
+    port:xorg-libsm                 \
+    port:xorg-libXi                 \
+    port:xorg-libXrandr         \
     port:gstreamer                         \
     port:gst-plugins-base                  \
     port:sqlite3

Modified: trunk/dports/x11/ratpoison/Portfile
===================================================================
--- trunk/dports/x11/ratpoison/Portfile	2009-01-18 19:52:04 UTC (rev 45602)
+++ trunk/dports/x11/ratpoison/Portfile	2009-01-18 20:52:41 UTC (rev 45603)
@@ -4,6 +4,7 @@
 
 name		ratpoison
 version		1.4.3
+revision        1
 categories	x11 x11-wm
 platforms	darwin
 maintainers	pmq
@@ -30,6 +31,6 @@
 		rmd160 f17f3db64cb11758e76c875cf1743931a0c623ec
 
 depends_lib \
-	lib:libXinerama.1:xorg-libXinerama \
-	lib:libXtst.6:xorg-libXtst
+	port:xorg-libXinerama \
+	port:xorg-libXtst
 configure.args	--mandir=${prefix}/share/man --infodir=${prefix}/share/info

Modified: trunk/dports/x11/rxvt/Portfile
===================================================================
--- trunk/dports/x11/rxvt/Portfile	2009-01-18 19:52:04 UTC (rev 45602)
+++ trunk/dports/x11/rxvt/Portfile	2009-01-18 20:52:41 UTC (rev 45603)
@@ -3,7 +3,7 @@
 PortSystem 1.0
 name		rxvt
 version		2.7.10
-revision	1
+revision	2
 categories	x11
 maintainers	nomaintainer
 description	Low memory usage colour xterm replacement
@@ -15,7 +15,7 @@
 platforms	darwin
 
 depends_lib \
-	lib:libXpm.4:xpm
+	port:xpm
 
 master_sites	sourceforge
 checksums	md5 302c5c455e64047b02d1ef19ff749141

Modified: trunk/dports/x11/rxvt-unicode/Portfile
===================================================================
--- trunk/dports/x11/rxvt-unicode/Portfile	2009-01-18 19:52:04 UTC (rev 45602)
+++ trunk/dports/x11/rxvt-unicode/Portfile	2009-01-18 20:52:41 UTC (rev 45603)
@@ -13,7 +13,7 @@
 
 name            rxvt-unicode
 version         9.06
-revision        1
+revision        2
 categories      x11
 maintainers     nomaintainer
 description     Unicode-aware rxvt clone.
@@ -38,7 +38,7 @@
 	port:pkgconfig
 
 depends_lib \
-	lib:libXft.2:Xft2 \
+	port:Xft2 \
 	port:expat \
 	port:ncursesw \
 	path:bin/perl:perl5 \

Modified: trunk/dports/x11/setxkbmap/Portfile
===================================================================
--- trunk/dports/x11/setxkbmap/Portfile	2009-01-18 19:52:04 UTC (rev 45602)
+++ trunk/dports/x11/setxkbmap/Portfile	2009-01-18 20:52:41 UTC (rev 45603)
@@ -3,6 +3,7 @@
 PortSystem          1.0
 name                setxkbmap
 version             1.0.4
+revision            1
 categories          x11
 maintainers         blb openmaintainer
 description         Set the keyboard using the X11 keyboard extension
@@ -22,7 +23,7 @@
 
 depends_build       port:pkgconfig
 
-depends_lib         lib:libxkbfile.1:xorg-libxkbfile
+depends_lib         port:xorg-libxkbfile
 
 livecheck.check     regex
 livecheck.regex     ${name}-(\[\\d.\]+)${extract.suffix}

Modified: trunk/dports/x11/showfont/Portfile
===================================================================
--- trunk/dports/x11/showfont/Portfile	2009-01-18 19:52:04 UTC (rev 45602)
+++ trunk/dports/x11/showfont/Portfile	2009-01-18 20:52:41 UTC (rev 45603)
@@ -3,6 +3,7 @@
 PortSystem          1.0
 name                showfont
 version             1.0.2
+revision            1
 categories          x11 graphics
 maintainers         blb openmaintainer
 description         Font dumper for X11 font server
@@ -23,7 +24,7 @@
 
 depends_build       port:pkgconfig
 
-depends_lib         lib:libFS.6:xorg-libFS
+depends_lib         port:xorg-libFS
 
 livecheck.check     regex
 livecheck.regex     ${name}-(\[\\d.\]+)${extract.suffix}

Modified: trunk/dports/x11/tightvnc/Portfile
===================================================================
--- trunk/dports/x11/tightvnc/Portfile	2009-01-18 19:52:04 UTC (rev 45602)
+++ trunk/dports/x11/tightvnc/Portfile	2009-01-18 20:52:41 UTC (rev 45603)
@@ -3,6 +3,7 @@
 
 name			tightvnc
 version			1.3.9
+revision                1
 categories		x11 vnc
 maintainers		nomaintainer
 description		Enhanced version of VNC
@@ -21,8 +22,8 @@
 platforms		darwin
 
 depends_lib \
-	lib:libXaw:xorg-libXaw \
-	lib:libXp.6:xorg-libXp \
+	port:xorg-libXaw \
+	port:xorg-libXp \
 	port:jpeg \
 	port:zlib
 

Modified: trunk/dports/x11/tk/Portfile
===================================================================
--- trunk/dports/x11/tk/Portfile	2009-01-18 19:52:04 UTC (rev 45602)
+++ trunk/dports/x11/tk/Portfile	2009-01-18 20:52:41 UTC (rev 45603)
@@ -4,6 +4,7 @@
 
 name            tk
 version         8.5.6
+revision        1
 categories      x11
 maintainers     mww openmaintainer
 description     Tcl Tool Kit
@@ -34,8 +35,8 @@
 # force usage of MacPorts Tcl
 depends_lib \
 	port:tcl \
-	lib:libXft.2:Xft2 \
-	lib:libXss.1:xorg-libXScrnSaver
+	port:Xft2 \
+	port:xorg-libXScrnSaver
 
 post-patch {
     reinplace s|@TCL_SRC_DIR@|${worksrcpath}/../../tcl${version}/|g ${worksrcpath}/Makefile.in

Modified: trunk/dports/x11/twm/Portfile
===================================================================
--- trunk/dports/x11/twm/Portfile	2009-01-18 19:52:04 UTC (rev 45602)
+++ trunk/dports/x11/twm/Portfile	2009-01-18 20:52:41 UTC (rev 45603)
@@ -3,6 +3,7 @@
 PortSystem          1.0
 name                twm
 version             1.0.4
+revision            1
 categories          x11 x11-wm
 maintainers         blb openmaintainer
 description         Tab Window Manager for X11
@@ -24,7 +25,7 @@
 
 depends_build       port:pkgconfig
 
-depends_lib         lib:libXmu.6:xorg-libXmu
+depends_lib         port:xorg-libXmu
 
 livecheck.check     regex
 livecheck.regex     ${name}-(\[\\d.\]+)${extract.suffix}

Modified: trunk/dports/x11/unclutter/Portfile
===================================================================
--- trunk/dports/x11/unclutter/Portfile	2009-01-18 19:52:04 UTC (rev 45602)
+++ trunk/dports/x11/unclutter/Portfile	2009-01-18 20:52:41 UTC (rev 45603)
@@ -3,6 +3,7 @@
 PortSystem			1.0
 name				unclutter
 version				8
+revision                        1
 categories			x11
 maintainers			nomaintainer
 description			Hides the cursor in X after a period of inactivity
@@ -19,7 +20,7 @@
 checksums			md5 1fe32cab8dd765263679618f8704117f
 
 depends_lib \
-	lib:libX11.6:xorg-libX11
+	port:xorg-libX11
 
 worksrcdir			${name}
 

Modified: trunk/dports/x11/viewres/Portfile
===================================================================
--- trunk/dports/x11/viewres/Portfile	2009-01-18 19:52:04 UTC (rev 45602)
+++ trunk/dports/x11/viewres/Portfile	2009-01-18 20:52:41 UTC (rev 45603)
@@ -3,6 +3,7 @@
 PortSystem          1.0
 name                viewres
 version             1.0.1
+revision            1
 categories          x11 graphics
 maintainers         blb openmaintainer
 description         Graphical class browser for Xt
@@ -26,7 +27,7 @@
 
 depends_build       port:pkgconfig
 
-depends_lib         lib:libXaw:xorg-libXaw
+depends_lib         port:xorg-libXaw
 
 configure.args      --mandir=${prefix}/share/man --disable-xprint
 

Modified: trunk/dports/x11/vnc/Portfile
===================================================================
--- trunk/dports/x11/vnc/Portfile	2009-01-18 19:52:04 UTC (rev 45602)
+++ trunk/dports/x11/vnc/Portfile	2009-01-18 20:52:41 UTC (rev 45603)
@@ -3,7 +3,7 @@
 
 name			vnc
 version			3.3.7
-revision		2
+revision		3
 categories		x11 vnc
 maintainers		nomaintainer
 description		Remote display system for X11 applications
@@ -17,7 +17,7 @@
 checksums		md5 511ffbc8ed8d9df82e7c67852164728c
 platforms		darwin
 
-depends_lib		lib:libX11.6:XFree86 \
+depends_lib		port:xorg-libs \
 				lib:libz.1:zlib
 depends_run		bin:perl:perl5
 

Modified: trunk/dports/x11/vtwm/Portfile
===================================================================
--- trunk/dports/x11/vtwm/Portfile	2009-01-18 19:52:04 UTC (rev 45602)
+++ trunk/dports/x11/vtwm/Portfile	2009-01-18 20:52:41 UTC (rev 45603)
@@ -3,6 +3,7 @@
 PortSystem 1.0
 name		vtwm
 version		5.4.6b
+revision        1
 categories	x11
 maintainers	mdales at mac.com
 description	Twm with a virtual desktop and optional Motif-like features
@@ -18,13 +19,13 @@
 
 depends_build   bin:xmkmf:imake
 
-depends_lib	lib:libX11.6:xorg-libX11 \
-                lib:libXt.6:xorg-libXt \
-                lib:libSM.6:xorg-libsm \
-                lib:libICE.6:xorg-libice \
-                lib:libXext.6:xorg-libXext \
-                lib:libXpm.4:xpm \
-                lib:libXmu.6:xorg-libXmu
+depends_lib	port:xorg-libX11 \
+                port:xorg-libXt \
+                port:xorg-libsm \
+                port:xorg-libice \
+                port:xorg-libXext \
+                port:xpm \
+                port:xorg-libXmu
 
 build.target-append DESTDIR=${destroot} \
                     BINDIR=${prefix}/bin \

Modified: trunk/dports/x11/windowmaker/Portfile
===================================================================
--- trunk/dports/x11/windowmaker/Portfile	2009-01-18 19:52:04 UTC (rev 45602)
+++ trunk/dports/x11/windowmaker/Portfile	2009-01-18 20:52:41 UTC (rev 45603)
@@ -2,7 +2,7 @@
 PortSystem 1.0
 name		windowmaker
 version		0.92.0
-revision    2
+revision        3
 maintainers	nomaintainer
 categories	x11 x11-wm
 platforms	darwin freebsd
@@ -33,10 +33,10 @@
 universal_variant no
 
 depends_lib \
-	lib:libSM.6:xorg-libsm \
-	lib:libXext.6:xorg-libXext \
-	lib:libXft.2:Xft2 \
-	lib:libXpm.4:xpm \
+	port:xorg-libsm \
+	port:xorg-libXext \
+	port:Xft2 \
+	port:xpm \
 	port:libpng \
 	port:gettext \
 	path:include/gif_lib.h:giflib \

Modified: trunk/dports/x11/wine/Portfile
===================================================================
--- trunk/dports/x11/wine/Portfile	2009-01-18 19:52:04 UTC (rev 45602)
+++ trunk/dports/x11/wine/Portfile	2009-01-18 20:52:41 UTC (rev 45603)
@@ -4,7 +4,7 @@
 
 name                    wine
 version                 1.0.1
-revision                1
+revision                2
 categories              x11
 maintainers             ryandesign jwa openmaintainer
 homepage                http://www.winehq.com/
@@ -41,12 +41,12 @@
     port:ncurses \
     port:openssl \
     port:zlib \
-    lib:libSM.6:xorg-libsm \
-    lib:libXcursor.1:xorg-libXcursor \
-    lib:libXi.6:xorg-libXi \
-    lib:libXinerama.1:xorg-libXinerama \
-    lib:libXrandr.2:xorg-libXrandr \
-    lib:libXxf86vm.1:xorg-libXxf86vm
+    port:xorg-libsm \
+    port:xorg-libXcursor \
+    port:xorg-libXi \
+    port:xorg-libXinerama \
+    port:xorg-libXrandr \
+    port:xorg-libXxf86vm
 
 depends_build \
     port:pkgconfig \

Modified: trunk/dports/x11/wine-devel/Portfile
===================================================================
--- trunk/dports/x11/wine-devel/Portfile	2009-01-18 19:52:04 UTC (rev 45602)
+++ trunk/dports/x11/wine-devel/Portfile	2009-01-18 20:52:41 UTC (rev 45603)
@@ -5,6 +5,7 @@
 name                    wine-devel
 set my_name             wine
 version                 1.1.13
+revision                1
 categories              x11
 maintainers             ryandesign jwa openmaintainer
 homepage                http://www.winehq.com/
@@ -42,12 +43,12 @@
     port:ncurses \
     port:openssl \
     port:zlib \
-    lib:libSM.6:xorg-libsm \
-    lib:libXcursor.1:xorg-libXcursor \
-    lib:libXi.6:xorg-libXi \
-    lib:libXinerama.1:xorg-libXinerama \
-    lib:libXrandr.2:xorg-libXrandr \
-    lib:libXxf86vm.1:xorg-libXxf86vm
+    port:xorg-libsm \
+    port:xorg-libXcursor \
+    port:xorg-libXi \
+    port:xorg-libXinerama \
+    port:xorg-libXrandr \
+    port:xorg-libXxf86vm
 
 depends_build \
     port:pkgconfig

Modified: trunk/dports/x11/wmcalclock/Portfile
===================================================================
--- trunk/dports/x11/wmcalclock/Portfile	2009-01-18 19:52:04 UTC (rev 45602)
+++ trunk/dports/x11/wmcalclock/Portfile	2009-01-18 20:52:41 UTC (rev 45603)
@@ -3,6 +3,7 @@
 PortSystem       1.0
 name             wmcalclock
 version          1.26
+revision         1
 categories       x11
 maintainers      nomaintainer
 description      WindowMaker clock docklet
@@ -11,7 +12,7 @@
 homepage         http://jmpacquet.free.fr/wmcalclock/
 platforms        darwin
 master_sites     http://jmpacquet.free.fr/wmcalclock/
-depends_lib      lib:libX11.6:XFree86
+depends_lib      port:xorg-libs
 checksums        md5 ea8df8a238cce22721eafbe2ea2b1ae7
 worksrcdir       ${distname}/Src
 patch {

Modified: trunk/dports/x11/wmclock/Portfile
===================================================================
--- trunk/dports/x11/wmclock/Portfile	2009-01-18 19:52:04 UTC (rev 45602)
+++ trunk/dports/x11/wmclock/Portfile	2009-01-18 20:52:41 UTC (rev 45603)
@@ -3,7 +3,7 @@
 PortSystem 1.0
 name		wmclock
 version		1.0.12.2
-revision	1
+revision	2
 categories	x11
 maintainers	nomaintainer
 description	A dockable clock applet
@@ -21,9 +21,9 @@
 
 depends_build   bin:xmkmf:imake
 depends_lib \
-        lib:libX11.6:xorg-libX11 \
-        lib:libXext.6:xorg-libXext \
-        lib:libXpm.4:xpm
+        port:xorg-libX11 \
+        port:xorg-libXext \
+        port:xpm
 
 destroot.target	install install.man
 

Modified: trunk/dports/x11/wmcube/Portfile
===================================================================
--- trunk/dports/x11/wmcube/Portfile	2009-01-18 19:52:04 UTC (rev 45602)
+++ trunk/dports/x11/wmcube/Portfile	2009-01-18 20:52:41 UTC (rev 45603)
@@ -3,6 +3,7 @@
 PortSystem       1.0
 name             wmcube
 version          0.98
+revision         1
 categories       x11
 maintainers      nomaintainer
 description      3D objects tumbling about representing CPU load.
@@ -15,8 +16,8 @@
 platforms        darwin
 master_sites     http://dockapps.org/download.php/id/222/
 depends_lib \
-	lib:libXext.6:xorg-libXext \
-	lib:libXpm.4:xpm
+	port:xorg-libXext \
+	port:xpm
 checksums        md5 efc6f484c53f0a98a76925a6e1a74cd3
 
 worksrcdir      ${name}/${name}

Modified: trunk/dports/x11/wmii/Portfile
===================================================================
--- trunk/dports/x11/wmii/Portfile	2009-01-18 19:52:04 UTC (rev 45602)
+++ trunk/dports/x11/wmii/Portfile	2009-01-18 20:52:41 UTC (rev 45603)
@@ -4,6 +4,7 @@
 
 name              wmii
 version           3.1
+revision          1
 categories        x11 x11-wm
 maintainers       nomaintainer
 
@@ -20,7 +21,7 @@
 
 universal_variant no
 depends_lib \
-	lib:libX11.6:xorg-libX11
+	port:xorg-libX11
 
 patch {
     reinplace "s|/usr/local|${prefix}|g" ${worksrcpath}/config.mk

Modified: trunk/dports/x11/x11perf/Portfile
===================================================================
--- trunk/dports/x11/x11perf/Portfile	2009-01-18 19:52:04 UTC (rev 45602)
+++ trunk/dports/x11/x11perf/Portfile	2009-01-18 20:52:41 UTC (rev 45603)
@@ -3,6 +3,7 @@
 PortSystem          1.0
 name                x11perf
 version             1.5
+revision            1
 categories          x11
 maintainers         blb openmaintainer
 description         X11 server performance test program
@@ -22,8 +23,8 @@
 
 depends_build       port:pkgconfig
 
-depends_lib         lib:libXext.6:xorg-libXext lib:libXft.2:Xft2 \
-                    lib:libXmuu.1:xorg-libXmu
+depends_lib         port:xorg-libXext port:Xft2 \
+                    port:xorg-libXmu
 
 livecheck.check     regex
 livecheck.regex     ${name}-(\[\\d.\]+)${extract.suffix}

Modified: trunk/dports/x11/xauth/Portfile
===================================================================
--- trunk/dports/x11/xauth/Portfile	2009-01-18 19:52:04 UTC (rev 45602)
+++ trunk/dports/x11/xauth/Portfile	2009-01-18 20:52:41 UTC (rev 45603)
@@ -4,7 +4,7 @@
 
 name                xauth
 version             1.0.3
-revision            0
+revision            1
 categories          x11
 platforms           darwin
 maintainers         jeremyhu
@@ -25,8 +25,8 @@
 	port:pkgconfig
 
 depends_lib \
-	lib:libXext.6:xorg-libXext \
-	lib:libXmuu.1:xorg-libXmu
+	port:xorg-libXext \
+	port:xorg-libXmu
 
 platform macosx {
 	if {${os.major} < 9 && ![file exists ${prefix}/lib/pkgconfig/xmuu.pc]} {

Modified: trunk/dports/x11/xcalc/Portfile
===================================================================
--- trunk/dports/x11/xcalc/Portfile	2009-01-18 19:52:04 UTC (rev 45602)
+++ trunk/dports/x11/xcalc/Portfile	2009-01-18 20:52:41 UTC (rev 45603)
@@ -3,6 +3,7 @@
 PortSystem          1.0
 name                xcalc
 version             1.0.2
+revision            1
 categories          x11 math science
 maintainers         blb openmaintainer
 description         Scientific calculator for X11
@@ -22,7 +23,7 @@
 
 depends_build       port:pkgconfig
 
-depends_lib         lib:libXaw:xorg-libXaw
+depends_lib         port:xorg-libXaw
 
 configure.args      --disable-xprint
 

Modified: trunk/dports/x11/xcb/Portfile
===================================================================
--- trunk/dports/x11/xcb/Portfile	2009-01-18 19:52:04 UTC (rev 45602)
+++ trunk/dports/x11/xcb/Portfile	2009-01-18 20:52:41 UTC (rev 45603)
@@ -4,6 +4,7 @@
 
 name             xcb
 version          2.4
+revision         1
 categories       x11
 maintainers      qbarnes at prairienet.org
 description      tool for managing X11 cut-buffers
@@ -24,13 +25,13 @@
 depends_build   bin:xmkmf:imake
 
 depends_lib \
-        lib:libXaw.7:xorg-libXaw \
-        lib:libXmu.6:xorg-libXmu \
-        lib:libXt.6:xorg-libXt \
-        lib:libSM.6:xorg-libSM \
-        lib:libICE.6:xorg-libICE \
-        lib:libXext.6:xorg-libXext \
-        lib:libX11.6:xorg-libX11
+        port:xorg-libXaw \
+        port:xorg-libXmu \
+        port:xorg-libXt \
+        port:xorg-libSM \
+        port:xorg-libICE \
+        port:xorg-libXext \
+        port:xorg-libX11
 
 destroot.destdir \
         DESTDIR=${destroot} \

Modified: trunk/dports/x11/xclipboard/Portfile
===================================================================
--- trunk/dports/x11/xclipboard/Portfile	2009-01-18 19:52:04 UTC (rev 45602)
+++ trunk/dports/x11/xclipboard/Portfile	2009-01-18 20:52:41 UTC (rev 45603)
@@ -3,6 +3,7 @@
 PortSystem          1.0
 name                xclipboard
 version             1.0.1
+revision            1
 categories          x11
 maintainers         blb openmaintainer
 description         X11 clipboard client
@@ -22,7 +23,7 @@
 
 depends_build       port:pkgconfig
 
-depends_lib         lib:libXaw:xorg-libXaw
+depends_lib         port:xorg-libXaw
 
 configure.args      --mandir=${prefix}/share/man --disable-xprint
 

Modified: trunk/dports/x11/xclock/Portfile
===================================================================
--- trunk/dports/x11/xclock/Portfile	2009-01-18 19:52:04 UTC (rev 45602)
+++ trunk/dports/x11/xclock/Portfile	2009-01-18 20:52:41 UTC (rev 45603)
@@ -3,6 +3,7 @@
 PortSystem          1.0
 name                xclock
 version             1.0.3
+revision            1
 categories          x11
 maintainers         blb openmaintainer
 description         Analog/digital clock for X11
@@ -22,8 +23,8 @@
 
 depends_build       port:pkgconfig
 
-depends_lib         lib:libXaw:xorg-libXaw lib:libXft.2:Xft2 \
-                    lib:libxkbfile.1:xorg-libxkbfile
+depends_lib         port:xorg-libXaw port:Xft2 \
+                    port:xorg-libxkbfile
 
 configure.args      --disable-xprint
 

Modified: trunk/dports/x11/xconsole/Portfile
===================================================================
--- trunk/dports/x11/xconsole/Portfile	2009-01-18 19:52:04 UTC (rev 45602)
+++ trunk/dports/x11/xconsole/Portfile	2009-01-18 20:52:41 UTC (rev 45603)
@@ -3,6 +3,7 @@
 PortSystem          1.0
 name                xconsole
 version             1.0.3
+revision            1
 categories          x11
 maintainers         blb openmaintainer
 description         Monitor system console messages with X11
@@ -22,7 +23,7 @@
 
 depends_build       port:pkgconfig
 
-depends_lib         lib:libXaw:xorg-libXaw
+depends_lib         port:xorg-libXaw
 
 configure.args      --disable-xprint
 

Modified: trunk/dports/x11/xcursorgen/Portfile
===================================================================
--- trunk/dports/x11/xcursorgen/Portfile	2009-01-18 19:52:04 UTC (rev 45602)
+++ trunk/dports/x11/xcursorgen/Portfile	2009-01-18 20:52:41 UTC (rev 45603)
@@ -3,6 +3,7 @@
 PortSystem          1.0
 name                xcursorgen
 version             1.0.2
+revision            1
 categories          x11
 maintainers         blb openmaintainer
 description         Create an X11 cursor file from a collection of PNG images
@@ -22,7 +23,7 @@
 
 depends_build       port:pkgconfig
 
-depends_lib         lib:libXcursor.1:xorg-libXcursor port:libpng
+depends_lib         port:xorg-libXcursor port:libpng
 
 livecheck.check     regex
 livecheck.regex     ${name}-(\[\\d.\]+)${extract.suffix}

Modified: trunk/dports/x11/xditview/Portfile
===================================================================
--- trunk/dports/x11/xditview/Portfile	2009-01-18 19:52:04 UTC (rev 45602)
+++ trunk/dports/x11/xditview/Portfile	2009-01-18 20:52:41 UTC (rev 45603)
@@ -3,6 +3,7 @@
 PortSystem          1.0
 name                xditview
 version             1.0.1
+revision            1
 categories          x11
 maintainers         blb openmaintainer
 description         Display ditroff output on an X11 display
@@ -20,7 +21,7 @@
 
 depends_build       port:pkgconfig
 
-depends_lib         lib:libXaw:xorg-libXaw
+depends_lib         port:xorg-libXaw
 
 configure.args      --mandir=${prefix}/share/man --disable-xprint
 

Modified: trunk/dports/x11/xdm/Portfile
===================================================================
--- trunk/dports/x11/xdm/Portfile	2009-01-18 19:52:04 UTC (rev 45602)
+++ trunk/dports/x11/xdm/Portfile	2009-01-18 20:52:41 UTC (rev 45603)
@@ -3,6 +3,7 @@
 PortSystem          1.0
 name                xdm
 version             1.1.8
+revision            1
 categories          x11
 maintainers         blb openmaintainer
 description         X11 display manager with support for XDMCP, host chooser
@@ -22,8 +23,8 @@
 
 depends_build       port:pkgconfig
 
-depends_lib         lib:libXinerama.1:xorg-libXinerama \
-                    lib:libXmu.6:xorg-libXmu lib:libXpm.4:xpm
+depends_lib         port:xorg-libXinerama \
+                    port:xorg-libXmu port:xpm
 
 livecheck.check     regex
 livecheck.regex     ${name}-(\[\\d.\]+)${extract.suffix}

Modified: trunk/dports/x11/xdpyinfo/Portfile
===================================================================
--- trunk/dports/x11/xdpyinfo/Portfile	2009-01-18 19:52:04 UTC (rev 45602)
+++ trunk/dports/x11/xdpyinfo/Portfile	2009-01-18 20:52:41 UTC (rev 45603)
@@ -3,6 +3,7 @@
 PortSystem          1.0
 name                xdpyinfo
 version             1.0.3
+revision            1
 categories          x11
 maintainers         blb openmaintainer
 description         Display information utility for X11
@@ -24,11 +25,11 @@
 
 depends_build       port:pkgconfig
 
-depends_lib         lib:libXinerama.1:xorg-libXinerama \
-                    lib:libXp.6:xorg-libXp lib:libXrender.1:xrender \
-                    lib:libXtst.6:xorg-libXtst \
-                    lib:libXxf86misc.1:xorg-libXxf86misc \
-                    lib:libXxf86vm.1:xorg-libXxf86vm lib:libdmx.1:xorg-libdmx
+depends_lib         port:xorg-libXinerama \
+                    port:xorg-libXp port:xrender \
+                    port:xorg-libXtst \
+                    port:xorg-libXxf86misc \
+                    port:xorg-libXxf86vm port:xorg-libdmx
 
 livecheck.check     regex
 livecheck.regex     ${name}-(\[\\d.\]+)${extract.suffix}

Modified: trunk/dports/x11/xearth/Portfile
===================================================================
--- trunk/dports/x11/xearth/Portfile	2009-01-18 19:52:04 UTC (rev 45602)
+++ trunk/dports/x11/xearth/Portfile	2009-01-18 20:52:41 UTC (rev 45603)
@@ -3,6 +3,7 @@
 PortSystem 1.0
 name            xearth
 version         1.1
+revision        1
 categories      x11
 platforms       darwin macosx
 maintainers     nomaintainer
@@ -13,8 +14,8 @@
 master_sites    ftp://ftp.eenet.ee/pub/gentoo/distfiles
 checksums       md5 6e409dffaa8dc5fae1064e38935ab61f
 depends_lib \
-	lib:libXext.6:xorg-libXext \
-	lib:libXt.6:xorg-libXt
+	port:xorg-libXext \
+	port:xorg-libXt
 depends_build \
 	bin:xmkmf:imake
 use_xmkmf       yes

Modified: trunk/dports/x11/xedit/Portfile
===================================================================
--- trunk/dports/x11/xedit/Portfile	2009-01-18 19:52:04 UTC (rev 45602)
+++ trunk/dports/x11/xedit/Portfile	2009-01-18 20:52:41 UTC (rev 45603)
@@ -3,6 +3,7 @@
 PortSystem          1.0
 name                xedit
 version             1.1.2
+revision            1
 categories          x11 editors
 maintainers         blb openmaintainer
 description         Simple text editor for X11
@@ -20,7 +21,7 @@
 
 depends_build       port:pkgconfig
 
-depends_lib         lib:libXaw:xorg-libXaw
+depends_lib         port:xorg-libXaw
 
 configure.args      --disable-xprint
 

Modified: trunk/dports/x11/xev/Portfile
===================================================================
--- trunk/dports/x11/xev/Portfile	2009-01-18 19:52:04 UTC (rev 45602)
+++ trunk/dports/x11/xev/Portfile	2009-01-18 20:52:41 UTC (rev 45603)
@@ -3,6 +3,7 @@
 PortSystem          1.0
 name                xev
 version             1.0.3
+revision            1
 categories          x11
 maintainers         blb openmaintainer
 description         Print contents of X11 events
@@ -26,7 +27,7 @@
 
 depends_build       port:pkgconfig
 
-depends_lib         lib:libX11.6:xorg-libX11
+depends_lib         port:xorg-libX11
 
 livecheck.check     regex
 livecheck.regex     ${name}-(\[\\d.\]+)${extract.suffix}

Modified: trunk/dports/x11/xeyes/Portfile
===================================================================
--- trunk/dports/x11/xeyes/Portfile	2009-01-18 19:52:04 UTC (rev 45602)
+++ trunk/dports/x11/xeyes/Portfile	2009-01-18 20:52:41 UTC (rev 45603)
@@ -4,6 +4,7 @@
 
 name                xeyes
 version             1.0.1
+revision            1
 categories          x11
 platforms           darwin
 maintainers         jeremyhu
@@ -20,7 +21,7 @@
 depends_build \
 	port:pkgconfig
 depends_lib \
-	lib:libXmu:xorg-libXmu
+	port:xorg-libXmu
 
 configure.args      --mandir=${prefix}/share/man
 

Modified: trunk/dports/x11/xfd/Portfile
===================================================================
--- trunk/dports/x11/xfd/Portfile	2009-01-18 19:52:04 UTC (rev 45602)
+++ trunk/dports/x11/xfd/Portfile	2009-01-18 20:52:41 UTC (rev 45603)
@@ -3,6 +3,7 @@
 PortSystem          1.0
 name                xfd
 version             1.0.1
+revision            1
 categories          x11
 maintainers         blb openmaintainer
 description         Display all the characters in an X11 font
@@ -20,7 +21,7 @@
 
 depends_build       port:pkgconfig
 
-depends_lib         lib:libXaw:xorg-libXaw lib:libXft.2:Xft2
+depends_lib         port:xorg-libXaw port:Xft2
 
 configure.args      --mandir=${prefix}/share/man --disable-xprint
 

Modified: trunk/dports/x11/xfontsel/Portfile
===================================================================
--- trunk/dports/x11/xfontsel/Portfile	2009-01-18 19:52:04 UTC (rev 45602)
+++ trunk/dports/x11/xfontsel/Portfile	2009-01-18 20:52:41 UTC (rev 45603)
@@ -3,6 +3,7 @@
 PortSystem          1.0
 name                xfontsel
 version             1.0.2
+revision            1
 categories          x11 graphics
 maintainers         blb openmaintainer
 description         Point and click selection of X11 font names
@@ -23,7 +24,7 @@
 
 depends_build       port:pkgconfig
 
-depends_lib         lib:libXaw:xorg-libXaw
+depends_lib         port:xorg-libXaw
 
 configure.args      --disable-xprint
 

Modified: trunk/dports/x11/xforms/Portfile
===================================================================
--- trunk/dports/x11/xforms/Portfile	2009-01-18 19:52:04 UTC (rev 45602)
+++ trunk/dports/x11/xforms/Portfile	2009-01-18 20:52:41 UTC (rev 45603)
@@ -4,6 +4,7 @@
 
 name            xforms
 version         1.0.90
+revision        1
 categories      x11
 maintainers     ira.uka.de:raphael openmaintainer
 description     GUI toolkit based on Xlib
@@ -23,8 +24,8 @@
                 sha1 7ef0655d1ba481a09af643455ec11afdcc28ce8a \
                 rmd160 f709bea1e2c3a867092e7cc4c7c5c1c60055b6e3
 depends_lib \
-	lib:libSM.6:xorg-libsm \
-	lib:libXpm.4:xpm \
+	port:xorg-libsm \
+	port:xpm \
 	port:jpeg
 
 # not trivial to autoreconf

Modified: trunk/dports/x11/xfs/Portfile
===================================================================
--- trunk/dports/x11/xfs/Portfile	2009-01-18 19:52:04 UTC (rev 45602)
+++ trunk/dports/x11/xfs/Portfile	2009-01-18 20:52:41 UTC (rev 45603)
@@ -3,6 +3,7 @@
 PortSystem          1.0
 name                xfs
 version             1.0.8
+revision            1
 categories          x11 graphics
 maintainers         blb openmaintainer
 description         X11 font server
@@ -22,7 +23,7 @@
 
 depends_build       port:pkgconfig
 
-depends_lib         lib:libFS.6:xorg-libFS lib:libXfont.1:xorg-libXfont
+depends_lib         port:xorg-libFS port:xorg-libXfont
 
 livecheck.check     regex
 livecheck.regex     ${name}-(\[\\d.\]+)${extract.suffix}

Modified: trunk/dports/x11/xfsinfo/Portfile
===================================================================
--- trunk/dports/x11/xfsinfo/Portfile	2009-01-18 19:52:04 UTC (rev 45602)
+++ trunk/dports/x11/xfsinfo/Portfile	2009-01-18 20:52:41 UTC (rev 45603)
@@ -3,6 +3,7 @@
 PortSystem          1.0
 name                xfsinfo
 version             1.0.2
+revision            1
 categories          x11 graphics
 maintainers         blb openmaintainer
 description         X11 font server information utility
@@ -24,7 +25,7 @@
 
 depends_build       port:pkgconfig
 
-depends_lib         lib:libFS.6:xorg-libFS lib:libX11.6:xorg-libX11
+depends_lib         port:xorg-libFS port:xorg-libX11
 
 livecheck.check     regex
 livecheck.regex     ${name}-(\[\\d.\]+)${extract.suffix}

Modified: trunk/dports/x11/xgc/Portfile
===================================================================
--- trunk/dports/x11/xgc/Portfile	2009-01-18 19:52:04 UTC (rev 45602)
+++ trunk/dports/x11/xgc/Portfile	2009-01-18 20:52:41 UTC (rev 45603)
@@ -3,6 +3,7 @@
 PortSystem          1.0
 name                xgc
 version             1.0.1
+revision            1
 categories          x11 graphics
 maintainers         blb openmaintainer
 description         Demonstrates various features of the X11 graphics primitives
@@ -20,7 +21,7 @@
 
 depends_build       port:pkgconfig
 
-depends_lib         lib:libXaw:xorg-libXaw
+depends_lib         port:xorg-libXaw
 
 configure.args      --mandir=${prefix}/share/man --disable-xprint
 

Modified: trunk/dports/x11/xhost/Portfile
===================================================================
--- trunk/dports/x11/xhost/Portfile	2009-01-18 19:52:04 UTC (rev 45602)
+++ trunk/dports/x11/xhost/Portfile	2009-01-18 20:52:41 UTC (rev 45603)
@@ -3,6 +3,7 @@
 PortSystem          1.0
 name                xhost
 version             1.0.2
+revision            1
 categories          x11
 maintainers         blb openmaintainer
 description         Server access control program for X11
@@ -22,7 +23,7 @@
 
 depends_build       port:pkgconfig
 
-depends_lib         lib:libXmuu.1:xorg-libXmu
+depends_lib         port:xorg-libXmu
 
 livecheck.check     regex
 livecheck.regex     ${name}-(\[\\d.\]+)${extract.suffix}

Modified: trunk/dports/x11/xinit/Portfile
===================================================================
--- trunk/dports/x11/xinit/Portfile	2009-01-18 19:52:04 UTC (rev 45602)
+++ trunk/dports/x11/xinit/Portfile	2009-01-18 20:52:41 UTC (rev 45603)
@@ -4,7 +4,7 @@
 
 name                xinit
 version             1.1.1
-revision            1
+revision            2
 categories          x11
 platforms           darwin
 maintainers         jeremyhu
@@ -29,7 +29,7 @@
                     port:mkfontdir
 
 depends_build       port:pkgconfig
-depends_lib         lib:libX11.6:xorg-libX11
+depends_lib         port:xorg-libX11
 
 configure.pkg_config_path ${x11prefix}/lib/pkgconfig
 

Modified: trunk/dports/x11/xinput/Portfile
===================================================================
--- trunk/dports/x11/xinput/Portfile	2009-01-18 19:52:04 UTC (rev 45602)
+++ trunk/dports/x11/xinput/Portfile	2009-01-18 20:52:41 UTC (rev 45603)
@@ -3,6 +3,7 @@
 PortSystem          1.0
 name                xinput
 version             1.3.0
+revision            1
 categories          x11
 maintainers         blb openmaintainer
 description         Utility to configure and test XInput devices
@@ -20,7 +21,7 @@
 
 depends_build       port:pkgconfig
 
-depends_lib         lib:libXi.6:xorg-libXi
+depends_lib         port:xorg-libXi
 
 livecheck.check     regex
 livecheck.regex     ${name}-(\[\\d.\]+)${extract.suffix}

Modified: trunk/dports/x11/xkbcomp/Portfile
===================================================================
--- trunk/dports/x11/xkbcomp/Portfile	2009-01-18 19:52:04 UTC (rev 45602)
+++ trunk/dports/x11/xkbcomp/Portfile	2009-01-18 20:52:41 UTC (rev 45603)
@@ -3,6 +3,7 @@
 PortSystem          1.0
 name                xkbcomp
 version             1.0.5
+revision            1
 categories          x11
 maintainers         blb openmaintainer
 description         Compile XKB keyboard description
@@ -25,7 +26,7 @@
 
 depends_build       port:pkgconfig
 
-depends_lib         lib:libxkbfile.1:xorg-libxkbfile
+depends_lib         port:xorg-libxkbfile
 
 livecheck.check     regex
 livecheck.regex     ${name}-(\[\\d.\]+)${extract.suffix}

Modified: trunk/dports/x11/xkbevd/Portfile
===================================================================
--- trunk/dports/x11/xkbevd/Portfile	2009-01-18 19:52:04 UTC (rev 45602)
+++ trunk/dports/x11/xkbevd/Portfile	2009-01-18 20:52:41 UTC (rev 45603)
@@ -3,6 +3,7 @@
 PortSystem          1.0
 name                xkbevd
 version             1.0.2
+revision            1
 categories          x11
 maintainers         blb openmaintainer
 description         XKB event daemon
@@ -20,7 +21,7 @@
 
 depends_build       port:pkgconfig
 
-depends_lib         lib:libxkbfile.1:xorg-libxkbfile
+depends_lib         port:xorg-libxkbfile
 
 configure.args      --mandir=${prefix}/share/man
 

Modified: trunk/dports/x11/xkbprint/Portfile
===================================================================
--- trunk/dports/x11/xkbprint/Portfile	2009-01-18 19:52:04 UTC (rev 45602)
+++ trunk/dports/x11/xkbprint/Portfile	2009-01-18 20:52:41 UTC (rev 45603)
@@ -3,6 +3,7 @@
 PortSystem          1.0
 name                xkbprint
 version             1.0.1
+revision            1
 categories          x11
 maintainers         blb openmaintainer
 description         Print an XKB keyboard description
@@ -20,7 +21,7 @@
 
 depends_build       port:pkgconfig
 
-depends_lib         lib:libxkbfile.1:xorg-libxkbfile
+depends_lib         port:xorg-libxkbfile
 
 configure.args      --mandir=${prefix}/share/man
 

Modified: trunk/dports/x11/xkbutils/Portfile
===================================================================
--- trunk/dports/x11/xkbutils/Portfile	2009-01-18 19:52:04 UTC (rev 45602)
+++ trunk/dports/x11/xkbutils/Portfile	2009-01-18 20:52:41 UTC (rev 45603)
@@ -3,6 +3,7 @@
 PortSystem          1.0
 name                xkbutils
 version             1.0.1
+revision            1
 categories          x11
 maintainers         blb openmaintainer
 description         XKB utilities xkbbell, xkbvleds, and xkbwatch
@@ -20,7 +21,7 @@
 
 depends_build       port:pkgconfig
 
-depends_lib         lib:libXaw:xorg-libXaw lib:libxkbfile.1:xorg-libxkbfile
+depends_lib         port:xorg-libXaw port:xorg-libxkbfile
 
 configure.args      --disable-xprint
 

Modified: trunk/dports/x11/xkill/Portfile
===================================================================
--- trunk/dports/x11/xkill/Portfile	2009-01-18 19:52:04 UTC (rev 45602)
+++ trunk/dports/x11/xkill/Portfile	2009-01-18 20:52:41 UTC (rev 45603)
@@ -3,6 +3,7 @@
 PortSystem          1.0
 name                xkill
 version             1.0.1
+revision            1
 categories          x11
 maintainers         blb openmaintainer
 description         Kill a client by its X11 resource
@@ -20,7 +21,7 @@
 
 depends_build       port:pkgconfig
 
-depends_lib         lib:libXmuu.1:xorg-libXmu
+depends_lib         port:xorg-libXmu
 
 configure.args      --mandir=${prefix}/share/man
 

Modified: trunk/dports/x11/xload/Portfile
===================================================================
--- trunk/dports/x11/xload/Portfile	2009-01-18 19:52:04 UTC (rev 45602)
+++ trunk/dports/x11/xload/Portfile	2009-01-18 20:52:41 UTC (rev 45603)
@@ -3,6 +3,7 @@
 PortSystem          1.0
 name                xload
 version             1.0.2
+revision            1
 categories          x11
 maintainers         blb openmaintainer
 description         System load average display for X11
@@ -20,7 +21,7 @@
 
 depends_build       port:pkgconfig
 
-depends_lib         lib:libXaw:xorg-libXaw
+depends_lib         port:xorg-libXaw
 
 configure.args      --mandir=${prefix}/share/man --disable-xprint
 

Modified: trunk/dports/x11/xlogo/Portfile
===================================================================
--- trunk/dports/x11/xlogo/Portfile	2009-01-18 19:52:04 UTC (rev 45602)
+++ trunk/dports/x11/xlogo/Portfile	2009-01-18 20:52:41 UTC (rev 45603)
@@ -3,6 +3,7 @@
 PortSystem          1.0
 name                xlogo
 version             1.0.1
+revision            1
 categories          x11
 maintainers         blb openmaintainer
 description         X11 Window System logo
@@ -20,7 +21,7 @@
 
 depends_build       port:pkgconfig
 
-depends_lib         lib:libXaw:xorg-libXaw lib:libXft.2:Xft2
+depends_lib         port:xorg-libXaw port:Xft2
 
 configure.args      --mandir=${prefix}/share/man --disable-xprint
 

Modified: trunk/dports/x11/xlsatoms/Portfile
===================================================================
--- trunk/dports/x11/xlsatoms/Portfile	2009-01-18 19:52:04 UTC (rev 45602)
+++ trunk/dports/x11/xlsatoms/Portfile	2009-01-18 20:52:41 UTC (rev 45603)
@@ -3,6 +3,7 @@
 PortSystem          1.0
 name                xlsatoms
 version             1.0.1
+revision            1
 categories          x11
 maintainers         blb openmaintainer
 description         List interned atoms defined on an X11 server
@@ -20,7 +21,7 @@
 
 depends_build       port:pkgconfig
 
-depends_lib         lib:libXmuu.1:xorg-libXmu
+depends_lib         port:xorg-libXmu
 
 configure.args      --mandir=${prefix}/share/man
 

Modified: trunk/dports/x11/xlsclients/Portfile
===================================================================
--- trunk/dports/x11/xlsclients/Portfile	2009-01-18 19:52:04 UTC (rev 45602)
+++ trunk/dports/x11/xlsclients/Portfile	2009-01-18 20:52:41 UTC (rev 45603)
@@ -3,6 +3,7 @@
 PortSystem          1.0
 name                xlsclients
 version             1.0.1
+revision            1
 categories          x11
 maintainers         blb openmaintainer
 description         List client applications running on an X11 display
@@ -20,7 +21,7 @@
 
 depends_build       port:pkgconfig
 
-depends_lib         lib:libXmuu.1:xorg-libXmu
+depends_lib         port:xorg-libXmu
 
 configure.args      --mandir=${prefix}/share/man
 

Modified: trunk/dports/x11/xlsfonts/Portfile
===================================================================
--- trunk/dports/x11/xlsfonts/Portfile	2009-01-18 19:52:04 UTC (rev 45602)
+++ trunk/dports/x11/xlsfonts/Portfile	2009-01-18 20:52:41 UTC (rev 45603)
@@ -3,6 +3,7 @@
 PortSystem          1.0
 name                xlsfonts
 version             1.0.2
+revision            1
 categories          x11
 maintainers         blb openmaintainer
 description         List available fonts on an X11 server
@@ -20,7 +21,7 @@
 
 depends_build       port:pkgconfig
 
-depends_lib         lib:libX11.6:xorg-libX11
+depends_lib         port:xorg-libX11
 
 livecheck.check     regex
 livecheck.regex     ${name}-(\[\\d.\]+)${extract.suffix}

Modified: trunk/dports/x11/xmag/Portfile
===================================================================
--- trunk/dports/x11/xmag/Portfile	2009-01-18 19:52:04 UTC (rev 45602)
+++ trunk/dports/x11/xmag/Portfile	2009-01-18 20:52:41 UTC (rev 45603)
@@ -3,6 +3,7 @@
 PortSystem          1.0
 name                xmag
 version             1.0.2
+revision            1
 categories          x11 graphics
 maintainers         blb openmaintainer
 description         Magnify parts of the X11 screen
@@ -20,7 +21,7 @@
 
 depends_build       port:pkgconfig
 
-depends_lib         lib:libXaw:xorg-libXaw
+depends_lib         port:xorg-libXaw
 
 configure.args      --disable-xprint
 

Modified: trunk/dports/x11/xman/Portfile
===================================================================
--- trunk/dports/x11/xman/Portfile	2009-01-18 19:52:04 UTC (rev 45602)
+++ trunk/dports/x11/xman/Portfile	2009-01-18 20:52:41 UTC (rev 45603)
@@ -3,6 +3,7 @@
 PortSystem          1.0
 name                xman
 version             1.0.3
+revision            1
 categories          x11
 maintainers         blb openmaintainer
 description         Manual page display program for the X11 Window System
@@ -20,7 +21,7 @@
 
 depends_build       port:pkgconfig
 
-depends_lib         lib:libXaw:xorg-libXaw
+depends_lib         port:xorg-libXaw
 
 configure.args      --disable-xprint
 

Modified: trunk/dports/x11/xmessage/Portfile
===================================================================
--- trunk/dports/x11/xmessage/Portfile	2009-01-18 19:52:04 UTC (rev 45602)
+++ trunk/dports/x11/xmessage/Portfile	2009-01-18 20:52:41 UTC (rev 45603)
@@ -3,6 +3,7 @@
 PortSystem          1.0
 name                xmessage
 version             1.0.2
+revision            1
 categories          x11
 maintainers         blb openmaintainer
 description         Display a message or query in a window (X11-based /bin/echo)
@@ -20,7 +21,7 @@
 
 depends_build       port:pkgconfig
 
-depends_lib         lib:libXaw:xorg-libXaw
+depends_lib         port:xorg-libXaw
 
 configure.args      --mandir=${prefix}/share/man --disable-xprint
 

Modified: trunk/dports/x11/xmh/Portfile
===================================================================
--- trunk/dports/x11/xmh/Portfile	2009-01-18 19:52:04 UTC (rev 45602)
+++ trunk/dports/x11/xmh/Portfile	2009-01-18 20:52:41 UTC (rev 45603)
@@ -3,6 +3,7 @@
 PortSystem          1.0
 name                xmh
 version             1.0.1
+revision            1
 categories          x11 mail
 maintainers         blb openmaintainer
 description         Send and read mail with an X11 interface to MH
@@ -20,7 +21,7 @@
 
 depends_build       port:pkgconfig
 
-depends_lib         lib:libXaw:xorg-libXaw
+depends_lib         port:xorg-libXaw
 
 configure.args      --mandir=${prefix}/share/man --disable-xprint
 

Modified: trunk/dports/x11/xmodmap/Portfile
===================================================================
--- trunk/dports/x11/xmodmap/Portfile	2009-01-18 19:52:04 UTC (rev 45602)
+++ trunk/dports/x11/xmodmap/Portfile	2009-01-18 20:52:41 UTC (rev 45603)
@@ -3,6 +3,7 @@
 PortSystem          1.0
 name                xmodmap
 version             1.0.3
+revision            1
 categories          x11
 maintainers         blb openmaintainer
 description         Modify keymaps and pointer button mappings in X11
@@ -23,7 +24,7 @@
 
 depends_build       port:pkgconfig
 
-depends_lib         lib:libX11.6:xorg-libX11
+depends_lib         port:xorg-libX11
 
 livecheck.check     regex
 livecheck.regex     ${name}-(\[\\d.\]+)${extract.suffix}

Modified: trunk/dports/x11/xmore/Portfile
===================================================================
--- trunk/dports/x11/xmore/Portfile	2009-01-18 19:52:04 UTC (rev 45602)
+++ trunk/dports/x11/xmore/Portfile	2009-01-18 20:52:41 UTC (rev 45603)
@@ -3,6 +3,7 @@
 PortSystem          1.0
 name                xmore
 version             1.0.1
+revision            1
 categories          x11
 maintainers         blb openmaintainer
 description         Plain text display program for the X11 Window System
@@ -20,7 +21,7 @@
 
 depends_build       port:pkgconfig
 
-depends_lib         lib:libXaw:xorg-libXaw
+depends_lib         port:xorg-libXaw
 
 configure.args      --mandir=${prefix}/share/man --disable-xprint
 

Modified: trunk/dports/x11/xnee/Portfile
===================================================================
--- trunk/dports/x11/xnee/Portfile	2009-01-18 19:52:04 UTC (rev 45602)
+++ trunk/dports/x11/xnee/Portfile	2009-01-18 20:52:41 UTC (rev 45603)
@@ -3,6 +3,7 @@
 
 name		 xnee
 version		 2.01
+revision         1
 categories	 x11
 maintainers    nomaintainer
 description	 Xnee's Not an Event Emulator
@@ -18,7 +19,7 @@
 depends_build \
 	port:pkgconfig
 depends_lib \
-	lib:libXtst.6:xorg-libXtst \
+	port:xorg-libXtst \
 	port:gtk2
 
 configure.args --disable-doc

Modified: trunk/dports/x11/xping/Portfile
===================================================================
--- trunk/dports/x11/xping/Portfile	2009-01-18 19:52:04 UTC (rev 45602)
+++ trunk/dports/x11/xping/Portfile	2009-01-18 20:52:41 UTC (rev 45603)
@@ -3,7 +3,7 @@
 
 name		xping
 version		1.9
-revision	1
+revision	2
 categories	x11
 maintainers	nomaintainer
 description	'ping' an Xserver
@@ -11,7 +11,7 @@
 distfiles	xping.c
 universal_variant no
 depends_lib \
-	lib:libX11.6:xorg-libX11
+	port:xorg-libX11
 
 fetch 		{}
 extract		{ file mkdir ${worksrcpath}

Modified: trunk/dports/x11/xplanet/Portfile
===================================================================
--- trunk/dports/x11/xplanet/Portfile	2009-01-18 19:52:04 UTC (rev 45602)
+++ trunk/dports/x11/xplanet/Portfile	2009-01-18 20:52:41 UTC (rev 45603)
@@ -3,7 +3,7 @@
 PortSystem			1.0
 name				xplanet
 version				1.2.0
-revision			2
+revision			3
 categories			x11 graphics
 maintainers			nomaintainer
 description			Render an image of a planet into an X window or file
@@ -21,7 +21,7 @@
 checksums			md5 87d62fcdf43ad1beec677bfb6e299ac1
 
 depends_lib \
-	lib:libXss.1:xorg-libXScrnSaver \
+	port:xorg-libXScrnSaver \
 	port:fontconfig \
 	port:libpng \
 	port:jpeg \
@@ -57,7 +57,7 @@
 }
 
 variant aqua description "Use aqua instead of X11" {
-	depends_lib-delete	lib:libXss.1:xorg-libXScrnSaver
+	depends_lib-delete	port:xorg-libXScrnSaver
 	configure.args-delete	--with-x --with-xscreensaver
 	configure.args-append	--without-x --with-aqua
 }

Modified: trunk/dports/x11/xpr/Portfile
===================================================================
--- trunk/dports/x11/xpr/Portfile	2009-01-18 19:52:04 UTC (rev 45602)
+++ trunk/dports/x11/xpr/Portfile	2009-01-18 20:52:41 UTC (rev 45603)
@@ -3,6 +3,7 @@
 PortSystem          1.0
 name                xpr
 version             1.0.2
+revision            1
 categories          x11
 maintainers         blb openmaintainer
 description         Print an X11 window dump
@@ -20,7 +21,7 @@
 
 depends_build       port:pkgconfig
 
-depends_lib         lib:libXmuu.1:xorg-libXmu
+depends_lib         port:xorg-libXmu
 
 livecheck.check     regex
 livecheck.regex     ${name}-(\[\\d.\]+)${extract.suffix}

Modified: trunk/dports/x11/xprop/Portfile
===================================================================
--- trunk/dports/x11/xprop/Portfile	2009-01-18 19:52:04 UTC (rev 45602)
+++ trunk/dports/x11/xprop/Portfile	2009-01-18 20:52:41 UTC (rev 45603)
@@ -3,6 +3,7 @@
 PortSystem          1.0
 name                xprop
 version             1.0.4
+revision            1
 categories          x11
 maintainers         blb openmaintainer
 description         Property displayer for X11
@@ -20,7 +21,7 @@
 
 depends_build       port:pkgconfig
 
-depends_lib         lib:libX11.6:xorg-libX11
+depends_lib         port:xorg-libX11
 
 livecheck.check     regex
 livecheck.regex     ${name}-(\[\\d.\]+)${extract.suffix}

Modified: trunk/dports/x11/xrandr/Portfile
===================================================================
--- trunk/dports/x11/xrandr/Portfile	2009-01-18 19:52:04 UTC (rev 45602)
+++ trunk/dports/x11/xrandr/Portfile	2009-01-18 20:52:41 UTC (rev 45603)
@@ -3,6 +3,7 @@
 PortSystem          1.0
 name                xrandr
 version             1.2.3
+revision            1
 categories          x11
 maintainers         blb openmaintainer
 description         Primitive command line interface to RandR X11 extension
@@ -20,7 +21,7 @@
 
 depends_build       port:pkgconfig
 
-depends_lib         lib:libXrandr.2:xorg-libXrandr
+depends_lib         port:xorg-libXrandr
 
 livecheck.check     regex
 livecheck.regex     ${name}-(\[\\d.\]+)${extract.suffix}

Modified: trunk/dports/x11/xrdb/Portfile
===================================================================
--- trunk/dports/x11/xrdb/Portfile	2009-01-18 19:52:04 UTC (rev 45602)
+++ trunk/dports/x11/xrdb/Portfile	2009-01-18 20:52:41 UTC (rev 45603)
@@ -3,6 +3,7 @@
 PortSystem          1.0
 name                xrdb
 version             1.0.5
+revision            1
 categories          x11
 maintainers         blb openmaintainer
 description         X11 server resource database utility
@@ -20,7 +21,7 @@
 
 depends_build       port:pkgconfig
 
-depends_lib         lib:libXmuu.1:xorg-libXmu
+depends_lib         port:xorg-libXmu
 
 livecheck.check     regex
 livecheck.regex     ${name}-(\[\\d.\]+)${extract.suffix}

Modified: trunk/dports/x11/xrefresh/Portfile
===================================================================
--- trunk/dports/x11/xrefresh/Portfile	2009-01-18 19:52:04 UTC (rev 45602)
+++ trunk/dports/x11/xrefresh/Portfile	2009-01-18 20:52:41 UTC (rev 45603)
@@ -3,6 +3,7 @@
 PortSystem          1.0
 name                xrefresh
 version             1.0.2
+revision            1
 categories          x11
 maintainers         blb openmaintainer
 description         Refresh all or part of an X11 screen
@@ -20,7 +21,7 @@
 
 depends_build       port:pkgconfig
 
-depends_lib         lib:libX11.6:xorg-libX11
+depends_lib         port:xorg-libX11
 
 configure.args      --mandir=${prefix}/share/man
 

Modified: trunk/dports/x11/xrender/Portfile
===================================================================
--- trunk/dports/x11/xrender/Portfile	2009-01-18 19:52:04 UTC (rev 45602)
+++ trunk/dports/x11/xrender/Portfile	2009-01-18 20:52:41 UTC (rev 45603)
@@ -5,7 +5,7 @@
 name				xrender
 set my_name			libXrender
 version				0.9.4
-revision			4
+revision			5
 categories			x11
 platforms			darwin
 maintainers			jeremyhu openmaintainer
@@ -30,7 +30,7 @@
 
 # Change this to port:xorg-libX11 when other ports depend on this using lib: instead of port:
 depends_lib \
-	lib:libX11:xorg-libX11
+	port:xorg-libX11
 
 use_parallel_build  yes
 

Modified: trunk/dports/x11/xrmap/Portfile
===================================================================
--- trunk/dports/x11/xrmap/Portfile	2009-01-18 19:52:04 UTC (rev 45602)
+++ trunk/dports/x11/xrmap/Portfile	2009-01-18 20:52:41 UTC (rev 45603)
@@ -4,6 +4,7 @@
 
 name			xrmap
 version			2.33
+revision                1
 categories		x11
 platforms		darwin
 maintainers		nomaintainer
@@ -30,7 +31,7 @@
 				factbook_text_2002.tar.bz2 md5 d28fc69a9fd48d9d39a1fda8099cfb1b
 patchfiles		patch-earthview-Makefile
 
-depends_lib		lib:libX11.6:XFree86
+depends_lib		port:xorg-libs
 
 use_bzip2		yes
 extract.only	${distname}.tar.bz2 \

Modified: trunk/dports/x11/xroot/Portfile
===================================================================
--- trunk/dports/x11/xroot/Portfile	2009-01-18 19:52:04 UTC (rev 45602)
+++ trunk/dports/x11/xroot/Portfile	2009-01-18 20:52:41 UTC (rev 45603)
@@ -3,6 +3,7 @@
 PortSystem          1.0
 name                xroot
 version             1.0
+revision            1
 categories          x11
 maintainers         nomaintainer
 description         A small X -root window
@@ -21,7 +22,7 @@
 distfiles           xroot.c
 universal_variant   no
 depends_lib \
-	lib:libX11.6:xorg-libX11
+	port:xorg-libX11
 
 extract   {}
 use_configure       no

Modified: trunk/dports/x11/xruskb/Portfile
===================================================================
--- trunk/dports/x11/xruskb/Portfile	2009-01-18 19:52:04 UTC (rev 45602)
+++ trunk/dports/x11/xruskb/Portfile	2009-01-18 20:52:41 UTC (rev 45603)
@@ -3,6 +3,7 @@
 PortSystem 1.0
 name		xruskb
 version		1.15.3
+revision        1
 categories	x11 russian
 maintainers	jc at crazic.ru
 description	program for switching two keyboard layouts
@@ -21,7 +22,7 @@
 master_sites	http://ftp.yars.free.net/pub/software/unix/X11/
 checksums	md5 17d67bfe2cadf588b3b3e97e5791d05d
 
-depends_lib	lib:libX11.6:XFree86
+depends_lib	port:xorg-libs
 
 variant motif {
 	configure.args-append --with-motif  

Modified: trunk/dports/x11/xsel/Portfile
===================================================================
--- trunk/dports/x11/xsel/Portfile	2009-01-18 19:52:04 UTC (rev 45602)
+++ trunk/dports/x11/xsel/Portfile	2009-01-18 20:52:41 UTC (rev 45603)
@@ -4,6 +4,7 @@
 
 name                    xsel
 version                 1.2.0
+revision                1
 categories              x11
 platforms               darwin
 maintainers             ryandesign
@@ -26,7 +27,7 @@
     rmd160  53fc7fe06e4e4ebe3c47a3a97408876cd0c5faed
 
 depends_lib \
-	lib:libX11.6:xorg-libX11
+	port:xorg-libX11
 
 livecheck.check         regex
 livecheck.url           [lindex ${master_sites} 0]?M=D

Modified: trunk/dports/x11/xset/Portfile
===================================================================
--- trunk/dports/x11/xset/Portfile	2009-01-18 19:52:04 UTC (rev 45602)
+++ trunk/dports/x11/xset/Portfile	2009-01-18 20:52:41 UTC (rev 45603)
@@ -3,6 +3,7 @@
 PortSystem          1.0
 name                xset
 version             1.0.4
+revision            1
 categories          x11
 maintainers         blb openmaintainer
 description         User preference utility for X11
@@ -20,9 +21,9 @@
 
 depends_build       port:pkgconfig
 
-depends_lib         lib:libXfontcache.1:xorg-libXfontcache \
-                    lib:libXmuu.1:xorg-libXmu lib:libXp.6:xorg-libXp \
-                    lib:libXxf86misc.1:xorg-libXxf86misc
+depends_lib         port:xorg-libXfontcache \
+                    port:xorg-libXmu port:xorg-libXp \
+                    port:xorg-libXxf86misc
 
 livecheck.check     regex
 livecheck.regex     ${name}-(\[\\d.\]+)${extract.suffix}

Modified: trunk/dports/x11/xsetmode/Portfile
===================================================================
--- trunk/dports/x11/xsetmode/Portfile	2009-01-18 19:52:04 UTC (rev 45602)
+++ trunk/dports/x11/xsetmode/Portfile	2009-01-18 20:52:41 UTC (rev 45603)
@@ -3,6 +3,7 @@
 PortSystem          1.0
 name                xsetmode
 version             1.0.0
+revision            1
 categories          x11
 maintainers         blb openmaintainer
 description         Set the mode for an X11 input device
@@ -20,7 +21,7 @@
 
 depends_build       port:pkgconfig
 
-depends_lib         lib:libXi.6:xorg-libXi
+depends_lib         port:xorg-libXi
 
 configure.args      --mandir=${prefix}/share/man
 

Modified: trunk/dports/x11/xsetpointer/Portfile
===================================================================
--- trunk/dports/x11/xsetpointer/Portfile	2009-01-18 19:52:04 UTC (rev 45602)
+++ trunk/dports/x11/xsetpointer/Portfile	2009-01-18 20:52:41 UTC (rev 45603)
@@ -3,6 +3,7 @@
 PortSystem          1.0
 name                xsetpointer
 version             1.0.1
+revision            1
 categories          x11
 maintainers         blb openmaintainer
 description         Set an X11 input device as the main pointer
@@ -20,7 +21,7 @@
 
 depends_build       port:pkgconfig
 
-depends_lib         lib:libXi.6:xorg-libXi
+depends_lib         port:xorg-libXi
 
 livecheck.check     regex
 livecheck.regex     ${name}-(\[\\d.\]+)${extract.suffix}

Modified: trunk/dports/x11/xsetroot/Portfile
===================================================================
--- trunk/dports/x11/xsetroot/Portfile	2009-01-18 19:52:04 UTC (rev 45602)
+++ trunk/dports/x11/xsetroot/Portfile	2009-01-18 20:52:41 UTC (rev 45603)
@@ -3,6 +3,7 @@
 PortSystem          1.0
 name                xsetroot
 version             1.0.2
+revision            1
 categories          x11
 maintainers         blb openmaintainer
 description         Root window parameter setting utility for X11
@@ -20,7 +21,7 @@
 
 depends_build       port:pkgconfig
 
-depends_lib         lib:libXmuu.1:xorg-libXmu
+depends_lib         port:xorg-libXmu
 
 configure.args      --mandir=${prefix}/share/man
 

Modified: trunk/dports/x11/xsm/Portfile
===================================================================
--- trunk/dports/x11/xsm/Portfile	2009-01-18 19:52:04 UTC (rev 45602)
+++ trunk/dports/x11/xsm/Portfile	2009-01-18 20:52:41 UTC (rev 45603)
@@ -3,6 +3,7 @@
 PortSystem          1.0
 name                xsm
 version             1.0.1
+revision            1
 categories          x11
 maintainers         blb openmaintainer
 description         X11 session manager
@@ -20,7 +21,7 @@
 
 depends_build       port:pkgconfig
 
-depends_lib         lib:libXaw:xorg-libXaw
+depends_lib         port:xorg-libXaw
 
 configure.args      --mandir=${prefix}/share/man --disable-xprint
 

Modified: trunk/dports/x11/xstdcmap/Portfile
===================================================================
--- trunk/dports/x11/xstdcmap/Portfile	2009-01-18 19:52:04 UTC (rev 45602)
+++ trunk/dports/x11/xstdcmap/Portfile	2009-01-18 20:52:41 UTC (rev 45603)
@@ -3,6 +3,7 @@
 PortSystem          1.0
 name                xstdcmap
 version             1.0.1
+revision            1
 categories          x11
 maintainers         blb openmaintainer
 description         X11 standard colormap utility
@@ -20,7 +21,7 @@
 
 depends_build       port:pkgconfig
 
-depends_lib         lib:libXmu.6:xorg-libXmu
+depends_lib         port:xorg-libXmu
 
 configure.args      --mandir=${prefix}/share/man
 

Modified: trunk/dports/x11/xteddy/Portfile
===================================================================
--- trunk/dports/x11/xteddy/Portfile	2009-01-18 19:52:04 UTC (rev 45602)
+++ trunk/dports/x11/xteddy/Portfile	2009-01-18 20:52:41 UTC (rev 45603)
@@ -4,6 +4,7 @@
 
 name			xteddy
 version			2.0.2
+revision                1
 categories		x11
 platforms		darwin
 maintainers		nomaintainer
@@ -20,7 +21,7 @@
 universal_variant no
 
 depends_lib \
-	lib:libSM.6:xorg-libsm \
+	port:xorg-libsm \
 	port:imlib \
 	port:zlib
 

Modified: trunk/dports/x11/xterm/Portfile
===================================================================
--- trunk/dports/x11/xterm/Portfile	2009-01-18 19:52:04 UTC (rev 45602)
+++ trunk/dports/x11/xterm/Portfile	2009-01-18 20:52:41 UTC (rev 45603)
@@ -4,6 +4,7 @@
 
 name                xterm
 version             238
+revision            1
 categories          x11
 platforms           darwin
 maintainers         jeremyhu
@@ -29,8 +30,8 @@
 	port:ncurses \
 	port:expat \
 	port:zlib \
-	lib:libXaw:xorg-libXaw \
-	lib:libXft.2:Xft2
+	port:xorg-libXaw \
+	port:Xft2
 
 patchfiles          patch-configure.diff
 

Modified: trunk/dports/x11/xtrap/Portfile
===================================================================
--- trunk/dports/x11/xtrap/Portfile	2009-01-18 19:52:04 UTC (rev 45602)
+++ trunk/dports/x11/xtrap/Portfile	2009-01-18 20:52:41 UTC (rev 45603)
@@ -3,6 +3,7 @@
 PortSystem          1.0
 name                xtrap
 version             1.0.2
+revision            1
 categories          x11
 maintainers         blb openmaintainer
 description         XTrap sample clients
@@ -22,7 +23,7 @@
 
 depends_build       port:pkgconfig
 
-depends_lib         lib:libXTrap.6:xorg-libXTrap
+depends_lib         port:xorg-libXTrap
 
 configure.args      --mandir=${prefix}/share/man
 

Modified: trunk/dports/x11/xvinfo/Portfile
===================================================================
--- trunk/dports/x11/xvinfo/Portfile	2009-01-18 19:52:04 UTC (rev 45602)
+++ trunk/dports/x11/xvinfo/Portfile	2009-01-18 20:52:41 UTC (rev 45603)
@@ -3,6 +3,7 @@
 PortSystem          1.0
 name                xvinfo
 version             1.0.2
+revision            1
 categories          x11
 maintainers         blb openmaintainer
 description         Print out X-Video extension adaptor information
@@ -20,7 +21,7 @@
 
 depends_build       port:pkgconfig
 
-depends_lib         lib:libXv.1:xorg-libXv
+depends_lib         port:xorg-libXv
 
 livecheck.check     regex
 livecheck.regex     ${name}-(\[\\d.\]+)${extract.suffix}

Modified: trunk/dports/x11/xwd/Portfile
===================================================================
--- trunk/dports/x11/xwd/Portfile	2009-01-18 19:52:04 UTC (rev 45602)
+++ trunk/dports/x11/xwd/Portfile	2009-01-18 20:52:41 UTC (rev 45603)
@@ -3,6 +3,7 @@
 PortSystem          1.0
 name                xwd
 version             1.0.2
+revision            1
 categories          x11 graphics
 maintainers         blb openmaintainer
 description         Dump an image of an X11 window
@@ -20,7 +21,7 @@
 
 depends_build       port:pkgconfig
 
-depends_lib         lib:libX11.6:xorg-libX11
+depends_lib         port:xorg-libX11
 
 livecheck.check     regex
 livecheck.regex     ${name}-(\[\\d.\]+)${extract.suffix}

Modified: trunk/dports/x11/xwininfo/Portfile
===================================================================
--- trunk/dports/x11/xwininfo/Portfile	2009-01-18 19:52:04 UTC (rev 45602)
+++ trunk/dports/x11/xwininfo/Portfile	2009-01-18 20:52:41 UTC (rev 45603)
@@ -3,6 +3,7 @@
 PortSystem          1.0
 name                xwininfo
 version             1.0.4
+revision            1
 categories          x11
 maintainers         blb openmaintainer
 description         Window information utility for X11
@@ -20,7 +21,7 @@
 
 depends_build       port:pkgconfig
 
-depends_lib         lib:libXext.6:xorg-libXext
+depends_lib         port:xorg-libXext
 
 livecheck.check     regex
 livecheck.regex     ${name}-(\[\\d.\]+)${extract.suffix}

Modified: trunk/dports/x11/xwud/Portfile
===================================================================
--- trunk/dports/x11/xwud/Portfile	2009-01-18 19:52:04 UTC (rev 45602)
+++ trunk/dports/x11/xwud/Portfile	2009-01-18 20:52:41 UTC (rev 45603)
@@ -3,6 +3,7 @@
 PortSystem          1.0
 name                xwud
 version             1.0.1
+revision            1
 categories          x11 graphics
 maintainers         blb openmaintainer
 description         Image displayer for X11
@@ -20,7 +21,7 @@
 
 depends_build       port:pkgconfig
 
-depends_lib         lib:libX11.6:xorg-libX11
+depends_lib         port:xorg-libX11
 
 configure.args      --mandir=${prefix}/share/man
 

Modified: trunk/dports/xfce/libxfce4mcs/Portfile
===================================================================
--- trunk/dports/xfce/libxfce4mcs/Portfile	2009-01-18 19:52:04 UTC (rev 45602)
+++ trunk/dports/xfce/libxfce4mcs/Portfile	2009-01-18 20:52:41 UTC (rev 45603)
@@ -4,6 +4,7 @@
 
 name		libxfce4mcs
 version		4.4.3
+revision        1
 categories	xfce
 platforms	darwin
 maintainers	afb at macports.org
@@ -20,4 +21,4 @@
 
 depends_lib	port:libxfce4util \
 		port:startup-notification \
-		lib:libX11:XFree86
+		port:xorg-libs

Modified: trunk/dports/xfce/xfwm4/Portfile
===================================================================
--- trunk/dports/xfce/xfwm4/Portfile	2009-01-18 19:52:04 UTC (rev 45602)
+++ trunk/dports/xfce/xfwm4/Portfile	2009-01-18 20:52:41 UTC (rev 45603)
@@ -4,6 +4,7 @@
 
 name		xfwm4
 version		4.4.3
+revision        1
 categories	xfce
 platforms	darwin
 maintainers	afb at macports.org
@@ -18,4 +19,4 @@
 
 configure.args	--enable-randr --enable-startup-notification \
 		--disable-compositor --disable-xsync
-depends_lib	port:xfce-mcs-manager port:gtk2 lib:libXrandr:XFree86
+depends_lib	port:xfce-mcs-manager port:gtk2 port:xorg-libs
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20090118/843f17fa/attachment-0001.html>


More information about the macports-changes mailing list