[pkgsrc/trunk]: pkgsrc Honour PKGMANDIR

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/d70588531ac6
branches:  trunk
changeset: 542520:d70588531ac6
user:      tnn <tnn%pkgsrc.org@localhost>
date:      Tue May 20 18:36:47 2008 +0000

description:
Honour PKGMANDIR

diffstat:

 audio/mpg123/distinfo         |   4 ++--
 audio/mpg123/patches/patch-aa |  19 ++++++++++++++-----
 sysutils/rox/Makefile         |   7 ++++---
 3 files changed, 20 insertions(+), 10 deletions(-)

diffs (88 lines):

diff -r 8535eed4f48b -r d70588531ac6 audio/mpg123/distinfo
--- a/audio/mpg123/distinfo     Tue May 20 18:29:28 2008 +0000
+++ b/audio/mpg123/distinfo     Tue May 20 18:36:47 2008 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.27 2006/05/26 12:16:13 drochner Exp $
+$NetBSD: distinfo,v 1.28 2008/05/20 18:36:47 tnn Exp $
 
 SHA1 (mpg123/mpg123-0.59r.tar.gz) = c32fe242f4506d218bd19a51a4034da9fdc79493
 RMD160 (mpg123/mpg123-0.59r.tar.gz) = 17d47ca04fdcac5e2d71f95ccbd23b61b5ed8b3c
@@ -6,7 +6,7 @@
 SHA1 (mpg123/mpg123-059r-v6-20000713b.diff.gz) = fab11489b6a1ab79d6c29787161f1c05e492dc0b
 RMD160 (mpg123/mpg123-059r-v6-20000713b.diff.gz) = c1942566dcbaf9bd605a1544b5c390e27dc150ca
 Size (mpg123/mpg123-059r-v6-20000713b.diff.gz) = 5600 bytes
-SHA1 (patch-aa) = 89bbd6e349fda3a646813dc6314da72a6dd22ed3
+SHA1 (patch-aa) = bbed4c6c2f68e65c8256ffb307ca4d94aefe1422
 SHA1 (patch-ab) = ffc387d93f0f2832e49796c80be26e908defa3a7
 SHA1 (patch-ac) = 06a5037e27ddd4cc34e5348c09e702f9740173c5
 SHA1 (patch-ad) = e9b2b874a95a67139c7d48e74492eb64dfa815f0
diff -r 8535eed4f48b -r d70588531ac6 audio/mpg123/patches/patch-aa
--- a/audio/mpg123/patches/patch-aa     Tue May 20 18:29:28 2008 +0000
+++ b/audio/mpg123/patches/patch-aa     Tue May 20 18:36:47 2008 +0000
@@ -1,7 +1,16 @@
-$NetBSD: patch-aa,v 1.26 2005/12/11 21:59:29 joerg Exp $
+$NetBSD: patch-aa,v 1.27 2008/05/20 18:36:47 tnn Exp $
 
---- Makefile.orig      2005-12-11 21:33:57.000000000 +0000
+--- Makefile.orig      2008-05-20 20:33:45.000000000 +0200
 +++ Makefile
+@@ -6,7 +6,7 @@
+ 
+ PREFIX=/usr/local
+ BINDIR=$(PREFIX)/bin
+-MANDIR=$(PREFIX)/man
++MANDIR=$(PREFIX)/$(PKGMANDIR)
+ SECTION=1
+ 
+ # Enable the below line If your plathome support IPv6
 @@ -54,6 +54,23 @@ nothing-specified:
        @echo "make aix-tk3play    IBM AIX"
        @echo "make os2            IBM OS/2"
@@ -96,8 +105,7 @@
 +              OBJECTS='decode_i386.o dct64_i386.o decode_i586.o \
 +                      audio_sun.o term.o' \
 +              CFLAGS='$(CFLAGS) -Wall -ansi -pedantic -O4 -fomit-frame-pointer \
-                       -funroll-all-loops -ffast-math -DROT_I386 \
--                      -DI386_ASSEM -DREAL_IS_FLOAT -DUSE_MMAP -DNETBSD' \
++                      -funroll-all-loops -ffast-math -DROT_I386 \
 +                      -DI386_ASSEM -DPENTIUM_OPT -DREAL_IS_FLOAT -DUSE_MMAP \
 +                      -DREAD_MMAP -DNETBSD -DTERM_CONTROL' \
 +              mpg123-make
@@ -230,7 +238,8 @@
 +              OBJECTS='decode_i386.o dct64_i386.o decode_i586.o \
 +                      audio_nas.o term.o' \
 +              CFLAGS='$(CFLAGS) -Wall -ansi -pedantic -O4 -fomit-frame-pointer \
-+                      -funroll-all-loops -ffast-math -DROT_I386 \
+                       -funroll-all-loops -ffast-math -DROT_I386 \
+-                      -DI386_ASSEM -DREAL_IS_FLOAT -DUSE_MMAP -DNETBSD' \
 +                      -DI386_ASSEM -DPENTIUM_OPT -DREAL_IS_FLOAT -DUSE_MMAP \
 +                      -DREAD_MMAP -DNETBSD -DTERM_CONTROL \
 +                      -DNAS' \
diff -r 8535eed4f48b -r d70588531ac6 sysutils/rox/Makefile
--- a/sysutils/rox/Makefile     Tue May 20 18:29:28 2008 +0000
+++ b/sysutils/rox/Makefile     Tue May 20 18:36:47 2008 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.44 2008/03/06 14:53:55 wiz Exp $
+# $NetBSD: Makefile,v 1.45 2008/05/20 18:40:18 tnn Exp $
 #
 
 DISTNAME=      rox-2.4.1
@@ -19,7 +19,8 @@
 USE_TOOLS+=            pkg-config
 GNU_CONFIGURE=         yes
 
-INSTALLATION_DIRS=     libexec/rox share/Choices share/rox/ROX-Filer
+INSTALLATION_DIRS=     libexec/rox share/Choices share/rox/ROX-Filer \
+                         ${PKGMANDIR}/man1
 
 SUBST_CLASSES+=                path
 SUBST_MESSAGE.path=    Fixing hardcoded paths.
@@ -56,7 +57,7 @@
                -s ',^\./ROX-Filer.dbg$$,,' -s ',^\./ROX-Filer.dbg/.*,,'\
                -s ',^\./src$$,,' -s ',^\./src/.*,,'    \
                . ${PREFIX:Q}/share/rox/ROX-Filer
-       ${INSTALL_MAN} ${WRKSRC:Q}/rox.1 ${PREFIX:Q}/man/man1
+       ${INSTALL_MAN} ${WRKSRC:Q}/rox.1 ${PREFIX:Q}/${PKGMANDIR}/man1
        ${INSTALL_DATA} ${WRKSRC:Q}/rox.xml ${PREFIX:Q}/share/mime/packages
        ${INSTALL_SCRIPT} ${WRKDIR:Q}/rox ${PREFIX:Q}/bin