$PKG_SYSCONFDIR support from Jeremy C. Reed with minor changes from me.

Bump PKG_REVISION.
This commit is contained in:
markd 2005-03-06 12:57:38 +00:00
parent 8d2edeed36
commit 1076fabea0
5 changed files with 50 additions and 11 deletions

View file

@ -1,7 +1,7 @@
# $NetBSD: Makefile,v 1.67 2005/03/06 12:21:21 markd Exp $ # $NetBSD: Makefile,v 1.68 2005/03/06 12:57:38 markd Exp $
DISTNAME= kdebase-${_KDE_VERSION} DISTNAME= kdebase-${_KDE_VERSION}
PKGREVISION= 3 PKGREVISION= 4
CATEGORIES= x11 CATEGORIES= x11
COMMENT= Base modules for the KDE 3 integrated X11 desktop COMMENT= Base modules for the KDE 3 integrated X11 desktop
@ -41,6 +41,17 @@ REPLACE_PERL= \
CONF_FILES= ${PREFIX}/share/kde/config/kdm/kdmrc \ CONF_FILES= ${PREFIX}/share/kde/config/kdm/kdmrc \
${PKG_SYSCONFDIR}/kdm/kdmrc ${PKG_SYSCONFDIR}/kdm/kdmrc
CONF_FILES+= ${PREFIX}/share/examples/kdebase3/ksysguarddrc \
${PKG_SYSCONFDIR}/ksysguarddrc
CONF_FILES+= ${PREFIX}/share/examples/kdebase3/kde-information.menu \
${PKG_SYSCONFDIR}/xdg/menus/kde-information.menu
CONF_FILES+= ${PREFIX}/share/examples/kdebase3/kde-screensavers.menu \
${PKG_SYSCONFDIR}/xdg/menus/kde-screensavers.menu
CONF_FILES+= ${PREFIX}/share/examples/kdebase3/kde-settings.menu \
${PKG_SYSCONFDIR}/xdg/menus/kde-settings.menu
CONF_FILES+= ${PREFIX}/share/examples/kdebase3/applications-merged/kde-essential.menu \
${PKG_SYSCONFDIR}/xdg/menus/applications-merged/kde-essential.menu
MAKE_DIRS+= ${PKG_SYSCONFDIR}/xdg/menus/applications-merged
OWN_DIRS= ${PKG_SYSCONFDIR}/kdm OWN_DIRS= ${PKG_SYSCONFDIR}/kdm
RCD_SCRIPTS= kdm RCD_SCRIPTS= kdm

View file

@ -1,4 +1,4 @@
@comment $NetBSD: PLIST,v 1.28 2005/03/06 12:21:21 markd Exp $ @comment $NetBSD: PLIST,v 1.29 2005/03/06 12:57:38 markd Exp $
bin/appletproxy bin/appletproxy
bin/drkonqi bin/drkonqi
bin/extensionproxy bin/extensionproxy
@ -71,11 +71,6 @@ bin/kxkb
bin/nspluginscan bin/nspluginscan
bin/nspluginviewer bin/nspluginviewer
bin/startkde bin/startkde
etc/ksysguarddrc
etc/xdg/menus/applications-merged/kde-essential.menu
etc/xdg/menus/kde-information.menu
etc/xdg/menus/kde-screensavers.menu
etc/xdg/menus/kde-settings.menu
include/KBackgroundIface.h include/KBackgroundIface.h
include/KDesktopIface.h include/KDesktopIface.h
include/KScreensaverIface.h include/KScreensaverIface.h
@ -971,6 +966,11 @@ share/doc/kde/HTML/en/kwrite/index.docbook
share/doc/kde/HTML/en/kxkb/common share/doc/kde/HTML/en/kxkb/common
share/doc/kde/HTML/en/kxkb/index.cache.bz2 share/doc/kde/HTML/en/kxkb/index.cache.bz2
share/doc/kde/HTML/en/kxkb/index.docbook share/doc/kde/HTML/en/kxkb/index.docbook
share/examples/kdebase3/applications-merged/kde-essential.menu
share/examples/kdebase3/kde-information.menu
share/examples/kdebase3/kde-screensavers.menu
share/examples/kdebase3/kde-settings.menu
share/examples/kdebase3/ksysguarddrc
share/kde/applnk/.hidden/battery.desktop share/kde/applnk/.hidden/battery.desktop
share/kde/applnk/.hidden/bwarning.desktop share/kde/applnk/.hidden/bwarning.desktop
share/kde/applnk/.hidden/cwarning.desktop share/kde/applnk/.hidden/cwarning.desktop
@ -4013,6 +4013,8 @@ ${PKGLOCALEDIR}/locale/l10n/zw/flag.png
@comment in kde: @dirrm share/kde/applnk/.hidden @comment in kde: @dirrm share/kde/applnk/.hidden
@comment in kde: @dirrm share/kde/applnk @comment in kde: @dirrm share/kde/applnk
@comment in kde: @dirrm share/kde @comment in kde: @dirrm share/kde
@dirrm share/examples/kdebase3/applications-merged
@dirrm share/examples/kdebase3
@dirrm share/doc/kde/HTML/en/kxkb @dirrm share/doc/kde/HTML/en/kxkb
@dirrm share/doc/kde/HTML/en/kwrite @dirrm share/doc/kde/HTML/en/kwrite
@dirrm share/doc/kde/HTML/en/ksysguard @dirrm share/doc/kde/HTML/en/ksysguard
@ -4125,5 +4127,3 @@ ${PKGLOCALEDIR}/locale/l10n/zw/flag.png
@dirrm include/ksgrd @dirrm include/ksgrd
@dirrm include/kate/utils @dirrm include/kate/utils
@comment in kde: @dirrm include/kate @comment in kde: @dirrm include/kate
@dirrm etc/xdg/menus/applications-merged
@comment dirrm etc/xdg/menus

View file

@ -1,4 +1,4 @@
$NetBSD: distinfo,v 1.61 2005/03/06 12:21:21 markd Exp $ $NetBSD: distinfo,v 1.62 2005/03/06 12:57:38 markd Exp $
SHA1 (kdebase-3.3.2.tar.bz2) = 7807437bed2a2ee83591755f70ad42358a52a36e SHA1 (kdebase-3.3.2.tar.bz2) = 7807437bed2a2ee83591755f70ad42358a52a36e
RMD160 (kdebase-3.3.2.tar.bz2) = a57e2fd6f7810d4a82e18cf5b1afe59e39298075 RMD160 (kdebase-3.3.2.tar.bz2) = a57e2fd6f7810d4a82e18cf5b1afe59e39298075
@ -55,3 +55,5 @@ SHA1 (patch-fw) = bf0b590b6d416cfccbaed5dca4174002462db1ed
SHA1 (patch-fx) = 95451a2c5c614d5e1ff4799991b2e2dc11eada0f SHA1 (patch-fx) = 95451a2c5c614d5e1ff4799991b2e2dc11eada0f
SHA1 (patch-fy) = cf91cc7a5fe14bdfb38e4ca3ad4d82ffba86a05e SHA1 (patch-fy) = cf91cc7a5fe14bdfb38e4ca3ad4d82ffba86a05e
SHA1 (patch-fz) = 49dcc3508edf4deccadce5ff788b424bb0fc6d78 SHA1 (patch-fz) = 49dcc3508edf4deccadce5ff788b424bb0fc6d78
SHA1 (patch-ga) = 40ab73f3e32e8d8e8c58662df7c5dc54bd4acd29
SHA1 (patch-gb) = b36e23cf6c64e42269b396f389c5a0e24a40e67e

View file

@ -0,0 +1,13 @@
$NetBSD: patch-ga,v 1.1 2005/03/06 12:57:38 markd Exp $
--- ksysguard/example/Makefile.in.orig 2004-11-30 04:43:14.000000000 +1300
+++ ksysguard/example/Makefile.in
@@ -490,7 +490,7 @@ xdg_directorydir = @xdg_directorydir@
xdg_menudir = @xdg_menudir@
ksysguard_example_datadir = $(kde_datadir)/ksysguard
ksysguard_example_data_DATA = eventsrc
-etcdir = $(sysconfdir)
+etcdir = $(prefix)/share/examples/kdebase3
etc_DATA = ksysguarddrc
#>- all: all-am
#>+ 1

View file

@ -0,0 +1,13 @@
$NetBSD: patch-gb,v 1.1 2005/03/06 12:57:38 markd Exp $
--- applnk/Makefile.in.orig 2004-11-30 04:43:04.000000000 +1300
+++ applnk/Makefile.in
@@ -504,7 +504,7 @@ x_includes = @x_includes@
x_libraries = @x_libraries@
xdg_appsdir = @xdg_appsdir@
xdg_directorydir = @xdg_directorydir@
-xdg_menudir = @xdg_menudir@
+xdg_menudir = $(prefix)/share/examples/kdebase3
SUBDIRS = compat
xdg_menu_DATA = kde-settings.menu kde-information.menu kde-screensavers.menu
xdg_mergedmenu_DATA = kde-essential.menu