Adapted MASTER_SITES to changed project directory at sourceforge.

Added support for installation to DESTDIR.

3 files changed, 29 insertions, 12 deletions

diff --git a/devel/py-expect/Makefile b/devel/py-expect/Makefile
index 5cd87a81eeb..105500481eb 100644
--- a/devel/py-expect/Makefile
+++ b/devel/py-expect/Makefile
@@ -1,16 +1,18 @@
-# $NetBSD: Makefile,v 1.15 2007/03/21 19:44:10 jwise Exp $
+# $NetBSD: Makefile,v 1.16 2007/12/11 22:41:54 heinz Exp $
 #
 
 DISTNAME=	ExpectPy-1.9b1
 PKGNAME=	${PYPKGPREFIX}-expect-1.9b1
 PKGREVISION=	3
 CATEGORIES=	devel python
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=pub/sourceforge/expectpy/}
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=expectpy/}
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://sourceforge.net/projects/expectpy/
 COMMENT=	Expect module for Python
 
+PKG_DESTDIR_SUPPORT=	user-destdir
+
 USE_LIBTOOL=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS+=	--with-python=${BUILDLINK_PREFIX.${PYPACKAGE}} \
@@ -25,10 +27,13 @@ PLIST_SUBST+=	PYLIB=${PYLIB:Q} PYPKGPREFIX=${PYPKGPREFIX:Q}
 EXAMPLESDIR=	${PREFIX}/share/examples/${PYPKGPREFIX}-expect
 EXAMPLESFILES=	ask.py glob.py ping.py telnet.py xping.py
 
+INSTALLATION_DIRS=	lib/python${PYVERSSUFFIX}/lib-dynload
+
 post-install:
-		${INSTALL_DATA_DIR} ${EXAMPLESDIR}
+		${INSTALL_DATA_DIR} ${DESTDIR:Q}${EXAMPLESDIR}
 .for f in ${EXAMPLESFILES}
-		${INSTALL_DATA} ${WRKSRC}/examples/${f} ${EXAMPLESDIR}
+		${INSTALL_DATA} ${WRKSRC}/examples/${f} \
+			${DESTDIR:Q}${EXAMPLESDIR}
 .endfor
 
 .include "../../mk/bsd.prefs.mk"
diff --git a/devel/py-expect/distinfo b/devel/py-expect/distinfo
index 3208f7fd7a6..43f5445c0cc 100644
--- a/devel/py-expect/distinfo
+++ b/devel/py-expect/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.7 2007/10/10 18:09:31 rillig Exp $
+$NetBSD: distinfo,v 1.8 2007/12/11 22:41:54 heinz Exp $
 
 SHA1 (ExpectPy-1.9b1.tar.gz) = f43fcd53901f327dc8acf0650dbfe45b274a8d7d
 RMD160 (ExpectPy-1.9b1.tar.gz) = d0e586a987db1c6eb22008519483081f7278be20
@@ -6,7 +6,7 @@ Size (ExpectPy-1.9b1.tar.gz) = 149580 bytes
 SHA1 (patch-aa) = eff544e7290736bebb81b8391848369d630f7b03
 SHA1 (patch-ab) = d95ef8bc2f6c0178de0b05e649d6e2d6aed37335
 SHA1 (patch-ac) = 0ff7162129a84fbc913a8b1240209387b922c2a8
-SHA1 (patch-ad) = 267c2e93f89f786b415c7fa2645913c40541bc38
+SHA1 (patch-ad) = 135080d8709e489c6896cea9a1f5c5d31bf61e98
 SHA1 (patch-ae) = 0f5190724d3b17e7b7f06f6408e1c9e7a3e66868
 SHA1 (patch-af) = 130de0f91370a49db5c9236445d2cb258303b190
 SHA1 (patch-ag) = 7e43133aeebee5c63716aefba8fd4e0d4b1ff6ce
diff --git a/devel/py-expect/patches/patch-ad b/devel/py-expect/patches/patch-ad
index c50193f4e62..397c4e34233 100644
--- a/devel/py-expect/patches/patch-ad
+++ b/devel/py-expect/patches/patch-ad
@@ -1,7 +1,7 @@
-$NetBSD: patch-ad,v 1.1.1.1 2001/03/21 23:36:07 jwise Exp $
---- Makefile.in.orig	Fri Oct 20 05:06:30 2000
-+++ Makefile.in	Wed Mar 21 15:10:52 2001
-@@ -29,8 +29,8 @@
+$NetBSD: patch-ad,v 1.2 2007/12/11 22:41:55 heinz Exp $
+--- Makefile.in.orig	2000-10-20 14:06:30.000000000 +0200
++++ Makefile.in
+@@ -29,8 +29,8 @@ PYTHLIB   = @PYTH_LIBDIR@/config
  PYTHCNFG  = @PYTH_CONFIG@
  PYCNF   = @PYCNF@
  
@@ -12,7 +12,7 @@ $NetBSD: patch-ad,v 1.1.1.1 2001/03/21 23:36:07 jwise Exp $
  RANLIB  = @RANLIB@
  INSTALL = @INSTALL@
  INSTALL_PROGRAM = @INSTALL_PROGRAM@
-@@ -39,13 +39,13 @@
+@@ -39,13 +39,13 @@ LN_S    = @LN_S@
  LDEXE   = @LDEXE@
  
  SO       = @SO@
@@ -29,7 +29,7 @@ $NetBSD: patch-ad,v 1.1.1.1 2001/03/21 23:36:07 jwise Exp $
  LIBS     = $(EXPLIB) @LIBS@
  INSTLIBDIR = @PYTH_SHLIBDIR@
  
-@@ -109,8 +109,8 @@
+@@ -109,8 +109,8 @@ python: $(MODNAME)module.a pyconfig.o $(
  	$(LDEXE) $(LDFLAGS) -o $@ $(PYTH_OBJS) pyconfig.o \
  	  $(MODNAME)module.a $(EXPSUBLIB).a $(LIBS)
  
@@ -40,3 +40,15 @@ $NetBSD: patch-ad,v 1.1.1.1 2001/03/21 23:36:07 jwise Exp $
  $(MODNAME)module.a: $(OBJS)
  	$(AR) $(ARFLAGS) $@ $(OBJS)
  	$(RANLIB) $@
+@@ -141,9 +141,9 @@ explib/libexplib.a explib/libexplib.as e
+ install:
+ 	@echo Use either installbin or installshared
+ installbin: python
+-	$(INSTALL_PROGRAM) python $(exec_prefix)/bin/python.exppy
++	$(INSTALL_PROGRAM) python $(DESTDIR)$(exec_prefix)/bin/python.exppy
+ installshared:  $(MODNAME)module$(SO)
+-	$(INSTALL_PROGRAM) $(MODNAME)module$(SO) $(INSTLIBDIR)
++	$(INSTALL_PROGRAM) $(MODNAME)module$(SO) $(DESTDIR)$(INSTLIBDIR)
+ uninstall:
+ 
+ clean::