CVS commit: pkgsrc/editors/mg

To: pkgsrc-changes%NetBSD.org@localhost
Subject: CVS commit: pkgsrc/editors/mg
From: "Nikita" <nikita%netbsd.org@localhost>
Date: Tue, 25 Apr 2023 21:53:02 +0000

Module Name:    pkgsrc
Committed By:   nikita
Date:           Tue Apr 25 21:53:02 UTC 2023

Modified Files:
        pkgsrc/editors/mg: Makefile PLIST distinfo
        pkgsrc/editors/mg/patches: patch-af patch-ttyio.c
Added Files:
        pkgsrc/editors/mg/patches: patch-GNUmakefile
Removed Files:
        pkgsrc/editors/mg/patches: patch-ab patch-ad patch-ag patch-ah patch-ai
            patch-basic.c patch-echo.c patch-fgetln.c patch-line.c patch-main.c

Log Message:
mg: update to version 20230406

upstream URL changed.


To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 pkgsrc/editors/mg/Makefile \
    pkgsrc/editors/mg/distinfo
cvs rdiff -u -r1.2 -r1.3 pkgsrc/editors/mg/PLIST
cvs rdiff -u -r0 -r1.1 pkgsrc/editors/mg/patches/patch-GNUmakefile
cvs rdiff -u -r1.2 -r0 pkgsrc/editors/mg/patches/patch-ab \
    pkgsrc/editors/mg/patches/patch-ai
cvs rdiff -u -r1.4 -r0 pkgsrc/editors/mg/patches/patch-ad
cvs rdiff -u -r1.3 -r1.4 pkgsrc/editors/mg/patches/patch-af
cvs rdiff -u -r1.5 -r0 pkgsrc/editors/mg/patches/patch-ag
cvs rdiff -u -r1.3 -r0 pkgsrc/editors/mg/patches/patch-ah
cvs rdiff -u -r1.1 -r0 pkgsrc/editors/mg/patches/patch-basic.c \
    pkgsrc/editors/mg/patches/patch-echo.c \
    pkgsrc/editors/mg/patches/patch-fgetln.c \
    pkgsrc/editors/mg/patches/patch-line.c \
    pkgsrc/editors/mg/patches/patch-main.c
cvs rdiff -u -r1.1 -r1.2 pkgsrc/editors/mg/patches/patch-ttyio.c

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

Modified files:

Index: pkgsrc/editors/mg/Makefile
diff -u pkgsrc/editors/mg/Makefile:1.13 pkgsrc/editors/mg/Makefile:1.14
--- pkgsrc/editors/mg/Makefile:1.13     Mon Apr 27 04:22:22 2020
+++ pkgsrc/editors/mg/Makefile  Tue Apr 25 21:53:01 2023
@@ -1,18 +1,19 @@
-# $NetBSD: Makefile,v 1.13 2020/04/27 04:22:22 rillig Exp $
+# $NetBSD: Makefile,v 1.14 2023/04/25 21:53:01 nikita Exp $
 
-DISTNAME=      mg-20110905
-PKGREVISION=   5
+DISTNAME=      mg-20230406
 CATEGORIES=    editors
-MASTER_SITES=  https://homepage.boetes.org/software/mg/
+MASTER_SITES=  ${MASTER_SITE_GITHUB:=hboetes/}
+GITHUB_PROJECT=        mg
+GITHUB_TAG=    ${PKGVERSION_NOREV}
 
 MAINTAINER=    abs%NetBSD.org@localhost
-HOMEPAGE=      https://homepage.boetes.org/software/mg/
+HOMEPAGE=      https://github.com/hboetes/mg
 COMMENT=       Small, fast, public domain EMACS style editor
 
-HAS_CONFIGURE= yes
-FAKE_NCURSES=  yes
-USE_TOOLS+=    install
+#FAKE_NCURSES= yes
+USE_TOOLS+=    install gmake pkg-config
 MAKE_ENV+=     prefix=${PREFIX}
+MAKE_FILE=     GNUmakefile
 
 CFLAGS.NetBSD+=        -D_OPENBSD_SOURCE
 
@@ -25,10 +26,13 @@ BUILDLINK_TRANSFORM+=       rm:-Werror
 SUBST_CLASSES+=                path
 SUBST_STAGE.path=      pre-configure
 SUBST_MESSAGE.path=    Adjusting path.
-SUBST_FILES.path=      Makefile.in mg.1
+SUBST_FILES.path=      GNUmakefile mg.1
 SUBST_SED.path=                -e "s|/usr/local|${PREFIX}|g"
 SUBST_SED.path+=       -e "s|/usr/share/doc|${PREFIX}/share/doc|g"
-SUBST_SED.path+=       -e "s|/usr/bin/install|${INSTALL}|g"
 
-.include "../../mk/curses.buildlink3.mk"
+.include "../../mk/bsd.prefs.mk"
+.if !empty(MACHINE_PLATFORM:MLinux-*-*)
+.include "../../devel/libbsd/buildlink3.mk"
+.endif
+.include "../../devel/ncursesw/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
Index: pkgsrc/editors/mg/distinfo
diff -u pkgsrc/editors/mg/distinfo:1.13 pkgsrc/editors/mg/distinfo:1.14
--- pkgsrc/editors/mg/distinfo:1.13     Tue Oct 26 10:21:33 2021
+++ pkgsrc/editors/mg/distinfo  Tue Apr 25 21:53:01 2023
@@ -1,18 +1,9 @@
-$NetBSD: distinfo,v 1.13 2021/10/26 10:21:33 nia Exp $
+$NetBSD: distinfo,v 1.14 2023/04/25 21:53:01 nikita Exp $
 
-BLAKE2s (mg-20110905.tar.gz) = 823eb67e303ab6e9d183dd03dfd49afa2ce97298b5406076fafa6eaf357d8e15
-SHA512 (mg-20110905.tar.gz) = b490a5a3526d35839353e138f33ac924c5afbbf7e5c9faa20ceccb82e1dc1e6a3f0726b32bac7d43dcf8a410b1b8525067da5557cf669c52a9e32d1d2f45a8a4
-Size (mg-20110905.tar.gz) = 138805 bytes
-SHA1 (patch-ab) = 2deb4c7e78d580434cfedfe9ea23add3b19cc300
-SHA1 (patch-ad) = 12515e4f5ce063f2984e5a144e467ba9b1693a7e
-SHA1 (patch-af) = b3c845deb4d7d70d006b8e00eeb5cf89a4b1027b
-SHA1 (patch-ag) = 41211898a86c3a8e88952b58d1026f03733e069a
-SHA1 (patch-ah) = 4c30216b73e895c0905c1245918c1bf04363ab16
-SHA1 (patch-ai) = bc9950469e4792867532dcaddba331f07131215c
-SHA1 (patch-basic.c) = bf528fd1b41d669427b00eb39c3c244cca725b5a
-SHA1 (patch-echo.c) = 4efb1e8205a399e5486ee81728e02b0358d7cf86
-SHA1 (patch-fgetln.c) = b2df2ccb26dea1c03cb159b2dea81a99583a933d
-SHA1 (patch-line.c) = 789afe647e1cb8d34280399f2ee5fbf31cce4926
-SHA1 (patch-main.c) = 32d374128558aae6db10e2326af8084d75eefe26
+BLAKE2s (mg-20230406-20230406.tar.gz) = d93c2f38b6f82e189c02f131b8c09073aee2f20f67cc6f106d0d61a8ea3a01a1
+SHA512 (mg-20230406-20230406.tar.gz) = 0d1ad46899c7afc4ce6634f0274286400d8a6bd8a7e28df970e1b6470d10520e1a74acb6059f3774a9ab9f6fd8e9ed7ddacf1cb70134538348e10f58a354ea4f
+Size (mg-20230406-20230406.tar.gz) = 157992 bytes
+SHA1 (patch-GNUmakefile) = b79834c2f125db8338c16697cde1719d3e039b13
+SHA1 (patch-af) = 678983bc292b41a2d67f969182bc377a47b89d2b
 SHA1 (patch-paragraph.c) = d68754b802c99fecb63a6cfa634f0360945f034f
-SHA1 (patch-ttyio.c) = 29009af12c5f6a95e083128baef5fef602b16f28
+SHA1 (patch-ttyio.c) = 125cbdf461aec3f629340affc3c9f600bb9d7102

Index: pkgsrc/editors/mg/PLIST
diff -u pkgsrc/editors/mg/PLIST:1.2 pkgsrc/editors/mg/PLIST:1.3
--- pkgsrc/editors/mg/PLIST:1.2 Wed Dec 12 12:47:50 2012
+++ pkgsrc/editors/mg/PLIST     Tue Apr 25 21:53:01 2023
@@ -1,4 +1,3 @@
-@comment $NetBSD: PLIST,v 1.2 2012/12/12 12:47:50 wiz Exp $
+@comment $NetBSD: PLIST,v 1.3 2023/04/25 21:53:01 nikita Exp $
 bin/mg
 man/man1/mg.1
-share/doc/mg/tutorial

Index: pkgsrc/editors/mg/patches/patch-af
diff -u pkgsrc/editors/mg/patches/patch-af:1.3 pkgsrc/editors/mg/patches/patch-af:1.4
--- pkgsrc/editors/mg/patches/patch-af:1.3      Mon Jul  7 18:06:58 2014
+++ pkgsrc/editors/mg/patches/patch-af  Tue Apr 25 21:53:01 2023
@@ -1,17 +1,9 @@
-$NetBSD: patch-af,v 1.3 2014/07/07 18:06:58 jperkin Exp $
+$NetBSD: patch-af,v 1.4 2023/04/25 21:53:01 nikita Exp $
 
 Include limits.h for INT_{MIN,MAX}
 
 --- grep.c.orig        2011-01-02 22:57:56.000000000 +0000
 +++ grep.c
-@@ -8,6 +8,7 @@
- 
- #include <sys/types.h>
- #include <ctype.h>
-+#include <limits.h>
- 
- #include "libgen.h"
- 
 @@ -152,7 +153,7 @@ gid(int f, int n)
        /* Skip backwards over delimiters we are currently on */
        while (i > 0) {

Index: pkgsrc/editors/mg/patches/patch-ttyio.c
diff -u pkgsrc/editors/mg/patches/patch-ttyio.c:1.1 pkgsrc/editors/mg/patches/patch-ttyio.c:1.2
--- pkgsrc/editors/mg/patches/patch-ttyio.c:1.1 Mon Jul  7 18:06:58 2014
+++ pkgsrc/editors/mg/patches/patch-ttyio.c     Tue Apr 25 21:53:01 2023
@@ -1,16 +1,16 @@
-$NetBSD: patch-ttyio.c,v 1.1 2014/07/07 18:06:58 jperkin Exp $
+$NetBSD: patch-ttyio.c,v 1.2 2023/04/25 21:53:01 nikita Exp $
 
 SunOS needs sys/filio.h for FIONREAD.
 
---- ttyio.c.orig       2008-12-11 08:59:08.000000000 +0000
-+++ ttyio.c
+--- ttyio.c.orig       2023-04-25 22:27:51.465437426 +0200
++++ ttyio.c    2023-04-25 22:28:25.938802102 +0200
 @@ -14,6 +14,9 @@
- #include <sys/types.h>
+ #include <sys/queue.h>
  #include <sys/time.h>
- #include <sys/ioctl.h>
+ #include <sys/types.h>
 +#ifdef __sun
 +#include <sys/filio.h>
 +#endif
+ #include <errno.h>
  #include <fcntl.h>
- #include <termios.h>
- #include <term.h>
+ #include <poll.h>

Added files:

Index: pkgsrc/editors/mg/patches/patch-GNUmakefile
diff -u /dev/null pkgsrc/editors/mg/patches/patch-GNUmakefile:1.1
--- /dev/null   Tue Apr 25 21:53:02 2023
+++ pkgsrc/editors/mg/patches/patch-GNUmakefile Tue Apr 25 21:53:01 2023
@@ -0,0 +1,27 @@
+$NetBSD: patch-GNUmakefile,v 1.1 2023/04/25 21:53:01 nikita Exp $
+
+
+--- GNUmakefile.orig   2023-04-06 05:06:27.000000000 +0200
++++ GNUmakefile        2023-04-25 23:05:43.954953743 +0200
+@@ -13,14 +13,18 @@
+ includedir=   $(prefix)/include
+ mandir=               $(prefix)/man
+ 
+-PKG_CONFIG=   /usr/bin/pkg-config --silence-errors
+-INSTALL=      /usr/bin/install
+-STRIP=                /usr/bin/strip
++PKG_CONFIG?=  /usr/bin/pkg-config --silence-errors
++INSTALL?=     /usr/bin/install
++STRIP?=               /usr/bin/strip
+ 
+ UNAME:=               $(shell uname)
+ ifeq ($(UNAME),FreeBSD)
+   BSD_CPPFLAGS:= -DHAVE_UTIL_H
+   BSD_LIBS:=   -lutil
++endif
++ifeq ($(UNAME),NetBSD)
++  BSD_CPPFLAGS:= -DHAVE_UTIL_H
++  BSD_LIBS:=   -lutil
+ else
+   BSD_CPPFLAGS:= $(shell $(PKG_CONFIG) --cflags libbsd-overlay) -DHAVE_PTY_H
+   BSD_LIBS:=   $(shell $(PKG_CONFIG) --libs libbsd-overlay) -lutil

Prev by Date: CVS commit: pkgsrc/doc
Next by Date: CVS commit: pkgsrc/editors/mg
Previous by Thread: CVS commit: pkgsrc/doc
Next by Thread: CVS commit: pkgsrc/editors/mg
Indexes:

Home | Main Index | Thread Index | Old Index