pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

updated wip/moe to 1.13

Module Name:	pkgsrc-wip
Committed By:	Georg Schwarz <schwarz%NetBSD.org@localhost>
Pushed By:	schwarz
Date:		Fri Mar 10 21:21:42 2023 +0100
Changeset:	c187fc1f8d34babd6b10005e041797bd32968660

Modified Files:
	TODO
	moe/Makefile
	moe/PLIST
	moe/distinfo
	moe/patches/patch-aa
	moe/patches/patch-ab

Log Message:
updated wip/moe to 1.13

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

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

diffstat:
 TODO                 |  1 -
 moe/Makefile         | 16 +++-------------
 moe/PLIST            |  2 +-
 moe/distinfo         | 10 +++++-----
 moe/patches/patch-aa | 25 ++++++++-----------------
 moe/patches/patch-ab |  8 ++++----
 6 files changed, 21 insertions(+), 41 deletions(-)

diffs:
diff --git a/TODO b/TODO
index e01654cd94..1b315f4b54 100644
--- a/TODO
+++ b/TODO
@@ -90,7 +90,6 @@ Suggested package updates
 	o meta-tracker-1.4.0
 	o miro-5.0
 	o mixxx-1.11.0
-	o moe-1.9
 	o mpgedit-0.73dev2
 	o mumble-1.2.4
 	o mupen64-0.5
diff --git a/moe/Makefile b/moe/Makefile
index 0f9420e7de..ee61a0cbfa 100644
--- a/moe/Makefile
+++ b/moe/Makefile
@@ -1,6 +1,6 @@
 # $NetBSD: Makefile,v 1.18 2015/05/08 20:18:18 gschwarz Exp $
 
-DISTNAME=	moe-1.9
+DISTNAME=	moe-1.13
 CATEGORIES=	editors
 MASTER_SITES=	${MASTER_SITE_GNU:=moe/}
 EXTRACT_SUFX=	.tar.lz
@@ -20,18 +20,8 @@ MAKE_ENV+=		INSTALL_DIR=${MKDIR:Q}
 LDFLAGS+=		${BUILDLINK_LDADD.ncurses:Q}
 USE_LANGUAGES=		c++
 
-.include "../../mk/compiler.mk"
-.if !empty(PKGSRC_COMPILER:Mclang)
-# cf. https://lists.gnu.org/archive/html/bug-moe/2017-09/msg00000.html
-SUBST_CLASSES+= clang
-SUBST_STAGE.clang=	post-patch
-SUBST_FILES.clang=	window_vector.cc
-SUBST_MESSAGE.clang=	fixing code for clang incompatiblity
-SUBST_SED.clang=	-e "s/, 1, /, 1U, /"
-.endif
-
-CONF_FILES=		${PREFIX}/share/examples/moe/moerc \
-			${PKG_SYSCONFDIR}/moerc
+CONF_FILES=		${PREFIX}/share/examples/moe/moe.conf \
+			${PKG_SYSCONFDIR}/moe.conf
 INSTALL_TARGET=		install install-man
 INSTALLATION_DIRS=	bin ${PKGMANDIR}/man1 ${PKGINFODIR} share/examples/moe
 
diff --git a/moe/PLIST b/moe/PLIST
index 5396305f9f..056efd26db 100644
--- a/moe/PLIST
+++ b/moe/PLIST
@@ -2,4 +2,4 @@
 bin/moe
 info/moe.info
 man/man1/moe.1
-share/examples/moe/moerc
+share/examples/moe/moe.conf
diff --git a/moe/distinfo b/moe/distinfo
index fc798a9feb..fead8ac3f8 100644
--- a/moe/distinfo
+++ b/moe/distinfo
@@ -1,7 +1,7 @@
 $NetBSD: distinfo,v 1.13 2015/05/08 20:18:18 gschwarz Exp $
 
-RMD160 (moe-1.9.tar.lz) = 004a64d33a3b83cc6ddc28c38e5f01125339539f
-SHA512 (moe-1.9.tar.lz) = 277700e4a796e1a7aee42de55ba4599a350a612f95a1a2eca5078d85f6f9a7db190fb5611eb2f286c98580af847a2934bf38a4bce10176db4c5cddc2d257f929
-Size (moe-1.9.tar.lz) = 82046 bytes
-SHA1 (patch-aa) = cef5b4e810cb4c6605ae7d4d7e851cd680fb1d18
-SHA1 (patch-ab) = d2f4e0450403dccdd90d5d7f50ff3662c260a23e
+BLAKE2s (moe-1.13.tar.lz) = 8653c42c10d85a2f6a66b66b57e33aade3d2a51ea3977f8e30df4500b9321e29
+SHA512 (moe-1.13.tar.lz) = 3fb13398de56cf71025cdd132ca64a18a0adcbd1222cb3c611ff134adad2787de2e3a8993b381da1526015bfbba03be49d8f07f8e314f0cb19cedabb5b843228
+Size (moe-1.13.tar.lz) = 91414 bytes
+SHA1 (patch-aa) = cbe58f88d9ea8764f9d30d7d86e1c0e821979d70
+SHA1 (patch-ab) = ef138164f15c8d3fd4ac85a54626d4a37bd32fd5
diff --git a/moe/patches/patch-aa b/moe/patches/patch-aa
index 6a42224a86..bea3ae50e0 100644
--- a/moe/patches/patch-aa
+++ b/moe/patches/patch-aa
@@ -1,39 +1,30 @@
 $NetBSD$
 
---- Makefile.in.orig	2017-02-14 17:00:19.000000000 +0100
-+++ Makefile.in	2020-04-01 21:34:46.000000000 +0200
-@@ -1,11 +1,11 @@
+--- Makefile.in.orig	2023-03-10 20:23:22.000000000 +0100
++++ Makefile.in	2023-03-10 20:28:29.000000000 +0100
+@@ -1,10 +1,10 @@
  
  DISTNAME = $(pkgname)-$(pkgversion)
 -INSTALL = install
 -INSTALL_PROGRAM = $(INSTALL) -m 755
 -INSTALL_DATA = $(INSTALL) -m 644
 -INSTALL_DIR = $(INSTALL) -d -m 755
+-SHELL = /bin/sh
 +#INSTALL = install
 +#INSTALL_PROGRAM = $(INSTALL) -m 755
 +#INSTALL_DATA = $(INSTALL) -m 644
 +#INSTALL_DIR = $(INSTALL) -d -m 755
- LIBS = -lncurses
--SHELL = /bin/sh
 +#SHELL = /bin/sh
  CAN_RUN_INSTALLINFO = $(SHELL) -c "install-info --version" > /dev/null 2>&1
  
  edobjs = basic_buffer.o block.o buffer.o buffer_handle.o \
-@@ -73,7 +73,7 @@
+@@ -72,7 +72,8 @@
  	if [ ! -d "$(DESTDIR)$(bindir)" ] ; then $(INSTALL_DIR) "$(DESTDIR)$(bindir)" ; fi
  	if [ ! -d "$(DESTDIR)$(sysconfdir)" ] ; then $(INSTALL_DIR) "$(DESTDIR)$(sysconfdir)" ; fi
  	$(INSTALL_PROGRAM) ./$(progname) "$(DESTDIR)$(bindir)/$(progname)"
--	$(INSTALL_DATA) $(VPATH)/$(pkgname)rc "$(DESTDIR)$(sysconfdir)/$(pkgname)rc"
-+	$(INSTALL_DATA) $(VPATH)/$(pkgname)rc "$(DESTDIR)$(prefix)/share/examples/moe/$(progname)rc"
+-	$(INSTALL_DATA) $(VPATH)/$(pkgname).conf "$(DESTDIR)$(sysconfdir)/$(pkgname).conf"
++	$(INSTALL_DATA) $(VPATH)/$(pkgname).conf "$(DESTDIR)/$(prefix)/share/examples/moe/$(pkgname).conf"
++
  
  install-bin-strip : all
  	$(MAKE) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' install-bin
-@@ -92,7 +92,7 @@
- install-man :
- 	if [ ! -d "$(DESTDIR)$(mandir)/man1" ] ; then $(INSTALL_DIR) "$(DESTDIR)$(mandir)/man1" ; fi
- 	-rm -f "$(DESTDIR)$(mandir)/man1/$(progname).1"*
--	$(INSTALL_DATA) $(VPATH)/doc/$(progname).1 "$(DESTDIR)$(mandir)/man1/$(progname).1"
-+	$(INSTALL_MAN) $(VPATH)/doc/$(progname).1 "$(DESTDIR)$(mandir)/man1/$(progname).1"
- 
- install-man-compress : install-man
- 	lzip -v -9 "$(DESTDIR)$(mandir)/man1/$(progname).1"
diff --git a/moe/patches/patch-ab b/moe/patches/patch-ab
index 74706f443d..ba73f449ce 100644
--- a/moe/patches/patch-ab
+++ b/moe/patches/patch-ab
@@ -1,7 +1,7 @@
 $NetBSD$
 
---- configure.orig	2017-06-02 19:25:44.000000000 +0200
-+++ configure	2020-04-01 21:30:46.000000000 +0200
+--- configure.orig	2023-03-10 20:31:04.000000000 +0100
++++ configure	2023-03-10 20:31:52.000000000 +0100
 @@ -21,10 +21,10 @@
  infodir='$(datarootdir)/info'
  mandir='$(datarootdir)/man'
@@ -14,6 +14,6 @@ $NetBSD$
 +#CPPFLAGS=
 +#CXXFLAGS='-Wall -W -O2'
 +#LDFLAGS=
+ LIBS=-lncurses
+ MAKEINFO=makeinfo
  
- # checking whether we are using GNU C++.
- /bin/sh -c "${CXX} --version" > /dev/null 2>&1 ||
Home | Main Index | Thread Index | Old Index