[Midnightbsd-cvs] mports: print/freetype-tools: Fake fixes.

ctriv at midnightbsd.org ctriv at midnightbsd.org
Sat Nov 10 14:11:19 EST 2007


Log Message:
-----------
Fake fixes.  This is a good example of how to use the new run-* targets. 
This port still needs some work, there's no reason to build all of freetype,
but the tools' build system leaves something to be desired.

Modified Files:
--------------
    mports/print/freetype-tools:
        Makefile (r1.1 -> r1.2)
    mports/print/freetype-tools/files:
        patch-Makefile.in (r1.1 -> r1.2)

Added Files:
-----------
    mports/print/freetype-tools/files:
        patch-contrib__ttf2pfb__Makefile.in (r1.1)

-------------- next part --------------
Index: Makefile
===================================================================
RCS file: /home/cvs/mports/print/freetype-tools/Makefile,v
retrieving revision 1.1
retrieving revision 1.2
diff -L print/freetype-tools/Makefile -L print/freetype-tools/Makefile -u -r1.1 -r1.2
--- print/freetype-tools/Makefile
+++ print/freetype-tools/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	freetype-tools
 PORTVERSION=	1.3.1
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	print
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:S,%SUBDIR%,freetype,} \
 		http://sunsite.cnlab-switch.ch/ftp/mirror/freetype/%SUBDIR%/ \
@@ -21,6 +21,7 @@
 
 MAINTAINER=	ports at MidnightBSD.org
 COMMENT=	Tools for FreeType 1
+LICENSE=	unknown
 
 LIB_DEPENDS=	ttf.4:${PORTSDIR}/print/freetype
 RUN_DEPENDS=	${LOCALBASE}/lib/libkpathsea.a:${PORTSDIR}/print/teTeX-base \
@@ -30,31 +31,36 @@
 USE_GMAKE=	yes
 USE_AUTOTOOLS=	libtool:15
 CONFIGURE_ARGS=	--disable-nls --enable-static --enable-shared
+CFLAGS+=	-L${PREFIX}/lib
 
 TEXMFMAIN=	${TARGETDIR}/share/texmf
 
 MAN1=		ttf2bdf.1 ttf2tfm.1 ttf2pk.1
 
+FAKE_OPTS=	prefixhack
+SUBDIRS=	contrib/ttf2bdf contrib/ttf2pfb contrib/ttf2pk contrib/ttfbanner
+
 post-patch:
 	@${REINPLACE_CMD} -e 's|$${CONFIG_SHELL-/bin/sh} $$ac_aux_dir|$$ac_aux_dir|' \
 		${WRKSRC}/configure
 	@${FIND} ${WRKSRC} -name Makefile.in | ${XARGS} ${REINPLACE_CMD} -e \
 		's|LIBTOOL =.*|LIBTOOL = ${LIBTOOL}|'
 	@${FIND} ${WRKSRC} -name '*.orig' -delete
-	@${REINPLACE_CMD} -e 's|^PROGRAMS = t1asm|PROGRAMS =|' \
-		${WRKSRC}/contrib/ttf2pfb/Makefile.in
+
 
 post-build:
-	@cd ${WRKSRC}/contrib/ttf2bdf && ./configure --prefix=${TARGETDIR} && ${GMAKE}
-	@cd ${WRKSRC}/contrib/ttf2pfb && ./configure --prefix=${TARGETDIR} && ${GMAKE}
-	@cd ${WRKSRC}/contrib/ttf2pk && ./configure --prefix=${TARGETDIR} --with-kpathsea-dir=${LOCALBASE} && ${GMAKE}
-	@cd ${WRKSRC}/contrib/ttfbanner && ./configure --prefix=${TARGETDIR} && ${GMAKE}
-
-do-install:
-	@cd ${WRKSRC}/contrib/ttf2bdf && ${GMAKE} install
-	@cd ${WRKSRC}/contrib/ttf2pfb && ${GMAKE} install
-	@cd ${WRKSRC}/contrib/ttf2pk && ${GMAKE} install
-	@cd ${WRKSRC}/contrib/ttfbanner && ${GMAKE} install
+.for DIR in ${SUBDIRS}
+	cd ${.CURDIR} && ${MAKE} WRKSRC=${WRKSRC}/${DIR} run-configure run-build 
+.endfor
+
+
+do-fake:
+.for DIR in ${SUBDIRS}
+	cd ${.CURDIR} && ${MAKE} WRKSRC=${WRKSRC}/${DIR} run-fake
+.endfor
+
+
+post-install:
 	@${MKDIR} ${TEXMFMAIN}/ttf2pk
 	@for f in ${WRKSRC}/contrib/ttf2pk/data/*; do \
 	  ${INSTALL_DATA} $$f ${TEXMFMAIN}/ttf2pk; \
Index: patch-Makefile.in
===================================================================
RCS file: /home/cvs/mports/print/freetype-tools/files/patch-Makefile.in,v
retrieving revision 1.1
retrieving revision 1.2
diff -L print/freetype-tools/files/patch-Makefile.in -L print/freetype-tools/files/patch-Makefile.in -u -r1.1 -r1.2
--- print/freetype-tools/files/patch-Makefile.in
+++ print/freetype-tools/files/patch-Makefile.in
@@ -1,5 +1,5 @@
---- Makefile.in.orig	Wed Nov  8 18:01:07 2000
-+++ Makefile.in	Wed Nov  8 18:01:38 2000
+--- ./Makefile.in.orig	Wed Aug 19 21:59:56 1998
++++ ./Makefile.in	Sat Nov 10 12:30:11 2007
 @@ -8,7 +8,7 @@
  FTTESTDIR = test
  FTPODIR = po
--- /dev/null
+++ print/freetype-tools/files/patch-contrib__ttf2pfb__Makefile.in
@@ -0,0 +1,20 @@
+--- ./contrib/ttf2pfb/Makefile.in.orig	Sat Nov 10 12:37:06 2007
++++ ./contrib/ttf2pfb/Makefile.in	Sat Nov 10 12:38:30 2007
+@@ -32,7 +32,7 @@
+ 
+ SRC = t1asm.c ttf2pfb.c
+ 
+-PROGRAMS = t1asm ttf2pfb
++PROGRAMS = ttf2pfb
+ 
+ default all: $(PROGRAMS)
+ 
+@@ -62,7 +62,7 @@
+ 	for P in $(PROGRAMS) ; do \
+ 	  $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$P $(bindir)/$$P ; \
+ 	done
+-	$(INSTALL_PROGRAM) $(srcdir)/getafm $(bindir)/getafm
++	$(BSD_INSTALL_SCRIPT) $(srcdir)/getafm $(bindir)/getafm
+ 
+ uninstall:
+ 	-for P in $(PROGRAMS) ; do \


More information about the Midnightbsd-cvs mailing list