From 4949e1da3945de6a06fe49c39886b11d7c18efba Mon Sep 17 00:00:00 2001 From: wiz Date: Sat, 6 Jun 2009 21:51:59 +0000 Subject: Update to 0.40, set LICENSE to gnu-lgpl-v2.1. This is a minor bugfix release. It fixes some issues with some of the example programs and removes some bash-specific constructs from the user-contributed mozilla_helper.sh script. --- devel/chmlib/Makefile | 5 +++-- devel/chmlib/distinfo | 10 +++++----- devel/chmlib/patches/patch-ac | 36 ++++++++++++++++++------------------ 3 files changed, 26 insertions(+), 25 deletions(-) (limited to 'devel') diff --git a/devel/chmlib/Makefile b/devel/chmlib/Makefile index 9b227352f14..ebaeca6f3b4 100644 --- a/devel/chmlib/Makefile +++ b/devel/chmlib/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.18 2008/06/12 02:14:21 joerg Exp $ +# $NetBSD: Makefile,v 1.19 2009/06/06 21:51:59 wiz Exp $ # -DISTNAME= chmlib-0.39 +DISTNAME= chmlib-0.40 CATEGORIES= devel MASTER_SITES= http://morte.jedrea.com/~jedwin/projects/chmlib/ EXTRACT_SUFX= .tar.bz2 @@ -9,6 +9,7 @@ EXTRACT_SUFX= .tar.bz2 MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= http://morte.jedrea.com/~jedwin/projects/chmlib/ COMMENT= Library for dealing with Microsoft ITSS/CHM format files +LICENSE= gnu-lgpl-v2.1 CONFLICTS= kchm-[0-9]* diff --git a/devel/chmlib/distinfo b/devel/chmlib/distinfo index 1381103fb99..6949f3cffd0 100644 --- a/devel/chmlib/distinfo +++ b/devel/chmlib/distinfo @@ -1,7 +1,7 @@ -$NetBSD: distinfo,v 1.12 2007/01/28 07:31:20 wiz Exp $ +$NetBSD: distinfo,v 1.13 2009/06/06 21:51:59 wiz Exp $ -SHA1 (chmlib-0.39.tar.bz2) = 985cb51136beaf42cdd886744ebe600ebacafcfc -RMD160 (chmlib-0.39.tar.bz2) = 488f5a0619ee4c107014d768df6299971a0e0677 -Size (chmlib-0.39.tar.bz2) = 263013 bytes +SHA1 (chmlib-0.40.tar.bz2) = 5231d7531e8808420d7f89fd1e4fdbac1ed7a167 +RMD160 (chmlib-0.40.tar.bz2) = f79d6b3d94f8eb8aa0c517c0805d2ac8e1128f64 +Size (chmlib-0.40.tar.bz2) = 252036 bytes SHA1 (patch-aa) = c4a7c21e8ae0cb097e9225cdf7e099395c5ed331 -SHA1 (patch-ac) = b57e5c7246fd3db876325f476bdf4249c49e0734 +SHA1 (patch-ac) = 32c3e3a1fe548123bce15de4cb81b869c9cbded8 diff --git a/devel/chmlib/patches/patch-ac b/devel/chmlib/patches/patch-ac index 18eaede4326..bfb22efb69d 100644 --- a/devel/chmlib/patches/patch-ac +++ b/devel/chmlib/patches/patch-ac @@ -1,17 +1,17 @@ -$NetBSD: patch-ac,v 1.2 2006/06/23 12:56:26 salo Exp $ +$NetBSD: patch-ac,v 1.3 2009/06/06 21:51:59 wiz Exp $ ---- configure.orig 2006-06-17 01:09:19.000000000 +0200 -+++ configure 2006-06-23 14:13:20.000000000 +0200 -@@ -19435,13 +19435,13 @@ if test "${enable_pthread+set}" = set; t +--- configure.orig 2009-05-23 15:12:23.000000000 +0000 ++++ configure +@@ -11339,13 +11339,13 @@ if test "${enable_pthread+set}" = set; t enableval=$enable_pthread; if test "$enableval" = "yes"; then --{ echo "$as_me:$LINENO: checking for pthread_mutex_init in -lpthread" >&5 --echo $ECHO_N "checking for pthread_mutex_init in -lpthread... $ECHO_C" >&6; } -+{ echo "$as_me:$LINENO: checking for pthread_mutex_init in ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}" >&5 -+echo $ECHO_N "checking for pthread_mutex_init in ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}... $ECHO_C" >&6; } +-{ $as_echo "$as_me:$LINENO: checking for pthread_mutex_init in -lpthread" >&5 +-$as_echo_n "checking for pthread_mutex_init in -lpthread... " >&6; } ++{ $as_echo "$as_me:$LINENO: checking for pthread_mutex_init in ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}" >&5 ++$as_echo_n "checking for pthread_mutex_init in ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}... " >&6; } if test "${ac_cv_lib_pthread_pthread_mutex_init+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS -LIBS="-lpthread $LIBS" @@ -19,7 +19,7 @@ $NetBSD: patch-ac,v 1.2 2006/06/23 12:56:26 salo Exp $ cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF -@@ -19505,12 +19505,12 @@ if test $ac_cv_lib_pthread_pthread_mutex +@@ -11409,12 +11409,12 @@ if test "x$ac_cv_lib_pthread_pthread_mut #define HAVE_LIBPTHREAD 1 _ACEOF @@ -33,17 +33,17 @@ $NetBSD: patch-ac,v 1.2 2006/06/23 12:56:26 salo Exp $ + LDFLAGS="$LDFLAGS ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}" else CHM_MT="" - { echo "$as_me:$LINENO: WARNING: Thread safe mode turned off. chm_http will not be built" >&5 -@@ -19520,13 +19520,13 @@ echo "$as_me: WARNING: Thread safe mode + { $as_echo "$as_me:$LINENO: WARNING: Thread safe mode turned off. chm_http will not be built" >&5 +@@ -11424,13 +11424,13 @@ $as_echo "$as_me: WARNING: Thread safe m else --{ echo "$as_me:$LINENO: checking for pthread_mutex_init in -lpthread" >&5 --echo $ECHO_N "checking for pthread_mutex_init in -lpthread... $ECHO_C" >&6; } -+{ echo "$as_me:$LINENO: checking for pthread_mutex_init in ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}" >&5 -+echo $ECHO_N "checking for pthread_mutex_init in ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}... $ECHO_C" >&6; } +-{ $as_echo "$as_me:$LINENO: checking for pthread_mutex_init in -lpthread" >&5 +-$as_echo_n "checking for pthread_mutex_init in -lpthread... " >&6; } ++{ $as_echo "$as_me:$LINENO: checking for pthread_mutex_init in ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}" >&5 ++$as_echo_n "checking for pthread_mutex_init in ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}... " >&6; } if test "${ac_cv_lib_pthread_pthread_mutex_init+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS -LIBS="-lpthread $LIBS" @@ -51,7 +51,7 @@ $NetBSD: patch-ac,v 1.2 2006/06/23 12:56:26 salo Exp $ cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF -@@ -19590,12 +19590,12 @@ if test $ac_cv_lib_pthread_pthread_mutex +@@ -11494,12 +11494,12 @@ if test "x$ac_cv_lib_pthread_pthread_mut #define HAVE_LIBPTHREAD 1 _ACEOF -- cgit v1.2.3