4 files changed, 24 insertions, 68 deletions

diff --git a/games/lianliankan/Makefile b/games/lianliankan/Makefile
index 5f3de4d72fae..f2e94820eb30 100644
--- a/games/lianliankan/Makefile
+++ b/games/lianliankan/Makefile
@@ -24,25 +24,32 @@ CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 
 DATADIR=	${PREFIX}/share/llk_linux
-DOCSDIR=	${PREFIX}/share/doc/llk_linux
 
-NO_STAGE=	yes
-.include <bsd.port.options.mk>
+OPTIONS_DEFINE=	NLS
+OPTIONS_SUB=	yes
 
-.if ${PORT_OPTIONS:MNLS}
-USES+=		gettext
-PLIST_SUB+=	NLS=""
-.else
-PLIST_SUB+=	NLS="@comment "
-.endif
+NLS_USES=	gettext
+
+.include <bsd.port.options.mk>
 
 post-patch:
-.if empty(PORT_OPTIONS:MNLS)
+	@${REINPLACE_CMD} -e 's|po include src|po src|' \
+		-e '/llk_linuxdocdir/,/EXTRA_DIST =/ d' \
+		${WRKSRC}/Makefile.am
+	@${REINPLACE_CMD} -e 's|gdk_pixbuf_unref|g_object_unref| ; \
+		s|OK,message|OK, "%s", message|' \
+		${WRKSRC}/src/main.c
+	@${REINPLACE_CMD} -e 's|Pos.__pos|Pos|' \
+		${WRKSRC}/src/pak/pak.c
+
+
+.if ! ${PORT_OPTIONS:MNLS}
 	@${REINPLACE_CMD} -e '/^SUBDIRS/s|po||' \
 		${WRKSRC}/Makefile.am
 .endif
 
 post-install:
-	${INSTALL_DATA} ${FILESDIR}/lianliankan.desktop ${PREFIX}/share/applications
+	${INSTALL_DATA} ${FILESDIR}/lianliankan.desktop \
+		${STAGEDIR}${DESKTOPDIR}
 
 .include <bsd.port.mk>
diff --git a/games/lianliankan/files/patch-Makefile.am b/games/lianliankan/files/patch-Makefile.am
deleted file mode 100644
index 510456e07f85..000000000000
--- a/games/lianliankan/files/patch-Makefile.am
+++ /dev/null
@@ -1,23 +0,0 @@
---- ./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 = \
-+EXTRA_DIST = \
- 	README\
- 	COPYING\
- 	AUTHORS\
-@@ -15,7 +15,6 @@
- 	NEWS\
- 	TODO
- 
--EXTRA_DIST = $(llk_linuxdoc_DATA)
- 
- 
- 
diff --git a/games/lianliankan/files/patch-src__Makefile.am b/games/lianliankan/files/patch-src__Makefile.am
index ea4219faf4da..5057b153eb3f 100644
--- a/games/lianliankan/files/patch-src__Makefile.am
+++ b/games/lianliankan/files/patch-src__Makefile.am
@@ -1,15 +1,16 @@
---- ./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 @@
+--- ./src/Makefile.am.orig	2006-01-01 16:53:12.000000000 +0100
++++ ./src/Makefile.am	2013-12-27 10:51:14.000000000 +0100
+@@ -9,8 +9,7 @@
  	 -I../ -I../include
  
  AM_CFLAGS =\
 -	`pkg-config --cflags --libs gtk+-2.0`\
+-	 -Wall\
 +	`pkg-config --cflags gtk+-2.0`\
- 	 -Wall\
  	 -g
  
-@@ -26,7 +26,8 @@
+ bin_PROGRAMS = llk_linux
+@@ -26,7 +25,8 @@
  	tray.c
  
  llk_linux_LDFLAGS = \
diff --git a/games/lianliankan/files/patch-src_pak_pak.c b/games/lianliankan/files/patch-src_pak_pak.c
deleted file mode 100644
index bb3a6bbaffb1..000000000000
--- a/games/lianliankan/files/patch-src_pak_pak.c
+++ /dev/null
@@ -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 );
-