Thu Aug 4 23:40:49 2011 UTC ()
Only depend on perl when the perl option is selected. From Matthew Mondor
in PR 45205.


(wiz)
diff -r1.28 -r1.29 pkgsrc/x11/rxvt-unicode/Makefile
diff -r1.6 -r1.7 pkgsrc/x11/rxvt-unicode/options.mk
cvs diff -r1.28 -r1.29 pkgsrc/x11/rxvt-unicode/Makefile (expand / switch to unified diff)

--- pkgsrc/x11/rxvt-unicode/Makefile 2010/08/21 16:37:14 1.28
+++ pkgsrc/x11/rxvt-unicode/Makefile 2011/08/04 23:40:48 1.29
@@ -1,31 +1,30 @@ @@ -1,31 +1,30 @@
1# $NetBSD: Makefile,v 1.28 2010/08/21 16:37:14 seb Exp $ 1# $NetBSD: Makefile,v 1.29 2011/08/04 23:40:48 wiz Exp $
2 2
3DISTNAME= rxvt-unicode-9.06 3DISTNAME= rxvt-unicode-9.06
4PKGREVISION= 2 4PKGREVISION= 2
5CATEGORIES= x11 5CATEGORIES= x11
6MASTER_SITES= http://dist.schmorp.de/rxvt-unicode/ \ 6MASTER_SITES= http://dist.schmorp.de/rxvt-unicode/ \
7 http://dist.schmorp.de/rxvt-unicode/Attic/ 7 http://dist.schmorp.de/rxvt-unicode/Attic/
8EXTRACT_SUFX= .tar.bz2 8EXTRACT_SUFX= .tar.bz2
9 9
10MAINTAINER= pkgsrc-users@NetBSD.org 10MAINTAINER= pkgsrc-users@NetBSD.org
11HOMEPAGE= http://software.schmorp.de/pkg/rxvt-unicode.html 11HOMEPAGE= http://software.schmorp.de/pkg/rxvt-unicode.html
12COMMENT= rxvt clone supporting Xft fonts and Unicode 12COMMENT= rxvt clone supporting Xft fonts and Unicode
13LICENSE= gnu-gpl-v2 13LICENSE= gnu-gpl-v2
14 14
15GNU_CONFIGURE= yes 15GNU_CONFIGURE= yes
16USE_LANGUAGES= c c++ 16USE_LANGUAGES= c c++
17USE_TOOLS+= pkg-config 17USE_TOOLS+= pkg-config
18USE_TOOLS+= perl:run 
19USE_FEATURES+= snprintf 18USE_FEATURES+= snprintf
20 19
21CONFIGURE_ENV+= ac_cv_path_TIC=no 20CONFIGURE_ENV+= ac_cv_path_TIC=no
22 21
23PKG_DESTDIR_SUPPORT= user-destdir 22PKG_DESTDIR_SUPPORT= user-destdir
24INSTALLATION_DIRS+= share/doc/rxvt-unicode share/examples/rxvt-unicode 23INSTALLATION_DIRS+= share/doc/rxvt-unicode share/examples/rxvt-unicode
25 24
26post-install: 25post-install:
27 ${INSTALL_DATA} ${WRKSRC}/README.FAQ \ 26 ${INSTALL_DATA} ${WRKSRC}/README.FAQ \
28 ${DESTDIR}${PREFIX}/share/doc/rxvt-unicode 27 ${DESTDIR}${PREFIX}/share/doc/rxvt-unicode
29.for t in rxvt-unicode.termcap rxvt-unicode.terminfo 28.for t in rxvt-unicode.termcap rxvt-unicode.terminfo
30 ${INSTALL_DATA} ${WRKSRC}/doc/etc/${t} \ 29 ${INSTALL_DATA} ${WRKSRC}/doc/etc/${t} \
31 ${DESTDIR}${PREFIX}/share/examples/rxvt-unicode 30 ${DESTDIR}${PREFIX}/share/examples/rxvt-unicode
cvs diff -r1.6 -r1.7 pkgsrc/x11/rxvt-unicode/options.mk (expand / switch to unified diff)

--- pkgsrc/x11/rxvt-unicode/options.mk 2008/04/12 22:43:15 1.6
+++ pkgsrc/x11/rxvt-unicode/options.mk 2011/08/04 23:40:48 1.7
@@ -1,27 +1,28 @@ @@ -1,27 +1,28 @@
1# $NetBSD: options.mk,v 1.6 2008/04/12 22:43:15 jlam Exp $ 1# $NetBSD: options.mk,v 1.7 2011/08/04 23:40:48 wiz Exp $
2 2
3PKG_OPTIONS_VAR= PKG_OPTIONS.rxvt-unicode 3PKG_OPTIONS_VAR= PKG_OPTIONS.rxvt-unicode
4PKG_SUPPORTED_OPTIONS= perl unicode3 xft2 rxvt-term 4PKG_SUPPORTED_OPTIONS= perl unicode3 xft2 rxvt-term
5PKG_SUGGESTED_OPTIONS= perl unicode3 xft2 5PKG_SUGGESTED_OPTIONS= perl unicode3 xft2
6 6
7.include "../../mk/bsd.options.mk" 7.include "../../mk/bsd.options.mk"
8 8
9.if !empty(PKG_OPTIONS:Mrxvt-term) 9.if !empty(PKG_OPTIONS:Mrxvt-term)
10CONFIGURE_ARGS+= --with-term=rxvt 10CONFIGURE_ARGS+= --with-term=rxvt
11.endif 11.endif
12 12
13PLIST_VARS+= perl 13PLIST_VARS+= perl
14.if !empty(PKG_OPTIONS:Mperl) 14.if !empty(PKG_OPTIONS:Mperl)
 15USE_TOOLS+= perl:run
15CONFIGURE_ARGS+= --enable-perl 16CONFIGURE_ARGS+= --enable-perl
16PLIST.perl= yes 17PLIST.perl= yes
17.include "../../lang/perl5/buildlink3.mk" 18.include "../../lang/perl5/buildlink3.mk"
18USE_TOOLS+= perl 19USE_TOOLS+= perl
19.else 20.else
20CONFIGURE_ARGS+= --disable-perl 21CONFIGURE_ARGS+= --disable-perl
21.endif 22.endif
22 23
23# use 21 instead of 16 bits to represent unicode characters 24# use 21 instead of 16 bits to represent unicode characters
24.if !empty(PKG_OPTIONS:Municode3) 25.if !empty(PKG_OPTIONS:Municode3)
25CONFIGURE_ARGS+= --enable-unicode3 26CONFIGURE_ARGS+= --enable-unicode3
26.else 27.else
27CONFIGURE_ARGS+= --disable-unicode3 28CONFIGURE_ARGS+= --disable-unicode3