[50572] trunk/dports
jeremyhu at macports.org
jeremyhu at macports.org
Mon May 4 12:19:10 PDT 2009
Revision: 50572
http://trac.macports.org/changeset/50572
Author: jeremyhu at macports.org
Date: 2009-05-04 12:19:09 -0700 (Mon, 04 May 2009)
Log Message:
-----------
All ports: Remove reference to $x11prefix
Now that the X11 libs are provided by MacPorts and the +system_x11
compatability variant is gone, there is no need to use the system X11 libs and
headers. Users can still use the system X11 server (or any server for that
matter).
Some ports have received revision bumps becasue they were previously referring
to x11prefix even when the users were not using +system_x11. The revision
bump fixes the reference and forces a rebuild. Other ports have NOT received
revision bumps because they should be identical to what would've been
installed by default (-system_x11) before this patch.
Modified Paths:
--------------
trunk/dports/aqua/osx2x/Portfile
trunk/dports/audio/easytag/Portfile
trunk/dports/audio/easytag-devel/Portfile
trunk/dports/devel/evas/Portfile
trunk/dports/devel/gtkglext/Portfile
trunk/dports/devel/hat/Portfile
trunk/dports/devel/inventor/Portfile
trunk/dports/devel/libast/Portfile
trunk/dports/devel/libgdiplus/Portfile
trunk/dports/devel/mono/Portfile
trunk/dports/devel/pkgconfig/Portfile
trunk/dports/devel/xulrunner/Portfile
trunk/dports/editors/elvis/Portfile
trunk/dports/editors/emacs/Portfile
trunk/dports/games/gnubg/Portfile
trunk/dports/games/jnethack/Portfile
trunk/dports/gnome/at-spi/Portfile
trunk/dports/gnustep/gnustep-make/Portfile
trunk/dports/graphics/SimGear/Portfile
trunk/dports/graphics/antigraingeometry/Portfile
trunk/dports/graphics/cairo/Portfile
trunk/dports/graphics/cairo-devel/Portfile
trunk/dports/graphics/jasper/Portfile
trunk/dports/graphics/libguichan/Portfile
trunk/dports/graphics/magicpoint/Portfile
trunk/dports/graphics/openvrml/Portfile
trunk/dports/graphics/pgplot/Portfile
trunk/dports/graphics/vtk/Portfile
trunk/dports/graphics/vtk5/Portfile
trunk/dports/graphics/xaos/Portfile
trunk/dports/graphics/xpdf/Portfile
trunk/dports/lang/otcl/Portfile
trunk/dports/lang/swi-prolog/Portfile
trunk/dports/lang/swi-prolog-devel/Portfile
trunk/dports/lang/tclcl/Portfile
trunk/dports/mail/procmail/Portfile
trunk/dports/math/R/Portfile
trunk/dports/multimedia/mpeg2vidcodec/Portfile
trunk/dports/net/driftnet/Portfile
trunk/dports/net/logjam/Portfile
trunk/dports/net/openssh/Portfile
trunk/dports/print/espgs/Portfile
trunk/dports/print/gv/Portfile
trunk/dports/python/py-game/Portfile
trunk/dports/python/py-gtk2/Portfile
trunk/dports/python/py25-game/Portfile
trunk/dports/python/py25-gtk/Portfile
trunk/dports/python/py26-game/Portfile
trunk/dports/python/py26-mapnik/Portfile
trunk/dports/science/geomview/Portfile
trunk/dports/science/gwyddion/Portfile
trunk/dports/science/opendx/Portfile
trunk/dports/science/triangle/Portfile
trunk/dports/sysutils/wmcpuload/Portfile
trunk/dports/www/firefox-x11/Portfile
trunk/dports/www/firefox-x11-devel/Portfile
trunk/dports/www/mozplugger/Portfile
trunk/dports/x11/SoXt/Portfile
trunk/dports/x11/XFree86/Portfile
trunk/dports/x11/Xaw3d/Portfile
trunk/dports/x11/abclock/Portfile
trunk/dports/x11/aewm/Portfile
trunk/dports/x11/aterm/Portfile
trunk/dports/x11/desklaunch/Portfile
trunk/dports/x11/evilwm/Portfile
trunk/dports/x11/eyeclock/Portfile
trunk/dports/x11/fireworkx/Portfile
trunk/dports/x11/fox/Portfile
trunk/dports/x11/grace/Portfile
trunk/dports/x11/gtk2/Portfile
trunk/dports/x11/gtkglarea2/Portfile
trunk/dports/x11/kinput2/Portfile
trunk/dports/x11/luit/Portfile
trunk/dports/x11/mkfontscale/Portfile
trunk/dports/x11/openmotif/Portfile
trunk/dports/x11/pango/Portfile
trunk/dports/x11/qt4-x11/Portfile
trunk/dports/x11/rox-filer/Portfile
trunk/dports/x11/unclutter/Portfile
trunk/dports/x11/windowmaker/Portfile
trunk/dports/x11/wine/Portfile
trunk/dports/x11/wine/files/wine.in
trunk/dports/x11/wine-crossover-games/Portfile
trunk/dports/x11/wine-crossover-games/files/wine.in
trunk/dports/x11/wine-devel/Portfile
trunk/dports/x11/wine-devel/files/wine.in
trunk/dports/x11/wmcalclock/Portfile
trunk/dports/x11/wmcube/Portfile
trunk/dports/x11/wxgtk/Portfile
trunk/dports/x11/xauth/Portfile
trunk/dports/x11/xcircuit/Portfile
trunk/dports/x11/xdiskusage/Portfile
trunk/dports/x11/xeyes/Portfile
trunk/dports/x11/xfe/Portfile
trunk/dports/x11/xforms/Portfile
trunk/dports/x11/xglobe/Portfile
trunk/dports/x11/xinit/Portfile
trunk/dports/x11/xmove/Portfile
trunk/dports/x11/xorg-server/Portfile
trunk/dports/x11/xorg-server-devel/Portfile
trunk/dports/x11/xping/Portfile
trunk/dports/x11/xroot/Portfile
trunk/dports/x11/xterm/Portfile
trunk/dports/xfce/libxfcegui4/Portfile
trunk/dports/xfce/xfce-utils/Portfile
trunk/dports/xfce/xfce4-settings/Portfile
trunk/dports/xfce/xfconf/Portfile
trunk/dports/xfce/xfprint/Portfile
Modified: trunk/dports/aqua/osx2x/Portfile
===================================================================
--- trunk/dports/aqua/osx2x/Portfile 2009-05-04 18:52:57 UTC (rev 50571)
+++ trunk/dports/aqua/osx2x/Portfile 2009-05-04 19:19:09 UTC (rev 50572)
@@ -38,17 +38,13 @@
post-patch {
reinplace s|@PREFIX@|$prefix| $worksrcpath/osx2x.xcodeproj/project.pbxproj
- if {[file exists ${prefix}/lib/libX11.dylib]} {
- reinplace s|@X11_PREFIX@|$prefix| $worksrcpath/osx2x.xcodeproj/project.pbxproj
- } else {
- reinplace s|@X11_PREFIX@|$x11prefix| $worksrcpath/osx2x.xcodeproj/project.pbxproj
- }
+ reinplace s|@X11_PREFIX@|$prefix| $worksrcpath/osx2x.xcodeproj/project.pbxproj
}
depends_lib port:xorg-libXtst \
port:openssl
-set library_search_path "LIBRARY_SEARCH_PATHS='$prefix/lib $x11prefix/lib'"
+set library_search_path "LIBRARY_SEARCH_PATHS='$prefix/lib'"
eval xcode.build.settings-append $library_search_path
eval xcode.destroot.settings-append $library_search_path
Modified: trunk/dports/audio/easytag/Portfile
===================================================================
--- trunk/dports/audio/easytag/Portfile 2009-05-04 18:52:57 UTC (rev 50571)
+++ trunk/dports/audio/easytag/Portfile 2009-05-04 19:19:09 UTC (rev 50572)
@@ -36,11 +36,6 @@
depends_build port:hicolor-icon-theme
-if { ![file exists ${prefix}/lib/pkgconfig/x11.pc] } {
- configure.cppflags-append -I${x11prefix}/include
- configure.ldflags-append -L${x11prefix}/lib
-}
-
configure.args --mandir=${prefix}/share/man \
--infodir=${prefix}/share/info
Modified: trunk/dports/audio/easytag-devel/Portfile
===================================================================
--- trunk/dports/audio/easytag-devel/Portfile 2009-05-04 18:52:57 UTC (rev 50571)
+++ trunk/dports/audio/easytag-devel/Portfile 2009-05-04 19:19:09 UTC (rev 50572)
@@ -31,11 +31,6 @@
depends_build port:hicolor-icon-theme
-if { ![file exists ${prefix}/lib/pkgconfig/x11.pc] } {
- configure.cppflags-append -I${x11prefix}/include
- configure.ldflags-append -L${x11prefix}/lib
-}
-
configure.args --mandir=${prefix}/share/man \
--infodir=${prefix}/share/info \
--disable-flac \
Modified: trunk/dports/devel/evas/Portfile
===================================================================
--- trunk/dports/devel/evas/Portfile 2009-05-04 18:52:57 UTC (rev 50571)
+++ trunk/dports/devel/evas/Portfile 2009-05-04 19:19:09 UTC (rev 50572)
@@ -30,7 +30,6 @@
port:imlib2 \
path:include/gif_lib.h:giflib
-configure.cppflags-append "-I${x11prefix}/include"
configure.args --mandir=${prefix}/share/man \
--enable-glitz-x11 \
--enable-gl-x11 \
Modified: trunk/dports/devel/gtkglext/Portfile
===================================================================
--- trunk/dports/devel/gtkglext/Portfile 2009-05-04 18:52:57 UTC (rev 50571)
+++ trunk/dports/devel/gtkglext/Portfile 2009-05-04 19:19:09 UTC (rev 50572)
@@ -21,23 +21,4 @@
port:xorg-libXmu \
port:gtk2
-# AC_X_PATH blindly asks xmkmf where X11 is, and it always uses /usr/X11R6.
-# This block helps us link correctly and setup our pc files correctly when we
-# are +system_x11 and x11prefix is somewhere non-standard and should cause
-# AC_X_PATH to let us setup our CPPFLAGS and LDFLAGS without interference
-configure.args-append --x-include=${prefix}/include --x-lib=${prefix}/lib
-if { ![file exists ${prefix}/lib/pkgconfig/x11.pc] } {
- pre-configure {
- configure.cppflags-append -I${x11prefix}/include
- configure.ldflags-append -L${x11prefix}/lib
- }
-
- # And this will similarly get ports that use pkgconfig to find our pkgconfig-less libX11
- post-destroot {
- if {![file exists ${x11prefix}/lib/pkgconfig/x11.pc]} {
- foreach pc [glob ${destroot}${prefix}/lib/pkgconfig/*.pc] {
- reinplace "s:-lXt:-L${prefix}/lib -L${x11prefix}/lib -lXt:g" ${pc}
- }
- }
- }
-}
+configure.args --x-include=${prefix}/include --x-lib=${prefix}/lib
Modified: trunk/dports/devel/hat/Portfile
===================================================================
--- trunk/dports/devel/hat/Portfile 2009-05-04 18:52:57 UTC (rev 50571)
+++ trunk/dports/devel/hat/Portfile 2009-05-04 19:19:09 UTC (rev 50572)
@@ -34,10 +34,6 @@
#user_notes Despite being compatible with both nhc98 and ghc, the \
# port depends on the more featureful ghc.
-#
-# If the message "resize: command not found" appears,
-# you need to add ${x11prefix}/bin to your PATH.
-#
configure.args --mandir=${prefix}/share/man/man1
Modified: trunk/dports/devel/inventor/Portfile
===================================================================
--- trunk/dports/devel/inventor/Portfile 2009-05-04 18:52:57 UTC (rev 50571)
+++ trunk/dports/devel/inventor/Portfile 2009-05-04 19:19:09 UTC (rev 50572)
@@ -59,12 +59,8 @@
patch-widgets-GNUmakefile.componentTest.diff
post-patch {
- reinplace "s|__PREFIX__|${prefix}|" ${worksrcpath}/make/ivcommondefs
- if { [file exists ${prefix}/lib/pkgconfig/x11.pc] } {
- reinplace "s|/usr/X11R6|${prefix}|" ${worksrcpath}/make/ivcommondefs
- } else {
- reinplace "s|/usr/X11R6|${x11prefix}|" ${worksrcpath}/make/ivcommondefs
- }
+ reinplace "s|__PREFIX__|${prefix}|" ${worksrcpath}/make/ivcommondefs
+ reinplace "s|/usr/X11R6|${prefix}|" ${worksrcpath}/make/ivcommondefs
}
universal_variant no
Modified: trunk/dports/devel/libast/Portfile
===================================================================
--- trunk/dports/devel/libast/Portfile 2009-05-04 18:52:57 UTC (rev 50571)
+++ trunk/dports/devel/libast/Portfile 2009-05-04 19:19:09 UTC (rev 50572)
@@ -33,4 +33,4 @@
use_autoconf yes
autoconf.cmd autoreconf
autoconf.args -fvi
-autoconf.env ACLOCAL="aclocal -I ${prefix}/share/aclocal -I ${x11prefix}/share/aclocal -I ."
+autoconf.env ACLOCAL="aclocal -I ${prefix}/share/aclocal -I ."
Modified: trunk/dports/devel/libgdiplus/Portfile
===================================================================
--- trunk/dports/devel/libgdiplus/Portfile 2009-05-04 18:52:57 UTC (rev 50571)
+++ trunk/dports/devel/libgdiplus/Portfile 2009-05-04 19:19:09 UTC (rev 50572)
@@ -35,8 +35,6 @@
port:xorg-libsm \
port:xrender
-configure.cppflags-append -I${x11prefix}/include
-
post-patch {
reinplace "s/-pthread/-lpthread/g" ${worksrcpath}/configure
}
Modified: trunk/dports/devel/mono/Portfile
===================================================================
--- trunk/dports/devel/mono/Portfile 2009-05-04 18:52:57 UTC (rev 50571)
+++ trunk/dports/devel/mono/Portfile 2009-05-04 19:19:09 UTC (rev 50572)
@@ -27,8 +27,6 @@
patchfiles patch-configure.diff
-configure.pkg_config "${prefix}/bin/pkg-config"
-configure.pkg_config_path "${prefix}/lib/pkgconfig:${x11prefix}/lib/pkgconfig"
configure.env-append ACLOCAL_FLAGS="-I ${prefix}/share/aclocal"
# Do NOT pick up external boehmgc (prefixing CPPFLAGS or CFLAGS does not suffice -- ugly++)
configure.cc-append "-I${worksrcpath}/libgc/include"
Modified: trunk/dports/devel/pkgconfig/Portfile
===================================================================
--- trunk/dports/devel/pkgconfig/Portfile 2009-05-04 18:52:57 UTC (rev 50571)
+++ trunk/dports/devel/pkgconfig/Portfile 2009-05-04 19:19:09 UTC (rev 50572)
@@ -29,7 +29,7 @@
configure.args \
--enable-indirect-deps \
- --with-pc-path=${prefix}/lib/pkgconfig:${prefix}/share/pkgconfig:${x11prefix}/lib/pkgconfig
+ --with-pc-path=${prefix}/lib/pkgconfig:${prefix}/share/pkgconfig
platform darwin 6 {
configure.cppflags-append \
Modified: trunk/dports/devel/xulrunner/Portfile
===================================================================
--- trunk/dports/devel/xulrunner/Portfile 2009-05-04 18:52:57 UTC (rev 50571)
+++ trunk/dports/devel/xulrunner/Portfile 2009-05-04 19:19:09 UTC (rev 50572)
@@ -208,17 +208,6 @@
installdir="${prefix}/lib/${name}" \
sdkdir="${prefix}/lib/${name}"
-# AC_X_PATH blindly asks xmkmf where X11 is, and it always uses /usr/X11R6.
-# This block helps us link correctly when we are +system_x11 and x11prefix
-# is somewhere non-standard and should cause AC_X_PATH to let us setup our
-# CPPFLAGS and LDFLAGS without interference
-pre-configure {
- if { ![file exists ${prefix}/lib/pkgconfig/x11.pc] } {
- configure.cppflags-append -I${x11prefix}/include
- configure.ldflags-append -L${x11prefix}/lib
- }
-}
-
post-destroot {
# Workaround to get root certs loaded, so https:// works
ln -s ${prefix}/lib/nss/libnssckbi.dylib ${destroot}${prefix}/lib/${name}/libnssckbi.dylib
Modified: trunk/dports/editors/elvis/Portfile
===================================================================
--- trunk/dports/editors/elvis/Portfile 2009-05-04 18:52:57 UTC (rev 50571)
+++ trunk/dports/editors/elvis/Portfile 2009-05-04 19:19:09 UTC (rev 50572)
@@ -25,11 +25,7 @@
# configure.args-delete --without-x
# configure.args-append --with-x
#
-# if { [file exists ${prefix}/lib/libX11.dylib]} {
-# configure.args-append --x-includes=${prefix}/include --x-libraries=${prefix}/lib
-# } else {
-# configure.args-append --x-includes=${x11prefix}/include --x-libraries=${x11prefix}/lib
-# }
+# configure.args-append --x-includes=${prefix}/include --x-libraries=${prefix}/lib
#
# build.args-append CC="gcc -I${prefix}/include `${prefix}/bin/freetype-config --cflags`"
#}
Modified: trunk/dports/editors/emacs/Portfile
===================================================================
--- trunk/dports/editors/emacs/Portfile 2009-05-04 18:52:57 UTC (rev 50571)
+++ trunk/dports/editors/emacs/Portfile 2009-05-04 19:19:09 UTC (rev 50572)
@@ -60,12 +60,6 @@
lib:libtiff:tiff \
path:include/gif_lib.h:giflib \
lib:libpng:libpng
-
- pre-configure {
- if { ![file exists ${prefix}/lib/pkgconfig/x11.pc] } {
- configure.ldflags-append -L${x11prefix}/lib
- }
- }
}
variant motif requires x11 description {Builds emacs as an X11 program with Motif widgets} {
Modified: trunk/dports/games/gnubg/Portfile
===================================================================
--- trunk/dports/games/gnubg/Portfile 2009-05-04 18:52:57 UTC (rev 50571)
+++ trunk/dports/games/gnubg/Portfile 2009-05-04 19:19:09 UTC (rev 50572)
@@ -44,15 +44,8 @@
platform darwin 9 { patchfiles-append patch-rollout.h.diff }
configure.cflags-append "-lmx"
+configure.ldflags-append "-L${prefix}/lib -lX11 -bind_at_load -multiply_defined suppress"
-pre-configure {
- if { [file exists ${prefix}/lib/pkgconfig/x11.pc] } {
- configure.ldflags-append "-L${prefix}/lib -lX11 -bind_at_load -multiply_defined suppress"
- } else {
- configure.ldflags-append "-L${x11prefix}/lib -lX11 -bind_at_load -multiply_defined suppress"
- }
-}
-
configure.args --mandir=${prefix}/share/man \
--infodir=${prefix}/share/info \
--sysconfdir=${prefix}/etc \
Modified: trunk/dports/games/jnethack/Portfile
===================================================================
--- trunk/dports/games/jnethack/Portfile 2009-05-04 18:52:57 UTC (rev 50571)
+++ trunk/dports/games/jnethack/Portfile 2009-05-04 19:19:09 UTC (rev 50572)
@@ -61,11 +61,6 @@
set jn_cflags "${jn_cflags} ${configure.universal_cflags}"
}
- if {[variant_isset x11] && ![file exists ${prefix}/lib/pkgconfig/x11.pc] } {
- set jn_cflags "${jn_cflags} -I${x11prefix}/include"
- set jn_ldflags "${jn_ldflags} -L${x11prefix}/lib"
- }
-
foreach f {sys/unix/Makefile.doc
sys/unix/Makefile.src
sys/unix/Makefile.top
Modified: trunk/dports/gnome/at-spi/Portfile
===================================================================
--- trunk/dports/gnome/at-spi/Portfile 2009-05-04 18:52:57 UTC (rev 50571)
+++ trunk/dports/gnome/at-spi/Portfile 2009-05-04 19:19:09 UTC (rev 50572)
@@ -36,18 +36,7 @@
configure.env PYTHON=${prefix}/bin/python2.5
variant x11 conflicts quartz description {Use X11 (default)} {
- configure.args-append --with-x
- # AC_X_PATH blindly asks xmkmf where X11 is, and it always uses /usr/X11R6.
- # This block helps us link correctly and setup our pc files correctly when we
- # are +system_x11 and x11prefix is somewhere non-standard and should cause
- # AC_X_PATH to let us setup our CPPFLAGS and LDFLAGS without interference
- configure.args-append --x-include=${prefix}/include --x-lib=${prefix}/lib
- if {![file exists ${prefix}/lib/pkgconfig/x11.pc]} {
- pre-configure {
- configure.cppflags-append -I${x11prefix}/include
- configure.ldflags-append -L${x11prefix}/lib
- }
- }
+ configure.args-append --with-x --x-include=${prefix}/include --x-lib=${prefix}/lib
}
variant quartz conflicts x11 description {Use Quartz (broken)} {
Modified: trunk/dports/gnustep/gnustep-make/Portfile
===================================================================
--- trunk/dports/gnustep/gnustep-make/Portfile 2009-05-04 18:52:57 UTC (rev 50571)
+++ trunk/dports/gnustep/gnustep-make/Portfile 2009-05-04 19:19:09 UTC (rev 50572)
@@ -64,7 +64,7 @@
to your shell login (in ~/.profile)
You may also want to set up your MANPATH :
-export MANPATH=\$GNUSTEP_LOCAL_ROOT/Library/Documentation/man:\$GNUSTEP_SYSTEM_ROOT/Library/Documentation/man:${prefix}/share/man:/usr/share/man:${x11prefix}/man
+export MANPATH=\$GNUSTEP_LOCAL_ROOT/Library/Documentation/man:\$GNUSTEP_SYSTEM_ROOT/Library/Documentation/man:${prefix}/share/man:/usr/share/man
##########################################################
"
}
Modified: trunk/dports/graphics/SimGear/Portfile
===================================================================
--- trunk/dports/graphics/SimGear/Portfile 2009-05-04 18:52:57 UTC (rev 50571)
+++ trunk/dports/graphics/SimGear/Portfile 2009-05-04 19:19:09 UTC (rev 50572)
@@ -26,16 +26,4 @@
port:openal \
port:xorg-libX11
-configure.args --with-x
-
-# AC_X_PATH blindly asks xmkmf where X11 is, and it always uses /usr/X11R6.
-# This block helps us link correctly and setup our pc files correctly when we
-# are +system_x11 and x11prefix is somewhere non-standard and should cause
-# AC_X_PATH to let us setup our CPPFLAGS and LDFLAGS without interference
-configure.args-append --x-include=${prefix}/include --x-lib=${prefix}/lib
-if { ![file exists ${prefix}/lib/pkgconfig/x11.pc] } {
- pre-configure {
- configure.cppflags-append -I${x11prefix}/include
- configure.ldflags-append -L${x11prefix}/lib
- }
-}
+configure.args --with-x --x-include=${prefix}/include --x-lib=${prefix}/lib
Modified: trunk/dports/graphics/antigraingeometry/Portfile
===================================================================
--- trunk/dports/graphics/antigraingeometry/Portfile 2009-05-04 18:52:57 UTC (rev 50571)
+++ trunk/dports/graphics/antigraingeometry/Portfile 2009-05-04 19:19:09 UTC (rev 50572)
@@ -38,30 +38,11 @@
use_autoreconf yes
autoreconf.args -fvi
autoreconf.env AUTOMAKE="automake --foreign --add-missing --ignore-deps"
+
configure.cxxflags "-I${prefix}/include"
+configure.args --x-include=${prefix}/include --x-lib=${prefix}/lib
variant sdl {
patchfiles-delete configure.in.diff src-platform-Makefile.am.diff
depends_lib-append port:libsdl
}
-
-# AC_X_PATH blindly asks xmkmf where X11 is, and it always uses /usr/X11R6.
-# This block helps us link correctly and setup our pc files correctly when we
-# are +system_x11 and x11prefix is somewhere non-standard and should cause
-# AC_X_PATH to let us setup our CPPFLAGS and LDFLAGS without interference
-configure.args-append --x-include=${prefix}/include --x-lib=${prefix}/lib
-if { ![file exists ${prefix}/lib/pkgconfig/x11.pc] } {
- pre-configure {
- configure.cppflags-append -I${x11prefix}/include
- configure.ldflags-append -L${x11prefix}/lib
- }
-
- # And this will similarly get ports that use pkgconfig to find our pkgconfig-less libX11
- post-destroot {
- if {![file exists ${x11prefix}/lib/pkgconfig/x11.pc]} {
- foreach pc [glob ${destroot}${prefix}/lib/pkgconfig/*.pc] {
- reinplace "s:-lX11:-L${prefix}/lib -L${x11prefix}/lib -lX11:g" ${pc}
- }
- }
- }
-}
Modified: trunk/dports/graphics/cairo/Portfile
===================================================================
--- trunk/dports/graphics/cairo/Portfile 2009-05-04 18:52:57 UTC (rev 50571)
+++ trunk/dports/graphics/cairo/Portfile 2009-05-04 19:19:09 UTC (rev 50572)
@@ -76,28 +76,9 @@
--enable-xlib \
--enable-xlib-xrender \
--with-x
+ --x-include=${prefix}/include \
+ --x-lib=${prefix}/lib
-# AC_X_PATH blindly asks xmkmf where X11 is, and it always uses /usr/X11R6.
-# This block helps us link correctly and setup our pc files correctly when we
-# are +system_x11 and x11prefix is somewhere non-standard and should cause
-# AC_X_PATH to let us setup our CPPFLAGS and LDFLAGS without interference
-configure.args-append --x-include=${prefix}/include --x-lib=${prefix}/lib
-if { ![file exists ${prefix}/lib/pkgconfig/x11.pc] } {
- pre-configure {
- configure.cppflags-append -I${x11prefix}/include
- configure.ldflags-append -L${x11prefix}/lib
- }
-
- # And this will similarly get ports that use pkgconfig to find our pkgconfig-less libX11
- post-destroot {
- if {![file exists ${x11prefix}/lib/pkgconfig/x11.pc]} {
- foreach pc [glob ${destroot}${prefix}/lib/pkgconfig/*.pc] {
- reinplace "s:-lX11:-L${prefix}/lib -L${x11prefix}/lib -lX11:g" ${pc}
- }
- }
- }
-}
-
variant glitz conflicts no_x11 description {Add glitz graphics interface} {
depends_lib-append \
port:glitz
Modified: trunk/dports/graphics/cairo-devel/Portfile
===================================================================
--- trunk/dports/graphics/cairo-devel/Portfile 2009-05-04 18:52:57 UTC (rev 50571)
+++ trunk/dports/graphics/cairo-devel/Portfile 2009-05-04 19:19:09 UTC (rev 50572)
@@ -74,30 +74,9 @@
--enable-svg \
--enable-xlib \
--enable-xlib-xrender \
- --with-x
+ --with-x --x-include=${prefix}/include --x-lib=${prefix}/lib
# change --enable-freetype to --enable-ft starting with cairo-devel 1.9.x
-# AC_X_PATH blindly asks xmkmf where X11 is, and it always uses /usr/X11R6.
-# This block helps us link correctly and setup our pc files correctly when we
-# are +system_x11 and x11prefix is somewhere non-standard and should cause
-# AC_X_PATH to let us setup our CPPFLAGS and LDFLAGS without interference
-configure.args-append --x-include=${prefix}/include --x-lib=${prefix}/lib
-if { ![file exists ${prefix}/lib/pkgconfig/x11.pc] } {
- pre-configure {
- configure.cppflags-append -I${x11prefix}/include
- configure.ldflags-append -L${x11prefix}/lib
- }
-
- # And this will similarly get ports that use pkgconfig to find our pkgconfig-less libX11
- post-destroot {
- if {![file exists ${x11prefix}/lib/pkgconfig/x11.pc]} {
- foreach pc [glob ${destroot}${prefix}/lib/pkgconfig/*.pc] {
- reinplace "s:-lX11:-L${prefix}/lib -L${x11prefix}/lib -lX11:g" ${pc}
- }
- }
- }
-}
-
variant glitz conflicts no_x11 description {Add glitz graphics interface} {
depends_lib-append \
port:glitz
Modified: trunk/dports/graphics/jasper/Portfile
===================================================================
--- trunk/dports/graphics/jasper/Portfile 2009-05-04 18:52:57 UTC (rev 50571)
+++ trunk/dports/graphics/jasper/Portfile 2009-05-04 19:19:09 UTC (rev 50572)
@@ -51,12 +51,6 @@
configure.args-delete --disable-opengl
configure.args-append --enable-opengl
-
- # In case mesa was installed with system_x11.
- if { ![file exists ${prefix}/lib/pkgconfig/x11.pc] } {
- configure.cppflags-append -I${x11prefix}/include
- configure.ldflags-append -L${x11prefix}/lib
- }
}
livecheck.check regex
Modified: trunk/dports/graphics/libguichan/Portfile
===================================================================
--- trunk/dports/graphics/libguichan/Portfile 2009-05-04 18:52:57 UTC (rev 50571)
+++ trunk/dports/graphics/libguichan/Portfile 2009-05-04 19:19:09 UTC (rev 50572)
@@ -19,14 +19,10 @@
sha1 5993e0a5e948b0f3e614025ff02f818bfe9c2198 \
rmd160 a8ab10d9c49542e018d688b9ee90ef2879f94a28
-depends_lib port:libsdl port:libsdl_image port:allegro
+depends_lib port:libsdl port:libsdl_image port:allegro port:mesa
-configure.cppflags-append -I${x11prefix}/include
-configure.ldflags-append -L${x11prefix}/lib
use_parallel_build yes
-platform darwin 9 {
- configure.ldflags-append "-Wl,-dylib_file,/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib:/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib"
-}
+configure.args --x-include=${prefix}/include --x-lib=${prefix}/lib
livecheck.regex <a href=\"http://guichan.googlecode.com/files/guichan\\-(.*)${extract.suffix}\"
Modified: trunk/dports/graphics/magicpoint/Portfile
===================================================================
--- trunk/dports/graphics/magicpoint/Portfile 2009-05-04 18:52:57 UTC (rev 50571)
+++ trunk/dports/graphics/magicpoint/Portfile 2009-05-04 19:19:09 UTC (rev 50572)
@@ -29,8 +29,6 @@
universal_variant no
-# LOCALPREFIX= is for configure to find libungif.
-configure.env PKG_CONFIG_PATH=${x11prefix}/lib/pkgconfig LOCALPREFIX=${prefix}
configure.args --enable-gif --mandir=${prefix}/share/man
post-configure {
Modified: trunk/dports/graphics/openvrml/Portfile
===================================================================
--- trunk/dports/graphics/openvrml/Portfile 2009-05-04 18:52:57 UTC (rev 50571)
+++ trunk/dports/graphics/openvrml/Portfile 2009-05-04 19:19:09 UTC (rev 50572)
@@ -50,15 +50,10 @@
--x-libraries=${prefix}/lib
configure.env-append BOOST_LIB_SUFFIX=-mt
-# For +system_x11 variant
-if { ![file exists ${prefix}/lib/pkgconfig/gl.pc] } {
- configure.args-delete --x-includes=${prefix}/include \
- --x-libraries=${prefix}/lib
-}
-
use_parallel_build yes
variant js_mozilla description {Enable support for JavaScript in the Script node with Mozilla} {
+ # TODO: This should use port:xulrunner instead
depends_lib-append port:mozilla
configure.args-delete --disable-script-node-javascript
}
@@ -81,6 +76,7 @@
}
variant mozilla_plugin requires xembed description {Build the Mozilla plug-in} {
+ # TODO: This should use port:xulrunner instead
depends_lib-append port:mozilla
configure.args-delete --disable-mozilla-plugin
}
Modified: trunk/dports/graphics/pgplot/Portfile
===================================================================
--- trunk/dports/graphics/pgplot/Portfile 2009-05-04 18:52:57 UTC (rev 50571)
+++ trunk/dports/graphics/pgplot/Portfile 2009-05-04 19:19:09 UTC (rev 50572)
@@ -79,17 +79,10 @@
"-dynamiclib -single_module -current_version ${version} -compatibility_version ${compat_version}"
if {![variant_isset no_x11]} {
- if { [file exists ${prefix}/lib/pkgconfig/x11.pc] || [file exists ${x11prefix}/lib/pkgconfig/x11.pc] } {
- # XQuartz or MacPorts X11 (pkg-config gives precedence to MacPorts X11)
- eval configure.ldflags-append [exec pkg-config x11 --libs-only-L]
- set x11Libs [exec pkg-config x11 --libs-only-l]
- eval configure.cppflags-append [exec pkg-config x11 --cflags]
- } else {
- # Tiger or earlier X11 (xorg-libX11 installed with system_x11 variant)
- configure.ldflags-append "-L${x11prefix}/lib"
- set x11Libs -lX11
- configure.cppflags-append "-I${x11prefix}/include"
- }
+ # XQuartz or MacPorts X11 (pkg-config gives precedence to MacPorts X11)
+ eval configure.ldflags-append [exec pkg-config x11 --libs-only-L]
+ set x11Libs [exec pkg-config x11 --libs-only-l]
+ eval configure.cppflags-append [exec pkg-config x11 --cflags]
} else {
set x11Libs ""
}
Modified: trunk/dports/graphics/vtk/Portfile
===================================================================
--- trunk/dports/graphics/vtk/Portfile 2009-05-04 18:52:57 UTC (rev 50571)
+++ trunk/dports/graphics/vtk/Portfile 2009-05-04 19:19:09 UTC (rev 50572)
@@ -67,6 +67,3 @@
-D OPENGL_gl_LIBRARY:FILEPATH=${prefix}/lib/libGL.dylib \
-D OPENGL_glu_LIBRARY:FILEPATH=${prefix}/lib/libGLU.dylib
}
-
-#variant system_x11 description {Build VTK with the Apple X11 libraries} {
-#}
Modified: trunk/dports/graphics/vtk5/Portfile
===================================================================
--- trunk/dports/graphics/vtk5/Portfile 2009-05-04 18:52:57 UTC (rev 50571)
+++ trunk/dports/graphics/vtk5/Portfile 2009-05-04 19:19:09 UTC (rev 50572)
@@ -5,7 +5,7 @@
name vtk5
version 5.2.1
-revision 1
+revision 2
set branch [join [lrange [split ${version} .] 0 1] .]
categories graphics devel
maintainers nomaintainer
@@ -95,8 +95,8 @@
configure.args-append \
-DVTK_USE_COCOA:BOOL=OFF \
-DVTK_USE_X:BOOL=ON \
- -DOPENGL_gl_LIBRARY:FILEPATH=${x11prefix}/lib/libGL.dylib \
- -DOPENGL_glu_LIBRARY:FILEPATH=${x11prefix}/lib/libGLU.dylib
+ -DOPENGL_gl_LIBRARY:FILEPATH=${prefix}/lib/libGL.dylib \
+ -DOPENGL_glu_LIBRARY:FILEPATH=${prefix}/lib/libGLU.dylib
}
variant tcltk conflicts carbon description {build with Tcl wrappers and Tk support} {
Modified: trunk/dports/graphics/xaos/Portfile
===================================================================
--- trunk/dports/graphics/xaos/Portfile 2009-05-04 18:52:57 UTC (rev 50571)
+++ trunk/dports/graphics/xaos/Portfile 2009-05-04 19:19:09 UTC (rev 50572)
@@ -41,15 +41,6 @@
--with-long-double=yes \
--disable-nls \
--mandir=${prefix}/share/man \
- --infodir=${prefix}/share/info
+ --infodir=${prefix}/share/info \
+ --x-includes=${prefix}/include --x-libraries=${prefix}/lib
-platform macosx {
- if {[file exists ${prefix}/lib/pkgconfig/x11.pc]} {
- configure.args-append --x-includes=${prefix}/include \
- --x-libraries=${prefix}/lib
- } else {
- configure.args-append --x-includes=${x11prefix}/include \
- --x-libraries=${x11prefix}/lib
- }
-}
-
Modified: trunk/dports/graphics/xpdf/Portfile
===================================================================
--- trunk/dports/graphics/xpdf/Portfile 2009-05-04 18:52:57 UTC (rev 50571)
+++ trunk/dports/graphics/xpdf/Portfile 2009-05-04 19:19:09 UTC (rev 50572)
@@ -83,8 +83,6 @@
--enable-wordlist \
--enable-opi
configure.cxxflags-append "-I${prefix}/include/freetype2 -I${prefix}/include"
-configure.cflags-append "-I${x11prefix}/include"
-configure.cppflags-append "-I${x11prefix}/include"
configure.ldflags-append "-lz"
variant a4 description {Use A4 as the default paper size instead of Letter} {
Modified: trunk/dports/lang/otcl/Portfile
===================================================================
--- trunk/dports/lang/otcl/Portfile 2009-05-04 18:52:57 UTC (rev 50571)
+++ trunk/dports/lang/otcl/Portfile 2009-05-04 19:19:09 UTC (rev 50572)
@@ -4,6 +4,7 @@
name otcl
version 1.9
+revision 1
categories lang
platforms darwin
maintainers nomaintainer
@@ -37,27 +38,14 @@
configure.args --with-Tcl=${prefix} --with-Tcl-ver=${tclmaj} \
--with-tk=${prefix} --with-tk-ver=${tclmaj} \
- --prefix=${prefix}
+ --prefix=${prefix} \
+ CPPFLAGS='-I${prefix}/include -I${workpath}/tcl${tclv}/generic/' \
+ CFLAGS='-I${prefix}/include -I${workpath}/tcl${tclv}/generic/' \
+ LDFLAGS='-L${prefix}/lib'
-pre-configure {
- if { ![file exists ${prefix}/lib/pkgconfig/x11.pc] } {
- configure.args-append \
- CPPFLAGS='-I${prefix}/include -I${workpath}/tcl${tclv}/generic/' \
- CFLAGS='-I${prefix}/include -I${workpath}/tcl${tclv}/generic/' \
- LDFLAGS='-L${prefix}/lib'
- } else {
- configure.args-append \
- CPPFLAGS='-I${x11prefix}/include -I${workpath}/tcl${tclv}/generic/' \
- CFLAGS='-I${x11prefix}/include -I${workpath}/tcl${tclv}/generic/' \
- LDFLAGS='-L${x11prefix}/lib'
- }
-}
-
post-configure {
reinplace "s|-ltk8.4|-ltcl8.4 -ltk8.4|g" \
${worksrcpath}/Makefile
- reinplace "s|-lXext|-L${x11prefix}/lib -lXext|g" \
- ${worksrcpath}/Makefile
}
build.target all
Modified: trunk/dports/lang/swi-prolog/Portfile
===================================================================
--- trunk/dports/lang/swi-prolog/Portfile 2009-05-04 18:52:57 UTC (rev 50571)
+++ trunk/dports/lang/swi-prolog/Portfile 2009-05-04 19:19:09 UTC (rev 50572)
@@ -4,7 +4,7 @@
name swi-prolog
version 5.6.63
-revision 1
+revision 2
epoch 20051223
categories lang
@@ -55,8 +55,8 @@
distname pl-${version}
configure.env \
- LIBRARY_PATH=/usr/lib:${x11prefix}/lib:${prefix}/lib \
- CPATH=/usr/include:${x11prefix}/include:${prefix}/include \
+ LIBRARY_PATH=/usr/lib:${prefix}/lib \
+ CPATH=/usr/include:${prefix}/include \
JUNIT=${prefix}/share/java/junit.jar
configure.ldflags
@@ -66,8 +66,8 @@
--with-world
build.env \
- LIBRARY_PATH=/usr/lib:${x11prefix}/lib:${prefix}/lib \
- CPATH=/usr/include:${x11prefix}/include:${prefix}/include \
+ LIBRARY_PATH=/usr/lib:${prefix}/lib \
+ CPATH=/usr/include:${prefix}/include \
JUNIT=${prefix}/share/java/junit.jar \
CC=${configure.cc}
Modified: trunk/dports/lang/swi-prolog-devel/Portfile
===================================================================
--- trunk/dports/lang/swi-prolog-devel/Portfile 2009-05-04 18:52:57 UTC (rev 50571)
+++ trunk/dports/lang/swi-prolog-devel/Portfile 2009-05-04 19:19:09 UTC (rev 50572)
@@ -4,7 +4,7 @@
name swi-prolog-devel
version 5.7.4
-revision 1
+revision 2
epoch 20051223
categories lang
@@ -55,8 +55,8 @@
distname pl-${version}
configure.env \
- LIBRARY_PATH=/usr/lib:${x11prefix}/lib:${prefix}/lib \
- CPATH=/usr/include:${x11prefix}/include:${prefix}/include \
+ LIBRARY_PATH=/usr/lib:${prefix}/lib \
+ CPATH=/usr/include:${prefix}/include \
JUNIT=${prefix}/share/java/junit.jar
configure.ldflags
@@ -66,8 +66,8 @@
--with-world
build.env \
- LIBRARY_PATH=/usr/lib:${x11prefix}/lib:${prefix}/lib \
- CPATH=/usr/include:${x11prefix}/include:${prefix}/include \
+ LIBRARY_PATH=/usr/lib:${prefix}/lib \
+ CPATH=/usr/include:${prefix}/include \
JUNIT=${prefix}/share/java/junit.jar
post-build {
Modified: trunk/dports/lang/tclcl/Portfile
===================================================================
--- trunk/dports/lang/tclcl/Portfile 2009-05-04 18:52:57 UTC (rev 50571)
+++ trunk/dports/lang/tclcl/Portfile 2009-05-04 19:19:09 UTC (rev 50572)
@@ -4,6 +4,7 @@
name tclcl
version 1.16
+revision 1
categories lang
platforms darwin
maintainers nomaintainer
@@ -39,22 +40,11 @@
--with-tcl=${prefix} --with-tcl-ver=${tclmaj} \
--with-tk=${prefix} --with-tk-ver=${tclmaj} \
--with-otcl=${prefix} \
- --prefix=${prefix}
+ --prefix=${prefix} \
+ CPPFLAGS='-I${prefix}/include -I${workpath}/tcl${tclv}/generic/' \
+ CFLAGS='-I${prefix}/include -I${workpath}/tcl${tclv}/generic/' \
+ LDFLAGS='-L${prefix}/lib'
-pre-configure {
- if { ![file exists ${prefix}/lib/pkgconfig/x11.pc] } {
- configure.args-append \
- CPPFLAGS='-I${prefix}/include -I${workpath}/tcl${tclv}/generic/' \
- CFLAGS='-I${prefix}/include -I${workpath}/tcl${tclv}/generic/' \
- LDFLAGS='-L${prefix}/lib'
- } else {
- configure.args-append \
- CPPFLAGS='-I${x11prefix}/include -I${workpath}/tcl${tclv}/generic/' \
- CFLAGS='-I${x11prefix}/include -I${workpath}/tcl${tclv}/generic/' \
- LDFLAGS='-L${x11prefix}/lib'
- }
-}
-
post-configure {
reinplace "s|@V_TCLSH@|${prefix}/bin/tclsh8.4|g" \
${worksrcpath}/Makefile
@@ -62,8 +52,6 @@
${worksrcpath}/Makefile
reinplace "s|-ltk8.4|-ltcl8.4 -ltk8.4|g" \
${worksrcpath}/Makefile
- reinplace "s|-lXext|-L${x11prefix}/lib -lXext|g" \
- ${worksrcpath}/Makefile
reinplace "s|http2.4|http2.5|g" \
${worksrcpath}/Makefile
reinplace "s|@V_TCL_LIBRARY_FILES@|\$(TCL_84_LIBRARY_FILES)|g" \
Modified: trunk/dports/mail/procmail/Portfile
===================================================================
--- trunk/dports/mail/procmail/Portfile 2009-05-04 18:52:57 UTC (rev 50571)
+++ trunk/dports/mail/procmail/Portfile 2009-05-04 19:19:09 UTC (rev 50572)
@@ -3,7 +3,7 @@
name procmail
version 3.22
-revision 1
+revision 2
categories mail
maintainers nomaintainer
description A local mail delivery agent
@@ -57,7 +57,7 @@
configure {
system "cd ${worksrcpath} && mv INSTALL INSTALL.README"
- reinplace "s%^/\\*\\(#define\[ \t\]*DEF\[S\]*PATH\[ \t\]*\".*\\)\".*$%\\1:${prefix}/bin:${x11prefix}/bin\"%" ${worksrcpath}/config.h
+ reinplace "s%^/\\*\\(#define\[ \t\]*DEF\[S\]*PATH\[ \t\]*\".*\\)\".*$%\\1:${prefix}/bin\"%" ${worksrcpath}/config.h
reinplace "s%/etc/procmailrc%${prefix}/etc/procmailrc%" ${worksrcpath}/config.h
reinplace "s%/usr/local%${prefix}%g" ${worksrcpath}/Makefile
reinplace "s%(BASENAME)/man%(BASENAME)/share/man%" ${worksrcpath}/Makefile }
Modified: trunk/dports/math/R/Portfile
===================================================================
--- trunk/dports/math/R/Portfile 2009-05-04 18:52:57 UTC (rev 50571)
+++ trunk/dports/math/R/Portfile 2009-05-04 19:19:09 UTC (rev 50572)
@@ -42,17 +42,6 @@
universal_variant no
-# AC_X_PATH blindly asks xmkmf where X11 is, and it always uses /usr/X11R6.
-# This block helps us link correctly and setup our pc files correctly when we
-# are +system_x11 and x11prefix is somewhere non-standard and should cause
-# AC_X_PATH to let us setup our CPPFLAGS and LDFLAGS without interference
-configure.args-append --x-include=${prefix}/include --x-lib=${prefix}/lib
-if { ![file exists ${prefix}/lib/pkgconfig/x11.pc] } {
- pre-configure {
- configure.cppflags-append -I${x11prefix}/include
- configure.ldflags-append -L${x11prefix}/lib
- }
-}
variant gcc42 description {Build with gcc42} {
configure.compiler macports-gcc-4.2
@@ -80,6 +69,8 @@
--without-aqua \
--with-tcl-config=${prefix}/lib/tclConfig.sh \
--with-tk-config=${prefix}/lib/tkConfig.sh
+ --x-include=${prefix}/include \
+ --x-lib=${prefix}/lib
test.run yes
test.target check
Modified: trunk/dports/multimedia/mpeg2vidcodec/Portfile
===================================================================
--- trunk/dports/multimedia/mpeg2vidcodec/Portfile 2009-05-04 18:52:57 UTC (rev 50571)
+++ trunk/dports/multimedia/mpeg2vidcodec/Portfile 2009-05-04 19:19:09 UTC (rev 50572)
@@ -29,17 +29,9 @@
depends_lib port:xorg-libXext
build.args USE_DISP=-DDISPLAY \
USE_SHMEM=-DSH_MEM \
- LIBS="-lXext -lX11"
-
- pre-build {
- if { [file exists ${prefix}/lib/pkgconfig/x11.pc] } {
- build.args-append INCLUDEDIR="-I${prefix}/include" \
- LIBRARYDIR="-L${prefix}/lib"
- } else {
- build.args-append INCLUDEDIR="-I${prefix}/include -I${x11prefix}/include" \
- LIBRARYDIR="-L${prefix}/lib -L${x11prefix}/lib"
- }
- }
+ LIBS="-lXext -lX11" \
+ INCLUDEDIR="-I${prefix}/include" \
+ LIBRARYDIR="-L${prefix}/lib"
}
configure {
Modified: trunk/dports/net/driftnet/Portfile
===================================================================
--- trunk/dports/net/driftnet/Portfile 2009-05-04 18:52:57 UTC (rev 50571)
+++ trunk/dports/net/driftnet/Portfile 2009-05-04 19:19:09 UTC (rev 50572)
@@ -18,8 +18,6 @@
master_sites http://www.ex-parrot.com/~chris/driftnet/
-#bugs You need to have 'makedepend' in your path to build \
-# driftnet. It usually is found in ${x11prefix}/bin. \
# Driftnet doesn't use a configure file, so the Makefile \
# has to be rudely coerced to work properly.
@@ -29,6 +27,8 @@
checksums md5 8e11d77770452f97bb3c23f510489815
+depends_build port:makedepend
+
depends_lib lib:libjpeg:jpeg lib:libpcap:libpcap \
lib:libungif:libungif lib:libgtk.1:gtk1
Modified: trunk/dports/net/logjam/Portfile
===================================================================
--- trunk/dports/net/logjam/Portfile 2009-05-04 18:52:57 UTC (rev 50571)
+++ trunk/dports/net/logjam/Portfile 2009-05-04 19:19:09 UTC (rev 50572)
@@ -19,15 +19,8 @@
configure.cppflags-append "-no-cpp-precomp"
-pre-configure {
- if { [file exists ${prefix}/lib/pkgconfig/x11.pc] } {
- configure.env LIBS="-L${prefix}/lib -lX11"
- configure.ldflags-append "-L${prefix}/lib -bind_at_load"
- } else {
- configure.env LIBS="-L${prefix}/lib -L${x11prefix}/lib -lX11"
- configure.ldflags-append "-L${x11prefix}/lib -bind_at_load"
- }
-}
+configure.env LIBS="-L${prefix}/lib -lX11"
+configure.ldflags-append "-L${prefix}/lib -bind_at_load"
configure.args --without-gtkspell --without-xmms --without-gtkhtml \
--without-librsvg --mandir=${prefix}/share/man
Modified: trunk/dports/net/openssh/Portfile
===================================================================
--- trunk/dports/net/openssh/Portfile 2009-05-04 18:52:57 UTC (rev 50571)
+++ trunk/dports/net/openssh/Portfile 2009-05-04 19:19:09 UTC (rev 50572)
@@ -4,6 +4,7 @@
name openssh
version 5.2p1
+revision 1
categories net
maintainers jwa openmaintainer
description OpenSSH secure login server
@@ -33,6 +34,7 @@
ftp://openbsd.mirrors.pair.com/ftp/OpenSSH/portable \
ftp://openbsd.secsup.org/pub/openbsd/OpenSSH/portable/
depends_lib port:openssl port:zlib
+depends_run port:xauth
# Specified -fno-builtin because GCC 3.3 has log() as a builtin
# (from math.h) while OpenSSH has its own log() function
@@ -43,7 +45,7 @@
--with-pid-dir=${prefix}/var/run --with-tcp-wrappers \
--with-pam --disable-suid-ssh --with-random=/dev/urandom \
--mandir=${prefix}/share/man --with-zlib=${prefix} \
- --with-kerberos5=/usr
+ --with-kerberos5=/usr --with-xauth=${prefix}/bin/xauth
use_parallel_build yes
@@ -54,10 +56,10 @@
reinplace "s|#Port 22|Port 2222|g" ${destroot}${prefix}/etc/ssh/sshd_config
}
-# For X11 Forwarding
-variant apple_x11 description "use (apple's) X11 for forwarding" {
- configure.args-append --with-xauth=${x11prefix}/bin/xauth
- }
+variant no_x11 {
+ configure.args-delete --with-xauth=${prefix}/bin/xauth
+ depends_run-delete port:xauth
+}
# For high-performance patch
variant hpn description "apply high performance patch" {
Modified: trunk/dports/print/espgs/Portfile
===================================================================
--- trunk/dports/print/espgs/Portfile 2009-05-04 18:52:57 UTC (rev 50571)
+++ trunk/dports/print/espgs/Portfile 2009-05-04 19:19:09 UTC (rev 50572)
@@ -71,7 +71,6 @@
variant x11 {
depends_lib-append port:xorg-libXext port:xorg-libXt
configure.args-append --with-x
- configure.cppflags-append -I${x11prefix}/include
}
# Their Makefile.in is busted
Modified: trunk/dports/print/gv/Portfile
===================================================================
--- trunk/dports/print/gv/Portfile 2009-05-04 18:52:57 UTC (rev 50571)
+++ trunk/dports/print/gv/Portfile 2009-05-04 19:19:09 UTC (rev 50572)
@@ -45,21 +45,11 @@
use_autoreconf yes
autoreconf.args -fvi
-configure.args --enable-setenv-code
+configure.args --enable-setenv-code \
+ --x-include=${prefix}/include \
+ --x-lib=${prefix}/lib
variant letter description {sets default paper size to letter} {
configure.args-append --with-default-papersize=letter
}
-# AC_X_PATH blindly asks xmkmf where X11 is, and it always uses /usr/X11R6.
-# This block helps us link correctly and setup our pc files correctly when we
-# are +system_x11 and x11prefix is somewhere non-standard and should cause
-# AC_X_PATH to let us setup our CPPFLAGS and LDFLAGS without interference
-configure.args-append --x-include=${prefix}/include --x-lib=${prefix}/lib
-if { ![file exists ${prefix}/lib/pkgconfig/x11.pc] } {
- pre-configure {
- configure.cppflags-append -I${x11prefix}/include
- configure.ldflags-append -L${x11prefix}/lib
- }
-}
-
Modified: trunk/dports/python/py-game/Portfile
===================================================================
--- trunk/dports/python/py-game/Portfile 2009-05-04 18:52:57 UTC (rev 50571)
+++ trunk/dports/python/py-game/Portfile 2009-05-04 19:19:09 UTC (rev 50572)
@@ -49,12 +49,6 @@
configure.env-append LOCALBASE=${prefix}
configure.cmd ${python.bin} config.py
-post-configure {
- # Make sure the X11 include directory is found.
- reinplace "s|-Ddarwin -lSDL|-Ddarwin -lSDL -I${x11prefix}/include|g" \
- ${worksrcpath}/Setup
-}
-
platform darwin 9 {
depends_lib-delete port:py-pyobjc
depends_lib-append port:py-pyobjc2 port:py-pyobjc2-cocoa
Modified: trunk/dports/python/py-gtk2/Portfile
===================================================================
--- trunk/dports/python/py-gtk2/Portfile 2009-05-04 18:52:57 UTC (rev 50571)
+++ trunk/dports/python/py-gtk2/Portfile 2009-05-04 19:19:09 UTC (rev 50572)
@@ -42,10 +42,6 @@
configure.python ${prefix}/bin/python2.4
-platform darwin 7 {
- configure.cflags-append -I${x11prefix}/include
-}
-
platform darwin 9 {
post-patch {
reinplace "s| -export-symbols-regex.*||g" \
Modified: trunk/dports/python/py25-game/Portfile
===================================================================
--- trunk/dports/python/py25-game/Portfile 2009-05-04 18:52:57 UTC (rev 50571)
+++ trunk/dports/python/py25-game/Portfile 2009-05-04 19:19:09 UTC (rev 50572)
@@ -49,12 +49,6 @@
configure.env-append LOCALBASE=${prefix}
configure.cmd ${python.bin} config.py
-post-configure {
- # Make sure the X11 include directory is found.
- reinplace "s|-Ddarwin -lSDL|-Ddarwin -lSDL -I${x11prefix}/include|g" \
- ${worksrcpath}/Setup
-}
-
platform darwin 9 {
depends_lib-delete port:py25-pyobjc
depends_lib-append port:py25-pyobjc2 port:py25-pyobjc2-cocoa
Modified: trunk/dports/python/py25-gtk/Portfile
===================================================================
--- trunk/dports/python/py25-gtk/Portfile 2009-05-04 18:52:57 UTC (rev 50571)
+++ trunk/dports/python/py25-gtk/Portfile 2009-05-04 19:19:09 UTC (rev 50572)
@@ -42,10 +42,6 @@
configure.python ${prefix}/bin/python2.5
-platform darwin 7 {
- configure.cflags-append -I${x11prefix}/include
-}
-
platform darwin 9 {
post-patch {
reinplace "s| -export-symbols-regex.*||g" \
Modified: trunk/dports/python/py26-game/Portfile
===================================================================
--- trunk/dports/python/py26-game/Portfile 2009-05-04 18:52:57 UTC (rev 50571)
+++ trunk/dports/python/py26-game/Portfile 2009-05-04 19:19:09 UTC (rev 50572)
@@ -50,12 +50,6 @@
configure.env-append LOCALBASE=${prefix}
configure.cmd ${python.bin} config.py
-post-configure {
- # Make sure the X11 include directory is found.
- reinplace "s|-Ddarwin -lSDL|-Ddarwin -lSDL -I${x11prefix}/include|g" \
- ${worksrcpath}/Setup
-}
-
platform darwin 9 {
depends_lib-delete port:py26-pyobjc
depends_lib-append port:py26-pyobjc2 port:py26-pyobjc2-cocoa
Modified: trunk/dports/python/py26-mapnik/Portfile
===================================================================
--- trunk/dports/python/py26-mapnik/Portfile 2009-05-04 18:52:57 UTC (rev 50571)
+++ trunk/dports/python/py26-mapnik/Portfile 2009-05-04 19:19:09 UTC (rev 50572)
@@ -60,7 +60,7 @@
configure.pkg_config ${prefix}/bin/pkg-config
variant cairo description {Builds port with Cairo Support} {
- configure.pkg_config_path ${prefix}/lib/pkgconfig:${x11prefix}/lib/pkgconfig:${prefix}/Library/Frameworks/Python.framework/Versions/2.6/lib/pkgconfig
+ configure.pkg_config_path ${prefix}/lib/pkgconfig:${prefix}/Library/Frameworks/Python.framework/Versions/2.6/lib/pkgconfig
depends_lib-append port:cairo
depends_lib-append port:cairomm
depends_lib-append port:py26-cairo
@@ -122,4 +122,4 @@
destroot {
system "cd ${worksrcpath} && ${python} scons/scons.py install"
-}
\ No newline at end of file
+}
Modified: trunk/dports/science/geomview/Portfile
===================================================================
--- trunk/dports/science/geomview/Portfile 2009-05-04 18:52:57 UTC (rev 50571)
+++ trunk/dports/science/geomview/Portfile 2009-05-04 19:19:09 UTC (rev 50572)
@@ -59,15 +59,8 @@
depends_lib-delete port:zlib
}
-# For +system_x11 variant
-if { ![file exists ${prefix}/lib/pkgconfig/gl.pc] } {
- configure.args-delete --with-opengl=${prefix}
- configure.args-append --with-opengl=${x11prefix}
-}
-
-
variant no_opengl description {do not use OpenGL} {
configure.args-append --without-opengl
configure.args-delete --with-opengl=${prefix}
- configure.args-delete --with-opengl=${x11prefix}
+ depends_lib-delete port:mesa
}
Modified: trunk/dports/science/gwyddion/Portfile
===================================================================
--- trunk/dports/science/gwyddion/Portfile 2009-05-04 18:52:57 UTC (rev 50571)
+++ trunk/dports/science/gwyddion/Portfile 2009-05-04 19:19:09 UTC (rev 50572)
@@ -33,26 +33,6 @@
--x-include=${prefix}/include \
--x-lib=${prefix}/lib
-# AC_X_PATH blindly asks xmkmf where X11 is, and it always uses /usr/X11R6.
-# This block helps us link correctly and setup our pc files correctly when we
-# are +system_x11 and x11prefix is somewhere non-standard and should cause
-# AC_X_PATH to let us setup our CPPFLAGS and LDFLAGS without interference
-if { ![file exists ${prefix}/lib/pkgconfig/x11.pc] } {
- pre-configure {
- configure.cppflags-append -I${x11prefix}/include
- configure.ldflags-append -L${x11prefix}/lib
- }
-
- # And this will similarly get ports that use pkgconfig to find our pkgconfig-less libX11
- post-destroot {
- if {![file exists ${x11prefix}/lib/pkgconfig/x11.pc]} {
- foreach pc [glob ${destroot}${prefix}/lib/pkgconfig/*.pc] {
- reinplace "s:-lX11:-L${prefix}/lib -L${x11prefix}/lib -lX11:g" ${pc}
- }
- }
- }
-}
-
post-destroot {
xinstall -m 755 -d ${destroot}${applications_dir}/gwyddion.app/Contents/MacOS
xinstall ${filespath}/gwyddion ${destroot}${applications_dir}/gwyddion.app/Contents/MacOS
Modified: trunk/dports/science/opendx/Portfile
===================================================================
--- trunk/dports/science/opendx/Portfile 2009-05-04 18:52:57 UTC (rev 50571)
+++ trunk/dports/science/opendx/Portfile 2009-05-04 19:19:09 UTC (rev 50572)
@@ -3,7 +3,7 @@
PortSystem 1.0
name opendx
version 4.4.4
-revision 1
+revision 2
categories science
maintainers gwright at macports.org
platforms darwin
@@ -29,7 +29,8 @@
port:cosmoplayer \
port:opendx-java40 \
port:ImageMagick \
- path:lib/libXm.dylib:openmotif
+ path:lib/libXm.dylib:openmotif \
+ port:mesa
use_autoconf yes
autoconf.cmd autoreconf
@@ -58,9 +59,6 @@
JAVAH=/usr/bin/javah \
JAVAP=/usr/bin/javap
-# For /usr/X11/include/GL even if we're using MacPorts X11 libs
-configure.cppflags-append "-I${x11prefix}/include"
-
configure.args --with-jni-path=/System/Library/Frameworks/JavaVM.framework/Headers \
--with-java40jar-path=${prefix}/share/java/java40.jar \
--with-cosmojar-path=${prefix}/share/java/npcosmop211.jar
Modified: trunk/dports/science/triangle/Portfile
===================================================================
--- trunk/dports/science/triangle/Portfile 2009-05-04 18:52:57 UTC (rev 50571)
+++ trunk/dports/science/triangle/Portfile 2009-05-04 19:19:09 UTC (rev 50572)
@@ -32,11 +32,7 @@
file mkdir ${worksrcpath}
eval file rename [glob -directory ${workpath} \[A-s\]* t*.?] ${worksrcpath}
reinplace "s/-DLINUX//" ${worksrcpath}/makefile
- if { [file exists ${prefix}/lib/pkgconfig/x11.pc] } {
- reinplace "s|/usr/X11R6|${prefix}|g" ${worksrcpath}/makefile
- } else {
- reinplace "s|/usr/X11R6|${x11prefix}|g" ${worksrcpath}/makefile
- }
+ reinplace "s|/usr/X11R6|${prefix}|g" ${worksrcpath}/makefile
}
post-configure {
Modified: trunk/dports/sysutils/wmcpuload/Portfile
===================================================================
--- trunk/dports/sysutils/wmcpuload/Portfile 2009-05-04 18:52:57 UTC (rev 50571)
+++ trunk/dports/sysutils/wmcpuload/Portfile 2009-05-04 19:19:09 UTC (rev 50572)
@@ -25,14 +25,4 @@
port:xorg-libXext \
port:xpm
-# AC_X_PATH blindly asks xmkmf where X11 is, and it always uses /usr/X11R6.
-# This block helps us link correctly and setup our pc files correctly when we
-# are +system_x11 and x11prefix is somewhere non-standard and should cause
-# AC_X_PATH to let us setup our CPPFLAGS and LDFLAGS without interference
-configure.args-append --x-include=${prefix}/include --x-lib=${prefix}/lib
-if { ![file exists ${prefix}/lib/pkgconfig/x11.pc] } {
- pre-configure {
- configure.cppflags-append -I${x11prefix}/include
- configure.ldflags-append -L${x11prefix}/lib
- }
-}
+configure.args --x-include=${prefix}/include --x-lib=${prefix}/lib
Modified: trunk/dports/www/firefox-x11/Portfile
===================================================================
--- trunk/dports/www/firefox-x11/Portfile 2009-05-04 18:52:57 UTC (rev 50571)
+++ trunk/dports/www/firefox-x11/Portfile 2009-05-04 19:19:09 UTC (rev 50572)
@@ -223,17 +223,6 @@
sdkdir="${prefix}/lib/${name}" \
SKIP_COPY_XULRUNNER=1
-# AC_X_PATH blindly asks xmkmf where X11 is, and it always uses /usr/X11R6.
-# This block helps us link correctly when we are +system_x11 and x11prefix
-# is somewhere non-standard and should cause AC_X_PATH to let us setup our
-# CPPFLAGS and LDFLAGS without interference
-pre-configure {
- if { ![file exists ${prefix}/lib/pkgconfig/x11.pc] } {
- configure.cppflags-append -I${x11prefix}/include
- configure.ldflags-append -L${x11prefix}/lib
- }
-}
-
post-destroot {
file mkdir ${destroot}${prefix}/share/applications
Modified: trunk/dports/www/firefox-x11-devel/Portfile
===================================================================
--- trunk/dports/www/firefox-x11-devel/Portfile 2009-05-04 18:52:57 UTC (rev 50571)
+++ trunk/dports/www/firefox-x11-devel/Portfile 2009-05-04 19:19:09 UTC (rev 50572)
@@ -237,17 +237,6 @@
installdir="${prefix}/lib/${name}" \
sdkdir="${prefix}/lib/${name}"
-# AC_X_PATH blindly asks xmkmf where X11 is, and it always uses /usr/X11R6.
-# This block helps us link correctly when we are +system_x11 and x11prefix
-# is somewhere non-standard and should cause AC_X_PATH to let us setup our
-# CPPFLAGS and LDFLAGS without interference
-pre-configure {
- if { ![file exists ${prefix}/lib/pkgconfig/x11.pc] } {
- configure.cppflags-append -I${x11prefix}/include
- configure.ldflags-append -L${x11prefix}/lib
- }
-}
-
post-destroot {
file mkdir ${destroot}${prefix}/share/applications
Modified: trunk/dports/www/mozplugger/Portfile
===================================================================
--- trunk/dports/www/mozplugger/Portfile 2009-05-04 18:52:57 UTC (rev 50571)
+++ trunk/dports/www/mozplugger/Portfile 2009-05-04 19:19:09 UTC (rev 50572)
@@ -21,6 +21,7 @@
sha1 5107338378795c147e79c04eead8f9fa7f6ebd28 \
rmd160 87c82713de2dd9b139ea0b49f856b6797c913fb8
+#TODO: port:xulrunner ?
depends_lib \
port:firefox-x11
@@ -33,13 +34,5 @@
use_configure no
-build.args prefix=${prefix} XLDFLAGS="-flat_namespace -bundle -shared -L${prefix}/lib -L${x11prefix}/lib -lX11"
-destroot.args root=${destroot} prefix=${prefix}
-
-if { [file exists ${prefix}/lib/pkgconfig/x11.pc] } {
- build.args-append X11=${prefix}
- destroot.args-append X11=${prefix}
-} else {
- build.args-append X11=${x11prefix}
- destroot.args-append X11=${x11prefix}
-}
+build.args prefix=${prefix} XLDFLAGS="-flat_namespace -bundle -shared -L${prefix}/lib -lX11" X11=${prefix}
+destroot.args root=${destroot} prefix=${prefix} X11=${prefix}
Modified: trunk/dports/x11/SoXt/Portfile
===================================================================
--- trunk/dports/x11/SoXt/Portfile 2009-05-04 18:52:57 UTC (rev 50571)
+++ trunk/dports/x11/SoXt/Portfile 2009-05-04 19:19:09 UTC (rev 50572)
@@ -31,20 +31,9 @@
port:Coin
configure.args --enable-man --mandir=${prefix}/share/man \
- --with-coin=${prefix}
+ --with-coin=${prefix} \
+ --x-include=${prefix}/include --x-lib=${prefix}/lib
-# AC_X_PATH blindly asks xmkmf where X11 is, and it always uses /usr/X11R6.
-# This block helps us link correctly and setup our pc files correctly when we
-# are +system_x11 and x11prefix is somewhere non-standard and should cause
-# AC_X_PATH to let us setup our CPPFLAGS and LDFLAGS without interference
-configure.args-append --x-include=${prefix}/include --x-lib=${prefix}/lib
-if { ![file exists ${prefix}/lib/pkgconfig/x11.pc] } {
- pre-configure {
- configure.cppflags-append -I${x11prefix}/include
- configure.ldflags-append -L${x11prefix}/lib
- }
-}
-
platform darwin {
configure.args-append --enable-darwin-x11
}
Modified: trunk/dports/x11/XFree86/Portfile
===================================================================
--- trunk/dports/x11/XFree86/Portfile 2009-05-04 18:52:57 UTC (rev 50571)
+++ trunk/dports/x11/XFree86/Portfile 2009-05-04 19:19:09 UTC (rev 50572)
@@ -42,7 +42,7 @@
close $hostfd
}
-prefix ${x11prefix}
+prefix /usr/X11R6
worksrcdir xc
use_configure no
@@ -90,7 +90,7 @@
If you really want to use XFree86 instead,
please move it aside first :
- sudo mv $x11prefix ${x11prefix}.apple
+ sudo mv $prefix ${prefix}.apple
"
} else {
return -code error "
@@ -101,7 +101,7 @@
If you really want to use XFree86 instead,
please move it aside first :
- sudo mv $x11prefix ${x11prefix}.apple
+ sudo mv $prefix ${prefix}.apple
"
}
} elseif { [file exists ${prefix}/include/X11/X.h] } {
@@ -116,7 +116,7 @@
If you really want to use XFree86 instead,
please move it aside first :
- sudo mv $x11prefix ${x11prefix}.apple
+ sudo mv $prefix ${prefix}.apple
"
}
}
Modified: trunk/dports/x11/Xaw3d/Portfile
===================================================================
--- trunk/dports/x11/Xaw3d/Portfile 2009-05-04 18:52:57 UTC (rev 50571)
+++ trunk/dports/x11/Xaw3d/Portfile 2009-05-04 19:19:09 UTC (rev 50572)
@@ -56,18 +56,13 @@
# This uses xmkmf to build and doesn't make a universal lib
universal_variant no
-if {[file exists ${prefix}/lib/pkgconfig/x11.pc]} {
- build.target-append INCROOT=${prefix}/include
-} else {
- build.target-append SHLIBGLOBALSFLAGS=-L${x11prefix}/lib
-}
-
# The Imakefile default is to install everything into /usr/X11R6/lib,
# which prevents multiple MacPorts installs on the same system. Have
# it install the entire package into ${prefix} instead.
build.target-append INCDIR=${prefix}/include \
SHLIBDIR=${prefix}/lib \
- USRLIBDIR=${prefix}/lib
+ USRLIBDIR=${prefix}/lib \
+ INCROOT=${prefix}/include
destroot.destdir-append INCDIR=${prefix}/include \
SHLIBDIR=${prefix}/lib \
Modified: trunk/dports/x11/abclock/Portfile
===================================================================
--- trunk/dports/x11/abclock/Portfile 2009-05-04 18:52:57 UTC (rev 50571)
+++ trunk/dports/x11/abclock/Portfile 2009-05-04 19:19:09 UTC (rev 50572)
@@ -21,7 +21,7 @@
reinplace "s|#include <values.h>||" ${worksrcpath}/abclock.c
}
use_configure no
-build.target all XLIBDIR="-L${prefix}/lib -L${x11prefix}/lib" XINCLUDEDIR="-I${prefix}/include -I${x11prefix}/include" OPT="${configure.cflags}"
+build.target all XLIBDIR="-L${prefix}/lib" XINCLUDEDIR="-I${prefix}/include" OPT="${configure.cflags}"
destroot {
xinstall -m 555 ${worksrcpath}/abclock ${destroot}${prefix}/bin
xinstall -m 555 ${worksrcpath}/abc_img ${destroot}${prefix}/bin
Modified: trunk/dports/x11/aewm/Portfile
===================================================================
--- trunk/dports/x11/aewm/Portfile 2009-05-04 18:52:57 UTC (rev 50571)
+++ trunk/dports/x11/aewm/Portfile 2009-05-04 19:19:09 UTC (rev 50572)
@@ -4,6 +4,7 @@
name aewm
version 1.3.10
+revision 1
categories x11 x11-wm
platforms darwin
maintainers nomaintainer
@@ -22,7 +23,7 @@
universal_variant no
use_parallel_build yes
-build.args PREFIX=${prefix} XROOT=${x11prefix} \
+build.args PREFIX=${prefix} XROOT=${prefix} \
CC=${configure.cc}
destroot.args ${build.args}
Modified: trunk/dports/x11/aterm/Portfile
===================================================================
--- trunk/dports/x11/aterm/Portfile 2009-05-04 18:52:57 UTC (rev 50571)
+++ trunk/dports/x11/aterm/Portfile 2009-05-04 19:19:09 UTC (rev 50572)
@@ -28,20 +28,9 @@
--disable-delete-key --enable-fading \
--enable-graphics --enable-half-shadow \
--enable-menubar --enable-transparency \
+ --x-include=${prefix}/include --x-lib=${prefix}/lib \
--enable-wtmp
-# AC_X_PATH blindly asks xmkmf where X11 is, and it always uses /usr/X11R6.
-# This block helps us link correctly and setup our pc files correctly when we
-# are +system_x11 and x11prefix is somewhere non-standard and should cause
-# AC_X_PATH to let us setup our CPPFLAGS and LDFLAGS without interference
-configure.args-append --x-include=${prefix}/include --x-lib=${prefix}/lib
-if { ![file exists ${prefix}/lib/pkgconfig/x11.pc] } {
- pre-configure {
- configure.cppflags-append -I${x11prefix}/include
- configure.ldflags-append -L${x11prefix}/lib
- }
-}
-
variant afterstep description {Enable AfterStep integration} {
depends_lib-append port:AfterStep
configure.args-append --with-afterimage-config=${prefix}/bin \
Modified: trunk/dports/x11/desklaunch/Portfile
===================================================================
--- trunk/dports/x11/desklaunch/Portfile 2009-05-04 18:52:57 UTC (rev 50571)
+++ trunk/dports/x11/desklaunch/Portfile 2009-05-04 19:19:09 UTC (rev 50572)
@@ -23,16 +23,9 @@
use_configure no
destroot.destdir DESTDIR=${destroot}${prefix}
-pre-configure {
- if { [file exists ${prefix}/lib/pkgconfig/x11.pc] } {
- build.args-append XROOT=${prefix}
- } else {
- build.args-append XROOT=${x11prefix}
- }
-}
+build.args-append XROOT="${prefix}" \
+ CFLAGS="${configure.cflags}"
-build.args-append CFLAGS="${configure.cflags}"
-
variant universal {
build.args-append CFLAGS="${configure.cflags} ${configure.universal_cflags}"
}
Modified: trunk/dports/x11/evilwm/Portfile
===================================================================
--- trunk/dports/x11/evilwm/Portfile 2009-05-04 18:52:57 UTC (rev 50571)
+++ trunk/dports/x11/evilwm/Portfile 2009-05-04 19:19:09 UTC (rev 50572)
@@ -16,11 +16,7 @@
port:xorg-libXext
configure {
- if {[file exists ${prefix}/lib/pkgconfig/xext]} {
- reinplace "s|XROOT=.*|XROOT=${prefix}|" ${worksrcpath}/Makefile
- } else {
- reinplace "s|XROOT=.*|XROOT=${x11prefix}|" ${worksrcpath}/Makefile
- }
+ reinplace "s|XROOT=.*|XROOT=${prefix}|" ${worksrcpath}/Makefile
reinplace "s|\$(LDFLAGS)|\$(LDFLAGS) \$(OTHERLDFLAGS)|g" ${worksrcpath}/Makefile
}
Modified: trunk/dports/x11/eyeclock/Portfile
===================================================================
--- trunk/dports/x11/eyeclock/Portfile 2009-05-04 18:52:57 UTC (rev 50571)
+++ trunk/dports/x11/eyeclock/Portfile 2009-05-04 19:19:09 UTC (rev 50572)
@@ -27,16 +27,9 @@
build.args PREFIX=${prefix}
destroot.destdir PREFIX=${destroot}${prefix}
-build.target-append OCFLAGS="${configure.cflags}" OLDFLAGS="${configure.ldflags}"
+build.target-append OCFLAGS="${configure.cflags}" OLDFLAGS="${configure.ldflags}" X11BASE=${prefix}
variant universal {
build.target-append OCFLAGS="${configure.cflags} ${configure.universal_cflags}" OLDFLAGS="${configure.ldflags} ${configure.universal_ldflags}"
}
-pre-build {
- if { [file exists ${prefix}/lib/pkgconfig/x11.pc] } {
- build.target-append X11BASE=${prefix}
- } else {
- build.target-append X11BASE=${x11prefix}
- }
-}
Modified: trunk/dports/x11/fireworkx/Portfile
===================================================================
--- trunk/dports/x11/fireworkx/Portfile 2009-05-04 18:52:57 UTC (rev 50571)
+++ trunk/dports/x11/fireworkx/Portfile 2009-05-04 19:19:09 UTC (rev 50572)
@@ -31,8 +31,8 @@
${destroot}${prefix}/share/doc/${name}
}
-build.target-append CFLAGS="${configure.cflags} -I${prefix}/include -I${x11prefix}/include" LDFLAGS="${configure.ldflags} -L${prefix}/lib -L${x11prefix}/lib"
+build.target-append CFLAGS="${configure.cflags} -I${prefix}/include" LDFLAGS="${configure.ldflags} -L${prefix}/lib"
variant universal {
- build.target-append CFLAGS="${configure.cflags} ${configure.universal_cflags} -I${prefix}/include -I${x11prefix}/include" LDFLAGS="${configure.ldflags} ${configure.universal_ldflags} -L${prefix}/lib -L${x11prefix}/lib"
+ build.target-append CFLAGS="${configure.cflags} ${configure.universal_cflags} -I${prefix}/include" LDFLAGS="${configure.ldflags} ${configure.universal_ldflags} -L${prefix}/lib"
}
Modified: trunk/dports/x11/fox/Portfile
===================================================================
--- trunk/dports/x11/fox/Portfile 2009-05-04 18:52:57 UTC (rev 50571)
+++ trunk/dports/x11/fox/Portfile 2009-05-04 19:19:09 UTC (rev 50572)
@@ -4,7 +4,7 @@
name fox
version 1.6.34
-revision 1
+revision 2
description The FOX GUI toolkit
long_description FOX is a C++ based Toolkit for developing Graphical \
User Interfaces easily and effectively.
@@ -28,10 +28,9 @@
port:xorg-libXcursor \
port:Xft2 \
port:xorg-libXrandr \
- port:freetype
+ port:freetype \
+ port:mesa
-configure.cppflags-append "-I${x11prefix}/include"
-
configure.pre_args --prefix=${prefix} --mandir=${prefix}/share/man
configure.args --with-x --with-xft --with-opengl --enable-cups
Modified: trunk/dports/x11/grace/Portfile
===================================================================
--- trunk/dports/x11/grace/Portfile 2009-05-04 18:52:57 UTC (rev 50571)
+++ trunk/dports/x11/grace/Portfile 2009-05-04 19:19:09 UTC (rev 50572)
@@ -41,19 +41,8 @@
configure.pre_args --prefix=${prefix}/lib \
--with-helpviewer="open ${prefix}/share/doc/${name}/`basename %s`"
+ --x-include=${prefix}/include --x-lib=${prefix}/lib
-# AC_X_PATH blindly asks xmkmf where X11 is, and it always uses /usr/X11R6.
-# This block helps us link correctly and setup our pc files correctly when we
-# are +system_x11 and x11prefix is somewhere non-standard and should cause
-# AC_X_PATH to let us setup our CPPFLAGS and LDFLAGS without interference
-configure.args-append --x-include=${prefix}/include --x-lib=${prefix}/lib
-if { ![file exists ${prefix}/lib/pkgconfig/x11.pc] } {
- pre-configure {
- configure.cppflags-append -I${x11prefix}/include
- configure.ldflags-append -L${x11prefix}/lib
- }
-}
-
post-destroot {
xinstall -m 755 -d ${destroot}${prefix}/share/doc
file delete ${destroot}${prefix}/bin
Modified: trunk/dports/x11/gtk2/Portfile
===================================================================
--- trunk/dports/x11/gtk2/Portfile 2009-05-04 18:52:57 UTC (rev 50571)
+++ trunk/dports/x11/gtk2/Portfile 2009-05-04 19:19:09 UTC (rev 50572)
@@ -205,28 +205,8 @@
port:xorg-libXcomposite \
port:xorg-libXfixes
- configure.args-append --with-xinput --enable-xinerama
-
- # AC_X_PATH blindly asks xmkmf where X11 is, and it always uses /usr/X11R6.
- # This block helps us link correctly and setup our pc files correctly when we
- # are +system_x11 and x11prefix is somewhere non-standard and should cause
- # AC_X_PATH to let us setup our CPPFLAGS and LDFLAGS without interference
- configure.args-append --x-include=${prefix}/include --x-lib=${prefix}/lib
- if { ![file exists ${prefix}/lib/pkgconfig/x11.pc] } {
- pre-configure {
- configure.cppflags-append -I${x11prefix}/include
- configure.ldflags-append -L${x11prefix}/lib
- }
-
- # And this will similarly get ports that use pkgconfig to find our pkgconfig-less libX11
- post-destroot {
- if {![file exists ${x11prefix}/lib/pkgconfig/x11.pc]} {
- foreach pc [glob ${destroot}${prefix}/lib/pkgconfig/*.pc] {
- reinplace "s:-lX11:-L${prefix}/lib -L${x11prefix}/lib -lX11:g" ${pc}
- }
- }
- }
- }
+ configure.args-append --with-xinput --enable-xinerama \
+ --x-include=${prefix}/include --x-lib=${prefix}/lib
}
livecheck.check regex
Modified: trunk/dports/x11/gtkglarea2/Portfile
===================================================================
--- trunk/dports/x11/gtkglarea2/Portfile 2009-05-04 18:52:57 UTC (rev 50571)
+++ trunk/dports/x11/gtkglarea2/Portfile 2009-05-04 19:19:09 UTC (rev 50572)
@@ -28,10 +28,4 @@
use_autoreconf yes
autoreconf.args -fvi
-pre-configure {
- if { [file exists ${x11prefix}/lib/libGL.dylib ] } {
- configure.post_args --with-GL-prefix=${x11prefix}
- } else {
- configure.post_args --with-GL-prefix=${prefix}
- }
-}
+configure.post_args --with-GL-prefix=${prefix}
Modified: trunk/dports/x11/kinput2/Portfile
===================================================================
--- trunk/dports/x11/kinput2/Portfile 2009-05-04 18:52:57 UTC (rev 50571)
+++ trunk/dports/x11/kinput2/Portfile 2009-05-04 19:19:09 UTC (rev 50572)
@@ -60,7 +60,7 @@
pre-destroot {
destroot.target install install.man
- destroot.post_args-append "PREFIX=${prefix} BINDIR=${prefix}/bin LIBDIR=${prefix}/lib CONFDIR=${prefix}/etc MANSOURCEPATH=${prefix}/share/man/man DOCDIR=${prefix}/share/doc/${name} XAPPLOADDIR=${x11prefix}/lib/X11/app-defaults"
+ destroot.post_args-append "PREFIX=${prefix} BINDIR=${prefix}/bin LIBDIR=${prefix}/lib CONFDIR=${prefix}/etc MANSOURCEPATH=${prefix}/share/man/man DOCDIR=${prefix}/share/doc/${name} XAPPLOADDIR=${prefix}/lib/X11/app-defaults"
#notice: app-defaults/Kinput2 is installed outside of /opt tree.
}
destroot.violate_mtree yes
Modified: trunk/dports/x11/luit/Portfile
===================================================================
--- trunk/dports/x11/luit/Portfile 2009-05-04 18:52:57 UTC (rev 50571)
+++ trunk/dports/x11/luit/Portfile 2009-05-04 19:19:09 UTC (rev 50572)
@@ -33,11 +33,3 @@
livecheck.check regex
livecheck.url [lindex ${master_sites} 0]?C=M&O=D
livecheck.regex ${name}-(\\d+(?:\\.\\d+)*)
-
-platform macosx {
- if {${os.major} < 9 && ![file exists ${prefix}/lib/pkgconfig/fontenc.pc]} {
- configure.env-append \
- LUIT_CFLAGS="-I${x11prefix}/include" \
- LUIT_LIBS="-L${x11prefix}/lib -lfontenc -lX11"
- }
-}
Modified: trunk/dports/x11/mkfontscale/Portfile
===================================================================
--- trunk/dports/x11/mkfontscale/Portfile 2009-05-04 18:52:57 UTC (rev 50571)
+++ trunk/dports/x11/mkfontscale/Portfile 2009-05-04 19:19:09 UTC (rev 50572)
@@ -43,11 +43,3 @@
configure.args --with-bzip2
-platform macosx {
- if {${os.major} < 9 && ![file exists ${prefix}/lib/pkgconfig/fontenc.pc]} {
- configure.env-append \
- MKFONTSCALE_CFLAGS="-I${x11prefix}/include `pkg-config --cflags freetype2`" \
- MKFONTSCALE_LIBS="-L${x11prefix}/lib -lfontenc `pkg-config --libs freetype2`"
- }
-}
-
Modified: trunk/dports/x11/openmotif/Portfile
===================================================================
--- trunk/dports/x11/openmotif/Portfile 2009-05-04 18:52:57 UTC (rev 50571)
+++ trunk/dports/x11/openmotif/Portfile 2009-05-04 19:19:09 UTC (rev 50572)
@@ -51,29 +51,9 @@
configure.args --mandir=${prefix}/share/man \
--enable-xft \
--enable-jpeg \
- --enable-png
+ --enable-png \
+ --x-include=${prefix}/include --x-lib=${prefix}/lib
-# AC_X_PATH blindly asks xmkmf where X11 is, and it always uses /usr/X11R6.
-# This block helps us link correctly and setup our pc files correctly when we
-# are +system_x11 and x11prefix is somewhere non-standard and should cause
-# AC_X_PATH to let us setup our CPPFLAGS and LDFLAGS without interference
-configure.args-append --x-include=${prefix}/include --x-lib=${prefix}/lib
-if { ![file exists ${prefix}/lib/pkgconfig/x11.pc] } {
- pre-configure {
- configure.cppflags-append -I${x11prefix}/include
- configure.ldflags-append -L${x11prefix}/lib
- }
-
- # And this will similarly get ports that use pkgconfig to find our pkgconfig-less libX11
- post-destroot {
- if {![file exists ${x11prefix}/lib/pkgconfig/x11.pc]} {
- foreach pc [glob ${destroot}${prefix}/lib/pkgconfig/*.pc] {
- reinplace "s:-lX11:-L${prefix}/lib -L${x11prefix}/lib -lX11:g" ${pc}
- }
- }
- }
-}
-
build.env LANG=C
post-destroot {
Modified: trunk/dports/x11/pango/Portfile
===================================================================
--- trunk/dports/x11/pango/Portfile 2009-05-04 18:52:57 UTC (rev 50571)
+++ trunk/dports/x11/pango/Portfile 2009-05-04 19:19:09 UTC (rev 50572)
@@ -99,29 +99,9 @@
-bind_at_load
configure.args \
- --enable-static
+ --enable-static \
+ --x-include=${prefix}/include --x-lib=${prefix}/lib
-# AC_X_PATH blindly asks xmkmf where X11 is, and it always uses /usr/X11R6.
-# This block helps us link correctly and setup our pc files correctly when we
-# are +system_x11 and x11prefix is somewhere non-standard and should cause
-# AC_X_PATH to let us setup our CPPFLAGS and LDFLAGS without interference
-configure.args-append --x-include=${prefix}/include --x-lib=${prefix}/lib
-if { ![file exists ${prefix}/lib/pkgconfig/x11.pc] } {
- pre-configure {
- configure.cppflags-append -I${x11prefix}/include
- configure.ldflags-append -L${x11prefix}/lib
- }
-
- # And this will similarly get ports that use pkgconfig to find our pkgconfig-less libX11
- post-destroot {
- if {![file exists ${x11prefix}/lib/pkgconfig/x11.pc]} {
- foreach pc [glob ${destroot}${prefix}/lib/pkgconfig/*.pc] {
- reinplace "s:-lX11:-L${prefix}/lib -L${x11prefix}/lib -lX11:g" ${pc}
- }
- }
- }
-}
-
variant no_x11 {
depends_lib-delete \
port:Xft2
Modified: trunk/dports/x11/qt4-x11/Portfile
===================================================================
--- trunk/dports/x11/qt4-x11/Portfile 2009-05-04 18:52:57 UTC (rev 50571)
+++ trunk/dports/x11/qt4-x11/Portfile 2009-05-04 19:19:09 UTC (rev 50572)
@@ -5,7 +5,7 @@
name qt4-x11
version 4.4.3
-revision 2
+revision 3
categories x11
maintainers mcalhoun
homepage http://www.trolltech.com/
@@ -119,7 +119,7 @@
reinplace "s|CFG_HOST_ARCH=macosx|CFG_HOST_ARCH=`uname -p`|g" ${worksrcpath}/configure
# Ensure the correct MacPorts X11 is used
- reinplace "s|/usr/X11R6|${x11prefix}|g" ${worksrcpath}/mkspecs/darwin-g++/qmake.conf
+ reinplace "s|/usr/X11R6|${prefix}|g" ${worksrcpath}/mkspecs/darwin-g++/qmake.conf
# Avoid having to call "install_name_tool -change" after destroot.
reinplace \
Modified: trunk/dports/x11/rox-filer/Portfile
===================================================================
--- trunk/dports/x11/rox-filer/Portfile 2009-05-04 18:52:57 UTC (rev 50571)
+++ trunk/dports/x11/rox-filer/Portfile 2009-05-04 19:19:09 UTC (rev 50572)
@@ -26,27 +26,8 @@
use_configure no
universal_variant no
-# AC_X_PATH blindly asks xmkmf where X11 is, and it always uses /usr/X11R6.
-# This block helps us link correctly and setup our pc files correctly when we
-# are +system_x11 and x11prefix is somewhere non-standard and should cause
-# AC_X_PATH to let us setup our CPPFLAGS and LDFLAGS without interference
-configure.args-append --x-include=${prefix}/include --x-lib=${prefix}/lib
-if { ![file exists ${prefix}/lib/pkgconfig/x11.pc] } {
- pre-configure {
- configure.cppflags-append -I${x11prefix}/include
- configure.ldflags-append -L${x11prefix}/lib
- }
+configure.args --x-include=${prefix}/include --x-lib=${prefix}/lib
- # And this will similarly get ports that use pkgconfig to find our pkgconfig-less libX11
- post-destroot {
- if {![file exists ${x11prefix}/lib/pkgconfig/x11.pc]} {
- foreach pc [glob ${destroot}${prefix}/lib/pkgconfig/*.pc] {
- reinplace "s:-lX11:-L${prefix}/lib -L${x11prefix}/lib -lX11:g" ${pc}
- }
- }
- }
-}
-
#build.env CC=${configure.cc} CPPFLAGS=${configure.cppflags} LDFLAGS=${configure.ldflags}
build { system "cd ${worksrcpath}; CC=${configure.cc} CPPFLAGS=\"${configure.cppflags}\" LDFLAGS=\"${configure.ldflags}\" ./ROX-Filer/AppRun --compile ${configure.args}" }
Modified: trunk/dports/x11/unclutter/Portfile
===================================================================
--- trunk/dports/x11/unclutter/Portfile 2009-05-04 18:52:57 UTC (rev 50571)
+++ trunk/dports/x11/unclutter/Portfile 2009-05-04 19:19:09 UTC (rev 50572)
@@ -26,7 +26,7 @@
use_configure no
-build.args-append CCOPTIONS='-I${prefix}/include -I${x11prefix}/include' LDOPTIONS='-L${prefix}/lib -L${x11prefix}/lib'
+build.args-append CCOPTIONS='-I${prefix}/include' LDOPTIONS='-L${prefix}/lib'
destroot.args BINDIR=${destroot}${prefix}/bin MANDIR=${destroot}${prefix}/share/man/man1
Modified: trunk/dports/x11/windowmaker/Portfile
===================================================================
--- trunk/dports/x11/windowmaker/Portfile 2009-05-04 18:52:57 UTC (rev 50571)
+++ trunk/dports/x11/windowmaker/Portfile 2009-05-04 19:19:09 UTC (rev 50572)
@@ -2,7 +2,7 @@
PortSystem 1.0
name windowmaker
version 0.92.0
-revision 3
+revision 4
maintainers nomaintainer
categories x11 x11-wm
platforms darwin freebsd
@@ -57,7 +57,7 @@
configure.env LINGUAS="bg cs da de el es et fi fr gl hr hu it ja \
ko ms nl no pl pt ro ru sk sv tr zh_CN" \
- LIBS="-L${prefix}/lib -lintl -L${x11prefix}/lib -lX11"
+ LIBS="-L${prefix}/lib -lintl -lX11"
configure.args --disable-debug --enable-gnome \
--mandir=${prefix}/share/man \
--with-nlsdir=${prefix}/share/locale \
Modified: trunk/dports/x11/wine/Portfile
===================================================================
--- trunk/dports/x11/wine/Portfile 2009-05-04 18:52:57 UTC (rev 50571)
+++ trunk/dports/x11/wine/Portfile 2009-05-04 19:19:09 UTC (rev 50572)
@@ -64,6 +64,8 @@
-framework CoreServices \
-lz
+configure.args --x-include=${prefix}/include --x-lib=${prefix}/lib
+
pre-fetch {
if { [string compare ${os.endian} "little"] != 0 } {
return -code error "${name} only runs on little-endian computers, such as an Intel Mac."
@@ -75,20 +77,7 @@
file rename ${destroot}${prefix}/bin/wine ${destroot}${prefix}/libexec/wine/wine
xinstall -m 755 ${filespath}/wine.in ${destroot}${prefix}/bin/wine
reinplace s|@PREFIX@|${prefix}|g ${destroot}${prefix}/bin/wine
- reinplace s|@X11PREFIX@|${x11prefix}|g ${destroot}${prefix}/bin/wine
}
-# AC_X_PATH blindly asks xmkmf where X11 is, and it always uses /usr/X11R6.
-# This block helps us link correctly when we are +system_x11 and x11prefix
-# is somewhere non-standard and should cause AC_X_PATH to let us setup our
-# CPPFLAGS and LDFLAGS without interference
-configure.args-append --x-include=${prefix}/include --x-lib=${prefix}/lib
-pre-configure {
- if { ![file exists ${prefix}/lib/pkgconfig/x11.pc] } {
- configure.cppflags-append -I${x11prefix}/include
- configure.ldflags-append -L${x11prefix}/lib
- }
-}
-
livecheck.check sourceforge
livecheck.regex "<title>Source Packages (\[0-9\]+\\.\[0-9\]*\[02468\](\\.\[0-9\]+)*) released.*</title>"
Modified: trunk/dports/x11/wine/files/wine.in
===================================================================
--- trunk/dports/x11/wine/files/wine.in 2009-05-04 18:52:57 UTC (rev 50571)
+++ trunk/dports/x11/wine/files/wine.in 2009-05-04 19:19:09 UTC (rev 50572)
@@ -1,5 +1,5 @@
#!/bin/sh
# $Id$
-DYLD_FALLBACK_LIBRARY_PATH="@PREFIX@/lib:@X11PREFIX@/lib" \
+DYLD_FALLBACK_LIBRARY_PATH="@PREFIX@/lib" \
"@PREFIX@/libexec/wine/wine" "$@"
Modified: trunk/dports/x11/wine-crossover-games/Portfile
===================================================================
--- trunk/dports/x11/wine-crossover-games/Portfile 2009-05-04 18:52:57 UTC (rev 50571)
+++ trunk/dports/x11/wine-crossover-games/Portfile 2009-05-04 19:19:09 UTC (rev 50572)
@@ -55,6 +55,8 @@
-framework CoreServices \
-lz
+configure.args --x-include=${prefix}/include --x-lib=${prefix}/lib
+
pre-fetch {
if { [string compare ${os.endian} "little"] != 0 } {
return -code error "${name} only runs on little-endian computers, such as an Intel Mac."
@@ -69,18 +71,5 @@
xinstall -d ${destroot}${prefix}/libexec/wine
xinstall -m 755 ${filespath}/wine.in ${destroot}${prefix}/bin/wine
reinplace s|@PREFIX@|${prefix}|g ${destroot}${prefix}/bin/wine
- reinplace s|@X11PREFIX@|${x11prefix}|g ${destroot}${prefix}/bin/wine
}
-# AC_X_PATH blindly asks xmkmf where X11 is, and it always uses /usr/X11R6.
-# This block helps us link correctly when we are +system_x11 and x11prefix
-# is somewhere non-standard and should cause AC_X_PATH to let us setup our
-# CPPFLAGS and LDFLAGS without interference
-configure.args-append --x-include=${prefix}/include --x-lib=${prefix}/lib
-pre-configure {
- if { ![file exists ${prefix}/lib/pkgconfig/x11.pc] } {
- configure.cppflags-append -I${x11prefix}/include
- configure.ldflags-append -L${x11prefix}/lib
- }
-}
-
Modified: trunk/dports/x11/wine-crossover-games/files/wine.in
===================================================================
--- trunk/dports/x11/wine-crossover-games/files/wine.in 2009-05-04 18:52:57 UTC (rev 50571)
+++ trunk/dports/x11/wine-crossover-games/files/wine.in 2009-05-04 19:19:09 UTC (rev 50572)
@@ -1,4 +1,4 @@
#!/bin/sh
-DYLD_FALLBACK_LIBRARY_PATH="@PREFIX@/lib:@X11PREFIX@/lib" \
+DYLD_FALLBACK_LIBRARY_PATH="@PREFIX@/lib" \
"@PREFIX@/bin/wineloader" "$@"
Modified: trunk/dports/x11/wine-devel/Portfile
===================================================================
--- trunk/dports/x11/wine-devel/Portfile 2009-05-04 18:52:57 UTC (rev 50571)
+++ trunk/dports/x11/wine-devel/Portfile 2009-05-04 19:19:09 UTC (rev 50572)
@@ -57,6 +57,8 @@
-framework CoreServices \
-lz
+configure.args --x-include=${prefix}/include --x-lib=${prefix}/lib
+
pre-fetch {
if { [string compare ${os.endian} "little"] != 0 } {
return -code error "${name} only runs on little-endian computers, such as an Intel Mac."
@@ -68,21 +70,8 @@
file rename ${destroot}${prefix}/bin/wine ${destroot}${prefix}/libexec/wine/wine
xinstall -m 755 ${filespath}/wine.in ${destroot}${prefix}/bin/wine
reinplace s|@PREFIX@|${prefix}|g ${destroot}${prefix}/bin/wine
- reinplace s|@X11PREFIX@|${x11prefix}|g ${destroot}${prefix}/bin/wine
}
-# AC_X_PATH blindly asks xmkmf where X11 is, and it always uses /usr/X11R6.
-# This block helps us link correctly when we are +system_x11 and x11prefix
-# is somewhere non-standard and should cause AC_X_PATH to let us setup our
-# CPPFLAGS and LDFLAGS without interference
-configure.args-append --x-include=${prefix}/include --x-lib=${prefix}/lib
-pre-configure {
- if { ![file exists ${prefix}/lib/pkgconfig/x11.pc] } {
- configure.cppflags-append -I${x11prefix}/include
- configure.ldflags-append -L${x11prefix}/lib
- }
-}
-
livecheck.name ${my_name}
livecheck.check sourceforge
livecheck.regex "<title>Source Packages (\[0-9\]+\\.\[0-9\]*\[13579\](\\.\[0-9\]+)*) released.*</title>"
Modified: trunk/dports/x11/wine-devel/files/wine.in
===================================================================
--- trunk/dports/x11/wine-devel/files/wine.in 2009-05-04 18:52:57 UTC (rev 50571)
+++ trunk/dports/x11/wine-devel/files/wine.in 2009-05-04 19:19:09 UTC (rev 50572)
@@ -1,5 +1,5 @@
#!/bin/sh
# $Id$
-DYLD_FALLBACK_LIBRARY_PATH="@PREFIX@/lib:@X11PREFIX@/lib" \
+DYLD_FALLBACK_LIBRARY_PATH="@PREFIX@/lib" \
"@PREFIX@/libexec/wine/wine" "$@"
Modified: trunk/dports/x11/wmcalclock/Portfile
===================================================================
--- trunk/dports/x11/wmcalclock/Portfile 2009-05-04 18:52:57 UTC (rev 50571)
+++ trunk/dports/x11/wmcalclock/Portfile 2009-05-04 19:19:09 UTC (rev 50572)
@@ -22,4 +22,4 @@
use_configure no
destroot.destdir DESTDIR=${destroot}${prefix}
-build.args INCDIR="-I${prefix}/include -I${x11prefix}/include" LIBDIR="-L${prefix}/lib -L${x11prefix}/lib"
+build.args INCDIR="-I${prefix}/include" LIBDIR="-L${prefix}/lib"
Modified: trunk/dports/x11/wmcube/Portfile
===================================================================
--- trunk/dports/x11/wmcube/Portfile 2009-05-04 18:52:57 UTC (rev 50571)
+++ trunk/dports/x11/wmcube/Portfile 2009-05-04 19:19:09 UTC (rev 50572)
@@ -24,7 +24,7 @@
use_configure no
universal_variant no
-build.args -f Makefile.OPENBSD LIBDIR="-L${prefix}/lib -L${x11prefix}/lib -L./libdocapp" INCLUDES="-I${prefix}/include -I${x11prefix}/include"
+build.args -f Makefile.OPENBSD LIBDIR="-L${prefix}/lib -L./libdocapp" INCLUDES="-I${prefix}/include"
destroot {
xinstall -m 755 -o root -g wheel ${worksrcpath}/${name} \
Modified: trunk/dports/x11/wxgtk/Portfile
===================================================================
--- trunk/dports/x11/wxgtk/Portfile 2009-05-04 18:52:57 UTC (rev 50571)
+++ trunk/dports/x11/wxgtk/Portfile 2009-05-04 19:19:09 UTC (rev 50572)
@@ -24,8 +24,6 @@
patchfiles patch-Makefile.in
-configure.cppflags-append "-I${x11prefix}/include"
-
configure.args --with-gtk --with-libpng --with-libjpeg --with-libtiff \
--with-freetype --with-zlib
Modified: trunk/dports/x11/xauth/Portfile
===================================================================
--- trunk/dports/x11/xauth/Portfile 2009-05-04 18:52:57 UTC (rev 50571)
+++ trunk/dports/x11/xauth/Portfile 2009-05-04 19:19:09 UTC (rev 50572)
@@ -28,10 +28,7 @@
port:xorg-libXext \
port:xorg-libXmu
-platform macosx {
- if {${os.major} < 9 && ![file exists ${prefix}/lib/pkgconfig/xmuu.pc]} {
- configure.env-append \
- XAUTH_CFLAGS="-I${x11prefix}/include" \
- XAUTH_LIBS="-L${x11prefix}/lib -lXmuu -lXext -lX11 -lXau"
- }
-}
+livecheck.check regex
+livecheck.url [lindex ${master_sites} 0]?C=M&O=D
+livecheck.regex ${name}-(\\d+(?:\\.\\d+)*)
+
Modified: trunk/dports/x11/xcircuit/Portfile
===================================================================
--- trunk/dports/x11/xcircuit/Portfile 2009-05-04 18:52:57 UTC (rev 50571)
+++ trunk/dports/x11/xcircuit/Portfile 2009-05-04 19:19:09 UTC (rev 50572)
@@ -32,11 +32,6 @@
configure.args --mandir=${prefix}/share/man \
--with-tcl=${prefix}/lib \
--with-tk=${prefix}/lib \
- --with-gs=${prefix}/bin/gs
-
-# AC_X_PATH doesn't find the X ports correctly
-if { [file exists ${prefix}/lib/pkgconfig/x11.pc] } {
- configure.args-append --x-includes=${prefix}/include --x-libraries=${prefix}/lib
-} else {
- configure.args-append --x-includes=${x11prefix}/include --x-libraries=${x11prefix}/lib
-}
+ --with-gs=${prefix}/bin/gs \
+ --x-includes=${prefix}/include \
+ --x-libraries=${prefix}/lib
Modified: trunk/dports/x11/xdiskusage/Portfile
===================================================================
--- trunk/dports/x11/xdiskusage/Portfile 2009-05-04 18:52:57 UTC (rev 50571)
+++ trunk/dports/x11/xdiskusage/Portfile 2009-05-04 19:19:09 UTC (rev 50572)
@@ -18,13 +18,7 @@
depends_lib port:fltk
-pre-build {
- if { [file exists ${prefix}/lib/pkgconfig/x11.pc] } {
- build.args-append CXXFLAGS="-I${prefix}/include" LDFLAGS="-L${prefix}/lib"
- } else {
- build.args-append CXXFLAGS="-I${prefix}/include -I${x11prefix}/include" LDFLAGS="-L${prefix}/lib -L${x11prefix}/lib"
- }
-}
+build.args-append CXXFLAGS="-I${prefix}/include" LDFLAGS="-L${prefix}/lib"
destroot.destdir prefix=${destroot}${prefix} mandir=${destroot}${prefix}/share/man
Modified: trunk/dports/x11/xeyes/Portfile
===================================================================
--- trunk/dports/x11/xeyes/Portfile 2009-05-04 18:52:57 UTC (rev 50571)
+++ trunk/dports/x11/xeyes/Portfile 2009-05-04 19:19:09 UTC (rev 50572)
@@ -28,11 +28,3 @@
livecheck.check regex
livecheck.url [lindex ${master_sites} 0]?C=M&O=D
livecheck.regex ${name}-(\\d+(?:\\.\\d+)*)
-
-platform macosx {
- if {${os.major} < 9 && ![file exists ${prefix}/lib/pkgconfig/xt.pc]} {
- configure.env-append \
- XEYES_CFLAGS="-I${x11prefix}/include" \
- XEYES_LIBS="-L${x11prefix}/lib -lXmu -lXt -lXext -lX11 -lSM -lICE"
- }
-}
Modified: trunk/dports/x11/xfe/Portfile
===================================================================
--- trunk/dports/x11/xfe/Portfile 2009-05-04 18:52:57 UTC (rev 50571)
+++ trunk/dports/x11/xfe/Portfile 2009-05-04 19:19:09 UTC (rev 50572)
@@ -25,13 +25,6 @@
configure.args --with-included-gettext --enable-release
-pre-configure {
- if { ![file exists ${prefix}/lib/pkgconfig/x11.pc] } {
- configure.cppflags-append -I${x11prefix}/include
- configure.ldflags-append -L${x11prefix}/lib
- }
-}
-
configure.env LIBS="-lX11 -lXft"
post-configure {
reinplace "s;/usr/local/share;${prefix}/share;" \
Modified: trunk/dports/x11/xforms/Portfile
===================================================================
--- trunk/dports/x11/xforms/Portfile 2009-05-04 18:52:57 UTC (rev 50571)
+++ trunk/dports/x11/xforms/Portfile 2009-05-04 19:19:09 UTC (rev 50572)
@@ -30,11 +30,3 @@
# not trivial to autoreconf
universal_variant no
-
-pre-configure {
- if { ![file exists ${prefix}/lib/pkgconfig/x11.pc] } {
- configure.cppflags-append -I${x11prefix}/include
- configure.ldflags-append -L${x11prefix}/lib
- }
-}
-
Modified: trunk/dports/x11/xglobe/Portfile
===================================================================
--- trunk/dports/x11/xglobe/Portfile 2009-05-04 18:52:57 UTC (rev 50571)
+++ trunk/dports/x11/xglobe/Portfile 2009-05-04 19:19:09 UTC (rev 50572)
@@ -23,7 +23,7 @@
universal_variant no
patchfiles patch-Makefile patch-renderer_cpp
configure { reinplace "s|@@PREFIX@@|${prefix}|g" ${worksrcpath}/Makefile
- reinplace "s|@@X11PREFIX@@|${x11prefix}|g" ${worksrcpath}/Makefile }
+ reinplace "s|@@X11PREFIX@@|${prefix}|g" ${worksrcpath}/Makefile }
destroot.args DESTDIR=${destroot}
destroot.destdir prefix=${destroot}${prefix}
post-destroot { system "install -c \
Modified: trunk/dports/x11/xinit/Portfile
===================================================================
--- trunk/dports/x11/xinit/Portfile 2009-05-04 18:52:57 UTC (rev 50571)
+++ trunk/dports/x11/xinit/Portfile 2009-05-04 19:19:09 UTC (rev 50572)
@@ -50,11 +50,3 @@
reinplace "s|^X11DIR=.*$|X11DIR=${prefix}|" ${destroot}${prefix}/bin/font_cache
reinplace "s|^X11FONTDIR=.*$|X11FONTDIR=${prefix}/share/fonts|" ${destroot}${prefix}/bin/font_cache
}
-
-platform macosx {
- if {${os.major} < 9 && ![file exists ${prefix}/lib/pkgconfig/x11.pc]} {
- configure.env-append \
- XINIT_CFLAGS="-I${x11prefix}/include" \
- XINIT_LIBS="-L${x11prefix}/lib -lX11"
- }
-}
Modified: trunk/dports/x11/xmove/Portfile
===================================================================
--- trunk/dports/x11/xmove/Portfile 2009-05-04 18:52:57 UTC (rev 50571)
+++ trunk/dports/x11/xmove/Portfile 2009-05-04 19:19:09 UTC (rev 50572)
@@ -17,9 +17,6 @@
master_sites ftp://ftp.cs.columbia.edu/pub/xmove/
checksums md5 d70107f7835b755bd4f57b47a8ac7b38
-#if this is set, put manpages in man and not share/man
-#prefix ${x11prefix}
-
distname ${name}.${version}
patchfiles patch-XMOVELib.c patch-externs.h patch-main.c patch-move_window.c \
patch-print11.c patch-put_image.c patch-server.c patch-xmovectrl.h
Modified: trunk/dports/x11/xorg-server/Portfile
===================================================================
--- trunk/dports/x11/xorg-server/Portfile 2009-05-04 18:52:57 UTC (rev 50571)
+++ trunk/dports/x11/xorg-server/Portfile 2009-05-04 19:19:09 UTC (rev 50572)
@@ -66,8 +66,6 @@
port:xorg-libXfixes
post-patch {
- reinplace "s|ensure_path(X11BINDIR);|ensure_path(X11BINDIR); ensure_path(\"${x11prefix}/bin\");|" ${worksrcpath}/hw/xquartz/mach-startup/bundle-main.c
-
# Yeah, there's probably a better way to do this...
system "cd ${worksrcpath}/.. && patch -p0 < ${filespath}/mesa-7.0-multisample.patch"
}
@@ -76,7 +74,7 @@
# Otherwise glcore.h will be pulled in from glproto in ${prefix}/include/GL/internal
configure.cppflags-delete -I${prefix}/include
-configure.cppflags-append -I${worksrcpath}/../Mesa-${mesavers}/include -I${prefix}/include -I${x11prefix}/include
+configure.cppflags-append -I${worksrcpath}/../Mesa-${mesavers}/include -I${prefix}/include
post-destroot {
ln -s Xquartz ${destroot}${prefix}/bin/X
Modified: trunk/dports/x11/xorg-server-devel/Portfile
===================================================================
--- trunk/dports/x11/xorg-server-devel/Portfile 2009-05-04 18:52:57 UTC (rev 50571)
+++ trunk/dports/x11/xorg-server-devel/Portfile 2009-05-04 19:19:09 UTC (rev 50572)
@@ -60,10 +60,6 @@
port:xorg-libAppleWM \
port:xorg-libXfixes
-post-patch {
- reinplace "s|ensure_path(X11BINDIR);|ensure_path(X11BINDIR); ensure_path(\"${x11prefix}/bin\");|" ${worksrcpath}/hw/xquartz/mach-startup/bundle-main.c
-}
-
configure.args --with-apple-applications-dir=${applications_dir} --with-fontdir=${prefix}/share/fonts --with-apple-application-id=org.macports.X11
# Xplugin.h is missing on Tiger, and provided in filespath
Modified: trunk/dports/x11/xping/Portfile
===================================================================
--- trunk/dports/x11/xping/Portfile 2009-05-04 18:52:57 UTC (rev 50571)
+++ trunk/dports/x11/xping/Portfile 2009-05-04 19:19:09 UTC (rev 50572)
@@ -18,6 +18,6 @@
file copy ${filespath}/${distfiles} ${worksrcpath} }
use_configure no
-build { system "cd ${worksrcpath} && cc ${distfiles} -Wall -I${prefix}/include -I${x11prefix}/include -L${prefix}/lib -L${x11prefix}/lib -lX11 -o xping" }
+build { system "cd ${worksrcpath} && cc ${distfiles} -Wall -I${prefix}/include -L${prefix}/lib -lX11 -o xping" }
destroot { system "install -m 755 ${worksrcpath}/xping ${destroot}/${prefix}/bin/" }
Modified: trunk/dports/x11/xroot/Portfile
===================================================================
--- trunk/dports/x11/xroot/Portfile 2009-05-04 18:52:57 UTC (rev 50571)
+++ trunk/dports/x11/xroot/Portfile 2009-05-04 19:19:09 UTC (rev 50572)
@@ -3,7 +3,7 @@
PortSystem 1.0
name xroot
version 1.0
-revision 1
+revision 2
categories x11
maintainers nomaintainer
description A small X -root window
@@ -32,7 +32,7 @@
}
build {
file copy ${distpath}/${distfile} ${worksrcpath}
- system "cd ${worksrcpath} && c++ ${distfile} -Wall -L${prefix}/lib -L${x11prefix}/lib -I${prefix}/include -I${x11prefix}/include -lX11 -o xroot"
+ system "cd ${worksrcpath} && c++ ${distfile} -Wall -L${prefix}/lib -I${prefix}/include -lX11 -o xroot"
}
destroot {
xinstall -m 755 ${worksrcpath}/xroot ${destroot}${prefix}/bin/
Modified: trunk/dports/x11/xterm/Portfile
===================================================================
--- trunk/dports/x11/xterm/Portfile 2009-05-04 18:52:57 UTC (rev 50571)
+++ trunk/dports/x11/xterm/Portfile 2009-05-04 19:19:09 UTC (rev 50572)
@@ -36,20 +36,9 @@
configure.args --mandir=${prefix}/share/man --enable-luit \
--enable-logging --enable-wide-chars \
- --enable-256-color --enable-load-vt-fonts
+ --enable-256-color --enable-load-vt-fonts \
+ --x-include=${prefix}/include --x-lib=${prefix}/lib
-# AC_X_PATH blindly asks xmkmf where X11 is, and it always uses /usr/X11R6.
-# This block helps us link correctly and setup our pc files correctly when we
-# are +system_x11 and x11prefix is somewhere non-standard and should cause
-# AC_X_PATH to let us setup our CPPFLAGS and LDFLAGS without interference
-configure.args-append --x-include=${prefix}/include --x-lib=${prefix}/lib
-if { ![file exists ${prefix}/lib/pkgconfig/x11.pc] } {
- pre-configure {
- configure.cppflags-append -I${x11prefix}/include
- configure.ldflags-append -L${x11prefix}/lib
- }
-}
-
# If -ltermcap stays in the LDFLAGS, xterm is linked against both
# /usr/lib's and ${prefix}/lib's libncurses.
post-configure {
Modified: trunk/dports/xfce/libxfcegui4/Portfile
===================================================================
--- trunk/dports/xfce/libxfcegui4/Portfile 2009-05-04 18:52:57 UTC (rev 50571)
+++ trunk/dports/xfce/libxfcegui4/Portfile 2009-05-04 19:19:09 UTC (rev 50572)
@@ -16,7 +16,8 @@
sha1 82bcfe74dd3b9188b9f41d8fa7dc4a8481461696 \
rmd160 295263f3e8a6bbcea05ce5ae8ab0f3a9cf1e4568
-configure.args --enable-startup-notification
+configure.args --enable-startup-notification \
+ --x-include=${prefix}/include --x-lib=${prefix}/lib
depends_lib port:libxfce4util \
port:xfconf \
@@ -24,25 +25,3 @@
port:gtk-xfce-engine \
port:libxml2 \
port:startup-notification
-
-# AC_X_PATH blindly asks xmkmf where X11 is, and it always uses /usr/X11R6.
-# This block helps us link correctly and setup our pc files correctly when we
-# are +system_x11 and x11prefix is somewhere non-standard and should cause
-# AC_X_PATH to let us setup our CPPFLAGS and LDFLAGS without interference
-configure.args-append --x-include=${prefix}/include --x-lib=${prefix}/lib
-if { ![file exists ${prefix}/lib/pkgconfig/x11.pc] } {
- pre-configure {
- configure.cppflags-append -I${x11prefix}/include
- configure.ldflags-append -L${x11prefix}/lib
- }
-
- # And this will similarly get ports that use pkgconfig to find our pkgconfig-less libX11
- post-destroot {
- if {![file exists ${x11prefix}/lib/pkgconfig/x11.pc]} {
- foreach pc [glob ${destroot}${prefix}/lib/pkgconfig/*.pc] {
- reinplace "s:-lX11:-L${prefix}/lib -L${x11prefix}/lib -lX11:g" ${pc}
- }
- }
- }
-}
-
Modified: trunk/dports/xfce/xfce-utils/Portfile
===================================================================
--- trunk/dports/xfce/xfce-utils/Portfile 2009-05-04 18:52:57 UTC (rev 50571)
+++ trunk/dports/xfce/xfce-utils/Portfile 2009-05-04 19:19:09 UTC (rev 50572)
@@ -20,13 +20,6 @@
configure.args --disable-gdm --with-xsession-prefix=${prefix}
-pre-configure {
- if { ![file exists ${prefix}/lib/pkgconfig/x11.pc] } {
- configure.cppflags-append -I${x11prefix}/include
- configure.ldflags-append "-L${x11prefix}/lib -lXft -lfontconfig -lXrender -lXext -lXinerama -lXrandr"
- }
-}
-
variant midori {
depends_lib-append port:midori
configure.args-append --with-browser=midori
Modified: trunk/dports/xfce/xfce4-settings/Portfile
===================================================================
--- trunk/dports/xfce/xfce4-settings/Portfile 2009-05-04 18:52:57 UTC (rev 50571)
+++ trunk/dports/xfce/xfce4-settings/Portfile 2009-05-04 19:19:09 UTC (rev 50572)
@@ -4,6 +4,7 @@
name xfce4-settings
version 4.6.1
+revision 1
categories xfce
platforms darwin
maintainers afb at macports.org
@@ -21,9 +22,9 @@
platform darwin 8 {
patchfiles-append patch-configure.diff
- configure.env-append PKG_CONFIG_PATH="${x11prefix}/lib/pkgconfig" \
- XI_VERSION="1.0.0" XI_CFLAGS="-I${x11prefix}/include" XI_LIBS="-L${x11prefix}/lib -lXi" \
- LIBX11_VERSION="6.2.0" LIBX11_CFLAGS="-I${x11prefix}/include" LIBX11_LIBS="-L${x11prefix}/lib -lX11" \
- XRANDR_VERSION="2.0.0" XRANDR_CFLAGS="-I${x11prefix}/include" XRANDR_LIBS="-L${x11prefix}/lib -lXrandr" \
- XCURSOR_VERSION="1.0.0" XCURSOR_CFLAGS="-I${x11prefix}/include" XCURSOR_LIBS="-L${x11prefix}/lib -lXcursor"
+ configure.env-append PKG_CONFIG_PATH="${prefix}/lib/pkgconfig" \
+ XI_VERSION="1.0.0" XI_CFLAGS="-I${prefix}/include" XI_LIBS="-L${prefix}/lib -lXi" \
+ LIBX11_VERSION="6.2.0" LIBX11_CFLAGS="-I${prefix}/include" LIBX11_LIBS="-L${prefix}/lib -lX11" \
+ XRANDR_VERSION="2.0.0" XRANDR_CFLAGS="-I${prefix}/include" XRANDR_LIBS="-L${prefix}/lib -lXrandr" \
+ XCURSOR_VERSION="1.0.0" XCURSOR_CFLAGS="-I${prefix}/include" XCURSOR_LIBS="-L${prefix}/lib -lXcursor"
}
Modified: trunk/dports/xfce/xfconf/Portfile
===================================================================
--- trunk/dports/xfce/xfconf/Portfile 2009-05-04 18:52:57 UTC (rev 50571)
+++ trunk/dports/xfce/xfconf/Portfile 2009-05-04 19:19:09 UTC (rev 50572)
@@ -21,28 +21,8 @@
port:xorg-libsm port:xorg-libX11 \
port:gtk2
+configure.args --x-include=${prefix}/include --x-lib=${prefix}/lib
+
platform darwin {
configure.args-append --disable-visibility
}
-
-# AC_X_PATH blindly asks xmkmf where X11 is, and it always uses /usr/X11R6.
-# This block helps us link correctly and setup our pc files correctly when we
-# are +system_x11 and x11prefix is somewhere non-standard and should cause
-# AC_X_PATH to let us setup our CPPFLAGS and LDFLAGS without interference
-configure.args-append --x-include=${prefix}/include --x-lib=${prefix}/lib
-if { ![file exists ${prefix}/lib/pkgconfig/x11.pc] } {
- pre-configure {
- configure.cppflags-append -I${x11prefix}/include
- configure.ldflags-append -L${x11prefix}/lib
- }
-
- # And this will similarly get ports that use pkgconfig to find our pkgconfig-less libX11
- post-destroot {
- if {![file exists ${x11prefix}/lib/pkgconfig/x11.pc]} {
- foreach pc [glob ${destroot}${prefix}/lib/pkgconfig/*.pc] {
- reinplace "s:-lX11:-L${prefix}/lib -L${x11prefix}/lib -lX11:g" ${pc}
- }
- }
- }
-}
-
Modified: trunk/dports/xfce/xfprint/Portfile
===================================================================
--- trunk/dports/xfce/xfprint/Portfile 2009-05-04 18:52:57 UTC (rev 50571)
+++ trunk/dports/xfce/xfprint/Portfile 2009-05-04 19:19:09 UTC (rev 50572)
@@ -21,11 +21,4 @@
configure.args --enable-cups
-pre-configure {
- if { ![file exists ${prefix}/lib/pkgconfig/x11.pc] } {
- configure.cppflags-append -I${x11prefix}/include
- configure.ldflags-append -L${x11prefix}/lib
- }
-}
-
configure.ldflags-append "-lXft -lfontconfig -lXrender -lXext -lXinerama -lXrandr"
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20090504/ba997bf9/attachment-0001.html>
More information about the macports-changes
mailing list