pkgsrc-Changes-HG archive

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

[pkgsrc/trunk]: pkgsrc/x11/bbapm * This package uses C++, so add 'c++' to USE...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/74cc8af2e0b1
branches:  trunk
changeset: 514927:74cc8af2e0b1
user:      jlam <jlam%pkgsrc.org@localhost>
date:      Tue Jun 20 22:11:52 2006 +0000

description:
* This package uses C++, so add 'c++' to USE_LANGUAGES.
* Honor PKGMANDIR.
* Use LDFLAGS.Linux instead of an explicit test for ${OPSYS} == "Linux".

This fixes the bulk build problem reported in:

        http://mail-index.netbsd.org/pkgsrc-bulk/2006/06/20/0000.html

diffstat:

 x11/bbapm/Makefile |  13 ++++++-------
 1 files changed, 6 insertions(+), 7 deletions(-)

diffs (44 lines):

diff -r e1f1265650ff -r 74cc8af2e0b1 x11/bbapm/Makefile
--- a/x11/bbapm/Makefile        Tue Jun 20 22:10:45 2006 +0000
+++ b/x11/bbapm/Makefile        Tue Jun 20 22:11:52 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2006/02/05 23:11:31 joerg Exp $
+# $NetBSD: Makefile,v 1.11 2006/06/20 22:11:52 jlam Exp $
 # based on
 #    FreeBSD port:
 #    ID: ports/x11-wm/bbapm/Makefile,v 1.5 2002/09/02 01:30:15 lioux Exp
@@ -15,6 +15,7 @@
 COMMENT=       APM monitor for Blackbox
 
 GNU_CONFIGURE= yes
+USE_LANGUAGES= c c++
 
 # For now:
 # We use i386/apmvar.h; other architectures will require modification
@@ -22,7 +23,9 @@
 # patch-ak
 ONLY_FOR_PLATFORM=     NetBSD-*-i386 Linux-*-*
 
-INSTALLATION_DIRS=     bin man/man1
+LDFLAGS.Linux+=                -lapm
+
+INSTALLATION_DIRS=     bin ${PKGMANDIR}/man1
 
 .include "../../mk/x11.buildlink3.mk"
 
@@ -32,14 +35,10 @@
 
 do-install:
        ${INSTALL_PROGRAM} ${WRKSRC}/bbapm ${PREFIX}/bin
-       ${INSTALL_MAN} ${WRKSRC}/data/bbapm.1 ${PREFIX}/man/man1/
+       ${INSTALL_MAN} ${WRKSRC}/data/bbapm.1 ${PREFIX}/${PKGMANDIR}/man1
        ${INSTALL_DATA_DIR} ${PREFIX}/share/bbtools
 .for a in README.bbapm bbapm.conf bbapm.nobb bbapm.style
        ${INSTALL_DATA} ${WRKSRC}/data/${a} ${PREFIX}/share/bbtools
 .endfor
 
 .include "../../mk/bsd.pkg.mk"
-
-.if ${OPSYS} == "Linux"
-LDFLAGS+=      -lapm
-.endif



Home | Main Index | Thread Index | Old Index