update Thu Oct 22 18:37:00 PDT 2009
authorCharlie <root@crater.dragonflybsd.org>
Fri, 23 Oct 2009 01:47:06 +0000 (18:47 -0700)
committerCharlie <root@crater.dragonflybsd.org>
Fri, 23 Oct 2009 01:47:06 +0000 (18:47 -0700)
32 files changed:
devel/pango/Makefile
devel/pango/hacks.mk [new file with mode: 0644]
doc/CHANGES-2009
doc/TODO
graphics/graphviz/Makefile
misc/gwaei/Makefile
misc/gwaei/PLIST
misc/gwaei/PLIST.gnome [copied from misc/gwaei/PLIST with 72% similarity]
misc/gwaei/distinfo
misc/gwaei/options.mk [new file with mode: 0644]
misc/gwaei/patches/patch-aa [new file with mode: 0644]
news/tin/Makefile
news/tin/distinfo
news/tin/patches/patch-ad [new file with mode: 0644]
news/tin/patches/patch-ae [new file with mode: 0644]
news/tin/patches/patch-af [new file with mode: 0644]
news/tin/patches/patch-ag [new file with mode: 0644]
news/tin/patches/patch-ah [new file with mode: 0644]
news/tin/patches/patch-ai [new file with mode: 0644]
news/tin/patches/patch-aj [new file with mode: 0644]
news/tin/patches/patch-ak [new file with mode: 0644]
news/tin/patches/patch-al [new file with mode: 0644]
pkgtools/pkg_install/files/lib/pkgdb.c
pkgtools/pkg_install/files/lib/version.h
wip/jdk15/distinfo
wip/jdk15/patches/patch-af
x11/Makefile
x11/gselt/DESCR [new file with mode: 0644]
x11/gselt/Makefile [new file with mode: 0644]
x11/gselt/PLIST [new file with mode: 0644]
x11/gselt/distinfo [new file with mode: 0644]
x11/modular-xorg-server/options.mk

index 9da26db..34d4ac5 100644 (file)
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.134 2009/10/21 15:42:18 drochner Exp $
+# $NetBSD: Makefile,v 1.135 2009/10/22 19:54:03 tron Exp $
 
 DISTNAME=              pango-1.26.0
+PKGREVISION=           1
 CATEGORIES=            devel fonts
 MASTER_SITES=          ${MASTER_SITE_GNOME:=sources/pango/1.26/}
 EXTRACT_SUFX=          .tar.bz2
diff --git a/devel/pango/hacks.mk b/devel/pango/hacks.mk
new file mode 100644 (file)
index 0000000..2ce71ee
--- /dev/null
@@ -0,0 +1,14 @@
+# $NetBSD: hacks.mk,v 1.1 2009/10/22 19:54:03 tron Exp $
+
+.if !defined(PANGO_HACKS_MK)
+PANGO_HACKS_MK=        # defined
+
+# Avoid high CPU usage caused by code generaton problems in Apple's G++.
+# Please look here for details:
+# https://bugzilla.gnome.org/show_bug.cgi?id=593240
+
+.  if ${OPSYS} == "Darwin"
+PKG_HACKS+=    darwin-pango-code-gen-bug
+CFLAGS=                -pipe -O0 -g
+.  endif
+.endif
index aa20a13..e355076 100644 (file)
@@ -1,4 +1,4 @@
-$NetBSD: CHANGES-2009,v 1.4048 2009/10/22 18:35:32 adam Exp $
+$NetBSD: CHANGES-2009,v 1.4052 2009/10/22 22:31:26 wiz Exp $
 
 Changes to the packages collection and infrastructure in 2009:
 
@@ -5378,3 +5378,7 @@ Changes to the packages collection and infrastructure in 2009:
        Updated devel/libgnomemm to 2.28.0 [adam 2009-10-22]
        Updated devel/libgnomeuimm to 2.28.0 [adam 2009-10-22]
        Updated graphics/autopano-sift-C to 2.5.1 [adam 2009-10-22]
+       Updated devel/pango to 1.26.0nb1 [tron 2009-10-22]
+       Updated news/tin to 1.9.4nb1 [wiz 2009-10-22]
+       Updated misc/gwaei to 1.0.1 [wiz 2009-10-22]
+       Added x11/gselt version 1.2 [wiz 2009-10-22]
index 5b95ebb..8128414 100644 (file)
--- a/doc/TODO
+++ b/doc/TODO
@@ -1,4 +1,4 @@
-$NetBSD: TODO,v 1.8556 2009/10/22 18:14:56 adam Exp $
+$NetBSD: TODO,v 1.8557 2009/10/22 21:54:15 wiz Exp $
 
 Suggested new packages
 ======================
@@ -713,25 +713,19 @@ For possible perl packages updates, see http://www.pkgbox.org/p2c/
        o gnash-0.8.6
        o gnet1-1.1.9
        o gnetman-20050429
-       o gnome-applets-2.28.0 [GNOME 2.28]
        o gnome-backgrounds-2.28.0 [GNOME 2.28]
        o gnome-bluetooth-2.28.3 [GNOME 2.28]
        o gnome-commander-1.2.8.2
        o gnome-common-2.28.0 [GNOME 2.28]
-       o gnome-control-center-2.28.1 [GNOME 2.28]
-       o gnome-desktop-2.28.0 [GNOME 2.28]
        o gnome-devel-docs-2.28.0 [GNOME 2.28]
        o gnome-games-2.28.1 [GNOME 2.28]
        o gnome-mag-0.15.9 [GNOME 2.28]
-       o gnome-media-2.28.1 [GNOME 2.28]
-       o gnome-menus-2.28.0.1 [GNOME 2.28]
        o gnome-netstatus-2.28.0 [GNOME 2.28]
        o gnome-nettool-2.28.0 [GNOME 2.28]
        o gnome-packagekit-2.28.1 [GNOME 2.28]
        o gnome-power-manager-2.28.1 [GNOME 2.28, wants DeviceKit-power]
        o gnome-screensaver-2.28.0 [GNOME 2.28]
        o gnome-session-2.28.0 [GNOME 2.28]
-       o gnome-settings-daemon-2.28.1 [GNOME 2.28]
        o gnome-subtitles-0.9.1
        o gnome-system-tools-2.28.1 [GNOME 2.28]
        o gnome-terminal-2.28.1 [GNOME 2.28]
@@ -739,7 +733,6 @@ For possible perl packages updates, see http://www.pkgbox.org/p2c/
        o gnome-user-docs-2.28.0 [GNOME 2.28]
        o gnome-user-share-2.26.0 [GNOME 2.26]
        o gnome-utils-2.28.0 [GNOME 2.28]
-       o gnome-vfs-2.24.2
        o gnome-web-photo-0.6 [GNOME 2.26]
        o gnomeicu-0.99.14
        o gnopernicus-1.1.2
@@ -771,7 +764,6 @@ For possible perl packages updates, see http://www.pkgbox.org/p2c/
        o gtk-vnc-0.3.10
        o gtk2-engines-2.18.4 [GNOME 2.28]
        o gtkglarea-2.0.1
-       o gtkhtml324-3.28.1 [GNOME 2.28]
        o gtkimageview-1.6.4
        o gtkmm-documentation-2.16.0 [GNOME 2.26]
        o gtkyahoo-0.18.3
@@ -779,7 +771,6 @@ For possible perl packages updates, see http://www.pkgbox.org/p2c/
        o gtodo-applet-0.16.2
        o gtranscript-0.2.0
        o gtranslator-1.9.6
-       o gucharmap-2.28.1 [GNOME 2.28]
        o guile-gtk-2.0
        o gupnp-0.13.1
        o gv-3.6.7
@@ -888,7 +879,7 @@ For possible perl packages updates, see http://www.pkgbox.org/p2c/
        o libXcomposite-0.4.1
        o libXdamage-1.1.2
        o libXdmcp-1.0.3
-       o libXext-1.1
+       o libXext-1.1.1
        o libXfixes-4.0.4
        o libXfont-1.4.1
        o libXft-2.1.14
@@ -924,7 +915,6 @@ For possible perl packages updates, see http://www.pkgbox.org/p2c/
        o libgii-1.0.2
        o libgiigic-1.1.2
        o libgnomedb-3.1.2
-       o libgnomekbd-2.28.0 [GNOME 2.28]
        o libgsf-1.14.16
        o libhydrogen-0.9.2
        o libiconv-1.13.1
@@ -950,7 +940,6 @@ For possible perl packages updates, see http://www.pkgbox.org/p2c/
        o libtool-base-2.2.6a
        o libusb-1.0
        o libv4l-0.6.2
-       o libwnck-2.28.0 [GNOME 2.28]
        o libxkbfile-1.0.6
        o licq-1.3.6
        o lighttpd-1.4.23
@@ -1009,7 +998,6 @@ For possible perl packages updates, see http://www.pkgbox.org/p2c/
        o mercury-0.13.1
        o mergeant-0.67
        o mesure-0.7.2
-       o metacity-2.28.0 [GNOME 2.28]
        o mftrace-1.2.15
        o mgetty+sendfax-1.1.35
        o mimedefang-2.67
@@ -1049,7 +1037,6 @@ For possible perl packages updates, see http://www.pkgbox.org/p2c/
        o mysqlcc-0.9.8
        o nagios-3.2.0
        o nap-1.5.3
-       o nautilus-2.28.1 [GNOME 2.28]
        o nautilus-sendto-1.1.7
        o navi2ch-1.8.1
        o nawk-20071023
@@ -1125,6 +1112,7 @@ For possible perl packages updates, see http://www.pkgbox.org/p2c/
        o paprefs-0.9.8
        o pari-2.3.3 [pkg/38116]
        o pari-galdata-2.2 [pkg/38117]
+       o parrot-1.7.0
        o patchutils-0.3.1
        o pavucontrol-0.9.8
        o pcal-4.8
@@ -1385,6 +1373,7 @@ For possible perl packages updates, see http://www.pkgbox.org/p2c/
        o stratagus-2.2.2
        o streamripper-1.63.0
        o subtitleeditor-0.33.0
+       o subversion-1.6.6
        o suse_base-11.0
        o swfdec-gnome-2.28.0
        o swi-prolog-5.6.31
@@ -1632,7 +1621,6 @@ For possible perl packages updates, see http://www.pkgbox.org/p2c/
        o yorick-2.1.05
        o zebra-0.95a
        o zenicb-1.31 (needs merge with lots of local changes)
-       o zenity-2.28.0 [GNOME 2.28]
        o zephyr-20070719
        o zile-2.3.12
        o zircon-1.18.256
index 54b6999..f6ccf97 100644 (file)
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.76 2009/09/13 11:17:30 sno Exp $
+# $NetBSD: Makefile,v 1.77 2009/10/22 20:33:59 snj Exp $
 
 DISTNAME=      graphviz-2.24.0
 CATEGORIES=    graphics
@@ -16,6 +16,8 @@ DEPENDS+= ghostscript-fonts>=6.0:../../fonts/ghostscript-fonts
 
 CHECK_FILES_SKIP=      ${PREFIX}/lib/graphviz/config6
 
+PRIVILEGED_STAGES+=    clean
+
 USE_LANGUAGES=         c c++
 USE_LIBTOOL=           yes
 USE_TOOLS+=            bison pkg-config
index 6afbec2..75f4cfd 100644 (file)
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.8 2009/08/26 19:58:01 sno Exp $
+# $NetBSD: Makefile,v 1.9 2009/10/22 22:27:23 wiz Exp $
 #
 
-DISTNAME=      gwaei-0.15.3
-PKGREVISION=   1
+DISTNAME=      gwaei-1.0.1
 CATEGORIES=    misc
 MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=gwaei/}
 
@@ -18,13 +17,11 @@ GNU_CONFIGURE=              yes
 USE_PKGLOCALEDIR=      yes
 USE_TOOLS+=            gmake perl pkg-config
 
-GCONF_SCHEMAS=         gwaei.schemas
-
-SUBST_CLASSES+=                perl
-SUBST_STAGE.perl=      pre-configure
-SUBST_FILES.perl=      src/kpengine/Makefile.in
-SUBST_SED.perl=                -e "s,/usr/bin/perl,${PERL5},"
-SUBST_MESSAGE.perl=    Fixing path to perl.
+#SUBST_CLASSES+=               perl
+#SUBST_STAGE.perl=     pre-configure
+#SUBST_FILES.perl=     src/kpengine/Makefile.in
+#SUBST_SED.perl=               -e "s,/usr/bin/perl,${PERL5},"
+#SUBST_MESSAGE.perl=   Fixing path to perl.
 
 SUBST_CLASSES+=                rsync
 SUBST_STAGE.rsync=     pre-configure
@@ -32,22 +29,15 @@ SUBST_FILES.rsync=  src/io.c
 SUBST_SED.rsync=       -e "s,@RSYNC@,${LOCALBASE}/bin/rsync,"
 SUBST_MESSAGE.rsync=   Fixing path to rsync.
 
-post-install:
-       ${INSTALL_DATA} ${WRKSRC}/src/schemas/gwaei.schemas \
-               ${DESTDIR}${PREFIX}/share/gconf/schemas/
+PLIST_SRC=             PLIST
+.include "options.mk"
 
-BUILDLINK_API_DEPENDS.GConf+=  GConf>=2.22.0
-.include "../../devel/GConf/schemas.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
 BUILDLINK_API_DEPENDS.glib2+=  glib2>=2.16.0
 .include "../../devel/glib2/buildlink3.mk"
-BUILDLINK_API_DEPENDS.libgnome+=       libgnome>=2.22.0
-.include "../../devel/libgnome/buildlink3.mk"
-BUILDLINK_API_DEPENDS.libsexy+=                libsexy>=0.1.11
-.include "../../devel/libsexy/buildlink3.mk"
-.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
 BUILDLINK_API_DEPENDS.curl+=   curl>=7.18.0
 .include "../../www/curl/buildlink3.mk"
 BUILDLINK_API_DEPENDS.gtk2+=   gtk2+>=2.12.0
 .include "../../x11/gtk2/buildlink3.mk"
+.include "../../textproc/gnome-doc-utils/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
index 40384f8..17660f9 100644 (file)
@@ -1,36 +1,9 @@
-@comment $NetBSD: PLIST,v 1.6 2009/06/14 18:07:22 joerg Exp $
-bin/waei
+@comment $NetBSD: PLIST,v 1.7 2009/10/22 22:27:23 wiz Exp $
 bin/gwaei
-share/applications/gwaei.desktop
+bin/waei
 share/doc/${PKGNAME}/COPYING
 share/doc/${PKGNAME}/ChangeLog
 share/doc/${PKGNAME}/NEWS
-share/gconf/schemas/gwaei.schemas
-share/gnome/help/gwaei/C/glossary.xml
-share/gnome/help/gwaei/C/index.xml
-share/gwaei/character.png
-share/gwaei/character2.png
-share/gwaei/character3.png
-share/gwaei/jdata.dat
-share/gwaei/kanjipad.xml
-share/gwaei/kpengine
-share/gwaei/logo.png
-share/gwaei/main.xml
-share/gwaei/radicals.xml
-share/gwaei/settings.xml
-share/icons/hicolor/16x16/actions/non-word-boundary.png
-share/icons/hicolor/16x16/actions/unknown-character.png
-share/icons/hicolor/16x16/actions/word-boundary.png
-share/icons/hicolor/16x16/apps/gwaei.png
-share/icons/hicolor/22x22/actions/non-word-boundary.png
-share/icons/hicolor/22x22/actions/unknown-character.png
-share/icons/hicolor/22x22/actions/word-boundary.png
-share/icons/hicolor/24x24/actions/non-word-boundary.png
-share/icons/hicolor/24x24/actions/unknown-character.png
-share/icons/hicolor/24x24/actions/word-boundary.png
-share/icons/hicolor/24x24/apps/gwaei.png
-share/icons/hicolor/32x32/apps/gwaei.png
-share/icons/hicolor/48x48/apps/gwaei.png
 share/locale/en@boldquot/LC_MESSAGES/gwaei.mo
 share/locale/en@quot/LC_MESSAGES/gwaei.mo
 share/locale/es/LC_MESSAGES/gwaei.mo
similarity index 72%
copy from misc/gwaei/PLIST
copy to misc/gwaei/PLIST.gnome
index 40384f8..ebe122f 100644 (file)
@@ -1,13 +1,9 @@
-@comment $NetBSD: PLIST,v 1.6 2009/06/14 18:07:22 joerg Exp $
-bin/waei
+@comment $NetBSD: PLIST.gnome,v 1.1 2009/10/22 22:27:23 wiz Exp $
 bin/gwaei
 share/applications/gwaei.desktop
-share/doc/${PKGNAME}/COPYING
-share/doc/${PKGNAME}/ChangeLog
-share/doc/${PKGNAME}/NEWS
 share/gconf/schemas/gwaei.schemas
 share/gnome/help/gwaei/C/glossary.xml
-share/gnome/help/gwaei/C/index.xml
+share/gnome/help/gwaei/C/gwaei.xml
 share/gwaei/character.png
 share/gwaei/character2.png
 share/gwaei/character3.png
@@ -31,8 +27,4 @@ share/icons/hicolor/24x24/actions/word-boundary.png
 share/icons/hicolor/24x24/apps/gwaei.png
 share/icons/hicolor/32x32/apps/gwaei.png
 share/icons/hicolor/48x48/apps/gwaei.png
-share/locale/en@boldquot/LC_MESSAGES/gwaei.mo
-share/locale/en@quot/LC_MESSAGES/gwaei.mo
-share/locale/es/LC_MESSAGES/gwaei.mo
-share/locale/it/LC_MESSAGES/gwaei.mo
-share/locale/ja/LC_MESSAGES/gwaei.mo
+share/omf/gwaei/gwaei-C.omf
index fc1ae92..26cdf83 100644 (file)
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.6 2009/03/22 17:37:39 wiz Exp $
+$NetBSD: distinfo,v 1.7 2009/10/22 22:27:23 wiz Exp $
 
-SHA1 (gwaei-0.15.3.tar.gz) = d92c269c6b049774c6b6e51058d78c12ee6c2d6a
-RMD160 (gwaei-0.15.3.tar.gz) = 87df84e149c6a6a0dec62641937fe104648476aa
-Size (gwaei-0.15.3.tar.gz) = 536092 bytes
+SHA1 (gwaei-1.0.1.tar.gz) = 8638b7365e8a06c6bc0565fb5fac497081b81ee1
+RMD160 (gwaei-1.0.1.tar.gz) = 2456cfd89767d61e408d1c94019a479b90eda4ee
+Size (gwaei-1.0.1.tar.gz) = 551430 bytes
+SHA1 (patch-aa) = a9f5f6dda8efe6140bce1b9d9132ffd2f302e15a
diff --git a/misc/gwaei/options.mk b/misc/gwaei/options.mk
new file mode 100644 (file)
index 0000000..bfbf7d5
--- /dev/null
@@ -0,0 +1,28 @@
+# $NetBSD: options.mk,v 1.1 2009/10/22 22:27:23 wiz Exp $
+
+PKG_OPTIONS_VAR=       PKG_OPTIONS.gwaei
+PKG_SUPPORTED_OPTIONS= gnome
+PKG_SUGGESTED_OPTIONS= gnome
+
+.include "../../mk/bsd.options.mk"
+
+.if !empty(PKG_OPTIONS:Mgnome)
+GCONF_SCHEMAS=         gwaei.schemas
+PLIST_SRC+=            PLIST.gnome
+
+post-install:
+       ${INSTALL_DATA} ${WRKSRC}/src/schemas/gwaei.schemas \
+               ${DESTDIR}${PREFIX}/share/gconf/schemas/
+
+BUILDLINK_API_DEPENDS.GConf+=  GConf>=2.22.0
+.include "../../devel/GConf/schemas.mk"
+BUILDLINK_API_DEPENDS.libgnome+=       libgnome>=2.22.0
+.include "../../devel/libgnome/buildlink3.mk"
+BUILDLINK_API_DEPENDS.libsexy+=                libsexy>=0.1.11
+.include "../../devel/libsexy/buildlink3.mk"
+.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
+.include "../../sysutils/desktop-file-utils/desktopdb.mk"
+.include "../../mk/omf-scrollkeeper.mk"
+.else
+CONFIGURE_ARGS+=       --without-gnome
+.endif
diff --git a/misc/gwaei/patches/patch-aa b/misc/gwaei/patches/patch-aa
new file mode 100644 (file)
index 0000000..dc1f49d
--- /dev/null
@@ -0,0 +1,17 @@
+$NetBSD: patch-aa,v 1.1 2009/10/22 22:27:23 wiz Exp $
+
+From upstream, will be in next release.
+
+--- src/preferences-gconf.c.orig       2009-05-25 03:57:50.000000000 +0200
++++ src/preferences-gconf.c    2009-10-23 00:17:03.000000000 +0200
+@@ -170,6 +168,10 @@
+       return_value = NULL;
+       strncpy(output, backup, n);
+     }
++    else if (return_value == NULL || strlen(return_value) == 0)
++    {
++      strncpy(output, backup, n);
++    }
+     else
+     {
+       strncpy(output, return_value, n);
index 56f599a..1568c6f 100644 (file)
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.42 2009/08/23 16:49:54 wiz Exp $
+# $NetBSD: Makefile,v 1.43 2009/10/22 22:01:25 wiz Exp $
 #
 
 DISTNAME=      tin-1.9.4
+PKGREVISION=   1
 CATEGORIES=    news
 MASTER_SITES=  ftp://ftp.tin.org/pub/news/clients/tin/unstable/ \
                ftp://ftp.cs.tu-berlin.de/pub/net/news/tin/unstable/
index 8048f60..dd4a79c 100644 (file)
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.16 2009/07/22 10:53:51 wiz Exp $
+$NetBSD: distinfo,v 1.17 2009/10/22 22:01:25 wiz Exp $
 
 SHA1 (tin-1.9.4.tar.bz2) = e1f5ff2f04923137f43119b144f8a20e733eea23
 RMD160 (tin-1.9.4.tar.bz2) = 6a85e47ea06f2e86f2b8f688df137432ecb7c4e9
@@ -6,3 +6,12 @@ Size (tin-1.9.4.tar.bz2) = 1526534 bytes
 SHA1 (patch-aa) = a3d40ff4e38230bcf8a3814c92ec2a75f85bf44e
 SHA1 (patch-ab) = 34794d259ae4fb81888184ded9876ab5874d8731
 SHA1 (patch-ac) = b5e72a659414833db5f18c2e8f3404dadd03f87f
+SHA1 (patch-ad) = 598a9e287a343eff866ac95d89ed7724eb364c0c
+SHA1 (patch-ae) = 558deb467d7c3c423d4982952a736a501c906355
+SHA1 (patch-af) = c71cfb049312ac4931bb2d488623aa249d255486
+SHA1 (patch-ag) = 6885a9a8444129288207904084963705fb60aaea
+SHA1 (patch-ah) = bac7062665d7351f88081d8582110c079d828228
+SHA1 (patch-ai) = d956f88aff41969e25857af60b04e92c055fb8d2
+SHA1 (patch-aj) = db18012097b3f7fbc1108c1ec530658dc2d3ff1d
+SHA1 (patch-ak) = 746c6edfef424e8ccfd93f945e51eea4b93f4f1c
+SHA1 (patch-al) = f17d06620d7556f90cd72de443ac27fe91604896
diff --git a/news/tin/patches/patch-ad b/news/tin/patches/patch-ad
new file mode 100644 (file)
index 0000000..08b5aa0
--- /dev/null
@@ -0,0 +1,12 @@
+$NetBSD: patch-ad,v 1.3 2009/10/22 22:01:26 wiz Exp $
+
+--- include/proto.h.orig       2009-01-25 19:59:14.000000000 +0100
++++ include/proto.h
+@@ -503,6 +503,7 @@ extern t_bool prompt_option_string(enum 
+ extern t_bool prompt_string(const char *prompt, char *buf, int which_hist);
+ extern void prompt_continue(void);
+ extern void prompt_slk_redraw(void);
++extern void prompt_yn_redraw(void);
+ /* read.c */
+ extern char *tin_fgets(FILE *fp, t_bool header);
diff --git a/news/tin/patches/patch-ae b/news/tin/patches/patch-ae
new file mode 100644 (file)
index 0000000..56d6b7b
--- /dev/null
@@ -0,0 +1,12 @@
+$NetBSD: patch-ae,v 1.1 2009/10/22 22:01:26 wiz Exp $
+
+--- include/tcurses.h.orig     2008-12-30 20:27:28.000000000 +0100
++++ include/tcurses.h
+@@ -95,6 +95,7 @@
+ #             define HpGlitch(func)                   /*nothing*/
+ extern int cmdReadCh(void);
++extern int cmd_get_arrow_key(int prech);
+ extern char *screen_contents(int row, int col, char *buffer);
+ extern void MoveCursor(int row, int col);
+ extern void my_erase(void);
diff --git a/news/tin/patches/patch-af b/news/tin/patches/patch-af
new file mode 100644 (file)
index 0000000..20ccc88
--- /dev/null
@@ -0,0 +1,13 @@
+$NetBSD: patch-af,v 1.1 2009/10/22 22:01:26 wiz Exp $
+
+--- include/tin.h.orig 2009-02-10 18:10:02.000000000 +0100
++++ include/tin.h
+@@ -98,7 +98,7 @@
+ #include      <signal.h>
+ enum context { cMain, cArt, cConfig, cFilter, cGroup, cHelp, cInfopager, cPage, cSelect, cThread };
+-enum icontext { cNone, cGetline, cPromptSLK };
++enum icontext { cNone, cGetline, cPromptCONT, cPromptSLK, cPromptYN };
+ enum resizer { cNo, cYes, cRedraw };
+ enum rc_state { RC_IGNORE, RC_CHECK, RC_UPGRADE, RC_DOWNGRADE, RC_ERROR };
diff --git a/news/tin/patches/patch-ag b/news/tin/patches/patch-ag
new file mode 100644 (file)
index 0000000..1735296
--- /dev/null
@@ -0,0 +1,28 @@
+$NetBSD: patch-ag,v 1.1 2009/10/22 22:01:26 wiz Exp $
+
+--- src/curses.c.orig  2008-12-30 20:26:23.000000000 +0100
++++ src/curses.c
+@@ -32,6 +32,7 @@
+ #if defined(MULTIBYTE_ABLE) && !defined(NO_LOCALE) && defined(M_UNIX)
+ #     define ReadWch cmdReadWch
+ #endif /* MULTIBYTE_ABLE && !NO_LOCALE && M_UNIX */
++#define get_arrow_key cmd_get_arrow_key
+ void my_dummy(void) { }       /* ANSI C requires non-empty file */
+ t_bool have_linescroll = TRUE;        /* USE_CURSES always allows line scrolling */
+@@ -920,6 +921,7 @@ word_highlight_string(
+                       tputs(_reset, 1, outchar);
+       stow_cursor();
+ }
++#endif /* USE_CURSES */
+ /*
+@@ -1142,7 +1144,6 @@ get_arrow_key(
+                       return KEYMAP_UNKNOWN;
+       }
+ }
+-#endif /* USE_CURSES */
+ /*
diff --git a/news/tin/patches/patch-ah b/news/tin/patches/patch-ah
new file mode 100644 (file)
index 0000000..bc87284
--- /dev/null
@@ -0,0 +1,23 @@
+$NetBSD: patch-ah,v 1.1 2009/10/22 22:01:26 wiz Exp $
+
+--- src/feed.c.orig    2008-12-30 20:26:23.000000000 +0100
++++ src/feed.c
+@@ -607,8 +607,10 @@ feed_articles(
+                       EndWin(); /* Turn off curses/windowing */
+                       Raw(FALSE);
+                       fflush(stdout);
++                      set_signal_catcher(FALSE);
+                       if ((pipe_fp = popen(tinrc.default_pipe_command, "w")) == NULL) {
+                               perror_message(_(txt_command_failed), tinrc.default_pipe_command);
++                              set_signal_catcher(TRUE);
+                               Raw(TRUE);
+                               InitWin();
+                               return;
+@@ -846,6 +848,7 @@ got_sig_pipe_while_piping:
+                       got_sig_pipe = FALSE;
+                       fflush(pipe_fp);
+                       (void) pclose(pipe_fp);
++                      set_signal_catcher(TRUE);
+                       Raw(TRUE);
+                       InitWin();
+                       prompt_continue();
diff --git a/news/tin/patches/patch-ai b/news/tin/patches/patch-ai
new file mode 100644 (file)
index 0000000..40d7800
--- /dev/null
@@ -0,0 +1,15 @@
+$NetBSD: patch-ai,v 1.1 2009/10/22 22:01:26 wiz Exp $
+
+--- src/nntplib.c.orig 2009-02-09 11:03:19.000000000 +0100
++++ src/nntplib.c
+@@ -888,6 +888,10 @@ get_server(
+        *       leave the s_gets() in that case)
+        */
+       while (nntp_rd_fp == NULL || s_gets(string, size, nntp_rd_fp) == NULL) {
++              if (errno == EINTR) {
++                      errno = 0;
++                      continue;
++              }
+               if (quitting)                                           /* Don't bother to reconnect */
+                       tin_done(NNTP_ERROR_EXIT);              /* And don't try to disconnect again! */
diff --git a/news/tin/patches/patch-aj b/news/tin/patches/patch-aj
new file mode 100644 (file)
index 0000000..d1df7c1
--- /dev/null
@@ -0,0 +1,110 @@
+$NetBSD: patch-aj,v 1.1 2009/10/22 22:01:26 wiz Exp $
+
+--- src/prompt.c.orig  2009-01-23 16:10:39.000000000 +0100
++++ src/prompt.c
+@@ -44,6 +44,7 @@
+ static char *prompt_slk_message;      /* prompt message for prompt_slk_redraw */
++static char *prompt_yn_message;
+ /*
+  * Local prototypes
+@@ -163,7 +164,7 @@ prompt_yn(
+ {
+       char *keyprompt;
+       char keyno[MAXKEYLEN], keyyes[MAXKEYLEN];
+-      int keyyes_len = 0, keyno_len = 0, maxlen;
++      int keyyes_len = 0, keyno_len = 0, maxlen, prompt_len;
+       t_function func;
+ #if defined (MULTIBYTE_ABLE) && !defined(NO_LOCALE)
+       wint_t yes, no, prompt_ch, ch;
+@@ -194,21 +195,17 @@ prompt_yn(
+       keyno_len = (int) strlen(keyno);
+ #endif /* MULTIBYTE_ABLE && !NO_LOCALE */
+       maxlen = MAX(keyyes_len, keyno_len);
++      prompt_len = (int) strlen(prompt) + keyyes_len + keyno_len + maxlen + 6;
++      prompt_yn_message = my_malloc(prompt_len + 1);
++
++      input_context = cPromptYN;
+       do {
+               prompt_ch = (default_answer ? yes : no);
+               keyprompt = (default_answer ? keyyes : keyno);
+-              if (!cmd_line) {
+-                      MoveCursor(cLINES, 0);
+-                      CleartoEOLN();
+-              }
+-              my_printf("%s (%s/%s) %-*s", prompt, keyyes, keyno, maxlen, keyprompt);
+-              if (!cmd_line)
+-                      cursoron();
+-              my_flush();
+-              if (!cmd_line)
+-                      MoveCursor(cLINES, (int) strlen(prompt) + keyyes_len + keyno_len + 5);
++              snprintf(prompt_yn_message, prompt_len, "%s (%s/%s) %-*s", prompt, keyyes, keyno, maxlen, keyprompt);
++              prompt_yn_redraw();
+ #if defined (MULTIBYTE_ABLE) && !defined(NO_LOCALE)
+               if (((ch = ReadWch()) == '\n') || (ch == '\r'))
+@@ -248,6 +245,9 @@ prompt_yn(
+               func = key_to_func(ch, prompt_keys);
+       } while (func == NOT_ASSIGNED);
++      input_context = cNone;
++      FreeAndNull(prompt_yn_message);
++
+       if (!cmd_line) {
+               clear_message();
+               my_flush();
+@@ -256,6 +256,24 @@ prompt_yn(
+ }
++/* (Re)draws the prompt message for prompt_yn() */
++void
++prompt_yn_redraw(
++      void)
++{
++      if (!cmd_line) {
++              MoveCursor(cLINES, 0);
++              CleartoEOLN();
++      }
++      my_printf("%s", prompt_yn_message);
++      if (!cmd_line)
++              cursoron();
++      my_flush();
++      if (!cmd_line)
++              MoveCursor(cLINES, (int) strlen(prompt_yn_message) -1);
++}
++
++
+ /*
+  * help_text is displayed near the bottom of the screen.
+  * var is an index into a list containing size elements.
+@@ -745,11 +763,14 @@ prompt_continue(
+       void)
+ {
+       int ch;
++      int save_signal_context = signal_context;
+ #ifdef USE_CURSES
+       cmd_line = TRUE;
+ #endif /* USE_CURSES */
+       info_message(_(txt_return_key));
++      signal_context = cMain;
++      input_context = cPromptCONT;
+       switch ((ch = ReadCh())) {
+               case ESC:
+@@ -763,6 +784,10 @@ prompt_continue(
+                       break;
+       }
++      input_context = cNone;
++      signal_context = save_signal_context;
++      my_fputc('\n', stdout);
++
+ #ifdef USE_CURSES
+       cmd_line = FALSE;
+       my_retouch();
diff --git a/news/tin/patches/patch-ak b/news/tin/patches/patch-ak
new file mode 100644 (file)
index 0000000..26547f8
--- /dev/null
@@ -0,0 +1,84 @@
+$NetBSD: patch-ak,v 1.1 2009/10/22 22:01:26 wiz Exp $
+
+--- src/signal.c.orig  2008-12-30 20:26:25.000000000 +0100
++++ src/signal.c
+@@ -104,6 +104,8 @@ int need_resize = cNo;
+  */
+ int NOTESLINES;
++static t_bool redraw_after_suspend;
++
+ #ifndef __LCLINT__ /* lclint doesn't like it */
+ static const struct {
+@@ -268,7 +270,7 @@ handle_resize(
+       switch (signal_context) {
+               case cArt:
+                       ClearScreen();
+-                      show_art_msg(curr_group->name);
++                      show_art_msg(CURR_GROUP.name);
+                       break;
+               case cConfig:
+@@ -303,14 +305,24 @@ handle_resize(
+                       gl_redraw();
+                       break;
++              case cPromptCONT:
++                      if (redraw_after_suspend)
++                              info_message(_(txt_return_key));
++                      break;
++
+               case cPromptSLK:
+                       prompt_slk_redraw();
+                       break;
++              case cPromptYN:
++                      prompt_yn_redraw();
++                      break;
++
+               default:
+                       break;
+       }
+       my_fflush(stdout);
++      redraw_after_suspend = FALSE;
+ #endif /* SIGWINCH || SIGTSTP */
+ }
+@@ -320,22 +332,34 @@ static void
+ handle_suspend(
+       void)
+ {
++      t_bool save_cmd_line = cmd_line;
++      t_bool save_state = (!batch_mode || !cmd_line);
++
+       TRACE(("handle_suspend(%d)", signal_context));
+       set_keypad_off();
+       if (!cmd_line)
+               set_xclick_off();
+-      Raw(FALSE);
++      if (save_state) {
++              EndWin();
++              Raw(FALSE);
++      }
++
+       wait_message(0, _(txt_suspended_message), tin_progname);
+       kill(0, SIGSTOP);                               /* Put ourselves to sleep */
+       RESTORE_HANDLER(SIGTSTP, signal_handler);
+-      if (!batch_mode) {
++      if (save_state) {
+               Raw(TRUE);
++              InitWin();
++              cmd_line = save_cmd_line;
++              if (!cmd_line)
++                      my_retouch();
+               need_resize = cRedraw;          /* Flag a redraw */
++              redraw_after_suspend = TRUE;
+       }
+       set_keypad_on();
+       if (!cmd_line)
diff --git a/news/tin/patches/patch-al b/news/tin/patches/patch-al
new file mode 100644 (file)
index 0000000..581bdf6
--- /dev/null
@@ -0,0 +1,142 @@
+$NetBSD: patch-al,v 1.1 2009/10/22 22:01:26 wiz Exp $
+
+--- src/tcurses.c.orig 2008-12-30 20:26:25.000000000 +0100
++++ src/tcurses.c
+@@ -896,72 +896,77 @@ get_arrow_key(
+ #     ifdef NCURSES_MOUSE_VERSION
+       MEVENT my_event;
+ #     endif /* NCURSES_MOUSE_VERSION */
+-      int ch = getch();
++      int ch;
+       int code = KEYMAP_UNKNOWN;
+-      switch (ch) {
+-              case KEY_DC:
+-                      code = KEYMAP_DEL;
+-                      break;
+-
+-              case KEY_IC:
+-                      code = KEYMAP_INS;
+-                      break;
+-
+-              case KEY_UP:
+-                      code = KEYMAP_UP;
+-                      break;
+-
+-              case KEY_DOWN:
+-                      code = KEYMAP_DOWN;
+-                      break;
+-
+-              case KEY_LEFT:
+-                      code = KEYMAP_LEFT;
+-                      break;
+-
+-              case KEY_RIGHT:
+-                      code = KEYMAP_RIGHT;
+-                      break;
+-
+-              case KEY_NPAGE:
+-                      code = KEYMAP_PAGE_DOWN;
+-                      break;
+-
+-              case KEY_PPAGE:
+-                      code = KEYMAP_PAGE_UP;
+-                      break;
+-
+-              case KEY_HOME:
+-                      code = KEYMAP_HOME;
+-                      break;
+-
+-              case KEY_END:
+-                      code = KEYMAP_END;
+-                      break;
++      if (cmd_line)
++              code = cmd_get_arrow_key(prech);
++      else {
++              ch = getch();
++              switch (ch) {
++                      case KEY_DC:
++                              code = KEYMAP_DEL;
++                              break;
++
++                      case KEY_IC:
++                              code = KEYMAP_INS;
++                              break;
++
++                      case KEY_UP:
++                              code = KEYMAP_UP;
++                              break;
++
++                      case KEY_DOWN:
++                              code = KEYMAP_DOWN;
++                              break;
++
++                      case KEY_LEFT:
++                              code = KEYMAP_LEFT;
++                              break;
++
++                      case KEY_RIGHT:
++                              code = KEYMAP_RIGHT;
++                              break;
++
++                      case KEY_NPAGE:
++                              code = KEYMAP_PAGE_DOWN;
++                              break;
++
++                      case KEY_PPAGE:
++                              code = KEYMAP_PAGE_UP;
++                              break;
++
++                      case KEY_HOME:
++                              code = KEYMAP_HOME;
++                              break;
++
++                      case KEY_END:
++                              code = KEYMAP_END;
++                              break;
+ #     ifdef NCURSES_MOUSE_VERSION
+-              case KEY_MOUSE:
+-                      if (getmouse(&my_event) != ERR) {
+-                              switch ((int) my_event.bstate) {
+-                                      case BUTTON1_CLICKED:
+-                                              xmouse = MOUSE_BUTTON_1;
+-                                              break;
+-
+-                                      case BUTTON2_CLICKED:
+-                                              xmouse = MOUSE_BUTTON_2;
+-                                              break;
+-
+-                                      case BUTTON3_CLICKED:
+-                                              xmouse = MOUSE_BUTTON_3;
+-                                              break;
++                      case KEY_MOUSE:
++                              if (getmouse(&my_event) != ERR) {
++                                      switch ((int) my_event.bstate) {
++                                              case BUTTON1_CLICKED:
++                                                      xmouse = MOUSE_BUTTON_1;
++                                                      break;
++
++                                              case BUTTON2_CLICKED:
++                                                      xmouse = MOUSE_BUTTON_2;
++                                                      break;
++
++                                              case BUTTON3_CLICKED:
++                                                      xmouse = MOUSE_BUTTON_3;
++                                                      break;
++                                      }
++                                      xcol = my_event.x;      /* column */
++                                      xrow = my_event.y;      /* row */
++                                      code = KEYMAP_MOUSE;
+                               }
+-                              xcol = my_event.x;      /* column */
+-                              xrow = my_event.y;      /* row */
+-                              code = KEYMAP_MOUSE;
+-                      }
+-                      break;
++                              break;
+ #     endif /* NCURSES_MOUSE_VERSION */
++              }
+       }
+       return code;
+ }
index 1026e5a..a72664d 100644 (file)
@@ -1,4 +1,4 @@
-/*     $NetBSD: pkgdb.c,v 1.35 2009/09/11 18:00:13 joerg Exp $ */
+/*     $NetBSD: pkgdb.c,v 1.36 2009/10/22 22:51:29 joerg Exp $ */
 
 #if HAVE_CONFIG_H
 #include "config.h"
@@ -7,7 +7,7 @@
 #if HAVE_SYS_CDEFS_H
 #include <sys/cdefs.h>
 #endif
-__RCSID("$NetBSD: pkgdb.c,v 1.35 2009/09/11 18:00:13 joerg Exp $");
+__RCSID("$NetBSD: pkgdb.c,v 1.36 2009/10/22 22:51:29 joerg Exp $");
 
 /*-
  * Copyright (c) 1999-2008 The NetBSD Foundation, Inc.
@@ -78,7 +78,6 @@ __RCSID("$NetBSD: pkgdb.c,v 1.35 2009/09/11 18:00:13 joerg Exp $");
 
 static DB   *pkgdbp;
 static char *pkgdb_dir = NULL;
-static char  pkgdb_cache[MaxPathSize];
 
 /*
  *  Open the pkg-database
@@ -310,8 +309,13 @@ _pkgdb_getPKGDB_DIR(void)
 void
 _pkgdb_setPKGDB_DIR(const char *dir)
 {
-       (void) snprintf(pkgdb_cache, sizeof(pkgdb_cache), "%s", dir);
-       pkgdb_dir = pkgdb_cache;
+       char *new_dir;
+
+       if (dir == pkgdb_dir)
+               return;
+       new_dir = xstrdup(dir);
+       free(pkgdb_dir);
+       pkgdb_dir = new_dir;
 }
 
 char *
index 74a5f42..30c18a3 100644 (file)
@@ -1,4 +1,4 @@
-/*     $NetBSD: version.h,v 1.141 2009/10/21 17:10:36 joerg Exp $      */
+/*     $NetBSD: version.h,v 1.142 2009/10/22 22:51:29 joerg Exp $      */
 
 /*
  * Copyright (c) 2001 Thomas Klausner.  All rights reserved.
@@ -27,6 +27,6 @@
 #ifndef _INST_LIB_VERSION_H_
 #define _INST_LIB_VERSION_H_
 
-#define PKGTOOLS_VERSION "20091021"
+#define PKGTOOLS_VERSION "20091022"
 
 #endif /* _INST_LIB_VERSION_H_ */
index 20f2464..c9ecdc8 100644 (file)
@@ -17,7 +17,7 @@ SHA1 (patch-ab) = 549dac84644247e0c90978f2c78ce49ee62f7434
 SHA1 (patch-ac) = ceb2b0fe31ca6fc3a06285625655db1ee20ec0a1
 SHA1 (patch-ad) = 18014bd4b668be764cc1a170b161e80cd48c625f
 SHA1 (patch-ae) = a5c50cc33f8fcbdd66318af81fe303285bab6f3b
-SHA1 (patch-af) = 9da5210f49d0983bb32edf91ba08c1552717a397
+SHA1 (patch-af) = c6ab873b86e71bf23476a2a17a3e40454f24608a
 SHA1 (patch-ag) = bec1a8c871b826361ab5acbe7c7b64f92b71d8bc
 SHA1 (patch-ah) = ebba71477dccc416e81e1d3aaca5d098a03df760
 SHA1 (patch-aj) = c28c777ebfceea200fd0e0311981be5b38cbb247
index f225325..14ef95a 100644 (file)
@@ -2,8 +2,11 @@ $NetBSD$
 
 --- hotspot/src/os/bsd/vm/os_bsd.cpp.orig      2009-03-06 01:20:09.000000000 +0000
 +++ hotspot/src/os/bsd/vm/os_bsd.cpp
-@@ -59,6 +59,17 @@
+@@ -57,8 +57,20 @@
+ # define pthread_getprio(a) 0
+ # define pthread_setprio(a, b) 0
  # define pthread_main_np() 0
++typedef struct link_map Link_map; /* Needed on at least NetBSD 5.0 */
  #endif
  
 +/*
@@ -20,7 +23,7 @@ $NetBSD$
  #ifndef timespecsub
  #define       timespecsub(tsp, usp, vsp)                                      \
        do {                                                            \
-@@ -508,7 +519,7 @@ void os::init_system_properties_values()
+@@ -508,7 +520,7 @@ void os::init_system_properties_values()
  #define getenv(n) ::getenv(n)
  
  #ifndef DEFAULT_LD_LIBRARY_PATH
@@ -29,7 +32,7 @@ $NetBSD$
  #endif
  #define EXTENSIONS_DIR "/lib/ext"
  #define ENDORSED_DIR "/lib/endorsed"
-@@ -3000,7 +3011,7 @@ jint os::init_2(void) {
+@@ -3000,7 +3012,7 @@ jint os::init_2(void) {
  
    // XXX ugly hack for 32-bit address space, since we know the
    // java heap is allocated with mmap() not sbrk():
index 7202965..d239f57 100644 (file)
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.600 2009/10/08 06:20:07 jnemeth Exp $
+# $NetBSD: Makefile,v 1.601 2009/10/22 22:31:04 wiz Exp $
 #
 
 COMMENT=       Packages to support the X window system
@@ -74,6 +74,7 @@ SUBDIR+=      gnustep-gui
 SUBDIR+=       gnustep-preferences
 SUBDIR+=       grandr_applet
 SUBDIR+=       gromit
+SUBDIR+=       gselt
 SUBDIR+=       gst-plugins0.10-x11
 SUBDIR+=       gtk
 SUBDIR+=       gtk+extra
diff --git a/x11/gselt/DESCR b/x11/gselt/DESCR
new file mode 100644 (file)
index 0000000..5a84dc6
--- /dev/null
@@ -0,0 +1,3 @@
+This tool shows a borderless GTK window with various buttons in
+depending on the current X11 selection. It's configured by a ".gselt"
+file in your $HOME directory.
diff --git a/x11/gselt/Makefile b/x11/gselt/Makefile
new file mode 100644 (file)
index 0000000..fa0188b
--- /dev/null
@@ -0,0 +1,19 @@
+# $NetBSD: Makefile,v 1.1.1.1 2009/10/22 22:30:40 wiz Exp $
+#
+
+DISTNAME=      gselt-1.2
+CATEGORIES=    x11
+MASTER_SITES=  http://offog.org/files/
+
+MAINTAINER=    pkgsrc-users@NetBSD.org
+HOMEPAGE=      http://offog.org/code/gselt.html
+COMMENT=       Display a menu of actions that can be done with an X selection
+LICENSE=       gnu-gpl-v2
+
+PKG_DESTDIR_SUPPORT=   user-destdir
+
+GNU_CONFIGURE= yes
+USE_TOOLS+=    pkg-config
+
+.include "../../x11/gtk2/buildlink3.mk"
+.include "../../mk/bsd.pkg.mk"
diff --git a/x11/gselt/PLIST b/x11/gselt/PLIST
new file mode 100644 (file)
index 0000000..aa618f1
--- /dev/null
@@ -0,0 +1,3 @@
+@comment $NetBSD: PLIST,v 1.1.1.1 2009/10/22 22:30:40 wiz Exp $
+bin/gselt
+share/gselt/dot-gselt
diff --git a/x11/gselt/distinfo b/x11/gselt/distinfo
new file mode 100644 (file)
index 0000000..860bb15
--- /dev/null
@@ -0,0 +1,5 @@
+$NetBSD: distinfo,v 1.1.1.1 2009/10/22 22:30:40 wiz Exp $
+
+SHA1 (gselt-1.2.tar.gz) = cb646d042ed78b4937daa5a36889cc553b1a1478
+RMD160 (gselt-1.2.tar.gz) = 11445a51fbb01a3e2c2b9f419e2261c4f669e6cc
+Size (gselt-1.2.tar.gz) = 79375 bytes
index ff2fef2..b9f4422 100644 (file)
@@ -1,7 +1,7 @@
-# $NetBSD: options.mk,v 1.6 2009/06/07 11:23:46 wiz Exp $
+# $NetBSD: options.mk,v 1.7 2009/10/22 20:12:25 tnn Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.modular-xorg-server
-PKG_SUPPORTED_OPTIONS= dri inet6
+PKG_SUPPORTED_OPTIONS= dri inet6 debug
 PKG_SUGGESTED_OPTIONS= dri
 
 .include "../../mk/bsd.options.mk"
@@ -26,3 +26,8 @@ CONFIGURE_ARGS+=      --enable-ipv6
 .else
 CONFIGURE_ARGS+=       --disable-ipv6
 .endif
+
+.if !empty(PKG_OPTIONS:Mdebug)
+CONFIGURE_ARGS+=       --enable-debug
+CFLAGS+=               -ggdb
+.endif