diff options
| author | agc <agc> | 2010-07-04 07:27:29 +0000 |
|---|---|---|
| committer | agc <agc> | 2010-07-04 07:27:29 +0000 |
| commit | bebf7ab762d274004dfe39135aecde31a2f609b6 (patch) | |
| tree | e0264b7dabe86676da500a5aec5b8e378b76d74d | |
| parent | b9d3cc1975b5d0422e0d448c4601f88b80356917 (diff) | |
| download | pkgsrc-bebf7ab762d274004dfe39135aecde31a2f609b6.tar.gz | |
Pullup previous changes on HEAD to pkgsrc-2010Q2 branch to fix branching
error, and to sync with reality.
53 files changed, 280 insertions, 111 deletions
diff --git a/textproc/ja-groff/patches/patch-aa b/textproc/ja-groff/patches/patch-aa index edfcf68776e..4f353861150 100644 --- a/textproc/ja-groff/patches/patch-aa +++ b/textproc/ja-groff/patches/patch-aa @@ -1,4 +1,4 @@ -$NetBSD: patch-aa,v 1.1.1.1 2002/05/31 13:00:40 seb Exp $ +$NetBSD: patch-aa,v 1.1.1.1.58.1 2010/07/04 07:27:29 agc Exp $ --- afmtodit/Makefile.sub.orig Wed Oct 28 21:48:22 1992 +++ afmtodit/Makefile.sub Tue Mar 26 22:38:08 1996 @@ -15,7 +15,7 @@ diff --git a/textproc/ja-groff/patches/patch-ab b/textproc/ja-groff/patches/patch-ab index 969f35af22c..dc42d7aa884 100644 --- a/textproc/ja-groff/patches/patch-ab +++ b/textproc/ja-groff/patches/patch-ab @@ -1,4 +1,4 @@ -$NetBSD: patch-ab,v 1.1.1.1 2002/05/31 13:00:40 seb Exp $ +$NetBSD: patch-ab,v 1.1.1.1.58.1 2010/07/04 07:27:29 agc Exp $ --- Makefile.in.orig Fri May 28 16:26:33 1999 +++ Makefile.in Fri May 28 16:34:14 1999 @@ -175,7 +175,21 @@ diff --git a/textproc/ja-groff/patches/patch-ac b/textproc/ja-groff/patches/patch-ac index 73c8e7e40be..2227e9e14b5 100644 --- a/textproc/ja-groff/patches/patch-ac +++ b/textproc/ja-groff/patches/patch-ac @@ -1,4 +1,4 @@ -$NetBSD: patch-ac,v 1.1.1.1 2002/05/31 13:00:40 seb Exp $ +$NetBSD: patch-ac,v 1.1.1.1.58.1 2010/07/04 07:27:29 agc Exp $ --- troff/env.cc.orig Fri May 28 14:52:15 1999 +++ troff/env.cc Fri May 28 15:00:12 1999 @@ -765,7 +765,6 @@ diff --git a/textproc/ja-groff/patches/patch-ad b/textproc/ja-groff/patches/patch-ad index 2c01d912635..57cddc74723 100644 --- a/textproc/ja-groff/patches/patch-ad +++ b/textproc/ja-groff/patches/patch-ad @@ -1,4 +1,4 @@ -$NetBSD: patch-ad,v 1.1.1.1 2002/05/31 13:00:40 seb Exp $ +$NetBSD: patch-ad,v 1.1.1.1.58.1 2010/07/04 07:27:29 agc Exp $ --- Makefile.comm.orig Tue Jun 27 20:08:27 1995 +++ Makefile.comm Fri May 28 16:10:13 1999 @@ -44,7 +44,7 @@ diff --git a/textproc/ja-groff/patches/patch-ae b/textproc/ja-groff/patches/patch-ae index 21133cd0689..f50b20a1aeb 100644 --- a/textproc/ja-groff/patches/patch-ae +++ b/textproc/ja-groff/patches/patch-ae @@ -1,4 +1,4 @@ -$NetBSD: patch-ae,v 1.1.1.1 2002/05/31 13:00:40 seb Exp $ +$NetBSD: patch-ae,v 1.1.1.1.58.1 2010/07/04 07:27:29 agc Exp $ --- nroff/nroff.sh.orig Fri May 28 17:03:23 1999 +++ nroff/nroff.sh Fri May 28 18:24:04 1999 @@ -58,4 +58,4 @@ diff --git a/textproc/ja-groff/patches/patch-af b/textproc/ja-groff/patches/patch-af index 44845f283c9..0e6fa05ca4d 100644 --- a/textproc/ja-groff/patches/patch-af +++ b/textproc/ja-groff/patches/patch-af @@ -1,4 +1,4 @@ -$NetBSD: patch-af,v 1.1.1.1 2002/05/31 13:00:40 seb Exp $ +$NetBSD: patch-af,v 1.1.1.1.58.1 2010/07/04 07:27:29 agc Exp $ --- devascii/DESC.proto.orig Wed Jul 29 22:32:04 1992 +++ devascii/DESC.proto Mon May 31 14:38:42 1999 @@ -5,4 +5,4 @@ diff --git a/textproc/ja-groff/patches/patch-ag b/textproc/ja-groff/patches/patch-ag index 9e21fde1fe9..4ea9341164a 100644 --- a/textproc/ja-groff/patches/patch-ag +++ b/textproc/ja-groff/patches/patch-ag @@ -1,4 +1,4 @@ -$NetBSD: patch-ag,v 1.1.1.1 2002/05/31 13:00:40 seb Exp $ +$NetBSD: patch-ag,v 1.1.1.1.58.1 2010/07/04 07:27:29 agc Exp $ --- devdvi/DESC.in.orig Mon May 31 13:36:28 1999 +++ devdvi/DESC.in Mon May 31 14:38:55 1999 @@ -8,4 +8,4 @@ diff --git a/textproc/ja-groff/patches/patch-ah b/textproc/ja-groff/patches/patch-ah index dfed1f23e4e..9bd974d893e 100644 --- a/textproc/ja-groff/patches/patch-ah +++ b/textproc/ja-groff/patches/patch-ah @@ -1,4 +1,4 @@ -$NetBSD: patch-ah,v 1.1.1.1 2002/05/31 13:00:40 seb Exp $ +$NetBSD: patch-ah,v 1.1.1.1.58.1 2010/07/04 07:27:29 agc Exp $ --- devlatin1/DESC.proto.orig Wed Jul 29 22:32:26 1992 +++ devlatin1/DESC.proto Mon May 31 14:39:13 1999 @@ -5,4 +5,4 @@ diff --git a/textproc/ja-groff/patches/patch-ai b/textproc/ja-groff/patches/patch-ai index 74546e1cceb..341a29fc3a9 100644 --- a/textproc/ja-groff/patches/patch-ai +++ b/textproc/ja-groff/patches/patch-ai @@ -1,4 +1,4 @@ -$NetBSD: patch-ai,v 1.1.1.1 2002/05/31 13:00:40 seb Exp $ +$NetBSD: patch-ai,v 1.1.1.1.58.1 2010/07/04 07:27:29 agc Exp $ --- devlj4/DESC.in.orig Wed Jul 6 22:10:25 1994 +++ devlj4/DESC.in Mon May 31 14:39:27 1999 @@ -6,4 +6,4 @@ diff --git a/textproc/ja-groff/patches/patch-aj b/textproc/ja-groff/patches/patch-aj index daf39fa24e1..cfb9ad38683 100644 --- a/textproc/ja-groff/patches/patch-aj +++ b/textproc/ja-groff/patches/patch-aj @@ -1,4 +1,4 @@ -$NetBSD: patch-aj,v 1.1.1.1 2002/05/31 13:00:40 seb Exp $ +$NetBSD: patch-aj,v 1.1.1.1.58.1 2010/07/04 07:27:29 agc Exp $ --- devnippon/DESC.proto.orig Mon May 31 13:36:29 1999 +++ devnippon/DESC.proto Mon May 31 14:39:40 1999 @@ -6,4 +6,4 @@ diff --git a/textproc/ja-groff/patches/patch-ak b/textproc/ja-groff/patches/patch-ak index 9a7851e01fe..44877eb0103 100644 --- a/textproc/ja-groff/patches/patch-ak +++ b/textproc/ja-groff/patches/patch-ak @@ -1,4 +1,4 @@ -$NetBSD: patch-ak,v 1.1.1.1 2002/05/31 13:00:40 seb Exp $ +$NetBSD: patch-ak,v 1.1.1.1.58.1 2010/07/04 07:27:29 agc Exp $ --- devps/DESC.in.orig Mon May 31 13:36:29 1999 +++ devps/DESC.in Mon May 31 14:39:52 1999 @@ -11,4 +11,4 @@ diff --git a/textproc/ja-groff/patches/patch-al b/textproc/ja-groff/patches/patch-al index 6e21165ff6a..ef7addd984d 100644 --- a/textproc/ja-groff/patches/patch-al +++ b/textproc/ja-groff/patches/patch-al @@ -1,4 +1,4 @@ -$NetBSD: patch-al,v 1.1.1.1 2002/05/31 13:00:40 seb Exp $ +$NetBSD: patch-al,v 1.1.1.1.58.1 2010/07/04 07:27:29 agc Exp $ --- include/lib.h.orig Thu Jun 22 09:41:29 1995 +++ include/lib.h diff --git a/textproc/kbanner/PLIST b/textproc/kbanner/PLIST index 74da37508df..359843baf81 100644 --- a/textproc/kbanner/PLIST +++ b/textproc/kbanner/PLIST @@ -1,3 +1,3 @@ -@comment $NetBSD: PLIST,v 1.1.1.1 2002/05/31 13:00:29 seb Exp $ +@comment $NetBSD: PLIST,v 1.1.1.1.58.1 2010/07/04 07:27:29 agc Exp $ bin/kbanner man/man1/kbanner.1 diff --git a/textproc/kbanner/patches/patch-ab b/textproc/kbanner/patches/patch-ab index 685c6192228..a8b6024e660 100644 --- a/textproc/kbanner/patches/patch-ab +++ b/textproc/kbanner/patches/patch-ab @@ -1,4 +1,4 @@ -$NetBSD: patch-ab,v 1.1.1.1 2002/05/31 13:00:29 seb Exp $ +$NetBSD: patch-ab,v 1.1.1.1.58.1 2010/07/04 07:27:29 agc Exp $ --- kbanner.c.orig Fri Oct 15 17:43:31 1993 +++ kbanner.c Thu May 18 00:28:39 2000 diff --git a/textproc/kbanner/patches/patch-ac b/textproc/kbanner/patches/patch-ac index 61f4c9fced6..e19c9109c22 100644 --- a/textproc/kbanner/patches/patch-ac +++ b/textproc/kbanner/patches/patch-ac @@ -1,4 +1,4 @@ -$NetBSD: patch-ac,v 1.1.1.1 2002/05/31 13:00:29 seb Exp $ +$NetBSD: patch-ac,v 1.1.1.1.58.1 2010/07/04 07:27:29 agc Exp $ --- font1.c.orig Fri Oct 15 14:18:50 1993 +++ font1.c Thu May 18 00:27:02 2000 diff --git a/textproc/kbanner/patches/patch-ad b/textproc/kbanner/patches/patch-ad index 3e8f061a22e..2a1b830651c 100644 --- a/textproc/kbanner/patches/patch-ad +++ b/textproc/kbanner/patches/patch-ad @@ -1,4 +1,4 @@ -$NetBSD: patch-ad,v 1.1.1.1 2002/05/31 13:00:29 seb Exp $ +$NetBSD: patch-ad,v 1.1.1.1.58.1 2010/07/04 07:27:29 agc Exp $ --- font2.c.orig Fri Oct 15 14:18:52 1993 +++ font2.c Thu May 18 00:27:02 2000 diff --git a/textproc/kbanner/patches/patch-ae b/textproc/kbanner/patches/patch-ae index 8d422d0651d..301f1be0bdb 100644 --- a/textproc/kbanner/patches/patch-ae +++ b/textproc/kbanner/patches/patch-ae @@ -1,4 +1,4 @@ -$NetBSD: patch-ae,v 1.1.1.1 2002/05/31 13:00:29 seb Exp $ +$NetBSD: patch-ae,v 1.1.1.1.58.1 2010/07/04 07:27:29 agc Exp $ --- font3.c.orig Fri Oct 15 14:18:55 1993 +++ font3.c Thu May 18 00:27:03 2000 diff --git a/textproc/kbanner/patches/patch-af b/textproc/kbanner/patches/patch-af index ffeb8a0193b..4e0f7003db2 100644 --- a/textproc/kbanner/patches/patch-af +++ b/textproc/kbanner/patches/patch-af @@ -1,4 +1,4 @@ -$NetBSD: patch-af,v 1.1.1.1 2002/05/31 13:00:29 seb Exp $ +$NetBSD: patch-af,v 1.1.1.1.58.1 2010/07/04 07:27:29 agc Exp $ JIS X0208-1990 characters. diff --git a/textproc/lout/Makefile b/textproc/lout/Makefile index 61430cb2b1b..ccb677a0181 100644 --- a/textproc/lout/Makefile +++ b/textproc/lout/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.13 2009/06/14 22:58:09 joerg Exp $ +# $NetBSD: Makefile,v 1.13.10.1 2010/07/04 07:27:30 agc Exp $ # DISTNAME= lout-3.26 @@ -10,9 +10,11 @@ MAINTAINER= tsarna@NetBSD.org HOMEPAGE= http://lout.sourceforge.net/ COMMENT= Basser Lout, a TeX/troff-like formatter with PostScript/PDF output +PKG_DESTDIR_SUPPORT= user-destdir + PLIST_SRC= ${WRKDIR}/.PLIST_SRC INSTALL_TARGET= allinstall -INSTALLATION_DIRS= bin share/doc +INSTALLATION_DIRS= bin ${PKGMANDIR}/man1 share/doc do-configure: ${MV} ${WRKSRC}/makefile ${WRKSRC}/makefile.in @@ -20,9 +22,8 @@ do-configure: post-install: ${CAT} ${PKGDIR}/PLIST.pre >${PLIST_SRC} - (cd ${PREFIX}; ${FIND} share/doc/lout -type f -print >>${PLIST_SRC}) - (cd ${PREFIX}; ${FIND} share/lout -type f -print >>${PLIST_SRC}) - ${ECHO} "@unexec ${RM} -rf %D/share/doc/lout" >>${PLIST_SRC} + (cd ${DESTDIR}${PREFIX}; ${FIND} share/doc/lout -type f -print >>${PLIST_SRC}) + (cd ${DESTDIR}${PREFIX}; ${FIND} share/lout -type f -print >>${PLIST_SRC}) .include "../../devel/zlib/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/textproc/lout/distinfo b/textproc/lout/distinfo index 442a7bca5b7..a9ed3ec3108 100644 --- a/textproc/lout/distinfo +++ b/textproc/lout/distinfo @@ -1,6 +1,6 @@ -$NetBSD: distinfo,v 1.5 2007/04/01 19:36:08 rillig Exp $ +$NetBSD: distinfo,v 1.5.32.1 2010/07/04 07:27:30 agc Exp $ SHA1 (lout-3.26.tar.gz) = f32c15a538a0b46b85ccaa1a9716c4c3b87dcd75 RMD160 (lout-3.26.tar.gz) = 336f341dd79b128fa945f08c463ec944cd82d5d2 Size (lout-3.26.tar.gz) = 1881323 bytes -SHA1 (patch-aa) = c2b33f9a894346fc3754b8be470c2f4332034e5c +SHA1 (patch-aa) = e2318c006d3af79ae42a1217e10e0ca4a48cdfc5 diff --git a/textproc/lout/patches/patch-aa b/textproc/lout/patches/patch-aa index 252f9946695..98cddd4dc67 100644 --- a/textproc/lout/patches/patch-aa +++ b/textproc/lout/patches/patch-aa @@ -1,8 +1,8 @@ -$NetBSD: patch-aa,v 1.5 2007/04/01 19:36:08 rillig Exp $ +$NetBSD: patch-aa,v 1.5.32.1 2010/07/04 07:27:30 agc Exp $ ---- makefile.orig 2002-10-16 00:11:05.000000000 +0100 -+++ makefile 2003-09-15 10:19:50.000000000 +0100 -@@ -276,10 +276,10 @@ +--- makefile.orig 2002-10-15 23:11:05.000000000 +0000 ++++ makefile +@@ -276,10 +276,10 @@ SAFEDFT = 0 DEBUGGING = 1 TRACING = -g @@ -10,14 +10,14 @@ $NetBSD: patch-aa,v 1.5 2007/04/01 19:36:08 rillig Exp $ -LIBDIR = /home/jeff/lout.lib -DOCDIR = /home/jeff/lout.doc -MANDIR = /home/jeff/lout.man -+BINDIR = @PREFIX@/bin -+LIBDIR = @PREFIX@/share/lout -+DOCDIR = @PREFIX@/share/doc/lout -+MANDIR = @PREFIX@/${PKGMANDIR}/man1 ++BINDIR = ${DESTDIR}@PREFIX@/bin ++LIBDIR = ${DESTDIR}@PREFIX@/share/lout ++DOCDIR = ${DESTDIR}@PREFIX@/share/doc/lout ++MANDIR = ${DESTDIR}@PREFIX@/${PKGMANDIR}/man1 LIBFONT = font LIBMAPS = maps -@@ -297,8 +297,8 @@ +@@ -297,8 +297,8 @@ LOC_DE = de COLLATE = 1 @@ -28,7 +28,16 @@ $NetBSD: patch-aa,v 1.5 2007/04/01 19:36:08 rillig Exp $ ZLIBPATH = CC = gcc -@@ -450,3 +450,6 @@ +@@ -392,7 +392,7 @@ install: lout prg2lout + chmod 755 $(LIBDIR)/$(LIBLOCA) + @echo "" + @echo "(c) Initializing run (should be silent, no errors expected)" +- $(BINDIR)/lout -x -s $(LIBDIR)/$(LIBINCL)/init ++ $(BINDIR)/lout -D $(LIBDIR)/$(LIBDATA) -H $(LIBDIR)/$(LIBHYPH) -I $(LIBDIR)/$(LIBINCL) -x -s $(LIBDIR)/$(LIBINCL)/init + @echo "" + @echo "(d) Changing mode of files just created by initializing run" + chmod 644 $(LIBDIR)/$(LIBDATA)/* +@@ -450,3 +450,6 @@ clean: -rm -f lout prg2lout *.o restart: clean uninstall diff --git a/textproc/troffcvt/Makefile b/textproc/troffcvt/Makefile index 876d112b1f1..fa89828d544 100644 --- a/textproc/troffcvt/Makefile +++ b/textproc/troffcvt/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.16 2009/07/07 20:35:27 joerg Exp $ +# $NetBSD: Makefile,v 1.16.8.1 2010/07/04 07:27:30 agc Exp $ # DISTNAME= troffcvt-1.04 @@ -11,6 +11,7 @@ HOMEPAGE= ${MASTER_SITES} COMMENT= Troff/groff to RTF/HTML/TEXT converter PKG_DESTDIR_SUPPORT= user-destdir +MAKE_JOBS_SAFE= no USE_TOOLS+= perl:run diff --git a/www/Makefile b/www/Makefile index 1f13055496c..9fe75dbdd67 100644 --- a/www/Makefile +++ b/www/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.731 2010/06/25 12:59:47 hauke Exp $ +# $NetBSD: Makefile,v 1.731.2.1 2010/07/04 07:28:52 agc Exp $ # COMMENT= Packages related to the World Wide Web @@ -473,6 +473,7 @@ SUBDIR+= py-ClientForm SUBDIR+= py-HTMLgen SUBDIR+= py-PasteDeploy SUBDIR+= py-beautifulsoup +SUBDIR+= py-blosxom SUBDIR+= py-clearsilver SUBDIR+= py-curl SUBDIR+= py-django @@ -491,7 +492,6 @@ SUBDIR+= py-simpletal SUBDIR+= py-swish-e SUBDIR+= py-uwsgi SUBDIR+= py-webpy -SUBDIR+= py-blosxom SUBDIR+= qDecoder SUBDIR+= raggle SUBDIR+= rails diff --git a/www/ap2-cband/Makefile b/www/ap2-cband/Makefile index 082b49ac11f..86a6aef85c1 100644 --- a/www/ap2-cband/Makefile +++ b/www/ap2-cband/Makefile @@ -1,7 +1,8 @@ -# $NetBSD: Makefile,v 1.3 2009/12/03 17:12:42 joerg Exp $ +# $NetBSD: Makefile,v 1.3.6.1 2010/07/04 07:28:52 agc Exp $ # DISTNAME= mod-cband-0.9.7.5 +PKGNAME= ${APACHE_PKG_PREFIX}-cband-${DISTNAME:S/mod-cband-//} CATEGORIES= www MASTER_SITES= http://cband.linux.pl/download/ EXTRACT_SUFX= .tgz @@ -25,6 +26,8 @@ BUILD_TARGET= INSTALLATION_DIRS+= lib/httpd share/doc/${APACHE_MODULE_NAME} +CONFIGURE_ENV+= APXS=${APXS} + do-install: cd ${WRKSRC}/src && \ libexecdir=`${APXS} -q LIBEXECDIR` && \ diff --git a/www/ap2-fcgid/Makefile b/www/ap2-fcgid/Makefile index e866f47b175..f27c1fb0e6b 100644 --- a/www/ap2-fcgid/Makefile +++ b/www/ap2-fcgid/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2010/02/15 11:38:44 fhajny Exp $ +# $NetBSD: Makefile,v 1.5.4.1 2010/07/04 07:28:52 agc Exp $ DISTNAME= mod_fcgid-2.3.5 PKGNAME= ${APACHE_PKG_PREFIX}-${DISTNAME:S/mod_//} @@ -16,13 +16,12 @@ PKG_APACHE_ACCEPTED= apache2 apache22 APACHE_MODULE= YES USE_LIBTOOL= YES +HAS_CONFIGURE= yes +CONFIGURE_SCRIPT= ./configure.apxs CONFIGURE_ENV+= APXS=${APXS:Q} MAKE_FLAGS+= LIBTOOL=${LIBTOOL:Q} MAKE_FLAGS+= INCLUDES="-I${BUILDLINK_PREFIX.apache}/include/httpd" -do-configure: - cd ${WRKSRC} && ./configure.apxs - .include "../../mk/apache.mk" .include "../../mk/bsd.pkg.mk" diff --git a/www/ap22-dnssd/Makefile b/www/ap22-dnssd/Makefile index ead74feb509..ed9d77f3036 100644 --- a/www/ap22-dnssd/Makefile +++ b/www/ap22-dnssd/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2010/06/13 22:45:32 wiz Exp $ +# $NetBSD: Makefile,v 1.4.2.1 2010/07/04 07:28:52 agc Exp $ # DISTNAME= mod_dnssd-0.5 @@ -15,6 +15,7 @@ GNU_CONFIGURE= yes USE_TOOLS= pkg-config gmake USE_LIBTOOL= yes +CONFIGURE_ENV+= APXS=${APXS:Q} CONFIGURE_ARGS+= --disable-lynx PKG_APACHE_ACCEPTED= apache22 diff --git a/www/cherokee/Makefile b/www/cherokee/Makefile index 6a3ccfffde7..e663880a926 100644 --- a/www/cherokee/Makefile +++ b/www/cherokee/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.13 2010/03/12 13:45:42 jmmv Exp $ +# $NetBSD: Makefile,v 1.13.4.1 2010/07/04 07:28:52 agc Exp $ # DISTNAME= cherokee-0.5.3 @@ -10,6 +10,8 @@ MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= http://www.cherokee-project.com/ COMMENT= Flexible and fast web server +PKG_DESTDIR_SUPPORT= user-destdir + GNU_CONFIGURE= yes USE_LIBTOOL= yes USE_TOOLS+= bison flex @@ -78,7 +80,6 @@ CONF_FILES+= ${EGDIR}/cherokee/mods-available/ssl \ CONFIGURE_ARGS+= --disable-tls .endif -pre-install: - ${INSTALL_DATA_DIR} ${EGDIR}/pam.d +INSTALLATION_DIRS+= ${EGDIR}/pam.d .include "../../mk/bsd.pkg.mk" diff --git a/www/emacs-w3m-snapshot/distinfo b/www/emacs-w3m-snapshot/distinfo index 74a72a6867f..7853bf1347b 100644 --- a/www/emacs-w3m-snapshot/distinfo +++ b/www/emacs-w3m-snapshot/distinfo @@ -1,5 +1,6 @@ -$NetBSD: distinfo,v 1.1.1.1 2009/08/05 22:17:58 minskim Exp $ +$NetBSD: distinfo,v 1.1.1.1.8.1 2010/07/04 07:28:53 agc Exp $ SHA1 (w3m-el-snapshot_1.4.364+0.20090802.orig.tar.gz) = c03da651ff5faaa945db124653e287bfe927a6b1 RMD160 (w3m-el-snapshot_1.4.364+0.20090802.orig.tar.gz) = 0a4331a129f00c943e10f15a257db2d5420be624 Size (w3m-el-snapshot_1.4.364+0.20090802.orig.tar.gz) = 951300 bytes +SHA1 (patch-aa) = d17fa31e5cf767203dad2652e2ebb5aebffa535d diff --git a/www/emacs-w3m-snapshot/patches/patch-aa b/www/emacs-w3m-snapshot/patches/patch-aa new file mode 100644 index 00000000000..36d7a08007c --- /dev/null +++ b/www/emacs-w3m-snapshot/patches/patch-aa @@ -0,0 +1,13 @@ +$NetBSD: patch-aa,v 1.1.2.2 2010/07/04 07:30:12 agc Exp $ + +--- aclocal.m4.orig 2010-06-28 20:31:17.000000000 +0000 ++++ aclocal.m4 +@@ -116,7 +116,7 @@ AC_DEFUN(AC_PATH_EMACS, + case "${flavor}" in + XEmacs) + EMACS_FLAVOR=xemacs;; +- Emacs\ 2[[123]]\.*) ++ Emacs\ 2[[1234]]\.*) + EMACS_FLAVOR=emacs;; + *) + EMACS_FLAVOR=unsupported;; diff --git a/www/lhs/PLIST b/www/lhs/PLIST index a6d56b16805..2220d0fd834 100644 --- a/www/lhs/PLIST +++ b/www/lhs/PLIST @@ -1,2 +1,2 @@ -@comment $NetBSD: PLIST,v 1.1.1.1 2002/06/18 12:09:25 agc Exp $ +@comment $NetBSD: PLIST,v 1.1.1.1.58.1 2010/07/04 07:28:53 agc Exp $ sbin/lhs diff --git a/www/lhs/patches/patch-aa b/www/lhs/patches/patch-aa index b6e430b0de1..e9435004172 100644 --- a/www/lhs/patches/patch-aa +++ b/www/lhs/patches/patch-aa @@ -1,4 +1,4 @@ -$NetBSD: patch-aa,v 1.1.1.1 2002/06/18 12:09:25 agc Exp $ +$NetBSD: patch-aa,v 1.1.1.1.58.1 2010/07/04 07:28:53 agc Exp $ --- Makefile.in.orig Sun Feb 25 14:42:39 2001 +++ Makefile.in Tue Jun 18 12:58:26 2002 diff --git a/www/lhs/patches/patch-ab b/www/lhs/patches/patch-ab index 92f03b1f093..abfa05fecad 100644 --- a/www/lhs/patches/patch-ab +++ b/www/lhs/patches/patch-ab @@ -1,4 +1,4 @@ -$NetBSD: patch-ab,v 1.1.1.1 2002/06/18 12:09:25 agc Exp $ +$NetBSD: patch-ab,v 1.1.1.1.58.1 2010/07/04 07:28:53 agc Exp $ --- lhs.h 2002/06/18 11:49:31 1.1 +++ lhs.h 2002/06/18 11:50:29 diff --git a/www/lhs/patches/patch-ac b/www/lhs/patches/patch-ac index 5a89d7c8f03..367d0976dba 100644 --- a/www/lhs/patches/patch-ac +++ b/www/lhs/patches/patch-ac @@ -1,4 +1,4 @@ -$NetBSD: patch-ac,v 1.1.1.1 2002/06/18 12:09:25 agc Exp $ +$NetBSD: patch-ac,v 1.1.1.1.58.1 2010/07/04 07:28:53 agc Exp $ --- lhs.c 2002/06/18 11:54:40 1.1 +++ lhs.c 2002/06/18 11:54:05 diff --git a/www/lighttpd/options.mk b/www/lighttpd/options.mk index 02955d42b88..0a4fbc40c78 100644 --- a/www/lighttpd/options.mk +++ b/www/lighttpd/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.6 2007/02/22 19:27:20 wiz Exp $ +# $NetBSD: options.mk,v 1.6.32.1 2010/07/04 07:28:53 agc Exp $ PKG_OPTIONS_VAR = PKG_OPTIONS.lighttpd PKG_SUPPORTED_OPTIONS= bzip fam gdbm inet6 ldap lua mysql ssl memcache @@ -12,6 +12,8 @@ PKG_SUGGESTED_OPTIONS= inet6 ssl .if !empty(PKG_OPTIONS:Mbzip) . include "../../archivers/bzip2/buildlink3.mk" CONFIGURE_ARGS+= --with-bzip2 +.else +CONFIGURE_ARGS+= --without-bzip2 .endif ### diff --git a/www/mknmz-wwwoffle/PLIST b/www/mknmz-wwwoffle/PLIST index 17f90ecb1e7..bf15bf013e6 100644 --- a/www/mknmz-wwwoffle/PLIST +++ b/www/mknmz-wwwoffle/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.1.1.1 2002/05/31 13:01:44 seb Exp $ +@comment $NetBSD: PLIST,v 1.1.1.1.58.1 2010/07/04 07:28:53 agc Exp $ bin/mknmz-wwwoffle man/man1/mknmz-wwwoffle.1 share/namazu/filter/wwwofflecache.pl diff --git a/www/nginx/options.mk b/www/nginx/options.mk index f63b43cc31f..ee70697364f 100644 --- a/www/nginx/options.mk +++ b/www/nginx/options.mk @@ -1,9 +1,9 @@ -# $NetBSD: options.mk,v 1.9 2010/06/15 20:05:48 joerg Exp $ +# $NetBSD: options.mk,v 1.9.2.1 2010/07/04 07:28:53 agc Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.nginx -PKG_SUPPORTED_OPTIONS= ssl pcre dav flv sub gtools mail-proxy memcache \ - realip inet6 uwsgi -PKG_SUGGESTED_OPTIONS= ssl pcre +PKG_SUPPORTED_OPTIONS= dav flv gtools inet6 mail-proxy memcache pcre \ + push realip ssl sub uwsgi +PKG_SUGGESTED_OPTIONS= pcre ssl PLIST_VARS+= uwsgi @@ -58,5 +58,13 @@ CONFIGURE_ARGS+= --with-ipv6 EGFILES+= uwsgi_params PLIST.uwsgi= yes .else + +.if !empty(PKG_OPTIONS:Mpush) +PUSH= nginx_http_push_module-0.692 +DISTFILES+= ${PUSH}.tar.gz +SITES.${PUSH}.tar.gz= http://pushmodule.slact.net/downloads/ +CONFIGURE_ARGS+= --add-module=../${PUSH} +.endif + CONFIGURE_ARGS+= --without-http_uwsgi_module .endif diff --git a/www/w3m-img/Makefile b/www/w3m-img/Makefile index 3da0cf52a2a..da0bedfcc9c 100644 --- a/www/w3m-img/Makefile +++ b/www/w3m-img/Makefile @@ -1,8 +1,7 @@ -# $NetBSD: Makefile,v 1.19 2010/01/24 13:26:12 wiz Exp $ -# +# $NetBSD: Makefile,v 1.19.4.1 2010/07/04 07:28:54 agc Exp $ PKGNAME= w3m-img-${W3M_VERS} -PKGREVISION= 4 +PKGREVISION= 5 COMMENT= Multilingualized version of a pager/text-based browser w3m with inline image support CONFLICTS+= w3m-[0-9]* diff --git a/www/w3m/Makefile b/www/w3m/Makefile index 5bf7d4c8381..8b3344c6b04 100644 --- a/www/w3m/Makefile +++ b/www/w3m/Makefile @@ -1,8 +1,7 @@ -# $NetBSD: Makefile,v 1.57 2010/01/17 12:02:51 wiz Exp $ -# +# $NetBSD: Makefile,v 1.57.4.1 2010/07/04 07:28:54 agc Exp $ PKGNAME= w3m-${W3M_VERS} -PKGREVISION= 4 +PKGREVISION= 5 COMMENT= Multilingualized version of a pager/text-based browser w3m CONFLICTS+= w3m-img-[0-9]* diff --git a/www/w3m/distinfo b/www/w3m/distinfo index c1a91961186..95d23278ebc 100644 --- a/www/w3m/distinfo +++ b/www/w3m/distinfo @@ -1,8 +1,10 @@ -$NetBSD: distinfo,v 1.20 2008/12/13 08:52:13 obache Exp $ +$NetBSD: distinfo,v 1.20.14.1 2010/07/04 07:28:54 agc Exp $ SHA1 (w3m-0.5.2.tar.gz) = 484522547ae6dbb342d3858a2a53a65451e273f9 RMD160 (w3m-0.5.2.tar.gz) = 09ce72d8ef5e621a2e49496b63e22f2773edbe79 Size (w3m-0.5.2.tar.gz) = 1906812 bytes SHA1 (patch-aa) = 2de78a6db9bd483416895b393935ccadab879932 SHA1 (patch-ab) = 2d60d7a2946f13a185591c0b927cf0f8b5ea351b +SHA1 (patch-ac) = 800d4b8c2ed93ccaa000564366ad07fabcc5bdc2 +SHA1 (patch-ad) = 7a11f6f97fb5d01a420c95bcd03e577ffd3a241f SHA1 (patch-ak) = ac0ee99d5ab49c431cfa496d0d2d509efd6b06fa diff --git a/www/w3m/patches/patch-ac b/www/w3m/patches/patch-ac new file mode 100644 index 00000000000..3a68242c1d6 --- /dev/null +++ b/www/w3m/patches/patch-ac @@ -0,0 +1,26 @@ +$NetBSD: patch-ac,v 1.14.4.2 2010/07/04 07:28:54 agc Exp $ + +Fix for CVE-2010-2074 taken from here: + +http://www.openwall.com/lists/oss-security/2010/06/14/4 + +--- fm.h.orig 2007-05-30 05:47:24.000000000 +0100 ++++ fm.h 2010-07-01 19:26:27.000000000 +0100 +@@ -1119,7 +1119,7 @@ + #endif + + #if defined(USE_SSL) && defined(USE_SSL_VERIFY) +-global int ssl_verify_server init(FALSE); ++global int ssl_verify_server init(TRUE); + global char *ssl_cert_file init(NULL); + global char *ssl_key_file init(NULL); + global char *ssl_ca_path init(NULL); +@@ -1128,7 +1128,7 @@ + #endif /* defined(USE_SSL) && + * defined(USE_SSL_VERIFY) */ + #ifdef USE_SSL +-global char *ssl_forbid_method init(NULL); ++global char *ssl_forbid_method init("2"); + #endif + + global int is_redisplay init(FALSE); diff --git a/www/w3m/patches/patch-ad b/www/w3m/patches/patch-ad new file mode 100644 index 00000000000..a6d2cf3ddb5 --- /dev/null +++ b/www/w3m/patches/patch-ad @@ -0,0 +1,58 @@ +$NetBSD: patch-ad,v 1.8.4.2 2010/07/04 07:28:54 agc Exp $ + +Fix for CVE-2010-2074 taken from here: + +http://www.openwall.com/lists/oss-security/2010/06/14/4 + +--- istream.c.orig 2007-05-23 16:06:05.000000000 +0100 ++++ istream.c 2010-07-01 19:31:00.000000000 +0100 +@@ -447,8 +447,17 @@ + + if (!seen_dnsname) + seen_dnsname = Strnew(); ++ /* replace \0 to make full string visible to user */ ++ if (sl != strlen(sn)) { ++ int i; ++ for (i = 0; i < sl; ++i) { ++ if (!sn[i]) ++ sn[i] = '!'; ++ } ++ } + Strcat_m_charp(seen_dnsname, sn, " ", NULL); +- if (ssl_match_cert_ident(sn, sl, hostname)) ++ if (sl == strlen(sn) /* catch \0 in SAN */ ++ && ssl_match_cert_ident(sn, sl, hostname)) + break; + } + } +@@ -466,16 +475,27 @@ + if (match_ident == FALSE && ret == NULL) { + X509_NAME *xn; + char buf[2048]; ++ int slen; + + xn = X509_get_subject_name(x); + +- if (X509_NAME_get_text_by_NID(xn, NID_commonName, +- buf, sizeof(buf)) == -1) ++ slen = X509_NAME_get_text_by_NID(xn, NID_commonName, buf, sizeof(buf)); ++ if ( slen == -1) + /* FIXME: gettextize? */ + ret = Strnew_charp("Unable to get common name from peer cert"); +- else if (!ssl_match_cert_ident(buf, strlen(buf), hostname)) ++ else if (slen != strlen(buf) ++ || !ssl_match_cert_ident(buf, strlen(buf), hostname)) { ++ /* replace \0 to make full string visible to user */ ++ if (slen != strlen(buf)) { ++ int i; ++ for (i = 0; i < slen; ++i) { ++ if (!buf[i]) ++ buf[i] = '!'; ++ } ++ } + /* FIXME: gettextize? */ + ret = Sprintf("Bad cert ident %s from %s", buf, hostname); ++ } + else + match_ident = TRUE; + } diff --git a/www/wwwcount/Makefile b/www/wwwcount/Makefile index babcfceee61..9cf087ef574 100644 --- a/www/wwwcount/Makefile +++ b/www/wwwcount/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.18 2009/12/17 19:32:28 abs Exp $ +# $NetBSD: Makefile,v 1.18.6.1 2010/07/04 07:28:54 agc Exp $ DISTNAME= wwwcount2.5 PKGNAME= wwwcount-2.5 @@ -10,6 +10,8 @@ MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= http://www.muquit.com/muquit/software/Count/Count.html COMMENT= Graphical access counter, clock and date indicator for WWW pages +PKG_DESTDIR_SUPPORT= user-destdir + GNU_CONFIGURE= yes INSTALLATION_DIRS= bin ${PKGMANDIR}/man1 \ share/doc/wwwcount/Count2.5/images \ @@ -22,6 +24,11 @@ CONF_FILES= ${PREFIX}/share/examples/wwwcount.conf \ MAKE_JOBS_SAFE= NO +SUBST_CLASSES+= destdir +SUBST_STAGE.destdir= pre-install +SUBST_FILES.destdir= Config.tmpl +SUBST_SED.destdir= -e s,=\"${PREFIX},=\"${DESTDIR}${PREFIX}, + pre-configure: cd ${WRKSRC}; yes "" | PREFIX=${PREFIX} PKG_SYSCONFDIR=${PKG_SYSCONFDIR} VARBASE=${VARBASE} ./Count-config diff --git a/www/wwwcount/PLIST b/www/wwwcount/PLIST index 44bc66fd1ee..1fd4e086a9d 100644 --- a/www/wwwcount/PLIST +++ b/www/wwwcount/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.4 2009/06/14 22:00:41 joerg Exp $ +@comment $NetBSD: PLIST,v 1.4.10.1 2010/07/04 07:28:54 agc Exp $ bin/mkstrip bin/extdgts libdata/wwwcount/digits/A/peng.gif @@ -16,7 +16,6 @@ libdata/wwwcount/digits/cdd/strip.gif libdata/wwwcount/digits/cdr/strip.gif libdata/wwwcount/digits/mkstrip.sh libdata/wwwcount/rgb.txt -libdata/wwwcount/sample.dat libexec/cgi-bin/Count.cgi share/doc/wwwcount/blues.gif share/doc/wwwcount/index.html diff --git a/www/wwwcount/distinfo b/www/wwwcount/distinfo index d70a4511625..5404577ded2 100644 --- a/www/wwwcount/distinfo +++ b/www/wwwcount/distinfo @@ -1,8 +1,8 @@ -$NetBSD: distinfo,v 1.5 2006/07/19 19:48:21 jlam Exp $ +$NetBSD: distinfo,v 1.5.36.1 2010/07/04 07:28:54 agc Exp $ SHA1 (wwwcount2.5.tar.gz) = 374babfc93db3092eda13bda5fd65a372beca4bb RMD160 (wwwcount2.5.tar.gz) = 354c92ab5e0f8ec2acd484108fa968a5bfb6e62a Size (wwwcount2.5.tar.gz) = 441215 bytes SHA1 (patch-aa) = 2c1db53763365a08e32e9724efd3148994af9963 SHA1 (patch-ab) = f6f71b1428506ab565f127c38096b65408f5bc53 -SHA1 (patch-ae) = e950e48c2f9a8f3da27c8b51267a52d7a7bd704e +SHA1 (patch-ae) = ab0d799eaf0a49eebace0ad200d53bee3ac6cee9 diff --git a/www/wwwcount/patches/patch-ae b/www/wwwcount/patches/patch-ae index 153de0e5146..8bb3c72fcab 100644 --- a/www/wwwcount/patches/patch-ae +++ b/www/wwwcount/patches/patch-ae @@ -1,7 +1,7 @@ -$NetBSD: patch-ae,v 1.4 1999/12/12 08:46:01 rh Exp $ +$NetBSD: patch-ae,v 1.4.66.1 2010/07/04 07:28:54 agc Exp $ ---- Count-install.orig Mon May 17 03:01:50 1999 -+++ Count-install Sun Dec 12 09:45:45 1999 +--- Count-install.orig 1999-05-17 01:01:50.000000000 +0000 ++++ Count-install @@ -13,7 +13,6 @@ # Nov 24, 1995 ## @@ -10,7 +10,7 @@ $NetBSD: patch-ae,v 1.4 1999/12/12 08:46:01 rh Exp $ INSTALL_PROG="./install-sh" Tmpl="./Config.tmpl" Binary="./bin/Count.cgi" -@@ -28,8 +27,6 @@ +@@ -28,8 +27,6 @@ Digit_cdd="./data/digits/cdd" Digit_bang="./data/digits/bang" Rgbfile="./data/rgb.txt" SAMPLE_DAT="./data/data/sample.dat" @@ -19,7 +19,7 @@ $NetBSD: patch-ae,v 1.4 1999/12/12 08:46:01 rh Exp $ UserId="nobody" userid_flag=0 -@@ -115,20 +112,6 @@ +@@ -115,20 +112,6 @@ fi . $Tmpl @@ -40,7 +40,7 @@ $NetBSD: patch-ae,v 1.4 1999/12/12 08:46:01 rh Exp $ tdir="./tmp" if [ ! -d $tdir ]; then -@@ -197,7 +180,6 @@ +@@ -197,7 +180,6 @@ anything else. cgi-bin directory = $CGIBIN_DIR conf directory = $CONFIG_DIR @@ -48,7 +48,7 @@ $NetBSD: patch-ae,v 1.4 1999/12/12 08:46:01 rh Exp $ digit directory = $DIGIT_DIR data directory = $DATA_DIR log directory = $LOG_DIR -@@ -212,7 +194,7 @@ +@@ -212,7 +194,7 @@ read answer if [ .$answer = . ] then @@ -57,7 +57,7 @@ $NetBSD: patch-ae,v 1.4 1999/12/12 08:46:01 rh Exp $ fi until [ $answer = "y" -o $answer = "Y" -o $answer = "n" -o $answer = "N" ] do -@@ -253,7 +235,7 @@ +@@ -253,7 +235,7 @@ echo $n "*Do you know the user and group read answer if [ .$answer = . ] then @@ -66,7 +66,7 @@ $NetBSD: patch-ae,v 1.4 1999/12/12 08:46:01 rh Exp $ fi until [ $answer = "y" -o $answer = "Y" -o $answer = "n" -o $answer = "N" ] do -@@ -272,11 +254,11 @@ +@@ -272,11 +254,11 @@ echo $n "*Do you know the user and group ### # enter user id -starts ### @@ -80,7 +80,7 @@ $NetBSD: patch-ae,v 1.4 1999/12/12 08:46:01 rh Exp $ fi until [ $answer != "x" ] do -@@ -296,11 +278,11 @@ +@@ -296,11 +278,11 @@ echo $n "*Do you know the user and group ## # enter groud id -starts ## @@ -94,7 +94,7 @@ $NetBSD: patch-ae,v 1.4 1999/12/12 08:46:01 rh Exp $ fi until [ $answer != "x" ] do -@@ -318,47 +300,18 @@ +@@ -318,47 +300,18 @@ echo $n "*Do you know the user and group # enter groud id -ends ## echo "installing Count.cgi->$CGIBIN_DIR" @@ -105,10 +105,12 @@ $NetBSD: patch-ae,v 1.4 1999/12/12 08:46:01 rh Exp $ -# -# check if the file exist or not -# -- ++#echo "installing sample datafile $SAMPLE_DAT->$RGB_DIR" ++#$INSTALL_PROG -c -o $UserId -g $GroupId -m 664 $SAMPLE_DAT $RGB_DIR/sample.dat + -if [ ! -f $CONFIG_DIR/$CONFIG_FILE ]; then -+echo "installing sample datafile $SAMPLE_DAT->$RGB_DIR" -+$INSTALL_PROG -c -o $UserId -g $GroupId -m 664 $SAMPLE_DAT $RGB_DIR/sample.dat ++echo "installing rgb.txt->$RGB_DIR" ++$INSTALL_PROG -c -m 644 $Rgbfile $RGB_DIR/rgb.txt - $INSTALL_PROG -c -m 664 $CONFIG_FILE $CONFIG_DIR/$CONFIG_FILE -else @@ -119,9 +121,7 @@ $NetBSD: patch-ae,v 1.4 1999/12/12 08:46:01 rh Exp $ - echo " $INSTALL_PROG -c -m 664 $CONFIG_FILE $CONFIG_DIR/$CONFIG_FILE" - echo "" -fi -+echo "installing rgb.txt->$RGB_DIR" -+$INSTALL_PROG -c -m 644 $Rgbfile $RGB_DIR/rgb.txt - +- -echo "installing sample datafile $SAMPLE_DAT->$DATA_DIR" - -if [ ! -f $DATA_DIR/sample.dat ]; then @@ -145,13 +145,13 @@ $NetBSD: patch-ae,v 1.4 1999/12/12 08:46:01 rh Exp $ -chgrp $GroupId $LOG_DIR -chmod 775 $LOG_DIR +echo "installing $LOG_FILE->$LOG_DIR" -+touch $LOG_DIR/$LOG_FILE -+chmod 644 $LOG_DIR/$LOG_FILE -+chown $UserId.$GroupId $LOG_DIR/$LOG_FILE ++#touch $LOG_DIR/$LOG_FILE ++#chmod 644 $LOG_DIR/$LOG_FILE ++#chown $UserId.$GroupId $LOG_DIR/$LOG_FILE echo "installing image strip for digit style A->$DIGIT_DIR/A" $INSTALL_PROG -c -m 644 $DigitA/strip.gif $DIGIT_DIR/A/strip.gif -@@ -400,18 +353,6 @@ +@@ -400,18 +353,6 @@ $INSTALL_PROG -c -m 644 $Digit_cdd/strip echo "installing strip image for digit style bang->$DIGIT_DIR/bang" $INSTALL_PROG -c -m 644 $Digit_bang/strip.gif $DIGIT_DIR/bang/strip.gif @@ -170,7 +170,7 @@ $NetBSD: patch-ae,v 1.4 1999/12/12 08:46:01 rh Exp $ ;; n|N) cat <<EOM -@@ -424,17 +365,16 @@ +@@ -424,17 +365,16 @@ cat <<EOM EOM echo "installing Count.cgi->$CGIBIN_DIR" @@ -194,13 +194,13 @@ $NetBSD: patch-ae,v 1.4 1999/12/12 08:46:01 rh Exp $ echo "installing image strip for digit style A->$DIGIT_DIR/A" $INSTALL_PROG -c $DigitA/strip.gif $DIGIT_DIR/A/strip.gif -@@ -474,9 +414,6 @@ - +@@ -475,9 +415,6 @@ $INSTALL_PROG -c $Digit_cdd/strip.gif $D echo "installing strip image for digit style bang->$DIGIT_DIR/bang" $INSTALL_PROG -c $Digit_bang/strip.gif $DIGIT_DIR/bang/strip.gif -- + -echo "installing the mirroring script" -$INSTALL_PROG -c $mirror_script $BASE_DIR/$mirror_file - +- ;; *) + esac diff --git a/www/zope3/Makefile b/www/zope3/Makefile index b53c6c7e5c3..608b994f01b 100644 --- a/www/zope3/Makefile +++ b/www/zope3/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.21 2009/12/17 19:31:55 abs Exp $ +# $NetBSD: Makefile,v 1.21.6.1 2010/07/04 07:28:55 agc Exp $ # DISTNAME= Zope-3.3.1 @@ -12,6 +12,8 @@ MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= http://www.zope.org/DevHome/Zope3/ COMMENT= Zope 3 Application Server +PKG_DESTDIR_SUPPORT= user-destdir + DEPENDS+= ${PYPKGPREFIX}-xml>=0.8.4:../../textproc/py-xml HAS_CONFIGURE= yes @@ -51,6 +53,8 @@ EXTRACT_USING= bsdtar USE_TOOLS+= pax +INSTALLATION_DIRS+= bin ${ZOPE3_DOCDIR} + pre-install: ${FIND} ${WRKSRC} -name "*.orig" -type f -print | ${XARGS} ${RM} -f @@ -58,7 +62,6 @@ post-install: ${LN} -s ${DESTDIR}${ZOPE3_DIR}/bin/mkzeoinstance ${DESTDIR}${PREFIX}/bin ${LN} -s ${DESTDIR}${ZOPE3_DIR}/bin/mkzopeinstance ${DESTDIR}${PREFIX}/bin ${LN} -s ${DESTDIR}${ZOPE3_DIR}/bin/zopetest ${DESTDIR}${PREFIX}/bin - ${INSTALL_DATA_DIR} ${ZOPE3_DOCDIR} cd ${WRKSRC}/Zope && pax -r -w LICENSES.txt ZopePublicLicense.txt \ ${DESTDIR}${ZOPE3_DOCDIR} cd ${WRKSRC}/Zope/doc && pax -r -w *.txt ${DESTDIR}${ZOPE3_DOCDIR} diff --git a/www/zope3/distinfo b/www/zope3/distinfo index dced98d5801..3604e406560 100644 --- a/www/zope3/distinfo +++ b/www/zope3/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.6 2007/12/21 16:18:35 taca Exp $ +$NetBSD: distinfo,v 1.6.26.1 2010/07/04 07:28:55 agc Exp $ SHA1 (Zope-3.3.1.tgz) = 4576ac21c3415563d3b0b747e40963a762b63fce RMD160 (Zope-3.3.1.tgz) = 11bf3b8c899518a5965f21a4a372912a4bc1438d @@ -6,3 +6,4 @@ Size (Zope-3.3.1.tgz) = 6594248 bytes SHA1 (patch-aa) = 1e1a29f1519ee50861b513b5ff5254a76541a735 SHA1 (patch-ab) = c4e098593a36998384fe70150456cae2a8b55c9e SHA1 (patch-ac) = cb89f361441e9caf7f2c16c01d4eb3273f4e4e47 +SHA1 (patch-ad) = 67ccfa1ca4bc964e6d7f7875ade7444dd2327cd0 diff --git a/www/zope3/patches/patch-ad b/www/zope3/patches/patch-ad new file mode 100644 index 00000000000..7333f3f3d38 --- /dev/null +++ b/www/zope3/patches/patch-ad @@ -0,0 +1,13 @@ +$NetBSD: patch-ad,v 1.5.2.2 2010/07/04 07:28:55 agc Exp $ + +--- Makefile.in.orig 2010-06-27 19:40:00.000000000 +0000 ++++ Makefile.in +@@ -21,7 +21,7 @@ build: + # handled via the dependency on the build target. + # + install: build +- $(PYTHON) install.py -q install --skip-build --home "$(prefix)" ++ $(PYTHON) install.py -q install --skip-build --home ${DESTDIR}$(prefix) + + check test: build + $(PYTHON) test.py $(TESTOPTS) diff --git a/x11/gtkmm/Makefile b/x11/gtkmm/Makefile index 773306f614a..9e3d49bfcb9 100644 --- a/x11/gtkmm/Makefile +++ b/x11/gtkmm/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.69 2010/06/13 22:45:39 wiz Exp $ +# $NetBSD: Makefile,v 1.69.2.1 2010/07/04 07:31:13 agc Exp $ DISTNAME= gtkmm-2.20.3 -PKGREVISION= 1 +PKGREVISION= 2 CATEGORIES= x11 MASTER_SITES= ${MASTER_SITE_GNOME:=sources/gtkmm/2.20/} EXTRACT_SUFX= .tar.bz2 @@ -18,6 +18,8 @@ USE_TOOLS+= gmake perl:run pkg-config GNU_CONFIGURE= yes CONFIGURE_ARGS+= --disable-examples +EXTRACT_USING= bsdtar + PKGCONFIG_OVERRIDE= atk/atkmm-1.6.pc.in PKGCONFIG_OVERRIDE+= gdk/gdkmm-2.4.pc.in PKGCONFIG_OVERRIDE+= gtk/gtkmm-2.4.pc.in diff --git a/x11/gtkmm/PLIST b/x11/gtkmm/PLIST index daa090fa77d..7336174a4ce 100644 --- a/x11/gtkmm/PLIST +++ b/x11/gtkmm/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.36 2010/06/02 16:45:41 adam Exp $ +@comment $NetBSD: PLIST,v 1.36.2.1 2010/07/04 07:31:13 agc Exp $ include/atkmm-1.6/atkmm.h include/atkmm-1.6/atkmm/action.h include/atkmm-1.6/atkmm/component.h @@ -608,6 +608,9 @@ share/doc/gtkmm-2.4/reference/html/classGdk_1_1Visual__coll__graph.png share/doc/gtkmm-2.4/reference/html/classGdk_1_1Window-members.html share/doc/gtkmm-2.4/reference/html/classGdk_1_1Window.html share/doc/gtkmm-2.4/reference/html/classGdk_1_1Window__coll__graph.png +share/doc/gtkmm-2.4/reference/html/classGlib_1_1Value_3_01Glib_1_1RefPtr_3_01Gtk_1_1RecentInfo_01_4_01_4-members.html +share/doc/gtkmm-2.4/reference/html/classGlib_1_1Value_3_01Glib_1_1RefPtr_3_01Gtk_1_1RecentInfo_01_4_01_4.html +share/doc/gtkmm-2.4/reference/html/classGlib_1_1Value_3_01Glib_1_1RefPtr_3_01Gtk_1_1RecentInfo_01_4_01_4__coll__graph.png share/doc/gtkmm-2.4/reference/html/classGtk_1_1AboutDialog-members.html share/doc/gtkmm-2.4/reference/html/classGtk_1_1AboutDialog.html share/doc/gtkmm-2.4/reference/html/classGtk_1_1AboutDialog__coll__graph.png @@ -752,7 +755,9 @@ share/doc/gtkmm-2.4/reference/html/classGtk_1_1ComboDropDown.html share/doc/gtkmm-2.4/reference/html/classGtk_1_1ComboDropDownItem-members.html share/doc/gtkmm-2.4/reference/html/classGtk_1_1ComboDropDownItem.html share/doc/gtkmm-2.4/reference/html/classGtk_1_1ComboDropDownItem__coll__graph.png +share/doc/gtkmm-2.4/reference/html/classGtk_1_1ComboDropDown__Helpers_1_1ComboDropDownList-members.html share/doc/gtkmm-2.4/reference/html/classGtk_1_1ComboDropDown__Helpers_1_1ComboDropDownList.html +share/doc/gtkmm-2.4/reference/html/classGtk_1_1ComboDropDown__Helpers_1_1ComboDropDownList__coll__graph.png share/doc/gtkmm-2.4/reference/html/classGtk_1_1ComboDropDown__coll__graph.png share/doc/gtkmm-2.4/reference/html/classGtk_1_1Combo__coll__graph.png share/doc/gtkmm-2.4/reference/html/classGtk_1_1Container-members.html diff --git a/x11/modular-xorg-server/Makefile b/x11/modular-xorg-server/Makefile index 74c82a2ecda..4d90d86963a 100644 --- a/x11/modular-xorg-server/Makefile +++ b/x11/modular-xorg-server/Makefile @@ -1,9 +1,9 @@ -# $NetBSD: Makefile,v 1.60 2010/04/25 19:17:41 jmmv Exp $ +# $NetBSD: Makefile,v 1.60.2.1 2010/07/04 07:31:14 agc Exp $ # DISTNAME= xorg-server-1.6.5 PKGNAME= modular-${DISTNAME} -PKGREVISION= 6 +PKGREVISION= 7 CATEGORIES= x11 MASTER_SITES= ${MASTER_SITE_XORG:=xserver/} EXTRACT_SUFX= .tar.bz2 @@ -105,6 +105,7 @@ CONFIGURE_ENV+= ac_cv_path_RAWCPP="cc -E -Uunix -" .include "../../fonts/libfontenc/buildlink3.mk" .include "../../graphics/MesaLib/buildlink3.mk" .include "../../security/openssl/buildlink3.mk" +BUILDLINK_API_DEPENDS.libpciaccess+= libpciaccess>=0.11.0 .include "../../sysutils/libpciaccess/buildlink3.mk" .include "../../x11/bigreqsproto/buildlink3.mk" .include "../../x11/compositeproto/buildlink3.mk" diff --git a/x11/modular-xorg-server/distinfo b/x11/modular-xorg-server/distinfo index aa88f827a70..31ccacee1b1 100644 --- a/x11/modular-xorg-server/distinfo +++ b/x11/modular-xorg-server/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.41 2010/04/09 09:08:13 tnn Exp $ +$NetBSD: distinfo,v 1.41.2.1 2010/07/04 07:31:14 agc Exp $ SHA1 (xorg-server-1.6.5.tar.bz2) = c57c80dd15d3ca492e58ae993b9015d085ec6ea6 RMD160 (xorg-server-1.6.5.tar.bz2) = 702970358a5643dbc9205f42e39c5b8ed2ff845a @@ -25,7 +25,7 @@ SHA1 (patch-bm) = 9c7192eb98816165d8fb16af465e0056045280b2 SHA1 (patch-bn) = 27dffea8ce05ac79fd438818fba463f57776f2af SHA1 (patch-bo) = ee05a01c6b1d4d0b759d8372f16c5f752273f73e SHA1 (patch-sa) = bdd9209e873f676ee4d0436a94e468b824e80f87 -SHA1 (patch-sb) = 0a064016b16e088d08cd9e290a57cb4efb4f5d26 +SHA1 (patch-sb) = 48c22a62b30c6bc4d5786624bc264fee30a9bb81 SHA1 (patch-sc) = dd93e15253b78395050d65df0f972e57ccf546e0 SHA1 (patch-sd) = 36d3946217b57416e8d0d3099e48d4e9f957c881 SHA1 (patch-se) = 22b20c734b7fcf59d75227aeb1fa703465582568 diff --git a/x11/modular-xorg-server/patches/patch-sb b/x11/modular-xorg-server/patches/patch-sb index 16b729757f0..2d7a7df16d0 100644 --- a/x11/modular-xorg-server/patches/patch-sb +++ b/x11/modular-xorg-server/patches/patch-sb @@ -1,9 +1,7 @@ -$NetBSD: patch-sb,v 1.2 2009/06/07 11:23:47 wiz Exp $ +$NetBSD: patch-sb,v 1.2.10.1 2010/07/04 07:31:14 agc Exp $ -Temporary disable Sbus suport. - ---- hw/xfree86/common/xf86Configure.c.orig 2009-03-21 01:57:50 +0200 -+++ hw/xfree86/common/xf86Configure.c 2009-05-19 14:36:57 +0300 +--- hw/xfree86/common/xf86Configure.c.orig 2009-10-12 02:52:40.000000000 +0000 ++++ hw/xfree86/common/xf86Configure.c @@ -115,7 +115,7 @@ xf86AddBusDeviceToConfigure(const char * return NULL; isPrimary = xf86IsPrimaryPci(pVideo); @@ -13,3 +11,20 @@ Temporary disable Sbus suport. case BUS_SBUS: for (i = 0; i < nDevToConfig; i++) if (DevToConfig[i].sVideo && +@@ -180,8 +180,14 @@ xf86AddBusDeviceToConfigure(const char * + + NewDevice.GDev.busID = xnfalloc(16); + xf86FormatPciBusNumber(pVideo->bus, busnum); +- sprintf(NewDevice.GDev.busID, "PCI:%s:%d:%d", +- busnum, pVideo->dev, pVideo->func); ++ ++ if (pVideo->domain == 0) { ++ snprintf(NewDevice.GDev.busID, 16, "PCI:%s:%d:%d", ++ busnum, pVideo->dev, pVideo->func); ++ } else { ++ snprintf(NewDevice.GDev.busID, 16, "PCI:%s@%d:%d:%d", ++ busnum, pVideo->domain, pVideo->dev, pVideo->func); ++ } + + NewDevice.GDev.chipID = pVideo->device_id; + NewDevice.GDev.chipRev = pVideo->revision; |