Sat Apr 19 05:38:16 2008 UTC ()
Update weex to 2.6.1.5.
Based on patch provided by Zafer Aydogan via private mail.

This update to 2.6.1 contains all patches from the Debian package:
- various bug fixes
- uploading under the temporary name `weex.tmp' with the RenameOK option
- support for FTP proxy server that requires challenge/response
- The i386 RPM was compiled on RedHat 9
- You should be able to "rpmbuild --rebuild" the SRPM on older RedHat releases
  or other RPM based distros.

pkgsrc changes:
  * project now on sourceforge
  * no need patch to fix localedir (patch-ac)
  * need msgfmt to build
  * need gettext-lib
  * add DESTDIR support


(obache)
diff -r1.9 -r1.10 pkgsrc/www/weex/Makefile
diff -r1.4 -r1.5 pkgsrc/www/weex/distinfo
diff -r1.1.1.1 -r1.2 pkgsrc/www/weex/patches/patch-ac
diff -r1.1 -r1.2 pkgsrc/www/weex/patches/patch-ad
cvs diff -r1.9 -r1.10 pkgsrc/www/weex/Makefile (expand / switch to unified diff)

--- pkgsrc/www/weex/Makefile 2005/10/05 13:38:13 1.9
+++ pkgsrc/www/weex/Makefile 2008/04/19 05:38:16 1.10
@@ -1,30 +1,33 @@ @@ -1,30 +1,33 @@
1# $NetBSD: Makefile,v 1.9 2005/10/05 13:38:13 salo Exp $ 1# $NetBSD: Makefile,v 1.10 2008/04/19 05:38:16 obache Exp $
2 2
3DISTNAME= weex-2.6.1 3DISTNAME= weex-2.6.1.5
4PKGREVISION= 1 
5CATEGORIES= www 4CATEGORIES= www
6MASTER_SITES= http://www.enjoy.ne.jp/~gm/program/weex/arc/ 5MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=weex/}
7 6
8MAINTAINER= tech-pkg-ja@jp.NetBSD.org 7MAINTAINER= tech-pkg-ja@jp.NetBSD.org
9HOMEPAGE= http://www.enjoy.ne.jp/~gm/program/weex/index.html 8HOMEPAGE= http://weex.sourceforge.net/
10COMMENT= Non-interactive ftp client 9COMMENT= Non-interactive ftp client
11 10
 11PKG_DESTDIR_SUPPORT= user-destdir
 12
12GNU_CONFIGURE= yes 13GNU_CONFIGURE= yes
13USE_PKGLOCALEDIR= yes 14USE_PKGLOCALEDIR= yes
 15USE_TOOLS+= msgfmt
14 16
15WEEX_DOCS= AUTHORS BUGS BUGS.ja COPYING COPYING.ja \ 17WEEX_DOCS= AUTHORS BUGS BUGS.ja COPYING COPYING.ja \
16 ChangeLog ChangeLog.ja FAQ FAQ.ja README README.ja \ 18 ChangeLog ChangeLog.ja FAQ FAQ.ja README README.ja \
17 THANKS TODO TODO.ja 19 THANKS TODO TODO.ja
18 20
19WEEX_DOCDIR= share/doc/weex 21WEEX_DOCDIR= share/doc/weex
20 22
21post-install: 23post-install:
22 ${INSTALL_DATA_DIR} ${PREFIX}/${WEEX_DOCDIR} 24 ${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/${WEEX_DOCDIR}
23.for f in ${WEEX_DOCS} 25.for f in ${WEEX_DOCS}
24 ${INSTALL_DATA} ${WRKSRC}/doc/${f} ${PREFIX}/${WEEX_DOCDIR} 26 ${INSTALL_DATA} ${WRKSRC}/doc/${f} ${DESTDIR}${PREFIX}/${WEEX_DOCDIR}
25.endfor 27.endfor
26 ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/weex 28 ${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/examples/weex
27 ${INSTALL_DATA} ${WRKSRC}/doc/sample.weexrc \ 29 ${INSTALL_DATA} ${WRKSRC}/doc/sample.weexrc \
28 ${PREFIX}/share/examples/weex 30 ${DESTDIR}${PREFIX}/share/examples/weex
29 31
 32.include "../../devel/gettext-lib/buildlink3.mk"
30.include "../../mk/bsd.pkg.mk" 33.include "../../mk/bsd.pkg.mk"
cvs diff -r1.4 -r1.5 pkgsrc/www/weex/distinfo (expand / switch to unified diff)

--- pkgsrc/www/weex/distinfo 2005/10/05 13:38:13 1.4
+++ pkgsrc/www/weex/distinfo 2008/04/19 05:38:16 1.5
@@ -1,9 +1,9 @@ @@ -1,9 +1,9 @@
1$NetBSD: distinfo,v 1.4 2005/10/05 13:38:13 salo Exp $ 1$NetBSD: distinfo,v 1.5 2008/04/19 05:38:16 obache Exp $
2 2
3SHA1 (weex-2.6.1.tar.gz) = 8613e7c1a1621bbe042d076883f10b330934de5e 3SHA1 (weex-2.6.1.5.tar.gz) = eab3560cc75265bd96bac52f08d81f3d735696f0
4RMD160 (weex-2.6.1.tar.gz) = d286d24d3d87ce78fb5032d50f0d6a0ac2876a04 4RMD160 (weex-2.6.1.5.tar.gz) = adf792c92f95799cfde9d96a54de006ebc840aca
5Size (weex-2.6.1.tar.gz) = 200858 bytes 5Size (weex-2.6.1.5.tar.gz) = 206972 bytes
6SHA1 (patch-aa) = f8f092150b3556d78ab8ef66070447724c9c118d 6SHA1 (patch-aa) = f8f092150b3556d78ab8ef66070447724c9c118d
7SHA1 (patch-ab) = 49e383c1c766d63b56256afe3293bf473ca63f6f 7SHA1 (patch-ab) = 49e383c1c766d63b56256afe3293bf473ca63f6f
8SHA1 (patch-ac) = e22d816ad7177fdc3bd68f33fd1118cc8f5164d2 8SHA1 (patch-ac) = c58dbbe7ee381a33ad6b77aeceaa3cef2923d2e7
9SHA1 (patch-ad) = 0474aa99d979ff90aa1d9c179e7c44eccceefce2 9SHA1 (patch-ad) = c0ec8dc6e55134316f61372724b5e7aee0c493b8
cvs diff -r1.1.1.1 -r1.2 pkgsrc/www/weex/patches/patch-ac (expand / switch to unified diff)

--- pkgsrc/www/weex/patches/patch-ac 2001/11/29 08:36:06 1.1.1.1
+++ pkgsrc/www/weex/patches/patch-ac 2008/04/19 05:38:16 1.2
@@ -1,12 +1,25 @@ @@ -1,12 +1,25 @@
1$NetBSD: patch-ac,v 1.1.1.1 2001/11/29 08:36:06 martti Exp $ 1$NetBSD: patch-ac,v 1.2 2008/04/19 05:38:16 obache Exp $
2--- po/Makefile.in.in.orig Sat Jun 2 05:56:57 2001 2
3+++ po/Makefile.in.in Sat Jun 2 05:57:17 2001 3--- po/Makefile.in.in.orig 2000-04-24 14:44:53.000000000 +0000
4@@ -19,7 +19,7 @@ 4+++ po/Makefile.in.in
5 prefix = @prefix@ 5@@ -111,9 +111,9 @@ install-data: install-data-@USE_NLS@
6 exec_prefix = @exec_prefix@ 6 install-data-no: all
7 datadir = $(prefix)/@DATADIRNAME@ 7 install-data-yes: all
8-localedir = $(datadir)/locale 8 if test -r "$(MKINSTALLDIRS)"; then \
9+localedir = $(prefix)/share/locale 9- $(MKINSTALLDIRS) $(datadir); \
10 gnulocaledir = $(prefix)/share/locale 10+ $(MKINSTALLDIRS) $(DESTDIR)$(datadir); \
11 gettextsrcdir = $(prefix)/share/gettext/po 11 else \
12 subdir = po 12- $(SHELL) $(top_srcdir)/mkinstalldirs $(datadir); \
 13+ $(SHELL) $(top_srcdir)/mkinstalldirs $(DESTDIR)$(datadir); \
 14 fi
 15 @catalogs='$(CATALOGS)'; \
 16 for cat in $$catalogs; do \
 17@@ -123,7 +123,7 @@ install-data-yes: all
 18 *) destdir=$(localedir);; \
 19 esac; \
 20 lang=`echo $$cat | sed 's/\$(CATOBJEXT)$$//'`; \
 21- dir=$$destdir/$$lang/LC_MESSAGES; \
 22+ dir=$(DESTDIR)$$destdir/$$lang/LC_MESSAGES; \
 23 if test -r "$(MKINSTALLDIRS)"; then \
 24 $(MKINSTALLDIRS) $$dir; \
 25 else \
cvs diff -r1.1 -r1.2 pkgsrc/www/weex/patches/patch-ad (expand / switch to unified diff)

--- pkgsrc/www/weex/patches/patch-ad 2005/10/05 13:38:13 1.1
+++ pkgsrc/www/weex/patches/patch-ad 2008/04/19 05:38:16 1.2
@@ -1,15 +1,15 @@ @@ -1,15 +1,15 @@
1$NetBSD: patch-ad,v 1.1 2005/10/05 13:38:13 salo Exp $ 1$NetBSD: patch-ad,v 1.2 2008/04/19 05:38:16 obache Exp $
2 2
3Fix for SA17028, via FreeBSD. 3Fix for SA17028, via FreeBSD.
4 4
5--- src/log.c.orig 2000-05-03 16:42:05.000000000 +0200 5--- src/log.c.orig 2003-08-18 09:52:38.000000000 +0000
6+++ src/log.c 2005-10-05 15:31:06.000000000 +0200 6+++ src/log.c
7@@ -182,7 +182,7 @@ 7@@ -183,7 +183,7 @@ void log_flush(void)
8  8
9 fp=log_open(); 9 fp=log_open();
10 for(i=0;i<max_log;i++){ 10 for(i=0;i<max_log;i++){
11- fprintf(fp,log_str[i]); 11- fprintf(fp,log_str[i]);
12+ fprintf(fp,"%s",log_str[i]); 12+ fprintf(fp,"%s",log_str[i]);
13 free(log_str[i]); 13 free(log_str[i]);
14 } 14 }
15 free(log_str); 15 free(log_str);