pkgsrc-Bugs archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

pkg/38038: Patches for various packages



>Number:         38038
>Category:       pkg
>Synopsis:       Patches for various packages
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    pkg-manager
>State:          open
>Class:          sw-bug
>Submitter-Id:   net
>Arrival-Date:   Fri Feb 15 15:45:00 +0000 2008
>Originator:     Thomas Klausner
>Release:        N/A
>Organization:
>Environment:
        
        
>Description:
veego mailed some patches of his to pkgsrc-users -- this GNATS is just
for making sure they are not lost. I don't currently have time to
handle them.

--- audio/ifp-line/Makefile     22 Sep 2005 04:08:31 -0000      1.9
+++ audio/ifp-line/Makefile     6 Jan 2007 20:33:45 -0000
@@ -1,7 +1,6 @@
 # $NetBSD: Makefile,v 1.9 2005/09/22 04:08:31 minskim Exp $
 
-DISTNAME=              ifp-line-0.2.4.4
-PKGREVISION=           1
+DISTNAME=              ifp-line-0.3
 CATEGORIES=            audio
 MASTER_SITES=          ${MASTER_SITE_SOURCEFORGE:=ifp-driver/}
 
@@ -9,5 +8,8 @@
 HOMEPAGE=              http://ifp-driver.sourceforge.net/
 COMMENT=               Command-line interface to iRiver MP3 players
 
+GNU_CONFIGURE=         YES
+
 .include "../../devel/libusb/buildlink3.mk"
+.include "../../converters/libiconv/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
--- audio/ifp-line/PLIST        22 Sep 2005 04:08:31 -0000      1.2
+++ audio/ifp-line/PLIST        6 Jan 2007 20:36:41 -0000
@@ -1,3 +1,8 @@
 @comment $NetBSD: PLIST,v 1.2 2005/09/22 04:08:31 minskim Exp $
 bin/ifp
 man/man1/ifp.1
+share/ifp-line/NEWS
+share/ifp-line/README
+share/ifp-line/TIPS
+share/ifp-line/nonroot.sh
+@dirrm share/ifp-line
--- audio/ifp-line/distinfo     24 May 2005 13:54:30 -0000      1.6
+++ audio/ifp-line/distinfo     6 Jan 2007 20:28:53 -0000
@@ -1,6 +1,5 @@
 $NetBSD: distinfo,v 1.6 2005/05/24 13:54:30 rillig Exp $
 
-SHA1 (ifp-line-0.2.4.4.tar.gz) = f801a7a8179ab5430631f1027c25b449998cbc84
-RMD160 (ifp-line-0.2.4.4.tar.gz) = d67b5683b075f7e121585de21d9ebb475fcc3bd6
-Size (ifp-line-0.2.4.4.tar.gz) = 23879 bytes
-SHA1 (patch-aa) = 0524d1a5834f6b0320173c5eafff258e78ec1220
+SHA1 (ifp-line-0.3.tar.gz) = e511157878a08fbea6a2c702e726e131dd20cb2f
+RMD160 (ifp-line-0.3.tar.gz) = 71fee7e02daeb9b3dc2e7da53236057b9d5a9f63
+Size (ifp-line-0.3.tar.gz) = 138272 bytes
--- devel/doxygen/Makefile      23 Sep 2007 17:49:08 -0000      1.57
+++ devel/doxygen/Makefile      6 Oct 2007 20:58:53 -0000
@@ -33,6 +33,8 @@
 PLIST_SUBST+=  CASESENSITIVE="" CASEINSENSITIVE="@comment "
 .endif
 
+PRIVILEGED_STAGES+=     clean
+
 SUBST_CLASSES+=                pybin
 SUBST_STAGE.pybin=     pre-configure
 SUBST_FILES.pybin=     doc/Makefile.in
--- mail/thunderbird/Makefile-thunderbird.common        22 Dec 2007 07:22:09 
-0000      1.32
+++ mail/thunderbird/Makefile-thunderbird.common        23 Dec 2007 20:05:48 
-0000
@@ -15,6 +15,8 @@
 DISTINFO_FILE=         ${.CURDIR}/../../mail/thunderbird/distinfo
 PATCHDIR=              ${.CURDIR}/../../mail/thunderbird/patches
 
+PRIVILEGED_STAGES+=    clean
+
 CONFIGURE_ARGS+=       --enable-application=mail
 CONFIGURE_ARGS+=       --enable-debug=-g
 CONFIGURE_ENV+=                ac_cv_visibility_pragma=no 
ac_cv_visibility_hidden=no
--- multimedia/mjpegtools/Makefile      5 Feb 2007 20:38:57 -0000       1.39
+++ multimedia/mjpegtools/Makefile      4 Jun 2007 06:01:15 -0000
@@ -9,6 +9,8 @@
 HOMEPAGE=      http://mjpeg.sourceforge.net/
 COMMENT=       Programs for compressing video streams
 
+MAKE_JOBS_SAFE=                no
+
 CONFLICTS+=            mplex-[0-9]*
 DEPENDS+=              toolame>=02l:../../audio/toolame
 BUILD_DEPENDS+=                nasm>=0.98:../../devel/nasm
--- net/liblive/Makefile        19 Nov 2006 22:36:20 -0000      1.14
+++ net/liblive/Makefile        27 Jan 2007 23:44:09 -0000
@@ -1,7 +1,7 @@
 # $NetBSD: Makefile,v 1.14 2006/11/19 22:36:20 rillig Exp $
 #
 
-DISTNAME=      live.2006.11.16a
+DISTNAME=      live.2007.01.17
 PKGNAME=       lib${DISTNAME:S/./-/}
 PKGREVISION=   1
 CATEGORIES=    net
--- net/liblive/PLIST   19 Nov 2006 22:36:20 -0000      1.3
+++ net/liblive/PLIST   28 Jan 2007 08:38:27 -0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2006/11/19 22:36:20 rillig Exp $
+@comment $NetBSD$
 include/liblive/BasicUsageEnvironment/BasicHashTable.hh
 include/liblive/BasicUsageEnvironment/BasicUsageEnvironment.hh
 include/liblive/BasicUsageEnvironment/BasicUsageEnvironment0.hh
@@ -52,6 +52,7 @@
 include/liblive/liveMedia/H263plusVideoRTPSink.hh
 include/liblive/liveMedia/H263plusVideoRTPSource.hh
 include/liblive/liveMedia/H263plusVideoStreamFramer.hh
+include/liblive/liveMedia/H264VideoFileSink.hh
 include/liblive/liveMedia/H264VideoRTPSink.hh
 include/liblive/liveMedia/H264VideoRTPSource.hh
 include/liblive/liveMedia/H264VideoStreamFramer.hh
@@ -82,11 +83,14 @@
 include/liblive/liveMedia/MPEG1or2VideoRTPSource.hh
 include/liblive/liveMedia/MPEG1or2VideoStreamDiscreteFramer.hh
 include/liblive/liveMedia/MPEG1or2VideoStreamFramer.hh
+include/liblive/liveMedia/MPEG2IndexFromTransportStream.hh
 include/liblive/liveMedia/MPEG2TransportFileServerMediaSubsession.hh
 include/liblive/liveMedia/MPEG2TransportStreamFramer.hh
 include/liblive/liveMedia/MPEG2TransportStreamFromESSource.hh
 include/liblive/liveMedia/MPEG2TransportStreamFromPESSource.hh
+include/liblive/liveMedia/MPEG2TransportStreamIndexFile.hh
 include/liblive/liveMedia/MPEG2TransportStreamMultiplexor.hh
+include/liblive/liveMedia/MPEG2TransportStreamTrickModeFilter.hh
 include/liblive/liveMedia/MPEG4ESVideoRTPSink.hh
 include/liblive/liveMedia/MPEG4ESVideoRTPSource.hh
 include/liblive/liveMedia/MPEG4GenericRTPSink.hh
--- net/liblive/distinfo        19 Nov 2006 22:36:20 -0000      1.5
+++ net/liblive/distinfo        27 Jan 2007 23:44:41 -0000
@@ -1,5 +1,5 @@
 $NetBSD: distinfo,v 1.5 2006/11/19 22:36:20 rillig Exp $
 
-SHA1 (live.2006.11.16a.tar.gz) = 605d0e288a8d09654ef0d2cc271f0bc0837c53f5
-RMD160 (live.2006.11.16a.tar.gz) = f43dfc069ca17008d96a6f217f80549747cf724a
-Size (live.2006.11.16a.tar.gz) = 425773 bytes
+SHA1 (live.2007.01.17.tar.gz) = a2c057dfb8385015e4b247e2cbe57ee1f9e7fcc7
+RMD160 (live.2007.01.17.tar.gz) = 60b8493bb7f88af32b452a9bc58220a7713ef1e9
+Size (live.2007.01.17.tar.gz) = 442752 bytes
--- net/mppe-lkm/Makefile       16 Feb 2006 22:04:07 -0000      1.4
+++ net/mppe-lkm/Makefile       19 Aug 2007 08:25:19 -0000
@@ -1,8 +1,7 @@
 # $NetBSD: Makefile,v 1.4 2006/02/16 22:04:07 cube Exp $
 
 DISTNAME=      kernel_ppp_mppe-0.0.4-src
-PKGNAME=       mppe-lkm-0.0.4
-PKGREVISION=   2
+PKGNAME=       mppe-lkm-0.0.4.${OS_VERSION}
 CATEGORIES=    net
 MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=poptop/}
 EXTRACT_SUFX=  .tgz
@@ -14,6 +13,7 @@
 
 ONLY_FOR_PLATFORM=     NetBSD-*-*
 MAKE_ENV+=     KMODDIR=${PREFIX}/lkm
+PKGMAKECONF?=  ${MAKECONF}
 WRKSRC=                ${WRKDIR}/mppe-lkm
 KPM_SRC=       ${WRKDIR}/${DISTNAME:C/-src$//}
 
--- net/pptp/Makefile   12 May 2006 09:30:55 -0000      1.11
+++ net/pptp/Makefile   5 Jan 2007 19:04:23 -0000
@@ -1,13 +1,12 @@
 # $NetBSD: Makefile,v 1.11 2006/05/12 09:30:55 joerg Exp $
 
-DISTNAME=      pptp-1.7.0
-PKGREVISION=   2
+DISTNAME=      pptp-1.7.1
 CATEGORIES=    net
 MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=pptpclient/}
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=      http://pptpclient.sourceforge.net/
-COMMENT=       PPTP client package for Microsoft VPN servers (no encryption 
yet)
+COMMENT=       PPTP client package for Microsoft VPN servers
 
 NOT_FOR_PLATFORM=      Interix-*-*
 
@@ -21,16 +20,23 @@
 DOCDIR=                ${PREFIX}/share/doc/pptp
 
 post-install:
-       cd ${WRKSRC:Q}/Documentation && ${INSTALL_DATA} * 
${DOCDIR:Q}/Documentation
+       cd ${WRKSRC:Q}/Documentation && ${INSTALL_DATA} DESIGN.* 
${DOCDIR:Q}/Documentation
        cd ${WRKSRC:Q}/Reference && ${INSTALL_DATA} * ${DOCDIR:Q}/Reference
-       cd ${WRKSRC:Q} && ${INSTALL_DATA} INSTALL NEWS README USING ${DOCDIR:Q}
+       cd ${WRKSRC:Q} && ${INSTALL_DATA} README USING ${DOCDIR:Q}
 
 .include "../../mk/bsd.prefs.mk"
 
-# Not quite yet---special config for MPPE in pppd.
-#.if defined(PPTP_USE_MPPE)
-#DEPENDS+=     ppp-mppe-2.3.9:../../net/ppp-mppe
-#CONFIGURE_ARGS+= --with-pppd=${PREFIX}/sbin/pppd
-#.endif
+.if defined(PPTP_USE_MPPE)
+DEPENDS+=      pppd>=2.4.3:../../net/pppd
+MAKE_FLAGS+=   PPPD=${PREFIX}/sbin/pppd
+.else
+MAKE_FLAGS+=   PPPD=/usr/sbin/pppd
+.endif
+
+SUBST_CLASSES+=                pptp
+SUBST_MESSAGE.pptp=    "Fixing hardcoded paths."
+SUBST_STAGE.pptp=      post-patch
+SUBST_FILES.pptp=      pptp.8
+SUBST_SED.pptp=                -e 's,/usr,${PREFIX},g'
 
 .include "../../mk/bsd.pkg.mk"
--- net/pptp/PLIST      12 May 2006 09:30:55 -0000      1.3
+++ net/pptp/PLIST      5 Jan 2007 19:05:03 -0000
@@ -3,9 +3,6 @@
 sbin/pptp
 share/doc/pptp/Documentation/DESIGN.CALLMGR
 share/doc/pptp/Documentation/DESIGN.PPTP
-share/doc/pptp/Documentation/PORTING
-share/doc/pptp/INSTALL
-share/doc/pptp/NEWS
 share/doc/pptp/README
 share/doc/pptp/Reference/README
 share/doc/pptp/Reference/README.Reference
--- net/pptp/distinfo   12 May 2006 09:30:55 -0000      1.6
+++ net/pptp/distinfo   5 Jan 2007 19:07:29 -0000
@@ -1,9 +1,9 @@
 $NetBSD: distinfo,v 1.6 2006/05/12 09:30:55 joerg Exp $
 
-SHA1 (pptp-1.7.0.tar.gz) = fc96e8a765bf17eb02ce1584d8e9d024b68ab5a7
-RMD160 (pptp-1.7.0.tar.gz) = 62c947379c44102945a198ddc914d5aa634db13c
-Size (pptp-1.7.0.tar.gz) = 227699 bytes
+SHA1 (pptp-1.7.1.tar.gz) = cc2e4f40c5e3316bede41ec0a092a32025682851
+RMD160 (pptp-1.7.1.tar.gz) = f510262e8c06058d754d6d73d1b289fcdbc54dc7
+Size (pptp-1.7.1.tar.gz) = 229024 bytes
 SHA1 (patch-ab) = 01d8346064bee226adb11035d98c2f06523b8e4a
 SHA1 (patch-ac) = 8a0dd645ed0a766375a803fecda80d716c441d52
 SHA1 (patch-ad) = a037ba927c181f812ecd5c1ea2d344483d8ad4bf
-SHA1 (patch-ah) = 3a08c64c0cff8ca3d7e78ce445e7b126076c1425
+SHA1 (patch-ah) = a50163f175f51ac616b3c0cf126d6d531cbebfff
--- net/pptp/patches/patch-ah   14 Apr 2006 10:32:02 -0000      1.1
+++ net/pptp/patches/patch-ah   5 Jan 2007 19:07:22 -0000
@@ -1,10 +1,20 @@
 $NetBSD: patch-ah,v 1.1 2006/04/14 10:32:02 rillig Exp $
 
+Make it possible to overwritte the pppd location.
 Not everyone wants to install this as root.
 
---- Makefile.orig      2005-07-28 03:15:10.000000000 +0200
-+++ Makefile   2006-03-14 14:41:35.000000000 +0100
-@@ -55,7 +55,7 @@ test: vector_test
+--- Makefile.orig      2006-02-13 04:07:42.000000000 +0100
++++ Makefile   2007-01-05 20:00:40.000000000 +0100
+@@ -4,7 +4,7 @@
+ 
+ #################################################################
+ # CHANGE THIS LINE to point to the location of your pppd binary.
+-PPPD = /usr/sbin/pppd
++#PPPD = /usr/sbin/pppd
+ #################################################################
+ 
+ BINDIR=$(DESTDIR)/usr/sbin
+@@ -55,7 +55,7 @@
  
  install:
        mkdir -p $(BINDIR)
--- sysutils/acpi-iasl/Makefile 17 Aug 2007 20:14:55 -0000      1.10
+++ sysutils/acpi-iasl/Makefile 18 Aug 2007 16:21:23 -0000
@@ -10,7 +10,7 @@
 HOMEPAGE=      http://www.intel.com/technology/iapc/acpi/downloads.htm
 COMMENT=       Compiler of Intel ACPI CA - Unix Build Environment
 
-ACPI_IASL_VERSION=     20060217
+ACPI_IASL_VERSION=     20061109
 
 PKG_INSTALLATION_TYPES=        overwrite pkgviews
 PKG_DESTDIR_SUPPORT=   user-destdir
--- sysutils/acpi-iasl/distinfo 12 Mar 2006 13:15:20 -0000      1.5
+++ sysutils/acpi-iasl/distinfo 21 Apr 2007 18:12:46 -0000
@@ -1,5 +1,5 @@
 $NetBSD: distinfo,v 1.5 2006/03/12 13:15:20 kochi Exp $
 
-SHA1 (acpica-unix-20060217.tar.gz) = 49151dc9edd821e6b9852640003bef9a7568614e
-RMD160 (acpica-unix-20060217.tar.gz) = 1aba33f2749a7465987906417d7daf95f75554ad
-Size (acpica-unix-20060217.tar.gz) = 797939 bytes
+SHA1 (acpica-unix-20061109.tar.gz) = 98540d982172286674d904f98ac1b5e13b59d455
+RMD160 (acpica-unix-20061109.tar.gz) = 70f6314e5968c8f0a918050677070c88da8f46cd
+Size (acpica-unix-20061109.tar.gz) = 862538 bytes
--- x11/openmotif/Makefile      27 Oct 2007 12:31:15 -0000      1.53
+++ x11/openmotif/Makefile      26 Dec 2007 15:26:27 -0000
@@ -1,11 +1,9 @@
 # $NetBSD: Makefile,v 1.53 2007/10/27 12:31:15 rillig Exp $
 
-PKGVER=                2.2.3
-DISTNAME=      openMotif-${PKGVER}
-PKGNAME=       openmotif-${PKGVER}
-PKGREVISION=   3
+PKGVER=                2.3.0
+DISTNAME=      openmotif-${PKGVER}
 CATEGORIES=    x11
-MASTER_SITES=  http://ftp.motifzone.com/src/
+MASTER_SITES=  ftp://ftp.ics.com/openmotif/2.3/${PKGVER}/
 
 MAINTAINER=            joerg%NetBSD.org@localhost
 HOMEPAGE=              http://www.opengroup.org/openmotif/
@@ -65,9 +63,10 @@
 #    avoid manpage conflicts with other packages.
 #
 post-patch:
+       cd ${WRKSRC}/doc/man && ${CP} -f man4/mwmrc.4 man5/mwmrc.5
        set -e; \
        cd ${WRKSRC}/doc/man;                                           \
-       for manpage in man1/*.1 man3/*.3 man4/*.4 man5/*.5; do          \
+       for manpage in man1/*.1 man3/*.3 man5/*.5; do           \
                ${SED}  -e "s|user cmd|1|g"                             \
                        -e "s|library call|3|g"                         \
                        -e "s|special file|5|g"                         \
@@ -75,7 +74,6 @@
                        $${manpage} > $${manpage}.fixed;                \
                ${MV} -f $${manpage}.fixed $${manpage};                 \
        done;                                                           \
-       ${CP} -f man4/mwmrc.4 man5/mwmrc.5
        set -e; \
        cd ${WRKSRC}/doc/man/man3;                                      \
        for name in Core Object Shell; do                               \
@@ -88,13 +86,12 @@
                        ${RM} -f $${manpage}.presubst;                  \
                done;                                                   \
        done
-       echo "#include <X11/Xos_r.h>" > ${WRKSRC}/lib/Xm/Xmos_r.h
 
 # Filter the manpages through tbl.
 post-build:
        set -e; \
        cd ${WRKSRC}/doc/man;                                           \
-       for manpage in man1/*.1 man3/*.3 man4/*.4 man5/*.5; do          \
+       for manpage in man1/*.1 man3/*.3 man5/*.5; do           \
                ${TBL} $${manpage} > $${manpage}.tblized;               \
                ${MV} -f $${manpage}.tblized $${manpage};               \
        done
@@ -102,6 +99,7 @@
 .include "../../x11/xextproto/buildlink3.mk"
 .include "../../x11/libX11/buildlink3.mk"
 .include "../../x11/libXaw/buildlink3.mk"
+.include "../../x11/libXft/buildlink3.mk"
 .include "../../x11/libXmu/buildlink3.mk"
 .include "../../x11/libXp/buildlink3.mk"
 .include "../../x11/libXext/buildlink3.mk"
--- x11/openmotif/PLIST 21 May 2006 11:41:59 -0000      1.6
+++ x11/openmotif/PLIST 26 Dec 2007 15:44:05 -0000
@@ -209,6 +209,8 @@
 include/Xm/ToggleBG.h
 include/Xm/ToggleBGP.h
 include/Xm/ToggleBP.h
+include/Xm/ToolTipCT.h
+include/Xm/ToolTipT.h
 include/Xm/TraitP.h
 include/Xm/Transfer.h
 include/Xm/TransferP.h
@@ -232,6 +234,7 @@
 include/Xm/XmP.h
 include/Xm/XmStrDefs.h
 include/Xm/XmStrDefs22.h
+include/Xm/XmStrDefs23.h
 include/Xm/Xmfuncs.h
 include/Xm/XmosP.h
 include/Xm/Xmos_r.h
@@ -369,8 +372,10 @@
 man/man3/XmCreateArrowButtonGadget.3
 man/man3/XmCreateBulletinBoard.3
 man/man3/XmCreateBulletinBoardDialog.3
+man/man3/XmCreateButtonBox.3
 man/man3/XmCreateCascadeButton.3
 man/man3/XmCreateCascadeButtonGadget.3
+man/man3/XmCreateCombinationBox2.3
 man/man3/XmCreateComboBox.3
 man/man3/XmCreateCommand.3
 man/man3/XmCreateCommandDialog.3
@@ -388,6 +393,7 @@
 man/man3/XmCreateForm.3
 man/man3/XmCreateFormDialog.3
 man/man3/XmCreateFrame.3
+man/man3/XmCreateHierarchy.3
 man/man3/XmCreateIconGadget.3
 man/man3/XmCreateInformationDialog.3
 man/man3/XmCreateLabel.3
@@ -398,9 +404,9 @@
 man/man3/XmCreateMenuShell.3
 man/man3/XmCreateMessageBox.3
 man/man3/XmCreateMessageDialog.3
-man/man3/XmCreateMultiList.3
 man/man3/XmCreateNotebook.3
 man/man3/XmCreateOptionMenu.3
+man/man3/XmCreateOutline.3
 man/man3/XmCreatePanedWindow.3
 man/man3/XmCreatePopupMenu.3
 man/man3/XmCreatePromptDialog.3
@@ -443,6 +449,20 @@
 man/man3/XmCvtXmStringToByteStream.3
 man/man3/XmCvtXmStringToCT.3
 man/man3/XmDataField.3
+man/man3/XmDataFieldCopy.3
+man/man3/XmDataFieldCut.3
+man/man3/XmDataFieldGetSelection.3
+man/man3/XmDataFieldGetSelectionPosition.3
+man/man3/XmDataFieldGetString.3
+man/man3/XmDataFieldGetStringWcs.3
+man/man3/XmDataFieldPaste.3
+man/man3/XmDataFieldSetAddMode.3
+man/man3/XmDataFieldSetEditable.3
+man/man3/XmDataFieldSetHighlight.3
+man/man3/XmDataFieldSetInsertionPosition.3
+man/man3/XmDataFieldSetSelection.3
+man/man3/XmDataFieldSetString.3
+man/man3/XmDataFieldXYToPos.3
 man/man3/XmDeactivateProtocol.3
 man/man3/XmDeactivateWMProtocol.3
 man/man3/XmDestroyPixmap.3
@@ -459,11 +479,7 @@
 man/man3/XmDrawingArea.3
 man/man3/XmDrawnButton.3
 man/man3/XmDropDown.3
-man/man3/XmDropDownGetArrow.3
-man/man3/XmDropDownGetLabel.3
-man/man3/XmDropDownGetList.3
-man/man3/XmDropDownGetText.3
-man/man3/XmDropDownGetValue.3
+man/man3/XmDropDownGetChild.3
 man/man3/XmDropSite.3
 man/man3/XmDropSiteConfigureStackingOrder.3
 man/man3/XmDropSiteEndUpdate.3
@@ -477,6 +493,7 @@
 man/man3/XmDropTransfer.3
 man/man3/XmDropTransferAdd.3
 man/man3/XmDropTransferStart.3
+man/man3/XmExt18List.3
 man/man3/XmFileSelectionBox.3
 man/man3/XmFileSelectionBoxGetChild.3
 man/man3/XmFileSelectionDoSearch.3
@@ -517,7 +534,11 @@
 man/man3/XmGetVisibility.3
 man/man3/XmGetXmDisplay.3
 man/man3/XmGetXmScreen.3
+man/man3/XmHierarchy.3
+man/man3/XmHierarchyGetChildNodes.3
+man/man3/XmHierarchyOpenAllAncestors.3
 man/man3/XmIconBox.3
+man/man3/XmIconBoxIsCellEmpty.3
 man/man3/XmIconButton.3
 man/man3/XmIconGadget.3
 man/man3/XmImCloseXIM.3
@@ -589,8 +610,6 @@
 man/man3/XmMessageBox.3
 man/man3/XmMessageBoxGetChild.3
 man/man3/XmMultiList.3
-man/man3/XmMultiListDeselectAllItems.3
-man/man3/XmMultiListDeselectItem.3
 man/man3/XmMultiListDeselectItems.3
 man/man3/XmMultiListDeselectRow.3
 man/man3/XmMultiListGetSelectedRowArray.3
@@ -600,11 +619,16 @@
 man/man3/XmMultiListSelectItems.3
 man/man3/XmMultiListSelectRow.3
 man/man3/XmMultiListToggleRow.3
+man/man3/XmMultiListUnselectAllItems.3
+man/man3/XmMultiListUnselectItem.3
 man/man3/XmNotebook.3
 man/man3/XmNotebookGetPageInfo.3
 man/man3/XmObjectAtPoint.3
 man/man3/XmOptionButtonGadget.3
 man/man3/XmOptionLabelGadget.3
+man/man3/XmOutline.3
+man/man3/XmPaned.3
+man/man3/XmPanedGetPanes.3
 man/man3/XmPanedWindow.3
 man/man3/XmParseMapping.3
 man/man3/XmParseMappingCreate.3
@@ -748,6 +772,9 @@
 man/man3/XmTabListTabCount.3
 man/man3/XmTabSetValue.3
 man/man3/XmTabStack.3
+man/man3/XmTabStackGetSelectedTab.3
+man/man3/XmTabStackSelectTab.3
+man/man3/XmTabStackXYToWidget.3
 man/man3/XmTargetsAreCompatible.3
 man/man3/XmText.3
 man/man3/XmTextClearSelection.3
@@ -848,12 +875,104 @@
 man/man3/XmTree.3
 man/man3/XmUninstallImage.3
 man/man3/XmUpdateDisplay.3
+man/man3/XmVaCreateArrowButton.3
+man/man3/XmVaCreateArrowButtonGadget.3
+man/man3/XmVaCreateBulletinBoard.3
+man/man3/XmVaCreateButtonBox.3
+man/man3/XmVaCreateCascadeButton.3
+man/man3/XmVaCreateCascadeButtonGadget.3
+man/man3/XmVaCreateColorSelector.3
+man/man3/XmVaCreateColumn.3
+man/man3/XmVaCreateCombinationBox2.3
+man/man3/XmVaCreateComboBox.3
+man/man3/XmVaCreateCommand.3
+man/man3/XmVaCreateContainer.3
+man/man3/XmVaCreateDataField.3
+man/man3/XmVaCreateDrawingArea.3
+man/man3/XmVaCreateDrawnButton.3
+man/man3/XmVaCreateDropDown.3
+man/man3/XmVaCreateExt18List.3
+man/man3/XmVaCreateFileSelectionBox.3
+man/man3/XmVaCreateForm.3
+man/man3/XmVaCreateFrame.3
+man/man3/XmVaCreateHierarchy.3
+man/man3/XmVaCreateIconGadget.3
+man/man3/XmVaCreateLabel.3
+man/man3/XmVaCreateLabelGadget.3
+man/man3/XmVaCreateList.3
+man/man3/XmVaCreateMainWindow.3
+man/man3/XmVaCreateManagedArrowButton.3
+man/man3/XmVaCreateManagedArrowButtonGadget.3
+man/man3/XmVaCreateManagedBulletinBoard.3
+man/man3/XmVaCreateManagedButtonBox.3
+man/man3/XmVaCreateManagedCascadeButton.3
+man/man3/XmVaCreateManagedCascadeButtonGadget.3
+man/man3/XmVaCreateManagedColorSelector.3
+man/man3/XmVaCreateManagedColumn.3
+man/man3/XmVaCreateManagedCombinationBox2.3
+man/man3/XmVaCreateManagedComboBox.3
+man/man3/XmVaCreateManagedCommand.3
+man/man3/XmVaCreateManagedContainer.3
+man/man3/XmVaCreateManagedDataField.3
+man/man3/XmVaCreateManagedDrawingArea.3
+man/man3/XmVaCreateManagedDrawnButton.3
+man/man3/XmVaCreateManagedDropDown.3
+man/man3/XmVaCreateManagedExt18List.3
+man/man3/XmVaCreateManagedFileSelectionBox.3
+man/man3/XmVaCreateManagedForm.3
+man/man3/XmVaCreateManagedFrame.3
+man/man3/XmVaCreateManagedHierarchy.3
+man/man3/XmVaCreateManagedIconGadget.3
+man/man3/XmVaCreateManagedLabel.3
+man/man3/XmVaCreateManagedLabelGadget.3
+man/man3/XmVaCreateManagedList.3
+man/man3/XmVaCreateManagedMainWindow.3
+man/man3/XmVaCreateManagedMessageBox.3
+man/man3/XmVaCreateManagedMultiList.3
+man/man3/XmVaCreateManagedNotebook.3
+man/man3/XmVaCreateManagedOutline.3
+man/man3/XmVaCreateManagedPanedWindow.3
+man/man3/XmVaCreateManagedPushButton.3
+man/man3/XmVaCreateManagedPushButtonGadget.3
+man/man3/XmVaCreateManagedRowColumn.3
+man/man3/XmVaCreateManagedScale.3
+man/man3/XmVaCreateManagedScrollBar.3
+man/man3/XmVaCreateManagedScrolledWindow.3
+man/man3/XmVaCreateManagedSelectionBox.3
+man/man3/XmVaCreateManagedSeparatorGadget.3
+man/man3/XmVaCreateManagedSimpleSpinBox.3
+man/man3/XmVaCreateManagedSpinBox.3
+man/man3/XmVaCreateManagedTabStack.3
+man/man3/XmVaCreateManagedText.3
+man/man3/XmVaCreateManagedTextField.3
+man/man3/XmVaCreateManagedToggleButton.3
+man/man3/XmVaCreateManagedToggleButtonGadget.3
+man/man3/XmVaCreateMessageBox.3
+man/man3/XmVaCreateMultiList.3
+man/man3/XmVaCreateNotebook.3
+man/man3/XmVaCreateOutline.3
+man/man3/XmVaCreatePanedWindow.3
+man/man3/XmVaCreatePushButton.3
+man/man3/XmVaCreatePushButtonGadget.3
+man/man3/XmVaCreateRowColumn.3
+man/man3/XmVaCreateScale.3
+man/man3/XmVaCreateScrollBar.3
+man/man3/XmVaCreateScrolledWindow.3
+man/man3/XmVaCreateSelectionBox.3
+man/man3/XmVaCreateSeparatorGadget.3
 man/man3/XmVaCreateSimpleCheckBox.3
 man/man3/XmVaCreateSimpleMenuBar.3
 man/man3/XmVaCreateSimpleOptionMenu.3
 man/man3/XmVaCreateSimplePopupMenu.3
 man/man3/XmVaCreateSimplePulldownMenu.3
 man/man3/XmVaCreateSimpleRadioBox.3
+man/man3/XmVaCreateSimpleSpinBox.3
+man/man3/XmVaCreateSpinBox.3
+man/man3/XmVaCreateTabStack.3
+man/man3/XmVaCreateText.3
+man/man3/XmVaCreateTextField.3
+man/man3/XmVaCreateToggleButton.3
+man/man3/XmVaCreateToggleButtonGadget.3
 man/man3/XmWidgetGetBaselines.3
 man/man3/XmWidgetGetDisplayRect.3
 man/man5/Traits.5
--- x11/openmotif/distinfo      15 Aug 2007 19:26:39 -0000      1.25
+++ x11/openmotif/distinfo      26 Dec 2007 15:21:23 -0000
@@ -1,28 +1,15 @@
 $NetBSD: distinfo,v 1.25 2007/08/15 19:26:39 joerg Exp $
 
-SHA1 (openMotif-2.2.3.tar.gz) = c463653d9f8e24b35522c3ba6363ddf7a282eab4
-RMD160 (openMotif-2.2.3.tar.gz) = b99230d508da57bca72b6920d28fce4187bf5179
-Size (openMotif-2.2.3.tar.gz) = 5149785 bytes
-SHA1 (patch-aa) = 5c204036a831ca890b196c6f7d23be2fdb848980
-SHA1 (patch-ac) = 1c14d22f888859b15365bcba7edba78a1114c6ac
-SHA1 (patch-ad) = 4903cbf3b9ac6e2dd2f8e327bb33f5743650787e
-SHA1 (patch-ae) = 00ffe019ea7a6950ed673f5a7907196b22a45f4e
-SHA1 (patch-af) = 5ea54810105cfb2fc9d4a828e32208318e3c5d42
-SHA1 (patch-ag) = c7e461c35ef4bdbcc8917917a34ab546760cb5cc
-SHA1 (patch-ah) = d94132709d6b69d437a37616834bda8cc42592ba
-SHA1 (patch-aj) = 0f8ba09947dcbab85fa30fc5f126e07a9ebfb930
-SHA1 (patch-ak) = 8fe997bd930111cd04c051c5cffdf2b930f0c356
-SHA1 (patch-az) = 2b389987baa5a278f93efe35528d94c8defcd48f
-SHA1 (patch-ba) = c8a13cc06db7413ddb0abcc2b6e9781d4b9550ef
-SHA1 (patch-bb) = 1d38da709ee1231323feb0e348be6dafd54d755d
-SHA1 (patch-bc) = 87915f61d20e4defd6ac3a68667528515b6b88a0
-SHA1 (patch-bd) = 8f46473bb0380ce69b2eadc1c65322094d538bf8
-SHA1 (patch-be) = 35a24957def48a2f2771f34ebc53ecf83c827a66
-SHA1 (patch-bf) = 211d84bccf91ed474634658a75af5d8977b052d4
-SHA1 (patch-bg) = 582f455b066bd4f12160d719c885e9d8423632e5
-SHA1 (patch-bh) = 09401eb3e5e6e7e911a9268f2ba0cd6ddaeed3b4
-SHA1 (patch-bi) = 4dced20ce293f8635f121f77e9112e93766b9723
-SHA1 (patch-bj) = ac2b1d9fc09ff1bc712e776a3e2e469c1993c385
-SHA1 (patch-bk) = 3d8c264c8060616878dec5a7a21a479aa801e95d
+SHA1 (openmotif-2.3.0.tar.gz) = efb5f5fdc4cc43ef6065594f4ebe98953b7af15e
+RMD160 (openmotif-2.3.0.tar.gz) = 317c8d13d59c6fdd4a9f0e3b63000695f6677b6c
+Size (openmotif-2.3.0.tar.gz) = 5661471 bytes
+SHA1 (patch-aa) = d9b07fca5ed89313b1993ab8072e17ac9c2a22b2
+SHA1 (patch-ac) = 29e0bfb5c9a30a0a05aa8b1464cf2093913d96c1
+SHA1 (patch-ae) = 459576b270852058f30c0efc039fcd4557861e76
+SHA1 (patch-ah) = 2a3736e398e16e25fd8667835f4f3e88d31fdfc2
+SHA1 (patch-aj) = a055ab6d4c3e3928953b9bfa0811a4d45a6c421e
+SHA1 (patch-al) = e565e0b80f6b2290fdf89294a6899ef9bb879da7
+SHA1 (patch-az) = bae056cdddaab6e32277a2f6b97a56572b30b699
+SHA1 (patch-bj) = bfc30fc15cff1db6ba3f699e0fd5b93b34c9afbe
 SHA1 (patch-bl) = 905bec86af6d8d139faa2ca185adf3e8b58c1dea
-SHA1 (patch-bm) = 7d41d373b7428cd9eb53841b6636318431d40206
+SHA1 (patch-bm) = 7da799aa439c3a8cd66d452eb558831c99484c7e
--- x11/openmotif/patches/patch-aa      12 Dec 2005 19:55:41 -0000      1.3
+++ x11/openmotif/patches/patch-aa      26 Dec 2007 14:01:11 -0000
@@ -1,18 +1,18 @@
-$NetBSD: patch-aa,v 1.3 2005/12/12 19:55:41 joerg Exp $
+$NetBSD$
 
---- lib/Xm/TextF.c.orig        2005-11-25 05:28:12.000000000 +0100
-+++ lib/Xm/TextF.c
-@@ -89,11 +89,11 @@ static char rcsid[] = "$TOG: TextF.c /ma
- #include <Xm/PrintSP.h>         /* for XmIsPrintShell */
+--- lib/Xm/TextF.c.orig        2006-08-28 15:53:30.000000000 +0200
++++ lib/Xm/TextF.c     2007-12-26 15:00:45.000000000 +0100
+@@ -95,11 +95,11 @@
  
  
--#if defined(__FreeBSD__) || defined(__APPLE__) || defined(__NetBSD__) || 
defined(__OpenBSD__)
-+#if defined(__APPLE__) || defined(__OpenBSD__)
+ #if (defined(__FreeBSD__) && (__FreeBSD__ < 4)) || \
+-    (defined(__APPLE__) || defined(__NetBSD__) || defined(__OpenBSD__))
++    (defined(__APPLE__) || defined(__OpenBSD__))
  /*
   * Modification by Integrated Computer Solutions, Inc.  May 2000
   *
-- * FreeBSD, DARWIN, NetBSD, and OpenBSD do not include the necessary wide
-+ * DARWIN, NetBSD before 1.6, and OpenBSD do not include the necessary wide
-  * character string functions.  Use the internal _Xwc... routines and add the
-  * other missing functions as _Xmwc... routines.  The new functions
-  * are added static to this file.
+- * FreeBSD (pre-4.0), DARWIN, NetBSD, and OpenBSD do not include the necessary
++ * FreeBSD (pre-4.0), DARWIN, NetBSD (pre 1.6), and OpenBSD do not include 
the necessary
+  * wide character string functions.  Use the internal _Xwc... routines and add
+  * the other missing functions as _Xmwc... routines.  The new functions are
+  * added static to this file.
--- x11/openmotif/patches/patch-ac      9 Jan 2006 13:13:53 -0000       1.6
+++ x11/openmotif/patches/patch-ac      26 Dec 2007 14:21:44 -0000
@@ -1,8 +1,8 @@
-$NetBSD: patch-ac,v 1.6 2006/01/09 13:13:53 joerg Exp $
+$NetBSD$
 
---- lib/Xm/Xmos.c.orig 2005-11-25 05:50:57.000000000 +0100
-+++ lib/Xm/Xmos.c
-@@ -91,6 +91,17 @@ extern int regex();
+--- lib/Xm/Xmos.c.orig 2004-04-15 16:03:57.000000000 +0200
++++ lib/Xm/Xmos.c      2007-12-26 15:21:16.000000000 +0100
+@@ -95,6 +95,17 @@
  
  #include <sys/stat.h>
  
--- x11/openmotif/patches/patch-ad      12 Dec 2005 19:55:41 -0000      1.3
+++ /dev/null   1 Jan 1970 00:00:00 -0000
@@ -1,28 +0,0 @@
-$NetBSD: patch-ad,v 1.3 2005/12/12 19:55:41 joerg Exp $
-
---- lib/Xm/Makefile.in.orig    2004-04-06 19:50:27.000000000 +0200
-+++ lib/Xm/Makefile.in
-@@ -100,8 +100,6 @@ INCLUDES = -I.. -I$(srcdir)/.. -DXMBINDD
- 
- xmdir = $(includedir)/Xm
- 
--LDFLAGS = -version-info @CURRENT@:@REVISION@:@AGE@
--
- lib_LTLIBRARIES = libXm.la
- 
- TIP_SRCS = ToolTip.c
-@@ -159,12 +157,13 @@ LTLIBRARIES =  $(lib_LTLIBRARIES)
- 
- DEFS = @DEFS@ -I. -I$(srcdir) -I../../include
- CPPFLAGS = @CPPFLAGS@
-+LDFLAGS = @LDFLAGS@
- LIBS = @LIBS@
- X_CFLAGS = @X_CFLAGS@
- X_LIBS = @X_LIBS@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_PRE_LIBS = @X_PRE_LIBS@
--libXm_la_LDFLAGS = 
-+libXm_la_LDFLAGS = -version-info @CURRENT@:@REVISION@:@AGE@
- libXm_la_DEPENDENCIES = 
- @OM_XMU_TRUE@libXm_la_OBJECTS =  XmStrDefs.lo ArrowB.lo ArrowBG.lo \
- @OM_XMU_TRUE%BulletinB.lo@localhost CallbackI.lo CascadeB.lo CascadeBG.lo \
diff -b -u -r1.4 patch-ae
--- x11/openmotif/patches/patch-ae      9 Jan 2006 13:13:53 -0000       1.4
+++ x11/openmotif/patches/patch-ae      26 Dec 2007 14:31:37 -0000
@@ -1,13 +1,12 @@
-$NetBSD: patch-ae,v 1.4 2006/01/09 13:13:53 joerg Exp $
+$NetBSD$
 
---- clients/uil/UilDB.c.orig   2005-11-25 10:43:27.000000000 +0100
-+++ clients/uil/UilDB.c
-@@ -79,8 +79,17 @@ static char rcsid[] = "$XConsortium: Uil
+--- clients/uil/UilDB.c.orig   2004-11-18 09:54:32.000000000 +0100
++++ clients/uil/UilDB.c        2007-12-26 15:30:46.000000000 +0100
+@@ -79,7 +79,16 @@
  #include <unistd.h>
  #endif
  
 -
--
 +#if defined(__NetBSD__)
 +#include <sys/param.h>
 +#  if __NetBSD_Version__ >= 299001000 /* NetBSD 2.99.10 has getpw*_r*/
@@ -18,7 +17,6 @@
 +#    define XNO_MTSAFE_PWDAPI
 +#  endif
 +#endif
-+
  
- #include "UilDefI.h"
  
+ #include "UilDefI.h"
--- x11/openmotif/patches/patch-af      12 Dec 2005 19:55:41 -0000      1.3
+++ /dev/null   1 Jan 1970 00:00:00 -0000
@@ -1,22 +0,0 @@
-$NetBSD: patch-af,v 1.3 2005/12/12 19:55:41 joerg Exp $
-
---- lib/Mrm/Makefile.in.orig   2005-11-25 10:46:23.000000000 +0100
-+++ lib/Mrm/Makefile.in
-@@ -101,7 +101,7 @@ mrmdir = $(includedir)/Mrm
- 
- libMrm_la_LIBADD = ../Xm/libXm.la ${X_LIBS} -lXt ${X_PRE_LIBS} -lX11 
${X_EXTRA_LIBS}
- 
--LDFLAGS = -version-info @CURRENT@:@REVISION@:@AGE@
-+LDFLAGS = @LDFLAGS@
- 
- lib_LTLIBRARIES = libMrm.la
- 
-@@ -131,7 +131,7 @@ X_CFLAGS = @X_CFLAGS@
- X_LIBS = @X_LIBS@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_PRE_LIBS = @X_PRE_LIBS@
--libMrm_la_LDFLAGS = 
-+libMrm_la_LDFLAGS = -version-info @CURRENT@:@REVISION@:@AGE@
- libMrm_la_DEPENDENCIES =  ../Xm/libXm.la
- libMrm_la_OBJECTS =  MrmIbuffer.lo MrmIentry.lo MrmIfile.lo \
- MrmIheader.lo MrmIindex.lo MrmIindexw.lo MrmIrid.lo MrmIswap.lo \
--- x11/openmotif/patches/patch-ag      12 Dec 2005 19:55:41 -0000      1.5
+++ /dev/null   1 Jan 1970 00:00:00 -0000
@@ -1,22 +0,0 @@
-$NetBSD: patch-ag,v 1.5 2005/12/12 19:55:41 joerg Exp $
-
---- clients/uil/Makefile.in.orig       2005-11-25 10:50:34.000000000 +0100
-+++ clients/uil/Makefile.in
-@@ -99,7 +99,7 @@ EXTRA_DIST = Uil.msg
- #
- bin_PROGRAMS = uil
- 
--LDFLAGS = -version-info @CURRENT@:@REVISION@:@AGE@
-+LDFLAGS = @LDFLAGS@
- 
- libUil_la_LIBADD = UilParser.lo ../../lib/Mrm/libMrm.la ../../lib/Xm/libXm.la 
- 
-@@ -150,7 +150,7 @@ X_CFLAGS = @X_CFLAGS@
- X_LIBS = @X_LIBS@
- X_EXTRA_LIBS = @X_EXTRA_LIBS@
- X_PRE_LIBS = @X_PRE_LIBS@
--libUil_la_LDFLAGS = 
-+libUil_la_LDFLAGS = -version-info @CURRENT@:@REVISION@:@AGE@
- libUil_la_OBJECTS =  UilCmd.lo UilDiags.lo UilKeyTab.lo UilLexAna.lo \
- UilLexPars.lo UilLstLst.lo UilP2Out.lo UilP2Reslv.lo UilSarComp.lo \
- UilSarExp.lo UilSarInc.lo UilSarMod.lo UilSarObj.lo UilSarProc.lo \
--- x11/openmotif/patches/patch-ah      12 Dec 2005 19:55:41 -0000      1.3
+++ x11/openmotif/patches/patch-ah      26 Dec 2007 14:33:09 -0000
@@ -1,13 +1,14 @@
-$NetBSD: patch-ah,v 1.3 2005/12/12 19:55:41 joerg Exp $
+$NetBSD$
 
---- Makefile.in.orig   2005-11-25 16:33:30.000000000 +0100
-+++ Makefile.in
-@@ -101,7 +101,7 @@ EXTRA_DIST = BUGREPORT              COPY
- MAINTAINERCLEANFILES = Makefile.in              configure libtool             
 config.guess              config.sub              config.log              
ltconfig ltmain.sh              aclocal.m4              config.h.in             
 install-sh              missing mkinstalldirs
- 
- 
--SUBDIRS = bindings bitmaps              config              localized         
     lib              include              tools              clients           
   doc              demos
-+SUBDIRS = bindings bitmaps              config              localized         
     lib              include              tools              clients           
   doc
+--- Makefile.in.orig   2007-08-09 09:27:57.000000000 +0200
++++ Makefile.in        2007-12-26 15:32:49.000000000 +0100
+@@ -249,8 +249,7 @@
+              include \
+              tools \
+              clients \
+-             doc \
+-             demos
++             doc
  
  AUTOMAKE_OPTIONS = 1.4
- ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+ all: all-recursive
--- x11/openmotif/patches/patch-aj      12 Dec 2005 19:55:41 -0000      1.3
+++ x11/openmotif/patches/patch-aj      26 Dec 2007 15:19:40 -0000
@@ -1,13 +1,14 @@
-$NetBSD: patch-aj,v 1.3 2005/12/12 19:55:41 joerg Exp $
+$NetBSD$
 
---- doc/man/man5/Makefile.in.orig      2005-11-25 17:24:35.000000000 +0100
-+++ doc/man/man5/Makefile.in
-@@ -95,7 +95,7 @@ MAINTAINERCLEANFILES = Makefile.in
+--- doc/man/man5/Makefile.in.orig      2007-08-09 09:27:52.000000000 +0200
++++ doc/man/man5/Makefile.in   2007-12-26 16:18:59.000000000 +0100
+@@ -205,7 +205,8 @@
+ man_MANS = \
+     Traits.5 \
+     UIL.5 \
+-    WML.5
++    WML.5 \
++    mwmrc.5
  
- EXTRA_DIST = $(man_MANS)
+ all: all-am
  
--man_MANS =      Traits.5     UIL.5     WML.5
-+man_MANS =      Traits.5     UIL.5     WML.5  mwmrc.5
- 
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
- CONFIG_HEADER = ../../../include/config.h
--- x11/openmotif/patches/patch-ak      12 Dec 2005 19:55:41 -0000      1.3
+++ /dev/null   1 Jan 1970 00:00:00 -0000
@@ -1,13 +0,0 @@
-$NetBSD: patch-ak,v 1.3 2005/12/12 19:55:41 joerg Exp $
-
---- doc/man/man4/Makefile.in.orig      2005-11-25 17:25:13.000000000 +0100
-+++ doc/man/man4/Makefile.in
-@@ -95,7 +95,7 @@ MAINTAINERCLEANFILES = Makefile.in
- 
- EXTRA_DIST = $(man_MANS)
- 
--man_MANS =      mwmrc.4
-+man_MANS =      
- 
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
- CONFIG_HEADER = ../../../include/config.h
diff -N x11/openmotif/patches/patch-al
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ x11/openmotif/patches/patch-al      26 Dec 2007 15:19:31 -0000
@@ -0,0 +1,13 @@
+$NetBSD$
+
+--- doc/man/Makefile.in.orig   2007-08-09 09:27:51.000000000 +0200
++++ doc/man/Makefile.in        2007-12-26 16:15:50.000000000 +0100
+@@ -206,7 +206,7 @@
+ target_os = @target_os@
+ target_vendor = @target_vendor@
+ MAINTAINERCLEANFILES = Makefile.in
+-SUBDIRS = man1 man3 man4 man5
++SUBDIRS = man1 man3 man5
+ all: all-recursive
+ 
+ .SUFFIXES:
--- x11/openmotif/patches/patch-az      12 Dec 2005 19:55:41 -0000      1.2
+++ x11/openmotif/patches/patch-az      26 Dec 2007 14:44:20 -0000
@@ -1,8 +1,8 @@
-$NetBSD: patch-az,v 1.2 2005/12/12 19:55:41 joerg Exp $
+$NetBSD$
 
---- lib/Xm/Scale.c.orig        2005-12-02 18:31:33.000000000 +0100
-+++ lib/Xm/Scale.c
-@@ -87,6 +87,9 @@ static char rcsid[] = "$TOG: Scale.c /ma
+--- lib/Xm/Scale.c.orig        2005-05-07 09:11:14.000000000 +0200
++++ lib/Xm/Scale.c     2007-12-26 15:43:49.000000000 +0100
+@@ -87,6 +87,9 @@
  extern "C" { /* some 'locale.h' do not have prototypes (sun) */
  #endif
  #include <X11/Xlocale.h>
--- x11/openmotif/patches/patch-ba      18 Dec 2004 00:39:31 -0000      1.1
+++ /dev/null   1 Jan 1970 00:00:00 -0000
@@ -1,30 +0,0 @@
-$NetBSD: patch-ba,v 1.1 2004/12/18 00:39:31 tron Exp $
-
---- lib/Xm/XpmAttrib.c.orig    2000-04-28 16:05:22.000000000 +0100
-+++ lib/Xm/XpmAttrib.c 2004-12-17 23:20:38.000000000 +0000
-@@ -36,7 +36,7 @@
- #include "XpmI.h"
- 
- /* 3.2 backward compatibility code */
--LFUNC(CreateOldColorTable, int, (XpmColor *ct, int ncolors,
-+LFUNC(CreateOldColorTable, int, (XpmColor *ct, unsigned int ncolors,
-                                XpmColor ***oldct));
- 
- LFUNC(FreeOldColorTable, void, (XpmColor **colorTable, int ncolors));
-@@ -47,12 +47,15 @@
- static int
- CreateOldColorTable(ct, ncolors, oldct)
-     XpmColor *ct;
--    int ncolors;
-+    unsigned int ncolors;
-     XpmColor ***oldct;
- {
-     XpmColor **colorTable, **color;
-     int a;
- 
-+    if (ncolors >= SIZE_MAX / sizeof(XpmColor *)) 
-+      return XpmNoMemory;
-+
-     colorTable = (XpmColor **) XpmMalloc(ncolors * sizeof(XpmColor *));
-     if (!colorTable) {
-       *oldct = NULL;
--- x11/openmotif/patches/patch-bb      18 Dec 2004 00:39:31 -0000      1.1
+++ /dev/null   1 Jan 1970 00:00:00 -0000
@@ -1,13 +0,0 @@
-$NetBSD: patch-bb,v 1.1 2004/12/18 00:39:31 tron Exp $
-
---- lib/Xm/XpmCrDatFrI.c.orig  2000-04-28 16:05:22.000000000 +0100
-+++ lib/Xm/XpmCrDatFrI.c       2004-12-17 23:20:38.000000000 +0000
-@@ -129,6 +129,8 @@
-      */
-     header_nlines = 1 + image->ncolors;
-     header_size = sizeof(char *) * header_nlines;
-+    if (header_size >= SIZE_MAX / sizeof(char *))
-+      return (XpmNoMemory);
-     header = (char **) XpmCalloc(header_size, sizeof(char *));
-     if (!header)
-       return (XpmNoMemory);
--- x11/openmotif/patches/patch-bc      18 Dec 2004 00:39:31 -0000      1.1
+++ /dev/null   1 Jan 1970 00:00:00 -0000
@@ -1,36 +0,0 @@
-$NetBSD: patch-bc,v 1.1 2004/12/18 00:39:31 tron Exp $
-
---- lib/Xm/XpmI.h.orig 2004-12-17 23:17:51.000000000 +0000
-+++ lib/Xm/XpmI.h      2004-12-17 23:21:35.000000000 +0000
-@@ -179,6 +179,18 @@
-               boundCheckingCalloc((long)(nelem),(long) (elsize))
- #endif
- 
-+#if defined(SCO) || defined(__USLC__)
-+#include <stdint.h>   /* For SIZE_MAX */
-+#endif
-+#include <limits.h>
-+#ifndef SIZE_MAX
-+# ifdef ULONG_MAX
-+#  define SIZE_MAX ULONG_MAX
-+# else 
-+#  define SIZE_MAX UINT_MAX
-+# endif
-+#endif
-+
- #define XPMMAXCMTLEN BUFSIZ
- typedef struct {
-     unsigned int type;
-@@ -276,9 +288,9 @@
- }      *xpmHashAtom;
- 
- typedef struct {
--    int size;
--    int limit;
--    int used;
-+    unsigned int size;
-+    unsigned int limit;
-+    unsigned int used;
-     xpmHashAtom *atomTable;
- }      xpmHashTable;
- 
--- x11/openmotif/patches/patch-bd      18 Dec 2004 00:39:31 -0000      1.1
+++ /dev/null   1 Jan 1970 00:00:00 -0000
@@ -1,13 +0,0 @@
-$NetBSD: patch-bd,v 1.1 2004/12/18 00:39:31 tron Exp $
-
---- lib/Xm/XpmWrFFrI.c.orig    2000-04-28 16:05:22.000000000 +0100
-+++ lib/Xm/XpmWrFFrI.c 2004-12-17 23:20:38.000000000 +0000
-@@ -239,6 +239,8 @@
-     unsigned int x, y, h;
- 
-     h = height - 1;
-+    if (cpp != 0 && width >= (SIZE_MAX - 3)/cpp) 
-+      return XpmNoMemory;    
-     p = buf = (char *) XpmMalloc(width * cpp + 3);
-     if (!buf)
-       return (XpmNoMemory);
--- x11/openmotif/patches/patch-be      18 Dec 2004 00:39:31 -0000      1.1
+++ /dev/null   1 Jan 1970 00:00:00 -0000
@@ -1,59 +0,0 @@
-$NetBSD: patch-be,v 1.1 2004/12/18 00:39:31 tron Exp $
-
---- lib/Xm/Xpmcreate.c.orig    2000-04-28 16:05:21.000000000 +0100
-+++ lib/Xm/Xpmcreate.c 2004-12-17 23:28:32.000000000 +0000
-@@ -1,4 +1,5 @@
- /* $XConsortium: Xpmcreate.c /main/8 1996/09/20 08:15:02 pascale $ */
-+/* $XdotOrg: pre-CVS proposed fix for CESA-2004-003 alanc 7/25/2004 $ */
- /*
-  * Copyright (C) 1989-95 GROUPE BULL
-  *
-@@ -799,6 +800,9 @@
- 
-     ErrorStatus = XpmSuccess;
- 
-+    if (image->ncolors >= SIZE_MAX / sizeof(Pixel)) 
-+      return (XpmNoMemory);
-+
-     /* malloc pixels index tables */
-     image_pixels = (Pixel *) XpmMalloc(sizeof(Pixel) * image->ncolors);
-     if (!image_pixels)
-@@ -942,6 +946,8 @@
-       return (XpmNoMemory);
- 
- #ifndef FOR_MSW
-+     if (height != 0 && (*image_return)->bytes_per_line >= SIZE_MAX / height)
-+      return XpmNoMemory;
-     /* now that bytes_per_line must have been set properly alloc data */
-     (*image_return)->data =
-       (char *) XpmMalloc((*image_return)->bytes_per_line * height);
-@@ -1987,6 +1993,9 @@
-       xpmGetCmt(data, &colors_cmt);
- 
-     /* malloc pixels index tables */
-+    if (ncolors >= SIZE_MAX / sizeof(Pixel)) 
-+      return XpmNoMemory;
-+
-     image_pixels = (Pixel *) XpmMalloc(sizeof(Pixel) * ncolors);
-     if (!image_pixels)
-       RETURN(XpmNoMemory);
-@@ -2200,6 +2209,9 @@
-       {
-           unsigned short colidx[256];
- 
-+          if (ncolors > 256)
-+              return (XpmFileInvalid);
-+
-           bzero((char *)colidx, 256 * sizeof(short));
-           for (a = 0; a < ncolors; a++)
-               colidx[(unsigned char)colorTable[a].string[0]] = a + 1;
-@@ -2298,6 +2310,9 @@
-           char *s;
-           char buf[BUFSIZ];
- 
-+          if (cpp >= sizeof(buf))
-+              return (XpmFileInvalid);
-+
-           buf[cpp] = '\0';
-           if (USE_HASHTABLE) {
-               xpmHashAtom *slot;
--- x11/openmotif/patches/patch-bf      18 Dec 2004 00:39:31 -0000      1.1
+++ /dev/null   1 Jan 1970 00:00:00 -0000
@@ -1,13 +0,0 @@
-$NetBSD: patch-bf,v 1.1 2004/12/18 00:39:31 tron Exp $
-
---- lib/Xm/Xpmdata.c.orig      2000-04-28 16:05:21.000000000 +0100
-+++ lib/Xm/Xpmdata.c   2004-12-17 23:29:37.000000000 +0000
-@@ -371,7 +371,7 @@
- {
-     if (!mdata->type)
-       *cmt = NULL;
--    else if (mdata->CommentLength) {
-+    else if (mdata->CommentLength != 0 && mdata->CommentLength < SIZE_MAX - 
1) {
-       *cmt = (char *) XpmMalloc(mdata->CommentLength + 1);
-       strncpy(*cmt, mdata->Comment, mdata->CommentLength);
-       (*cmt)[mdata->CommentLength] = '\0';
--- x11/openmotif/patches/patch-bg      18 Dec 2004 00:39:31 -0000      1.1
+++ /dev/null   1 Jan 1970 00:00:00 -0000
@@ -1,31 +0,0 @@
-$NetBSD: patch-bg,v 1.1 2004/12/18 00:39:31 tron Exp $
-
---- lib/Xm/Xpmhashtab.c.orig   2000-04-28 16:05:22.000000000 +0100
-+++ lib/Xm/Xpmhashtab.c        2004-12-17 23:21:35.000000000 +0000
-@@ -136,7 +136,7 @@
-     xpmHashTable *table;
- {
-     xpmHashAtom *atomTable = table->atomTable;
--    int size = table->size;
-+    unsigned int size = table->size;
-     xpmHashAtom *t, *p;
-     int i;
-     int oldSize = size;
-@@ -145,6 +145,8 @@
-     HASH_TABLE_GROWS
-       table->size = size;
-     table->limit = size / 3;
-+    if (size >= SIZE_MAX / sizeof(*atomTable)) 
-+      return (XpmNoMemory);
-     atomTable = (xpmHashAtom *) XpmMalloc(size * sizeof(*atomTable));
-     if (!atomTable)
-       return (XpmNoMemory);
-@@ -205,6 +207,8 @@
-     table->size = INITIAL_HASH_SIZE;
-     table->limit = table->size / 3;
-     table->used = 0;
-+    if (table->size >= SIZE_MAX / sizeof(*atomTable))
-+      return (XpmNoMemory);
-     atomTable = (xpmHashAtom *) XpmMalloc(table->size * sizeof(*atomTable));
-     if (!atomTable)
-       return (XpmNoMemory);
--- x11/openmotif/patches/patch-bh      12 Dec 2005 19:55:41 -0000      1.2
+++ /dev/null   1 Jan 1970 00:00:00 -0000
@@ -1,170 +0,0 @@
-$NetBSD: patch-bh,v 1.2 2005/12/12 19:55:41 joerg Exp $
-
---- lib/Xm/Xpmparse.c.orig     2000-04-28 16:05:21.000000000 +0100
-+++ lib/Xm/Xpmparse.c  2004-12-18 00:31:35.000000000 +0000
-@@ -47,6 +47,15 @@
- #include "XpmI.h"
- #include <ctype.h>
- 
-+#define STRLCAT(dst, src, dstsize) { \
-+      if ((strlen(dst) + strlen(src)) < (dstsize)) \
-+          strcat(dst, src); \
-+      else return (XpmFileInvalid); }
-+#define STRLCPY(dst, src, dstsize) { \
-+      if (strlen(src) < (dstsize)) \
-+          strcpy(dst, src); \
-+      else return (XpmFileInvalid); }
-+
- LFUNC(ParsePixels, int, (xpmData *data, unsigned int width,
-                        unsigned int height, unsigned int ncolors,
-                        unsigned int cpp, XpmColor *colorTable,
-@@ -215,7 +224,7 @@ xpmParseValues(data, width, height, ncol
-     unsigned int *extensions;
- {
-     unsigned int l;
--    char buf[BUFSIZ];
-+    char buf[BUFSIZ+1];
- 
-     if (!data->format) {              /* XPM 2 or 3 */
- 
-@@ -324,10 +333,10 @@ xpmParseColors(data, ncolors, cpp, color
-     XpmColor **colorTablePtr;
-     xpmHashTable *hashtable;
- {
--    unsigned int key, l, a, b;
-+    unsigned int key = 0, l, a, b, len;
-     unsigned int curkey;              /* current color key */
-     unsigned int lastwaskey;          /* key read */
--    char buf[BUFSIZ];
-+    char buf[BUFSIZ+1];
-     char curbuf[BUFSIZ];              /* current buffer */
-     char **sptr, *s;
-     XpmColor *color;
-@@ -335,6 +344,8 @@ xpmParseColors(data, ncolors, cpp, color
-     char **defaults;
-     int ErrorStatus;
- 
-+    if (ncolors >= SIZE_MAX / sizeof(XpmColor))
-+      return (XpmNoMemory);
-     colorTable = (XpmColor *) XpmCalloc(ncolors, sizeof(XpmColor));
-     if (!colorTable)
-       return (XpmNoMemory);
-@@ -346,6 +357,10 @@ xpmParseColors(data, ncolors, cpp, color
-           /*
-            * read pixel value
-            */
-+          if (cpp >= SIZE_MAX - 1) {
-+              xpmFreeColorTable(colorTable, ncolors);
-+              return (XpmNoMemory);
-+          }
-           color->string = (char *) XpmMalloc(cpp + 1);
-           if (!color->string) {
-               xpmFreeColorTable(colorTable, ncolors);
-@@ -383,13 +398,14 @@ xpmParseColors(data, ncolors, cpp, color
-               }
-               if (!lastwaskey && key < NKEYS) {       /* open new key */
-                   if (curkey) {       /* flush string */
--                      s = (char *) XpmMalloc(strlen(curbuf) + 1);
-+                      len = strlen(curbuf) + 1;
-+                      s = (char *) XpmMalloc(len);
-                       if (!s) {
-                           xpmFreeColorTable(colorTable, ncolors);
-                           return (XpmNoMemory);
-                       }
-                       defaults[curkey] = s;
--                      strcpy(s, curbuf);
-+                      memcpy(s, curbuf, len);
-                   }
-                   curkey = key + 1;   /* set new key  */
-                   *curbuf = '\0';     /* reset curbuf */
-@@ -400,9 +416,9 @@ xpmParseColors(data, ncolors, cpp, color
-                       return (XpmFileInvalid);
-                   }
-                   if (!lastwaskey)
--                      strcat(curbuf, " ");    /* append space */
-+                      STRLCAT(curbuf, " ", sizeof(curbuf));   /* append space 
*/
-                   buf[l] = '\0';
--                  strcat(curbuf, buf);/* append buf */
-+                  STRLCAT(curbuf, buf, sizeof(curbuf));/* append buf */
-                   lastwaskey = 0;
-               }
-           }
-@@ -410,12 +426,13 @@ xpmParseColors(data, ncolors, cpp, color
-               xpmFreeColorTable(colorTable, ncolors);
-               return (XpmFileInvalid);
-           }
--          s = defaults[curkey] = (char *) XpmMalloc(strlen(curbuf) + 1);
-+          len = strlen(curbuf) + 1;
-+          s = defaults[curkey] = (char *) XpmMalloc(len);
-           if (!s) {
-               xpmFreeColorTable(colorTable, ncolors);
-               return (XpmNoMemory);
-           }
--          strcpy(s, curbuf);
-+          memcpy(s, curbuf, len);
-       }
-     } else {                          /* XPM 1 */
-       /* get to the beginning of the first string */
-@@ -428,6 +445,10 @@ xpmParseColors(data, ncolors, cpp, color
-           /*
-            * read pixel value
-            */
-+          if (cpp >= SIZE_MAX - 1) {
-+              xpmFreeColorTable(colorTable, ncolors);
-+              return (XpmNoMemory);
-+          }
-           color->string = (char *) XpmMalloc(cpp + 1);
-           if (!color->string) {
-               xpmFreeColorTable(colorTable, ncolors);
-@@ -456,16 +477,17 @@ xpmParseColors(data, ncolors, cpp, color
-           *curbuf = '\0';             /* init curbuf */
-           while ((l = xpmNextWord(data, buf, BUFSIZ))) {
-               if (*curbuf != '\0')
--                  strcat(curbuf, " ");/* append space */
-+                  STRLCAT(curbuf, " ", sizeof(curbuf));/* append space */
-               buf[l] = '\0';
--              strcat(curbuf, buf);    /* append buf */
-+              STRLCAT(curbuf, buf, sizeof(curbuf));   /* append buf */
-           }
--          s = (char *) XpmMalloc(strlen(curbuf) + 1);
-+          len = strlen(curbuf) + 1;
-+          s = (char *) XpmMalloc(len);
-           if (!s) {
-               xpmFreeColorTable(colorTable, ncolors);
-               return (XpmNoMemory);
-           }
--          strcpy(s, curbuf);
-+          memcpy(s, curbuf, len);
-           color->c_color = s;
-           *curbuf = '\0';             /* reset curbuf */
-           if (a < ncolors - 1)
-@@ -490,6 +512,9 @@ ParsePixels(data, width, height, ncolors
-     unsigned int *iptr, *iptr2;
-     unsigned int a, x, y;
- 
-+    if ((height > 0 && width >= SIZE_MAX / height) ||
-+      width * height >= SIZE_MAX / sizeof(unsigned int)) 
-+      return XpmNoMemory;
- #ifndef FOR_MSW
-     iptr2 = (unsigned int *) XpmMalloc(sizeof(unsigned int) * width * height);
- #else
-@@ -513,6 +538,9 @@ ParsePixels(data, width, height, ncolors
-       {
-           unsigned short colidx[256];
- 
-+          if (ncolors > 256)
-+              return (XpmFileInvalid);
-+
-           bzero((char *)colidx, 256 * sizeof(short));
-           for (a = 0; a < ncolors; a++)
-               colidx[(unsigned char)colorTable[a].string[0]] = a + 1;
-@@ -590,6 +618,9 @@ if (cidx[f]) XpmFree(cidx[f]);}
-           char *s;
-           char buf[BUFSIZ];
- 
-+          if (cpp >= sizeof(buf))
-+              return (XpmFileInvalid);
-+
-           buf[cpp] = '\0';
-           if (USE_HASHTABLE) {
-               xpmHashAtom *slot;
--- x11/openmotif/patches/patch-bi      10 Mar 2005 16:00:32 -0000      1.2
+++ /dev/null   1 Jan 1970 00:00:00 -0000
@@ -1,79 +0,0 @@
-$NetBSD: patch-bi,v 1.2 2005/03/10 16:00:32 wiz Exp $
-
---- lib/Xm/Xpmscan.c.orig      2000-04-28 17:05:21.000000000 +0200
-+++ lib/Xm/Xpmscan.c
-@@ -93,7 +93,8 @@ LFUNC(MSWGetImagePixels, int, (Display *
- LFUNC(ScanTransparentColor, int, (XpmColor *color, unsigned int cpp,
-                                 XpmAttributes *attributes));
- 
--LFUNC(ScanOtherColors, int, (Display *display, XpmColor *colors, int ncolors,
-+LFUNC(ScanOtherColors, int, (Display *display, XpmColor *colors, 
-+                           unsigned int ncolors, 
-                            Pixel *pixels, unsigned int mask,
-                            unsigned int cpp, XpmAttributes *attributes));
- 
-@@ -220,11 +221,17 @@ XpmCreateXpmImageFromImage(display, imag
-     else
-       cpp = 0;
- 
-+    if ((height > 0 && width >= SIZE_MAX / height) ||
-+      width * height >= SIZE_MAX / sizeof(unsigned int))
-+      RETURN(XpmNoMemory);
-     pmap.pixelindex =
-       (unsigned int *) XpmCalloc(width * height, sizeof(unsigned int));
-     if (!pmap.pixelindex)
-       RETURN(XpmNoMemory);
- 
-+    if (pmap.size >= SIZE_MAX / sizeof(Pixel)) 
-+      RETURN(XpmNoMemory);
-+
-     pmap.pixels = (Pixel *) XpmMalloc(sizeof(Pixel) * pmap.size);
-     if (!pmap.pixels)
-       RETURN(XpmNoMemory);
-@@ -279,7 +286,8 @@ XpmCreateXpmImageFromImage(display, imag
-      * get rgb values and a string of char, and possibly a name for each
-      * color
-      */
--
-+    if (pmap.ncolors >= SIZE_MAX / sizeof(XpmColor))
-+      RETURN(XpmNoMemory);
-     colorTable = (XpmColor *) XpmCalloc(pmap.ncolors, sizeof(XpmColor));
-     if (!colorTable)
-       RETURN(XpmNoMemory);
-@@ -327,6 +335,8 @@ ScanTransparentColor(color, cpp, attribu
- 
-     /* first get a character string */
-     a = 0;
-+    if (cpp >= SIZE_MAX - 1)
-+      return (XpmNoMemory);
-     if (!(s = color->string = (char *) XpmMalloc(cpp + 1)))
-       return (XpmNoMemory);
-     *s++ = printable[c = a % MAXPRINTABLE];
-@@ -374,7 +384,7 @@ static int
- ScanOtherColors(display, colors, ncolors, pixels, mask, cpp, attributes)
-     Display *display;
-     XpmColor *colors;
--    int ncolors;
-+    unsigned int ncolors;
-     Pixel *pixels;
-     unsigned int mask;
-     unsigned int cpp;
-@@ -418,6 +428,8 @@ ScanOtherColors(display, colors, ncolors
-     }
- 
-     /* first get character strings and rgb values */
-+    if (ncolors >= SIZE_MAX / sizeof(XColor) || cpp >= SIZE_MAX - 1)
-+      return (XpmNoMemory);
-     xcolors = (XColor *) XpmMalloc(sizeof(XColor) * ncolors);
-     if (!xcolors)
-       return (XpmNoMemory);
-@@ -585,6 +597,9 @@ GetImagePixels(image, width, height, pma
-     ibpp = image->bits_per_pixel;
-     offset = image->xoffset;
- 
-+    if (image->bitmap_unit < 0)
-+          return (XpmNoMemory);
-+
-     if ((image->bits_per_pixel | image->depth) == 1) {
-       ibu = image->bitmap_unit;
-       for (y = 0; y < height; y++)
--- x11/openmotif/patches/patch-bj      7 Jan 2006 21:08:12 -0000       1.3
+++ x11/openmotif/patches/patch-bj      26 Dec 2007 14:59:34 -0000
@@ -1,23 +1,8 @@
-$NetBSD: patch-bj,v 1.3 2006/01/07 21:08:12 joerg Exp $
+$NetBSD$
 
---- clients/uil/UilDiags.c.orig        2006-01-06 20:46:16.000000000 +0100
-+++ clients/uil/UilDiags.c
-@@ -293,12 +293,12 @@ void     diag_issue_diagnostic
-     va_start(ap, l_start_column);
- 
- #ifndef NO_MESSAGE_CATALOG
--    vsprintf( msg_buffer, 
-+    vsnprintf( msg_buffer, sizeof(msg_buffer),
-             catgets(uil_catd, UIL_SET1, msg_cat_table[ message_number ],
-                     diag_rz_msg_table[ message_number ].ac_text), 
-            ap );
- #else
--    vsprintf( msg_buffer, 
-+    vsnprintf( msg_buffer, sizeof(msg_buffer), 
-             diag_rz_msg_table[ message_number ].ac_text, 
-             ap );
- #endif
-@@ -317,13 +317,13 @@ void     diag_issue_diagnostic
+--- clients/uil/UilDiags.c.orig        2006-04-06 15:24:06.000000000 +0200
++++ clients/uil/UilDiags.c     2007-12-26 15:59:05.000000000 +0100
+@@ -317,13 +317,13 @@
            */
  
  #ifndef NO_MESSAGE_CATALOG
@@ -33,7 +18,7 @@
                     "\t\t line: %d  file: %s",
                     az_src_rec->w_line_number,
                     src_get_file_name( az_src_rec ) );
-@@ -371,7 +371,7 @@ void       diag_issue_diagnostic
+@@ -371,7 +371,7 @@
  
            if (l_start_column != diag_k_no_column)
  #ifndef NO_MESSAGE_CATALOG
@@ -42,7 +27,7 @@
                      catgets(uil_catd, UIL_SET_MISC,
                              UIL_MISC_1, 
                              "\t\t line: %d  position: %d  file: %s"),
-@@ -379,7 +379,7 @@ void       diag_issue_diagnostic
+@@ -379,7 +379,7 @@
                      l_start_column + 1,
                      src_get_file_name( az_src_rec ) );
  #else
@@ -51,7 +36,7 @@
                      "\t\t line: %d  position: %d  file: %s",
                      az_src_rec->w_line_number,
                      l_start_column + 1,
-@@ -387,13 +387,14 @@ void     diag_issue_diagnostic
+@@ -387,13 +387,14 @@
  #endif
            else
  #ifndef NO_MESSAGE_CATALOG
--- x11/openmotif/patches/patch-bk      7 Jan 2006 21:08:12 -0000       1.1
+++ /dev/null   1 Jan 1970 00:00:00 -0000
@@ -1,16 +0,0 @@
-$NetBSD: patch-bk,v 1.1 2006/01/07 21:08:12 joerg Exp $
-
---- clients/uil/UilSrcSrc.c.orig       2006-01-06 20:50:23.000000000 +0100
-+++ clients/uil/UilSrcSrc.c
-@@ -629,8 +629,10 @@ open_source_file( XmConst char          
-     char                      buffer[256];
- 
- 
--    /* place the file name in the expanded_name buffer */
-+    if (strlen(c_file_name) >= sizeof(buffer + 1))
-+      return src_k_open_error;
- 
-+    /* place the file name in the expanded_name buffer */
-     strcpy(buffer, c_file_name);
- 
- /*    Determine if this is the main file or an include file.  */
--- x11/openmotif/patches/patch-bm      15 Aug 2007 19:26:39 -0000      1.1
+++ x11/openmotif/patches/patch-bm      26 Dec 2007 15:09:11 -0000
@@ -1,11 +1,11 @@
-$NetBSD: patch-bm,v 1.1 2007/08/15 19:26:39 joerg Exp $
-
---- config/util/Makefile.in.orig       2007-08-06 16:22:42.000000000 +0200
-+++ config/util/Makefile.in
-@@ -197,9 +197,15 @@ distclean-libtool:
- 
- maintainer-clean-libtool:
+$NetBSD$
  
+--- config/util/Makefile.in.orig       2007-08-09 09:27:23.000000000 +0200
++++ config/util/Makefile.in    2007-12-26 16:08:44.000000000 +0100
+@@ -264,9 +264,15 @@
+         echo " rm -f $$p $$f"; \
+         rm -f $$p $$f ; \
+       done
 +ifndef CROSS_COMPILING
  makestrs$(EXEEXT): $(makestrs_OBJECTS) $(makestrs_DEPENDENCIES)
        @rm -f makestrs$(EXEEXT)
@@ -16,5 +16,5 @@
 +          $(CFLAGS_FOR_BUILD) $(LDFLAGS_FOR_BUILD) -o $@ makestrs.c
 +endif
  
- tags: TAGS
- 
+ mostlyclean-compile:
+       -rm -f *.$(OBJEXT)
diff -b -u -r1.22 Makefile
--- x11/p5-gtk2/Makefile        13 May 2007 22:57:57 -0000      1.22
+++ x11/p5-gtk2/Makefile        28 May 2007 21:52:49 -0000
@@ -9,6 +9,8 @@
 HOMEPAGE=      http://gtk2-perl.sourceforge.net/
 COMMENT=       Perl bindings for GTK+ 2.0
 
+MAKE_JOBS_SAFE=        no
+
 DEPENDS+=      p5-ExtUtils-Depends>=0.2:../../devel/p5-ExtUtils-Depends
 DEPENDS+=      p5-ExtUtils-PkgConfig>=1.03:../../devel/p5-ExtUtils-PkgConfig
 
>How-To-Repeat:
        
>Fix:
        

>Unformatted:
        
        


Home | Main Index | Thread Index | Old Index