summaryrefslogtreecommitdiff
path: root/x11/modeline
diff options
context:
space:
mode:
authortnn <tnn@pkgsrc.org>2020-08-24 06:30:58 +0000
committertnn <tnn@pkgsrc.org>2020-08-24 06:30:58 +0000
commit7c9df11975ff1c7aecd25c863ecd438b19c1c9a6 (patch)
treecb523f44703ff8d6de56597ef2a7f1428449ab79 /x11/modeline
parentf3ea28501d73c50f7292263b1e7615c4512a508c (diff)
downloadpkgsrc-7c9df11975ff1c7aecd25c863ecd438b19c1c9a6.tar.gz
modeline: fix package that I previously broke due to a missing DIST_SUBDIR
Diffstat (limited to 'x11/modeline')
-rw-r--r--x11/modeline/Makefile5
-rw-r--r--x11/modeline/distinfo4
-rw-r--r--x11/modeline/patches/patch-aa17
3 files changed, 9 insertions, 17 deletions
diff --git a/x11/modeline/Makefile b/x11/modeline/Makefile
index 5cd80bec874..370e3e0b382 100644
--- a/x11/modeline/Makefile
+++ b/x11/modeline/Makefile
@@ -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//}
diff --git a/x11/modeline/distinfo b/x11/modeline/distinfo
index 0020c5e0dc8..c3491e9cfb8 100644
--- a/x11/modeline/distinfo
+++ b/x11/modeline/distinfo
@@ -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
diff --git a/x11/modeline/patches/patch-aa b/x11/modeline/patches/patch-aa
index e5663321645..b318faf2f27 100644
--- a/x11/modeline/patches/patch-aa
+++ b/x11/modeline/patches/patch-aa
@@ -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 given.
* Output: Modeline
*
* Example use:
-@@ -20,7 +20,7 @@
- #include<stdlib.h>
-
- 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) {