ports/79906: [PATCH] www/snownews: unbreak port

[Yen-Ming Lee]

>Number:         79906
>Category:       ports
>Synopsis:       [PATCH] www/snownews: unbreak port
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Thu Apr 14 13:30:25 GMT 2005
>Closed-Date:
>Last-Modified:
>Originator:     Yen-Ming Lee
>Release:        FreeBSD 5.4-PRERELEASE i386
>Organization:
FreeBSD Taiwan
>Environment:
System: FreeBSD utopia.leeym.com 5.4-PRERELEASE FreeBSD 5.4-PRERELEASE #0: Tue Mar 15 10:20:57 CST 2005
>Description:
- add PERL5 related patch and unbreak this port
- relocate all REINPLACE stuff to post-patch target
- respect WITHOUT_NLS

Port maintainer (clsung at FreeBSD.org) is cc'd.

Generated with FreeBSD Port Tools 0.63
>How-To-Repeat:
http://pointyhat.freebsd.org/errorlogs/i386-errorlogs/e.5.2005040320/snownews-1.5.6.1_1.log
>Fix:

--- snownews-1.5.6.1_1.patch begins here ---
Index: Makefile
===================================================================
RCS file: /home/pcvs/ports/www/snownews/Makefile,v
retrieving revision 1.17
diff -u -u -r1.17 Makefile
--- Makefile	9 Apr 2005 08:16:43 -0000	1.17
+++ Makefile	14 Apr 2005 13:19:46 -0000
@@ -15,11 +15,11 @@
 MAINTAINER=	clsung at FreeBSD.org
 COMMENT=	A text mode RSS newsreader
 
-USE_GETTEXT=	yes
 USE_GMAKE=	yes
 USE_GNOME=	libxml2
 USE_REINPLACE=	yes
 HAS_CONFIGURE=	yes
+USE_PERL5=	yes
 
 .if defined(CHARSET)
 CONFIGURE_ARGS=	--charset=${CHARSET}
@@ -29,6 +29,13 @@
 .endif
 .endif
 
+.if !defined(WITHOUT_NLS)
+USE_GETTEXT=	yes
+PLIST_SUB+=	NLS=""
+.else
+PLIST_SUB+=	NLS="@comment "
+.endif
+
 MAN1=		snownews.1
 MANLANG=	"" de nl fr it ru_RU.KOI8-R
 
@@ -39,14 +46,14 @@
 	@${ECHO_MSG} " Default is ISO-8859-1."
 	@${ECHO_MSG} " "
 
-pre-configure:
-	@${REINPLACE_CMD} -e 's|#!/usr/bin/perl|#!/usr/bin/env perl|g' ${WRKSRC}/configure
-	
 post-patch:
+	@${REINPLACE_CMD} -e 's|#!/usr/bin/perl|#!${PERL}|g' ${WRKSRC}/configure
 	@${REINPLACE_CMD} -e 's|CFLAGS=|CFLAGS+=|g' ${WRKSRC}/platform_settings
-	@${REINPLACE_CMD} -e 's|gcc|${CC}|' ${WRKSRC}/Makefile
-
-pre-build:
 	@${REINPLACE_CMD} -e 's|^PREFIX|#PREFIX|' ${WRKSRC}/platform_settings
+	@${REINPLACE_CMD} -e 's|gcc|${CC}|' ${WRKSRC}/Makefile
+.if defined(WITHOUT_NLS)
+	${REINPLACE_CMD} -e 's/ install-locales / /g' ${WRKSRC}/Makefile
+	${REINPLACE_CMD} -e 's/ locales$$//g' ${WRKSRC}/Makefile
+.endif
 
 .include <bsd.port.mk>
Index: pkg-plist
===================================================================
RCS file: /home/pcvs/ports/www/snownews/pkg-plist,v
retrieving revision 1.7
diff -u -u -r1.7 pkg-plist
--- pkg-plist	26 Jan 2005 08:07:19 -0000	1.7
+++ pkg-plist	14 Apr 2005 13:19:46 -0000
@@ -1,15 +1,15 @@
 bin/opml2snow
 bin/snownews
 bin/snowsync
-share/locale/de/LC_MESSAGES/snownews.mo
-share/locale/fr/LC_MESSAGES/snownews.mo
-share/locale/nl/LC_MESSAGES/snownews.mo
-share/locale/sl/LC_MESSAGES/snownews.mo
-share/locale/es/LC_MESSAGES/snownews.mo
-share/locale/it/LC_MESSAGES/snownews.mo
-share/locale/ru/LC_MESSAGES/snownews.mo
-share/locale/pt_BR/LC_MESSAGES/snownews.mo
-share/locale/zh_TW/LC_MESSAGES/snownews.mo
+%%NLS%%share/locale/de/LC_MESSAGES/snownews.mo
+%%NLS%%share/locale/fr/LC_MESSAGES/snownews.mo
+%%NLS%%share/locale/nl/LC_MESSAGES/snownews.mo
+%%NLS%%share/locale/sl/LC_MESSAGES/snownews.mo
+%%NLS%%share/locale/es/LC_MESSAGES/snownews.mo
+%%NLS%%share/locale/it/LC_MESSAGES/snownews.mo
+%%NLS%%share/locale/ru/LC_MESSAGES/snownews.mo
+%%NLS%%share/locale/pt_BR/LC_MESSAGES/snownews.mo
+%%NLS%%share/locale/zh_TW/LC_MESSAGES/snownews.mo
 @unexec rmdir %D/man/fr/man1 2>/dev/null || true
 @unexec rmdir %D/man/fr 2>/dev/null || true
 @unexec rmdir %D/man/de/man1 2>/dev/null || true
--- snownews-1.5.6.1_1.patch ends here ---

>Release-Note:
>Audit-Trail:
>Unformatted: