From owner-svn-ports-all@FreeBSD.ORG  Tue Nov 12 20:51:00 2013
Return-Path: <owner-svn-ports-all@FreeBSD.ORG>
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 2120E6A2;
 Tue, 12 Nov 2013 20:51:00 +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 107962566;
 Tue, 12 Nov 2013 20:51:00 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rACKoxBb002823;
 Tue, 12 Nov 2013 20:50:59 GMT (envelope-from danilo@svn.freebsd.org)
Received: (from danilo@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id rACKoxdQ002821;
 Tue, 12 Nov 2013 20:50:59 GMT (envelope-from danilo@svn.freebsd.org)
Message-Id: <201311122050.rACKoxdQ002821@svn.freebsd.org>
From: Danilo Egea Gondolfo <danilo@FreeBSD.org>
Date: Tue, 12 Nov 2013 20:50:59 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r333619 - head/games/xabacus
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.16
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all/>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 12 Nov 2013 20:51:00 -0000

Author: danilo
Date: Tue Nov 12 20:50:59 2013
New Revision: 333619
URL: http://svnweb.freebsd.org/changeset/ports/333619

Log:
  - Use options helpers
  - Fix build with clang
  - Add stage support

Modified:
  head/games/xabacus/Makefile
  head/games/xabacus/pkg-plist

Modified: head/games/xabacus/Makefile
==============================================================================
--- head/games/xabacus/Makefile	Tue Nov 12 20:38:47 2013	(r333618)
+++ head/games/xabacus/Makefile	Tue Nov 12 20:50:59 2013	(r333619)
@@ -20,26 +20,23 @@ USE_XORG=	xpm
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--without-nas
 
-MAN6=		xabacus.6
+MOTIF_USES=	motif
+MOTIF_CONFIGURE_WITH=	motif
 
-NO_STAGE=	yes
 .include <bsd.port.options.mk>
 
-.if ${PORT_OPTIONS:MMOTIF}
-USES=		motif
-.else
-CONFIGURE_ARGS+=	--without-motif
-.endif
-
 .if ${PORT_OPTIONS:MESOUND}
 USE_GNOME+=	esound
 CONFIGURE_ARGS+=	--without-rplay --with-esound
 .else
-LIB_DEPENDS+=	rplay:${PORTSDIR}/audio/rplay
+LIB_DEPENDS+=		librplay.so:${PORTSDIR}/audio/rplay
 CONFIGURE_ARGS+=	--with-rplay --without-esound
 .endif
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|/games/|/|g' ${WRKSRC}/Makefile.in
 
+post-configure:
+	@${REINPLACE_CMD} -e '/^XWIDGETLDFLAGS/d' ${WRKSRC}/Makefile
+
 .include <bsd.port.mk>

Modified: head/games/xabacus/pkg-plist
==============================================================================
--- head/games/xabacus/pkg-plist	Tue Nov 12 20:38:47 2013	(r333618)
+++ head/games/xabacus/pkg-plist	Tue Nov 12 20:50:59 2013	(r333619)
@@ -1,4 +1,5 @@
 bin/xabacus
+man/man6/xabacus.6.gz
 lib/X11/app-defaults/Abacus
 %%DATADIR%%/Abacus.ps
 %%DATADIR%%/Abacus1_1.les