pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

irssi: use GITHUB_RELEASE in order to avoid a lot of USE_TOOLS.



Module Name:	pkgsrc-wip
Committed By:	Leonardo Taccari <leot%NetBSD.org@localhost>
Pushed By:	leot
Date:		Thu Mar 3 18:35:08 2016 +0100
Changeset:	1a4619192ae6e06b6de68cdde0cae59486543143

Modified Files:
	irssi/Makefile
	irssi/Makefile.common
	irssi/distinfo
Removed Files:
	irssi/patches/patch-irssi-version.sh

Log Message:
irssi: use GITHUB_RELEASE in order to avoid a lot of USE_TOOLS.

Currently there are several distfiles in GitHub and so this make a bit of
confusion. The one in https://github.com/irssi/irssi/archive/* (previously used)
did not contain a (generated) configure. Use the one available in
https://github.com/irssi/irssi/releases/* to avoid that.

ok coypu

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=1a4619192ae6e06b6de68cdde0cae59486543143

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 irssi/Makefile                       | 13 +------------
 irssi/Makefile.common                |  7 ++-----
 irssi/distinfo                       | 11 +++++------
 irssi/patches/patch-irssi-version.sh | 14 --------------
 4 files changed, 8 insertions(+), 37 deletions(-)

diffs:
diff --git a/irssi/Makefile b/irssi/Makefile
index 1f677dd..7ad409c 100644
--- a/irssi/Makefile
+++ b/irssi/Makefile
@@ -1,7 +1,6 @@
 # $NetBSD: Makefile,v 1.68 2015/06/12 10:48:27 wiz Exp $
 
 DISTNAME=		${IRSSI_DISTNAME}
-PKGREVISION=		1
 CATEGORIES=		chat
 EXTRACT_SUFX=		${IRSSI_EXTRACT_SUFX}
 
@@ -15,7 +14,7 @@ LICENSE=		gnu-gpl-v2
 
 GNU_CONFIGURE=		yes
 USE_LIBTOOL=		yes
-USE_TOOLS+=		perl gettext autoconf automake autoreconf pkg-config
+USE_TOOLS+=		pkg-config
 
 CONFIGURE_ARGS+=	--with-terminfo \
 			--with-proxy \
@@ -27,21 +26,11 @@ CONF_FILES=	${EGDIR}/irssi.conf ${PKG_SYSCONFDIR}/irssi.conf
 
 INSTALL_MAKE_FLAGS+=	sysconfdir=${EGDIR}
 
-# specify date of version, we can't use git to figure it out
-# (irssi-version.sh)
-MAKE_ENV+=	DATE="20160208 10:18:00"
-
-pre-configure:
-	cd ${WRKSRC} && ./autogen.sh
-
 .include "options.mk"
 .include "../../devel/glib2/buildlink3.mk"
 
 post-install:
 	${INSTALL_DATA} ${WRKSRC}/irssi-config ${DESTDIR}${IRSSI_CONFIG}
 
-# tries to run lynx in autogen.sh (or links, elinks)
-BUILD_DEPENDS+=		lynx-[0-9]*:../../www/lynx
-
 .include "../../mk/termcap.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/irssi/Makefile.common b/irssi/Makefile.common
index e2916eb..4fbfad0 100644
--- a/irssi/Makefile.common
+++ b/irssi/Makefile.common
@@ -9,11 +9,8 @@ IRSSI_DISTNAME=			irssi-${IRSSI_VERSION}
 IRSSI_EXTRACT_SUFX=		.tar.gz
 IRSSI_DISTFILE=			${IRSSI_DISTNAME}${IRSSI_EXTRACT_SUFX}
 MASTER_SITES=			${MASTER_SITE_GITHUB:=irssi/}
-SITES.${IRSSI_DISTFILE}=	${MASTER_SITE_GITHUB:=irssi/}
-GITHUB_PROJECT=			irssi
-GITHUB_TAG=			${IRSSI_VERSION}
-
-
+SITES.${IRSSI_DISTFILE}=	${MASTER_SITES}
+GITHUB_RELEASE=			${IRSSI_VERSION}
 
 # These files are generated during Irssi's build, but are required by
 # plugins to compile properly.
diff --git a/irssi/distinfo b/irssi/distinfo
index 8ff7bdd..37b2640 100644
--- a/irssi/distinfo
+++ b/irssi/distinfo
@@ -1,9 +1,8 @@
-$NetBSD: distinfo,v 1.34 2015/11/03 01:20:20 agc Exp $
+$NetBSD$
 
-SHA1 (irssi-0.8.18.tar.gz) = 69fce5d5dbbb2f8c16637f404e2fced7d93cfb41
-RMD160 (irssi-0.8.18.tar.gz) = 1a4a6ea974234726a726ff2b928a83a56d144abb
-SHA512 (irssi-0.8.18.tar.gz) = 005fb4b0f8a2cc0ecdc8da4d79686e9540f755eba9279e98abf6fb6329bc77ae2b38c5097235f3b4fba9344be0c57a172bf29c6a697fd365ae90177f9ef09f41
-Size (irssi-0.8.18.tar.gz) = 662224 bytes
+SHA1 (irssi-0.8.18.tar.gz) = 7e3c7688dbe30c8657299abf49d50ebfe8625aee
+RMD160 (irssi-0.8.18.tar.gz) = 200a3112783e19ce5de4b371966711da81cb3cbd
+SHA512 (irssi-0.8.18.tar.gz) = cb5a0686eb374594c22485a57c64c2e3bdbb6d92d510add9fdcc123d189f1e4592a9f37a92dfe8ac56a2e58000f2db0f60f0ea5aa70a3c0ffff1aa04d151fd91
+Size (irssi-0.8.18.tar.gz) = 1563130 bytes
 SHA1 (patch-aa) = 83a0f6def09cb283aa55b63a249a81121748232b
 SHA1 (patch-ad) = 8cb41612afcd6088b869235166da9a6eb37e6ec7
-SHA1 (patch-irssi-version.sh) = 45a764e868a0314f85b8b300a10f34b5255a31dc
diff --git a/irssi/patches/patch-irssi-version.sh b/irssi/patches/patch-irssi-version.sh
deleted file mode 100644
index 7d4d778..0000000
--- a/irssi/patches/patch-irssi-version.sh
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD$
-
-dont try to run git, specifying date with MAKE_ENV instead.
-
---- irssi-version.sh.orig	2016-02-08 20:18:04.000000000 +0000
-+++ irssi-version.sh
-@@ -1,6 +1,6 @@
- #!/bin/sh
- 
--DATE=`GIT_DIR=$1/.git git log -1 --pretty=format:%ai HEAD`
-+#DATE=`GIT_DIR=$1/.git git log -1 --pretty=format:%ai HEAD`
- 
- VERSION_DATE=`echo $DATE | cut -f 1 -d ' ' | tr -d -`
- VERSION_TIME=`echo $DATE | cut -f 2 -d ' ' | awk -F: '{printf "%d", $1$2}'`


Home | Main Index | Thread Index | Old Index