Ticket #11721: diff

Portfile

@@ -1 +1 @@
 # $Id$
 PortSystem 1.0
 name           gnome-applets
-version                2.16.2
+version                2.18.0
 description    GNOME panel applets.
 long_description        This package contains applets for use with the \
                        GNOME panel.  
@@ -9 +9 @@
 categories     gnome
 platforms      darwin 
 homepage       http://www.gnome.org/
-master_sites    gnome:sources/gnome-applets/2.16/
-checksums      md5 1a46b8557ff05ca75e7db6adb4dd6707 \
-                       sha1 8b912c21e7c390c9aae96bb81fe017fa1f9bf006 \
-                       rmd160 b8706c57b37702b0bfc64cb549fc594b05da5e5b
+master_sites    gnome:sources/gnome-applets/2.18/
+checksums      md5 db3ef99c00335798f30fc0a9162c0257 \
+                       sha1 7bec1f642e827634f74859e81e1502799d3c05a2 \
+                       rmd160 c9a18c717fd01ede9476a70784a8522968e52211
 
 depends_lib \
         lib:libatk-1.0:atk bin:gconftool-2:gconf lib:libgettextlib:gettext \
@@ -26 +26 @@
         lib:libiconv:libiconv lib:libpng:libpng lib:libtiff:tiff port:xrender \
         port:audiofile port:esound port:gnome-keyring port:cairo port:zlib \
        port:gail port:gnome-panel port:libwnck port:libxklavier port:p5-xml-parser \
-       port:popt port:startup-notification port:libxklavier-2-2 \
+       port:popt port:startup-notification port:libgnomekbd \
        port:dbus \
        port:dbus-glib
 
 use_bzip2      yes
 
-patchfiles \
-        patch-libgweather-weather.c \
-        patch-libgweather-weather-met.c
+#patchfiles \
+#        patch-libgweather-weather.c \
+#        patch-libgweather-weather-met.c
 
 #patchfiles \
 #      patch-Makefile.in \
@@ -43 +43 @@
 #      patch-libgweather-weather-met.c
 
 configure.env  GMSGFMT=${prefix}/bin/msgfmt \
-               CFLAGS="-I${prefix}/lib/libxklavier-2.2/include -I${prefix}/include -I/usr/include" \
-               CPPFLAGS="-L${prefix}/lib/libxklavier-2.2/lib -I${prefix}/lib/libxklavier-2.2/include -I${prefix}/include -I/usr/include" \
-               PKG_CONFIG_PATH="${prefix}/lib/libxklavier-2.2/lib/pkgconfig:${prefix}/lib/pkgconfig:${prefix}/share/pkgconfig"
+               CFLAGS="-I${prefix}/lib/libxklavier/include -I${prefix}/include -I/usr/include" \
+               CPPFLAGS="-L${prefix}/lib/libxklavier/lib -I${prefix}/lib/libxklavier/include -I${prefix}/include -I/usr/include" \
+               PKG_CONFIG_PATH="${prefix}/lib/libxklavier/lib/pkgconfig:${prefix}/lib/pkgconfig:${prefix}/share/pkgconfig"
 
 configure.args  --mandir=${prefix}/share/man \
                --with-gstreamer=0.10 \