From 618a2f6d80ee1f3210c276fbbf549af9a1cf899d Mon Sep 17 00:00:00 2001 From: Antoine Brodin Date: Fri, 1 Aug 2014 20:06:11 +0000 Subject: Remove print/freetype-tools, it's integrated in TeXLive --- MOVED | 1 + print/Makefile | 1 - print/freetype-tools/Makefile | 61 --------------------- print/freetype-tools/distinfo | 2 - print/freetype-tools/files/patch-Makefile.in | 49 ----------------- print/freetype-tools/files/patch-big5eten | 21 -------- .../files/patch-contrib-ttf2pfb-t1asm.c | 22 -------- .../files/patch-lib-arch-unix-Makefile.in | 62 ---------------------- print/freetype-tools/files/patch-libtool | 40 -------------- print/freetype-tools/files/patch-malloc | 10 ---- print/freetype-tools/pkg-descr | 10 ---- print/freetype-tools/pkg-plist | 22 -------- 12 files changed, 1 insertion(+), 300 deletions(-) delete mode 100644 print/freetype-tools/Makefile delete mode 100644 print/freetype-tools/distinfo delete mode 100644 print/freetype-tools/files/patch-Makefile.in delete mode 100644 print/freetype-tools/files/patch-big5eten delete mode 100644 print/freetype-tools/files/patch-contrib-ttf2pfb-t1asm.c delete mode 100644 print/freetype-tools/files/patch-lib-arch-unix-Makefile.in delete mode 100644 print/freetype-tools/files/patch-libtool delete mode 100644 print/freetype-tools/files/patch-malloc delete mode 100644 print/freetype-tools/pkg-descr delete mode 100644 print/freetype-tools/pkg-plist diff --git a/MOVED b/MOVED index cc950c4e612f..9873af3d36ae 100644 --- a/MOVED +++ b/MOVED @@ -6366,3 +6366,4 @@ mail/getlive||2014-08-01|Has expired: GetLive project has been declared dead due print/ifxetex||2014-08-01|Has expired: Very outdated and fully contained in texlive-texmf lang/dragonegg46-33||2014-08-01|Has expired: Dead upstream, impractical to build on 10 and later lang/dragonegg47-33||2014-08-01|Has expired: Dead upstream, impractical to build on 10 and later +print/freetype-tools|print/texlive-texmf|2014-08-01|Has been incorporated in TeXLive diff --git a/print/Makefile b/print/Makefile index 0c31f2438196..a61b23c2b101 100644 --- a/print/Makefile +++ b/print/Makefile @@ -70,7 +70,6 @@ SUBDIR += foxitreader SUBDIR += fpdf SUBDIR += freetype - SUBDIR += freetype-tools SUBDIR += freetype2 SUBDIR += frescobaldi SUBDIR += ft2demos diff --git a/print/freetype-tools/Makefile b/print/freetype-tools/Makefile deleted file mode 100644 index 410b49995e94..000000000000 --- a/print/freetype-tools/Makefile +++ /dev/null @@ -1,61 +0,0 @@ -# Created by: rafan@infor.org -# $FreeBSD$ - -PORTNAME= freetype-tools -PORTVERSION= 1.3.1 -PORTREVISION= 9 -CATEGORIES= print -MASTER_SITES= SF/freetype/freetype/${PORTVERSION} \ - http://sunsite.cnlab-switch.ch/ftp/mirror/freetype/freetype1/ \ - http://www.funet.fi/pub/mirrors/ftp.freetype.org/freetype1/ \ - http://ftp.sunet.se/pub/text-processing/freetype/freetype1/ \ - ${MASTER_SITE_RINGSERVER:S,%SUBDIR%,graphics/freetype/&,} \ - ftp://ftp.freetype.org/freetype/freetupe1/ -DISTNAME= freetype-${PORTVERSION} - -MAINTAINER= ports@FreeBSD.org -COMMENT= Tools for FreeType 1 - -LIB_DEPENDS= libttf.so:${PORTSDIR}/print/freetype -RUN_DEPENDS= t1asm:${PORTSDIR}/print/t1utils -BUILD_DEPENDS:= ${RUN_DEPENDS} - -USE_TEX= base texmf -USES= gmake -USE_AUTOTOOLS= libtool -CONFIGURE_ARGS= --disable-nls --enable-static --enable-shared - -TEXMFMAIN= ${PREFIX}/share/texmf - -MAN1= ttf2bdf.1 ttf2tfm.1 ttf2pk.1 - -PORTSCOUT= limit:^1\. - -NO_STAGE= yes -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=${PREFIX} && ${MAKE_CMD} - @cd ${WRKSRC}/contrib/ttf2pfb && ./configure --prefix=${PREFIX} && ${MAKE_CMD} - @cd ${WRKSRC}/contrib/ttf2pk && ./configure --prefix=${PREFIX} --with-kpathsea-dir=${LOCALBASE} && ${MAKE_CMD} - @cd ${WRKSRC}/contrib/ttfbanner && ./configure --prefix=${PREFIX} && ${MAKE_CMD} - -do-install: - @cd ${WRKSRC}/contrib/ttf2bdf && ${MAKE_CMD} install - @cd ${WRKSRC}/contrib/ttf2pfb && ${MAKE_CMD} install - @cd ${WRKSRC}/contrib/ttf2pk && ${MAKE_CMD} install - @cd ${WRKSRC}/contrib/ttfbanner && ${MAKE_CMD} install - @${MKDIR} ${TEXMFMAIN}/ttf2pk - @for f in ${WRKSRC}/contrib/ttf2pk/data/*; do \ - ${INSTALL_DATA} $$f ${TEXMFMAIN}/ttf2pk; \ - done - @${LN} -fs ${TEXMFMAIN}/ttf2pk ${TEXMFMAIN}/ttf2tfm - -.include diff --git a/print/freetype-tools/distinfo b/print/freetype-tools/distinfo deleted file mode 100644 index c8d4394d010d..000000000000 --- a/print/freetype-tools/distinfo +++ /dev/null @@ -1,2 +0,0 @@ -SHA256 (freetype-1.3.1.tar.gz) = a27271fc5b2d91ee8931972dfb9683cd3971272cfe04d03caf5d13b1db5287c4 -SIZE (freetype-1.3.1.tar.gz) = 1427072 diff --git a/print/freetype-tools/files/patch-Makefile.in b/print/freetype-tools/files/patch-Makefile.in deleted file mode 100644 index d0a79de00928..000000000000 --- a/print/freetype-tools/files/patch-Makefile.in +++ /dev/null @@ -1,49 +0,0 @@ ---- Makefile.in.orig Wed Nov 8 18:01:07 2000 -+++ Makefile.in Wed Nov 8 18:01:38 2000 -@@ -8,7 +8,7 @@ - FTTESTDIR = test - FTPODIR = po - --all: ttlib tttest ttpo -+all: ttlib ttpo - - debug: ttlibdebug tttest ttpo - -@@ -22,30 +22,23 @@ - ttlibdebug: - cd $(FTLIBDIR); $(MAKE) -f $(MAKEFILE) debug - --tttest: -- cd $(FTTESTDIR); $(MAKE) -f $(MAKEFILE) all -- - ttpo: - cd $(FTPODIR); $(MAKE) all - - install: - cd $(FTLIBDIR); $(MAKE) -f $(MAKEFILE) install -- cd $(FTTESTDIR); $(MAKE) -f $(MAKEFILE) install - cd $(FTPODIR); $(MAKE) install - - uninstall: - cd $(FTLIBDIR); $(MAKE) -f $(MAKEFILE) uninstall -- cd $(FTTESTDIR); $(MAKE) -f $(MAKEFILE) uninstall - cd $(FTPODIR); $(MAKE) uninstall - - clean: - cd $(FTLIBDIR); $(MAKE) -f $(MAKEFILE) clean -- cd $(FTTESTDIR); $(MAKE) -f $(MAKEFILE) clean - cd $(FTPODIR); $(MAKE) clean - - distclean: - cd $(FTLIBDIR); $(MAKE) -f $(MAKEFILE) distclean -- cd $(FTTESTDIR); $(MAKE) -f $(MAKEFILE) distclean - cd $(FTPODIR); $(MAKE) distclean - $(RMF) config.cache config.log config.status Makefile \ - MakeSub ft_conf.h libtool -@@ -55,6 +48,5 @@ - - depend: - cd $(FTLIBDIR); $(MAKE) -f $(MAKEFILE) depend -- cd $(FTTESTDIR); $(MAKE) -f $(MAKEFILE) depend - - # end of Makefile.in diff --git a/print/freetype-tools/files/patch-big5eten b/print/freetype-tools/files/patch-big5eten deleted file mode 100644 index 11ca0e542369..000000000000 --- a/print/freetype-tools/files/patch-big5eten +++ /dev/null @@ -1,21 +0,0 @@ ---- contrib/ttf2pk/data/UBig5.sfd.orig Thu Dec 10 22:40:10 1998 -+++ contrib/ttf2pk/data/UBig5.sfd Fri Jan 21 23:38:41 2000 -@@ -1746,12 +1746,12 @@ - 0x6207 0x6B1E 0x7227 0x864C 0x8EA8 0x9482 0x9480 0x9481 \ - 0x9A69 0x9A68 0x9B2E 0x9E19 0x7229 0x864B 0x8B9F 0x9483 \ - 0x9C79 0x9EB7 0x7675 0x9A6B 0x9C7A 0x9E1D 0x7069 0x706A \ -- 0x9EA4 0x9F7E 0x9F49 0x9F98 0xFFFE 0xFFFE 0xFFFE 0xFFFE \ -- 0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE \ -- 0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE \ -- 0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE \ -- 0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE \ -- 0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE \ -+ 0x9EA4 0x9F7E 0x9F49 0x9F98 0x7881 0x92B9 0x88CF 0x58BB \ -+ 0x6052 0x7CA7 0x5AFA 0x2554 0x2566 0x2557 0x2560 0x256C \ -+ 0x2563 0x255A 0x2569 0x255D 0x2552 0x2564 0x2555 0x255E \ -+ 0x256A 0x2561 0x2558 0x2567 0x255B 0x2553 0x2565 0x2556 \ -+ 0x255F 0x256B 0x2562 0x2559 0x2568 0x255C 0x2551 0x2550 \ -+ 0x256D 0x256E 0x2570 0x256F 0x25A0 0xFFFE 0xFFFE 0xFFFE \ - 0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE \ - 0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE \ - 0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE 0xFFFE \ diff --git a/print/freetype-tools/files/patch-contrib-ttf2pfb-t1asm.c b/print/freetype-tools/files/patch-contrib-ttf2pfb-t1asm.c deleted file mode 100644 index 087241af5420..000000000000 --- a/print/freetype-tools/files/patch-contrib-ttf2pfb-t1asm.c +++ /dev/null @@ -1,22 +0,0 @@ ---- contrib/ttf2pfb/t1asm.c.orig Thu Jul 28 01:54:45 2005 -+++ contrib/ttf2pfb/t1asm.c Thu Jul 28 01:56:55 2005 -@@ -49,8 +49,8 @@ - - typedef unsigned char byte; - --static FILE *ifp = stdin; --static FILE *ofp = stdout; -+static FILE *ifp; -+static FILE *ofp; - - /* flags */ - static int pfb = 0; -@@ -437,6 +437,8 @@ - extern int optind; - extern int getopt(int argc, char **argv, char *optstring); - -+ ifp = stdin; -+ ofp = stdout; - fprintf(stderr, "%s", BANNER); - - /* interpret command line arguments using getopt */ diff --git a/print/freetype-tools/files/patch-lib-arch-unix-Makefile.in b/print/freetype-tools/files/patch-lib-arch-unix-Makefile.in deleted file mode 100644 index a97729fb0760..000000000000 --- a/print/freetype-tools/files/patch-lib-arch-unix-Makefile.in +++ /dev/null @@ -1,62 +0,0 @@ ---- lib/arch/unix/Makefile.in.orig Sat Jul 31 08:48:17 1999 -+++ lib/arch/unix/Makefile.in Sat Aug 21 12:55:07 2004 -@@ -2,8 +2,8 @@ - # - # lib/arch/unix/Makefile.in - --ARCH = arch/unix --FT_MAKEFILE = $(ARCH)/Makefile -+FTARCH = arch/unix -+FT_MAKEFILE = $(FTARCH)/Makefile - - RM = @RM@ - RMF = @RM@ -f -@@ -83,7 +83,7 @@ - $(srcdir)/$(FILESRC) \ - $(srcdir)/$(MEMSRC) \ - $(srcdir)/$(MUTEXSRC) --SRC_S = $(srcdir)/$(ARCH)/freetype.c -+SRC_S = $(srcdir)/$(FTARCH)/freetype.c - - # all header files - HEADERS = $(srcdir)/freetype.h \ -@@ -200,10 +200,10 @@ - -version-info $(version_info) $(FT_LIBS) - - install: libttf.la -- $(MKINSTALLDIRS) $(libdir) $(includedir)/freetype -+ $(MKINSTALLDIRS) $(libdir) $(includedir)/freetype1/freetype - $(LIBTOOL) --mode=install $(INSTALL) libttf.la $(libdir) - -for P in $(HEADERS) ; do \ -- $(INSTALL_DATA) $$P $(includedir)/freetype ; \ -+ $(INSTALL_DATA) $$P $(includedir)/freetype1/freetype ; \ - done - - uninstall: -@@ -218,15 +218,15 @@ - -$(RMF) file.c memory.c mutex.c - -$(RMF) libttf.la - -$(RMF) *.orig *~ core *.core -- -$(RMF) $(ARCH)/Makefile -+ -$(RMF) $(FTARCH)/Makefile - -$(RMF) .libs/* - -$(RMDIR) .libs - - depend: do_link - (echo '/^#.* PUT NO STUFF BELOW/,$$d' ; echo w ; echo q) | \ -- ed - $(ARCH)/Makefile -+ ed - $(FTARCH)/Makefile - echo '# Dependencies generated by make depend: PUT NO STUFF BELOW' \ -- >> $(ARCH)/Makefile -+ >> $(FTARCH)/Makefile - for file in $(SRC_S) $(SRC_M) $(EXTSRC) ; do \ - $(CPP) $(CPPFLAGS) $(INCLUDES) $$file | \ - sed -n -e 's|^# [1-9][0-9]* "\([^/].*\.h\)".*|\1|p' \ -@@ -239,6 +239,6 @@ - else if ($$1 != last) \ - { print line ; line = last = $$1 } \ - line = line " " $$2 } \ -- END { print line }' >> $(ARCH)/Makefile -+ END { print line }' >> $(FTARCH)/Makefile - - # Dependencies generated by make depend: PUT NO STUFF BELOW diff --git a/print/freetype-tools/files/patch-libtool b/print/freetype-tools/files/patch-libtool deleted file mode 100644 index 554caa4670ab..000000000000 --- a/print/freetype-tools/files/patch-libtool +++ /dev/null @@ -1,40 +0,0 @@ ---- contrib/ttf2pfb/Makefile.in.orig Thu Jul 28 02:09:51 2005 -+++ contrib/ttf2pfb/Makefile.in Thu Jul 28 02:10:02 2005 -@@ -40,7 +40,7 @@ - $(CC) $(CFLAGS) -o $@ $< - - ttf2pfb: ttf2pfb.o $(LIBDIR)/libttf.la -- $(LIBTOOL) --mode=link $(CC) $(FT_CFLAGS) -o $@ $< \ -+ $(LIBTOOL) --tag=CXX --mode=link $(CC) $(FT_CFLAGS) -o $@ $< \ - $(LIBDIR)/libttf.la $(LDFLAGS) - - clean: - ---- contrib/ttf2pk/Makefile.in.orig Tue Jul 26 01:52:45 2005 -+++ contrib/ttf2pk/Makefile.in Thu Sep 3 13:12:57 1998 -@@ -61,11 +61,11 @@ - default all: $(PROGRAMS) - - ttf2pk: $(ttf2pkobjs) $(LIBDIR)/libttf.la -- $(LIBTOOL) --mode=link $(CC) $(FT_CFLAGS) -o ttf2pk $(ttf2pkobjs) \ -+ $(LIBTOOL) --tag=CXX --mode=link $(CC) $(FT_CFLAGS) -o ttf2pk $(ttf2pkobjs) \ - $(LIBDIR)/libttf.la $(LDFLAGS) - - ttf2tfm: $(ttf2tfmobjs) $(LIBDIR)/libttf.la -- $(LIBTOOL) --mode=link $(CC) $(FT_CFLAGS) -o ttf2tfm $(ttf2tfmobjs) \ -+ $(LIBTOOL) --tag=CXX --mode=link $(CC) $(FT_CFLAGS) -o ttf2tfm $(ttf2tfmobjs) \ - $(LIBDIR)/libttf.la $(LDFLAGS) - - install: $(PROGRAMS) - ---- contrib/ttfbanner/Makefile.in.orig Sat Jul 30 14:09:54 2005 -+++ contrib/ttfbanner/Makefile.in Sat Jul 30 14:10:03 2005 -@@ -35,7 +35,7 @@ - default all: ttfbanner - - ttfbanner: ttfbanner.o $(LIBDIR)/libttf.la -- $(LIBTOOL) --mode=link $(CC) $(FT_CFLAGS) -o $@ $< \ -+ $(LIBTOOL) --tag=CXX --mode=link $(CC) $(FT_CFLAGS) -o $@ $< \ - $(LIBDIR)/libttf.la $(LDFLAGS) - - clean: diff --git a/print/freetype-tools/files/patch-malloc b/print/freetype-tools/files/patch-malloc deleted file mode 100644 index 8a04a033b8fa..000000000000 --- a/print/freetype-tools/files/patch-malloc +++ /dev/null @@ -1,10 +0,0 @@ ---- contrib/ttfbanner/ttfbanner.c.orig Sat Jul 30 14:07:56 2005 -+++ contrib/ttfbanner/ttfbanner.c Sat Jul 30 14:08:02 2005 -@@ -4,7 +4,6 @@ - - #include - #include --#include - #include - #include "freetype.h" - #include "ttfbanner.h" diff --git a/print/freetype-tools/pkg-descr b/print/freetype-tools/pkg-descr deleted file mode 100644 index 538d9a8f8fa2..000000000000 --- a/print/freetype-tools/pkg-descr +++ /dev/null @@ -1,10 +0,0 @@ -This includes some tools that are in FreeType 1's contrib directory. - -ttf2pfb: Converting TrueType fonts to the Postscript Type 1 format. -ttf2pk: A simple conversion tool to bring TrueType quality to the - TeX world. -ttf2bdf: Produce bitmapped fonts from TrueType files for your X11 - applications. -ttfbanner: make posters using a TrueType font - -WWW: http://freetype.sourceforge.net/freetype1/projects.html diff --git a/print/freetype-tools/pkg-plist b/print/freetype-tools/pkg-plist deleted file mode 100644 index a27b947bb945..000000000000 --- a/print/freetype-tools/pkg-plist +++ /dev/null @@ -1,22 +0,0 @@ -bin/getafm -bin/ttf2bdf -bin/ttf2pfb -bin/ttf2pk -bin/ttf2tfm -bin/ttfbanner -share/texmf/ttf2pk/Big5.sfd -share/texmf/ttf2pk/ET5.enc -share/texmf/ttf2pk/EUC.sfd -share/texmf/ttf2pk/SJIS.sfd -share/texmf/ttf2pk/T1-WGL4.enc -share/texmf/ttf2pk/UBg5plus.sfd -share/texmf/ttf2pk/UBig5.sfd -share/texmf/ttf2pk/UGB.sfd -share/texmf/ttf2pk/UGBK.sfd -share/texmf/ttf2pk/UJIS.sfd -share/texmf/ttf2pk/UKS.sfd -share/texmf/ttf2pk/Unicode.sfd -share/texmf/ttf2pk/VPS.rpl -share/texmf/ttf2pk/ttfonts.map -share/texmf/ttf2tfm -@dirrm share/texmf/ttf2pk -- cgit v1.2.3