From owner-svn-ports-all@freebsd.org Fri Aug 12 21:32:54 2016 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 6D1A0BB8CF7; Fri, 12 Aug 2016 21:32:54 +0000 (UTC) (envelope-from ehaupt@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 mx1.freebsd.org (Postfix) with ESMTPS id 4AA581B2E; Fri, 12 Aug 2016 21:32:54 +0000 (UTC) (envelope-from ehaupt@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u7CLWrMB031602; Fri, 12 Aug 2016 21:32:53 GMT (envelope-from ehaupt@FreeBSD.org) Received: (from ehaupt@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u7CLWrgC031599; Fri, 12 Aug 2016 21:32:53 GMT (envelope-from ehaupt@FreeBSD.org) Message-Id: <201608122132.u7CLWrgC031599@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ehaupt set sender to ehaupt@FreeBSD.org using -f From: Emanuel Haupt Date: Fri, 12 Aug 2016 21:32:53 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r420143 - in head/misc/ddate: . files X-SVN-Group: ports-head 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.22 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: Fri, 12 Aug 2016 21:32:54 -0000 Author: ehaupt Date: Fri Aug 12 21:32:53 2016 New Revision: 420143 URL: https://svnweb.freebsd.org/changeset/ports/420143 Log: 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 (via mail) Added: head/misc/ddate/files/patch-ddate.c (contents, props changed) Deleted: head/misc/ddate/files/patch-misc-utils__ddate.c Modified: head/misc/ddate/Makefile head/misc/ddate/distinfo Modified: head/misc/ddate/Makefile ============================================================================== --- head/misc/ddate/Makefile Fri Aug 12 21:30:41 2016 (r420142) +++ head/misc/ddate/Makefile Fri Aug 12 21:32:53 2016 (r420143) @@ -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 +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 Modified: head/misc/ddate/distinfo ============================================================================== --- head/misc/ddate/distinfo Fri Aug 12 21:30:41 2016 (r420142) +++ head/misc/ddate/distinfo Fri Aug 12 21:32:53 2016 (r420143) @@ -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 Added: head/misc/ddate/files/patch-ddate.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/misc/ddate/files/patch-ddate.c Fri Aug 12 21:32:53 2016 (r420143) @@ -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 */ +