Received: by mail.netbsd.org (Postfix, from userid 605) id 7772884D86; Mon, 24 Aug 2020 06:30:59 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id F173784D7E for ; Mon, 24 Aug 2020 06:30:58 +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 D9hmH8IQy9NI for ; Mon, 24 Aug 2020 06:30:58 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.netbsd.org [199.233.217.197]) by mail.netbsd.org (Postfix) with ESMTP id 6DAC484CEF for ; Mon, 24 Aug 2020 06:30:58 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 66317FB28; Mon, 24 Aug 2020 06:30:58 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1598250658246980" MIME-Version: 1.0 Date: Mon, 24 Aug 2020 06:30:58 +0000 From: "Tobias Nygren" Subject: CVS commit: pkgsrc/x11/modeline To: pkgsrc-changes@NetBSD.org Reply-To: tnn@netbsd.org X-Mailer: log_accum Message-Id: <20200824063058.66317FB28@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: pkgsrc-changes.NetBSD.org Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_1598250658246980 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: tnn Date: Mon Aug 24 06:30:58 UTC 2020 Modified Files: pkgsrc/x11/modeline: Makefile distinfo pkgsrc/x11/modeline/patches: patch-aa Log Message: modeline: fix package that I previously broke due to a missing DIST_SUBDIR To generate a diff of this commit: cvs rdiff -u -r1.16 -r1.17 pkgsrc/x11/modeline/Makefile cvs rdiff -u -r1.6 -r1.7 pkgsrc/x11/modeline/distinfo cvs rdiff -u -r1.2 -r1.3 pkgsrc/x11/modeline/patches/patch-aa Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1598250658246980 Content-Disposition: inline Content-Length: 2734 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/x11/modeline/Makefile diff -u pkgsrc/x11/modeline/Makefile:1.16 pkgsrc/x11/modeline/Makefile:1.17 --- pkgsrc/x11/modeline/Makefile:1.16 Tue Aug 18 02:01:43 2020 +++ pkgsrc/x11/modeline/Makefile Mon Aug 24 06:30:58 2020 @@ -1,7 +1,8 @@ -# $NetBSD: Makefile,v 1.16 2020/08/18 02:01:43 tnn Exp $ +# $NetBSD: Makefile,v 1.17 2020/08/24 06:30:58 tnn Exp $ DISTNAME= modeline_vfr.c PKGNAME= modeline-20060729 +PKGREVISION= 1 CATEGORIES= x11 MASTER_SITES= http://www.bohne-lang.de/spec/linux/modeline/ EXTRACT_SUFX= # empty @@ -16,7 +17,7 @@ INSTALLATION_DIRS= bin do-extract: ${MKDIR} ${WRKSRC} - ${CP} ${DISTDIR}/${DISTNAME} ${WRKSRC} + ${CP} ${DISTDIR}/${DIST_SUBDIR}/${DISTNAME} ${WRKSRC} do-build: cd ${WRKSRC}; ${CC} ${CFLAGS} ${DISTNAME} -o ${DISTNAME:S/.c//} Index: pkgsrc/x11/modeline/distinfo diff -u pkgsrc/x11/modeline/distinfo:1.6 pkgsrc/x11/modeline/distinfo:1.7 --- pkgsrc/x11/modeline/distinfo:1.6 Tue Aug 18 02:01:43 2020 +++ pkgsrc/x11/modeline/distinfo Mon Aug 24 06:30:58 2020 @@ -1,7 +1,7 @@ -$NetBSD: distinfo,v 1.6 2020/08/18 02:01:43 tnn Exp $ +$NetBSD: distinfo,v 1.7 2020/08/24 06:30:58 tnn Exp $ SHA1 (modeline-20060729/modeline_vfr.c) = 0ce2771e46344fde9abc3d81c2a8775265c955c2 RMD160 (modeline-20060729/modeline_vfr.c) = 42f03cd4851e5d222ee8b8dce3d4ddd17640a88c SHA512 (modeline-20060729/modeline_vfr.c) = 8a85f5b8546930e88893adbdae2499932de97795fa8735a45964d3d2ba13941aec28800210e2a6c9b4e038aff687bcb083c166bf1b73348f07c274471f4e4c13 Size (modeline-20060729/modeline_vfr.c) = 2437 bytes -SHA1 (patch-aa) = d8d425c25814f23e0bec4cc1b3cbff8405e9cdec +SHA1 (patch-aa) = 2f8795bc9b8108c9c77f9b9b28055be39e91121f Index: pkgsrc/x11/modeline/patches/patch-aa diff -u pkgsrc/x11/modeline/patches/patch-aa:1.2 pkgsrc/x11/modeline/patches/patch-aa:1.3 --- pkgsrc/x11/modeline/patches/patch-aa:1.2 Fri Aug 10 18:00:14 2012 +++ pkgsrc/x11/modeline/patches/patch-aa Mon Aug 24 06:30:58 2020 @@ -1,8 +1,8 @@ -$NetBSD: patch-aa,v 1.2 2012/08/10 18:00:14 joerg Exp $ +$NetBSD: patch-aa,v 1.3 2020/08/24 06:30:58 tnn Exp $ Check that the proper arguments are given. ---- modeline_vfr.c.orig 2012-08-10 12:53:32.000000000 +0000 +--- modeline_vfr.c.orig 2020-08-24 06:27:34.226844393 +0000 +++ modeline_vfr.c @@ -6,7 +6,7 @@ * @@ -13,17 +13,8 @@ Check that the proper arguments are give * Output: Modeline * * Example use: -@@ -20,7 +20,7 @@ - #include - - int --main( char argc, char** argv ) -+main( int argc, char** argv ) - { - float hr,vr; - float dcf; -@@ -44,6 +44,12 @@ main( char argc, char** argv ) - float step =10; +@@ -44,6 +44,12 @@ main( int argc, char** argv ) + float step =10.0; float s_rr; + if (argc != 4) { --_----------=_1598250658246980--