diff options
| -rw-r--r-- | deskutils/cal/Makefile | 35 | ||||
| -rw-r--r-- | deskutils/cal/distinfo | 5 | ||||
| -rw-r--r-- | deskutils/cal/files/patch-cal.1 | 17 | ||||
| -rw-r--r-- | deskutils/cal/files/patch-cal.c | 27 | ||||
| -rw-r--r-- | deskutils/cal/files/patch-makefile.unx | 18 | ||||
| -rw-r--r-- | deskutils/cal/pkg-descr | 18 | ||||
| -rw-r--r-- | deskutils/cal/pkg-plist | 6 |
7 files changed, 29 insertions, 97 deletions
diff --git a/deskutils/cal/Makefile b/deskutils/cal/Makefile index 8825e8142dc7..91da341e20ca 100644 --- a/deskutils/cal/Makefile +++ b/deskutils/cal/Makefile @@ -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> diff --git a/deskutils/cal/distinfo b/deskutils/cal/distinfo index ff99f44708d8..1720135c63ab 100644 --- a/deskutils/cal/distinfo +++ b/deskutils/cal/distinfo @@ -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 diff --git a/deskutils/cal/files/patch-cal.1 b/deskutils/cal/files/patch-cal.1 deleted file mode 100644 index 5208947b67f2..000000000000 --- a/deskutils/cal/files/patch-cal.1 +++ /dev/null @@ -1,17 +0,0 @@ ---- cal.1.orig 1996-07-05 17:55:52 UTC -+++ cal.1 -@@ -375,12 +375,12 @@ Unix local color file - .TP - .B caldat - .TP --.B /usr/lib/caldat -+.B %%PREFIX%%/etc/cal/caldat - Unix global date files - .TP - .B calcol - .TP --.B /usr/lib/calcol -+.B %%PREFIX%%/etc/cal/calcol - Unix global color files - .TP - .B ~/.dates diff --git a/deskutils/cal/files/patch-cal.c b/deskutils/cal/files/patch-cal.c deleted file mode 100644 index ef363a9b2d59..000000000000 --- a/deskutils/cal/files/patch-cal.c +++ /dev/null @@ -1,27 +0,0 @@ ---- cal.c.orig 1996-07-11 19:36:33 UTC -+++ cal.c -@@ -130,6 +130,10 @@ BASIC DATA STRUCTURE: - /* Note: Other unix systems may require this next re-define to work. */ - /* I believe that SCO is one such system. Please send in any fixes */ - /* needed to get your system running. */ -+#ifdef __FreeBSD__ /* Make FreeBSD compatible with stricmp() */ -+#define stricmp(a,b) strcasecmp(a,b) /* case-insensitive string comparison */ -+#endif -+ - #ifdef __linux__ /* Make linux compatible with stricmp() */ - #define stricmp(a,b) strcasecmp(a,b) /* case-insensitive string comparison */ - #endif -@@ -1401,8 +1405,12 @@ FILE *efopen(const char *file, const cha - strcpy(str, "."); - strcpy(str, file); - if ((fp = fopen(str, mode)) == NULL) { -- /* If still not found then look in a lib directory */ -+ /* If still not found then look in config directory */ -+#ifdef PREFIX -+ strcpy(str, PREFIX "/etc/cal/"); -+#else - strcpy(str, "/usr/lib/"); -+#endif - strcat(str,file); - fp = fopen(str, mode); - } diff --git a/deskutils/cal/files/patch-makefile.unx b/deskutils/cal/files/patch-makefile.unx deleted file mode 100644 index e5ce64735937..000000000000 --- a/deskutils/cal/files/patch-makefile.unx +++ /dev/null @@ -1,18 +0,0 @@ ---- makefile.unx.orig 1996-03-04 21:36:27 UTC -+++ makefile.unx -@@ -7,9 +7,13 @@ - # To use, enter "make -f makefile.unx" - - RM=rm -f --CC=gcc -+CC?=gcc --CFLAGS=-O -Wall -DUNIX -DUSE_REMINDER -+CFLAGS+=-Wall -DUNIX -DUSE_REMINDER - -+.ifdef PREFIX -+CFLAGS+=-DPREFIX="\"${PREFIX}\"" -+.endif -+ - BINDIR=/usr/bin - MANDIR=/usr/man - diff --git a/deskutils/cal/pkg-descr b/deskutils/cal/pkg-descr index 482cefb92be1..f4537e70f4a6 100644 --- a/deskutils/cal/pkg-descr +++ b/deskutils/cal/pkg-descr @@ -2,37 +2,21 @@ CAL is a nicely-enhanced version of the Unix `cal' command. 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 diff --git a/deskutils/cal/pkg-plist b/deskutils/cal/pkg-plist index f4a04c87869f..bfae000aa652 100644 --- a/deskutils/cal/pkg-plist +++ b/deskutils/cal/pkg-plist @@ -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 |