Attachment #231865 for bug #261986




# Created by: Lewis Thompson <purple@lewiz.net>

PORTNAME=	remind
DISTVERSION=	03.04.00
CATEGORIES=	deskutils
# upstream moves distfiles to OLD once a new release appears
MASTER_SITES=	https://dianne.skoll.ca/projects/remind/download/ \
		https://dianne.skoll.ca/projects/remind/download/OLD/

MAINTAINER=	fuz@fuz.su
COMMENT=	Sophisticated calendar and alarm program

MAKE_ARGS=	INSTALL_SCRIPT="${INSTALL_SCRIPT}"
INSTALL_TARGET=	${WITH_DEBUG:Dinstall-nostripped:Uinstall}

OPTIONS_DEFINE=	A4 TCLTK REM2HTML REM2PDF
OPTIONS_DEFAULT=	LANG_US REM2HTML REM2PDF
		bin/remind \
		man/man1/rem.1.gz \
		man/man1/rem2ps.1.gz \
		man/man1/remind.1.gz

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
OPTIONS_SUB=	yes
A4_DESC=	Use A4 instead of Letter paper
LANGUAGE_DESC=	User interface language
REM2HTML_DESC=	Build and install rem2html (requires Perl)
REM2PDF_DESC=	Build and install rem2pdf (requires Perl)

# do not sort these -- correspond to enumeration in source code
LANG.US=	ENGLISH

LANG.RO=	ROMANIAN
LANG.ES=	SPANISH
LANG.IS=	ICELANDIC
CFLAGS+=	-DLANG=${${PORT_OPTIONS:MLANG_*:S/_/./}}

TCLTK_USES=	tk
TCLTK_RUN_DEPENDS=	dtplite:devel/tcllib

			man/man1/tkremind.1.gz
REM2HTML_USES=	perl5
REM2HTML_BUILD_DEPENDS=	p5-JSON-MaybeXS>0:converters/p5-JSON-MaybeXS
REM2HTML_RUN_DEPENDS=	p5-JSON-MaybeXS>0:converters/p5-JSON-MaybeXS

REM2PDF_USES=	perl5
REM2PDF_RUN_DEPENDS=	p5-Cairo>0:graphics/p5-Cairo \
			p5-Pango>0:x11-toolkits/p5-Pango

# hard wired customisation variables
DEFAULT_LATITUDE?=	45.42055555555555
DEFAULT_LONGITUDE?=	-75.68972222222223
LAT_SEC?=	0
LON_DEG?=	75
LON_MIN?=	39
LON_SEC?=	0
LOCATION?=	Ottawa

CFLAGS+=	-DLANG=${${PORT_OPTIONS:MLANG_*:S/_/./}}

post-patch:
	@${REINPLACE_CMD} \
	    -e 's#DEFAULT_LATITUDE 39#DEFAULT_LATITUDE ${DEFAULT_LATITUDE}#' \
	    -e 's#DEFAULT_LONGITUDE 39#DEFAULT_LONGITUDE ${DEFAULT_LONGITUDE}#' \
	    -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:

post-patch-TCLTK-on:
	@${REINPLACE_CMD} -e 's,wish,${WISH},' ${WRKSRC}/scripts/tkremind

do-build:
	cd ${WRKSRC}/src && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} all

do-install:
	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

do-install-REM2PDF-on:
	cd ${WRKSRC}/rem2pdf && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_FLAGS} Makefile.top ${MAKE_ARGS} all
	cd ${WRKSRC}/rem2pdf && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_FLAGS} Makefile.top ${MAKE_ARGS} install

post-install-TCLTK-off:
	${RM} ${STAGEDIR}${PREFIX}/bin/tkremind
	${RM} ${STAGEDIR}${PREFIX}/man/man1/tkremind.1

Lines 1-3 Link Here

(-)b/deskutils/remind/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1643135424	1	TIMESTAMP = 1644690278
2	SHA256 (remind-03.03.12.tar.gz) = d4aa4cda5a1b53e2acc631e935e031c00c77982ad4f0867286f7d8270954409e	2	SHA256 (remind-03.04.00.tar.gz) = b88a48ca0c55e65d76d8537cb33f8e31e421f222f8572f3b10cd7f0a316f2d52
3	SIZE (remind-03.03.12.tar.gz) = 424070	3	SIZE (remind-03.04.00.tar.gz) = 439400




--- rem2html/Makefile.in.orig	2022-02-10 22:15:01 UTC
+++ rem2html/Makefile.in
@@ -12,17 +12,15 @@ all:
 	true
 
 install:

-	    $(PERL) -M$$m -e 1 > /dev/null 2>&1; \
-	    if test $$? != 0 ; then echo "Not installing rem2html; missing $$m"; exit 0; fi; \
-	done; \
-	pod2man rem2html > rem2html.1 && mkdir -p $(DESTDIR)$(mandir)/man1 && cp rem2html.1 $(DESTDIR)$(mandir)/man1/rem2html.1 || true; \
-	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;

+        do \
+	    $(PERL) -M$$m -e 1 ; \
+	done
+	pod2man rem2html > rem2html.1 && mkdir -p $(DESTDIR)$(mandir)/man1 && cp rem2html.1 $(DESTDIR)$(mandir)/man1/rem2html.1 || true
+	@echo "Installing rem2html in $(DESTDIR)$(bindir)"
+	mkdir -p $(DESTDIR)$(bindir)
+	sed -e 's|^#!perl|#!$(PERL)|' < rem2html > rem2html.out




--- src/Makefile.in.orig	2022-02-10 22:15:01 UTC
+++ src/Makefile.in
@@ -52,8 +52,11 @@ remind: $(REMINDOBJS)
 
 install-nostripped: all
 	-mkdir -p $(DESTDIR)$(bindir) || true
-	for prog in $(PROGS) $(SCRIPTS) ; do \
+	for prog in $(PROGS) ; do \
 		$(INSTALL_PROGRAM) $$prog $(DESTDIR)$(bindir) || exit 1; \
+	done
+	for script in $(SCRIPTS) ; do \
+		$(INSTALL_SCRIPT) $$script $(DESTDIR)$(bindir) || exit 1; \
 	done
 	rm -f $(DESTDIR)$(bindir)/rem > /dev/null 2>&1 || true
 	ln -s remind $(DESTDIR)$(bindir)/rem
 	-mkdir -p $(DESTDIR)$(mandir)/man1 || true
- 

Return to bug 261986

Lines 1-9 Link Here

(-)b/deskutils/remind/Makefile (-29 / +25 lines)
1	# Created by: Lewis Thompson <purple@lewiz.net>	1	# Created by: Lewis Thompson <purple@lewiz.net>
2		2
3	PORTNAME= remind	3	PORTNAME= remind
4	DISTVERSION= 03.03.12	4	DISTVERSION= 03.04.00
5	CATEGORIES= deskutils	5	CATEGORIES= deskutils
6	MASTER_SITES= https://dianne.skoll.ca/projects/remind/download/	6	# upstream moves distfiles to OLD once a new release appears
		7	MASTER_SITES= https://dianne.skoll.ca/projects/remind/download/ \
		8	https://dianne.skoll.ca/projects/remind/download/OLD/
7		9
8	MAINTAINER= fuz@fuz.su	10	MAINTAINER= fuz@fuz.su
9	COMMENT= Sophisticated calendar and alarm program	11	COMMENT= Sophisticated calendar and alarm program
Lines 14-35 GNU_CONFIGURE= yes Link Here
14	MAKE_ARGS= INSTALL_SCRIPT="${INSTALL_SCRIPT}"	16	MAKE_ARGS= INSTALL_SCRIPT="${INSTALL_SCRIPT}"
15	INSTALL_TARGET= ${WITH_DEBUG:Dinstall-nostripped:Uinstall}	17	INSTALL_TARGET= ${WITH_DEBUG:Dinstall-nostripped:Uinstall}
16		18
17	PLIST_FILES= bin/rem \	19	OPTIONS_DEFINE= A4 TCLTK REM2HTML REM2PDF
18	bin/rem2ps \	20	OPTIONS_DEFAULT= LANG_US REM2HTML REM2PDF
19	bin/remind \
20	man/man1/rem.1.gz \
21	man/man1/rem2ps.1.gz \
22	man/man1/remind.1.gz
23
24	OPTIONS_DEFINE= A4 TCLTK REM2HTML
25	OPTIONS_DEFAULT= LANG_US REM2HTML
26	OPTIONS_SINGLE= LANGUAGE	21	OPTIONS_SINGLE= LANGUAGE
27	OPTIONS_SINGLE_LANGUAGE= \	22	OPTIONS_SINGLE_LANGUAGE= \
28	LANG_US LANG_DE LANG_NL LANG_FI LANG_FR LANG_NN LANG_DA \	23	LANG_US LANG_DE LANG_NL LANG_FI LANG_FR LANG_NN LANG_DA \
29	LANG_PL LANG_PBR LANG_IT LANG_RO LANG_ES LANG_IS	24	LANG_PL LANG_PBR LANG_IT LANG_RO LANG_ES LANG_IS
		25	OPTIONS_SUB= yes
30	A4_DESC= Use A4 instead of Letter paper	26	A4_DESC= Use A4 instead of Letter paper
31	LANGUAGE_DESC= User interface language	27	LANGUAGE_DESC= User interface language
32	REM2HTML_DESC= Build and install rem2html (requires Perl)	28	REM2HTML_DESC= Build and install rem2html (requires Perl)
		29	REM2PDF_DESC= Build and install rem2pdf (requires Perl)
33		30
34	# do not sort these -- correspond to enumeration in source code	31	# do not sort these -- correspond to enumeration in source code
35	LANG.US= ENGLISH	32	LANG.US= ENGLISH
Lines 45-79 LANG.IT= ITALIAN Link Here
45	LANG.RO= ROMANIAN	42	LANG.RO= ROMANIAN
46	LANG.ES= SPANISH	43	LANG.ES= SPANISH
47	LANG.IS= ICELANDIC	44	LANG.IS= ICELANDIC
		45	CFLAGS+= -DLANG=${${PORT_OPTIONS:MLANG_*:S/_/./}}
48		46
49	TCLTK_USES= tk	47	TCLTK_USES= tk
50	TCLTK_RUN_DEPENDS= dtplite:devel/tcllib	48	TCLTK_RUN_DEPENDS= dtplite:devel/tcllib
51	TCLTK_PLIST_FILES= bin/tkremind \	49
52	man/man1/tkremind.1.gz
53	REM2HTML_USES= perl5	50	REM2HTML_USES= perl5
54	REM2HTML_BUILD_DEPENDS= p5-JSON-MaybeXS>0:converters/p5-JSON-MaybeXS
55	REM2HTML_RUN_DEPENDS= p5-JSON-MaybeXS>0:converters/p5-JSON-MaybeXS	51	REM2HTML_RUN_DEPENDS= p5-JSON-MaybeXS>0:converters/p5-JSON-MaybeXS
56	REM2HTML_PLIST_FILES= bin/rem2html	52
		53	REM2PDF_USES= perl5
		54	REM2PDF_RUN_DEPENDS= p5-Cairo>0:graphics/p5-Cairo \
		55	p5-Pango>0:x11-toolkits/p5-Pango
57		56
58	# hard wired customisation variables	57	# hard wired customisation variables
59	LAT_DEG?= 45	58	DEFAULT_LATITUDE?= 45.42055555555555
60	LAT_MIN?= 24	59	DEFAULT_LONGITUDE?= -75.68972222222223
61	LAT_SEC?= 0
62	LON_DEG?= 75
63	LON_MIN?= 39
64	LON_SEC?= 0
65	LOCATION?= Ottawa	60	LOCATION?= Ottawa
66		61
67	CFLAGS+= -DLANG=${${PORT_OPTIONS:MLANG_*:S/_/./}}
68
69	post-patch:	62	post-patch:
70	@${REINPLACE_CMD} \	63	@${REINPLACE_CMD} \
71	-e 's#LAT_DEG 45#LAT_DEG ${LAT_DEG}#' \	64	-e 's#DEFAULT_LATITUDE 39#DEFAULT_LATITUDE ${DEFAULT_LATITUDE}#' \
72	-e 's#LAT_MIN 24#LAT_MIN ${LAT_MIN}#' \	65	-e 's#DEFAULT_LONGITUDE 39#DEFAULT_LONGITUDE ${DEFAULT_LONGITUDE}#' \
73	-e 's#LAT_SEC 0#LAT_SEC ${LAT_SEC}#' \
74	-e 's#LON_DEG 75#LON_DEG ${LON_DEG}#' \
75	-e 's#LON_MIN 39#LON_MIN ${LON_MIN}#' \
76	-e 's#LON_SEC 0#LON_SEC ${LON_SEC}#' \
77	-e 's#Ottawa#${LOCATION}#' ${WRKSRC}/src/custom.h	66	-e 's#Ottawa#${LOCATION}#' ${WRKSRC}/src/custom.h
78		67
79	post-patch-A4-on:	68	post-patch-A4-on:
Lines 82-93 post-patch-A4-on: Link Here
82	post-patch-TCLTK-on:	71	post-patch-TCLTK-on:
83	@${REINPLACE_CMD} -e 's,wish,${WISH},' ${WRKSRC}/scripts/tkremind	72	@${REINPLACE_CMD} -e 's,wish,${WISH},' ${WRKSRC}/scripts/tkremind
84		73
		74	do-build:
		75	cd ${WRKSRC}/src && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} all
		76
85	do-install:	77	do-install:
86	cd ${WRKSRC}/src && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${INSTALL_TARGET}	78	cd ${WRKSRC}/src && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${INSTALL_TARGET}
87		79
88	do-install-REM2HTML-on:	80	do-install-REM2HTML-on:
89	cd ${WRKSRC}/rem2html && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} install	81	cd ${WRKSRC}/rem2html && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} install
90		82
		83	do-install-REM2PDF-on:
		84	cd ${WRKSRC}/rem2pdf && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_FLAGS} Makefile.top ${MAKE_ARGS} all
		85	cd ${WRKSRC}/rem2pdf && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_FLAGS} Makefile.top ${MAKE_ARGS} install
		86
91	post-install-TCLTK-off:	87	post-install-TCLTK-off:
92	${RM} ${STAGEDIR}${PREFIX}/bin/tkremind	88	${RM} ${STAGEDIR}${PREFIX}/bin/tkremind
93	${RM} ${STAGEDIR}${PREFIX}/man/man1/tkremind.1	89	${RM} ${STAGEDIR}${PREFIX}/man/man1/tkremind.1

Lines 1-6 Link Here

(-)b/deskutils/remind/files/patch-rem2html_Makefile.in (-2 / +4 lines)
1	--- rem2html/Makefile.in.orig 2021-10-16 12:02:17 UTC	1	--- rem2html/Makefile.in.orig 2022-02-10 22:15:01 UTC
2	+++ rem2html/Makefile.in	2	+++ rem2html/Makefile.in
3	@@ -12,16 +12,14 @@ all:	3	@@ -12,17 +12,15 @@ all:
4	true	4	true
5		5
6	install:	6	install:
Lines 11-16 Link Here
11	- $(PERL) -M$$m -e 1 > /dev/null 2>&1; \	11	- $(PERL) -M$$m -e 1 > /dev/null 2>&1; \
12	- if test $$? != 0 ; then echo "Not installing rem2html; missing $$m"; exit 0; fi; \	12	- if test $$? != 0 ; then echo "Not installing rem2html; missing $$m"; exit 0; fi; \
13	- done; \	13	- done; \
		14	- pod2man rem2html > rem2html.1 && mkdir -p $(DESTDIR)$(mandir)/man1 && cp rem2html.1 $(DESTDIR)$(mandir)/man1/rem2html.1 \|\| true; \
14	- echo "Installing rem2html in $(DESTDIR)$(bindir)"; \	15	- echo "Installing rem2html in $(DESTDIR)$(bindir)"; \
15	- mkdir -p $(DESTDIR)$(bindir) && sed -e 's\|^#!perl\|#!$(PERL)\|' < rem2html > $(DESTDIR)$(bindir)/rem2html && chmod 755 $(DESTDIR)$(bindir)/rem2html && exit 0; \	16	- mkdir -p $(DESTDIR)$(bindir) && sed -e 's\|^#!perl\|#!$(PERL)\|' < rem2html > $(DESTDIR)$(bindir)/rem2html && chmod 755 $(DESTDIR)$(bindir)/rem2html && exit 0; \
16	- exit 1;	17	- exit 1;
Lines 18-23 Link Here
18	+ do \	19	+ do \
19	+ $(PERL) -M$$m -e 1 ; \	20	+ $(PERL) -M$$m -e 1 ; \
20	+ done	21	+ done
		22	+ pod2man rem2html > rem2html.1 && mkdir -p $(DESTDIR)$(mandir)/man1 && cp rem2html.1 $(DESTDIR)$(mandir)/man1/rem2html.1 \|\| true
21	+ @echo "Installing rem2html in $(DESTDIR)$(bindir)"	23	+ @echo "Installing rem2html in $(DESTDIR)$(bindir)"
22	+ mkdir -p $(DESTDIR)$(bindir)	24	+ mkdir -p $(DESTDIR)$(bindir)
23	+ sed -e 's\|^#!perl\|#!$(PERL)\|' < rem2html > rem2html.out	25	+ sed -e 's\|^#!perl\|#!$(PERL)\|' < rem2html > rem2html.out

Lines 1-16 Link Here

(-)b/deskutils/remind/files/patch-src_Makefile.in (-7 / +5 lines)
1	--- src/Makefile.in.orig 2007-10-09 19:45:41.000000000 +0300	1	--- src/Makefile.in.orig 2022-02-10 22:15:01 UTC
2	+++ src/Makefile.in 2007-10-09 19:46:25.000000000 +0300	2	+++ src/Makefile.in
3	@@ -51,9 +51,12 @@	3	@@ -52,8 +52,11 @@ remind: $(REMINDOBJS)
4		4
5	install-nostripped: all	5	install-nostripped: all
6	-mkdir -p $(DESTDIR)$(bindir) \|\| true	6	-mkdir -p $(DESTDIR)$(bindir) \|\| true
7	- for prog in $(PROGS) $(SCRIPTS) ; do \	7	- for prog in $(PROGS) $(SCRIPTS) ; do \
8	+ for prog in $(PROGS) ; do \	8	+ for prog in $(PROGS) ; do \
9	$(INSTALL_PROGRAM) $$prog $(DESTDIR)$(bindir) \|\| exit 1; \	9	$(INSTALL_PROGRAM) $$prog $(DESTDIR)$(bindir) \|\| exit 1; \
10	done	10	+ done
11	+ for script in $(SCRIPTS) ; do \	11	+ for script in $(SCRIPTS) ; do \
12	+ $(INSTALL_SCRIPT) $$script $(DESTDIR)$(bindir) \|\| exit 1; \	12	+ $(INSTALL_SCRIPT) $$script $(DESTDIR)$(bindir) \|\| exit 1; \
13	+ done	13	done
14	rm -f $(DESTDIR)$(bindir)/rem > /dev/null 2>&1 \|\| true	14	rm -f $(DESTDIR)$(bindir)/rem > /dev/null 2>&1 \|\| true
15	ln -s remind $(DESTDIR)$(bindir)/rem	15	ln -s remind $(DESTDIR)$(bindir)/rem
16	-mkdir -p $(DESTDIR)$(mandir)/man1 \|\| true
17	-