4 files changed, 58 insertions, 39 deletions

diff --git a/x11-fonts/linuxlibertine/Makefile b/x11-fonts/linuxlibertine/Makefile
index 97e996b30b58..f955400ed546 100644
--- a/x11-fonts/linuxlibertine/Makefile
+++ b/x11-fonts/linuxlibertine/Makefile
@@ -5,37 +5,51 @@
 #
 
 PORTNAME=	linuxlibertine
-PORTVERSION=	4.4.1
-PORTREVISION=	1
+PORTVERSION=	4.7.5
 CATEGORIES=	x11-fonts
 MASTER_SITES=	SF
-DISTNAME=	LinLibertineFont-${PORTVERSION}
+DISTNAME=	LinLibertineFont-${PORTVERSION}-2
 EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	bkoenig@alpha-tierchen.de
 COMMENT=	Linux Libertine Open Fonts
 
+LICENSE=	GPLv2 LINUXLIBERTINE OFL
+LICENSE_COMB=	multi
+
 BUILD_DEPENDS=	fc-cache:${PORTSDIR}/x11-fonts/fontconfig
 RUN_DEPENDS=	fc-cache:${PORTSDIR}/x11-fonts/fontconfig
 
-WRKSRC=		${WRKDIR}/${DISTNAME:C/-.*//}
+LICENSE_NAME_LINUXLIBERTINE=	LinuxLibertine License
+LICENSE_FILE_LINUXLIBERTINE=	${WRKSRC}/LICENCE.txt
+LICENSE_PERMS_LINUXLIBERTINE=	auto-accept
+
+LICENSE_NAME_OFL=	Open Fonts License
+LICENSE_FILE_OFL=	${WRKSRC}/OFL.txt
+LICENSE_PERMS_OFL=	auto-accept
+
+SUB_FILES=	pkg-deinstall
+SUB_LIST=	FONTSDIR=${FONTSDIR}
+WRKSRC=		${WRKDIR}/LinLibertine
 FONTSDIR?=	${PREFIX}/lib/X11/fonts/${PORTNAME}
 PLIST_SUB=	FONTSDIR="${FONTSDIR:S|${PREFIX}/||}"
 NO_BUILD=	yes
 
+PORTDOCS=	Bugs.txt \
+		ChangeLog.txt \
+		Readme.txt \
+		Readme-TEX.txt
+
 do-install:
 	${MKDIR} ${FONTSDIR}
-	${INSTALL_DATA} ${WRKSRC}/*.ttf ${FONTSDIR}
-	${INSTALL_DATA} ${WRKSRC}/*.otf ${FONTSDIR}
+.for ext in ttf otf
+	${INSTALL_DATA} ${WRKSRC}/Fonts/*.${ext} ${FONTSDIR}
+.endfor
 .if !defined(NOPORTDOCS)
 	${MKDIR} ${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/Bugs ${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/ChangeLog.txt ${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/GPL.txt ${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/LICENCE.txt ${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/OFL.txt ${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/Readme ${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/Readme-TEX.txt ${DOCSDIR}
+.for i in ${PORTDOCS}
+	${INSTALL_DATA} ${WRKSRC}/$i ${DOCSDIR}
+.endfor
 .endif
 
 post-install:
diff --git a/x11-fonts/linuxlibertine/distinfo b/x11-fonts/linuxlibertine/distinfo
index cc72ea201d91..cdb0850f147b 100644
--- a/x11-fonts/linuxlibertine/distinfo
+++ b/x11-fonts/linuxlibertine/distinfo
@@ -1,2 +1,2 @@
-SHA256 (LinLibertineFont-4.4.1.tgz) = c2b2fd57ae659fa672741eb3c28535e1153ac15a411f4b93ac7879947176873f
-SIZE (LinLibertineFont-4.4.1.tgz) = 7083504
+SHA256 (LinLibertineFont-4.7.5-2.tgz) = f11ff509b89b060953c8921bcaeab14256999083c2e01c7a23bc1cf1709d1dfa
+SIZE (LinLibertineFont-4.7.5-2.tgz) = 6119255
diff --git a/x11-fonts/linuxlibertine/files/pkg-deinstall.in b/x11-fonts/linuxlibertine/files/pkg-deinstall.in
new file mode 100644
index 000000000000..e0081ba45052
--- /dev/null
+++ b/x11-fonts/linuxlibertine/files/pkg-deinstall.in
@@ -0,0 +1,6 @@
+#!/bin/sh
+
+if [ $2 = "DEINSTALL" ]; then
+  /bin/echo "===> Running fc-cache"
+  %%LOCALBASE%%/bin/fc-cache -f -v %%FONTSDIR%%
+fi
diff --git a/x11-fonts/linuxlibertine/pkg-plist b/x11-fonts/linuxlibertine/pkg-plist
index eb0fdce86173..53c136898277 100644
--- a/x11-fonts/linuxlibertine/pkg-plist
+++ b/x11-fonts/linuxlibertine/pkg-plist
@@ -1,25 +1,24 @@
-%%FONTSDIR%%/Biolinum_Bd-0.4.1.otf
-%%FONTSDIR%%/Biolinum_Bd-0.4.1.ttf
-%%FONTSDIR%%/Biolinum_Re-0.4.1.otf
-%%FONTSDIR%%/Biolinum_Re-0.4.1.ttf
-%%FONTSDIR%%/LinLibertine_Bd-4.1.0.otf
-%%FONTSDIR%%/LinLibertine_BI-4.0.5.ttf
-%%FONTSDIR%%/LinLibertine_Bd-4.1.0.ttf
-%%FONTSDIR%%/LinLibertineC_Re-4.0.3.otf
-%%FONTSDIR%%/LinLibertine_It-4.0.6.ttf
-%%FONTSDIR%%/LinLibertine_Re-4.4.1.ttf
-%%FONTSDIR%%/LinLibertine_It-4.0.6.otf
-%%FONTSDIR%%/LinLibertine_BI-4.0.5.otf
-%%FONTSDIR%%/LinLibertineC_Re-4.0.3.ttf
-%%FONTSDIR%%/LinLibertine_Re-4.4.1.otf
-%%PORTDOCS%%%%DOCSDIR%%/Bugs
-%%PORTDOCS%%%%DOCSDIR%%/ChangeLog.txt
-%%PORTDOCS%%%%DOCSDIR%%/GPL.txt
-%%PORTDOCS%%%%DOCSDIR%%/LICENCE.txt
-%%PORTDOCS%%%%DOCSDIR%%/OFL.txt
-%%PORTDOCS%%%%DOCSDIR%%/Readme
-%%PORTDOCS%%%%DOCSDIR%%/Readme-TEX.txt
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
+%%FONTSDIR%%/LinBiolinum_Bd-0.5.5.otf
+%%FONTSDIR%%/LinBiolinum_Bd-0.5.5.ttf
+%%FONTSDIR%%/LinBiolinum_It-0.5.1.otf
+%%FONTSDIR%%/LinBiolinum_It-0.5.1.ttf
+%%FONTSDIR%%/LinBiolinum_Kb-0.5.4.otf
+%%FONTSDIR%%/LinBiolinum_Kb-0.5.4.ttf
+%%FONTSDIR%%/LinBiolinum_Re-0.6.4.otf
+%%FONTSDIR%%/LinBiolinum_Re-0.6.4.ttf
+%%FONTSDIR%%/LinLibertine_BI-4.1.0.otf
+%%FONTSDIR%%/LinLibertine_BI-4.1.0.ttf
+%%FONTSDIR%%/LinLibertine_Bd-4.1.5.otf
+%%FONTSDIR%%/LinLibertine_Bd-4.1.5.ttf
+%%FONTSDIR%%/LinLibertine_C-4.0.4.otf
+%%FONTSDIR%%/LinLibertine_C-4.0.4.ttf
+%%FONTSDIR%%/LinLibertine_It-4.2.6.otf
+%%FONTSDIR%%/LinLibertine_It-4.2.6.ttf
+%%FONTSDIR%%/LinLibertine_Re-4.7.5.otf
+%%FONTSDIR%%/LinLibertine_Re-4.7.5.ttf
+%%FONTSDIR%%/LinBiolinum_Sl-0.4.9.otf
+%%FONTSDIR%%/LinBiolinum_Sl-0.4.9.ttf
+%%PORTDOCS%%@dirrmtry %%DOCSDIR%%
 @unexec /bin/rm %D/%%FONTSDIR%%/fonts.cache-1 2>/dev/null || /usr/bin/true
-@dirrm %%FONTSDIR%%
-@exec %%X11BASE%%/bin/fc-cache -f -v %%FONTSDIR%% || /usr/bin/true
+@dirrmtry %%FONTSDIR%%
+@exec %%LOCALBASE%%/bin/fc-cache -f -v %%FONTSDIR%% || /usr/bin/true