[Midnightbsd-cvs] mports [15449] trunk/sysutils: Update several ports.

laffer1 at midnightbsd.org laffer1 at midnightbsd.org
Mon Sep 16 21:04:46 EDT 2013 

Revision: 15449
          http://svnweb.midnightbsd.org/mports/?rev=15449
Author:   laffer1
Date:     2013-09-16 21:04:45 -0400 (Mon, 16 Sep 2013)
Log Message:
-----------
Update several ports.

Modified Paths:
--------------
    trunk/sysutils/Makefile
    trunk/sysutils/ciso/Makefile
    trunk/sysutils/ciso/distinfo
    trunk/sysutils/ciso/pkg-descr
    trunk/sysutils/consolekit/Makefile
    trunk/sysutils/coreutils/Makefile
    trunk/sysutils/dvdbackup/Makefile
    trunk/sysutils/mdf2iso/distinfo
    trunk/sysutils/memtest86/Makefile
    trunk/sysutils/memtest86/distinfo
    trunk/sysutils/memtest86/files/pkg-message.in
    trunk/sysutils/obliterate/Makefile
    trunk/sysutils/obliterate/distinfo
    trunk/sysutils/openupsd/Makefile
    trunk/sysutils/p5-File-Listing/Makefile
    trunk/sysutils/p5-File-Listing/distinfo
    trunk/sysutils/p5-File-Which/Makefile
    trunk/sysutils/p5-File-Which/distinfo
    trunk/sysutils/p5-File-Which/pkg-descr
    trunk/sysutils/p5-Sys-Hostname-Long/distinfo
    trunk/sysutils/synergy/Makefile
    trunk/sysutils/system-tools-backends/Makefile
    trunk/sysutils/tarsnap/Makefile
    trunk/sysutils/tarsnap/distinfo
    trunk/sysutils/ucspi-tcp/Makefile

Added Paths:
-----------
    trunk/sysutils/ciso/files/patch-ciso.c
    trunk/sysutils/ciso/files/patch-ciso.h
    trunk/sysutils/openupsd/files/openupsd.in
    trunk/sysutils/synergy/files/
    trunk/sysutils/synergy/files/patch-CConfig.cpp
    trunk/sysutils/synergy/files/patch-CConfig.h
    trunk/sysutils/synergy/files/patch-gtest-port.h

Removed Paths:
-------------
    trunk/sysutils/openupsd/files/openupsd.sh

Modified: trunk/sysutils/Makefile
===================================================================
--- trunk/sysutils/Makefile	2013-09-17 01:04:24 UTC (rev 15448)
+++ trunk/sysutils/Makefile	2013-09-17 01:04:45 UTC (rev 15449)
@@ -113,6 +113,10 @@
 SUBDIR += xfce4-settings
 SUBDIR += zeitgeist
 SUBDIR += zetaback
+SUBDIR += zfs-periodic
+SUBDIR += zfs-replicate
+SUBDIR += zfs-snapshot-clean
+SUBDIR += zfs-snapshot-mgmt
 SUBDIR += zfs-stats
 SUBDIR += zfsnap
 SUBDIR += zfstools

Modified: trunk/sysutils/ciso/Makefile
===================================================================
--- trunk/sysutils/ciso/Makefile	2013-09-17 01:04:24 UTC (rev 15448)
+++ trunk/sysutils/ciso/Makefile	2013-09-17 01:04:45 UTC (rev 15449)
@@ -4,14 +4,15 @@
 PORTVERSION=	1.0.0
 PORTREVISION=	1
 CATEGORIES=	sysutils
-MASTER_SITES=	http://ciso.tenshu.fr/
+MASTER_SITES=	SF
 
 MAINTAINER=	ports at MidnightBSD.org
 COMMENT=	A tool to compress ISO images to CSO format
+
 LICENSE=	gpl2
 
 FAKE_OPTS=	trueprefix
-#USE_DOS2UNIX=	yes
+USE_DOS2UNIX=	yes
 
 PLIST_FILES=	bin/ciso
 

Modified: trunk/sysutils/ciso/distinfo
===================================================================
--- trunk/sysutils/ciso/distinfo	2013-09-17 01:04:24 UTC (rev 15448)
+++ trunk/sysutils/ciso/distinfo	2013-09-17 01:04:45 UTC (rev 15449)
@@ -1,2 +1,2 @@
-SHA256 (ciso-1.0.0.tar.gz) = 640dbd70f54f7857610f6e82c53893f468964d43c7a4d183efaa71f94b7b692a
-SIZE (ciso-1.0.0.tar.gz) = 9287
+SHA256 (ciso-1.0.0.tar.gz) = 2191dc3b12dc00678e8ed12f1276fc387fc95e2d00319a7ea81983892abf695b
+SIZE (ciso-1.0.0.tar.gz) = 9271

Added: trunk/sysutils/ciso/files/patch-ciso.c
===================================================================
--- trunk/sysutils/ciso/files/patch-ciso.c	                        (rev 0)
+++ trunk/sysutils/ciso/files/patch-ciso.c	2013-09-17 01:04:45 UTC (rev 15449)
@@ -0,0 +1,10 @@
+--- ciso.c-orig	2013-09-08 13:47:13.000000000 +0000
++++ ciso.c	2013-09-08 13:48:03.000000000 +0000
+@@ -24,6 +24,7 @@
+ #include <stdlib.h>
+ #include <zlib.h>               /* /usr(/local)/include/zlib.h */
+ #include <zconf.h>
++#include <string.h>
+ 
+ #include "ciso.h"
+ 

Added: trunk/sysutils/ciso/files/patch-ciso.h
===================================================================
--- trunk/sysutils/ciso/files/patch-ciso.h	                        (rev 0)
+++ trunk/sysutils/ciso/files/patch-ciso.h	2013-09-17 01:04:45 UTC (rev 15449)
@@ -0,0 +1,23 @@
+--- ciso.h.orig	2010-02-07 16:32:56.000000000 +0100
++++ ciso.h	2010-02-07 16:33:38.000000000 +0100
+@@ -19,6 +19,8 @@
+     Copyright 2005 BOOSTER
+ */
+ 
++#include <stdint.h>
++
+ 
+ #ifndef __CISO_H__
+ #define __CISO_H__
+@@ -28,9 +30,9 @@
+ typedef struct ciso_header
+ {
+ 	unsigned char magic[4];			/* +00 : 'C','I','S','O'                 */
+-	unsigned long header_size;		/* +04 : header size (==0x18)            */
++	uint32_t header_size;		/* +04 : header size (==0x18)            */
+ 	unsigned long long total_bytes;	/* +08 : number of original data size    */
+-	unsigned long block_size;		/* +10 : number of compressed block size */
++	uint32_t block_size;		/* +10 : number of compressed block size */
+ 	unsigned char ver;				/* +14 : version 01                      */
+ 	unsigned char align;			/* +15 : align of index value            */
+ 	unsigned char rsv_06[2];		/* +16 : reserved                        */

Modified: trunk/sysutils/ciso/pkg-descr
===================================================================
--- trunk/sysutils/ciso/pkg-descr	2013-09-17 01:04:24 UTC (rev 15448)
+++ trunk/sysutils/ciso/pkg-descr	2013-09-17 01:04:45 UTC (rev 15449)
@@ -1,5 +1,4 @@
 CISO - tiny and easy to use tool to convert ISO images
 in CSO (compressed ISO) format.
 
-Author:	Originaly coded by BOOSTER
-WWW:	http://ciso.tenshu.fr/
+WWW: http://sourceforge.net/projects/ciso/

Modified: trunk/sysutils/consolekit/Makefile
===================================================================
--- trunk/sysutils/consolekit/Makefile	2013-09-17 01:04:24 UTC (rev 15448)
+++ trunk/sysutils/consolekit/Makefile	2013-09-17 01:04:45 UTC (rev 15449)
@@ -2,7 +2,7 @@
 
 PORTNAME=	consolekit
 PORTVERSION=	0.4.3
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	sysutils gnome
 MASTER_SITES=	http://www.freedesktop.org/software/ConsoleKit/dist/
 DISTFILES=	ConsoleKit-${PORTVERSION}${EXTRACT_SUFX}
@@ -9,6 +9,7 @@
 
 MAINTAINER=	ports at MidnightBSD.org
 COMMENT=	Framework for defining and tracking users
+
 LICENSE=	gpl2
 
 LIB_DEPENDS=	dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib \
@@ -17,7 +18,7 @@
 WRKSRC=		${WRKDIR}/ConsoleKit-${PORTVERSION}
 USE_BZIP2=	yes
 USE_XORG=	x11
-USES=	pathfix gettext
+USES=	pathfix gettext pkgconfig
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes

Modified: trunk/sysutils/coreutils/Makefile
===================================================================
--- trunk/sysutils/coreutils/Makefile	2013-09-17 01:04:24 UTC (rev 15448)
+++ trunk/sysutils/coreutils/Makefile	2013-09-17 01:04:45 UTC (rev 15449)
@@ -2,7 +2,7 @@
 
 PORTNAME=	coreutils
 PORTVERSION=	8.20
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	sysutils textproc
 MASTER_SITES=	${MASTER_SITE_GNU}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -45,19 +45,20 @@
 	gusers.1 gvdir.1 gwc.1 gwho.1 gwhoami.1 gyes.1 gbase64.1 gsha224sum.1 \
 	gsha256sum.1 gsha384sum.1 gsha512sum.1 gshuf.1 gnproc.1
 
-OPTIONS=	GMP "Build with GNU Multiple Precision Arithmetic Library" off
+OPTIONS_DEFINE=	GMP NLS
+OPTIONS_DEFAULT=NLS
 
 .include <bsd.mport.options.mk>
 
-.if defined(WITHOUT_NLS)
+.if ${PORT_OPTIONS:MNLS}
+USES+=		gettext
+PLIST_SUB+=	NLS=""
+.else
 CONFIGURE_ARGS+=--disable-nls
 PLIST_SUB+=	NLS="@comment "
-.else
-USES+=	gettext
-PLIST_SUB+=	NLS=""
 .endif
 
-.if defined(WITH_GMP)
+.if ${PORT_OPTIONS:MGMP}
 LIB_DEPENDS+=	gmp:${PORTSDIR}/math/gmp
 .else
 CONFIGURE_ARGS+=--without-gmp

Modified: trunk/sysutils/dvdbackup/Makefile
===================================================================
--- trunk/sysutils/dvdbackup/Makefile	2013-09-17 01:04:24 UTC (rev 15448)
+++ trunk/sysutils/dvdbackup/Makefile	2013-09-17 01:04:45 UTC (rev 15449)
@@ -13,7 +13,6 @@
 
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
-MAKE_JOBS_SAFE=	yes
 
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib

Modified: trunk/sysutils/mdf2iso/distinfo
===================================================================
--- trunk/sysutils/mdf2iso/distinfo	2013-09-17 01:04:24 UTC (rev 15448)
+++ trunk/sysutils/mdf2iso/distinfo	2013-09-17 01:04:45 UTC (rev 15449)
@@ -1,3 +1,2 @@
 SHA256 (mdf2iso-0.3.0-src.tar.gz) = 734007c4ed957325a36bb8bd46fa14ec5be51276ce2271656d98ea8836561662
-RMD160 (mdf2iso-0.3.0-src.tar.gz) = 351f04703d3537aa86ab0e1d319da2509d484d75
 SIZE (mdf2iso-0.3.0-src.tar.gz) = 191783

Modified: trunk/sysutils/memtest86/Makefile
===================================================================
--- trunk/sysutils/memtest86/Makefile	2013-09-17 01:04:24 UTC (rev 15448)
+++ trunk/sysutils/memtest86/Makefile	2013-09-17 01:04:45 UTC (rev 15449)
@@ -1,11 +1,10 @@
 # $MidnightBSD: mports/sysutils/memtest86/Makefile,v 1.4 2011/01/25 14:14:45 laffer1 Exp $
 
 PORTNAME=	memtest86
-PORTVERSION=	4.0
+PORTVERSION=	4.0b
 CATEGORIES=	sysutils
 MASTER_SITES=	http://www.memtest86.com/
-DISTFILES=	${DISTNAME}${EXTRACT_SUFX} ${DISTNAME}.iso.zip
-EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
+DISTFILES=	${DISTNAME:S,b,s,}${EXTRACT_SUFX} ${DISTNAME:S,b,s,}.iso.zip
 
 MAINTAINER=	ports at MidnightBSD.org
 COMMENT=	Stand alone memory test for x86 architecture computers
@@ -18,23 +17,24 @@
 NO_BUILD=	yes
 
 PORTDOCS=	README
-PLIST_FILES=	%%DATADIR%%/floppy.bin %%DATADIR%%/Memtest86_4.0.iso
+PLIST_FILES=	%%DATADIR%%/floppy.bin \
+		%%DATADIR%%/Memtest86_4.0.iso
 PLIST_DIRS=	%%DATADIR%%
 
 SUB_FILES=	pkg-message
 
 post-extract:
-	@${UNZIP_CMD} -qo ${DISTDIR}/${DISTNAME}.iso.zip -d ${WRKSRC}
+	@${UNZIP_CMD} -qo ${DISTDIR}/${DISTNAME:S,b,s,}.iso.zip -d ${WRKSRC}
 
 do-install:
 	@${MKDIR} ${DATADIR}
-	${INSTALL_DATA} ${WRKSRC}/precomp.bin ${DATADIR}/floppy.bin
-	${INSTALL_DATA} ${WRKSRC}/Memtest86_${PORTVERSION}.iso \
-			${DATADIR}/Memtest86_${PORTVERSION}.iso
+	${INSTALL_DATA} ${WRKSRC:S,b,s,}/precomp.bin ${DATADIR}/floppy.bin
+	${INSTALL_DATA} ${WRKSRC}/Memtest86_${PORTVERSION:S,b,s,}.iso \
+			${DATADIR}/Memtest86_${PORTVERSION:S,b,,}.iso
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
 .for i in ${PORTDOCS}
-	${INSTALL_DATA} ${WRKSRC}/${i} ${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC:S,b,s,}/${i} ${DOCSDIR}
 .endfor
 .endif
 

Modified: trunk/sysutils/memtest86/distinfo
===================================================================
--- trunk/sysutils/memtest86/distinfo	2013-09-17 01:04:24 UTC (rev 15448)
+++ trunk/sysutils/memtest86/distinfo	2013-09-17 01:04:45 UTC (rev 15449)
@@ -1,6 +1,4 @@
-SHA256 (memtest86-4.0.tar.gz) = a998d21d61d1d4f38856c1d840523bfcc4835799855c228dcf1d01e174424afc
-RMD160 (memtest86-4.0.tar.gz) = 84cc12957741950ff8d26b8847875b77eeceb6ae
-SIZE (memtest86-4.0.tar.gz) = 134766
-SHA256 (memtest86-4.0.iso.zip) = 3c8f660291d58f064ecaba737d1dd9c245b9ed7bc0bf277a0dfdcd814af6b850
-RMD160 (memtest86-4.0.iso.zip) = 98ad620253a5fce56e35e3a90460ce5d579c7206
-SIZE (memtest86-4.0.iso.zip) = 688227
+SHA256 (memtest86-4.0s.tar.gz) = 05270483eef83683ede190750951387c4a7173568f5c8d7b82bb06824836cb79
+SIZE (memtest86-4.0s.tar.gz) = 157262
+SHA256 (memtest86-4.0s.iso.zip) = b3741456fd006bd1903b3a99f1e44966bf1421deb91343b8c64b8bc37dcec8bc
+SIZE (memtest86-4.0s.iso.zip) = 773918

Modified: trunk/sysutils/memtest86/files/pkg-message.in
===================================================================
--- trunk/sysutils/memtest86/files/pkg-message.in	2013-09-17 01:04:24 UTC (rev 15448)
+++ trunk/sysutils/memtest86/files/pkg-message.in	2013-09-17 01:04:45 UTC (rev 15449)
@@ -1,6 +1,7 @@
-Usage:
-
-1) Insert blank floppy
-2) dd if=%%DATADIR%%/floppy.bin of=/dev/fd0
-3) Boot the floppy
 *
+* Usage:
+*
+* 1) Insert blank floppy
+* 2) dd if=%%DATADIR%%/floppy.bin of=/dev/fd0
+* 3) Boot the floppy
+*

Modified: trunk/sysutils/obliterate/Makefile
===================================================================
--- trunk/sysutils/obliterate/Makefile	2013-09-17 01:04:24 UTC (rev 15448)
+++ trunk/sysutils/obliterate/Makefile	2013-09-17 01:04:45 UTC (rev 15449)
@@ -1,10 +1,4 @@
-# New ports collection makefile for:    obliterate
-# Date created:         17 Nov 1999
-# Whom:                 Wes Peters <wes at FreeBSD.ORG>
-#
-# $FreeBSD: ports/sysutils/obliterate/Makefile,v 1.11 2005/01/19 06:23:01 wes Exp $
 # $MidnightBSD: mports/sysutils/obliterate/Makefile,v 1.3 2007/10/25 02:57:51 laffer1 Exp $ 
-#
 
 PORTNAME=	obliterate
 PORTVERSION=	0.5
@@ -11,10 +5,11 @@
 PORTREVISION=	1
 CATEGORIES=	sysutils
 MASTER_SITES=	${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= wes
+MASTER_SITE_SUBDIR=wes
 
 MAINTAINER=	ports at MidnightBSD.ORG
 COMMENT=	Securely delete file[s]
+
 LICENSE=	bsd2
 
 FAKE_OPTS+=	trueprefix

Modified: trunk/sysutils/obliterate/distinfo
===================================================================
--- trunk/sysutils/obliterate/distinfo	2013-09-17 01:04:24 UTC (rev 15448)
+++ trunk/sysutils/obliterate/distinfo	2013-09-17 01:04:45 UTC (rev 15449)
@@ -1,3 +1,2 @@
 SHA256 (obliterate-0.5.tar.gz) = b035a84d3de3ef740ff25b34c19d16d34cc02ef22521f08ea71dd735b9134574
-RMD160 (obliterate-0.5.tar.gz) = 6542612023209ff952d1a0189ffa4ae2073bb2e0
 SIZE (obliterate-0.5.tar.gz) = 4680

Modified: trunk/sysutils/openupsd/Makefile
===================================================================
--- trunk/sysutils/openupsd/Makefile	2013-09-17 01:04:24 UTC (rev 15448)
+++ trunk/sysutils/openupsd/Makefile	2013-09-17 01:04:45 UTC (rev 15449)
@@ -8,6 +8,7 @@
 
 PORTNAME=	openupsd
 PORTVERSION=	0.3.1
+PORTREVISION=	1
 CATEGORIES=	sysutils
 MASTER_SITES=	http://frmb.org/download/
 
@@ -15,18 +16,13 @@
 COMMENT=	A UPS daemon for some Belkin UPS's
 LICENSE=	gpl2
 
-USE_RC_SUBR=	yes
+USE_RC_SUBR=	${PORTNAME}
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--program-transform-name= --bindir=${PREFIX}/sbin
 
-PLIST_FILES=	sbin/openupsd etc/openupsd.conf.sample etc/rc.d/openupsd.sh
+PLIST_FILES=	sbin/openupsd etc/openupsd.conf.sample
 
-post-extract:
-	@${SED} -e 's#%%RC_SUBR%%#${RC_SUBR}#g' -e 's#%%PREFIX%%#${PREFIX}#g' \
-		${FILESDIR}/openupsd.sh > ${WRKDIR}/openupsd.sh
-
 post-install:
 	${INSTALL_DATA} ${WRKSRC}/openupsd.conf ${PREFIX}/etc/openupsd.conf.sample
-	${INSTALL_SCRIPT} ${WRKDIR}/openupsd.sh ${PREFIX}/etc/rc.d/
 
 .include <bsd.port.mk>

Added: trunk/sysutils/openupsd/files/openupsd.in
===================================================================
--- trunk/sysutils/openupsd/files/openupsd.in	                        (rev 0)
+++ trunk/sysutils/openupsd/files/openupsd.in	2013-09-17 01:04:45 UTC (rev 15449)
@@ -0,0 +1,23 @@
+#!/bin/sh
+#
+# $MidnightBSD$
+#
+# PROVIDE: openupsd
+# REQUIRE: LOGIN
+# KEYWORD: shutdown
+
+openupsd_enable=${openupsd_enable:-"NO"}
+
+. /etc/rc.subr
+
+name="openupsd"
+rcvar=openupsd_enable
+
+pidfile=/var/run/${name}.pid
+required_files=%%PREFIX%%/etc/${name}.conf
+
+command=%%PREFIX%%/sbin/openupsd
+command_args="-p ${pidfile}"
+
+load_rc_config $name
+run_rc_command "$1"

Deleted: trunk/sysutils/openupsd/files/openupsd.sh
===================================================================
--- trunk/sysutils/openupsd/files/openupsd.sh	2013-09-17 01:04:24 UTC (rev 15448)
+++ trunk/sysutils/openupsd/files/openupsd.sh	2013-09-17 01:04:45 UTC (rev 15449)
@@ -1,23 +0,0 @@
-#!/bin/sh
-#
-# $FreeBSD: ports/sysutils/openupsd/files/openupsd.sh,v 1.3 2006/02/20 20:47:43 dougb Exp $
-#
-# PROVIDE: openupsd
-# REQUIRE: LOGIN
-# KEYWORD: shutdown
-
-openupsd_enable=${openupsd_enable:-"NO"}
-
-. %%RC_SUBR%%
-
-name="openupsd"
-rcvar=`set_rcvar`
-
-pidfile=/var/run/${name}.pid
-required_files=%%PREFIX%%/etc/${name}.conf
-
-command=%%PREFIX%%/sbin/openupsd
-command_args="-p ${pidfile}"
-
-load_rc_config $name
-run_rc_command "$1"

Modified: trunk/sysutils/p5-File-Listing/Makefile
===================================================================
--- trunk/sysutils/p5-File-Listing/Makefile	2013-09-17 01:04:24 UTC (rev 15448)
+++ trunk/sysutils/p5-File-Listing/Makefile	2013-09-17 01:04:45 UTC (rev 15449)
@@ -1,8 +1,7 @@
 # $MidnightBSD$
-# $FreeBSD: ports/sysutils/p5-File-Listing/Makefile,v 1.3 2011/09/23 12:43:01 culot Exp $
 
 PORTNAME=	File-Listing
-PORTVERSION=	6.03
+PORTVERSION=	6.04
 CATEGORIES=	sysutils perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
@@ -9,6 +8,7 @@
 
 MAINTAINER=	ports at MidnightBSD.org
 COMMENT=	Parse directory listings
+
 LICENSE=	perl
 
 RUN_DEPENDS=	p5-HTTP-Date>=6:${PORTSDIR}/www/p5-HTTP-Date

Modified: trunk/sysutils/p5-File-Listing/distinfo
===================================================================
--- trunk/sysutils/p5-File-Listing/distinfo	2013-09-17 01:04:24 UTC (rev 15448)
+++ trunk/sysutils/p5-File-Listing/distinfo	2013-09-17 01:04:45 UTC (rev 15449)
@@ -1,3 +1,2 @@
-SHA256 (File-Listing-6.03.tar.gz) = 23e96035f2759f211d3e9027d608c5fb6c81ba1b7cdd1079c6fa597613b99094
-RMD160 (File-Listing-6.03.tar.gz) = d56987dd8cdcf1b749344017b2a6cbf46bd1be73
-SIZE (File-Listing-6.03.tar.gz) = 51415
+SHA256 (File-Listing-6.04.tar.gz) = 1e0050fcd6789a2179ec0db282bf1e90fb92be35d1171588bd9c47d52d959cf5
+SIZE (File-Listing-6.04.tar.gz) = 51536

Modified: trunk/sysutils/p5-File-Which/Makefile
===================================================================
--- trunk/sysutils/p5-File-Which/Makefile	2013-09-17 01:04:24 UTC (rev 15448)
+++ trunk/sysutils/p5-File-Which/Makefile	2013-09-17 01:04:45 UTC (rev 15449)
@@ -4,11 +4,11 @@
 PORTVERSION=	1.09
 CATEGORIES=	sysutils perl5
 MASTER_SITES=	CPAN
-MASTER_SITE_SUBDIR=	File
 PKGNAMEPREFIX=	p5-
 
 MAINTAINER=	ports at MidnightBSD.org
 COMMENT=	Portable implementation of `which' in Perl
+
 LICENSE=	perl
 
 PERL_CONFIGURE=	yes

Modified: trunk/sysutils/p5-File-Which/distinfo
===================================================================
--- trunk/sysutils/p5-File-Which/distinfo	2013-09-17 01:04:24 UTC (rev 15448)
+++ trunk/sysutils/p5-File-Which/distinfo	2013-09-17 01:04:45 UTC (rev 15449)
@@ -1,4 +1,2 @@
-MD5 (File-Which-1.09.tar.gz) = b9429edaad7f45caafa4d458afcfd8af
 SHA256 (File-Which-1.09.tar.gz) = b72fec6590160737cba97293c094962adf4f7d44d9e68dde7062ecec13f4b2c3
-RMD160 (File-Which-1.09.tar.gz) = 2ebbe4afe4bdefada7f66c726a4156cbaecd0490
 SIZE (File-Which-1.09.tar.gz) = 15637

Modified: trunk/sysutils/p5-File-Which/pkg-descr
===================================================================
--- trunk/sysutils/p5-File-Which/pkg-descr	2013-09-17 01:04:24 UTC (rev 15448)
+++ trunk/sysutils/p5-File-Which/pkg-descr	2013-09-17 01:04:45 UTC (rev 15449)
@@ -3,3 +3,5 @@
 installed somewhere in your PATH, or just check for its existence. It
 includes the command-line utility `pwhich' which has the same function
 as `which'.
+
+WWW: http://search.cpan.org/dist/File-Which/

Modified: trunk/sysutils/p5-Sys-Hostname-Long/distinfo
===================================================================
--- trunk/sysutils/p5-Sys-Hostname-Long/distinfo	2013-09-17 01:04:24 UTC (rev 15448)
+++ trunk/sysutils/p5-Sys-Hostname-Long/distinfo	2013-09-17 01:04:45 UTC (rev 15449)
@@ -1,4 +1,2 @@
-MD5 (Sys-Hostname-Long-1.4.tar.gz) = a5b3c23754cbcff10e283d16c42ec3d3
 SHA256 (Sys-Hostname-Long-1.4.tar.gz) = 9db6c8cd3ca0ba8dbf19969ed0a936cecb7f555c1cc8077b08cf8bf78b10c143
-RMD160 (Sys-Hostname-Long-1.4.tar.gz) = d4ea949ed6d4a4fceaaea2952e46aaf0ecae65c6
 SIZE (Sys-Hostname-Long-1.4.tar.gz) = 4991

Modified: trunk/sysutils/synergy/Makefile
===================================================================
--- trunk/sysutils/synergy/Makefile	2013-09-17 01:04:24 UTC (rev 15448)
+++ trunk/sysutils/synergy/Makefile	2013-09-17 01:04:45 UTC (rev 15449)
@@ -13,9 +13,9 @@
 
 USE_CMAKE=	yes
 USE_XORG=	ice xtst x11 sm
-MAKE_ENV+=	PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
-		PTHREAD_LIBS="${PTHREAD_LIBS}"
 
+MAKE_JOBS_UNSAFE=yes
+
 CFLAGS+=	-L${LOCALBASE}/lib -I${LOCALBASE}/include
 
 PLIST_FILES=	bin/synergys bin/synergyc

Added: trunk/sysutils/synergy/files/patch-CConfig.cpp
===================================================================
--- trunk/sysutils/synergy/files/patch-CConfig.cpp	                        (rev 0)
+++ trunk/sysutils/synergy/files/patch-CConfig.cpp	2013-09-17 01:04:45 UTC (rev 15449)
@@ -0,0 +1,14 @@
+--- src/lib/server/CConfig.cpp.orig	2011-01-21 11:51:35.000000000 +0800
++++ src/lib/server/CConfig.cpp	2013-09-12 17:23:04.000000000 +0800
+@@ -1908,9 +1908,9 @@
+ 	return m_line;
+ }
+ 
+-CConfigReadContext::operator void*() const
++CConfigReadContext::operator bool() const
+ {
+-	return m_stream;
++	return !m_stream.bad();
+ }
+ 
+ bool

Added: trunk/sysutils/synergy/files/patch-CConfig.h
===================================================================
--- trunk/sysutils/synergy/files/patch-CConfig.h	                        (rev 0)
+++ trunk/sysutils/synergy/files/patch-CConfig.h	2013-09-17 01:04:45 UTC (rev 15449)
@@ -0,0 +1,11 @@
+--- src/lib/server/CConfig.h.orig	2013-09-12 16:03:30.000000000 +0800
++++ src/lib/server/CConfig.h	2013-09-12 16:04:07.000000000 +0800
+@@ -483,7 +483,7 @@
+ 	bool			readLine(CString&);
+ 	UInt32			getLineNumber() const;
+ 
+-	operator void*() const;
++	operator bool() const;
+ 	bool			operator!() const;
+ 
+ 	OptionValue		parseBoolean(const CString&) const;

Added: trunk/sysutils/synergy/files/patch-gtest-port.h
===================================================================
--- trunk/sysutils/synergy/files/patch-gtest-port.h	                        (rev 0)
+++ trunk/sysutils/synergy/files/patch-gtest-port.h	2013-09-17 01:04:45 UTC (rev 15449)
@@ -0,0 +1,11 @@
+--- tools/gtest-1.6.0/include/gtest/internal/gtest-port.h.orig	2011-05-07 10:25:30.000000000 +0800
++++ tools/gtest-1.6.0/include/gtest/internal/gtest-port.h	2013-09-12 17:39:09.000000000 +0800
+@@ -204,6 +204,8 @@
+ #define GTEST_NAME_ "Google Test"
+ #define GTEST_PROJECT_URL_ "http://code.google.com/p/googletest/"
+ 
++#define GTEST_USE_OWN_TR1_TUPLE 1
++
+ // Determines the version of gcc that is used to compile this.
+ #ifdef __GNUC__
+ // 40302 means version 4.3.2.

Modified: trunk/sysutils/system-tools-backends/Makefile
===================================================================
--- trunk/sysutils/system-tools-backends/Makefile	2013-09-17 01:04:24 UTC (rev 15448)
+++ trunk/sysutils/system-tools-backends/Makefile	2013-09-17 01:04:45 UTC (rev 15449)
@@ -2,7 +2,7 @@
 
 PORTNAME=	system-tools-backends
 PORTVERSION=	2.10.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	sysutils gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome2
@@ -18,6 +18,7 @@
 RUN_DEPENDS=	${SITE_PERL}/${PERL_ARCH}/Net/DBus.pm:${PORTSDIR}/devel/p5-Net-DBus
 
 USE_BZIP2=	yes
+USES=		pkgconfig
 USE_GMAKE=	yes
 USE_PERL5=	yes
 USE_GNOME=	gnomehack intlhack glib20

Modified: trunk/sysutils/tarsnap/Makefile
===================================================================
--- trunk/sysutils/tarsnap/Makefile	2013-09-17 01:04:24 UTC (rev 15448)
+++ trunk/sysutils/tarsnap/Makefile	2013-09-17 01:04:45 UTC (rev 15449)
@@ -1,7 +1,7 @@
 # $MidnightBSD$
 
 PORTNAME=	tarsnap
-PORTVERSION=	1.0.33
+PORTVERSION=	1.0.35
 CATEGORIES=	sysutils
 MASTER_SITES=	http://www.tarsnap.com/download-http/
 DISTNAME=	${PORTNAME}-autoconf-${PORTVERSION}
@@ -9,6 +9,7 @@
 
 MAINTAINER=	ports at MidnightBSD.org
 COMMENT=	Online encrypted backup service (client)
+
 LICENSE=	restricted
 
 RESTRICTED=	license restricts redistribution of source and binaries

Modified: trunk/sysutils/tarsnap/distinfo
===================================================================
--- trunk/sysutils/tarsnap/distinfo	2013-09-17 01:04:24 UTC (rev 15448)
+++ trunk/sysutils/tarsnap/distinfo	2013-09-17 01:04:45 UTC (rev 15449)
@@ -1,2 +1,3 @@
-SHA256 (tarsnap-autoconf-1.0.33.tgz) = 0c0d825a8c9695fc8d44c5d8c3cd17299c248377c9c7b91fdb49d73e54ae0b7d
-SIZE (tarsnap-autoconf-1.0.33.tgz) = 569831
+SHA256 (tarsnap-autoconf-1.0.35.tgz) = 6c9f6756bc43bc225b842f7e3a0ec7204e0cf606e10559d27704e1cc33098c9a
+SIZE (tarsnap-autoconf-1.0.35.tgz) = 600115
+

Modified: trunk/sysutils/ucspi-tcp/Makefile
===================================================================
--- trunk/sysutils/ucspi-tcp/Makefile	2013-09-17 01:04:24 UTC (rev 15448)
+++ trunk/sysutils/ucspi-tcp/Makefile	2013-09-17 01:04:45 UTC (rev 15449)
@@ -2,7 +2,7 @@
 
 PORTNAME=	ucspi-tcp
 PORTVERSION=	0.88
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	sysutils net
 MASTER_SITES=	http://cr.yp.to/ucspi-tcp/ \
 		${MASTER_SITE_FREEBSD_LOCAL}
@@ -14,15 +14,14 @@
 COMMENT=	Command-line tools for building TCP client-server applications
 LICENSE=	restricted
 
-OPTIONS=	MAN "Install man(1) pages" on \
-		RSS_DIFF "Patch rblsmtpd for qmail users" off \
-		SSL "Adds support for SSL (Secure Socket Layer)" off \
-		RBL2SMTPD "Don't drop connection, pass envvar to smtpd" off \
-		LIMITS "Implement per-connection and other limits" off \
-		IPV6 "Add IPv6 support" off
+OPTIONS_DEFINE=	MANPAGES RSS_DIFF RBL2SMTPD IPV6 SSL LIMITS
+OPTIONS_DEFAULT=MANPAGES
 
-MAKE_JOBS_SAFE=	yes
+RSS_DIFF_DESC=	Patch rblsmtpd for qmail users
+RBL2SMTPD_DESC=	Don't drop connection, pass envvar to smtpd
+LIMITS_DESC=	Implement per-connection and other limits
 
+
 ALL_TARGET=	prog install instcheck
 
 SCRIPTS_ENV=	BINOWN="${BINOWN}" \
@@ -53,7 +52,7 @@
 .include <bsd.port.pre.mk>
 
 # SSL and LIMITS can't coexist
-.if defined(WITH_SSL) && defined(WITH_LIMITS)
+.if ${PORT_OPTIONS:MSSL} && ${PORT_OPTIONS:MLIMITS}
 BROKEN=	SSL and LIMITS options cannot coexist, please choose one of them
 .endif
 
@@ -62,7 +61,7 @@
 CFLAGS+=	-O
 .endif
 
-.if defined(WITH_MAN)
+.if ${PORT_OPTIONS:MMANPAGES}
 MASTER_SITES+=	http://smarden.org/pape/djb/manpages/:man \
 		${MASTER_SITE_LOCAL:S/$/:man/}
 MASTER_SITE_SUBDIR+=	garga/ucspi-tcp/:man
@@ -73,12 +72,12 @@
 		tcpclient.1 tcprules.1 tcprulescheck.1 tcpserver.1 who at .1
 .endif
 
-.if defined(WITH_RSS_DIFF)
+.if ${PORT_OPTIONS:MRSS_DIFF}
 PATCH_SITES+=	http://www.qmail.org/:rss
 PATCHFILES+=	ucspi-rss.diff:rss
 .endif
 
-.if defined(WITH_SSL)
+.if ${PORT_OPTIONS:MSSL}
 # we can't use USE_OPENSSL=yes after including bsd.port.pre.mk
 .include "${PORTSDIR}/Mk/bsd.openssl.mk"
 PATCH_SITES+=	http://www.nrg4u.com/qmail/:ssl
@@ -85,26 +84,26 @@
 PATCHFILES+=	ucspi-tcp-ssl-20050405.patch.gz:ssl
 .endif
 
-.if defined(WITH_RBL2SMTPD)
+.if ${PORT_OPTIONS:MRBL2SMTPD}
 PATCHFILES+=	ucspi-tcp_rbl2smtpd.diff:rbl2smtpd
 .endif
 
-.if defined(WITH_LIMITS)
+.if ${PORT_OPTIONS:MLIMITS}
 PATCH_SITES+=	http://linux.voyager.hr/ucspi-tcp/files/:limits
 PATCHFILES+=	tcpserver-limits-2006-01-26.diff:limits
 .endif
 
+.if ${PORT_OPTIONS:MIPV6}
 # Neither can IPv6 and SSL
-.if defined(WITH_IPV6) && defined(WITH_SSL)
-BROKEN= SSL and IPv6 options cannot coexist, please choose one of them
-.endif
+. if ${PORT_OPTIONS:MSSL}
+BROKEN=	SSL and IPv6 options cannot coexist, please choose one of them
+. endif
 
 # Same for IPv6 and LIMITS
-.if defined(WITH_IPV6) && defined(WITH_LIMITS)
-BROKEN= IPv6 and LIMITS options cannot coexist, please choose one of them
-.endif
+. if ${PORT_OPTIONS:MLIMITS}
+BROKEN=	IPv6 and LIMITS options cannot coexist, please choose one of them
+. endif
 
-.if defined(WITH_IPV6)
 PATCH_SITES+=	http://www.fefe.de/ucspi/:ipv6
 PATCHFILES+=	ucspi-tcp-0.88-ipv6.diff19.bz2:ipv6
 .endif
@@ -113,7 +112,7 @@
 PATCH_SITE_SUBDIR+=	garga/ucspi-tcp/:rss,ssl,rbl2smtpd
 
 post-patch:
-.if defined(WITH_SSL)
+.if ${PORT_OPTIONS:MSSL}
 	@${REINPLACE_CMD} -e 's|#INCS=-I/usr/local/include|INCS=-I${OPENSSLBASE}/include|g; \
 			      s|-lcrypto|-L${OPENSSLBASE}/lib |g' \
 		${WRKSRC}/Makefile
@@ -131,7 +130,7 @@
 .for file_name in ${SCRIPTS}
 	@${INSTALL_SCRIPT} ${WRKSRC}/${file_name} ${PREFIX}/bin
 .endfor
-.if defined(WITH_MAN)
+.if ${PORT_OPTIONS:MMANPAGES}
 . for file_name in ${MAN1}
 	${INSTALL_MAN} ${WRKSRC}-man/${file_name} ${MAN1PREFIX}/man/man1/
 . endfor

More information about the Midnightbsd-cvs mailing list