5 files changed, 32 insertions, 37 deletions

diff --git a/devel/gettext-lint/Makefile b/devel/gettext-lint/Makefile
index b71847ee7473..648e6b11579f 100644
--- a/devel/gettext-lint/Makefile
+++ b/devel/gettext-lint/Makefile
@@ -7,10 +7,10 @@
 #
 
 PORTNAME=	gettext-lint
-PORTVERSION=	0.3.1
+PORTVERSION=	0.4
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=gettext-lint
+MASTER_SITE_SUBDIR=	${PORTNAME}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Check the validity and consistency of PO and POT files
@@ -18,14 +18,29 @@ COMMENT=	Check the validity and consistency of PO and POT files
 RUN_DEPENDS=	msgfmt:${PORTSDIR}/devel/gettext
 
 USE_PYTHON=	yes
-GNU_CONFIGURE=	yes
-MAKE_ENV=	PYTHON_SITELIBDIR=${PYTHON_SITELIBDIR}
+NO_BUILD=	yes
 
-MAN1=		POFileConsistency.1 POFileChecker.1 POFileSpell.1 POFileFill.1 \
-		POFileEquiv.1 POFileStatus.1
+MAN1=		POFileChecker.1 POFileClean.1 POFileConsistency.1 \
+		POFileEquiv.1 POFileFill.1 POFileGlossary.1 \
+		POFileSpell.1 POFileStatus.1
 
 post-patch:
-	@${GREP} -lR "@prefix@/share/@PACKAGE@" ${WRKSRC} | ${XARGS} \
-		${REINPLACE_CMD} -e "s,@prefix@/share/@PACKAGE@,${PYTHON_SITELIBDIR}/@PACKAGE@,"
+.for i in POFileChecker POFileClean POFileConsistency POFileEquiv POFileFill \
+	POFileGlossary POFileSpell POFileStatus
+	cd ${WRKSRC}/src && ${SED} -e 's|@PYTHON@|${PYTHON_CMD}|g ; \
+		 s|@prefix@/share/@PACKAGE@|${PYTHON_SITELIBDIR}/${PORTNAME}|g' ${i}.in > ${i}
+.endfor
+
+do-install:
+.for i in POFileChecker POFileClean POFileConsistency POFileEquiv POFileFill \
+	POFileGlossary POFileSpell POFileStatus
+	${INSTALL_SCRIPT} ${WRKSRC}/src/${i} ${PREFIX}/bin/${i}
+	${INSTALL_MAN} ${WRKSRC}/doc/${i}.1 ${MANPREFIX}/man/man1/${i}.1
+.endfor
+	@${MKDIR} ${PYTHON_SITELIBDIR}/${PORTNAME}
+	${INSTALL_DATA} ${WRKSRC}/src/*.py ${PYTHON_SITELIBDIR}/${PORTNAME}
+	@${MKDIR} ${DATADIR}
+	${INSTALL_DATA} ${WRKSRC}/etc/*.css ${DATADIR}
+	${INSTALL_DATA} ${WRKSRC}/etc/*.xsl ${DATADIR}
 
 .include <bsd.port.mk>
diff --git a/devel/gettext-lint/distinfo b/devel/gettext-lint/distinfo
index 4494463248a8..fb3b1ffe8e66 100644
--- a/devel/gettext-lint/distinfo
+++ b/devel/gettext-lint/distinfo
@@ -1,3 +1,3 @@
-MD5 (gettext-lint-0.3.1.tar.gz) = 9414ca6d500d29f29b6a1f8669a11e5c
-SHA256 (gettext-lint-0.3.1.tar.gz) = 7d9b22d727e0d6764bd91a56b45f8c04e0d24a996cbdea32cfc0b4b3b2247cf2
-SIZE (gettext-lint-0.3.1.tar.gz) = 72912
+MD5 (gettext-lint-0.4.tar.gz) = 9db81f7c3df06147ba27ee331222e057
+SHA256 (gettext-lint-0.4.tar.gz) = 0ddf463517cc8eb87afc127683040073edad47623be963e0fdd537a7c7b4ec68
+SIZE (gettext-lint-0.4.tar.gz) = 148364
diff --git a/devel/gettext-lint/files/patch-etc:Makefile.in b/devel/gettext-lint/files/patch-etc:Makefile.in
deleted file mode 100644
index e2c60d899773..000000000000
--- a/devel/gettext-lint/files/patch-etc:Makefile.in
+++ /dev/null
@@ -1,10 +0,0 @@
---- etc/Makefile.in.orig	Tue Feb  3 14:25:14 2004
-+++ etc/Makefile.in	Tue Feb  3 14:25:26 2004
-@@ -224,7 +224,6 @@
- 
- 
- install-data-local:
--	@$(NORMAL-INSTALL)
- 	$(mkinstalldirs) $(DESTDIR)$(pkgdatadir); \
-         $(INSTALL_DATA) report.xsl $(DESTDIR)$(pkgdatadir)
- # Tell versions [3.59,3.63) of GNU make to not export all variables.
diff --git a/devel/gettext-lint/files/patch-src:Makefile.in b/devel/gettext-lint/files/patch-src:Makefile.in
deleted file mode 100644
index 31705332b12c..000000000000
--- a/devel/gettext-lint/files/patch-src:Makefile.in
+++ /dev/null
@@ -1,13 +0,0 @@
---- src/Makefile.in.orig	Fri Feb 11 05:25:29 2005
-+++ src/Makefile.in	Sun Feb 20 21:52:56 2005
-@@ -250,8 +250,8 @@
- 
- 
- install-data-local:
--	$(mkinstalldirs) $(DESTDIR)$(pkgdatadir); \
--        $(INSTALL_DATA) *.py $(DESTDIR)$(pkgdatadir)
-+	$(mkinstalldirs) $(DESTDIR)$(PYTHON_SITELIBDIR)/gettext-lint; \
-+        $(INSTALL_DATA) *.py $(DESTDIR)$(PYTHON_SITELIBDIR)/gettext-lint
- 
- pychecker:
- 	@for i in *.py; do pychecker -Q $$i; done
diff --git a/devel/gettext-lint/pkg-plist b/devel/gettext-lint/pkg-plist
index 299a6b539766..8a7f5b182a21 100644
--- a/devel/gettext-lint/pkg-plist
+++ b/devel/gettext-lint/pkg-plist
@@ -1,15 +1,18 @@
 bin/POFileChecker
+bin/POFileClean
 bin/POFileConsistency
 bin/POFileEquiv
 bin/POFileFill
+bin/POFileGlossary
 bin/POFileSpell
 bin/POFileStatus
 %%PYTHON_SITELIBDIR%%/gettext-lint/Equivalent.py
+%%PYTHON_SITELIBDIR%%/gettext-lint/Glossary.py
 %%PYTHON_SITELIBDIR%%/gettext-lint/POFile.py
 %%PYTHON_SITELIBDIR%%/gettext-lint/capitalization.py
 %%PYTHON_SITELIBDIR%%/gettext-lint/util.py
-@dirrm %%PYTHON_SITELIBDIR%%/gettext-lint
-%%DATADIR%%/report.xsl
-%%DATADIR%%/report.css
 %%DATADIR%%/count.xsl
+%%DATADIR%%/report.css
+%%DATADIR%%/report.xsl
 @dirrm %%DATADIR%%
+@dirrm %%PYTHON_SITELIBDIR%%/gettext-lint