Freetype wird gebraucht vom rrdtool.

git-svn-id: http://svn.ipfire.org/svn/ipfire/trunk@585 ea5c0bd1-69bd-2848-81d8-4f18e57aeed8

diff --git a/config/rootfiles/common/freetype b/config/rootfiles/common/freetype
new file mode 100644 (file)
index 0000000..9731f28
--- /dev/null
+++ b/config/rootfiles/common/freetype
@@ -0,0 +1,95 @@
+#usr/bin/freetype-config
+#usr/include/freetype2
+#usr/include/freetype2/freetype
+#usr/include/freetype2/freetype/cache
+#usr/include/freetype2/freetype/cache/ftccache.h
+#usr/include/freetype2/freetype/cache/ftccmap.h
+#usr/include/freetype2/freetype/cache/ftcglyph.h
+#usr/include/freetype2/freetype/cache/ftcimage.h
+#usr/include/freetype2/freetype/cache/ftcmanag.h
+#usr/include/freetype2/freetype/cache/ftcmru.h
+#usr/include/freetype2/freetype/cache/ftcsbits.h
+#usr/include/freetype2/freetype/config
+#usr/include/freetype2/freetype/config/ftconfig.h
+#usr/include/freetype2/freetype/config/ftheader.h
+#usr/include/freetype2/freetype/config/ftmodule.h
+#usr/include/freetype2/freetype/config/ftoption.h
+#usr/include/freetype2/freetype/config/ftstdlib.h
+#usr/include/freetype2/freetype/freetype.h
+#usr/include/freetype2/freetype/ftbbox.h
+#usr/include/freetype2/freetype/ftbdf.h
+#usr/include/freetype2/freetype/ftbitmap.h
+#usr/include/freetype2/freetype/ftcache.h
+#usr/include/freetype2/freetype/ftchapters.h
+#usr/include/freetype2/freetype/fterrdef.h
+#usr/include/freetype2/freetype/fterrors.h
+#usr/include/freetype2/freetype/ftglyph.h
+#usr/include/freetype2/freetype/ftgzip.h
+#usr/include/freetype2/freetype/ftimage.h
+#usr/include/freetype2/freetype/ftincrem.h
+#usr/include/freetype2/freetype/ftlist.h
+#usr/include/freetype2/freetype/ftlzw.h
+#usr/include/freetype2/freetype/ftmac.h
+#usr/include/freetype2/freetype/ftmm.h
+#usr/include/freetype2/freetype/ftmodapi.h
+#usr/include/freetype2/freetype/ftmoderr.h
+#usr/include/freetype2/freetype/ftotval.h
+#usr/include/freetype2/freetype/ftoutln.h
+#usr/include/freetype2/freetype/ftpfr.h
+#usr/include/freetype2/freetype/ftrender.h
+#usr/include/freetype2/freetype/ftsizes.h
+#usr/include/freetype2/freetype/ftsnames.h
+#usr/include/freetype2/freetype/ftstroke.h
+#usr/include/freetype2/freetype/ftsynth.h
+#usr/include/freetype2/freetype/ftsysio.h
+#usr/include/freetype2/freetype/ftsysmem.h
+#usr/include/freetype2/freetype/ftsystem.h
+#usr/include/freetype2/freetype/fttrigon.h
+#usr/include/freetype2/freetype/fttypes.h
+#usr/include/freetype2/freetype/ftwinfnt.h
+#usr/include/freetype2/freetype/ftxf86.h
+#usr/include/freetype2/freetype/internal
+#usr/include/freetype2/freetype/internal/autohint.h
+#usr/include/freetype2/freetype/internal/ftcalc.h
+#usr/include/freetype2/freetype/internal/ftdebug.h
+#usr/include/freetype2/freetype/internal/ftdriver.h
+#usr/include/freetype2/freetype/internal/ftgloadr.h
+#usr/include/freetype2/freetype/internal/ftmemory.h
+#usr/include/freetype2/freetype/internal/ftobjs.h
+#usr/include/freetype2/freetype/internal/ftrfork.h
+#usr/include/freetype2/freetype/internal/ftserv.h
+#usr/include/freetype2/freetype/internal/ftstream.h
+#usr/include/freetype2/freetype/internal/fttrace.h
+#usr/include/freetype2/freetype/internal/ftvalid.h
+#usr/include/freetype2/freetype/internal/internal.h
+#usr/include/freetype2/freetype/internal/pcftypes.h
+#usr/include/freetype2/freetype/internal/psaux.h
+#usr/include/freetype2/freetype/internal/pshints.h
+#usr/include/freetype2/freetype/internal/sfnt.h
+#usr/include/freetype2/freetype/internal/svbdf.h
+#usr/include/freetype2/freetype/internal/svgldict.h
+#usr/include/freetype2/freetype/internal/svmm.h
+#usr/include/freetype2/freetype/internal/svotval.h
+#usr/include/freetype2/freetype/internal/svpfr.h
+#usr/include/freetype2/freetype/internal/svpostnm.h
+#usr/include/freetype2/freetype/internal/svpscmap.h
+#usr/include/freetype2/freetype/internal/svpsinfo.h
+#usr/include/freetype2/freetype/internal/svsfnt.h
+#usr/include/freetype2/freetype/internal/svttcmap.h
+#usr/include/freetype2/freetype/internal/svwinfnt.h
+#usr/include/freetype2/freetype/internal/svxf86nm.h
+#usr/include/freetype2/freetype/internal/t1types.h
+#usr/include/freetype2/freetype/internal/tttypes.h
+#usr/include/freetype2/freetype/t1tables.h
+#usr/include/freetype2/freetype/ttnameid.h
+#usr/include/freetype2/freetype/tttables.h
+#usr/include/freetype2/freetype/tttags.h
+#usr/include/freetype2/freetype/ttunpat.h
+#usr/include/ft2build.h
+#usr/lib/libfreetype.a
+#usr/lib/libfreetype.la
+usr/lib/libfreetype.so
+usr/lib/libfreetype.so.6
+usr/lib/libfreetype.so.6.3.8
+#usr/lib/pkgconfig/freetype2.pc
+#usr/share/aclocal/freetype2.m4

diff --git a/config/rootfiles/common/pam_mysql b/config/rootfiles/common/pam_mysql
index 99cef2f1e8de35221be98af84e15152e32448396..fbdfadd3a63889a7c0eb4e7bef1754b4890999d2 100644 (file)
--- a/config/rootfiles/common/pam_mysql
+++ b/config/rootfiles/common/pam_mysql
@@ -1,2 +1,2 @@
-lib/security/pam_mysql.la
+#lib/security/pam_mysql.la
 lib/security/pam_mysql.so

diff --git a/doc/packages-list.txt b/doc/packages-list.txt
index 8ec03df10825e307e16ffeec757f4144e098f18c..84de4ab9ff01da9ac4f2f233156d5f0b5a6bafd6 100644 (file)
--- a/doc/packages-list.txt
+++ b/doc/packages-list.txt
@@ -127,13 +127,11 @@
 * kudzu-1.2.64
 * l7-protocols-2006-09-10
 * lame-3.96.1
-* lcms-1.15
 * less-394
 * libaal-1.0.5
 * libart_lgpl-2.3.17
 * libcap-1.10
 * libmad-0.15.1b
-* libmng-1.0.9
 * libnet-1.1.2.1
 * libogg-1.1.3
 * libpcap-0.8.3
@@ -210,7 +208,6 @@
 * rp-pppoe-3.8
 * rrdtool-1.2.15
 * rsync-2.6.8
-* samba-3.0.25
 * samba-3.0.25a
 * screen-4.0.2
 * sed-4.1.5

diff --git a/lfs/freetype b/lfs/freetype
new file mode 100644 (file)
index 0000000..f990124
--- /dev/null
+++ b/lfs/freetype
@@ -0,0 +1,80 @@
+###############################################################################
+# This file is part of the IPCop Firewall.                                    #
+#                                                                             #
+# IPCop is free software; you can redistribute it and/or modify               #
+# it under the terms of the GNU General Public License as published by        #
+# the Free Software Foundation; either version 2 of the License, or           #
+# (at your option) any later version.                                         #
+#                                                                             #
+# IPCop is distributed in the hope that it will be useful,                    #
+# but WITHOUT ANY WARRANTY; without even the implied warranty of              #
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the               #
+# GNU General Public License for more details.                                #
+#                                                                             #
+# You should have received a copy of the GNU General Public License           #
+# along with IPCop; if not, write to the Free Software                        #
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA    #
+#                                                                             #
+# Makefiles are based on LFSMake, which is                                    #
+# Copyright (C) 2002 Rod Roard <rod@sunsetsystems.com>                        #
+#                                                                             #
+###############################################################################
+
+###############################################################################
+# Definitions
+###############################################################################
+
+include Config
+
+VER        = 2.1.10
+
+THISAPP    = freetype-$(VER)
+DL_FILE    = $(THISAPP).tar.bz2
+DL_FROM    = $(URL_IPFIRE)
+DIR_APP    = $(DIR_SRC)/$(THISAPP)
+TARGET     = $(DIR_INFO)/$(THISAPP)
+
+###############################################################################
+# Top-level Rules
+###############################################################################
+
+objects = $(DL_FILE)
+
+$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
+
+$(DL_FILE)_MD5 = a4012e7d1f6400df44a16743b11b8423
+
+install : $(TARGET)
+
+check : $(patsubst %,$(DIR_CHK)/%,$(objects))
+
+download :$(patsubst %,$(DIR_DL)/%,$(objects))
+
+md5 : $(subst %,%_MD5,$(objects))
+
+###############################################################################
+# Downloading, checking, md5sum
+###############################################################################
+
+$(patsubst %,$(DIR_CHK)/%,$(objects)) :
+       @$(CHECK)
+
+$(patsubst %,$(DIR_DL)/%,$(objects)) :
+       @$(LOAD)
+
+$(subst %,%_MD5,$(objects)) :
+       @$(MD5)
+
+###############################################################################
+# Installation Details
+###############################################################################
+
+$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
+       @$(PREBUILD)
+       @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
+       cd $(DIR_APP) && sed -i -r 's:.*(#.*BYTE.*) .*:\1:' include/freetype/config/ftoption.h
+       cd $(DIR_APP) && ./configure --prefix=/usr
+       cd $(DIR_APP) && make $(MAKETUNING)
+       cd $(DIR_APP) && make install
+       @rm -rf $(DIR_APP)
+       @$(POSTBUILD)

diff --git a/make.sh b/make.sh
index c9132d279d9894ad985c1c9ae2bb3fb7480d080d..769366102a57b4a8159749bf96f3492088242cef 100755 (executable)
--- a/make.sh
+++ b/make.sh
@@ -365,6 +365,7 @@ buildipfire() {
   ipfiremake libpng
   ipfiremake libtiff
   ipfiremake libart
+  ipfiremake freetype
   ipfiremake gd
   ipfiremake popt
   ipfiremake pcre