pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/net/mouse-pppoe nested function -> macro
details: https://anonhg.NetBSD.org/pkgsrc/rev/96c991b879d2
branches: trunk
changeset: 547772:96c991b879d2
user: joerg <joerg%pkgsrc.org@localhost>
date: Thu Oct 02 17:01:16 2008 +0000
description:
nested function -> macro
DESTDIR support
diffstat:
net/mouse-pppoe/Makefile | 11 ++++++-----
net/mouse-pppoe/distinfo | 4 ++--
net/mouse-pppoe/patches/patch-aa | 33 +++++++++++++++++++++++++++++++--
3 files changed, 39 insertions(+), 9 deletions(-)
diffs (92 lines):
diff -r 96ec44ccbbbd -r 96c991b879d2 net/mouse-pppoe/Makefile
--- a/net/mouse-pppoe/Makefile Thu Oct 02 16:34:18 2008 +0000
+++ b/net/mouse-pppoe/Makefile Thu Oct 02 17:01:16 2008 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2005/11/07 21:39:28 tv Exp $
+# $NetBSD: Makefile,v 1.15 2008/10/02 17:01:16 joerg Exp $
DISTNAME= pppoe.20000912
PKGNAME= mouse-${DISTNAME:S/./-/}
@@ -6,20 +6,21 @@
CATEGORIES= net
MASTER_SITES= ftp://ftp.NetBSD.org/pub/NetBSD/misc/mouse/pppoe/
+PKG_DESTDIR_SUPPORT= user-destdir
+
MAINTAINER= mouse%NetBSD.org@localhost
COMMENT= derMouse's PPP over Ethernet program
NOT_FOR_PLATFORM= Interix-*-* # no userland protocol stack support
WRKSRC= ${WRKDIR}
-INSTALLATION_DIRS= sbin
+INSTALLATION_DIRS= sbin share/doc/mouse_pppoe
do-build:
(cd ${WRKSRC} ; ${CC} ${CFLAGS} -o pppoe pppoe.c)
do-install:
- ${INSTALL_PROGRAM} ${WRKSRC}/pppoe ${PREFIX}/sbin/mouse-pppoe
- ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/mouse_pppoe
- ${INSTALL_DATA} ${WRKSRC}/pppoe.readme ${PREFIX}/share/doc/mouse_pppoe
+ ${INSTALL_PROGRAM} ${WRKSRC}/pppoe ${DESTDIR}${PREFIX}/sbin/mouse-pppoe
+ ${INSTALL_DATA} ${WRKSRC}/pppoe.readme ${DESTDIR}${PREFIX}/share/doc/mouse_pppoe
.include "../../mk/bsd.pkg.mk"
diff -r 96ec44ccbbbd -r 96c991b879d2 net/mouse-pppoe/distinfo
--- a/net/mouse-pppoe/distinfo Thu Oct 02 16:34:18 2008 +0000
+++ b/net/mouse-pppoe/distinfo Thu Oct 02 17:01:16 2008 +0000
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.4 2006/01/25 17:45:32 joerg Exp $
+$NetBSD: distinfo,v 1.5 2008/10/02 17:01:16 joerg Exp $
SHA1 (pppoe.20000912.tar.gz) = e077e02e42cad1266316cdfa87c31bde191e530e
RMD160 (pppoe.20000912.tar.gz) = c0034484f2dbc54a3e1ea9648dfb37f6f25f0a2e
Size (pppoe.20000912.tar.gz) = 9621 bytes
-SHA1 (patch-aa) = 7478d6d155cdec4c9b6d11ccdde467a9fddff0c4
+SHA1 (patch-aa) = 89d7ca556a0572d8ee3034607021e2edb058b4d2
diff -r 96ec44ccbbbd -r 96c991b879d2 net/mouse-pppoe/patches/patch-aa
--- a/net/mouse-pppoe/patches/patch-aa Thu Oct 02 16:34:18 2008 +0000
+++ b/net/mouse-pppoe/patches/patch-aa Thu Oct 02 17:01:16 2008 +0000
@@ -1,6 +1,6 @@
-$NetBSD: patch-aa,v 1.3 2006/01/25 17:45:32 joerg Exp $
+$NetBSD: patch-aa,v 1.4 2008/10/02 17:01:16 joerg Exp $
---- pppoe.c.orig 2000-04-21 03:58:32.000000000 +0000
+--- pppoe.c.orig 2000-04-21 05:58:32.000000000 +0200
+++ pppoe.c
@@ -5,6 +5,7 @@
#include <stdarg.h>
@@ -32,3 +32,32 @@
*ap++ = "nopcomp";
*ap++ = "nopersist";
*ap++ = "nopredictor1";
+@@ -701,17 +706,17 @@ static void send_frame_to_pppd(const voi
+ const unsigned char *dp;
+ unsigned short int fcs;
+
+- static void addchar(unsigned char ch)
+- { switch (ch)
+- { case PPP_FLAG: case PPP_ESC: case 0x00 ... 0x1f: case 0x7f ... 0x9f:
+- *sp++ = PPP_ESC;
+- *sp++ = ch ^ PPP_MOD;
+- break;
+- default:
+- *sp++ = ch;
+- break;
+- }
+- fcs = PPP_FCSCHAR(fcs,ch);
++#define addchar(ch) \
++ { switch (ch) \
++ { case PPP_FLAG: case PPP_ESC: case 0x00 ... 0x1f: case 0x7f ... 0x9f: \
++ *sp++ = PPP_ESC; \
++ *sp++ = ch ^ PPP_MOD; \
++ break; \
++ default: \
++ *sp++ = ch; \
++ break; \
++ } \
++ fcs = PPP_FCSCHAR(fcs,ch); \
+ }
+
+ sp = &stuffup[0];
Home |
Main Index |
Thread Index |
Old Index