From owner-svn-ports-all@FreeBSD.ORG Mon Sep 17 14:25:55 2012 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id B5C79106566C; Mon, 17 Sep 2012 14:25:55 +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 A10438FC0C; Mon, 17 Sep 2012 14:25:55 +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 q8HEPtiK035296; Mon, 17 Sep 2012 14:25:55 GMT (envelope-from jhale@svn.freebsd.org) Received: (from jhale@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q8HEPthW035292; Mon, 17 Sep 2012 14:25:55 GMT (envelope-from jhale@svn.freebsd.org) Message-Id: <201209171425.q8HEPthW035292@svn.freebsd.org> From: "Jason E. Hale" Date: Mon, 17 Sep 2012 14:25:55 +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: r304401 - head/games/tanglet X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.5 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: Mon, 17 Sep 2012 14:25:55 -0000 Author: jhale Date: Mon Sep 17 14:25:55 2012 New Revision: 304401 URL: http://svn.freebsd.org/changeset/ports/304401 Log: - Clean up Makefile - Respect PREFIX - Don't use PORTDATA macro since the data is required - Use the build system provided by the software PR: ports/171364 Submitted by: nemysis (maintainer) Approved by: makc (mentor) Modified: head/games/tanglet/Makefile head/games/tanglet/pkg-plist (contents, props changed) Modified: head/games/tanglet/Makefile ============================================================================== --- head/games/tanglet/Makefile Mon Sep 17 14:23:30 2012 (r304400) +++ head/games/tanglet/Makefile Mon Sep 17 14:25:55 2012 (r304401) @@ -7,55 +7,37 @@ PORTNAME= tanglet PORTVERSION= 1.2.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= games MASTER_SITES= http://gottcode.org/${PORTNAME}/ EXTRACT_SUFX= -src.tar.bz2 MAINTAINER= nemysis@gmx.ch -COMMENT= Tanglet is a single player word finding game based on Boggle +COMMENT= Single player word finding game based on Boggle LICENSE= GPLv3 USE_BZIP2= yes -USE_QT4= moc_build qmake_build rcc_build corelib gui iconengines imageformats +USE_QT4= moc_build qmake_build rcc_build gui INSTALLS_ICONS= yes - MAKE_JOBS_SAFE= yes -PORTDATA= * PORTDOCS= CREDITS ChangeLog .include do-configure: @cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} \ - ${QMAKE} ${QMAKEFLAGS} + ${QMAKE} ${QMAKEFLAGS} PREFIX=${PREFIX} -do-install: -# Executable - ${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${PREFIX}/bin - -# Data - @(cd ${WRKSRC} && ${COPYTREE_SHARE} "data translations" ${DATADIR}) - -# Icons - cd ${WRKSRC}/icons && ${FIND} hicolor -type d -name apps -exec \ - ${MKDIR} ${PREFIX}/share/icons/{} \; - cd ${WRKSRC}/icons && ${FIND} hicolor -type f -exec \ - ${INSTALL_DATA} {} ${PREFIX}/share/icons/{} \; - -# Pixmaps and Desktop - ${INSTALL_DATA} ${WRKSRC}/icons/${PORTNAME}_32.xpm ${PREFIX}/share/pixmaps/ - ${MKDIR} ${PREFIX}/share/applications - ${INSTALL_DATA} ${WRKSRC}/icons/${PORTNAME}.desktop ${PREFIX}/share/applications/ +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 Modified: head/games/tanglet/pkg-plist ============================================================================== --- head/games/tanglet/pkg-plist Mon Sep 17 14:23:30 2012 (r304400) +++ head/games/tanglet/pkg-plist Mon Sep 17 14:25:55 2012 (r304401) @@ -9,7 +9,51 @@ share/icons/hicolor/32x32/apps/tanglet.p share/icons/hicolor/48x48/apps/tanglet.png share/icons/hicolor/64x64/apps/tanglet.png share/icons/hicolor/scalable/apps/tanglet.svg +share/pixmaps/tanglet.png share/pixmaps/tanglet_32.xpm +share/tanglet/data/cs/dice +share/tanglet/data/cs/dictionary +share/tanglet/data/cs/name +share/tanglet/data/cs/words +share/tanglet/data/de/README +share/tanglet/data/de/dice +share/tanglet/data/de/dictionary +share/tanglet/data/de/name +share/tanglet/data/de/words +share/tanglet/data/en/README +share/tanglet/data/en/dice +share/tanglet/data/en/dictionary +share/tanglet/data/en/name +share/tanglet/data/en/scowl-word-lists-used +share/tanglet/data/en/words +share/tanglet/data/fr/dice +share/tanglet/data/fr/dictionary +share/tanglet/data/fr/name +share/tanglet/data/fr/words +share/tanglet/data/he/README +share/tanglet/data/he/dice +share/tanglet/data/he/dictionary +share/tanglet/data/he/name +share/tanglet/data/he/words +share/tanglet/data/nl/dice +share/tanglet/data/nl/dictionary +share/tanglet/data/nl/name +share/tanglet/data/nl/words +share/tanglet/translations/tanglet_cs.qm +share/tanglet/translations/tanglet_de.qm +share/tanglet/translations/tanglet_en.qm +share/tanglet/translations/tanglet_fr.qm +share/tanglet/translations/tanglet_he.qm +share/tanglet/translations/tanglet_nl.qm +@dirrm share/tanglet/translations +@dirrm share/tanglet/data/nl +@dirrm share/tanglet/data/he +@dirrm share/tanglet/data/fr +@dirrm share/tanglet/data/en +@dirrm share/tanglet/data/de +@dirrm share/tanglet/data/cs +@dirrm share/tanglet/data +@dirrm share/tanglet @dirrmtry share/icons/hicolor/scalable/apps @dirrmtry share/icons/hicolor/scalable @dirrmtry share/icons/hicolor/64x64/apps