diff options
| author | obache <obache@pkgsrc.org> | 2014-03-15 07:40:59 +0000 |
|---|---|---|
| committer | obache <obache@pkgsrc.org> | 2014-03-15 07:40:59 +0000 |
| commit | e1a10bae244f535eca4627dce5176d2a66d447de (patch) | |
| tree | 6dc3fe2d61e1b77baf9fd5333d8fc285056baa51 /graphics | |
| parent | 689afa79f1966a9b27e8fb7c0ce33aebee33fa73 (diff) | |
| download | pkgsrc-e1a10bae244f535eca4627dce5176d2a66d447de.tar.gz | |
Fixes packaging
* just using ruby as a tool, not a module.
* missing dependency on xwd and xwininfo for the case X11_TYPE=modular.
* fixes prefix of ImageMagick, long term bug since converted dependency from
buildlik to simple DEPENDS.
Bump PKGREVISION.
Diffstat (limited to 'graphics')
| -rw-r--r-- | graphics/x11rec/Makefile | 19 |
1 files changed, 15 insertions, 4 deletions
diff --git a/graphics/x11rec/Makefile b/graphics/x11rec/Makefile index 915b322482f..3e3e7a2e806 100644 --- a/graphics/x11rec/Makefile +++ b/graphics/x11rec/Makefile @@ -1,8 +1,9 @@ -# $NetBSD: Makefile,v 1.18 2012/10/06 14:11:25 asau Exp $ +# $NetBSD: Makefile,v 1.19 2014/03/15 07:40:59 obache Exp $ # DISTNAME= x11rec-0.3 -PKGREVISION= 7 +PKGNAME= ${RUBY_PKGPREFIX}-x11rec-0.3 +PKGREVISION= 8 CATEGORIES= graphics ruby MASTER_SITES= http://0xcc.net/x11rec/ @@ -14,6 +15,12 @@ LICENSE= gnu-gpl-v2 DEPENDS+= gifsicle-[0-9]*:../../graphics/gifsicle DEPENDS+= ImageMagick-[0-9]*:../../graphics/ImageMagick +.include "../../mk/bsd.prefs.mk" +.if ${X11_TYPE} == "modular" +DEPENDS+= xwd-[0-9]*:../../x11/xwd +DEPENDS+= xwininfo-[0-9]*:../../x11/xwininfo +.endif + CONFLICTS+= ruby[1-9][0-9]-x11rec-[0-9]* x11rec-[0-9]* NO_BUILD= yes @@ -28,7 +35,11 @@ do-install: ${INSTALL_DATA} ${WRKSRC}/x11rec-ja.html \ ${DESTDIR}${PREFIX}/share/doc/x11rec/index.html.ja -.include "../../lang/ruby/modules.mk" +.include "../../lang/ruby/replace.mk" + +FIND_PREFIX:= BUILDLINK_PREFIX.ImageMagick=ImageMagick \ + BUILDLINK_PREFIX.gifsicle=gifsicle +.include "../../mk/find-prefix.mk" SUBST_CLASSES+= toolpath SUBST_STAGE.toolpath= pre-configure @@ -37,6 +48,6 @@ SUBST_FILES.toolpath= x11rec SUBST_SED.toolpath= -e "s|@xwininfo@|${X11BASE}/bin/xwininfo|" SUBST_SED.toolpath+= -e "s|@xwd@|${X11BASE}/bin/xwd|" SUBST_SED.toolpath+= -e "s|@convert@|${BUILDLINK_PREFIX.ImageMagick}/bin/convert|" -SUBST_SED.toolpath+= -e "s|@gifsicle@|${PREFIX}/bin/gifsicle|" +SUBST_SED.toolpath+= -e "s|@gifsicle@|${BUILDLINK_PREFIX.gifsicle}/bin/gifsicle|" .include "../../mk/bsd.pkg.mk" |