Attachment 128308 Details for Bug 172187 – lianliankan-2.3.b1_7.patch

[patch] lianliankan-2.3.b1_7.patch

lianliankan-2.3.b1_7.patch (text/plain), 5.67 KB, created by nemysis on 2012-09-30 19:00:10 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: nemysis

Created: 2012-09-30 19:00:10 UTC

Size: 5.67 KB

patch

obsolete

>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

Actions: View | Diff

Attachments on bug 172187: 128308