[pkgsrc/trunk]: pkgsrc/devel Move documentation to where it belongs, bump PKG...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/62822444b4f3
branches:  trunk
changeset: 373665:62822444b4f3
user:      rillig <rillig%pkgsrc.org@localhost>
date:      Sun Jan 07 21:24:11 2018 +0000

description:
Move documentation to where it belongs, bump PKGREVISION.

diffstat:

 devel/jam/Makefile   |  31 +++++++++----------------------
 devel/jam/PLIST      |   8 ++++----
 devel/pilrc/Makefile |  14 ++++++--------
 devel/pilrc/PLIST    |  16 ++++++++--------
 4 files changed, 27 insertions(+), 42 deletions(-)

diffs (127 lines):

diff -r 1afa7aa543f2 -r 62822444b4f3 devel/jam/Makefile
--- a/devel/jam/Makefile        Sun Jan 07 21:23:39 2018 +0000
+++ b/devel/jam/Makefile        Sun Jan 07 21:24:11 2018 +0000
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.15 2017/07/27 08:48:13 wiz Exp $
+# $NetBSD: Makefile,v 1.16 2018/01/07 21:24:11 rillig Exp $
 #
 
+DISTNAME=      ft${PKGNAME_NOREV}
 PKGNAME=       jam-2.5.2
-DISTNAME=      ft${PKGNAME}
+PKGREVISION=   1
 CATEGORIES=    devel
 MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=freetype/}
 #MASTER_SITES= ftp://ftp.perforce.com/pub/jam/
@@ -18,27 +19,13 @@
 GNU_CONFIGURE= yes
 
 USE_TOOLS+=    yacc gmake
-MAKEFLAGS+=    LINKFLAGS=${LDFLAGS:Q}
-
-DOCDIR=                share/doc/${PKGBASE}
-HTMLDIR=       share/doc/html/${PKGBASE}
-
-INSTALLATION_DIRS=     bin ${DOCDIR} ${HTMLDIR}
+MAKEFLAGS+=    LINKFLAGS=${LDFLAGS:M*:Q}
+AUTO_MKDIRS=   yes
 
 do-install:
-       for f in jam mkjambase; do \
-               ${INSTALL_PROGRAM} ${WRKSRC}/bin.*/$${f} \
-                       ${DESTDIR}${PREFIX}/bin; \
-       done
-
-       for f in Porting README RELNOTES; do \
-               ${INSTALL_DATA} ${WRKSRC}/$${f} \
-                       ${DESTDIR}${PREFIX}/${DOCDIR}; \
-       done
-
-       for f in *.html; do \
-               ${INSTALL_DATA} ${WRKSRC}/$${f} \
-                       ${DESTDIR}${PREFIX}/${HTMLDIR}; \
-       done
+       cd ${WRKSRC}/bin.* \
+       && ${INSTALL_PROGRAM} jam mkjambase ${DESTDIR}${PREFIX}/bin
+       cd ${WRKSRC} && ${INSTALL_DATA} Porting README RELNOTES *.html \
+               ${DESTDIR}${PREFIX}/share/doc/${PKGBASE}
 
 .include "../../mk/bsd.pkg.mk"
diff -r 1afa7aa543f2 -r 62822444b4f3 devel/jam/PLIST
--- a/devel/jam/PLIST   Sun Jan 07 21:23:39 2018 +0000
+++ b/devel/jam/PLIST   Sun Jan 07 21:24:11 2018 +0000
@@ -1,9 +1,9 @@
-@comment $NetBSD: PLIST,v 1.2 2009/06/14 17:48:49 joerg Exp $
+@comment $NetBSD: PLIST,v 1.3 2018/01/07 21:24:11 rillig Exp $
 bin/jam
 bin/mkjambase
-share/doc/html/jam/Jam.html
-share/doc/html/jam/Jambase.html
-share/doc/html/jam/Jamfile.html
+share/doc/jam/Jam.html
+share/doc/jam/Jambase.html
+share/doc/jam/Jamfile.html
 share/doc/jam/Porting
 share/doc/jam/README
 share/doc/jam/RELNOTES
diff -r 1afa7aa543f2 -r 62822444b4f3 devel/pilrc/Makefile
--- a/devel/pilrc/Makefile      Sun Jan 07 21:23:39 2018 +0000
+++ b/devel/pilrc/Makefile      Sun Jan 07 21:24:11 2018 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.34 2012/10/31 11:19:25 asau Exp $
+# $NetBSD: Makefile,v 1.35 2018/01/07 21:31:10 rillig Exp $
 #
 
 DISTNAME=      pilrc-3.2
@@ -14,8 +14,6 @@
 GNU_CONFIGURE= YES
 CONFIGURE_SCRIPT=unix/configure
 
-DOCDIR=                ${PREFIX}/share/doc/html/pilrc
-
 .include "../../mk/bsd.prefs.mk"
 
 PKG_OPTIONS_VAR=               PKG_OPTIONS.pilrc
@@ -34,12 +32,12 @@
 CONFIGURE_ARGS+=       --enable-pilrcui
 .endif
 
-INSTALLATION_DIRS=     ${DOCDIR}/images
+AUTO_MKDIRS=           yes
 
 post-install:
-       cd ${WRKSRC}/doc &&                                             \
-               ${INSTALL_DATA} archive.html download.html index.html   \
-               contrib.html history.html manual.html ${DESTDIR}${DOCDIR}
-       ${INSTALL_DATA} ${WRKSRC}/doc/images/download.gif ${DESTDIR}${DOCDIR}/images
+       cd ${WRKSRC}/doc && ${INSTALL_DATA} *.html \
+               ${DESTDIR}${PREFIX}/share/doc/pilrc
+       cd ${WRKSRC}/doc/images && ${INSTALL_DATA} download.gif \
+               ${DESTDIR}${PREFIX}/share/doc/pilrc/images
 
 .include "../../mk/bsd.pkg.mk"
diff -r 1afa7aa543f2 -r 62822444b4f3 devel/pilrc/PLIST
--- a/devel/pilrc/PLIST Sun Jan 07 21:23:39 2018 +0000
+++ b/devel/pilrc/PLIST Sun Jan 07 21:24:11 2018 +0000
@@ -1,13 +1,13 @@
-@comment $NetBSD: PLIST,v 1.4 2009/06/14 17:49:03 joerg Exp $
+@comment $NetBSD: PLIST,v 1.5 2018/01/07 21:31:10 rillig Exp $
 bin/pilrc
 ${PLIST.pilrcui}bin/pilrcui
-share/doc/html/pilrc/archive.html
-share/doc/html/pilrc/contrib.html
-share/doc/html/pilrc/download.html
-share/doc/html/pilrc/history.html
-share/doc/html/pilrc/images/download.gif
-share/doc/html/pilrc/index.html
-share/doc/html/pilrc/manual.html
+share/doc/pilrc/archive.html
+share/doc/pilrc/contrib.html
+share/doc/pilrc/download.html
+share/doc/pilrc/history.html
+share/doc/pilrc/images/download.gif
+share/doc/pilrc/index.html
+share/doc/pilrc/manual.html
 share/pilrc/palette-02.pbm
 share/pilrc/palette-04.pgm
 share/pilrc/palette-16.pgm