Date: Fri, 27 Dec 2013 11:01:19 +0000 (UTC) From: Rusmir Dusko <nemysis@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r337706 - in head/games/lianliankan: . files Message-ID: <201312271101.rBRB1JD9091366@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: nemysis Date: Fri Dec 27 11:01:19 2013 New Revision: 337706 URL: http://svnweb.freebsd.org/changeset/ports/337706 Log: - Remove not needed DOCS - Add NLS Option - Support STAGEDIR and add OPTIONS_SUB - Add REINPLACE_CMD, fix bad GTK code - Use REINPLACE_CMD instead of simple patches - Change files/patch-src__Makefile.am, disable warning with - -Wal - Break lines around 80 characters Approved by: pawel / wg (mentors, implicit) Deleted: head/games/lianliankan/files/patch-Makefile.am head/games/lianliankan/files/patch-src_pak_pak.c Modified: head/games/lianliankan/Makefile head/games/lianliankan/files/patch-src__Makefile.am Modified: head/games/lianliankan/Makefile ============================================================================== --- head/games/lianliankan/Makefile Fri Dec 27 10:51:57 2013 (r337705) +++ head/games/lianliankan/Makefile Fri Dec 27 11:01:19 2013 (r337706) @@ -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> Modified: head/games/lianliankan/files/patch-src__Makefile.am ============================================================================== --- head/games/lianliankan/files/patch-src__Makefile.am Fri Dec 27 10:51:57 2013 (r337705) +++ head/games/lianliankan/files/patch-src__Makefile.am Fri Dec 27 11:01:19 2013 (r337706) @@ -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 = \
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201312271101.rBRB1JD9091366>