From affac40b0f90566b15eb2b98f824517944e46480 Mon Sep 17 00:00:00 2001
From: jmmv <jmmv@pkgsrc.org>
Date: Wed, 17 Mar 2004 19:27:42 +0000
Subject: Fix path to python in scripts installed by bittorrent-gui by moving
 the inclusion of python/application.mk to the end of Makefile's and fixing
 paths to files.  Bump PKGREVISION of this package to 1.

---
 net/bittorrent-gui/Makefile    | 7 ++++---
 net/bittorrent/Makefile        | 3 ++-
 net/bittorrent/Makefile.common | 4 +---
 3 files changed, 7 insertions(+), 7 deletions(-)

(limited to 'net')

diff --git a/net/bittorrent-gui/Makefile b/net/bittorrent-gui/Makefile
index 8735fec31be..04f79c73aac 100644
--- a/net/bittorrent-gui/Makefile
+++ b/net/bittorrent-gui/Makefile
@@ -1,22 +1,23 @@
-# $NetBSD: Makefile,v 1.2 2004/03/07 21:34:06 recht Exp $
+# $NetBSD: Makefile,v 1.3 2004/03/17 19:27:42 jmmv Exp $
 #
 
 .include "../../net/bittorrent/Makefile.common"
 
 PKGNAME=	${DISTNAME:S/BitTorrent/bittorrent-gui/}
+PKGREVISION=	1
 
 COMMENT+=	(wxGTK GUI)
 
 DEPENDS+=	bittorrent>=3.4:../../net/bittorrent
 
-NO_CONFIGURE=	# defined
 NO_BUILD=	# defined
 
-PYTHON_PATCH_SCRIPTS= bin/btcompletedirgui.py bin/btdownloadgui.py
+PYTHON_PATCH_SCRIPTS= btcompletedirgui.py btdownloadgui.py
 
 do-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/btcompletedirgui.py ${PREFIX}/bin
 	${INSTALL_SCRIPT} ${WRKSRC}/btdownloadgui.py ${PREFIX}/bin
 
+.include "../../lang/python/application.mk"
 .include "../../x11/py-wxWindows/buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/bittorrent/Makefile b/net/bittorrent/Makefile
index e2d85e2e7a2..aab5527c1ea 100644
--- a/net/bittorrent/Makefile
+++ b/net/bittorrent/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2004/03/12 23:43:05 recht Exp $
+# $NetBSD: Makefile,v 1.19 2004/03/17 19:27:42 jmmv Exp $
 #
 
 .include "Makefile.common"
@@ -11,6 +11,7 @@ post-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/bittorrent
 	${INSTALL_DATA} ${WRKSRC}/README.txt ${PREFIX}/share/doc/bittorrent
 
+.include "../../lang/python/application.mk"
 .include "../../lang/python/extension.mk"
 .include "../../devel/py-cursespanel/buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/bittorrent/Makefile.common b/net/bittorrent/Makefile.common
index 01616f1451b..e44e22705ff 100644
--- a/net/bittorrent/Makefile.common
+++ b/net/bittorrent/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.3 2004/03/12 23:43:05 recht Exp $
+# $NetBSD: Makefile.common,v 1.4 2004/03/17 19:27:42 jmmv Exp $
 #
 
 DISTNAME=	BitTorrent-3.4.1
@@ -18,5 +18,3 @@ PATCHDIR=	${.CURDIR}/../../net/bittorrent/patches
 USE_BUILDLINK2=	YES
 
 PYTHON_VERSIONS_ACCEPTED=	23pth 22pth
-
-.include "../../lang/python/application.mk"
-- 
cgit v1.2.3