From: Charlie Date: Tue, 4 May 2010 01:45:45 +0000 (-0700) Subject: update Mon May 3 18:37:00 PDT 2010 X-Git-Url: https://gitweb.dragonflybsd.org/pkgsrc.git/commitdiff_plain/b44744839bbe8798df77aa84a9eec7aaa8217713 update Mon May 3 18:37:00 PDT 2010 --- diff --git a/doc/CHANGES-2010 b/doc/CHANGES-2010 index 3683702468c1..d7f706a1040f 100644 --- a/doc/CHANGES-2010 +++ b/doc/CHANGES-2010 @@ -1,4 +1,4 @@ -$NetBSD: CHANGES-2010,v 1.1800 2010/05/03 19:19:31 ghen Exp $ +$NetBSD: CHANGES-2010,v 1.1803 2010/05/03 23:18:32 minskim Exp $ Changes to the packages collection and infrastructure in 2010: @@ -2272,3 +2272,6 @@ Changes to the packages collection and infrastructure in 2010: Updated net/Transmission to 1.93 [tnn 2010-05-03] Updated print/tex-collection-basic to 2009nb1 [minskim 2010-05-03] Updated mail/dovecot to 1.2.11nb2 [ghen 2010-05-03] + Updated www/apache22 to 2.2.15nb1 [tron 2010-05-03] + Updated fonts/tex-kotex-base to 0.1.1nb1 [minskim 2010-05-03] + Added print/tex-kotex-utils version 0.1.1 [minskim 2010-05-03] diff --git a/fonts/tex-kotex-base/Makefile b/fonts/tex-kotex-base/Makefile index 11cb167738a9..a68aa7cf7f7a 100644 --- a/fonts/tex-kotex-base/Makefile +++ b/fonts/tex-kotex-base/Makefile @@ -1,9 +1,10 @@ -# $NetBSD: Makefile,v 1.1.1.1 2009/06/10 00:24:30 minskim Exp $ -# TeX Live Revision 1 +# $NetBSD: Makefile,v 1.2 2010/05/03 23:00:45 minskim Exp $ +# TeX Live Revision 2 DISTNAME= kotex-base PKGNAME= tex-${DISTNAME}-0.1.1 -MASTER_SITES= http://ftp.ktug.or.kr/KTUG/texlive/2008/archive/ +PKGREVISION= 1 +MASTER_SITES= http://ftp.ktug.or.kr/KTUG/texlive/2009/archive/ MAINTAINER= minskim@NetBSD.org HOMEPAGE= http://project.ktug.or.kr/ko.TeX/ @@ -11,5 +12,5 @@ COMMENT= Fonts for Korean TeX TEX_MAP_FILES+= kotex-base.map -.include "../../print/texlive/module.mk" +.include "../../print/texlive/package.mk" .include "../../mk/bsd.pkg.mk" diff --git a/fonts/tex-kotex-base/distinfo b/fonts/tex-kotex-base/distinfo index 59d442a65c26..808b8b44c0fc 100644 --- a/fonts/tex-kotex-base/distinfo +++ b/fonts/tex-kotex-base/distinfo @@ -1,5 +1,5 @@ -$NetBSD: distinfo,v 1.1.1.1 2009/06/10 00:24:39 minskim Exp $ +$NetBSD: distinfo,v 1.2 2010/05/03 23:00:45 minskim Exp $ -SHA1 (tex-kotex-base-0.1.1/kotex-base.tar.lzma) = f2ba35f0701182b2c189537e203b7e97878cb800 -RMD160 (tex-kotex-base-0.1.1/kotex-base.tar.lzma) = 070d0174601dedd69dd1751a3ff43fb0bc305f11 -Size (tex-kotex-base-0.1.1/kotex-base.tar.lzma) = 46655349 bytes +SHA1 (tex-kotex-base-0.1.1/kotex-base.tar.xz) = f3796d455f475a088daee020cd934f33508a2102 +RMD160 (tex-kotex-base-0.1.1/kotex-base.tar.xz) = 8adcc329f371083cc4d8b34a97bf2320b6c62af3 +Size (tex-kotex-base-0.1.1/kotex-base.tar.xz) = 46717168 bytes diff --git a/print/Makefile b/print/Makefile index e57efdc9015e..c91d581f7d3f 100644 --- a/print/Makefile +++ b/print/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.400 2010/05/02 17:36:23 minskim Exp $ +# $NetBSD: Makefile,v 1.401 2010/05/03 23:18:32 minskim Exp $ # COMMENT= Desktop publishing @@ -345,6 +345,7 @@ SUBDIR+= tex-kotex SUBDIR+= tex-kotex-dev SUBDIR+= tex-kotex-dev-doc SUBDIR+= tex-kotex-doc +SUBDIR+= tex-kotex-utils SUBDIR+= tex-kpathsea SUBDIR+= tex-kpathsea-doc SUBDIR+= tex-lambda diff --git a/print/tex-kotex-utils/DESCR b/print/tex-kotex-utils/DESCR new file mode 100644 index 000000000000..f40d098443fd --- /dev/null +++ b/print/tex-kotex-utils/DESCR @@ -0,0 +1 @@ +This package provides utility programs for Korean typesetting in TeX. diff --git a/print/tex-kotex-utils/Makefile b/print/tex-kotex-utils/Makefile new file mode 100644 index 000000000000..e64fd1c905dd --- /dev/null +++ b/print/tex-kotex-utils/Makefile @@ -0,0 +1,35 @@ +# $NetBSD: Makefile,v 1.1.1.1 2010/05/03 23:17:48 minskim Exp $ + +DISTNAME= ko.tex-macro +PKGNAME= tex-kotex-utils-0.1.1 +CATEGORIES= print +MASTER_SITES= http://ftp.ktug.or.kr/KTUG/ko.TeX/ + +MAINTAINER= minskim@NetBSD.org +HOMEPAGE= http://project.ktug.or.kr/ko.TeX/ +COMMENT= Utilities for tex-kotex + +PKG_DESTDIR_SUPPORT= user-destdir + +USE_TOOLS+= perl:run +WRKSRC= ${WRKDIR}/util + +REPLACE_PERL= *.pl + +INSTALLATION_DIRS+= bin + +do-build: +.for f in hbibtex hmakeindex + cd ${WRKSRC} && ${CC} ${CPPFLAGS} ${CFLAGS} -o ${f} ${f}.c +.endfor + +do-install: +.for f in hbibtex hmakeindex + ${INSTALL_PROGRAM} ${WRKSRC}/${f} ${DESTDIR}${PREFIX}/bin +.endfor +.for f in euc-bookmark hypua2jamo insertjamofiller jamo2hypua komkindex \ + ttf2kotexfont + ${INSTALL_SCRIPT} ${WRKSRC}/${f}.pl ${DESTDIR}${PREFIX}/bin/${f} +.endfor + +.include "../../mk/bsd.pkg.mk" diff --git a/print/tex-kotex-utils/PLIST b/print/tex-kotex-utils/PLIST new file mode 100644 index 000000000000..ce5b2d719920 --- /dev/null +++ b/print/tex-kotex-utils/PLIST @@ -0,0 +1,9 @@ +@comment $NetBSD: PLIST,v 1.1.1.1 2010/05/03 23:17:48 minskim Exp $ +bin/euc-bookmark +bin/hbibtex +bin/hmakeindex +bin/hypua2jamo +bin/insertjamofiller +bin/jamo2hypua +bin/komkindex +bin/ttf2kotexfont diff --git a/print/tex-kotex-utils/distinfo b/print/tex-kotex-utils/distinfo new file mode 100644 index 000000000000..e8ba627f1193 --- /dev/null +++ b/print/tex-kotex-utils/distinfo @@ -0,0 +1,5 @@ +$NetBSD: distinfo,v 1.1.1.1 2010/05/03 23:17:48 minskim Exp $ + +SHA1 (ko.tex-macro.tar.gz) = 3eb45288fad43301686a75f46199a8968564aecc +RMD160 (ko.tex-macro.tar.gz) = 845a92ce3b94c54694ea3379aebd52eb6960ed16 +Size (ko.tex-macro.tar.gz) = 1392662 bytes diff --git a/shells/tcsh/distinfo b/shells/tcsh/distinfo index d72490e80ddc..aa72443c5341 100644 --- a/shells/tcsh/distinfo +++ b/shells/tcsh/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.26 2010/03/26 14:09:50 hauke Exp $ +$NetBSD: distinfo,v 1.27 2010/05/04 00:14:00 agc Exp $ SHA1 (tcsh-6.17.00.tar.gz) = 9bf67d5ce1b406178e9ba535ecd34553fe0d4d36 RMD160 (tcsh-6.17.00.tar.gz) = 2cc41a895799ade6d62640f877bb626f136dac35 @@ -6,3 +6,4 @@ Size (tcsh-6.17.00.tar.gz) = 890084 bytes SHA1 (patch-aa) = bd2c3a5814b17675c56618feae9184548e40c0d0 SHA1 (patch-ab) = ab71a3826bbcef0702a7d43446f13454176aa671 SHA1 (patch-ac) = b08d073d947775c0bedaaf53c55bbd6c6c63c6d2 +SHA1 (patch-ad) = 7db4fbbcafb1d2ed1b0e68dd70373e6e5fac93e6 diff --git a/shells/tcsh/patches/patch-ad b/shells/tcsh/patches/patch-ad new file mode 100644 index 000000000000..e2dfb75f667e --- /dev/null +++ b/shells/tcsh/patches/patch-ad @@ -0,0 +1,21 @@ +$NetBSD: patch-ad,v 1.11 2010/05/04 00:14:00 agc Exp $ + +fix 'e' navigation in vi mode to classify '_' chars as part of words + +--- ed.chared.c 2010/04/02 00:04:39 1.1 ++++ ed.chared.c 2010/04/02 00:04:59 +@@ -832,11 +832,11 @@ + while ((p < high) && Isspace(*p)) + p++; + +- if (Isalnum(*p)) +- while ((p < high) && Isalnum(*p)) ++ if (isword(*p)) ++ while ((p < high) && isword(*p)) + p++; + else +- while ((p < high) && !(Isspace(*p) || Isalnum(*p))) ++ while ((p < high) && !(Isspace(*p) || isword(*p))) + p++; + } + diff --git a/wip/ibus-pinyin/Makefile b/wip/ibus-pinyin/Makefile index 6ee8f074e3d5..c44a1751d795 100644 --- a/wip/ibus-pinyin/Makefile +++ b/wip/ibus-pinyin/Makefile @@ -1,7 +1,7 @@ # $NetBSD$ # -DISTNAME= ibus-pinyin-1.3.4 +DISTNAME= ibus-pinyin-1.3.5 CATEGORIES= inputmethod chinese MASTER_SITES= http://ibus.googlecode.com/files/ DISTFILES= ${DEFAULT_DISTFILES} ${DBTAR} diff --git a/wip/ibus-pinyin/distinfo b/wip/ibus-pinyin/distinfo index 42ad66379ed2..5da173ab5102 100644 --- a/wip/ibus-pinyin/distinfo +++ b/wip/ibus-pinyin/distinfo @@ -1,8 +1,8 @@ $NetBSD$ -SHA1 (ibus-pinyin-1.3.4.tar.gz) = 6629fb52999891e987848bdb02d929709abc58b6 -RMD160 (ibus-pinyin-1.3.4.tar.gz) = e69c6aaad85eac571f7255dc753bb63d7f9d8ff5 -Size (ibus-pinyin-1.3.4.tar.gz) = 1609416 bytes +SHA1 (ibus-pinyin-1.3.5.tar.gz) = 09fd407486815022432a49bad89f108b4957ef11 +RMD160 (ibus-pinyin-1.3.5.tar.gz) = 18db4f30754a3d3e4225a8b5dab2f426df623bde +Size (ibus-pinyin-1.3.5.tar.gz) = 1609682 bytes SHA1 (pinyin-database-1.2.99.tar.bz2) = e38a148a772e9909facda66b2d579e17b94cccbe RMD160 (pinyin-database-1.2.99.tar.bz2) = 1679567f31c20a235577f02175df38e16a05e7de Size (pinyin-database-1.2.99.tar.bz2) = 9977983 bytes diff --git a/www/apache22/Makefile b/www/apache22/Makefile index 82fffee4c641..5785ef8abe9c 100644 --- a/www/apache22/Makefile +++ b/www/apache22/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.57 2010/04/30 16:30:09 tron Exp $ +# $NetBSD: Makefile,v 1.58 2010/05/03 20:10:33 tron Exp $ DISTNAME= httpd-2.2.15 -PKGREVISION= 1 +PKGREVISION= 2 PKGNAME= ${DISTNAME:S/httpd/apache/} CATEGORIES= www MASTER_SITES= ${MASTER_SITE_APACHE:=httpd/} \ diff --git a/www/apache22/PLIST b/www/apache22/PLIST index c0fa34843ead..1e0bb0968e6c 100644 --- a/www/apache22/PLIST +++ b/www/apache22/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.17 2010/04/30 16:30:09 tron Exp $ +@comment $NetBSD: PLIST,v 1.18 2010/05/03 20:10:33 tron Exp $ ${PLIST.suexec}sbin/suexec include/httpd/ap_compat.h include/httpd/ap_config.h @@ -119,6 +119,7 @@ ${PLIST.all-shared}lib/httpd/mod_speling.so ${PLIST.all-shared}lib/httpd/mod_ssl.so ${PLIST.all-shared}lib/httpd/mod_status.so ${PLIST.all-shared}lib/httpd/mod_substitute.so +${PLIST.all-shared}${PLIST.suexec}lib/httpd/mod_suexec.so ${PLIST.all-shared}lib/httpd/mod_unique_id.so ${PLIST.all-shared}lib/httpd/mod_userdir.so ${PLIST.all-shared}lib/httpd/mod_usertrack.so diff --git a/www/apache22/options.mk b/www/apache22/options.mk index c536b6513d8c..b2255c600fe3 100644 --- a/www/apache22/options.mk +++ b/www/apache22/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.7 2010/04/30 16:30:09 tron Exp $ +# $NetBSD: options.mk,v 1.8 2010/05/03 20:10:33 tron Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.apache PKG_OPTIONS_REQUIRED_GROUPS= mpm @@ -56,7 +56,11 @@ APACHE_SUEXEC_CONFIGURE_ARGS+= \ --with-suexec-docroot=${APACHE_SUEXEC_DOCROOT:Q} \ --with-suexec-logfile=${APACHE_SUEXEC_LOGFILE:Q} +. if !empty(PKG_OPTIONS:Mapache-shared-modules) +CONFIGURE_ARGS+= --enable-modules="all suexec" +. else APACHE_MODULES+= suexec +. endif CONFIGURE_ARGS+= ${APACHE_SUEXEC_CONFIGURE_ARGS:M--with-suexec-*} BUILD_DEFS+= APACHE_SUEXEC_CONFIGURE_ARGS BUILD_TARGET= all suexec