From owner-svn-ports-head@FreeBSD.ORG Wed May 22 09:48:13 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id 197F217B; Wed, 22 May 2013 09:48:13 +0000 (UTC) (envelope-from danfe@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id EE906861; Wed, 22 May 2013 09:48:12 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r4M9mCOS027738; Wed, 22 May 2013 09:48:12 GMT (envelope-from danfe@svn.freebsd.org) Received: (from danfe@localhost) by svn.freebsd.org (8.14.6/8.14.5/Submit) id r4M9mCaX027732; Wed, 22 May 2013 09:48:12 GMT (envelope-from danfe@svn.freebsd.org) Message-Id: <201305220948.r4M9mCaX027732@svn.freebsd.org> From: Alexey Dokuchaev Date: Wed, 22 May 2013 09:48:12 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r318760 - head/emulators/hfsutils X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 22 May 2013 09:48:13 -0000 Author: danfe Date: Wed May 22 09:48:12 2013 New Revision: 318760 URL: http://svnweb.freebsd.org/changeset/ports/318760 Log: - Trim Makefile header per recent agreements - Define LICENSE (GPLv2), reword COMMENT line - Install several PORTDOCS (like Gentoo) - Make Tcl/Tk support optional and default to off - Fix the build with Tcl 8.6 (obtained from Gentoo) - Install hfsck(1) utility (sadly, no manpage) - Cleanup and reformat port description while here This port (along with similar `emulators/hfs') should probably be moved to sysutils; `sysutils/hfsexplorer' already lives there. Modified: head/emulators/hfsutils/Makefile head/emulators/hfsutils/pkg-descr head/emulators/hfsutils/pkg-plist Modified: head/emulators/hfsutils/Makefile ============================================================================== --- head/emulators/hfsutils/Makefile Wed May 22 09:33:35 2013 (r318759) +++ head/emulators/hfsutils/Makefile Wed May 22 09:48:12 2013 (r318760) @@ -1,26 +1,21 @@ -# New ports collection makefile for: hfsutils -# Date Created: 7 Sep 1997 -# Whom: Vanilla I. Shu -# +# Created by: Vanilla I. Shu # $FreeBSD$ -# PORTNAME= hfsutils PORTVERSION= 3.2.6 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= emulators tk MASTER_SITES= ftp://ftp.mars.org/pub/hfs/ MAINTAINER= ports@FreeBSD.org -COMMENT= Yet Another HFS Utility +COMMENT= Utilities for accessing Apple's HFS volumes -CONFLICTS= hfs-[0-9]* +LICENSE= GPLv2 -USE_TCL= 84 -USE_TK= 84 +CONFLICTS= hfs-[0-9]* GNU_CONFIGURE= yes -CONFIGURE_ARGS= --with-tcl=${TCL_LIBDIR} --with-tk=${TK_LIBDIR} +ALL_TARGET= all hfsck/hfsck MAN1= hattrib.1 \ hcd.1 \ @@ -28,8 +23,6 @@ MAN1= hattrib.1 \ hdel.1 \ hdir.1 \ hformat.1 \ - hfs.1 \ - hfssh.1 \ hfsutils.1 \ hls.1 \ hmkdir.1 \ @@ -38,10 +31,47 @@ MAN1= hattrib.1 \ hrename.1 \ hrmdir.1 \ humount.1 \ - hvol.1 \ + hvol.1 + +OPTIONS_DEFINE= TCLTK DOCS +TCLTK_DESC= Build tools that require Tcl/Tk support + +PORTDOCS= * + +.include + +.if ${PORT_OPTIONS:MTCLTK} +USE_TCL= 84+ +USE_TK= 84+ + +CONFIGURE_ARGS= --with-tcl=${TCL_LIBDIR} --with-tk=${TK_LIBDIR} +CPPFLAGS+= -I${LOCALBASE}/include + +MAN1+= hfs.1 \ + hfssh.1 \ xhfs.1 +PLIST_FILES+= bin/hfs \ + bin/hfssh \ + bin/xhfs +.else +CONFIGURE_ARGS= --without-tcl --without-tk +.endif + +post-patch: +# Unbreak against Tcl 8.6 + @${ECHO_CMD} '#define USE_INTERP_RESULT 1' >> ${WRKSRC}/config.h.in + post-install: - ${CHMOD} 755 ${PREFIX}/bin/hfs + ${INSTALL_PROGRAM} ${WRKSRC}/hfsck/hfsck ${PREFIX}/bin +.if ${PORT_OPTIONS:MTCLTK} + @${CHMOD} 755 ${PREFIX}/bin/hfs +.endif +.if ${PORT_OPTIONS:MDOCS} + @${MKDIR} ${DOCSDIR} +. for f in BLURB CHANGES README TODO doc/*.txt + ${INSTALL_DATA} ${WRKSRC}/${f} ${DOCSDIR} +. endfor +.endif .include Modified: head/emulators/hfsutils/pkg-descr ============================================================================== --- head/emulators/hfsutils/pkg-descr Wed May 22 09:33:35 2013 (r318759) +++ head/emulators/hfsutils/pkg-descr Wed May 22 09:48:12 2013 (r318760) @@ -1,14 +1,16 @@ - HFS is the "Hierarchical File System" used on modern Macintosh computers. - With this package, you can read and write Macintosh-formatted media such as - floppy disks, CD-ROMs, and SCSI hard disks on most UNIX platforms. You can - also format raw media into an HFS volume. +HFS is the "Hierarchical File System" used on modern Macintosh computers. +With this package, you can read and write Macintosh-formatted media such as +floppy disks, CD-ROMs, and SCSI hard disks on most UNIX platforms. You can +also format raw media into an HFS volume. - This package contains a number of different tools: +This package contains a number of different tools: - * Several command-line programs (hmount, hls, hcopy, et al.) - * A Tk-based front-end for browsing and copying files through a - variety of transfer modes (MacBinary, BinHex, text, etc.) - * A Tcl package and interface for scriptable access to volumes - * A C library for low-level access to volumes + - Several command-line programs (hmount, hls, hcopy, et al.) + - Tk-based front-end for browsing and copying files through a + variety of transfer modes (MacBinary, BinHex, text, etc.) + - Tcl package and interface for scriptable access to volumes + - C library for low-level access to volumes + +Support for Apple's new Extended Format (HFS+) is currently not available. WWW: http://www.mars.org/home/rob/proj/hfs/ Modified: head/emulators/hfsutils/pkg-plist ============================================================================== --- head/emulators/hfsutils/pkg-plist Wed May 22 09:33:35 2013 (r318759) +++ head/emulators/hfsutils/pkg-plist Wed May 22 09:48:12 2013 (r318760) @@ -4,8 +4,7 @@ bin/hcopy bin/hdel bin/hdir bin/hformat -bin/hfs -bin/hfssh +bin/hfsck bin/hls bin/hmkdir bin/hmount @@ -14,4 +13,3 @@ bin/hrename bin/hrmdir bin/humount bin/hvol -bin/xhfs