Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 22 Sep 2020 19:57:09 +0000 (UTC)
From:      Mateusz Piotrowski <0mp@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r549630 - in head/deskutils/cal: . files
Message-ID:  <202009221957.08MJv9xE059921@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
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 <bsd.port.mk>

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



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202009221957.08MJv9xE059921>