update Thu Apr 15 06:37:02 PDT 2010
authorCharlie <root@crater.dragonflybsd.org>
Thu, 15 Apr 2010 14:48:58 +0000 (07:48 -0700)
committerCharlie <root@crater.dragonflybsd.org>
Thu, 15 Apr 2010 14:48:58 +0000 (07:48 -0700)
49 files changed:
databases/slony1/Makefile
databases/slony1/PLIST
databases/slony1/distinfo
databases/slony1/patches/patch-aa
databases/slony1/patches/patch-ab
doc/CHANGES-2010
doc/TODO
mail/elm-me/Makefile
mail/elm-me/distinfo
mail/elm-me/patches/patch-ab
mail/elm-me/patches/patch-cb
mail/elm-me/patches/patch-cd
mail/elm-me/patches/patch-ce
mail/elm-me/patches/patch-cf [new file with mode: 0644]
mail/elm-me/patches/patch-cg [new file with mode: 0644]
mail/enma/Makefile
mail/metamail/Makefile
net/Makefile
net/libbind/DESCR [moved from wip/libbind/DESCR with 100% similarity]
net/libbind/Makefile [moved from wip/libbind/Makefile with 80% similarity]
net/libbind/PLIST [moved from wip/libbind/PLIST with 94% similarity]
net/libbind/buildlink3.mk [moved from wip/libbind/buildlink3.mk with 62% similarity]
net/libbind/distinfo [moved from wip/libbind/distinfo with 79% similarity]
net/libbind/options.mk [moved from wip/libbind/options.mk with 91% similarity]
net/libbind/patches/patch-aa [moved from wip/libbind/patches/patch-aa with 86% similarity]
net/samba/Makefile
net/samba/files/winbindd.sh
net/samba33/Makefile
pkgtools/pkg_comp/Makefile
pkgtools/pkg_comp/files/pkg_comp.8
pkgtools/pkg_comp/files/pkg_comp.sh
security/stunnel/Makefile
security/stunnel/distinfo
security/stunnel/patches/patch-aa
shells/bash/distinfo
shells/bash/patches/patch-af
textproc/py-libxml2/Makefile
wip/ibus-pinyin/Makefile
wip/ibus-pinyin/PLIST
wip/ibus-pinyin/distinfo
wip/ibus-pinyin/patches/patch-aa [deleted file]
wip/ibus-pinyin/patches/patch-ab [deleted file]
wip/ibus-pinyin/patches/patch-ac [deleted file]
wip/ibus-pinyin/patches/patch-ad [deleted file]
wip/ibus-pinyin/patches/patch-ae [deleted file]
wip/ibus-pinyin/patches/patch-af [new file with mode: 0644]
wip/libbind/TODO [deleted file]
wip/nmzmail/TODO [new file with mode: 0644]
wip/wput/TODO [new file with mode: 0644]

index 0b25a44..231bcc8 100644 (file)
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.13 2010/02/10 19:34:07 joerg Exp $
+# $NetBSD: Makefile,v 1.14 2010/04/15 07:55:31 adam Exp $
 
-DISTNAME=      slony1-1.2.15
-PKGREVISION=   1
+DISTNAME=      slony1-2.0.2
 CATEGORIES=    databases
-MASTER_SITES=  http://slony.info/downloads/1.2/source/
+MASTER_SITES=  http://slony.info/downloads/2.0/source/
 EXTRACT_SUFX=  .tar.bz2
 
 MAINTAINER=    adam@NetBSD.org
@@ -12,6 +11,8 @@ COMMENT=      Replication system for PostgreSQL
 
 PKG_DESTDIR_SUPPORT=   user-destdir
 
+PGSQL_VERSIONS_ACCEPTED=84 83
+
 DEPENDS+=      postgresql${PGSQL_VERSION}-server-[0-9]*:../../databases/postgresql${PGSQL_VERSION}-server
 
 USE_TOOLS+=            gmake
index c195b6f..44f4a58 100644 (file)
@@ -1,18 +1,10 @@
-@comment $NetBSD: PLIST,v 1.3 2008/01/14 18:58:02 adam Exp $
+@comment $NetBSD: PLIST,v 1.4 2010/04/15 07:55:31 adam Exp $
 bin/slon
 bin/slonik
 bin/slony_logshipper
 lib/postgresql/slony1_funcs.so
-lib/postgresql/xxid.so
 share/postgresql/slon.conf-sample
 share/postgresql/slony1_base.sql
-share/postgresql/slony1_base.v74.sql
-share/postgresql/slony1_base.v80.sql
-share/postgresql/slony1_base.v81.sql
+share/postgresql/slony1_base.v83.sql
 share/postgresql/slony1_funcs.sql
-share/postgresql/slony1_funcs.v74.sql
-share/postgresql/slony1_funcs.v80.sql
-share/postgresql/slony1_funcs.v81.sql
-share/postgresql/xxid.v74.sql
-share/postgresql/xxid.v80.sql
-share/postgresql/xxid.v81.sql
+share/postgresql/slony1_funcs.v83.sql
index 4f1b786..98f8a51 100644 (file)
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.7 2008/10/06 09:54:42 adam Exp $
+$NetBSD: distinfo,v 1.8 2010/04/15 07:55:31 adam Exp $
 
-SHA1 (slony1-1.2.15.tar.bz2) = cc0f5e5d904070a2496a66fe9482c2fdbdda372c
-RMD160 (slony1-1.2.15.tar.bz2) = c99a862bda6aca8adf7f838a872fc66eac556732
-Size (slony1-1.2.15.tar.bz2) = 871479 bytes
-SHA1 (patch-aa) = 0d47e35c562b47afb826f3ee0c2b20f015940269
-SHA1 (patch-ab) = 8a8cc04e5d64be50fea0f2dd1e3da487223d8c45
+SHA1 (slony1-2.0.2.tar.bz2) = 7c23b02389be7b3236fa092114196a3cd69ad38a
+RMD160 (slony1-2.0.2.tar.bz2) = a757aa8bb1fe6fdacd592ff5778858fba64b03e2
+Size (slony1-2.0.2.tar.bz2) = 933793 bytes
+SHA1 (patch-aa) = 591635aa8badd2690629ffd4ba1d4a619d332fbc
+SHA1 (patch-ab) = de4549aa7fae7aed10f4ebb14de8d5aea5419cb4
index 2f252bd..1c0d9d9 100644 (file)
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.4 2008/01/14 18:58:03 adam Exp $
+$NetBSD: patch-aa,v 1.5 2010/04/15 07:55:32 adam Exp $
 
---- configure.orig     2007-11-12 23:46:59.000000000 +0100
+--- configure.orig     2009-05-08 22:10:34.000000000 +0000
 +++ configure
-@@ -1904,6 +1904,7 @@ case $host_os in
+@@ -2014,6 +2014,7 @@ case $host_os in
    darwin*) template=darwin ;;
      dgux*) template=dgux ;;
   freebsd*) template=freebsd ;;
index 85827ef..407b61e 100644 (file)
@@ -1,31 +1,13 @@
-$NetBSD: patch-ab,v 1.1 2008/01/14 18:58:03 adam Exp $
+$NetBSD: patch-ab,v 1.2 2010/04/15 07:55:32 adam Exp $
 
---- tests/run_test.sh.orig     2008-01-13 22:38:16.000000000 +0100
-+++ tests/run_test.sh
-@@ -179,7 +179,7 @@ store_node()
+--- tools/start_slon.sh.orig   2010-04-15 09:45:28.000000000 +0000
++++ tools/start_slon.sh
+@@ -16,7 +16,7 @@ test -r "$SLON_CONF" || (echo "No slon c
  
-       if [ -n "${db}" -a "${host}" -a "${user}" -a "${port}" ]; then
-         if [ ${alias} -ne ${originnode} ]; then
--          if [ "x${logship}" == "xtrue" ]; then    # Don't bother generating nodes used for log shipping
-+          if [ "x${logship}" = "xtrue" ]; then    # Don't bother generating nodes used for log shipping
-             status "Node ${alias} is a log shipping node - no need for STORE NODE"
-           else
-             echo "STORE NODE (id=${alias}, comment='node ${alias}');" >> $mktmp/slonik.script
-@@ -219,7 +219,7 @@ store_path()
-           eval bport=\$PORT${j}
-           eval blogship=\$LOGSHIP${j}
-           if [ -n "${bdb}" -a "${bhost}" -a "${buser}" -a "${bport}" ]; then
--            if [[ "x${logship}" == "xtrue" || "x${blogship}" == "xtrue" ]]; then
-+            if [[ "x${logship}" = "xtrue" || "x${blogship}" = "xtrue" ]]; then
-                 # log shipping node - no paths need exist that involve this node
-                 status "log shipping between nodes(${i}/${j}) - ls(${logship}/${blogship}) - omit STORE PATH"
-             else
-@@ -499,7 +499,7 @@ launch_slon()
-        fi
-         conninfo="dbname=${db} host=${host} user=${user} port=${port}"
--        if [ "x${logship}" == "xtrue" ]; then
-+        if [ "x${logship}" = "xtrue" ]; then
-           status "do not launch slon for node ${alias} - it receives data via log shipping"
-         else
-           status "launching: $pgbindir/slon -s500 -g10 -d2 ${archiveparm} $cluster \"$conninfo\""
+ PID_LINE=`grep pid_file $SLON_CONF | cut -d "#" -f 1 | grep "^[:space:]*pid_file='.*'"`
+ PID_FILE=`echo $PID_LINE | cut -d "=" -f 2 | cut -d "'" -f 2`
+-if [ "x$PID_FILE" == "x" ]; then
++if [ "x$PID_FILE" = "x" ]; then
+     echo "pid_file not found in slon conf file - $SLON_CONF"
+     exit 1
+ else
index 9e4efe3..3aa6e5e 100644 (file)
@@ -1,4 +1,4 @@
-$NetBSD: CHANGES-2010,v 1.1540 2010/04/15 06:51:13 dholland Exp $
+$NetBSD: CHANGES-2010,v 1.1547 2010/04/15 13:03:34 obache Exp $
 
 Changes to the packages collection and infrastructure in 2010:
 
@@ -1920,3 +1920,10 @@ Changes to the packages collection and infrastructure in 2010:
        Updated databases/postgresql83-client to 8.3.10nb1 [taca 2010-04-15]
        Updated databases/postgresql84-client to 8.4.3nb1 [taca 2010-04-15]
        Updated mail/elm to 2.5.8nb2 [dholland 2010-04-15]
+       Updated chat/jabberd2 to 2.2.9nb2 [adam 2010-04-15]
+       Updated databases/slony1 to 2.0.2 [adam 2010-04-15]
+       Updated mail/metamail to 2.7nb10 [tron 2010-04-15]
+       Updated pkgtools/pkg_comp to 1.33 [jmmv 2010-04-15]
+       Updated security/stunnel to 4.33 [tron 2010-04-15]
+       Added net/libbind version 6.0 [obache 2010-04-15]
+       Updated mail/enma to 1.1.0nb1 [obache 2010-04-15]
index 8ec8cb9..2808be8 100644 (file)
--- a/doc/TODO
+++ b/doc/TODO
@@ -1,4 +1,4 @@
-$NetBSD: TODO,v 1.9205 2010/04/15 00:28:54 wiz Exp $
+$NetBSD: TODO,v 1.9206 2010/04/15 09:58:05 tron Exp $
 
 Suggested new packages
 ======================
@@ -1308,7 +1308,6 @@ For possible perl packages updates, see http://www.pkgbox.org/p2c/
        o strace-4.5.16
        o stratagus-2.2.2
        o streamripper-1.63.0
-       o stunnel-4.33
        o subtitleeditor-0.33.0
        o sun-jdk6-6.0.19
        o sun-jre6-6.0.19
index a19eced..62b9eab 100644 (file)
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.30 2009/06/30 00:07:19 joerg Exp $
+# $NetBSD: Makefile,v 1.31 2010/04/15 08:13:34 dholland Exp $
 
 DISTNAME=              elm-2.4ME+93
 PKGNAME=               elm-me-2.4.93
@@ -10,6 +10,8 @@ MAINTAINER=           pkgsrc-users@NetBSD.org
 HOMEPAGE=              http://www.instinct.org/elm/
 COMMENT=               ELM Mail User Agent with ME extensions
 
+PKG_DESTDIR_SUPPORT=   user-destdir
+
 MAKE_JOBS_SAFE=                no
 
 CONFLICTS=             elm-[0-9]*
@@ -35,6 +37,10 @@ SUBST_MESSAGE.errno= Fixing declaration of errno.
 SUBST_FILES.errno=     */*.c
 SUBST_SED.errno=       -e 's,^extern int errno;,\#include <errno.h>,'
 
+# currently not set in files/config.sh
+# (should probably be a package option)
+#SPECIAL_PERMS+=       bin/elm ${ROOT_USER} mail 2755
+
 pre-configure:
        ${CP} ${FILESDIR}/config.sh ${WRKSRC}/
        ${MV} ${WRKSRC}/nls/LANGS ${WRKSRC}/nls/LANGS.tmpl
@@ -42,7 +48,7 @@ pre-configure:
 
 post-install:
        ${INSTALL_DATA} ${FILESDIR}/elm.mimetypes                       \
-               ${PREFIX}/lib/elm.mimetypes-dist
+               ${DESTDIR}${PREFIX}/lib/elm.mimetypes-dist
 
 post-configure:
        ${TOUCH} ${WRKSRC}/config.sh
index 503d55f..576cd48 100644 (file)
@@ -1,17 +1,19 @@
-$NetBSD: distinfo,v 1.4 2008/01/05 19:21:00 rillig Exp $
+$NetBSD: distinfo,v 1.5 2010/04/15 08:13:34 dholland Exp $
 
 SHA1 (elm-2.4ME+93.tar.gz) = 2ce3cee8eb7af9b73e11fb99b901357b1bd5cd4d
 RMD160 (elm-2.4ME+93.tar.gz) = 46b36b2fdc78924ffbbced66c93defa431508e29
 Size (elm-2.4ME+93.tar.gz) = 1569204 bytes
 SHA1 (patch-aa) = 22f5b0219ada56c90cd26b47e9f5beac3af00c4a
-SHA1 (patch-ab) = 288893a202522d3197cd5092273c1dfbcd31f3da
+SHA1 (patch-ab) = 6445b6573934c9497c15050917da6738e883c576
 SHA1 (patch-ac) = c76cbb5adc548bdc68fc860063e5280ff90d7e59
 SHA1 (patch-ad) = 73875671aa53548e1cbe1bfae56acb4792ee4b24
 SHA1 (patch-ae) = 600dbb380442dcbaef51c69d81847b400538bf0f
 SHA1 (patch-bb) = ba9a5645f5dbc66723e8a6b21666b4009fe31f66
 SHA1 (patch-bv) = dc11b6ef449d041ff63055924686d2da2138088f
 SHA1 (patch-ca) = df5ea5f20ffc2c26f8ba2cd5d3a341fbd0ec6f54
-SHA1 (patch-cb) = 2f9dde23fbe375be32d91b6df60c81427c7bf3d0
+SHA1 (patch-cb) = ba7c02eb16746f04c2abf264dd73ed73bcdad8ba
 SHA1 (patch-cc) = 59cae75adfd90c2a14f6c55e83b36bc701cbed97
-SHA1 (patch-cd) = 63f9d58211888d9383e0b2b3d62c0d08ff94d78b
-SHA1 (patch-ce) = 3b692fb3814ceca41c3ba192398468166b46d64b
+SHA1 (patch-cd) = f734efccc0f0c99637a3a527a920e6aa5543da48
+SHA1 (patch-ce) = 862968b558af3a30b2a523566f5e327d579e3f87
+SHA1 (patch-cf) = 4a5c2a09d90358bde1697bb79e09944014a3da72
+SHA1 (patch-cg) = 75e26fab55016ccbe6b1c248d7fd31150971f36d
index 68039cc..c7957c1 100644 (file)
@@ -1,7 +1,10 @@
-$NetBSD: patch-ab,v 1.1.1.1 2001/07/18 19:59:14 martin Exp $
+$NetBSD: patch-ab,v 1.2 2010/04/15 08:13:34 dholland Exp $
 
---- nls/Makefile.orig  Thu Nov 18 14:41:07 1999
-+++ nls/Makefile       Thu Nov 18 14:46:27 1999
+use right gencat
+DESTDIR support
+
+--- nls/Makefile.orig  2001-06-19 17:03:18.000000000 +0000
++++ nls/Makefile
 @@ -3,7 +3,7 @@
  #
  LANGFILE=LANGS
@@ -11,3 +14,12 @@ $NetBSD: patch-ab,v 1.1.1.1 2001/07/18 19:59:14 martin Exp $
  
  HDIR= ../hdrs
  SDIR= C/C/C
+@@ -41,7 +41,7 @@ nls-headers: clean $(HFILES)
+ all:
+ install:
+-      ./Install $(LANGFILE) $(GENCAT) $(CATNAME)
++      DESTDIR=$(DESTDIR) ./Install $(LANGFILE) $(GENCAT) $(CATNAME)
+ $(HFILES): $(MFILES)
+       gencat/gencat $(MSGCAT) "$(SDIR)/`basename $@ .h`".m -h $@
index 27885b9..0abf668 100644 (file)
@@ -1,7 +1,22 @@
-$NetBSD: patch-cb,v 1.1 2006/01/24 19:01:45 joerg Exp $
+$NetBSD: patch-cb,v 1.2 2010/04/15 08:13:34 dholland Exp $
 
---- lib/Makefile.SH.orig       2006-01-24 18:04:57.000000000 +0000
+fix CFLAGS
+DESTDIR support
+
+--- lib/Makefile.SH.orig       2001-06-19 17:03:40.000000000 +0000
 +++ lib/Makefile.SH
+@@ -102,9 +102,9 @@ if $test "$d_shared" = "$define" ; then
+ cat >>Makefile <<SUBSTITUTE
+ SHLIST          = ../shlib/libelmme-base.so
+-INSTLIB               = $shlib/libelmme-base.so$d_shared_rev
++INSTLIB               = \$(DESTDIR)$shlib/libelmme-base.so$d_shared_rev
+ SONAME          = ${soname_opt}$shlib/libelmme-base.so$d_shared_rev
+-SHLIB         = $shlib
++SHLIB         = \$(DESTDIR)$shlib
+ SUBSTITUTE
+ else
 @@ -121,7 +121,7 @@ fi
  $cat >>Makefile <<'!NO!SUBS!'
  
index 846b2fd..215ff5d 100644 (file)
@@ -1,7 +1,19 @@
-$NetBSD: patch-cd,v 1.1 2006/01/24 19:01:45 joerg Exp $
+$NetBSD: patch-cd,v 1.2 2010/04/15 08:13:34 dholland Exp $
 
---- src/Makefile.SH.orig       2006-01-24 18:05:41.000000000 +0000
+fix CFLAGS
+DESTDIR support
+
+--- src/Makefile.SH.orig       2001-06-19 17:03:45.000000000 +0000
 +++ src/Makefile.SH
+@@ -22,7 +22,7 @@ fi
+ case "$d_locale" in
+ define)
+-      localetarget='$(LIB)/elm.mimecharsets'
++      localetarget='$(DESTDIR)$(LIB)/elm.mimecharsets'
+       ;;
+ *)
+       localetarget=
 @@ -83,7 +83,7 @@ cat >>Makefile <<'!NO!SUBS!'
  
  #     Other general variables
@@ -11,3 +23,86 @@ $NetBSD: patch-cd,v 1.1 2006/01/24 19:01:45 joerg Exp $
  INCLDIR               =       ../hdrs
  LINTFLAGS     =       -I$(INCLDIR)
  SHELL         =       /bin/sh
+@@ -216,19 +216,19 @@ ELM_OBJ          =       addr_util.o     \
+ # Standard targets
+ all:          Makefile $(BIN)/elm $(SHLIST)
+-install:      Makefile $(DEST) $(LIB) $(DEST)/elm $(LOCALETARG) $(LIB)/elm.map.bin/unidata.bin 
++install:      Makefile $(DESTDIR)$(DEST) $(DESTDIR)$(LIB) $(DESTDIR)$(DEST)/elm $(LOCALETARG) $(DESTDIR)$(LIB)/elm.map.bin/unidata.bin 
+-$(DEST):
+-              mkdir $(DEST)
++$(DESTDIR)$(DEST):
++              mkdir $(DESTDIR)$(DEST)
+-$(LIB):
+-              mkdir $(LIB)
++$(DESTDIR)$(LIB):
++              mkdir $(DESTDIR)$(LIB)
+-$(LIB)/elm.map.bin: 
+-              mkdir $(LIB)/elm.map.bin
++$(DESTDIR)$(LIB)/elm.map.bin: 
++              mkdir $(DESTDIR)$(LIB)/elm.map.bin
+ uninstall:    
+-              $(RM) $(DEST)/elm $(LOCALETARG) $(LIB)/elm.map.bin/unidata.bin
++              $(RM) $(DESTDIR)$(DEST)/elm $(LOCALETARG) $(DESTDIR)$(LIB)/elm.map.bin/unidata.bin
+ Makefile: Makefile.SH ../config.sh
+       @echo "You must run 'sh Configure -S' or 'sh Configure'"
+@@ -323,17 +323,17 @@ syscall.o:       $(INCLDIR)/headers.h $(INCLDI
+ utils.o:      $(INCLDIR)/headers.h $(INCLDIR)/s_elm.h $(INCLDIR)/me.h
+ #     Dependencies and rules for compiling C programs
+-$(BIN)/elm:   $& $(ELM_OBJ) ../melib/libme.a ../lib/libutil.a 
++$(DESTDIR)$(BIN)/elm: $& $(ELM_OBJ) ../melib/libme.a ../lib/libutil.a 
+               $(CC) $(LFLAGS) -o $@ $(ELM_OBJ) ../melib/libme.a ../lib/libutil.a $(LIBS) $(LIB2)
+ #     Dependencies and rules for installing C programs
+-$(LIB)/elm.mimecharsets: $(BIN)/elm.mimecharsets $(BIN)/elmcharset ../ConfTool/killsets
++$(DESTDIR)$(LIB)/elm.mimecharsets: $(BIN)/elm.mimecharsets $(BIN)/elmcharset ../ConfTool/killsets
+               $(BIN)/elmcharset -G -I ../ConfTool/killsets -w $@ $(BIN)/elm.mimecharsets 
+               $(CHMOD) u=rw,go=r $@
+-$(LIB)/elm.map.bin/unidata.bin: $(LIB) $(LIB)/elm.map.bin ../charset/UNIDATA/UNIDATA2.TXT $(BIN)/elmunidata 
+-              $(BIN)/elmunidata -I -s ../charset/UNIDATA/UNIDATA2.TXT 
++$(DESTDIR)$(LIB)/elm.map.bin/unidata.bin: $(DESTDIR)$(LIB) $(DESTDIR)$(LIB)/elm.map.bin ../charset/UNIDATA/UNIDATA2.TXT $(BIN)/elmunidata 
++              $(BIN)/elmunidata -w $@ -s ../charset/UNIDATA/UNIDATA2.TXT 
+               $(CHMOD) ugo=r $@
+ !NO!SUBS!
+@@ -346,24 +346,26 @@ $(BIN)/elm-shared: $& $(ELM_OBJ) ../meli
+               $(CC) $(LFLAGS) -o $@ $(RPATH) $(ELM_OBJ) ../melib/libme.a ../shlib/libelmme-base.so $(LIBS) $(LIB2)
+-$(DEST)/elm:  $(BIN)/elm-shared
++$(DESTDIR)$(DEST)/elm:        $(BIN)/elm-shared
+               -$(MV) $@ $@.old
+               -$(RM) $@.old
+               $(CP) $(BIN)/elm-shared $@
+-              $(CHGRP) $(MAILGRP) $@
+-              $(CHMOD) $(MAILERMODE) $@
++              $(CHMOD) a+x $@
++              #$(CHGRP) $(MAILGRP) $@
++              #$(CHMOD) $(MAILERMODE) $@
+ !NO!SUBS!
+ else
+ cat >>Makefile <<'!NO!SUBS!'
+-$(DEST)/elm:  $(BIN)/elm
++$(DESTDIR)$(DEST)/elm:        $(BIN)/elm
+               -$(MV) $@ $@.old
+               -$(RM) $@.old
+               $(CP) $(BIN)/elm $@
+-              $(CHGRP) $(MAILGRP) $@
+-              $(CHMOD) $(MAILERMODE) $@
++              $(CHMOD) a+x $@
++              #$(CHGRP) $(MAILGRP) $@
++              #$(CHMOD) $(MAILERMODE) $@
+ !NO!SUBS!
+ fi
index 70af08b..a8427db 100644 (file)
@@ -1,7 +1,23 @@
-$NetBSD: patch-ce,v 1.1 2006/01/24 19:01:45 joerg Exp $
+$NetBSD: patch-ce,v 1.2 2010/04/15 08:13:34 dholland Exp $
 
---- utils/Makefile.SH.orig     2006-01-24 18:05:58.000000000 +0000
+fix CFLAGS
+DESTDIR support
+
+--- utils/Makefile.SH.orig     2001-06-19 17:03:48.000000000 +0000
 +++ utils/Makefile.SH
+@@ -30,10 +30,10 @@ CC         =       $cc
+ CCFLAGS               =       $ccflags $xencf
+ CHMOD         =       $chmod
+ CP            =       $cp
+-DEST          =       $bin
++DEST          =       \$(DESTDIR)$bin
+ ECHO          =       $echo
+ LFLAGS                =       $ldflags $dynamic_opt $xenlf
+-LIB           =       $lib
++LIB           =       \$(DESTDIR)$lib
+ LIB2          =       $dlopen_lib $libs
+ LIBS          =       $termlib $dbm
+ LINT          =       $lint
 @@ -74,7 +74,7 @@ fi
  cat >>Makefile <<'!NO!SUBS!'
  #     Other general variables
diff --git a/mail/elm-me/patches/patch-cf b/mail/elm-me/patches/patch-cf
new file mode 100644 (file)
index 0000000..fe2d3c7
--- /dev/null
@@ -0,0 +1,110 @@
+$NetBSD: patch-cf,v 1.1 2010/04/15 08:13:34 dholland Exp $
+
+DESTDIR support
+
+--- doc/Makefile.SH~   2001-06-19 17:03:39.000000000 +0000
++++ doc/Makefile.SH
+@@ -32,12 +32,15 @@ DEST               =       $bin
+ ECHO          =       $echo
+ FORMATTER     =       $roff
+ FORMATTER_OPTS        =       $roffopts
+-LIB           =       $lib
++PLIB          =       $lib
++LIB           =       \$(DESTDIR)$lib
+ LN            =       $ln
+ MAKE          =       $make
+-MAN           =       $mansrc
++PMAN          =       $mansrc
++MAN           =       \$(DESTDIR)$mansrc
+ MANEXT                =       $manext
+-CATMAN                =       $catmansrc
++PCATMAN               =       $catmansrc
++CATMAN                =       \$(DESTDIR)$catmansrc
+ CATMANEXT     =       $catmanext
+ RM            =       $rm -f
+ TBL           =       $tbl
+@@ -134,42 +137,42 @@ FORMATTED_LIST   =       Alias.fmtd      \
+ # Targets
+ all: 
+-      @if $(TEST) '$(CATMAN)' != none; then $(MAKE) formatted_pages ;  else true ; fi
++      @if $(TEST) '$(PCATMAN)' != none; then $(MAKE) formatted_pages ;  else true ; fi
+ #     The following are no-ops
+ lint:
+ clean:        
+ elm.1.subs: elm.1
+-      $(SED) 's"#LIB#"$(LIB)"g;' < elm.1 > elm.1.subs
++      $(SED) 's"#LIB#"$(PLIB)"g;' < elm.1 > elm.1.subs
+ answer.1.subs: answer.1
+-      $(SED) 's"#LIB#"$(LIB)"g;' < answer.1 > answer.1.subs
++      $(SED) 's"#LIB#"$(PLIB)"g;' < answer.1 > answer.1.subs
+ chkalias.1.subs: chkalias.1
+-      $(SED) 's"#LIB#"$(LIB)"g;' < chkalias.1 > chkalias.1.subs
++      $(SED) 's"#LIB#"$(PLIB)"g;' < chkalias.1 > chkalias.1.subs
+ elmalias.1.subs: elmalias.1
+-      $(SED) 's"#LIB#"$(LIB)"g;' < elmalias.1 > elmalias.1.subs
++      $(SED) 's"#LIB#"$(PLIB)"g;' < elmalias.1 > elmalias.1.subs
+ elmcharset.1.subs: elmcharset.1
+-      $(SED) 's"#LIB#"$(LIB)"g;' < elmcharset.1 > elmcharset.1.subs
++      $(SED) 's"#LIB#"$(PLIB)"g;' < elmcharset.1 > elmcharset.1.subs
+ elmterminal.1.subs: elmterminal.1
+-      $(SED) 's"#LIB#"$(LIB)"g;' < elmterminal.1 > elmterminal.1.subs
++      $(SED) 's"#LIB#"$(PLIB)"g;' < elmterminal.1 > elmterminal.1.subs
+ elmunidata.1.subs: elmunidata.1
+-      $(SED) 's"#LIB#"$(LIB)"g;' < elmunidata.1 > elmunidata.1.subs
++      $(SED) 's"#LIB#"$(PLIB)"g;' < elmunidata.1 > elmunidata.1.subs
+ fastmail.1.subs: fastmail.1
+-      $(SED) 's"#LIB#"$(LIB)"g;' < fastmail.1 > fastmail.1.subs
++      $(SED) 's"#LIB#"$(PLIB)"g;' < fastmail.1 > fastmail.1.subs
+ frm.1.subs: frm.1
+-      $(SED) 's"#LIB#"$(LIB)"g;' < frm.1 > frm.1.subs
++      $(SED) 's"#LIB#"$(PLIB)"g;' < frm.1 > frm.1.subs
+ listalias.1.subs: listalias.1
+-      $(SED) 's"#LIB#"$(LIB)"g;' < listalias.1 > listalias.1.subs
++      $(SED) 's"#LIB#"$(PLIB)"g;' < listalias.1 > listalias.1.subs
+ messages.1.subs: messages.1
+-      $(SED) 's"#LIB#"$(LIB)"g;' < messages.1 > messages.1.subs
++      $(SED) 's"#LIB#"$(PLIB)"g;' < messages.1 > messages.1.subs
+ newalias.1.subs: newalias.1
+-      $(SED) 's"#LIB#"$(LIB)"g;' < newalias.1 > newalias.1.subs
++      $(SED) 's"#LIB#"$(PLIB)"g;' < newalias.1 > newalias.1.subs
+ printmail.1.subs: printmail.1
+-      $(SED) 's"#LIB#"$(LIB)"g;' < printmail.1 > printmail.1.subs
++      $(SED) 's"#LIB#"$(PLIB)"g;' < printmail.1 > printmail.1.subs
+ readmsg.1.subs: readmsg.1
+-      $(SED) 's"#LIB#"$(LIB)"g;' < readmsg.1 > readmsg.1.subs
++      $(SED) 's"#LIB#"$(PLIB)"g;' < readmsg.1 > readmsg.1.subs
+ newmail.1.subs: newmail.1
+-      $(SED) 's"#LIB#"$(LIB)"g;' < newmail.1 > newmail.1.subs
++      $(SED) 's"#LIB#"$(PLIB)"g;' < newmail.1 > newmail.1.subs
+@@ -180,8 +183,8 @@ catman:
+       mkdir catman
+ install: $(LIB_LIST)
+-      @if $(TEST) '$(MAN)' != none; then $(MAKE) install_man ; else true ;  fi
+-      @if $(TEST) '$(CATMAN)' != none; then $(MAKE) install_catman ; else true ;  fi
++      @if $(TEST) '$(PMAN)' != none; then $(MAKE) install_man ; else true ;  fi
++      @if $(TEST) '$(PCATMAN)' != none; then $(MAKE) install_catman ; else true ;  fi
+ install_man: $(MANROOT) $(MAN) $(MAN_LIST) $(MAN)/wnewmail$(MANEXT)
+@@ -195,12 +198,12 @@ $(CATMAN):
+ uninstall:
+       $(RM) $(LIB_LIST) 
+-      @if $(TEST) '$(MAN)' != none; then  \
++      @if $(TEST) '$(PMAN)' != none; then  \
+               $(RM) $(MAN_LIST) $(MAN)/wnewmail$(MANEXT) ; \
+       else \
+               true ; \
+       fi
+-      @if $(TEST) '$(CATMAN)' != none; then \
++      @if $(TEST) '$(PCATMAN)' != none; then \
+               $(RM) $(CATMAN_LIST) $(CATMAN)/wnewmail$(CATMANEXT)$(SUFFIX) ; \
+       else \
+               true ; \
diff --git a/mail/elm-me/patches/patch-cg b/mail/elm-me/patches/patch-cg
new file mode 100644 (file)
index 0000000..cdc7e4b
--- /dev/null
@@ -0,0 +1,24 @@
+$NetBSD: patch-cg,v 1.1 2010/04/15 08:13:34 dholland Exp $
+
+DESTDIR support
+
+--- nls/Install~       2001-06-19 17:03:18.000000000 +0000
++++ nls/Install
+@@ -39,12 +39,12 @@ do
+               echo "\"$InDir\" is not a directory"
+               continue
+       fi
+-      if [ ! -d $DestDir ]
++      if [ ! -d $DESTDIR$DestDir ]
+       then
+-              echo "\"$DestDir\" is not a directory"
++              echo "\"$DESTDIR$DestDir\" is not a directory"
+               continue
+       fi
+-      /bin/rm -f $DestDir/$CATNAME
+-      echo "$GENCAT $DestDir/$CATNAME $InDir/*.m"
+-      $GENCAT $DestDir/$CATNAME $InDir/*.m
++      /bin/rm -f $DESTDIR$DestDir/$CATNAME
++      echo "$GENCAT $DESTDIR$DestDir/$CATNAME $InDir/*.m"
++      $GENCAT $DESTDIR$DestDir/$CATNAME $InDir/*.m
+ done < $LANGFILE
index c01daa5..79bb9a0 100644 (file)
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.3 2009/12/15 16:40:01 joerg Exp $
+# $NetBSD: Makefile,v 1.4 2010/04/15 13:03:21 obache Exp $
 #
 
 DISTNAME=      enma-1.1.0
+PKGREVISION=   1
 CATEGORIES=    mail
 MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=enma/}
 
@@ -15,11 +16,10 @@ GNU_CONFIGURE=      yes
 USE_TOOLS+=    gmake
 
 CONFIGURE_ARGS+=       --with-libmilter=${BUILDLINK_PREFIX.libmilter}
-#CONFIGURE_ARGS+=      --with-libbind=${BUILDLINK_PREFIX.bind}
+CONFIGURE_ARGS+=       --with-libbind=${BUILDLINK_PREFIX.libbind}
+CONFIGURE_ARGS+=       --with-ssl=${SSLBASE}
 CONFIGURE_ARGS+=       --sysconfdir=${PREFIX}/share/examples/enma
 
-BUILDLINK_TRANSFORM+=  opt:-lbind:${RESOLV_LDFLAGS}
-
 BUILD_DEFS+=   VARBASE
 
 CONF_FILES+=   share/examples/enma/enma.conf.sample ${PKG_SYSCONFDIR}/enma.conf
@@ -57,9 +57,7 @@ post-install:
                ${DESTDIR}${PREFIX}/share/examples/enma/enma.conf.sample
 
 .include "../../mail/libmilter/buildlink3.mk"
+.include "../../net/libbind/buildlink3.mk"
+.include "../../security/openssl/buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
-.if ${OPSYS} == "DragonFly"
-USE_BUILTIN.resolv=    no
-.endif
-.include "../../mk/resolv.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
index e5b2a59..7c96b4a 100644 (file)
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.45 2008/05/10 11:52:14 obache Exp $
+# $NetBSD: Makefile,v 1.46 2010/04/15 09:07:37 tron Exp $
 
 DISTNAME=      mm2.7
 PKGNAME=       metamail-2.7
-PKGREVISION=   9
+PKGREVISION=   10
 CATEGORIES=    mail
 MASTER_SITES=  http://ftp.funet.fi/pub/unix/mail/metamail/     \
                ftp://ftp.research.telcordia.com/pub/nsb/
@@ -11,7 +11,7 @@ EXTRACT_SUFX= .tar.Z
 MAINTAINER=    pkgsrc-users@NetBSD.org
 COMMENT=       Implementation of MIME, the Multipurpose Internet Mail Extensions
 
-CONFLICTS+=    elm>=2.5.5 mm-2.7
+CONFLICTS+=    mm-2.7
 
 PKG_INSTALLATION_TYPES=        overwrite pkgviews
 PKG_DESTDIR_SUPPORT=   user-destdir
index 9d5eca2..6d573f4 100644 (file)
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.824 2010/04/11 18:57:01 seb Exp $
+# $NetBSD: Makefile,v 1.825 2010/04/15 12:59:31 obache Exp $
 #
 
 COMMENT=       Networking tools
@@ -210,6 +210,7 @@ SUBDIR+=    lftp
 SUBDIR+=       libIDL
 SUBDIR+=       libares
 SUBDIR+=       libasyncns
+SUBDIR+=       libbind
 SUBDIR+=       libcares
 SUBDIR+=       libdnet
 SUBDIR+=       libfetch
similarity index 100%
rename from wip/libbind/DESCR
rename to net/libbind/DESCR
similarity index 80%
rename from wip/libbind/Makefile
rename to net/libbind/Makefile
index e899358..9e66eed 100644 (file)
@@ -1,4 +1,4 @@
-# $NetBSD$
+# $NetBSD: Makefile,v 1.1.1.1 2010/04/15 12:57:49 obache Exp $
 #
 
 DISTNAME=      libbind-6.0
@@ -7,7 +7,7 @@ MASTER_SITES=   ftp://ftp.isc.org/isc/libbind/6.0/
 
 MAINTAINER=    obache@NetBSD.org
 HOMEPAGE=      https://www.isc.org/software/libbind
-COMMENT=       Standard Resolver Library
+COMMENT=       ISC Standard Resolver Library
 #LICENSE=      isc
 
 PKG_DESTDIR_SUPPORT=   user-destdir
similarity index 94%
rename from wip/libbind/PLIST
rename to net/libbind/PLIST
index 404921e..2417818 100644 (file)
@@ -1,4 +1,4 @@
-@comment $NetBSD$
+@comment $NetBSD: PLIST,v 1.1.1.1 2010/04/15 12:57:49 obache Exp $
 include/bind/arpa/inet.h
 include/bind/arpa/nameser.h
 include/bind/arpa/nameser_compat.h
similarity index 62%
rename from wip/libbind/buildlink3.mk
rename to net/libbind/buildlink3.mk
index 911ea87..0f419f7 100644 (file)
@@ -1,4 +1,4 @@
-# $NetBSD$
+# $NetBSD: buildlink3.mk,v 1.1.1.1 2010/04/15 12:57:49 obache Exp $
 
 BUILDLINK_TREE+=       libbind
 
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=        libbind
 LIBBIND_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.libbind+=        libbind>=6.0
-BUILDLINK_PKGSRCDIR.libbind?=  ../../wip/libbind
+BUILDLINK_PKGSRCDIR.libbind?=  ../../net/libbind
 .endif # LIBBIND_BUILDLINK3_MK
 
 BUILDLINK_TREE+=       -libbind
similarity index 79%
rename from wip/libbind/distinfo
rename to net/libbind/distinfo
index 19eabae..efc29eb 100644 (file)
@@ -1,4 +1,4 @@
-$NetBSD$
+$NetBSD: distinfo,v 1.1.1.1 2010/04/15 12:57:49 obache Exp $
 
 SHA1 (libbind-6.0.tar.gz) = 4664646238cd3602df168da1e9bc9591d3f566b2
 RMD160 (libbind-6.0.tar.gz) = bfafac89a455a05202763f6e10f292978085d811
similarity index 91%
rename from wip/libbind/options.mk
rename to net/libbind/options.mk
index 7a66acf..53c96d9 100644 (file)
@@ -1,4 +1,4 @@
-# $NetBSD$
+# $NetBSD: options.mk,v 1.1.1.1 2010/04/15 12:57:49 obache Exp $
 #
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.libbind
similarity index 86%
rename from wip/libbind/patches/patch-aa
rename to net/libbind/patches/patch-aa
index 4e0fb45..ed9cee5 100644 (file)
@@ -1,4 +1,4 @@
-$NetBSD$
+$NetBSD: patch-aa,v 1.1.1.1 2010/04/15 12:57:49 obache Exp $
 
 --- configure.orig     2009-03-05 01:37:31.000000000 +0000
 +++ configure
index 7c8d3d1..1ca8c7c 100644 (file)
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.199 2010/04/14 14:51:00 sborrill Exp $
+# $NetBSD: Makefile,v 1.200 2010/04/15 09:38:09 sborrill Exp $
 
 .include "Makefile.mirrors"
 
 DISTNAME=              samba-${VERSION}
-PKGREVISION=           2
+PKGREVISION=           3
 CATEGORIES=            net
 MASTER_SITES=          ${SAMBA_MIRRORS:=old-versions/}
 
index 2f1542a..d3cb370 100644 (file)
@@ -1,6 +1,6 @@
 #!@RCD_SCRIPTS_SHELL@
 #
-# $NetBSD: winbindd.sh,v 1.4 2006/05/03 23:23:06 jlam Exp $
+# $NetBSD: winbindd.sh,v 1.5 2010/04/15 09:36:50 sborrill Exp $
 #
 # PROVIDE: winbindd
 # REQUIRE: DAEMON
@@ -12,7 +12,6 @@ rcvar=$name
 command="@PREFIX@/sbin/${name}"
 required_files="@SAMBA_ETCDIR@/smb.conf"
 extra_commands="reload"
-command_args="-B"
 
 load_rc_config $name
 run_rc_command "$1"
index ca1a4e0..9f268fa 100644 (file)
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.8 2010/04/14 14:51:01 sborrill Exp $
+# $NetBSD: Makefile,v 1.9 2010/04/15 09:38:09 sborrill Exp $
 
 .include "../../net/samba/Makefile.mirrors"
 
 DISTNAME=              samba-${VERSION}
+PKGREVISION=           1
 CATEGORIES=            net
 MASTER_SITES=          ${SAMBA_MIRRORS:=old-versions/}
 
index a58f394..6f0ffe0 100644 (file)
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.44 2010/04/13 16:46:01 jmmv Exp $
+# $NetBSD: Makefile,v 1.45 2010/04/15 09:42:45 jmmv Exp $
 
-DISTNAME=      pkg_comp-1.32
+DISTNAME=      pkg_comp-1.33
 CATEGORIES=    pkgtools
 MASTER_SITES=  # empty
 DISTFILES=     # empty
index 41ab9fa..2dff943 100644 (file)
@@ -1,4 +1,4 @@
-.\" $NetBSD: pkg_comp.8,v 1.34 2010/04/13 20:59:19 wiz Exp $
+.\" $NetBSD: pkg_comp.8,v 1.35 2010/04/15 09:42:45 jmmv Exp $
 .\"
 .\" pkg_comp - Build packages inside a clean chroot environment
 .\" Copyright (c) 2002, 2003, 2004, 2005 Julio M. Merino Vidal <jmmv@NetBSD.org>
@@ -27,7 +27,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"
-.Dd April 13, 2010
+.Dd April 15, 2010
 .Dt PKG_COMP 8
 .Os
 .Sh NAME
@@ -265,6 +265,10 @@ See
 for more information.
 Defaults to
 .Ql no .
+.It PKG_DBDIR
+Location of the packages database.
+Defaults to
+.Pa /var/db/pkg .
 .It PKG_SYSCONFBASE
 Base directory of configuration files.
 Defaults to
index 3c7e068..70d9c57 100644 (file)
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $NetBSD: pkg_comp.sh,v 1.36 2010/04/13 16:46:01 jmmv Exp $
+# $NetBSD: pkg_comp.sh,v 1.37 2010/04/15 09:42:45 jmmv Exp $
 #
 # pkg_comp - Build packages inside a clean chroot environment
 # Copyright (c) 2002, 2003, 2004, 2005 Julio M. Merino Vidal <jmmv@NetBSD.org>
@@ -43,7 +43,7 @@ _MKCONF_VARS="WRKDIR_BASENAME MKOBJDIRS BSDSRCDIR WRKOBJDIR DISTDIR PACKAGES \
               PKG_DEVELOPER CLEANDEPENDS LOCALBASE PKG_SYSCONFBASE \
               CFLAGS CPPFLAGS CXXFLAGS USE_AUDIT_PACKAGES PKGVULNDIR \
               USE_XPKGWEDGE PKGSRC_COMPILER \
-              LIBKVER_STANDALONE_PREFIX"
+              LIBKVER_STANDALONE_PREFIX PKG_DBDIR"
 
 _TEMPLATE_VARS="DESTDIR ROOTSHELL COPYROOTCFG BUILD_TARGET DISTRIBDIR SETS \
                 SETS_X11 REAL_SRC REAL_SRC_OPTS REAL_PKGSRC \
@@ -99,6 +99,7 @@ env_setdefaults()
     : ${PKGVULNDIR:=/usr/pkg/share}
     : ${USE_XPKGWEDGE:=yes}
     : ${PKGSRC_COMPILER:=gcc}
+    : ${PKG_DBDIR:=/var/db/pkg}
 
     # Default values for global variables used in the script.
     : ${DESTDIR:=/var/chroot/pkg_comp/default}
@@ -513,16 +514,20 @@ makeroot()
     echo "ENV=/etc/shrc" >> $DESTDIR/etc/profile
     echo "export PS1=\"pkg_comp:`basename $conffile`# \"" >> $DESTDIR/etc/shrc
     echo "set -o emacs" >> $DESTDIR/etc/shrc
+    echo "export PKG_DBDIR=\"${PKG_DBDIR}\"" >> ${DESTDIR}/etc/shrc
 
     # Set csh configuration
     echo "umask 022" >> $DESTDIR/etc/csh.login
     echo "set prompt=\"pkg_comp:`basename $conffile`# \"" >> $DESTDIR/etc/csh.login
     echo "set prompt=\"pkg_comp:`basename $conffile`# \"" >> $DESTDIR/etc/csh.cshrc
+    echo "setenv PKG_DBDIR \"${PKG_DBDIR}\"" >> ${DESTDIR}/etc/csh.cshrc
 
     cp /etc/resolv.conf $DESTDIR/etc/resolv.conf
 
     makeroot_mkconf
 
+    echo "PKG_DBDIR=${PKG_DBDIR}" >> ${DESTDIR}/etc/pkg_install.conf
+
     # From now on, filesystems may be mounted, so we need to trap
     # signals to umount them.
     trap "echo \"*** Process aborted ***\" ; fsumount ; exit 1" INT QUIT
index 0035bdf..822876a 100644 (file)
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.69 2010/01/20 14:46:17 wiz Exp $
+# $NetBSD: Makefile,v 1.70 2010/04/15 09:57:47 tron Exp $
 
-DISTNAME=              stunnel-4.29
+DISTNAME=              stunnel-4.33
 CATEGORIES=            security
-MASTER_SITES=          ftp://ftp.fu-berlin.de/unix/security/stunnel/ \
-                       ftp://stunnel.mirt.net/stunnel/ \
+MASTER_SITES=          ftp://stunnel.mirt.net/stunnel/ \
                        http://www.stunnel.org/download/stunnel/src/
 
 MAINTAINER=            shaun@inerd.com
index 872a2cc..212965b 100644 (file)
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.28 2010/01/20 14:46:17 wiz Exp $
+$NetBSD: distinfo,v 1.29 2010/04/15 09:57:47 tron Exp $
 
-SHA1 (stunnel-4.29.tar.gz) = f93ac9054c62b1db0dcf44f668d323d82cc0f413
-RMD160 (stunnel-4.29.tar.gz) = 7861b38da0c9b1bf5c3aa8c1e9a654d7cedec5ba
-Size (stunnel-4.29.tar.gz) = 544292 bytes
-SHA1 (patch-aa) = 322721b50487cd0eb795df2e3cd45beb86cd95e6
+SHA1 (stunnel-4.33.tar.gz) = 695c7ef834952cb8ddbc790e10b6e32798fc2767
+RMD160 (stunnel-4.33.tar.gz) = b9d32b4c17cf250d3284e020bb9c6b3fc4463cc5
+Size (stunnel-4.33.tar.gz) = 560103 bytes
+SHA1 (patch-aa) = 73bc30792896006853953ac626a45bcc50ca6f62
 SHA1 (patch-ac) = 7b4c4331e97f575b0bb82e6ce8a2b7d9a1483da6
index 61914e7..9603b23 100644 (file)
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.21 2008/10/17 07:31:58 adam Exp $
+$NetBSD: patch-aa,v 1.22 2010/04/15 09:57:47 tron Exp $
 
---- tools/Makefile.in.orig     2008-09-20 22:32:29.000000000 +0200
-+++ tools/Makefile.in
-@@ -167,7 +167,7 @@ target_alias = @target_alias@
+--- tools/Makefile.in.orig     2010-03-31 10:45:09.000000000 +0100
++++ tools/Makefile.in  2010-04-15 10:43:07.000000000 +0100
+@@ -169,7 +169,7 @@
  EXTRA_DIST = ca.html ca.pl importCA.html importCA.sh script.sh \
        stunnel.spec stunnel.cnf stunnel.nsi stunnel.conf
  
@@ -11,7 +11,7 @@ $NetBSD: patch-aa,v 1.21 2008/10/17 07:31:58 adam Exp $
  conf_DATA = stunnel.conf-sample
  examplesdir = $(docdir)/examples
  examples_DATA = ca.html ca.pl importCA.html importCA.sh script.sh \
-@@ -337,7 +337,7 @@ info: info-am
+@@ -334,7 +334,7 @@
  
  info-am:
  
@@ -19,4 +19,4 @@ $NetBSD: patch-aa,v 1.21 2008/10/17 07:31:58 adam Exp $
 +install-data-am: install-confDATA \
        install-examplesDATA
  
- install-exec-am:
+ install-dvi: install-dvi-am
index 2e4afc5..ca1476e 100644 (file)
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.20 2010/02/09 12:31:19 wiz Exp $
+$NetBSD: distinfo,v 1.21 2010/04/15 12:49:41 joerg Exp $
 
 SHA1 (bash-4.1.tar.gz) = 3bd1ec9c66f3689f6b3495bdaaf9077b2e5dc150
 RMD160 (bash-4.1.tar.gz) = 554c7ecb4a63da431768caed1f958c06b8fa7207
 Size (bash-4.1.tar.gz) = 6598300 bytes
 SHA1 (patch-aa) = 24fefdd101926d89b4b9faea1ca74a34bdd5b99f
-SHA1 (patch-af) = 34833c0628a60b5200a9559581c617d878eb62a8
+SHA1 (patch-af) = 769ca529b3a755faa70f517988722276088859b7
 SHA1 (patch-ag) = 4da0a43f6b890482affff46b18eef4be67770e48
index a50bf91..4249a88 100644 (file)
@@ -1,8 +1,8 @@
-$NetBSD: patch-af,v 1.4 2007/09/18 21:20:12 wiz Exp $
+$NetBSD: patch-af,v 1.5 2010/04/15 12:49:41 joerg Exp $
 
---- builtins/printf.def.orig   2007-09-18 15:24:09.000000000 +0000
+--- builtins/printf.def.orig   2009-11-20 20:31:23.000000000 +0000
 +++ builtins/printf.def
-@@ -74,6 +74,11 @@ $END
+@@ -85,6 +85,11 @@ $END
  #  undef PRIdMAX
  #endif
  
@@ -14,7 +14,7 @@ $NetBSD: patch-af,v 1.4 2007/09/18 21:20:12 wiz Exp $
  #if !defined (PRIdMAX)
  #  if HAVE_LONG_LONG
  #    define PRIdMAX   "lld"
-@@ -81,6 +86,13 @@ $END
+@@ -92,6 +97,13 @@ $END
  #    define PRIdMAX   "ld"
  #  endif
  #endif
@@ -28,7 +28,16 @@ $NetBSD: patch-af,v 1.4 2007/09/18 21:20:12 wiz Exp $
  
  #if !defined (errno)
  extern int errno;
-@@ -466,7 +478,11 @@ printf_builtin (list)
+@@ -172,7 +184,7 @@ extern int asprintf __P((char **, const 
+ #endif
+ #if !HAVE_VSNPRINTF
+-extern int vsnprintf __P((char *, size_t, const char *, ...)) __attribute__((__format__ (printf, 3, 4)));
++extern int vsnprintf __P((char *, size_t, const char *, va_list)) __attribute__((__format__ (printf, 3, 0)));
+ #endif
+ static void printf_erange __P((char *));
+@@ -487,7 +499,11 @@ printf_builtin (list)
                p = pp = getintmax ();
                if (p != pp)
                  {
@@ -40,7 +49,7 @@ $NetBSD: patch-af,v 1.4 2007/09/18 21:20:12 wiz Exp $
                    PF (f, pp);
                  }
                else
-@@ -493,7 +509,11 @@ printf_builtin (list)
+@@ -514,7 +530,11 @@ printf_builtin (list)
                p = pp = getuintmax ();
                if (p != pp)
                  {
index 80502d3..34ba8fa 100644 (file)
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.35 2010/04/13 16:05:01 drochner Exp $
+# $NetBSD: Makefile,v 1.36 2010/04/15 11:49:28 jmcneill Exp $
 
 DISTNAME=      libxml2-2.7.7
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
@@ -25,6 +25,8 @@ SUBST_SED.setup=      -e "/ROOT/s,'/usr','${BUILDLINK_PREFIX.libxml2}',g" \
                        -e "/^\"/s,/usr/include,${BUILDLINK_PREFIX.iconv}/include,g" \
                        -e "/^\"/s,/usr/local/include,${BUILDLINK_PREFIX.iconv}/include,g"
 
+BUILD_DEPENDS+=        ${PYPKGPREFIX}-expat>=0:../../textproc/py-expat
+
 BUILDLINK_API_DEPENDS.libxml2+=        libxml2>=${PKGVERSION}
 .include "../../textproc/libxml2/buildlink3.mk"
 
index a67a44f..99c4151 100644 (file)
@@ -1,7 +1,7 @@
 # $NetBSD$
 #
 
-DISTNAME=      ibus-pinyin-1.3.2
+DISTNAME=      ibus-pinyin-1.3.3
 CATEGORIES=    inputmethod chinese
 MASTER_SITES=  http://ibus.googlecode.com/files/
 DISTFILES=     ${DEFAULT_DISTFILES} ${DBTAR}
index 7721e15..345718a 100644 (file)
@@ -12,6 +12,7 @@ share/ibus-pinyin/icons/half.svg
 share/ibus-pinyin/icons/ibus-pinyin.svg
 share/ibus-pinyin/icons/simp-chinese.svg
 share/ibus-pinyin/icons/trad-chinese.svg
+share/ibus-pinyin/phrases.txt
 share/ibus-pinyin/setup/ibus-pinyin-preferences.ui
 share/ibus-pinyin/setup/main.py
 share/ibus-pinyin/setup/main.pyc
index 8604e6a..c2520a5 100644 (file)
@@ -1,13 +1,8 @@
 $NetBSD$
 
-SHA1 (ibus-pinyin-1.3.2.tar.gz) = 0e1026ee575055f5d999489a7416bc1db89ab7bc
-RMD160 (ibus-pinyin-1.3.2.tar.gz) = 835d864ffed1046a50a895e3dc4ffd8f67d85b6a
-Size (ibus-pinyin-1.3.2.tar.gz) = 1557928 bytes
+SHA1 (ibus-pinyin-1.3.3.tar.gz) = cc00ee61e2a68764849d7df3946edd9af4acfe45
+RMD160 (ibus-pinyin-1.3.3.tar.gz) = 56c395e900d00ff6e7b94343f07be49f42dbb543
+Size (ibus-pinyin-1.3.3.tar.gz) = 1559658 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
-SHA1 (patch-aa) = 61b3b7b03fc900965070e5eb24578a923230abda
-SHA1 (patch-ab) = e3eee81cc5667239b988a9953a2d6070e4a71762
-SHA1 (patch-ac) = fd9929e89fec1535c4dec048cf59c7c48f8b422c
-SHA1 (patch-ad) = acd4d6a1ccf93cb4d4fa12326e49f55f4796e15b
-SHA1 (patch-ae) = 68b585a9faed06d9093366fb8560258a30eeccac
diff --git a/wip/ibus-pinyin/patches/patch-aa b/wip/ibus-pinyin/patches/patch-aa
deleted file mode 100644 (file)
index 21fa7be..0000000
+++ /dev/null
@@ -1,29 +0,0 @@
-$NetBSD$
-
---- config.h.in.orig   2010-04-11 00:29:09.000000000 +0000
-+++ config.h.in
-@@ -48,9 +48,24 @@
- /* Define to 1 if you have the <sys/types.h> header file. */
- #undef HAVE_SYS_TYPES_H
-+/* Define to 1 if you have the <sys/uuid.h> header file. */
-+#undef HAVE_SYS_UUID_H
-+
- /* Define to 1 if you have the <unistd.h> header file. */
- #undef HAVE_UNISTD_H
-+/* Define to 1 if you have the `uuid_create' function. */
-+#undef HAVE_UUID_CREATE
-+
-+/* Define to 1 if you have the `uuid_generate' function. */
-+#undef HAVE_UUID_GENERATE
-+
-+/* Define to 1 if you have the <uuid.h> header file. */
-+#undef HAVE_UUID_H
-+
-+/* Define to 1 if you have the <uuid/uuid.h> header file. */
-+#undef HAVE_UUID_UUID_H
-+
- /* Define to the sub-directory in which libtool stores uninstalled libraries.
-    */
- #undef LT_OBJDIR
diff --git a/wip/ibus-pinyin/patches/patch-ab b/wip/ibus-pinyin/patches/patch-ab
deleted file mode 100644 (file)
index abc3839..0000000
+++ /dev/null
@@ -1,40 +0,0 @@
-$NetBSD$
-
---- configure.ac.orig  2010-04-11 00:28:47.000000000 +0000
-+++ configure.ac
-@@ -65,9 +65,34 @@ AC_PATH_PROG(SQLITE3, sqlite3)
- # check uuid
- PKG_CHECK_MODULES(UUID, [
-     uuid
-+],
-+[
-+    cat >>confdefs.h <<_ACEOF
-+#define HAVE_UUID_UUID_H 1
-+#define HAVE_UUID_GENERATE 1
-+_ACEOF
-+],
-+[
-+    uuid_revert_save_LIBS=$LIBS
-+    AC_CHECK_HEADERS(uuid.h uuid/uuid.h sys/uuid.h)
-+    AC_SEARCH_LIBS(uuid_create, uuid, [
-+        if test "$ac_cv_search_uuid_create" != "none required"; then
-+            UUID_LIBS=$ac_cv_search_uuid_create
-+        fi
-+        AC_CHECK_FUNCS(uuid_create)
-+    ],
-+    [
-+        AC_SEARCH_LIBS(uuid_generate, uuid, [
-+            if test "$ac_cv_search_uuid_generate" != "none required"; then
-+                UUID_LIBS=$ac_cv_search_uuid_generate
-+            fi
-+            AC_CHECK_FUNCS(uuid_generate)
-+        ])
-+    ])
-+    LIBS=$uuid_revert_save_LIBS
- ])
--# check uuid
-+# check sigc
- PKG_CHECK_MODULES(SIGC, [
-     sigc++-2.0
- ])
diff --git a/wip/ibus-pinyin/patches/patch-ac b/wip/ibus-pinyin/patches/patch-ac
deleted file mode 100644 (file)
index 575aa39..0000000
+++ /dev/null
@@ -1,376 +0,0 @@
-$NetBSD$
-
---- configure.orig     2010-04-11 00:28:57.000000000 +0000
-+++ configure
-@@ -16529,41 +16529,349 @@ fi
-       # Put the nasty error message in config.log where it belongs
-       echo "$UUID_PKG_ERRORS" >&5
--      as_fn_error "Package requirements (
--    uuid
--) were not met:
-+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-+$as_echo "no" >&6; }
--$UUID_PKG_ERRORS
-+    uuid_revert_save_LIBS=$LIBS
-+    for ac_header in uuid.h uuid/uuid.h sys/uuid.h
-+do :
-+  as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
-+ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
-+eval as_val=\$$as_ac_Header
-+   if test "x$as_val" = x""yes; then :
-+  cat >>confdefs.h <<_ACEOF
-+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
-+_ACEOF
--Consider adjusting the PKG_CONFIG_PATH environment variable if you
--installed software in a non-standard prefix.
-+fi
-+
-+done
-+
-+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing uuid_create" >&5
-+$as_echo_n "checking for library containing uuid_create... " >&6; }
-+if test "${ac_cv_search_uuid_create+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  ac_func_search_save_LIBS=$LIBS
-+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+
-+/* Override any GCC internal prototype to avoid an error.
-+   Use char because int might match the return type of a GCC
-+   builtin and then its argument prototype would still apply.  */
-+#ifdef __cplusplus
-+extern "C"
-+#endif
-+char uuid_create ();
-+int
-+main ()
-+{
-+return uuid_create ();
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+for ac_lib in '' uuid; do
-+  if test -z "$ac_lib"; then
-+    ac_res="none required"
-+  else
-+    ac_res=-l$ac_lib
-+    LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
-+  fi
-+  if ac_fn_c_try_link "$LINENO"; then :
-+  ac_cv_search_uuid_create=$ac_res
-+fi
-+rm -f core conftest.err conftest.$ac_objext \
-+    conftest$ac_exeext
-+  if test "${ac_cv_search_uuid_create+set}" = set; then :
-+  break
-+fi
-+done
-+if test "${ac_cv_search_uuid_create+set}" = set; then :
-+
-+else
-+  ac_cv_search_uuid_create=no
-+fi
-+rm conftest.$ac_ext
-+LIBS=$ac_func_search_save_LIBS
-+fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_uuid_create" >&5
-+$as_echo "$ac_cv_search_uuid_create" >&6; }
-+ac_res=$ac_cv_search_uuid_create
-+if test "$ac_res" != no; then :
-+  test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
-+
-+        if test "$ac_cv_search_uuid_create" != "none required"; then
-+            UUID_LIBS=$ac_cv_search_uuid_create
-+        fi
-+        for ac_func in uuid_create
-+do :
-+  ac_fn_c_check_func "$LINENO" "uuid_create" "ac_cv_func_uuid_create"
-+if test "x$ac_cv_func_uuid_create" = x""yes; then :
-+  cat >>confdefs.h <<_ACEOF
-+#define HAVE_UUID_CREATE 1
-+_ACEOF
-+
-+fi
-+done
-+
-+
-+else
-+
-+        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing uuid_generate" >&5
-+$as_echo_n "checking for library containing uuid_generate... " >&6; }
-+if test "${ac_cv_search_uuid_generate+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  ac_func_search_save_LIBS=$LIBS
-+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+
-+/* Override any GCC internal prototype to avoid an error.
-+   Use char because int might match the return type of a GCC
-+   builtin and then its argument prototype would still apply.  */
-+#ifdef __cplusplus
-+extern "C"
-+#endif
-+char uuid_generate ();
-+int
-+main ()
-+{
-+return uuid_generate ();
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+for ac_lib in '' uuid; do
-+  if test -z "$ac_lib"; then
-+    ac_res="none required"
-+  else
-+    ac_res=-l$ac_lib
-+    LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
-+  fi
-+  if ac_fn_c_try_link "$LINENO"; then :
-+  ac_cv_search_uuid_generate=$ac_res
-+fi
-+rm -f core conftest.err conftest.$ac_objext \
-+    conftest$ac_exeext
-+  if test "${ac_cv_search_uuid_generate+set}" = set; then :
-+  break
-+fi
-+done
-+if test "${ac_cv_search_uuid_generate+set}" = set; then :
-+
-+else
-+  ac_cv_search_uuid_generate=no
-+fi
-+rm conftest.$ac_ext
-+LIBS=$ac_func_search_save_LIBS
-+fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_uuid_generate" >&5
-+$as_echo "$ac_cv_search_uuid_generate" >&6; }
-+ac_res=$ac_cv_search_uuid_generate
-+if test "$ac_res" != no; then :
-+  test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
-+
-+            if test "$ac_cv_search_uuid_generate" != "none required"; then
-+                UUID_LIBS=$ac_cv_search_uuid_generate
-+            fi
-+            for ac_func in uuid_generate
-+do :
-+  ac_fn_c_check_func "$LINENO" "uuid_generate" "ac_cv_func_uuid_generate"
-+if test "x$ac_cv_func_uuid_generate" = x""yes; then :
-+  cat >>confdefs.h <<_ACEOF
-+#define HAVE_UUID_GENERATE 1
-+_ACEOF
-+
-+fi
-+done
-+
-+
-+fi
-+
-+
-+fi
-+
-+    LIBS=$uuid_revert_save_LIBS
--Alternatively, you may set the environment variables UUID_CFLAGS
--and UUID_LIBS to avoid the need to call pkg-config.
--See the pkg-config man page for more details.
--" "$LINENO" 5
- elif test $pkg_failed = untried; then
--      { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
--$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
--as_fn_error "The pkg-config script could not be found or is too old.  Make sure it
--is in your PATH or set the PKG_CONFIG environment variable to the full
--path to pkg-config.
--Alternatively, you may set the environment variables UUID_CFLAGS
--and UUID_LIBS to avoid the need to call pkg-config.
--See the pkg-config man page for more details.
-+    uuid_revert_save_LIBS=$LIBS
-+    for ac_header in uuid.h uuid/uuid.h sys/uuid.h
-+do :
-+  as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
-+ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
-+eval as_val=\$$as_ac_Header
-+   if test "x$as_val" = x""yes; then :
-+  cat >>confdefs.h <<_ACEOF
-+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
-+_ACEOF
-+
-+fi
-+
-+done
-+
-+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing uuid_create" >&5
-+$as_echo_n "checking for library containing uuid_create... " >&6; }
-+if test "${ac_cv_search_uuid_create+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  ac_func_search_save_LIBS=$LIBS
-+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+
-+/* Override any GCC internal prototype to avoid an error.
-+   Use char because int might match the return type of a GCC
-+   builtin and then its argument prototype would still apply.  */
-+#ifdef __cplusplus
-+extern "C"
-+#endif
-+char uuid_create ();
-+int
-+main ()
-+{
-+return uuid_create ();
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+for ac_lib in '' uuid; do
-+  if test -z "$ac_lib"; then
-+    ac_res="none required"
-+  else
-+    ac_res=-l$ac_lib
-+    LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
-+  fi
-+  if ac_fn_c_try_link "$LINENO"; then :
-+  ac_cv_search_uuid_create=$ac_res
-+fi
-+rm -f core conftest.err conftest.$ac_objext \
-+    conftest$ac_exeext
-+  if test "${ac_cv_search_uuid_create+set}" = set; then :
-+  break
-+fi
-+done
-+if test "${ac_cv_search_uuid_create+set}" = set; then :
-+
-+else
-+  ac_cv_search_uuid_create=no
-+fi
-+rm conftest.$ac_ext
-+LIBS=$ac_func_search_save_LIBS
-+fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_uuid_create" >&5
-+$as_echo "$ac_cv_search_uuid_create" >&6; }
-+ac_res=$ac_cv_search_uuid_create
-+if test "$ac_res" != no; then :
-+  test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
-+
-+        if test "$ac_cv_search_uuid_create" != "none required"; then
-+            UUID_LIBS=$ac_cv_search_uuid_create
-+        fi
-+        for ac_func in uuid_create
-+do :
-+  ac_fn_c_check_func "$LINENO" "uuid_create" "ac_cv_func_uuid_create"
-+if test "x$ac_cv_func_uuid_create" = x""yes; then :
-+  cat >>confdefs.h <<_ACEOF
-+#define HAVE_UUID_CREATE 1
-+_ACEOF
-+
-+fi
-+done
-+
-+
-+else
-+
-+        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing uuid_generate" >&5
-+$as_echo_n "checking for library containing uuid_generate... " >&6; }
-+if test "${ac_cv_search_uuid_generate+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  ac_func_search_save_LIBS=$LIBS
-+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+
-+/* Override any GCC internal prototype to avoid an error.
-+   Use char because int might match the return type of a GCC
-+   builtin and then its argument prototype would still apply.  */
-+#ifdef __cplusplus
-+extern "C"
-+#endif
-+char uuid_generate ();
-+int
-+main ()
-+{
-+return uuid_generate ();
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+for ac_lib in '' uuid; do
-+  if test -z "$ac_lib"; then
-+    ac_res="none required"
-+  else
-+    ac_res=-l$ac_lib
-+    LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
-+  fi
-+  if ac_fn_c_try_link "$LINENO"; then :
-+  ac_cv_search_uuid_generate=$ac_res
-+fi
-+rm -f core conftest.err conftest.$ac_objext \
-+    conftest$ac_exeext
-+  if test "${ac_cv_search_uuid_generate+set}" = set; then :
-+  break
-+fi
-+done
-+if test "${ac_cv_search_uuid_generate+set}" = set; then :
-+
-+else
-+  ac_cv_search_uuid_generate=no
-+fi
-+rm conftest.$ac_ext
-+LIBS=$ac_func_search_save_LIBS
-+fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_uuid_generate" >&5
-+$as_echo "$ac_cv_search_uuid_generate" >&6; }
-+ac_res=$ac_cv_search_uuid_generate
-+if test "$ac_res" != no; then :
-+  test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
-+
-+            if test "$ac_cv_search_uuid_generate" != "none required"; then
-+                UUID_LIBS=$ac_cv_search_uuid_generate
-+            fi
-+            for ac_func in uuid_generate
-+do :
-+  ac_fn_c_check_func "$LINENO" "uuid_generate" "ac_cv_func_uuid_generate"
-+if test "x$ac_cv_func_uuid_generate" = x""yes; then :
-+  cat >>confdefs.h <<_ACEOF
-+#define HAVE_UUID_GENERATE 1
-+_ACEOF
-+
-+fi
-+done
-+
-+
-+fi
-+
-+
-+fi
-+
-+    LIBS=$uuid_revert_save_LIBS
--To get pkg-config, see <http://pkg-config.freedesktop.org/>.
--See \`config.log' for more details." "$LINENO" 5; }
- else
-       UUID_CFLAGS=$pkg_cv_UUID_CFLAGS
-       UUID_LIBS=$pkg_cv_UUID_LIBS
-         { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
- $as_echo "yes" >&6; }
--      :
-+
-+    cat >>confdefs.h <<_ACEOF
-+#define HAVE_UUID_UUID_H 1
-+#define HAVE_UUID_GENERATE 1
-+_ACEOF
-+
- fi
--# check uuid
-+# check sigc
- pkg_failed=no
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for SIGC" >&5
diff --git a/wip/ibus-pinyin/patches/patch-ad b/wip/ibus-pinyin/patches/patch-ad
deleted file mode 100644 (file)
index 77a1575..0000000
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD$
-
---- src/PinyinParser.cc.orig   2010-04-08 10:28:18.000000000 +0000
-+++ src/PinyinParser.cc
-@@ -59,8 +59,8 @@ is_pinyin (const gchar *p,
-         return NULL;
-     }
--    len = strnlen (p, 6);
--    len = MIN (len, end - p);
-+    /* len < 0 */
-+    len = MIN (6, end - p);
-     strncpy (buf, p, len);
-     for (; len > 0; len --) {
diff --git a/wip/ibus-pinyin/patches/patch-ae b/wip/ibus-pinyin/patches/patch-ae
deleted file mode 100644 (file)
index ed9e73d..0000000
+++ /dev/null
@@ -1,39 +0,0 @@
-$NetBSD$
-
---- src/Util.h.orig    2010-04-08 07:03:07.000000000 +0000
-+++ src/Util.h
-@@ -1,7 +1,17 @@
- #ifndef __PY_UTIL_H_
- #define __PY_UTIL_H_
-+#ifdef HAVE_CONFIG_H
-+#include "config.h"
-+#endif
-+
-+#if defined(HAVE_UUID_H)
-+#include <uuid.h>
-+#elif defined(HAVE_UUID_UUID_H)
- #include <uuid/uuid.h>
-+#elif defined(HAVE_SYS_UUID_H)
-+#include <sys/uuid.h>
-+#endif
- #include <sys/utsname.h>
- #include <stdlib.h>
- #include "String.h"
-@@ -12,8 +22,16 @@ class UUID {
- public:
-     UUID (void) {
-         uuid_t u;
-+#if defined(HAVE_UUID_CREATE)
-+        gchar* uuid;
-+        uuid_create (&u, 0);
-+        uuid_to_string (&u, &uuid, 0);
-+        strncpy (m_uuid, uuid, sizeof(m_uuid));
-+        free(uuid);
-+#elif defined(HAVE_UUID_GENERATE)
-         uuid_generate (u);
-         uuid_unparse (u, m_uuid);
-+#endif
-     }
-     operator const gchar * (void) const {
diff --git a/wip/ibus-pinyin/patches/patch-af b/wip/ibus-pinyin/patches/patch-af
new file mode 100644 (file)
index 0000000..c3f2e95
--- /dev/null
@@ -0,0 +1,15 @@
+$NetBSD$
+
+--- src/DynamicSpecialPhrase.cc.orig   2010-04-15 03:57:26.000000000 +0000
++++ src/DynamicSpecialPhrase.cc
+@@ -56,8 +56,8 @@ DynamicSpecialPhrase::text (void)
+ inline const std::string
+ DynamicSpecialPhrase::dec (gint d, const gchar *fmt)
+ {
+-    char string [32];
+-    std::snprintf (string, sizeof (string), fmt, d);
++    gchar string [32];
++    g_snprintf (string, sizeof (string), fmt, d);
+     return string;
+ }
diff --git a/wip/libbind/TODO b/wip/libbind/TODO
deleted file mode 100644 (file)
index 1d41a38..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-* builtin libbind detection
-* libbind compatible libresolve detection?
-* replacement for using net/bind9?/buildlink3.mk
diff --git a/wip/nmzmail/TODO b/wip/nmzmail/TODO
new file mode 100644 (file)
index 0000000..9b8f2ba
--- /dev/null
@@ -0,0 +1,2 @@
+* missng dependency on textproc/namazu
+* `mknmz` commmand should be execute with absolute path
diff --git a/wip/wput/TODO b/wip/wput/TODO
new file mode 100644 (file)
index 0000000..71ea988
--- /dev/null
@@ -0,0 +1,2 @@
+* `wdel' command and manpage are not installed.
+* missing message catalogues.