- Update to 2.18

- Support STAGEDIR

3 files changed, 18 insertions, 11 deletions

diff --git a/emulators/cpmtools2/Makefile b/emulators/cpmtools2/Makefile
index 861c6f5d39e5..a4f5983be6f2 100644
--- a/emulators/cpmtools2/Makefile
+++ b/emulators/cpmtools2/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	cpmtools2
-PORTVERSION=	2.16
+PORTVERSION=	2.18
 CATEGORIES=	emulators sysutils
 MASTER_SITES=	http://www.moria.de/~michael/cpmtools/
 DISTNAME=	${PORTNAME:C/2$//}-${PORTVERSION}
@@ -12,14 +12,11 @@ COMMENT=	Tools to access CP/M disks and disk images
 
 LICENSE=	GPLv3
 
-NO_STAGE=	yes
+USES=	desthack
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS+=--bindir=${PREFIX}/sbin \
+CONFIGURE_ARGS+=--bindir=${STAGEDIR}${PREFIX}/sbin \
 		--datarootdir=${DATADIR}
 
-MAN1=	cpmls.1 cpmcp.1 cpmrm.1 cpmchmod.1 cpmchattr.1 mkfs.cpm.1 fsck.cpm.1 fsed.cpm.1
-MAN5=	cpm.5
-
 OPTIONS_DEFINE=	LIBDSK
 
 LIBDSK_DESC=	Access to disks and disk images support
@@ -30,13 +27,14 @@ LIBDSK_LIB_DEPENDS+=	libdsk.so:${PORTSDIR}/emulators/libdsk
 
 # remove unneeded getopt*.c
 # remove curses from all but fsed.cpm
+# fixes for stage
 post-patch:
 	@${REINPLACE_CMD} -e 's|getopt$$(OBJEXT)||g; s|getopt1$$(OBJEXT)||g' \
-		${WRKSRC}/Makefile.in
-	@${REINPLACE_CMD} -e 's|\($$(CC).*fsed.cpm$$(OBJEXT).*$$(DEVICEOBJ)\)|\1 -lcurses|' \
+		-e 's|\($$(CC).*fsed.cpm$$(OBJEXT).*$$(DEVICEOBJ)\)|\1 -lcurses|' \
+		-e 's|diskdefs @datarootdir@/diskdefs|diskdefs $$(DESTDIR)@datarootdir@/diskdefs|' \
 		${WRKSRC}/Makefile.in
 
 pre-install:
-	@${MKDIR} ${DATADIR}
+	@${MKDIR} ${STAGEDIR}${DATADIR}
 
 .include <bsd.port.mk>
diff --git a/emulators/cpmtools2/distinfo b/emulators/cpmtools2/distinfo
index 982d99d6e31e..47c4cae78d57 100644
--- a/emulators/cpmtools2/distinfo
+++ b/emulators/cpmtools2/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cpmtools-2.16.tar.gz) = 12b8832ea15e88c6755a2801caa6fab4e1e2cda18468206b5c7acb16232897af
-SIZE (cpmtools-2.16.tar.gz) = 181842
+SHA256 (cpmtools-2.18.tar.gz) = cef4437227ed75957d6065b4aa630fa84529215e1b7c64dc5bfc2986923a0ef7
+SIZE (cpmtools-2.18.tar.gz) = 185331
diff --git a/emulators/cpmtools2/pkg-plist b/emulators/cpmtools2/pkg-plist
index 28487d201db6..848b872eee62 100644
--- a/emulators/cpmtools2/pkg-plist
+++ b/emulators/cpmtools2/pkg-plist
@@ -6,5 +6,14 @@ sbin/cpmchattr
 sbin/mkfs.cpm
 sbin/fsck.cpm
 sbin/fsed.cpm
+man/man1/cpmls.1.gz
+man/man1/cpmcp.1.gz
+man/man1/cpmrm.1.gz
+man/man1/cpmchmod.1.gz
+man/man1/cpmchattr.1.gz
+man/man1/mkfs.cpm.1.gz
+man/man1/fsck.cpm.1.gz
+man/man1/fsed.cpm.1.gz
+man/man5/cpm.5.gz
 %%DATADIR%%/diskdefs
 @dirrm %%DATADIR%%