Date: Mon, 23 Sep 2013 12:58:03 +0000 (UTC) From: Pietro Cerutti <gahr@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r327994 - in head/audio/xcd: . files Message-ID: <201309231258.r8NCw3du099491@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: gahr Date: Mon Sep 23 12:58:03 2013 New Revision: 327994 URL: http://svnweb.freebsd.org/changeset/ports/327994 Log: - Convert to USES+=tcl - Refactor a bit the Makefile Added: head/audio/xcd/files/patch-Makefile (contents, props changed) Modified: head/audio/xcd/Makefile Modified: head/audio/xcd/Makefile ============================================================================== --- head/audio/xcd/Makefile Mon Sep 23 12:52:41 2013 (r327993) +++ head/audio/xcd/Makefile Mon Sep 23 12:58:03 2013 (r327994) @@ -12,14 +12,17 @@ COMMENT= Tcl/Tk CD player WRKSRC= ${WRKDIR}/${PORTNAME} -USE_TK_WRAPPER= yes +USES+= tk NO_STAGE= yes MAN1= xcd.1 -.if !defined(WITH_CDROM_PLAYER) -WITH_CDROM_PLAYER= cd0 -.endif +WITH_CDROM_PLAYER?= cd0 + +MAKE_ENV+= BINDIR="${PREFIX}/bin" \ + CDDIR="${PREFIX}/lib/xcd" \ + BITMAPDIR="${PREFIX}/lib/xcd" \ + MANDIR="${MANPREFIX}/man/man1" pre-extract: @${ECHO_CMD} "" @@ -30,21 +33,7 @@ pre-extract: @${ECHO_CMD} "" post-patch: - @${REINPLACE_CMD} 's|cd0c|${WITH_CDROM_PLAYER}|' ${WRKSRC}/cdplayer.cc - @(cd ${WRKSRC} && ${SED} -e \ - 's|/usr/local/bin/wish8.0|${WISH}| ; \ - s|CDPLAYER|${PREFIX}/lib/xcd/cdplayer| ; \ - s|BITMAPDIR|${PREFIX}/lib/xcd|' \ - < xcd.in > xcd) - -do-build: - (cd ${WRKSRC} && ${CXX} ${CXXFLAGS} -o cdplayer cdplayer.cc) - -do-install: - (cd ${WRKSRC} && ${INSTALL_SCRIPT} xcd ${PREFIX}/bin) - (cd ${WRKSRC} && ${INSTALL_MAN} xcd.1 ${MANPREFIX}/man/man1) - @${MKDIR} ${PREFIX}/lib/xcd - (cd ${WRKSRC} && ${INSTALL_PROGRAM} cdplayer ${PREFIX}/lib/xcd) - (cd ${WRKSRC}/bitmaps && ${INSTALL_DATA} *.xbm ${PREFIX}/lib/xcd) + @${REINPLACE_CMD} -e 's|cd0c|${WITH_CDROM_PLAYER}|' ${WRKSRC}/cdplayer.cc + @${REINPLACE_CMD} -e 's|/usr/local/bin/wish8.0|${WISH}|' ${WRKSRC}/xcd.in .include <bsd.port.mk> Added: head/audio/xcd/files/patch-Makefile ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/audio/xcd/files/patch-Makefile Mon Sep 23 12:58:03 2013 (r327994) @@ -0,0 +1,12 @@ +--- Makefile.orig 1998-10-27 01:14:26.000000000 +0100 ++++ Makefile 2013-09-23 14:57:00.000000000 +0200 +@@ -1,6 +1,6 @@ +-BINDIR = /usr/local/bin +-CDDIR = /usr/local/lib/xcd +-MANDIR = /usr/local/man/man1 ++BINDIR ?= /usr/local/bin ++CDDIR ?= /usr/local/lib/xcd ++MANDIR ?= /usr/local/man/man1 + + all: cdplayer xcd + xcd: xcd.in
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201309231258.r8NCw3du099491>