From nemysis@gmx.ch  Sun Sep 30 17:53:06 2012
Return-Path: <nemysis@gmx.ch>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 95E16106564A
	for <FreeBSD-gnats-submit@freebsd.org>; Sun, 30 Sep 2012 17:53:03 +0000 (UTC)
	(envelope-from nemysis@gmx.ch)
Received: from mailout-de.gmx.net (mailout-de.gmx.net [213.165.64.22])
	by mx1.freebsd.org (Postfix) with SMTP id 1742B8FC08
	for <FreeBSD-gnats-submit@freebsd.org>; Sun, 30 Sep 2012 17:53:02 +0000 (UTC)
Received: (qmail invoked by alias); 30 Sep 2012 17:53:01 -0000
Received: from 201-230.4-85.cust.bluewin.ch (EHLO something.email.com) [85.4.230.201]
  by mail.gmx.net (mp012) with SMTP; 30 Sep 2012 19:53:01 +0200
Received: by something.email.com (sSMTP sendmail emulation); Sun, 30 Sep 2012 19:52:59 +0200
Message-Id: <20120930175303.95E16106564A@hub.freebsd.org>
Date: Sun, 30 Sep 2012 19:52:59 +0200
From: nemysis <nemysis@gmx.ch>
To: FreeBSD-gnats-submit@freebsd.org
Cc:
Subject: [PATCH] games/lianliankan: Makefile changed, OptionsNG for NLS, take maintainership
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         172187
>Category:       ports
>Synopsis:       [PATCH] games/lianliankan: Makefile changed, OptionsNG for NLS, take maintainership
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    jhale
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Sun Sep 30 18:00:10 UTC 2012
>Closed-Date:    Sat Oct 06 04:27:58 UTC 2012
>Last-Modified:  Sat Oct  6 04:30:10 UTC 2012
>Originator:     nemysis
>Release:        FreeBSD 9.0-RELEASE amd64
>Organization:
>Environment:
System: FreeBSD FreeBSD_Ports 9.0-RELEASE FreeBSD 9.0-RELEASE #0: Tue Jan  3 07:46:30 UTC
>Description:

Makefile changed

+COMMENT=	Scarce recreation game

+LICENSE=	GPLv2

OptionsNG for NLS


- Take maintainership

Added file(s):
- files/patch-Makefile.am

Removed file(s):
- files/patch-Makefile.in
- files/patch-src_pak_pak.c

Generated and tested manually, tested with port test and with RedPorts (all RELEASES, CLANG), sent with FreeBSD Port Tools 0.99_6 (mode: change, diff: ports)
>How-To-Repeat:

portlint -A
WARN: Makefile: [37]: You may remove pkg-plist if you use PLIST_FILES and/or PLIST_DIRS.
WARN: Makefile: for new port, make $FreeBSD$ tag in comment section empty, to make SVN happy.
WARN: Makefile: new ports should not set PORTREVISION.
0 fatal errors and 3 warnings found.

WARN: Makefile: [37] because is used

+PLIST_FILES+=	share/locale/zh_CN/LC_MESSAGES/llk_linux.mo


Build log RedPorts

https://redports.org/buildarchive/20120930150306-36494/

>Fix:

--- lianliankan-2.3.b1_7.patch begins here ---
diff -ruN --exclude=CVS /usr/ports/games/lianliankan/Makefile ./Makefile
--- /usr/ports/games/lianliankan/Makefile	2012-06-01 07:19:00.000000000 +0200
+++ ./Makefile	2012-09-30 17:02:40.000000000 +0200
@@ -7,32 +7,51 @@
 
 PORTNAME=	lianliankan
 DISTVERSION=	2.3beta1
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	games
 MASTER_SITES=	SF/llk-linux/llk-linux-source/2.3beta1
 DISTNAME=	llk_linux-${DISTVERSION}
 
-MAINTAINER=	ports@FreeBSD.org
-COMMENT=	A scarce recreation game
+MAINTAINER=	nemysis@gmx.ch
+COMMENT=	Scarce recreation game
+
+LICENSE=	GPLv2
 
-USE_AUTOTOOLS=	automake:env
 USE_GNOME=	gtk20 esound
-USE_GETTEXT=	yes
+USE_AUTOTOOLS=	automake:env libtool
 GNU_CONFIGURE=	yes
+USE_GMAKE=	yes
+
+CFLAGS+=	-I${LOCALBASE}/include -L${LOCALBASE}/lib
+
+DATADIR=	${PREFIX}/share/llk_linux
+DOCSDIR=	${PREFIX}/share/doc/llk_linux
+
+OPTIONS_DEFINE=	NLS
+
+.include <bsd.port.options.mk>
+
+.if ${PORT_OPTIONS:MNLS}
+USE_GETTEXT=	yes
+PLIST_SUB+=	NLS=""
+PLIST_FILES+=	share/locale/zh_CN/LC_MESSAGES/llk_linux.mo
+.else
+PLIST_SUB+=	NLS="@comment "
+.endif
 
-CPPFLAGS+=	-I${LOCALBASE}/include
-LDFLAGS+=	-L${LOCALBASE}/lib
+post-patch:
+	@${REINPLACE_CMD} -e 's|Pos.__pos =|Pos =|g' ${WRKSRC}/src/pak/pak.c
 
-.if !defined(NOPORTDOCS)
-INSTALL_TARGET=	install install-llk_linuxdocDATA
+.if !${PORT_OPTIONS:MNLS}
+	@${REINPLACE_CMD} -e 's|SUBDIRS = po src pixmaps data|SUBDIRS = src pixmaps data|g' \
+		${WRKSRC}/Makefile.am
 .endif
 
 pre-configure:
-.for f in install-sh depcomp missing COPYING INSTALL
-	@${LN} -sf ${AUTOMAKE_DIR}/${f} ${WRKSRC}
-.endfor
+	@(cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} ./autogen.sh)
 
 post-install:
+# Desktop
 	${MKDIR} ${PREFIX}/share/applications
 	${INSTALL_DATA} ${FILESDIR}/lianliankan.desktop ${PREFIX}/share/applications
 
diff -ruN --exclude=CVS /usr/ports/games/lianliankan/files/patch-Makefile.am ./files/patch-Makefile.am
--- /usr/ports/games/lianliankan/files/patch-Makefile.am	1970-01-01 01:00:00.000000000 +0100
+++ ./files/patch-Makefile.am	2012-09-30 14:36:53.000000000 +0200
@@ -0,0 +1,23 @@
+--- Makefile.am.orig	2006-01-10 14:33:40.000000000 +0100
++++ Makefile.am	2012-09-30 14:36:32.000000000 +0200
+@@ -3,17 +3,11 @@
+ ## 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_linuxdocdir = ${prefix}/share/doc/llk_linux
+ llk_linuxdoc_DATA = \
+-	README\
+-	COPYING\
+-	AUTHORS\
+-	ChangeLog\
+-	INSTALL\
+-	NEWS\
+-	TODO
++	AUTHORS
+ 
+ EXTRA_DIST = $(llk_linuxdoc_DATA)
+ 
diff -ruN --exclude=CVS /usr/ports/games/lianliankan/files/patch-Makefile.in ./files/patch-Makefile.in
--- /usr/ports/games/lianliankan/files/patch-Makefile.in	2007-08-01 13:52:45.000000000 +0200
+++ ./files/patch-Makefile.in	1970-01-01 01:00:00.000000000 +0100
@@ -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 -ruN --exclude=CVS /usr/ports/games/lianliankan/files/patch-src_pak_pak.c ./files/patch-src_pak_pak.c
--- /usr/ports/games/lianliankan/files/patch-src_pak_pak.c	2007-08-01 13:52:45.000000000 +0200
+++ ./files/patch-src_pak_pak.c	1970-01-01 01:00:00.000000000 +0100
@@ -1,29 +0,0 @@
---- src/pak/pak.c.orig	2007-07-30 17:17:44.000000000 +0800
-+++ src/pak/pak.c	2007-07-30 17:19:23.000000000 +0800
-@@ -253,7 +253,7 @@
- #ifdef WIN32
- 	Pos = Current->dwOffset;
- #else
--    Pos.__pos = Current->dwOffset; 
-+    Pos = Current->dwOffset; 
- #endif
-     fsetpos( PAKStream, &Pos );
- 
-@@ -418,7 +418,7 @@
- #ifdef WIN32
- 	Pos = Current->dwOffset;
- #else
--    Pos.__pos = Current->dwOffset; 
-+    Pos = Current->dwOffset; 
- #endif
-     fsetpos( ReadStream, &Pos );
- 
-@@ -497,7 +497,7 @@
- #ifdef WIN32
- 	Pos = Current->dwOffset;
- #else
--    Pos.__pos = Current->dwOffset; 
-+    Pos = Current->dwOffset; 
- #endif
-   fsetpos( ReadStream, &Pos );
- 
diff -ruN --exclude=CVS /usr/ports/games/lianliankan/pkg-plist ./pkg-plist
--- /usr/ports/games/lianliankan/pkg-plist	2007-08-01 13:52:45.000000000 +0200
+++ ./pkg-plist	2012-09-30 14:41:36.000000000 +0200
@@ -1,25 +1,18 @@
 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
+%%PORTDOCS%%%%DOCSDIR%%/AUTHORS
+%%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
 share/pixmaps/llk_linux.png
-@dirrm share/llk_linux
-%%PORTDOCS%%@dirrm share/doc/llk_linux
+@dirrm %%DATADIR%%
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
 @dirrmtry share/applications
--- lianliankan-2.3.b1_7.patch ends here ---

>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->jhale 
Responsible-Changed-By: jhale 
Responsible-Changed-When: Thu Oct 4 02:25:58 UTC 2012 
Responsible-Changed-Why:  
I'll take it. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=172187 
State-Changed-From-To: open->closed 
State-Changed-By: jhale 
State-Changed-When: Sat Oct 6 04:27:54 UTC 2012 
State-Changed-Why:  
Committed, with minor changes. Thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=172187 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/172187: commit references a PR
Date: Sat,  6 Oct 2012 04:27:22 +0000 (UTC)

 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 <nemysis@gmx.ch>
   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 <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
 
 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
 _______________________________________________
 svn-ports-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/svn-ports-all
 To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org"
 
>Unformatted:
