summaryrefslogtreecommitdiff
path: root/x11-fonts
diff options
context:
space:
mode:
authorAndrey A. Chernov <ache@FreeBSD.org>2000-02-28 20:03:52 +0000
committerAndrey A. Chernov <ache@FreeBSD.org>2000-02-28 20:03:52 +0000
commitaca90445a69a41c5772842063bfc0f8317413ff0 (patch)
tree092984be30738c077f596cba50654c3ede8323a0 /x11-fonts
parentChange MAINTAINERship to kris, he evidently maintains this now. (diff)
Make TTF support not optional, it never come into package otherwise
Notes
Notes: svn path=/head/; revision=26413
Diffstat (limited to 'x11-fonts')
-rw-r--r--x11-fonts/xmbdfed/Makefile7
-rw-r--r--x11-fonts/xmbdfed/files/patch-aa14
2 files changed, 6 insertions, 15 deletions
diff --git a/x11-fonts/xmbdfed/Makefile b/x11-fonts/xmbdfed/Makefile
index 553b8e5d30e5..97d1fc8bd91c 100644
--- a/x11-fonts/xmbdfed/Makefile
+++ b/x11-fonts/xmbdfed/Makefile
@@ -16,18 +16,11 @@ PATCHFILES= ${DISTNAME}.patch1 ${DISTNAME}.patch2 ${DISTNAME}.patch3
MAINTAINER= ports@FreeBSD.org
-.if defined(USE_FREETYPE)
LIB_DEPENDS= ttf.4:${PORTSDIR}/print/freetype
-.endif
USE_X_PREFIX= yes
REQUIRES_MOTIF= yes
MAN1= xmbdfed.1
-.if !defined(USE_FREETYPE)
-pre-extract:
- @${ECHO_MSG} "You can add the optional FreeType import capability by defining USE_FREETYPE"
-.endif
-
.include <bsd.port.mk>
diff --git a/x11-fonts/xmbdfed/files/patch-aa b/x11-fonts/xmbdfed/files/patch-aa
index ee07cb19e561..4fe57b110448 100644
--- a/x11-fonts/xmbdfed/files/patch-aa
+++ b/x11-fonts/xmbdfed/files/patch-aa
@@ -1,5 +1,5 @@
---- Makefile.orig Tue May 4 02:17:50 1999
-+++ Makefile Thu Jan 6 23:55:37 2000
+--- Makefile.orig Mon May 3 21:17:50 1999
++++ Makefile Mon Feb 28 22:53:25 2000
@@ -23,8 +23,8 @@
#
# $Id: Makefile,v 1.8 1999/05/03 17:17:50 mleisher Exp $
@@ -11,18 +11,16 @@
OTHER = README CHANGES COPYRIGHTS Makefile Imakefile.lesstif Project.tmpl \
xmbdfedrc xmbdfed.man
-@@ -47,17 +47,19 @@
+@@ -47,17 +47,17 @@
# Uncomment these if you have the FreeType library and want to use it to
# import TrueType fonts.
#
-#FTYPE_INCS = -I/usr/local/include
-#FTYPE_LIBS = -L/user/local/lib -lttf
-#FTYPE_DEFS = -DHAVE_FREETYPE
-+.if defined(USE_FREETYPE)
+FTYPE_INCS = -I${LOCALBASE}/include/freetype
+FTYPE_LIBS = -L${LOCALBASE}/lib -lttf
+FTYPE_DEFS = -DHAVE_FREETYPE
-+.endif
#
# Uncomment these if you have the hbf.h and hbf.c files in the current
@@ -37,7 +35,7 @@
#
# Specify the various defines needed for HBF fonts. If you do not have GNU
-@@ -65,7 +67,7 @@
+@@ -65,7 +65,7 @@
# files with a ".gz" extension. If you don't care about HBF fonts, just
# comment this line out.
#
@@ -46,7 +44,7 @@
#
# Set the defines used for all files except the HBF support.
-@@ -83,9 +85,9 @@
+@@ -83,9 +83,9 @@
#
# Uncomment these for Solaris.
#
@@ -59,7 +57,7 @@
#
# Uncomment these for Linux.
-@@ -131,7 +133,15 @@
+@@ -131,7 +131,15 @@
#LIBS = -L/usr/Motif-1.2/lib32 -lXm \
# -L/usr/lib/X11 -lXmu -lXt -lXext -lX11 -lSM -lICE $(FTYPE_LIBS)