7 files changed, 94 insertions, 70 deletions

diff --git a/games/lianliankan/Makefile b/games/lianliankan/Makefile
index 450d98c24452..bf77f7a0cdf7 100644
--- a/games/lianliankan/Makefile
+++ b/games/lianliankan/Makefile
@@ -1,36 +1,46 @@
-# New ports collection makefile for:	lianliankan
-# Date created:				26 April 2006
-# Whom:					Yinghong Liu <relaxbsd@gmail.com>
-#
+# Created by: Yinghong Liu <relaxbsd@gmail.com>
 # $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 <bsd.port.options.mk>
+
+.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
diff --git a/games/lianliankan/files/lianliankan.desktop b/games/lianliankan/files/lianliankan.desktop
index ad0c6816d618..39283974d7ae 100644
--- a/games/lianliankan/files/lianliankan.desktop
+++ b/games/lianliankan/files/lianliankan.desktop
@@ -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;
diff --git a/games/lianliankan/files/patch-Makefile.am b/games/lianliankan/files/patch-Makefile.am
new file mode 100644
index 000000000000..24e1eeb67916
--- /dev/null
+++ b/games/lianliankan/files/patch-Makefile.am
@@ -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)
+ 
+ 
+ 
diff --git a/games/lianliankan/files/patch-Makefile.in b/games/lianliankan/files/patch-Makefile.in
deleted file mode 100644
index 51cc62109f8c..000000000000
--- a/games/lianliankan/files/patch-Makefile.in
+++ /dev/null
@@ -1,22 +0,0 @@
---- Makefile.in.orig	2006-01-10 21:33:53.000000000 +0800
-+++ Makefile.in	2007-07-30 17:56:35.000000000 +0800
-@@ -212,8 +212,8 @@
- sharedstatedir = @sharedstatedir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
--SUBDIRS = po include src pixmaps data
--llk_linuxdocdir = ${prefix}/doc/llk_linux
-+SUBDIRS = po src pixmaps data
-+llk_linuxdocdir = ${PACKAGE_DATA_DIR}/doc/llk_linux
- llk_linuxdoc_DATA = \
- 	README\
- 	COPYING\
-@@ -635,7 +635,7 @@
- 
- info-am:
- 
--install-data-am: install-llk_linuxdocDATA
-+install-data-am:
- 
- install-exec-am:
- 
diff --git a/games/lianliankan/files/patch-src__Makefile.am b/games/lianliankan/files/patch-src__Makefile.am
new file mode 100644
index 000000000000..ea4219faf4da
--- /dev/null
+++ b/games/lianliankan/files/patch-src__Makefile.am
@@ -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)\
diff --git a/games/lianliankan/pkg-descr b/games/lianliankan/pkg-descr
index c1aa3f6c91fb..e8eb59accc6a 100644
--- a/games/lianliankan/pkg-descr
+++ b/games/lianliankan/pkg-descr
@@ -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
diff --git a/games/lianliankan/pkg-plist b/games/lianliankan/pkg-plist
index d1b688fdf2f7..34c4f6fc2fec 100644
--- a/games/lianliankan/pkg-plist
+++ b/games/lianliankan/pkg-plist
@@ -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