Mon Aug 18 21:47:12 2008 UTC ()
Don't enforce the use of Xft2 for rendering under Mac OS X Darwin to work
around build problems. Set appropriate linker options instead to achieve
the same result. Bump package revision because of this fix which results
in changes to the binary.


(tron)
diff -r1.59 -r1.60 pkgsrc/chat/xchat/Makefile
cvs diff -r1.59 -r1.60 pkgsrc/chat/xchat/Attic/Makefile (expand / switch to unified diff)

--- pkgsrc/chat/xchat/Attic/Makefile 2008/08/15 17:25:31 1.59
+++ pkgsrc/chat/xchat/Attic/Makefile 2008/08/18 21:47:12 1.60
@@ -1,20 +1,20 @@ @@ -1,20 +1,20 @@
1# $NetBSD: Makefile,v 1.59 2008/08/15 17:25:31 tron Exp $ 1# $NetBSD: Makefile,v 1.60 2008/08/18 21:47:12 tron Exp $
2 2
3PKG_DESTDIR_SUPPORT= user-destdir 3PKG_DESTDIR_SUPPORT= user-destdir
4 4
5.include "Makefile.common" 5.include "Makefile.common"
6 6
7PKGREVISION= 2 7PKGREVISION= 3
8OWNER= tron@NetBSD.org 8OWNER= tron@NetBSD.org
9COMMENT= X11 (X Window System) IRC client, using the GTK2 toolkit 9COMMENT= X11 (X Window System) IRC client, using the GTK2 toolkit
10 10
11CONFLICTS= xchat-gnome-[0-9]* 11CONFLICTS= xchat-gnome-[0-9]*
12 12
13USE_TOOLS+= msgfmt 13USE_TOOLS+= msgfmt
14USE_PKGLOCALEDIR= YES 14USE_PKGLOCALEDIR= YES
15USE_DIRS+= xdg-1.1 15USE_DIRS+= xdg-1.1
16GCONF_SCHEMAS= apps_xchat_url_handler.schemas 16GCONF_SCHEMAS= apps_xchat_url_handler.schemas
17 17
18CONFIGURE_ARGS+= --enable-tcl=no 18CONFIGURE_ARGS+= --enable-tcl=no
19CONFIGURE_ARGS+= --disable-perl 19CONFIGURE_ARGS+= --disable-perl
20CONFIGURE_ARGS+= --disable-python 20CONFIGURE_ARGS+= --disable-python
@@ -23,28 +23,27 @@ LDFLAGS.IRIX+= -lX11 @@ -23,28 +23,27 @@ LDFLAGS.IRIX+= -lX11
23 23
24.include "../../mk/bsd.prefs.mk" 24.include "../../mk/bsd.prefs.mk"
25.include "options.mk" 25.include "options.mk"
26 26
27.include "../../devel/gettext-lib/buildlink3.mk" 27.include "../../devel/gettext-lib/buildlink3.mk"
28.include "../../sysutils/desktop-file-utils/desktopdb.mk" 28.include "../../sysutils/desktop-file-utils/desktopdb.mk"
29BUILDLINK_API_DEPENDS.gtk2+= gtk2+>=2.10.0 29BUILDLINK_API_DEPENDS.gtk2+= gtk2+>=2.10.0
30.include "../../x11/gtk2/buildlink3.mk" 30.include "../../x11/gtk2/buildlink3.mk"
31 31
32.if ${OPSYS} == "Darwin" 32.if ${OPSYS} == "Darwin"
33INSTALL_UNSTRIPPED= YES 33INSTALL_UNSTRIPPED= YES
34 34
35.if empty(PKG_BUILD_OPTIONS.gtk2:Mquartz) 35.if empty(PKG_BUILD_OPTIONS.gtk2:Mquartz)
36LDFLAGS.Darwin+= -lX11 36LDFLAGS.Darwin+= -L${PREFIX}/lib -lX11
37CONFIGURE_ARGS+= --enable-xft 
38.else 37.else
39CONFIGURE_ARGS+= --disable-xlib 38CONFIGURE_ARGS+= --disable-xlib
40.endif 39.endif
41.endif 40.endif
42 41
43INSTALLATION_DIRS+= share/doc/xchat lib/xchat/plugins 42INSTALLATION_DIRS+= share/doc/xchat lib/xchat/plugins
44 43
45post-install: 44post-install:
46 ${INSTALL_DATA} ${WRKSRC}/README ${DESTDIR}${PREFIX}/share/doc/xchat/ 45 ${INSTALL_DATA} ${WRKSRC}/README ${DESTDIR}${PREFIX}/share/doc/xchat/
47 ${INSTALL_DATA} ${WRKSRC}/faq.html ${DESTDIR}${PREFIX}/share/doc/xchat/ 46 ${INSTALL_DATA} ${WRKSRC}/faq.html ${DESTDIR}${PREFIX}/share/doc/xchat/
48 ${INSTALL_DATA} ${WRKSRC}/plugins/plugin20.html \ 47 ${INSTALL_DATA} ${WRKSRC}/plugins/plugin20.html \
49 ${DESTDIR}${PREFIX}/share/doc/xchat/ 48 ${DESTDIR}${PREFIX}/share/doc/xchat/
50 49