CVS commit: pkgsrc/devel/st

["Roland Illig" <rillig%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   rillig
Date:           Sun Jan  7 21:37:55 UTC 2018

Modified Files:
        pkgsrc/devel/st: Makefile PLIST

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


To generate a diff of this commit:
cvs rdiff -u -r1.19 -r1.20 pkgsrc/devel/st/Makefile
cvs rdiff -u -r1.5 -r1.6 pkgsrc/devel/st/PLIST

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

Modified files:

Index: pkgsrc/devel/st/Makefile
diff -u pkgsrc/devel/st/Makefile:1.19 pkgsrc/devel/st/Makefile:1.20
--- pkgsrc/devel/st/Makefile:1.19       Thu Nov 30 10:58:14 2017
+++ pkgsrc/devel/st/Makefile    Sun Jan  7 21:37:55 2018
@@ -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_LIBTOOL= yes
 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 @@ do-install:
        ${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"

Index: pkgsrc/devel/st/PLIST
diff -u pkgsrc/devel/st/PLIST:1.5 pkgsrc/devel/st/PLIST:1.6
--- pkgsrc/devel/st/PLIST:1.5   Sun Jun 14 18:48:18 2009
+++ pkgsrc/devel/st/PLIST       Sun Jan  7 21:37:55 2018
@@ -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