pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/sysutils/mgm Fixed pkglint warnings. The documentation...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/f5f5f62d235f
branches:  trunk
changeset: 511334:f5f5f62d235f
user:      rillig <rillig%pkgsrc.org@localhost>
date:      Thu Apr 13 00:20:22 2006 +0000

description:
Fixed pkglint warnings. The documentation is installed in share/doc/mgm
instead of share/doc/html. Bumped PKGREVISION.

diffstat:

 sysutils/mgm/Makefile |   30 ++++------
 sysutils/mgm/PLIST    |  136 +++++++++++++++++++++++++-------------------------
 2 files changed, 80 insertions(+), 86 deletions(-)

diffs (214 lines):

diff -r 8afc33e1ffe3 -r f5f5f62d235f sysutils/mgm/Makefile
--- a/sysutils/mgm/Makefile     Thu Apr 13 00:15:24 2006 +0000
+++ b/sysutils/mgm/Makefile     Thu Apr 13 00:20:22 2006 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.12 2006/03/04 21:30:42 jlam Exp $
+# $NetBSD: Makefile,v 1.13 2006/04/13 00:20:22 rillig Exp $
 
 DISTNAME=      mgm-1.1
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    sysutils
 MASTER_SITES=  http://www.xiph.org/mgm/
 EXTRACT_SUFX=  .tgz
@@ -12,40 +12,34 @@
 
 DEPENDS+=      p5-Tk-[0-9]*:../../x11/p5-Tk
 
-WRKSRC=                ${WRKDIR}/${DISTNAME:C/-.*$//}
+WRKSRC=                ${WRKDIR}/mgm
 NO_BUILD=      yes
 USE_TOOLS+=    perl:run
-PERL_SCRIPTS=  mgm
 
-MGM_PERL_DIR=  ${PREFIX}/lib/${DISTNAME:C/-.*$//}
-MGM_DOC_DIR=   ${PREFIX}/share/doc/html/${DISTNAME:C/-.*$//}
+MGM_PERL_DIR=  ${PREFIX}/lib/mgm
+MGM_DOC_DIR=   ${PREFIX}/share/doc/mgm
 
 INSTALLATION_DIRS=     bin
 
+REPLACE_PERL+= mgm lib/xpm
+
 post-patch:
        ${SED} -e 's|@@MGM_PERL_DIR@@|${MGM_PERL_DIR}|' \
                ${FILESDIR}/mgm.sh > ${WRKDIR}/mgm.sh
-       cd ${WRKSRC}; \
-       for FILE in ${PERL_SCRIPTS}; do \
-               ${CP} $$FILE $${FILE}.orig; \
-               ${SED} -e 's#/usr/bin/perl#${PERL5}#g' \
-                       <$${FILE}.orig >$$FILE; \
-       done
 
 do-install:
        ${INSTALL_DATA_DIR} ${MGM_PERL_DIR} ${MGM_PERL_DIR}/modules
        ${INSTALL_SCRIPT} ${WRKSRC}/mgm ${MGM_PERL_DIR}
+       set -e; \
        cd ${WRKSRC}; \
        for DIR in lib modules/*; do \
-               ${INSTALL_DATA_DIR} ${MGM_PERL_DIR}/$$DIR; \
-               for FILE in $$DIR/*; do \
-                       ${INSTALL_DATA} $$FILE ${MGM_PERL_DIR}/$$DIR; \
+               ${INSTALL_DATA_DIR} ${MGM_PERL_DIR}/"$$DIR"; \
+               for FILE in "$$DIR"/*; do \
+                       ${INSTALL_DATA} "$$FILE" ${MGM_PERL_DIR}/"$$DIR"; \
                done; \
        done
        ${INSTALL_DATA_DIR} ${MGM_DOC_DIR}
-       for FILE in ${WRKSRC}/doc/*; do \
-               ${INSTALL_DATA} $$FILE ${MGM_DOC_DIR}; \
-       done
+       cd ${WRKSRC}/doc && ${INSTALL_DATA} * ${MGM_DOC_DIR}
        ${INSTALL_SCRIPT} ${WRKDIR}/mgm.sh ${PREFIX}/bin/mgm
 
 .include "../../mk/bsd.pkg.mk"
diff -r 8afc33e1ffe3 -r f5f5f62d235f sysutils/mgm/PLIST
--- a/sysutils/mgm/PLIST        Thu Apr 13 00:15:24 2006 +0000
+++ b/sysutils/mgm/PLIST        Thu Apr 13 00:20:22 2006 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1 2001/10/31 22:53:31 zuntum Exp $
+@comment $NetBSD: PLIST,v 1.2 2006/04/13 00:20:22 rillig Exp $
 bin/mgm
 lib/mgm/lib/fishframe.xpm
 lib/mgm/lib/helvetica.xpm
@@ -43,73 +43,73 @@
 lib/mgm/modules/solaris/hostlogo
 lib/mgm/modules/solaris/phoon
 lib/mgm/modules/solaris/spacer
-share/doc/html/mgm/battery.gif
-share/doc/html/mgm/docs.html
-share/doc/html/mgm/down.html
-share/doc/html/mgm/faq.html
-share/doc/html/mgm/index.html
-share/doc/html/mgm/m-battery.html
-share/doc/html/mgm/m-biff.html
-share/doc/html/mgm/m-clock.html
-share/doc/html/mgm/m-context.html
-share/doc/html/mgm/m-cpustat.html
-share/doc/html/mgm/m-diskstat.html
-share/doc/html/mgm/m-diskuse.html
-share/doc/html/mgm/m-forks.html
-share/doc/html/mgm/m-hostlogo.html
-share/doc/html/mgm/m-loadav.html
-share/doc/html/mgm/m-memuse.html
-share/doc/html/mgm/m-netstat.html
-share/doc/html/mgm/m-pagestat.html
-share/doc/html/mgm/m-phoon.html
-share/doc/html/mgm/m-spacer.html
-share/doc/html/mgm/m-swapstat.html
-share/doc/html/mgm/mail.html
-share/doc/html/mgm/mgm-small.gif
-share/doc/html/mgm/mgm.gif
-share/doc/html/mgm/ps.gif
-share/doc/html/mgm/r-active.html
-share/doc/html/mgm/r-background.html
-share/doc/html/mgm/r-bars.html
-share/doc/html/mgm/r-blank.html
-share/doc/html/mgm/r-borderwidth.html
-share/doc/html/mgm/r-dimbackground.html
-share/doc/html/mgm/r-dimforeground.html
-share/doc/html/mgm/r-dimrelief.html
-share/doc/html/mgm/r-font.html
-share/doc/html/mgm/r-foreground.html
-share/doc/html/mgm/r-geometry.html
-share/doc/html/mgm/r-label.html
-share/doc/html/mgm/r-labelsize.html
-share/doc/html/mgm/r-lendemand.html
-share/doc/html/mgm/r-litbackground.html
-share/doc/html/mgm/r-litforeground.html
-share/doc/html/mgm/r-litrelief.html
-share/doc/html/mgm/r-minx.html
-share/doc/html/mgm/r-miny.html
-share/doc/html/mgm/r-order.html
-share/doc/html/mgm/r-ratio.html
-share/doc/html/mgm/r-reconfig.html
-share/doc/html/mgm/r-relief.html
-share/doc/html/mgm/r-scale.html
-share/doc/html/mgm/r-scalecolor.html
-share/doc/html/mgm/r-scalejustify.html
-share/doc/html/mgm/r-scalelenadj.html
-share/doc/html/mgm/r-scalerefresh.html
-share/doc/html/mgm/r-scalereturn.html
-share/doc/html/mgm/r-scalescroll.html
-share/doc/html/mgm/r-scalethresh.html
-share/doc/html/mgm/r-scalewidadj.html
-share/doc/html/mgm/r-stack.html
-share/doc/html/mgm/r-textpad.html
-share/doc/html/mgm/r-widdemand.html
-share/doc/html/mgm/r-widgetpad.html
-share/doc/html/mgm/screenshot1.gif
-share/doc/html/mgm/screenshot2.gif
-share/doc/html/mgm/trouble.html
-share/doc/html/mgm/villa.gif
-share/doc/html/mgm/white-xifish.gif
-@dirrm share/doc/html/mgm
+share/doc/mgm/battery.gif
+share/doc/mgm/docs.html
+share/doc/mgm/down.html
+share/doc/mgm/faq.html
+share/doc/mgm/index.html
+share/doc/mgm/m-battery.html
+share/doc/mgm/m-biff.html
+share/doc/mgm/m-clock.html
+share/doc/mgm/m-context.html
+share/doc/mgm/m-cpustat.html
+share/doc/mgm/m-diskstat.html
+share/doc/mgm/m-diskuse.html
+share/doc/mgm/m-forks.html
+share/doc/mgm/m-hostlogo.html
+share/doc/mgm/m-loadav.html
+share/doc/mgm/m-memuse.html
+share/doc/mgm/m-netstat.html
+share/doc/mgm/m-pagestat.html
+share/doc/mgm/m-phoon.html
+share/doc/mgm/m-spacer.html
+share/doc/mgm/m-swapstat.html
+share/doc/mgm/mail.html
+share/doc/mgm/mgm-small.gif
+share/doc/mgm/mgm.gif
+share/doc/mgm/ps.gif
+share/doc/mgm/r-active.html
+share/doc/mgm/r-background.html
+share/doc/mgm/r-bars.html
+share/doc/mgm/r-blank.html
+share/doc/mgm/r-borderwidth.html
+share/doc/mgm/r-dimbackground.html
+share/doc/mgm/r-dimforeground.html
+share/doc/mgm/r-dimrelief.html
+share/doc/mgm/r-font.html
+share/doc/mgm/r-foreground.html
+share/doc/mgm/r-geometry.html
+share/doc/mgm/r-label.html
+share/doc/mgm/r-labelsize.html
+share/doc/mgm/r-lendemand.html
+share/doc/mgm/r-litbackground.html
+share/doc/mgm/r-litforeground.html
+share/doc/mgm/r-litrelief.html
+share/doc/mgm/r-minx.html
+share/doc/mgm/r-miny.html
+share/doc/mgm/r-order.html
+share/doc/mgm/r-ratio.html
+share/doc/mgm/r-reconfig.html
+share/doc/mgm/r-relief.html
+share/doc/mgm/r-scale.html
+share/doc/mgm/r-scalecolor.html
+share/doc/mgm/r-scalejustify.html
+share/doc/mgm/r-scalelenadj.html
+share/doc/mgm/r-scalerefresh.html
+share/doc/mgm/r-scalereturn.html
+share/doc/mgm/r-scalescroll.html
+share/doc/mgm/r-scalethresh.html
+share/doc/mgm/r-scalewidadj.html
+share/doc/mgm/r-stack.html
+share/doc/mgm/r-textpad.html
+share/doc/mgm/r-widdemand.html
+share/doc/mgm/r-widgetpad.html
+share/doc/mgm/screenshot1.gif
+share/doc/mgm/screenshot2.gif
+share/doc/mgm/trouble.html
+share/doc/mgm/villa.gif
+share/doc/mgm/white-xifish.gif
+@dirrm share/doc/mgm
 @dirrm lib/mgm/modules/solaris
 @dirrm lib/mgm/modules/share
 @dirrm lib/mgm/modules/netbsd



Home | Main Index | Thread Index | Old Index