Wed Dec 19 14:26:37 2012 UTC ()
Need to explicitly link against libiconv on Solaris.


(jperkin)
diff -r1.71 -r1.72 pkgsrc/graphics/gnuplot/Makefile
cvs diff -r1.71 -r1.72 pkgsrc/graphics/gnuplot/Makefile (expand / switch to unified diff)

--- pkgsrc/graphics/gnuplot/Makefile 2012/11/18 01:56:20 1.71
+++ pkgsrc/graphics/gnuplot/Makefile 2012/12/19 14:26:37 1.72
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.71 2012/11/18 01:56:20 joerg Exp $ 1# $NetBSD: Makefile,v 1.72 2012/12/19 14:26:37 jperkin Exp $
2 2
3DISTNAME= gnuplot-4.6.1 3DISTNAME= gnuplot-4.6.1
4PKGREVISION= 1 4PKGREVISION= 1
5CATEGORIES+= graphics 5CATEGORIES+= graphics
6MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=gnuplot/} 6MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=gnuplot/}
7 7
8MAINTAINER= pkgsrc-users@NetBSD.org 8MAINTAINER= pkgsrc-users@NetBSD.org
9HOMEPAGE= http://gnuplot.sourceforge.net/ 9HOMEPAGE= http://gnuplot.sourceforge.net/
10COMMENT= Portable interactive, function plotting utility 10COMMENT= Portable interactive, function plotting utility
11 11
12CONFLICTS+= gnuplot-nox11-[0-9]* 12CONFLICTS+= gnuplot-nox11-[0-9]*
13 13
14PATCHDIR= ${.CURDIR}/../../graphics/gnuplot/patches 14PATCHDIR= ${.CURDIR}/../../graphics/gnuplot/patches
@@ -33,26 +33,28 @@ USE_LANGUAGES= c @@ -33,26 +33,28 @@ USE_LANGUAGES= c
33.if !empty(OPSYS:M*BSD) || ${OPSYS} == "DragonFly" || ${OPSYS} == "Darwin" 33.if !empty(OPSYS:M*BSD) || ${OPSYS} == "DragonFly" || ${OPSYS} == "Darwin"
34. if ${OPSYS} == "NetBSD" && !empty(OS_VERSION:M[01234].*) 34. if ${OPSYS} == "NetBSD" && !empty(OS_VERSION:M[01234].*)
35CONFIGURE_ARGS+= --with-readline=${BUILDLINK_PREFIX.readline} 35CONFIGURE_ARGS+= --with-readline=${BUILDLINK_PREFIX.readline}
36.include "../../devel/readline/buildlink3.mk" 36.include "../../devel/readline/buildlink3.mk"
37. else 37. else
38CONFIGURE_ARGS+= --with-readline=bsd 38CONFIGURE_ARGS+= --with-readline=bsd
39.include "../../mk/curses.buildlink3.mk" 39.include "../../mk/curses.buildlink3.mk"
40. endif 40. endif
41.else 41.else
42CONFIGURE_ARGS+= --with-readline=${BUILDLINK_PREFIX.readline} 42CONFIGURE_ARGS+= --with-readline=${BUILDLINK_PREFIX.readline}
43.include "../../devel/readline/buildlink3.mk" 43.include "../../devel/readline/buildlink3.mk"
44.endif 44.endif
45 45
 46LDFLAGS.SunOS+= -liconv
 47
46# Make this available to patch-ah so the font path can include pkgsrc fonts. 48# Make this available to patch-ah so the font path can include pkgsrc fonts.
47SUBST_CLASSES+= fontpath 49SUBST_CLASSES+= fontpath
48SUBST_STAGE.fontpath= pre-configure 50SUBST_STAGE.fontpath= pre-configure
49SUBST_MESSAGE.fontpath= Fixing font path. 51SUBST_MESSAGE.fontpath= Fixing font path.
50SUBST_FILES.fontpath= src/variable.c 52SUBST_FILES.fontpath= src/variable.c
51SUBST_SED.fontpath= -e 's,@PKGSRC_PREFIX@,"${PREFIX}",' 53SUBST_SED.fontpath= -e 's,@PKGSRC_PREFIX@,"${PREFIX}",'
52 54
53.include "options.mk" 55.include "options.mk"
54 56
55.include "../../converters/libiconv/buildlink3.mk" 57.include "../../converters/libiconv/buildlink3.mk"
56.include "../../devel/pango/buildlink3.mk" 58.include "../../devel/pango/buildlink3.mk"
57.include "../../graphics/cairo/buildlink3.mk" 59.include "../../graphics/cairo/buildlink3.mk"
58.include "../../graphics/plotutils/buildlink3.mk" 60.include "../../graphics/plotutils/buildlink3.mk"