Update to 3.0.0.

14 files changed, 108 insertions, 82 deletions

diff --git a/editors/openoffice-3/Makefile b/editors/openoffice-3/Makefile
index d1ad551bc58f..070fbdadc39a 100644
--- a/editors/openoffice-3/Makefile
+++ b/editors/openoffice-3/Makefile
@@ -8,10 +8,8 @@
 
 PORTNAME?=	openoffice.org
 PORTVERSION?=	${OOOVERSION}
-PORTREVISION=	1
 CATEGORIES+=	editors java
 MASTER_SITES+=	http://ooopackages.good-day.net/pub/OpenOffice.org/sources/ \
-		http://openoffice.lunarshells.com/sources/ \
 		http://ooopackages.good-day.net/pub/OpenOffice.org/cws/:cws \
 		ftp://ftp.cs.man.ac.uk/pub/toby/gpc/:gpc \
 		${MASTER_SITE_APACHE:S,%SUBDIR%/,ant/binaries/:antbin,} \
@@ -33,7 +31,7 @@ DISTFILES+=	${CWSARCHIVE}:cws
 .endif
 CWSARCHIVE=	${WITH_CWS}.tar.gz
 
-OOOVERSION=	3.0.0.b2
+OOOVERSION=	3.0.0
 NO_LATEST_LINK=	yes
 USE_GNOME=	desktopfileutils gtk20
 MOZILLA_VERSION=	1.7.5
@@ -74,8 +72,8 @@ FREEBSD_ENV_SET=	FreeBSDAMDEnv.Set
 FREEBSD_ENV_SET=	FreeBSDX86Env.Set
 .endif
 
-MILESTONE?=		3
-OOOTAG?=		BEB300_m${MILESTONE}
+MILESTONE?=		9
+OOOTAG?=		OOO300_m${MILESTONE}
 OOOSRC?=		OOo_${OOOTAG}_source${EXTRACT_SUFX}
 OOODIR=			openoffice.org3
 INSTALLATION_BASEDIR?=	openoffice.org-${OOOVERSION}
@@ -87,9 +85,9 @@ EXECBASE=		openoffice.org-${OOOVERSION}-${WITH_CWS}
 DIST_SUBDIR=		openoffice.org3
 SIMPLEOSVER=		${OSREL:C/\.//g}
 .if ${ARCH} == amd64
-PACKAGE_BASENAME=	OOo_Dev_${OOOVERSION}_${OPSYS}${SIMPLEOSVER}X86-64
+PACKAGE_BASENAME=	OOo_${OOOVERSION}_${OPSYS}${SIMPLEOSVER}X86-64
 .else
-PACKAGE_BASENAME=	OOo_Dev_${OOOVERSION}_${OPSYS}${SIMPLEOSVER}Intel
+PACKAGE_BASENAME=	OOo_${OOOVERSION}_${OPSYS}${SIMPLEOSVER}Intel
 .endif
 
 LOCALIZED_LANG?=	en-US
@@ -151,6 +149,9 @@ CONFIGURE_ARGS+=	--with-gnu-cp=${LOCALBASE}/bin/gcp		\
 WITHOUT_MOZILLA=	yes
 LIB_DEPENDS+=		boost_regex:${PORTSDIR}/devel/boost
 CONFIGURE_ARGS+=	--with-system-boost=yes #i58343#
+.if (${OSVERSION} >= 700042)
+EXTRA_PATCHES+=	${FILESDIR}/amd64-gcc42-workaround
+.endif
 .endif
 .if (${OSVERSION} <= 602102)
 EXTRA_PATCHES+=	${FILESDIR}/rtld-workaround-i66667
diff --git a/editors/openoffice-3/distinfo b/editors/openoffice-3/distinfo
index 917c7efaf0d8..d783b2012d4a 100644
--- a/editors/openoffice-3/distinfo
+++ b/editors/openoffice-3/distinfo
@@ -1,6 +1,6 @@
-MD5 (openoffice.org3/OOo_BEB300_m3_source.tar.bz2) = e5f3677affcf64293048a8e9235bba89
-SHA256 (openoffice.org3/OOo_BEB300_m3_source.tar.bz2) = 493d6e45407a14de1acda5ed64adbd4cca966de11ffd6acec9ba24f7e359e185
-SIZE (openoffice.org3/OOo_BEB300_m3_source.tar.bz2) = 299207769
+MD5 (openoffice.org3/OOo_OOO300_m9_source.tar.bz2) = 1906f63b3777ba9bfe8fdcd2a62a4a1a
+SHA256 (openoffice.org3/OOo_OOO300_m9_source.tar.bz2) = 872ee6b86495cab333d25759f009d2ace958edff1859082d519bc9c23623c681
+SIZE (openoffice.org3/OOo_OOO300_m9_source.tar.bz2) = 315878390
 MD5 (openoffice.org3/unowinreg.dll) = e3a0b76dcd876f3d721ee7183729153d
 SHA256 (openoffice.org3/unowinreg.dll) = f563e522922133db9340b0306711c2d8767cc3481dd9e7d9b0d059906d12653c
 SIZE (openoffice.org3/unowinreg.dll) = 6144
diff --git a/editors/openoffice-3/files/Makefile.others b/editors/openoffice-3/files/Makefile.others
index f5848df41e31..a94d866b232b 100644
--- a/editors/openoffice-3/files/Makefile.others
+++ b/editors/openoffice-3/files/Makefile.others
@@ -24,7 +24,7 @@ sdk:
 	@${RM} -fr ${WRKDIR}/sdk_tmp
 	@${MKDIR} ${WRKDIR}/sdk_tmp
 	@cd ${WRKDIR}/sdk_tmp ; \
-		${TAR} xfz ${WRKSRC}/instsetoo_native/unxfbsd?.pro/OpenOffice_SDK/bsd/install/${LOCALIZED_LANG}/freebsd-*/openoffice*.t?z
+		${TAR} xfz ${WRKSRC}/instsetoo_native/unxfbsd?.pro/OpenOffice_SDK/bsd/install/${LOCALIZED_LANG}/freebsd-*/ooobasis*.t?z
 	@cd ${WRKDIR}/sdk_tmp/opt/openoffice* ; \
 		${MKDIR} ../${INSTALLATION_BASEDIR}_sdk ; \
 		${MV} * ../${INSTALLATION_BASEDIR}_sdk ; cd .. ; \
diff --git a/editors/openoffice-3/files/amd64-gcc42-workaround b/editors/openoffice-3/files/amd64-gcc42-workaround
new file mode 100644
index 000000000000..01ace4ad728c
--- /dev/null
+++ b/editors/openoffice-3/files/amd64-gcc42-workaround
@@ -0,0 +1,13 @@
+--- writerfilter/source/resourcemodel/makefile.mk.orig	2008-07-22 08:53:57.000000000 -0400
++++ writerfilter/source/resourcemodel/makefile.mk	2008-09-03 12:26:09.000000000 -0400
+@@ -56,8 +56,8 @@
+     $(SLO)$/TagLogger.obj \
+ 	$(SLO)$/WW8Analyzer.obj
+ 
+-# linux 64 bit: compiler (gcc 4.2.3) fails with 'out of memory'
+-.IF "$(OUTPATH)"=="unxlngx6"
++# FreeBSD/Linux 64-bit: compiler (gcc 4.2.x) fails with 'out of memory'
++.IF "$(OUTPATH)"=="unxfbsdx" || "$(OUTPATH)"=="unxlngx6"
+ NOOPTFILES= \
+ 	$(SLO)$/qnametostr.obj
+ .ENDIF
diff --git a/editors/openoffice-3/files/patch-i84549 b/editors/openoffice-3/files/patch-i84549
index 3f1808c45b5a..1d7f6517953b 100644
--- a/editors/openoffice-3/files/patch-i84549
+++ b/editors/openoffice-3/files/patch-i84549
@@ -1,17 +1,16 @@
-? neon/unxfbsdi.pro
 Index: neon/neon.patch
 ===================================================================
 RCS file: /cvs/external/neon/neon.patch,v
-retrieving revision 1.20
-diff -u -r1.20 neon.patch
---- neon/neon.patch	14 Nov 2007 09:49:43 -0000	1.20
-+++ neon/neon.patch	13 Dec 2007 17:16:29 -0000
-@@ -268,7 +268,7 @@
- ! #define HAVE_SYS_TYPES_H 1
- ! 
- ! /* Define if the timezone global is available */
--! #ifndef MACOSX
-+! #if !defined (MACOSX) && !defined (FREEBSD)
- ! #define HAVE_TIMEZONE 1
- ! #endif
- ! 
+retrieving revision 1.25
+diff -u -r1.25 neon.patch
+--- neon/neon.patch	22 Jul 2008 17:17:06 -0000	1.25
++++ neon/neon.patch	10 Aug 2008 04:20:27 -0000
+@@ -266,7 +266,7 @@
+ +#define HAVE_SYS_TYPES_H 1
+ +
+ +/* Define if the timezone global is available */
+-+#ifndef MACOSX
+++#if !defined(MACOSX) && !defined(FREEBSD)
+ +#define HAVE_TIMEZONE 1
+ +#endif
+ +
diff --git a/editors/openoffice-3/files/patch-i91318 b/editors/openoffice-3/files/patch-i91318
index 172af1ddae5a..a038fc180ff5 100644
--- a/editors/openoffice-3/files/patch-i91318
+++ b/editors/openoffice-3/files/patch-i91318
@@ -1,18 +1,19 @@
 Index: hunspell/hunspell-1.1.12.patch
 ===================================================================
 RCS file: /cvs/external/hunspell/hunspell-1.1.12.patch,v
-retrieving revision 1.11
-diff -u -r1.11 hunspell-1.1.12.patch
---- hunspell/hunspell-1.1.12.patch	18 Jun 2008 10:07:23 -0000	1.11
-+++ hunspell/hunspell-1.1.12.patch	2 Jul 2008 20:13:47 -0000
-@@ -450,3 +450,10 @@
+retrieving revision 1.12
+diff -u -r1.12 hunspell-1.1.12.patch
+--- hunspell/hunspell-1.1.12.patch	2 Jul 2008 09:46:59 -0000	1.12
++++ hunspell/hunspell-1.1.12.patch	10 Aug 2008 01:02:29 -0000
+@@ -487,3 +487,11 @@
   i68568utf.test \
   1706659.test \
   digits_in_words.test \
 +--- misc/hunspell-1.1.12/tests/test.sh	2007-07-15 22:33:13.000000000 +0900
-++++ misc/build/hunspell-1.1.12/tests/test.sh	2008-07-01 06:18:31.000000000 +0900
+++++ misc/build/hunspell-1.1.12/tests/test.sh	2008-08-10 10:00:33.000000000 +0900
 +@@ -1,4 +1,4 @@
 +-#!/bin/bash
 ++#!/usr/local/bin/bash
 + export LC_ALL="C"
 + 
++ function check_valgrind_log () {
diff --git a/editors/openoffice-3/files/patch-i91861 b/editors/openoffice-3/files/patch-i91861
index 06602529f013..93c8021d3385 100644
--- a/editors/openoffice-3/files/patch-i91861
+++ b/editors/openoffice-3/files/patch-i91861
@@ -1,19 +1,18 @@
-? vcl/unxfbsdi.pro
 Index: vcl/source/glyphs/makefile.mk
 ===================================================================
 RCS file: /cvs/gsl/vcl/source/glyphs/makefile.mk,v
-retrieving revision 1.13
-diff -u -r1.13 makefile.mk
---- vcl/source/glyphs/makefile.mk	11 Apr 2008 08:59:18 -0000	1.13
-+++ vcl/source/glyphs/makefile.mk	20 Jul 2008 03:14:41 -0000
-@@ -42,9 +42,17 @@
+retrieving revision 1.13.106.1
+diff -u -r1.13.106.1 makefile.mk
+--- vcl/source/glyphs/makefile.mk	31 Jul 2008 20:14:59 -0000	1.13.106.1
++++ vcl/source/glyphs/makefile.mk	10 Aug 2008 01:06:59 -0000
+@@ -41,9 +41,17 @@
+ .INCLUDE :  settings.mk
  .INCLUDE :  $(PRJ)$/util$/makefile2.pmk
  
- .IF "$(SYSTEM_FREETYPE)" == "YES"
 +.IF "$(OS)" != "FREEBSD"
- CFLAGS+=-DSYSTEM_FREETYPE $(FREETYPE_CFLAGS)
+ CFLAGS+= $(FREETYPE_CFLAGS)
 +.ELSE
-+ADDCDEFS+=-DSYSTEM_FREETYPE $(FREETYPE_CFLAGS)
++ADDCDEFS+= $(FREETYPE_CFLAGS)
 +.ENDIF
  .IF "$(USE_FT_EMBOLDEN)" == "YES"
 +.IF "$(OS)" != "FREEBSD"
@@ -22,5 +21,5 @@ diff -u -r1.13 makefile.mk
 +ADDCDEFS+=-DUSE_FT_EMBOLDEN
 +.ENDIF
  .ENDIF
- .ENDIF
  
+ # --- Files --------------------------------------------------------
diff --git a/editors/openoffice.org-3/Makefile b/editors/openoffice.org-3/Makefile
index d1ad551bc58f..070fbdadc39a 100644
--- a/editors/openoffice.org-3/Makefile
+++ b/editors/openoffice.org-3/Makefile
@@ -8,10 +8,8 @@
 
 PORTNAME?=	openoffice.org
 PORTVERSION?=	${OOOVERSION}
-PORTREVISION=	1
 CATEGORIES+=	editors java
 MASTER_SITES+=	http://ooopackages.good-day.net/pub/OpenOffice.org/sources/ \
-		http://openoffice.lunarshells.com/sources/ \
 		http://ooopackages.good-day.net/pub/OpenOffice.org/cws/:cws \
 		ftp://ftp.cs.man.ac.uk/pub/toby/gpc/:gpc \
 		${MASTER_SITE_APACHE:S,%SUBDIR%/,ant/binaries/:antbin,} \
@@ -33,7 +31,7 @@ DISTFILES+=	${CWSARCHIVE}:cws
 .endif
 CWSARCHIVE=	${WITH_CWS}.tar.gz
 
-OOOVERSION=	3.0.0.b2
+OOOVERSION=	3.0.0
 NO_LATEST_LINK=	yes
 USE_GNOME=	desktopfileutils gtk20
 MOZILLA_VERSION=	1.7.5
@@ -74,8 +72,8 @@ FREEBSD_ENV_SET=	FreeBSDAMDEnv.Set
 FREEBSD_ENV_SET=	FreeBSDX86Env.Set
 .endif
 
-MILESTONE?=		3
-OOOTAG?=		BEB300_m${MILESTONE}
+MILESTONE?=		9
+OOOTAG?=		OOO300_m${MILESTONE}
 OOOSRC?=		OOo_${OOOTAG}_source${EXTRACT_SUFX}
 OOODIR=			openoffice.org3
 INSTALLATION_BASEDIR?=	openoffice.org-${OOOVERSION}
@@ -87,9 +85,9 @@ EXECBASE=		openoffice.org-${OOOVERSION}-${WITH_CWS}
 DIST_SUBDIR=		openoffice.org3
 SIMPLEOSVER=		${OSREL:C/\.//g}
 .if ${ARCH} == amd64
-PACKAGE_BASENAME=	OOo_Dev_${OOOVERSION}_${OPSYS}${SIMPLEOSVER}X86-64
+PACKAGE_BASENAME=	OOo_${OOOVERSION}_${OPSYS}${SIMPLEOSVER}X86-64
 .else
-PACKAGE_BASENAME=	OOo_Dev_${OOOVERSION}_${OPSYS}${SIMPLEOSVER}Intel
+PACKAGE_BASENAME=	OOo_${OOOVERSION}_${OPSYS}${SIMPLEOSVER}Intel
 .endif
 
 LOCALIZED_LANG?=	en-US
@@ -151,6 +149,9 @@ CONFIGURE_ARGS+=	--with-gnu-cp=${LOCALBASE}/bin/gcp		\
 WITHOUT_MOZILLA=	yes
 LIB_DEPENDS+=		boost_regex:${PORTSDIR}/devel/boost
 CONFIGURE_ARGS+=	--with-system-boost=yes #i58343#
+.if (${OSVERSION} >= 700042)
+EXTRA_PATCHES+=	${FILESDIR}/amd64-gcc42-workaround
+.endif
 .endif
 .if (${OSVERSION} <= 602102)
 EXTRA_PATCHES+=	${FILESDIR}/rtld-workaround-i66667
diff --git a/editors/openoffice.org-3/distinfo b/editors/openoffice.org-3/distinfo
index 917c7efaf0d8..d783b2012d4a 100644
--- a/editors/openoffice.org-3/distinfo
+++ b/editors/openoffice.org-3/distinfo
@@ -1,6 +1,6 @@
-MD5 (openoffice.org3/OOo_BEB300_m3_source.tar.bz2) = e5f3677affcf64293048a8e9235bba89
-SHA256 (openoffice.org3/OOo_BEB300_m3_source.tar.bz2) = 493d6e45407a14de1acda5ed64adbd4cca966de11ffd6acec9ba24f7e359e185
-SIZE (openoffice.org3/OOo_BEB300_m3_source.tar.bz2) = 299207769
+MD5 (openoffice.org3/OOo_OOO300_m9_source.tar.bz2) = 1906f63b3777ba9bfe8fdcd2a62a4a1a
+SHA256 (openoffice.org3/OOo_OOO300_m9_source.tar.bz2) = 872ee6b86495cab333d25759f009d2ace958edff1859082d519bc9c23623c681
+SIZE (openoffice.org3/OOo_OOO300_m9_source.tar.bz2) = 315878390
 MD5 (openoffice.org3/unowinreg.dll) = e3a0b76dcd876f3d721ee7183729153d
 SHA256 (openoffice.org3/unowinreg.dll) = f563e522922133db9340b0306711c2d8767cc3481dd9e7d9b0d059906d12653c
 SIZE (openoffice.org3/unowinreg.dll) = 6144
diff --git a/editors/openoffice.org-3/files/Makefile.others b/editors/openoffice.org-3/files/Makefile.others
index f5848df41e31..a94d866b232b 100644
--- a/editors/openoffice.org-3/files/Makefile.others
+++ b/editors/openoffice.org-3/files/Makefile.others
@@ -24,7 +24,7 @@ sdk:
 	@${RM} -fr ${WRKDIR}/sdk_tmp
 	@${MKDIR} ${WRKDIR}/sdk_tmp
 	@cd ${WRKDIR}/sdk_tmp ; \
-		${TAR} xfz ${WRKSRC}/instsetoo_native/unxfbsd?.pro/OpenOffice_SDK/bsd/install/${LOCALIZED_LANG}/freebsd-*/openoffice*.t?z
+		${TAR} xfz ${WRKSRC}/instsetoo_native/unxfbsd?.pro/OpenOffice_SDK/bsd/install/${LOCALIZED_LANG}/freebsd-*/ooobasis*.t?z
 	@cd ${WRKDIR}/sdk_tmp/opt/openoffice* ; \
 		${MKDIR} ../${INSTALLATION_BASEDIR}_sdk ; \
 		${MV} * ../${INSTALLATION_BASEDIR}_sdk ; cd .. ; \
diff --git a/editors/openoffice.org-3/files/amd64-gcc42-workaround b/editors/openoffice.org-3/files/amd64-gcc42-workaround
new file mode 100644
index 000000000000..01ace4ad728c
--- /dev/null
+++ b/editors/openoffice.org-3/files/amd64-gcc42-workaround
@@ -0,0 +1,13 @@
+--- writerfilter/source/resourcemodel/makefile.mk.orig	2008-07-22 08:53:57.000000000 -0400
++++ writerfilter/source/resourcemodel/makefile.mk	2008-09-03 12:26:09.000000000 -0400
+@@ -56,8 +56,8 @@
+     $(SLO)$/TagLogger.obj \
+ 	$(SLO)$/WW8Analyzer.obj
+ 
+-# linux 64 bit: compiler (gcc 4.2.3) fails with 'out of memory'
+-.IF "$(OUTPATH)"=="unxlngx6"
++# FreeBSD/Linux 64-bit: compiler (gcc 4.2.x) fails with 'out of memory'
++.IF "$(OUTPATH)"=="unxfbsdx" || "$(OUTPATH)"=="unxlngx6"
+ NOOPTFILES= \
+ 	$(SLO)$/qnametostr.obj
+ .ENDIF
diff --git a/editors/openoffice.org-3/files/patch-i84549 b/editors/openoffice.org-3/files/patch-i84549
index 3f1808c45b5a..1d7f6517953b 100644
--- a/editors/openoffice.org-3/files/patch-i84549
+++ b/editors/openoffice.org-3/files/patch-i84549
@@ -1,17 +1,16 @@
-? neon/unxfbsdi.pro
 Index: neon/neon.patch
 ===================================================================
 RCS file: /cvs/external/neon/neon.patch,v
-retrieving revision 1.20
-diff -u -r1.20 neon.patch
---- neon/neon.patch	14 Nov 2007 09:49:43 -0000	1.20
-+++ neon/neon.patch	13 Dec 2007 17:16:29 -0000
-@@ -268,7 +268,7 @@
- ! #define HAVE_SYS_TYPES_H 1
- ! 
- ! /* Define if the timezone global is available */
--! #ifndef MACOSX
-+! #if !defined (MACOSX) && !defined (FREEBSD)
- ! #define HAVE_TIMEZONE 1
- ! #endif
- ! 
+retrieving revision 1.25
+diff -u -r1.25 neon.patch
+--- neon/neon.patch	22 Jul 2008 17:17:06 -0000	1.25
++++ neon/neon.patch	10 Aug 2008 04:20:27 -0000
+@@ -266,7 +266,7 @@
+ +#define HAVE_SYS_TYPES_H 1
+ +
+ +/* Define if the timezone global is available */
+-+#ifndef MACOSX
+++#if !defined(MACOSX) && !defined(FREEBSD)
+ +#define HAVE_TIMEZONE 1
+ +#endif
+ +
diff --git a/editors/openoffice.org-3/files/patch-i91318 b/editors/openoffice.org-3/files/patch-i91318
index 172af1ddae5a..a038fc180ff5 100644
--- a/editors/openoffice.org-3/files/patch-i91318
+++ b/editors/openoffice.org-3/files/patch-i91318
@@ -1,18 +1,19 @@
 Index: hunspell/hunspell-1.1.12.patch
 ===================================================================
 RCS file: /cvs/external/hunspell/hunspell-1.1.12.patch,v
-retrieving revision 1.11
-diff -u -r1.11 hunspell-1.1.12.patch
---- hunspell/hunspell-1.1.12.patch	18 Jun 2008 10:07:23 -0000	1.11
-+++ hunspell/hunspell-1.1.12.patch	2 Jul 2008 20:13:47 -0000
-@@ -450,3 +450,10 @@
+retrieving revision 1.12
+diff -u -r1.12 hunspell-1.1.12.patch
+--- hunspell/hunspell-1.1.12.patch	2 Jul 2008 09:46:59 -0000	1.12
++++ hunspell/hunspell-1.1.12.patch	10 Aug 2008 01:02:29 -0000
+@@ -487,3 +487,11 @@
   i68568utf.test \
   1706659.test \
   digits_in_words.test \
 +--- misc/hunspell-1.1.12/tests/test.sh	2007-07-15 22:33:13.000000000 +0900
-++++ misc/build/hunspell-1.1.12/tests/test.sh	2008-07-01 06:18:31.000000000 +0900
+++++ misc/build/hunspell-1.1.12/tests/test.sh	2008-08-10 10:00:33.000000000 +0900
 +@@ -1,4 +1,4 @@
 +-#!/bin/bash
 ++#!/usr/local/bin/bash
 + export LC_ALL="C"
 + 
++ function check_valgrind_log () {
diff --git a/editors/openoffice.org-3/files/patch-i91861 b/editors/openoffice.org-3/files/patch-i91861
index 06602529f013..93c8021d3385 100644
--- a/editors/openoffice.org-3/files/patch-i91861
+++ b/editors/openoffice.org-3/files/patch-i91861
@@ -1,19 +1,18 @@
-? vcl/unxfbsdi.pro
 Index: vcl/source/glyphs/makefile.mk
 ===================================================================
 RCS file: /cvs/gsl/vcl/source/glyphs/makefile.mk,v
-retrieving revision 1.13
-diff -u -r1.13 makefile.mk
---- vcl/source/glyphs/makefile.mk	11 Apr 2008 08:59:18 -0000	1.13
-+++ vcl/source/glyphs/makefile.mk	20 Jul 2008 03:14:41 -0000
-@@ -42,9 +42,17 @@
+retrieving revision 1.13.106.1
+diff -u -r1.13.106.1 makefile.mk
+--- vcl/source/glyphs/makefile.mk	31 Jul 2008 20:14:59 -0000	1.13.106.1
++++ vcl/source/glyphs/makefile.mk	10 Aug 2008 01:06:59 -0000
+@@ -41,9 +41,17 @@
+ .INCLUDE :  settings.mk
  .INCLUDE :  $(PRJ)$/util$/makefile2.pmk
  
- .IF "$(SYSTEM_FREETYPE)" == "YES"
 +.IF "$(OS)" != "FREEBSD"
- CFLAGS+=-DSYSTEM_FREETYPE $(FREETYPE_CFLAGS)
+ CFLAGS+= $(FREETYPE_CFLAGS)
 +.ELSE
-+ADDCDEFS+=-DSYSTEM_FREETYPE $(FREETYPE_CFLAGS)
++ADDCDEFS+= $(FREETYPE_CFLAGS)
 +.ENDIF
  .IF "$(USE_FT_EMBOLDEN)" == "YES"
 +.IF "$(OS)" != "FREEBSD"
@@ -22,5 +21,5 @@ diff -u -r1.13 makefile.mk
 +ADDCDEFS+=-DUSE_FT_EMBOLDEN
 +.ENDIF
  .ENDIF
- .ENDIF
  
+ # --- Files --------------------------------------------------------