Date: Thu, 25 Jul 2013 21:13:59 +0000 (UTC) From: Baptiste Daroussin <bapt@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r323669 - in head/games/tuxpaint: . files Message-ID: <201307252113.r6PLDx2v006843@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: bapt Date: Thu Jul 25 21:13:59 2013 New Revision: 323669 URL: http://svnweb.freebsd.org/changeset/ports/323669 Log: Fix build with linker that does not copy the dt_need from libraries it links with like recent binutils. [1] While here: - trim headers - convert to new options framework - remove shlib version - convert USE_GMAKE -> USES=gmake Obtained from: DPorts [1] Modified: head/games/tuxpaint/Makefile head/games/tuxpaint/files/patch-Makefile Modified: head/games/tuxpaint/Makefile ============================================================================== --- head/games/tuxpaint/Makefile Thu Jul 25 21:10:34 2013 (r323668) +++ head/games/tuxpaint/Makefile Thu Jul 25 21:13:59 2013 (r323669) @@ -1,9 +1,5 @@ -# New ports collection makefile for: tuxpaint -# Date created: 14 Jul 2005 -# Whom: Alejandro Pulver <alejandro@varnet.biz> -# +# Created by: Alejandro Pulver <alejandro@varnet.biz> # $FreeBSD$ -# PORTNAME= tuxpaint PORTVERSION= 0.9.21 @@ -14,13 +10,14 @@ MASTER_SITES= SF MAINTAINER= ports@FreeBSD.org COMMENT= Drawing program designed for young children -LIB_DEPENDS= fribidi.3:${PORTSDIR}/converters/fribidi \ - paper.2:${PORTSDIR}/print/libpaper +LIB_DEPENDS= fribidi:${PORTSDIR}/converters/fribidi \ + paper:${PORTSDIR}/print/libpaper + +OPTIONS_DEFINE= DOCS USE_GNOME= librsvg2 USE_SDL= image mixer sdl ttf pango -USES= gettext -USE_GMAKE= yes +USES= gettext gmake MAKE_ARGS= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" \ PREFIX="${PREFIX}" \ @@ -37,7 +34,9 @@ MAKE_ARGS= CPPFLAGS="-I${LOCALBASE}/incl MANCOMPRESSED= yes MAN1= tp-magic-config.1 tuxpaint.1 tuxpaint-import.1 -.if defined(NOPORTDOCS) +.include <bsd.port.options.mk> + +.if ${PORT_OPTIONS:MDOCS} INSTALL_TARGET= install-bin install-data install-man install-magic-plugins \ install-magic-plugin-dev install-icon install-gettext \ install-im install-importscript install-default-config \ Modified: head/games/tuxpaint/files/patch-Makefile ============================================================================== --- head/games/tuxpaint/files/patch-Makefile Thu Jul 25 21:10:34 2013 (r323668) +++ head/games/tuxpaint/files/patch-Makefile Thu Jul 25 21:13:59 2013 (r323669) @@ -1,5 +1,14 @@ ---- Makefile.orig 2009-04-29 14:18:57.000000000 +0900 +--- Makefile.orig 2013-03-18 11:17:31.189596000 +0000 +++ Makefile 2010-10-19 01:08:15.000000000 +0900 +@@ -157,7 +157,7 @@ CURSOR_SHAPES:=LARGE + + + # Libraries, paths, and flags: +-SDL_LIBS:=$(shell sdl-config --libs) -lSDL_image -lSDL_ttf ++SDL_LIBS:=$(shell sdl-config --libs) -lSDL_image -lSDL_ttf -lpng15 -lintl + + # Sound support + SDL_MIXER_LIB:=$(call linktest,-lSDL_mixer,$(SDL_LIBS)) @@ -303,7 +303,8 @@ INSTALLED_MOFILES:=$(patsubst trans/%.mo,$(LOCALE_PREFIX)/%/LC_MESSAGES/tuxpaint.mo,$(MOFILES))
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201307252113.r6PLDx2v006843>