[86071] users/cal/ports/x11/herbstluftwm

[cal at macports.org]

Revision: 86071
          http://trac.macports.org/changeset/86071
Author:   cal at macports.org
Date:     2011-10-18 15:22:06 -0700 (Tue, 18 Oct 2011)
Log Message:
-----------
user port for x11/herbstluftwm: Fix some problems reported by ryandesign

Modified Paths:
--------------
    users/cal/ports/x11/herbstluftwm/Portfile
    users/cal/ports/x11/herbstluftwm/files/config.patch

Modified: users/cal/ports/x11/herbstluftwm/Portfile
===================================================================
--- users/cal/ports/x11/herbstluftwm/Portfile	2011-10-18 22:18:38 UTC (rev 86070)
+++ users/cal/ports/x11/herbstluftwm/Portfile	2011-10-18 22:22:06 UTC (rev 86071)
@@ -31,7 +31,7 @@
 
 depends_build           bin:a2x:asciidoc
 
-depends_lib             port:glib2 \
+depends_lib             path:lib/pkgconfig/glib-2.0.pc:glib2 \
                         port:xorg-libX11
 
 # declare universal variant, so get_canonical_archflags works
@@ -45,7 +45,7 @@
                         EXTRALDFLAGS="${configure.ldflags} [get_canonical_archflags]" \
                         TPUT=true
 
-destroot.args-append    PREFIX=${destroot}/${prefix} \
-                        ETCDIR=${destroot}/${prefix}/etc/ \
+destroot.args-append    PREFIX=${destroot}${prefix} \
+                        ETCDIR=${destroot}${prefix}/etc/ \
                         TPUT=true
 

Modified: users/cal/ports/x11/herbstluftwm/files/config.patch
===================================================================
--- users/cal/ports/x11/herbstluftwm/files/config.patch	2011-10-18 22:18:38 UTC (rev 86070)
+++ users/cal/ports/x11/herbstluftwm/files/config.patch	2011-10-18 22:22:06 UTC (rev 86071)
@@ -5,8 +5,8 @@
  # paths
 -X11INC = /usr/X11R6/include
 -X11LIB = /usr/X11R6/lib
-+X11INC = /opt/local/include/X11
-+X11LIB = /opt/local/lib
++X11INC = $(PREFIX)/include/X11
++X11LIB = $(PREFIX)/lib
  
  INCS = -Isrc/ -I/usr/include -I${X11INC}  `pkg-config --cflags glib-2.0`
  LIBS = -L/usr/lib -lc -L${X11LIB} -lX11 `pkg-config --libs glib-2.0`
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20111018/0987e4aa/attachment.html>