From bd2788d930980fb7fff304fa568751d0f69d819b Mon Sep 17 00:00:00 2001
From: jlam <jlam@pkgsrc.org>
Date: Fri, 19 Aug 2005 18:12:36 +0000
Subject: Merge CONF_FILES/SUPPORT_FILES and
 CONF_FILES_PERMS/SUPPORT_FILES_PERMS as the INSTALL and DEINSTALL scripts no
 longer distinguish between the two types of files.  Drop
 SUPPORT_FILES{,_PERMS} and modify the packages in pkgsrc accordingly.

---
 textproc/icu/Makefile       | 4 ++--
 textproc/xmlcatmgr/Makefile | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'textproc')

diff --git a/textproc/icu/Makefile b/textproc/icu/Makefile
index b1b587d61bc..12a114e6674 100644
--- a/textproc/icu/Makefile
+++ b/textproc/icu/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.41 2005/06/24 16:44:15 kristerw Exp $
+# $NetBSD: Makefile,v 1.42 2005/08/19 18:12:39 jlam Exp $
 #
 
 DISTNAME=	icu-3.2
@@ -28,7 +28,7 @@ PKG_SYSCONFSUBDIR=	icu
 CONVRTRS_EG=		${CONVRTRS_EG_DIR}/convrtrs.txt
 CONVRTRS_EG_DIR=	${PREFIX}/share/examples/icu
 
-SUPPORT_FILES+=		${CONVRTRS_EG} ${PKG_SYSCONFDIR}/convrtrs.txt
+CONF_FILES+=		${CONVRTRS_EG} ${PKG_SYSCONFDIR}/convrtrs.txt
 
 .include "../../mk/pthread.buildlink3.mk"
 
diff --git a/textproc/xmlcatmgr/Makefile b/textproc/xmlcatmgr/Makefile
index 19110efa692..cce6baceb59 100644
--- a/textproc/xmlcatmgr/Makefile
+++ b/textproc/xmlcatmgr/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 2005/04/11 21:47:43 tv Exp $
+# $NetBSD: Makefile,v 1.25 2005/08/19 18:12:39 jlam Exp $
 #
 
 DISTNAME=	xmlcatmgr-2.2
@@ -20,9 +20,9 @@ OWN_DIRS=	${PKG_SYSCONFDIR}/sgml ${PKG_SYSCONFDIR}/xml
 EGDIR=		${PREFIX}/share/examples/xmlcatmgr
 CONF_FILES=	${EGDIR}/catalog.etc.sgml ${PKG_SYSCONFDIR}/sgml/catalog
 CONF_FILES+=	${EGDIR}/catalog.etc.xml ${PKG_SYSCONFDIR}/xml/catalog
+CONF_FILES+=	${EGDIR}/catalog.share.sgml ${PREFIX}/share/sgml/catalog
+CONF_FILES+=	${EGDIR}/catalog.share.xml ${PREFIX}/share/xml/catalog
 MAKE_DIRS=	${PREFIX}/share/sgml ${PREFIX}/share/xml
-SUPPORT_FILES=	${EGDIR}/catalog.share.sgml ${PREFIX}/share/sgml/catalog
-SUPPORT_FILES+=	${EGDIR}/catalog.share.xml ${PREFIX}/share/xml/catalog
 
 PRINT_PLIST_AWK+=	/^@dirrm share\/(sgml|xml)$$/ { next; }
 
-- 
cgit v1.2.3