Index: branches/2016Q3/x11-fonts/linuxlibertine/files/pkg-deinstall.in =================================================================== --- branches/2016Q3/x11-fonts/linuxlibertine/files/pkg-deinstall.in (revision 419403) +++ branches/2016Q3/x11-fonts/linuxlibertine/files/pkg-deinstall.in (nonexistent) @@ -1,6 +0,0 @@ -#!/bin/sh - -if [ $2 = "DEINSTALL" ]; then - /bin/echo "===> Running fc-cache" - %%LOCALBASE%%/bin/fc-cache -f -v %%FONTSDIR%% -fi Property changes on: branches/2016Q3/x11-fonts/linuxlibertine/files/pkg-deinstall.in ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: branches/2016Q3/x11-fonts/linuxlibertine/Makefile =================================================================== --- branches/2016Q3/x11-fonts/linuxlibertine/Makefile (revision 419403) +++ branches/2016Q3/x11-fonts/linuxlibertine/Makefile (revision 419404) @@ -1,49 +1,48 @@ # Created by: Björn König # $FreeBSD$ PORTNAME= linuxlibertine PORTVERSION= 4.7.5 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= x11-fonts MASTER_SITES= SF DISTNAME= LinLibertineFont-${PORTVERSION}-2 EXTRACT_SUFX= .tgz MAINTAINER= office@FreeBSD.org COMMENT= Linux Libertine Open Fonts LICENSE= GPLv2 LINUXLIBERTINE OFL10 LICENSE_COMB= multi USES= fonts OPTIONS_DEFINE= DOCS LICENSE_NAME_LINUXLIBERTINE= LinuxLibertine License LICENSE_FILE_LINUXLIBERTINE= ${WRKSRC}/LICENCE.txt LICENSE_PERMS_LINUXLIBERTINE= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept LICENSE_NAME_OFL= Open Fonts License LICENSE_FILE_OFL= ${WRKSRC}/OFL.txt LICENSE_PERMS_OFL= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept -SUB_FILES= pkg-deinstall WRKSRC= ${WRKDIR}/LinLibertine NO_BUILD= yes PORTDOCS= Bugs.txt \ ChangeLog.txt \ Readme.txt \ Readme-TEX.txt do-install: @${MKDIR} ${STAGEDIR}${FONTSDIR} .for ext in ttf otf ${INSTALL_DATA} ${WRKSRC}/Fonts/*.${ext} ${STAGEDIR}${FONTSDIR} .endfor @${MKDIR} ${STAGEDIR}${DOCSDIR} .for i in ${PORTDOCS} ${INSTALL_DATA} ${WRKSRC}/$i ${STAGEDIR}${DOCSDIR} .endfor .include Index: branches/2016Q3/x11-fonts/wqy/pkg-deinstall =================================================================== --- branches/2016Q3/x11-fonts/wqy/pkg-deinstall (revision 419403) +++ branches/2016Q3/x11-fonts/wqy/pkg-deinstall (nonexistent) @@ -1,3 +0,0 @@ -#!/bin/sh - -fc-cache -fv Property changes on: branches/2016Q3/x11-fonts/wqy/pkg-deinstall ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: branches/2016Q3/x11-fonts/wqy/Makefile =================================================================== --- branches/2016Q3/x11-fonts/wqy/Makefile (revision 419403) +++ branches/2016Q3/x11-fonts/wqy/Makefile (revision 419404) @@ -1,101 +1,101 @@ # Created by: Dryice Liu # $FreeBSD$ PORTNAME= wqy-fonts PORTVERSION= 20100803 -PORTREVISION= 5 +PORTREVISION= 6 PORTEPOCH= 1 CATEGORIES= x11-fonts MASTER_SITES= SF/wqy/wqy-bitmapfont/1.0.0-RC1:bitmapfont \ SF/wqy/wqy-unibit/1.1.0:unibit \ SF/wqy/wqy-zenhei/0.9.45%20%28Fighting-state%20RC1%29:zenhei \ SF/wqy/wqy-microhei-lite/0.2.0-beta:microheilite \ SF/wqy/wqy-microhei/0.2.0-beta:microhei DISTFILES= wqy-bitmapsong-pcf-1.0.0-RC1.tar.gz:bitmapfont \ wqy-unibit-bdf-1.1.0-1.tar.gz:unibit \ wqy-zenhei-0.9.45.tar.gz:zenhei \ wqy-microhei-lite-0.2.0-beta.tar.gz:microheilite \ wqy-microhei-0.2.0-beta.tar.gz:microhei MAINTAINER= ports@FreeBSD.org COMMENT= GNU GPL-licensed font set covering CJK and other Unicode characters BUILD_DEPENDS= bdftopcf:x11-fonts/bdftopcf USE_XORG= x11 USES= fonts perl5 USE_PERL5= build NO_WRKSUBDIR= yes FONTNAME= wqy CONFDDIR= etc/fonts/conf.d CONFAVAILDIR= etc/fonts/conf.avail PLIST_SUB= CONFDDIR=${CONFDDIR} \ CONFAVAILDIR=${CONFAVAILDIR} SUB_FILES= pkg-message OPTIONS_DEFINE= DOCS PORTDOCS= AUTHORS.bitmap ChangeLog.bitmap README.bitmap COPYING.bitmap \ LOGO.png \ AUTHORS.zenhei ChangeLog.zenhei README.zenhei \ AUTHORS.microheilite README.microheilite ChangeLog.microheilite \ AUTHORS.microhei README.microhei ChangeLog.microhei \ LICENSE_Apache2.txt LICENSE_GPLv3.txt do-build: ${PERL} ${WRKSRC}/wqy-unibit/bdfmerge.pl 0x0--0xFFFF ${WRKSRC}/wqy-unibit/wqy-unibit.bdf > ${WRKSRC}/wqy-unibit/wqy-unibit_cjk.bdf bdftopcf ${WRKSRC}/wqy-unibit/wqy-unibit_cjk.bdf > ${WRKSRC}/wqy-unibit/wqy-unibit.pcf ${CP} ${WRKSRC}/wqy-bitmapsong/AUTHORS ${WRKSRC}/wqy-bitmapsong/AUTHORS.bitmap ${CP} ${WRKSRC}/wqy-bitmapsong/ChangeLog ${WRKSRC}/wqy-bitmapsong/ChangeLog.bitmap ${CP} ${WRKSRC}/wqy-bitmapsong/README ${WRKSRC}/wqy-bitmapsong/README.bitmap ${CP} ${WRKSRC}/wqy-bitmapsong/COPYING ${WRKSRC}/wqy-bitmapsong/COPYING.bitmap ${CP} ${WRKSRC}/wqy-zenhei/AUTHORS ${WRKSRC}/wqy-zenhei/AUTHORS.zenhei ${CP} ${WRKSRC}/wqy-zenhei/ChangeLog ${WRKSRC}/wqy-zenhei/ChangeLog.zenhei ${CP} ${WRKSRC}/wqy-zenhei/README ${WRKSRC}/wqy-zenhei/README.zenhei ${CP} ${WRKSRC}/wqy-microhei-lite/AUTHORS.txt ${WRKSRC}/wqy-microhei-lite/AUTHORS.microheilite ${CP} ${WRKSRC}/wqy-microhei-lite/ChangeLog.txt ${WRKSRC}/wqy-microhei-lite/ChangeLog.microheilite ${CP} ${WRKSRC}/wqy-microhei-lite/README.txt ${WRKSRC}/wqy-microhei-lite/README.microheilite ${CP} ${WRKSRC}/wqy-microhei/AUTHORS.txt ${WRKSRC}/wqy-microhei/AUTHORS.microhei ${CP} ${WRKSRC}/wqy-microhei/ChangeLog.txt ${WRKSRC}/wqy-microhei/ChangeLog.microhei ${CP} ${WRKSRC}/wqy-microhei/README.txt ${WRKSRC}/wqy-microhei/README.microhei do-install: ${MKDIR} ${STAGEDIR}${FONTSDIR} ${STAGEDIR}${PREFIX}/${CONFDDIR} ${STAGEDIR}${PREFIX}/${CONFAVAILDIR} # WQY Bitmap Song ${INSTALL_DATA} ${WRKSRC}/wqy-bitmapsong/*.pcf ${STAGEDIR}${FONTSDIR} # WQY Bitmap Song ${INSTALL_DATA} ${WRKSRC}/wqy-unibit/wqy-unibit.pcf ${STAGEDIR}${FONTSDIR} # WQY TrueType Zenhei ${INSTALL_DATA} ${WRKSRC}/wqy-zenhei/wqy-zenhei.ttc ${STAGEDIR}${FONTSDIR} # WQY TrueType MicroHei Lite ${INSTALL_DATA} ${WRKSRC}/wqy-microhei-lite/wqy-microhei-lite.ttc ${STAGEDIR}${FONTSDIR} # WQY TrueType MicroHei ${INSTALL_DATA} ${WRKSRC}/wqy-microhei/wqy-microhei.ttc ${STAGEDIR}${FONTSDIR} ${INSTALL_DATA} ${FILESDIR}/85-wqy.conf ${STAGEDIR}${PREFIX}/${CONFAVAILDIR} ${LN} -sf ${PREFIX}/${CONFAVAILDIR}/85-wqy.conf ${STAGEDIR}${PREFIX}/${CONFDDIR}/85-wqy.conf ${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} \ ${WRKSRC}/wqy-bitmapsong/AUTHORS.bitmap \ ${WRKSRC}/wqy-bitmapsong/ChangeLog.bitmap \ ${WRKSRC}/wqy-bitmapsong/README.bitmap \ ${WRKSRC}/wqy-bitmapsong/COPYING.bitmap \ ${WRKSRC}/wqy-bitmapsong/LOGO.png \ ${WRKSRC}/wqy-zenhei/AUTHORS.zenhei \ ${WRKSRC}/wqy-zenhei/ChangeLog.zenhei \ ${WRKSRC}/wqy-zenhei/README.zenhei \ ${WRKSRC}/wqy-microhei-lite/AUTHORS.microheilite \ ${WRKSRC}/wqy-microhei-lite/ChangeLog.microheilite \ ${WRKSRC}/wqy-microhei-lite/README.microheilite \ ${WRKSRC}/wqy-microhei/AUTHORS.microhei \ ${WRKSRC}/wqy-microhei/ChangeLog.microhei \ ${WRKSRC}/wqy-microhei/README.microhei \ ${WRKSRC}/wqy-microhei/LICENSE_Apache2.txt \ ${WRKSRC}/wqy-microhei/LICENSE_GPLv3.txt \ ${STAGEDIR}${DOCSDIR} .include Index: branches/2016Q3 =================================================================== --- branches/2016Q3 (revision 419403) +++ branches/2016Q3 (revision 419404) Property changes on: branches/2016Q3 ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head:r419067,419403