pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/x11/kdebase3 Fixed some pkglint warnings.
details: https://anonhg.NetBSD.org/pkgsrc/rev/110124651f48
branches: trunk
changeset: 559647:110124651f48
user: rillig <rillig%pkgsrc.org@localhost>
date: Tue May 26 21:41:06 2009 +0000
description:
Fixed some pkglint warnings.
diffstat:
x11/kdebase3/Makefile | 11 +++++++----
x11/kdebase3/buildlink3.mk | 6 +++---
2 files changed, 10 insertions(+), 7 deletions(-)
diffs (73 lines):
diff -r 1cc4ef27e15e -r 110124651f48 x11/kdebase3/Makefile
--- a/x11/kdebase3/Makefile Tue May 26 21:40:42 2009 +0000
+++ b/x11/kdebase3/Makefile Tue May 26 21:41:06 2009 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.147 2009/05/06 11:04:18 markd Exp $
+# $NetBSD: Makefile,v 1.148 2009/05/26 21:41:06 rillig Exp $
DISTNAME= kdebase-${_KDE_VERSION}
PKGREVISION= 2
@@ -73,7 +73,7 @@
PLIST_SRC= ${WRKDIR}/PLIST.Xdpms
-_KDE3_EXTRA_INCLUDES= ${LOCALBASE}/include:${X11BASE}/include:${BUILDLINK_PREFIX.freetype2}/include/freetype2
+_KDE3_EXTRA_INCLUDES= ${PREFIX}/include:${X11BASE}/include:${BUILDLINK_PREFIX.freetype2}/include/freetype2
# Don't execute kappfinder_install at install-time. This causes random
# applications to be found which causes random .desktop files to be created
@@ -124,17 +124,19 @@
.endif
.endif
-SUBST_CLASSES+= htdig paths xkb
+SUBST_CLASSES+= htdig
SUBST_STAGE.htdig= post-patch
SUBST_MESSAGE.htdig= Fix htdig paths.
SUBST_FILES.htdig= khelpcenter/searchhandlers/khc_htsearch.pl
SUBST_SED.htdig= -e s:/srv/www/cgi-bin:${PREFIX}/libexec/cgi-bin:
+SUBST_CLASSES+= paths
SUBST_FILES.paths= kcontrol/kdm/main.cpp kioslave/info/kde-info2html.conf
SUBST_SED.paths= -e 's,@PKG_SYSCONFDIR@,${PKG_SYSCONFDIR},g'
-SUBST_SED.paths+= -e 's,@LOCALBASE@,${LOCALBASE},g'
+SUBST_SED.paths+= -e 's,@LOCALBASE@,${PREFIX},g'
SUBST_STAGE.paths= post-patch
+SUBST_CLASSES+= xkb
SUBST_FILES.xkb= kxkb/x11helper.cpp
SUBST_SED.xkb= -e 's:XLIBDIR:"${X11BASE}/lib/X11/", "${X11BASE}/share/X11/", XLIBDIR:'
SUBST_STAGE.xkb= post-patch
@@ -195,6 +197,7 @@
.endif
.include "../../meta-pkgs/kde3/kde3.mk"
+.include "../../sysutils/desktop-file-utils/desktopdb.mk"
.include "../../databases/openldap-client/buildlink3.mk"
.if ${OPSYS} != "SunOS"
diff -r 1cc4ef27e15e -r 110124651f48 x11/kdebase3/buildlink3.mk
--- a/x11/kdebase3/buildlink3.mk Tue May 26 21:40:42 2009 +0000
+++ b/x11/kdebase3/buildlink3.mk Tue May 26 21:41:06 2009 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.29 2009/05/20 00:58:30 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.30 2009/05/26 21:41:06 rillig Exp $
BUILDLINK_TREE+= kdebase
@@ -6,13 +6,13 @@
KDEBASE_BUILDLINK3_MK:=
BUILDLINK_API_DEPENDS.kdebase+= kdebase>=3.5.0nb2
-BUILDLINK_ABI_DEPENDS.kdebase?= kdebase>=3.5.10nb2
+BUILDLINK_ABI_DEPENDS.kdebase+= kdebase>=3.5.10nb2
BUILDLINK_PKGSRCDIR.kdebase?= ../../x11/kdebase3
pkgbase := kdebase
.include "../../mk/pkg-build-options.mk"
-BUILDLINK_API_DEPENDS.Xrandr+= Xrandr>=1.0
+BUILDLINK_API_DEPENDS.Xrandr+= Xrandr>=1.0
.include "../../databases/openldap-client/buildlink3.mk"
.include "../../fonts/fontconfig/buildlink3.mk"
Home |
Main Index |
Thread Index |
Old Index