Date: Thu, 30 Oct 2014 20:29:41 +0000 (UTC) From: Dmitry Marakasov <amdmi3@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r371771 - in head/games/neverball: . files Message-ID: <201410302029.s9UKTfBK028458@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: amdmi3 Date: Thu Oct 30 20:29:41 2014 New Revision: 371771 URL: https://svnweb.freebsd.org/changeset/ports/371771 QAT: https://qat.redports.org/buildarchive/r371771/ Log: - Update to 1.6.0 Modified: head/games/neverball/Makefile head/games/neverball/distinfo head/games/neverball/files/patch-Makefile head/games/neverball/pkg-plist Modified: head/games/neverball/Makefile ============================================================================== --- head/games/neverball/Makefile Thu Oct 30 19:01:53 2014 (r371770) +++ head/games/neverball/Makefile Thu Oct 30 20:29:41 2014 (r371771) @@ -1,11 +1,9 @@ # $FreeBSD$ PORTNAME= neverball -PORTVERSION= 1.5.4 -PORTREVISION= 9 +PORTVERSION= 1.6.0 CATEGORIES= games -MASTER_SITES= http://offload1.icculus.org:9090/neverball/ \ - http://offload2.icculus.org:9090/neverball/ \ +MASTER_SITES= http://icculus.org/neverball/ \ http://mirror.amdmi3.ru/distfiles/ MAINTAINER= amdmi3@FreeBSD.org @@ -18,41 +16,29 @@ LIB_DEPENDS= libpng.so:${PORTSDIR}/graph libvorbis.so:${PORTSDIR}/audio/libvorbis \ libphysfs.so:${PORTSDIR}/devel/physfs -USES= gmake +USES= gmake iconv USE_GL= gl -USE_SDL= sdl ttf -MAKE_ENV+= ENABLE_WII=0 -USE_XORG= x11 +USE_SDL= sdl2 ttf2 +MAKE_ARGS+= DATADIR="${DATADIR}" \ + LOCALEDIR="${PREFIX}/share/locale" -PORTDOCS= CHANGES COPYING README +PORTDOCS= * PORTDATA= * OPTIONS_DEFINE= DOCS NLS +OPTIONS_SUB= yes .include <bsd.port.options.mk> .if ${PORT_OPTIONS:MNLS} USES+= gettext MAKE_ENV+= ENABLE_NLS=1 -LOCALE_DIRS= ca de es fi fr lv nn -PLIST_SUB+= NLS="" .else MAKE_ENV+= ENABLE_NLS=0 -PLIST_SUB+= NLS="@comment " .endif -post-patch: - @${REINPLACE_CMD} -e 's|./data|${DATADIR}/data|g; \ - s|./locale|${PREFIX}/share/locale|g; \ - s|sdl-config|${SDL_CONFIG}|g; \ - s| -O2| ${CFLAGS}|g; \ - s|%%LOCALBASE%%|${LOCALBASE}|g; \ - s|%%ICONV_LIB%%|${ICONV_LIB}|' \ - ${WRKSRC}/Makefile - do-install: - @${MKDIR} ${STAGEDIR}${DATADIR}/data - cd ${WRKSRC} && ${COPYTREE_SHARE} data ${STAGEDIR}${DATADIR}/ + cd ${WRKSRC}/data && ${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR}/ ${INSTALL_MAN} ${WRKSRC}/dist/*.6 ${STAGEDIR}${MAN6PREFIX}/man/man6/ .for f in neverball neverputt ${INSTALL_DATA} ${WRKSRC}/dist/${f}.desktop \ @@ -62,15 +48,8 @@ do-install: ${INSTALL_PROGRAM} ${WRKSRC}/${f} ${STAGEDIR}${PREFIX}/bin/ .endfor .if ${PORT_OPTIONS:MNLS} -. for ii in ${LOCALE_DIRS} - @${MKDIR} ${STAGEDIR}${PREFIX}/share/locale/${ii}/LC_MESSAGES - ${INSTALL_DATA} ${WRKSRC}/locale/${ii}/LC_MESSAGES/*.mo \ - ${STAGEDIR}${PREFIX}/share/locale/${ii}/LC_MESSAGES/ -. endfor + cd ${WRKSRC}/locale && ${COPYTREE_SHARE} . ${STAGEDIR}${PREFIX}/share/locale/ .endif - @${MKDIR} ${STAGEDIR}${DOCSDIR} -.for i in ${PORTDOCS} - ${INSTALL_DATA} ${WRKSRC}/${i} ${STAGEDIR}${DOCSDIR}/ -.endfor + cd ${WRKSRC}/doc && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR}/ .include <bsd.port.mk> Modified: head/games/neverball/distinfo ============================================================================== --- head/games/neverball/distinfo Thu Oct 30 19:01:53 2014 (r371770) +++ head/games/neverball/distinfo Thu Oct 30 20:29:41 2014 (r371771) @@ -1,2 +1,2 @@ -SHA256 (neverball-1.5.4.tar.gz) = ea31ca9f6eec70c8e66eaa20d7ce9e48295fdb077313b97637c503b16b7b0da6 -SIZE (neverball-1.5.4.tar.gz) = 26767623 +SHA256 (neverball-1.6.0.tar.gz) = 73fe63cca4f96e2d355480d03bc0b2904e83a0abdf65fe8c52db5cc3cca88fa0 +SIZE (neverball-1.6.0.tar.gz) = 37772911 Modified: head/games/neverball/files/patch-Makefile ============================================================================== --- head/games/neverball/files/patch-Makefile Thu Oct 30 19:01:53 2014 (r371770) +++ head/games/neverball/files/patch-Makefile Thu Oct 30 20:29:41 2014 (r371771) @@ -1,28 +1,49 @@ ---- Makefile.orig 2009-01-29 16:39:11.000000000 -0600 -+++ Makefile 2009-02-05 21:25:57.000000000 -0600 -@@ -12,6 +12,10 @@ - DARWIN := 1 +--- Makefile ++++ Makefile +@@ -17,6 +17,10 @@ ifeq ($(shell uname), Darwin) + PLATFORM := darwin endif +ifeq ($(shell uname), FreeBSD) -+ FREEBSD := 1 ++ PLATFORM := freebsd +endif + #------------------------------------------------------------------------------ + # Paths (packagers might want to set DATADIR and LOCALEDIR) + +@@ -36,13 +40,13 @@ endif # Optional flags (CFLAGS, CPPFLAGS, ...) -@@ -105,6 +109,14 @@ - BASE_LIBS += -L/opt/local/lib + ifeq ($(DEBUG),1) +- CFLAGS := -g +- CXXFLAGS := -g +- CPPFLAGS := ++ CFLAGS ?= -g ++ CXXFLAGS ?= -g ++ CPPFLAGS += + else +- CFLAGS := -O2 +- CXXFLAGS := -O2 +- CPPFLAGS := -DNDEBUG ++ CFLAGS ?= -O2 ++ CXXFLAGS ?= -O2 ++ CPPFLAGS += -DNDEBUG + endif + + #------------------------------------------------------------------------------ +@@ -179,6 +183,15 @@ ifeq ($(PLATFORM),darwin) + /usr/local/lib)) endif -+ifdef FREEBSD -+ BASE_LIBS += -L%%LOCALBASE%%/lib -lX11 -lm ++ifeq ($(PLATFORM),freebsd) ++ LOCALBASE ?= /usr/local ++ BASE_LIBS += -L${LOCALBASE}/lib + -+ ifneq ($(ENABLE_NLS),0) -+ INTL_LIBS := -lintl %%ICONV_LIB%% -+ endif ++ ifneq ($(ENABLE_NLS),0) ++ INTL_LIBS := -lintl ++ endif +endif + - ALL_LIBS := $(SDL_LIBS) $(BASE_LIBS) $(TILT_LIBS) $(INTL_LIBS) -lSDL_ttf \ - -lvorbisfile $(OGL_LIBS) + OGG_LIBS := -lvorbisfile + TTF_LIBS := -lSDL2_ttf Modified: head/games/neverball/pkg-plist ============================================================================== --- head/games/neverball/pkg-plist Thu Oct 30 19:01:53 2014 (r371770) +++ head/games/neverball/pkg-plist Thu Oct 30 20:29:41 2014 (r371771) @@ -6,10 +6,23 @@ share/applications/neverball.desktop share/applications/neverputt.desktop %%NLS%%share/locale/ca/LC_MESSAGES/neverball.mo %%NLS%%share/locale/de/LC_MESSAGES/neverball.mo +%%NLS%%share/locale/el/LC_MESSAGES/neverball.mo +%%NLS%%share/locale/eo/LC_MESSAGES/neverball.mo %%NLS%%share/locale/es/LC_MESSAGES/neverball.mo %%NLS%%share/locale/fi/LC_MESSAGES/neverball.mo %%NLS%%share/locale/fr/LC_MESSAGES/neverball.mo +%%NLS%%share/locale/gd/LC_MESSAGES/neverball.mo +%%NLS%%share/locale/gl/LC_MESSAGES/neverball.mo +%%NLS%%share/locale/hu/LC_MESSAGES/neverball.mo +%%NLS%%share/locale/it/LC_MESSAGES/neverball.mo +%%NLS%%share/locale/ko/LC_MESSAGES/neverball.mo %%NLS%%share/locale/lv/LC_MESSAGES/neverball.mo %%NLS%%share/locale/nn/LC_MESSAGES/neverball.mo +%%NLS%%share/locale/pl/LC_MESSAGES/neverball.mo +%%NLS%%share/locale/pt_BR/LC_MESSAGES/neverball.mo +%%NLS%%share/locale/ru/LC_MESSAGES/neverball.mo +%%NLS%%share/locale/sv/LC_MESSAGES/neverball.mo +%%NLS%%share/locale/zh_CN/LC_MESSAGES/neverball.mo +%%NLS%%share/locale/zh_TW/LC_MESSAGES/neverball.mo share/pixmaps/neverball.png share/pixmaps/neverputt.png
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201410302029.s9UKTfBK028458>