diff options
| author | obache <obache@pkgsrc.org> | 2011-03-17 13:24:07 +0000 |
|---|---|---|
| committer | obache <obache@pkgsrc.org> | 2011-03-17 13:24:07 +0000 |
| commit | 4fbd91bd63dae4f2aee8ae7f2f7f2caaf494432d (patch) | |
| tree | 88517663edeb1fc8e9c1be6a820fd8f3fd6a876f | |
| parent | 72e1ebc790dd2ef18b173f670eab061cace9afc2 (diff) | |
| download | pkgsrc-4fbd91bd63dae4f2aee8ae7f2f7f2caaf494432d.tar.gz | |
* 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.
| -rw-r--r-- | www/nvu/Makefile | 9 | ||||
| -rw-r--r-- | www/nvu/PLIST | 3 | ||||
| -rw-r--r-- | www/nvu/distinfo | 3 | ||||
| -rw-r--r-- | www/nvu/patches/patch-nsprpub_config_Makefile.in | 12 |
4 files changed, 22 insertions, 5 deletions
diff --git a/www/nvu/Makefile b/www/nvu/Makefile index c491856159a..18c267d79d5 100644 --- a/www/nvu/Makefile +++ b/www/nvu/Makefile @@ -1,8 +1,9 @@ -# $NetBSD: Makefile,v 1.5 2009/08/25 12:32:56 wiz Exp $ +# $NetBSD: Makefile,v 1.6 2011/03/17 13:24:07 obache Exp $ # DISTNAME= nvu-1.0-sources -PKGNAME= nvu-1.0 +PKGNAME= ${DISTNAME:S/-sources//} +PKGREVISION= 1 CATEGORIES= www MASTER_SITES= http://cvs.nvu.com/download/ EXTRACT_SUFX= .tar.bz2 @@ -13,6 +14,8 @@ COMMENT= Web Authoring System BUILD_DEPENDS+= zip-[0-9]*:../../archivers/zip +PKG_DESTDIR_SUPPORT= user-destdir + WRKSRC= ${WRKDIR}/mozilla GNU_CONFIGURE= yes CONFIGURE_ENV+= ORBIT_CONFIG=orbit2-config @@ -32,4 +35,6 @@ BUILDLINK_TRANSFORM+= l:IDL:IDL-2 .include "../../net/libIDL/buildlink3.mk" .include "../../net/ORBit2/buildlink3.mk" .include "../../x11/gtk/buildlink3.mk" +.include "../../x11/libXp/buildlink3.mk" +.include "../../x11/libXt/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/www/nvu/PLIST b/www/nvu/PLIST index c0b47429fda..1ba76db0ddb 100644 --- a/www/nvu/PLIST +++ b/www/nvu/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.2 2009/06/14 22:00:29 joerg Exp $ +@comment $NetBSD: PLIST,v 1.3 2011/03/17 13:24:07 obache Exp $ bin/nvu bin/nvu-config include/${PKGNAME}/accessibility/nsAccessNode.h @@ -2077,7 +2077,6 @@ lib/pkgconfig/nvu-nspr.pc lib/pkgconfig/nvu-nss.pc lib/pkgconfig/nvu-plugin.pc lib/pkgconfig/nvu-xpcom.pc -share/aclocal/nspr.m4 share/idl/${PKGNAME}/XPCIDispatch.idl share/idl/${PKGNAME}/diIIconFinder.idl share/idl/${PKGNAME}/domstubs.idl diff --git a/www/nvu/distinfo b/www/nvu/distinfo index 8bd36a1b2d3..08943099edb 100644 --- a/www/nvu/distinfo +++ b/www/nvu/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.2 2007/12/01 21:29:53 rillig Exp $ +$NetBSD: distinfo,v 1.3 2011/03/17 13:24:07 obache Exp $ SHA1 (nvu-1.0-sources.tar.bz2) = 438b1633cb820bbede503ef2da90f46d4e96bee8 RMD160 (nvu-1.0-sources.tar.bz2) = 6d6fdb747d79e8602a4757e8eff8bbb21db6df8c @@ -11,3 +11,4 @@ SHA1 (patch-al) = 57a15074fca3ddba756d0b3898ad9bf06a6e130a SHA1 (patch-an) = 99ac2da44322db96f8d65fbfdb380727b9da96fe SHA1 (patch-ao) = 617d232bd335bc988388f2004ca919c829e371da SHA1 (patch-ap) = 82a85df0b172f949509561f83ae7849e177babee +SHA1 (patch-nsprpub_config_Makefile.in) = daf6423b53385c32e658fa5d93e33a0c5f31ca91 diff --git a/www/nvu/patches/patch-nsprpub_config_Makefile.in b/www/nvu/patches/patch-nsprpub_config_Makefile.in new file mode 100644 index 00000000000..a4b284f5f34 --- /dev/null +++ b/www/nvu/patches/patch-nsprpub_config_Makefile.in @@ -0,0 +1,12 @@ +$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 |