Update to 0.33

5 files changed, 37 insertions, 31 deletions

diff --git a/japanese/gicq/Makefile b/japanese/gicq/Makefile
index cd80647da2b7..c389db92977b 100644
--- a/japanese/gicq/Makefile
+++ b/japanese/gicq/Makefile
@@ -1,38 +1,40 @@
 # New ports collection makefile for:	gicq
-# Version required:		0.22
+# Version required:		0.33
 # Date Created:			31 Oct 1998
 # Whom:				Seiichirou Hiraoka
 #
-# $Id: Makefile,v 1.3 1998/11/25 22:31:28 sada Exp $
+# $Id: Makefile,v 1.4 1998/12/11 02:30:33 flathill Exp $
 #
 
-DISTNAME=	gicq-0.22
-PKGNAME=	ja-gicq-0.22
+DISTNAME=	gicq-0.33
+PKGNAME=	ja-gicq-0.33
 CATEGORIES=	japanese net
-MASTER_SITES=	http://www.montana.com/gabriel/gicq/files/
+MASTER_SITES=	ftp://ftp.korsoft.com/pub/gicq/
 
-PATCH_SITES=	http://flos.kuee.kyoto-u.ac.jp/soft/
-PATCHFILES=	gicq-0.22ja.patch
-PATCH_DIST_STRIP= -p1
+PATCH_SITES=	http://www.freebsd.org/~flathill/distfiles/ \
+		http://www-nagao.kuee.kyoto-u.ac.jp/member/taku/soft/
+PATCHFILES=	gicq-0.33ja.patch
+PATCH_DIST_STRIP=	-p1
 
 MAINTAINER=	flathill@FreeBSD.ORG
 
-LIB_DEPENDS=	gtkjp.1:${PORTSDIR}/japanese/gtk \
+LIB_DEPENDS=	gtk12.1:${PORTSDIR}/x11-toolkits/gtk12	\
 		icq.0:${PORTSDIR}/japanese/libicq
 
 USE_X_PREFIX=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--without-gnome --disable-nls
-CONFIGURE_ENV=	CFLAGS="${CFLAGS} -I${LOCALBASE}/include -L${LOCALBASE}/lib" LIBS=-lxpg4
+CONFIGURE_ENV=	GTK_CONFIG="${X11BASE}/bin/gtk12-config" \
+		CFLAGS="${CFLAGS} -I${LOCALBASE}/include -L${LOCALBASE}/lib" \
+		LIBS="-lxpg4"
 
-post-configure:
-	@${SED} -e "s;@PREFIX@;${PREFIX};g" ${FILESDIR}/wrapper \
-	 > ${WRKDIR}/wrapper
+do-install:
+	@${INSTALL_PROGRAM} ${WRKSRC}/src/gicq ${PREFIX}/bin
 
 post-install:
-	@${MV} ${PREFIX}/bin/gicq ${PREFIX}/bin/gicq.bin
-	@${INSTALL_SCRIPT} ${WRKDIR}/wrapper ${PREFIX}/bin/gicq
-	@${INSTALL_DATA} \
-		${FILESDIR}/menu.gicq ${PREFIX}/share/ja-gtk/menu/menu.gicq.bin
+.if !defined(NOPORTDOCS)
+	${MKDIR} ${PREFIX}/share/doc/gicq
+	${INSTALL_DATA} ${WRKSRC}/doc/index.html ${PREFIX}/share/doc/gicq
+.endif
 
 .include <bsd.port.mk>
diff --git a/japanese/gicq/distinfo b/japanese/gicq/distinfo
index 75dc55affaa8..c557bde54d1a 100644
--- a/japanese/gicq/distinfo
+++ b/japanese/gicq/distinfo
@@ -1,2 +1,2 @@
-MD5 (gicq-0.22.tar.gz) = 06d1a56a2c244df6d73813952665136d
-MD5 (gicq-0.22ja.patch) = 13d12aa2140809a6f96c266e4afac615
+MD5 (gicq-0.33.tar.gz) = 4e9ef1ef01bf1c74cbbd10448c9568e1
+MD5 (gicq-0.33ja.patch) = 505659cf8cf78784252f87ed829cc3f4
diff --git a/japanese/gicq/pkg-plist b/japanese/gicq/pkg-plist
index 817ff1ad02a0..65baac2d34f7 100644
--- a/japanese/gicq/pkg-plist
+++ b/japanese/gicq/pkg-plist
@@ -1,3 +1,3 @@
 bin/gicq
-bin/gicq.bin
-share/ja-gtk/menu/menu.gicq.bin
+share/doc/gicq/index.html
+@dirrm share/doc/gicq
diff --git a/japanese/libicq/Makefile b/japanese/libicq/Makefile
index bf4f5e0cdeac..944dd3cd3428 100644
--- a/japanese/libicq/Makefile
+++ b/japanese/libicq/Makefile
@@ -1,23 +1,27 @@
 # New ports collection makefile for:   libicq
-# Version required:		0.20
+# Version required:		0.33
 # Date Created:			22 Oct 1998
 # Whom:				Seiichirou Hiraoka
 #
-# $Id$
+# $Id: Makefile,v 1.1.1.1 1998/11/19 07:33:02 flathill Exp $
 #
 
-DISTNAME=	libicq-0.20
-PKGNAME=	ja-libicq-0.20
+DISTNAME=	libicq-0.33
+PKGNAME=	ja-libicq-0.33
 CATEGORIES=	japanese devel
-MASTER_SITES=	http://www.montana.com/gabriel/gicq/files/
+MASTER_SITES=	ftp://ftp.korsoft.com/pub/gicq/
 
-PATCH_SITES=	http://flos.kuee.kyoto-u.ac.jp/soft/
-PATCHFILES=	libicq-0.20ja.patch
+PATCH_SITES=	http://www.freebsd.org/~flathill/distfiles/ \
+		http://www-nagao.kuee.kyoto-u.ac.jp/member/taku/soft/
+PATCHFILES=	libicq-0.33ja.patch
 PATCH_DIST_STRIP= -p1
 
 MAINTAINER=	flathill@FreeBSD.ORG
 
-GNU_CONFIGURE=	yes
+LIB_DEPENDS=    glib12.1:${PORTSDIR}/devel/glib12
+
+GNU_CONFIGURE=  yes
+CONFIGURE_ENV=  GLIB_CONFIG="${PREFIX}/bin/glib12-config"
 
 post-install:
 	@${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/lib
diff --git a/japanese/libicq/distinfo b/japanese/libicq/distinfo
index 9dcb30f27bc7..2a18aac33954 100644
--- a/japanese/libicq/distinfo
+++ b/japanese/libicq/distinfo
@@ -1,2 +1,2 @@
-MD5 (libicq-0.20.tar.gz) = c066b5d9093d014005dff0d073a31450
-MD5 (libicq-0.20ja.patch) = 7808e77b91eb5035d520c15f55eb846e
+MD5 (libicq-0.33.tar.gz) = 3717d4b08dfdd9af9a57f5d17d04529d
+MD5 (libicq-0.33ja.patch) = 3d88c888c46951efdf39345f79a9b18e