pkgsrc-WIP-changes archive

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

xjed/jed: fixed pkglint warnings



Module Name:	pkgsrc-wip
Committed By:	Kevin Bloom <kevin.bloom%posteo.net@localhost>
Pushed By:	nuclearkev
Date:		Tue Nov 28 21:27:17 2023 -0500
Changeset:	2c012a20db97b677d8f605aad2335527f47cae92

Modified Files:
	jed/Makefile
	jed/Makefile.common
	jed/distinfo
	jed/patches/patch-autoconf_configure.ac
	jed/patches/patch-src_Makefile.in
	jed/patches/patch-src_config.hin
	jed/patches/patch-src_jprocess.c
	jed/patches/patch-src_pty.c
	xjed/Makefile
	xjed/distinfo
	xjed/patches/patch-src_Makefile.in

Log Message:
xjed/jed: fixed pkglint warnings

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

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

diffstat:
 jed/Makefile                            |  5 ++---
 jed/Makefile.common                     |  2 +-
 jed/distinfo                            | 10 +++++-----
 jed/patches/patch-autoconf_configure.ac |  2 ++
 jed/patches/patch-src_Makefile.in       |  2 ++
 jed/patches/patch-src_config.hin        |  2 ++
 jed/patches/patch-src_jprocess.c        |  2 ++
 jed/patches/patch-src_pty.c             |  2 ++
 xjed/Makefile                           |  8 ++++----
 xjed/distinfo                           |  2 +-
 xjed/patches/patch-src_Makefile.in      |  2 ++
 11 files changed, 25 insertions(+), 14 deletions(-)

diffs:
diff --git a/jed/Makefile b/jed/Makefile
index 3dbafb6a94..ad0dc88833 100644
--- a/jed/Makefile
+++ b/jed/Makefile
@@ -1,10 +1,9 @@
 # $NetBSD: Makefile,v 1.28 2012/10/03 11:43:35 asau Exp $
 #
 PKGNAME=		jed-0.99.19
-PKGREVISION=		2
+LICENSE=		gnu-gpl-v2
 
-# .include "../../editors/jed/Makefile.common"
-.include "./Makefile.common"
+.include "../../editors/jed/Makefile.common"
 COMMENT=		Extensible folding editor with Emacs/WordStar/EDT emulations
 
 CONFLICTS=		xjed-[0-9]*
diff --git a/jed/Makefile.common b/jed/Makefile.common
index 87107e12f9..3fb0d72b15 100644
--- a/jed/Makefile.common
+++ b/jed/Makefile.common
@@ -17,7 +17,7 @@ HOMEPAGE=		https://www.jedsoft.org/jed/
 MAKE_JOBS_SAFE=		no
 
 GNU_CONFIGURE=		yes
-CONFIGURE_ARGS+=		--with-slang=${PREFIX}
+CONFIGURE_ARGS+=	--with-slang=${PREFIX}
 
 LIBS.SunOS+=		-lnsl -lresolv
 
diff --git a/jed/distinfo b/jed/distinfo
index cf1f03f330..dc3cedda52 100644
--- a/jed/distinfo
+++ b/jed/distinfo
@@ -3,8 +3,8 @@ $NetBSD: distinfo,v 1.15 2021/10/26 10:21:31 nia Exp $
 BLAKE2s (jed-0.99-19.tar.bz2) = 5d9d89262f4aa31a8a181064d9c0a4c373c3d727ff731feaf7db5fbfb1701bd1
 SHA512 (jed-0.99-19.tar.bz2) = db8a30284f9b8e3e2c5d1a600eeb7af29c9f943a5c23d7c74fce926e0b0252f54805e214670e7c9357ce0e6918ad67cba2769a523979bfbd285328f94fff747c
 Size (jed-0.99-19.tar.bz2) = 884198 bytes
-SHA1 (patch-autoconf_configure.ac) = d8a2c75708a89dfae9ab9d4a6053d9e41bce0c59
-SHA1 (patch-src_Makefile.in) = 301002f36dadea78a59b8edec9391bedf58bb3cb
-SHA1 (patch-src_config.hin) = ebb2179fd2e1246d5bd7978a67af660ad5ae6fd3
-SHA1 (patch-src_jprocess.c) = 3011a03bfff56071cb0448bccd8c903a8343c7e4
-SHA1 (patch-src_pty.c) = fc954f310187482ddf8ce65c601448d33926958f
+SHA1 (patch-autoconf_configure.ac) = df7be1bddbd1a4ed1f40e2a4523a7c39a2af3a9d
+SHA1 (patch-src_Makefile.in) = 94379d3acdc5f922485eb2a071dc89ff7a1224cf
+SHA1 (patch-src_config.hin) = c0e5858d9e6539b55c5a3f72342cbde06e3247c5
+SHA1 (patch-src_jprocess.c) = 576950628d199709e77e525295d4cd4542fcdf72
+SHA1 (patch-src_pty.c) = 7333060954757643fe2bc800f9de87e5861c2014
diff --git a/jed/patches/patch-autoconf_configure.ac b/jed/patches/patch-autoconf_configure.ac
index 1372184944..962753d309 100644
--- a/jed/patches/patch-autoconf_configure.ac
+++ b/jed/patches/patch-autoconf_configure.ac
@@ -1,5 +1,7 @@
 $NetBSD$
 
+Add in stropts library
+
 --- autoconf/configure.ac.orig	2023-11-29 01:48:10.235315068 +0000
 +++ autoconf/configure.ac
 @@ -33,6 +33,7 @@ termios.h \
diff --git a/jed/patches/patch-src_Makefile.in b/jed/patches/patch-src_Makefile.in
index fbbe95d6d2..779e682ee3 100644
--- a/jed/patches/patch-src_Makefile.in
+++ b/jed/patches/patch-src_Makefile.in
@@ -1,5 +1,7 @@
 $NetBSD$
 
+Change jed's root into the pkg share dir.
+
 --- src/Makefile.in.orig	2009-12-14 02:12:55.000000000 +0000
 +++ src/Makefile.in
 @@ -14,8 +14,7 @@ prefix = @prefix@
diff --git a/jed/patches/patch-src_config.hin b/jed/patches/patch-src_config.hin
index 188ebc7a0b..b1ac399b0c 100644
--- a/jed/patches/patch-src_config.hin
+++ b/jed/patches/patch-src_config.hin
@@ -1,5 +1,7 @@
 $NetBSD$
 
+Remove Undefined of HAVE_SYS_STROPTS_H
+
 --- src/config.hin.orig	2023-11-29 01:54:22.766379393 +0000
 +++ src/config.hin
 @@ -35,6 +35,9 @@
diff --git a/jed/patches/patch-src_jprocess.c b/jed/patches/patch-src_jprocess.c
index f9764bc5e5..29e81b9291 100644
--- a/jed/patches/patch-src_jprocess.c
+++ b/jed/patches/patch-src_jprocess.c
@@ -1,5 +1,7 @@
 $NetBSD: $
 
+If not FreeBSD, don't use PTY
+
 --- src/jprocess.c.orig	2004-03-18 16:39:02.000000000 +0000
 +++ src/jprocess.c	2004-03-18 16:39:57.000000000 +0000
 @@ -58,8 +58,10 @@
diff --git a/jed/patches/patch-src_pty.c b/jed/patches/patch-src_pty.c
index 08ecbfbc07..598c3f1b5b 100644
--- a/jed/patches/patch-src_pty.c
+++ b/jed/patches/patch-src_pty.c
@@ -1,5 +1,7 @@
 $NetBSD$
 
+Only do the I_PUSH stuff if it's defined.
+
 --- src/pty.c.orig	2009-12-14 02:12:55.000000000 +0000
 +++ src/pty.c
 @@ -19,10 +19,12 @@
diff --git a/xjed/Makefile b/xjed/Makefile
index 6b0f416365..247854ac90 100644
--- a/xjed/Makefile
+++ b/xjed/Makefile
@@ -2,9 +2,9 @@
 #
 PKGNAME=		xjed-0.99.19
 PKGREVISION=		1
+LICENSE=		gnu-gpl-v2
 
-#.include "../../editors/jed/Makefile.common"
-.include "../jed/Makefile.common"
+.include "../../editors/jed/Makefile.common"
 COMMENT=		Extensible folding editor + Emacs/WordStar/EDT emulations, X11 version
 
 CONFLICTS=		jed-[0-9]*
@@ -13,8 +13,8 @@ CONFIGURE_ARGS+=	--with-x
 
 BUILD_TARGET=		xjed
 
-MESSAGE_SRC=		${.CURDIR}/../jed/MESSAGE
-PLIST_SRC=		${.CURDIR}/../jed/PLIST
+MESSAGE_SRC=		${.CURDIR}/../../editorsjed/MESSAGE
+PLIST_SRC=		${.CURDIR}/../../editors/jed/PLIST
 PLIST_SRC+=		${.CURDIR}/PLIST.xjed
 
 .include "../../mk/bsd.prefs.mk"
diff --git a/xjed/distinfo b/xjed/distinfo
index d1eb872b27..18b529f486 100644
--- a/xjed/distinfo
+++ b/xjed/distinfo
@@ -3,4 +3,4 @@ $NetBSD: distinfo,v 1.7 2021/10/26 10:21:44 nia Exp $
 BLAKE2s (jed-0.99-19.tar.bz2) = 5d9d89262f4aa31a8a181064d9c0a4c373c3d727ff731feaf7db5fbfb1701bd1
 SHA512 (jed-0.99-19.tar.bz2) = db8a30284f9b8e3e2c5d1a600eeb7af29c9f943a5c23d7c74fce926e0b0252f54805e214670e7c9357ce0e6918ad67cba2769a523979bfbd285328f94fff747c
 Size (jed-0.99-19.tar.bz2) = 884198 bytes
-SHA1 (patch-src_Makefile.in) = 301002f36dadea78a59b8edec9391bedf58bb3cb
+SHA1 (patch-src_Makefile.in) = 94379d3acdc5f922485eb2a071dc89ff7a1224cf
diff --git a/xjed/patches/patch-src_Makefile.in b/xjed/patches/patch-src_Makefile.in
index fbbe95d6d2..779e682ee3 100644
--- a/xjed/patches/patch-src_Makefile.in
+++ b/xjed/patches/patch-src_Makefile.in
@@ -1,5 +1,7 @@
 $NetBSD$
 
+Change jed's root into the pkg share dir.
+
 --- src/Makefile.in.orig	2009-12-14 02:12:55.000000000 +0000
 +++ src/Makefile.in
 @@ -14,8 +14,7 @@ prefix = @prefix@


Home | Main Index | Thread Index | Old Index