Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 8 Dec 2013 22:38:52 +0000 (UTC)
From:      Matthew Seaman <matthew@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r335945 - in head: databases/mytop databases/phpmyadmin devel/p5-Date-Extract devel/p5-Role-Basic devel/p5-Set-Tiny devel/p5-Symbol-Global-Name mail/p5-Email-Address-List mail/p5-Test-E...
Message-ID:  <201312082238.rB8Mcqb4082782@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: matthew
Date: Sun Dec  8 22:38:52 2013
New Revision: 335945
URL: http://svnweb.freebsd.org/changeset/ports/335945

Log:
  Mark all my architecture independent ports using shell/perl/PHP as
  NO_ARCH=yes
  
  While here, fix a few other niggles:
  
  net/phpldapadmin -- remove indefinite article from COMMENT
  
  www/p5-RT* -- fix comments referencing the different versions of RT
  
  x11-fonts/gentium-{basic,plus} -- mention ${STAGEDIR} explicitly in the
    install targets; rework the handling of ${FONTPATH}

Modified:
  head/databases/mytop/Makefile
  head/databases/phpmyadmin/Makefile
  head/devel/p5-Date-Extract/Makefile
  head/devel/p5-Role-Basic/Makefile
  head/devel/p5-Set-Tiny/Makefile
  head/devel/p5-Symbol-Global-Name/Makefile
  head/mail/p5-Email-Address-List/Makefile
  head/mail/p5-Test-Email/Makefile
  head/mail/sa-utils/Makefile
  head/misc/p5-Business-Hours/Makefile
  head/net/phpldapadmin/Makefile
  head/ports-mgmt/p5-FreeBSD-Portindex/Makefile
  head/ports-mgmt/wanted-ports/Makefile
  head/www/p5-Plack-Middleware-Test-StashWarnings/Makefile
  head/www/p5-RT-Authen-ExternalAuth/Makefile
  head/www/p5-RT-Extension-LDAPImport/Makefile
  head/www/p5-RT-Extension-MandatoryOnTransition/Makefile
  head/www/p5-RT-Extension-SLA/Makefile
  head/www/p5-RTx-Calendar/Makefile
  head/www/rt40/Makefile
  head/www/rt42/Makefile
  head/x11-fonts/gentium-basic/Makefile
  head/x11-fonts/gentium-plus/Makefile
Directory Properties:
  head/devel/p5-Date-Extract/distinfo   (props changed)
  head/devel/p5-Date-Extract/pkg-descr   (props changed)
  head/devel/p5-Date-Extract/pkg-plist   (props changed)
  head/devel/p5-Set-Tiny/distinfo   (props changed)
  head/devel/p5-Set-Tiny/pkg-descr   (props changed)
  head/devel/p5-Set-Tiny/pkg-plist   (props changed)
  head/devel/p5-Symbol-Global-Name/distinfo   (props changed)
  head/devel/p5-Symbol-Global-Name/pkg-descr   (props changed)
  head/devel/p5-Symbol-Global-Name/pkg-plist   (props changed)
  head/mail/p5-Email-Address-List/distinfo   (props changed)
  head/mail/p5-Email-Address-List/pkg-descr   (props changed)
  head/mail/p5-Email-Address-List/pkg-plist   (props changed)
  head/mail/p5-Test-Email/distinfo   (props changed)
  head/mail/p5-Test-Email/pkg-descr   (props changed)
  head/mail/p5-Test-Email/pkg-plist   (props changed)

Modified: head/databases/mytop/Makefile
==============================================================================
--- head/databases/mytop/Makefile	Sun Dec  8 22:32:06 2013	(r335944)
+++ head/databases/mytop/Makefile	Sun Dec  8 22:38:52 2013	(r335945)
@@ -14,6 +14,7 @@ RUN_DEPENDS=	p5-DBD-mysql>1.0:${PORTSDIR
 		p5-DBI>=1.13:${PORTSDIR}/databases/p5-DBI \
 		p5-Term-ReadKey>=2.10:${PORTSDIR}/devel/p5-Term-ReadKey
 
+NO_ARCH=	yes
 CONFLICTS=	mariadb-scripts-[0-9]*
 
 USES+=		perl5

Modified: head/databases/phpmyadmin/Makefile
==============================================================================
--- head/databases/phpmyadmin/Makefile	Sun Dec  8 22:32:06 2013	(r335944)
+++ head/databases/phpmyadmin/Makefile	Sun Dec  8 22:38:52 2013	(r335945)
@@ -10,6 +10,7 @@ DISTNAME=	${PORTNAME}-${DISTVERSION}-all
 MAINTAINER=	matthew@FreeBSD.org
 COMMENT=	A set of PHP-scripts to manage MySQL over the web
 
+NO_ARCH=	yes
 LICENSE=	GPLv2
 
 USE_XZ=		yes

Modified: head/devel/p5-Date-Extract/Makefile
==============================================================================
--- head/devel/p5-Date-Extract/Makefile	Sun Dec  8 22:32:06 2013	(r335944)
+++ head/devel/p5-Date-Extract/Makefile	Sun Dec  8 22:38:52 2013	(r335945)
@@ -15,6 +15,8 @@ BUILD_DEPENDS=	p5-DateTime-Format-Natura
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 TEST_DEPENDS=	p5-Test-MockTime>=0:${PORTSDIR}/devel/p5-Test-MockTime
 
+NO_ARCH=	yes
+
 USES=		perl5
 USE_PERL5=	configure
 

Modified: head/devel/p5-Role-Basic/Makefile
==============================================================================
--- head/devel/p5-Role-Basic/Makefile	Sun Dec  8 22:32:06 2013	(r335944)
+++ head/devel/p5-Role-Basic/Makefile	Sun Dec  8 22:38:52 2013	(r335945)
@@ -11,6 +11,7 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	matthew@FreeBSD.org
 COMMENT=	Just roles. Nothing else
 
+NO_ARCH=	yes
 PORTSCOUT=	limit:^0\.[1-9]
 
 USES=		perl5

Modified: head/devel/p5-Set-Tiny/Makefile
==============================================================================
--- head/devel/p5-Set-Tiny/Makefile	Sun Dec  8 22:32:06 2013	(r335944)
+++ head/devel/p5-Set-Tiny/Makefile	Sun Dec  8 22:38:52 2013	(r335945)
@@ -10,6 +10,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	matthew@FreeBSD.org
 COMMENT=	Simple sets of strings
 
+NO_ARCH=	yes
+
 USES=		perl5
 USE_PERL5=	configure
 

Modified: head/devel/p5-Symbol-Global-Name/Makefile
==============================================================================
--- head/devel/p5-Symbol-Global-Name/Makefile	Sun Dec  8 22:32:06 2013	(r335944)
+++ head/devel/p5-Symbol-Global-Name/Makefile	Sun Dec  8 22:38:52 2013	(r335945)
@@ -10,6 +10,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	matthew@FreeBSD.org
 COMMENT=	Finds name and type of a global variable
 
+NO_ARCH=	yes
+
 USES=		perl5
 USE_PERL5=	configure
 

Modified: head/mail/p5-Email-Address-List/Makefile
==============================================================================
--- head/mail/p5-Email-Address-List/Makefile	Sun Dec  8 22:32:06 2013	(r335944)
+++ head/mail/p5-Email-Address-List/Makefile	Sun Dec  8 22:38:52 2013	(r335945)
@@ -13,6 +13,8 @@ COMMENT=	RFC-close address list parsing
 BUILD_DEPENDS=	p5-Email-Address>0:${PORTSDIR}/mail/p5-Email-Address
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
+NO_ARCH=	yes
+
 USES=		perl5
 USE_PERL5=	configure
 

Modified: head/mail/p5-Test-Email/Makefile
==============================================================================
--- head/mail/p5-Test-Email/Makefile	Sun Dec  8 22:32:06 2013	(r335944)
+++ head/mail/p5-Test-Email/Makefile	Sun Dec  8 22:38:52 2013	(r335945)
@@ -17,6 +17,8 @@ BUILD_DEPENDS=	p5-Mail-POP3Client>=2:${P
 		p5-Test-Simple>=0.7:${PORTSDIR}/devel/p5-Test-Simple
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
+NO_ARCH=	yes
+
 USES=		perl5
 USE_PERL5=	configure
 

Modified: head/mail/sa-utils/Makefile
==============================================================================
--- head/mail/sa-utils/Makefile	Sun Dec  8 22:32:06 2013	(r335944)
+++ head/mail/sa-utils/Makefile	Sun Dec  8 22:38:52 2013	(r335945)
@@ -16,6 +16,7 @@ RUN_DEPENDS=	sa-update:${PORTSDIR}/mail/
 OPTIONS_DEFINE=	SACOMPILE
 SACOMPILE_DESC=	Enable sa-compile support
 
+NO_ARCH=	yes
 NO_BUILD=	yes
 SUB_FILES=	sa-utils
 

Modified: head/misc/p5-Business-Hours/Makefile
==============================================================================
--- head/misc/p5-Business-Hours/Makefile	Sun Dec  8 22:32:06 2013	(r335944)
+++ head/misc/p5-Business-Hours/Makefile	Sun Dec  8 22:38:52 2013	(r335945)
@@ -15,6 +15,8 @@ RUN_DEPENDS:=	${BUILD_DEPENDS}
 TEST_DEPENDS=	p5-Test-Pod>-1.0:${PORTSDIR}/devel/p5-Test-Pod \
 		p5-Test-Pod-Coverage>0:${PORTSDIR}/devel/p5-Test-Pod-Coverage
 
+NO_ARCH=	yes
+
 USES+=		perl5
 USE_PERL5=	configure
 

Modified: head/net/phpldapadmin/Makefile
==============================================================================
--- head/net/phpldapadmin/Makefile	Sun Dec  8 22:32:06 2013	(r335944)
+++ head/net/phpldapadmin/Makefile	Sun Dec  8 22:38:52 2013	(r335945)
@@ -9,10 +9,11 @@ MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}
 EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	matthew@FreeBSD.org
-COMMENT=	A set of PHP-scripts to administer LDAP over the web
+COMMENT=	PHP application to administer LDAP over the web
 
 LICENSE=	GPLv2
 
+NO_ARCH=	yes
 NO_BUILD=	yes
 USE_PHP=	gettext ldap openssl pcre session xml iconv hash
 DEFAULT_PHP_VER=	5

Modified: head/ports-mgmt/p5-FreeBSD-Portindex/Makefile
==============================================================================
--- head/ports-mgmt/p5-FreeBSD-Portindex/Makefile	Sun Dec  8 22:32:06 2013	(r335944)
+++ head/ports-mgmt/p5-FreeBSD-Portindex/Makefile	Sun Dec  8 22:38:52 2013	(r335945)
@@ -15,6 +15,8 @@ LICENSE=	BSD
 BUILD_DEPENDS=	p5-BerkeleyDB>0:${PORTSDIR}/databases/p5-BerkeleyDB
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
+NO_ARCH=	yes
+
 # GraphViz not required for portindex to run or generate GraphViz
 # format output: this is only needed to render the output on the same
 # machine.

Modified: head/ports-mgmt/wanted-ports/Makefile
==============================================================================
--- head/ports-mgmt/wanted-ports/Makefile	Sun Dec  8 22:32:06 2013	(r335944)
+++ head/ports-mgmt/wanted-ports/Makefile	Sun Dec  8 22:38:52 2013	(r335945)
@@ -13,6 +13,7 @@ COMMENT=	Just depend on a configurable, 
 
 LICENSE=	BSD
 
+NO_ARCH=	yes
 NO_BUILD=	yes
 SUB_FILES=	${PORTNAME}   \
 		${PORTNAME}.1

Modified: head/www/p5-Plack-Middleware-Test-StashWarnings/Makefile
==============================================================================
--- head/www/p5-Plack-Middleware-Test-StashWarnings/Makefile	Sun Dec  8 22:32:06 2013	(r335944)
+++ head/www/p5-Plack-Middleware-Test-StashWarnings/Makefile	Sun Dec  8 22:38:52 2013	(r335945)
@@ -13,6 +13,8 @@ COMMENT=	Test your application's warning
 BUILD_DEPENDS=	p5-Plack>0:${PORTSDIR}/www/p5-Plack
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
+NO_ARCH=	yes
+
 USES=		perl5
 USE_PERL5=	configure
 

Modified: head/www/p5-RT-Authen-ExternalAuth/Makefile
==============================================================================
--- head/www/p5-RT-Authen-ExternalAuth/Makefile	Sun Dec  8 22:32:06 2013	(r335944)
+++ head/www/p5-RT-Authen-ExternalAuth/Makefile	Sun Dec  8 22:38:52 2013	(r335945)
@@ -18,6 +18,8 @@ BUILD_DEPENDS=	p5-perl-ldap>0:${PORTSDIR
 		p5-Net-SSLeay>0:${PORTSDIR}/security/p5-Net-SSLeay
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
+NO_ARCH=	yes
+
 USES+=		perl5
 USE_PERL5=	configure
 
@@ -47,7 +49,7 @@ MAN3PREFIX=	${PREFIX}
 PLIST_SUB+=	RTHOME=share/rt${RT_VER}
 
 # Note: You can install using an arbitrary $PREFIX but only if it
-# matches the $PREFIX used to install www/rt{38,40}.  Hence ignore
+# matches the $PREFIX used to install www/rt{38,40,42}.  Hence ignore
 # $PREFIX in the environment and inherit settings from RT.pm
 
 do-configure:

Modified: head/www/p5-RT-Extension-LDAPImport/Makefile
==============================================================================
--- head/www/p5-RT-Extension-LDAPImport/Makefile	Sun Dec  8 22:32:06 2013	(r335944)
+++ head/www/p5-RT-Extension-LDAPImport/Makefile	Sun Dec  8 22:38:52 2013	(r335945)
@@ -18,6 +18,8 @@ BUILD_DEPENDS=	p5-perl-ldap>0:${PORTSDIR
 		p5-Class-Accessor>0:${PORTSDIR}/devel/p5-Class-Accessor
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
+NO_ARCH=	yes
+
 USES+=		perl5
 USE_PERL5=	configure
 
@@ -47,7 +49,7 @@ MAN3PREFIX=	${PREFIX}
 PLIST_SUB+=	RTHOME=share/rt${RT_VER}
 
 # Note: You can install using an arbitrary $PREFIX but only if it
-# matches the $PREFIX used to install www/rt{38,40}.  Hence ignore
+# matches the $PREFIX used to install www/rt{38,40,42}.  Hence ignore
 # $PREFIX in the environment and inherit settings from RT.pm
 do-configure:
 	@cd ${CONFIGURE_WRKSRC} && \

Modified: head/www/p5-RT-Extension-MandatoryOnTransition/Makefile
==============================================================================
--- head/www/p5-RT-Extension-MandatoryOnTransition/Makefile	Sun Dec  8 22:32:06 2013	(r335944)
+++ head/www/p5-RT-Extension-MandatoryOnTransition/Makefile	Sun Dec  8 22:38:52 2013	(r335945)
@@ -33,13 +33,15 @@ RT_VER=         ${opt}
 BUILD_DEPENDS=	${LOCALBASE}/bin/rt:${PORTSDIR}/www/rt${RT_VER}
 RUN_DEPENDS=	${LOCALBASE}/bin/rt:${PORTSDIR}/www/rt${RT_VER}
 
-USES=	perl5
+NO_ARCH=	yes
+
+USES=		perl5
 USE_PERL5=	configure
 
 PLIST_SUB+=	RT_VER=${RT_VER}
 
 # Note: You can install using an arbitrary $PREFIX but only if it
-# matches the $PREFIX used to install www/rt{38,40}.  Hence ignore
+# matches the $PREFIX used to install www/rt{40,42}.  Hence ignore
 # $PREFIX in the environment and inherit settings from RT.pm
 do-configure:
 	@cd ${CONFIGURE_WRKSRC} && \

Modified: head/www/p5-RT-Extension-SLA/Makefile
==============================================================================
--- head/www/p5-RT-Extension-SLA/Makefile	Sun Dec  8 22:32:06 2013	(r335944)
+++ head/www/p5-RT-Extension-SLA/Makefile	Sun Dec  8 22:38:52 2013	(r335945)
@@ -18,6 +18,8 @@ RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 LICENSE=	GPLv2
 
+NO_ARCH=	yes
+
 USES+=		perl5
 USE_PERL5=	configure
 
@@ -50,7 +52,7 @@ SUB_LIST+=	INITIALDATA=plugins/RT-Extens
 SUB_FILES+=	pkg-message
 
 # Note: You can install using an arbitrary $PREFIX but only if it
-# matches the $PREFIX used to install www/rt{38,40}.  Hence ignore
+# matches the $PREFIX used to install www/rt{38,40,42}.  Hence ignore
 # $PREFIX in the environment and inherit settings from RT.pm
 do-configure:
 	@cd ${CONFIGURE_WRKSRC} && \

Modified: head/www/p5-RTx-Calendar/Makefile
==============================================================================
--- head/www/p5-RTx-Calendar/Makefile	Sun Dec  8 22:32:06 2013	(r335944)
+++ head/www/p5-RTx-Calendar/Makefile	Sun Dec  8 22:38:52 2013	(r335945)
@@ -19,6 +19,8 @@ BUILD_DEPENDS=	p5-Date-ICal>0:${PORTSDIR
 		p5-DateTime-Set>0:${PORTSDIR}/devel/p5-DateTime-Set
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
+NO_ARCH=	yes
+
 USES+=		perl5
 USE_PERL5=	configure
 

Modified: head/www/rt40/Makefile
==============================================================================
--- head/www/rt40/Makefile	Sun Dec  8 22:32:06 2013	(r335944)
+++ head/www/rt40/Makefile	Sun Dec  8 22:38:52 2013	(r335945)
@@ -13,13 +13,15 @@ CONFLICTS=	rt-3.8* rt42-4.2* brlcad-[0-9
 PKGNAMESUFFIX=	40
 NEED_ROOT=	yes
 
+NO_ARCH=	yes
+
 # See doc/web_deployment.pod for info on the choices of webserver /
 # webapp combinations.  Note: if using apache, apache-2.2+ is
 # recommended.  For deployment with nginx, use the SPAWN_FCGI method
 # or the builtin webserver with a FCGI handler.
 #
 # The builtin standalone PSGI based webserver is always available, no
-# mater what choice of web deployment platform, or none, that you
+# matter what choice of web deployment platform, or none, that you
 # make.  Best Practical state that this is really only suitable for
 # development usage, although I have heard reports of people using it
 # successfully for medium sized deployments.  If you only want the

Modified: head/www/rt42/Makefile
==============================================================================
--- head/www/rt42/Makefile	Sun Dec  8 22:32:06 2013	(r335944)
+++ head/www/rt42/Makefile	Sun Dec  8 22:38:52 2013	(r335945)
@@ -12,13 +12,15 @@ COMMENT=	RT is an industrial-grade ticke
 
 CONFLICTS=	rt-3.8* rt40-4.0* brlcad-[0-9]*
 
+NO_ARCH=	yes
+
 # See doc/web_deployment.pod for info on the choices of webserver /
 # webapp combinations.  Note: if using apache, apache-2.2+ is
 # recommended.  For deployment with nginx, use the SPAWN_FCGI method
 # or the builtin webserver with a FCGI handler.
 #
 # The builtin standalone PSGI based webserver is always available, no
-# mater what choice of web deployment platform, or none, that you
+# matter what choice of web deployment platform, or none, that you
 # make.  Best Practical state that this is really only suitable for
 # development usage, although I have heard reports of people using it
 # successfully for medium sized deployments.  If you only want the

Modified: head/x11-fonts/gentium-basic/Makefile
==============================================================================
--- head/x11-fonts/gentium-basic/Makefile	Sun Dec  8 22:32:06 2013	(r335944)
+++ head/x11-fonts/gentium-basic/Makefile	Sun Dec  8 22:38:52 2013	(r335945)
@@ -12,26 +12,28 @@ COMMENT=	Gentium Basic and Gentium Book 
 
 LICENSE=	OFL11
 
+NO_ARCH=	yes
+
 USE_TGZ=	yes
 XORG_CAT=	font
 
 FONTLIBPATH=	lib/X11/fonts
-FONTROOTDIR=	${STAGEDIR}${PREFIX}/${FONTLIBPATH}
+FONTPATH=	${PREFIX}/${FONTLIBPATH}/${FONTDIR}
 INSTALLS_TTF=	yes
 MEDIA_ID=	${PORTNAME}_${PORTVERSION}_tar
 NO_BUILD=	yes
 WRKSRC=		${WRKDIR}/${DISTNAME:S,.orig,,:S,_,-,}
 
-PLIST_FILES=	${FONTLIBPATH}/${FONTDIR}/GenBasB.ttf \
-		${FONTLIBPATH}/${FONTDIR}/GenBasBI.ttf \
-		${FONTLIBPATH}/${FONTDIR}/GenBasI.ttf \
-		${FONTLIBPATH}/${FONTDIR}/GenBasR.ttf \
-		${FONTLIBPATH}/${FONTDIR}/GenBkBasB.ttf \
-		${FONTLIBPATH}/${FONTDIR}/GenBkBasBI.ttf \
-		${FONTLIBPATH}/${FONTDIR}/GenBkBasI.ttf \
-		${FONTLIBPATH}/${FONTDIR}/GenBkBasR.ttf
+PLIST_FILES=	${FONTPATH:S,^${PREFIX}/,,}/GenBasB.ttf \
+		${FONTPATH:S,^${PREFIX}/,,}/GenBasBI.ttf \
+		${FONTPATH:S,^${PREFIX}/,,}/GenBasI.ttf \
+		${FONTPATH:S,^${PREFIX}/,,}/GenBasR.ttf \
+		${FONTPATH:S,^${PREFIX}/,,}/GenBkBasB.ttf \
+		${FONTPATH:S,^${PREFIX}/,,}/GenBkBasBI.ttf \
+		${FONTPATH:S,^${PREFIX}/,,}/GenBkBasI.ttf \
+		${FONTPATH:S,^${PREFIX}/,,}/GenBkBasR.ttf
 
-SUB_LIST=	"FONTPATH=${PREFIX}/${FONTLIBPATH}/${FONTDIR}"
+SUB_LIST=	"FONTPATH=${FONTPATH}"
 SUB_FILES=	pkg-message
 
 DOCSLIST=	FONTLOG.txt GENTIUM-FAQ.txt OFL-FAQ.txt
@@ -47,8 +49,8 @@ do-configure:
 do-install: install-fonts install-docs
 
 install-fonts:
-	${MKDIR} ${FONTROOTDIR}/${FONTDIR}
-	${INSTALL_DATA} ${WRKSRC}/*.ttf ${FONTROOTDIR}/${FONTDIR}
+	${MKDIR} ${STAGEDIR}${FONTPATH}
+	${INSTALL_DATA} ${WRKSRC}/*.ttf ${STAGEDIR}${FONTPATH}
 
 install-docs:
 .if ${PORT_OPTIONS:MDOCS}

Modified: head/x11-fonts/gentium-plus/Makefile
==============================================================================
--- head/x11-fonts/gentium-plus/Makefile	Sun Dec  8 22:32:06 2013	(r335944)
+++ head/x11-fonts/gentium-plus/Makefile	Sun Dec  8 22:38:52 2013	(r335945)
@@ -11,20 +11,22 @@ COMMENT=	Gentium Plus TrueType font coll
 
 LICENSE=	OFL11
 
+NO_ARCH=	yes
+
 USE_ZIP=	yes
 XORG_CAT=	font
 
 FONTLIBPATH=	lib/X11/fonts
-FONTROOTDIR=	${STAGEDIR}${PREFIX}/${FONTLIBPATH}
+FONTPATH=	${PREFIX}/${FONTLIBPATH}/${FONTDIR}
 INSTALLS_TTF=	yes
 MEDIA_ID=	${DISTNAME}${EXTRACT_SUFX}
 NO_BUILD=	yes
 USE_TGZ=	yes	#prevent bsd.xorg.mk from setting USE_BZIP
 
-PLIST_FILES=	${FONTLIBPATH}/${FONTDIR}/${PORTNAME}-I.ttf \
-		${FONTLIBPATH}/${FONTDIR}/${PORTNAME}-R.ttf
+PLIST_FILES=	${FONTPATH:S,^${PREFIX}/,,}/${PORTNAME}-I.ttf \
+		${FONTPATH:S,^${PREFIX}/,,}/${PORTNAME}-R.ttf
 
-SUB_LIST=	"FONTPATH=${PREFIX}$FONTLIBPATH}/${FONTDIR}"
+SUB_LIST=	"FONTPATH=${FONTPATH}"
 SUB_FILES=	pkg-message
 
 DOCSLIST=	FONTLOG.txt GENTIUM-FAQ.txt OFL-FAQ.txt OFL.txt README.txt \
@@ -41,8 +43,8 @@ do-configure:
 do-install: install-fonts install-docs
 
 install-fonts:
-	${MKDIR} ${FONTROOTDIR}/${FONTDIR}
-	${INSTALL_DATA} ${WRKSRC}/*.ttf ${FONTROOTDIR}/${FONTDIR}
+	${MKDIR} ${STAGEDIR}${FONTPATH}
+	${INSTALL_DATA} ${WRKSRC}/*.ttf ${STAGEDIR}${FONTPATH}
 
 install-docs:
 .if ${PORT_OPTIONS:MDOCS}



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201312082238.rB8Mcqb4082782>