From dc7fc838ed4ff03c4e5cefd0700e07b613af2b0f Mon Sep 17 00:00:00 2001
From: Mikhail Teterin <mi@FreeBSD.org>
Date: Mon, 21 Jan 2002 18:27:03 +0000
Subject: 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 | 5 +++--
graphics/gd2/files/Makefile.bsd | 4 ++--
graphics/gd2/pkg-plist | 17 ++++++++---------
3 files changed, 13 insertions(+), 13 deletions(-)
(limited to 'graphics')
diff --git a/graphics/gd2/Makefile b/graphics/gd2/Makefile
index 20251e37687b..c0240060d306 100644
--- a/graphics/gd2/Makefile
+++ b/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
diff --git a/graphics/gd2/files/Makefile.bsd b/graphics/gd2/files/Makefile.bsd
index a2021c6d7942..718ca5c3b113 100644
--- a/graphics/gd2/files/Makefile.bsd
+++ b/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/"
diff --git a/graphics/gd2/pkg-plist b/graphics/gd2/pkg-plist
index d27067ebb24c..1b1b3125513d 100644
--- a/graphics/gd2/pkg-plist
+++ b/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
--
cgit debian/1.2.3+git2.25.1-1-2-gaceb0