Fix build with Clang.

23 files changed, 220 insertions, 61 deletions

diff --git a/www/nvu/Makefile b/www/nvu/Makefile
index 3e15d20ba88..811a4b1de95 100644
--- a/www/nvu/Makefile
+++ b/www/nvu/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2012/10/28 06:30:24 asau Exp $
+# $NetBSD: Makefile,v 1.14 2013/03/24 16:45:54 joerg Exp $
 #
 
 DISTNAME=	nvu-1.0-sources
@@ -28,6 +28,8 @@ PKGCONFIG_OVERRIDE+=	build/unix/mozilla-xpcom.pc.in
 CPPFLAGS+=	-I${BUILDLINK_PREFIX.libIDL}/include/libIDL-2.0
 BUILDLINK_TRANSFORM+=	l:IDL:IDL-2
 
+LDFLAGS+=	-Wl,-rpath,${PREFIX}/lib/nvu-1.0
+
 .include "../../net/libIDL/buildlink3.mk"
 .include "../../net/ORBit2/buildlink3.mk"
 .include "../../x11/gtk/buildlink3.mk"
diff --git a/www/nvu/distinfo b/www/nvu/distinfo
index 79ffc698b09..1123ec234be 100644
--- a/www/nvu/distinfo
+++ b/www/nvu/distinfo
@@ -1,18 +1,28 @@
-$NetBSD: distinfo,v 1.5 2011/08/16 01:30:59 dholland Exp $
+$NetBSD: distinfo,v 1.6 2013/03/24 16:45:55 joerg Exp $
 
 SHA1 (nvu-1.0-sources.tar.bz2) = 438b1633cb820bbede503ef2da90f46d4e96bee8
 RMD160 (nvu-1.0-sources.tar.bz2) = 6d6fdb747d79e8602a4757e8eff8bbb21db6df8c
 Size (nvu-1.0-sources.tar.bz2) = 29687976 bytes
-SHA1 (patch-ah) = 8f92f4294ead04ddc5b719ff66b4aada912dcc01
-SHA1 (patch-ai) = c702ee4ed7e78efae8dfde676de9d556cb4ccdad
-SHA1 (patch-aj) = 951b5ea63116d876a6fcef586256a5728a2df2cf
-SHA1 (patch-ak) = f867ca0973fb4d0ca325b25f83586f10f6e85e32
-SHA1 (patch-al) = 57a15074fca3ddba756d0b3898ad9bf06a6e130a
-SHA1 (patch-an) = 99ac2da44322db96f8d65fbfdb380727b9da96fe
-SHA1 (patch-ao) = 617d232bd335bc988388f2004ca919c829e371da
-SHA1 (patch-ap) = 82a85df0b172f949509561f83ae7849e177babee
+SHA1 (patch-ah) = 6d4805a719d2ba5347d283b85ddf0b65e8c536af
+SHA1 (patch-ai) = 74e87e7bfb098cd598ec30d21e9dc28fb4b99b7e
+SHA1 (patch-aj) = ebb3b4f8700dc179dfae31740e35984f58a5b638
+SHA1 (patch-ak) = 6f86b60fbe29db5d984fda06de0eff3ebf4de307
+SHA1 (patch-al) = 5fe0093d2fa0691e9db035ce224265b438eedd3a
+SHA1 (patch-an) = 090e62c11b8d1f4d6779f5b1e1221efb43f9460e
+SHA1 (patch-ao) = eb220c4c30838216e709179cf953b9cbb9696421
+SHA1 (patch-ap) = 35a193158e43d57a1c31270214140afbb3cebb56
 SHA1 (patch-netwerk_protocol_http_src_nshttpconnectionmgr_cpp) = 5b14d68932a3dd2be9e57f130e825150de8cc8dd
 SHA1 (patch-nsprpub_config_Makefile.in) = daf6423b53385c32e658fa5d93e33a0c5f31ca91
-SHA1 (patch-nsprpub_pr_include_md__netbsd_cfg) = 4f65863a7516ed8c37a752e040ef1e3d4b881f29
-SHA1 (patch-nsprpub_pr_include_md__netbsd_h) = 059df4799777743947b74ae39ed250c17c78ad37
-SHA1 (patch-nsprpub_pr_src_io_prprf_c) = fabb1a52ced70a7640dd8a8d91e20e9672b22b76
+SHA1 (patch-nsprpub_lib_ds_Makefile.in) = 3620eee6be375bfa3afc2008fbe714bbbb670a27
+SHA1 (patch-nsprpub_lib_libc_src_Makefile.in) = c2d2a951b475c44a6ed5bf3bba6a53fc0b1a77d5
+SHA1 (patch-nsprpub_pr_include_md__netbsd_cfg) = 5a310a520f1168c4b5fe72c0603268d6b0b82c61
+SHA1 (patch-nsprpub_pr_include_md__netbsd_h) = 5eaddf0bb6e4daf3308d5167fdfd97bae10dd894
+SHA1 (patch-nsprpub_pr_src_io_prprf_c) = a18f1b0fbd699858628474cafd676f702c1a574e
+SHA1 (patch-security_nss_lib_nss_config.mk) = 870321ea256dbb3d5bf187460f7b6b4329cde2a7
+SHA1 (patch-security_nss_lib_smime_config.mk) = e7b89c537574af70e3e14f334d46a77e1dbc4bc0
+SHA1 (patch-security_nss_lib_softoken_config.mk) = c1110bad9779d241582d14c62a14b564664ecaa3
+SHA1 (patch-security_nss_lib_ssl_config.mk) = 9c428af47fcdd3d879dab41297d2714e40587bb7
+SHA1 (patch-xpcom_ds_nsBaseHashtable.h) = 72af3045b04104fcf9cb8b5e0c278ccbec9680ca
+SHA1 (patch-xpcom_ds_nsClassHashtable.h) = 6ebed99e3ee8709cee2cfd9ed61a2a6197fe8595
+SHA1 (patch-xpcom_ds_nsInterfaceHashtable.h) = a1922d87d364e2b8f592ac49098b23ab744e8930
+SHA1 (patch-xpcom_ds_nsRefPtrHashtable.h) = ccfd991c49243fc73957a49ed043c6f1e4ad96d4
diff --git a/www/nvu/patches/patch-ah b/www/nvu/patches/patch-ah
index a8093d66403..c44abd1f0bc 100644
--- a/www/nvu/patches/patch-ah
+++ b/www/nvu/patches/patch-ah
@@ -1,9 +1,9 @@
-$NetBSD: patch-ah,v 1.1.1.1 2006/10/21 21:54:13 rillig Exp $
+$NetBSD: patch-ah,v 1.2 2013/03/24 16:45:55 joerg Exp $
 
 diff -ru ../Orig/mozilla/gfx/idl/nsIFreeType2.idl ./gfx/idl/nsIFreeType2.idl
---- ../Orig/mozilla/gfx/idl/nsIFreeType2.idl	2004-04-16 10:09:33.000000000 +0900
-+++ ./gfx/idl/nsIFreeType2.idl	2004-06-11 00:32:42.000000000 +0900
-@@ -76,10 +76,11 @@
+--- gfx/idl/nsIFreeType2.idl.orig	2004-04-16 01:09:33.000000000 +0000
++++ gfx/idl/nsIFreeType2.idl
+@@ -76,10 +76,11 @@ native FT_Pointer(FT_Pointer);
  native FT_Sfnt_Tag(FT_Sfnt_Tag);
  native FT_Size(FT_Size);
  
@@ -17,7 +17,7 @@ diff -ru ../Orig/mozilla/gfx/idl/nsIFreeType2.idl ./gfx/idl/nsIFreeType2.idl
  native FTC_Manager(FTC_Manager);
  
  // #ifdef MOZ_SVG
-@@ -99,7 +100,7 @@
+@@ -99,7 +100,7 @@ interface nsIFreeType2 : nsISupports
  
      readonly attribute FT_Library library;
      readonly attribute FTC_Manager FTCacheManager;
@@ -26,7 +26,7 @@ diff -ru ../Orig/mozilla/gfx/idl/nsIFreeType2.idl ./gfx/idl/nsIFreeType2.idl
  
      void    doneFace(in FT_Face face);
      void    doneFreeType(in FT_Library lib);
-@@ -115,16 +116,16 @@
+@@ -115,16 +116,16 @@ interface nsIFreeType2 : nsISupports
      void    outlineDecompose(in FT_Outline_p outline,
                               in const_FT_Outline_Funcs_p funcs, in voidPtr p);
      void    setCharmap(in FT_Face face, in FT_CharMap charmap);
diff --git a/www/nvu/patches/patch-ai b/www/nvu/patches/patch-ai
index 7ac49d6171d..ff61d354c40 100644
--- a/www/nvu/patches/patch-ai
+++ b/www/nvu/patches/patch-ai
@@ -1,8 +1,8 @@
-$NetBSD: patch-ai,v 1.1.1.1 2006/10/21 21:54:13 rillig Exp $
+$NetBSD: patch-ai,v 1.2 2013/03/24 16:45:55 joerg Exp $
 
---- gfx/src/ps/nsFontMetricsPS.cpp.orig	2004-02-05 02:57:05.000000000 +0100
-+++ gfx/src/ps/nsFontMetricsPS.cpp	2006-10-21 20:37:14.000000000 +0200
-@@ -1141,10 +1142,10 @@ nsFontPSFreeType::Init(nsITrueTypeFontCa
+--- gfx/src/ps/nsFontMetricsPS.cpp.orig	2004-02-05 01:57:05.000000000 +0000
++++ gfx/src/ps/nsFontMetricsPS.cpp
+@@ -1141,10 +1141,10 @@ nsFontPSFreeType::Init(nsITrueTypeFontCa
    
    mPixelSize = NSToIntRound(app2dev * mFont->size);
  
@@ -17,7 +17,7 @@ $NetBSD: patch-ai,v 1.1.1.1 2006/10/21 21:54:13 rillig Exp $
  
    nsresult rv;
    mFt2 = do_GetService(NS_FREETYPE2_CONTRACTID, &rv);
-@@ -1190,7 +1191,7 @@ nsFontPSFreeType::GetWidth(const PRUnich
+@@ -1190,7 +1190,7 @@ nsFontPSFreeType::GetWidth(const PRUnich
    if (!face)
      return 0;
  
@@ -26,7 +26,7 @@ $NetBSD: patch-ai,v 1.1.1.1 2006/10/21 21:54:13 rillig Exp $
    nsresult rv = mFt2->GetImageCache(&iCache);
    if (NS_FAILED(rv)) {
      NS_ERROR("Failed to get Image Cache");
-@@ -1228,8 +1229,8 @@ nsFontPSFreeType::getFTFace()
+@@ -1228,8 +1228,8 @@ nsFontPSFreeType::getFTFace()
    
    FTC_Manager cManager;
    mFt2->GetFTCacheManager(&cManager);
@@ -37,7 +37,7 @@ $NetBSD: patch-ai,v 1.1.1.1 2006/10/21 21:54:13 rillig Exp $
    NS_ASSERTION(rv==0, "failed to get face/size");
    if (rv)
      return nsnull;
-@@ -1622,16 +1623,16 @@ void nsFT2Type8Generator::GeneratePSFont
+@@ -1622,16 +1622,16 @@ void nsFT2Type8Generator::GeneratePSFont
    mEntry->GetFamilyName(fontName);
    mEntry->GetStyleName(styleName);
    
diff --git a/www/nvu/patches/patch-aj b/www/nvu/patches/patch-aj
index 71ed505bcce..07f35211a6e 100644
--- a/www/nvu/patches/patch-aj
+++ b/www/nvu/patches/patch-aj
@@ -1,8 +1,8 @@
-$NetBSD: patch-aj,v 1.1.1.1 2006/10/21 21:54:13 rillig Exp $
+$NetBSD: patch-aj,v 1.2 2013/03/24 16:45:55 joerg Exp $
 
---- gfx/src/freetype/nsFreeType.h.orig	2005-05-01 19:36:19.000000000 +0200
+--- gfx/src/freetype/nsFreeType.h.orig	2004-04-16 21:31:42.000000000 +0000
 +++ gfx/src/freetype/nsFreeType.h
-@@ -120,13 +120,13 @@ typedef FT_Error (*FT_Outline_Decompose_
+@@ -104,13 +104,13 @@ typedef FT_Error (*FT_Outline_Decompose_
  typedef FT_Error (*FT_New_Face_t)(FT_Library, const char*, FT_Long, FT_Face*);
  typedef FT_Error (*FT_Set_Charmap_t)(FT_Face face, FT_CharMap  charmap);
  typedef FT_Error (*FTC_Image_Cache_Lookup_t)
@@ -20,7 +20,7 @@ $NetBSD: patch-aj,v 1.1.1.1 2006/10/21 21:54:13 rillig Exp $
  // #ifdef MOZ_SVG
  typedef FT_Error (*FT_Glyph_Transform_t)(FT_Glyph, FT_Matrix*, FT_Vector*);
  typedef FT_Error (*FT_Get_Kerning_t)
-@@ -181,7 +181,7 @@ protected:
+@@ -165,7 +165,7 @@ protected:
    FT_Outline_Decompose_t    nsFT_Outline_Decompose;
    FT_Set_Charmap_t          nsFT_Set_Charmap;
    FTC_Image_Cache_Lookup_t  nsFTC_Image_Cache_Lookup;
@@ -29,7 +29,7 @@ $NetBSD: patch-aj,v 1.1.1.1 2006/10/21 21:54:13 rillig Exp $
    FTC_Manager_Done_t        nsFTC_Manager_Done;
    FTC_Manager_New_t         nsFTC_Manager_New;
    FTC_Image_Cache_New_t     nsFTC_Image_Cache_New;
-@@ -229,7 +229,7 @@ protected:
+@@ -213,7 +213,7 @@ protected:
    PRLibrary      *mSharedLib;
    FT_Library      mFreeTypeLibrary;
    FTC_Manager     mFTCacheManager;
diff --git a/www/nvu/patches/patch-ak b/www/nvu/patches/patch-ak
index 5a6de6fb93c..67ed4c6b787 100644
--- a/www/nvu/patches/patch-ak
+++ b/www/nvu/patches/patch-ak
@@ -1,6 +1,6 @@
-$NetBSD: patch-ak,v 1.1.1.1 2006/10/21 21:54:13 rillig Exp $
+$NetBSD: patch-ak,v 1.2 2013/03/24 16:45:55 joerg Exp $
 
---- gfx/src/freetype/nsFreeType.cpp.orig	2005-07-13 20:21:10.000000000 +0200
+--- gfx/src/freetype/nsFreeType.cpp.orig	2004-02-07 15:22:30.000000000 +0000
 +++ gfx/src/freetype/nsFreeType.cpp
 @@ -110,11 +110,11 @@ FtFuncList nsFreeType2::FtFuncs [] = {
    {"FT_New_Face",             NS_FT2_OFFSET(nsFT_New_Face),             PR_TRUE},
@@ -17,7 +17,7 @@ $NetBSD: patch-ak,v 1.1.1.1 2006/10/21 21:54:13 rillig Exp $
  // #ifdef MOZ_SVG
    {"FT_Glyph_Transform",      NS_FT2_OFFSET(nsFT_Glyph_Transform),      PR_TRUE},
    {"FT_Get_Kerning",          NS_FT2_OFFSET(nsFT_Get_Kerning),          PR_TRUE},
-@@ -288,7 +288,7 @@ nsFreeType2::SetCharmap(FT_Face face, FT
+@@ -282,7 +282,7 @@ nsFreeType2::SetCharmap(FT_Face face, FT
  } 
   
  NS_IMETHODIMP
@@ -26,7 +26,7 @@ $NetBSD: patch-ak,v 1.1.1.1 2006/10/21 21:54:13 rillig Exp $
                                FT_UInt glyphID, FT_Glyph *glyph)
  { 
    // call the FreeType2 function via the function pointer
-@@ -297,11 +297,11 @@ nsFreeType2::ImageCacheLookup(FTC_Image_
+@@ -291,11 +291,11 @@ nsFreeType2::ImageCacheLookup(FTC_Image_
  } 
   
  NS_IMETHODIMP
@@ -41,7 +41,7 @@ $NetBSD: patch-ak,v 1.1.1.1 2006/10/21 21:54:13 rillig Exp $
    return error ? NS_ERROR_FAILURE : NS_OK;
  } 
   
-@@ -326,7 +326,7 @@ nsFreeType2::ManagerNew(FT_Library libra
+@@ -320,7 +320,7 @@ nsFreeType2::ManagerNew(FT_Library libra
  } 
   
  NS_IMETHODIMP
@@ -50,7 +50,7 @@ $NetBSD: patch-ak,v 1.1.1.1 2006/10/21 21:54:13 rillig Exp $
  { 
    // call the FreeType2 function via the function pointer
    FT_Error error = nsFTC_Image_Cache_New(manager, cache);
-@@ -395,7 +395,7 @@ nsFreeType2::SupportsExtFunc(PRBool *res
+@@ -389,7 +389,7 @@ nsFreeType2::SupportsExtFunc(PRBool *res
  } 
   
  NS_IMETHODIMP
diff --git a/www/nvu/patches/patch-al b/www/nvu/patches/patch-al
index 38439d3a9b9..ee0cd08d52b 100644
--- a/www/nvu/patches/patch-al
+++ b/www/nvu/patches/patch-al
@@ -1,7 +1,7 @@
-$NetBSD: patch-al,v 1.1.1.1 2006/10/21 21:54:13 rillig Exp $
+$NetBSD: patch-al,v 1.2 2013/03/24 16:45:55 joerg Exp $
 
---- gfx/src/ps/nsFontMetricsPS.h.orig	2003-04-22 18:25:09.000000000 +0200
-+++ gfx/src/ps/nsFontMetricsPS.h	2006-10-21 20:34:01.000000000 +0200
+--- gfx/src/ps/nsFontMetricsPS.h.orig	2003-04-22 16:25:09.000000000 +0000
++++ gfx/src/ps/nsFontMetricsPS.h
 @@ -320,7 +320,7 @@ protected:
    nsCOMPtr<nsITrueTypeFontCatalogEntry> mFaceID;
    nsCOMPtr<nsIFreeType2> mFt2;
diff --git a/www/nvu/patches/patch-an b/www/nvu/patches/patch-an
index 30a2c794abc..3fa8a537439 100644
--- a/www/nvu/patches/patch-an
+++ b/www/nvu/patches/patch-an
@@ -1,9 +1,9 @@
-$NetBSD: patch-an,v 1.1.1.1 2006/10/21 21:54:13 rillig Exp $
+$NetBSD: patch-an,v 1.2 2013/03/24 16:45:55 joerg Exp $
 
 diff -ru ../Orig/mozilla/gfx/src/x11shared/nsFontFreeType.h ./gfx/src/x11shared/nsFontFreeType.h
---- ../Orig/mozilla/gfx/src/x11shared/nsFontFreeType.h	2003-04-23 01:25:13.000000000 +0900
-+++ ./gfx/src/x11shared/nsFontFreeType.h	2004-06-10 23:06:35.000000000 +0900
-@@ -110,7 +110,7 @@
+--- gfx/src/x11shared/nsFontFreeType.h.orig	2003-04-22 16:25:13.000000000 +0000
++++ gfx/src/x11shared/nsFontFreeType.h
+@@ -110,7 +110,7 @@ protected:
    XImage *GetXImage(PRUint32 width, PRUint32 height);
    nsITrueTypeFontCatalogEntry *mFaceID;
    PRUint16        mPixelSize;
diff --git a/www/nvu/patches/patch-ao b/www/nvu/patches/patch-ao
index b11498d0081..e9be36f087e 100644
--- a/www/nvu/patches/patch-ao
+++ b/www/nvu/patches/patch-ao
@@ -1,9 +1,9 @@
-$NetBSD: patch-ao,v 1.1.1.1 2006/10/21 21:54:13 rillig Exp $
+$NetBSD: patch-ao,v 1.2 2013/03/24 16:45:55 joerg Exp $
 
 diff -ru ../Orig/mozilla/gfx/src/x11shared/nsFontFreeType.cpp ./gfx/src/x11shared/nsFontFreeType.cpp
---- ../Orig/mozilla/gfx/src/x11shared/nsFontFreeType.cpp	2003-12-25 17:24:52.000000000 +0900
-+++ ./gfx/src/x11shared/nsFontFreeType.cpp	2004-06-10 23:06:38.000000000 +0900
-@@ -177,7 +177,7 @@
+--- gfx/src/x11shared/nsFontFreeType.cpp.orig	2003-12-25 08:24:52.000000000 +0000
++++ gfx/src/x11shared/nsFontFreeType.cpp
+@@ -177,7 +177,7 @@ nsFreeTypeFont::getFTFace()
    FTC_Manager mgr;
    nsresult rv;
    mFt2->GetFTCacheManager(&mgr);
@@ -12,7 +12,7 @@ diff -ru ../Orig/mozilla/gfx/src/x11shared/nsFontFreeType.cpp ./gfx/src/x11share
    NS_ASSERTION(NS_SUCCEEDED(rv), "failed to get face/size");
    if (NS_FAILED(rv))
      return nsnull;
-@@ -191,22 +191,15 @@
+@@ -191,22 +191,15 @@ nsFreeTypeFont::nsFreeTypeFont(nsITrueTy
    PRBool embedded_bimap = PR_FALSE;
    mFaceID = aFaceID;
    mPixelSize = aPixelSize;
@@ -39,7 +39,7 @@ diff -ru ../Orig/mozilla/gfx/src/x11shared/nsFontFreeType.cpp ./gfx/src/x11share
    PRUint32  num_embedded_bitmaps, i;
    PRInt32*  embedded_bitmapheights;
    mFaceID->GetEmbeddedBitmapHeights(&num_embedded_bitmaps,
-@@ -218,7 +211,6 @@
+@@ -218,7 +211,6 @@ nsFreeTypeFont::nsFreeTypeFont(nsITrueTy
          if (embedded_bitmapheights[i] == aPixelSize) {
            embedded_bimap = PR_TRUE;
            // unhinted must be set for embedded bitmaps to be used
@@ -47,7 +47,7 @@ diff -ru ../Orig/mozilla/gfx/src/x11shared/nsFontFreeType.cpp ./gfx/src/x11share
            break;
          }
        }
-@@ -312,7 +304,7 @@
+@@ -312,7 +304,7 @@ nsFreeTypeFont::doGetBoundingMetrics(con
    if (!face)
      return NS_ERROR_FAILURE;
  
@@ -56,7 +56,7 @@ diff -ru ../Orig/mozilla/gfx/src/x11shared/nsFontFreeType.cpp ./gfx/src/x11share
    mFt2->GetImageCache(&icache);
    if (!icache)
      return NS_ERROR_FAILURE;
-@@ -401,7 +393,7 @@
+@@ -401,7 +393,7 @@ nsFreeTypeFont::GetWidth(const PRUnichar
    if (!face)
      return 0;
  
@@ -65,7 +65,7 @@ diff -ru ../Orig/mozilla/gfx/src/x11shared/nsFontFreeType.cpp ./gfx/src/x11share
    mFt2->GetImageCache(&icache);
    if (!icache)
      return 0;
-@@ -723,7 +715,7 @@
+@@ -723,7 +715,7 @@ nsFreeTypeXImage::DrawString(nsRendering
      if (y%4==0) (*blendPixelFunc)(sub_image, y, ascent-1, black, 255/2);
  #endif
  
diff --git a/www/nvu/patches/patch-ap b/www/nvu/patches/patch-ap
index e03f7d57c66..11899a06667 100644
--- a/www/nvu/patches/patch-ap
+++ b/www/nvu/patches/patch-ap
@@ -1,7 +1,7 @@
-$NetBSD: patch-ap,v 1.1 2007/12/01 21:29:53 rillig Exp $
+$NetBSD: patch-ap,v 1.2 2013/03/24 16:45:55 joerg Exp $
 
 --- security/nss/lib/pki1/oiddata.h.orig	2002-01-04 05:22:07.000000000 +0000
-+++ security/nss/lib/pki1/oiddata.h	2007-12-01 21:16:59.000000000 +0000
++++ security/nss/lib/pki1/oiddata.h
 @@ -43,7 +43,6 @@ static const char OIDDATA_CVS_ID[] = "@(
  #include "nsspki1t.h"
  #endif /* NSSPKI1T_H */
diff --git a/www/nvu/patches/patch-nsprpub_lib_ds_Makefile.in b/www/nvu/patches/patch-nsprpub_lib_ds_Makefile.in
new file mode 100644
index 00000000000..3e90691a997
--- /dev/null
+++ b/www/nvu/patches/patch-nsprpub_lib_ds_Makefile.in
@@ -0,0 +1,13 @@
+$NetBSD: patch-nsprpub_lib_ds_Makefile.in,v 1.1 2013/03/24 16:45:55 joerg Exp $
+
+--- nsprpub/lib/ds/Makefile.in.orig	2013-03-24 14:48:57.000000000 +0000
++++ nsprpub/lib/ds/Makefile.in
+@@ -95,6 +95,8 @@ MKSHLIB += -M $(MAPFILE)
+ endif
+ endif
+ 
++MKSHLIB += -Wl,-rpath,${PREFIX}/lib/nvu-1.0
++
+ ifeq ($(OS_ARCH),OS2)
+ MAPFILE = $(OBJDIR)/$(LIBRARY_NAME)$(LIBRARY_VERSION).def
+ GARBAGE += $(MAPFILE)
diff --git a/www/nvu/patches/patch-nsprpub_lib_libc_src_Makefile.in b/www/nvu/patches/patch-nsprpub_lib_libc_src_Makefile.in
new file mode 100644
index 00000000000..91d23284be9
--- /dev/null
+++ b/www/nvu/patches/patch-nsprpub_lib_libc_src_Makefile.in
@@ -0,0 +1,13 @@
+$NetBSD: patch-nsprpub_lib_libc_src_Makefile.in,v 1.1 2013/03/24 16:45:55 joerg Exp $
+
+--- nsprpub/lib/libc/src/Makefile.in.orig	2013-03-24 14:43:01.000000000 +0000
++++ nsprpub/lib/libc/src/Makefile.in
+@@ -146,6 +146,8 @@ else
+ 	SUF = LL
+ endif
+ 
++MKSHLIB += -Wl,-rpath,${PREFIX}/lib/nvu-1.0
++
+ GARBAGE += $(TINC)
+ 
+ $(TINC):
diff --git a/www/nvu/patches/patch-nsprpub_pr_include_md__netbsd_cfg b/www/nvu/patches/patch-nsprpub_pr_include_md__netbsd_cfg
index d181ad1547c..26fcba5f592 100644
--- a/www/nvu/patches/patch-nsprpub_pr_include_md__netbsd_cfg
+++ b/www/nvu/patches/patch-nsprpub_pr_include_md__netbsd_cfg
@@ -1,8 +1,8 @@
-$NetBSD: patch-nsprpub_pr_include_md__netbsd_cfg,v 1.1 2011/08/13 22:20:14 dholland Exp $
+$NetBSD: patch-nsprpub_pr_include_md__netbsd_cfg,v 1.2 2013/03/24 16:45:55 joerg Exp $
 
 Build on amd64.
 
---- nsprpub/pr/include/md/_netbsd.cfg~	2000-12-01 21:29:17.000000000 +0000
+--- nsprpub/pr/include/md/_netbsd.cfg.orig	2000-12-01 21:29:17.000000000 +0000
 +++ nsprpub/pr/include/md/_netbsd.cfg
 @@ -137,7 +137,7 @@
  #define PR_ALIGN_OF_DOUBLE  8
diff --git a/www/nvu/patches/patch-nsprpub_pr_include_md__netbsd_h b/www/nvu/patches/patch-nsprpub_pr_include_md__netbsd_h
index c6c9172142f..97ce832228b 100644
--- a/www/nvu/patches/patch-nsprpub_pr_include_md__netbsd_h
+++ b/www/nvu/patches/patch-nsprpub_pr_include_md__netbsd_h
@@ -1,8 +1,8 @@
-$NetBSD: patch-nsprpub_pr_include_md__netbsd_h,v 1.1 2011/08/13 22:20:14 dholland Exp $
+$NetBSD: patch-nsprpub_pr_include_md__netbsd_h,v 1.2 2013/03/24 16:45:55 joerg Exp $
 
 Build on amd64.
 
---- nsprpub/pr/include/md/_netbsd.h~	2003-09-11 17:24:53.000000000 +0000
+--- nsprpub/pr/include/md/_netbsd.h.orig	2003-09-11 17:24:53.000000000 +0000
 +++ nsprpub/pr/include/md/_netbsd.h
 @@ -42,6 +42,8 @@
  #define _PR_SI_SYSNAME  "NetBSD"
diff --git a/www/nvu/patches/patch-nsprpub_pr_src_io_prprf_c b/www/nvu/patches/patch-nsprpub_pr_src_io_prprf_c
index 11bcccf5395..cb7e3d81a5d 100644
--- a/www/nvu/patches/patch-nsprpub_pr_src_io_prprf_c
+++ b/www/nvu/patches/patch-nsprpub_pr_src_io_prprf_c
@@ -1,8 +1,8 @@
-$NetBSD: patch-nsprpub_pr_src_io_prprf_c,v 1.1 2011/08/13 22:20:14 dholland Exp $
+$NetBSD: patch-nsprpub_pr_src_io_prprf_c,v 1.2 2013/03/24 16:45:55 joerg Exp $
 
 Use valid va_list handling.
 
---- nsprpub/pr/src/io/prprf.c~	2004-03-09 03:18:19.000000000 +0000
+--- nsprpub/pr/src/io/prprf.c.orig	2004-03-09 03:18:19.000000000 +0000
 +++ nsprpub/pr/src/io/prprf.c
 @@ -51,7 +51,10 @@
  ** Note: on some platforms va_list is defined as an array,
diff --git a/www/nvu/patches/patch-security_nss_lib_nss_config.mk b/www/nvu/patches/patch-security_nss_lib_nss_config.mk
new file mode 100644
index 00000000000..1ad0e84dab8
--- /dev/null
+++ b/www/nvu/patches/patch-security_nss_lib_nss_config.mk
@@ -0,0 +1,12 @@
+$NetBSD: patch-security_nss_lib_nss_config.mk,v 1.1 2013/03/24 16:45:55 joerg Exp $
+
+--- security/nss/lib/nss/config.mk.orig	2013-03-24 14:32:56.000000000 +0000
++++ security/nss/lib/nss/config.mk
+@@ -116,6 +116,7 @@ MKSHLIB += -R '$$ORIGIN'
+ endif
+ endif
+ 
++MKSHLIB += -Wl,-rpath,${PREFIX}/lib/nvu-1.0
+ 
+ ifeq (,$(filter-out WINNT WIN95,$(OS_TARGET)))
+ ifndef NS_USE_GCC
diff --git a/www/nvu/patches/patch-security_nss_lib_smime_config.mk b/www/nvu/patches/patch-security_nss_lib_smime_config.mk
new file mode 100644
index 00000000000..d6d083085cf
--- /dev/null
+++ b/www/nvu/patches/patch-security_nss_lib_smime_config.mk
@@ -0,0 +1,9 @@
+$NetBSD: patch-security_nss_lib_smime_config.mk,v 1.1 2013/03/24 16:45:55 joerg Exp $
+
+--- security/nss/lib/smime/config.mk.orig	2013-03-24 14:47:55.000000000 +0000
++++ security/nss/lib/smime/config.mk
+@@ -92,3 +92,4 @@ ifeq ($(OS_TARGET),SunOS)
+ MKSHLIB += -R '$$ORIGIN'
+ endif
+ 
++MKSHLIB += -Wl,-rpath,${PREFIX}/lib/nvu-1.0
diff --git a/www/nvu/patches/patch-security_nss_lib_softoken_config.mk b/www/nvu/patches/patch-security_nss_lib_softoken_config.mk
new file mode 100644
index 00000000000..d7231435a94
--- /dev/null
+++ b/www/nvu/patches/patch-security_nss_lib_softoken_config.mk
@@ -0,0 +1,10 @@
+$NetBSD: patch-security_nss_lib_softoken_config.mk,v 1.1 2013/03/24 16:45:55 joerg Exp $
+
+--- security/nss/lib/softoken/config.mk.orig	2013-03-24 14:50:22.000000000 +0000
++++ security/nss/lib/softoken/config.mk
+@@ -92,3 +92,5 @@ endif
+ ifeq ($(OS_TARGET),WINCE)
+ DEFINES += -DDBM_USING_NSPR
+ endif
++
++MKSHLIB += -Wl,-rpath,${PREFIX}/lib/nvu-1.0
diff --git a/www/nvu/patches/patch-security_nss_lib_ssl_config.mk b/www/nvu/patches/patch-security_nss_lib_ssl_config.mk
new file mode 100644
index 00000000000..2e0158fbd13
--- /dev/null
+++ b/www/nvu/patches/patch-security_nss_lib_ssl_config.mk
@@ -0,0 +1,11 @@
+$NetBSD: patch-security_nss_lib_ssl_config.mk,v 1.1 2013/03/24 16:45:55 joerg Exp $
+
+--- security/nss/lib/ssl/config.mk.orig	2013-03-24 14:50:44.000000000 +0000
++++ security/nss/lib/ssl/config.mk
+@@ -84,4 +84,6 @@ ifeq ($(OS_TARGET),SunOS)
+ MKSHLIB += -R '$$ORIGIN'
+ endif
+ 
++MKSHLIB += -Wl,-rpath,${PREFIX}/lib/nvu-1.0
++
+ endif
diff --git a/www/nvu/patches/patch-xpcom_ds_nsBaseHashtable.h b/www/nvu/patches/patch-xpcom_ds_nsBaseHashtable.h
new file mode 100644
index 00000000000..8fed425dd4a
--- /dev/null
+++ b/www/nvu/patches/patch-xpcom_ds_nsBaseHashtable.h
@@ -0,0 +1,31 @@
+$NetBSD: patch-xpcom_ds_nsBaseHashtable.h,v 1.1 2013/03/24 16:45:55 joerg Exp $
+
+--- xpcom/ds/nsBaseHashtable.h.orig	2003-08-09 19:24:24.000000000 +0000
++++ xpcom/ds/nsBaseHashtable.h
+@@ -124,7 +124,7 @@ public:
+    */
+   PRBool Get(KeyType aKey, UserDataType* pData) const
+   {
+-    EntryType* ent = GetEntry(aKey);
++    EntryType* ent = this->GetEntry(aKey);
+ 
+     if (!ent)
+       return PR_FALSE;
+@@ -143,7 +143,7 @@ public:
+    */
+   PRBool Put(KeyType aKey, UserDataType aData)
+   {
+-    EntryType* ent = PutEntry(aKey);
++    EntryType* ent = this->PutEntry(aKey);
+ 
+     if (!ent)
+       return PR_FALSE;
+@@ -157,7 +157,7 @@ public:
+    * remove the data for the associated key
+    * @param aKey the key to remove from the hashtable
+    */
+-  void Remove(KeyType aKey) { RemoveEntry(aKey); }
++  void Remove(KeyType aKey) { this->RemoveEntry(aKey); }
+ 
+   /**
+    * function type provided by the application for enumeration.
diff --git a/www/nvu/patches/patch-xpcom_ds_nsClassHashtable.h b/www/nvu/patches/patch-xpcom_ds_nsClassHashtable.h
new file mode 100644
index 00000000000..301c0ef9083
--- /dev/null
+++ b/www/nvu/patches/patch-xpcom_ds_nsClassHashtable.h
@@ -0,0 +1,13 @@
+$NetBSD: patch-xpcom_ds_nsClassHashtable.h,v 1.1 2013/03/24 16:45:55 joerg Exp $
+
+--- xpcom/ds/nsClassHashtable.h.orig	2003-06-19 18:42:23.000000000 +0000
++++ xpcom/ds/nsClassHashtable.h
+@@ -98,7 +98,7 @@ PRBool
+ nsClassHashtable<KeyClass,T>::Get(KeyType aKey, T** retVal) const
+ {
+   typename nsBaseHashtable<KeyClass,nsAutoPtr<T>,T*>::EntryType* ent =
+-    GetEntry(aKey);
++    this->GetEntry(aKey);
+ 
+   if (ent)
+   {
diff --git a/www/nvu/patches/patch-xpcom_ds_nsInterfaceHashtable.h b/www/nvu/patches/patch-xpcom_ds_nsInterfaceHashtable.h
new file mode 100644
index 00000000000..8932870126b
--- /dev/null
+++ b/www/nvu/patches/patch-xpcom_ds_nsInterfaceHashtable.h
@@ -0,0 +1,22 @@
+$NetBSD: patch-xpcom_ds_nsInterfaceHashtable.h,v 1.1 2013/03/24 16:45:55 joerg Exp $
+
+--- xpcom/ds/nsInterfaceHashtable.h.orig	2003-12-29 13:22:49.000000000 +0000
++++ xpcom/ds/nsInterfaceHashtable.h
+@@ -111,7 +111,7 @@ nsInterfaceHashtable<KeyClass,Interface>
+   (KeyType aKey, UserDataType* pInterface) const
+ {
+   typename nsBaseHashtable<KeyClass, nsCOMPtr<Interface>, Interface*>::EntryType* ent =
+-    GetEntry(aKey);
++    this->GetEntry(aKey);
+ 
+   if (ent)
+   {
+@@ -139,7 +139,7 @@ nsInterfaceHashtable<KeyClass,Interface>
+   (KeyType aKey, PRBool* aFound) const
+ {
+   typename nsBaseHashtable<KeyClass, nsCOMPtr<Interface>, Interface*>::EntryType* ent =
+-    GetEntry(aKey);
++    this->GetEntry(aKey);
+ 
+   if (ent)
+   {
diff --git a/www/nvu/patches/patch-xpcom_ds_nsRefPtrHashtable.h b/www/nvu/patches/patch-xpcom_ds_nsRefPtrHashtable.h
new file mode 100644
index 00000000000..1f04f519572
--- /dev/null
+++ b/www/nvu/patches/patch-xpcom_ds_nsRefPtrHashtable.h
@@ -0,0 +1,13 @@
+$NetBSD: patch-xpcom_ds_nsRefPtrHashtable.h,v 1.1 2013/03/24 16:45:56 joerg Exp $
+
+--- xpcom/ds/nsRefPtrHashtable.h.orig	2004-01-31 12:37:36.000000000 +0000
++++ xpcom/ds/nsRefPtrHashtable.h
+@@ -140,7 +140,7 @@ nsRefPtrHashtable<KeyClass,RefPtr>::GetW
+   (KeyType aKey, PRBool* aFound) const
+ {
+   typename nsBaseHashtable<KeyClass, nsRefPtr<RefPtr>, RefPtr*>::EntryType* ent =
+-    GetEntry(aKey);
++    this->GetEntry(aKey);
+ 
+   if (ent)
+   {