Obey hier(7) by installing the include files into

${LOCALBASE}/include, rather than include/gd. Each file is named gd*.h
anyway. Bump  the PORTREVISION.  Other ports  should be  fine, because
the  have  the  -I${LOCALBASE}/include  anyway, but  should  keep  the
-I${LOCALBASE}/include/gd for a while too.

graphics/gd2/Makefile

@@ -7,6 +7,7 @@
 
 PORTNAME=	gd
 PORTVERSION=	2.0.1
+PORTREVISION=	1
 CATEGORIES+=	graphics
 MASTER_SITES=	http://www.boutell.com/gd/http/ \
 		ftp://ftp.boutell.com/pub/boutell/gd/ \
@@ -22,8 +23,8 @@ MAINTAINER?=	ports@FreeBSD.org
 BUILD_DEPENDS+=	bzip2:${PORTSDIR}/archivers/bzip2
 .endif
 LIB_DEPENDS=	png:${PORTSDIR}/graphics/png \
-		jpeg.9:${PORTSDIR}/graphics/jpeg \
-		freetype.7:${PORTSDIR}/print/freetype2
+		jpeg:${PORTSDIR}/graphics/jpeg \
+		freetype:${PORTSDIR}/print/freetype2
 
 LATEST_LINK=	gd2
 

graphics/gd2/files/Makefile.bsd

@@ -41,11 +41,11 @@ ${PROGS} ${TESTS}: ${SHLIB_NAME} lib${LIB}.a
 		CFLAGS="${CFLAGS}" -ECFLAGS -f bsd.prog.mk
 
 install:
-	mkdir -p ${PREFIX}/include/gd
+	mkdir -p ${PREFIX}/include
 	make LIB=${LIB} LIBDIR="${PREFIX}/lib" NOPROFILE=true \
 		SHLIB_MAJOR=${SHLIB_MAJOR} SHLIB_MINOR=${SHLIB_MINOR} \
 		-f bsd.lib.mk install
-	cd ${.CURDIR} && ${INSTALL_DATA} ${INCS} ${PREFIX}/include/gd
+	cd ${.CURDIR} && ${INSTALL_DATA} ${INCS} ${PREFIX}/include
 	cd ${.CURDIR} && ${INSTALL_PROGRAM} ${PROGS} "${PREFIX}/bin/"
 	${INSTALL_SCRIPT} "${.CURDIR}/bdftogd" "${PREFIX}/bin/"
 

graphics/gd2/pkg-plist

@@ -6,15 +6,14 @@ bin/gdtopng
 bin/pngtogd
 bin/pngtogd2
 bin/webpng
-include/gd/gd.h
-include/gd/gd_io.h
-include/gd/gdcache.h
-include/gd/gdfontg.h
-include/gd/gdfontl.h
-include/gd/gdfontmb.h
-include/gd/gdfonts.h
-include/gd/gdfontt.h
+include/gd.h
+include/gd_io.h
+include/gdcache.h
+include/gdfontg.h
+include/gdfontl.h
+include/gdfontmb.h
+include/gdfonts.h
+include/gdfontt.h
 lib/libgd.a
 lib/libgd.so
 lib/libgd.so.3.0
-@dirrm include/gd