diff -urN /usr/ports/games/xcowsay/Makefile games/xcowsay/Makefile
--- /usr/ports/games/xcowsay/Makefile	2009-08-29 14:13:14.000000000 +0900
+++ games/xcowsay/Makefile	2009-10-25 00:17:21.000000000 +0900
@@ -6,33 +6,44 @@
 #
 
 PORTNAME=	xcowsay
-PORTVERSION=	1.1
-PORTREVISION=	1
+PORTVERSION=	1.1.1
 CATEGORIES=	games gnome
-MASTER_SITES=	http://www.nickg.me.uk/files/ LOCAL/chinsan/games
+MASTER_SITES=	http://www.nickg.me.uk/files/
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A graphical configurable talking cow
 
-GNU_CONFIGURE=	yes
-USE_GNOME=	gtk20 gdkpixbuf intlhack
+OPTIONS=	DBUS "Enable DBus support" off
+
+USE_GNOME=	gtk20
+USE_GETTEXT=	yes
 USE_GMAKE=	yes
-USE_ICONV=	yes
-CPPFLAGS+=	-I${LOCALBASE}/include
-LDFLAGS+=	-L${LOCALBASE}/lib ${PTHREAD}
+GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 
 MAN6=		xcowsay.6
-
-.if !defined(WITHOUT_NLS)
-USE_GETTEXT=	yes
-PLIST_SUB+=	NLS=""
-CPPFLAGS+=	-I${LOCALBASE}/include
-LDFLAGS+=	-L${LOCALBASE}/lib
-CONFIGURE_ENV+=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
-.else
-CONFIGURE_ARGS+=--disable-nls
-PLIST_SUB+=	NLS="@comment "
+PLIST_FILES=	bin/xcowdream \
+		bin/xcowfortune \
+		bin/xcowsay \
+		bin/xcowthink \
+		share/locale/pt_BR/LC_MESSAGES/xcowsay.mo \
+		%%DATADIR%%/cow_large.png \
+		%%DATADIR%%/cow_med.png \
+		%%DATADIR%%/cow_small.png
+PLIST_DIRS=	%%DATADIR%%
+
+CPPFLAGS=	-I${LOCALBASE}/include
+LDFLAGS=	-L${LOCALBASE}/lib
+
+.include <bsd.port.pre.mk>
+
+.if defined(WITH_DBUS)
+LIB_DEPENDS+=	dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib
+CFLAGS+=	-DWITH_DBUS
+CONFIGURE_ARGS+=	--enable-dbus
 .endif
 
-.include <bsd.port.mk>
+post-patch:
+	@${REINPLACE_CMD} -e 's|-DWITH_DBUS||g' ${WRKSRC}/configure
+
+.include <bsd.port.post.mk>
diff -urN /usr/ports/games/xcowsay/distinfo games/xcowsay/distinfo
--- /usr/ports/games/xcowsay/distinfo	2008-09-08 00:10:57.000000000 +0900
+++ games/xcowsay/distinfo	2009-10-24 17:56:31.000000000 +0900
@@ -1,3 +1,3 @@
-MD5 (xcowsay-1.1.tar.gz) = cf08b324b67d5761158344adcea89402
-SHA256 (xcowsay-1.1.tar.gz) = e0dd4b753690c650c6bfbb5af9d190fa6bb3d889a491c8553a34ba397ede8bbc
-SIZE (xcowsay-1.1.tar.gz) = 258978
+MD5 (xcowsay-1.1.1.tar.gz) = b6ba1b3726fc6d365311693e583d3c14
+SHA256 (xcowsay-1.1.1.tar.gz) = 121ad38463808217ef0b56a192848cb07add74937a0190c89b881e062f374719
+SIZE (xcowsay-1.1.1.tar.gz) = 258392
diff -urN /usr/ports/games/xcowsay/pkg-plist games/xcowsay/pkg-plist
--- /usr/ports/games/xcowsay/pkg-plist	2008-09-08 00:10:57.000000000 +0900
+++ games/xcowsay/pkg-plist	1970-01-01 09:00:00.000000000 +0900
@@ -1,9 +0,0 @@
-bin/xcowsay
-bin/xcowfortune
-bin/xcowdream
-bin/xcowthink
-%%NLS%%share/locale/pt_BR/LC_MESSAGES/xcowsay.mo
-%%DATADIR%%/cow_small.png
-%%DATADIR%%/cow_med.png
-%%DATADIR%%/cow_large.png
-@dirrm %%DATADIR%%