[pkgsrc/trunk]: pkgsrc/devel/netbeans-ide devel/netbeans-ide: adjust location...

[rillig <rillig%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/ba9d2822aa0c
branches:  trunk
changeset: 342038:ba9d2822aa0c
user:      rillig <rillig%pkgsrc.org@localhost>
date:      Sat Oct 12 19:37:47 2019 +0000

description:
devel/netbeans-ide: adjust location of HTML documentation

diffstat:

 devel/netbeans-ide/Makefile |  28 ++++++++++++----------------
 devel/netbeans-ide/PLIST    |   8 ++++----
 2 files changed, 16 insertions(+), 20 deletions(-)

diffs (74 lines):

diff -r 6098e003b5ec -r ba9d2822aa0c devel/netbeans-ide/Makefile
--- a/devel/netbeans-ide/Makefile       Sat Oct 12 19:28:21 2019 +0000
+++ b/devel/netbeans-ide/Makefile       Sat Oct 12 19:37:47 2019 +0000
@@ -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 @@
 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_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
 
diff -r 6098e003b5ec -r ba9d2822aa0c devel/netbeans-ide/PLIST
--- a/devel/netbeans-ide/PLIST  Sat Oct 12 19:28:21 2019 +0000
+++ b/devel/netbeans-ide/PLIST  Sat Oct 12 19:37:47 2019 +0000
@@ -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