diff options
| author | Felippe de Meirelles Motta <lippe@FreeBSD.org> | 2008-04-03 02:14:31 +0000 |
|---|---|---|
| committer | Felippe de Meirelles Motta <lippe@FreeBSD.org> | 2008-04-03 02:14:31 +0000 |
| commit | 09cec24050fbc389d107cbe8ba116cc197bc0040 (patch) | |
| tree | 1a4c0d189d0c40cba2b29ea50bf2da42165b5ab1 /x11-fonts | |
| parent | 42d6377aa40f053111f0e4bf42847bbdecea97d2 (diff) | |
| download | ports-09cec24050fbc389d107cbe8ba116cc197bc0040.tar.gz ports-09cec24050fbc389d107cbe8ba116cc197bc0040.zip | |
- Makefile cosmetic changes.
- Move pkg-message to FILESDIR.
- Bump PORTREVISION.
PR: ports/121753
Submitted by: myself
Approved by: araujo (mentor), Konstantinos Konstantinidis <kkonstan@duth.gr> (maintainer)
Notes
Notes:
svn path=/head/; revision=210413
Diffstat (limited to 'x11-fonts')
| -rw-r--r-- | x11-fonts/webfonts/Makefile | 27 | ||||
| -rw-r--r-- | x11-fonts/webfonts/files/pkg-message.in (renamed from x11-fonts/webfonts/pkg-message) | 0 |
2 files changed, 13 insertions, 14 deletions
diff --git a/x11-fonts/webfonts/Makefile b/x11-fonts/webfonts/Makefile index d126e052647a..e282f302f87b 100644 --- a/x11-fonts/webfonts/Makefile +++ b/x11-fonts/webfonts/Makefile @@ -7,7 +7,7 @@ PORTNAME= webfonts PORTVERSION= 0.30 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= x11-fonts MASTER_SITES= ${MASTER_SITE_NETBSD:S/%SUBDIR%/ms-ttf/}:group1 \ ${MASTER_SITE_SOURCEFORGE:S/%SUBDIR%/corefonts/}:group1 \ @@ -22,11 +22,6 @@ DISTFILES= andale32.exe:group1 arial32.exe:group1 arialb32.exe:group1 \ comic32.exe:group1 courie32.exe:group1 georgi32.exe:group1 \ impact32.exe:group1 times32.exe:group1 trebuc32.exe:group1 \ verdan32.exe:group1 webdin32.exe:group1 - -.if defined(WITH_MSWINDOWS_LICENSE) -DISTFILES+= ielpkth.cab:group2 -.endif - DIST_SUBDIR= ${PORTNAME} MAINTAINER= kkonstan@duth.gr @@ -37,7 +32,7 @@ BUILD_DEPENDS= fc-cache:${PORTSDIR}/x11-fonts/fontconfig RUN_DEPENDS= fc-cache:${PORTSDIR}/x11-fonts/fontconfig NO_BUILD= yes -RESTRICTED= "Restrictive license - cannot sell for profit or distribute in modified form" +RESTRICTED= Restrictive license - cannot sell for profit or distribute in modified form EXTRACT_CMD= ${LOCALBASE}/bin/cabextract EXTRACT_BEFORE_ARGS= -qLF '*.ttf' -d ${WRKSRC} @@ -54,13 +49,17 @@ PLIST_SUB= FONTNAME="${FONTNAME}" \ FONTSDIR="${FONTSDIR:S|${PREFIX}/||}" \ TTFONTSDIR="${TTFONTSDIR:S|${X11BASE}/||}" -MSG_FILE= ${PKGDIR}/pkg-message -PKGMESSAGE= ${WRKDIR}/pkg-message +SUB_LIST= FONTSDIR="${FONTSDIR}" DOCSDIR="${DOCSDIR}" +SUB_FILES= pkg-message FONTS_FILE= ${WRKDIR}/fonts.dir .include <bsd.port.pre.mk> +.if defined(WITH_MSWINDOWS_LICENSE) +DISTFILES+= ielpkth.cab:group2 +.endif + .SILENT: # @@ -73,9 +72,6 @@ post-extract: # Post-patch # post-patch: - ${SED} -e 's|%%FONTSDIR%%|${FONTSDIR}|g' \ - -e 's|%%DOCSDIR%%|${DOCSDIR}|g' \ - ${MSG_FILE} > ${PKGMESSAGE} .if defined(WITH_MSWINDOWS_LICENSE) ${SORT} ${FILESDIR}/fonts.dir ${FILESDIR}/tahoma.dir > ${FONTS_FILE} .else @@ -98,11 +94,14 @@ PLIST_SUB+= EXTRAFONTS="@comment " # Install # do-install: - ${MKDIR} ${FONTSDIR} ${DOCSDIR} +.if !defined(NOPORTDOCS) + @${MKDIR} ${DOCSDIR} + @${INSTALL_DATA} ${WRKSRC}/licen.txt ${DOCSDIR}/LICENSE +.endif + ${MKDIR} ${FONTSDIR} ${INSTALL_DATA} ${WRKSRC}/*.ttf ${FONTSDIR} ${INSTALL_DATA} ${FONTS_FILE} ${FONTSDIR} ${INSTALL_DATA} ${FONTS_FILE} ${FONTSDIR}/fonts.scale - ${INSTALL_DATA} ${WRKSRC}/licen.txt ${DOCSDIR}/LICENSE # # Post-install diff --git a/x11-fonts/webfonts/pkg-message b/x11-fonts/webfonts/files/pkg-message.in index b6b58147a0a1..b6b58147a0a1 100644 --- a/x11-fonts/webfonts/pkg-message +++ b/x11-fonts/webfonts/files/pkg-message.in |