diff options
34 files changed, 8 insertions, 104 deletions
diff --git a/databases/freetds-devel/Makefile b/databases/freetds-devel/Makefile index 085938a..f18e65a 100644 --- a/databases/freetds-devel/Makefile +++ b/databases/freetds-devel/Makefile @@ -41,10 +41,6 @@ PLIST_SUB+= ODBC="@comment " .endif post-patch: -.for file in configure include/tds.h.in src/tds/iconv.c - @${PERL} -pi -e 's|<iconv.h>|<giconv.h>|g ; \ - s|-liconv|-lgiconv|g' ${WRKSRC}/${file} -.endfor @find ${WRKSRC} -name "Makefile.in" | xargs ${PERL} -pi -e \ 's|/freetds.conf|/freetds.conf.dist|g ; \ s|glib-config|\$$\(GLIB_CONFIG\)|g ; \ diff --git a/databases/freetds/Makefile b/databases/freetds/Makefile index 085938a..f18e65a 100644 --- a/databases/freetds/Makefile +++ b/databases/freetds/Makefile @@ -41,10 +41,6 @@ PLIST_SUB+= ODBC="@comment " .endif post-patch: -.for file in configure include/tds.h.in src/tds/iconv.c - @${PERL} -pi -e 's|<iconv.h>|<giconv.h>|g ; \ - s|-liconv|-lgiconv|g' ${WRKSRC}/${file} -.endfor @find ${WRKSRC} -name "Makefile.in" | xargs ${PERL} -pi -e \ 's|/freetds.conf|/freetds.conf.dist|g ; \ s|glib-config|\$$\(GLIB_CONFIG\)|g ; \ diff --git a/deskutils/mrproject/Makefile b/deskutils/mrproject/Makefile index e81b78b..07561dd 100644 --- a/deskutils/mrproject/Makefile +++ b/deskutils/mrproject/Makefile @@ -32,7 +32,5 @@ pre-patch: @find ${WRKSRC} -name "Makefile.in*" | xargs ${PERL} -pi -e \ 's|\$\(datadir\)/gnome/|\$\(datadir\)/|g ; \ s|\$\(datadir\)/locale|\$\(prefix\)/share/locale|g' - @find ${WRKSRC} -type f -name "*.[ch]" | xargs ${GREP} -l '[^g]iconv.h' | \ - xargs ${PERL} -pi -e 's|(["<])iconv.h|\1giconv.h|g' .include <bsd.port.mk> diff --git a/deskutils/planner/Makefile b/deskutils/planner/Makefile index e81b78b..07561dd 100644 --- a/deskutils/planner/Makefile +++ b/deskutils/planner/Makefile @@ -32,7 +32,5 @@ pre-patch: @find ${WRKSRC} -name "Makefile.in*" | xargs ${PERL} -pi -e \ 's|\$\(datadir\)/gnome/|\$\(datadir\)/|g ; \ s|\$\(datadir\)/locale|\$\(prefix\)/share/locale|g' - @find ${WRKSRC} -type f -name "*.[ch]" | xargs ${GREP} -l '[^g]iconv.h' | \ - xargs ${PERL} -pi -e 's|(["<])iconv.h|\1giconv.h|g' .include <bsd.port.mk> diff --git a/devel/glib20/Makefile b/devel/glib20/Makefile index 3ac2f9e..e9f4cf5 100644 --- a/devel/glib20/Makefile +++ b/devel/glib20/Makefile @@ -40,8 +40,6 @@ CONFIGURE_TARGET= --target=${MACHINE_ARCH}-unknown-freebsd${OSREL} MAN1= glib-genmarshal.1 glib-mkenums.1 pre-patch: - @find ${WRKSRC} -type f | xargs ${GREP} -l iconv.h | \ - xargs ${PERL} -pi -e "s|iconv\.h|giconv.h|g" @find ${WRKSRC} -name Makefile.in | xargs ${PERL} -pi -e \ 's|\$\(libdir\)/pkgconfig|\$\(prefix\)/libdata/pkgconfig|g' diff --git a/devel/styx/Makefile b/devel/styx/Makefile index 3d72890..10d30bc 100644 --- a/devel/styx/Makefile +++ b/devel/styx/Makefile @@ -27,9 +27,6 @@ USE_GMAKE= yes INSTALLS_SHLIB= yes post-patch: -.for file in config.h.in configure libbase/styconf0.h - @${PERL} -pi -e "s,iconv.h,giconv.h,g" ${WRKSRC}/${file} -.endfor .for file in config.h.in libbase/styconf0.h libbase/gstream.c @${PERL} -pi -e "s,ICONV_H,GICONV_H,g" ${WRKSRC}/${file} .endfor diff --git a/editors/dedit/Makefile b/editors/dedit/Makefile index b2310b1..af4fff0 100644 --- a/editors/dedit/Makefile +++ b/editors/dedit/Makefile @@ -31,8 +31,6 @@ pre-patch: @find ${WRKSRC} -name "Makefile.in" | xargs ${PERL} -pi -e \ 's|\$\(datadir\)/gnome/|\$\(datadir\)/|g ; \ s|dedit.ja.1||' - @find ${WRKSRC} -name "*.c" | xargs ${PERL} -pi -e \ - 's|<iconv.h>|<giconv.h>|g' post-install: ${INSTALL_MAN} ${WRKSRC}/doc/dedit.ja.1 ${MANPREFIX}/man/ja/man1/dedit.1 diff --git a/graphics/gphoto2/Makefile b/graphics/gphoto2/Makefile index 1382ddd..1149e5e 100644 --- a/graphics/gphoto2/Makefile +++ b/graphics/gphoto2/Makefile @@ -35,9 +35,7 @@ INSTALL_CMD= /usr/bin/install -c -o ${BINOWN} -g ${BINGRP} post-patch: .for file in configure libgphoto2_port/configure - @${PERL} -pi -e 's|<iconv.h>|<giconv.h>|g ; \ - s|-liconv|-lgiconv|g ; \ - s|-g -Wall||g' ${WRKSRC}/${file} + @${PERL} -pi -e 's|-g -Wall||g' ${WRKSRC}/${file} .endfor @find ${WRKSRC} -name "Makefile.in" | xargs ${PERL} -pi -e \ 's|\@INSTALL\@|${INSTALL_CMD}|g ; \ diff --git a/irc/xchat-gnome/Makefile b/irc/xchat-gnome/Makefile index bbf0d60..95fe629 100644 --- a/irc/xchat-gnome/Makefile +++ b/irc/xchat-gnome/Makefile @@ -69,10 +69,7 @@ CONFIGURE_ARGS+= --disable-gnome --disable-zvt post-patch: @${PERL} -pi \ -e 's|-lpthread|${PTHREAD_LIBS}|g;' \ - -e 's|iconv|giconv|;' \ ${WRKSRC}/configure - @${PERL} -pi -e 's|iconv\.h|giconv.h|;' \ - ${WRKSRC}/src/common/jcode.c post-install: .if !defined(NOPORTDOCS) diff --git a/irc/xchat/Makefile b/irc/xchat/Makefile index bbf0d60..95fe629 100644 --- a/irc/xchat/Makefile +++ b/irc/xchat/Makefile @@ -69,10 +69,7 @@ CONFIGURE_ARGS+= --disable-gnome --disable-zvt post-patch: @${PERL} -pi \ -e 's|-lpthread|${PTHREAD_LIBS}|g;' \ - -e 's|iconv|giconv|;' \ ${WRKSRC}/configure - @${PERL} -pi -e 's|iconv\.h|giconv.h|;' \ - ${WRKSRC}/src/common/jcode.c post-install: .if !defined(NOPORTDOCS) diff --git a/irc/xchat1/Makefile b/irc/xchat1/Makefile index bbf0d60..95fe629 100644 --- a/irc/xchat1/Makefile +++ b/irc/xchat1/Makefile @@ -69,10 +69,7 @@ CONFIGURE_ARGS+= --disable-gnome --disable-zvt post-patch: @${PERL} -pi \ -e 's|-lpthread|${PTHREAD_LIBS}|g;' \ - -e 's|iconv|giconv|;' \ ${WRKSRC}/configure - @${PERL} -pi -e 's|iconv\.h|giconv.h|;' \ - ${WRKSRC}/src/common/jcode.c post-install: .if !defined(NOPORTDOCS) diff --git a/irc/xchat2/Makefile b/irc/xchat2/Makefile index bbf0d60..95fe629 100644 --- a/irc/xchat2/Makefile +++ b/irc/xchat2/Makefile @@ -69,10 +69,7 @@ CONFIGURE_ARGS+= --disable-gnome --disable-zvt post-patch: @${PERL} -pi \ -e 's|-lpthread|${PTHREAD_LIBS}|g;' \ - -e 's|iconv|giconv|;' \ ${WRKSRC}/configure - @${PERL} -pi -e 's|iconv\.h|giconv.h|;' \ - ${WRKSRC}/src/common/jcode.c post-install: .if !defined(NOPORTDOCS) diff --git a/mail/balsa/Makefile b/mail/balsa/Makefile index db053e5..336425e 100644 --- a/mail/balsa/Makefile +++ b/mail/balsa/Makefile @@ -38,9 +38,7 @@ MAN1= balsa.1 post-patch: @${PERL} -pi -e 's|-lpthread|${PTHREAD_LIBS}|g ; \ - s|DATADIRNAME=lib|DATADIRNAME=share|g ; \ - s|-liconv|-lgiconv|g ; s|iconv_open|libiconv_open|g ; \ - s|([^g])iconv.h|\1giconv.h|g' \ + s|DATADIRNAME=lib|DATADIRNAME=share|g' \ ${WRKSRC}/configure ${WRKSRC}/libmutt/configure @find ${WRKSRC} -name "Makefile.in*" | xargs ${PERL} -pi -e \ 's|\$\(datadir\)/gnome/|\$\(datadir\)/|g ; \ diff --git a/mail/balsa2/Makefile b/mail/balsa2/Makefile index db053e5..336425e 100644 --- a/mail/balsa2/Makefile +++ b/mail/balsa2/Makefile @@ -38,9 +38,7 @@ MAN1= balsa.1 post-patch: @${PERL} -pi -e 's|-lpthread|${PTHREAD_LIBS}|g ; \ - s|DATADIRNAME=lib|DATADIRNAME=share|g ; \ - s|-liconv|-lgiconv|g ; s|iconv_open|libiconv_open|g ; \ - s|([^g])iconv.h|\1giconv.h|g' \ + s|DATADIRNAME=lib|DATADIRNAME=share|g' \ ${WRKSRC}/configure ${WRKSRC}/libmutt/configure @find ${WRKSRC} -name "Makefile.in*" | xargs ${PERL} -pi -e \ 's|\$\(datadir\)/gnome/|\$\(datadir\)/|g ; \ diff --git a/mail/evolution-devel/Makefile b/mail/evolution-devel/Makefile index b14afd5..4c115378 100644 --- a/mail/evolution-devel/Makefile +++ b/mail/evolution-devel/Makefile @@ -70,8 +70,6 @@ pre-patch: @find ${WRKSRC} -name "Makefile.in*" | xargs ${PERL} -pi -e \ 's|\$\(datadir\)/gnome/|\$\(datadir\)/|g ; \ s|\$\(datadir\)/locale|\$\(prefix\)/share/locale|g' - @find ${WRKSRC} -type f -name "*.[ch]" | xargs ${GREP} -l '[^g]iconv.h' | \ - xargs ${PERL} -pi -e 's|(["<])iconv.h|\1giconv.h|g' @find ${WRKSRC} -type f -name "*.[ch]" | xargs ${GREP} -l '<db.h>' | \ xargs ${PERL} -pi -e 's|<db.h>|<db3/db.h>|g' diff --git a/mail/evolution/Makefile b/mail/evolution/Makefile index b14afd5..4c115378 100644 --- a/mail/evolution/Makefile +++ b/mail/evolution/Makefile @@ -70,8 +70,6 @@ pre-patch: @find ${WRKSRC} -name "Makefile.in*" | xargs ${PERL} -pi -e \ 's|\$\(datadir\)/gnome/|\$\(datadir\)/|g ; \ s|\$\(datadir\)/locale|\$\(prefix\)/share/locale|g' - @find ${WRKSRC} -type f -name "*.[ch]" | xargs ${GREP} -l '[^g]iconv.h' | \ - xargs ${PERL} -pi -e 's|(["<])iconv.h|\1giconv.h|g' @find ${WRKSRC} -type f -name "*.[ch]" | xargs ${GREP} -l '<db.h>' | \ xargs ${PERL} -pi -e 's|<db.h>|<db3/db.h>|g' diff --git a/mail/gbiff/Makefile b/mail/gbiff/Makefile index 62497c7..1f9a149 100644 --- a/mail/gbiff/Makefile +++ b/mail/gbiff/Makefile @@ -24,8 +24,6 @@ pre-patch: @${PERL} -pi -e 's|DATADIRNAME=lib|DATADIRNAME=share|g ; \ s|`gtk-config --cflags`|`\$$GTK_CONFIG --cflags`|g ; \ s|`gtk-config --libs`|`\$$GTK_CONFIG --libs`|g ; \ - s|<iconv.h>|<giconv.h>|g ; \ - s|-liconv|-lgiconv|g ; \ s|DATADIRNAME}"|DATADIRNAME}/gnome"|g' ${WRKSRC}/configure @find ${WRKSRC} -name "Makefile.in" | xargs ${PERL} -pi -e \ 's|\$\(datadir\)/gnome/|\$\(datadir\)/|g ; \ diff --git a/math/gnumeric/Makefile b/math/gnumeric/Makefile index 8f6fbb2..d3e1193 100644 --- a/math/gnumeric/Makefile +++ b/math/gnumeric/Makefile @@ -42,8 +42,6 @@ pre-patch: @find ${WRKSRC} -name "Makefile.in*" | xargs ${PERL} -pi -e \ 's|\$\(datadir\)/gnome/|\$\(datadir\)/|g ; \ s|\$\(datadir\)/locale|\$\(prefix\)/share/locale|g' - @find ${WRKSRC}/plugins/excel -name "*.[ch]" | xargs ${PERL} -pi -e \ - 's|iconv\.h|giconv.h|g' post-install: .for dir in share/gnome lib diff --git a/math/gnumeric2/Makefile b/math/gnumeric2/Makefile index 8f6fbb2..d3e1193 100644 --- a/math/gnumeric2/Makefile +++ b/math/gnumeric2/Makefile @@ -42,8 +42,6 @@ pre-patch: @find ${WRKSRC} -name "Makefile.in*" | xargs ${PERL} -pi -e \ 's|\$\(datadir\)/gnome/|\$\(datadir\)/|g ; \ s|\$\(datadir\)/locale|\$\(prefix\)/share/locale|g' - @find ${WRKSRC}/plugins/excel -name "*.[ch]" | xargs ${PERL} -pi -e \ - 's|iconv\.h|giconv.h|g' post-install: .for dir in share/gnome lib diff --git a/misc/pinfo/Makefile b/misc/pinfo/Makefile index eea9f2a..1335b40 100644 --- a/misc/pinfo/Makefile +++ b/misc/pinfo/Makefile @@ -31,8 +31,4 @@ LIB_DEPENDS+= ncurses.5:${PORTSDIR}/devel/ncurses CONFIGURE_ARGS+= --with-ncurses=${LOCALBASE} .endif -pre-patch: - @${PERL} -pi -e 's|<iconv.h>|<giconv.h>|g ; \ - s|-liconv|-lgiconv|g' ${WRKSRC}/configure - .include <bsd.port.post.mk> diff --git a/net/gabber/Makefile b/net/gabber/Makefile index 6041aa9..41a2052 100644 --- a/net/gabber/Makefile +++ b/net/gabber/Makefile @@ -40,7 +40,5 @@ post-patch: @find ${WRKSRC} -name "Makefile.in*" | xargs ${PERL} -pi -e \ 's|\$\(datadir\)/gnome/|\$\(datadir\)/|g ; \ s|\$\(datadir\)/locale|\$\(prefix\)/share/locale|g' - @find ${WRKSRC}/src -name "*.[ch]" | xargs ${PERL} -pi -e \ - 's|\<iconv.h\>|\<giconv.h\>|g' .include <bsd.port.mk> diff --git a/net/wol/Makefile b/net/wol/Makefile index 9e21d9f8..c782c1b 100644 --- a/net/wol/Makefile +++ b/net/wol/Makefile @@ -23,7 +23,4 @@ GNU_CONFIGURE= yes CONFIGURE_ENV= CPPFLAGS="${CXXFLAGS} -I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib -lgiconv -lgnugetopt" -post-patch: - @${PERL} -pi -e "s/iconv.h/giconv.h/g" ${WRKSRC}/configure - .include <bsd.port.mk> diff --git a/palm/pilot-link-devel/Makefile b/palm/pilot-link-devel/Makefile index cd6a729..a09fba6 100644 --- a/palm/pilot-link-devel/Makefile +++ b/palm/pilot-link-devel/Makefile @@ -31,10 +31,6 @@ CFLAGS+= -I${LOCALBASE}/include CONFIGURE_ARGS= --with-perl5=${PERL5} --with-libiconv=${LOCALBASE} post-patch: - # FreeBSD installs -lgiconv instead of -liconv. Patch configure. - ${PERL} -pi -e 's/([^g])iconv.h/\1giconv.h/g;' \ - -e 's/-liconv/-lgiconv/g' ${WRKSRC}/${CONFIGURE_SCRIPT} \ - ${WRKSRC}/libsock/util.c # Remove the FORCE tag, which forced recompiling/relinking # of the otherwise up-to-date files. ${PERL} -pi -e 's/: FORCE/:/;' -e 's/getopt.h//;' ${WRKSRC}/Makefile.in diff --git a/palm/pilot-link/Makefile b/palm/pilot-link/Makefile index cd6a729..a09fba6 100644 --- a/palm/pilot-link/Makefile +++ b/palm/pilot-link/Makefile @@ -31,10 +31,6 @@ CFLAGS+= -I${LOCALBASE}/include CONFIGURE_ARGS= --with-perl5=${PERL5} --with-libiconv=${LOCALBASE} post-patch: - # FreeBSD installs -lgiconv instead of -liconv. Patch configure. - ${PERL} -pi -e 's/([^g])iconv.h/\1giconv.h/g;' \ - -e 's/-liconv/-lgiconv/g' ${WRKSRC}/${CONFIGURE_SCRIPT} \ - ${WRKSRC}/libsock/util.c # Remove the FORCE tag, which forced recompiling/relinking # of the otherwise up-to-date files. ${PERL} -pi -e 's/: FORCE/:/;' -e 's/getopt.h//;' ${WRKSRC}/Makefile.in diff --git a/science/vis5d+/Makefile b/science/vis5d+/Makefile index 16dce65..5a1ac49 100644 --- a/science/vis5d+/Makefile +++ b/science/vis5d+/Makefile @@ -34,11 +34,6 @@ CONFIGURE_ARGS= --enable-gtk --enable-threads --with-mesa --with-netcdf \ --with-mixkit=${LOCALBASE}/lib/libmix.a --with-x INSTALLS_SHLIB= yes -post-patch: -.for file in configure intl/gettextP.h - @${PERL} -pi -e "s,iconv.h,giconv.h,g" ${WRKSRC}/${file} -.endfor - pre-build: @${LN} -sf ${LOCALBASE}/bin/libtool ${WRKSRC} diff --git a/textproc/gxmlviewer/Makefile b/textproc/gxmlviewer/Makefile index 64c5c0d..5e3e85f 100644 --- a/textproc/gxmlviewer/Makefile +++ b/textproc/gxmlviewer/Makefile @@ -21,8 +21,6 @@ USE_GNOME= yes GNU_CONFIGURE= yes post-patch: - @${PERL} -pi -e 's|-lpthread|${PTHREAD_LIBS}|g ; \ - s|<iconv.h>|<giconv.h>|g ; \ - s|-liconv|-lgiconv|g' ${WRKSRC}/configure + @${PERL} -pi -e 's|-lpthread|${PTHREAD_LIBS}|g' ${WRKSRC}/configure .include <bsd.port.mk> diff --git a/textproc/libxml2/Makefile b/textproc/libxml2/Makefile index 8e48575..5806dd9 100644 --- a/textproc/libxml2/Makefile +++ b/textproc/libxml2/Makefile @@ -49,8 +49,5 @@ pre-extract: pre-patch: @find ${WRKSRC} -name Makefile.in | xargs ${PERL} -pi -e \ 's|\$\(libdir\)/pkgconfig|\$\(prefix\)/libdata/pkgconfig|g' - @cd ${WRKSRC} && ${PERL} -pi -e \ - 's|([^g])iconv.h|\1giconv.h|g ; s|-liconv|-lgiconv|g' \ - configure include/libxml/encoding.h .include <bsd.port.mk> diff --git a/textproc/wv/Makefile b/textproc/wv/Makefile index 8bc38d5..73bfac2 100644 --- a/textproc/wv/Makefile +++ b/textproc/wv/Makefile @@ -25,10 +25,4 @@ MAN1= wvAbw.1 wvCleanLatex.1 wvDVI.1 wvHtml.1 wvLatex.1 wvMime.1 wvPDF.1 \ wvPS.1 wvRTF.1 wvSummary.1 wvText.1 wvVersion.1 wvWare.1 wvWml.1 MLINKS= wvWare.1 wvConvert.1 -pre-patch: - @${PERL} -pi -e 's|<iconv.h>|<giconv.h>|g ; \ - s|-liconv|-lgiconv|g' ${WRKSRC}/configure - @find ${WRKSRC} -name '*.[ch]' | xargs ${PERL} -pi -e \ - 's|"iconv.h"|"giconv.h"|g' - .include <bsd.port.mk> diff --git a/www/galeon/Makefile b/www/galeon/Makefile index c6fbc21..fe610a5 100644 --- a/www/galeon/Makefile +++ b/www/galeon/Makefile @@ -56,14 +56,11 @@ post-extract: pre-patch: @${PERL} -pi -e 's|-lpthread|${PTHREAD_LIBS}|g ; \ - s|DATADIRNAME=lib|DATADIRNAME=share|g ; \ - s|-liconv|-lgiconv|g ; s|iconv\.h|giconv.h|g' ${WRKSRC}/configure + s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure @find ${WRKSRC} -name "Makefile.in*" | xargs ${PERL} -pi -e \ 's|\$\(datadir\)/gnome/|\$\(datadir\)/|g ; \ s|\$\(datadir\)/locale|\$\(prefix\)/share/locale|g ; \ s|-lpthread|${PTHREAD_LIBS}|g' - @find ${WRKSRC} -name "*.[ch]" | xargs ${PERL} -pi -e \ - 's|iconv\.h|giconv.h|g' @${MKDIR} ${WRKSRC}/src/libnautilus post-configure: diff --git a/www/galeon2/Makefile b/www/galeon2/Makefile index c6fbc21..fe610a5 100644 --- a/www/galeon2/Makefile +++ b/www/galeon2/Makefile @@ -56,14 +56,11 @@ post-extract: pre-patch: @${PERL} -pi -e 's|-lpthread|${PTHREAD_LIBS}|g ; \ - s|DATADIRNAME=lib|DATADIRNAME=share|g ; \ - s|-liconv|-lgiconv|g ; s|iconv\.h|giconv.h|g' ${WRKSRC}/configure + s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure @find ${WRKSRC} -name "Makefile.in*" | xargs ${PERL} -pi -e \ 's|\$\(datadir\)/gnome/|\$\(datadir\)/|g ; \ s|\$\(datadir\)/locale|\$\(prefix\)/share/locale|g ; \ s|-lpthread|${PTHREAD_LIBS}|g' - @find ${WRKSRC} -name "*.[ch]" | xargs ${PERL} -pi -e \ - 's|iconv\.h|giconv.h|g' @${MKDIR} ${WRKSRC}/src/libnautilus post-configure: diff --git a/x11-toolkits/gal/Makefile b/x11-toolkits/gal/Makefile index 624c1a7..2077fe8 100644 --- a/x11-toolkits/gal/Makefile +++ b/x11-toolkits/gal/Makefile @@ -36,7 +36,5 @@ pre-patch: @find ${WRKSRC} -name "Makefile.in*" | xargs ${PERL} -pi -e \ 's|\$\(datadir\)/gnome/|\$\(datadir\)/|g ; \ s|\$\(datadir\)/locale|\$\(prefix\)/share/locale|g' - @find ${WRKSRC}/gal/widgets -name '*.[ch]' | xargs ${PERL} -pi -e \ - 's|<iconv.h>|<giconv.h>|' .include <bsd.port.mk> diff --git a/x11-toolkits/gal2/Makefile b/x11-toolkits/gal2/Makefile index 624c1a7..2077fe8 100644 --- a/x11-toolkits/gal2/Makefile +++ b/x11-toolkits/gal2/Makefile @@ -36,7 +36,5 @@ pre-patch: @find ${WRKSRC} -name "Makefile.in*" | xargs ${PERL} -pi -e \ 's|\$\(datadir\)/gnome/|\$\(datadir\)/|g ; \ s|\$\(datadir\)/locale|\$\(prefix\)/share/locale|g' - @find ${WRKSRC}/gal/widgets -name '*.[ch]' | xargs ${PERL} -pi -e \ - 's|<iconv.h>|<giconv.h>|' .include <bsd.port.mk> diff --git a/x11-wm/xfce/Makefile b/x11-wm/xfce/Makefile index 8cca42a..0471f34 100644 --- a/x11-wm/xfce/Makefile +++ b/x11-wm/xfce/Makefile @@ -58,11 +58,8 @@ pre-everything:: pre-patch: @${PERL} -pi -e \ - 's|DATADIRNAME=lib|DATADIRNAME=share|g ; \ - s|<iconv.h>|<giconv.h>|g ; \ - s|-liconv|-lgiconv|g' ${WRKSRC}/configure + 's|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure @${PERL} -pi -e 's|gtk-config|${GTK_CONFIG:T}|g' ${WRKSRC}/xfce/setup.c - @${PERL} -pi -e 's|<iconv.h>|<giconv.h>|g' ${WRKSRC}/xfmenu/xfmenu.c @${PERL} -pi -e 's|xfplay|internal|g' ${WRKSRC}/other/xfsoundrc.in .include <bsd.port.post.mk> diff --git a/x11-wm/xfce4/Makefile b/x11-wm/xfce4/Makefile index 8cca42a..0471f34 100644 --- a/x11-wm/xfce4/Makefile +++ b/x11-wm/xfce4/Makefile @@ -58,11 +58,8 @@ pre-everything:: pre-patch: @${PERL} -pi -e \ - 's|DATADIRNAME=lib|DATADIRNAME=share|g ; \ - s|<iconv.h>|<giconv.h>|g ; \ - s|-liconv|-lgiconv|g' ${WRKSRC}/configure + 's|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure @${PERL} -pi -e 's|gtk-config|${GTK_CONFIG:T}|g' ${WRKSRC}/xfce/setup.c - @${PERL} -pi -e 's|<iconv.h>|<giconv.h>|g' ${WRKSRC}/xfmenu/xfmenu.c @${PERL} -pi -e 's|xfplay|internal|g' ${WRKSRC}/other/xfsoundrc.in .include <bsd.port.post.mk> |
