Sat Mar 15 07:40:59 2014 UTC ()
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.


(obache)
diff -r1.18 -r1.19 pkgsrc/graphics/x11rec/Makefile
cvs diff -r1.18 -r1.19 pkgsrc/graphics/x11rec/Attic/Makefile (expand / switch to unified diff)

--- pkgsrc/graphics/x11rec/Attic/Makefile 2012/10/06 14:11:25 1.18
+++ pkgsrc/graphics/x11rec/Attic/Makefile 2014/03/15 07:40:59 1.19
@@ -1,42 +1,53 @@ @@ -1,42 +1,53 @@
1# $NetBSD: Makefile,v 1.18 2012/10/06 14:11:25 asau Exp $ 1# $NetBSD: Makefile,v 1.19 2014/03/15 07:40:59 obache Exp $
2# 2#
3 3
4DISTNAME= x11rec-0.3 4DISTNAME= x11rec-0.3
5PKGREVISION= 7 5PKGNAME= ${RUBY_PKGPREFIX}-x11rec-0.3
 6PKGREVISION= 8
6CATEGORIES= graphics ruby 7CATEGORIES= graphics ruby
7MASTER_SITES= http://0xcc.net/x11rec/ 8MASTER_SITES= http://0xcc.net/x11rec/
8 9
9MAINTAINER= obache@NetBSD.org 10MAINTAINER= obache@NetBSD.org
10HOMEPAGE= http://0xcc.net/x11rec/ 11HOMEPAGE= http://0xcc.net/x11rec/
11COMMENT= Very ad hoc X11 recorder which create a movie 12COMMENT= Very ad hoc X11 recorder which create a movie
12LICENSE= gnu-gpl-v2 13LICENSE= gnu-gpl-v2
13 14
14DEPENDS+= gifsicle-[0-9]*:../../graphics/gifsicle 15DEPENDS+= gifsicle-[0-9]*:../../graphics/gifsicle
15DEPENDS+= ImageMagick-[0-9]*:../../graphics/ImageMagick 16DEPENDS+= ImageMagick-[0-9]*:../../graphics/ImageMagick
16 17
 18.include "../../mk/bsd.prefs.mk"
 19.if ${X11_TYPE} == "modular"
 20DEPENDS+= xwd-[0-9]*:../../x11/xwd
 21DEPENDS+= xwininfo-[0-9]*:../../x11/xwininfo
 22.endif
 23
17CONFLICTS+= ruby[1-9][0-9]-x11rec-[0-9]* x11rec-[0-9]* 24CONFLICTS+= ruby[1-9][0-9]-x11rec-[0-9]* x11rec-[0-9]*
18 25
19NO_BUILD= yes 26NO_BUILD= yes
20REPLACE_RUBY= x11rec 27REPLACE_RUBY= x11rec
21 28
22INSTALLATION_DIRS= bin share/doc/x11rec 29INSTALLATION_DIRS= bin share/doc/x11rec
23 30
24do-install: 31do-install:
25 ${INSTALL_SCRIPT} ${WRKSRC}/x11rec ${DESTDIR}${PREFIX}/bin 32 ${INSTALL_SCRIPT} ${WRKSRC}/x11rec ${DESTDIR}${PREFIX}/bin
26 ${INSTALL_DATA} ${WRKSRC}/x11rec-en.html \ 33 ${INSTALL_DATA} ${WRKSRC}/x11rec-en.html \
27 ${DESTDIR}${PREFIX}/share/doc/x11rec/index.html.en 34 ${DESTDIR}${PREFIX}/share/doc/x11rec/index.html.en
28 ${INSTALL_DATA} ${WRKSRC}/x11rec-ja.html \ 35 ${INSTALL_DATA} ${WRKSRC}/x11rec-ja.html \
29 ${DESTDIR}${PREFIX}/share/doc/x11rec/index.html.ja 36 ${DESTDIR}${PREFIX}/share/doc/x11rec/index.html.ja
30 37
31.include "../../lang/ruby/modules.mk" 38.include "../../lang/ruby/replace.mk"
 39
 40FIND_PREFIX:= BUILDLINK_PREFIX.ImageMagick=ImageMagick \
 41 BUILDLINK_PREFIX.gifsicle=gifsicle
 42.include "../../mk/find-prefix.mk"
32 43
33SUBST_CLASSES+= toolpath 44SUBST_CLASSES+= toolpath
34SUBST_STAGE.toolpath= pre-configure 45SUBST_STAGE.toolpath= pre-configure
35SUBST_MESSAGE.toolpath= Fixing paths. 46SUBST_MESSAGE.toolpath= Fixing paths.
36SUBST_FILES.toolpath= x11rec 47SUBST_FILES.toolpath= x11rec
37SUBST_SED.toolpath= -e "s|@xwininfo@|${X11BASE}/bin/xwininfo|" 48SUBST_SED.toolpath= -e "s|@xwininfo@|${X11BASE}/bin/xwininfo|"
38SUBST_SED.toolpath+= -e "s|@xwd@|${X11BASE}/bin/xwd|" 49SUBST_SED.toolpath+= -e "s|@xwd@|${X11BASE}/bin/xwd|"
39SUBST_SED.toolpath+= -e "s|@convert@|${BUILDLINK_PREFIX.ImageMagick}/bin/convert|" 50SUBST_SED.toolpath+= -e "s|@convert@|${BUILDLINK_PREFIX.ImageMagick}/bin/convert|"
40SUBST_SED.toolpath+= -e "s|@gifsicle@|${PREFIX}/bin/gifsicle|" 51SUBST_SED.toolpath+= -e "s|@gifsicle@|${BUILDLINK_PREFIX.gifsicle}/bin/gifsicle|"
41 52
42.include "../../mk/bsd.pkg.mk" 53.include "../../mk/bsd.pkg.mk"