From owner-svn-ports-all@FreeBSD.ORG Sat Dec 7 18:38:37 2013 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 8BF87A00; Sat, 7 Dec 2013 18:38:37 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 5F6311197; Sat, 7 Dec 2013 18:38:37 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rB7IcbTc074638; Sat, 7 Dec 2013 18:38:37 GMT (envelope-from danilo@svn.freebsd.org) Received: (from danilo@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rB7IcamC074635; Sat, 7 Dec 2013 18:38:36 GMT (envelope-from danilo@svn.freebsd.org) Message-Id: <201312071838.rB7IcamC074635@svn.freebsd.org> From: Danilo Egea Gondolfo Date: Sat, 7 Dec 2013 18:38:36 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r335840 - in head/audio/xcd: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 07 Dec 2013 18:38:37 -0000 Author: danilo Date: Sat Dec 7 18:38:36 2013 New Revision: 335840 URL: http://svnweb.freebsd.org/changeset/ports/335840 Log: - Fix build (remove BROKEN). Use CXX as compiler instead of CC. - Add stage support Modified: head/audio/xcd/Makefile head/audio/xcd/files/patch-Makefile head/audio/xcd/pkg-plist Modified: head/audio/xcd/Makefile ============================================================================== --- head/audio/xcd/Makefile Sat Dec 7 18:23:30 2013 (r335839) +++ head/audio/xcd/Makefile Sat Dec 7 18:38:36 2013 (r335840) @@ -12,12 +12,7 @@ COMMENT= Tcl/Tk CD player WRKSRC= ${WRKDIR}/${PORTNAME} -BROKEN= Does not build - -USES+= tk -NO_STAGE= yes - -MAN1= xcd.1 +USES= tk WITH_CDROM_PLAYER?= cd0 Modified: head/audio/xcd/files/patch-Makefile ============================================================================== --- head/audio/xcd/files/patch-Makefile Sat Dec 7 18:23:30 2013 (r335839) +++ head/audio/xcd/files/patch-Makefile Sat Dec 7 18:38:36 2013 (r335840) @@ -1,5 +1,5 @@ ---- Makefile.orig 1998-10-27 01:14:26.000000000 +0100 -+++ Makefile 2013-09-23 14:57:00.000000000 +0200 +--- ./Makefile.orig 1998-10-26 22:14:26.000000000 -0200 ++++ ./Makefile 2013-12-07 16:02:51.000000000 -0200 @@ -1,6 +1,6 @@ -BINDIR = /usr/local/bin -CDDIR = /usr/local/lib/xcd @@ -10,3 +10,35 @@ all: cdplayer xcd xcd: xcd.in +@@ -8,20 +8,20 @@ + < xcd.in > $@ + chmod ugo+x xcd + cdplayer: cdplayer.cc +- $(CC) $(CFLAGS) -o $@ cdplayer.cc -lm ++ $(CXX) $(CFLAGS) -o $@ cdplayer.cc -lm + + install: xcd cdplayer +- mkdir -p $(BINDIR) +- mkdir -p $(MANDIR) +- mkdir -p $(CDDIR) +- install -c -s cdplayer $(CDDIR) +- install -c xcd $(BINDIR) +- install -c xcd.1 $(MANDIR) ++ mkdir -p ${DESTDIR}$(BINDIR) ++ mkdir -p ${DESTDIR}$(MANDIR) ++ mkdir -p ${DESTDIR}$(CDDIR) ++ install -c -s cdplayer ${DESTDIR}$(CDDIR) ++ install -c xcd ${DESTDIR}$(BINDIR) ++ install -c xcd.1 ${DESTDIR}$(MANDIR) + for f in bitmaps/*.xbm ; do \ +- install -c $$f $(CDDIR); \ ++ install -c $$f ${DESTDIR}$(CDDIR); \ + done + + install.prog: xcd cdplayer +- mkdir -p $(BINDIR) +- install -c -s cdplayer $(CDDIR) +- install -c xcd $(BINDIR) ++ mkdir -p ${DESTDIR}$(BINDIR) ++ install -c -s cdplayer ${DESTDIR}$(CDDIR) ++ install -c xcd ${DESTDIR}$(BINDIR) Modified: head/audio/xcd/pkg-plist ============================================================================== --- head/audio/xcd/pkg-plist Sat Dec 7 18:23:30 2013 (r335839) +++ head/audio/xcd/pkg-plist Sat Dec 7 18:38:36 2013 (r335840) @@ -1,4 +1,5 @@ bin/xcd +man/man1/xcd.1.gz lib/xcd/cdplayer lib/xcd/eject.xbm lib/xcd/eject_s.xbm