Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 22 Mar 2016 00:33:51 +0000 (UTC)
From:      Dmitry Marakasov <amdmi3@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r411630 - in head/sysutils/hfsutils: . files
Message-ID:  <201603220033.u2M0XpZ7088191@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: amdmi3
Date: Tue Mar 22 00:33:51 2016
New Revision: 411630
URL: https://svnweb.freebsd.org/changeset/ports/411630

Log:
  - Clarify LICENSE
  - Add LICENSE_FILE
  - Switch to options helpers
  - Regenerate patches with `make makepatch`

Modified:
  head/sysutils/hfsutils/Makefile
  head/sysutils/hfsutils/files/patch-Makefile.in

Modified: head/sysutils/hfsutils/Makefile
==============================================================================
--- head/sysutils/hfsutils/Makefile	Tue Mar 22 00:23:10 2016	(r411629)
+++ head/sysutils/hfsutils/Makefile	Tue Mar 22 00:33:51 2016	(r411630)
@@ -10,7 +10,8 @@ MASTER_SITES=	ftp://ftp.mars.org/pub/hfs
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Utilities for accessing Apple's HFS volumes
 
-LICENSE=	GPLv2
+LICENSE=	GPLv2+
+LICENSE_FILE=	${WRKSRC}/COPYING
 
 CONFLICTS=	hfs-[0-9]*
 
@@ -34,8 +35,6 @@ TCLTK_CONFIGURE_OFF=	--without-tcl --wit
 
 DEVLIBS_CONFIGURE_ON=	--enable-devlibs
 
-.include <bsd.port.options.mk>
-
 post-patch:
 # Unbreak against Tcl 8.6
 	@${ECHO_CMD} '#define USE_INTERP_RESULT 1' >> ${WRKSRC}/config.h.in
@@ -45,9 +44,11 @@ post-patch:
 
 post-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/hfsck/hfsck ${STAGEDIR}${PREFIX}/bin
-.if ${PORT_OPTIONS:MTCLTK}
+
+post-install-TCLTK-on:
 	@${CHMOD} 755 ${STAGEDIR}${PREFIX}/bin/hfs
-.endif
+
+post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 .for f in BLURB CHANGES README TODO doc/*.txt
 	${INSTALL_DATA} ${WRKSRC}/${f} ${STAGEDIR}${DOCSDIR}

Modified: head/sysutils/hfsutils/files/patch-Makefile.in
==============================================================================
--- head/sysutils/hfsutils/files/patch-Makefile.in	Tue Mar 22 00:23:10 2016	(r411629)
+++ head/sysutils/hfsutils/files/patch-Makefile.in	Tue Mar 22 00:33:51 2016	(r411630)
@@ -1,6 +1,6 @@
---- Makefile.in.orig	Tue Sep  1 02:40:14 1998
-+++ Makefile.in	Wed Nov  4 17:32:21 1998
-@@ -64,7 +64,8 @@
+--- Makefile.in.orig	1998-08-31 18:40:14 UTC
++++ Makefile.in
+@@ -64,7 +64,8 @@ TARGETS =	$(CLITARGETS) $(TCLTARGETS) $(
  
  CLITARGETS =	hattrib hcd hcopy hdel hdir hformat hls hmkdir hmount hpwd  \
  		hrename hrmdir humount hvol
@@ -10,7 +10,7 @@
  TKTARGETS =	xhfs
  
  LIBHFS =	libhfs/libhfs.a
-@@ -96,7 +97,7 @@
+@@ -96,7 +97,7 @@ UTILOBJS =	crc.o binhex.o copyin.o copyo
  all  :: @MAKE_TARGETS@
  
  all_cli :: $(CLITARGETS)
@@ -19,7 +19,7 @@
  all_tk  :: $(TKTARGETS)
  all_lib :: $(LIBHFS) $(LIBRSRC)
  
-@@ -129,9 +130,13 @@
+@@ -129,9 +130,13 @@ install_tcl :: all_tcl
  		$(BININSTALL) $$file "$(BINDEST)/.";  \
  	done
  



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201603220033.u2M0XpZ7088191>