Attachment 228764 Details for Bug 259212 – deskutils/remind: update to 03.03.09

[patch] deskutils/remind: update to 03.03.09

0001-deskutils-remind-update-to-03.03.09.patch (text/plain), 6.87 KB, created by Robert Clausecker on 2021-10-16 13:26:52 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Robert Clausecker

Created: 2021-10-16 13:26:52 UTC

Size: 6.87 KB

patch

obsolete

>From 364e0934038325e1c47b586ea587c91190b4fd3f Mon Sep 17 00:00:00 2001
>From: Robert Clausecker <fuz@fuz.su>
>Date: Sat, 16 Oct 2021 14:43:02 +0200
>Subject: [PATCH] deskutils/remind: update to 03.03.09
>
>---
> deskutils/remind/Makefile                     | 98 +++++++++----------
> deskutils/remind/distinfo                     |  6 +-
> .../remind/files/patch-rem2html_Makefile.in   | 27 +++++
> 3 files changed, 77 insertions(+), 54 deletions(-)
> create mode 100644 deskutils/remind/files/patch-rem2html_Makefile.in
>
>diff --git a/deskutils/remind/Makefile b/deskutils/remind/Makefile
>index 8e5e0c855a32..fd98ffcc2ec4 100644
>--- a/deskutils/remind/Makefile
>+++ b/deskutils/remind/Makefile
>@@ -1,7 +1,7 @@
> # Created by: Lewis Thompson <purple@lewiz.net>
> 
> PORTNAME=	remind
>-DISTVERSION=	03.03.08
>+DISTVERSION=	03.03.09
> CATEGORIES=	deskutils
> MASTER_SITES=	https://dianne.skoll.ca/projects/remind/download/
> 
>@@ -12,6 +12,7 @@ LICENSE=	GPLv2
> 
> GNU_CONFIGURE=	yes
> MAKE_ARGS=	INSTALL_SCRIPT="${INSTALL_SCRIPT}"
>+INSTALL_TARGET=	${WITH_DEBUG:Dinstall-nostripped:Uinstall}
> 
> PLIST_FILES=	bin/rem \
> 		bin/rem2ps \
>@@ -20,16 +21,17 @@ PLIST_FILES=	bin/rem \
> 		man/man1/rem2ps.1.gz \
> 		man/man1/remind.1.gz
> 
>-OPTIONS_DEFINE=			A4 TCLTK
>-OPTIONS_DEFAULT=		LANG_US
>-OPTIONS_SINGLE=			LANGUAGE
>-OPTIONS_SINGLE_LANGUAGE=	LANG_DA LANG_DE LANG_ES LANG_FI LANG_FR LANG_IS \
>-				LANG_IT LANG_NL LANG_NN LANG_PBR LANG_PL \
>-				LANG_RO LANG_US
>-
>+OPTIONS_DEFINE=	A4 TCLTK REM2HTML
>+OPTIONS_DEFAULT=	LANG_US REM2HTML
>+OPTIONS_SINGLE=	LANGUAGE
>+OPTIONS_SINGLE_LANGUAGE= \
>+		LANG_US LANG_DE LANG_NL LANG_FI LANG_FR LANG_NN LANG_DA \
>+		LANG_PL LANG_PBR LANG_IT LANG_RO LANG_ES LANG_IS
> A4_DESC=	Use A4 instead of Letter paper
> LANGUAGE_DESC=	User interface language
>+REM2HTML_DESC=	Build and install rem2html (requires Perl)
> 
>+# do not sort these -- correspond to enumeration in source code
> LANG.DE=	GERMAN
> LANG.NL=	DUTCH
> LANG.FI=	FINNISH
>@@ -45,11 +47,25 @@ LANG.IS=	ICELANDIC
> 
> TCLTK_USES=	tk
> TCLTK_RUN_DEPENDS=	dtplite:devel/tcllib
>-TCLTK_PLIST_FILES=	bin/cm2rem.tcl \
>-			bin/tkremind \
>-			man/man1/cm2rem.1.gz \
>+TCLTK_PLIST_FILES=	bin/tkremind \
> 			man/man1/tkremind.1.gz
> 
>+REM2HTML_USES=	perl5
>+REM2HTML_BUILD_DEPENDS=	p5-JSON-Any>0:converters/p5-JSON-Any \
>+			p5-Getopt-Long>0:devel/p5-Getopt-Long
>+REM2HTML_RUN_DEPENDS=	p5-JSON-Any>0:converters/p5-JSON-Any \
>+			p5-Getopt-Long>0:devel/p5-Getopt-Long
>+REM2HTML_PLIST_FILES=	bin/rem2html
>+
>+# hard wired customisation variables
>+LAT_DEG?=	45
>+LAT_MIN?=	24
>+LAT_SEC?=	0
>+LON_DEG?=	75
>+LON_MIN?=	39
>+LON_SEC?=	0
>+LOCATION?=	Ottawa
>+
> .include <bsd.port.options.mk>
> 
> .if "${PORT_OPTIONS:MLANG_*}" != "" && "${PORT_OPTIONS:MLANG_*}" != LANG_US
>@@ -57,49 +73,29 @@ CFLAGS+=	-DLANG=${${PORT_OPTIONS:MLANG_*:S/_/./}}
> .endif
> 
> post-patch:
>-# This seems more than a little ugly.
>-.if defined(LAT_DEG)
>-	@${REINPLACE_CMD} -e 's#LAT_DEG 45#LAT_DEG ${LAT_DEG}#' ${WRKSRC}/src/custom.h
>-.endif
>-.if defined(LAT_MIN)
>-	@${REINPLACE_CMD} -e 's#LAT_MIN 24#LAT_MIN ${LAT_MIN}#' ${WRKSRC}/src/custom.h
>-.endif
>-.if defined(LAT_SEC)
>-	@${REINPLACE_CMD} -e 's#LAT_SEC  0#LAT_SEC ${LAT_SEC}#' ${WRKSRC}/src/custom.h
>-.endif
>-.if defined(LON_DEG)
>-	@${REINPLACE_CMD} -e 's#LON_DEG 75#LON_DEG ${LON_DEG}#' ${WRKSRC}/src/custom.h
>-.endif
>-.if defined(LON_MIN)
>-	@${REINPLACE_CMD} -e 's#LON_MIN 39#LON_MIN ${LON_MIN}#' ${WRKSRC}/src/custom.h
>-.endif
>-.if defined(LON_SEC)
>-	@${REINPLACE_CMD} -e 's#LON_SEC  0#LON_SEC ${LON_SEC}#' ${WRKSRC}/src/custom.h
>-.endif
>-.if defined(LOCATION)
>-	@${REINPLACE_CMD} -e 's#Ottawa#${LOCATION}#' ${WRKSRC}/src/custom.h
>-.endif
>-.if defined(A4) || ${PORT_OPTIONS:MA4}
>+	@${REINPLACE_CMD} \
>+	    -e 's#LAT_DEG 45#LAT_DEG ${LAT_DEG}#' \
>+	    -e 's#LAT_MIN 24#LAT_MIN ${LAT_MIN}#' \
>+	    -e 's#LAT_SEC  0#LAT_SEC ${LAT_SEC}#' \
>+	    -e 's#LON_DEG 75#LON_DEG ${LON_DEG}#' \
>+	    -e 's#LON_MIN 39#LON_MIN ${LON_MIN}#' \
>+	    -e 's#LON_SEC  0#LON_SEC ${LON_SEC}#' \
>+	    -e 's#Ottawa#${LOCATION}#' ${WRKSRC}/src/custom.h
>+
>+post-patch-A4-on:
> 	@${REINPLACE_CMD} -e 's#"Letter", 612, 792#"A4", 595, 842#' ${WRKSRC}/src/custom.h
>-.endif
>-.if ${PORT_OPTIONS:MTCLTK}
>+
>+post-patch-TCLTK-on:
> 	@${REINPLACE_CMD} -e 's,wish,${WISH},' ${WRKSRC}/scripts/tkremind
>-	@${REINPLACE_CMD} -e 's,tclsh,${TCLSH},' ${WRKSRC}/scripts/cm2rem.tcl
>-.endif
> 
> do-install:
>-.for i in rem2ps remind
>-	${INSTALL_PROGRAM} ${WRKSRC}/src/${i} ${STAGEDIR}${PREFIX}/bin
>-	${INSTALL_MAN} ${WRKSRC}/man/${i}.1 ${STAGEDIR}${PREFIX}/man/man1
>-.endfor
>-	${INSTALL_MAN} ${WRKSRC}/man/rem.1 ${STAGEDIR}${PREFIX}/man/man1
>-	${LN} -sf ../bin/remind ${STAGEDIR}${PREFIX}/bin/rem
>-.if ${PORT_OPTIONS:MTCLTK}
>-	${INSTALL_SCRIPT} ${WRKSRC}/scripts/cm2rem.tcl ${STAGEDIR}${PREFIX}/bin
>-	${INSTALL_SCRIPT} ${WRKSRC}/scripts/tkremind ${STAGEDIR}${PREFIX}/bin
>-.for i in cm2rem tkremind
>-	${INSTALL_MAN} ${WRKSRC}/man/${i}.1 ${STAGEDIR}${PREFIX}/man/man1
>-.endfor
>-.endif
>+	cd ${WRKSRC}/src && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${INSTALL_TARGET}
>+
>+do-install-REM2HTML-on:
>+	cd ${WRKSRC}/rem2html && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} install
>+
>+post-install-TCLTK-off:
>+	${RM} ${STAGEDIR}${PREFIX}/bin/tkremind
>+	${RM} ${STAGEDIR}${PREFIX}/man/man1/tkremind.1
> 
> .include <bsd.port.mk>
>diff --git a/deskutils/remind/distinfo b/deskutils/remind/distinfo
>index 876c238db2ee..6b43ae9c75a2 100644
>--- a/deskutils/remind/distinfo
>+++ b/deskutils/remind/distinfo
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1631630542
>-SHA256 (remind-03.03.08.tar.gz) = 25ea12cd914b7d4aecc5731b5bcb81295c0e3df963d86b9171a4eca145b7b788
>-SIZE (remind-03.03.08.tar.gz) = 407339
>+TIMESTAMP = 1634383830
>+SHA256 (remind-03.03.09.tar.gz) = c9087a8c691136442f3e882e46677ad36e69084b2f3bbc3c5b760d3b6bf3b6f3
>+SIZE (remind-03.03.09.tar.gz) = 408928
>diff --git a/deskutils/remind/files/patch-rem2html_Makefile.in b/deskutils/remind/files/patch-rem2html_Makefile.in
>new file mode 100644
>index 000000000000..5385f9413023
>--- /dev/null
>+++ b/deskutils/remind/files/patch-rem2html_Makefile.in
>@@ -0,0 +1,27 @@
>+--- rem2html/Makefile.in.orig	2021-10-16 12:02:17 UTC
>++++ rem2html/Makefile.in
>+@@ -12,16 +12,14 @@ all:
>+ 	true
>+ 
>+ install:
>+-	@if test "$(PERL)" = "" ; then \
>+-	    echo "Not installing rem2html; Perl is required"; exit 0; fi; \
>+-	 for m in $(PERLMODS_NEEDED) ; \
>+-         do \
>+-	    perl -M$$m -e 1 > /dev/null 2>&1; \
>+-	    if test $$? != 0 ; then echo "Not installing rem2html; missing $$m"; exit 0; fi; \
>+-	done; \
>+-	echo "Installing rem2html in $(DESTDIR)$(bindir)"; \
>+-	mkdir -p $(DESTDIR)$(bindir) && sed -e 's|^#!perl|#!$(PERL)|' < rem2html > $(DESTDIR)$(bindir)/rem2html && chmod 755 $(DESTDIR)$(bindir)/rem2html && exit 0; \
>+-	exit 1;
>++	@for m in $(PERLMODS_NEEDED) ; \
>++        do \
>++	    perl -M$$m -e 1 ; \
>++	done
>++	@echo "Installing rem2html in $(DESTDIR)$(bindir)"
>++	mkdir -p $(DESTDIR)$(bindir)
>++	sed -e 's|^#!perl|#!$(PERL)|' < rem2html > rem2html.out
>++	$(INSTALL_SCRIPT) rem2html.out $(DESTDIR)$(bindir)/rem2html
>+ 
>+ 
>+ 
>-- 
>2.32.0
>

Flags:

fuz: maintainer-approval+

Actions: View | Diff

Attachments on bug 259212: 228764