pkg/39887: Update www/snownews to 1.5.10

[leonardo1990%gmail.com@localhost]

>Number:         39887
>Category:       pkg
>Synopsis:       www/snownews is not the latest stable version
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    pkg-manager
>State:          open
>Class:          change-request
>Submitter-Id:   net
>Arrival-Date:   Sun Nov 09 22:25:01 +0000 2008
>Originator:     Leonardo Taccari
>Release:        NetBSD 4.0.1
>Organization:
NetBSD Italia
>Environment:
        
        
System: NetBSD bianconiglio 4.0.1 NetBSD 4.0.1 (BIANCONIGLIO) #0: Sat Oct 18 
15:44:19 CEST 2008 
leot@bianconiglio:/home/leot/builds/usr/src/sys/arch/i386/compile/BIANCONIGLIO 
i386
Architecture: i386
Machine: i386
>Description:
        www/snownews is not the the latest stable version. In pkgsrc we have 
1.5.9
        while the 1.5.10 is released.

        While here I also tryed to improve and make simpler the package (fixing
        various warnings):
         o removed a redundant USE_NCURSES in Makefile
         o removed snowsync from REPLACE_PERL (1.5.9 and 1.5.10 does not contain
           it)
         o removed -lintl hack, is not needed anymore
         o replaced patch-ac with a simple SUBST class
         o removed the do-install, we don't need it anymore
         o change the obsolete(?) PKG_LEGACY_OPTS with PKG_OPTIONS_LEGACY_OPTS

>How-To-Repeat:
        $ cd ${PKGSRCDIR}/www/snownews && make show-var VARNAME=DISTNAME

        and/or

        $ cd ${PKGSRCDIR}/www/snownews && make install && snownews -V

>Fix:
        Just apply the attached patches. Thanks a lot!


Index: distinfo
===================================================================
RCS file: /cvsroot/pkgsrc/www/snownews/distinfo,v
retrieving revision 1.10
diff -u -p -r1.10 distinfo
--- distinfo    16 Apr 2008 08:54:28 -0000      1.10
+++ distinfo    9 Nov 2008 12:40:36 -0000
@@ -1,6 +1,5 @@
 $NetBSD: distinfo,v 1.10 2008/04/16 08:54:28 wiz Exp $
 
-SHA1 (snownews-1.5.9.tar.gz) = a3c778272c1ae599e11f283fab1bd267ca3af011
-RMD160 (snownews-1.5.9.tar.gz) = 478c8b60e3bfb1f0eb13268c6deb2a258831aa6b
-Size (snownews-1.5.9.tar.gz) = 170666 bytes
-SHA1 (patch-ac) = f724a970df5626272c1ea2a9ce0213d471c6ce74
+SHA1 (snownews-1.5.10.tar.gz) = e5a068418f34f3437267eff6356729b9d8714701
+RMD160 (snownews-1.5.10.tar.gz) = 4650fc194c458fbf212f81cfc5e6080a3d4fb26d
+Size (snownews-1.5.10.tar.gz) = 171699 bytes


Index: Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/www/snownews/Makefile,v
retrieving revision 1.33
diff -u -p -r1.33 Makefile
--- Makefile    16 Apr 2008 08:54:28 -0000      1.33
+++ Makefile    9 Nov 2008 12:38:23 -0000
@@ -1,6 +1,6 @@
 # $NetBSD: Makefile,v 1.33 2008/04/16 08:54:28 wiz Exp $
 
-DISTNAME=      snownews-1.5.9
+DISTNAME=      snownews-1.5.10
 CATEGORIES=    www
 MASTER_SITES=  http://kiza.kcore.de/software/snownews/download/
 
@@ -13,43 +13,33 @@ DEPENDS+=           p5-XML-LibXML>=1.58:../../tex
 PKG_DESTDIR_SUPPORT=   user-destdir
 
 HAS_CONFIGURE=         yes
-USE_NCURSES=           yes     # missing WA_BOLD, WA_REVERSE, KEY_RESIZE
-USE_PKGLOCALEDIR=      yes
-USE_TOOLS+=            msgfmt perl:run
+USE_TOOLS+=            msgfmt perl
 
-REPLACE_PERL+=         configure opml2snow snowsync
+REPLACE_PERL+=         configure opml2snow
 
-CONFIG_SHELL=          perl
+CONFIG_SHELL=          ${PERL5}
 CONFIGURE_ARGS+=       --prefix=${PREFIX:Q}
-MAKE_ENV+=             PKG_LOCALEDIR=${PKGLOCALEDIR:Q}
+MAKE_ENV+=             LOCALPATH=${PKGLOCALEDIR:Q}
 MAKE_ENV+=             EXTRA_CFLAGS=${CFLAGS:Q}
 
-# XXX -lintl hack suggested by Jeremy C. Reed: blocking on PR #23369
-.include "../../devel/gettext-lib/buildlink3.mk"
-MAKE_ENV+=     EXTRA_LDFLAGS=${LDFLAGS:Q}" "${BUILDLINK_LDADD.gettext:Q}
+SUBST_CLASSES+=                makefile
+SUBST_MESSAGE.makefile=        Fixing Makefile and hardcoded paths.
+SUBST_STAGE.makefile=  post-patch
+SUBST_FILES.makefile=  Makefile
+SUBST_SED.makefile+=   -e '/^CC/ s/=/?=/'
+SUBST_SED.makefile+=   -e '/^MAKE/ s/=/?=/'
+SUBST_SED.makefile+=   -e 's;share/locale;${PKGLOCALEDIR}/locale;'
+SUBST_SED.makefile+=   -e 's;share/man;${PKGMANDIR};'
+SUBST_SED.makefile+=   -e '/msgfmt/ s/L; \\/L.po; \\/'
+
+# XXX: bin/snow2opml is just a symbolic link
+CHECK_FILES_SKIP+=     ${PREFIX}/bin/snow2opml
 
 INSTALLATION_DIRS=     bin ${PKGMANDIR}/man1
 
 .include "options.mk"
 
-do-install:
-       ${INSTALL_PROGRAM} ${WRKSRC}/snownews ${DESTDIR}${PREFIX}/bin
-       ${INSTALL_SCRIPT} ${WRKSRC}/opml2snow ${DESTDIR}${PREFIX}/bin
-.for lang in de fr it nl ru_RU.KOI8-R
-       ${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/${PKGMANDIR}/${lang}/man1
-       ${INSTALL_MAN} ${WRKSRC}/doc/man/${lang}/snownews.1 \
-               ${DESTDIR}${PREFIX}/${PKGMANDIR}/${lang}/man1
-.endfor
-       ${INSTALL_MAN} ${WRKSRC}/doc/man/snownews.1 \
-               ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
-       ${INSTALL_MAN} ${WRKSRC}/doc/man/opml2snow.1 \
-               ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
-.for lang in de es ja nl pl pt_BR ru sl zh_TW zh_CN
-       ${INSTALL_DATA_DIR} 
${DESTDIR}${PREFIX}/${PKGLOCALEDIR}/locale/${lang}/LC_MESSAGES
-       ${INSTALL_DATA} ${WRKSRC}/po/${lang}.mo \
-               
${DESTDIR}${PREFIX}/${PKGLOCALEDIR}/locale/${lang}/LC_MESSAGES/snownews.mo
-.endfor
-
 .include "../../converters/libiconv/buildlink3.mk"
+.include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../textproc/libxml2/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"


Index: options.mk
===================================================================
RCS file: /cvsroot/pkgsrc/www/snownews/options.mk,v
retrieving revision 1.2
diff -u -p -r1.2 options.mk
--- options.mk  21 Feb 2008 22:47:28 -0000      1.2
+++ options.mk  9 Nov 2008 12:42:17 -0000
@@ -2,18 +2,17 @@
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.snownews
 PKG_SUPPORTED_OPTIONS= wide-curses
-PKG_LEGACY_OPTS+=      ncursesw:wide-curses
+PKG_OPTIONS_LEGACY_OPTS+=      ncursesw:wide-curses
 
 .include "../../mk/bsd.options.mk"
 
+USE_NCURSES=   yes     # WA_BOLD, WA_REVERSE, KEY_RESIZE
+
 ###
 ### Wide curses support; otherwise, default to using narrow curses.
 ###
-USE_NCURSES=           yes     # WA_BOLD, WA_REVERSE, KEY_RESIZE
-
 .if !empty(PKG_OPTIONS:Mwide-curses)
 .  include "../../devel/ncursesw/buildlink3.mk"
-CONFIGURE_ARGS+=       --charset=UTF-8
 .else
 .  include "../../devel/ncurses/buildlink3.mk"
 .endif


Index: PLIST
===================================================================
RCS file: /cvsroot/pkgsrc/www/snownews/PLIST,v
retrieving revision 1.5
diff -u -p -r1.5 PLIST
--- PLIST       17 Apr 2006 07:07:38 -0000      1.5
+++ PLIST       9 Nov 2008 12:38:46 -0000
@@ -1,5 +1,6 @@
-@comment $NetBSD: PLIST,v 1.5 2006/04/17 07:07:38 jlam Exp $
+@comment $NetBSD$
 bin/opml2snow
+@comment bin/snow2opml is just a link to opml2snow
 bin/snownews
 man/de/man1/snownews.1
 man/fr/man1/snownews.1
@@ -8,16 +9,23 @@ man/man1/opml2snow.1
 man/man1/snownews.1
 man/nl/man1/snownews.1
 man/ru_RU.KOI8-R/man1/snownews.1
+share/locale/be@latin/LC_MESSAGES/snownews.mo
 share/locale/de/LC_MESSAGES/snownews.mo
 share/locale/es/LC_MESSAGES/snownews.mo
+share/locale/fr/LC_MESSAGES/snownews.mo
+share/locale/it/LC_MESSAGES/snownews.mo
 share/locale/ja/LC_MESSAGES/snownews.mo
 share/locale/nl/LC_MESSAGES/snownews.mo
 share/locale/pl/LC_MESSAGES/snownews.mo
 share/locale/pt_BR/LC_MESSAGES/snownews.mo
 share/locale/ru/LC_MESSAGES/snownews.mo
+share/locale/se/LC_MESSAGES/snownews.mo
 share/locale/sl/LC_MESSAGES/snownews.mo
+share/locale/uk_UA/LC_MESSAGES/snownews.mo
 share/locale/zh_CN/LC_MESSAGES/snownews.mo
 share/locale/zh_TW/LC_MESSAGES/snownews.mo
+@unexec ${RMDIR} %D/share/locale/uk_UA/LC_MESSAGES 2> /dev/null || ${TRUE}
+@unexec ${RMDIR} %D/share/locale/uk_UA 2> /dev/null || ${TRUE}
 @unexec ${RMDIR} %D/man/ru_RU.KOI8-R/man1 2> /dev/null || ${TRUE}
 @unexec ${RMDIR} %D/man/ru_RU.KOI8-R 2> /dev/null || ${TRUE}
 @unexec ${RMDIR} %D/man/nl/man1 2> /dev/null || ${TRUE}

>Unformatted: