From 28d4036d309e65d3f7b890c984a4306b27a04b72 Mon Sep 17 00:00:00 2001 From: Charlie Date: Sun, 13 Sep 2009 06:47:18 -0700 Subject: [PATCH] update Sun Sep 13 06:37:00 PDT 2009 --- archivers/lzo/Makefile | 5 +- devel/xulrunner/Makefile | 20 +- devel/xulrunner/PLIST | 75 +++++++- devel/xulrunner/distinfo | 10 +- devel/xulrunner/patches/patch-ap | 8 +- doc/CHANGES-2009 | 9 +- doc/TODO | 10 +- graphics/graphviz/Makefile | 5 +- graphics/graphviz/PLIST | 8 +- graphics/graphviz/distinfo | 8 +- graphics/graphviz/options.mk | 76 +++++--- mail/p5-Mail-Mbox-MessageParser/Makefile | 16 +- mail/p5-Mail-Mbox-MessageParser/distinfo | 11 +- .../patches/patch-aa | 15 -- .../patches/patch-ab | 15 -- .../patches/patch-ac | 15 -- misc/py-anita/Makefile | 4 +- misc/py-anita/distinfo | 8 +- mk/bsd.prefs.mk | 5 +- mk/defaults/mk.conf | 13 +- multimedia/libtheora/Makefile | 5 +- multimedia/p5-xmltv/Makefile | 26 ++- multimedia/p5-xmltv/PLIST | 14 +- multimedia/p5-xmltv/distinfo | 8 +- multimedia/totem-browser-plugin/Makefile | 10 +- multimedia/totem-browser-plugin/PLIST | 10 +- net/libpcap/builtin.mk | 8 +- parallel/Makefile | 3 +- parallel/openpbs/DESCR | 6 - parallel/openpbs/Makefile | 38 ---- parallel/openpbs/PLIST | 173 ------------------ parallel/openpbs/distinfo | 9 - parallel/openpbs/patches/patch-aa | 16 -- parallel/openpbs/patches/patch-ab | 14 -- parallel/openpbs/patches/patch-ac | 26 --- parallel/openpbs/patches/patch-ad | 37 ---- pkgtools/x11-links/Makefile | 7 +- pkgtools/x11-links/buildlink3.mk | 4 +- time/p5-DateTime-Locale/Makefile | 6 +- time/p5-DateTime-Locale/distinfo | 8 +- wip/e17/distinfo | 1 + wip/gcc44/TODO | 2 + wip/linux-kernel/TODO | 2 +- wip/linux24-kernel/TODO | 2 +- wip/p5-POD2-IT/Makefile | 3 +- wip/p5-POD2-IT/distinfo | 6 +- wip/pipestatus/Makefile | 2 +- wip/pipestatus/distinfo | 6 +- wip/runawk/PLIST | 4 +- wip/sbcl/Makefile | 6 +- www/apache22/Makefile | 3 +- www/apache22/distinfo | 3 +- www/apache22/patches/patch-ab | 19 ++ 53 files changed, 316 insertions(+), 507 deletions(-) delete mode 100644 mail/p5-Mail-Mbox-MessageParser/patches/patch-aa delete mode 100644 mail/p5-Mail-Mbox-MessageParser/patches/patch-ab delete mode 100644 mail/p5-Mail-Mbox-MessageParser/patches/patch-ac delete mode 100644 parallel/openpbs/DESCR delete mode 100644 parallel/openpbs/Makefile delete mode 100644 parallel/openpbs/PLIST delete mode 100644 parallel/openpbs/distinfo delete mode 100644 parallel/openpbs/patches/patch-aa delete mode 100644 parallel/openpbs/patches/patch-ab delete mode 100644 parallel/openpbs/patches/patch-ac delete mode 100644 parallel/openpbs/patches/patch-ad create mode 100644 wip/gcc44/TODO create mode 100644 www/apache22/patches/patch-ab diff --git a/archivers/lzo/Makefile b/archivers/lzo/Makefile index 780ca6ffc673..18c3c31e081c 100644 --- a/archivers/lzo/Makefile +++ b/archivers/lzo/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2008/05/20 15:11:55 wiz Exp $ +# $NetBSD: Makefile,v 1.8 2009/09/13 13:11:56 tron Exp $ DISTNAME= lzo-2.03 CATEGORIES= archivers @@ -18,7 +18,8 @@ TEST_TARGET= test .include "../../mk/bsd.prefs.mk" -.if !empty(MACHINE_PLATFORM:MDarwin-9.*-i386) +.if !empty(MACHINE_PLATFORM:MDarwin-9.*-i386) || \ + !empty(MACHINE_PLATFORM:MDarwin-??.*-*) CONFIGURE_ARGS+= --disable-asm .endif diff --git a/devel/xulrunner/Makefile b/devel/xulrunner/Makefile index 11dcdad263f0..7668deed5013 100644 --- a/devel/xulrunner/Makefile +++ b/devel/xulrunner/Makefile @@ -1,10 +1,10 @@ -# $NetBSD: Makefile,v 1.15 2009/09/09 18:15:37 tnn Exp $ +# $NetBSD: Makefile,v 1.17 2009/09/13 12:19:26 tnn Exp $ # DISTNAME= xulrunner-${XULRUNNER_VER}-source PKGNAME= ${DISTNAME:S/-source//} -XULRUNNER_VER= 1.9.1.2 -PKGREVISION= 5 +XULRUNNER_VER= 1.9.1.3 +PKGREVISION= 1 CATEGORIES= devel www MASTER_SITES= ${MASTER_SITE_MOZILLA:=xulrunner/releases/${XULRUNNER_VER}/source/} EXTRACT_SUFX= .tar.bz2 @@ -90,11 +90,13 @@ create-rm-wrapper: chmod +x ${WRAPPER_DIR}/bin/rm INCLUDE_SUBDIRS=\ - caps chardet cookie commandhandler content docshell dom exthandler fastfind find gfx gtkembedmoz \ - java js layout locale mimetype necko nkcache nspr oji pipboot pipnss pref shistory \ - string uconv uriloader webbrowserpersist webbrwsr webshell widget windowwatcher xpcom \ - xpconnect xulapp profdirserviceprovider thebes embedcomponents intl loginmgr \ - toolkitcomps downloads spellchecker + caps chardet commandhandler content cookie docshell dom \ + downloads embedcomponents exthandler fastfind find gfx \ + gtkembedmoz htmlparser imglib2 intl java js layout libreg \ + locale loginmgr mimetype necko nkcache nspr oji pipboot pipnss \ + places pref profdirserviceprovider rdf shistory spellchecker \ + string thebes toolkitcomps uconv uriloader webbrowserpersist \ + webbrwsr webshell widget windowwatcher xpcom xpconnect xulapp post-install: # XXX fix the pkg-config files instead @@ -104,6 +106,8 @@ post-install: rm -f ${DESTDIR}${PREFIX}/lib/xulrunner/libxpcomglue_s.a ln -s ${PREFIX}/lib/xulrunner-sdk/sdk/lib/libxpcomglue_s.a \ ${DESTDIR}${PREFIX}/lib/xulrunner/libxpcomglue_s.a + ${INSTALL_LIB} ${WRKSRC}/dist/lib/libunicharutil_external_s.a \ + ${DESTDIR}${PREFIX}/lib/xulrunner cd ${WRKSRC}/dist/include && \ ${INSTALL_DATA} `find ${INCLUDE_SUBDIRS} -name "*.h" -print` \ js/jsproto.tbl mozilla-config.h gtkembedmoz/gtkmozembed_glue.cpp \ diff --git a/devel/xulrunner/PLIST b/devel/xulrunner/PLIST index 573cce020652..e9d8af4f1cf7 100644 --- a/devel/xulrunner/PLIST +++ b/devel/xulrunner/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.11 2009/08/15 05:03:30 obache Exp $ +@comment $NetBSD: PLIST,v 1.13 2009/09/13 12:19:26 tnn Exp $ bin/xulrunner include/xulrunner/stable/base64.h include/xulrunner/stable/blapit.h @@ -461,9 +461,16 @@ ${PLIST.jit}include/xulrunner/unstable/Fragmento.h ${PLIST.jit}include/xulrunner/unstable/LIR.h ${PLIST.jit}include/xulrunner/unstable/Native.h ${PLIST.jit}include/xulrunner/unstable/Native${NANOJIT_ARCH}.h +include/xulrunner/unstable/ImageErrors.h +include/xulrunner/unstable/ImageLogging.h +include/xulrunner/unstable/NSReg.h +include/xulrunner/unstable/ImageErrors.h +include/xulrunner/unstable/ImageLogging.h +include/xulrunner/unstable/NSReg.h include/xulrunner/unstable/ProxyJNI.h ${PLIST.jit}include/xulrunner/unstable/RegAlloc.h ${PLIST.jit}include/xulrunner/unstable/TraceTreeDrawer.h +include/xulrunner/unstable/VerReg.h include/xulrunner/unstable/XPCIDispatch.h ${PLIST.jit}include/xulrunner/unstable/avmplus.h include/xulrunner/unstable/base64.h @@ -520,6 +527,16 @@ include/xulrunner/unstable/gtkmozembed.h include/xulrunner/unstable/gtkmozembed_glue.cpp include/xulrunner/unstable/gtkmozembed_internal.h include/xulrunner/unstable/hasht.h +include/xulrunner/unstable/imgICache.h +include/xulrunner/unstable/imgIContainer.h +include/xulrunner/unstable/imgIContainerObserver.h +include/xulrunner/unstable/imgIDecoder.h +include/xulrunner/unstable/imgIDecoderObserver.h +include/xulrunner/unstable/imgIEncoder.h +include/xulrunner/unstable/imgILoad.h +include/xulrunner/unstable/imgILoader.h +include/xulrunner/unstable/imgIRequest.h +include/xulrunner/unstable/imgITools.h include/xulrunner/unstable/interpreter.h include/xulrunner/unstable/jar-ds.h include/xulrunner/unstable/jar.h @@ -753,6 +770,9 @@ include/xulrunner/unstable/nsHTMLMediaElement.h include/xulrunner/unstable/nsHTMLParts.h include/xulrunner/unstable/nsHTMLReflowMetrics.h include/xulrunner/unstable/nsHTMLReflowState.h +include/xulrunner/unstable/nsHTMLTagList.h +include/xulrunner/unstable/nsHTMLTags.h +include/xulrunner/unstable/nsHTMLTokens.h include/xulrunner/unstable/nsHTMLVideoElement.h include/xulrunner/unstable/nsHashKeys.h include/xulrunner/unstable/nsHashPropertyBag.h @@ -763,6 +783,7 @@ include/xulrunner/unstable/nsIASN1PrintableItem.h include/xulrunner/unstable/nsIASN1Sequence.h include/xulrunner/unstable/nsIAboutModule.h include/xulrunner/unstable/nsIAllocator.h +include/xulrunner/unstable/nsIAnnotationService.h include/xulrunner/unstable/nsIAnonymousContentCreator.h include/xulrunner/unstable/nsIAppShell.h include/xulrunner/unstable/nsIAppStartupNotifier.h @@ -796,6 +817,7 @@ include/xulrunner/unstable/nsIBlocklistService.h include/xulrunner/unstable/nsIBoxObject.h include/xulrunner/unstable/nsIBrowserBoxObject.h include/xulrunner/unstable/nsIBrowserDOMWindow.h +include/xulrunner/unstable/nsIBrowserHistory.h include/xulrunner/unstable/nsIBufEntropyCollector.h include/xulrunner/unstable/nsIBufferedStreams.h include/xulrunner/unstable/nsIByteBuffer.h @@ -884,6 +906,7 @@ include/xulrunner/unstable/nsIContentHandler.h include/xulrunner/unstable/nsIContentIterator.h include/xulrunner/unstable/nsIContentPolicy.h include/xulrunner/unstable/nsIContentSerializer.h +include/xulrunner/unstable/nsIContentSink.h include/xulrunner/unstable/nsIContentSniffer.h include/xulrunner/unstable/nsIContentViewer.h include/xulrunner/unstable/nsIContentViewerContainer.h @@ -1277,6 +1300,7 @@ include/xulrunner/unstable/nsIDOMXULSelectCntrlEl.h include/xulrunner/unstable/nsIDOMXULSelectCntrlItemEl.h include/xulrunner/unstable/nsIDOMXULTextboxElement.h include/xulrunner/unstable/nsIDOMXULTreeElement.h +include/xulrunner/unstable/nsIDTD.h include/xulrunner/unstable/nsIDataSignatureVerifier.h include/xulrunner/unstable/nsIDateTimeFormat.h include/xulrunner/unstable/nsIDebug.h @@ -1312,9 +1336,11 @@ include/xulrunner/unstable/nsIDragDropHandler.h include/xulrunner/unstable/nsIDragService.h include/xulrunner/unstable/nsIDragSession.h include/xulrunner/unstable/nsIDragSessionGTK.h +include/xulrunner/unstable/nsIDynamicContainer.h include/xulrunner/unstable/nsIEditorBoxObject.h include/xulrunner/unstable/nsIEditorDocShell.h include/xulrunner/unstable/nsIEffectiveTLDService.h +include/xulrunner/unstable/nsIElementObserver.h include/xulrunner/unstable/nsIEmbeddingSiteWindow.h include/xulrunner/unstable/nsIEmbeddingSiteWindow2.h include/xulrunner/unstable/nsIEncodedChannel.h @@ -1328,6 +1354,8 @@ include/xulrunner/unstable/nsIEventStateManager.h include/xulrunner/unstable/nsIEventTarget.h include/xulrunner/unstable/nsIException.h include/xulrunner/unstable/nsIExceptionService.h +include/xulrunner/unstable/nsIExpatSink.h +include/xulrunner/unstable/nsIExtendedExpatSink.h include/xulrunner/unstable/nsIExternalHelperAppService.h include/xulrunner/unstable/nsIExternalProtocolHandler.h include/xulrunner/unstable/nsIExternalProtocolService.h @@ -1336,6 +1364,7 @@ include/xulrunner/unstable/nsIFTPChannel.h include/xulrunner/unstable/nsIFactory.h include/xulrunner/unstable/nsIFastLoadFileControl.h include/xulrunner/unstable/nsIFastLoadService.h +include/xulrunner/unstable/nsIFaviconService.h include/xulrunner/unstable/nsIFile.h include/xulrunner/unstable/nsIFileChannel.h include/xulrunner/unstable/nsIFileControlElement.h @@ -1356,6 +1385,7 @@ include/xulrunner/unstable/nsIFormSigningDialog.h include/xulrunner/unstable/nsIFormSubmission.h include/xulrunner/unstable/nsIFormSubmitObserver.h include/xulrunner/unstable/nsIFormatConverter.h +include/xulrunner/unstable/nsIFragmentContentSink.h include/xulrunner/unstable/nsIFrame.h include/xulrunner/unstable/nsIFrameDebug.h include/xulrunner/unstable/nsIFrameFrame.h @@ -1375,6 +1405,7 @@ include/xulrunner/unstable/nsIGnomeVFSService.h include/xulrunner/unstable/nsIGridPart.h include/xulrunner/unstable/nsIHTMLCSSStyleSheet.h include/xulrunner/unstable/nsIHTMLCollection.h +include/xulrunner/unstable/nsIHTMLContentSink.h include/xulrunner/unstable/nsIHTMLDocument.h include/xulrunner/unstable/nsIHTMLToTextSink.h include/xulrunner/unstable/nsIHandlerService.h @@ -1440,10 +1471,12 @@ include/xulrunner/unstable/nsILinkHandler.h include/xulrunner/unstable/nsIListBoxObject.h include/xulrunner/unstable/nsIListControlFrame.h include/xulrunner/unstable/nsILiveConnectManager.h +include/xulrunner/unstable/nsILivemarkService.h include/xulrunner/unstable/nsILoadContext.h include/xulrunner/unstable/nsILoadGroup.h include/xulrunner/unstable/nsILocalFile.h include/xulrunner/unstable/nsILocalFileWin.h +include/xulrunner/unstable/nsILocalStore.h include/xulrunner/unstable/nsILocale.h include/xulrunner/unstable/nsILocaleService.h include/xulrunner/unstable/nsILoginInfo.h @@ -1480,6 +1513,8 @@ include/xulrunner/unstable/nsINSSErrorsService.h include/xulrunner/unstable/nsINameSpaceManager.h include/xulrunner/unstable/nsINativeAppSupport.h include/xulrunner/unstable/nsINativeKeyBindings.h +include/xulrunner/unstable/nsINavBookmarksService.h +include/xulrunner/unstable/nsINavHistoryService.h include/xulrunner/unstable/nsINestedURI.h include/xulrunner/unstable/nsINetUtil.h include/xulrunner/unstable/nsINetworkLinkService.h @@ -1504,6 +1539,10 @@ include/xulrunner/unstable/nsIPKCS11Module.h include/xulrunner/unstable/nsIPKCS11ModuleDB.h include/xulrunner/unstable/nsIPKCS11Slot.h include/xulrunner/unstable/nsIPageSequenceFrame.h +include/xulrunner/unstable/nsIParser.h +include/xulrunner/unstable/nsIParserFilter.h +include/xulrunner/unstable/nsIParserNode.h +include/xulrunner/unstable/nsIParserService.h include/xulrunner/unstable/nsIPasswordManager.h include/xulrunner/unstable/nsIPasswordManagerInternal.h include/xulrunner/unstable/nsIPercentHeightObserver.h @@ -1563,6 +1602,26 @@ include/xulrunner/unstable/nsIProxiedProtocolHandler.h include/xulrunner/unstable/nsIProxyAutoConfig.h include/xulrunner/unstable/nsIProxyInfo.h include/xulrunner/unstable/nsIProxyObjectManager.h +include/xulrunner/unstable/nsIRDFCompositeDataSource.h +include/xulrunner/unstable/nsIRDFContainer.h +include/xulrunner/unstable/nsIRDFContainerUtils.h +include/xulrunner/unstable/nsIRDFContentSink.h +include/xulrunner/unstable/nsIRDFDataSource.h +include/xulrunner/unstable/nsIRDFDelegateFactory.h +include/xulrunner/unstable/nsIRDFInMemoryDataSource.h +include/xulrunner/unstable/nsIRDFInferDataSource.h +include/xulrunner/unstable/nsIRDFLiteral.h +include/xulrunner/unstable/nsIRDFNode.h +include/xulrunner/unstable/nsIRDFObserver.h +include/xulrunner/unstable/nsIRDFPropagatableDataSource.h +include/xulrunner/unstable/nsIRDFPurgeableDataSource.h +include/xulrunner/unstable/nsIRDFRemoteDataSource.h +include/xulrunner/unstable/nsIRDFResource.h +include/xulrunner/unstable/nsIRDFService.h +include/xulrunner/unstable/nsIRDFXMLParser.h +include/xulrunner/unstable/nsIRDFXMLSerializer.h +include/xulrunner/unstable/nsIRDFXMLSink.h +include/xulrunner/unstable/nsIRDFXMLSource.h include/xulrunner/unstable/nsIRadioControlElement.h include/xulrunner/unstable/nsIRadioControlFrame.h include/xulrunner/unstable/nsIRadioGroupContainer.h @@ -1701,6 +1760,7 @@ include/xulrunner/unstable/nsISystemProxySettings.h include/xulrunner/unstable/nsITXTToHTMLConv.h include/xulrunner/unstable/nsITableCellLayout.h include/xulrunner/unstable/nsITableLayout.h +include/xulrunner/unstable/nsITaggingService.h include/xulrunner/unstable/nsITextControlElement.h include/xulrunner/unstable/nsITextControlFrame.h include/xulrunner/unstable/nsITextScroll.h @@ -1715,6 +1775,7 @@ include/xulrunner/unstable/nsITimelineService.h include/xulrunner/unstable/nsITimer.h include/xulrunner/unstable/nsITokenDialogs.h include/xulrunner/unstable/nsITokenPasswordDialogs.h +include/xulrunner/unstable/nsITokenizer.h include/xulrunner/unstable/nsIToolkit.h include/xulrunner/unstable/nsIToolkitProfile.h include/xulrunner/unstable/nsIToolkitProfileService.h @@ -1860,6 +1921,7 @@ include/xulrunner/unstable/nsPIDNSService.h include/xulrunner/unstable/nsPIDOMEventTarget.h include/xulrunner/unstable/nsPIDOMStorage.h include/xulrunner/unstable/nsPIDOMWindow.h +include/xulrunner/unstable/nsPIPlacesDatabase.h include/xulrunner/unstable/nsPIPromptService.h include/xulrunner/unstable/nsPISocketTransportService.h include/xulrunner/unstable/nsPIWindowRoot.h @@ -1867,6 +1929,8 @@ include/xulrunner/unstable/nsPIWindowWatcher.h include/xulrunner/unstable/nsPLDOMEvent.h include/xulrunner/unstable/nsPSPrinters.h include/xulrunner/unstable/nsPaperPS.h +include/xulrunner/unstable/nsParserCIID.h +include/xulrunner/unstable/nsParserDataListener.h include/xulrunner/unstable/nsPoint.h include/xulrunner/unstable/nsPrefsCID.h include/xulrunner/unstable/nsPresContext.h @@ -1881,6 +1945,7 @@ include/xulrunner/unstable/nsPropertyTable.h include/xulrunner/unstable/nsProxiedService.h include/xulrunner/unstable/nsProxyRelease.h include/xulrunner/unstable/nsQuickSort.h +include/xulrunner/unstable/nsRDFCID.h include/xulrunner/unstable/nsReadLine.h include/xulrunner/unstable/nsReadableUtils.h include/xulrunner/unstable/nsRect.h @@ -1900,6 +1965,7 @@ include/xulrunner/unstable/nsSVGNumber.h include/xulrunner/unstable/nsSVGPoint.h include/xulrunner/unstable/nsSVGRect.h include/xulrunner/unstable/nsSVGUtils.h +include/xulrunner/unstable/nsScannerString.h include/xulrunner/unstable/nsScriptLoader.h include/xulrunner/unstable/nsScriptableInputStream.h include/xulrunner/unstable/nsServiceManagerUtils.h @@ -1954,6 +2020,7 @@ include/xulrunner/unstable/nsThreadUtils.h include/xulrunner/unstable/nsThreadUtilsInternal.h include/xulrunner/unstable/nsTime.h include/xulrunner/unstable/nsTimeStamp.h +include/xulrunner/unstable/nsToken.h include/xulrunner/unstable/nsToolkitCompsCID.h include/xulrunner/unstable/nsTraceRefcnt.h include/xulrunner/unstable/nsTraceRefcntImpl.h @@ -2092,6 +2159,10 @@ include/xulrunner/unstable/prtypes.h include/xulrunner/unstable/prvrsion.h include/xulrunner/unstable/prwin16.h include/xulrunner/unstable/psSharedCore.h +include/xulrunner/unstable/rdf.h +include/xulrunner/unstable/rdfIDataSource.h +include/xulrunner/unstable/rdfISerializer.h +include/xulrunner/unstable/rdfITripleVisitor.h include/xulrunner/unstable/secasn1.h include/xulrunner/unstable/secasn1t.h include/xulrunner/unstable/seccomon.h @@ -2394,6 +2465,7 @@ lib/xulrunner/libsmime3.so lib/xulrunner/libsoftokn3.chk lib/xulrunner/libsoftokn3.so lib/xulrunner/libssl3.so +lib/xulrunner/libunicharutil_external_s.a lib/xulrunner/libxpcom.so lib/xulrunner/libxpcomglue.a lib/xulrunner/libxpcomglue_s.a @@ -2410,6 +2482,7 @@ lib/xulrunner/modules/XPCOMUtils.jsm lib/xulrunner/modules/debug.js lib/xulrunner/modules/utils.js lib/xulrunner/mozilla-xremote-client +lib/xulrunner/nspr-config lib/xulrunner/platform.ini lib/xulrunner/plugins/libnullplugin.so lib/xulrunner/plugins/libunixprintplugin.so diff --git a/devel/xulrunner/distinfo b/devel/xulrunner/distinfo index e28404f04891..24e2634093e9 100644 --- a/devel/xulrunner/distinfo +++ b/devel/xulrunner/distinfo @@ -1,8 +1,8 @@ -$NetBSD: distinfo,v 1.6 2009/09/10 07:53:45 tnn Exp $ +$NetBSD: distinfo,v 1.7 2009/09/13 08:01:04 tnn Exp $ -SHA1 (xulrunner-1.9.1.2-source.tar.bz2) = 6439923ff9d316297926ebe193bac3ac1a41b494 -RMD160 (xulrunner-1.9.1.2-source.tar.bz2) = d5e0b5f0e8b19b216394584ccabf37d776b89a39 -Size (xulrunner-1.9.1.2-source.tar.bz2) = 46787928 bytes +SHA1 (xulrunner-1.9.1.3-source.tar.bz2) = 83b2625eb74e81b473ac40ac52505e5fc9a497eb +RMD160 (xulrunner-1.9.1.3-source.tar.bz2) = c2487c90b4a9490840817c7b00dcccd68a0c4422 +Size (xulrunner-1.9.1.3-source.tar.bz2) = 46766383 bytes SHA1 (patch-aa) = 3bcbced4642b8814f5255973d45a0ac1eaded64d SHA1 (patch-ab) = 5331bae45501013d3ca13d161226e311bc10aafe SHA1 (patch-ac) = e50356963fd235ea11fa45baae356fcf21c6669d @@ -18,7 +18,7 @@ SHA1 (patch-al) = ca1a1fb5f875ab9c84c0afea5d913172a6f7ab57 SHA1 (patch-am) = 75eb92d1941309ffc13f01d7f1946a2f09170220 SHA1 (patch-an) = e975941955b578f1d3336d546e99f0c464cdd9d7 SHA1 (patch-ao) = af027520b0277838a5a5f4ad33e14174e6e8bc0c -SHA1 (patch-ap) = ec834a5d8c4cf5bf8fb5b8fc2b75cc4ba34f4b56 +SHA1 (patch-ap) = 2044c8f0b293984755864b2ca5d45e4bb0407646 SHA1 (patch-aq) = ee2f7917fbf102ce6d20f1467702815b062f82e7 SHA1 (patch-ar) = bfeaa055b7192e5874427615424496b41410f24b SHA1 (patch-as) = aa83f9b834d796982a2b580ed908e188a28c6a41 diff --git a/devel/xulrunner/patches/patch-ap b/devel/xulrunner/patches/patch-ap index f4c7a73fd20c..2b03806a7c63 100644 --- a/devel/xulrunner/patches/patch-ap +++ b/devel/xulrunner/patches/patch-ap @@ -1,13 +1,13 @@ -$NetBSD: patch-ap,v 1.1.1.1 2009/08/05 02:59:48 tnn Exp $ +$NetBSD: patch-ap,v 1.2 2009/09/13 08:01:04 tnn Exp $ ---- media/liboggz/include/oggz/oggz_off_t_generated.h.orig 2009-06-29 18:15:03.000000000 +0200 +--- media/liboggz/include/oggz/oggz_off_t_generated.h.orig 2009-08-24 17:52:50.000000000 +0200 +++ media/liboggz/include/oggz/oggz_off_t_generated.h @@ -59,7 +59,7 @@ #include --#if defined(__APPLE__) || defined(SOLARIS) -+#if defined(__APPLE__) || defined(SOLARIS) || defined(__NetBSD__) || defined(__DragonFly__) +-#if defined(__APPLE__) || defined(SOLARIS) || defined(OS2) ++#if defined(__APPLE__) || defined(SOLARIS) || defined(OS2) || defined(__NetBSD__) || defined(__DragonFly__) typedef off_t oggz_off_t; #else typedef loff_t oggz_off_t; diff --git a/doc/CHANGES-2009 b/doc/CHANGES-2009 index 689690b7d474..c16379b9f8fd 100644 --- a/doc/CHANGES-2009 +++ b/doc/CHANGES-2009 @@ -1,4 +1,4 @@ -$NetBSD: CHANGES-2009,v 1.3654 2009/09/13 03:55:47 hira Exp $ +$NetBSD: CHANGES-2009,v 1.3661 2009/09/13 13:35:13 tron Exp $ Changes to the packages collection and infrastructure in 2009: @@ -4765,3 +4765,10 @@ Changes to the packages collection and infrastructure in 2009: Updated devel/ruby-readline to 1.8.7.174nb1 [taca 2009-09-13] Updated editors/emacs22 to 22.3nb4 [jun 2009-09-13] Updated misc/openoffice2 to 2.4.3 [hira 2009-09-13] + Removed parallel/openpbs [asau 2009-09-13] + Updated misc/py-anita to 1.6 [gson 2009-09-13] + Updated multimedia/p5-xmltv to 0.5.56 [sno 2009-09-13] + Updated graphics/graphviz to 2.24.0 [sno 2009-09-13] + Updated time/p5-DateTime-Locale to 0.44 [sno 2009-09-13] + Updated mail/p5-Mail-Mbox-MessageParser to 1.5002 [sno 2009-09-13] + Updated pkgtools/x11-links to 0.44 [tron 2009-09-13] diff --git a/doc/TODO b/doc/TODO index a81eb140551d..db3ade250d41 100644 --- a/doc/TODO +++ b/doc/TODO @@ -1,4 +1,4 @@ -$NetBSD: TODO,v 1.8461 2009/09/13 03:57:00 hira Exp $ +$NetBSD: TODO,v 1.8465 2009/09/13 11:52:14 sno Exp $ Suggested new packages ====================== @@ -317,6 +317,11 @@ Suggested new packages http://www.sagemath.org/ Open-source alternative to Magma, Maple, Mathematica, Matlab. + Torque + http://www.clusterresources.com/products/torque-resource-manager.php + Open source batch jobs resource manager, successor to OpenPBS. + + Suggested package updates ========================= For possible perl packages updates, see http://www.pkgbox.org/p2c/ @@ -638,7 +643,6 @@ For possible perl packages updates, see http://www.pkgbox.org/p2c/ o gpsdrive-2.09 o gramofile-1.6P o granulate-0.2 - o graphviz-2.24.0 o grep-2.5.4 o gsasl-1.2 o gsharutils-4.7 @@ -927,10 +931,8 @@ For possible perl packages updates, see http://www.pkgbox.org/p2c/ o oroborus-2.0.18 o oto-0.5 o otpCalc-0.97 - o p5-Mail-Mbox-MessageParser-1.5002 o p5-ispman-1.2 o p5-sybperl-2.18 - o p5-xmltv-0.5.56 o packagekit-0.5.1 o pam-smbpass-3.0.13 o paprefs-0.9.8 diff --git a/graphics/graphviz/Makefile b/graphics/graphviz/Makefile index c34f8fe634c2..54b69996273f 100644 --- a/graphics/graphviz/Makefile +++ b/graphics/graphviz/Makefile @@ -1,7 +1,6 @@ -# $NetBSD: Makefile,v 1.75 2009/08/26 19:57:43 sno Exp $ +# $NetBSD: Makefile,v 1.76 2009/09/13 11:17:30 sno Exp $ -DISTNAME= graphviz-2.22.2 -PKGREVISION= 1 +DISTNAME= graphviz-2.24.0 CATEGORIES= graphics MASTER_SITES= http://www.graphviz.org/pub/graphviz/stable/SOURCES/ diff --git a/graphics/graphviz/PLIST b/graphics/graphviz/PLIST index de674dd1521e..5ca290451b69 100644 --- a/graphics/graphviz/PLIST +++ b/graphics/graphviz/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.35 2009/07/05 10:15:02 obache Exp $ +@comment $NetBSD: PLIST,v 1.36 2009/09/13 11:17:30 sno Exp $ bin/acyclic bin/bcomps bin/ccomps @@ -22,6 +22,7 @@ bin/lneato bin/mm2gv bin/neato bin/nop +bin/osage bin/prune bin/sccmap bin/tred @@ -34,6 +35,7 @@ include/graphviz/cgraph.h include/graphviz/color.h include/graphviz/geom.h include/graphviz/graph.h +include/graphviz/graphviz_version.h include/graphviz/gv.cpp include/graphviz/gv.i include/graphviz/gvc.h @@ -59,6 +61,7 @@ lib/graphviz/libgvplugin_dot_layout.la lib/graphviz/libgvplugin_gd.la ${PLIST.gtk}lib/graphviz/libgvplugin_gdk_pixbuf.la ${PLIST.gtk}lib/graphviz/libgvplugin_gtk.la +${PLIST.ghostscript}lib/graphviz/libgvplugin_gs.la lib/graphviz/libgvplugin_neato_layout.la ${PLIST.pangocairo}lib/graphviz/libgvplugin_pango.la ${PLIST.rsvg}lib/graphviz/libgvplugin_rsvg.la @@ -115,6 +118,7 @@ man/man1/lneato.1 man/man1/mm2gv.1 man/man1/neato.1 man/man1/nop.1 +man/man1/osage.1 man/man1/prune.1 man/man1/sccmap.1 man/man1/tred.1 @@ -253,7 +257,6 @@ share/graphviz/doc/html/info/ellipse.gif share/graphviz/doc/html/info/fill.gif share/graphviz/doc/html/info/folder.gif share/graphviz/doc/html/info/forward.gif -share/graphviz/doc/html/info/grammar.html share/graphviz/doc/html/info/hexagon.gif share/graphviz/doc/html/info/house.gif share/graphviz/doc/html/info/html1.gif @@ -335,6 +338,7 @@ share/graphviz/doc/pdf/mm2gv.1.pdf share/graphviz/doc/pdf/neato.1.pdf share/graphviz/doc/pdf/neatoguide.pdf share/graphviz/doc/pdf/nop.1.pdf +share/graphviz/doc/pdf/osage.1.pdf share/graphviz/doc/pdf/pathplan.3.pdf share/graphviz/doc/pdf/prune.pdf share/graphviz/doc/pdf/sccmap.1.pdf diff --git a/graphics/graphviz/distinfo b/graphics/graphviz/distinfo index 43b152eedc41..1a5eec2cd4ee 100644 --- a/graphics/graphviz/distinfo +++ b/graphics/graphviz/distinfo @@ -1,8 +1,8 @@ -$NetBSD: distinfo,v 1.34 2009/05/17 12:55:52 sno Exp $ +$NetBSD: distinfo,v 1.35 2009/09/13 11:17:30 sno Exp $ -SHA1 (graphviz-2.22.2.tar.gz) = 92b40b1fb596a6b3e880e74101921d7681f62c94 -RMD160 (graphviz-2.22.2.tar.gz) = 546eebc1a0b97ffdc431a986102c9e25d1ea216e -Size (graphviz-2.22.2.tar.gz) = 16674049 bytes +SHA1 (graphviz-2.24.0.tar.gz) = 1d91b3a7d2c7fa15e5e718eb456210cd15731e14 +RMD160 (graphviz-2.24.0.tar.gz) = d003cfa57e73c44fbb71ae8f8726ecc9c74735f9 +Size (graphviz-2.24.0.tar.gz) = 16746568 bytes SHA1 (patch-aa) = c9942207526b60caa90406a5204737be1207b71f SHA1 (patch-ab) = 01aae00529da57b9d5dd5ee27c2b9bbef3809d5d SHA1 (patch-ag) = 1eb3aab33f132b019a3faaa80bb68d44daa58f61 diff --git a/graphics/graphviz/options.mk b/graphics/graphviz/options.mk index 33e5a824256f..16ade625dab7 100644 --- a/graphics/graphviz/options.mk +++ b/graphics/graphviz/options.mk @@ -1,23 +1,23 @@ -# $NetBSD: options.mk,v 1.9 2009/08/24 11:53:42 gdt Exp $ +# $NetBSD: options.mk,v 1.10 2009/09/13 11:17:30 sno Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.graphviz -PKG_SUPPORTED_OPTIONS= gd x11 pangocairo gtk rsvg swig guile lua ocaml tcl perl -PKG_SUGGESTED_OPTIONS= gd x11 pangocairo gtk rsvg swig lua tcl perl +PKG_SUPPORTED_OPTIONS= gd ghostscript x11 pangocairo gtk rsvg guile lua ocaml tcl perl +PKG_SUGGESTED_OPTIONS= gd x11 pangocairo gtk lua tcl perl # Explanation of consquence of options, to help those trying to slim down: -# swig: build-time only, needed for any of the languages. Silently -# forces off language options. -# ocaml lua tcl perl: extension language support -# x11: Omits all linking with x11. Silently forces off pangocairo, gtk -# and rsvg. -# pangocairo: [need explanation]. Silently forces off gtk. -# gtk: [need explanation] -# rsvg: Omitting loses svg support. librsvg has large dependencies +# guild ocaml lua tcl perl: extension language support +# x11: Omits all linking with x11, which means x11 graphics supports as +# well as x11 frontend support. +# pangocairo: basic ps/pdf support. +# gtk: basic graphic format support (in addition to gd, which isn't maintained +# anymore) +# rsvg: Omitting loses svg support. librsvg has large dependencies # including some Gnome libs. -# gd: [need explanation] (seems small) +# gd: basic graphic format support, especially gif +# ghostscript: provides better ps/pdf-support, plus eps .include "../../mk/bsd.options.mk" -PLIST_VARS+= gd x11 pangocairo rsvg gtk guile lua ocaml tcl perl +PLIST_VARS+= gd ghostscript x11 pangocairo rsvg gtk guile lua ocaml tcl perl .if !empty(PKG_OPTIONS:Mx11) .include "../../x11/libXp/buildlink3.mk" @@ -30,6 +30,13 @@ PLIST.x11= yes .include "../../graphics/cairo/buildlink3.mk" PLIST.pangocairo= yes +.if !empty(PKG_OPTIONS:Mghostscript) +.include "../../print/ghostscript/buildlink3.mk" +PLIST.ghostscript= yes +.else +CONFIGURE_ARGS+= --without-ghostscript +.endif + .if !empty(PKG_OPTIONS:Mgtk) .include "../../x11/gtk2/buildlink3.mk" PLIST.gtk= yes @@ -49,22 +56,47 @@ CONFIGURE_ARGS+= --without-rsvg .else CONFIGURE_ARGS+= --without-pangocairo +.if !empty(PKG_OPTIONS:Mghostscript) +PKG_FAIL_REASON+= "option ghostscript needs option pangocairo" +.endif +CONFIGURE_ARGS+= --without-ghostscript + +.if !empty(PKG_OPTIONS:Mgtk) +PKG_FAIL_REASON+= "option gtk needs option pangocairo" +.endif CONFIGURE_ARGS+= --without-gdk-pixbuf CONFIGURE_ARGS+= --without-gtk CONFIGURE_ARGS+= --without-gnomeui +.if !empty(PKG_OPTIONS:Mrsvg) +PKG_FAIL_REASON+= "option rsvg needs option pangocairo" +.endif CONFIGURE_ARGS+= --without-rsvg .endif .else CONFIGURE_ARGS+= --without-x +.if !empty(PKG_OPTIONS:Mpangocairo) +PKG_FAIL_REASON+= "option pangocairo needs option x11" +.endif CONFIGURE_ARGS+= --without-pangocairo +.if !empty(PKG_OPTIONS:Mghostscript) +PKG_FAIL_REASON+= "option ghostscript needs option pangocairo and x11" +.endif +CONFIGURE_ARGS+= --without-ghostscript + +.if !empty(PKG_OPTIONS:Mgtk) +PKG_FAIL_REASON+= "option gtk needs option pangocairo and x11" +.endif CONFIGURE_ARGS+= --without-gdk-pixbuf CONFIGURE_ARGS+= --without-gtk CONFIGURE_ARGS+= --without-gnomeui +.if !empty(PKG_OPTIONS:Mrsvg) +PKG_FAIL_REASON+= "option rsvg needs option pangocairo and x11" +.endif CONFIGURE_ARGS+= --without-rsvg .endif @@ -73,19 +105,21 @@ CONFIGURE_ARGS+= --without-rsvg PLIST.gd= yes .else CONFIGURE_ARGS+= --without-libgd +CONFIGURE_ARGS+= --without-mylibgd .endif -.if !empty(PKG_OPTIONS:Mswig) -.include "../../devel/swig/buildlink3.mk" - .if !empty(PKG_OPTIONS:Mlua) +USING_SWIG= yes .include "../../lang/lua/buildlink3.mk" PLIST.lua= yes .else CONFIGURE_ARGS+= --disable-lua .endif +USING_SWIG= no + .if !empty(PKG_OPTIONS:Mocaml) +USING_SWIG= yes .include "../../lang/ocaml/buildlink3.mk" PLIST.ocaml= yes .else @@ -93,6 +127,7 @@ CONFIGURE_ARGS+= --disable-ocaml .endif .if !empty(PKG_OPTIONS:Mtcl) +USING_SWIG= yes .include "../../x11/tk/buildlink3.mk" CONFIGURE_ENV+= TCLCONFIG=${TCLCONFIG_SH:Q} CONFIGURE_ENV+= TKCONFIG=${TKCONFIG_SH:Q} @@ -102,6 +137,7 @@ CONFIGURE_ARGS+= --disable-tcl .endif .if !empty(PKG_OPTIONS:Mguile) +USING_SWIG= yes .include "../../lang/guile/buildlink3.mk" CONFIGURE_ARGS+= --enable-guile PLIST.guile= yes @@ -110,6 +146,7 @@ CONFIGURE_ARGS+= --disable-guile .endif .if !empty(PKG_OPTIONS:Mperl) +USING_SWIG= yes .include "../../lang/perl5/buildlink3.mk" CONFIGURE_ARGS+= --enable-perl PLIST.perl= yes @@ -118,11 +155,8 @@ USE_TOOLS+=perl CONFIGURE_ARGS+= --disable-perl .endif +.if !empty(USING_SWIG:Myes) +.include "../../devel/swig/buildlink3.mk" .else CONFIGURE_ARGS+= --disable-swig -CONFIGURE_ARGS+= --disable-tcl -CONFIGURE_ARGS+= --disable-ocaml -CONFIGURE_ARGS+= --disable-lua -CONFIGURE_ARGS+= --disable-guile -CONFIGURE_ARGS+= --disable-perl .endif diff --git a/mail/p5-Mail-Mbox-MessageParser/Makefile b/mail/p5-Mail-Mbox-MessageParser/Makefile index cc38b909262a..146dd85da669 100644 --- a/mail/p5-Mail-Mbox-MessageParser/Makefile +++ b/mail/p5-Mail-Mbox-MessageParser/Makefile @@ -1,22 +1,23 @@ -# $NetBSD: Makefile,v 1.13 2009/04/02 18:10:39 tez Exp $ +# $NetBSD: Makefile,v 1.14 2009/09/13 11:51:57 sno Exp $ -DISTNAME= Mail-Mbox-MessageParser-1.5000 +DISTNAME= Mail-Mbox-MessageParser-1.5002 PKGNAME= p5-${DISTNAME} -PKGREVISION= 2 CATEGORIES= mail perl5 MASTER_SITES= ${MASTER_SITE_PERL_CPAN:=Mail/} MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= http://search.cpan.org/dist/Mail-Mbox-MessageParser/ COMMENT= Perl5 module for parsing mail messages +LICENSE= gnu-gpl-v2 PKG_DESTDIR_SUPPORT= user-destdir DEPENDS+= p5-FileHandle-Unget-[0-9]*:../../devel/p5-FileHandle-Unget -DEPENDS+= p5-Storable-[0-9]*:../../devel/p5-Storable +DEPENDS+= {perl>=5.10,p5-Storable-[0-9]*}:../../devel/p5-Storable + +BUILD_DEPENDS+= p5-Text-Diff-[0-9]*:../../textproc/p5-Text-Diff PERL5_PACKLIST= auto/Mail/Mbox/MessageParser/.packlist -MAKE_PARAMS+= < /dev/null USE_TOOLS+= grep gzip @@ -26,11 +27,10 @@ SETTINGS+= INSTALLDIRS=site SETTINGS+= BZIP=/usr/bin/bzip2 SETTINGS+= BZIP2=/usr/bin/bzip2 SETTINGS+= DIFF=/usr/bin/diff -SETTINGS+= GREP=${GREP} SETTINGS+= GZIP=${GZIP_CMD} -SETTINGS+= TZIP= -MAKE_PARAMS+= ${SETTINGS} +MAKE_PARAMS+= --skipdeps ${SETTINGS} +MAKE_PARAMS+= ../../patches/patch-aa - ---- lib/Mail/Mbox/MessageParser/Config.pm.orig 2009-03-31 16:22:14.517431000 -0500 -+++ lib/Mail/Mbox/MessageParser/Config.pm 2009-03-31 16:22:41.477544900 -0500 -@@ -19,7 +19,7 @@ - - 'read_chunk_size' => 20000, - -- 'from_pattern' => q/(?x)^ -+ 'from_pattern' => q/(?mx)^ - (From\s - # Skip names, months, days - (?> [^:\n]+ ) diff --git a/mail/p5-Mail-Mbox-MessageParser/patches/patch-ab b/mail/p5-Mail-Mbox-MessageParser/patches/patch-ab deleted file mode 100644 index 4fc43a0874ec..000000000000 --- a/mail/p5-Mail-Mbox-MessageParser/patches/patch-ab +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-ab,v 1.1 2009/04/02 18:10:39 tez Exp $ - -diff -ruN lib/Mail/Mbox/MessageParser/Grep.pm.orig lib/Mail/Mbox/MessageParser/Grep.pm > ../../patches/patch-ab - ---- lib/Mail/Mbox/MessageParser/Grep.pm.orig 2009-03-31 16:21:34.719068900 -0500 -+++ lib/Mail/Mbox/MessageParser/Grep.pm 2009-03-31 16:23:08.691314600 -0500 -@@ -289,7 +289,7 @@ - # RFC 1521 says the boundary can be no longer than 70 characters. Back up a - # little more than that. - my $endline = $self->{'endline'}; -- $self->_read_until_match(qr/^--\Q$boundary\E--$endline/,76) -+ $self->_read_until_match(qr/^--\Q$boundary\E--$endline/m,76) - or return 0; - - return 1; diff --git a/mail/p5-Mail-Mbox-MessageParser/patches/patch-ac b/mail/p5-Mail-Mbox-MessageParser/patches/patch-ac deleted file mode 100644 index 3a241ef8224c..000000000000 --- a/mail/p5-Mail-Mbox-MessageParser/patches/patch-ac +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-ac,v 1.1 2009/04/02 18:10:39 tez Exp $ - -diff -ruN lib/Mail/Mbox/MessageParser/Perl.pm.orig lib/Mail/Mbox/MessageParser/Perl.pm > ../../patches/patch-ac - ---- lib/Mail/Mbox/MessageParser/Perl.pm.orig 2009-03-31 16:21:44.338876800 -0500 -+++ lib/Mail/Mbox/MessageParser/Perl.pm 2009-03-31 16:23:32.285106100 -0500 -@@ -265,7 +265,7 @@ - # RFC 1521 says the boundary can be no longer than 70 characters. Back up a - # little more than that. - my $endline = $self->{'endline'}; -- $self->_read_until_match(qr/^--\Q$boundary\E--$endline/,76) -+ $self->_read_until_match(qr/^--\Q$boundary\E--$endline/m,76) - or return 0; - - return 1; diff --git a/misc/py-anita/Makefile b/misc/py-anita/Makefile index c7a6e34b3556..4cb04767784e 100644 --- a/misc/py-anita/Makefile +++ b/misc/py-anita/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.1.1.1 2009/09/11 11:51:52 gson Exp $ +# $NetBSD: Makefile,v 1.2 2009/09/13 10:14:51 gson Exp $ # -DISTNAME= anita-1.5 +DISTNAME= anita-1.6 PKGNAME= ${PYPKGPREFIX}-${DISTNAME} CATEGORIES= misc MASTER_SITES= http://www.gson.org/netbsd/anita/download/ diff --git a/misc/py-anita/distinfo b/misc/py-anita/distinfo index 899c83609268..efc516127bc0 100644 --- a/misc/py-anita/distinfo +++ b/misc/py-anita/distinfo @@ -1,5 +1,5 @@ -$NetBSD: distinfo,v 1.1.1.1 2009/09/11 11:51:52 gson Exp $ +$NetBSD: distinfo,v 1.2 2009/09/13 10:14:51 gson Exp $ -SHA1 (anita-1.5.tar.gz) = f1d518708142824567bd4c7a1762fe791f43dffe -RMD160 (anita-1.5.tar.gz) = 596f753e7839bdc0e624e52145f5add3f889c1d1 -Size (anita-1.5.tar.gz) = 9164 bytes +SHA1 (anita-1.6.tar.gz) = 54d5cd5f4d8cb51957485767e73d1d7aaeecc1d6 +RMD160 (anita-1.6.tar.gz) = 7c73c7f9a2da0ea408393a5dda5c8a200f9f6d69 +Size (anita-1.6.tar.gz) = 9169 bytes diff --git a/mk/bsd.prefs.mk b/mk/bsd.prefs.mk index ecef995076e5..5b44dde08b7f 100644 --- a/mk/bsd.prefs.mk +++ b/mk/bsd.prefs.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.prefs.mk,v 1.294 2009/05/23 23:48:44 joerg Exp $ +# $NetBSD: bsd.prefs.mk,v 1.295 2009/09/13 13:28:46 tron Exp $ # # This file includes the mk.conf file, which contains the user settings. # @@ -501,7 +501,8 @@ X11_TYPE?= native X11BASE?= /usr/openwin . elif ${OPSYS} == "IRIX" || ${OPSYS} == "OSF1" || ${OPSYS} == "HPUX" X11BASE?= /usr -. elif !empty(MACHINE_PLATFORM:MDarwin-9.*-*) +. elif !empty(MACHINE_PLATFORM:MDarwin-9.*-*) || \ + !empty(MACHINE_PLATFORM:MDarwin-??.*-*) X11BASE?= /usr/X11 . elif exists(/usr/X11R7/lib/libX11.so) X11BASE?= /usr/X11R7 diff --git a/mk/defaults/mk.conf b/mk/defaults/mk.conf index 6999d267467b..9dfc783c4836 100644 --- a/mk/defaults/mk.conf +++ b/mk/defaults/mk.conf @@ -1,4 +1,4 @@ -# $NetBSD: mk.conf,v 1.185 2009/08/05 22:14:28 minskim Exp $ +# $NetBSD: mk.conf,v 1.186 2009/09/13 13:28:46 tron Exp $ # # This file provides default values for variables that may be overridden @@ -206,12 +206,15 @@ PKGSRC_RUN_TEST?= no .if (!empty(MACHINE_PLATFORM:MNetBSD-*-*) && \ exists(/usr/X11R7/lib/libX11.so)) PREFER_PKGSRC?= -.elif empty(MACHINE_PLATFORM:MDarwin-9.*-*) || \ - (defined(X11_TYPE) && ${X11_TYPE} != "native") +.elif !empty(MACHINE_PLATFORM:MDarwin-??.*-*) && \ + (!defined(X11_TYPE) || ${X11_TYPE} == "native") +PREFER_PKGSRC?= +.elif !empty(MACHINE_PLATFORM:MDarwin-9.*-*) && \ + (!defined(X11_TYPE) || ${X11_TYPE} == "native") +PREFER_PKGSRC?= fontconfig pixman Xft2 +.else PREFER_PKGSRC?= MesaLib Xft2 Xrandr Xrender expat fontconfig \ freetype2 glu randrproto renderproto xcursor -.else -PREFER_PKGSRC?= fontconfig pixman Xft2 .endif PREFER_NATIVE?= yes # diff --git a/multimedia/libtheora/Makefile b/multimedia/libtheora/Makefile index 6f57fe5be4c8..39f44a1f656a 100644 --- a/multimedia/libtheora/Makefile +++ b/multimedia/libtheora/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.26 2009/04/16 04:03:49 tron Exp $ +# $NetBSD: Makefile,v 1.27 2009/09/13 13:33:59 tron Exp $ # .include "Makefile.common" @@ -21,7 +21,8 @@ CONFIGURE_ENV+= HAVE_PDFLATEX=no .include "../../mk/compiler.mk" .if !empty(PKGSRC_COMPILER:Msunpro) || \ - !empty(MACHINE_PLATFORM:MDarwin-[9].*-i386) + !empty(MACHINE_PLATFORM:MDarwin-9.*-i386) || \ + !empty(MACHINE_PLATFORM:MDarwin-??.*-*) CONFIGURE_ARGS+= --disable-asm .endif diff --git a/multimedia/p5-xmltv/Makefile b/multimedia/p5-xmltv/Makefile index 38bef18244a6..ca72b03895ea 100644 --- a/multimedia/p5-xmltv/Makefile +++ b/multimedia/p5-xmltv/Makefile @@ -1,8 +1,7 @@ -# $NetBSD: Makefile,v 1.24 2009/07/17 18:00:18 adrianp Exp $ +# $NetBSD: Makefile,v 1.25 2009/09/13 10:29:00 sno Exp $ -DISTNAME= xmltv-0.5.45 +DISTNAME= xmltv-0.5.56 PKGNAME= p5-${DISTNAME} -PKGREVISION= 3 CATEGORIES= multimedia perl5 MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=xmltv/} EXTRACT_SUFX= .tar.bz2 @@ -10,14 +9,17 @@ EXTRACT_SUFX= .tar.bz2 MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= http://xmltv.org/wiki/ COMMENT= Set of utilities to manage your TV viewing +LICENSE= gnu-gpl-v2 # needed +DEPENDS+= p5-Date-Manip>=5.42a:../../devel/p5-Date-Manip +DEPENDS+= p5-File-Slurp-[0-9]*:../../devel/p5-File-Slurp DEPENDS+= p5-XML-Parser>=2.34:../../textproc/p5-XML-Parser DEPENDS+= p5-XML-Twig>=3.10:../../textproc/p5-XML-Twig -DEPENDS+= p5-Date-Manip>=5.42a:../../devel/p5-Date-Manip -DEPENDS+= p5-XML-Writer>=0.4.6:../../textproc/p5-XML-Writer -DEPENDS+= p5-Memoize-[0-9]*:../../devel/p5-Memoize -DEPENDS+= p5-Storable>=2.04:../../devel/p5-Storable +DEPENDS+= p5-XML-Writer>=0.600:../../textproc/p5-XML-Writer +DEPENDS+= {perl>=5.10,p5-Memoize-[0-9]*}:../../devel/p5-Memoize +DEPENDS+= {perl>=5.10,p5-Storable>=2.04}:../../devel/p5-Storable +DEPENDS+= p5-libwww>=5.65:../../www/p5-libwww # recommended DEPENDS+= p5-Lingua-EN-Numbers-Ordinate-[0-9]*:../../textproc/p5-Lingua-EN-Numbers-Ordinate DEPENDS+= p5-Lingua-Preferred>=0.2.4:../../textproc/p5-Lingua-Preferred @@ -27,13 +29,19 @@ DEPENDS+= p5-Unicode-String-[0-9]*:../../converters/p5-Unicode-String DEPENDS+= p5-IO-stringy-[0-9]*:../../devel/p5-IO-stringy # needed by uk grabber DEPENDS+= p5-Archive-Zip-[0-9]*:../../archivers/p5-Archive-Zip +DEPENDS+= p5-HTTP-Cache-Transparent>=1.0:../../www/p5-HTTP-Cache-Transparent # needed by us grabbers DEPENDS+= p5-SOAP-Lite-[0-9]*:../../net/p5-SOAP-Lite DEPENDS+= p5-Term-ReadKey-[0-9]*:../../devel/p5-Term-ReadKey DEPENDS+= p5-HTML-TableExtract-[0-9]*:../../www/p5-HTML-TableExtract DEPENDS+= p5-WWW-Mechanize>=1.02:../../www/p5-WWW-Mechanize +# needed by DirectTV grabbers in us +DEPENDS+= p5-TimeDate-[0-9]*:../../time/p5-TimeDate # needed by de, dk, es, fi, fr, huro, jp, nl, pt grabbers DEPENDS+= p5-HTML-Tree-[0-9]*:../../www/p5-HTML-Tree +DEPENDS+= p5-HTML-Parser-[0-9]*:../../www/p5-HTML-Parser +# needed to grab for some european countries (epgdata.com) +DEPENDS+= p5-DateTime-Format-Strptime-[0-9]*:../../time/p5-DateTime-Format-Strptime # needed by jp grabber DEPENDS+= p5-Text-Kakasi-[0-9]*:../../textproc/p5-Text-Kakasi # needed by se grabber @@ -42,6 +50,10 @@ DEPENDS+= p5-IO-Compress-[0-9]*:../../devel/p5-IO-Compress DEPENDS+= p5-HTTP-Cache-Transparent-[0-9]*:../../www/p5-HTTP-Cache-Transparent # needed by pt grabber DEPENDS+= p5-Unicode-UTF8simple-[0-9]*:../../converters/p5-Unicode-UTF8simple +# needed by is grabbers +DEPENDS+= p5-XML-LibXSLT-[0-9]*:../../textproc/p5-XML-LibXSLT +DEPENDS+= p5-XML-DOM-[0-9]*:../../textproc/p5-XML-DOM +# Tk::TableMatrix missing for tv_check (report exceptions & changes in schedule) PKG_INSTALLATION_TYPES= overwrite pkgviews PKG_DESTDIR_SUPPORT= user-destdir diff --git a/multimedia/p5-xmltv/PLIST b/multimedia/p5-xmltv/PLIST index c02cdf92fb3e..2eb5031ee81d 100644 --- a/multimedia/p5-xmltv/PLIST +++ b/multimedia/p5-xmltv/PLIST @@ -1,16 +1,20 @@ -@comment $NetBSD: PLIST,v 1.8 2009/06/14 18:08:09 joerg Exp $ +@comment $NetBSD: PLIST,v 1.9 2009/09/13 10:29:00 sno Exp $ share/doc/${DISTNAME}/COPYING share/doc/${DISTNAME}/QuickStart share/doc/${DISTNAME}/README share/doc/${DISTNAME}/README.win32 -share/xmltv/tv_grab_be/channel_ids_fr -share/xmltv/tv_grab_be/channel_ids_nl -share/xmltv/tv_grab_ch_bluewin/channel_ids -share/xmltv/tv_grab_de_tvtoday/channel_ids +share/xmltv/tv_grab_ch_search/channel_ids +share/xmltv/tv_grab_eu_epgdata/channel_ids +share/xmltv/tv_grab_huro/catmap.cz share/xmltv/tv_grab_huro/catmap.hu share/xmltv/tv_grab_huro/catmap.ro +share/xmltv/tv_grab_huro/catmap.sk share/xmltv/tv_grab_huro/jobmap share/xmltv/tv_grab_it/channel_ids share/xmltv/tv_grab_uk_bleb/icon_urls share/xmltv/tv_grab_uk_rt/channel_ids +share/xmltv/tv_grab_uk_rt/channels_platforms +share/xmltv/tv_grab_uk_rt/prog_titles_to_process +share/xmltv/tv_grab_uk_rt/regional_channels_by_postcode +share/xmltv/tv_grab_uk_rt/utf8_fixups share/xmltv/xmltv.dtd diff --git a/multimedia/p5-xmltv/distinfo b/multimedia/p5-xmltv/distinfo index ef4728443206..e25b207d74a8 100644 --- a/multimedia/p5-xmltv/distinfo +++ b/multimedia/p5-xmltv/distinfo @@ -1,6 +1,6 @@ -$NetBSD: distinfo,v 1.9 2007/02/27 13:28:05 wiz Exp $ +$NetBSD: distinfo,v 1.10 2009/09/13 10:29:00 sno Exp $ -SHA1 (xmltv-0.5.45.tar.bz2) = ac63d247a8b8fb4b50355b3eefebd1b5cccb23bb -RMD160 (xmltv-0.5.45.tar.bz2) = c41af01cb2c7936154c3439937f7969809366dc9 -Size (xmltv-0.5.45.tar.bz2) = 556939 bytes +SHA1 (xmltv-0.5.56.tar.bz2) = 51bc2b37c00bc1bcab767773d42abf26c9071677 +RMD160 (xmltv-0.5.56.tar.bz2) = 067c3cd231659fb99518947b9e46fca5fcae0c8e +Size (xmltv-0.5.56.tar.bz2) = 716236 bytes SHA1 (patch-aa) = 35d4bc04eb9cf3909e875e94196fcbb340c34b43 diff --git a/multimedia/totem-browser-plugin/Makefile b/multimedia/totem-browser-plugin/Makefile index 73fc26d35863..adb22ecda424 100644 --- a/multimedia/totem-browser-plugin/Makefile +++ b/multimedia/totem-browser-plugin/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2009/08/26 20:22:52 sno Exp $ +# $NetBSD: Makefile,v 1.6 2009/09/13 11:22:58 tnn Exp $ # PKG_DESTDIR_SUPPORT= user-destdir @@ -6,7 +6,7 @@ PKG_DESTDIR_SUPPORT= user-destdir .include "../../multimedia/totem/Makefile.common" PKGNAME= ${DISTNAME:S/totem/totem-browser-plugin/} -PKGREVISION= 1 +PKGREVISION= 2 # override Makefile.common PLIST_SRC= ${.CURDIR}/PLIST @@ -18,13 +18,13 @@ CONFIGURE_ARGS+= --enable-browser-plugins BROWSER_PLUGINS= cone gmp mully narrowspace -INSTALLATION_DIRS= lib/firefox3/plugins +INSTALLATION_DIRS= lib/netscape/plugins INSTALLATION_DIRS+= libexec do-install: .for plugin in ${BROWSER_PLUGINS} cd ${WRKSRC}/browser-plugin && ${LIBTOOL} --mode=install ${INSTALL_DATA} \ - libtotem-${plugin}-plugin.la ${DESTDIR}${PREFIX}/lib/firefox3/plugins + libtotem-${plugin}-plugin.la ${DESTDIR}${PREFIX}/lib/netscape/plugins .endfor cd ${WRKSRC}/browser-plugin && ${LIBTOOL} --mode=install ${INSTALL_PROGRAM} \ totem-plugin-viewer ${DESTDIR}${PREFIX}/libexec @@ -34,7 +34,5 @@ BUILDLINK_API_DEPENDS.shared-mime-info+= shared-mime-info>=0.22 .include "../../multimedia/gst-plugins0.10-base/buildlink3.mk" .include "../../multimedia/gst-plugins0.10-good/buildlink3.mk" .include "../../multimedia/gstreamer0.10/buildlink3.mk" -# not actually needed to build, but firefox3 owns the plugin directory -.include "../../www/firefox3/buildlink3.mk" .include "../../x11/startup-notification/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/multimedia/totem-browser-plugin/PLIST b/multimedia/totem-browser-plugin/PLIST index 40e977ee5f28..d70419b9e6e6 100644 --- a/multimedia/totem-browser-plugin/PLIST +++ b/multimedia/totem-browser-plugin/PLIST @@ -1,6 +1,6 @@ -@comment $NetBSD: PLIST,v 1.2 2009/03/16 12:13:31 jmcneill Exp $ -lib/firefox3/plugins/libtotem-cone-plugin.la -lib/firefox3/plugins/libtotem-gmp-plugin.la -lib/firefox3/plugins/libtotem-mully-plugin.la -lib/firefox3/plugins/libtotem-narrowspace-plugin.la +@comment $NetBSD: PLIST,v 1.4 2009/09/13 11:22:58 tnn Exp $ +lib/netscape/plugins/libtotem-cone-plugin.la +lib/netscape/plugins/libtotem-gmp-plugin.la +lib/netscape/plugins/libtotem-mully-plugin.la +lib/netscape/plugins/libtotem-narrowspace-plugin.la libexec/totem-plugin-viewer diff --git a/net/libpcap/builtin.mk b/net/libpcap/builtin.mk index 5eb94001dab2..103529826032 100644 --- a/net/libpcap/builtin.mk +++ b/net/libpcap/builtin.mk @@ -1,9 +1,15 @@ -# $NetBSD: builtin.mk,v 1.14 2006/04/06 06:22:33 reed Exp $ +# $NetBSD: builtin.mk,v 1.15 2009/09/13 13:07:11 tron Exp $ BUILTIN_PKG:= libpcap +.include "../../mk/bsd.fast.prefs.mk" + BUILTIN_FIND_FILES_VAR:= H_LIBPCAP +.if empty(MACHINE_PLATFORM:MDarwin-??.*-*) BUILTIN_FIND_FILES.H_LIBPCAP= /usr/include/pcap.h +.else +BUILTIN_FIND_FILES.H_LIBPCAP= /usr/include/pcap/pcap.h +.endif .include "../../mk/buildlink3/bsd.builtin.mk" diff --git a/parallel/Makefile b/parallel/Makefile index b4695aadc49e..f013163816d7 100644 --- a/parallel/Makefile +++ b/parallel/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.11 2007/08/13 08:12:48 rillig Exp $ +# $NetBSD: Makefile,v 1.12 2009/09/13 08:25:34 asau Exp $ # COMMENT= Applications dealing with parallelism in computing @@ -10,7 +10,6 @@ SUBDIR+= ganglia-monitor-core SUBDIR+= glunix SUBDIR+= linda SUBDIR+= mpi-ch -SUBDIR+= openpbs SUBDIR+= p5-Parallel-Pvm SUBDIR+= pvm3 SUBDIR+= sge diff --git a/parallel/openpbs/DESCR b/parallel/openpbs/DESCR deleted file mode 100644 index e01a1de2a7aa..000000000000 --- a/parallel/openpbs/DESCR +++ /dev/null @@ -1,6 +0,0 @@ -The Portable Batch System (PBS) is a flexible batch queueing and -workload management system originally developed for NASA. It operates -on networked, multi-platform UNIX environments, including -heterogeneous clusters of workstations, supercomputers, and massively -parallel systems. Development of PBS is provided by Altair Grid -Technologies. diff --git a/parallel/openpbs/Makefile b/parallel/openpbs/Makefile deleted file mode 100644 index 8996c0aecfc7..000000000000 --- a/parallel/openpbs/Makefile +++ /dev/null @@ -1,38 +0,0 @@ -# $NetBSD: Makefile,v 1.12 2006/08/23 18:47:27 wiz Exp $ -# - -DISTNAME= OpenPBS_2_3_16 -PKGNAME= openpbs-2.3.16 -PKGREVISION= 1 -CATEGORIES= parallel sysutils -MASTER_SITES= # http://www.openpbs.org/UserArea/Download/ - -MAINTAINER= pkgsrc-users@NetBSD.org -HOMEPAGE= http://www.openpbs.org/ -COMMENT= Generic network queueing system - -INTERACTIVE_STAGE= fetch - -HAS_CONFIGURE= yes -CONFIGURE_ARGS+= --prefix=${PREFIX:Q} - -REPLACE_INTERPRETER+= tcl -REPLACE.tcl.old= .*/bin/pbs_tclsh -REPLACE.tcl.new= ${PREFIX}/bin/tclsh -REPLACE_FILES.tcl+= src/gui/buildindex.src -REPLACE_FILES.tcl+= src/tools/xpbsmon/buildindex.src - -REPLACE_INTERPRETER+= tk -REPLACE.tk.old= .*/bin/wish -REPLACE.tk.new= ${PREFIX}/bin/wish -REPLACE_FILES.tk+= src/gui/xpbs.src - -REPLACE_INTERPRETER+= tk2 -REPLACE.tk2.old= .*/bin/pbs_wish -REPLACE.tk2.new= ${PREFIX}/bin/pbs_wish -REPLACE_FILES.tk2+= src/tools/xpbsmon/xpbsmon.src - -_CONFIGURE_POSTREQ+= replace-interpreter - -.include "../../x11/tk83/buildlink3.mk" -.include "../../mk/bsd.pkg.mk" diff --git a/parallel/openpbs/PLIST b/parallel/openpbs/PLIST deleted file mode 100644 index 32ef9dc7ef1f..000000000000 --- a/parallel/openpbs/PLIST +++ /dev/null @@ -1,173 +0,0 @@ -@comment $NetBSD: PLIST,v 1.2 2009/06/14 18:10:40 joerg Exp $ -bin/chk_tree -bin/hostn -bin/nqs2pbs -bin/pbs_tclsh -bin/pbs_wish -bin/pbsdsh -bin/pbsnodes -bin/printjob -bin/qalter -bin/qdel -bin/qdisable -bin/qenable -bin/qhold -bin/qmgr -bin/qmove -bin/qmsg -bin/qorder -bin/qrerun -bin/qrls -bin/qrun -bin/qselect -bin/qsig -bin/qstart -bin/qstat -bin/qstop -bin/qsub -bin/qterm -bin/tracejob -bin/xpbs -bin/xpbsmon -include/pbs_error.h -include/pbs_ifl.h -include/tm.h -include/tm_.h -lib/libattr.a -lib/libcmds.a -lib/liblog.a -lib/libnet.a -lib/libpbs.a -lib/libsite.a -lib/pbs_sched.a -lib/xpbs/acctname.tk -lib/xpbs/after_depend.tk -lib/xpbs/auto_upd.tk -lib/xpbs/before_depend.tk -lib/xpbs/bin/xpbs_datadump -lib/xpbs/bin/xpbs_scriptload -lib/xpbs/bindings.tk -lib/xpbs/bitmaps/Downarrow.bmp -lib/xpbs/bitmaps/Uparrow.bmp -lib/xpbs/bitmaps/curve_down_arrow.bmp -lib/xpbs/bitmaps/curve_up_arrow.bmp -lib/xpbs/bitmaps/cyclist-only.xbm -lib/xpbs/bitmaps/hourglass.bmp -lib/xpbs/bitmaps/iconize.bmp -lib/xpbs/bitmaps/logo.bmp -lib/xpbs/bitmaps/maximize.bmp -lib/xpbs/bitmaps/sm_down_arrow.bmp -lib/xpbs/bitmaps/sm_up_arrow.bmp -lib/xpbs/box.tk -lib/xpbs/buildindex -lib/xpbs/button.tk -lib/xpbs/checkpoint.tk -lib/xpbs/common.tk -lib/xpbs/concur.tk -lib/xpbs/datetime.tk -lib/xpbs/email_list.tk -lib/xpbs/entry.tk -lib/xpbs/fileselect.tk -lib/xpbs/help/after_depend.hlp -lib/xpbs/help/auto_update.hlp -lib/xpbs/help/before_depend.hlp -lib/xpbs/help/concur.hlp -lib/xpbs/help/datetime.hlp -lib/xpbs/help/delete.hlp -lib/xpbs/help/email.hlp -lib/xpbs/help/fileselect.hlp -lib/xpbs/help/hold.hlp -lib/xpbs/help/main.hlp -lib/xpbs/help/message.hlp -lib/xpbs/help/misc.hlp -lib/xpbs/help/modify.hlp -lib/xpbs/help/move.hlp -lib/xpbs/help/notes.hlp -lib/xpbs/help/preferences.hlp -lib/xpbs/help/release.hlp -lib/xpbs/help/select.acctname.hlp -lib/xpbs/help/select.checkpoint.hlp -lib/xpbs/help/select.hold.hlp -lib/xpbs/help/select.jobname.hlp -lib/xpbs/help/select.owners.hlp -lib/xpbs/help/select.priority.hlp -lib/xpbs/help/select.qtime.hlp -lib/xpbs/help/select.rerun.hlp -lib/xpbs/help/select.resources.hlp -lib/xpbs/help/select.states.hlp -lib/xpbs/help/signal.hlp -lib/xpbs/help/staging.hlp -lib/xpbs/help/submit.hlp -lib/xpbs/help/terminate.hlp -lib/xpbs/help/trackjob.hlp -lib/xpbs/hold.tk -lib/xpbs/jobname.tk -lib/xpbs/listbox.tk -lib/xpbs/main.tk -lib/xpbs/misc.tk -lib/xpbs/owners.tk -lib/xpbs/pbs.tcl -lib/xpbs/pref.tk -lib/xpbs/preferences.tcl -lib/xpbs/prefsave.tk -lib/xpbs/priority.tk -lib/xpbs/qalter.tk -lib/xpbs/qdel.tk -lib/xpbs/qhold.tk -lib/xpbs/qmove.tk -lib/xpbs/qmsg.tk -lib/xpbs/qrls.tk -lib/xpbs/qsig.tk -lib/xpbs/qsub.tk -lib/xpbs/qterm.tk -lib/xpbs/qtime.tk -lib/xpbs/rerun.tk -lib/xpbs/res.tk -lib/xpbs/spinbox.tk -lib/xpbs/staging.tk -lib/xpbs/state.tk -lib/xpbs/tclIndex -lib/xpbs/text.tk -lib/xpbs/trackjob.tk -lib/xpbs/wmgr.tk -lib/xpbs/xpbsrc -lib/xpbsmon/auto_upd.tk -lib/xpbsmon/bindings.tk -lib/xpbsmon/bitmaps/cyclist-only.xbm -lib/xpbsmon/bitmaps/hourglass.bmp -lib/xpbsmon/bitmaps/iconize.bmp -lib/xpbsmon/bitmaps/logo.bmp -lib/xpbsmon/bitmaps/maximize.bmp -lib/xpbsmon/box.tk -lib/xpbsmon/buildindex -lib/xpbsmon/button.tk -lib/xpbsmon/cluster.tk -lib/xpbsmon/color.tk -lib/xpbsmon/common.tk -lib/xpbsmon/dialog.tk -lib/xpbsmon/entry.tk -lib/xpbsmon/expr.tk -lib/xpbsmon/help/auto_update.hlp -lib/xpbsmon/help/main.hlp -lib/xpbsmon/help/notes.hlp -lib/xpbsmon/help/pref.hlp -lib/xpbsmon/help/prefQuery.hlp -lib/xpbsmon/help/prefServer.hlp -lib/xpbsmon/listbox.tk -lib/xpbsmon/main.tk -lib/xpbsmon/node.tk -lib/xpbsmon/pbs.tk -lib/xpbsmon/pref.tk -lib/xpbsmon/preferences.tcl -lib/xpbsmon/prefsave.tk -lib/xpbsmon/spinbox.tk -lib/xpbsmon/system.tk -lib/xpbsmon/tclIndex -lib/xpbsmon/wmgr.tk -lib/xpbsmon/xpbsmonrc -sbin/pbs_demux -sbin/pbs_iff -sbin/pbs_mom -sbin/pbs_rcp -sbin/pbs_sched -sbin/pbs_server diff --git a/parallel/openpbs/distinfo b/parallel/openpbs/distinfo deleted file mode 100644 index bd4e54a4d71a..000000000000 --- a/parallel/openpbs/distinfo +++ /dev/null @@ -1,9 +0,0 @@ -$NetBSD: distinfo,v 1.2 2005/02/24 12:23:31 agc Exp $ - -SHA1 (OpenPBS_2_3_16.tar.gz) = cd91d3732dc3a035ffbbd51ac045380575c79eae -RMD160 (OpenPBS_2_3_16.tar.gz) = 3cc617a674e206bd979508c3fa9f540e5e6a359c -Size (OpenPBS_2_3_16.tar.gz) = 1307483 bytes -SHA1 (patch-aa) = 53bf36659c5c3e609e081ae243513b46a74c16da -SHA1 (patch-ab) = 0f4acb035de98eaf50705a4b7b64beda008f10a8 -SHA1 (patch-ac) = 50c1183d3734a3a91944fbb262df49cc1855a071 -SHA1 (patch-ad) = 343360019f6ab6a491edad978b38759b99369bb4 diff --git a/parallel/openpbs/patches/patch-aa b/parallel/openpbs/patches/patch-aa deleted file mode 100644 index a3b632e30c4c..000000000000 --- a/parallel/openpbs/patches/patch-aa +++ /dev/null @@ -1,16 +0,0 @@ -$NetBSD: patch-aa,v 1.1.1.1 2003/07/17 14:19:16 agc Exp $ - ---- src/resmom/netbsd/mom_mach.c 2003/07/09 13:17:42 1.1 -+++ src/resmom/netbsd/mom_mach.c 2003/07/09 13:23:18 -@@ -124,7 +124,11 @@ - #include - #include - #include -+#if __NetBSD_Version__ >= 104240000 /* 1.4X */ -+#include -+#else - #include -+#endif - - #include "portability.h" - #include "pbs_error.h" diff --git a/parallel/openpbs/patches/patch-ab b/parallel/openpbs/patches/patch-ab deleted file mode 100644 index 2f685058bc9d..000000000000 --- a/parallel/openpbs/patches/patch-ab +++ /dev/null @@ -1,14 +0,0 @@ -$NetBSD: patch-ab,v 1.1.1.1 2003/07/17 14:19:16 agc Exp $ - ---- src/server/pbsd_init.c 2003/07/09 13:30:00 1.1 -+++ src/server/pbsd_init.c 2003/07/09 13:31:07 -@@ -88,6 +88,9 @@ - #include - #include - #include -+#ifdef __NetBSD__ -+#include -+#endif - - #include - #include diff --git a/parallel/openpbs/patches/patch-ac b/parallel/openpbs/patches/patch-ac deleted file mode 100644 index bd436dc6c8af..000000000000 --- a/parallel/openpbs/patches/patch-ac +++ /dev/null @@ -1,26 +0,0 @@ -$NetBSD: patch-ac,v 1.1.1.1 2003/07/17 14:19:16 agc Exp $ - ---- src/gui/Makefile.in 2003/07/17 13:42:27 1.1 -+++ src/gui/Makefile.in 2003/07/17 13:44:32 -@@ -112,10 +112,7 @@ - # - xpbs: $(srcdir)/xpbs.src - @echo Processing xpbs -- @sed -e 's,#\!.*wish.*$$,#\!${WISH_PATH} -f,;' \ -- -e 's,set *libdir.*$$,set libdir $(srcdir),' \ -- -e 's,set *appdefdir.*$$,set appdefdir .,' \ -- $? > $@ -+ cp ${srcdir}/xpbs.src xpbs - @chmod +x $@ - - xpbsrc: $(srcdir)/xpbsrc.src -@@ -126,7 +123,8 @@ - - buildindex: $(srcdir)/buildindex.src - @echo Processing buildindex -- @sed -e 's,#\!.*tclsh.*$$,#\!${TCLSH_PATH},' $? > $@ -+# @sed -e 's,#\!.*tclsh.*$$,#\!${TCLSH_PATH},' $? > $@ -+ cp ${srcdir}/buildindex.src buildindex - @chmod +x $@ - @echo Running buildindex \(locally\) - @./buildindex $(srcdir) . diff --git a/parallel/openpbs/patches/patch-ad b/parallel/openpbs/patches/patch-ad deleted file mode 100644 index ce85899ca9c1..000000000000 --- a/parallel/openpbs/patches/patch-ad +++ /dev/null @@ -1,37 +0,0 @@ -$NetBSD: patch-ad,v 1.1.1.1 2003/07/17 14:19:16 agc Exp $ - ---- src/tools/xpbsmon/Makefile.in 2003/07/17 13:47:50 1.1 -+++ src/tools/xpbsmon/Makefile.in 2003/07/17 13:48:52 -@@ -112,10 +112,7 @@ - # - xpbsmon: $(srcdir)/xpbsmon.src - @echo Processing xpbsmon -- @sed -e 's,#\!.*pbs_wish.*$$,#\!../pbs_wish -f,' \ -- -e 's,set *libdir.*$$,set libdir $(srcdir),' \ -- -e 's,set *appdefdir.*$$,set appdefdir .,' \ -- $? > $@ -+ @cp ${srcdir}/xpbsmon.src xpbsmon - @chmod +x $@ - - xpbsmonrc: $(srcdir)/xpbsmonrc.src -@@ -124,7 +121,7 @@ - - buildindex: $(srcdir)/buildindex.src - @echo Processing buildindex -- @sed 's,#\!.*tclsh.*$$,#\!${TCLSH_PATH},' $? > $@ -+ @cp ${srcdir}/buildindex.src buildindex - @chmod +x $@ - @echo Running buildindex \(locally\) - @./buildindex $(srcdir) . -@@ -151,10 +148,7 @@ - # - # install xpbsmon changing the location of pbs_tclsh and libdir - # -- sed -e 's,#\!.*pbs_wish.*$$,#\!$(PBS_UBIN)/pbs_wish -f,' \ -- -e 's,set *libdir.*$$,set libdir ${XPBSMON_LIB},' \ -- -e 's,set *appdefdir.*$$,set appdefdir ${XPBSMON_LIB},' \ -- xpbsmon > $(bindir)/xpbsmon -+ cp xpbsmon $(bindir)/xpbsmon - chmod 755 $(bindir)/xpbsmon 2> /dev/null - # - $(INSTALL) -m 755 buildindex $(XPBSMON_LIB) diff --git a/pkgtools/x11-links/Makefile b/pkgtools/x11-links/Makefile index 50a0068736e6..a53d725534ea 100644 --- a/pkgtools/x11-links/Makefile +++ b/pkgtools/x11-links/Makefile @@ -1,10 +1,10 @@ -# $NetBSD: Makefile,v 1.104 2009/06/15 12:42:15 tron Exp $ +# $NetBSD: Makefile,v 1.105 2009/09/13 13:31:41 tron Exp $ # # NOTE: If you update this package, then you'll likely need to also update # the x11-links dependency in buildlink3.mk to the correct version, # usually the most recent. -DISTNAME= x11-links-0.43 +DISTNAME= x11-links-0.44 CATEGORIES= pkgtools x11 MASTER_SITES= # empty DISTFILES= # empty @@ -36,7 +36,8 @@ PKG_FAIL_REASON+= "${PKGNAME} requires X headers to be installed" . include "xdec.mk" .elif !empty(X11BASE:M*openwin) . include "openwin.mk" -.elif exists(${X11BASE}/lib/X11/config/xorgversion.def) +.elif exists(${X11BASE}/lib/X11/config/xorgversion.def) || \ + exists(${X11BASE}/lib/pkgconfig/xorg-server.pc) . include "xorg.mk" .else . include "xfree.mk" diff --git a/pkgtools/x11-links/buildlink3.mk b/pkgtools/x11-links/buildlink3.mk index c53151c504c3..482df82851aa 100644 --- a/pkgtools/x11-links/buildlink3.mk +++ b/pkgtools/x11-links/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.21 2009/03/20 19:25:13 joerg Exp $ +# $NetBSD: buildlink3.mk,v 1.22 2009/09/13 13:31:41 tron Exp $ # # Don't include this file manually! It will be included as necessary # by bsd.buildlink3.mk. @@ -12,7 +12,7 @@ BUILDLINK_TREE+= x11-links .if !defined(X11_LINKS_BUILDLINK3_MK) X11_LINKS_BUILDLINK3_MK:= -BUILDLINK_API_DEPENDS.x11-links+= x11-links>=0.43 +BUILDLINK_API_DEPENDS.x11-links+= x11-links>=0.44 BUILDLINK_PKGSRCDIR.x11-links?= ../../pkgtools/x11-links BUILDLINK_DEPMETHOD.x11-links?= build diff --git a/time/p5-DateTime-Locale/Makefile b/time/p5-DateTime-Locale/Makefile index 17ea999ebe2b..fea65b4c26d1 100644 --- a/time/p5-DateTime-Locale/Makefile +++ b/time/p5-DateTime-Locale/Makefile @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.15 2009/07/08 07:40:45 sno Exp $ +# $NetBSD: Makefile,v 1.16 2009/09/13 11:33:03 sno Exp $ -DISTNAME= DateTime-Locale-0.43 +DISTNAME= DateTime-Locale-0.44 PKGNAME= p5-${DISTNAME} CATEGORIES= time perl5 MASTER_SITES= ${MASTER_SITE_PERL_CPAN:=DateTime/} @@ -11,7 +11,7 @@ COMMENT= Localization data for p5-DateTime LICENSE= ${PERL5_LICENSE} DEPENDS+= p5-List-MoreUtils-[0-9]*:../../devel/p5-List-MoreUtils -DEPENDS+= p5-Params-Validate-[0-9]*:../../devel/p5-Params-Validate +DEPENDS+= p5-Params-Validate>=0.91:../../devel/p5-Params-Validate USE_LANGUAGES= # empty PERL5_MODULE_TYPE= Module::Build diff --git a/time/p5-DateTime-Locale/distinfo b/time/p5-DateTime-Locale/distinfo index 2387a8d7d8ac..a168b6c63730 100644 --- a/time/p5-DateTime-Locale/distinfo +++ b/time/p5-DateTime-Locale/distinfo @@ -1,5 +1,5 @@ -$NetBSD: distinfo,v 1.10 2009/07/08 07:40:45 sno Exp $ +$NetBSD: distinfo,v 1.11 2009/09/13 11:33:03 sno Exp $ -SHA1 (DateTime-Locale-0.43.tar.gz) = 810a3d03b67791ba9a928e0f4394143e9b86c281 -RMD160 (DateTime-Locale-0.43.tar.gz) = 1fedff8f0346b94fcaa9df56b898e07553b7356a -Size (DateTime-Locale-0.43.tar.gz) = 778002 bytes +SHA1 (DateTime-Locale-0.44.tar.gz) = 3d1feb233e0d5d86e4d7142a4ab90aca3943ed28 +RMD160 (DateTime-Locale-0.44.tar.gz) = 1d3ca4e6e6cddb700e6a4ae0b9befe267b415402 +Size (DateTime-Locale-0.44.tar.gz) = 1055901 bytes diff --git a/wip/e17/distinfo b/wip/e17/distinfo index 782110a84445..253d26d34620 100644 --- a/wip/e17/distinfo +++ b/wip/e17/distinfo @@ -11,3 +11,4 @@ SHA1 (patch-ae) = 1c280cdf3bb2a67985a8e94ffb11ab0cf124532f SHA1 (patch-af) = 785db672d1d771770d5d96efb77b34b94d403a43 SHA1 (patch-ag) = 99ec8af1686937f345b8337ea963fcd6be71768b SHA1 (patch-ah) = 917f385d4c1e8ee3065cceb90b822c3e09bda61f +SHA1 (patch-ai) = c50fb23efb4da8487cd8bf486e85926ae01bfd9c diff --git a/wip/gcc44/TODO b/wip/gcc44/TODO new file mode 100644 index 000000000000..cfe321c304aa --- /dev/null +++ b/wip/gcc44/TODO @@ -0,0 +1,2 @@ +Compiles path to buildlink-sed into +/usr/pkg/gcc44/libexec/gcc/x86_64-unknown-netbsd5.99.16/4.4.0/install-tools/fixincl diff --git a/wip/linux-kernel/TODO b/wip/linux-kernel/TODO index b89c5ff51b36..5056dbe6e8cb 100644 --- a/wip/linux-kernel/TODO +++ b/wip/linux-kernel/TODO @@ -60,4 +60,4 @@ look at default /boot/config-2.2.20-idepci # cp -i arch/i386/boot/bzImage /bzImage.-- with kernel-version- or other name # maybe copy to boot directory (as lilo also knows it) -- This package has known vulnerabilities, please investigate and fix if possible. (see: CVE-2008-1375, CVE-2008-1675, CVE-2008-1669, CVE-2008-1615, CVE-2008-1375, CVE-2008-0007, CVE-2007-6282, CVE-2005-0504, CVE-2008-1673, CVE-2008-2750, CVE-2008-2812, CVE-2008-3077, CVE-2008-3247, CVE-2008-3276, CVE-2008-3686, CVE-2008-1514, CVE-2008-3831, CVE-2008-5025, CVE-2009-0029, http://secunia.com/advisories/30258/, CVE-2008-3272, CVE-2008-3275, CVE-2008-3534, CVE-2008-4410, CVE-2008-4933, CVE-2008-4934, CVE-2008-5029, CVE-2008-5134, CVE-2008-3528, CVE-2008-4395, CVE-2008-5079, CVE-2008-5300, CVE-2008-5395, CVE-2009-0031, CVE-2009-0834, CVE-2009-0835, CVE-2009-1184, CVE-2009-1192, CVE-2009-1265, CVE-2009-1337, CVE-2009-1385, CVE-2009-1439, CVE-2009-1633, CVE-2009-1895, CVE-2009-1897, CVE-2009-2287, CVE-2009-2692, CVE-2009-3002, http://secunia.com/advisories/33656/, http://secunia.com/advisories/33938/, http://secunia.com/advisories/34033/, http://secunia.com/advisories/33977/, http://secunia.com/advisories/35127/, http://bugzilla.kernel.org/show_bug.cgi?id=12430), SA36200, SA35985, SA36136, SA35983. +- This package has known vulnerabilities, please investigate and fix if possible. (see: CVE-2008-1375, CVE-2008-1675, CVE-2008-1669, CVE-2008-1615, CVE-2008-1375, CVE-2008-0007, CVE-2007-6282, CVE-2005-0504, CVE-2008-1673, CVE-2008-2750, CVE-2008-2812, CVE-2008-3077, CVE-2008-3247, CVE-2008-3276, CVE-2008-3686, CVE-2008-1514, CVE-2008-3831, CVE-2008-5025, CVE-2009-0029, http://secunia.com/advisories/30258/, CVE-2008-3272, CVE-2008-3275, CVE-2008-3534, CVE-2008-4410, CVE-2008-4933, CVE-2008-4934, CVE-2008-5029, CVE-2008-5134, CVE-2008-3528, CVE-2008-4395, CVE-2008-5079, CVE-2008-5300, CVE-2008-5395, CVE-2009-0031, CVE-2009-0834, CVE-2009-0835, CVE-2009-1184, CVE-2009-1192, CVE-2009-1265, CVE-2009-1337, CVE-2009-1385, CVE-2009-1439, CVE-2009-1633, CVE-2009-1895, CVE-2009-1897, CVE-2009-2287, CVE-2009-2692, CVE-2009-3002, http://secunia.com/advisories/33656/, http://secunia.com/advisories/33938/, http://secunia.com/advisories/34033/, http://secunia.com/advisories/33977/, http://secunia.com/advisories/35127/, http://bugzilla.kernel.org/show_bug.cgi?id=12430), SA36200, SA35985, SA36136, SA35983. SA36617 diff --git a/wip/linux24-kernel/TODO b/wip/linux24-kernel/TODO index 97c5e437625b..2bfcd938e34e 100644 --- a/wip/linux24-kernel/TODO +++ b/wip/linux24-kernel/TODO @@ -36,4 +36,4 @@ look at default /boot/config-2.2.20-idepci # cp -i arch/i386/boot/bzImage /bzImage.-- with kernel-version- or other name # maybe copy to boot directory (as lilo also knows it) -- This package has known vulnerabilities, please investigate and fix if possible. (see: CVE-2008-2136, CVE-2008-2137, CVE-2007-3513, CVE-2008-1294, CVE-2008-4210, CVE-2008-3272, CVE-2008-3275, CVE-2008-3534, CVE-2008-4933, CVE-2008-4934, CVE-2009-2692). +- This package has known vulnerabilities, please investigate and fix if possible. (see: CVE-2008-2136, CVE-2008-2137, CVE-2007-3513, CVE-2008-1294, CVE-2008-4210, CVE-2008-3272, CVE-2008-3275, CVE-2008-3534, CVE-2008-4933, CVE-2008-4934, CVE-2009-2692, SA36638). diff --git a/wip/p5-POD2-IT/Makefile b/wip/p5-POD2-IT/Makefile index 91e9ed699071..722b281f0ae2 100644 --- a/wip/p5-POD2-IT/Makefile +++ b/wip/p5-POD2-IT/Makefile @@ -1,7 +1,7 @@ # $NetBSD$ # -DISTNAME= POD2-IT-0.12 +DISTNAME= POD2-IT-0.13 PKGNAME= p5-${DISTNAME} CATEGORIES= devel perl5 MASTER_SITES= ${MASTER_SITE_PERL_CPAN:=../../authors/id/E/EN/ENRYS/} @@ -9,6 +9,7 @@ MASTER_SITES= ${MASTER_SITE_PERL_CPAN:=../../authors/id/E/EN/ENRYS/} MAINTAINER= leot1990@users.sourceforge.net HOMEPAGE= http://pod2it.sourceforge.net/ COMMENT= Italian translation of Perl core documentation +LICENSE= ${PERL5_LICENSE} PKG_DESTDIR_SUPPORT= user-destdir diff --git a/wip/p5-POD2-IT/distinfo b/wip/p5-POD2-IT/distinfo index c793a8ec47d8..7cb24c69db68 100644 --- a/wip/p5-POD2-IT/distinfo +++ b/wip/p5-POD2-IT/distinfo @@ -1,5 +1,5 @@ $NetBSD$ -SHA1 (POD2-IT-0.12.tar.gz) = 3330134269fdbb93ff3ca2de7a791e0aeee6d3d4 -RMD160 (POD2-IT-0.12.tar.gz) = ca77e42afb9b1c0b2a117cc80c1df13114557b72 -Size (POD2-IT-0.12.tar.gz) = 597148 bytes +SHA1 (POD2-IT-0.13.tar.gz) = 17667df55f67701a6c9cfe40f4e017e4ae6737ce +RMD160 (POD2-IT-0.13.tar.gz) = 426a0fd8b71dd854402c9e1fed9621917fecc4c6 +Size (POD2-IT-0.13.tar.gz) = 603948 bytes diff --git a/wip/pipestatus/Makefile b/wip/pipestatus/Makefile index b5f827264d40..6d2af7d002a6 100644 --- a/wip/pipestatus/Makefile +++ b/wip/pipestatus/Makefile @@ -1,7 +1,7 @@ # $NetBSD$ # -DISTNAME= pipestatus-0.5.0 +DISTNAME= pipestatus-0.6.0 CATEGORIES= devel MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=pipestatus/} diff --git a/wip/pipestatus/distinfo b/wip/pipestatus/distinfo index 466f3b074960..53818c36da08 100644 --- a/wip/pipestatus/distinfo +++ b/wip/pipestatus/distinfo @@ -1,5 +1,5 @@ $NetBSD$ -SHA1 (pipestatus-0.5.0.tar.gz) = 064a2da0361fad057376ce361ac204e4a0905950 -RMD160 (pipestatus-0.5.0.tar.gz) = 77f3d159236e38975b5d1b12c33aec775762dbda -Size (pipestatus-0.5.0.tar.gz) = 5648 bytes +SHA1 (pipestatus-0.6.0.tar.gz) = ea1dfcf05ec421d15ec0c060b0d00a3e4dd59d41 +RMD160 (pipestatus-0.6.0.tar.gz) = 587ca90797dcd67a843bc4bc56ba6cbff2e50d15 +Size (pipestatus-0.6.0.tar.gz) = 6541 bytes diff --git a/wip/runawk/PLIST b/wip/runawk/PLIST index 23fc2b181c76..594a12554280 100644 --- a/wip/runawk/PLIST +++ b/wip/runawk/PLIST @@ -16,11 +16,13 @@ share/examples/runawk/demo_has_suffix.in share/examples/runawk/demo_modinfo share/examples/runawk/demo_multisub share/examples/runawk/demo_power_getopt +share/examples/runawk/demo_power_getopt2 share/examples/runawk/demo_readfile share/examples/runawk/demo_readfile.in share/examples/runawk/demo_runcmd share/examples/runawk/demo_shquote share/examples/runawk/demo_shquote.in +share/examples/runawk/demo_str2regexp share/examples/runawk/demo_tokenre share/examples/runawk/demo_tokenre.in share/examples/runawk/demo_tokenre2 @@ -28,8 +30,8 @@ share/examples/runawk/demo_tokenre2.in share/runawk/abort.awk share/runawk/abs.awk share/runawk/alt_assert.awk -share/runawk/alt_join.awk share/runawk/alt_getopt.awk +share/runawk/alt_join.awk share/runawk/basename.awk share/runawk/braceexpand.awk share/runawk/dirname.awk diff --git a/wip/sbcl/Makefile b/wip/sbcl/Makefile index ed3b454c665a..9e80d068727f 100644 --- a/wip/sbcl/Makefile +++ b/wip/sbcl/Makefile @@ -10,9 +10,9 @@ MAINTAINER= asau@users.sourceforge.net HOMEPAGE= http://www.sbcl.org/ COMMENT= SBCL, a Common Lisp implementation -ONLY_FOR_PLATFORM= NetBSD-[2-9]*-i386 -ONLY_FOR_PLATFORM+= FreeBSD-[2-9]*-i386 -ONLY_FOR_PLATFORM+= Linux-*-i386 +# ONLY_FOR_PLATFORM= NetBSD-[2-9]*-i386 +# ONLY_FOR_PLATFORM+= FreeBSD-[2-9]*-i386 +# ONLY_FOR_PLATFORM+= Linux-*-i386 # It should be possible to have SBCL working on amd64, powerpc, # sparc, alpha, mips, and HPPA hardware also, but they probably # need a bit of porting work done in SBCL itself. diff --git a/www/apache22/Makefile b/www/apache22/Makefile index f54633f6d336..bd6f3e570879 100644 --- a/www/apache22/Makefile +++ b/www/apache22/Makefile @@ -1,7 +1,8 @@ -# $NetBSD: Makefile,v 1.49 2009/08/10 11:45:08 tron Exp $ +# $NetBSD: Makefile,v 1.50 2009/09/13 13:32:50 tron Exp $ DISTNAME= httpd-2.2.13 PKGNAME= ${DISTNAME:S/httpd/apache/} +PKGREVISION= 1 CATEGORIES= www MASTER_SITES= ${MASTER_SITE_APACHE:=httpd/} \ ${MASTER_SITE_APACHE:=httpd/old/} diff --git a/www/apache22/distinfo b/www/apache22/distinfo index a628ebc2a039..f59e7d8f31a0 100644 --- a/www/apache22/distinfo +++ b/www/apache22/distinfo @@ -1,9 +1,10 @@ -$NetBSD: distinfo,v 1.24 2009/08/10 11:45:08 tron Exp $ +$NetBSD: distinfo,v 1.25 2009/09/13 13:32:50 tron Exp $ SHA1 (httpd-2.2.13.tar.bz2) = 44d85da1b8e6c579d4514cfefbea00b284717b69 RMD160 (httpd-2.2.13.tar.bz2) = 4a6a2247cc118175a9a36f1e14344ee71da24627 Size (httpd-2.2.13.tar.bz2) = 5300199 bytes SHA1 (patch-aa) = 40f5f687a1217b8d6684dc610d3d4c430f635cbf +SHA1 (patch-ab) = 76e50e1603c37e982a6ae9179009457aa9589e87 SHA1 (patch-ac) = 515043b5c215d49fe8f6d3191b502c978e2a2dad SHA1 (patch-ad) = 088d6ff0e7a8acfe70b4f85a6ce58d42c935fd13 SHA1 (patch-ae) = 86b307d6eefef232b6223afc3f69e64be40bd913 diff --git a/www/apache22/patches/patch-ab b/www/apache22/patches/patch-ab new file mode 100644 index 000000000000..358e46cd3639 --- /dev/null +++ b/www/apache22/patches/patch-ab @@ -0,0 +1,19 @@ +$NetBSD: patch-ab,v 1.12 2009/09/13 13:32:50 tron Exp $ + +Fix for CVE-2009-3094 based on the description of the problem: + +http://www.intevydis.com/blog/?p=59 + +--- modules/proxy/mod_proxy_ftp.c.orig 2008-11-11 20:04:34.000000000 +0000 ++++ modules/proxy/mod_proxy_ftp.c 2009-09-13 14:23:13.000000000 +0100 +@@ -1274,7 +1274,9 @@ + } + else { + /* and try the regular way */ +- apr_socket_close(data_sock); ++ if (data_sock != NULL) { ++ apr_socket_close(data_sock); ++ } + } + } + } -- 2.41.0