Index: branches/2014Q4/games/xabacus/Makefile
===================================================================
--- branches/2014Q4/games/xabacus/Makefile	(revision 370469)
+++ branches/2014Q4/games/xabacus/Makefile	(revision 370470)
@@ -1,49 +1,50 @@
 # Created by: Andrey Zakhvatov
 # $FreeBSD$
 
 PORTNAME=	xabacus
 PORTVERSION=	8.0.0
 CATEGORIES=	games
 MASTER_SITES=	http://www.tux.org/~bagleyd/abacus/ \
 		http://ftp.tux.org/pub/tux/bagleyd/xabacus/
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Abacus for X Window System
 
 LICENSE=	BSD
 
 USES=		tar:bzip2
 USE_XORG=	xpm
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--without-nas
+CONFIGURE_ENV=	ac_cv_x_app_defaults=${PREFIX}/lib/X11/app-defaults
 INSTALLS_ICONS=	yes
 
 DESKTOP_ENTRIES="XAbacus" "" "abacus" "${PORTNAME}" "" ""
 
 OPTIONS_DEFINE=		ESOUND MOTIF
 OPTIONS_DEFAULT=	MOTIF
 
 ESOUND_LIB_DEPENDS_OFF=	librplay.so:${PORTSDIR}/audio/rplay
 ESOUND_USE=		gnome=esound
 ESOUND_CONFIGURE_ON=	--without-rplay --with-esound
 ESOUND_CONFIGURE_OFF=	--with-rplay --without-esound
 ESOUND_LDFLAGS=		-L${LOCALBASE}/lib -laudiofile
 MOTIF_USES=	motif
 MOTIF_CONFIGURE_WITH=	motif
 
 post-patch:
 	@${REINPLACE_CMD} -e \
 		's|\($$(datadir)\)/games|\1| ; \
 		 s|@XWIDGETLDFLAGS@|@LDFLAGS@| ; \
 		 s|\([[:blank:]]\)/usr/games|\1$$(DESTDIR)$$(bindir)| ; \
 		 /chmod/s|^|#| ; \
 		 /chown/s|^|#|' ${WRKSRC}/Makefile.in
 
 post-install:
 .for i in 16 22 24 32 48
 	@${MKDIR} ${STAGEDIR}${PREFIX}/share/icons/hicolor/${i}x${i}/apps
 	(cd ${WRKSRC}/pixmaps/${i}x${i} && ${INSTALL_DATA} abacus.png \
 		${STAGEDIR}${PREFIX}/share/icons/hicolor/${i}x${i}/apps)
 .endfor
 
 .include <bsd.port.mk>
Index: branches/2014Q4/games/xabacus/pkg-plist
===================================================================
--- branches/2014Q4/games/xabacus/pkg-plist	(revision 370469)
+++ branches/2014Q4/games/xabacus/pkg-plist	(revision 370470)
@@ -1,41 +1,36 @@
-@group games
-@owner games
-bin/xabacus
-@owner
-@group
+@(games,games,) bin/xabacus
 lib/X11/app-defaults/Abacus
 man/man6/xabacus.6.gz
 share/icons/hicolor/16x16/apps/abacus.png
 share/icons/hicolor/22x22/apps/abacus.png
 share/icons/hicolor/24x24/apps/abacus.png
 share/icons/hicolor/32x32/apps/abacus.png
 share/icons/hicolor/48x48/apps/abacus.png
 %%DATADIR%%/Abacus.ps
 %%DATADIR%%/Abacus1_1.les
 %%DATADIR%%/Abacus1_2.les
 %%DATADIR%%/Abacus2_1.les
 %%DATADIR%%/Abacus3_1.les
 %%DATADIR%%/Abacus4_1.les
 %%DATADIR%%/Abacus5_1.les
 %%DATADIR%%/Abacusjp1_1.les
 %%DATADIR%%/Abacusjp1_2.les
 %%DATADIR%%/Abacusjp2_1.les
 %%DATADIR%%/Abacusjp3_1.les
 %%DATADIR%%/Abacusjp4_1.les
 %%DATADIR%%/Abacusjp5_1.les
 %%DATADIR%%/Abacusko1_1.les
 %%DATADIR%%/Abacusko1_2.les
 %%DATADIR%%/Abacusko2_1.les
 %%DATADIR%%/Abacusko3_1.les
 %%DATADIR%%/Abacusko4_1.les
 %%DATADIR%%/Abacusko5_1.les
 %%DATADIR%%/Abacusru1_1.les
 %%DATADIR%%/Abacusru1_2.les
 %%DATADIR%%/Abacusru2_1.les
 %%DATADIR%%/Abacusru3_1.les
 %%DATADIR%%/Abacusru4_1.les
 %%DATADIR%%/Abacusru5_1.les
 %%DATADIR%%/bump.au
 %%DATADIR%%/drip.au
 %%DATADIR%%/move.au
-@dirrm %%DATADIR%%
Index: branches/2014Q4
===================================================================
--- branches/2014Q4	(revision 370469)
+++ branches/2014Q4	(revision 370470)

Property changes on: branches/2014Q4
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /head:r370232