ddate has been officially removed from util-linux and move to github [1].

The new version scheme requires EPOCH to be bumped. While here switch to new
option helpers.

[1] https://git.kernel.org/cgit/utils/util-linux/util-linux.git/commit/?id=b77ce61eb31e3b7ab8295e848ef741e43b16ca87

Notified by:	Kathie Dart <kathiedart@gmail.com> (via mail)

4 files changed, 28 insertions, 64 deletions

diff --git a/misc/ddate/Makefile b/misc/ddate/Makefile
index c4ddc351ff67..d79e3d98173a 100644
--- a/misc/ddate/Makefile
+++ b/misc/ddate/Makefile
@@ -2,31 +2,19 @@
 # $FreeBSD$
 
 PORTNAME=	ddate
-PORTVERSION=	2.22.2
-PORTEPOCH=	1
+PORTVERSION=	0.2.1.2016062701
+DISTVERSIONPREFIX=	v
+PORTEPOCH=	2
 CATEGORIES=	misc
-MASTER_SITES=	http://www.kernel.org/pub/linux/utils/util-linux/v${PORTVERSION:C/^([0-9]*\.[0-9]*).*/\1/}/ \
-		LOCAL/ehaupt
-DISTNAME=	util-linux-${PORTVERSION}
 
 MAINTAINER=	ehaupt@FreeBSD.org
 COMMENT=	Command to print the date in Discordian date format
 
 LICENSE=	GPLv2
 
-PLIST_FILES=	bin/ddate man/man1/ddate.1.gz
-
-GNU_CONFIGURE=	yes
-USES=		tar:xz
-
-CONFIGURE_ARGS=	--disable-libuuid --disable-libblkid --disable-libmount \
-		--disable-mount --disable-losetup --disable-fsck \
-		--disable-partx --disable-uuidd --disable-mountpoint \
-		--disable-fallocate --disable-unshare --disable-eject \
-		--disable-agetty --disable-cramfs --disable-switch_root \
-		--disable-pivot_root --disable-kill --disable-utmpdump \
-		--disable-rename --disable-login --disable-sulogin \
-		--disable-su --disable-schedutils --disable-wall
+USE_GITHUB=	yes
+GH_ACCOUNT=	bo0ts
+GH_TAGNAME=	899ca66
 
 OPTIONS_DEFINE=	USFORMAT PRAISEBOB KILLBOB
 
@@ -36,28 +24,17 @@ KILLBOB_DESC=	Countdown to X-Day
 
 OPTIONS_DEFAULT=KILLBOB
 
-.include <bsd.port.options.mk>
+USFORMAT_CFLAGS=	-DUS_FORMAT=\"1\"
+PRAISEBOB_CFLAGS=	-DPRAISE_BOB=\"13013\"
+KILLBOB_CFLAGS=		-DKILL_BOB=\"13013\"
 
-.if ${PORT_OPTIONS:MUSFORMAT}
-CFLAGS+=	-DUS_FORMAT=\"1\"
-.endif
-
-.if ${PORT_OPTIONS:MPRAISEBOB}
-CFLAGS+=	-DPRAISE_BOB=\"13013\"
-.endif
-
-.if ${PORT_OPTIONS:MKILLBOB}
-CFLAGS+=	-DKILL_BOB=\"13013\"
-.endif
+PLIST_FILES=	bin/ddate man/man1/ddate.1.gz
 
 do-build:
-	${CC} ${WRKSRC}/misc-utils/ddate.c ${CFLAGS} \
-		-o ${WRKSRC}/misc-utils/${PORTNAME}
+	${CC} ${CFLAGS} ${WRKSRC}/${PORTNAME}.c -o ${WRKSRC}/${PORTNAME}
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/misc-utils/${PORTNAME} \
-		${STAGEDIR}${PREFIX}/bin
-	${INSTALL_MAN} ${WRKSRC}/misc-utils/ddate.1 \
-		${STAGEDIR}${MANPREFIX}/man/man1
+	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin
+	${INSTALL_MAN} ${WRKSRC}/${PORTNAME}.1 ${STAGEDIR}${MANPREFIX}/man/man1
 
 .include <bsd.port.mk>
diff --git a/misc/ddate/distinfo b/misc/ddate/distinfo
index 9a0e45f935f6..daf1bc1cd433 100644
--- a/misc/ddate/distinfo
+++ b/misc/ddate/distinfo
@@ -1,2 +1,3 @@
-SHA256 (util-linux-2.22.2.tar.xz) = 929b517fa39b16a61ec536514e08940a381b92befc629d0348e3097920dd2f12
-SIZE (util-linux-2.22.2.tar.xz) = 3100832
+TIMESTAMP = 1471035398
+SHA256 (bo0ts-ddate-v0.2.1.2016062701-899ca66_GH0.tar.gz) = a962b9170c906978e317526411ce9b9f4ace858e916d74826ee0dc19eeec6d18
+SIZE (bo0ts-ddate-v0.2.1.2016062701-899ca66_GH0.tar.gz) = 8073
diff --git a/misc/ddate/files/patch-ddate.c b/misc/ddate/files/patch-ddate.c
new file mode 100644
index 000000000000..f54e490a9497
--- /dev/null
+++ b/misc/ddate/files/patch-ddate.c
@@ -0,0 +1,12 @@
+--- ddate.c.orig	2016-08-12 21:07:26 UTC
++++ ddate.c
+@@ -64,7 +64,9 @@
+  * Church of the SubGenius and do not wish your copy of ddate(1) to contain
+  * code for counting down to X-Day, undefine KILL_BOB */
+ 
++/*
+ #define KILL_BOB 13013
++*/
+ 
+ /* If you wish ddate(1) to contain SubGenius slogans, define PRAISE_BOB */
+ 
diff --git a/misc/ddate/files/patch-misc-utils__ddate.c b/misc/ddate/files/patch-misc-utils__ddate.c
deleted file mode 100644
index 241cb580a3eb..000000000000
--- a/misc/ddate/files/patch-misc-utils__ddate.c
+++ /dev/null
@@ -1,26 +0,0 @@
---- ./misc-utils/ddate.c.orig	2012-07-23 23:21:56.336319000 +0200
-+++ ./misc-utils/ddate.c	2012-11-23 21:47:57.000000000 +0100
-@@ -51,7 +51,9 @@
-  * Church of the SubGenius and do not wish your copy of ddate(1) to contain
-  * code for counting down to X-Day, undefine KILL_BOB */
- 
-+/*
- #define KILL_BOB 13013
-+*/
- 
- /* If you wish ddate(1) to contain SubGenius slogans, define PRAISE_BOB */
- 
-@@ -62,9 +64,10 @@
- #include <time.h>
- #include <stdio.h>
- 
--#include "nls.h"
--#include "closestream.h"
--#include "c.h"
-+#include "../include/nls.h"
-+#include "../include/closestream.h"
-+#include "../include/c.h"
-+#include "../config.h"
- 
- #ifndef __GNUC__
- #define inline /* foo */