>Number:         10262
>Category:       pkg
>Synopsis:       pkgsrc of graphics/freetype-1.3.1
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    pkg-manager
>State:          open
>Class:          support
>Submitter-Id:   net
>Arrival-Date:   Fri Jun 02 01:13:00 PDT 2000
>Closed-Date:
>Last-Modified:
>Originator:     ORI Manabu
>Release:        NetBSD-current (checkouted on May 30)
>Organization:
Kyoto University
>Environment:
System: NetBSD ginger 1.4Z NetBSD 1.4Z (THINKPAD) #0: Tue May 30 17:43:01 JST 2000 m0ri@ginger:/local/branch/kern.i386/compile/THINKPAD i386


>Description:
	I made a pkgsrc of graphics/freetype for freetype-1.3.1.
	This is my first experience to make pkgsrc and do send-pr,
	so I'm sorry if I took the wrong step.
>How-To-Repeat:

>Fix:
	Please apply two patches below.
	"diff.freetype" is for graphics/freetype and
	"diff.freetype-lib" is for graphics/freetype-lib.

=== diff.freetype ===
[---snip---]
diff -urN freetype.old/Makefile freetype/Makefile
--- freetype.old/Makefile	Fri Jun  2 16:49:10 2000
+++ freetype/Makefile	Fri Jun  2 16:44:09 2000
@@ -1,7 +1,7 @@
 # $NetBSD: Makefile,v 1.10 2000/05/01 06:04:33 jlam Exp $
 
 DISTNAME=		freetype-${FT_VERS}
-FT_VERS=		1.2
+FT_VERS=		1.3.1
 CATEGORIES=		graphics textproc
 MASTER_SITES=		#
 DISTFILES=		#
[---snip---]


=== diff.freetype-lib ===
[---snip---]
diff -urN freetype-lib.old/Makefile.common freetype-lib/Makefile.common
--- freetype-lib.old/Makefile.common	Fri Jun  2 16:54:14 2000
+++ freetype-lib/Makefile.common	Fri Jun  2 15:26:47 2000
@@ -1,7 +1,7 @@
 # $NetBSD: Makefile.common,v 1.2 2000/05/01 21:53:33 jlam Exp $
 
 DISTNAME=		freetype-${FT_VERS}
-FT_VERS=		1.2
+FT_VERS=		1.3.1
 CATEGORIES=		graphics textproc
 MASTER_SITES=		ftp://ftp.freetype.org/pub/freetype/
 
diff -urN freetype-lib.old/files/md5 freetype-lib/files/md5
--- freetype-lib.old/files/md5	Fri Jun  2 16:54:13 2000
+++ freetype-lib/files/md5	Fri Jun  2 15:27:52 2000
@@ -1,3 +1,3 @@
-$NetBSD: md5,v 1.1.1.1 2000/05/01 06:02:24 jlam Exp $
+$NetBSD$
 
-MD5 (freetype-1.2.tar.gz) = d4821fb579c79ddbe47774d046c60dbc
+MD5 (freetype-1.3.1.tar.gz) = 9a9e7ad00c1ef6dfbf8f8e19ceefb300
diff -urN freetype-lib.old/files/patch-sum freetype-lib/files/patch-sum
--- freetype-lib.old/files/patch-sum	Fri Jun  2 16:54:13 2000
+++ freetype-lib/files/patch-sum	Fri Jun  2 16:35:46 2000
@@ -1,4 +1,4 @@
 $NetBSD: patch-sum,v 1.1.1.1 2000/05/01 06:02:24 jlam Exp $
 
 MD5 (patch-aa) = 49ea4d95019032b7ee9db832b954f73a
-MD5 (patch-ab) = d0d3ba2c9066e71b377a99d8101d6f44
+MD5 (patch-ab) = 6e5504379f12554b05d7b5dd2cda4bc0
diff -urN freetype-lib.old/patches/patch-ab freetype-lib/patches/patch-ab
--- freetype-lib.old/patches/patch-ab	Fri Jun  2 16:54:14 2000
+++ freetype-lib/patches/patch-ab	Fri Jun  2 16:35:29 2000
@@ -1,8 +1,6 @@
-$NetBSD: patch-ab,v 1.1.1.1 2000/05/01 06:02:25 jlam Exp $
-
---- test/arch/unix/Makefile.in.orig	Sat Aug  8 18:48:11 1998
-+++ test/arch/unix/Makefile.in	Mon May  1 01:30:24 2000
-@@ -57,11 +57,12 @@
+--- test/arch/unix/Makefile.in.orig	Tue Jun 29 04:52:08 1999
++++ test/arch/unix/Makefile.in	Fri Jun  2 16:35:05 2000
+@@ -62,11 +62,12 @@
  
  # variables used to compile either with libtool or not
  #
@@ -17,15 +15,22 @@
  
  .c.o:
  	$(CC) -c $(FT_CFLAGS) $<
-@@ -97,10 +98,9 @@
+@@ -104,16 +105,15 @@
+ 
+ ftsbit: ftsbit.o common.o $(LIBTTF)
+ 	$(PROCESS) -o ftsbit ftsbit.o common.o \
+-          $(EFENCE) $(LIBTTF)
++          $(EFENCE) $(LIBTTF) -lintl
+ 
+ ftstring: ftstring.o $(DISPOBJS) $(LIBTTF)
  	$(PROCESS) -o ftstring ftstring.o $(DISPOBJS) \
-         $(EFENCE) $(LIBTTF) $(FT_LIBS) -lX11
+           $(EFENCE) $(LIBTTF) $(FT_LIBS) -lX11
  
 -# ftstrpnm does not need any extra libraries
  ftstrpnm: ftstrpnm.o common.o $(LIBTTF)
  	$(PROCESS) -o ftstrpnm ftstrpnm.o common.o \
--        $(EFENCE) $(LIBTTF)
-+        $(EFENCE) $(LIBTTF) -lintl
+-          $(EFENCE) $(LIBTTF)
++          $(EFENCE) $(LIBTTF) -lintl
  
  fterror: fterror.o common.o $(LIBTTF)
  	$(PROCESS) -o fterror fterror.o common.o \
diff -urN freetype-lib.old/pkg/PLIST freetype-lib/pkg/PLIST
--- freetype-lib.old/pkg/PLIST	Fri Jun  2 16:54:14 2000
+++ freetype-lib/pkg/PLIST	Fri Jun  2 15:59:18 2000
@@ -1,15 +1,21 @@
 @comment $NetBSD: PLIST,v 1.1.1.1 2000/05/01 06:02:24 jlam Exp $
-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
+
+include/freetype/freetype.h
+include/freetype/fterrid.h
+include/freetype/ftnameid.h
+include/freetype/ftxkern.h
+include/freetype/ftxgasp.h
+include/freetype/ftxcmap.h
+include/freetype/ftxsbit.h
+include/freetype/ftxpost.h
+include/freetype/ftxwidth.h
+include/freetype/ftxerr18.h
+include/freetype/ftxgsub.h
+include/freetype/ftxgpos.h
+include/freetype/ftxgdef.h
+include/freetype/ftxopen.h
 lib/libttf.a
-lib/libttf.so.3.0
+lib/libttf.so.4.0
 share/locale/cs/LC_MESSAGES/freetype.mo
 share/locale/de/LC_MESSAGES/freetype.mo
 share/locale/es/LC_MESSAGES/freetype.mo
[---snip---]
>Release-Note:
>Audit-Trail:
>Unformatted: