kpriv/pkgsrc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

buildlink1 -> buildlink2

Browse source
This commit is contained in:
jlam 2002-10-08 09:58:20 +00:00
parent 368120b32f
commit a4d1311414
3 changed files with 23 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
fonts/ttf2pt1/Makefile
View file

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.2 2002/07/19 12:43:51 wiz Exp $
# $NetBSD: Makefile,v 1.3 2002/10/08 09:58:20 jlam Exp $
#
DISTNAME= ttf2pt1-3.4.0
@ -13,7 +13,7 @@ COMMENT= TrueType font converter to Postscript type 1
DEPENDS+= t1utils-[0-9]*:../../fonts/t1utils
USE_CONFIG_WRAPPER= yes
USE_BUILDLINK2= # defined
.include "../../graphics/freetype2/buildlink.mk"
.include "../../graphics/freetype2/buildlink2.mk"
.include "../../mk/bsd.pkg.mk"

4
fonts/ttf2pt1/distinfo
View file

@ -1,5 +1,5 @@
$NetBSD: distinfo,v 1.1.1.1 2002/07/16 15:26:01 wiz Exp $
$NetBSD: distinfo,v 1.2 2002/10/08 09:58:20 jlam Exp $
SHA1 (ttf2pt1-3.4.0.tgz) = 1e11478ab5f6dae26ea743dc1149603d652746bb
Size (ttf2pt1-3.4.0.tgz) = 204811 bytes
SHA1 (patch-aa) = 798855010e4c1615ac25050e21771103c92f2fff
SHA1 (patch-aa) = 6b009c2bee1d552b347023a3e79ab3fc91dd3c30

27
fonts/ttf2pt1/patches/patch-aa
View file

@ -1,6 +1,6 @@
$NetBSD: patch-aa,v 1.1.1.1 2002/07/16 15:26:01 wiz Exp $
$NetBSD: patch-aa,v 1.2 2002/10/08 09:58:21 jlam Exp $
--- Makefile.orig Mon Oct 15 04:32:29 2001
--- Makefile.orig Sun Oct 14 19:32:29 2001
+++ Makefile
@@ -20,7 +20,7 @@
#
@ -11,25 +11,25 @@ $NetBSD: patch-aa,v 1.1.1.1 2002/07/16 15:26:01 wiz Exp $
# For GNU C
#
@@ -54,7 +54,7 @@
@@ -54,7 +54,7 @@ LIBS_SYS= -lm
# This WON'T BUILD with FT2-beta8, use the FreeType release 2.0.
# http://download.sourceforge.net/freetype/freetype-2.0.tar.gz
-CFLAGS_FT=
+CFLAGS_FT= -DUSE_FREETYPE `${FREETYPE_CONFIG} --cflags`
+CFLAGS_FT= -DUSE_FREETYPE `freetype-config --cflags`
# To enable use of the FreeType-2 library
# (if the include and lib directory do not match your installation,
@@ -65,7 +65,7 @@
@@ -65,7 +65,7 @@ CFLAGS_FT=
#
# The FreeType-2 library flags (disabled by default)
-LIBS_FT=
+LIBS_FT= `${FREETYPE_CONFIG} --libs` -Wl,-R`${FREETYPE_CONFIG} --prefix`/lib
+LIBS_FT= `freetype-config --libs`
# To enable use of the FreeType-2 library
# (if the include and lib directory do not match your installation,
@@ -84,20 +84,20 @@
@@ -84,20 +84,20 @@ CFLAGS_PREF=
#CFLAGS_PREF= -DPREFER_FREETYPE
# Uncomment the second line to not compile t1asm into ttf2pt1
@ -55,7 +55,7 @@ $NetBSD: patch-aa,v 1.1.1.1 2002/07/16 15:26:01 wiz Exp $
# for scripts, maps/encodings etc.
SHAREDIR = $(INSTDIR)/share/ttf2pt1
MANDIR = $(INSTDIR)/man
@@ -118,12 +118,12 @@
@@ -118,12 +118,12 @@ DOCS=CHANGES README FONTS FONTS.hpux enc
app/X11/README app/netscape/README
SUBDIRS = app encodings maps scripts other
@ -70,7 +70,16 @@ $NetBSD: patch-aa,v 1.1.1.1 2002/07/16 15:26:01 wiz Exp $
docs: $(DOCS)
@@ -202,31 +202,21 @@
@@ -175,7 +175,7 @@ runt1asm.o: runt1asm.c global.h
$(CC) $(CFLAGS) $(CFLAGS_EXTT1ASM) -c runt1asm.c
ttf2pt1: ttf2pt1.o pt1.o runt1asm.o ttf.o ft.o bdf.o bitmap.o
- $(CC) $(CFLAGS) -o ttf2pt1 ttf2pt1.o pt1.o runt1asm.o ttf.o ft.o bdf.o bitmap.o $(LIBS)
+ $(CC) $(LDFLAGS) -o ttf2pt1 ttf2pt1.o pt1.o runt1asm.o ttf.o ft.o bdf.o bitmap.o $(LIBS)
CHANGES: CHANGES.html
scripts/unhtml <CHANGES.html >CHANGES
@@ -202,31 +202,21 @@ FONTS.hpux: FONTS.hpux.html
scripts/unhtml <FONTS.hpux.html >FONTS.hpux
install: all