diff options
author | obache <obache> | 2008-04-19 05:38:16 +0000 |
---|---|---|
committer | obache <obache> | 2008-04-19 05:38:16 +0000 |
commit | 321ebf0546ec94a5ff57c0dcfdfd558f1edfffca (patch) | |
tree | 0a31d8ce4fd8761b8bb035c5f52f8e64e5e9e54a /www/weex | |
parent | e66bf2c83b8b1677896e47e2396cc34339ed1b3b (diff) | |
download | pkgsrc-321ebf0546ec94a5ff57c0dcfdfd558f1edfffca.tar.gz |
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
Diffstat (limited to 'www/weex')
-rw-r--r-- | www/weex/Makefile | 21 | ||||
-rw-r--r-- | www/weex/distinfo | 12 | ||||
-rw-r--r-- | www/weex/patches/patch-ac | 37 | ||||
-rw-r--r-- | www/weex/patches/patch-ad | 8 |
4 files changed, 47 insertions, 31 deletions
diff --git a/www/weex/Makefile b/www/weex/Makefile index ada39182662..cbf50f03767 100644 --- a/www/weex/Makefile +++ b/www/weex/Makefile @@ -1,16 +1,18 @@ -# $NetBSD: Makefile,v 1.9 2005/10/05 13:38:13 salo Exp $ +# $NetBSD: Makefile,v 1.10 2008/04/19 05:38:16 obache Exp $ -DISTNAME= weex-2.6.1 -PKGREVISION= 1 +DISTNAME= weex-2.6.1.5 CATEGORIES= www -MASTER_SITES= http://www.enjoy.ne.jp/~gm/program/weex/arc/ +MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=weex/} MAINTAINER= tech-pkg-ja@jp.NetBSD.org -HOMEPAGE= http://www.enjoy.ne.jp/~gm/program/weex/index.html +HOMEPAGE= http://weex.sourceforge.net/ COMMENT= Non-interactive ftp client +PKG_DESTDIR_SUPPORT= user-destdir + GNU_CONFIGURE= yes USE_PKGLOCALEDIR= yes +USE_TOOLS+= msgfmt WEEX_DOCS= AUTHORS BUGS BUGS.ja COPYING COPYING.ja \ ChangeLog ChangeLog.ja FAQ FAQ.ja README README.ja \ @@ -19,12 +21,13 @@ WEEX_DOCS= AUTHORS BUGS BUGS.ja COPYING COPYING.ja \ WEEX_DOCDIR= share/doc/weex post-install: - ${INSTALL_DATA_DIR} ${PREFIX}/${WEEX_DOCDIR} + ${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/${WEEX_DOCDIR} .for f in ${WEEX_DOCS} - ${INSTALL_DATA} ${WRKSRC}/doc/${f} ${PREFIX}/${WEEX_DOCDIR} + ${INSTALL_DATA} ${WRKSRC}/doc/${f} ${DESTDIR}${PREFIX}/${WEEX_DOCDIR} .endfor - ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/weex + ${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/examples/weex ${INSTALL_DATA} ${WRKSRC}/doc/sample.weexrc \ - ${PREFIX}/share/examples/weex + ${DESTDIR}${PREFIX}/share/examples/weex +.include "../../devel/gettext-lib/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/www/weex/distinfo b/www/weex/distinfo index e226c44557e..77d3404d768 100644 --- a/www/weex/distinfo +++ b/www/weex/distinfo @@ -1,9 +1,9 @@ -$NetBSD: distinfo,v 1.4 2005/10/05 13:38:13 salo Exp $ +$NetBSD: distinfo,v 1.5 2008/04/19 05:38:16 obache Exp $ -SHA1 (weex-2.6.1.tar.gz) = 8613e7c1a1621bbe042d076883f10b330934de5e -RMD160 (weex-2.6.1.tar.gz) = d286d24d3d87ce78fb5032d50f0d6a0ac2876a04 -Size (weex-2.6.1.tar.gz) = 200858 bytes +SHA1 (weex-2.6.1.5.tar.gz) = eab3560cc75265bd96bac52f08d81f3d735696f0 +RMD160 (weex-2.6.1.5.tar.gz) = adf792c92f95799cfde9d96a54de006ebc840aca +Size (weex-2.6.1.5.tar.gz) = 206972 bytes SHA1 (patch-aa) = f8f092150b3556d78ab8ef66070447724c9c118d SHA1 (patch-ab) = 49e383c1c766d63b56256afe3293bf473ca63f6f -SHA1 (patch-ac) = e22d816ad7177fdc3bd68f33fd1118cc8f5164d2 -SHA1 (patch-ad) = 0474aa99d979ff90aa1d9c179e7c44eccceefce2 +SHA1 (patch-ac) = c58dbbe7ee381a33ad6b77aeceaa3cef2923d2e7 +SHA1 (patch-ad) = c0ec8dc6e55134316f61372724b5e7aee0c493b8 diff --git a/www/weex/patches/patch-ac b/www/weex/patches/patch-ac index 1f2e356028a..cd759b5870f 100644 --- a/www/weex/patches/patch-ac +++ b/www/weex/patches/patch-ac @@ -1,12 +1,25 @@ -$NetBSD: patch-ac,v 1.1.1.1 2001/11/29 08:36:06 martti Exp $ ---- po/Makefile.in.in.orig Sat Jun 2 05:56:57 2001 -+++ po/Makefile.in.in Sat Jun 2 05:57:17 2001 -@@ -19,7 +19,7 @@ - prefix = @prefix@ - exec_prefix = @exec_prefix@ - datadir = $(prefix)/@DATADIRNAME@ --localedir = $(datadir)/locale -+localedir = $(prefix)/share/locale - gnulocaledir = $(prefix)/share/locale - gettextsrcdir = $(prefix)/share/gettext/po - subdir = po +$NetBSD: patch-ac,v 1.2 2008/04/19 05:38:16 obache Exp $ + +--- po/Makefile.in.in.orig 2000-04-24 14:44:53.000000000 +0000 ++++ po/Makefile.in.in +@@ -111,9 +111,9 @@ install-data: install-data-@USE_NLS@ + install-data-no: all + install-data-yes: all + if test -r "$(MKINSTALLDIRS)"; then \ +- $(MKINSTALLDIRS) $(datadir); \ ++ $(MKINSTALLDIRS) $(DESTDIR)$(datadir); \ + else \ +- $(SHELL) $(top_srcdir)/mkinstalldirs $(datadir); \ ++ $(SHELL) $(top_srcdir)/mkinstalldirs $(DESTDIR)$(datadir); \ + fi + @catalogs='$(CATALOGS)'; \ + for cat in $$catalogs; do \ +@@ -123,7 +123,7 @@ install-data-yes: all + *) destdir=$(localedir);; \ + esac; \ + lang=`echo $$cat | sed 's/\$(CATOBJEXT)$$//'`; \ +- dir=$$destdir/$$lang/LC_MESSAGES; \ ++ dir=$(DESTDIR)$$destdir/$$lang/LC_MESSAGES; \ + if test -r "$(MKINSTALLDIRS)"; then \ + $(MKINSTALLDIRS) $$dir; \ + else \ diff --git a/www/weex/patches/patch-ad b/www/weex/patches/patch-ad index e39e4e52e4f..12d540b6cdd 100644 --- a/www/weex/patches/patch-ad +++ b/www/weex/patches/patch-ad @@ -1,10 +1,10 @@ -$NetBSD: patch-ad,v 1.1 2005/10/05 13:38:13 salo Exp $ +$NetBSD: patch-ad,v 1.2 2008/04/19 05:38:16 obache Exp $ Fix for SA17028, via FreeBSD. ---- src/log.c.orig 2000-05-03 16:42:05.000000000 +0200 -+++ src/log.c 2005-10-05 15:31:06.000000000 +0200 -@@ -182,7 +182,7 @@ +--- src/log.c.orig 2003-08-18 09:52:38.000000000 +0000 ++++ src/log.c +@@ -183,7 +183,7 @@ void log_flush(void) fp=log_open(); for(i=0;i<max_log;i++){ |