From 3827f6797b3e0fd33001c8d59e15ab3013a48c9f Mon Sep 17 00:00:00 2001 From: jlam Date: Mon, 1 May 2000 06:04:33 +0000 Subject: Split freetype into two packages: freetype-lib which contains just the library and doesn't require X11, and freetype-utils which contains the freetype test programs and does require X11. Leave freetype as a meta-package that includes the library and test-programs packages. This allows programs/libraries not requiring X11 to depend on freetype-lib. Make jlam@netbsd.org the MAINTAINER since I made all these mods. --- graphics/freetype/Makefile | 27 ++++++++++++++++----------- graphics/freetype/files/md5 | 3 --- graphics/freetype/files/patch-sum | 5 ----- graphics/freetype/patches/patch-aa | 20 -------------------- graphics/freetype/patches/patch-ab | 27 --------------------------- graphics/freetype/patches/patch-ac | 23 ----------------------- graphics/freetype/pkg/COMMENT | 2 +- graphics/freetype/pkg/DESCR | 2 ++ graphics/freetype/pkg/PLIST | 27 ++------------------------- 9 files changed, 21 insertions(+), 115 deletions(-) delete mode 100644 graphics/freetype/files/md5 delete mode 100644 graphics/freetype/files/patch-sum delete mode 100644 graphics/freetype/patches/patch-aa delete mode 100644 graphics/freetype/patches/patch-ab delete mode 100644 graphics/freetype/patches/patch-ac (limited to 'graphics/freetype') diff --git a/graphics/freetype/Makefile b/graphics/freetype/Makefile index 9c471f56c15..ce37c2115cc 100644 --- a/graphics/freetype/Makefile +++ b/graphics/freetype/Makefile @@ -1,20 +1,25 @@ -# $NetBSD: Makefile,v 1.9 2000/01/10 19:11:08 hubertf Exp $ +# $NetBSD: Makefile,v 1.10 2000/05/01 06:04:33 jlam Exp $ -DISTNAME= freetype-1.2 +DISTNAME= freetype-${FT_VERS} +FT_VERS= 1.2 CATEGORIES= graphics textproc -MASTER_SITES= ftp://ftp.freetype.org/pub/freetype/ +MASTER_SITES= # +DISTFILES= # -MAINTAINER= root@garbled.net +MAINTAINER= jlam@netbsd.org HOMEPAGE= http://www.freetype.org/ -DEPENDS+= gettext-0.10.*:../../devel/gettext +DEPENDS+= freetype-lib-${FT_VERS}:../../graphics/freetype-lib +DEPENDS+= freetype-utils-${FT_VERS}:../../graphics/freetype-utils -USE_X11= yes -USE_LIBTOOL= yes -GNU_CONFIGURE= yes -CONFIGURE_ARGS+= --with-locale-dir=${PREFIX}/share/locale -CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS}" +USE_X11= # defined # freetype-utils uses X11 -CPPFLAGS+= -I${LOCALBASE}/include # libintl.h +EXTRACT_ONLY= # empty +NO_CHECKSUM= # defined +NO_PATCH= # defined +NO_CONFIGURE= # defined +NO_BUILD= # defined + +do-install: # empty .include "../../mk/bsd.pkg.mk" diff --git a/graphics/freetype/files/md5 b/graphics/freetype/files/md5 deleted file mode 100644 index d3f29de89f2..00000000000 --- a/graphics/freetype/files/md5 +++ /dev/null @@ -1,3 +0,0 @@ -$NetBSD: md5,v 1.2 1999/10/28 00:38:45 jlam Exp $ - -MD5 (freetype-1.2.tar.gz) = d4821fb579c79ddbe47774d046c60dbc diff --git a/graphics/freetype/files/patch-sum b/graphics/freetype/files/patch-sum deleted file mode 100644 index 5dc0ebfd3bf..00000000000 --- a/graphics/freetype/files/patch-sum +++ /dev/null @@ -1,5 +0,0 @@ -$NetBSD: patch-sum,v 1.2 1999/10/28 00:38:45 jlam Exp $ - -MD5 (patch-aa) = 19afec47fc3d365730dc924878c6b8b5 -MD5 (patch-ab) = 849c663ea0c005292ea4975094ff96f9 -MD5 (patch-ac) = 669cce5458e659bdea9cdea687b32874 diff --git a/graphics/freetype/patches/patch-aa b/graphics/freetype/patches/patch-aa deleted file mode 100644 index 597cf2e78a5..00000000000 --- a/graphics/freetype/patches/patch-aa +++ /dev/null @@ -1,20 +0,0 @@ -$NetBSD: patch-aa,v 1.2 1999/10/28 00:38:46 jlam Exp $ - ---- configure.orig Mon Oct 26 15:20:13 1998 -+++ configure Wed Oct 20 21:10:03 1999 -@@ -972,6 +972,7 @@ - echo "$ac_t""no" 1>&6 - fi - -+if false; then - # Always use our own libtool. - LIBTOOL='$(SHELL) $(top_builddir)/libtool' - -@@ -1017,6 +1018,7 @@ - ${CONFIG_SHELL-/bin/sh} $ac_aux_dir/ltconfig \ - $libtool_flags --no-verify $ac_aux_dir/ltmain.sh $host \ - || { echo "configure: error: libtool configure failed" 1>&2; exit 1; } -+fi - - - freetype_version='1.2.0' diff --git a/graphics/freetype/patches/patch-ab b/graphics/freetype/patches/patch-ab deleted file mode 100644 index 1ff2493823e..00000000000 --- a/graphics/freetype/patches/patch-ab +++ /dev/null @@ -1,27 +0,0 @@ -$NetBSD: patch-ab,v 1.2 1999/10/28 00:38:46 jlam Exp $ - ---- lib/arch/unix/Makefile.in.orig Sat Aug 22 01:19:43 1998 -+++ lib/arch/unix/Makefile.in Wed Oct 20 21:16:12 1999 -@@ -21,7 +21,7 @@ - CC = @CC@ - CPP = @CPP@ - --LIBTOOL = $(top_builddir)/libtool -+LIBTOOL = @LIBTOOL@ - MKINSTALLDIRS = $(srcdir)/../mkinstalldirs - - version_info = @version_info@ -@@ -122,10 +122,11 @@ - # C flags - CFLAGS = @CFLAGS@ @XX_CFLAGS@ - CPPFLAGS = @CPPFLAGS@ --FT_CFLAGS = $(CFLAGS) $(INCLUDES) -+FT_CFLAGS = $(CFLAGS) $(CPPFLAGS) $(INCLUDES) - - # linker flags --FT_LIBS = @LIBS@ -+LDFLAGS = @LDFLAGS@ -+FT_LIBS = $(LDFLAGS) @LIBS@ - - # i18n stuff - LOCALEDIR = @LOCALEDIR@ diff --git a/graphics/freetype/patches/patch-ac b/graphics/freetype/patches/patch-ac deleted file mode 100644 index 26d49b849cf..00000000000 --- a/graphics/freetype/patches/patch-ac +++ /dev/null @@ -1,23 +0,0 @@ -$NetBSD: patch-ac,v 1.2 1999/10/28 00:38:46 jlam Exp $ - ---- test/arch/unix/Makefile.in.orig Sat Aug 8 18:48:11 1998 -+++ test/arch/unix/Makefile.in Wed Oct 20 21:14:51 1999 -@@ -19,7 +19,7 @@ - CC = @CC@ - CPP = @CPP@ - --LIBTOOL = $(top_builddir)/libtool -+LIBTOOL = @LIBTOOL@ - MKINSTALLDIRS = $(srcdir)/../mkinstalldirs - - include $(top_builddir)/MakeSub -@@ -32,7 +32,8 @@ - CPPFLAGS = @CPPFLAGS@ - FT_CFLAGS = $(INCDIRS) $(CFLAGS) $(CPPFLAGS) -DX11 -DLOCALEDIR='"@LOCALEDIR@"' - --FT_LIBS = @X_LIBS@ @X_PRE_LIBS@ @X_EXTRA_LIBS@ @LIBS@ -+LDFLAGS = @LDFLAGS@ -+FT_LIBS = $(LDFLAGS) @X_LIBS@ @X_PRE_LIBS@ @X_EXTRA_LIBS@ @LIBS@ - - SRC = $(srcdir)/common.c \ - $(srcdir)/ftdump.c \ diff --git a/graphics/freetype/pkg/COMMENT b/graphics/freetype/pkg/COMMENT index e46816f0dcf..edb1d3f4f8f 100644 --- a/graphics/freetype/pkg/COMMENT +++ b/graphics/freetype/pkg/COMMENT @@ -1 +1 @@ -TrueType font rendering engine and library API +FreeType libraries and utilities diff --git a/graphics/freetype/pkg/DESCR b/graphics/freetype/pkg/DESCR index 88e8b304ce9..c3ec5382d27 100644 --- a/graphics/freetype/pkg/DESCR +++ b/graphics/freetype/pkg/DESCR @@ -3,3 +3,5 @@ It has been developed to provide TT support to a great variety of platforms and environments. Notice that FreeType is a *library*. It is *not* a font server for your preferred environment, even though it has been written to allow the design of many font servers. + +This meta-package includes the freetype-lib and freetype-utils packages. diff --git a/graphics/freetype/pkg/PLIST b/graphics/freetype/pkg/PLIST index db9f1c87189..8f4cd257ccf 100644 --- a/graphics/freetype/pkg/PLIST +++ b/graphics/freetype/pkg/PLIST @@ -1,25 +1,2 @@ -@comment $NetBSD: PLIST,v 1.3 1999/10/28 00:38:47 jlam Exp $ -bin/ftdump -bin/fterror -bin/ftlint -bin/ftstring -bin/ftstrpnm -bin/fttimer -bin/ftview -bin/ftzoom -include/freetype.h -include/fterrid.h -include/ftnameid.h -include/ftxcmap.h -include/ftxerr18.h -include/ftxgasp.h -include/ftxkern.h -include/ftxpost.h -include/ftxwidth.h -lib/libttf.a -lib/libttf.so.3.0 -share/locale/cs/LC_MESSAGES/freetype.mo -share/locale/de/LC_MESSAGES/freetype.mo -share/locale/es/LC_MESSAGES/freetype.mo -share/locale/fr/LC_MESSAGES/freetype.mo -share/locale/nl/LC_MESSAGES/freetype.mo +@comment $NetBSD: PLIST,v 1.4 2000/05/01 06:04:42 jlam Exp $ +@comment this plist intentionally left empty -- cgit v1.2.3