pkgsrc-Changes-HG archive

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

[pkgsrc/trunk]: pkgsrc/sysutils/cdrtools Quiet pkglint, sync with cdrtools-os...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/c9f044531720
branches:  trunk
changeset: 507550:c9f044531720
user:      wiz <wiz%pkgsrc.org@localhost>
date:      Sat Feb 04 11:59:35 2006 +0000

description:
Quiet pkglint, sync with cdrtools-ossdvd.

diffstat:

 sysutils/cdrtools/Makefile |  28 ++++++++++++++++------------
 1 files changed, 16 insertions(+), 12 deletions(-)

diffs (78 lines):

diff -r 5e05140b4461 -r c9f044531720 sysutils/cdrtools/Makefile
--- a/sysutils/cdrtools/Makefile        Sat Feb 04 11:56:51 2006 +0000
+++ b/sysutils/cdrtools/Makefile        Sat Feb 04 11:59:35 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2006/01/25 16:03:00 joerg Exp $
+# $NetBSD: Makefile,v 1.3 2006/02/04 11:59:35 wiz Exp $
 
 DISTNAME=      cdrtools-2.01
 PKGREVISION=   1
@@ -18,6 +18,10 @@
 
 USE_TOOLS+=    gmake tbl
 
+.if ${LOCALBASE} != "/opt/schily"
+BUILDLINK_TRANSFORM+=  rmdir:/opt/schily
+.endif
+
 # avoid picking up a bad ${ARCH} during the build
 MAKE_ENV+=      ARCH=""
 MAKE_ENV+=      MAKEPROG="gmake"
@@ -37,8 +41,8 @@
 
 .if ${CDRECORD_CONF} != "/etc/default/cdrecord"
 MESSAGE_SRC+=  MESSAGE.cdrecord.conf
-MESSAGE_SUBST+=        PKGNAME_NOREV=${PKGNAME_NOREV}
-MESSAGE_SUBST+=        CDRECORD_CONF=${CDRECORD_CONF}
+MESSAGE_SUBST+=        PKGNAME_NOREV=${PKGNAME_NOREV:Q}
+MESSAGE_SUBST+=        CDRECORD_CONF=${CDRECORD_CONF:Q}
 .endif
 
 INSTALLATION_DIRS=     bin man/man1 man/man8
@@ -48,7 +52,7 @@
 SUBST_FILES.fix=       cdrecord/defaults.c cdrecord/cdrecord.1 \
                        readcd/readcd.1
 SUBST_SED.fix=         -e "s,@CDRECORD_CONF@,${CDRECORD_CONF},g"
-SUBST_MESSAGE.fix=     "Fixing paths."
+SUBST_MESSAGE.fix=     Fixing paths.
 
 post-extract:
        ${CP} ${WRKSRC}/RULES/os-freebsd.id ${WRKSRC}/RULES/os-dragonfly.id
@@ -63,29 +67,29 @@
 
 post-build:
        cd ${WRKSRC};                                                   \
-       for file in cdda2wav/cdda2wav.1 mkisofs/mkisofs.8; do           \
-               ${TBL} $${file} > $${file}.tmp;                         \
-               ${MV} -f $${file}.tmp $${file};                         \
+       for manpage in cdda2wav/cdda2wav.1 mkisofs/mkisofs.8; do        \
+               ${TBL} $${manpage} > $${manpage}.tmp;                   \
+               ${MV} -f $${manpage}.tmp $${manpage};                   \
        done
 
 do-install:
        cd ${WRKSRC}/cdda2wav;                                          \
                ${INSTALL_PROGRAM} OBJ/*/cdda2wav ${PREFIX}/bin;        \
-               ${INSTALL_MAN} cdda2wav.1 ${PREFIX}/man/man1
+               ${INSTALL_MAN} cdda2wav.1 ${PREFIX}/${PKGMANDIR}/man1
        cd ${WRKSRC}/cdrecord;                                          \
                ${INSTALL_PROGRAM} OBJ/*/cdrecord ${PREFIX}/bin;        \
-               ${INSTALL_MAN} cdrecord.1 ${PREFIX}/man/man1
+               ${INSTALL_MAN} cdrecord.1 ${PREFIX}/${PKGMANDIR}/man1
        cd ${WRKSRC}/mkisofs;                                           \
                ${INSTALL_PROGRAM} OBJ/*/mkisofs ${PREFIX}/bin;         \
-               ${INSTALL_MAN} mkisofs.8 ${PREFIX}/man/man8
+               ${INSTALL_MAN} mkisofs.8 ${PREFIX}/${PKGMANDIR}/man8
        cd ${WRKSRC}/mkisofs/diag;                                      \
                for f in devdump isodump isoinfo isovfy; do             \
                        ${INSTALL_PROGRAM} OBJ/*/$$f ${PREFIX}/bin;     \
-                       ${INSTALL_MAN} isoinfo.8 ${PREFIX}/man/man8/$$f.8; \
+                       ${INSTALL_MAN} isoinfo.8 ${PREFIX}/${PKGMANDIR}/man8/$$f.8; \
                done
        cd ${WRKSRC}/readcd;                                            \
                ${INSTALL_PROGRAM} OBJ/*/readcd ${PREFIX}/bin;          \
-               ${INSTALL_MAN} readcd.1 ${PREFIX}/man/man1
+               ${INSTALL_MAN} readcd.1 ${PREFIX}/${PKGMANDIR}/man1
 
 .include "../../mk/ossaudio.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"



Home | Main Index | Thread Index | Old Index