Stagify, cleanup Makefile, improve port description.

3 files changed, 46 insertions, 56 deletions

diff --git a/sysutils/hfsutils/Makefile b/sysutils/hfsutils/Makefile
index 5619b878b206..8aa3f5164a4c 100644
--- a/sysutils/hfsutils/Makefile
+++ b/sysutils/hfsutils/Makefile
@@ -14,78 +14,43 @@ LICENSE=	GPLv2
 
 CONFLICTS=	hfs-[0-9]*
 
+USES=		gmake			# passing -jX breaks BSD make(1)
 GNU_CONFIGURE=	yes
-USE_GMAKE=	yes			# passing -jX breaks BSD make(1)
 ALL_TARGET=	all hfsck/hfsck
 
-MAN1=		hattrib.1 \
-		hcd.1 \
-		hcopy.1 \
-		hdel.1 \
-		hdir.1 \
-		hformat.1 \
-		hfsutils.1 \
-		hls.1 \
-		hmkdir.1 \
-		hmount.1 \
-		hpwd.1 \
-		hrename.1 \
-		hrmdir.1 \
-		humount.1 \
-		hvol.1
+PORTDOCS=	*
 
 OPTIONS_DEFINE=	TCLTK DEVLIBS DOCS
+OPTIONS_SUB=	yes
 
 TCLTK_DESC=	Enable Tcl interface (HFS "shell") and Tk-based GUI
 DEVLIBS_DESC=	Install developer libraries and header files
 
-PORTDOCS=	*
-
-NO_STAGE=	yes
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MTCLTK}
-CATEGORIES+=	tcl tk
-
-USES=		tk
+TCLTK_CATEGORIES=	tcl tk
+TCLTK_USES=		tk
+TCLTK_CPPFLAGS=		-I${LOCALBASE}/include
+TCLTK_CONFIGURE_ON=	--with-tcl=${TCL_LIBDIR} --with-tk=${TK_LIBDIR}
+TCLTK_CONFIGURE_OFF=	--without-tcl --without-tk
 
-CONFIGURE_ARGS=	--with-tcl=${TCL_LIBDIR} --with-tk=${TK_LIBDIR}
-CPPFLAGS+=	-I${LOCALBASE}/include
+DEVLIBS_CONFIGURE_ON=	--enable-devlibs
 
-MAN1+=		hfs.1 \
-		hfssh.1 \
-		xhfs.1
-
-PLIST_FILES+=	bin/hfs \
-		bin/hfssh \
-		bin/xhfs
-.else
-CONFIGURE_ARGS=	--without-tcl --without-tk
-.endif
-
-.if ${PORT_OPTIONS:MDEVLIBS}
-CONFIGURE_ARGS+=	--enable-devlibs
-
-PLIST_FILES+=	include/hfs.h \
-		include/rsrc.h \
-		lib/libhfs.a \
-		lib/librsrc.a
-.endif
+.include <bsd.port.options.mk>
 
 post-patch:
 # Unbreak against Tcl 8.6
 	@${ECHO_CMD} '#define USE_INTERP_RESULT 1' >> ${WRKSRC}/config.h.in
+# Allow staging (support DESTDIR)
+	@${FIND} ${WRKSRC} -type f -name Makefile.in | ${XARGS} \
+		${REINPLACE_CMD} -e '/^...DEST =/s,@,$$(DESTDIR)&,'
 
 post-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/hfsck/hfsck ${PREFIX}/bin
+	${INSTALL_PROGRAM} ${WRKSRC}/hfsck/hfsck ${STAGEDIR}${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
+	@${CHMOD} 755 ${STAGEDIR}${PREFIX}/bin/hfs
 .endif
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+.for f in BLURB CHANGES README TODO doc/*.txt
+	${INSTALL_DATA} ${WRKSRC}/${f} ${STAGEDIR}${DOCSDIR}
+.endfor
 
 .include <bsd.port.mk>
diff --git a/sysutils/hfsutils/pkg-descr b/sysutils/hfsutils/pkg-descr
index 773ec5415632..67100a73e2af 100644
--- a/sysutils/hfsutils/pkg-descr
+++ b/sysutils/hfsutils/pkg-descr
@@ -1,7 +1,7 @@
 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.
+floppy disks, CD-ROMs, and SCSI hard disks on most Unix platforms.  You can
+also format raw media or file into an HFS volume.
 
 This package contains a number of different tools:
 
diff --git a/sysutils/hfsutils/pkg-plist b/sysutils/hfsutils/pkg-plist
index 3fd0b2c7ae93..faaa5a43658f 100644
--- a/sysutils/hfsutils/pkg-plist
+++ b/sysutils/hfsutils/pkg-plist
@@ -4,7 +4,9 @@ bin/hcopy
 bin/hdel
 bin/hdir
 bin/hformat
+%%TCLTK%%bin/hfs
 bin/hfsck
+%%TCLTK%%bin/hfssh
 bin/hls
 bin/hmkdir
 bin/hmount
@@ -13,3 +15,26 @@ bin/hrename
 bin/hrmdir
 bin/humount
 bin/hvol
+%%TCLTK%%bin/xhfs
+%%DEVLIBS%%include/hfs.h
+%%DEVLIBS%%include/rsrc.h
+%%DEVLIBS%%lib/libhfs.a
+%%DEVLIBS%%lib/librsrc.a
+man/man1/hattrib.1.gz
+man/man1/hcd.1.gz
+man/man1/hcopy.1.gz
+man/man1/hdel.1.gz
+man/man1/hdir.1.gz
+man/man1/hformat.1.gz
+%%TCLTK%%man/man1/hfs.1.gz
+%%TCLTK%%man/man1/hfssh.1.gz
+man/man1/hfsutils.1.gz
+man/man1/hls.1.gz
+man/man1/hmkdir.1.gz
+man/man1/hmount.1.gz
+man/man1/hpwd.1.gz
+man/man1/hrename.1.gz
+man/man1/hrmdir.1.gz
+man/man1/humount.1.gz
+man/man1/hvol.1.gz
+%%TCLTK%%man/man1/xhfs.1.gz