summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAkinori MUSHA <knu@FreeBSD.org>2000-11-02 14:39:36 +0000
committerAkinori MUSHA <knu@FreeBSD.org>2000-11-02 14:39:36 +0000
commit89b567a160dbb1058a811b511e949296ce3db7d9 (patch)
tree4ad2a892d519f9c79910e2dec565d73c5b7692b2
parentUpdate a converter to version 1.1a (diff)
Unbreak net/gnomeicu by adding libiconv dependency.
Retire japanese/gnomeicu, as gnomeicu now includes Japanese support out-of-the-box. The Japanese support code has been committed over the gnomeicu source tree by the patchkit author Takuo KITAME <kitame@northeye.org> himself. Yay! Approved by: nectar (MAINTAINER)
Notes
Notes: svn path=/head/; revision=34643
-rw-r--r--japanese/Makefile1
-rw-r--r--net-im/gnomeicu/Makefile5
-rw-r--r--net-im/gnomeicu2/Makefile5
-rw-r--r--net/gnomeicu/Makefile5
-rw-r--r--net/gnomeicu/gnomeicu/Makefile5
-rw-r--r--net/gnomeicu2/Makefile5
6 files changed, 15 insertions, 11 deletions
diff --git a/japanese/Makefile b/japanese/Makefile
index 325499431e2a..717c9c537acf 100644
--- a/japanese/Makefile
+++ b/japanese/Makefile
@@ -64,7 +64,6 @@
SUBDIR += gn-mnews
SUBDIR += gnome
SUBDIR += gnomecore
- SUBDIR += gnomeicu
SUBDIR += gnomelibs
SUBDIR += gnumeric
SUBDIR += gp
diff --git a/net-im/gnomeicu/Makefile b/net-im/gnomeicu/Makefile
index 73e6c22941d2..9538aa70c211 100644
--- a/net-im/gnomeicu/Makefile
+++ b/net-im/gnomeicu/Makefile
@@ -13,7 +13,8 @@ MASTER_SITE_SUBDIR= gnomeicu
MAINTAINER= nectar@FreeBSD.org
-LIB_DEPENDS= gdbm.2:${PORTSDIR}/databases/gdbm
+LIB_DEPENDS= gdbm.2:${PORTSDIR}/databases/gdbm \
+ iconv.1:${PORTSDIR}/converters/iconv
USE_X_PREFIX= yes
USE_BZIP2= yes
@@ -34,7 +35,7 @@ SOCKSLIBS= -lsocks
CONFIGURE_ARGS= --with-statusmenu
CONFIGURE_ENV= CPPFLAGS="${SOCKSFLAGS} -I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib" LIBS="${SOCKSLIBS}" \
+ LDFLAGS="-L${LOCALBASE}/lib" LIBS="-liconv ${SOCKSLIBS}" \
CFLAGS="${CFLAGS}"
pre-patch:
diff --git a/net-im/gnomeicu2/Makefile b/net-im/gnomeicu2/Makefile
index 73e6c22941d2..9538aa70c211 100644
--- a/net-im/gnomeicu2/Makefile
+++ b/net-im/gnomeicu2/Makefile
@@ -13,7 +13,8 @@ MASTER_SITE_SUBDIR= gnomeicu
MAINTAINER= nectar@FreeBSD.org
-LIB_DEPENDS= gdbm.2:${PORTSDIR}/databases/gdbm
+LIB_DEPENDS= gdbm.2:${PORTSDIR}/databases/gdbm \
+ iconv.1:${PORTSDIR}/converters/iconv
USE_X_PREFIX= yes
USE_BZIP2= yes
@@ -34,7 +35,7 @@ SOCKSLIBS= -lsocks
CONFIGURE_ARGS= --with-statusmenu
CONFIGURE_ENV= CPPFLAGS="${SOCKSFLAGS} -I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib" LIBS="${SOCKSLIBS}" \
+ LDFLAGS="-L${LOCALBASE}/lib" LIBS="-liconv ${SOCKSLIBS}" \
CFLAGS="${CFLAGS}"
pre-patch:
diff --git a/net/gnomeicu/Makefile b/net/gnomeicu/Makefile
index 73e6c22941d2..9538aa70c211 100644
--- a/net/gnomeicu/Makefile
+++ b/net/gnomeicu/Makefile
@@ -13,7 +13,8 @@ MASTER_SITE_SUBDIR= gnomeicu
MAINTAINER= nectar@FreeBSD.org
-LIB_DEPENDS= gdbm.2:${PORTSDIR}/databases/gdbm
+LIB_DEPENDS= gdbm.2:${PORTSDIR}/databases/gdbm \
+ iconv.1:${PORTSDIR}/converters/iconv
USE_X_PREFIX= yes
USE_BZIP2= yes
@@ -34,7 +35,7 @@ SOCKSLIBS= -lsocks
CONFIGURE_ARGS= --with-statusmenu
CONFIGURE_ENV= CPPFLAGS="${SOCKSFLAGS} -I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib" LIBS="${SOCKSLIBS}" \
+ LDFLAGS="-L${LOCALBASE}/lib" LIBS="-liconv ${SOCKSLIBS}" \
CFLAGS="${CFLAGS}"
pre-patch:
diff --git a/net/gnomeicu/gnomeicu/Makefile b/net/gnomeicu/gnomeicu/Makefile
index 73e6c22941d2..9538aa70c211 100644
--- a/net/gnomeicu/gnomeicu/Makefile
+++ b/net/gnomeicu/gnomeicu/Makefile
@@ -13,7 +13,8 @@ MASTER_SITE_SUBDIR= gnomeicu
MAINTAINER= nectar@FreeBSD.org
-LIB_DEPENDS= gdbm.2:${PORTSDIR}/databases/gdbm
+LIB_DEPENDS= gdbm.2:${PORTSDIR}/databases/gdbm \
+ iconv.1:${PORTSDIR}/converters/iconv
USE_X_PREFIX= yes
USE_BZIP2= yes
@@ -34,7 +35,7 @@ SOCKSLIBS= -lsocks
CONFIGURE_ARGS= --with-statusmenu
CONFIGURE_ENV= CPPFLAGS="${SOCKSFLAGS} -I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib" LIBS="${SOCKSLIBS}" \
+ LDFLAGS="-L${LOCALBASE}/lib" LIBS="-liconv ${SOCKSLIBS}" \
CFLAGS="${CFLAGS}"
pre-patch:
diff --git a/net/gnomeicu2/Makefile b/net/gnomeicu2/Makefile
index 73e6c22941d2..9538aa70c211 100644
--- a/net/gnomeicu2/Makefile
+++ b/net/gnomeicu2/Makefile
@@ -13,7 +13,8 @@ MASTER_SITE_SUBDIR= gnomeicu
MAINTAINER= nectar@FreeBSD.org
-LIB_DEPENDS= gdbm.2:${PORTSDIR}/databases/gdbm
+LIB_DEPENDS= gdbm.2:${PORTSDIR}/databases/gdbm \
+ iconv.1:${PORTSDIR}/converters/iconv
USE_X_PREFIX= yes
USE_BZIP2= yes
@@ -34,7 +35,7 @@ SOCKSLIBS= -lsocks
CONFIGURE_ARGS= --with-statusmenu
CONFIGURE_ENV= CPPFLAGS="${SOCKSFLAGS} -I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib" LIBS="${SOCKSLIBS}" \
+ LDFLAGS="-L${LOCALBASE}/lib" LIBS="-liconv ${SOCKSLIBS}" \
CFLAGS="${CFLAGS}"
pre-patch: