Index: head/emulators/cpmtools2/Makefile
===================================================================
--- head/emulators/cpmtools2/Makefile	(revision 267734)
+++ head/emulators/cpmtools2/Makefile	(revision 267735)
@@ -1,51 +1,49 @@
 # New ports collection makefile for:	cpmtools
 # Date created:		31 January 2008
 # Whom:			joerg
 #
 # $FreeBSD$
 #
 
 PORTNAME=	cpmtools
-PORTVERSION=	2.8
+PORTVERSION=	2.13
 CATEGORIES=	emulators sysutils
-MASTER_SITES=	http://www.moria.de/~michael/cpmtools/ \
-		http://www.copei.de/freebsd-ports/
+MASTER_SITES=	http://www.moria.de/~michael/cpmtools/
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	spam@rm-rf.kiev.ua
 COMMENT=	Tools to access CP/M disks and disk images
 
-LIB_DEPENDS+=	dmalloc:${PORTSDIR}/devel/dmalloc
-
-BROKEN=		does not fetch
-
 LATEST_LINK=	cpmtools2
 
-HAS_CONFIGURE=	yes
-CONFIGURE_ARGS+=--mandir=${PREFIX}/man --bindir=${PREFIX}/sbin \
-		--datarootdir=${PREFIX}/share/${PORTNAME} --with-dmalloc
+LICENSE=	GPLv3
 
+GNU_CONFIGURE=	yes
+CONFIGURE_ARGS+=--bindir=${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=	RAW_LIBDSK "With LIBDSK support with direct floppy access" on \
-		LIBDSK "With LIBDSK support (no direct floppy access)" off
+OPTIONS=	LIBDSK "With LIBDSK support" off
 
 .include <bsd.port.pre.mk>
 
-.if defined(WITH_LIBDSK) || defined(WITH_RAW_LIBDSK)
+.if defined(WITH_LIBDSK)
 LIB_DEPENDS+=	dsk.5:${PORTSDIR}/emulators/libdsk
-CONFIGURE_ARGS+=--with-libdsk=${LOCALBASE} --with-device=LibDsk
+CONFIGURE_ARGS+=--with-libdsk=${LOCALBASE}
 .else
-CONFIGURE_ARGS+=--without-libdsk --with-device=posix
+CONFIGURE_ARGS+=--with-libdsk=''
 .endif
 
-.if defined(WITH_RAW_LIBDSK)
-CONFIGURE_ARGS+=--enable-floppy
-.else
-CONFIGURE_ARGS+=--disable-floppy
-.endif
+# remove unneeded getopt*.c
+# remove curses from all but fsed.cpm
+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|' \
+		${WRKSRC}/Makefile.in
 
 pre-install:
 	@${MKDIR} ${DATADIR}
 
 .include <bsd.port.post.mk>

Property changes on: head/emulators/cpmtools2/Makefile
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.4
\ No newline at end of property
+1.5
\ No newline at end of property
Index: head/emulators/cpmtools2/distinfo
===================================================================
--- head/emulators/cpmtools2/distinfo	(revision 267734)
+++ head/emulators/cpmtools2/distinfo	(revision 267735)
@@ -1,3 +1,2 @@
-MD5 (cpmtools-2.8.tar.gz) = ccf53decbb9e9f6708fb1492c7defa17
-SHA256 (cpmtools-2.8.tar.gz) = f5269ef8b104f25d027c3244ab84dd7b60a7b2e23e595603f7569bcae58b5216
-SIZE (cpmtools-2.8.tar.gz) = 160705
+SHA256 (cpmtools-2.13.tar.gz) = 6cd80efe4adb8066616cbc18b1b4683a6f6567426fe84937bcff2ba70034ba86
+SIZE (cpmtools-2.13.tar.gz) = 170008

Property changes on: head/emulators/cpmtools2/distinfo
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.3
\ No newline at end of property
+1.4
\ No newline at end of property
Index: head/emulators/cpmtools2/files/patch-Makefile.in
===================================================================
--- head/emulators/cpmtools2/files/patch-Makefile.in	(revision 267734)
+++ head/emulators/cpmtools2/files/patch-Makefile.in	(revision 267735)
@@ -1,20 +1,11 @@
 --- Makefile.in.old	2008-05-30 13:00:09.000000000 -0300
 +++ Makefile.in	2008-05-30 13:00:27.000000000 -0300
 @@ -11,7 +11,7 @@
  INSTALL=        @INSTALL@
  INSTALL_DATA=   @INSTALL_DATA@
  CC=		@CC@
 -CFLAGS=		@CFLAGS@
 +CFLAGS=		@CFLAGS@ -DDISKDEFS=\"@datarootdir@/diskdefs\" -DFORMAT=\"$(DEFFORMAT)\"
  LDFLAGS=        @LDFLAGS@
  DEFFORMAT=      @DEFFORMAT@
  DEVICE=         @DEVICE@
-@@ -86,7 +86,7 @@
- 		$(INSTALL) -s -m 755 cpmchattr $(BINDIR)/cpmchattr
- 		$(INSTALL) -s -m 755 mkfs.cpm $(BINDIR)/mkfs.cpm
- 		$(INSTALL) -s -m 755 fsck.cpm $(BINDIR)/fsck.cpm
--		$(INSTALL) -s -m 755 fsed.cpm $(BINDIR)/fsed.cpm
-+#		$(INSTALL) -s -m 755 fsed.cpm $(BINDIR)/fsed.cpm
- 		$(INSTALL_DATA) diskdefs @datarootdir@/diskdefs
- 		$(INSTALL_DATA) cpmls.1 $(MANDIR)/man1/cpmls.1
- 		$(INSTALL_DATA) cpmcp.1 $(MANDIR)/man1/cpmcp.1

Property changes on: head/emulators/cpmtools2/files/patch-Makefile.in
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.1
\ No newline at end of property
+1.2
\ No newline at end of property
Index: head/emulators/cpmtools2/files/patch-configure
===================================================================
--- head/emulators/cpmtools2/files/patch-configure	(nonexistent)
+++ head/emulators/cpmtools2/files/patch-configure	(revision 267735)
@@ -0,0 +1,10 @@
+Index: configure
+@@ -3385,7 +3385,7 @@
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_curses_printw" >&5
+ $as_echo "$ac_cv_lib_curses_printw" >&6; }
+ if test "x$ac_cv_lib_curses_printw" = x""yes; then :
+-  FSED_CPM=fsed.cpm LIBS="-lcurses $LIBS"
++  FSED_CPM=fsed.cpm
+ else
+   FSED_CPM=
+ fi

Property changes on: head/emulators/cpmtools2/files/patch-configure
___________________________________________________________________
Added: cvs2svn:cvs-rev
## -0,0 +1 ##
+1.1
\ No newline at end of property
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Index: head/emulators/cpmtools2/pkg-plist
===================================================================
--- head/emulators/cpmtools2/pkg-plist	(revision 267734)
+++ head/emulators/cpmtools2/pkg-plist	(revision 267735)
@@ -1,9 +1,10 @@
 sbin/cpmls
 sbin/cpmcp
 sbin/cpmrm
 sbin/cpmchmod
 sbin/cpmchattr
 sbin/mkfs.cpm
 sbin/fsck.cpm
+sbin/fsed.cpm
 %%DATADIR%%/diskdefs
 @dirrm %%DATADIR%%

Property changes on: head/emulators/cpmtools2/pkg-plist
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.2
\ No newline at end of property
+1.3
\ No newline at end of property