diff options
| author | joerg <joerg@pkgsrc.org> | 2015-07-04 16:18:28 +0000 |
|---|---|---|
| committer | joerg <joerg@pkgsrc.org> | 2015-07-04 16:18:28 +0000 |
| commit | 40359543350f97f6f4ce738f77467358da339880 (patch) | |
| tree | d8a48c8d2848b617581f63aeec6454f4736400cd /fonts/xmbdfed | |
| parent | 87993e055fdcca0d2b61250e291a62eff0eb64ff (diff) | |
| download | pkgsrc-40359543350f97f6f4ce738f77467358da339880.tar.gz | |
Remove USE_X11BASE and X11PREFIX.
Diffstat (limited to 'fonts/xmbdfed')
| -rw-r--r-- | fonts/xmbdfed/Makefile | 4 | ||||
| -rw-r--r-- | fonts/xmbdfed/distinfo | 4 | ||||
| -rw-r--r-- | fonts/xmbdfed/patches/patch-aa | 10 |
3 files changed, 8 insertions, 10 deletions
diff --git a/fonts/xmbdfed/Makefile b/fonts/xmbdfed/Makefile index 43dc518f315..90101a0492f 100644 --- a/fonts/xmbdfed/Makefile +++ b/fonts/xmbdfed/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.19 2013/01/19 20:23:34 riastradh Exp $ +# $NetBSD: Makefile,v 1.20 2015/07/04 16:18:34 joerg Exp $ DISTNAME= xmbdfed-4.5 PKGREVISION= 5 @@ -9,8 +9,6 @@ MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= http://crl.nmsu.edu/~mleisher/xmbdfed.html COMMENT= Motif-based BDF font editor with lots of features -USE_X11BASE= YES - INSTALLATION_DIRS= bin ${PKGMANDIR}/man1 do-install: diff --git a/fonts/xmbdfed/distinfo b/fonts/xmbdfed/distinfo index bf81afd7075..d7fac5ea4b0 100644 --- a/fonts/xmbdfed/distinfo +++ b/fonts/xmbdfed/distinfo @@ -1,8 +1,8 @@ -$NetBSD: distinfo,v 1.7 2014/03/22 22:26:44 spz Exp $ +$NetBSD: distinfo,v 1.8 2015/07/04 16:18:34 joerg Exp $ SHA1 (xmbdfed-4.5.tar.gz) = 325f2f3a8ae68b3f5d22ff9bdd115d30cdd743db RMD160 (xmbdfed-4.5.tar.gz) = a6c1d9202e6d978dbc0aaa1fb6389a3d14b16c26 Size (xmbdfed-4.5.tar.gz) = 282055 bytes -SHA1 (patch-aa) = 9c01eb9c4d160e8747fe2f9d68bb16a2b6afc197 +SHA1 (patch-aa) = 55740a6f3bf01bf149bc953078a0cf75eea4dc11 SHA1 (patch-ab) = 2ddd129850dfc53e46ba0df8d62239ffb5fac0eb SHA1 (patch-ac) = c62140d171ea96418d48ee4b236cde8bb87b545d diff --git a/fonts/xmbdfed/patches/patch-aa b/fonts/xmbdfed/patches/patch-aa index 998058b4097..089f43f7385 100644 --- a/fonts/xmbdfed/patches/patch-aa +++ b/fonts/xmbdfed/patches/patch-aa @@ -1,4 +1,4 @@ -$NetBSD: patch-aa,v 1.3 2013/10/20 18:10:11 joerg Exp $ +$NetBSD: patch-aa,v 1.4 2015/07/04 16:18:34 joerg Exp $ --- Makefile.orig Fri Mar 17 05:08:49 2000 +++ Makefile Wed Mar 20 00:37:53 2002 @@ -14,8 +14,8 @@ $NetBSD: patch-aa,v 1.3 2013/10/20 18:10:11 joerg Exp $ -#FTYPE_INCS = -I/usr/local/include -#FTYPE_LIBS = -L/user/local/lib -lttf -#FTYPE_DEFS = -DHAVE_FREETYPE -+FTYPE_INCS = -I${X11PREFIX}/include/freetype -+FTYPE_LIBS = -L${X11PREFIX}/lib ${COMPILER_RPATH_FLAG}${X11PREFIX}/lib -lttf ++FTYPE_INCS = -I${X11BASE}/include/freetype ++FTYPE_LIBS = -L${X11BASE}/lib ${COMPILER_RPATH_FLAG}${X11BASE}/lib -lttf +FTYPE_DEFS = -DHAVE_FREETYPE @@ -66,3 +66,3 @@ @@ -25,8 +25,8 @@ $NetBSD: patch-aa,v 1.3 2013/10/20 18:10:11 joerg Exp $ @@ -73,2 +73,6 @@ -+INCS = -I${X11PREFIX}/include -I${PREFIX}/include ${FTYPE_INCS} -+LIBS = -L${X11PREFIX}/lib ${COMPILER_RPATH_FLAG}${X11PREFIX}/lib -L${PREFIX}/lib ${COMPILER_RPATH_FLAG}${PREFIX}/lib \ ++INCS = -I${X11BASE}/include -I${PREFIX}/include ${FTYPE_INCS} ++LIBS = -L${X11BASE}/lib ${COMPILER_RPATH_FLAG}${X11BASE}/lib -L${PREFIX}/lib ${COMPILER_RPATH_FLAG}${PREFIX}/lib \ + -lXm -lXmu -lXt -lXext -lX11 ${FTYPE_LIBS} + # |