From owner-ports-jp@jp.freebsd.org  Mon Feb 12 22:17:25 2001
Received: (from daemon@localhost)
	by castle.jp.freebsd.org (8.9.3+3.2W/8.7.3) id WAA79373;
	Mon, 12 Feb 2001 22:17:25 +0900 (JST)
	(envelope-from owner-ports-jp@jp.FreeBSD.org)
Received: from tortoise.jp.freebsd.org (root@tortoise.jp.FreeBSD.ORG [210.157.158.41])
	by castle.jp.freebsd.org (8.9.3+3.2W/8.7.3) with ESMTP id WAA79368
	for <ports-jp@jp.freebsd.org>; Mon, 12 Feb 2001 22:17:24 +0900 (JST)
	(envelope-from kuriyama@imgsrc.co.jp)
Received: from white.imgsrc.co.jp ([2001:218:422:2:210:4bff:fe11:b455])
	by tortoise.jp.freebsd.org (8.11.2+3.4W/8.11.1) with ESMTP/inet6 id f1CDHLx25329
	for <ports-jp@jp.freebsd.org>; Mon, 12 Feb 2001 22:17:22 +0900 (JST)
	(envelope-from kuriyama@imgsrc.co.jp)
Received: from waterblue.imgsrc.co.jp (waterblue.imgsrc.co.jp [210.226.20.160])
	by white.imgsrc.co.jp (8.11.2/8.11.0) with ESMTP id f1CDGMu57487
	for <ports-jp@jp.freebsd.org>; Mon, 12 Feb 2001 22:16:22 +0900 (JST)
Date: Mon, 12 Feb 2001 22:16:17 +0900
Message-ID: <7m1yt4rqhq.wl@waterblue.imgsrc.co.jp>
From: Jun Kuriyama <kuriyama@imgsrc.co.jp>
To: Japanese Ports Team <ports-jp@jp.freebsd.org>
References: <200011120822.RAA19256@base.hitachi-ms.co.jp>
User-Agent: Wanderlust/2.4.0 (Rio) SEMI/1.13.7 (Awazu) FLIM/1.13.2 (Kasanui) MULE XEmacs/21.1 (patch 14) (Cuyahoga Valley) (i386--freebsd)
MIME-Version: 1.0 (generated by SEMI 1.13.7 - "Awazu")
Content-Type: multipart/mixed;
 boundary="Multipart_Mon_Feb_12_22:16:17_2001-1"
Reply-To: ports-jp@jp.freebsd.org
Precedence: list
X-Distribute: distribute version 2.1 (Alpha) patchlevel 24e+000315
X-Sequence: ports-jp 10729
Subject: [ports-jp 10729] Forward: [PROPOSAL] to set gd and ja-gd up as satellite ports
Errors-To: owner-ports-jp@jp.freebsd.org
Sender: owner-ports-jp@jp.freebsd.org
X-Originator: kuriyama@imgsrc.co.jp

--Multipart_Mon_Feb_12_22:16:17_2001-1
Content-Type: text/plain; charset=ISO-2022-JP


$B!!$=$&$$$d@N(B ido $B$5$s$K$b$i$C$?$^$^(B queue $B$KF~$C$?$^$^$K$J$C$F$$$k%a!<%k(B
$B$,!D!D!#(B


$B$/$j$d$^(B

--Multipart_Mon_Feb_12_22:16:17_2001-1
Content-Type: message/rfc822

Message-Id: <200011120822.RAA19256@base.hitachi-ms.co.jp>
To: billf@FreeBSD.org
cc: kuriyama@imgsrc.co.jp, ichiro@ichiro.org, ido@hitachi-ms.co.jp
Subject: [PROPOSAL] to set gd and ja-gd up as satellite ports
From: Naoki IDO <ido@hitachi-ms.co.jp>
Date: Sun, 12 Nov 2000 17:22:23 +0900
Sender: ido@hitachi-ms.co.jp
MIME-Version: 1.0

Hello.

I have a proposal about graphics/gd and japanese/gd.

Now, the difference between graphics/gd and japanese/gd is
only compiling option (ja-gd requires -DJISX0208). It seems
reasonable to me that japanese/gd is slave port of graphics/gd.
So I made patches (see below). I'm sure that the patch for
graphics/gd has no side effects.

Could you check my patch for graphics/gd and commit it?
If you accept my patch, I will succeed the maintainer of japanese/gd.

Regards.
----
Naoki IDO


[for graphics/gd]
diff -ruN gd/Makefile gd.next/Makefile
--- gd/Makefile	Sun Nov 12 15:19:03 2000
+++ gd.next/Makefile	Sun Nov 12 16:38:25 2000
@@ -22,6 +22,10 @@
 USE_XPM=	yes
 .endif
 
+.if defined(JISX0208)
+MAKE_ARGS+=	"WITH_JISX0208=yes"
+.endif
+
 INSTALLS_SHLIB=	yes
 
 pre-fetch:
diff -ruN gd/files/patch-ac gd.next/files/patch-ac
--- gd/files/patch-ac	Sun Nov 12 15:19:03 2000
+++ gd.next/files/patch-ac	Sun Nov 12 16:43:40 2000
@@ -1,6 +1,6 @@
---- Makefile.orig	Sun Jun  4 03:26:12 2000
-+++ Makefile	Thu Nov  9 14:53:41 2000
-@@ -3,18 +3,22 @@
+--- Makefile.orig	Sun Jun  4 04:26:12 2000
++++ Makefile	Sun Nov 12 16:40:15 2000
+@@ -3,18 +3,26 @@
  #If you do not have gcc, change the setting for COMPILER, but you must
  #use an ANSI standard C compiler (NOT the old SunOS 4.1.3 cc
  #compiler; get gcc if you are still using it). 
@@ -24,10 +24,14 @@
 +.else
 +CFLAGS+=-DHAVE_JPEG -DHAVE_LIBTTF
 +.endif
++
++.if defined(WITH_JISX0208)
++CFLAGS+=-DJISX0208
++.endif
  
  #If you don't have FreeType and/or Xpm fully installed, uncomment this
  #(default).
-@@ -23,7 +27,7 @@
+@@ -23,7 +31,7 @@
  #Some systems are very picky about link order. They don't all agree
  #on the right order, either.
  
@@ -36,7 +40,7 @@
  
  #If you do have FreeType, JPEG and/or Xpm fully installed, uncomment a 
  #variation of this and comment out the line above. Note that
-@@ -33,14 +37,19 @@
+@@ -33,14 +41,19 @@
  #Some systems are very picky about link order. They don't all agree
  #on the right order, either.
  
@@ -58,7 +62,7 @@
  
  #Typical install locations for freetype, zlib, xpm and libpng libraries.
  #If yours are somewhere else, other than a standard location
-@@ -48,16 +57,19 @@
+@@ -48,16 +61,19 @@
  #-L. as this allows the gd library itself to be found.
  #Put -L. first so that old versions of the gd library elsewhere
  #on your system can't cause conflicts while building a new one.
@@ -82,7 +86,7 @@
  
  #
  #
-@@ -65,36 +77,43 @@
+@@ -65,36 +81,43 @@
  #
  #
  
@@ -147,7 +151,7 @@
  
  gddemo: gddemo.o libgd.a
  	$(CC) gddemo.o -o gddemo	$(LIBDIRS) $(LIBS)
-@@ -129,16 +148,19 @@
+@@ -129,16 +152,19 @@
  gdtestttf: gdtestttf.o libgd.a
  	$(CC) gdtestttf.o -o gdtestttf	$(LIBDIRS) $(LIBS)
  
[for japanese/gd]
diff -ruN gd/Makefile gd.next/Makefile
--- gd/Makefile	Fri Aug  4 13:32:05 2000
+++ gd.next/Makefile	Sun Nov 12 16:47:06 2000
@@ -5,29 +5,14 @@
 # $FreeBSD: ports/japanese/gd/Makefile,v 1.13 2000/07/30 18:03:06 steve Exp $
 #
 
-PORTNAME=	gd
-PORTVERSION=	1.6.3
-CATEGORIES=	japanese graphics
-MASTER_SITES=   http://www.boutell.com/gd/http/ \
-		ftp://ftp.boutell.com/pub/boutell/gd/
+CATEGORIES=	japanese
 
-PATCH_SITES=    ftp://ftp.ipc.chiba-u.ac.jp/pub/pub.yamaga/gd/${PORTVERSION}/
-PATCHFILES=     ${DISTNAME}.ttf-kanji.patch.990731
+MAINTAINER=	ido@hitachi-ms.co.jp
 
-MAINTAINER=	ichiro@ichiro.org
+JISX0208=	yes
 
-LIB_DEPENDS=	png.4:${PORTSDIR}/graphics/png
+MASTERDIR=	${.CURDIR}/../../graphics/gd
+PKGDIR=		${.CURDIR}
+PLIST=		${MASTERDIR}/pkg-plist
 
-FETCH_BEFORE_ARGS=	-b
-USE_LIBTOOL=		yes
-CFLAGS+=	-DJISX0208
-CONFIGURE_ENV+=		CFLAGS="${CFLAGS} -I${LOCALBASE}/include"
-CONFIGURE_ARGS+=	--includedir=${PREFIX}/include/gd \
-			--libdir=${PREFIX}/lib
-INSTALLS_SHLIB=	yes
-
-pre-install:
-	${MKDIR} ${PREFIX}/include/gd
-	${MKDIR} ${PREFIX}/share/examples/gd
-
-.include <bsd.port.mk>
+.include	"${MASTERDIR}/Makefile"
diff -ruN gd/distinfo gd.next/distinfo
--- gd/distinfo	Thu Sep  9 01:50:29 1999
+++ gd.next/distinfo	Thu Jan  1 09:00:00 1970
@@ -1,2 +0,0 @@
-MD5 (gd-1.6.3.tar.gz) = 519bfbb55e3b315dd3d5a37ab56c2d84
-MD5 (gd-1.6.3.ttf-kanji.patch.990731) = 4031e7c027f3d2ba418c6620f60428e2
diff -ruN gd/files/patch-ab gd.next/files/patch-ab
--- gd/files/patch-ab	Thu Sep  9 01:50:29 1999
+++ gd.next/files/patch-ab	Thu Jan  1 09:00:00 1970
@@ -1,20 +0,0 @@
---- Makefile.in.orig	Mon Aug 30 00:23:49 1999
-+++ Makefile.in	Mon Aug 30 00:24:49 1999
-@@ -88,7 +88,7 @@
- libgd_la_SOURCES = gd.c gd_io.c gd_io_file.c gd_io_dp.c gd_io_ss.c 	gd_png.c gd_ss.c gd_gd.c gd_gd2.c gdfontt.c gdfonts.c gdfontmb.c 	gdfontl.c gdfontg.c gdttf.c gdcache.c gdkanji.c	gd.h gdcache.h gdfontl.h gdfonts.h gd_io.h gdfontg.h 	gdfontmb.h gdfontt.h jisx0208.h
- 
- 
--libgd_la_LIBADD = @LIBS@
-+libgd_la_LIBADD = @LIBS@ -lm -L$(libdir) -lpng
- 
- bin_PROGRAMS = pngtogd pngtogd2 gdtopng gd2topng gd2copypal gdparttopng webpng
- 
-@@ -136,7 +136,7 @@
- LTLIBRARIES =  $(lib_LTLIBRARIES)
- 
- 
--DEFS = @DEFS@ -I. -I$(srcdir) 
-+DEFS = @DEFS@ -I. -I$(srcdir) -I$(includedir)
- CPPFLAGS = @CPPFLAGS@
- LDFLAGS = @LDFLAGS@
- LIBS = @LIBS@
Binary files gd/ja-gd-1.8.3.tgz and gd.next/ja-gd-1.8.3.tgz differ
diff -ruN gd/pkg-plist gd.next/pkg-plist
--- gd/pkg-plist	Tue Oct 31 18:46:04 2000
+++ gd.next/pkg-plist	Thu Jan  1 09:00:00 1970
@@ -1,19 +0,0 @@
-bin/pngtogd
-bin/pngtogd2
-bin/gdtopng
-bin/gd2topng
-bin/gd2copypal
-bin/gdparttopng
-bin/webpng
-include/gd/gd.h
-include/gd/gd_io.h
-include/gd/gdfontg.h
-include/gd/gdfontl.h
-include/gd/gdfontmb.h
-include/gd/gdfonts.h
-include/gd/gdfontt.h
-lib/libgd.a
-lib/libgd.so
-lib/libgd.so.0
-@dirrm include/gd
-@dirrm share/examples/gd


--Multipart_Mon_Feb_12_22:16:17_2001-1--
