pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/fonts/ghostscript-cidfonts For PR pkg/48479, old make ...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/049299c12ff8
branches:  trunk
changeset: 629532:049299c12ff8
user:      mef <mef%pkgsrc.org@localhost>
date:      Thu Jan 23 00:08:02 2014 +0000

description:
For PR pkg/48479, old make (like NetBSD-5.1) behaves differently
with undefined VARIABLE:
  Malformed conditional (!empty(PKG_OPTIONS.gs_type:Mghostscript-agpl))
So, avoid using ghostscript version dependent installation path.
PKGREVISION++ (installation path changed). Thanks obache@

diffstat:

 fonts/ghostscript-cidfonts/Makefile |  12 +++---------
 1 files changed, 3 insertions(+), 9 deletions(-)

diffs (35 lines):

diff -r 3449aed38540 -r 049299c12ff8 fonts/ghostscript-cidfonts/Makefile
--- a/fonts/ghostscript-cidfonts/Makefile       Wed Jan 22 20:24:44 2014 +0000
+++ b/fonts/ghostscript-cidfonts/Makefile       Thu Jan 23 00:08:02 2014 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.21 2014/01/09 02:39:42 mef Exp $
+# $NetBSD: Makefile,v 1.22 2014/01/23 00:08:02 mef Exp $
 
 DISTNAME=      ghostscript-cidfonts-20000901
-PKGREVISION=   5
+PKGREVISION=   6
 CATEGORIES=    fonts
 MASTER_SITES=  # empty
 DISTFILES=     # empty
@@ -15,7 +15,7 @@
 GHOSTSCRIPT_REQD=      9.05
 
 ADOBE_RESOURCEDIR=     ${PREFIX}/share/Adobe/Resource
-GS_RESOURCEDIR=                ${PREFIX}/share/ghostscript/${GS_VERSION}/Resource
+GS_RESOURCEDIR=                ${PREFIX}/share/ghostscript/fonts
 
 NO_CONFIGURE=          yes
 NO_BUILD=              yes
@@ -26,12 +26,6 @@
 
 REQD_DIRS=             ${GS_RESOURCEDIR} ${GS_RESOURCEDIR}/CIDFont
 
-.if   !empty(PKG_OPTIONS.gs_type:Mghostscript-agpl)
-. include       "../../print/ghostscript-agpl/Makefile.common"
-.else
-. include       "../../print/ghostscript-gpl/Makefile.common"
-.endif
-
 do-install:    # nothing
 
 .include "../../mk/bsd.pkg.mk"



Home | Main Index | Thread Index | Old Index