Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 3 Mar 2014 00:33:16 +0000 (UTC)
From:      Baptiste Daroussin <bapt@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r346846 - in head/emulators/cpmtools: . files
Message-ID:  <201403030033.s230XGii058543@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: bapt
Date: Mon Mar  3 00:33:16 2014
New Revision: 346846
URL: http://svnweb.freebsd.org/changeset/ports/346846
QAT: https://qat.redports.org/buildarchive/r346846/

Log:
  Support stage by going back to using upstream Makefiles instead of custom one
  Fix build with clang (thus remove USE_GCC=any)

Deleted:
  head/emulators/cpmtools/files/
Modified:
  head/emulators/cpmtools/Makefile
  head/emulators/cpmtools/pkg-plist

Modified: head/emulators/cpmtools/Makefile
==============================================================================
--- head/emulators/cpmtools/Makefile	Mon Mar  3 00:29:26 2014	(r346845)
+++ head/emulators/cpmtools/Makefile	Mon Mar  3 00:33:16 2014	(r346846)
@@ -12,15 +12,10 @@ MAINTAINER=	joerg@FreeBSD.org
 COMMENT=	Utility to transfer files from/to CP/M (R) diskettes
 
 WRKSRC=		${WRKDIR}/cpm
-MAN1=		cpm.1
 
-USE_GCC=	any
-
-#
-# need our own build target to pass PREFIX down to the make command
-#
-NO_STAGE=	yes
-do-build:
-	@(cd ${WRKSRC}; ${MAKE} PREFIX=${PREFIX} ${MAKE_FLAGS} ${MAKEFILE} all)
+CFLAGS+=	-Wno-return-type
+MAKE_ARGS+=	PREFIX=${PREFIX} DFLAG="${CFLAGS}" \
+		DEST="${STAGEDIR}${PREFIX}/bin" \
+		HELPFILEDIR="${STAGEDIR}${PREFIX}/lib"
 
 .include <bsd.port.mk>

Modified: head/emulators/cpmtools/pkg-plist
==============================================================================
--- head/emulators/cpmtools/pkg-plist	Mon Mar  3 00:29:26 2014	(r346845)
+++ head/emulators/cpmtools/pkg-plist	Mon Mar  3 00:33:16 2014	(r346846)
@@ -1,2 +1,3 @@
 bin/cpm
+man/man1/cpm.1.gz
 lib/cpm.hlp



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201403030033.s230XGii058543>