Ticket #17480: Portfile.diff

Portfile

@@ -7 +7 @@
                                         desktop window manager for the X Window system.
 homepage                        http://www.fvwm.org/
 maintainers                     pguyot@kallisys.net
-categories                      x11-wm x11
+categories                      x11 x11-wm
 platforms                       darwin
 master_sites            ftp://ftp.fvwm.org/pub/fvwm/version-2/ \
                                         ftp://ftp.hpc.uh.edu/pub/fvwm/version-2/
@@ -18 +18 @@
                                 rmd160 4025f6c75c0919bffdaa9acbc7a4d987617d098b
 
 depends_lib                     lib:libX11.6:XFree86 \
-                                        lib:libXpm.4:xpm \
-                                        lib:libgtk.1:gtk1 \
-                                        lib:libreadline:readline \
-                                        bin:gnome-config:gnome-libs
-# I'm installing this in x11prefix like fvwm.
-configure.args          --enable-gtk \
+                                lib:libXpm.4:xpm \
+                                port:gtk1 \
+                                port:readline \
+                                port:gnome-libs
+
+configure.args                          --enable-gtk \
                                         --with-gnome \
                                         --with-ncurses-library=yes \
                                         --without-rplay-library \
                                         --without-stroke-library \
-                                        --with-x \
-                                        --prefix=${x11prefix}
+                                        --x-include=${x11prefix}/include \
+                                        --x-lib=${x11prefix}/lib
 
 livecheck.check regexm
 livecheck.regex {Latest Unstable Release: &nbsp; </td>\s+.*?<a href="download" >([^<]*)</a>} 
 livecheck.url   ${homepage}
 
+variant without_gnome {
+        configure.args-delete --with-gnome
+        configure.args-append --without-gnome
+        depends_lib-delete port:gnome-libs
+}
+
+# port:gtk1 is not universal
+universal_variant no