Attachment #118968 for bug #161417

Lines 1835-1841 USE_LDCONFIG= ${PREFIX}/lib Link Here

(-)Mk/bsd.port.mk (-1 / +1 lines)
1835	IGNORE= has USE_LDCONFIG32 set to yes, which is not correct	1842	IGNORE= has USE_LDCONFIG32 set to yes, which is not correct
1836	.endif	1843	.endif
1837		1844
1838	.if defined(USE_ICONV)	1845	.if !exists(/usr/include/iconv.h) && defined(USE_ICONV)
1839	LIB_DEPENDS+= iconv.3:${PORTSDIR}/converters/libiconv	1846	LIB_DEPENDS+= iconv.3:${PORTSDIR}/converters/libiconv
1840	.endif	1847	.endif
1841		1848

Lines 479-485 intltool_BUILD_DEPENDS= ${intltool_DETEC Link Here

(-)Mk/bsd.gnome.mk (-1 / +1 lines)
479	intlhack_PRE_PATCH= ${FIND} ${WRKSRC} -name "intltool-merge.in" \| ${XARGS} ${REINPLACE_CMD} -e \	479	intlhack_PRE_PATCH= ${FIND} ${WRKSRC} -name "intltool-merge.in" \| ${XARGS} ${REINPLACE_CMD} -e \
480	's\|mkdir $$lang or\|mkdir $$lang, 0777 or\| ; \	480	's\|mkdir $$lang or\|mkdir $$lang, 0777 or\| ; \
481	s\|^push @INC, "/.*\|push @INC, "${LOCALBASE}/share/intltool";\| ; \	481	s\|^push @INC, "/.*\|push @INC, "${LOCALBASE}/share/intltool";\| ; \
482	s\|/usr/bin/iconv\|${LOCALBASE}/bin/iconv\|g ; \	482	s\|/usr/bin/iconv\|iconv\|g ; \
483	s\|unpack [(]'"'"'U\'"'"'\|unpack ('"'"'C*'"'"'\|'	483	s\|unpack [(]'"'"'U\'"'"'\|unpack ('"'"'C*'"'"'\|'
484	intlhack_USE_GNOME_IMPL=intltool	484	intlhack_USE_GNOME_IMPL=intltool
485		485

Added Link Here

(-)devel/gettext/files/patch-gettext-tools_src_write-po.c (+11 lines)
1	--- gettext-tools/src/write-po.c~
2	+++ gettext-tools/src/write-po.c
3	@@ -51,6 +51,8 @@
4	#include "po-xerror.h"
5	#include "gettext.h"
6
7	+#undef HAVE_ICONV
8	+
9	/* Our regular abbreviation. */
10	#define _(str) gettext (str)
11

Lines 41-47 USE_GMAKE= yes Link Here

(-)devel/glib20/Makefile (-1 / +3 lines)
41	MAKE_JOBS_SAFE= yes	41	MAKE_JOBS_SAFE= yes
42	USE_PYTHON= yes	42	USE_PYTHON= yes
43	USE_PERL5= yes	43	USE_PERL5= yes
44	CONFIGURE_ARGS= --enable-static --with-libiconv=gnu \	44	CONFIGURE_ARGS= --enable-static \
45	--disable-gtk-doc --with-html-dir=${PREFIX}/share/doc \	45	--disable-gtk-doc --with-html-dir=${PREFIX}/share/doc \
46	--disable-man --without-xml-catalog \	46	--disable-man --without-xml-catalog \
47	--disable-dtrace \	47	--disable-dtrace \
Lines 79-84 CONFIGURE_ARGS+= --enable-debug=yes Link Here
79	.endif	79	.endif
80		80
81	post-patch:	81	post-patch:
		82	@${REINPLACE_CMD} '/ac_fn_c_check_func/s/iconv_open/lib&/' \
		83	${WRKSRC}/configure
82	@${REINPLACE_CMD} -e 's\|/usr/local\|${LOCALBASE}\|g ; \	84	@${REINPLACE_CMD} -e 's\|/usr/local\|${LOCALBASE}\|g ; \
83	s\|/usr/share/locale/locale\|${LOCALBASE}/share/locale/locale\|g' \	85	s\|/usr/share/locale/locale\|${LOCALBASE}/share/locale/locale\|g' \
84	${WRKSRC}/glib/gutils.c	86	${WRKSRC}/glib/gutils.c

Lines 31-40 USE_GNOME= gnomehack pkgconfig _glib20 Link Here

(-)devel/gio-fam-backend/Makefile (-1 / +5 lines)
31	USE_FAM= yes	31	USE_FAM= yes
32	USE_GMAKE= yes	32	USE_GMAKE= yes
33	MAKE_JOBS_SAFE= yes	33	MAKE_JOBS_SAFE= yes
34	CONFIGURE_ARGS= --enable-static --with-libiconv=gnu	34	CONFIGURE_ARGS= --enable-static
35	CONFIGURE_ENV= PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \	35	CONFIGURE_ENV= PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
36	PTHREAD_LIBS="${PTHREAD_LIBS}"	36	PTHREAD_LIBS="${PTHREAD_LIBS}"
37	CPPFLAGS+= -I${LOCALBASE}/include	37	CPPFLAGS+= -I${LOCALBASE}/include
38	LDFLAGS+= -L${LOCALBASE}/lib -lintl	38	LDFLAGS+= -L${LOCALBASE}/lib -lintl
39		39
		40	post-patch:
		41	@${REINPLACE_CMD} '/ac_fn_c_check_func/s/iconv_open/lib&/' \
		42	${WRKSRC}/configure
		43
40	.include <bsd.port.mk>	44	.include <bsd.port.mk>

Return to bug 161417