From owner-svn-ports-all@FreeBSD.ORG Sat Oct 6 04:27:08 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 35621106564A; Sat, 6 Oct 2012 04:27:08 +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 1E63B8FC0A; Sat, 6 Oct 2012 04:27:08 +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 q964R7aU096518; Sat, 6 Oct 2012 04:27:07 GMT (envelope-from jhale@svn.freebsd.org) Received: (from jhale@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q964R7WI096511; Sat, 6 Oct 2012 04:27:07 GMT (envelope-from jhale@svn.freebsd.org) Message-Id: <201210060427.q964R7WI096511@svn.freebsd.org> From: "Jason E. Hale" Date: Sat, 6 Oct 2012 04:27:07 +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: r305333 - in head/games/lianliankan: . files 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: Sat, 06 Oct 2012 04:27:08 -0000 Author: jhale Date: Sat Oct 6 04:27:07 2012 New Revision: 305333 URL: http://svn.freebsd.org/changeset/ports/305333 Log: - Add LICENSE - Mark MAKE_JOBS_SAFE - Improve build and remove some annoying warnings - Improve .desktop file - Update pkg-descr - Convert Makefile header to new format - Pass maintainership to submitter PR: ports/172187 Submitted by: nemysis Approved by: makc (mentor) Added: head/games/lianliankan/files/patch-Makefile.am (contents, props changed) head/games/lianliankan/files/patch-src__Makefile.am (contents, props changed) Deleted: head/games/lianliankan/files/patch-Makefile.in Modified: head/games/lianliankan/Makefile (contents, props changed) head/games/lianliankan/files/lianliankan.desktop (contents, props changed) head/games/lianliankan/pkg-descr (contents, props changed) head/games/lianliankan/pkg-plist (contents, props changed) Modified: head/games/lianliankan/Makefile ============================================================================== --- head/games/lianliankan/Makefile Sat Oct 6 02:53:34 2012 (r305332) +++ head/games/lianliankan/Makefile Sat Oct 6 04:27:07 2012 (r305333) @@ -1,36 +1,46 @@ -# New ports collection makefile for: lianliankan -# Date created: 26 April 2006 -# Whom: Yinghong Liu -# +# Created by: Yinghong Liu # $FreeBSD$ -# PORTNAME= lianliankan DISTVERSION= 2.3beta1 -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= games -MASTER_SITES= SF/llk-linux/llk-linux-source/2.3beta1 +MASTER_SITES= SF/llk-linux/llk-linux-source/${DISTVERSION} DISTNAME= llk_linux-${DISTVERSION} -MAINTAINER= ports@FreeBSD.org -COMMENT= A scarce recreation game +MAINTAINER= nemysis@gmx.ch +COMMENT= Tile matching game -USE_AUTOTOOLS= automake:env +LICENSE= GPLv2 + +USE_PKGCONFIG= build USE_GNOME= gtk20 esound -USE_GETTEXT= yes -GNU_CONFIGURE= yes +USE_AUTOTOOLS= aclocal automake autoconf libtool +MAKE_JOBS_SAFE= yes + +AUTOMAKE_ARGS= --add-missing --copy +ACLOCAL_ARGS= -I ${LOCALBASE}/share/aclocal CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib -.if !defined(NOPORTDOCS) -INSTALL_TARGET= install install-llk_linuxdocDATA +DATADIR= ${PREFIX}/share/llk_linux +DOCSDIR= ${PREFIX}/share/doc/llk_linux + +.include + +.if ${PORT_OPTIONS:MNLS} +USE_GETTEXT= yes +PLIST_SUB+= NLS="" +.else +PLIST_SUB+= NLS="@comment " .endif -pre-configure: -.for f in install-sh depcomp missing COPYING INSTALL - @${LN} -sf ${AUTOMAKE_DIR}/${f} ${WRKSRC} -.endfor +post-patch: +.if empty(PORT_OPTIONS:MNLS) + @${REINPLACE_CMD} -e '/^SUBDIRS/s|po||' \ + ${WRKSRC}/Makefile.am +.endif post-install: ${MKDIR} ${PREFIX}/share/applications Modified: head/games/lianliankan/files/lianliankan.desktop ============================================================================== --- head/games/lianliankan/files/lianliankan.desktop Sat Oct 6 02:53:34 2012 (r305332) +++ head/games/lianliankan/files/lianliankan.desktop Sat Oct 6 04:27:07 2012 (r305333) @@ -1,11 +1,12 @@ [Desktop Entry] Encoding=UTF-8 -Name=lianiankan +Name=LianLianKan Name[zh_CN]=连连看 -Comment=Choose a pair of same pattern links. +GenericName=Tile Matching Game +Comment=Match pairs of tiles on a board Comment[zh_TW]=选择一对相同的牌联机 Exec=llk_linux -Icon=llk_linux.png +Icon=llk_linux Terminal=false Type=Application -Categories=GNOME;Application;Game;PuzzleGame; +Categories=GTK;Game;LogicGame; Added: head/games/lianliankan/files/patch-Makefile.am ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/games/lianliankan/files/patch-Makefile.am Sat Oct 6 04:27:07 2012 (r305333) @@ -0,0 +1,23 @@ +--- ./Makefile.am.orig 2006-01-10 08:33:40.000000000 -0500 ++++ ./Makefile.am 2012-10-04 14:47:12.000000000 -0400 +@@ -3,10 +3,10 @@ + ## If you don't want it to overwrite it, + ## Please disable it in the Anjuta project configuration + +-SUBDIRS = po include src pixmaps data ++SUBDIRS = po src pixmaps data + + llk_linuxdocdir = ${prefix}/doc/llk_linux +-llk_linuxdoc_DATA = \ ++EXRTA_DIST = \ + README\ + COPYING\ + AUTHORS\ +@@ -15,7 +15,6 @@ + NEWS\ + TODO + +-EXTRA_DIST = $(llk_linuxdoc_DATA) + + + Added: head/games/lianliankan/files/patch-src__Makefile.am ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/games/lianliankan/files/patch-src__Makefile.am Sat Oct 6 04:27:07 2012 (r305333) @@ -0,0 +1,21 @@ +--- ./src/Makefile.am.orig 2006-01-01 10:53:12.000000000 -0500 ++++ ./src/Makefile.am 2012-10-04 14:46:55.000000000 -0400 +@@ -9,7 +9,7 @@ + -I../ -I../include + + AM_CFLAGS =\ +- `pkg-config --cflags --libs gtk+-2.0`\ ++ `pkg-config --cflags gtk+-2.0`\ + -Wall\ + -g + +@@ -26,7 +26,8 @@ + tray.c + + llk_linux_LDFLAGS = \ +- -lesd ++ -lesd \ ++ `pkg-config --libs gtk+-2.0` + + llk_linux_LDADD = \ + $(PACKAGE_LIBS)\ Modified: head/games/lianliankan/pkg-descr ============================================================================== --- head/games/lianliankan/pkg-descr Sat Oct 6 02:53:34 2012 (r305332) +++ head/games/lianliankan/pkg-descr Sat Oct 6 04:27:07 2012 (r305333) @@ -1,7 +1,6 @@ -LianLianKan is a scarce recreation game. Game playing is very simple, -first you are required to choose a pair of same pattern links, but -the path of links appeared can not exceed twice turns, after links -keep away from other patterns. Only can enter next one when you fulfill task. -The difficulty of game can be divided into three levels. +LianLianKan is a tile matching game similar to Mahjongg. You must +match free tiles of the same type to eliminate them from the board. +Tiles may only be eliminated if a line can be made between between +the matched pair not exceeding two turns. WWW: http://sourceforge.net/projects/llk-linux Modified: head/games/lianliankan/pkg-plist ============================================================================== --- head/games/lianliankan/pkg-plist Sat Oct 6 02:53:34 2012 (r305332) +++ head/games/lianliankan/pkg-plist Sat Oct 6 04:27:07 2012 (r305333) @@ -1,25 +1,17 @@ bin/llk_linux share/applications/lianliankan.desktop -%%PORTDOCS%%share/doc/llk_linux/AUTHORS -%%PORTDOCS%%share/doc/llk_linux/COPYING -%%PORTDOCS%%share/doc/llk_linux/ChangeLog -%%PORTDOCS%%share/doc/llk_linux/INSTALL -%%PORTDOCS%%share/doc/llk_linux/NEWS -%%PORTDOCS%%share/doc/llk_linux/README -%%PORTDOCS%%share/doc/llk_linux/TODO -share/llk_linux/Cancle.wav -share/llk_linux/CanntLink.wav -share/llk_linux/Classical.pak -share/llk_linux/Click.wav -share/llk_linux/Diamond.pak -share/llk_linux/GameOver.wav -share/llk_linux/Hint.wav -share/llk_linux/Link.wav -share/llk_linux/QQ.pak -share/llk_linux/Shuffle.wav -share/llk_linux/Win.wav -share/locale/zh_CN/LC_MESSAGES/llk_linux.mo +%%DATADIR%%/Cancle.wav +%%DATADIR%%/CanntLink.wav +%%DATADIR%%/Classical.pak +%%DATADIR%%/Click.wav +%%DATADIR%%/Diamond.pak +%%DATADIR%%/GameOver.wav +%%DATADIR%%/Hint.wav +%%DATADIR%%/Link.wav +%%DATADIR%%/QQ.pak +%%DATADIR%%/Shuffle.wav +%%DATADIR%%/Win.wav +%%NLS%%share/locale/zh_CN/LC_MESSAGES/llk_linux.mo share/pixmaps/llk_linux.png -@dirrm share/llk_linux -%%PORTDOCS%%@dirrm share/doc/llk_linux +@dirrm %%DATADIR%% @dirrmtry share/applications