summaryrefslogtreecommitdiff
path: root/print
diff options
context:
space:
mode:
authorMaxim Sobolev <sobomax@FreeBSD.org>2002-03-14 11:15:03 +0000
committerMaxim Sobolev <sobomax@FreeBSD.org>2002-03-14 11:15:03 +0000
commit900ab41eb466f4dfa5b3ce47c110a153237a1ffc (patch)
tree1984f71c9b3e1294802f62b057e81f34756ec32b /print
parentUpdate modules: file, bind8. (diff)
Install includes into ${PREFIX}/include/freetype1/freetype instead of
${PREFIX}/include/freetype, so that ports that want freetype2 but don't pay particular attention to the order of `-I' directives won't be screwed if freetype1 is occasionally installed on the same system. This should fix recent problems with Mozilla. Bump PORTREVISION.
Notes
Notes: svn path=/head/; revision=56068
Diffstat (limited to 'print')
-rw-r--r--print/freetype/Makefile2
-rw-r--r--print/freetype/files/patch-lib::arch::unix::Makefile.in18
-rw-r--r--print/freetype/pkg-plist31
3 files changed, 35 insertions, 16 deletions
diff --git a/print/freetype/Makefile b/print/freetype/Makefile
index c4c9505823b0..280a86efcaf7 100644
--- a/print/freetype/Makefile
+++ b/print/freetype/Makefile
@@ -7,7 +7,7 @@
PORTNAME= freetype
PORTVERSION= 1.3.1
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= print
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:S,%SUBDIR%,freetype,} \
http://sunsite.cnlab-switch.ch/ftp/mirror/freetype/%SUBDIR%/ \
diff --git a/print/freetype/files/patch-lib::arch::unix::Makefile.in b/print/freetype/files/patch-lib::arch::unix::Makefile.in
new file mode 100644
index 000000000000..e5519bd3eff2
--- /dev/null
+++ b/print/freetype/files/patch-lib::arch::unix::Makefile.in
@@ -0,0 +1,18 @@
+
+$FreeBSD$
+
+--- lib/arch/unix/Makefile.in 2002/03/14 07:15:48 1.1
++++ lib/arch/unix/Makefile.in 2002/03/14 07:16:24
+@@ -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:
diff --git a/print/freetype/pkg-plist b/print/freetype/pkg-plist
index 76883024195c..89724bdf0e77 100644
--- a/print/freetype/pkg-plist
+++ b/print/freetype/pkg-plist
@@ -1,18 +1,19 @@
-include/freetype/freetype.h
-include/freetype/fterrid.h
-include/freetype/ftnameid.h
-include/freetype/ftxcmap.h
-include/freetype/ftxerr18.h
-include/freetype/ftxgasp.h
-include/freetype/ftxgdef.h
-include/freetype/ftxgpos.h
-include/freetype/ftxgsub.h
-include/freetype/ftxkern.h
-include/freetype/ftxopen.h
-include/freetype/ftxpost.h
-include/freetype/ftxsbit.h
-include/freetype/ftxwidth.h
+include/freetype1/freetype/freetype.h
+include/freetype1/freetype/fterrid.h
+include/freetype1/freetype/ftnameid.h
+include/freetype1/freetype/ftxcmap.h
+include/freetype1/freetype/ftxerr18.h
+include/freetype1/freetype/ftxgasp.h
+include/freetype1/freetype/ftxgdef.h
+include/freetype1/freetype/ftxgpos.h
+include/freetype1/freetype/ftxgsub.h
+include/freetype1/freetype/ftxkern.h
+include/freetype1/freetype/ftxopen.h
+include/freetype1/freetype/ftxpost.h
+include/freetype1/freetype/ftxsbit.h
+include/freetype1/freetype/ftxwidth.h
lib/libttf.a
lib/libttf.so
lib/libttf.so.4
-@dirrm include/freetype
+@dirrm include/freetype1/freetype
+@dirrm include/freetype1