[Midnightbsd-cvs] mports [16469] trunk/print/freetype: bump revision due to license fix and build fix
laffer1 at midnightbsd.org
laffer1 at midnightbsd.org
Tue Aug 19 07:16:21 EDT 2014
Revision: 16469
http://svnweb.midnightbsd.org/mports/?rev=16469
Author: laffer1
Date: 2014-08-19 07:16:20 -0400 (Tue, 19 Aug 2014)
Log Message:
-----------
bump revision due to license fix and build fix
Modified Paths:
--------------
trunk/print/freetype/Makefile
trunk/print/freetype/pkg-plist
Added Paths:
-----------
trunk/print/freetype/files/patch-lib__arch__unix__Makefile.in
Removed Paths:
-------------
trunk/print/freetype/files/patch-lib::arch::unix::Makefile.in
Modified: trunk/print/freetype/Makefile
===================================================================
--- trunk/print/freetype/Makefile 2014-08-19 11:01:53 UTC (rev 16468)
+++ trunk/print/freetype/Makefile 2014-08-19 11:16:20 UTC (rev 16469)
@@ -1,14 +1,9 @@
-# New ports collection makefile for: freetype
-# Date created: January 24, 1998
-# Whom: jseger at FreeBSD.org
-#
# $MidnightBSD$
# $FreeBSD: ports/print/freetype/Makefile,v 1.40 2007/01/26 15:46:46 shaun Exp $
-#
PORTNAME= freetype
PORTVERSION= 1.3.1
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= print
MASTER_SITES= SF \
http://sunsite.cnlab-switch.ch/ftp/mirror/freetype/freetype1/ \
@@ -18,13 +13,18 @@
ftp://ftp.freetype.org/freetype/freetupe1/
MAINTAINER= ports at MidnightBSD.org
-COMMENT= A free and portable TrueType font rendering engine
-LICENSE= restricted
+COMMENT= Free and portable TrueType font rendering engine
+
+LICENSE= freetype
+LICENSE_NAME= The FreeType Project LICENSE
+LICENSE_FILE= ${WRKSRC}/license.txt
+LICENSE_PERMS= dist-mirror
#apple patent whore
FAKE_OPTS+= prefixhack
-USE_AUTOTOOLS= libtool
+USES= libtool:oldver
+GNU_CONFIGURE= yes
USE_LDCONFIG= yes
CONFIGURE_ARGS= --disable-nls --enable-static --enable-shared
@@ -37,11 +37,9 @@
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}|'
-# Older versions of freetype installed include files in ${PREFIX}/include
-# this is a compatibility hack for now
+post-install:
+ cd ${PREFIX}/lib && ln libttf.so.4.0 libttf.so.4
#post-install:
# ${LN} -fs ${PREFIX}/include/freetype/*.h ${PREFIX}/include
Deleted: trunk/print/freetype/files/patch-lib::arch::unix::Makefile.in
===================================================================
--- trunk/print/freetype/files/patch-lib::arch::unix::Makefile.in 2014-08-19 11:01:53 UTC (rev 16468)
+++ trunk/print/freetype/files/patch-lib::arch::unix::Makefile.in 2014-08-19 11:16:20 UTC (rev 16469)
@@ -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
Copied: trunk/print/freetype/files/patch-lib__arch__unix__Makefile.in (from rev 16454, trunk/print/freetype/files/patch-lib::arch::unix::Makefile.in)
===================================================================
--- trunk/print/freetype/files/patch-lib__arch__unix__Makefile.in (rev 0)
+++ trunk/print/freetype/files/patch-lib__arch__unix__Makefile.in 2014-08-19 11:16:20 UTC (rev 16469)
@@ -0,0 +1,62 @@
+--- 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
Modified: trunk/print/freetype/pkg-plist
===================================================================
--- trunk/print/freetype/pkg-plist 2014-08-19 11:01:53 UTC (rev 16468)
+++ trunk/print/freetype/pkg-plist 2014-08-19 11:16:20 UTC (rev 16469)
@@ -14,7 +14,7 @@
include/freetype1/freetype/ftxwidth.h
lib/libttf.a
lib/libttf.la
-lib/libttf.so
lib/libttf.so.4
+lib/libttf.so.4.0
@dirrm include/freetype1/freetype
@dirrm include/freetype1
More information about the Midnightbsd-cvs
mailing list