summaryrefslogtreecommitdiff
path: root/comms
diff options
context:
space:
mode:
authorabs <abs@pkgsrc.org>2009-12-17 21:49:22 +0000
committerabs <abs@pkgsrc.org>2009-12-17 21:49:22 +0000
commit221f48ab145e03240112316297c4467f530266a5 (patch)
tree775f3bdba524e946259f4273b41208fdf0fb8e78 /comms
parented0a5b1e11cde21a87845671b2427c7cc90fbb38 (diff)
downloadpkgsrc-221f48ab145e03240112316297c4467f530266a5.tar.gz
Updated comms/xisp to 2.7p4
Updated from 2.7p1 to 2.7p4 as original distfile no longer available No changelog available added PKG_DESTDIR_SUPPORT
Diffstat (limited to 'comms')
-rw-r--r--comms/xisp/Makefile18
-rw-r--r--comms/xisp/distinfo14
-rw-r--r--comms/xisp/patches/patch-aa14
-rw-r--r--comms/xisp/patches/patch-ab4
-rw-r--r--comms/xisp/patches/patch-ac6
5 files changed, 29 insertions, 27 deletions
diff --git a/comms/xisp/Makefile b/comms/xisp/Makefile
index ea5cb59f76f..429ee03d743 100644
--- a/comms/xisp/Makefile
+++ b/comms/xisp/Makefile
@@ -1,17 +1,17 @@
-# $NetBSD: Makefile,v 1.29 2009/08/26 19:57:18 sno Exp $
+# $NetBSD: Makefile,v 1.30 2009/12/17 21:49:22 abs Exp $
#
-DISTNAME= xisp-2.7p1
-PKGREVISION= 4
+DISTNAME= xisp-2.7p4
CATEGORIES= comms x11
-MASTER_SITES= ${MASTER_SITE_SUNSITE:=system/network/serial/} \
- http://xisp.hellug.gr/release/ \
+MASTER_SITES= http://xisp.hellug.gr/release/ \
+ ${MASTER_SITE_SUNSITE:=system/network/serial/} \
ftp://argeas.cs-net.gr/pub/unix/linux/
MAINTAINER= pkgsrc-users@NetBSD.org
HOMEPAGE= http://xisp.hellug.gr/
COMMENT= User-friendly X11 interface to pppd/chat
+BUILD_DEFS+= VARBASE
PKG_GROUPS= ${DIALER_GROUP}
PKG_GROUPS_VARS+= DIALER_GROUP
MAKE_ENV+= DIALER_GROUP="${DIALER_GROUP}"
@@ -19,10 +19,12 @@ MAKE_ENV+= VARBASE=${VARBASE:Q}
MESSAGE_SUBST+= DIALER_GROUP=${DIALER_GROUP}
# XXX TODO: maybe do MODEM_DEV also?
+INSTALLATION_DIRS+= share/doc/xisp
+PKG_DESTDIR_SUPPORT= destdir
+
post-install:
- ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/xisp
- ${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/xisp/
- ${INSTALL_DATA} ${WRKSRC}/SECURITY ${PREFIX}/share/doc/xisp/
+ ${INSTALL_DATA} ${WRKSRC}/README ${DESTDIR}${PREFIX}/share/doc/xisp/
+ ${INSTALL_DATA} ${WRKSRC}/SECURITY ${DESTDIR}${PREFIX}/share/doc/xisp/
.include "../../x11/libXpm/buildlink3.mk"
.include "../../x11/xforms/buildlink3.mk"
diff --git a/comms/xisp/distinfo b/comms/xisp/distinfo
index 74c383444e4..aa516f2cdf0 100644
--- a/comms/xisp/distinfo
+++ b/comms/xisp/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.9 2006/10/06 22:14:44 reed Exp $
+$NetBSD: distinfo,v 1.10 2009/12/17 21:49:22 abs Exp $
-SHA1 (xisp-2.7p1.tar.gz) = 158db1ad0f9820da33b5f51fa5110b0a9374ba2f
-RMD160 (xisp-2.7p1.tar.gz) = 47a4c6ebe0c7e5a1971f2934f7371370e7cbdfe2
-Size (xisp-2.7p1.tar.gz) = 294492 bytes
-SHA1 (patch-aa) = 827a1e0bdd66d75e20d7526a0b5d68942fec207f
-SHA1 (patch-ab) = 19f3a0ef7fd776108d7796917019ffcc28576c8f
-SHA1 (patch-ac) = 14f251acd447c2502322c55c912fb66561e91555
+SHA1 (xisp-2.7p4.tar.gz) = d6b7cba0cbde2d8c42405108d69aa21c96e73659
+RMD160 (xisp-2.7p4.tar.gz) = 617ad86157dc0bef19239359eb20d6f65ee8a00b
+Size (xisp-2.7p4.tar.gz) = 300156 bytes
+SHA1 (patch-aa) = 2d9b9a8c52ce1a146061cbcf8d9042c0732ef8f6
+SHA1 (patch-ab) = aebdef9938050ad251a4160f1d1d51b83c75c2c0
+SHA1 (patch-ac) = d066fcfe23bdfb80b852096a6bd1039dba1c6914
diff --git a/comms/xisp/patches/patch-aa b/comms/xisp/patches/patch-aa
index 9c908c8e0c8..72b5f3dcb95 100644
--- a/comms/xisp/patches/patch-aa
+++ b/comms/xisp/patches/patch-aa
@@ -1,6 +1,6 @@
-$NetBSD: patch-aa,v 1.10 2006/10/06 22:14:44 reed Exp $
+$NetBSD: patch-aa,v 1.11 2009/12/17 21:49:22 abs Exp $
---- Makefile.orig 2003-06-28 14:03:03.000000000 +0000
+--- Makefile.orig 2005-11-07 00:38:22.000000000 +0000
+++ Makefile
@@ -12,12 +12,12 @@
# Compilation/installation vars (global for all following sections) |
@@ -22,7 +22,7 @@ $NetBSD: patch-aa,v 1.10 2006/10/06 22:14:44 reed Exp $
MODEM_DEV = modem
MODEM_PATH = /dev/$(MODEM_DEV)
@@ -29,26 +29,26 @@ MODEM_PATH = /dev/$(MODEM_DEV)
- # Normal (i.e. SuSE-[678].x) vars; for SuSE-5.x use the lines which
+ # Normal (i.e. SuSE-[6789].x) vars; for SuSE-5.x use the lines which
# DO NOT include -lcrypt for EXTRALIBS and -DGLIBC2 for EXTRADEFS.
#-------------------------------------------------------------------
-BINX11 = $(X11PREFIX)/bin
@@ -66,7 +66,7 @@ $NetBSD: patch-aa,v 1.10 2006/10/06 22:14:44 reed Exp $
#
# Debian vars (if your Debian distribution is relatively
# old and does not use glibc2, use the lines which DO NOT
-@@ -187,25 +187,29 @@ INSTALL = install
+@@ -186,25 +186,29 @@ INSTALL = install
#
# NetBSD vars
#-------------
@@ -103,7 +103,7 @@ $NetBSD: patch-aa,v 1.10 2006/10/06 22:14:44 reed Exp $
+GROUP = $(DIALER_GROUP)
+CCFLAGS = -Wall -O
+EXTRADEFS = -DMODEM_DEVICE=\"$(MODEM_PATH)\" -DHAVE_STRERROR
-+.if ${OPSYS} == "DragonFly"
++.if defined(OPSYS) && ${OPSYS} == "DragonFly"
+EXTRALIBS = -lcipher
+.else
+EXTRALIBS = -lcrypt
@@ -114,7 +114,7 @@ $NetBSD: patch-aa,v 1.10 2006/10/06 22:14:44 reed Exp $
#
# FreeBSD vars
#-------------
-@@ -325,19 +329,19 @@ network.o: network.h network.c
+@@ -324,19 +328,19 @@ network.o: network.h network.c
$(CC) $(CCOPTS) -c network.c
xispdial: xispdial.o $(SHAREOBJ)
@@ -137,7 +137,7 @@ $NetBSD: patch-aa,v 1.10 2006/10/06 22:14:44 reed Exp $
$(EXTRALIBS) -L$(LIBX11) $(LINKFORMS) -lXpm -lX11 -lm
rcio.o: rcio.h rcio.c common.h version.h
-@@ -350,7 +354,7 @@ xisp_euidaccess.o: xisp_euidaccess.c
+@@ -349,7 +353,7 @@ xisp_euidaccess.o: xisp_euidaccess.c
$(CC) $(CCOPTS) -c xisp_euidaccess.c
xispid: xispid.c
diff --git a/comms/xisp/patches/patch-ab b/comms/xisp/patches/patch-ab
index 84161272e80..341ec8d4dc6 100644
--- a/comms/xisp/patches/patch-ab
+++ b/comms/xisp/patches/patch-ab
@@ -1,6 +1,6 @@
-$NetBSD: patch-ab,v 1.3 2006/02/22 16:13:48 joerg Exp $
+$NetBSD: patch-ab,v 1.4 2009/12/17 21:49:22 abs Exp $
---- network.c.orig 2006-02-22 16:05:33.000000000 +0000
+--- network.c.orig 2005-11-07 00:38:22.000000000 +0000
+++ network.c
@@ -89,7 +89,7 @@ char *IFAddr(char *IFName, int dest)
#define AddrOpen popen("/usr/ucb/netstat -nr", "r")
diff --git a/comms/xisp/patches/patch-ac b/comms/xisp/patches/patch-ac
index 83fcd8fa051..8375627a64e 100644
--- a/comms/xisp/patches/patch-ac
+++ b/comms/xisp/patches/patch-ac
@@ -1,7 +1,7 @@
-$NetBSD: patch-ac,v 1.4 2006/10/06 22:14:44 reed Exp $
+$NetBSD: patch-ac,v 1.5 2009/12/17 21:49:22 abs Exp $
---- xispid.c.orig 2003-06-28 09:03:03.000000000 -0500
-+++ xispid.c 2006-10-05 17:22:58.000000000 -0500
+--- xispid.c.orig 2005-11-07 00:38:22.000000000 +0000
++++ xispid.c
@@ -42,7 +42,7 @@
#include <limits.h>
#endif