CVS commit: pkgsrc/devel/jam

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

Module Name:    pkgsrc
Committed By:   rillig
Date:           Sun Jan  7 21:24:11 UTC 2018

Modified Files:
        pkgsrc/devel/jam: Makefile PLIST

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


To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 pkgsrc/devel/jam/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/devel/jam/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/jam/Makefile
diff -u pkgsrc/devel/jam/Makefile:1.15 pkgsrc/devel/jam/Makefile:1.16
--- pkgsrc/devel/jam/Makefile:1.15      Thu Jul 27 08:48:13 2017
+++ pkgsrc/devel/jam/Makefile   Sun Jan  7 21:24:11 2018
@@ -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 @@ CONFLICTS=  acunia-jam-[0-9]*
 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"

Index: pkgsrc/devel/jam/PLIST
diff -u pkgsrc/devel/jam/PLIST:1.2 pkgsrc/devel/jam/PLIST:1.3
--- pkgsrc/devel/jam/PLIST:1.2  Sun Jun 14 17:48:49 2009
+++ pkgsrc/devel/jam/PLIST      Sun Jan  7 21:24:11 2018
@@ -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