From owner-svn-ports-all@FreeBSD.ORG  Tue May 13 20:53:43 2014
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 7E1EE412;
 Tue, 13 May 2014 20:53:43 +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))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 51B6E2DC9;
 Tue, 13 May 2014 20:53:43 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s4DKrhYu089397;
 Tue, 13 May 2014 20:53:43 GMT (envelope-from edwin@svn.freebsd.org)
Received: (from edwin@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s4DKrgxS089395;
 Tue, 13 May 2014 20:53:42 GMT (envelope-from edwin@svn.freebsd.org)
Message-Id: <201405132053.s4DKrgxS089395@svn.freebsd.org>
From: Edwin Groothuis <edwin@FreeBSD.org>
Date: Tue, 13 May 2014 20:53:42 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r353993 - head/games/sol
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.18
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, 13 May 2014 20:53:43 -0000

Author: edwin
Date: Tue May 13 20:53:42 2014
New Revision: 353993
URL: http://svnweb.freebsd.org/changeset/ports/353993
QAT: https://qat.redports.org/buildarchive/r353993/

Log:
  Fix staging

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

Modified: head/games/sol/Makefile
==============================================================================
--- head/games/sol/Makefile	Tue May 13 20:51:59 2014	(r353992)
+++ head/games/sol/Makefile	Tue May 13 20:53:42 2014	(r353993)
@@ -10,38 +10,35 @@ MASTER_SITES=	http://shh.thathost.com/pu
 MAINTAINER=	edwin@mavetju.org
 COMMENT=	Solitaire card game for X Window System
 
-LIB_DEPENDS=	shhopt.1:${PORTSDIR}/devel/libshhopt \
-		shhmsg.1:${PORTSDIR}/devel/libshhmsg \
-		xalloc.1:${PORTSDIR}/devel/libxalloc \
-		shhcards.1:${PORTSDIR}/games/libshhcards
+LIB_DEPENDS=	libshhopt.so.1:${PORTSDIR}/devel/libshhopt \
+		libshhmsg.so.1:${PORTSDIR}/devel/libshhmsg \
+		libxalloc.so.1:${PORTSDIR}/devel/libxalloc \
+		libshhcards.so.1:${PORTSDIR}/games/libshhcards
 
 CONFLICTS=	gnome-games-*
 
-USE_GMAKE=	yes
+USES=		gmake
 USE_XORG=	xpm x11 xaw
 
-MAN6=		sol.6
-
-NO_STAGE=	yes
 .include <bsd.port.pre.mk>
 
 pre-build:
 	cd ${WRKSRC} && ${GMAKE} readme.var
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/sol ${PREFIX}/bin
-	${INSTALL_MAN} ${WRKSRC}/sol.6 ${PREFIX}/man/man6
-	@${MKDIR} ${PREFIX}/share/sol
-	${INSTALL_DATA} ${WRKSRC}/sol.score ${PREFIX}/share/sol
-	@${CHOWN} root:games ${PREFIX}/bin/sol
-	@${CHOWN} root:games ${PREFIX}/share/sol/sol.score
-	@${CHMOD} 2755 ${PREFIX}/bin/sol
-	@${CHMOD} 770 ${PREFIX}/share/sol
-	@${CHMOD} 660 ${PREFIX}/share/sol/sol.score
+	${INSTALL_PROGRAM} ${WRKSRC}/sol ${STAGEDIR}${PREFIX}/bin
+	${INSTALL_MAN} ${WRKSRC}/sol.6 ${STAGEDIR}${PREFIX}/man/man6
+	@${MKDIR} ${STAGEDIR}${PREFIX}/share/sol
+	${INSTALL_DATA} ${WRKSRC}/sol.score ${STAGEDIR}${PREFIX}/share/sol
+	@${CHOWN} root:games ${STAGEDIR}${PREFIX}/bin/sol
+	@${CHOWN} root:games ${STAGEDIR}${PREFIX}/share/sol/sol.score
+	@${CHMOD} 2755 ${STAGEDIR}${PREFIX}/bin/sol
+	@${CHMOD} 770 ${STAGEDIR}${PREFIX}/share/sol
+	@${CHMOD} 660 ${STAGEDIR}${PREFIX}/share/sol/sol.score
 .if !defined(NOPORTDOCS)
-	@${MKDIR} ${PREFIX}/share/doc/sol
-	${INSTALL_DATA} ${WRKSRC}/CREDITS ${PREFIX}/share/doc/sol
-	${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/sol
+	@${MKDIR} ${STAGEDIR}${PREFIX}/share/doc/sol
+	${INSTALL_DATA} ${WRKSRC}/CREDITS ${STAGEDIR}${PREFIX}/share/doc/sol
+	${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${PREFIX}/share/doc/sol
 .endif
 
 .include <bsd.port.post.mk>

Modified: head/games/sol/pkg-plist
==============================================================================
--- head/games/sol/pkg-plist	Tue May 13 20:51:59 2014	(r353992)
+++ head/games/sol/pkg-plist	Tue May 13 20:53:42 2014	(r353993)
@@ -1,3 +1,4 @@
+man/man6/sol.6.gz
 @owner games
 @group games
 @mode 6755