Update to version 2.0.4 of the package fixes PR pkg/41118 adds a LICENSE settingdiff -r1.3 -r1.4 pkgsrc/www/varnish/Makefile
(spz)
| @@ -1,22 +1,24 @@ | @@ -1,22 +1,24 @@ | |||
| 1 | # $NetBSD: Makefile,v 1.3 2008/06/20 01:09:43 joerg Exp $ | 1 | # $NetBSD: Makefile,v 1.4 2009/04/11 19:03:53 spz Exp $ | |
| 2 | # | 2 | # | |
| 3 | 3 | |||
| 4 | DISTNAME= varnish-1.0.2 | 4 | DISTNAME= varnish-2.0.4 | |
| 5 | CATEGORIES= www | 5 | CATEGORIES= www | |
| 6 | MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=varnish/} | 6 | MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=varnish/} | |
| 7 | 7 | |||
| 8 | MAINTAINER= pkgsrc-users@NetBSD.org | 8 | MAINTAINER= pkgsrc-users@NetBSD.org | |
| 9 | HOMEPAGE= http://varnish-cache.org/ | 9 | HOMEPAGE= http://varnish-cache.org/ | |
| 10 | COMMENT= High-performace HTTP accelerator | 10 | COMMENT= High-performace HTTP accelerator | |
| 11 | 11 | |||
| 12 | LICENSE= modified-bsd | |||
| 13 | ||||
| 12 | PKG_DESTDIR_SUPPORT= user-destdir | 14 | PKG_DESTDIR_SUPPORT= user-destdir | |
| 13 | 15 | |||
| 14 | GNU_CONFIGURE= yes | 16 | GNU_CONFIGURE= yes | |
| 15 | USE_LIBTOOL= yes | 17 | USE_LIBTOOL= yes | |
| 16 | USE_TOOLS+= autoconf | 18 | USE_TOOLS+= autoconf | |
| 17 | 19 | |||
| 18 | pre-configure: | 20 | pre-configure: | |
| 19 | cd ${WRKSRC} && autoconf | 21 | cd ${WRKSRC} && autoconf | |
| 20 | 22 | |||
| 21 | .include "../../mk/pthread.buildlink3.mk" | 23 | .include "../../mk/pthread.buildlink3.mk" | |
| 22 | .include "../../mk/bsd.pkg.mk" | 24 | .include "../../mk/bsd.pkg.mk" |
| @@ -1,17 +1,33 @@ | @@ -1,17 +1,33 @@ | |||
| 1 | @comment $NetBSD: PLIST,v 1.1.1.1 2006/12/04 16:04:54 xtraeme Exp $ | 1 | @comment $NetBSD: PLIST,v 1.2 2009/04/11 19:03:53 spz Exp $ | |
| 2 | bin/varnishadm | |||
| 2 | bin/varnishhist | 3 | bin/varnishhist | |
| 3 | bin/varnishlog | 4 | bin/varnishlog | |
| 4 | bin/varnishncsa | 5 | bin/varnishncsa | |
| 6 | bin/varnishreplay | |||
| 5 | bin/varnishstat | 7 | bin/varnishstat | |
| 8 | bin/varnishtest | |||
| 6 | bin/varnishtop | 9 | bin/varnishtop | |
| 10 | etc/varnish/default.vcl | |||
| 11 | include/varnish/shmlog.h | |||
| 12 | include/varnish/shmlog_tags.h | |||
| 13 | include/varnish/stat_field.h | |||
| 14 | include/varnish/stats.h | |||
| 15 | include/varnish/varnishapi.h | |||
| 7 | lib/libvarnish.la | 16 | lib/libvarnish.la | |
| 8 | lib/libvarnishapi.la | 17 | lib/libvarnishapi.la | |
| 18 | lib/libvarnishcompat.la | |||
| 9 | lib/libvcl.la | 19 | lib/libvcl.la | |
| 20 | lib/pkgconfig/varnishapi.pc | |||
| 21 | man/man1/varnishadm.1 | |||
| 10 | man/man1/varnishd.1 | 22 | man/man1/varnishd.1 | |
| 11 | man/man1/varnishhist.1 | 23 | man/man1/varnishhist.1 | |
| 12 | man/man1/varnishlog.1 | 24 | man/man1/varnishlog.1 | |
| 13 | man/man1/varnishncsa.1 | 25 | man/man1/varnishncsa.1 | |
| 26 | man/man1/varnishreplay.1 | |||
| 14 | man/man1/varnishstat.1 | 27 | man/man1/varnishstat.1 | |
| 28 | man/man1/varnishtest.1 | |||
| 15 | man/man1/varnishtop.1 | 29 | man/man1/varnishtop.1 | |
| 16 | man/man7/vcl.7 | 30 | man/man7/vcl.7 | |
| 17 | sbin/varnishd | 31 | sbin/varnishd | |
| 32 | @dirrm include/varnish | |||
| 33 | @dirrm etc/varnish |
| @@ -1,9 +1,6 @@ | @@ -1,9 +1,6 @@ | |||
| 1 | $NetBSD: distinfo,v 1.2 2006/12/18 11:35:37 joerg Exp $ | 1 | $NetBSD: distinfo,v 1.3 2009/04/11 19:03:53 spz Exp $ | |
| 2 | 2 | |||
| 3 | SHA1 (varnish-1.0.2.tar.gz) = 88fa343be907088ac29be6fc9d899b352c91bf83 | 3 | SHA1 (varnish-2.0.4.tar.gz) = 7a7b1ce657b64c89025d61983b84d6ebf88dfbb2 | |
| 4 | RMD160 (varnish-1.0.2.tar.gz) = 28aac4f266369c2a3ffb4233b1cd3fd0b3f6ade2 | 4 | RMD160 (varnish-2.0.4.tar.gz) = 93f94555f42205ff5f324e76acb121c8da71f6e9 | |
| 5 | Size (varnish-1.0.2.tar.gz) = 539059 bytes | 5 | Size (varnish-2.0.4.tar.gz) = 786945 bytes | |
| 6 | SHA1 (patch-aa) = f49672e842cf01c58e2154a56271ce896a639161 | 6 | SHA1 (patch-aa) = c0216a4b4c73b43567a6402a14a64c7597d5c4b9 | |
| 7 | SHA1 (patch-ab) = ef32cee26f2542a44f2ab117154b58bc69931237 | |||
| 8 | SHA1 (patch-ac) = f537e46216a67fdf68afe8f9451bdf2aaff89958 | |||
| 9 | SHA1 (patch-ad) = 5523cd5cbcc29f4f6c85014870356c44c462b8ef |
| @@ -1,20 +1,21 @@ | @@ -1,20 +1,21 @@ | |||
| 1 | $NetBSD: patch-aa,v 1.2 2006/12/18 11:35:37 joerg Exp $ | 1 | $NetBSD: patch-aa,v 1.3 2009/04/11 19:03:53 spz Exp $ | |
| 2 | 2 | |||
| 3 | --- configure.ac.orig 2006-11-07 12:38:11.000000000 +0000 | 3 | --- configure.ac.orig 2009-04-01 13:35:15.000000000 +0000 | |
| 4 | +++ configure.ac | 4 | +++ configure.ac | |
| 5 | @@ -38,13 +38,14 @@ AC_PROG_MAKE_SET | 5 | @@ -55,6 +55,7 @@ AM_CONDITIONAL([HAVE_CURSES], [test x$ha | |
| 6 | AC_CHECK_LIB(rt, clock_gettime) | 6 | save_LIBS="${LIBS}" | |
| 7 | AC_CHECK_LIB(dl, dlopen) | 7 | LIBS="" | |
| 8 | #AC_SEARCH_LIBS(initscr, [curses ncurses]) | 8 | AC_SEARCH_LIBS(pthread_create, [thr pthread c_r]) | |
| 9 | -AC_SEARCH_LIBS(pthread_create, [thr pthread c_r]) | 9 | +LIBS="${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}" | |
| 10 | +LIBS="${LIBS} ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}" | 10 | PTHREAD_LIBS="${LIBS}" | |
| 11 | LIBS="${save_LIBS}" | |||
| 12 | AC_SUBST(PTHREAD_LIBS) | |||
| 13 | @@ -195,7 +196,7 @@ AC_ARG_ENABLE(kqueue, | |||
| 11 | 14 | |||
| 12 | # Checks for header files. | 15 | if test "$enable_kqueue" = yes; then | |
| 13 | AC_HEADER_STDC | 16 | case $target in | |
| 14 | AC_HEADER_SYS_WAIT | 17 | - *-*-freebsd* | *-*-darwin9* ) | |
| 15 | AC_HEADER_TIME | 18 | + *-*-freebsd* | *-*-darwin9* | *-*-netbsd* ) | |
| 16 | AC_CHECK_HEADERS([sys/socket.h]) | 19 | AC_CHECK_FUNCS([kqueue]) | |
| 17 | +AC_CHECK_HEADERS([sys/statvfs.h]) | 20 | ;; | |
| 18 | AC_CHECK_HEADERS([sys/vfs.h]) | 21 | *-*-bsd*) | |
| 19 | AC_CHECK_HEADERS([netinet/in.h]) | |||
| 20 | AC_CHECK_HEADERS([stddef.h]) |