From owner-freebsd-ports-bugs@FreeBSD.ORG Mon Jan 10 09:10:08 2011 Return-Path: <owner-freebsd-ports-bugs@FreeBSD.ORG> Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id A21C11065672 for <freebsd-ports-bugs@hub.freebsd.org>; Mon, 10 Jan 2011 09:10:08 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id 5FAEA8FC12 for <freebsd-ports-bugs@hub.freebsd.org>; Mon, 10 Jan 2011 09:10:08 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.4/8.14.4) with ESMTP id p0A9A8nU070379 for <freebsd-ports-bugs@freefall.freebsd.org>; Mon, 10 Jan 2011 09:10:08 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.4/8.14.4/Submit) id p0A9A834070378; Mon, 10 Jan 2011 09:10:08 GMT (envelope-from gnats) Resent-Date: Mon, 10 Jan 2011 09:10:08 GMT Resent-Message-Id: <201101100910.p0A9A834070378@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Alex Kozlov <spam@rm-rf.kiev.ua> Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id DE15A1065693 for <freebsd-gnats-submit@FreeBSD.org>; Mon, 10 Jan 2011 09:00:47 +0000 (UTC) (envelope-from nobody@FreeBSD.org) Received: from red.freebsd.org (unknown [IPv6:2001:4f8:fff6::22]) by mx1.freebsd.org (Postfix) with ESMTP id CDC188FC12 for <freebsd-gnats-submit@FreeBSD.org>; Mon, 10 Jan 2011 09:00:47 +0000 (UTC) Received: from red.freebsd.org (localhost [127.0.0.1]) by red.freebsd.org (8.14.4/8.14.4) with ESMTP id p0A90lv9054171 for <freebsd-gnats-submit@FreeBSD.org>; Mon, 10 Jan 2011 09:00:47 GMT (envelope-from nobody@red.freebsd.org) Received: (from nobody@localhost) by red.freebsd.org (8.14.4/8.14.4/Submit) id p0A90lf1054170; Mon, 10 Jan 2011 09:00:47 GMT (envelope-from nobody) Message-Id: <201101100900.p0A90lf1054170@red.freebsd.org> Date: Mon, 10 Jan 2011 09:00:47 GMT From: Alex Kozlov <spam@rm-rf.kiev.ua> To: freebsd-gnats-submit@FreeBSD.org X-Send-Pr-Version: www-3.1 Cc: Subject: ports/153838: [patch] update emulators/cpmtools2 to 2.13 X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Ports bug reports <freebsd-ports-bugs.freebsd.org> List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-ports-bugs>, <mailto:freebsd-ports-bugs-request@freebsd.org?subject=unsubscribe> List-Archive: <http://lists.freebsd.org/pipermail/freebsd-ports-bugs> List-Post: <mailto:freebsd-ports-bugs@freebsd.org> List-Help: <mailto:freebsd-ports-bugs-request@freebsd.org?subject=help> List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-ports-bugs>, <mailto:freebsd-ports-bugs-request@freebsd.org?subject=subscribe> X-List-Received-Date: Mon, 10 Jan 2011 09:10:08 -0000 >Number: 153838 >Category: ports >Synopsis: [patch] update emulators/cpmtools2 to 2.13 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: update >Submitter-Id: current-users >Arrival-Date: Mon Jan 10 09:10:07 UTC 2011 >Closed-Date: >Last-Modified: >Originator: Alex Kozlov >Release: RELENG_8 >Organization: private >Environment: >Description: Update emulators/cpmtools2 to 2.13, take maintainership. >How-To-Repeat: >Fix: Patch attached with submission follows: Index: emulators/cpmtools2/Makefile @@ -6,44 +6,42 @@ # 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 +LICENSE= GPLv3 + +GNU_CONFIGURE= yes CONFIGURE_ARGS+=--mandir=${PREFIX}/man --bindir=${PREFIX}/sbin \ - --datarootdir=${PREFIX}/share/${PORTNAME} --with-dmalloc + --datarootdir=${PREFIX}/share/${PORTNAME} 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} Index: emulators/cpmtools2/distinfo @@ -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 Index: emulators/cpmtools2/pkg-plist @@ -5,5 +5,6 @@ sbin/cpmchattr sbin/mkfs.cpm sbin/fsck.cpm +sbin/fsed.cpm %%DATADIR%%/diskdefs @dirrm %%DATADIR%% Index: emulators/cpmtools2/files/patch-Makefile.in @@ -9,12 +9,3 @@ 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 Index: emulators/cpmtools2/files/patch-configure @@ -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 >Release-Note: >Audit-Trail: >Unformatted: