Date: Fri, 27 Sep 2013 15:17:27 +0000 (UTC) From: Guido Falsi <madpilot@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r328492 - in head: chinese/fcitx chinese/sunpinyin games/caph graphics/djvulibre math/gnuplot x11-wm/awesome x11-wm/awesome2 x11-wm/blackbox x11-wm/i3 Message-ID: <201309271517.r8RFHRoh063836@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: madpilot Date: Fri Sep 27 15:17:26 2013 New Revision: 328492 URL: http://svnweb.freebsd.org/changeset/ports/328492 Log: Import a bunch of iconv fixes. Submitted by: marino Approved by: portmgr (bapt, implicit) Modified: head/chinese/fcitx/Makefile head/chinese/sunpinyin/Makefile head/games/caph/Makefile head/graphics/djvulibre/Makefile head/math/gnuplot/Makefile head/x11-wm/awesome/Makefile head/x11-wm/awesome2/Makefile head/x11-wm/blackbox/Makefile head/x11-wm/i3/Makefile Modified: head/chinese/fcitx/Makefile ============================================================================== --- head/chinese/fcitx/Makefile Fri Sep 27 14:55:35 2013 (r328491) +++ head/chinese/fcitx/Makefile Fri Sep 27 15:17:26 2013 (r328492) @@ -33,8 +33,9 @@ USE_XZ= yes USE_GNOME= pango intltool libxml2 introspection USE_XORG= x11 xext xkbfile USE_LDCONFIG= yes -USES= cmake gettext pathfix pkgconfig +USES= cmake gettext iconv pathfix pkgconfig INSTALLS_ICONS= yes +DFLAGS+= -L${LOCALBASE}/lib ${ICONV_LIB} OPTIONS_DEFINE= GTK2 GTK3 QT4 OPENCC TPUNC OPTIONS_DEFAULT=GTK2 Modified: head/chinese/sunpinyin/Makefile ============================================================================== --- head/chinese/sunpinyin/Makefile Fri Sep 27 14:55:35 2013 (r328491) +++ head/chinese/sunpinyin/Makefile Fri Sep 27 15:17:26 2013 (r328492) @@ -23,7 +23,8 @@ USE_XZ= yes USE_SCONS= yes SCONS_ARGS+= --prefix=${PREFIX} --libdatadir=${PREFIX}/share USE_LDCONFIG= yes -USES= gmake pkgconfig +USES= gmake iconv pkgconfig +LDFLAGS+= -L${LOCALBASE}/lib ${ICONV_LIB} NO_STAGE= yes post-patch: Modified: head/games/caph/Makefile ============================================================================== --- head/games/caph/Makefile Fri Sep 27 14:55:35 2013 (r328491) +++ head/games/caph/Makefile Fri Sep 27 15:17:26 2013 (r328492) @@ -15,6 +15,7 @@ LIB_DEPENDS= png15:${PORTSDIR}/graphics/ LICENSE= GPLv3 LICENSE_FILE= ${WRKSRC}/doc/caph/COPYING +USES= iconv USE_BZIP2= yes USE_SDL= sdl USE_GL= gl @@ -42,7 +43,7 @@ CFLAGS+= -O3 -ffast-math do-build: cd ${BUILD_WRKSRC} && ${CC} ${CFLAGS} -o caph -I../include *.c \ - `${SDL_CONFIG} --libs --cflags` -D_OPENGL -lGL -lpng + `${SDL_CONFIG} --libs --cflags` -D_OPENGL -lGL -lpng ${ICONV_LIB} post-patch: @${REINPLACE_CMD} -e 's|../share/caph|${DATADIR}|' ${BUILD_WRKSRC}/caph.c Modified: head/graphics/djvulibre/Makefile ============================================================================== --- head/graphics/djvulibre/Makefile Fri Sep 27 14:55:35 2013 (r328491) +++ head/graphics/djvulibre/Makefile Fri Sep 27 15:17:26 2013 (r328492) @@ -17,6 +17,7 @@ LIB_DEPENDS+= jpeg:${PORTSDIR}/graphics/ USES= pathfix iconv GNU_CONFIGURE= yes +LDFLAGS+= -L${LOCALBASE}/lib ${ICONV_LIB} CONFIGURE_ENV= JPEG_CFLAGS="-I${LOCALBASE}/include" \ JPEG_LIBS="-L${LOCALBASE}/lib -ljpeg" \ TIFF_CFLAGS="-I${LOCALBASE}/include" \ Modified: head/math/gnuplot/Makefile ============================================================================== --- head/math/gnuplot/Makefile Fri Sep 27 14:55:35 2013 (r328491) +++ head/math/gnuplot/Makefile Fri Sep 27 15:17:26 2013 (r328492) @@ -9,7 +9,9 @@ MASTER_SITES= SF MAINTAINER= glewis@FreeBSD.org COMMENT= Command-line driven graphing utility +USES= iconv GNU_CONFIGURE= yes +LDFLAGS+= -L${LOCALBASE}/lib ${ICONV_LIB} CONFIGURE_ARGS+=--with-lasergnu \ --with-readline=gnu \ --without-linux-vga \ Modified: head/x11-wm/awesome/Makefile ============================================================================== --- head/x11-wm/awesome/Makefile Fri Sep 27 14:55:35 2013 (r328491) +++ head/x11-wm/awesome/Makefile Fri Sep 27 15:17:26 2013 (r328492) @@ -41,6 +41,7 @@ USE_GNOME= glib20 pango USE_LUA= 5.1+ USE_XORG= pixman x11 xau xcb xdmcp xext xft xinerama xrandr xrender \ xproto +LDFLAGS+= ${ICONV_LIB} MAN1= awesome.1 \ awesome-client.1 Modified: head/x11-wm/awesome2/Makefile ============================================================================== --- head/x11-wm/awesome2/Makefile Fri Sep 27 14:55:35 2013 (r328491) +++ head/x11-wm/awesome2/Makefile Fri Sep 27 15:17:26 2013 (r328492) @@ -22,6 +22,7 @@ GNU_CONFIGURE= yes USE_EFL= imlib2 USE_GNOME= pango USE_XORG= x11 xft xext xinerama xt xrandr xproto +LDFLAGS+= -lX11 -lXext ${ICONV_LIB} MAN1= awesome2.1 \ awesome2-client.1 \ Modified: head/x11-wm/blackbox/Makefile ============================================================================== --- head/x11-wm/blackbox/Makefile Fri Sep 27 14:55:35 2013 (r328491) +++ head/x11-wm/blackbox/Makefile Fri Sep 27 15:17:26 2013 (r328492) @@ -15,6 +15,7 @@ LICENSE= MIT GNU_CONFIGURE= yes USES= pathfix pkgconfig iconv USE_XORG= x11 xft +LDFLAGS+= ${ICONV_LIB} MAN1= bsetbg.1 bsetroot.1 PORTDOCS= README.bbtools README.bsetbg Modified: head/x11-wm/i3/Makefile ============================================================================== --- head/x11-wm/i3/Makefile Fri Sep 27 14:55:35 2013 (r328491) +++ head/x11-wm/i3/Makefile Fri Sep 27 15:17:26 2013 (r328492) @@ -29,6 +29,7 @@ USE_XORG= x11 xcb xcursor USES= pkgconfig iconv gmake perl5 USE_BZIP2= yes USE_PERL5= run +LDFLAGS+= -L${LOCALBASE}/lib ${ICONV_LIB} MAKE_JOBS_UNSAFE= yes post-patch:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201309271517.r8RFHRoh063836>