Mon May 20 14:04:53 2013 UTC ()
Override results of the imake test to remove the dependency. Add fontenc
to dependency list. Bump revision.


(joerg)
diff -r1.177 -r1.178 pkgsrc/x11/kdebase3/Makefile
cvs diff -r1.177 -r1.178 pkgsrc/x11/kdebase3/Attic/Makefile (expand / switch to unified diff)

--- pkgsrc/x11/kdebase3/Attic/Makefile 2013/05/09 07:39:23 1.177
+++ pkgsrc/x11/kdebase3/Attic/Makefile 2013/05/20 14:04:53 1.178
@@ -1,17 +1,17 @@ @@ -1,17 +1,17 @@
1# $NetBSD: Makefile,v 1.177 2013/05/09 07:39:23 adam Exp $ 1# $NetBSD: Makefile,v 1.178 2013/05/20 14:04:53 joerg Exp $
2 2
3DISTNAME= kdebase-${_KDE_VERSION} 3DISTNAME= kdebase-${_KDE_VERSION}
4PKGREVISION= 28 4PKGREVISION= 29
5CATEGORIES= x11 5CATEGORIES= x11
6COMMENT= Base modules for the KDE 3 integrated X11 desktop 6COMMENT= Base modules for the KDE 3 integrated X11 desktop
7 7
8#PATCH_SITES= ftp://ftp.kde.org/pub/kde/security_patches/ \ 8#PATCH_SITES= ftp://ftp.kde.org/pub/kde/security_patches/ \
9# http://mirrors.isc.org/pub/kde/security_patches/ 9# http://mirrors.isc.org/pub/kde/security_patches/
10#PATCHFILES= post-3.5.7-kdebase-konqueror-2.diff post-3.5.7-kdebase-kdm.diff 10#PATCHFILES= post-3.5.7-kdebase-konqueror-2.diff post-3.5.7-kdebase-kdm.diff
11 11
12.include "../../meta-pkgs/kde3/Makefile.kde3" 12.include "../../meta-pkgs/kde3/Makefile.kde3"
13 13
14DISTFILES= ${DISTNAME}${EXTRACT_SUFX} Daemon.png Daemon.README 14DISTFILES= ${DISTNAME}${EXTRACT_SUFX} Daemon.png Daemon.README
15DISTFILES+= NetBSD-flag-1.0.png 15DISTFILES+= NetBSD-flag-1.0.png
16SITES.Daemon.png= ${MASTER_SITE_LOCAL} 16SITES.Daemon.png= ${MASTER_SITE_LOCAL}
17SITES.Daemon.README= ${MASTER_SITE_LOCAL} 17SITES.Daemon.README= ${MASTER_SITE_LOCAL}
@@ -23,26 +23,29 @@ UNLIMIT_RESOURCES= datasize @@ -23,26 +23,29 @@ UNLIMIT_RESOURCES= datasize
23USE_TOOLS+= pkg-config mkfontdir bdftopcf 23USE_TOOLS+= pkg-config mkfontdir bdftopcf
24 24
25FONTS_DIRS.x11+= ${PREFIX}/share/kde/apps/konsole/fonts 25FONTS_DIRS.x11+= ${PREFIX}/share/kde/apps/konsole/fonts
26REQD_DIRS+= ${PREFIX}/share/kde/apps/konsole 26REQD_DIRS+= ${PREFIX}/share/kde/apps/konsole
27REQD_DIRS+= ${PREFIX}/share/kde/apps/konsole/fonts 27REQD_DIRS+= ${PREFIX}/share/kde/apps/konsole/fonts
28 28
29FONTS_DIRS.x11+= ${PREFIX}/share/kde/fonts/override 29FONTS_DIRS.x11+= ${PREFIX}/share/kde/fonts/override
30REQD_DIRS+= ${PREFIX}/share/kde/fonts 30REQD_DIRS+= ${PREFIX}/share/kde/fonts
31REQD_DIRS+= ${PREFIX}/share/kde/fonts/override 31REQD_DIRS+= ${PREFIX}/share/kde/fonts/override
32 32
33CONFIGURE_ARGS+= --with-ldap="${BUILDLINK_PREFIX.openldap-client}" 33CONFIGURE_ARGS+= --with-ldap="${BUILDLINK_PREFIX.openldap-client}"
34CONFIGURE_ARGS+= --with-ssl-dir="${BUILDLINK_PREFIX.openssl}" 34CONFIGURE_ARGS+= --with-ssl-dir="${BUILDLINK_PREFIX.openssl}"
35CONFIGURE_ARGS+= --without-java 35CONFIGURE_ARGS+= --without-java
 36CONFIGURE_ENV+= kde_cv_defines_imake_version=8 \
 37 kde_cv_defines_imake="XBINDIR=${X11PREFIX:Q}/bin XLIBDIR=${X11PREFIX:Q}/lib" \
 38 XMKMF=${TRUE}
36 39
37REPLACE_PERL+= kcontrol/keys/convertShortcuts.pl \ 40REPLACE_PERL+= kcontrol/keys/convertShortcuts.pl \
38 khelpcenter/searchhandlers/khc_docbookdig.pl.in \ 41 khelpcenter/searchhandlers/khc_docbookdig.pl.in \
39 khelpcenter/searchhandlers/khc_htdig.pl.in \ 42 khelpcenter/searchhandlers/khc_htdig.pl.in \
40 khelpcenter/searchhandlers/khc_htsearch.pl \ 43 khelpcenter/searchhandlers/khc_htsearch.pl \
41 khelpcenter/searchhandlers/khc_mansearch.pl \ 44 khelpcenter/searchhandlers/khc_mansearch.pl \
42 kicker/kicker/kicker-3.1-properSizeSetting.pl \ 45 kicker/kicker/kicker-3.1-properSizeSetting.pl \
43 kicker/kicker/kicker-3.5-kconfigXTize.pl \ 46 kicker/kicker/kicker-3.5-kconfigXTize.pl \
44 kicker/kicker/kicker-3.5-taskbarEnums.pl \ 47 kicker/kicker/kicker-3.5-taskbarEnums.pl \
45 kioslave/finger/kio_finger.pl \ 48 kioslave/finger/kio_finger.pl \
46 kioslave/info/kde-info2html \ 49 kioslave/info/kde-info2html \
47 klipper/klipper-1-2.pl \ 50 klipper/klipper-1-2.pl \
48 kwin/data/kwin3_plugin.pl \ 51 kwin/data/kwin3_plugin.pl \
@@ -192,24 +195,25 @@ CONFIGURE_ENV+= ac_cv_func_getutxent='no @@ -192,24 +195,25 @@ CONFIGURE_ENV+= ac_cv_func_getutxent='no
192# updated from NetBSD 1.x. 195# updated from NetBSD 1.x.
193CONFIGURE_ENV+= kde_cv_path_fontconfig_config='NONE' 196CONFIGURE_ENV+= kde_cv_path_fontconfig_config='NONE'
194.endif 197.endif
195 198
196.include "../../meta-pkgs/kde3/kde3.mk" 199.include "../../meta-pkgs/kde3/kde3.mk"
197.include "../../sysutils/desktop-file-utils/desktopdb.mk" 200.include "../../sysutils/desktop-file-utils/desktopdb.mk"
198 201
199.include "../../databases/openldap-client/buildlink3.mk" 202.include "../../databases/openldap-client/buildlink3.mk"
200.if ${OPSYS} != "SunOS" 203.if ${OPSYS} != "SunOS"
201.include "../../devel/libusb/buildlink3.mk" 204.include "../../devel/libusb/buildlink3.mk"
202.endif 205.endif
203.include "../../devel/zlib/buildlink3.mk" 206.include "../../devel/zlib/buildlink3.mk"
204.include "../../fonts/fontconfig/buildlink3.mk" 207.include "../../fonts/fontconfig/buildlink3.mk"
 208.include "../../fonts/libfontenc/buildlink3.mk"
205.include "../../graphics/freetype2/buildlink3.mk" 209.include "../../graphics/freetype2/buildlink3.mk"
206.include "../../graphics/hicolor-icon-theme/buildlink3.mk" 210.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
207.include "../../graphics/openexr/buildlink3.mk" 211.include "../../graphics/openexr/buildlink3.mk"
208.include "../../security/openssl/buildlink3.mk" 212.include "../../security/openssl/buildlink3.mk"
209.include "../../x11/kdelibs3/buildlink3.mk" 213.include "../../x11/kdelibs3/buildlink3.mk"
210.include "../../x11/libXcursor/buildlink3.mk" 214.include "../../x11/libXcursor/buildlink3.mk"
211.include "../../x11/libXrandr/buildlink3.mk" 215.include "../../x11/libXrandr/buildlink3.mk"
212.include "../../x11/libXt/buildlink3.mk" 216.include "../../x11/libXt/buildlink3.mk"
213.include "../../x11/libxkbfile/buildlink3.mk" 217.include "../../x11/libxkbfile/buildlink3.mk"
214 218
215.include "../../mk/bsd.pkg.mk" 219.include "../../mk/bsd.pkg.mk"