- Update to 2.20

svn path=/head/; revision=372211

emulators/cpmtools2/Makefile

@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	cpmtools2
-PORTVERSION=	2.19
-PORTREVISION=	2
+PORTVERSION=	2.20
 CATEGORIES=	emulators sysutils
 MASTER_SITES=	http://www.moria.de/~michael/cpmtools/files/
 DISTNAME=	${PORTNAME:C/2$//}-${PORTVERSION}
@@ -32,8 +31,11 @@ LIBDSK_LIB_DEPENDS=	libdsk.so:${PORTSDIR}/emulators/libdsk
 post-patch:
 	@${REINPLACE_CMD} -e 's|getopt$$(OBJEXT)||g; s|getopt1$$(OBJEXT)||g' \
 		-e 's|\($$(CC).*fsed.cpm$$(OBJEXT).*$$(DEVICEOBJ)\)|\1 -lcurses|' \
+		-e '/^CFLAGS=/s|@CFLAGS@|@CFLAGS@ -DDISKDEFS=\\"@datarootdir@/diskdefs\\" -DFORMAT=\\"$$(DEFFORMAT)\\"|' \
 		-e 's|diskdefs @datarootdir@/diskdefs|diskdefs $$(DESTDIR)@datarootdir@/diskdefs|' \
 		${WRKSRC}/Makefile.in
+	@${REINPLACE_CMD} -e 's|\(FSED_CPM=fsed.cpm\) LIBS=\"-lcurses $$LIBS\"|\1|' \
+		${WRKSRC}/configure
 
 pre-install:
 	@${MKDIR} ${STAGEDIR}${DATADIR}

emulators/cpmtools2/distinfo

@@ -1,2 +1,2 @@
-SHA256 (cpmtools-2.19.tar.gz) = 4404fdd9a4b69a801c5af696aa452b51159f644f7ffb7d37891dcf66c2f75b6a
-SIZE (cpmtools-2.19.tar.gz) = 189014
+SHA256 (cpmtools-2.20.tar.gz) = d8c7e78a9750994124f3aab6e461da8fa0021acc7dbad76eafbac8b0ed8279d3
+SIZE (cpmtools-2.20.tar.gz) = 190381

emulators/cpmtools2/files/patch-Makefile.in

@@ -1,11 +0,0 @@
---- 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@

emulators/cpmtools2/files/patch-configure

@@ -1,10 +0,0 @@
-Index: configure
-@@ -3400,7 +3400,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" = xyes; then :
--  FSED_CPM=fsed.cpm LIBS="-lcurses $LIBS"
-+  FSED_CPM=fsed.cpm
- else
-   FSED_CPM=
- fi