sync/ports
1
0
Fork 0
mirror of https://git.freebsd.org/ports.git synced 2025-07-17 17:29:23 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Iconv cleanup, stage 2b: remove regex hacks that change iconv.h to giconv.h and

Browse source 
-liconv to -lgiconv.
This commit is contained in:
Maxim Sobolev 2002-03-18 11:50:38 +00:00
parent 449a928eea
commit a68d2827d3
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=56294
34 changed files with 8 additions and 104 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
databases/freetds-devel/Makefile
View file

@ -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 ; \

4
databases/freetds/Makefile
View file

@ -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 ; \

2
deskutils/mrproject/Makefile
View file

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

2
deskutils/planner/Makefile
View file

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

2
devel/glib20/Makefile
View file

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

3
devel/styx/Makefile
View file

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

2
editors/dedit/Makefile
View file

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

4
graphics/gphoto2/Makefile
View file

@ -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 ; \

3
irc/xchat-gnome/Makefile
View file

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

3
irc/xchat/Makefile
View file

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

3
irc/xchat1/Makefile
View file

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

3
irc/xchat2/Makefile
View file

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

4
mail/balsa/Makefile
View file

@ -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 ; \

4
mail/balsa2/Makefile
View file

@ -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 ; \

2
mail/evolution-devel/Makefile
View file

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

2
mail/evolution/Makefile
View file

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

2
mail/gbiff/Makefile
View file

@ -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 ; \

2
math/gnumeric/Makefile
View file

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

2
math/gnumeric2/Makefile
View file

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

4
misc/pinfo/Makefile
View file

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

2
net/gabber/Makefile
View file

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

3
net/wol/Makefile
View file

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

4
palm/pilot-link-devel/Makefile
View file

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

4
palm/pilot-link/Makefile
View file

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

5
science/vis5d+/Makefile
View file

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

4
textproc/gxmlviewer/Makefile
View file

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

3
textproc/libxml2/Makefile
View file

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

6
textproc/wv/Makefile
View file

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

5
www/galeon/Makefile
View file

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

5
www/galeon2/Makefile
View file

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

2
x11-toolkits/gal/Makefile
View file

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

2
x11-toolkits/gal2/Makefile
View file

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

5
x11-wm/xfce/Makefile
View file

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

5
x11-wm/xfce4/Makefile
View file

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