From owner-svn-ports-all@freebsd.org Tue Sep 22 19:57:10 2020 Return-Path: Delivered-To: svn-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 6CE643F499C; Tue, 22 Sep 2020 19:57:10 +0000 (UTC) (envelope-from 0mp@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 "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4BwsXQ0wBKz4X8R; Tue, 22 Sep 2020 19:57:10 +0000 (UTC) (envelope-from 0mp@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id DCAB024AC4; Tue, 22 Sep 2020 19:57:09 +0000 (UTC) (envelope-from 0mp@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 08MJv9bO059924; Tue, 22 Sep 2020 19:57:09 GMT (envelope-from 0mp@FreeBSD.org) Received: (from 0mp@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 08MJv9xE059921; Tue, 22 Sep 2020 19:57:09 GMT (envelope-from 0mp@FreeBSD.org) Message-Id: <202009221957.08MJv9xE059921@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: 0mp set sender to 0mp@FreeBSD.org using -f From: Mateusz Piotrowski <0mp@FreeBSD.org> Date: Tue, 22 Sep 2020 19:57:09 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r549630 - in head/deskutils/cal: . files X-SVN-Group: ports-head X-SVN-Commit-Author: 0mp X-SVN-Commit-Paths: in head/deskutils/cal: . files X-SVN-Commit-Revision: 549630 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 22 Sep 2020 19:57:10 -0000 Author: 0mp Date: Tue Sep 22 19:57:08 2020 New Revision: 549630 URL: https://svnweb.freebsd.org/changeset/ports/549630 Log: Update to 4.1 - Take maintainership - Change MASTER_SITES to the one used by other projects like HaikuPorts - Set LICENSE_FILE - Build the port manually via do-build; there is no point in patching the official makefile, it's is too fragile - Remove all the patches, they are no longer needed - Shorten pkg-descr & set WWW - Install the manual page under share/man/man1 Deleted: head/deskutils/cal/files/ Modified: head/deskutils/cal/Makefile head/deskutils/cal/distinfo head/deskutils/cal/pkg-descr head/deskutils/cal/pkg-plist Modified: head/deskutils/cal/Makefile ============================================================================== --- head/deskutils/cal/Makefile Tue Sep 22 19:57:07 2020 (r549629) +++ head/deskutils/cal/Makefile Tue Sep 22 19:57:08 2020 (r549630) @@ -2,28 +2,37 @@ # $FreeBSD$ PORTNAME= cal -PORTVERSION= 3.5 -PORTREVISION= 1 +DISTVERSION= 4.1 CATEGORIES= deskutils -MASTER_SITES= SUNSITE/utils/shell +MASTER_SITES= http://unicorn.us.com/pub/ +DISTNAME= ${PORTNAME}${DISTVERSION:C/[^0-9]//} -MAINTAINER= ports@FreeBSD.org +MAINTAINER= 0mp@FreeBSD.org COMMENT= Enhanced color version of standard calendar utility LICENSE= PD +LICENSE_FILE= ${WRKSRC}/readme.cal -WRKSRC= ${WRKDIR}/cal-3.5/source -MAKEFILE= makefile.unx -ALL_TARGET= cal +USES= zip -post-patch: - @${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|' ${WRKSRC}/cal.1 +CFLAGS+= -DPREFIX='"${ETCDIR}"' -DUSE_REMINDER +PORTDOCS= readme.cal + +OPTIONS_DEFINE= DOCS + +do-build: + ${SETENV} ${MAKE_ENV} ${CC} ${CFLAGS} -o ${WRKSRC}/cal ${WRKSRC}/src/cal.c + do-install: ${INSTALL_PROGRAM} ${WRKSRC}/cal ${STAGEDIR}${PREFIX}/bin/cal - ${INSTALL_MAN} ${WRKSRC}/cal.1 ${STAGEDIR}${MANPREFIX}/man/man1 - @${MKDIR} ${STAGEDIR}${PREFIX}/etc/cal - ${INSTALL_DATA} ${WRKDIR}/cal-3.5/cal.col ${STAGEDIR}${ETCDIR}/calcol.sample - ${INSTALL_DATA} ${WRKDIR}/cal-3.5/cal.dat ${STAGEDIR}${ETCDIR}/caldat.sample + ${INSTALL_MAN} ${WRKSRC}/src/cal.1 ${STAGEDIR}${MANPREFIX}/share/man/man1 + @${MKDIR} ${STAGEDIR}${ETCDIR} + ${INSTALL_DATA} ${WRKSRC}/cal.col ${STAGEDIR}${ETCDIR}/cal.col.sample + ${INSTALL_DATA} ${WRKSRC}/cal.dat ${STAGEDIR}${ETCDIR}/cal.dat.sample + +post-install-DOCS-on: + @${MKDIR} ${STAGEDIR}${DOCSDIR} + ${INSTALL_DATA} ${WRKSRC}/${PORTDOCS} ${STAGEDIR}${DOCSDIR} .include Modified: head/deskutils/cal/distinfo ============================================================================== --- head/deskutils/cal/distinfo Tue Sep 22 19:57:07 2020 (r549629) +++ head/deskutils/cal/distinfo Tue Sep 22 19:57:08 2020 (r549630) @@ -1,2 +1,3 @@ -SHA256 (cal-3.5.tar.gz) = 637b7301228035e53ed19965fe6489b8df83d614f519d301b4d1337bb7097b61 -SIZE (cal-3.5.tar.gz) = 47645 +TIMESTAMP = 1600801440 +SHA256 (cal41.zip) = 96318b738970237832e4594cb363058f4243f54e86a5f1e06737fb5d02e6c298 +SIZE (cal41.zip) = 38642 Modified: head/deskutils/cal/pkg-descr ============================================================================== --- head/deskutils/cal/pkg-descr Tue Sep 22 19:57:07 2020 (r549629) +++ head/deskutils/cal/pkg-descr Tue Sep 22 19:57:08 2020 (r549630) @@ -2,37 +2,21 @@ CAL is a nicely-enhanced version of the Unix `cal' com Features: * Hilights today's date when displaying a monthly calendar. - * Displays an optional user-definable list of `special day' descriptions (like appointments) to the right of the monthly calendar display. Cal can be set optionally to ignore appointments older than the current day. Next month's appointments are shown if there is room to do so. Multiple appointment data files may also be specified on the commandline. - * You can specify your own appointment and color definition files on the commandline, or use the defaults. - * Date descriptions can display "years since" a given year, useful for birthdays and anniversaries. - * Completely configurable colors -- eight separate color attributes. - * No ANSI driver needed for colors, and the output may be redirected anywhere, just like the Unix version. However, ANSI color control may be enabled (e.g. for Unix) with a #define in the source code. - * Commandline-compatible with Unix `cal' command, but with several enhanced switch settings. -Requests, bug reports, suggestions, donations, proposals for -contract work, and so forth may be sent to: - - Attn: Alex Matulich - Unicorn Research Corporation - 4621 N. Landmark Drive - Orlando, FL 32817-1235 - USA - 407-657-4974 FAX 407-657-6149 - -or send e-mail to matulich_a@seaa.navsea.navy.mil. +WWW: http://unicorn.us.com/cal.html Modified: head/deskutils/cal/pkg-plist ============================================================================== --- head/deskutils/cal/pkg-plist Tue Sep 22 19:57:07 2020 (r549629) +++ head/deskutils/cal/pkg-plist Tue Sep 22 19:57:08 2020 (r549630) @@ -1,4 +1,4 @@ bin/cal -@sample %%ETCDIR%%/calcol.sample -@sample %%ETCDIR%%/caldat.sample -man/man1/cal.1.gz +@sample %%ETCDIR%%/cal.col.sample +@sample %%ETCDIR%%/cal.dat.sample +share/man/man1/cal.1.gz