diff options
| author | jschauma <jschauma@pkgsrc.org> | 2002-09-08 00:03:56 +0000 |
|---|---|---|
| committer | jschauma <jschauma@pkgsrc.org> | 2002-09-08 00:03:56 +0000 |
| commit | aab069285fe8ae8da69296211de60673b51375fa (patch) | |
| tree | d0473176ca739dc800a536dc33721239a2ec37ab /x11 | |
| parent | 3e8a5c37f3847f483c65e666365b4656bb8783c0 (diff) | |
| download | pkgsrc-aab069285fe8ae8da69296211de60673b51375fa.tar.gz | |
For this to work nicely on Linux, we need to:
- add -lapm to LDFLAGS (which was removed during patching)
- ifdef our own net_apm.cc (created during patching)
- change ONLY_FOR_PLATFORMS from ... Linux-*-i[3-6]86 to
... Linux-*-* (all Linuxen should have include/apm.h)
Diffstat (limited to 'x11')
| -rw-r--r-- | x11/bbapm/Makefile | 8 | ||||
| -rw-r--r-- | x11/bbapm/distinfo | 4 | ||||
| -rw-r--r-- | x11/bbapm/patches/patch-aj | 6 |
3 files changed, 12 insertions, 6 deletions
diff --git a/x11/bbapm/Makefile b/x11/bbapm/Makefile index f5ecad78b7a..454d78b15cc 100644 --- a/x11/bbapm/Makefile +++ b/x11/bbapm/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2002/09/07 20:46:35 jschauma Exp $ +# $NetBSD: Makefile,v 1.3 2002/09/08 00:03:56 jschauma Exp $ # based on # FreeBSD port: # ID: ports/x11-wm/bbapm/Makefile,v 1.5 2002/09/02 01:30:15 lioux Exp @@ -20,7 +20,7 @@ LDFLAGS+= -Wl,-R${X11BASE}/lib # We use i386/apmvar.h; other architectures will require modification # of the patches, probably something like ${MACHINE_ARCH}/apmvar.h in # patch-ak -ONLY_FOR_PLATFORM= NetBSD-*-i386 Linux-*-i[3-6]86 +ONLY_FOR_PLATFORM= NetBSD-*-i386 Linux-*-* post-patch: ${SED} -e 's,@PREFIX@,${PREFIX},' ${WRKSRC}/data/bbapm.1.tmp > \ @@ -35,3 +35,7 @@ do-install: .endfor .include "../../mk/bsd.pkg.mk" + +.if ${OPSYS} == "Linux" +LDFLAGS+= -lapm +.endif diff --git a/x11/bbapm/distinfo b/x11/bbapm/distinfo index 5122c468322..8e48ac3cf20 100644 --- a/x11/bbapm/distinfo +++ b/x11/bbapm/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.1.1.1 2002/09/07 20:22:52 jschauma Exp $ +$NetBSD: distinfo,v 1.2 2002/09/08 00:03:57 jschauma Exp $ MD5 (bbapm-0.0.1.tar.gz) = 4d2629959bd907696c7765b7c34bc54f MD5 (bbapm-0.0.1-freebsd-patch-2.diff) = 8b9242c0fa6067d9d7c10dcbdc0cb8c7 @@ -11,7 +11,7 @@ SHA1 (patch-af) = b17cb4c3a6b12f1e387783bd62b9ef582d9eb2c3 SHA1 (patch-ag) = e3655cf7fae22b4c5279af2d4cad954f76e17912 SHA1 (patch-ah) = 4f0d79388e262d3063a1313024d3eb1e885880d4 SHA1 (patch-ai) = 9cfdfbef21513ac8135b01068f2cc9eb18b99df2 -SHA1 (patch-aj) = c7d41606be458658460119e47f53ee68c91126e7 +SHA1 (patch-aj) = ff37280070536b31d54ad9b4da018c8f03eda33e SHA1 (patch-ak) = 7087de90b4464bd7f5983b02bd55f4396a2fa692 SHA1 (patch-al) = 1f6c7f6833f4a79d63f8f53273d670fbc6acfbe6 SHA1 (patch-am) = 71db1ba7e9caa9c0fd1481a06ee4ba27029bb84b diff --git a/x11/bbapm/patches/patch-aj b/x11/bbapm/patches/patch-aj index 995a539c6ba..500a1cd4927 100644 --- a/x11/bbapm/patches/patch-aj +++ b/x11/bbapm/patches/patch-aj @@ -1,8 +1,9 @@ -$NetBSD: patch-aj,v 1.1.1.1 2002/09/07 20:22:53 jschauma Exp $ +$NetBSD: patch-aj,v 1.2 2002/09/08 00:03:57 jschauma Exp $ --- /dev/null Sat Sep 7 13:47:40 2002 +++ net_apm.cc Sat Sep 7 14:08:07 2002 -@@ -0,0 +1,21 @@ +@@ -0,0 +1,23 @@ ++#ifdef __NetBSD__ +#include "net_apm.h" + +int apm_desc = -1; @@ -24,3 +25,4 @@ $NetBSD: patch-aj,v 1.1.1.1 2002/09/07 20:22:53 jschauma Exp $ + else + return 0; +} ++#endif |