Sun Oct 9 05:26:09 2011 UTC ()
Use force on imake to keep it from installing fonts in /usr/X11R7 with
native X.


(dholland)
diff -r1.28 -r1.29 pkgsrc/x11/x3270/Makefile
cvs diff -r1.28 -r1.29 pkgsrc/x11/x3270/Makefile (expand / switch to unified diff)

--- pkgsrc/x11/x3270/Makefile 2011/10/04 19:25:31 1.28
+++ pkgsrc/x11/x3270/Makefile 2011/10/09 05:26:08 1.29
@@ -1,34 +1,35 @@ @@ -1,34 +1,35 @@
1# $NetBSD: Makefile,v 1.28 2011/10/04 19:25:31 gls Exp $ 1# $NetBSD: Makefile,v 1.29 2011/10/09 05:26:08 dholland Exp $
2 2
3DISTNAME= suite3270-3.3.12ga7-src 3DISTNAME= suite3270-3.3.12ga7-src
4PKGNAME= x3270-3.3.12ga7 4PKGNAME= x3270-3.3.12ga7
5CATEGORIES= x11 5CATEGORIES= x11
6MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=x3270/} 6MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=x3270/}
7EXTRACT_SUFX= .tgz 7EXTRACT_SUFX= .tgz
8 8
9MAINTAINER= gls@NetBSD.org 9MAINTAINER= gls@NetBSD.org
10HOMEPAGE= http://x3270.bgp.nu/ 10HOMEPAGE= http://x3270.bgp.nu/
11COMMENT= 3270 Terminal emulator 11COMMENT= 3270 Terminal emulator
12LICENSE= modified-bsd 12LICENSE= modified-bsd
13 13
14GNU_CONFIGURE= yes 14GNU_CONFIGURE= yes
15PKG_DESTDIR_SUPPORT= user-destdir 15PKG_DESTDIR_SUPPORT= user-destdir
16 16
17WRKSRC= ${WRKDIR}/x3270-3.3 17WRKSRC= ${WRKDIR}/x3270-3.3
18USE_IMAKE= yes 18USE_IMAKE= yes
19USE_TOOLS+= bdftopcf 19USE_TOOLS+= bdftopcf
20 20
21FONTS_DIRS.x11+= ${PREFIX}/lib/X11/fonts/misc 21FONTS_DIRS.x11+= ${PREFIX}/lib/X11/fonts/misc
 22IMAKEOPTS+= -DFontDir=${PREFIX}/lib/X11/fonts
22 23
23CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFBASEDIR} 24CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFBASEDIR}
24 25
25PKG_SYSCONFSUBDIR= x3270 26PKG_SYSCONFSUBDIR= x3270
26 27
27EGDIR= ${PREFIX}/share/examples/x3270 28EGDIR= ${PREFIX}/share/examples/x3270
28CONF_FILES= ${EGDIR}/ibm_hosts ${PKG_SYSCONFDIR}/ibm_hosts 29CONF_FILES= ${EGDIR}/ibm_hosts ${PKG_SYSCONFDIR}/ibm_hosts
29INSTALLATION_DIRS+= ${EGDIR} 30INSTALLATION_DIRS+= ${EGDIR}
30 31
31.include "../../x11/libXaw/buildlink3.mk" 32.include "../../x11/libXaw/buildlink3.mk"
32.include "../../x11/libXt/buildlink3.mk" 33.include "../../x11/libXt/buildlink3.mk"
33.include "../../x11/xbitmaps/buildlink3.mk" 34.include "../../x11/xbitmaps/buildlink3.mk"
34.include "../../mk/bsd.pkg.mk" 35.include "../../mk/bsd.pkg.mk"