diff options
| author | sobomax <sobomax@FreeBSD.org> | 2002-03-18 19:50:38 +0800 |
|---|---|---|
| committer | sobomax <sobomax@FreeBSD.org> | 2002-03-18 19:50:38 +0800 |
| commit | 905aa56821787eb98c150e2cd7e4222698cd34b5 (patch) | |
| tree | d5d7cef2ee1a3886c8300f6c59463d1704679734 /mail | |
| parent | 267c972eab297e87ce7c16314746799098e8dac4 (diff) | |
| download | freebsd-ports-gnome-905aa56821787eb98c150e2cd7e4222698cd34b5.tar.gz freebsd-ports-gnome-905aa56821787eb98c150e2cd7e4222698cd34b5.tar.zst freebsd-ports-gnome-905aa56821787eb98c150e2cd7e4222698cd34b5.zip | |
Iconv cleanup, stage 2b: remove regex hacks that change iconv.h to giconv.h and
-liconv to -lgiconv.
Diffstat (limited to 'mail')
| -rw-r--r-- | mail/balsa/Makefile | 4 | ||||
| -rw-r--r-- | mail/balsa2/Makefile | 4 | ||||
| -rw-r--r-- | mail/evolution-devel/Makefile | 2 | ||||
| -rw-r--r-- | mail/evolution/Makefile | 2 | ||||
| -rw-r--r-- | mail/gbiff/Makefile | 2 |
5 files changed, 2 insertions, 12 deletions
diff --git a/mail/balsa/Makefile b/mail/balsa/Makefile index db053e5c5dea..336425e176c5 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 db053e5c5dea..336425e176c5 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 b14afd5993fe..4c1153786b68 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 b14afd5993fe..4c1153786b68 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 62497c7c23bf..1f9a1497b970 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 ; \ |