3 files changed, 36 insertions, 28 deletions

diff --git a/multimedia/gaupol/Makefile b/multimedia/gaupol/Makefile
index 0abf35de13ef..faf8ec0aa7d9 100644
--- a/multimedia/gaupol/Makefile
+++ b/multimedia/gaupol/Makefile
@@ -6,27 +6,35 @@
 #
 
 PORTNAME=	gaupol
-PORTVERSION=	0.17
-CATEGORIES=	multimedia
-MASTER_SITES=	http://download.gna.org/gaupol/%SUBDIR%/
-MASTER_SITE_SUBDIR=	${PORTVERSION}
+PORTVERSION=	0.17.1
+CATEGORIES=	multimedia python
+MASTER_SITES=	http://download.gna.org/gaupol/0.17/ \
+		http://www.c-s.li/ports/
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	c-s@c-s.li
 COMMENT=	Subtitle editor
 
 RUN_DEPENDS=	iso-codes>=0:${PORTSDIR}/misc/iso-codes \
 		py*-chardet>=0:${PORTSDIR}/textproc/py-chardet \
 		py*-enchant>=1.5.1:${PORTSDIR}/textproc/py-enchant
 
+LICENSE=	GPLv3
+
 USE_BZIP2=	yes
 USE_GNOME=	pygtk2
-USE_PYTHON=	yes
+USE_PYTHON=	2.6+
 USE_PYDISTUTILS=yes
-USE_GETTEXT=	yes
 INSTALLS_ICONS=	yes
 
 MAN1=		${PORTNAME}.1
 
+.if !defined(WITHOUT_NLS)
+USE_GETTEXT=	yes
+PLIST_SUB+=	NLS=""
+.else
+PLIST_SUB+=	NLS="@comment "
+.endif
+
 post-patch:
 	@${REINPLACE_CMD} -e 's|share/man|man|g' ${WRKSRC}/setup.py
 
diff --git a/multimedia/gaupol/distinfo b/multimedia/gaupol/distinfo
index 734a7bc04121..0f4667441bae 100644
--- a/multimedia/gaupol/distinfo
+++ b/multimedia/gaupol/distinfo
@@ -1,3 +1,2 @@
-MD5 (gaupol-0.17.tar.bz2) = a6ee26fbadf21e096ee2d0a88cbf9eec
-SHA256 (gaupol-0.17.tar.bz2) = 935529b8e43d76e6f0ca44d4ef6bd1616d1e294fba670726be3beadf69069c38
-SIZE (gaupol-0.17.tar.bz2) = 414001
+SHA256 (gaupol-0.17.1.tar.bz2) = b7bdbf299f4cb65f78bfde26aa601ca26da6d0313fda694fc421417a878ec85f
+SIZE (gaupol-0.17.1.tar.bz2) = 427748
diff --git a/multimedia/gaupol/pkg-plist b/multimedia/gaupol/pkg-plist
index fd8ff1c8939a..f0e5abe658ab 100644
--- a/multimedia/gaupol/pkg-plist
+++ b/multimedia/gaupol/pkg-plist
@@ -1,4 +1,3 @@
-@comment $FreeBSD$
 bin/gaupol
 %%PYTHON_SITELIBDIR%%/aeidon/__init__.py
 %%PYTHON_SITELIBDIR%%/aeidon/__init__.pyc
@@ -463,6 +462,7 @@ bin/gaupol
 %%PYTHON_SITELIBDIR%%/gaupol/view.pyc
 %%PYTHON_SITELIBDIR%%/gaupol/view.pyo
 share/applications/gaupol.desktop
+share/applications/mimeinfo.cache
 %%DATADIR%%/extensions/bookmarks/add-bookmark-dialog.ui
 %%DATADIR%%/extensions/bookmarks/bookmark.png
 %%DATADIR%%/extensions/bookmarks/bookmarks.gaupol-extension
@@ -539,23 +539,15 @@ share/icons/hicolor/22x22/apps/gaupol.png
 share/icons/hicolor/24x24/apps/gaupol.png
 share/icons/hicolor/32x32/apps/gaupol.png
 share/icons/hicolor/scalable/apps/gaupol.svg
-share/locale/ca/LC_MESSAGES/gaupol.mo
-share/locale/de/LC_MESSAGES/gaupol.mo
-share/locale/es/LC_MESSAGES/gaupol.mo
-share/locale/fi/LC_MESSAGES/gaupol.mo
-share/locale/hu/LC_MESSAGES/gaupol.mo
-share/locale/pl/LC_MESSAGES/gaupol.mo
-share/locale/ru/LC_MESSAGES/gaupol.mo
-share/locale/sv/LC_MESSAGES/gaupol.mo
-@dirrm %%DATADIR%%/ui/text-assistant
-@dirrm %%DATADIR%%/ui
-@dirrm %%DATADIR%%/patterns
-@dirrm %%DATADIR%%/iso-codes
-@dirrm %%DATADIR%%/headers
-@dirrm %%DATADIR%%/extensions/side-pane
-@dirrm %%DATADIR%%/extensions/bookmarks
-@dirrm %%DATADIR%%/extensions
-@dirrm %%DATADIR%%
+%%NLS%%share/locale/ca/LC_MESSAGES/gaupol.mo
+%%NLS%%share/locale/de/LC_MESSAGES/gaupol.mo
+%%NLS%%share/locale/es/LC_MESSAGES/gaupol.mo
+%%NLS%%share/locale/fi/LC_MESSAGES/gaupol.mo
+%%NLS%%share/locale/he/LC_MESSAGES/gaupol.mo
+%%NLS%%share/locale/hu/LC_MESSAGES/gaupol.mo
+%%NLS%%share/locale/pl/LC_MESSAGES/gaupol.mo
+%%NLS%%share/locale/ru/LC_MESSAGES/gaupol.mo
+%%NLS%%share/locale/sv/LC_MESSAGES/gaupol.mo
 @dirrmtry share/icons/hicolor/scalable/apps
 @dirrmtry share/icons/hicolor/scalable
 @dirrmtry share/icons/hicolor/32x32/apps
@@ -569,6 +561,15 @@ share/locale/sv/LC_MESSAGES/gaupol.mo
 @dirrmtry share/icons/hicolor
 @dirrmtry share/icons
 @dirrmtry share/applications
+@dirrm %%DATADIR%%/ui/text-assistant
+@dirrm %%DATADIR%%/ui
+@dirrm %%DATADIR%%/patterns
+@dirrm %%DATADIR%%/iso-codes
+@dirrm %%DATADIR%%/headers
+@dirrm %%DATADIR%%/extensions/side-pane
+@dirrm %%DATADIR%%/extensions/bookmarks
+@dirrm %%DATADIR%%/extensions
+@dirrm %%DATADIR%%
 @dirrm %%PYTHON_SITELIBDIR%%/gaupol/renderers
 @dirrm %%PYTHON_SITELIBDIR%%/gaupol/enums
 @dirrm %%PYTHON_SITELIBDIR%%/gaupol/dialogs