From owner-freebsd-ports Thu Jul 29 12: 1:51 1999 Delivered-To: freebsd-ports@freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.ORG [204.216.27.21]) by hub.freebsd.org (Postfix) with ESMTP id C7F6015638 for ; Thu, 29 Jul 1999 12:01:47 -0700 (PDT) (envelope-from gnats@FreeBSD.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.9.3/8.9.2) id MAA70114; Thu, 29 Jul 1999 12:00:02 -0700 (PDT) (envelope-from gnats@FreeBSD.org) Received: from news.uni-kl.de (news.uni-kl.de [131.246.137.51]) by hub.freebsd.org (Postfix) with SMTP id 023BC14E2D for ; Thu, 29 Jul 1999 11:58:49 -0700 (PDT) (envelope-from naddy@unix-ag.uni-kl.de) Received: from sushi.unix-ag.uni-kl.de ( root@sushi.unix-ag.uni-kl.de [131.246.89.13] ) by news.uni-kl.de id aa14947 for ; 29 Jul 1999 21:00 MESZ Received: from fettuccini.unix-ag.uni-kl.de (fettuccini.unix-ag.uni-kl.de [131.246.89.27]) by sushi.unix-ag.uni-kl.de (8.9.1a/8.9.1) with ESMTP id UAA27634 for ; Thu, 29 Jul 1999 20:57:58 +0200 Received: (from naddy@localhost) by fettuccini.unix-ag.uni-kl.de (8.9.3/8.9.3) id UAA87455; Thu, 29 Jul 1999 20:58:02 +0200 (CEST) (envelope-from naddy) Message-Id: <199907291858.UAA87455@fettuccini.unix-ag.uni-kl.de> Date: Thu, 29 Jul 1999 20:58:02 +0200 (CEST) From: Christian Weisgerber Reply-To: naddy@mips.rhein-neckar.de To: FreeBSD-gnats-submit@freebsd.org X-Send-Pr-Version: 3.2 Subject: ports/12873: update: xmbdfed 3.9 Sender: owner-freebsd-ports@FreeBSD.ORG Precedence: bulk X-Loop: FreeBSD.org >Number: 12873 >Category: ports >Synopsis: update: xmbdfed 3.9 >Confidential: no >Severity: non-critical >Priority: medium >Responsible: freebsd-ports >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Thu Jul 29 12:00:01 PDT 1999 >Closed-Date: >Last-Modified: >Originator: Christian Weisgerber >Release: FreeBSD 3.2-STABLE i386 >Organization: >Environment: >Description: - update xmbdfed port to version 3.9, including two distributed patches - add optional inclusion of FreeType support - remove old patch that would make xmbdfed come up with no usable font at all >How-To-Repeat: >Fix: diff -uNr /usr/ports/x11-fonts/xmbdfed/Makefile xmbdfed/Makefile --- /usr/ports/x11-fonts/xmbdfed/Makefile Sun Jan 17 00:25:56 1999 +++ xmbdfed/Makefile Thu Jul 29 20:43:27 1999 @@ -6,18 +6,27 @@ # $Id: Makefile,v 1.9 1999/01/16 23:25:56 jfieber Exp $ # -DISTNAME= xmbdfed-3.7 +DISTNAME= xmbdfed-3.9 CATEGORIES= x11-fonts MASTER_SITES= ftp://crl.nmsu.edu/CLR/multiling/General/ PATCH_SITES= ${MASTER_SITES} -PATCHFILES= xmbdfed-3.7.patch1 +PATCHFILES= xmbdfed-3.9.patch1 xmbdfed-3.9.patch2 MAINTAINER= jfieber@FreeBSD.ORG +.if defined(FREETYPE) +LIB_DEPENDS= ttf.3:${PORTSDIR}/print/freetype +.endif + USE_X_PREFIX= yes REQUIRES_MOTIF= yes MAN1= xmbdfed.1 + +.if !defined(FREETYPE) +pre-extract: + @${ECHO} "You can add the optional FreeType import capability by defining FREETYPE" +.endif .include diff -uNr /usr/ports/x11-fonts/xmbdfed/files/md5 xmbdfed/files/md5 --- /usr/ports/x11-fonts/xmbdfed/files/md5 Sun Jan 17 00:26:01 1999 +++ xmbdfed/files/md5 Thu Jul 29 19:53:52 1999 @@ -1,2 +1,3 @@ -MD5 (xmbdfed-3.7.tar.gz) = 4271bdf58369897760427ab5d38d6f6c -MD5 (xmbdfed-3.7.patch1) = 1508ba39c6cc95d91e7439879ee6935d +MD5 (xmbdfed-3.9.tar.gz) = cf46985aaf12442cb2fcd1a806195a13 +MD5 (xmbdfed-3.9.patch1) = 53a94bd5c99bd9687fc3505aec6506aa +MD5 (xmbdfed-3.9.patch2) = 4c43818a68c0777e2a3adffaa52232a3 diff -uNr /usr/ports/x11-fonts/xmbdfed/patches/patch-aa xmbdfed/patches/patch-aa --- /usr/ports/x11-fonts/xmbdfed/patches/patch-aa Thu Oct 29 00:41:24 1998 +++ xmbdfed/patches/patch-aa Thu Jul 29 20:45:12 1999 @@ -1,17 +1,43 @@ ---- Makefile.orig Wed Oct 28 18:23:15 1998 -+++ Makefile Wed Oct 28 18:26:30 1998 +--- Makefile.orig Mon May 3 19:17:50 1999 ++++ Makefile Thu Jul 29 20:44:35 1999 @@ -23,8 +23,8 @@ # - # $Id: patch-aa,v 1.3 1998/10/28 23:41:24 jfieber Exp $ + # $Id: Makefile,v 1.8 1999/05/03 17:17:50 mleisher Exp $ # -CC = gcc -CFLAGS = -g -Wall +#CC = gcc +#CFLAGS = -g -Wall - OTHER = README COPYRIGHTS Makefile Imakefile.lesstif Project.tmpl \ + OTHER = README CHANGES COPYRIGHTS Makefile Imakefile.lesstif Project.tmpl \ xmbdfedrc xmbdfed.man -@@ -65,7 +65,7 @@ +@@ -47,17 +47,19 @@ + # 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(FREETYPE) ++FTYPE_INCS = -I${LOCALBASE}/include ++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 + # directory and the patch has been applied. + # +-#HBF_HDRS = hbf.h +-#HBF_OBJS = hbf.o +-#HBF_DEFS = -DHAVE_HBF ++HBF_HDRS = hbf.h ++HBF_OBJS = hbf.o ++HBF_DEFS = -DHAVE_HBF + + # + # Specify the various defines needed for HBF fonts. If you do not have GNU +@@ -65,7 +67,7 @@ # files with a ".gz" extension. If you don't care about HBF fonts, just # comment this line out. # @@ -20,7 +46,7 @@ # # Set the defines used for all files except the HBF support. -@@ -83,9 +83,9 @@ +@@ -83,9 +85,9 @@ # # Uncomment these for Solaris. # @@ -33,21 +59,19 @@ # # Uncomment these for Linux. -@@ -114,7 +114,17 @@ - #INCS = $(FTYPE_INCS) - #LIBS = -lXm -lXmu -lXt -lXext -lX11 -lsocket $(FTYPE_LIBS) +@@ -131,7 +133,15 @@ + #LIBS = -L/usr/Motif-1.2/lib32 -lXm \ + # -L/usr/lib/X11 -lXmu -lXt -lXext -lX11 -lSM -lICE $(FTYPE_LIBS) -+INCS = -I${X11BASE}/include -+LIBS = -L${X11BASE}/lib ${MOTIFLIB} -lXpm -lXmu -lXt -lX11 -lSM -lICE -lXext -lxpg4 ++INCS = -I${X11BASE}/include ${FTYPE_INCS} ++LIBS = -L${X11BASE}/lib ${MOTIFLIB} -lXpm -lXmu -lXt -lX11 -lSM -lICE -lXext -lxpg4 ${FTYPE_LIBS} + + all: xmbdfed + +install: xmbdfed -+ ${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} \ -+ xmbdfed ${X11BASE}/bin/xmbdfed -+ ${INSTALL} ${COPY} -o ${MANOWN} -g ${MANGRP} -m ${MANMODE} \ -+ xmbdfed.man ${X11BASE}/man/man1/xmbdfed.1 ++ ${BSD_INSTALL_PROGRAM} xmbdfed ${PREFIX}/bin/xmbdfed ++ ${BSD_INSTALL_MAN} xmbdfed.man ${PREFIX}/man/man1/xmbdfed.1 xmbdfed: $(OBJS) $(PURIFY) $(CC) $(STATIC) $(CFLAGS) -o xmbdfed $(OBJS) $(LIBS) diff -uNr /usr/ports/x11-fonts/xmbdfed/patches/patch-ab xmbdfed/patches/patch-ab --- /usr/ports/x11-fonts/xmbdfed/patches/patch-ab Wed Jul 16 04:18:28 1997 +++ xmbdfed/patches/patch-ab Thu Jan 1 01:00:00 1970 @@ -1,19 +0,0 @@ -*** xmbdfed.c.orig Mon Jun 2 14:08:10 1997 ---- xmbdfed.c Fri Jun 20 15:30:46 1997 -*************** -*** 91,97 **** - #define HGINFO "\"%s\" %04lX (%02X,%02X)\nascent %d descent %d right %d left %d" - - static String fallback_resources[] = { -! "*fontList: -adobe-new century schoolbook-medium-r-normal--14-100-100-100-p-82-iso8859-1", - (String) NULL, - }; - ---- 91,97 ---- - #define HGINFO "\"%s\" %04lX (%02X,%02X)\nascent %d descent %d right %d left %d" - - static String fallback_resources[] = { -! /* "*fontList: -adobe-new century schoolbook-medium-r-normal--14-100-100-100-p-82-iso8859-1", */ - (String) NULL, - }; - >Release-Note: >Audit-Trail: >Unformatted: To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports" in the body of the message