diff options
author | Ade Lovett <ade@FreeBSD.org> | 2001-05-04 21:51:17 +0000 |
---|---|---|
committer | Ade Lovett <ade@FreeBSD.org> | 2001-05-04 21:51:17 +0000 |
commit | 48d56577d5561c5f2ec4a29974cd7f64a2aa8ad5 (patch) | |
tree | 43d6d8552e11e9fff48a03d2af1f0686d4662f6e /net/gnomeicu | |
parent | Various patches (mainly shared library revision changes) for those (diff) |
The new GNOME 1.4 "Fifth-Toe" metaport, bringing together a whole
bunch of GNOME applications under one convenient building mechanism.
Applications include:
mozilla, galeon, gabber, pan, gnumeric, sodipodi, atomix, balsa,
bombermaze, dia, eog, gedit, gimp, glimmer, gnomeicu, gob, gtm,
gnucash and abiword.
Notes
Notes:
svn path=/head/; revision=42260
Diffstat (limited to 'net/gnomeicu')
-rw-r--r-- | net/gnomeicu/Makefile | 6 | ||||
-rw-r--r-- | net/gnomeicu/files/patch-configure | 16 | ||||
-rw-r--r-- | net/gnomeicu/files/patch-src::kanji_conv.c | 7 | ||||
-rw-r--r-- | net/gnomeicu/gnomeicu/Makefile | 6 | ||||
-rw-r--r-- | net/gnomeicu/gnomeicu/files/patch-configure | 16 | ||||
-rw-r--r-- | net/gnomeicu/gnomeicu/files/patch-src::kanji_conv.c | 7 |
6 files changed, 52 insertions, 6 deletions
diff --git a/net/gnomeicu/Makefile b/net/gnomeicu/Makefile index f29558638ad6..a1c29d9fd284 100644 --- a/net/gnomeicu/Makefile +++ b/net/gnomeicu/Makefile @@ -7,14 +7,14 @@ PORTNAME= gnomeicu PORTVERSION= 0.96.1 +PORTREVISION= 1 CATEGORIES= net gnome MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= gnomeicu MAINTAINER= nectar@FreeBSD.org -LIB_DEPENDS= gdbm.2:${PORTSDIR}/databases/gdbm \ - iconv.2:${PORTSDIR}/converters/iconv +LIB_DEPENDS= giconv.2:${PORTSDIR}/converters/libiconv USE_X_PREFIX= yes USE_BZIP2= yes @@ -35,7 +35,7 @@ SOCKSLIBS= -lsocks CONFIGURE_ARGS= --with-statusmenu CONFIGURE_ENV= CPPFLAGS="${SOCKSFLAGS} -I${LOCALBASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib" LIBS="-liconv ${SOCKSLIBS}" \ + LDFLAGS="-L${LOCALBASE}/lib" LIBS="-lgiconv ${SOCKSLIBS}" \ CFLAGS="${CFLAGS}" pre-patch: diff --git a/net/gnomeicu/files/patch-configure b/net/gnomeicu/files/patch-configure new file mode 100644 index 000000000000..fcb467e8a8ef --- /dev/null +++ b/net/gnomeicu/files/patch-configure @@ -0,0 +1,16 @@ +--- configure.orig Tue Feb 27 13:35:06 2001 ++++ configure Thu Apr 19 15:50:55 2001 +@@ -5039,5 +5039,5 @@ + +-ac_safe=`echo "iconv.h" | sed 'y%./+-%__p_%'` +-echo $ac_n "checking for iconv.h""... $ac_c" 1>&6 +-echo "configure:5043: checking for iconv.h" >&5 ++ac_safe=`echo "giconv.h" | sed 'y%./+-%__p_%'` ++echo $ac_n "checking for giconv.h""... $ac_c" 1>&6 ++echo "configure:5043: checking for giconv.h" >&5 + if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then +@@ -5048,3 +5048,3 @@ + #include "confdefs.h" +-#include <iconv.h> ++#include <giconv.h> + EOF diff --git a/net/gnomeicu/files/patch-src::kanji_conv.c b/net/gnomeicu/files/patch-src::kanji_conv.c new file mode 100644 index 000000000000..497b91d16c89 --- /dev/null +++ b/net/gnomeicu/files/patch-src::kanji_conv.c @@ -0,0 +1,7 @@ +--- src/kanji_conv.c.orig Wed Jan 3 16:14:39 2001 ++++ src/kanji_conv.c Thu Apr 19 15:51:21 2001 +@@ -32,3 +32,3 @@ + #ifdef HAVE_ICONV +-#include <iconv.h> ++#include <giconv.h> + #endif diff --git a/net/gnomeicu/gnomeicu/Makefile b/net/gnomeicu/gnomeicu/Makefile index f29558638ad6..a1c29d9fd284 100644 --- a/net/gnomeicu/gnomeicu/Makefile +++ b/net/gnomeicu/gnomeicu/Makefile @@ -7,14 +7,14 @@ PORTNAME= gnomeicu PORTVERSION= 0.96.1 +PORTREVISION= 1 CATEGORIES= net gnome MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= gnomeicu MAINTAINER= nectar@FreeBSD.org -LIB_DEPENDS= gdbm.2:${PORTSDIR}/databases/gdbm \ - iconv.2:${PORTSDIR}/converters/iconv +LIB_DEPENDS= giconv.2:${PORTSDIR}/converters/libiconv USE_X_PREFIX= yes USE_BZIP2= yes @@ -35,7 +35,7 @@ SOCKSLIBS= -lsocks CONFIGURE_ARGS= --with-statusmenu CONFIGURE_ENV= CPPFLAGS="${SOCKSFLAGS} -I${LOCALBASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib" LIBS="-liconv ${SOCKSLIBS}" \ + LDFLAGS="-L${LOCALBASE}/lib" LIBS="-lgiconv ${SOCKSLIBS}" \ CFLAGS="${CFLAGS}" pre-patch: diff --git a/net/gnomeicu/gnomeicu/files/patch-configure b/net/gnomeicu/gnomeicu/files/patch-configure new file mode 100644 index 000000000000..fcb467e8a8ef --- /dev/null +++ b/net/gnomeicu/gnomeicu/files/patch-configure @@ -0,0 +1,16 @@ +--- configure.orig Tue Feb 27 13:35:06 2001 ++++ configure Thu Apr 19 15:50:55 2001 +@@ -5039,5 +5039,5 @@ + +-ac_safe=`echo "iconv.h" | sed 'y%./+-%__p_%'` +-echo $ac_n "checking for iconv.h""... $ac_c" 1>&6 +-echo "configure:5043: checking for iconv.h" >&5 ++ac_safe=`echo "giconv.h" | sed 'y%./+-%__p_%'` ++echo $ac_n "checking for giconv.h""... $ac_c" 1>&6 ++echo "configure:5043: checking for giconv.h" >&5 + if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then +@@ -5048,3 +5048,3 @@ + #include "confdefs.h" +-#include <iconv.h> ++#include <giconv.h> + EOF diff --git a/net/gnomeicu/gnomeicu/files/patch-src::kanji_conv.c b/net/gnomeicu/gnomeicu/files/patch-src::kanji_conv.c new file mode 100644 index 000000000000..497b91d16c89 --- /dev/null +++ b/net/gnomeicu/gnomeicu/files/patch-src::kanji_conv.c @@ -0,0 +1,7 @@ +--- src/kanji_conv.c.orig Wed Jan 3 16:14:39 2001 ++++ src/kanji_conv.c Thu Apr 19 15:51:21 2001 +@@ -32,3 +32,3 @@ + #ifdef HAVE_ICONV +-#include <iconv.h> ++#include <giconv.h> + #endif |