From owner-svn-ports-all@FreeBSD.ORG  Mon Sep 17 14:23:31 2012
Return-Path: <owner-svn-ports-all@FreeBSD.ORG>
Delivered-To: svn-ports-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id ABF201065670;
	Mon, 17 Sep 2012 14:23:31 +0000 (UTC)
	(envelope-from jhale@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 7E87C8FC0C;
	Mon, 17 Sep 2012 14:23:31 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q8HENVnV034918;
	Mon, 17 Sep 2012 14:23:31 GMT (envelope-from jhale@svn.freebsd.org)
Received: (from jhale@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q8HENVsZ034915;
	Mon, 17 Sep 2012 14:23:31 GMT (envelope-from jhale@svn.freebsd.org)
Message-Id: <201209171423.q8HENVsZ034915@svn.freebsd.org>
From: "Jason E. Hale" <jhale@FreeBSD.org>
Date: Mon, 17 Sep 2012 14:23:31 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
	svn-ports-head@freebsd.org
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r304400 - head/games/connectagram
X-BeenThere: svn-ports-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/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: Mon, 17 Sep 2012 14:23:31 -0000

Author: jhale
Date: Mon Sep 17 14:23:30 2012
New Revision: 304400
URL: http://svn.freebsd.org/changeset/ports/304400

Log:
  - Clean up Makefile
  - Respect PREFIX
  - Install pixmaps
  - Convert to pkg-plist
  
  PR:		ports/171359
  Submitted by:	nemysis <nemysis at gmx dot ch> (maintainer)
  Approved by:	makc (mentor)

Added:
  head/games/connectagram/pkg-plist   (contents, props changed)
Modified:
  head/games/connectagram/Makefile

Modified: head/games/connectagram/Makefile
==============================================================================
--- head/games/connectagram/Makefile	Mon Sep 17 14:22:56 2012	(r304399)
+++ head/games/connectagram/Makefile	Mon Sep 17 14:23:30 2012	(r304400)
@@ -7,51 +7,37 @@
 
 PORTNAME=	connectagram
 PORTVERSION=	1.0.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	games
 MASTER_SITES=	http://gottcode.org/${PORTNAME}/
-DISTNAME=	${PORTNAME}-${DISTVERSION}-src
+EXTRACT_SUFX=	-src.tar.bz2
 
 MAINTAINER=	nemysis@gmx.ch
 COMMENT=	Word unscrambling game
 
 LICENSE=	GPLv3
 
-WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
-
 USE_BZIP2=	yes
-USE_QT_VER=	4
-QT_COMPONENTS=	moc_build qmake_build rcc_build corelib gui iconengines imageformats network
+USE_QT4=	moc_build qmake_build rcc_build gui network
 INSTALLS_ICONS=	yes
-
 MAKE_JOBS_SAFE=	yes
 
-PORTDATA=	*
 PORTDOCS=	ChangeLog
 
-PLIST_FILES=	bin/${PORTNAME} \
-	share/applications/${PORTNAME}.desktop \
-	share/icons/hicolor/48x48/apps/${PORTNAME}.png
-
-PLIST_DIRSTRY=	share/icons/hicolor/48x48/apps \
-	share/icons/hicolor/48x48 \
-	share/icons/hicolor \
-	share/icons \
-	share/applications
+.include <bsd.port.options.mk>
 
 do-configure:
 	@cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} \
-		${QMAKE} ${QMAKEFLAGS}
-
-.include <bsd.port.options.mk>
+		${QMAKE} ${QMAKEFLAGS} PREFIX=${PREFIX}
 
 post-install:
+# Pixmaps
+	${LN} -sf ${PREFIX}/share/icons/hicolor/48x48/apps/${PORTNAME}.png ${PREFIX}/share/pixmaps/
+
 # Documentation
 .if ${PORT_OPTIONS:MDOCS}
 	${MKDIR} ${DOCSDIR}
-.  for f in ${PORTDOCS}
-	${INSTALL_DATA} ${WRKSRC}/${f} ${DOCSDIR}
-.  endfor
+	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${DOCSDIR}
 .endif
 
 .include <bsd.port.mk>

Added: head/games/connectagram/pkg-plist
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/games/connectagram/pkg-plist	Mon Sep 17 14:23:30 2012	(r304400)
@@ -0,0 +1,11 @@
+bin/connectagram
+share/applications/connectagram.desktop
+share/connectagram/words
+share/icons/hicolor/48x48/apps/connectagram.png
+share/pixmaps/connectagram.png
+@dirrmtry share/icons/hicolor/48x48/apps
+@dirrmtry share/icons/hicolor/48x48
+@dirrmtry share/icons/hicolor
+@dirrmtry share/icons
+@dirrm share/connectagram
+@dirrmtry share/applications