3 files changed, 73 insertions, 71 deletions

diff --git a/x11-themes/lxappearance/Makefile b/x11-themes/lxappearance/Makefile
index 9ee0cb17a1df..7486223e53c2 100644
--- a/x11-themes/lxappearance/Makefile
+++ b/x11-themes/lxappearance/Makefile
@@ -8,23 +8,36 @@ CATEGORIES=	x11-themes gnome
 MASTER_SITES=	SF/lxde/LXAppearance
 
 MAINTAINER=	pawel@FreeBSD.org
-COMMENT=	A desktop-independent theme switcher for GTK+
+COMMENT=	Desktop-independent theme switcher for GTK+
 
 LICENSE=	GPLv2
 
-USE_GNOME=	gnomehack gtk20 intlhack
-USES=		gettext
-USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
+USE_GMAKE=	yes
+USE_GNOME=	gnomehack gtk20 intlhack
 MAKE_JOBS_SAFE=	yes
 
 MAN1=		lxappearance.1
 
-.include <bsd.port.pre.mk>
+PORTDOCS=	AUTHORS README
+
+OPTIONS_DEFINE=	DOCS NLS
+OPTIONS_SUB=	yes
+
+NLS_USES=	gettext
+
+.include <bsd.port.options.mk>
+
+post-patch:
+.if ! ${PORT_OPTIONS:MNLS}
+	@${REINPLACE_CMD} -e 's|man po|man|' \
+		${WRKSRC}/Makefile.in
+.endif
 
-# earlier versions don't have mkdtemp(3) in stdlib.h
-.if ${OSVERSION} < 800000
-EXTRA_PATCHES+=	${FILESDIR}/extra-src-utils.c
+post-install:
+.if ${PORT_OPTIONS:MDOCS}
+	@${MKDIR} ${DOCSDIR}
+	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${DOCSDIR}
 .endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/x11-themes/lxappearance/files/extra-src-utils.c b/x11-themes/lxappearance/files/extra-src-utils.c
deleted file mode 100644
index 5075b6406729..000000000000
--- a/x11-themes/lxappearance/files/extra-src-utils.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/utils.c.orig    2010-10-26 20:54:31.000000000 +0200
-+++ src/utils.c 2010-10-26 20:55:09.000000000 +0200
-@@ -27,7 +27,7 @@
- #include <sys/wait.h>
- #include <stdlib.h>
- #include <glib/gstdio.h>
--
-+#include <unistd.h>
- #include "icon-theme.h"
-
- static void on_pid_exit(GPid pid, gint status, gpointer user_data)
diff --git a/x11-themes/lxappearance/pkg-plist b/x11-themes/lxappearance/pkg-plist
index 1b687100965f..1733cb7517c1 100644
--- a/x11-themes/lxappearance/pkg-plist
+++ b/x11-themes/lxappearance/pkg-plist
@@ -2,59 +2,59 @@ bin/lxappearance
 include/lxappearance/lxappearance.h
 libdata/pkgconfig/lxappearance.pc
 share/applications/lxappearance.desktop
-share/locale/ar/LC_MESSAGES/lxappearance.mo
-share/locale/be/LC_MESSAGES/lxappearance.mo
-share/locale/bg/LC_MESSAGES/lxappearance.mo
-share/locale/cs/LC_MESSAGES/lxappearance.mo
-share/locale/da/LC_MESSAGES/lxappearance.mo
-share/locale/de/LC_MESSAGES/lxappearance.mo
-share/locale/el/LC_MESSAGES/lxappearance.mo
-share/locale/en_GB/LC_MESSAGES/lxappearance.mo
-share/locale/es/LC_MESSAGES/lxappearance.mo
-share/locale/et/LC_MESSAGES/lxappearance.mo
-share/locale/fa/LC_MESSAGES/lxappearance.mo
-share/locale/fi/LC_MESSAGES/lxappearance.mo
-share/locale/fo/LC_MESSAGES/lxappearance.mo
-share/locale/fr/LC_MESSAGES/lxappearance.mo
-share/locale/gl/LC_MESSAGES/lxappearance.mo
-share/locale/he/LC_MESSAGES/lxappearance.mo
-share/locale/hr/LC_MESSAGES/lxappearance.mo
-share/locale/hu/LC_MESSAGES/lxappearance.mo
-share/locale/id/LC_MESSAGES/lxappearance.mo
-share/locale/it/LC_MESSAGES/lxappearance.mo
-share/locale/ja/LC_MESSAGES/lxappearance.mo
-share/locale/kk/LC_MESSAGES/lxappearance.mo
-share/locale/ko/LC_MESSAGES/lxappearance.mo
-share/locale/lg/LC_MESSAGES/lxappearance.mo
-share/locale/lt/LC_MESSAGES/lxappearance.mo
-share/locale/nl/LC_MESSAGES/lxappearance.mo
-share/locale/pa/LC_MESSAGES/lxappearance.mo
-share/locale/pl/LC_MESSAGES/lxappearance.mo
-share/locale/pt/LC_MESSAGES/lxappearance.mo
-share/locale/pt_BR/LC_MESSAGES/lxappearance.mo
-share/locale/ro/LC_MESSAGES/lxappearance.mo
-share/locale/ru/LC_MESSAGES/lxappearance.mo
-share/locale/sl/LC_MESSAGES/lxappearance.mo
-share/locale/sr/LC_MESSAGES/lxappearance.mo
-share/locale/sr@latin/LC_MESSAGES/lxappearance.mo
-share/locale/sv/LC_MESSAGES/lxappearance.mo
-share/locale/te/LC_MESSAGES/lxappearance.mo
-share/locale/tr/LC_MESSAGES/lxappearance.mo
-share/locale/tt_RU/LC_MESSAGES/lxappearance.mo
-share/locale/ug/LC_MESSAGES/lxappearance.mo
-share/locale/uk/LC_MESSAGES/lxappearance.mo
-share/locale/vi/LC_MESSAGES/lxappearance.mo
-share/locale/zh_CN/LC_MESSAGES/lxappearance.mo
-share/locale/zh_TW/LC_MESSAGES/lxappearance.mo
+%%NLS%%share/locale/ar/LC_MESSAGES/lxappearance.mo
+%%NLS%%share/locale/be/LC_MESSAGES/lxappearance.mo
+%%NLS%%share/locale/bg/LC_MESSAGES/lxappearance.mo
+%%NLS%%share/locale/cs/LC_MESSAGES/lxappearance.mo
+%%NLS%%share/locale/da/LC_MESSAGES/lxappearance.mo
+%%NLS%%share/locale/de/LC_MESSAGES/lxappearance.mo
+%%NLS%%share/locale/el/LC_MESSAGES/lxappearance.mo
+%%NLS%%share/locale/en_GB/LC_MESSAGES/lxappearance.mo
+%%NLS%%share/locale/es/LC_MESSAGES/lxappearance.mo
+%%NLS%%share/locale/et/LC_MESSAGES/lxappearance.mo
+%%NLS%%share/locale/fa/LC_MESSAGES/lxappearance.mo
+%%NLS%%share/locale/fi/LC_MESSAGES/lxappearance.mo
+%%NLS%%share/locale/fo/LC_MESSAGES/lxappearance.mo
+%%NLS%%share/locale/fr/LC_MESSAGES/lxappearance.mo
+%%NLS%%share/locale/gl/LC_MESSAGES/lxappearance.mo
+%%NLS%%share/locale/he/LC_MESSAGES/lxappearance.mo
+%%NLS%%share/locale/hr/LC_MESSAGES/lxappearance.mo
+%%NLS%%share/locale/hu/LC_MESSAGES/lxappearance.mo
+%%NLS%%share/locale/id/LC_MESSAGES/lxappearance.mo
+%%NLS%%share/locale/it/LC_MESSAGES/lxappearance.mo
+%%NLS%%share/locale/ja/LC_MESSAGES/lxappearance.mo
+%%NLS%%share/locale/kk/LC_MESSAGES/lxappearance.mo
+%%NLS%%share/locale/ko/LC_MESSAGES/lxappearance.mo
+%%NLS%%share/locale/lg/LC_MESSAGES/lxappearance.mo
+%%NLS%%share/locale/lt/LC_MESSAGES/lxappearance.mo
+%%NLS%%share/locale/nl/LC_MESSAGES/lxappearance.mo
+%%NLS%%share/locale/pa/LC_MESSAGES/lxappearance.mo
+%%NLS%%share/locale/pl/LC_MESSAGES/lxappearance.mo
+%%NLS%%share/locale/pt/LC_MESSAGES/lxappearance.mo
+%%NLS%%share/locale/pt_BR/LC_MESSAGES/lxappearance.mo
+%%NLS%%share/locale/ro/LC_MESSAGES/lxappearance.mo
+%%NLS%%share/locale/ru/LC_MESSAGES/lxappearance.mo
+%%NLS%%share/locale/sl/LC_MESSAGES/lxappearance.mo
+%%NLS%%share/locale/sr/LC_MESSAGES/lxappearance.mo
+%%NLS%%share/locale/sr@latin/LC_MESSAGES/lxappearance.mo
+%%NLS%%share/locale/sv/LC_MESSAGES/lxappearance.mo
+%%NLS%%share/locale/te/LC_MESSAGES/lxappearance.mo
+%%NLS%%share/locale/tr/LC_MESSAGES/lxappearance.mo
+%%NLS%%share/locale/tt_RU/LC_MESSAGES/lxappearance.mo
+%%NLS%%share/locale/ug/LC_MESSAGES/lxappearance.mo
+%%NLS%%share/locale/uk/LC_MESSAGES/lxappearance.mo
+%%NLS%%share/locale/vi/LC_MESSAGES/lxappearance.mo
+%%NLS%%share/locale/zh_CN/LC_MESSAGES/lxappearance.mo
+%%NLS%%share/locale/zh_TW/LC_MESSAGES/lxappearance.mo
 %%DATADIR%%/ui/about.ui
 %%DATADIR%%/ui/lxappearance.ui
-@dirrmtry share/locale/fo/LC_MESSAGES
-@dirrmtry share/locale/fo
-@dirrmtry share/locale/lg/LC_MESSAGES
-@dirrmtry share/locale/lg
-@dirrmtry share/locale/tt_RU/LC_MESSAGES
-@dirrmtry share/locale/tt_RU
 @dirrm %%DATADIR%%/ui
 @dirrm %%DATADIR%%
-@dirrm include/lxappearance
+%%NLS%%@dirrmtry share/locale/tt_RU/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/tt_RU
+%%NLS%%@dirrmtry share/locale/lg/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/lg
+%%NLS%%@dirrmtry share/locale/fo/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/fo
 @dirrmtry share/applications
+@dirrm include/lxappearance