Content-Transfer-Encoding: 7bit
Content-Type: multipart/mixed; boundary="_----------=_1570909068109810"
MIME-Version: 1.0
Date: Sat, 12 Oct 2019 19:37:48 +0000
From: "Roland Illig" <rillig@netbsd.org>
Subject: CVS commit: pkgsrc/devel/netbeans-ide
To: pkgsrc-changes@NetBSD.org
Reply-To: rillig@netbsd.org
Message-Id: <20191012193748.3594CFBF4@cvs.NetBSD.org>
Sender: pkgsrc-changes-owner@NetBSD.org
Precedence: bulk

This is a multi-part message in MIME format.

--_----------=_1570909068109810
Content-Disposition: inline
Content-Transfer-Encoding: 8bit
Content-Type: text/plain; charset="US-ASCII"

Module Name:	pkgsrc
Committed By:	rillig
Date:		Sat Oct 12 19:37:48 UTC 2019

Modified Files:
	pkgsrc/devel/netbeans-ide: Makefile PLIST

Log Message:
devel/netbeans-ide: adjust location of HTML documentation


To generate a diff of this commit:
cvs rdiff -u -r1.24 -r1.25 pkgsrc/devel/netbeans-ide/Makefile
cvs rdiff -u -r1.6 -r1.7 pkgsrc/devel/netbeans-ide/PLIST

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.


--_----------=_1570909068109810
Content-Disposition: inline
Content-Length: 2632
Content-Transfer-Encoding: binary
Content-Type: text/x-diff; charset=us-ascii

Modified files:

Index: pkgsrc/devel/netbeans-ide/Makefile
diff -u pkgsrc/devel/netbeans-ide/Makefile:1.24 pkgsrc/devel/netbeans-ide/Makefile:1.25
--- pkgsrc/devel/netbeans-ide/Makefile:1.24	Sun Aug 11 13:18:47 2019
+++ pkgsrc/devel/netbeans-ide/Makefile	Sat Oct 12 19:37:47 2019
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.24 2019/08/11 13:18:47 wiz Exp $
+# $NetBSD: Makefile,v 1.25 2019/10/12 19:37:47 rillig Exp $
 #
 
 DISTNAME=	netbeans-8.2-201609300101
 PKGNAME=	netbeans-ide-8.2
-PKGREVISION=	3
-CATEGORIES=	editors
+PKGREVISION=	4
+CATEGORIES=	devel editors
 MASTER_SITES=	http://download.netbeans.org/netbeans/${PKGVERSION_NOREV}/final/zip/
 EXTRACT_SUFX=	.zip
 
@@ -12,11 +12,11 @@ MAINTAINER=	drue@users.sourceforge.net
 HOMEPAGE=	http://www.netbeans.org/
 COMMENT=	NetBeans Java IDE
 
-USE_TOOLS+=	pax
-USE_JAVA=	run
-PKG_JVMS_ACCEPTED=  sun-jdk7 openjdk7 oracle-jdk8 openjdk8
-NO_BUILD=	yes
-WRKSRC=		${WRKDIR}/netbeans
+USE_TOOLS+=		pax
+USE_JAVA=		run
+PKG_JVMS_ACCEPTED=	sun-jdk7 openjdk7 oracle-jdk8 openjdk8
+NO_BUILD=		yes
+WRKSRC=			${WRKDIR}/netbeans
 
 USE_TOOLS+=	perl:run
 REPLACE_PERL=	extide/ant/bin/antRun.pl \
@@ -25,19 +25,15 @@ REPLACE_PERL=	extide/ant/bin/antRun.pl \
 REPLACE_PYTHON=	extide/ant/bin/runant.py
 
 SHAREDIR=	${PREFIX}/share/${PKGBASE}
-DOCDIR=		${PREFIX}/share/doc/html/${PKGBASE}
 
 CHECK_SHLIBS_SUPPORTED=	no
 CHECK_SSP_SUPPORTED=	no
-INSTALLATION_DIRS=	bin
+AUTO_MKDIRS=		yes
 
 do-install:
-	${INSTALL_DATA_DIR} ${DESTDIR}${DOCDIR}
-	${INSTALL_DATA_DIR} ${DESTDIR}${SHAREDIR}
-	for f in CREDITS.html README.html netbeans.css; \
-	do \
-		${INSTALL_DATA} ${WRKSRC}/$${f} ${DESTDIR}${DOCDIR}; \
-	done
+	cd ${WRKSRC} && ${INSTALL_DATA} \
+		CREDITS.html README.html netbeans.css \
+		${DESTDIR}${PREFIX}/share/doc/${PKGBASE}
 	cd ${WRKSRC} && pax -rwpm * ${DESTDIR}${SHAREDIR}
 	${LN} -sf ${SHAREDIR}/bin/netbeans ${DESTDIR}${PREFIX}/bin/netbeans
 

Index: pkgsrc/devel/netbeans-ide/PLIST
diff -u pkgsrc/devel/netbeans-ide/PLIST:1.6 pkgsrc/devel/netbeans-ide/PLIST:1.7
--- pkgsrc/devel/netbeans-ide/PLIST:1.6	Fri Sep 15 15:39:26 2017
+++ pkgsrc/devel/netbeans-ide/PLIST	Sat Oct 12 19:37:47 2019
@@ -1,8 +1,8 @@
-@comment $NetBSD: PLIST,v 1.6 2017/09/15 15:39:26 asau Exp $
+@comment $NetBSD: PLIST,v 1.7 2019/10/12 19:37:47 rillig Exp $
 bin/netbeans
-share/doc/html/netbeans-ide/CREDITS.html
-share/doc/html/netbeans-ide/README.html
-share/doc/html/netbeans-ide/netbeans.css
+share/doc/netbeans-ide/CREDITS.html
+share/doc/netbeans-ide/README.html
+share/doc/netbeans-ide/netbeans.css
 share/netbeans-ide/CREDITS.html
 share/netbeans-ide/LICENSE.txt
 share/netbeans-ide/README.html


--_----------=_1570909068109810--