2 files changed, 17 insertions, 277 deletions

diff --git a/x11-fonts/fontconfig/Makefile b/x11-fonts/fontconfig/Makefile
index c577361e46b6..d735f54b8452 100644
--- a/x11-fonts/fontconfig/Makefile
+++ b/x11-fonts/fontconfig/Makefile
@@ -8,19 +8,23 @@
 
 PORTNAME=	fontconfig
 PORTVERSION=	2.3.2
-PORTREVISION=	4
-PORTEPOCH=	1
 CATEGORIES=	x11-fonts
 MASTER_SITES=	http://fontconfig.org/release/
 
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	An XML-based font configuration API for X Windows
 
+PREFIX?=	${X11BASE}
+
+.if !defined(REFERENCE_PORT)
+
+PORTREVISION=	5
+PORTEPOCH=	1
+
 LIB_DEPENDS=	freetype.9:${PORTSDIR}/print/freetype2 \
 		expat.6:${PORTSDIR}/textproc/expat2
 
 USE_GMAKE=	yes
-PREFIX?=	${X11BASE}
 INSTALLS_SHLIB=	yes
 GNU_CONFIGURE=	yes
 USE_GNOME=	gnomehack gnometarget pkgconfig
@@ -28,142 +32,16 @@ CONFIGURE_ARGS=	--with-confdir=${PREFIX}/etc/fonts \
 		--with-expat-includes=${LOCALBASE}/include \
 		--with-expat-lib=${LOCALBASE}/lib \
 		--with-default-fonts=${X11BASE}/lib/X11/fonts \
-		--without-add-fonts
+		--without-add-fonts \
+		--disable-docs
 CONFIGURE_ENV=	HASDOCBOOK=no
 MAKE_ENV=	LC_ALL=C
 PKGINSTALL=	${WRKDIR}/pkg-install
 PKGDEINSTALL=	${PKGINSTALL}
 
 MAN1=		fc-match.1
-MAN3=		FcAtomicCreate.3  \
-		FcAtomicDeleteNew.3  \
-		FcAtomicDestroy.3  \
-		FcAtomicLock.3  \
-		FcAtomicNewFile.3  \
-		FcAtomicOrigFile.3  \
-		FcAtomicReplaceOrig.3  \
-		FcAtomicUnlock.3  \
-		FcBlanksAdd.3  \
-		FcBlanksCreate.3  \
-		FcBlanksDestroy.3  \
-		FcBlanksIsMember.3  \
-		FcCharSetAddChar.3  \
-		FcCharSetCopy.3  \
-		FcCharSetCount.3  \
-		FcCharSetCreate.3  \
-		FcCharSetDestroy.3  \
-		FcCharSetEqual.3  \
-		FcCharSetFirstPage.3  \
-		FcCharSetHasChar.3  \
-		FcCharSetIntersect.3  \
-		FcCharSetIntersectCount.3  \
-		FcCharSetIsSubset.3  \
-		FcCharSetNextPage.3  \
-		FcCharSetSubtract.3  \
-		FcCharSetSubtractCount.3  \
-		FcCharSetUnion.3  \
-		FcConfigAppFontAddDir.3  \
-		FcConfigAppFontAddFile.3  \
-		FcConfigAppFontClear.3  \
-		FcConfigBuildFonts.3  \
-		FcConfigCreate.3  \
-		FcConfigDestroy.3  \
-		FcConfigFilename.3  \
-		FcConfigGetBlanks.3  \
-		FcConfigGetCache.3  \
-		FcConfigGetConfigDirs.3  \
-		FcConfigGetConfigFiles.3  \
-		FcConfigGetCurrent.3  \
-		FcConfigGetFontDirs.3  \
-		FcConfigGetFonts.3  \
-		FcConfigGetRescanInverval.3  \
-		FcConfigParseAndLoad.3  \
-		FcConfigSetCurrent.3  \
-		FcConfigSetRescanInverval.3  \
-		FcConfigSubstitute.3  \
-		FcConfigSubstituteWithPat.3  \
-		FcConfigUptoDate.3  \
-		FcDefaultSubstitute.3  \
-		FcDirCacheValid.3  \
-		FcDirSave.3  \
-		FcDirScan.3  \
-		FcFileScan.3  \
-		FcFini.3  \
-		FcFontList.3  \
-		FcFontMatch.3  \
-		FcFontRenderPrepare.3  \
-		FcFontSetAdd.3  \
-		FcFontSetCreate.3  \
-		FcFontSetDestroy.3  \
-		FcFontSort.3  \
-		FcFreeTypeCharIndex.3  \
-		FcFreeTypeCharSet.3  \
-		FcFreeTypeQuery.3  \
-		FcGetVersion.3  \
-		FcInit.3  \
-		FcInitBringUptoDate.3  \
-		FcInitLoadConfig.3  \
-		FcInitLoadConfigAndFonts.3  \
-		FcInitReinitialize.3  \
-		FcMatrixCopy.3  \
-		FcMatrixEqual.3  \
-		FcMatrixInit.3  \
-		FcMatrixMultiply.3  \
-		FcMatrixRotate.3  \
-		FcMatrixScale.3  \
-		FcMatrixShear.3  \
-		FcNameConstant.3  \
-		FcNameGetConstant.3  \
-		FcNameGetObjectType.3  \
-		FcNameParse.3  \
-		FcNameRegisterConstants.3  \
-		FcNameRegisterObjectTypes.3  \
-		FcNameUnparse.3  \
-		FcNameUnregisterConstants.3  \
-		FcNameUnregisterObjectTypes.3  \
-		FcObjectSetAdd.3  \
-		FcObjectSetBuild.3  \
-		FcObjectSetCreate.3  \
-		FcObjectSetDestroy.3  \
-		FcPatternAdd-Type.3  \
-		FcPatternAdd.3  \
-		FcPatternAddWeak.3  \
-		FcPatternBuild.3  \
-		FcPatternCreate.3  \
-		FcPatternDel.3  \
-		FcPatternDestroy.3  \
-		FcPatternEqual.3  \
-		FcPatternEqualSubset.3  \
-		FcPatternGet-Type.3  \
-		FcPatternGet.3  \
-		FcPatternHash.3  \
-		FcPatternPrint.3  \
-		FcPatternRemove.3  \
-		FcStrBasename.3  \
-		FcStrCmpIgnoreCase.3  \
-		FcStrCopy.3  \
-		FcStrCopyFilename.3  \
-		FcStrDirname.3  \
-		FcStrDowncase.3  \
-		FcStrListCreate.3  \
-		FcStrListDone.3  \
-		FcStrListNext.3  \
-		FcStrSetAdd.3  \
-		FcStrSetAddFilename.3  \
-		FcStrSetCreate.3  \
-		FcStrSetDel.3  \
-		FcStrSetDestroy.3  \
-		FcStrSetMember.3  \
-		FcStrStr.3  \
-		FcStrStrIgnoreCase.3  \
-		FcUcs4ToUtf8.3  \
-		FcUtf16Len.3  \
-		FcUtf16ToUcs4.3  \
-		FcUtf8Len.3  \
-		FcUtf8ToUcs4.3  \
-		FcValueDestroy.3  \
-		FcValueSave.3
 MAN5=		fonts-conf.5
+PORTDOCS=	fontconfig-user.html fontconfig-user.pdf fontconfig-user.txt
 
 .include <bsd.port.pre.mk>
 
@@ -175,13 +53,12 @@ PATCHFILES+=	cjk-fontconfig-2.3.2-20051217.patch.gz
 PATCH_DIST_STRIP+=	-p1
 .endif
 
-.if defined(NOPORTDOCS)
-post-patch:
-	@${REINPLACE_CMD} -Ee 's,(install-data-am: )install-data-local,\1,g' \
-		${WRKSRC}/doc/Makefile.in
-.endif
-
 post-install:
+.if !defined(NOPORTDOCS)
+	${MKDIR} ${DOCSDIR}
+	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/doc/|} ${DOCSDIR}
+.endif
+	${INSTALL_MAN} ${MAN5:S|^|${WRKSRC}/doc/|} ${PREFIX}/man/man5
 	if [ ! -f ${PREFIX}/etc/fonts/fonts.conf ]; then \
 		${INSTALL_DATA} ${WRKSRC}/fonts.conf ${PREFIX}/etc/fonts/fonts.conf; \
 		${INSTALL_DATA} ${WRKSRC}/fonts.conf ${PREFIX}/etc/fonts/fonts.conf.default; \
@@ -197,3 +74,5 @@ post-install:
 .endif
 
 .include <bsd.port.post.mk>
+
+.endif
diff --git a/x11-fonts/fontconfig/pkg-plist b/x11-fonts/fontconfig/pkg-plist
index 9da7d644e027..18587b6cd57d 100644
--- a/x11-fonts/fontconfig/pkg-plist
+++ b/x11-fonts/fontconfig/pkg-plist
@@ -19,145 +19,6 @@ lib/libfontconfig.la
 lib/libfontconfig.so
 lib/libfontconfig.so.1
 libdata/pkgconfig/fontconfig.pc
-%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel.pdf
-%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel.txt
-%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/index.html
-%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r1011.html
-%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r1042.html
-%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r1064.html
-%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r1090.html
-%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r1112.html
-%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r1135.html
-%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r1159.html
-%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r1182.html
-%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r120.html
-%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r1207.html
-%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r1232.html
-%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r1257.html
-%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r1282.html
-%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r1307.html
-%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r1329.html
-%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r1354.html
-%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r1379.html
-%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r1404.html
-%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r141.html
-%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r1431.html
-%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r1462.html
-%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r1485.html
-%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r1508.html
-%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r1534.html
-%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r1563.html
-%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r1593.html
-%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r162.html
-%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r1623.html
-%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r1656.html
-%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r1677.html
-%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r1698.html
-%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r1720.html
-%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r1741.html
-%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r1763.html
-%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r1784.html
-%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r1806.html
-%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r1828.html
-%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r183.html
-%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r1850.html
-%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r1871.html
-%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r1895.html
-%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r1916.html
-%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r1938.html
-%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r1961.html
-%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r1984.html
-%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r2007.html
-%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r2028.html
-%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r204.html
-%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r2057.html
-%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r2082.html
-%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r2110.html
-%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r2147.html
-%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r2178.html
-%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r2205.html
-%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r2229.html
-%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r225.html
-%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r2255.html
-%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r2279.html
-%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r2303.html
-%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r2328.html
-%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r2352.html
-%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r2376.html
-%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r2398.html
-%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r2426.html
-%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r2447.html
-%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r2468.html
-%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r249.html
-%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r2491.html
-%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r2517.html
-%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r2539.html
-%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r2561.html
-%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r2583.html
-%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r2605.html
-%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r2627.html
-%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r2648.html
-%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r2669.html
-%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r2694.html
-%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r270.html
-%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r2730.html
-%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r2765.html
-%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r2793.html
-%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r2818.html
-%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r2839.html
-%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r2864.html
-%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r2889.html
-%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r291.html
-%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r2914.html
-%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r2940.html
-%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r2962.html
-%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r2984.html
-%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r3006.html
-%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r3031.html
-%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r3060.html
-%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r3085.html
-%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r3117.html
-%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r3150.html
-%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r316.html
-%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r3186.html
-%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r3209.html
-%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r3231.html
-%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r3254.html
-%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r3279.html
-%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r3306.html
-%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r3333.html
-%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r3355.html
-%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r344.html
-%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r365.html
-%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r393.html
-%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r422.html
-%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r497.html
-%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r527.html
-%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r614.html
-%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r655.html
-%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r678.html
-%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r703.html
-%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r724.html
-%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r752.html
-%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r774.html
-%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r798.html
-%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r819.html
-%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r840.html
-%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r866.html
-%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r887.html
-%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r910.html
-%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r931.html
-%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r965.html
-%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r988.html
-%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/r99.html
-%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/x19.html
-%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/x31.html
-%%PORTDOCS%%%%DOCSDIR%%/fontconfig-devel/x93.html
-%%PORTDOCS%%%%DOCSDIR%%/fontconfig-user.html
-%%PORTDOCS%%%%DOCSDIR%%/fontconfig-user.pdf
-%%PORTDOCS%%%%DOCSDIR%%/fontconfig-user.txt
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/fontconfig-devel
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
 @dirrm include/fontconfig
 @dirrmtry etc/fonts/conf.d
 @dirrmtry etc/fonts