[pkgsrc/trunk]: pkgsrc Move documentation to where it belongs, add license, b...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/5885929f3749
branches:  trunk
changeset: 373666:5885929f3749
user:      rillig <rillig%pkgsrc.org@localhost>
date:      Sun Jan 07 21:37:55 2018 +0000

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

diffstat:

 devel/st/Makefile           |  13 ++++++-------
 devel/st/PLIST              |  11 +++++------
 emulators/minivmac/Makefile |  14 +++++---------
 emulators/minivmac/PLIST    |  20 ++++++++++----------
 4 files changed, 26 insertions(+), 32 deletions(-)

diffs (123 lines):

diff -r 62822444b4f3 -r 5885929f3749 devel/st/Makefile
--- a/devel/st/Makefile Sun Jan 07 21:24:11 2018 +0000
+++ b/devel/st/Makefile Sun Jan 07 21:37:55 2018 +0000
@@ -1,13 +1,15 @@
-# $NetBSD: Makefile,v 1.19 2017/11/30 10:58:14 gson Exp $
+# $NetBSD: Makefile,v 1.20 2018/01/07 21:37:55 rillig Exp $
 #
 
 DISTNAME=      st-1.9
+PKGREVISION=   1
 CATEGORIES=    devel
 MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=state-threads/}
 
 MAINTAINER=    gson%NetBSD.org@localhost
 HOMEPAGE=      http://state-threads.sourceforge.net/
 COMMENT=       Non-preemptive thread library for Internet applications
+LICENSE=       mpl-1.1
 
 MAKE_JOBS_SAFE=                no
 
@@ -15,10 +17,7 @@
 USE_TOOLS+=    gmake
 MAKE_ENV+=     CONFIG_GUESS_PATH=.
 BUILD_TARGET=  default
-
-HTMLDIR=       ${PREFIX}/share/doc/html/st
-
-INSTALLATION_DIRS=     bin include lib
+AUTO_MKDIRS=   yes
 
 post-extract:
        ${CP} ${PKGSRCDIR}/mk/gnu-config/config.guess ${WRKSRC}/
@@ -33,7 +32,7 @@
        ${LIBTOOL} --mode=install ${INSTALL_PROGRAM} \
                ${WRKSRC}/examples/server ${DESTDIR}${PREFIX}/bin/st-server
        ${INSTALL_DATA} ${WRKSRC}/public.h ${DESTDIR}${PREFIX}/include/st.h
-       ${INSTALL_DATA_DIR} ${DESTDIR}${HTMLDIR}
-       cd ${WRKSRC}/docs; ${INSTALL_DATA} *.html *.gif ${DESTDIR}${HTMLDIR}
+       cd ${WRKSRC}/docs && ${INSTALL_DATA} *.html *.gif \
+               ${DESTDIR}${PREFIX}/share/doc/st
 
 .include "../../mk/bsd.pkg.mk"
diff -r 62822444b4f3 -r 5885929f3749 devel/st/PLIST
--- a/devel/st/PLIST    Sun Jan 07 21:24:11 2018 +0000
+++ b/devel/st/PLIST    Sun Jan 07 21:37:55 2018 +0000
@@ -1,11 +1,10 @@
-@comment $NetBSD: PLIST,v 1.5 2009/06/14 18:48:18 joerg Exp $
+@comment $NetBSD: PLIST,v 1.6 2018/01/07 21:37:55 rillig Exp $
 bin/st-lookupdns
 bin/st-proxy
 bin/st-server
 include/st.h
 lib/libst.la
-share/doc/html/st/fig.gif
-share/doc/html/st/notes.html
-share/doc/html/st/reference.html
-share/doc/html/st/st.html
-@pkgdir include/st
+share/doc/st/fig.gif
+share/doc/st/notes.html
+share/doc/st/reference.html
+share/doc/st/st.html
diff -r 62822444b4f3 -r 5885929f3749 emulators/minivmac/Makefile
--- a/emulators/minivmac/Makefile       Sun Jan 07 21:24:11 2018 +0000
+++ b/emulators/minivmac/Makefile       Sun Jan 07 21:37:55 2018 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2012/10/03 12:55:15 asau Exp $
+# $NetBSD: Makefile,v 1.20 2018/01/07 21:46:55 rillig Exp $
 
 DISTNAME=      minivmac-0.1.7.src
 PKGNAME=       minivmac-0.1.7
@@ -10,22 +10,18 @@
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=      http://minivmac.sourceforge.net/
 COMMENT=       Miniature Macintosh emulator
+LICENSE=       gnu-gpl-v2
 
 WRKSRC=                ${WRKDIR}/minivmac
-
-SCRIPTS_ENV+=  CC="${CC}"
-
-DOCDIR=                ${PREFIX}/share/doc/html/minivmac
-
-INSTALLATION_DIRS=     bin
+SCRIPTS_ENV+=  CC=${CC:Q}
+AUTO_MKDIRS=   yes
 
 do-build:
        cd ${WRKSRC}/tool/bash; ${SETENV} ${SCRIPTS_ENV} ${SH} build
 
 do-install:
-       ${INSTALL_DATA_DIR} ${DESTDIR}${DOCDIR}
        ${INSTALL_PROGRAM} ${WRKSRC}/drv/minivmac ${DESTDIR}${PREFIX}/bin
-       ${INSTALL_DATA} ${WRKSRC}/doc/*.html ${DESTDIR}${DOCDIR}
+       ${INSTALL_DATA} ${WRKSRC}/doc/*.html ${DESTDIR}${PREFIX}/share/doc/minivmac
 
 .include "../../x11/libXext/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r 62822444b4f3 -r 5885929f3749 emulators/minivmac/PLIST
--- a/emulators/minivmac/PLIST  Sun Jan 07 21:24:11 2018 +0000
+++ b/emulators/minivmac/PLIST  Sun Jan 07 21:37:55 2018 +0000
@@ -1,11 +1,11 @@
-@comment $NetBSD: PLIST,v 1.4 2018/01/01 22:29:27 rillig Exp $
+@comment $NetBSD: PLIST,v 1.5 2018/01/07 21:46:56 rillig Exp $
 bin/minivmac
-share/doc/html/minivmac/about.html
-share/doc/html/minivmac/autoquit.html
-share/doc/html/minivmac/build.html
-share/doc/html/minivmac/contents.html
-share/doc/html/minivmac/credits.html
-share/doc/html/minivmac/default.html
-share/doc/html/minivmac/license.html
-share/doc/html/minivmac/manual.html
-share/doc/html/minivmac/todo.html
+share/doc/minivmac/about.html
+share/doc/minivmac/autoquit.html
+share/doc/minivmac/build.html
+share/doc/minivmac/contents.html
+share/doc/minivmac/credits.html
+share/doc/minivmac/default.html
+share/doc/minivmac/license.html
+share/doc/minivmac/manual.html
+share/doc/minivmac/todo.html