Make japanese/gd a slave port of graphics/gd.

Approved by:	ichiro@ichiro.org (MAINTAINER of japanese/gd)

12 files changed, 8 insertions, 174 deletions

diff --git a/japanese/gd/Makefile b/japanese/gd/Makefile
index b4ba246e528..bb2fafec2fd 100644
--- a/japanese/gd/Makefile
+++ b/japanese/gd/Makefile
@@ -5,29 +5,12 @@
 # $FreeBSD$
 #
 
-PORTNAME=	gd
-PORTVERSION=	1.6.3
-CATEGORIES=	japanese graphics
-MASTER_SITES=   http://www.boutell.com/gd/http/ \
-		ftp://ftp.boutell.com/pub/boutell/gd/
-
-PATCH_SITES=    ftp://ftp.ipc.chiba-u.ac.jp/pub/pub.yamaga/gd/${PORTVERSION}/
-PATCHFILES=	${DISTNAME}.ttf-kanji.patch.990731
+CATEGORIES=	japanese
 
 MAINTAINER=	ichiro@ichiro.org
 
-LIB_DEPENDS=	png.4:${PORTSDIR}/graphics/png
-
-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
+MASTERDIR=	${.CURDIR}/../../graphics/gd
 
-pre-install:
-	${MKDIR} ${PREFIX}/include/gd
-	${MKDIR} ${PREFIX}/share/examples/gd
+MAKE_ARGS=	-DJISX0208
 
-.include <bsd.port.mk>
+.include "${MASTERDIR}/Makefile"
diff --git a/japanese/gd/distinfo b/japanese/gd/distinfo
deleted file mode 100644
index 540fbc4d503..00000000000
--- a/japanese/gd/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 (gd-1.6.3.tar.gz) = 519bfbb55e3b315dd3d5a37ab56c2d84
-MD5 (gd-1.6.3.ttf-kanji.patch.990731) = 4031e7c027f3d2ba418c6620f60428e2
diff --git a/japanese/gd/files/patch-ab b/japanese/gd/files/patch-ab
deleted file mode 100644
index 6c11a95d5c9..00000000000
--- a/japanese/gd/files/patch-ab
+++ /dev/null
@@ -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@
diff --git a/japanese/gd/pkg-comment b/japanese/gd/pkg-comment
deleted file mode 100644
index c3e4e57602e..00000000000
--- a/japanese/gd/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A graphics library for fast GIF creation
diff --git a/japanese/gd/pkg-descr b/japanese/gd/pkg-descr
deleted file mode 100644
index c3898fc02fa..00000000000
--- a/japanese/gd/pkg-descr
+++ /dev/null
@@ -1,24 +0,0 @@
-DESCRIPTION
-
-	gd is a graphics library. It allows your code to quickly draw images
-	complete with lines, arcs, text, multiple colors, cut and paste from
-	other images, and flood fills, and write out the result as a .GIF file.
-	This is particularly useful in World Wide Web applications, where .GIF
-	is the format used for inline images. 
-
-	gd is not a paint program. If you are looking for a paint program, try 
-	xpaint by David Koblas, available by anonymous FTP from ftp.netcom.com
-	in pub/ko/koblas. (That package is for the X Window System; for the Mac
-	and the PC, paint programs are considerably easier to find.) 
-
-	gd does not provide for every possible desirable graphics operation. It
-	is not necessary or desirable for gd to become a kitchen-sink graphics
-	package, but version 1.3 incorporates most of the commonly requested
-	features for an 8-bit 2D package. Support for scalable fonts, and 
-	truecolor images, JPEG and PNG is planned for version 2.0. Version 1.3
-	was released to correct longstanding bugs and provide an LZW-free GIF 
-	compression routine. 
-
-AUTHOR
-	gd 1.2 was written by Thomas Boutell and is currently distributed by 
-	boutell.com, Inc. 
diff --git a/japanese/gd/pkg-plist b/japanese/gd/pkg-plist
deleted file mode 100644
index 7805ecc07a4..00000000000
--- a/japanese/gd/pkg-plist
+++ /dev/null
@@ -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
diff --git a/japanese/gd1/Makefile b/japanese/gd1/Makefile
index b4ba246e528..bb2fafec2fd 100644
--- a/japanese/gd1/Makefile
+++ b/japanese/gd1/Makefile
@@ -5,29 +5,12 @@
 # $FreeBSD$
 #
 
-PORTNAME=	gd
-PORTVERSION=	1.6.3
-CATEGORIES=	japanese graphics
-MASTER_SITES=   http://www.boutell.com/gd/http/ \
-		ftp://ftp.boutell.com/pub/boutell/gd/
-
-PATCH_SITES=    ftp://ftp.ipc.chiba-u.ac.jp/pub/pub.yamaga/gd/${PORTVERSION}/
-PATCHFILES=	${DISTNAME}.ttf-kanji.patch.990731
+CATEGORIES=	japanese
 
 MAINTAINER=	ichiro@ichiro.org
 
-LIB_DEPENDS=	png.4:${PORTSDIR}/graphics/png
-
-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
+MASTERDIR=	${.CURDIR}/../../graphics/gd
 
-pre-install:
-	${MKDIR} ${PREFIX}/include/gd
-	${MKDIR} ${PREFIX}/share/examples/gd
+MAKE_ARGS=	-DJISX0208
 
-.include <bsd.port.mk>
+.include "${MASTERDIR}/Makefile"
diff --git a/japanese/gd1/distinfo b/japanese/gd1/distinfo
deleted file mode 100644
index 540fbc4d503..00000000000
--- a/japanese/gd1/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 (gd-1.6.3.tar.gz) = 519bfbb55e3b315dd3d5a37ab56c2d84
-MD5 (gd-1.6.3.ttf-kanji.patch.990731) = 4031e7c027f3d2ba418c6620f60428e2
diff --git a/japanese/gd1/files/patch-ab b/japanese/gd1/files/patch-ab
deleted file mode 100644
index 6c11a95d5c9..00000000000
--- a/japanese/gd1/files/patch-ab
+++ /dev/null
@@ -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@
diff --git a/japanese/gd1/pkg-comment b/japanese/gd1/pkg-comment
deleted file mode 100644
index c3e4e57602e..00000000000
--- a/japanese/gd1/pkg-comment
+++ /dev/null
@@ -1 +0,0 @@
-A graphics library for fast GIF creation
diff --git a/japanese/gd1/pkg-descr b/japanese/gd1/pkg-descr
deleted file mode 100644
index c3898fc02fa..00000000000
--- a/japanese/gd1/pkg-descr
+++ /dev/null
@@ -1,24 +0,0 @@
-DESCRIPTION
-
-	gd is a graphics library. It allows your code to quickly draw images
-	complete with lines, arcs, text, multiple colors, cut and paste from
-	other images, and flood fills, and write out the result as a .GIF file.
-	This is particularly useful in World Wide Web applications, where .GIF
-	is the format used for inline images. 
-
-	gd is not a paint program. If you are looking for a paint program, try 
-	xpaint by David Koblas, available by anonymous FTP from ftp.netcom.com
-	in pub/ko/koblas. (That package is for the X Window System; for the Mac
-	and the PC, paint programs are considerably easier to find.) 
-
-	gd does not provide for every possible desirable graphics operation. It
-	is not necessary or desirable for gd to become a kitchen-sink graphics
-	package, but version 1.3 incorporates most of the commonly requested
-	features for an 8-bit 2D package. Support for scalable fonts, and 
-	truecolor images, JPEG and PNG is planned for version 2.0. Version 1.3
-	was released to correct longstanding bugs and provide an LZW-free GIF 
-	compression routine. 
-
-AUTHOR
-	gd 1.2 was written by Thomas Boutell and is currently distributed by 
-	boutell.com, Inc. 
diff --git a/japanese/gd1/pkg-plist b/japanese/gd1/pkg-plist
deleted file mode 100644
index 7805ecc07a4..00000000000
--- a/japanese/gd1/pkg-plist
+++ /dev/null
@@ -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