Changeset 50572


Ignore:
Timestamp:
May 4, 2009, 7:19:09 PM (10 years ago)
Author:
jeremyhu@…
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.

Location:
trunk/dports
Files:
108 edited

Legend:

Unmodified
Added
Removed
  • trunk/dports/aqua/osx2x/Portfile

    r47558 r50572  
    3939post-patch {
    4040    reinplace s|@PREFIX@|$prefix| $worksrcpath/osx2x.xcodeproj/project.pbxproj
    41     if {[file exists ${prefix}/lib/libX11.dylib]} {
    42         reinplace s|@X11_PREFIX@|$prefix| $worksrcpath/osx2x.xcodeproj/project.pbxproj
    43     } else {
    44         reinplace s|@X11_PREFIX@|$x11prefix| $worksrcpath/osx2x.xcodeproj/project.pbxproj
    45     }
     41    reinplace s|@X11_PREFIX@|$prefix| $worksrcpath/osx2x.xcodeproj/project.pbxproj
    4642}
    4743
     
    4945                port:openssl
    5046
    51 set library_search_path "LIBRARY_SEARCH_PATHS='$prefix/lib $x11prefix/lib'"
     47set library_search_path "LIBRARY_SEARCH_PATHS='$prefix/lib'"
    5248
    5349eval xcode.build.settings-append        $library_search_path
  • trunk/dports/audio/easytag-devel/Portfile

    r46271 r50572  
    3131
    3232depends_build           port:hicolor-icon-theme
    33 
    34 if { ![file exists ${prefix}/lib/pkgconfig/x11.pc] } {
    35         configure.cppflags-append -I${x11prefix}/include
    36         configure.ldflags-append  -L${x11prefix}/lib
    37 }
    3833
    3934configure.args          --mandir=${prefix}/share/man \
  • trunk/dports/audio/easytag/Portfile

    r46270 r50572  
    3737depends_build    port:hicolor-icon-theme
    3838
    39 if { ![file exists ${prefix}/lib/pkgconfig/x11.pc] } {
    40         configure.cppflags-append -I${x11prefix}/include
    41         configure.ldflags-append  -L${x11prefix}/lib
    42 }
    43 
    4439configure.args   --mandir=${prefix}/share/man \
    4540                 --infodir=${prefix}/share/info
  • trunk/dports/devel/evas/Portfile

    r47512 r50572  
    3131                path:include/gif_lib.h:giflib
    3232
    33 configure.cppflags-append   "-I${x11prefix}/include"
    3433configure.args  --mandir=${prefix}/share/man \
    3534                --enable-glitz-x11 \
  • trunk/dports/devel/gtkglext/Portfile

    r47549 r50572  
    2222        port:gtk2
    2323
    24 # AC_X_PATH blindly asks xmkmf where X11 is, and it always uses /usr/X11R6.
    25 # This block helps us link correctly and setup our pc files correctly when we   
    26 # are +system_x11 and x11prefix is somewhere non-standard and should cause
    27 # AC_X_PATH to let us setup our CPPFLAGS and LDFLAGS without interference
    28 configure.args-append --x-include=${prefix}/include --x-lib=${prefix}/lib
    29 if { ![file exists ${prefix}/lib/pkgconfig/x11.pc] } {
    30     pre-configure {
    31         configure.cppflags-append -I${x11prefix}/include
    32         configure.ldflags-append  -L${x11prefix}/lib
    33     }
    34 
    35     # And this will similarly get ports that use pkgconfig to find our pkgconfig-less libX11
    36     post-destroot {
    37         if {![file exists ${x11prefix}/lib/pkgconfig/x11.pc]} {
    38             foreach pc [glob ${destroot}${prefix}/lib/pkgconfig/*.pc] {
    39                 reinplace "s:-lXt:-L${prefix}/lib -L${x11prefix}/lib -lXt:g" ${pc}
    40             }
    41         }
    42     }
    43 }
     24configure.args --x-include=${prefix}/include --x-lib=${prefix}/lib
  • trunk/dports/devel/hat/Portfile

    r50031 r50572  
    3535#user_notes     Despite being compatible with both nhc98 and ghc, the \
    3636#               port depends on the more featureful ghc.
    37 #
    38 #               If the message "resize: command not found" appears,
    39 #               you need to add ${x11prefix}/bin to your PATH.
    40 #
    4137
    4238configure.args  --mandir=${prefix}/share/man/man1
  • trunk/dports/devel/inventor/Portfile

    r50128 r50572  
    6060
    6161post-patch {
    62            reinplace "s|__PREFIX__|${prefix}|" ${worksrcpath}/make/ivcommondefs
    63            if { [file exists ${prefix}/lib/pkgconfig/x11.pc] } {
    64               reinplace "s|/usr/X11R6|${prefix}|" ${worksrcpath}/make/ivcommondefs
    65            } else {
    66               reinplace "s|/usr/X11R6|${x11prefix}|" ${worksrcpath}/make/ivcommondefs
    67            }
     62        reinplace "s|__PREFIX__|${prefix}|" ${worksrcpath}/make/ivcommondefs
     63        reinplace "s|/usr/X11R6|${prefix}|" ${worksrcpath}/make/ivcommondefs
    6864}
    6965
  • trunk/dports/devel/libast/Portfile

    r45603 r50572  
    3434autoconf.cmd autoreconf
    3535autoconf.args -fvi
    36 autoconf.env ACLOCAL="aclocal -I ${prefix}/share/aclocal -I ${x11prefix}/share/aclocal -I ."
     36autoconf.env ACLOCAL="aclocal -I ${prefix}/share/aclocal -I ."
  • trunk/dports/devel/libgdiplus/Portfile

    r49143 r50572  
    3636                port:xrender
    3737
    38 configure.cppflags-append -I${x11prefix}/include
    39 
    4038post-patch {
    4139        reinplace "s/-pthread/-lpthread/g" ${worksrcpath}/configure
  • trunk/dports/devel/mono/Portfile

    r48761 r50572  
    2828patchfiles       patch-configure.diff
    2929
    30 configure.pkg_config    "${prefix}/bin/pkg-config"
    31 configure.pkg_config_path "${prefix}/lib/pkgconfig:${x11prefix}/lib/pkgconfig"
    3230configure.env-append    ACLOCAL_FLAGS="-I ${prefix}/share/aclocal"
    3331# Do NOT pick up external boehmgc (prefixing CPPFLAGS or CFLAGS does not suffice -- ugly++)
  • trunk/dports/devel/pkgconfig/Portfile

    r42121 r50572  
    3030configure.args \
    3131        --enable-indirect-deps \
    32         --with-pc-path=${prefix}/lib/pkgconfig:${prefix}/share/pkgconfig:${x11prefix}/lib/pkgconfig
     32        --with-pc-path=${prefix}/lib/pkgconfig:${prefix}/share/pkgconfig
    3333
    3434platform darwin 6 {
  • trunk/dports/devel/xulrunner/Portfile

    r49782 r50572  
    209209        sdkdir="${prefix}/lib/${name}"
    210210
    211 # AC_X_PATH blindly asks xmkmf where X11 is, and it always uses /usr/X11R6.
    212 # This block helps us link correctly when we are +system_x11 and x11prefix
    213 # is somewhere non-standard and should cause AC_X_PATH to let us setup our
    214 # CPPFLAGS and LDFLAGS without interference
    215 pre-configure {
    216     if { ![file exists ${prefix}/lib/pkgconfig/x11.pc] } {
    217         configure.cppflags-append -I${x11prefix}/include
    218         configure.ldflags-append  -L${x11prefix}/lib
    219     }
    220 }
    221 
    222211post-destroot {
    223212    # Workaround to get root certs loaded, so https:// works
  • trunk/dports/editors/elvis/Portfile

    r49271 r50572  
    2626#                       configure.args-append --with-x
    2727#
    28 #    if { [file exists ${prefix}/lib/libX11.dylib]} {
    29 #        configure.args-append --x-includes=${prefix}/include --x-libraries=${prefix}/lib
    30 #    } else {
    31 #        configure.args-append --x-includes=${x11prefix}/include --x-libraries=${x11prefix}/lib
    32 #    }
     28#    configure.args-append --x-includes=${prefix}/include --x-libraries=${prefix}/lib
    3329#
    3430#    build.args-append CC="gcc -I${prefix}/include `${prefix}/bin/freetype-config --cflags`"
  • trunk/dports/editors/emacs/Portfile

    r47574 r50572  
    6161                            path:include/gif_lib.h:giflib \
    6262                            lib:libpng:libpng
    63 
    64     pre-configure {
    65         if { ![file exists ${prefix}/lib/pkgconfig/x11.pc] } {
    66             configure.ldflags-append  -L${x11prefix}/lib
    67         }   
    68     }
    6963}
    7064
  • trunk/dports/games/gnubg/Portfile

    r48911 r50572  
    4545
    4646configure.cflags-append "-lmx"
    47 
    48 pre-configure {
    49     if { [file exists ${prefix}/lib/pkgconfig/x11.pc] } {
    50         configure.ldflags-append "-L${prefix}/lib -lX11 -bind_at_load -multiply_defined suppress"
    51     } else {
    52         configure.ldflags-append "-L${x11prefix}/lib -lX11 -bind_at_load -multiply_defined suppress"
    53     }
    54 }
     47configure.ldflags-append "-L${prefix}/lib -lX11 -bind_at_load -multiply_defined suppress"
    5548
    5649configure.args          --mandir=${prefix}/share/man \
  • trunk/dports/games/jnethack/Portfile

    r47572 r50572  
    6262    }
    6363
    64     if {[variant_isset x11] && ![file exists ${prefix}/lib/pkgconfig/x11.pc] } {
    65         set jn_cflags "${jn_cflags} -I${x11prefix}/include"
    66         set jn_ldflags "${jn_ldflags} -L${x11prefix}/lib"
    67     }
    68 
    6964    foreach f {sys/unix/Makefile.doc
    7065               sys/unix/Makefile.src
  • trunk/dports/gnome/at-spi/Portfile

    r49984 r50572  
    3737
    3838variant x11 conflicts quartz description {Use X11 (default)} {
    39    configure.args-append     --with-x
    40    # AC_X_PATH blindly asks xmkmf where X11 is, and it always uses /usr/X11R6.
    41    # This block helps us link correctly and setup our pc files correctly when we
    42    # are +system_x11 and x11prefix is somewhere non-standard and should cause
    43    # AC_X_PATH to let us setup our CPPFLAGS and LDFLAGS without interference
    44    configure.args-append --x-include=${prefix}/include --x-lib=${prefix}/lib
    45    if {![file exists ${prefix}/lib/pkgconfig/x11.pc]} {
    46       pre-configure {
    47          configure.cppflags-append -I${x11prefix}/include
    48          configure.ldflags-append  -L${x11prefix}/lib
    49       }
    50    }
     39   configure.args-append --with-x --x-include=${prefix}/include --x-lib=${prefix}/lib
    5140}
    5241
  • trunk/dports/gnustep/gnustep-make/Portfile

    r45046 r50572  
    6565
    6666You may also want to set up your MANPATH :
    67 export MANPATH=\$GNUSTEP_LOCAL_ROOT/Library/Documentation/man:\$GNUSTEP_SYSTEM_ROOT/Library/Documentation/man:${prefix}/share/man:/usr/share/man:${x11prefix}/man
     67export MANPATH=\$GNUSTEP_LOCAL_ROOT/Library/Documentation/man:\$GNUSTEP_SYSTEM_ROOT/Library/Documentation/man:${prefix}/share/man:/usr/share/man
    6868##########################################################
    6969        "
  • trunk/dports/graphics/SimGear/Portfile

    r47540 r50572  
    2727                                port:xorg-libX11
    2828
    29 configure.args  --with-x
    30 
    31 # AC_X_PATH blindly asks xmkmf where X11 is, and it always uses /usr/X11R6.
    32 # This block helps us link correctly and setup our pc files correctly when we   
    33 # are +system_x11 and x11prefix is somewhere non-standard and should cause
    34 # AC_X_PATH to let us setup our CPPFLAGS and LDFLAGS without interference
    35 configure.args-append --x-include=${prefix}/include --x-lib=${prefix}/lib
    36 if { ![file exists ${prefix}/lib/pkgconfig/x11.pc] } {
    37     pre-configure {
    38         configure.cppflags-append -I${x11prefix}/include
    39         configure.ldflags-append  -L${x11prefix}/lib
    40     }
    41 }
     29configure.args  --with-x --x-include=${prefix}/include --x-lib=${prefix}/lib
  • trunk/dports/graphics/antigraingeometry/Portfile

    r47539 r50572  
    3939autoreconf.args       -fvi
    4040autoreconf.env        AUTOMAKE="automake --foreign --add-missing --ignore-deps"
     41
    4142configure.cxxflags       "-I${prefix}/include"
     43configure.args --x-include=${prefix}/include --x-lib=${prefix}/lib
    4244
    4345variant sdl {
     
    4547    depends_lib-append  port:libsdl
    4648}
    47 
    48 # AC_X_PATH blindly asks xmkmf where X11 is, and it always uses /usr/X11R6.
    49 # This block helps us link correctly and setup our pc files correctly when we   
    50 # are +system_x11 and x11prefix is somewhere non-standard and should cause
    51 # AC_X_PATH to let us setup our CPPFLAGS and LDFLAGS without interference
    52 configure.args-append --x-include=${prefix}/include --x-lib=${prefix}/lib
    53 if { ![file exists ${prefix}/lib/pkgconfig/x11.pc] } {
    54     pre-configure {
    55         configure.cppflags-append -I${x11prefix}/include
    56         configure.ldflags-append  -L${x11prefix}/lib
    57     }
    58 
    59     # And this will similarly get ports that use pkgconfig to find our pkgconfig-less libX11
    60     post-destroot {
    61         if {![file exists ${x11prefix}/lib/pkgconfig/x11.pc]} {
    62             foreach pc [glob ${destroot}${prefix}/lib/pkgconfig/*.pc] {
    63                 reinplace "s:-lX11:-L${prefix}/lib -L${x11prefix}/lib -lX11:g" ${pc}
    64             }
    65         }
    66     }
    67 }
  • trunk/dports/graphics/cairo-devel/Portfile

    r48808 r50572  
    7575    --enable-xlib \
    7676    --enable-xlib-xrender \
    77     --with-x
     77    --with-x --x-include=${prefix}/include --x-lib=${prefix}/lib
    7878# change --enable-freetype to --enable-ft starting with cairo-devel 1.9.x
    79 
    80 # AC_X_PATH blindly asks xmkmf where X11 is, and it always uses /usr/X11R6.
    81 # This block helps us link correctly and setup our pc files correctly when we   
    82 # are +system_x11 and x11prefix is somewhere non-standard and should cause
    83 # AC_X_PATH to let us setup our CPPFLAGS and LDFLAGS without interference
    84 configure.args-append --x-include=${prefix}/include --x-lib=${prefix}/lib
    85 if { ![file exists ${prefix}/lib/pkgconfig/x11.pc] } {
    86     pre-configure {
    87         configure.cppflags-append -I${x11prefix}/include
    88         configure.ldflags-append  -L${x11prefix}/lib
    89     }
    90 
    91     # And this will similarly get ports that use pkgconfig to find our pkgconfig-less libX11
    92     post-destroot {
    93         if {![file exists ${x11prefix}/lib/pkgconfig/x11.pc]} {
    94             foreach pc [glob ${destroot}${prefix}/lib/pkgconfig/*.pc] {
    95                 reinplace "s:-lX11:-L${prefix}/lib -L${x11prefix}/lib -lX11:g" ${pc}
    96             }
    97         }
    98     }
    99 }
    10079
    10180variant glitz conflicts no_x11 description {Add glitz graphics interface} {
  • trunk/dports/graphics/cairo/Portfile

    r48808 r50572  
    7777    --enable-xlib-xrender \
    7878    --with-x
    79 
    80 # AC_X_PATH blindly asks xmkmf where X11 is, and it always uses /usr/X11R6.
    81 # This block helps us link correctly and setup our pc files correctly when we   
    82 # are +system_x11 and x11prefix is somewhere non-standard and should cause
    83 # AC_X_PATH to let us setup our CPPFLAGS and LDFLAGS without interference
    84 configure.args-append --x-include=${prefix}/include --x-lib=${prefix}/lib
    85 if { ![file exists ${prefix}/lib/pkgconfig/x11.pc] } {
    86     pre-configure {
    87         configure.cppflags-append -I${x11prefix}/include
    88         configure.ldflags-append  -L${x11prefix}/lib
    89     }
    90 
    91     # And this will similarly get ports that use pkgconfig to find our pkgconfig-less libX11
    92     post-destroot {
    93         if {![file exists ${x11prefix}/lib/pkgconfig/x11.pc]} {
    94             foreach pc [glob ${destroot}${prefix}/lib/pkgconfig/*.pc] {
    95                 reinplace "s:-lX11:-L${prefix}/lib -L${x11prefix}/lib -lX11:g" ${pc}
    96             }
    97         }
    98     }
    99 }
     79    --x-include=${prefix}/include \
     80    --x-lib=${prefix}/lib
    10081
    10182variant glitz conflicts no_x11 description {Add glitz graphics interface} {
  • trunk/dports/graphics/jasper/Portfile

    r49982 r50572  
    5252    configure.args-delete       --disable-opengl
    5353    configure.args-append       --enable-opengl
    54 
    55     # In case mesa was installed with system_x11.
    56     if { ![file exists ${prefix}/lib/pkgconfig/x11.pc] } {
    57         configure.cppflags-append  -I${x11prefix}/include
    58         configure.ldflags-append   -L${x11prefix}/lib
    59     }
    6054}
    6155
  • trunk/dports/graphics/libguichan/Portfile

    r36079 r50572  
    2020                rmd160 a8ab10d9c49542e018d688b9ee90ef2879f94a28
    2121
    22 depends_lib     port:libsdl port:libsdl_image port:allegro
     22depends_lib     port:libsdl port:libsdl_image port:allegro port:mesa
    2323
    24 configure.cppflags-append   -I${x11prefix}/include
    25 configure.ldflags-append    -L${x11prefix}/lib
    2624use_parallel_build yes
    2725
    28 platform darwin 9 {
    29     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"
    30 }
     26configure.args --x-include=${prefix}/include --x-lib=${prefix}/lib
    3127
    3228livecheck.regex <a href=\"http://guichan.googlecode.com/files/guichan\\-(.*)${extract.suffix}\"
  • trunk/dports/graphics/magicpoint/Portfile

    r47581 r50572  
    3030universal_variant no
    3131
    32 # LOCALPREFIX= is for configure to find libungif.
    33 configure.env   PKG_CONFIG_PATH=${x11prefix}/lib/pkgconfig LOCALPREFIX=${prefix}
    3432configure.args  --enable-gif --mandir=${prefix}/share/man
    3533
  • trunk/dports/graphics/openvrml/Portfile

    r48666 r50572  
    5151configure.env-append    BOOST_LIB_SUFFIX=-mt
    5252
    53 # For +system_x11 variant
    54 if { ![file exists ${prefix}/lib/pkgconfig/gl.pc] } {
    55         configure.args-delete --x-includes=${prefix}/include \
    56                               --x-libraries=${prefix}/lib
    57 }
    58 
    5953use_parallel_build      yes
    6054
    6155variant js_mozilla description {Enable support for JavaScript in the Script node with Mozilla} {
     56    # TODO: This should use port:xulrunner instead
    6257    depends_lib-append          port:mozilla
    6358    configure.args-delete       --disable-script-node-javascript
     
    8277
    8378variant mozilla_plugin requires xembed description {Build the Mozilla plug-in} {
     79    # TODO: This should use port:xulrunner instead
    8480    depends_lib-append          port:mozilla
    8581    configure.args-delete       --disable-mozilla-plugin
  • trunk/dports/graphics/pgplot/Portfile

    r47644 r50572  
    8080
    8181    if {![variant_isset no_x11]} {
    82         if { [file exists ${prefix}/lib/pkgconfig/x11.pc] || [file exists ${x11prefix}/lib/pkgconfig/x11.pc] } {
    83             # XQuartz or MacPorts X11 (pkg-config gives precedence to MacPorts X11)
    84             eval configure.ldflags-append   [exec pkg-config x11 --libs-only-L]
    85             set x11Libs                     [exec pkg-config x11 --libs-only-l]
    86             eval configure.cppflags-append  [exec pkg-config x11 --cflags]
    87         } else {
    88             # Tiger or earlier X11 (xorg-libX11 installed with system_x11 variant)
    89             configure.ldflags-append   "-L${x11prefix}/lib"
    90             set x11Libs                -lX11
    91             configure.cppflags-append  "-I${x11prefix}/include"
    92         }
     82        # XQuartz or MacPorts X11 (pkg-config gives precedence to MacPorts X11)
     83        eval configure.ldflags-append   [exec pkg-config x11 --libs-only-L]
     84        set x11Libs                     [exec pkg-config x11 --libs-only-l]
     85        eval configure.cppflags-append  [exec pkg-config x11 --cflags]
    9386    } else {
    9487        set x11Libs  ""
  • trunk/dports/graphics/vtk/Portfile

    r48522 r50572  
    6868                                -D OPENGL_glu_LIBRARY:FILEPATH=${prefix}/lib/libGLU.dylib
    6969}
    70 
    71 #variant system_x11 description {Build VTK with the Apple X11 libraries} {
    72 #}
  • trunk/dports/graphics/vtk5/Portfile

    r49649 r50572  
    66name        vtk5
    77version     5.2.1
    8 revision    1
     8revision    2
    99set branch  [join [lrange [split ${version} .] 0 1] .]
    1010categories  graphics devel
     
    9696        -DVTK_USE_COCOA:BOOL=OFF \
    9797        -DVTK_USE_X:BOOL=ON \
    98         -DOPENGL_gl_LIBRARY:FILEPATH=${x11prefix}/lib/libGL.dylib \
    99         -DOPENGL_glu_LIBRARY:FILEPATH=${x11prefix}/lib/libGLU.dylib
     98        -DOPENGL_gl_LIBRARY:FILEPATH=${prefix}/lib/libGL.dylib \
     99        -DOPENGL_glu_LIBRARY:FILEPATH=${prefix}/lib/libGLU.dylib
    100100}
    101101
  • trunk/dports/graphics/xaos/Portfile

    r47528 r50572  
    4242        --disable-nls \
    4343        --mandir=${prefix}/share/man \
    44         --infodir=${prefix}/share/info
     44        --infodir=${prefix}/share/info \
     45        --x-includes=${prefix}/include --x-libraries=${prefix}/lib
    4546
    46 platform macosx {
    47         if {[file exists ${prefix}/lib/pkgconfig/x11.pc]} {
    48                 configure.args-append   --x-includes=${prefix}/include \
    49                         --x-libraries=${prefix}/lib
    50         } else {
    51                 configure.args-append   --x-includes=${x11prefix}/include \
    52                         --x-libraries=${x11prefix}/lib
    53         }
    54 }
    55 
  • trunk/dports/graphics/xpdf/Portfile

    r47422 r50572  
    8484    --enable-opi
    8585configure.cxxflags-append "-I${prefix}/include/freetype2 -I${prefix}/include"
    86 configure.cflags-append "-I${x11prefix}/include"
    87 configure.cppflags-append "-I${x11prefix}/include"
    8886configure.ldflags-append "-lz"
    8987
  • trunk/dports/lang/otcl/Portfile

    r47569 r50572  
    55name                    otcl
    66version                 1.9
     7revision                1
    78categories              lang
    89platforms               darwin
     
    3839configure.args          --with-Tcl=${prefix} --with-Tcl-ver=${tclmaj} \
    3940                        --with-tk=${prefix} --with-tk-ver=${tclmaj} \
    40                         --prefix=${prefix}
    41 
    42 pre-configure {
    43     if { ![file exists ${prefix}/lib/pkgconfig/x11.pc] } {
    44         configure.args-append \
    45                 CPPFLAGS='-I${prefix}/include -I${workpath}/tcl${tclv}/generic/' \
    46                 CFLAGS='-I${prefix}/include -I${workpath}/tcl${tclv}/generic/' \
    47                 LDFLAGS='-L${prefix}/lib'
    48     } else {
    49         configure.args-append \
    50                 CPPFLAGS='-I${x11prefix}/include -I${workpath}/tcl${tclv}/generic/' \
    51                 CFLAGS='-I${x11prefix}/include -I${workpath}/tcl${tclv}/generic/' \
    52                 LDFLAGS='-L${x11prefix}/lib'
    53     }
    54 }
     41                        --prefix=${prefix} \
     42                        CPPFLAGS='-I${prefix}/include -I${workpath}/tcl${tclv}/generic/' \
     43                        CFLAGS='-I${prefix}/include -I${workpath}/tcl${tclv}/generic/' \
     44                        LDFLAGS='-L${prefix}/lib'
    5545
    5646post-configure          {
    5747                        reinplace "s|-ltk8.4|-ltcl8.4 -ltk8.4|g" \
    58                                 ${worksrcpath}/Makefile
    59                         reinplace "s|-lXext|-L${x11prefix}/lib -lXext|g" \
    6048                                ${worksrcpath}/Makefile
    6149}
  • trunk/dports/lang/swi-prolog-devel/Portfile

    r45603 r50572  
    55name            swi-prolog-devel
    66version         5.7.4
    7 revision        1
     7revision        2
    88epoch           20051223
    99
     
    5656
    5757configure.env   \
    58         LIBRARY_PATH=/usr/lib:${x11prefix}/lib:${prefix}/lib    \
    59         CPATH=/usr/include:${x11prefix}/include:${prefix}/include       \
     58        LIBRARY_PATH=/usr/lib:${prefix}/lib     \
     59        CPATH=/usr/include:${prefix}/include    \
    6060        JUNIT=${prefix}/share/java/junit.jar
    6161
     
    6767
    6868build.env       \
    69         LIBRARY_PATH=/usr/lib:${x11prefix}/lib:${prefix}/lib    \
    70         CPATH=/usr/include:${x11prefix}/include:${prefix}/include       \
     69        LIBRARY_PATH=/usr/lib:${prefix}/lib     \
     70        CPATH=/usr/include:${prefix}/include    \
    7171        JUNIT=${prefix}/share/java/junit.jar
    7272
  • trunk/dports/lang/swi-prolog/Portfile

    r49125 r50572  
    55name            swi-prolog
    66version         5.6.63
    7 revision        1
     7revision        2
    88epoch           20051223
    99
     
    5656
    5757configure.env   \
    58         LIBRARY_PATH=/usr/lib:${x11prefix}/lib:${prefix}/lib    \
    59         CPATH=/usr/include:${x11prefix}/include:${prefix}/include       \
     58        LIBRARY_PATH=/usr/lib:${prefix}/lib     \
     59        CPATH=/usr/include:${prefix}/include    \
    6060        JUNIT=${prefix}/share/java/junit.jar
    6161
     
    6767
    6868build.env       \
    69         LIBRARY_PATH=/usr/lib:${x11prefix}/lib:${prefix}/lib    \
    70         CPATH=/usr/include:${x11prefix}/include:${prefix}/include       \
     69        LIBRARY_PATH=/usr/lib:${prefix}/lib     \
     70        CPATH=/usr/include:${prefix}/include    \
    7171        JUNIT=${prefix}/share/java/junit.jar \
    7272        CC=${configure.cc}
  • trunk/dports/lang/tclcl/Portfile

    r47567 r50572  
    55name                    tclcl
    66version                 1.16
     7revision                1
    78categories              lang
    89platforms               darwin
     
    4041                        --with-tk=${prefix} --with-tk-ver=${tclmaj} \
    4142                        --with-otcl=${prefix} \
    42                         --prefix=${prefix}
    43 
    44 pre-configure {
    45     if { ![file exists ${prefix}/lib/pkgconfig/x11.pc] } {
    46         configure.args-append \
    47                 CPPFLAGS='-I${prefix}/include -I${workpath}/tcl${tclv}/generic/' \
    48                 CFLAGS='-I${prefix}/include -I${workpath}/tcl${tclv}/generic/' \
    49                 LDFLAGS='-L${prefix}/lib'
    50     } else {
    51         configure.args-append \
    52                 CPPFLAGS='-I${x11prefix}/include -I${workpath}/tcl${tclv}/generic/' \
    53                 CFLAGS='-I${x11prefix}/include -I${workpath}/tcl${tclv}/generic/' \
    54                 LDFLAGS='-L${x11prefix}/lib'
    55     }
    56 }
     43                        --prefix=${prefix} \
     44                        CPPFLAGS='-I${prefix}/include -I${workpath}/tcl${tclv}/generic/' \
     45                        CFLAGS='-I${prefix}/include -I${workpath}/tcl${tclv}/generic/' \
     46                        LDFLAGS='-L${prefix}/lib'
    5747
    5848post-configure          {
     
    6252                                ${worksrcpath}/Makefile
    6353                        reinplace "s|-ltk8.4|-ltcl8.4 -ltk8.4|g" \
    64                                 ${worksrcpath}/Makefile
    65                         reinplace "s|-lXext|-L${x11prefix}/lib -lXext|g" \
    6654                                ${worksrcpath}/Makefile
    6755                        reinplace "s|http2.4|http2.5|g" \
  • trunk/dports/mail/procmail/Portfile

    r40599 r50572  
    44name            procmail
    55version         3.22
    6 revision        1
     6revision        2
    77categories      mail
    88maintainers     nomaintainer
     
    5858configure       {
    5959                  system "cd ${worksrcpath} && mv INSTALL INSTALL.README"
    60                   reinplace "s%^/\\*\\(#define\[ \t\]*DEF\[S\]*PATH\[ \t\]*\".*\\)\".*$%\\1:${prefix}/bin:${x11prefix}/bin\"%" ${worksrcpath}/config.h
     60                  reinplace "s%^/\\*\\(#define\[ \t\]*DEF\[S\]*PATH\[ \t\]*\".*\\)\".*$%\\1:${prefix}/bin\"%" ${worksrcpath}/config.h
    6161                  reinplace "s%/etc/procmailrc%${prefix}/etc/procmailrc%" ${worksrcpath}/config.h
    6262                  reinplace "s%/usr/local%${prefix}%g" ${worksrcpath}/Makefile
  • trunk/dports/math/R/Portfile

    r49976 r50572  
    4343universal_variant no
    4444
    45 # AC_X_PATH blindly asks xmkmf where X11 is, and it always uses /usr/X11R6.
    46 # This block helps us link correctly and setup our pc files correctly when we
    47 # are +system_x11 and x11prefix is somewhere non-standard and should cause
    48 # AC_X_PATH to let us setup our CPPFLAGS and LDFLAGS without interference
    49 configure.args-append --x-include=${prefix}/include --x-lib=${prefix}/lib
    50 if { ![file exists ${prefix}/lib/pkgconfig/x11.pc] } {
    51     pre-configure {
    52         configure.cppflags-append -I${x11prefix}/include
    53         configure.ldflags-append  -L${x11prefix}/lib
    54     }
    55 }
    5645
    5746variant gcc42 description {Build with gcc42} {
     
    8170                 --with-tcl-config=${prefix}/lib/tclConfig.sh \
    8271                 --with-tk-config=${prefix}/lib/tkConfig.sh
     72                 --x-include=${prefix}/include \
     73                 --x-lib=${prefix}/lib
    8374
    8475test.run         yes
  • trunk/dports/multimedia/mpeg2vidcodec/Portfile

    r49044 r50572  
    3030    build.args          USE_DISP=-DDISPLAY \
    3131                        USE_SHMEM=-DSH_MEM \
    32                         LIBS="-lXext -lX11"
    33    
    34     pre-build {
    35         if { [file exists ${prefix}/lib/pkgconfig/x11.pc] } {
    36             build.args-append   INCLUDEDIR="-I${prefix}/include" \
    37                                 LIBRARYDIR="-L${prefix}/lib"
    38         } else {
    39             build.args-append   INCLUDEDIR="-I${prefix}/include -I${x11prefix}/include" \
    40                                 LIBRARYDIR="-L${prefix}/lib -L${x11prefix}/lib"
    41         }
    42     }
     32                        LIBS="-lXext -lX11" \
     33                        INCLUDEDIR="-I${prefix}/include" \
     34                        LIBRARYDIR="-L${prefix}/lib"
    4335}
    4436
  • trunk/dports/net/driftnet/Portfile

    r36592 r50572  
    1919master_sites    http://www.ex-parrot.com/~chris/driftnet/
    2020
    21 #bugs           You need to have 'makedepend' in your path to build     \
    22 #               driftnet. It usually is found in ${x11prefix}/bin.      \
    2321#               Driftnet doesn't use a configure file, so the Makefile  \
    2422#               has to be rudely coerced to work properly.
     
    2927
    3028checksums       md5 8e11d77770452f97bb3c23f510489815
     29
     30depends_build   port:makedepend
    3131
    3232depends_lib     lib:libjpeg:jpeg lib:libpcap:libpcap \
  • trunk/dports/net/logjam/Portfile

    r47563 r50572  
    2020configure.cppflags-append       "-no-cpp-precomp"
    2121
    22 pre-configure {
    23     if { [file exists ${prefix}/lib/pkgconfig/x11.pc] } {
    24         configure.env LIBS="-L${prefix}/lib -lX11"
    25         configure.ldflags-append "-L${prefix}/lib -bind_at_load"
    26     } else {
    27         configure.env LIBS="-L${prefix}/lib -L${x11prefix}/lib -lX11"
    28         configure.ldflags-append "-L${x11prefix}/lib -bind_at_load"
    29     }
    30 }
     22configure.env LIBS="-L${prefix}/lib -lX11"
     23configure.ldflags-append "-L${prefix}/lib -bind_at_load"
    3124
    3225configure.args  --without-gtkspell --without-xmms --without-gtkhtml \
  • trunk/dports/net/openssh/Portfile

    r47831 r50572  
    55name            openssh
    66version         5.2p1
     7revision        1
    78categories      net
    89maintainers     jwa openmaintainer
     
    3435        ftp://openbsd.secsup.org/pub/openbsd/OpenSSH/portable/
    3536depends_lib     port:openssl port:zlib
     37depends_run     port:xauth
    3638
    3739# Specified -fno-builtin because GCC 3.3 has log() as a builtin
     
    4446  --with-pam --disable-suid-ssh --with-random=/dev/urandom \
    4547  --mandir=${prefix}/share/man --with-zlib=${prefix} \
    46   --with-kerberos5=/usr
     48  --with-kerberos5=/usr --with-xauth=${prefix}/bin/xauth
    4749
    4850use_parallel_build      yes
     
    5557}
    5658
    57 # For X11 Forwarding
    58 variant apple_x11 description "use (apple's) X11 for forwarding" {
    59   configure.args-append --with-xauth=${x11prefix}/bin/xauth
    60  }
     59variant no_x11 {
     60  configure.args-delete --with-xauth=${prefix}/bin/xauth
     61  depends_run-delete    port:xauth
     62}
    6163
    6264# For high-performance patch
  • trunk/dports/print/espgs/Portfile

    r47513 r50572  
    7272    depends_lib-append      port:xorg-libXext port:xorg-libXt
    7373    configure.args-append   --with-x
    74     configure.cppflags-append -I${x11prefix}/include
    7574}
    7675
  • trunk/dports/print/gv/Portfile

    r48700 r50572  
    4646autoreconf.args         -fvi
    4747
    48 configure.args          --enable-setenv-code
     48configure.args          --enable-setenv-code \
     49                        --x-include=${prefix}/include \
     50                        --x-lib=${prefix}/lib
    4951
    5052variant letter description {sets default paper size to letter} {
     
    5254}
    5355
    54 # AC_X_PATH blindly asks xmkmf where X11 is, and it always uses /usr/X11R6.
    55 # This block helps us link correctly and setup our pc files correctly when we   
    56 # are +system_x11 and x11prefix is somewhere non-standard and should cause
    57 # AC_X_PATH to let us setup our CPPFLAGS and LDFLAGS without interference
    58 configure.args-append --x-include=${prefix}/include --x-lib=${prefix}/lib
    59 if { ![file exists ${prefix}/lib/pkgconfig/x11.pc] } {
    60     pre-configure {
    61         configure.cppflags-append -I${x11prefix}/include
    62         configure.ldflags-append  -L${x11prefix}/lib
    63     }
    64 }
    65 
  • trunk/dports/python/py-game/Portfile

    r44380 r50572  
    5050configure.cmd   ${python.bin} config.py
    5151
    52 post-configure {
    53     # Make sure the X11 include directory is found.
    54     reinplace "s|-Ddarwin  -lSDL|-Ddarwin -lSDL -I${x11prefix}/include|g" \
    55         ${worksrcpath}/Setup
    56 }
    57 
    5852platform darwin 9 {
    5953    depends_lib-delete port:py-pyobjc
  • trunk/dports/python/py-gtk2/Portfile

    r44370 r50572  
    4343configure.python    ${prefix}/bin/python2.4
    4444
    45 platform darwin 7 {
    46     configure.cflags-append -I${x11prefix}/include
    47 }
    48 
    4945platform darwin 9 {
    5046    post-patch {
  • trunk/dports/python/py25-game/Portfile

    r44380 r50572  
    5050configure.cmd   ${python.bin} config.py
    5151
    52 post-configure {
    53     # Make sure the X11 include directory is found.
    54     reinplace "s|-Ddarwin  -lSDL|-Ddarwin -lSDL -I${x11prefix}/include|g" \
    55         ${worksrcpath}/Setup
    56 }
    57 
    5852platform darwin 9 {
    5953    depends_lib-delete port:py25-pyobjc
  • trunk/dports/python/py25-gtk/Portfile

    r48537 r50572  
    4343configure.python    ${prefix}/bin/python2.5
    4444
    45 platform darwin 7 {
    46     configure.cflags-append -I${x11prefix}/include
    47 }
    48 
    4945platform darwin 9 {
    5046    post-patch {
  • trunk/dports/python/py26-game/Portfile

    r44380 r50572  
    5151configure.cmd   ${python.bin} config.py
    5252
    53 post-configure {
    54     # Make sure the X11 include directory is found.
    55     reinplace "s|-Ddarwin  -lSDL|-Ddarwin -lSDL -I${x11prefix}/include|g" \
    56         ${worksrcpath}/Setup
    57 }
    58 
    5953platform darwin 9 {
    6054    depends_lib-delete port:py26-pyobjc
  • trunk/dports/python/py26-mapnik/Portfile

    r50498 r50572  
    6161
    6262variant cairo description {Builds port with Cairo Support} {
    63     configure.pkg_config_path  ${prefix}/lib/pkgconfig:${x11prefix}/lib/pkgconfig:${prefix}/Library/Frameworks/Python.framework/Versions/2.6/lib/pkgconfig
     63    configure.pkg_config_path  ${prefix}/lib/pkgconfig:${prefix}/Library/Frameworks/Python.framework/Versions/2.6/lib/pkgconfig
    6464    depends_lib-append port:cairo
    6565    depends_lib-append port:cairomm
  • trunk/dports/science/geomview/Portfile

    r47444 r50572  
    6060}
    6161
    62 # For +system_x11 variant
    63 if { ![file exists ${prefix}/lib/pkgconfig/gl.pc] } {
    64         configure.args-delete --with-opengl=${prefix}
    65         configure.args-append --with-opengl=${x11prefix}
    66 }
    67 
    68 
    6962variant no_opengl description {do not use OpenGL} {
    7063    configure.args-append       --without-opengl
    7164    configure.args-delete       --with-opengl=${prefix}
    72     configure.args-delete       --with-opengl=${x11prefix}
     65    depends_lib-delete          port:mesa
    7366}
  • trunk/dports/science/gwyddion/Portfile

    r48574 r50572  
    3434                    --x-lib=${prefix}/lib
    3535
    36 # AC_X_PATH blindly asks xmkmf where X11 is, and it always uses /usr/X11R6.
    37 # This block helps us link correctly and setup our pc files correctly when we
    38 # are +system_x11 and x11prefix is somewhere non-standard and should cause
    39 # AC_X_PATH to let us setup our CPPFLAGS and LDFLAGS without interference
    40 if { ![file exists ${prefix}/lib/pkgconfig/x11.pc] } {
    41      pre-configure {
    42          configure.cppflags-append -I${x11prefix}/include
    43          configure.ldflags-append  -L${x11prefix}/lib
    44      }
    45 
    46     # And this will similarly get ports that use pkgconfig to find our pkgconfig-less libX11
    47     post-destroot {
    48         if {![file exists ${x11prefix}/lib/pkgconfig/x11.pc]} {
    49             foreach pc [glob ${destroot}${prefix}/lib/pkgconfig/*.pc] {
    50                 reinplace "s:-lX11:-L${prefix}/lib -L${x11prefix}/lib -lX11:g" ${pc}
    51             }
    52         }
    53     }
    54 }
    55 
    5636post-destroot {
    5737    xinstall -m 755 -d ${destroot}${applications_dir}/gwyddion.app/Contents/MacOS
  • trunk/dports/science/opendx/Portfile

    r44940 r50572  
    44name            opendx
    55version         4.4.4
    6 revision        1
     6revision        2
    77categories      science
    88maintainers     gwright@macports.org
     
    3030                port:opendx-java40      \
    3131                port:ImageMagick        \
    32                 path:lib/libXm.dylib:openmotif
     32                path:lib/libXm.dylib:openmotif \
     33                port:mesa
    3334
    3435use_autoconf yes
     
    5960                JAVAP=/usr/bin/javap
    6061
    61 # For /usr/X11/include/GL even if we're using MacPorts X11 libs
    62 configure.cppflags-append "-I${x11prefix}/include"
    63 
    6462configure.args  --with-jni-path=/System/Library/Frameworks/JavaVM.framework/Headers     \
    6563                --with-java40jar-path=${prefix}/share/java/java40.jar   \
  • trunk/dports/science/triangle/Portfile

    r47466 r50572  
    3333    eval file rename [glob -directory ${workpath} \[A-s\]* t*.?] ${worksrcpath}
    3434    reinplace "s/-DLINUX//" ${worksrcpath}/makefile
    35     if { [file exists ${prefix}/lib/pkgconfig/x11.pc] } {
    36         reinplace "s|/usr/X11R6|${prefix}|g" ${worksrcpath}/makefile
    37     } else {
    38         reinplace "s|/usr/X11R6|${x11prefix}|g" ${worksrcpath}/makefile
    39     }
     35    reinplace "s|/usr/X11R6|${prefix}|g" ${worksrcpath}/makefile
    4036}
    4137
  • trunk/dports/sysutils/wmcpuload/Portfile

    r47545 r50572  
    2626        port:xpm
    2727
    28 # AC_X_PATH blindly asks xmkmf where X11 is, and it always uses /usr/X11R6.
    29 # This block helps us link correctly and setup our pc files correctly when we   
    30 # are +system_x11 and x11prefix is somewhere non-standard and should cause
    31 # AC_X_PATH to let us setup our CPPFLAGS and LDFLAGS without interference
    32 configure.args-append --x-include=${prefix}/include --x-lib=${prefix}/lib
    33 if { ![file exists ${prefix}/lib/pkgconfig/x11.pc] } {
    34     pre-configure {
    35         configure.cppflags-append -I${x11prefix}/include
    36         configure.ldflags-append  -L${x11prefix}/lib
    37     }
    38 }
     28configure.args  --x-include=${prefix}/include --x-lib=${prefix}/lib
  • trunk/dports/www/firefox-x11-devel/Portfile

    r50117 r50572  
    238238        sdkdir="${prefix}/lib/${name}"
    239239
    240 # AC_X_PATH blindly asks xmkmf where X11 is, and it always uses /usr/X11R6.
    241 # This block helps us link correctly when we are +system_x11 and x11prefix
    242 # is somewhere non-standard and should cause AC_X_PATH to let us setup our
    243 # CPPFLAGS and LDFLAGS without interference
    244 pre-configure {
    245     if { ![file exists ${prefix}/lib/pkgconfig/x11.pc] } {
    246         configure.cppflags-append -I${x11prefix}/include
    247         configure.ldflags-append  -L${x11prefix}/lib
    248     }
    249 }
    250 
    251240post-destroot   {
    252241    file mkdir ${destroot}${prefix}/share/applications
  • trunk/dports/www/firefox-x11/Portfile

    r50075 r50572  
    224224        SKIP_COPY_XULRUNNER=1
    225225
    226 # AC_X_PATH blindly asks xmkmf where X11 is, and it always uses /usr/X11R6.
    227 # This block helps us link correctly when we are +system_x11 and x11prefix
    228 # is somewhere non-standard and should cause AC_X_PATH to let us setup our
    229 # CPPFLAGS and LDFLAGS without interference
    230 pre-configure {
    231     if { ![file exists ${prefix}/lib/pkgconfig/x11.pc] } {
    232         configure.cppflags-append -I${x11prefix}/include
    233         configure.ldflags-append  -L${x11prefix}/lib
    234     }
    235 }
    236 
    237226post-destroot   {
    238227    file mkdir ${destroot}${prefix}/share/applications
  • trunk/dports/www/mozplugger/Portfile

    r49543 r50572  
    2222                    rmd160  87c82713de2dd9b139ea0b49f856b6797c913fb8
    2323
     24#TODO: port:xulrunner ?
    2425depends_lib \
    2526        port:firefox-x11
     
    3435use_configure no
    3536
    36 build.args prefix=${prefix} XLDFLAGS="-flat_namespace -bundle -shared -L${prefix}/lib -L${x11prefix}/lib -lX11"
    37 destroot.args root=${destroot} prefix=${prefix}
    38 
    39 if { [file exists ${prefix}/lib/pkgconfig/x11.pc] } {
    40         build.args-append X11=${prefix}
    41         destroot.args-append X11=${prefix}
    42 } else {
    43         build.args-append X11=${x11prefix}
    44         destroot.args-append X11=${x11prefix}
    45 }
     37build.args prefix=${prefix} XLDFLAGS="-flat_namespace -bundle -shared -L${prefix}/lib -lX11" X11=${prefix}
     38destroot.args root=${destroot} prefix=${prefix} X11=${prefix}
  • trunk/dports/x11/SoXt/Portfile

    r47575 r50572  
    3232
    3333configure.args          --enable-man --mandir=${prefix}/share/man \
    34                         --with-coin=${prefix}
    35 
    36 # AC_X_PATH blindly asks xmkmf where X11 is, and it always uses /usr/X11R6.
    37 # This block helps us link correctly and setup our pc files correctly when we
    38 # are +system_x11 and x11prefix is somewhere non-standard and should cause
    39 # AC_X_PATH to let us setup our CPPFLAGS and LDFLAGS without interference
    40 configure.args-append --x-include=${prefix}/include --x-lib=${prefix}/lib
    41 if { ![file exists ${prefix}/lib/pkgconfig/x11.pc] } {
    42     pre-configure {
    43         configure.cppflags-append -I${x11prefix}/include
    44         configure.ldflags-append  -L${x11prefix}/lib
    45     }
    46 }
     34                        --with-coin=${prefix} \
     35                        --x-include=${prefix}/include --x-lib=${prefix}/lib
    4736
    4837platform darwin {
  • trunk/dports/x11/XFree86/Portfile

    r43091 r50572  
    4343}
    4444
    45 prefix                  ${x11prefix}
     45prefix                  /usr/X11R6
    4646worksrcdir              xc
    4747
     
    9191                        please move it aside first :
    9292
    93                             sudo mv $x11prefix ${x11prefix}.apple
     93                            sudo mv $prefix ${prefix}.apple
    9494                "
    9595            } else {
     
    102102                        please move it aside first :
    103103
    104                             sudo mv $x11prefix ${x11prefix}.apple
     104                            sudo mv $prefix ${prefix}.apple
    105105                "
    106106            }
     
    117117                        please move it aside first :
    118118
    119                             sudo mv $x11prefix ${x11prefix}.apple
     119                            sudo mv $prefix ${prefix}.apple
    120120            "
    121121        }
  • trunk/dports/x11/Xaw3d/Portfile

    r48826 r50572  
    5757universal_variant       no
    5858
    59 if {[file exists ${prefix}/lib/pkgconfig/x11.pc]} {
    60     build.target-append  INCROOT=${prefix}/include
    61 } else {
    62     build.target-append  SHLIBGLOBALSFLAGS=-L${x11prefix}/lib
    63 }
    64 
    6559# The Imakefile default is to install everything into /usr/X11R6/lib,
    6660# which prevents multiple MacPorts installs on the same system.  Have
     
    6862build.target-append     INCDIR=${prefix}/include \
    6963                        SHLIBDIR=${prefix}/lib \
    70                         USRLIBDIR=${prefix}/lib
     64                        USRLIBDIR=${prefix}/lib \
     65                        INCROOT=${prefix}/include
    7166
    7267destroot.destdir-append INCDIR=${prefix}/include \
  • trunk/dports/x11/abclock/Portfile

    r45603 r50572  
    2222}
    2323use_configure    no
    24 build.target     all XLIBDIR="-L${prefix}/lib -L${x11prefix}/lib" XINCLUDEDIR="-I${prefix}/include -I${x11prefix}/include" OPT="${configure.cflags}"
     24build.target     all XLIBDIR="-L${prefix}/lib" XINCLUDEDIR="-I${prefix}/include" OPT="${configure.cflags}"
    2525destroot {
    2626    xinstall -m 555 ${worksrcpath}/abclock ${destroot}${prefix}/bin
  • trunk/dports/x11/aewm/Portfile

    r50291 r50572  
    55name                    aewm
    66version                 1.3.10
     7revision                1
    78categories              x11 x11-wm
    89platforms               darwin
     
    2324use_parallel_build yes
    2425
    25 build.args              PREFIX=${prefix} XROOT=${x11prefix} \
     26build.args              PREFIX=${prefix} XROOT=${prefix} \
    2627                                CC=${configure.cc}
    2728
  • trunk/dports/x11/aterm/Portfile

    r49861 r50572  
    2929               --enable-graphics --enable-half-shadow \
    3030               --enable-menubar --enable-transparency \
     31               --x-include=${prefix}/include --x-lib=${prefix}/lib \
    3132               --enable-wtmp
    32 
    33 # AC_X_PATH blindly asks xmkmf where X11 is, and it always uses /usr/X11R6.
    34 # This block helps us link correctly and setup our pc files correctly when we   
    35 # are +system_x11 and x11prefix is somewhere non-standard and should cause
    36 # AC_X_PATH to let us setup our CPPFLAGS and LDFLAGS without interference
    37 configure.args-append --x-include=${prefix}/include --x-lib=${prefix}/lib
    38 if { ![file exists ${prefix}/lib/pkgconfig/x11.pc] } {
    39     pre-configure {
    40         configure.cppflags-append -I${x11prefix}/include
    41         configure.ldflags-append  -L${x11prefix}/lib
    42     }
    43 }
    4433
    4534variant afterstep description {Enable AfterStep integration} {
  • trunk/dports/x11/desklaunch/Portfile

    r47559 r50572  
    2424destroot.destdir        DESTDIR=${destroot}${prefix}
    2525
    26 pre-configure {
    27     if { [file exists ${prefix}/lib/pkgconfig/x11.pc] } {
    28         build.args-append XROOT=${prefix}
    29     } else {
    30         build.args-append XROOT=${x11prefix}
    31     }
    32 }
    33 
    34 build.args-append CFLAGS="${configure.cflags}"
     26build.args-append XROOT="${prefix}" \
     27                 CFLAGS="${configure.cflags}"
    3528
    3629variant universal {
  • trunk/dports/x11/evilwm/Portfile

    r45603 r50572  
    1717
    1818configure {
    19         if {[file exists ${prefix}/lib/pkgconfig/xext]} {
    20                 reinplace "s|XROOT=.*|XROOT=${prefix}|" ${worksrcpath}/Makefile
    21         } else {
    22                 reinplace "s|XROOT=.*|XROOT=${x11prefix}|" ${worksrcpath}/Makefile
    23         }
     19        reinplace "s|XROOT=.*|XROOT=${prefix}|" ${worksrcpath}/Makefile
    2420        reinplace "s|\$(LDFLAGS)|\$(LDFLAGS) \$(OTHERLDFLAGS)|g" ${worksrcpath}/Makefile
    2521}
  • trunk/dports/x11/eyeclock/Portfile

    r45603 r50572  
    2828destroot.destdir PREFIX=${destroot}${prefix}
    2929
    30 build.target-append OCFLAGS="${configure.cflags}" OLDFLAGS="${configure.ldflags}"
     30build.target-append OCFLAGS="${configure.cflags}" OLDFLAGS="${configure.ldflags}" X11BASE=${prefix}
    3131
    3232variant universal {
     
    3434}
    3535
    36 pre-build {
    37         if { [file exists ${prefix}/lib/pkgconfig/x11.pc] } {
    38                 build.target-append X11BASE=${prefix}
    39         } else {
    40                 build.target-append X11BASE=${x11prefix}
    41         }
    42 }
  • trunk/dports/x11/fireworkx/Portfile

    r45603 r50572  
    3232}
    3333
    34 build.target-append CFLAGS="${configure.cflags} -I${prefix}/include -I${x11prefix}/include" LDFLAGS="${configure.ldflags} -L${prefix}/lib -L${x11prefix}/lib"
     34build.target-append CFLAGS="${configure.cflags} -I${prefix}/include" LDFLAGS="${configure.ldflags} -L${prefix}/lib"
    3535
    3636variant universal {
    37         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"
     37        build.target-append CFLAGS="${configure.cflags} ${configure.universal_cflags} -I${prefix}/include" LDFLAGS="${configure.ldflags} ${configure.universal_ldflags} -L${prefix}/lib"
    3838}
  • trunk/dports/x11/fox/Portfile

    r45904 r50572  
    55name                fox
    66version             1.6.34
    7 revision            1
     7revision            2
    88description         The FOX GUI toolkit
    99long_description    FOX is a C++ based Toolkit for developing Graphical \
     
    2929        port:Xft2 \
    3030        port:xorg-libXrandr \
    31         port:freetype
    32 
    33 configure.cppflags-append       "-I${x11prefix}/include"
     31        port:freetype \
     32        port:mesa
    3433
    3534configure.pre_args  --prefix=${prefix} --mandir=${prefix}/share/man
  • trunk/dports/x11/grace/Portfile

    r47556 r50572  
    4242configure.pre_args      --prefix=${prefix}/lib \
    4343                    --with-helpviewer="open ${prefix}/share/doc/${name}/`basename %s`"
    44 
    45 # AC_X_PATH blindly asks xmkmf where X11 is, and it always uses /usr/X11R6.
    46 # This block helps us link correctly and setup our pc files correctly when we
    47 # are +system_x11 and x11prefix is somewhere non-standard and should cause
    48 # AC_X_PATH to let us setup our CPPFLAGS and LDFLAGS without interference
    49 configure.args-append --x-include=${prefix}/include --x-lib=${prefix}/lib
    50 if { ![file exists ${prefix}/lib/pkgconfig/x11.pc] } {
    51     pre-configure {
    52         configure.cppflags-append -I${x11prefix}/include
    53         configure.ldflags-append  -L${x11prefix}/lib
    54     }
    55 }
     44                    --x-include=${prefix}/include --x-lib=${prefix}/lib
    5645
    5746post-destroot {
  • trunk/dports/x11/gtk2/Portfile

    r50528 r50572  
    206206        port:xorg-libXfixes
    207207
    208     configure.args-append      --with-xinput --enable-xinerama
    209 
    210     # AC_X_PATH blindly asks xmkmf where X11 is, and it always uses /usr/X11R6.
    211     # This block helps us link correctly and setup our pc files correctly when we   
    212     # are +system_x11 and x11prefix is somewhere non-standard and should cause
    213     # AC_X_PATH to let us setup our CPPFLAGS and LDFLAGS without interference
    214     configure.args-append --x-include=${prefix}/include --x-lib=${prefix}/lib
    215     if { ![file exists ${prefix}/lib/pkgconfig/x11.pc] } {
    216         pre-configure {
    217             configure.cppflags-append -I${x11prefix}/include
    218             configure.ldflags-append  -L${x11prefix}/lib
    219         }
    220 
    221         # And this will similarly get ports that use pkgconfig to find our pkgconfig-less libX11
    222         post-destroot {
    223             if {![file exists ${x11prefix}/lib/pkgconfig/x11.pc]} {
    224                 foreach pc [glob ${destroot}${prefix}/lib/pkgconfig/*.pc] {
    225                     reinplace "s:-lX11:-L${prefix}/lib -L${x11prefix}/lib -lX11:g" ${pc}
    226                 }
    227             }
    228         }
    229     }
     208    configure.args-append      --with-xinput --enable-xinerama \
     209                               --x-include=${prefix}/include --x-lib=${prefix}/lib
    230210}
    231211
  • trunk/dports/x11/gtkglarea2/Portfile

    r47261 r50572  
    2929autoreconf.args -fvi
    3030
    31 pre-configure {
    32         if { [file exists ${x11prefix}/lib/libGL.dylib ] } {
    33                 configure.post_args --with-GL-prefix=${x11prefix}
    34         } else {
    35                 configure.post_args --with-GL-prefix=${prefix}
    36         }
    37 }
     31configure.post_args --with-GL-prefix=${prefix}
  • trunk/dports/x11/kinput2/Portfile

    r48826 r50572  
    6161pre-destroot {
    6262    destroot.target install install.man
    63     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"
     63    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"
    6464    #notice: app-defaults/Kinput2 is installed outside of /opt tree.
    6565}
  • trunk/dports/x11/luit/Portfile

    r45603 r50572  
    3434livecheck.url   [lindex ${master_sites} 0]?C=M&O=D
    3535livecheck.regex ${name}-(\\d+(?:\\.\\d+)*)
    36 
    37 platform macosx {
    38         if {${os.major} < 9 && ![file exists ${prefix}/lib/pkgconfig/fontenc.pc]} {
    39                 configure.env-append \
    40                         LUIT_CFLAGS="-I${x11prefix}/include" \
    41                         LUIT_LIBS="-L${x11prefix}/lib -lfontenc -lX11"
    42         }
    43 }
  • trunk/dports/x11/mkfontscale/Portfile

    r45603 r50572  
    4444configure.args --with-bzip2
    4545
    46 platform macosx {
    47         if {${os.major} < 9 && ![file exists ${prefix}/lib/pkgconfig/fontenc.pc]} {
    48                 configure.env-append \
    49                         MKFONTSCALE_CFLAGS="-I${x11prefix}/include `pkg-config --cflags freetype2`" \
    50                         MKFONTSCALE_LIBS="-L${x11prefix}/lib -lfontenc `pkg-config --libs freetype2`"
    51         }
    52 }
    53 
  • trunk/dports/x11/openmotif/Portfile

    r47546 r50572  
    5252                --enable-xft    \
    5353                --enable-jpeg   \
    54                 --enable-png
    55 
    56 # AC_X_PATH blindly asks xmkmf where X11 is, and it always uses /usr/X11R6.
    57 # This block helps us link correctly and setup our pc files correctly when we   
    58 # are +system_x11 and x11prefix is somewhere non-standard and should cause
    59 # AC_X_PATH to let us setup our CPPFLAGS and LDFLAGS without interference
    60 configure.args-append --x-include=${prefix}/include --x-lib=${prefix}/lib
    61 if { ![file exists ${prefix}/lib/pkgconfig/x11.pc] } {
    62     pre-configure {
    63         configure.cppflags-append -I${x11prefix}/include
    64         configure.ldflags-append  -L${x11prefix}/lib
    65     }
    66 
    67     # And this will similarly get ports that use pkgconfig to find our pkgconfig-less libX11
    68     post-destroot {
    69         if {![file exists ${x11prefix}/lib/pkgconfig/x11.pc]} {
    70             foreach pc [glob ${destroot}${prefix}/lib/pkgconfig/*.pc] {
    71                 reinplace "s:-lX11:-L${prefix}/lib -L${x11prefix}/lib -lX11:g" ${pc}
    72             }
    73         }
    74     }
    75 }
     54                --enable-png \
     55                --x-include=${prefix}/include --x-lib=${prefix}/lib
    7656
    7757build.env       LANG=C
  • trunk/dports/x11/pango/Portfile

    r50351 r50572  
    100100
    101101configure.args \
    102     --enable-static
    103 
    104 # AC_X_PATH blindly asks xmkmf where X11 is, and it always uses /usr/X11R6.
    105 # This block helps us link correctly and setup our pc files correctly when we
    106 # are +system_x11 and x11prefix is somewhere non-standard and should cause
    107 # AC_X_PATH to let us setup our CPPFLAGS and LDFLAGS without interference
    108 configure.args-append --x-include=${prefix}/include --x-lib=${prefix}/lib
    109 if { ![file exists ${prefix}/lib/pkgconfig/x11.pc] } {
    110     pre-configure {
    111         configure.cppflags-append -I${x11prefix}/include
    112         configure.ldflags-append  -L${x11prefix}/lib
    113     }
    114 
    115     # And this will similarly get ports that use pkgconfig to find our pkgconfig-less libX11
    116     post-destroot {
    117         if {![file exists ${x11prefix}/lib/pkgconfig/x11.pc]} {
    118             foreach pc [glob ${destroot}${prefix}/lib/pkgconfig/*.pc] {
    119                 reinplace "s:-lX11:-L${prefix}/lib -L${x11prefix}/lib -lX11:g" ${pc}
    120             }
    121         }
    122     }
    123 }
     102    --enable-static \
     103    --x-include=${prefix}/include --x-lib=${prefix}/lib
    124104
    125105variant no_x11 {
  • trunk/dports/x11/qt4-x11/Portfile

    r49630 r50572  
    66name                qt4-x11
    77version             4.4.3
    8 revision            2
     8revision            3
    99categories              x11
    1010maintainers         mcalhoun
     
    120120
    121121    # Ensure the correct MacPorts X11 is used
    122     reinplace "s|/usr/X11R6|${x11prefix}|g" ${worksrcpath}/mkspecs/darwin-g++/qmake.conf
     122    reinplace "s|/usr/X11R6|${prefix}|g" ${worksrcpath}/mkspecs/darwin-g++/qmake.conf
    123123
    124124    # Avoid having to call "install_name_tool -change" after destroot.
  • trunk/dports/x11/rox-filer/Portfile

    r50072 r50572  
    2727universal_variant       no
    2828
    29 # AC_X_PATH blindly asks xmkmf where X11 is, and it always uses /usr/X11R6.
    30 # This block helps us link correctly and setup our pc files correctly when we   
    31 # are +system_x11 and x11prefix is somewhere non-standard and should cause
    32 # AC_X_PATH to let us setup our CPPFLAGS and LDFLAGS without interference
    33 configure.args-append --x-include=${prefix}/include --x-lib=${prefix}/lib
    34 if { ![file exists ${prefix}/lib/pkgconfig/x11.pc] } {
    35     pre-configure {
    36         configure.cppflags-append -I${x11prefix}/include
    37         configure.ldflags-append  -L${x11prefix}/lib
    38     }
    39 
    40     # And this will similarly get ports that use pkgconfig to find our pkgconfig-less libX11
    41     post-destroot {
    42         if {![file exists ${x11prefix}/lib/pkgconfig/x11.pc]} {
    43             foreach pc [glob ${destroot}${prefix}/lib/pkgconfig/*.pc] {
    44                 reinplace "s:-lX11:-L${prefix}/lib -L${x11prefix}/lib -lX11:g" ${pc}
    45             }
    46         }
    47     }
    48 }
     29configure.args --x-include=${prefix}/include --x-lib=${prefix}/lib
    4930
    5031#build.env      CC=${configure.cc} CPPFLAGS=${configure.cppflags} LDFLAGS=${configure.ldflags}
  • trunk/dports/x11/unclutter/Portfile

    r45603 r50572  
    2727use_configure           no
    2828
    29 build.args-append CCOPTIONS='-I${prefix}/include -I${x11prefix}/include' LDOPTIONS='-L${prefix}/lib -L${x11prefix}/lib'
     29build.args-append CCOPTIONS='-I${prefix}/include' LDOPTIONS='-L${prefix}/lib'
    3030
    3131destroot.args           BINDIR=${destroot}${prefix}/bin MANDIR=${destroot}${prefix}/share/man/man1
  • trunk/dports/x11/windowmaker/Portfile

    r45603 r50572  
    33name            windowmaker
    44version         0.92.0
    5 revision        3
     5revision        4
    66maintainers     nomaintainer
    77categories      x11 x11-wm
     
    5858configure.env   LINGUAS="bg cs da de el es et fi fr gl hr hu it ja \
    5959                ko ms nl no pl pt ro ru sk sv tr zh_CN" \
    60                 LIBS="-L${prefix}/lib -lintl -L${x11prefix}/lib -lX11"
     60                LIBS="-L${prefix}/lib -lintl -lX11"
    6161configure.args  --disable-debug --enable-gnome \
    6262                --mandir=${prefix}/share/man \
  • trunk/dports/x11/wine-crossover-games/Portfile

    r48374 r50572  
    5656    -lz
    5757
     58configure.args --x-include=${prefix}/include --x-lib=${prefix}/lib
     59
    5860pre-fetch {
    5961    if { [string compare ${os.endian} "little"] != 0 } {
     
    7072    xinstall -m 755 ${filespath}/wine.in ${destroot}${prefix}/bin/wine
    7173    reinplace s|@PREFIX@|${prefix}|g ${destroot}${prefix}/bin/wine
    72     reinplace s|@X11PREFIX@|${x11prefix}|g ${destroot}${prefix}/bin/wine
    7374}
    7475
    75 # AC_X_PATH blindly asks xmkmf where X11 is, and it always uses /usr/X11R6.
    76 # This block helps us link correctly when we are +system_x11 and x11prefix
    77 # is somewhere non-standard and should cause AC_X_PATH to let us setup our
    78 # CPPFLAGS and LDFLAGS without interference
    79 configure.args-append --x-include=${prefix}/include --x-lib=${prefix}/lib
    80 pre-configure {
    81     if { ![file exists ${prefix}/lib/pkgconfig/x11.pc] } {
    82         configure.cppflags-append -I${x11prefix}/include
    83         configure.ldflags-append  -L${x11prefix}/lib
    84     }
    85 }
    86 
  • trunk/dports/x11/wine-crossover-games/files/wine.in

    r48374 r50572  
    11#!/bin/sh
    22
    3 DYLD_FALLBACK_LIBRARY_PATH="@PREFIX@/lib:@X11PREFIX@/lib" \
     3DYLD_FALLBACK_LIBRARY_PATH="@PREFIX@/lib" \
    44"@PREFIX@/bin/wineloader" "$@"
  • trunk/dports/x11/wine-devel/Portfile

    r50083 r50572  
    5858    -lz
    5959
     60configure.args --x-include=${prefix}/include --x-lib=${prefix}/lib
     61
    6062pre-fetch {
    6163    if { [string compare ${os.endian} "little"] != 0 } {
     
    6971    xinstall -m 755 ${filespath}/wine.in ${destroot}${prefix}/bin/wine
    7072    reinplace s|@PREFIX@|${prefix}|g ${destroot}${prefix}/bin/wine
    71     reinplace s|@X11PREFIX@|${x11prefix}|g ${destroot}${prefix}/bin/wine
    72 }
    73 
    74 # AC_X_PATH blindly asks xmkmf where X11 is, and it always uses /usr/X11R6.
    75 # This block helps us link correctly when we are +system_x11 and x11prefix
    76 # is somewhere non-standard and should cause AC_X_PATH to let us setup our
    77 # CPPFLAGS and LDFLAGS without interference
    78 configure.args-append --x-include=${prefix}/include --x-lib=${prefix}/lib
    79 pre-configure {
    80     if { ![file exists ${prefix}/lib/pkgconfig/x11.pc] } {
    81         configure.cppflags-append -I${x11prefix}/include
    82         configure.ldflags-append  -L${x11prefix}/lib
    83     }
    8473}
    8574
  • trunk/dports/x11/wine-devel/files/wine.in

    r49040 r50572  
    22# $Id$
    33
    4 DYLD_FALLBACK_LIBRARY_PATH="@PREFIX@/lib:@X11PREFIX@/lib" \
     4DYLD_FALLBACK_LIBRARY_PATH="@PREFIX@/lib" \
    55"@PREFIX@/libexec/wine/wine" "$@"
  • trunk/dports/x11/wine/Portfile

    r48366 r50572  
    6565    -lz
    6666
     67configure.args --x-include=${prefix}/include --x-lib=${prefix}/lib
     68
    6769pre-fetch {
    6870    if { [string compare ${os.endian} "little"] != 0 } {
     
    7678    xinstall -m 755 ${filespath}/wine.in ${destroot}${prefix}/bin/wine
    7779    reinplace s|@PREFIX@|${prefix}|g ${destroot}${prefix}/bin/wine
    78     reinplace s|@X11PREFIX@|${x11prefix}|g ${destroot}${prefix}/bin/wine
    79 }
    80 
    81 # AC_X_PATH blindly asks xmkmf where X11 is, and it always uses /usr/X11R6.
    82 # This block helps us link correctly when we are +system_x11 and x11prefix
    83 # is somewhere non-standard and should cause AC_X_PATH to let us setup our
    84 # CPPFLAGS and LDFLAGS without interference
    85 configure.args-append --x-include=${prefix}/include --x-lib=${prefix}/lib
    86 pre-configure {
    87     if { ![file exists ${prefix}/lib/pkgconfig/x11.pc] } {
    88         configure.cppflags-append -I${x11prefix}/include
    89         configure.ldflags-append  -L${x11prefix}/lib
    90     }
    9180}
    9281
  • trunk/dports/x11/wine/files/wine.in

    r49040 r50572  
    22# $Id$
    33
    4 DYLD_FALLBACK_LIBRARY_PATH="@PREFIX@/lib:@X11PREFIX@/lib" \
     4DYLD_FALLBACK_LIBRARY_PATH="@PREFIX@/lib" \
    55"@PREFIX@/libexec/wine/wine" "$@"
  • trunk/dports/x11/wmcalclock/Portfile

    r47520 r50572  
    2323destroot.destdir DESTDIR=${destroot}${prefix}
    2424
    25 build.args INCDIR="-I${prefix}/include -I${x11prefix}/include" LIBDIR="-L${prefix}/lib -L${x11prefix}/lib"
     25build.args INCDIR="-I${prefix}/include" LIBDIR="-L${prefix}/lib"
  • trunk/dports/x11/wmcube/Portfile

    r45603 r50572  
    2525use_configure   no
    2626universal_variant no
    27 build.args      -f Makefile.OPENBSD LIBDIR="-L${prefix}/lib -L${x11prefix}/lib -L./libdocapp" INCLUDES="-I${prefix}/include -I${x11prefix}/include"
     27build.args      -f Makefile.OPENBSD LIBDIR="-L${prefix}/lib -L./libdocapp" INCLUDES="-I${prefix}/include"
    2828
    2929destroot {
  • trunk/dports/x11/wxgtk/Portfile

    r47263 r50572  
    2525
    2626
    27 configure.cppflags-append       "-I${x11prefix}/include"
    28 
    2927configure.args  --with-gtk --with-libpng --with-libjpeg --with-libtiff \
    3028                                --with-freetype --with-zlib
  • trunk/dports/x11/xauth/Portfile

    r45603 r50572  
    2929        port:xorg-libXmu
    3030
    31 platform macosx {
    32         if {${os.major} < 9 && ![file exists ${prefix}/lib/pkgconfig/xmuu.pc]} {
    33                 configure.env-append \
    34                         XAUTH_CFLAGS="-I${x11prefix}/include" \
    35                         XAUTH_LIBS="-L${x11prefix}/lib -lXmuu -lXext -lX11 -lXau"
    36         }
    37 }
     31livecheck.check regex
     32livecheck.url   [lindex ${master_sites} 0]?C=M&O=D
     33livecheck.regex ${name}-(\\d+(?:\\.\\d+)*)
     34
  • trunk/dports/x11/xcircuit/Portfile

    r47833 r50572  
    3333                 --with-tcl=${prefix}/lib \
    3434                 --with-tk=${prefix}/lib \
    35                  --with-gs=${prefix}/bin/gs
    36 
    37 # AC_X_PATH doesn't find the X ports correctly
    38 if { [file exists ${prefix}/lib/pkgconfig/x11.pc] } {
    39     configure.args-append --x-includes=${prefix}/include --x-libraries=${prefix}/lib
    40 } else {
    41     configure.args-append --x-includes=${x11prefix}/include --x-libraries=${x11prefix}/lib
    42 }
     35                 --with-gs=${prefix}/bin/gs \
     36                 --x-includes=${prefix}/include \
     37                 --x-libraries=${prefix}/lib
  • trunk/dports/x11/xdiskusage/Portfile

    r47555 r50572  
    1919depends_lib             port:fltk
    2020
    21 pre-build {
    22     if { [file exists ${prefix}/lib/pkgconfig/x11.pc] } {
    23         build.args-append CXXFLAGS="-I${prefix}/include" LDFLAGS="-L${prefix}/lib"
    24     } else {
    25         build.args-append CXXFLAGS="-I${prefix}/include -I${x11prefix}/include" LDFLAGS="-L${prefix}/lib -L${x11prefix}/lib"
    26     }
    27 }
     21build.args-append CXXFLAGS="-I${prefix}/include" LDFLAGS="-L${prefix}/lib"
    2822
    2923destroot.destdir        prefix=${destroot}${prefix} mandir=${destroot}${prefix}/share/man
  • trunk/dports/x11/xeyes/Portfile

    r45603 r50572  
    2929livecheck.url   [lindex ${master_sites} 0]?C=M&O=D
    3030livecheck.regex ${name}-(\\d+(?:\\.\\d+)*)
    31 
    32 platform macosx {
    33         if {${os.major} < 9 && ![file exists ${prefix}/lib/pkgconfig/xt.pc]} {
    34                 configure.env-append \
    35                         XEYES_CFLAGS="-I${x11prefix}/include" \
    36                         XEYES_LIBS="-L${x11prefix}/lib -lXmu -lXt -lXext -lX11 -lSM -lICE"
    37         }
    38 }
  • trunk/dports/x11/xfe/Portfile

    r47554 r50572  
    2626configure.args          --with-included-gettext --enable-release
    2727
    28 pre-configure {
    29     if { ![file exists ${prefix}/lib/pkgconfig/x11.pc] } {
    30         configure.cppflags-append -I${x11prefix}/include
    31         configure.ldflags-append  -L${x11prefix}/lib
    32     }
    33 }
    34 
    3528configure.env           LIBS="-lX11 -lXft"
    3629post-configure          {
  • trunk/dports/x11/xforms/Portfile

    r47553 r50572  
    3131# not trivial to autoreconf
    3232universal_variant no
    33 
    34 pre-configure {
    35     if { ![file exists ${prefix}/lib/pkgconfig/x11.pc] } {
    36         configure.cppflags-append -I${x11prefix}/include
    37         configure.ldflags-append  -L${x11prefix}/lib
    38     }
    39 }
    40 
  • trunk/dports/x11/xglobe/Portfile

    r44809 r50572  
    2424patchfiles      patch-Makefile patch-renderer_cpp
    2525configure       {       reinplace "s|@@PREFIX@@|${prefix}|g" ${worksrcpath}/Makefile
    26                         reinplace "s|@@X11PREFIX@@|${x11prefix}|g" ${worksrcpath}/Makefile }
     26                        reinplace "s|@@X11PREFIX@@|${prefix}|g" ${worksrcpath}/Makefile }
    2727destroot.args   DESTDIR=${destroot}
    2828destroot.destdir        prefix=${destroot}${prefix}
  • trunk/dports/x11/xinit/Portfile

    r49632 r50572  
    5151        reinplace "s|^X11FONTDIR=.*$|X11FONTDIR=${prefix}/share/fonts|" ${destroot}${prefix}/bin/font_cache
    5252}
    53 
    54 platform macosx {
    55         if {${os.major} < 9 && ![file exists ${prefix}/lib/pkgconfig/x11.pc]} {
    56                 configure.env-append \
    57                         XINIT_CFLAGS="-I${x11prefix}/include" \
    58                         XINIT_LIBS="-L${x11prefix}/lib -lX11"
    59         }
    60 }
  • trunk/dports/x11/xmove/Portfile

    r43566 r50572  
    1717master_sites    ftp://ftp.cs.columbia.edu/pub/xmove/
    1818checksums       md5 d70107f7835b755bd4f57b47a8ac7b38
    19 
    20 #if this is set, put manpages in man and not share/man
    21 #prefix         ${x11prefix}
    2219
    2320distname        ${name}.${version}
  • trunk/dports/x11/xorg-server-devel/Portfile

    r49539 r50572  
    6161        port:xorg-libXfixes
    6262
    63 post-patch {
    64         reinplace "s|ensure_path(X11BINDIR);|ensure_path(X11BINDIR); ensure_path(\"${x11prefix}/bin\");|" ${worksrcpath}/hw/xquartz/mach-startup/bundle-main.c
    65 }
    66 
    6763configure.args  --with-apple-applications-dir=${applications_dir} --with-fontdir=${prefix}/share/fonts --with-apple-application-id=org.macports.X11
    6864
  • trunk/dports/x11/xorg-server/Portfile

    r49538 r50572  
    6767
    6868post-patch {
    69         reinplace "s|ensure_path(X11BINDIR);|ensure_path(X11BINDIR); ensure_path(\"${x11prefix}/bin\");|" ${worksrcpath}/hw/xquartz/mach-startup/bundle-main.c
    70 
    7169        # Yeah, there's probably a better way to do this...
    7270        system "cd ${worksrcpath}/.. && patch -p0 < ${filespath}/mesa-7.0-multisample.patch"
     
    7775# Otherwise glcore.h will be pulled in from glproto in ${prefix}/include/GL/internal
    7876configure.cppflags-delete -I${prefix}/include
    79 configure.cppflags-append -I${worksrcpath}/../Mesa-${mesavers}/include -I${prefix}/include -I${x11prefix}/include
     77configure.cppflags-append -I${worksrcpath}/../Mesa-${mesavers}/include -I${prefix}/include
    8078
    8179post-destroot {
  • trunk/dports/x11/xping/Portfile

    r45603 r50572  
    1919use_configure   no
    2020
    21 build           { system "cd ${worksrcpath} && cc ${distfiles} -Wall -I${prefix}/include -I${x11prefix}/include -L${prefix}/lib -L${x11prefix}/lib -lX11 -o xping" }
     21build           { system "cd ${worksrcpath} && cc ${distfiles} -Wall -I${prefix}/include -L${prefix}/lib -lX11 -o xping" }
    2222
    2323destroot        { system "install -m 755 ${worksrcpath}/xping ${destroot}/${prefix}/bin/" }
  • trunk/dports/x11/xroot/Portfile

    r45603 r50572  
    44name                xroot
    55version             1.0
    6 revision            1
     6revision            2
    77categories          x11
    88maintainers         nomaintainer
     
    3333build       {
    3434    file copy ${distpath}/${distfile} ${worksrcpath}
    35     system "cd ${worksrcpath} && c++ ${distfile} -Wall -L${prefix}/lib -L${x11prefix}/lib -I${prefix}/include -I${x11prefix}/include -lX11 -o xroot"
     35    system "cd ${worksrcpath} && c++ ${distfile} -Wall -L${prefix}/lib -I${prefix}/include -lX11 -o xroot"
    3636}
    3737destroot    {
  • trunk/dports/x11/xterm/Portfile

    r49869 r50572  
    3737configure.args      --mandir=${prefix}/share/man --enable-luit \
    3838                    --enable-logging --enable-wide-chars \
    39                     --enable-256-color --enable-load-vt-fonts
    40 
    41 # AC_X_PATH blindly asks xmkmf where X11 is, and it always uses /usr/X11R6.
    42 # This block helps us link correctly and setup our pc files correctly when we   
    43 # are +system_x11 and x11prefix is somewhere non-standard and should cause
    44 # AC_X_PATH to let us setup our CPPFLAGS and LDFLAGS without interference
    45 configure.args-append --x-include=${prefix}/include --x-lib=${prefix}/lib
    46 if { ![file exists ${prefix}/lib/pkgconfig/x11.pc] } {
    47     pre-configure {
    48         configure.cppflags-append -I${x11prefix}/include
    49         configure.ldflags-append  -L${x11prefix}/lib
    50     }
    51 }
     39                    --enable-256-color --enable-load-vt-fonts \
     40                    --x-include=${prefix}/include --x-lib=${prefix}/lib
    5241
    5342# If -ltermcap stays in the LDFLAGS, xterm is linked against both
  • trunk/dports/xfce/libxfcegui4/Portfile

    r50012 r50572  
    1717                rmd160 295263f3e8a6bbcea05ce5ae8ab0f3a9cf1e4568
    1818
    19 configure.args  --enable-startup-notification
     19configure.args  --enable-startup-notification \
     20                --x-include=${prefix}/include --x-lib=${prefix}/lib
    2021
    2122depends_lib     port:libxfce4util \
     
    2526                port:libxml2 \
    2627                port:startup-notification
    27 
    28 # AC_X_PATH blindly asks xmkmf where X11 is, and it always uses /usr/X11R6.
    29 # This block helps us link correctly and setup our pc files correctly when we   
    30 # are +system_x11 and x11prefix is somewhere non-standard and should cause
    31 # AC_X_PATH to let us setup our CPPFLAGS and LDFLAGS without interference
    32 configure.args-append --x-include=${prefix}/include --x-lib=${prefix}/lib
    33 if { ![file exists ${prefix}/lib/pkgconfig/x11.pc] } {
    34     pre-configure {
    35         configure.cppflags-append -I${x11prefix}/include
    36         configure.ldflags-append  -L${x11prefix}/lib
    37     }
    38 
    39     # And this will similarly get ports that use pkgconfig to find our pkgconfig-less libX11
    40     post-destroot {
    41         if {![file exists ${x11prefix}/lib/pkgconfig/x11.pc]} {
    42             foreach pc [glob ${destroot}${prefix}/lib/pkgconfig/*.pc] {
    43                 reinplace "s:-lX11:-L${prefix}/lib -L${x11prefix}/lib -lX11:g" ${pc}
    44             }
    45         }
    46     }
    47 }
    48 
  • trunk/dports/xfce/xfce-utils/Portfile

    r50012 r50572  
    2121configure.args  --disable-gdm --with-xsession-prefix=${prefix}
    2222
    23 pre-configure {
    24     if { ![file exists ${prefix}/lib/pkgconfig/x11.pc] } {
    25         configure.cppflags-append -I${x11prefix}/include
    26         configure.ldflags-append "-L${x11prefix}/lib -lXft -lfontconfig -lXrender -lXext -lXinerama -lXrandr"
    27     }
    28 }
    29 
    3023variant midori {
    3124        depends_lib-append port:midori
  • trunk/dports/xfce/xfce4-settings/Portfile

    r50012 r50572  
    55name            xfce4-settings
    66version         4.6.1
     7revision        1
    78categories      xfce
    89platforms       darwin
     
    2223platform darwin 8 {
    2324    patchfiles-append           patch-configure.diff
    24     configure.env-append        PKG_CONFIG_PATH="${x11prefix}/lib/pkgconfig" \
    25         XI_VERSION="1.0.0" XI_CFLAGS="-I${x11prefix}/include" XI_LIBS="-L${x11prefix}/lib -lXi" \
    26         LIBX11_VERSION="6.2.0" LIBX11_CFLAGS="-I${x11prefix}/include" LIBX11_LIBS="-L${x11prefix}/lib -lX11" \
    27         XRANDR_VERSION="2.0.0" XRANDR_CFLAGS="-I${x11prefix}/include" XRANDR_LIBS="-L${x11prefix}/lib -lXrandr" \
    28         XCURSOR_VERSION="1.0.0" XCURSOR_CFLAGS="-I${x11prefix}/include" XCURSOR_LIBS="-L${x11prefix}/lib -lXcursor"
     25    configure.env-append        PKG_CONFIG_PATH="${prefix}/lib/pkgconfig" \
     26        XI_VERSION="1.0.0" XI_CFLAGS="-I${prefix}/include" XI_LIBS="-L${prefix}/lib -lXi" \
     27        LIBX11_VERSION="6.2.0" LIBX11_CFLAGS="-I${prefix}/include" LIBX11_LIBS="-L${prefix}/lib -lX11" \
     28        XRANDR_VERSION="2.0.0" XRANDR_CFLAGS="-I${prefix}/include" XRANDR_LIBS="-L${prefix}/lib -lXrandr" \
     29        XCURSOR_VERSION="1.0.0" XCURSOR_CFLAGS="-I${prefix}/include" XCURSOR_LIBS="-L${prefix}/lib -lXcursor"
    2930}
  • trunk/dports/xfce/xfconf/Portfile

    r50012 r50572  
    2222                port:gtk2
    2323
     24configure.args --x-include=${prefix}/include --x-lib=${prefix}/lib
     25
    2426platform darwin {
    2527        configure.args-append --disable-visibility
    2628}
    27 
    28 # AC_X_PATH blindly asks xmkmf where X11 is, and it always uses /usr/X11R6.
    29 # This block helps us link correctly and setup our pc files correctly when we   
    30 # are +system_x11 and x11prefix is somewhere non-standard and should cause
    31 # AC_X_PATH to let us setup our CPPFLAGS and LDFLAGS without interference
    32 configure.args-append --x-include=${prefix}/include --x-lib=${prefix}/lib
    33 if { ![file exists ${prefix}/lib/pkgconfig/x11.pc] } {
    34     pre-configure {
    35         configure.cppflags-append -I${x11prefix}/include
    36         configure.ldflags-append  -L${x11prefix}/lib
    37     }
    38 
    39     # And this will similarly get ports that use pkgconfig to find our pkgconfig-less libX11
    40     post-destroot {
    41         if {![file exists ${x11prefix}/lib/pkgconfig/x11.pc]} {
    42             foreach pc [glob ${destroot}${prefix}/lib/pkgconfig/*.pc] {
    43                 reinplace "s:-lX11:-L${prefix}/lib -L${x11prefix}/lib -lX11:g" ${pc}
    44             }
    45         }
    46     }
    47 }
    48 
  • trunk/dports/xfce/xfprint/Portfile

    r50012 r50572  
    2222configure.args  --enable-cups
    2323
    24 pre-configure {
    25     if { ![file exists ${prefix}/lib/pkgconfig/x11.pc] } {
    26         configure.cppflags-append -I${x11prefix}/include
    27         configure.ldflags-append  -L${x11prefix}/lib
    28     }
    29 }
    30 
    3124configure.ldflags-append        "-lXft -lfontconfig -lXrender -lXext -lXinerama -lXrandr"
Note: See TracChangeset for help on using the changeset viewer.