Received: from mail.netbsd.org (mail.netbsd.org [199.233.217.200]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mail.netbsd.org", Issuer "Postmaster NetBSD.org" (verified OK)) by mollari.NetBSD.org (Postfix) with ESMTPS id 0EB717A3D7 for ; Sat, 18 Jun 2016 11:09:38 +0000 (UTC) Received: by mail.netbsd.org (Postfix, from userid 605) id 76C7485E62; Sat, 18 Jun 2016 11:09:37 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 086D685DFE for ; Sat, 18 Jun 2016 11:09:37 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([127.0.0.1]) by localhost (mail.netbsd.org [127.0.0.1]) (amavisd-new, port 10025) with ESMTP id rJYxfzXuDGfW for ; Sat, 18 Jun 2016 11:09:36 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.netbsd.org [199.233.217.197]) by mail.netbsd.org (Postfix) with ESMTP id 42BA984CFB for ; Sat, 18 Jun 2016 11:09:36 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 3DD27FBB5; Sat, 18 Jun 2016 11:09:36 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1466248176129620" MIME-Version: 1.0 Date: Sat, 18 Jun 2016 11:09:36 +0000 From: "Ryo ONODERA" Subject: CVS commit: pkgsrc/sysutils/consolekit To: pkgsrc-changes@NetBSD.org Reply-To: ryoon@netbsd.org X-Mailer: log_accum Message-Id: <20160618110936.3DD27FBB5@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: pkgsrc-changes.NetBSD.org Precedence: bulk This is a multi-part message in MIME format. --_----------=_1466248176129620 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: ryoon Date: Sat Jun 18 11:09:36 UTC 2016 Modified Files: pkgsrc/sysutils/consolekit: Makefile distinfo pkgsrc/sysutils/consolekit/patches: patch-data_Makefile.am Added Files: pkgsrc/sysutils/consolekit/patches: patch-data_Makefile.in Log Message: Use release tarball (and do not use too general distname) and use INSTALL_SCRIPT to install script To generate a diff of this commit: cvs rdiff -u -r1.31 -r1.32 pkgsrc/sysutils/consolekit/Makefile cvs rdiff -u -r1.13 -r1.14 pkgsrc/sysutils/consolekit/distinfo cvs rdiff -u -r1.1 -r1.2 \ pkgsrc/sysutils/consolekit/patches/patch-data_Makefile.am cvs rdiff -u -r0 -r1.1 \ pkgsrc/sysutils/consolekit/patches/patch-data_Makefile.in Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1466248176129620 Content-Disposition: inline Content-Length: 4769 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/sysutils/consolekit/Makefile diff -u pkgsrc/sysutils/consolekit/Makefile:1.31 pkgsrc/sysutils/consolekit/Makefile:1.32 --- pkgsrc/sysutils/consolekit/Makefile:1.31 Sat Jun 18 10:23:16 2016 +++ pkgsrc/sysutils/consolekit/Makefile Sat Jun 18 11:09:35 2016 @@ -1,19 +1,17 @@ -# $NetBSD: Makefile,v 1.31 2016/06/18 10:23:16 youri Exp $ +# $NetBSD: Makefile,v 1.32 2016/06/18 11:09:35 ryoon Exp $ CONSOLEKIT_VER= 1.0.2 -DISTNAME= ${CONSOLEKIT_VER} +DISTNAME= ConsoleKit2-1.0.2 PKGNAME= consolekit-${CONSOLEKIT_VER} CATEGORIES= sysutils -MASTER_SITES= ${MASTER_SITE_GITHUB:=ConsoleKit2/} +MASTER_SITES= https://github.com/ConsoleKit2/ConsoleKit2/releases/download/${CONSOLEKIT_VER}/ +EXTRACT_SUFX= .tar.bz2 MAINTAINER= youri@NetBSD.org HOMEPAGE= https://github.com/ConsoleKit2/ConsoleKit2/ COMMENT= Framework for defining and tracking users, login sessions, and seats LICENSE= gnu-gpl-v2 -GITHUB_PROJECT= ConsoleKit2 -GITHUB_TAG= ${CONSOLEKIT_VER} - MESSAGE_SUBST+= PREFIX=${PREFIX} BUILD_DEFS+= VARBASE \ @@ -55,9 +53,6 @@ INSTALL_MAKE_FLAGS+= sysconfdir=${EGDIR} DBUS_SYS_DIR=${EGDIR}/dbus-1/system.d \ XINITRC_DIR=${EGDIR}/X11/xinit/xinitrc.d -pre-configure: - cd ${WRKSRC} && ./autogen.sh - post-install: ${MKDIR} ${DESTDIR}${RULESDIR} && \ ${INSTALL_DATA} ${FILESDIR}/50-shutdown.rules \ Index: pkgsrc/sysutils/consolekit/distinfo diff -u pkgsrc/sysutils/consolekit/distinfo:1.13 pkgsrc/sysutils/consolekit/distinfo:1.14 --- pkgsrc/sysutils/consolekit/distinfo:1.13 Sat Jun 18 10:23:16 2016 +++ pkgsrc/sysutils/consolekit/distinfo Sat Jun 18 11:09:35 2016 @@ -1,7 +1,8 @@ -$NetBSD: distinfo,v 1.13 2016/06/18 10:23:16 youri Exp $ +$NetBSD: distinfo,v 1.14 2016/06/18 11:09:35 ryoon Exp $ -SHA1 (1.0.2.tar.gz) = aca2f13f65e77ebffc9fb65d6102cd8edde522ba -RMD160 (1.0.2.tar.gz) = 1af1cfe8bdfc92215e8393eb4246c0e8667ae5e5 -SHA512 (1.0.2.tar.gz) = a0ce6b3b8eded4ec9fb0774b617cbf6b50aedef16a2bc28ec783e296eb3acc4a250611abb108aaf4f3716f3386ba397644fe55615e516f156982e9102cbb950e -Size (1.0.2.tar.gz) = 205101 bytes -SHA1 (patch-data_Makefile.am) = 7d37d6c3b5c0bab2e1e4b7000bd23f72b646cf9c +SHA1 (ConsoleKit2-1.0.2.tar.bz2) = 57b5fc3eae0391105e4933e79e6aeda943e6da81 +RMD160 (ConsoleKit2-1.0.2.tar.bz2) = 7b151e8d25dedb6961d2d83b934d79d9411147ff +SHA512 (ConsoleKit2-1.0.2.tar.bz2) = a6d1c876aafe3cb102d916c6b6086283eff77d2f35fbda460196cb71daf16d21a6713096bfc9e1b6ccef9719b2fcb25b6124024f3245f9410d0e503087c479f7 +Size (ConsoleKit2-1.0.2.tar.bz2) = 622723 bytes +SHA1 (patch-data_Makefile.am) = 5de63a98459914c7fda185d71fefd553b82107d3 +SHA1 (patch-data_Makefile.in) = a1861d2b80cc45ec6e4d625b635d1fb3c8b90122 Index: pkgsrc/sysutils/consolekit/patches/patch-data_Makefile.am diff -u pkgsrc/sysutils/consolekit/patches/patch-data_Makefile.am:1.1 pkgsrc/sysutils/consolekit/patches/patch-data_Makefile.am:1.2 --- pkgsrc/sysutils/consolekit/patches/patch-data_Makefile.am:1.1 Sat Jun 18 10:23:17 2016 +++ pkgsrc/sysutils/consolekit/patches/patch-data_Makefile.am Sat Jun 18 11:09:36 2016 @@ -1,15 +1,16 @@ -$NetBSD: patch-data_Makefile.am,v 1.1 2016/06/18 10:23:17 youri Exp $ +$NetBSD: patch-data_Makefile.am,v 1.2 2016/06/18 11:09:36 ryoon Exp $ * Fix installation of script data files --- data/Makefile.am.orig 2015-06-28 08:37:44.000000000 +0000 +++ data/Makefile.am -@@ -113,7 +113,7 @@ install-logrotate: $(LOGROTATE_CONFS) +@@ -113,8 +113,7 @@ install-logrotate: $(LOGROTATE_CONFS) install-90-consolekit: $(XINITRC_CONFS) $(MKDIR_P) $(DESTDIR)$(XINITRC_DIR)/ - $(INSTALL_PROGRAM) 90-consolekit $(DESTDIR)$(XINITRC_DIR) && \ -+ $(INSTALL_DATA) 90-consolekit $(DESTDIR)$(XINITRC_DIR) && \ - chmod +x $(DESTDIR)$(XINITRC_DIR)/90-consolekit +- chmod +x $(DESTDIR)$(XINITRC_DIR)/90-consolekit ++ $(INSTALL_DATA) 90-consolekit $(DESTDIR)$(XINITRC_DIR) uninstall-logrotate: + rm -f $(DESTDIR)$(sysconfdir)/logrotate.d/consolekit Added files: Index: pkgsrc/sysutils/consolekit/patches/patch-data_Makefile.in diff -u /dev/null pkgsrc/sysutils/consolekit/patches/patch-data_Makefile.in:1.1 --- /dev/null Sat Jun 18 11:09:36 2016 +++ pkgsrc/sysutils/consolekit/patches/patch-data_Makefile.in Sat Jun 18 11:09:36 2016 @@ -0,0 +1,15 @@ +$NetBSD: patch-data_Makefile.in,v 1.1 2016/06/18 11:09:36 ryoon Exp $ + +* Fix installation of script data files + +--- data/Makefile.in.orig 2016-03-19 15:19:18.000000000 +0000 ++++ data/Makefile.in +@@ -784,7 +784,7 @@ install-logrotate: $(LOGROTATE_CONFS) + + install-90-consolekit: $(XINITRC_CONFS) + $(MKDIR_P) $(DESTDIR)$(XINITRC_DIR)/ +- $(INSTALL_PROGRAM) 90-consolekit $(DESTDIR)$(XINITRC_DIR) && \ ++ $(INSTALL_SCRIPT) 90-consolekit $(DESTDIR)$(XINITRC_DIR) && \ + chmod +x $(DESTDIR)$(XINITRC_DIR)/90-consolekit + + uninstall-logrotate: --_----------=_1466248176129620--