1
0
mirror of https://git.FreeBSD.org/ports.git synced 2024-12-24 04:33:24 +00:00

Update to 2.22

Feature safe:	yes
This commit is contained in:
Emanuel Haupt 2012-11-23 21:12:45 +00:00
parent 2b25c29408
commit 166ce1a40f
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=307686
4 changed files with 22 additions and 27 deletions

View File

@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= ddate
PORTVERSION= 2.21
PORTVERSION= 2.22
PORTEPOCH= 1
CATEGORIES= misc
MASTER_SITES= http://www.kernel.org/pub/linux/utils/util-linux/v${PORTVERSION}/ \
@ -17,14 +17,19 @@ LICENSE= GPLv2
PLIST_FILES= bin/ddate
GNU_CONFIGURE= yes
USE_BZIP2= yes
USE_XZ= yes
MAKE_JOBS_SAFE= yes
MAN1= ddate.1
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
#OPTIONS= USFORMAT "Use US time format" off \
# PRAISEBOB "Use SubGenius slogans" off \
# KILLBOB "Use countdown to X-Day" on
MAN1= ddate.1
OPTIONS_DEFINE= USFORMAT PRAISEBOB KILLBOB

View File

@ -1,2 +1,2 @@
SHA256 (util-linux-2.21.tar.bz2) = 2813ae6fe0449b60402e122c2baf97f26aa53e6e2dd05591c6cbcdf67ffdb6c6
SIZE (util-linux-2.21.tar.bz2) = 4756532
SHA256 (util-linux-2.22.tar.xz) = 32b329aa72c2ea546378bf81f08e30cf30440196c2edf7777b4f509a3fdbe5a2
SIZE (util-linux-2.22.tar.xz) = 3183868

View File

@ -1,13 +0,0 @@
--- ./configure.orig 2012-03-07 11:14:14.000000000 +0100
+++ ./configure 2012-03-07 11:16:07.000000000 +0100
@@ -19695,8 +19695,9 @@
ac_config_headers="$ac_config_headers config.h"
-ac_config_files="$ac_config_files disk-utils/Makefile fdisk/Makefile fsck/Makefile getopt/Makefile hwclock/Makefile include/Makefile lib/Makefile login-utils/Makefile Makefile man/ru/Makefile misc-utils/chkdupexe:misc-utils/chkdupexe.pl misc-utils/Makefile mount/Makefile partx/Makefile po/Makefile.in schedutils/Makefile libblkid/blkid.pc libblkid/Makefile libblkid/docs/Makefile libblkid/docs/version.xml libblkid/src/Makefile libblkid/src/blkid.h libblkid/src/superblocks/Makefile libblkid/src/topology/Makefile libblkid/src/partitions/Makefile libblkid/samples/Makefile libmount/mount.pc libmount/Makefile libmount/src/Makefile libmount/src/libmount.h libmount/docs/Makefile libmount/docs/version.xml libuuid/uuid.pc libuuid/Makefile libuuid/man/Makefile libuuid/src/Makefile sys-utils/Makefile term-utils/Makefile tests/commands.sh tests/helpers/Makefile tests/Makefile text-utils/Makefile"
+#ac_config_files="$ac_config_files disk-utils/Makefile fdisk/Makefile fsck/Makefile getopt/Makefile hwclock/Makefile include/Makefile lib/Makefile login-utils/Makefile Makefile man/ru/Makefile misc-utils/chkdupexe:misc-utils/chkdupexe.pl misc-utils/Makefile mount/Makefile partx/Makefile po/Makefile.in schedutils/Makefile libblkid/blkid.pc libblkid/Makefile libblkid/docs/Makefile libblkid/docs/version.xml libblkid/src/Makefile libblkid/src/blkid.h libblkid/src/superblocks/Makefile libblkid/src/topology/Makefile libblkid/src/partitions/Makefile libblkid/samples/Makefile libmount/mount.pc libmount/Makefile libmount/src/Makefile libmount/src/libmount.h libmount/docs/Makefile libmount/docs/version.xml libuuid/uuid.pc libuuid/Makefile libuuid/man/Makefile libuuid/src/Makefile sys-utils/Makefile term-utils/Makefile tests/commands.sh tests/helpers/Makefile tests/Makefile text-utils/Makefile"
+ac_config_files="$ac_config_files include/Makefile lib/Makefile misc-utils/Makefile"
cat >confcache <<\_ACEOF

View File

@ -1,21 +1,24 @@
--- ./misc-utils/ddate.c.orig 2011-12-18 21:29:45.802837000 +0100
+++ ./misc-utils/ddate.c 2012-03-07 11:19:23.000000000 +0100
@@ -51,7 +51,7 @@
--- ./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
+/* #define KILL_BOB 13013 */
+/*
#define KILL_BOB 13013
+*/
/* If you wish ddate(1) to contain SubGenius slogans, define PRAISE_BOB */
@@ -62,8 +62,9 @@
@@ -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"