1
0
mirror of https://git.FreeBSD.org/ports.git synced 2024-12-27 05:10:36 +00:00

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]
This commit is contained in:
Baptiste Daroussin 2013-07-25 21:13:59 +00:00
parent f57aabd96a
commit d2515d3552
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=323669
2 changed files with 19 additions and 11 deletions

View File

@ -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}/include" \
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 \

View File

@ -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))