Thu Mar 17 13:24:07 2011 UTC ()
* marked as user-destdir ready
* need libXt to build.
* need libXp to match PLIST.
* let not to install nspr.m4 to avoid conflict with devel/nspr

Bump PKGREVISION.


(obache)
diff -r1.5 -r1.6 pkgsrc/www/nvu/Makefile
diff -r1.2 -r1.3 pkgsrc/www/nvu/PLIST
diff -r1.2 -r1.3 pkgsrc/www/nvu/distinfo
diff -r0 -r1.1 pkgsrc/www/nvu/patches/patch-nsprpub_config_Makefile.in
cvs diff -r1.5 -r1.6 pkgsrc/www/nvu/Attic/Makefile (expand / switch to unified diff)

--- pkgsrc/www/nvu/Attic/Makefile 2009/08/25 12:32:56 1.5
+++ pkgsrc/www/nvu/Attic/Makefile 2011/03/17 13:24:07 1.6
@@ -1,35 +1,40 @@ @@ -1,35 +1,40 @@
1# $NetBSD: Makefile,v 1.5 2009/08/25 12:32:56 wiz Exp $ 1# $NetBSD: Makefile,v 1.6 2011/03/17 13:24:07 obache Exp $
2# 2#
3 3
4DISTNAME= nvu-1.0-sources 4DISTNAME= nvu-1.0-sources
5PKGNAME= nvu-1.0 5PKGNAME= ${DISTNAME:S/-sources//}
 6PKGREVISION= 1
6CATEGORIES= www 7CATEGORIES= www
7MASTER_SITES= http://cvs.nvu.com/download/ 8MASTER_SITES= http://cvs.nvu.com/download/
8EXTRACT_SUFX= .tar.bz2 9EXTRACT_SUFX= .tar.bz2
9 10
10MAINTAINER= pkgsrc-users@NetBSD.org 11MAINTAINER= pkgsrc-users@NetBSD.org
11HOMEPAGE= http://www.nvu.com/ 12HOMEPAGE= http://www.nvu.com/
12COMMENT= Web Authoring System 13COMMENT= Web Authoring System
13 14
14BUILD_DEPENDS+= zip-[0-9]*:../../archivers/zip 15BUILD_DEPENDS+= zip-[0-9]*:../../archivers/zip
15 16
 17PKG_DESTDIR_SUPPORT= user-destdir
 18
16WRKSRC= ${WRKDIR}/mozilla 19WRKSRC= ${WRKDIR}/mozilla
17GNU_CONFIGURE= yes 20GNU_CONFIGURE= yes
18CONFIGURE_ENV+= ORBIT_CONFIG=orbit2-config 21CONFIGURE_ENV+= ORBIT_CONFIG=orbit2-config
19USE_TOOLS+= gmake perl pkg-config unzip 22USE_TOOLS+= gmake perl pkg-config unzip
20USE_LANGUAGES= c c++ 23USE_LANGUAGES= c c++
21 24
22PKGCONFIG_OVERRIDE+= build/unix/mozilla-gtkmozembed.pc.in 25PKGCONFIG_OVERRIDE+= build/unix/mozilla-gtkmozembed.pc.in
23PKGCONFIG_OVERRIDE+= build/unix/mozilla-js.pc.in 26PKGCONFIG_OVERRIDE+= build/unix/mozilla-js.pc.in
24PKGCONFIG_OVERRIDE+= build/unix/mozilla-nspr.pc.in 27PKGCONFIG_OVERRIDE+= build/unix/mozilla-nspr.pc.in
25PKGCONFIG_OVERRIDE+= build/unix/mozilla-nss.pc.in 28PKGCONFIG_OVERRIDE+= build/unix/mozilla-nss.pc.in
26PKGCONFIG_OVERRIDE+= build/unix/mozilla-plugin.pc.in 29PKGCONFIG_OVERRIDE+= build/unix/mozilla-plugin.pc.in
27PKGCONFIG_OVERRIDE+= build/unix/mozilla-xpcom.pc.in 30PKGCONFIG_OVERRIDE+= build/unix/mozilla-xpcom.pc.in
28 31
29CPPFLAGS+= -I${BUILDLINK_PREFIX.libIDL}/include/libIDL-2.0 32CPPFLAGS+= -I${BUILDLINK_PREFIX.libIDL}/include/libIDL-2.0
30BUILDLINK_TRANSFORM+= l:IDL:IDL-2 33BUILDLINK_TRANSFORM+= l:IDL:IDL-2
31 34
32.include "../../net/libIDL/buildlink3.mk" 35.include "../../net/libIDL/buildlink3.mk"
33.include "../../net/ORBit2/buildlink3.mk" 36.include "../../net/ORBit2/buildlink3.mk"
34.include "../../x11/gtk/buildlink3.mk" 37.include "../../x11/gtk/buildlink3.mk"
 38.include "../../x11/libXp/buildlink3.mk"
 39.include "../../x11/libXt/buildlink3.mk"
35.include "../../mk/bsd.pkg.mk" 40.include "../../mk/bsd.pkg.mk"
cvs diff -r1.2 -r1.3 pkgsrc/www/nvu/Attic/PLIST (expand / switch to unified diff)

--- pkgsrc/www/nvu/Attic/PLIST 2009/06/14 22:00:29 1.2
+++ pkgsrc/www/nvu/Attic/PLIST 2011/03/17 13:24:07 1.3
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1@comment $NetBSD: PLIST,v 1.2 2009/06/14 22:00:29 joerg Exp $ 1@comment $NetBSD: PLIST,v 1.3 2011/03/17 13:24:07 obache Exp $
2bin/nvu 2bin/nvu
3bin/nvu-config 3bin/nvu-config
4include/${PKGNAME}/accessibility/nsAccessNode.h 4include/${PKGNAME}/accessibility/nsAccessNode.h
5include/${PKGNAME}/accessibility/nsAccessNodeWrap.h 5include/${PKGNAME}/accessibility/nsAccessNodeWrap.h
6include/${PKGNAME}/accessibility/nsAccessibleEventData.h 6include/${PKGNAME}/accessibility/nsAccessibleEventData.h
7include/${PKGNAME}/accessibility/nsAccessibleWrap.h 7include/${PKGNAME}/accessibility/nsAccessibleWrap.h
8include/${PKGNAME}/accessibility/nsDocAccessibleWrap.h 8include/${PKGNAME}/accessibility/nsDocAccessibleWrap.h
9include/${PKGNAME}/accessibility/nsIAccessNode.h 9include/${PKGNAME}/accessibility/nsIAccessNode.h
10include/${PKGNAME}/accessibility/nsIAccessibilityService.h 10include/${PKGNAME}/accessibility/nsIAccessibilityService.h
11include/${PKGNAME}/accessibility/nsIAccessible.h 11include/${PKGNAME}/accessibility/nsIAccessible.h
12include/${PKGNAME}/accessibility/nsIAccessibleCaret.h 12include/${PKGNAME}/accessibility/nsIAccessibleCaret.h
13include/${PKGNAME}/accessibility/nsIAccessibleDocument.h 13include/${PKGNAME}/accessibility/nsIAccessibleDocument.h
14include/${PKGNAME}/accessibility/nsIAccessibleEvent.h 14include/${PKGNAME}/accessibility/nsIAccessibleEvent.h
@@ -2067,27 +2067,26 @@ lib/${PKGNAME}/res/viewer.properties @@ -2067,27 +2067,26 @@ lib/${PKGNAME}/res/viewer.properties
2067lib/${PKGNAME}/res/viewsource.css 2067lib/${PKGNAME}/res/viewsource.css
2068lib/${PKGNAME}/run-mozilla.sh 2068lib/${PKGNAME}/run-mozilla.sh
2069lib/${PKGNAME}/xpcshell 2069lib/${PKGNAME}/xpcshell
2070lib/${PKGNAME}/xpicleanup 2070lib/${PKGNAME}/xpicleanup
2071lib/${PKGNAME}/xpidl 2071lib/${PKGNAME}/xpidl
2072lib/${PKGNAME}/xpt_dump 2072lib/${PKGNAME}/xpt_dump
2073lib/${PKGNAME}/xpt_link 2073lib/${PKGNAME}/xpt_link
2074lib/pkgconfig/nvu-gtkmozembed.pc 2074lib/pkgconfig/nvu-gtkmozembed.pc
2075lib/pkgconfig/nvu-js.pc 2075lib/pkgconfig/nvu-js.pc
2076lib/pkgconfig/nvu-nspr.pc 2076lib/pkgconfig/nvu-nspr.pc
2077lib/pkgconfig/nvu-nss.pc 2077lib/pkgconfig/nvu-nss.pc
2078lib/pkgconfig/nvu-plugin.pc 2078lib/pkgconfig/nvu-plugin.pc
2079lib/pkgconfig/nvu-xpcom.pc 2079lib/pkgconfig/nvu-xpcom.pc
2080share/aclocal/nspr.m4 
2081share/idl/${PKGNAME}/XPCIDispatch.idl 2080share/idl/${PKGNAME}/XPCIDispatch.idl
2082share/idl/${PKGNAME}/diIIconFinder.idl 2081share/idl/${PKGNAME}/diIIconFinder.idl
2083share/idl/${PKGNAME}/domstubs.idl 2082share/idl/${PKGNAME}/domstubs.idl
2084share/idl/${PKGNAME}/gfxIFormats.idl 2083share/idl/${PKGNAME}/gfxIFormats.idl
2085share/idl/${PKGNAME}/gfxIImageFrame.idl 2084share/idl/${PKGNAME}/gfxIImageFrame.idl
2086share/idl/${PKGNAME}/gfxtypes.idl 2085share/idl/${PKGNAME}/gfxtypes.idl
2087share/idl/${PKGNAME}/imgICache.idl 2086share/idl/${PKGNAME}/imgICache.idl
2088share/idl/${PKGNAME}/imgIContainer.idl 2087share/idl/${PKGNAME}/imgIContainer.idl
2089share/idl/${PKGNAME}/imgIContainerObserver.idl 2088share/idl/${PKGNAME}/imgIContainerObserver.idl
2090share/idl/${PKGNAME}/imgIDecoder.idl 2089share/idl/${PKGNAME}/imgIDecoder.idl
2091share/idl/${PKGNAME}/imgIDecoderObserver.idl 2090share/idl/${PKGNAME}/imgIDecoderObserver.idl
2092share/idl/${PKGNAME}/imgIEncoder.idl 2091share/idl/${PKGNAME}/imgIEncoder.idl
2093share/idl/${PKGNAME}/imgILoad.idl 2092share/idl/${PKGNAME}/imgILoad.idl
cvs diff -r1.2 -r1.3 pkgsrc/www/nvu/Attic/distinfo (expand / switch to unified diff)

--- pkgsrc/www/nvu/Attic/distinfo 2007/12/01 21:29:53 1.2
+++ pkgsrc/www/nvu/Attic/distinfo 2011/03/17 13:24:07 1.3
@@ -1,13 +1,14 @@ @@ -1,13 +1,14 @@
1$NetBSD: distinfo,v 1.2 2007/12/01 21:29:53 rillig Exp $ 1$NetBSD: distinfo,v 1.3 2011/03/17 13:24:07 obache Exp $
2 2
3SHA1 (nvu-1.0-sources.tar.bz2) = 438b1633cb820bbede503ef2da90f46d4e96bee8 3SHA1 (nvu-1.0-sources.tar.bz2) = 438b1633cb820bbede503ef2da90f46d4e96bee8
4RMD160 (nvu-1.0-sources.tar.bz2) = 6d6fdb747d79e8602a4757e8eff8bbb21db6df8c 4RMD160 (nvu-1.0-sources.tar.bz2) = 6d6fdb747d79e8602a4757e8eff8bbb21db6df8c
5Size (nvu-1.0-sources.tar.bz2) = 29687976 bytes 5Size (nvu-1.0-sources.tar.bz2) = 29687976 bytes
6SHA1 (patch-ah) = 8f92f4294ead04ddc5b719ff66b4aada912dcc01 6SHA1 (patch-ah) = 8f92f4294ead04ddc5b719ff66b4aada912dcc01
7SHA1 (patch-ai) = c702ee4ed7e78efae8dfde676de9d556cb4ccdad 7SHA1 (patch-ai) = c702ee4ed7e78efae8dfde676de9d556cb4ccdad
8SHA1 (patch-aj) = 951b5ea63116d876a6fcef586256a5728a2df2cf 8SHA1 (patch-aj) = 951b5ea63116d876a6fcef586256a5728a2df2cf
9SHA1 (patch-ak) = f867ca0973fb4d0ca325b25f83586f10f6e85e32 9SHA1 (patch-ak) = f867ca0973fb4d0ca325b25f83586f10f6e85e32
10SHA1 (patch-al) = 57a15074fca3ddba756d0b3898ad9bf06a6e130a 10SHA1 (patch-al) = 57a15074fca3ddba756d0b3898ad9bf06a6e130a
11SHA1 (patch-an) = 99ac2da44322db96f8d65fbfdb380727b9da96fe 11SHA1 (patch-an) = 99ac2da44322db96f8d65fbfdb380727b9da96fe
12SHA1 (patch-ao) = 617d232bd335bc988388f2004ca919c829e371da 12SHA1 (patch-ao) = 617d232bd335bc988388f2004ca919c829e371da
13SHA1 (patch-ap) = 82a85df0b172f949509561f83ae7849e177babee 13SHA1 (patch-ap) = 82a85df0b172f949509561f83ae7849e177babee
 14SHA1 (patch-nsprpub_config_Makefile.in) = daf6423b53385c32e658fa5d93e33a0c5f31ca91
File Added: pkgsrc/www/nvu/patches/Attic/patch-nsprpub_config_Makefile.in
$NetBSD: patch-nsprpub_config_Makefile.in,v 1.1 2011/03/17 13:24:07 obache Exp $

--- nsprpub/config/Makefile.in.orig	2004-04-16 22:28:03.000000000 +0000
+++ nsprpub/config/Makefile.in
@@ -139,7 +139,3 @@ ifeq ($(MOZ_OS2_TOOLS),VACPP)
 else
 	$(CC) $(XCFLAGS) $< $(LDFLAGS) $(XLDOPTS) $(OUTOPTION)$@
 endif
-
-real_install:: nspr.m4
-	$(NSINSTALL) -D $(DESTDIR)$(datadir)/aclocal
-	$(NSINSTALL) -t -m 0644 $< $(DESTDIR)$(datadir)/aclocal