diff -urN /usr/ports/x11/xdialog/Makefile x11/xdialog/Makefile
--- /usr/ports/x11/xdialog/Makefile	Wed Feb  4 19:06:02 2004
+++ x11/xdialog/Makefile	Sat Jul 24 21:43:17 2004
@@ -7,8 +7,7 @@
 #
 
 PORTNAME=	xdialog
-PORTVERSION=	2.1.1
-PORTREVISION=	1
+PORTVERSION=	2.1.2
 CATEGORIES=	x11
 MASTER_SITES=	http://thgodef.nerim.net/xdialog/
 DISTNAME=	${PORTNAME:S/x/X/}-${PORTVERSION}
@@ -19,16 +18,30 @@
 USE_BZIP2=	yes
 USE_X_PREFIX=	yes
 USE_GNOME=	gtk12
+USE_GETOPT_LONG=	yes
 USE_REINPLACE=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 
-MAN1=	Xdialog.1
+MAN1=		Xdialog.1
+
+CPPFLAGS=	-I${LOCALBASE}/include
+LDFLAGS=	-L${LOCALBASE}/lib
+
+.if defined(WITHOUT_NLS)
+CONFIGURE_ARGS+=	--disable-nls
+PLIST_SUB+=	NLS="@comment "
+.else
+USE_GETTEXT=	yes
+PLIST_SUB+=	NLS=""
+.endif
 
 post-patch:
 	@${FIND} ${WRKSRC} -name "Makefile.in" | ${XARGS} ${REINPLACE_CMD} -e \
-		's| install-docDATA||g'
+		's|m4 lib src|m4 src|g ; \
+		 s|-I../lib||g ; \
+		 s|-L../lib -lgetopt||g ; \
+		 s| install-docDATA||g'
 
 post-install:
 .if !defined(NOPORTDOCS)
diff -urN /usr/ports/x11/xdialog/distinfo x11/xdialog/distinfo
--- /usr/ports/x11/xdialog/distinfo	Fri Jan 30 14:55:32 2004
+++ x11/xdialog/distinfo	Sat Jul 24 21:33:19 2004
@@ -1,2 +1,2 @@
-MD5 (Xdialog-2.1.1.tar.bz2) = 379cd3983a22d98d4436e8d4f16a56e1
-SIZE (Xdialog-2.1.1.tar.bz2) = 439548
+MD5 (Xdialog-2.1.2.tar.bz2) = fb8177e9d87504329cf08b07d91586a0
+SIZE (Xdialog-2.1.2.tar.bz2) = 447821
diff -urN /usr/ports/x11/xdialog/pkg-plist x11/xdialog/pkg-plist
--- /usr/ports/x11/xdialog/pkg-plist	Mon May 19 09:46:43 2003
+++ x11/xdialog/pkg-plist	Sat Jul 24 21:49:48 2004
@@ -1,11 +1,17 @@
 bin/Xdialog
-share/locale/de/LC_MESSAGES/Xdialog.mo
-share/locale/es/LC_MESSAGES/Xdialog.mo
-share/locale/fr/LC_MESSAGES/Xdialog.mo
-share/locale/hu/LC_MESSAGES/Xdialog.mo
-share/locale/pt_BR/LC_MESSAGES/Xdialog.mo
-share/locale/ru/LC_MESSAGES/Xdialog.mo
-share/locale/no_NO/LC_MESSAGES/Xdialog.mo
+%%NLS%%share/locale/ca/LC_MESSAGES/Xdialog.mo
+%%NLS%%share/locale/de/LC_MESSAGES/Xdialog.mo
+%%NLS%%share/locale/es/LC_MESSAGES/Xdialog.mo
+%%NLS%%share/locale/fr/LC_MESSAGES/Xdialog.mo
+%%NLS%%share/locale/hu/LC_MESSAGES/Xdialog.mo
+%%NLS%%share/locale/id/LC_MESSAGES/Xdialog.mo
+%%NLS%%share/locale/it/LC_MESSAGES/Xdialog.mo
+%%NLS%%share/locale/nl/LC_MESSAGES/Xdialog.mo
+%%NLS%%share/locale/no_NO/LC_MESSAGES/Xdialog.mo
+%%NLS%%share/locale/pl/LC_MESSAGES/Xdialog.mo
+%%NLS%%share/locale/pt_BR/LC_MESSAGES/Xdialog.mo
+%%NLS%%share/locale/ru/LC_MESSAGES/Xdialog.mo
+%%NLS%%share/locale/sv_SE/LC_MESSAGES/Xdialog.mo
 %%PORTDOCS%%%%DOCSDIR%%/2ranges.png
 %%PORTDOCS%%%%DOCSDIR%%/authors.html
 %%PORTDOCS%%%%DOCSDIR%%/box.html