From nobody Wed Feb 16 18:01:58 2022 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 1044519CAC76; Wed, 16 Feb 2022 18:01:59 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4JzQlB6rB7z4m2n; Wed, 16 Feb 2022 18:01:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1645034519; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=VgCYKIHg874SAdT32Mo8RXEehrNYRuKKvxiQ3KPH0bY=; b=U1hqOeFkXDGWmt7xfsCDltnTudQY+pgeoooTJo0mPFhPOgjr8WSYrwBBpg0/IxRu/GsMzn 5T89pUnLu0yoxw2CiGeHo/XwvwKAsxsA/lYp5bqGskZnVFIGueag/r8RZmOOFNaL4hmJVj MrmfHwz91H2u1EcS7v8QKARdssQcTXFIYdFeT+GOdMzbp1UZNH661K4QndV4nd/etS/s7Z X4l9gG/KD4CI8VJQ+JkgVUCVNv0hnHC+cNG6I6qeBphmzJGGEtgGgP+RFWwYN+s7seC3Sh d/5QdUXcmHy6gPZ3xC1goQHWVr2AHB3AmTOW2tUF4OBGjifnXt6YzS/jaNRQdQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id CBA901ABF2; Wed, 16 Feb 2022 18:01:58 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 21GI1wUt062964; Wed, 16 Feb 2022 18:01:58 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 21GI1wWk062963; Wed, 16 Feb 2022 18:01:58 GMT (envelope-from git) Date: Wed, 16 Feb 2022 18:01:58 GMT Message-Id: <202202161801.21GI1wWk062963@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Li-Wen Hsu Subject: git: a1fa88108bf7 - main - deskutils/remind: update to 03.04.00 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: lwhsu X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a1fa88108bf79682e19617e74df6e8c4ce421baa Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1645034519; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=VgCYKIHg874SAdT32Mo8RXEehrNYRuKKvxiQ3KPH0bY=; b=rJIyxJtkk4R0LWLShBDwwREAx1+wD+j+vFXeFYPFzA7BY2RiGIHjXxh4qVFGF9lL1DTpxB N3ceFY9MhRI5VYig5iYGLgMtcGKZUp/lyYUcGafsC01gyahVIQgv0akuDeIPRNrZRE8/tn i/dqzC9P6U2q5tZonnEzJL/zPB616TI+STgedel0+cYYiy6FZCWvof9F0I0P77OtXH8IVa xhsJKZTBxJ378qlC6zuiWs8A7QASuHvyOEaRAyk82qGC29KmG43jQTsbwfDoxXvTRI55s/ XnCf/gYN3vI6l1y8M1oLil4elf46PZUJTBJxzpMtl7gjQTXMGTzNokkJ9IeTRA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1645034519; a=rsa-sha256; cv=none; b=UoWuILpp2fv8idYsFU32J2CO/h1YV4YWHvA1QHeiRJrN4b2B31YkhNIR87GKlzwazubx4s oIIp1YenbD23zaVFqAoAlJbYRHZFag/QA7ATM/mnh5CAyHSfylCIwMVIlngWhVAZ8DzVzF Nk8kg2I08dEXqL2q2fVFMdGew6XofkxI2FFzfFf6ltizHvwfA3Ycg3lKpYHDK4wmMl/hWm DumrKg9fUfqQkhu+3EvKm6bQhbvNWXvzspFymrZ++DzQ8yXqBWIUzX2RNAazT0VAZ3FsQX wTr58lvFbDxqERi2znvEkRD5+s/pSQg75xL32eQY2jwaMOucO6lyddaXU+1FPg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by lwhsu: URL: https://cgit.FreeBSD.org/ports/commit/?id=a1fa88108bf79682e19617e74df6e8c4ce421baa commit a1fa88108bf79682e19617e74df6e8c4ce421baa Author: Robert Clausecker AuthorDate: 2022-02-16 12:07:22 +0000 Commit: Li-Wen Hsu CommitDate: 2022-02-16 18:01:36 +0000 deskutils/remind: update to 03.04.00 - change LAT_??? and LON_??? variables to DEFAULT_LATITUDE and DEFAULT_LONGITUDE. Users who have set these variables must change their make.conf - fix fetch when port version is out of date - add a new REM2PDF option Upstream changes: - add UTF-8 support - add a remind-to-PDF converter REM2PDF - tkremind now support PDF and PS export when printing - replace LAT_??? and LON_??? macros with DEFAULT_LATITUDE and DEFAULT_LONGITUDE. - various bug fixes and documentation improvements Changelog: https://git.skoll.ca/Skollsoft-Public/Remind/src/branch/master/docs/WHATSNEW PR: 261986 --- deskutils/remind/Makefile | 54 ++++++++++------------ deskutils/remind/distinfo | 6 +-- deskutils/remind/files/patch-rem2html_Makefile.in | 6 ++- .../{patch-src_Makefile => patch-src_Makefile.in} | 11 ++--- 4 files changed, 37 insertions(+), 40 deletions(-) diff --git a/deskutils/remind/Makefile b/deskutils/remind/Makefile index 9b906a0e7184..260492bc89ed 100644 --- a/deskutils/remind/Makefile +++ b/deskutils/remind/Makefile @@ -1,9 +1,11 @@ # Created by: Lewis Thompson PORTNAME= remind -DISTVERSION= 03.03.12 +DISTVERSION= 03.04.00 CATEGORIES= deskutils -MASTER_SITES= https://dianne.skoll.ca/projects/remind/download/ +# 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 @@ -14,22 +16,17 @@ GNU_CONFIGURE= yes MAKE_ARGS= INSTALL_SCRIPT="${INSTALL_SCRIPT}" INSTALL_TARGET= ${WITH_DEBUG:Dinstall-nostripped:Uinstall} -PLIST_FILES= bin/rem \ - bin/rem2ps \ - 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_DEFINE= A4 TCLTK REM2HTML REM2PDF +OPTIONS_DEFAULT= LANG_US REM2HTML REM2PDF 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 @@ -45,35 +42,27 @@ LANG.IT= ITALIAN LANG.RO= ROMANIAN LANG.ES= SPANISH LANG.IS= ICELANDIC +CFLAGS+= -DLANG=${${PORT_OPTIONS:MLANG_*:S/_/./}} TCLTK_USES= tk TCLTK_RUN_DEPENDS= dtplite:devel/tcllib -TCLTK_PLIST_FILES= bin/tkremind \ - 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 -REM2HTML_PLIST_FILES= bin/rem2html + +REM2PDF_USES= perl5 +REM2PDF_RUN_DEPENDS= p5-Cairo>0:graphics/p5-Cairo \ + p5-Pango>0:x11-toolkits/p5-Pango # hard wired customisation variables -LAT_DEG?= 45 -LAT_MIN?= 24 -LAT_SEC?= 0 -LON_DEG?= 75 -LON_MIN?= 39 -LON_SEC?= 0 +DEFAULT_LATITUDE?= 45.42055555555555 +DEFAULT_LONGITUDE?= -75.68972222222223 LOCATION?= Ottawa -CFLAGS+= -DLANG=${${PORT_OPTIONS:MLANG_*:S/_/./}} - post-patch: @${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#DEFAULT_LATITUDE 39#DEFAULT_LATITUDE ${DEFAULT_LATITUDE}#' \ + -e 's#DEFAULT_LONGITUDE 39#DEFAULT_LONGITUDE ${DEFAULT_LONGITUDE}#' \ -e 's#Ottawa#${LOCATION}#' ${WRKSRC}/src/custom.h post-patch-A4-on: @@ -82,12 +71,19 @@ 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 diff --git a/deskutils/remind/distinfo b/deskutils/remind/distinfo index 7389d6e1e606..0c483e074140 100644 --- a/deskutils/remind/distinfo +++ b/deskutils/remind/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1643135424 -SHA256 (remind-03.03.12.tar.gz) = d4aa4cda5a1b53e2acc631e935e031c00c77982ad4f0867286f7d8270954409e -SIZE (remind-03.03.12.tar.gz) = 424070 +TIMESTAMP = 1644690278 +SHA256 (remind-03.04.00.tar.gz) = b88a48ca0c55e65d76d8537cb33f8e31e421f222f8572f3b10cd7f0a316f2d52 +SIZE (remind-03.04.00.tar.gz) = 439400 diff --git a/deskutils/remind/files/patch-rem2html_Makefile.in b/deskutils/remind/files/patch-rem2html_Makefile.in index fcff8437266a..4c7c48a733aa 100644 --- a/deskutils/remind/files/patch-rem2html_Makefile.in +++ b/deskutils/remind/files/patch-rem2html_Makefile.in @@ -1,6 +1,6 @@ ---- rem2html/Makefile.in.orig 2021-10-16 12:02:17 UTC +--- rem2html/Makefile.in.orig 2022-02-10 22:15:01 UTC +++ rem2html/Makefile.in -@@ -12,16 +12,14 @@ all: +@@ -12,17 +12,15 @@ all: true install: @@ -11,6 +11,7 @@ - $(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; @@ -18,6 +19,7 @@ + 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 diff --git a/deskutils/remind/files/patch-src_Makefile b/deskutils/remind/files/patch-src_Makefile.in similarity index 69% rename from deskutils/remind/files/patch-src_Makefile rename to deskutils/remind/files/patch-src_Makefile.in index f64adc2a990d..b97ab8f15d13 100644 --- a/deskutils/remind/files/patch-src_Makefile +++ b/deskutils/remind/files/patch-src_Makefile.in @@ -1,16 +1,15 @@ ---- src/Makefile.in.orig 2007-10-09 19:45:41.000000000 +0300 -+++ src/Makefile.in 2007-10-09 19:46:25.000000000 +0300 -@@ -51,9 +51,12 @@ +--- 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 ++ done + for script in $(SCRIPTS) ; do \ + $(INSTALL_SCRIPT) $$script $(DESTDIR)$(bindir) || exit 1; \ -+ done + done rm -f $(DESTDIR)$(bindir)/rem > /dev/null 2>&1 || true ln -s remind $(DESTDIR)$(bindir)/rem - -mkdir -p $(DESTDIR)$(mandir)/man1 || true