Make this package install its configuration file under the examples tree

and use bsd.pkg.install.mk to copy it to PKG_SYSCONFDIR.
Bump PKGREVISION to 1.

4 files changed, 16 insertions, 8 deletions

diff --git a/graphics/tcm/Makefile b/graphics/tcm/Makefile
index 2c3344214da..5f9b5e49de0 100644
--- a/graphics/tcm/Makefile
+++ b/graphics/tcm/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.12 2002/09/23 01:26:25 jlam Exp $
+# $NetBSD: Makefile,v 1.13 2003/01/01 22:02:01 jmmv Exp $
 
 DISTNAME=		tcm-2.01.src
 PKGNAME=		tcm-2.01
+PKGREVISION=		1
 CATEGORIES=		graphics devel
 MASTER_SITES=		ftp://ftp.cs.utwente.nl/pub/tcm/
 
@@ -23,6 +24,10 @@ MAKE_ENV+=		MOTIF_HOME=${MOTIFBASE}
 TCM_SRC=		${WRKDIR}/tcm-2.01
 MAKE_ENV+=		TCM_HOME=${TCM_SRC}
 
+CPPFLAGS+=		-DPKG_SYSCONFDIR=\"\\\"${PKG_SYSCONFDIR}\\\"\"
+CONF_FILES=		${PREFIX}/share/examples/tcm/tcm.conf \
+			${PKG_SYSCONFDIR}/tcm.conf
+
 ALL_TARGET=		depend all
 
 post-extract:
@@ -54,7 +59,8 @@ do-install:
 	${LN} -fs ${PREFIX}/bin/tcmt ${PREFIX}/bin/$$f;			\
 	done
 	${INSTALL_SCRIPT} ${TCM_SRC}/bin/psf ${PREFIX}/bin
-	${INSTALL_DATA} ${TCM_SRC}/lib/tcm.conf ${PREFIX}/etc
+	${INSTALL_DATA_DIR} ${PREFIX}/share/examples/tcm
+	${INSTALL_DATA} ${TCM_SRC}/lib/tcm.conf ${PREFIX}/share/examples/tcm
 	${INSTALL_DATA} ${TCM_SRC}/lib/TCM ${PREFIX}/lib/X11/app-defaults/
 	${INSTALL_DATA} ${TCM_SRC}/man/man1/*.1 ${PREFIX}/man/man1/
 	${INSTALL_DATA_DIR} ${PREFIX}/share/tcm
@@ -86,6 +92,7 @@ do-install:
 		${PREFIX}/share/doc/html/tcm/wishlist/
 
 .include "../../mk/motif.buildlink2.mk"
+.include "../../mk/bsd.pkg.install.mk"
 .include "../../mk/bsd.pkg.mk"
 
 .if defined(MOTIF_TYPE) && (${MOTIF_TYPE} == "lesstif")
diff --git a/graphics/tcm/PLIST b/graphics/tcm/PLIST
index 5b2a7b5286a..57df59254e0 100644
--- a/graphics/tcm/PLIST
+++ b/graphics/tcm/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1 2001/10/31 23:54:04 zuntum Exp $
+@comment $NetBSD: PLIST,v 1.2 2003/01/01 22:02:01 jmmv Exp $
 bin/psf
 bin/tatd
 bin/tcm
@@ -25,7 +25,6 @@ bin/tstd
 bin/ttdt
 bin/ttut
 bin/tucd
-etc/tcm.conf
 lib/X11/app-defaults/TCM
 man/man1/psf.1
 man/man1/tatd.1
@@ -806,6 +805,7 @@ share/doc/tcm/README
 share/doc/tcm/developersguide-2.01.ps.gz
 share/doc/tcm/sourcecode-2.01.ps.gz
 share/doc/tcm/usersguide-2.01.ps.gz
+share/examples/tcm/tcm.conf
 share/tcm/banner.ps
 share/tcm/colorrgb.txt
 share/tcm/help/CHANGELOG
@@ -846,6 +846,7 @@ share/tcm/help/Version
 share/tcm/help/Welcome
 @dirrm share/tcm/help
 @dirrm share/tcm
+@dirrm share/examples/tcm
 @dirrm share/doc/tcm
 @dirrm share/doc/html/tcm/wishlist
 @dirrm share/doc/html/tcm/usersguide
diff --git a/graphics/tcm/distinfo b/graphics/tcm/distinfo
index 54d0fca1839..7cb6dfbe06a 100644
--- a/graphics/tcm/distinfo
+++ b/graphics/tcm/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.7 2002/09/23 01:26:26 jlam Exp $
+$NetBSD: distinfo,v 1.8 2003/01/01 22:02:01 jmmv Exp $
 
 SHA1 (tcm-2.01.src.tar.gz) = ce63d4310f43c89984cfcf2fc3da38eb55907c0f
 Size (tcm-2.01.src.tar.gz) = 3624778 bytes
@@ -17,7 +17,7 @@ SHA1 (patch-al) = 49b18674873b9e4556f39013dd6677722f04eb64
 SHA1 (patch-am) = 7aa052825735b055f622c3917e14529ef5d808a5
 SHA1 (patch-an) = 1c33207bb1e29caef8c592542c347e9916745fcc
 SHA1 (patch-ao) = 3581a8395b2ad1a861781f12f1a2fe05b3970cf4
-SHA1 (patch-ap) = 8470d73a87c586989dedd9391ba511f3d4941dce
+SHA1 (patch-ap) = 9aacd9d9500723db45d29f790edc0ef7ab14ed00
 SHA1 (patch-aq) = ed86083b7e02a235c84ffab3acbaffa8146f0945
 SHA1 (patch-ar) = 6b9b71925eb9a90d738c2646d51b0fd38f54a2d0
 SHA1 (patch-as) = acfdbdbaaac5878e658a83ba1c9a9d64f12db26f
diff --git a/graphics/tcm/patches/patch-ap b/graphics/tcm/patches/patch-ap
index d40d9e6cc6a..0befece9af0 100644
--- a/graphics/tcm/patches/patch-ap
+++ b/graphics/tcm/patches/patch-ap
@@ -1,4 +1,4 @@
-$NetBSD: patch-ap,v 1.1.1.1 2001/02/24 01:30:07 jtb Exp $
+$NetBSD: patch-ap,v 1.2 2003/01/01 22:02:02 jmmv Exp $
 
 --- gl/config.c.orig	Fri Feb 23 18:13:48 2001
 +++ gl/config.c
@@ -7,7 +7,7 @@ $NetBSD: patch-ap,v 1.1.1.1 2001/02/24 01:30:07 jtb Exp $
  #include <string.h>
  
 -const char Config::SYS_CONFIG[] = "lib/tcm.conf";
-+const char Config::SYS_CONFIG[] = "etc/tcm.conf";
++const char Config::SYS_CONFIG[] = PKG_SYSCONFDIR "/tcm.conf";
  const char Config::USER_CONFIG[] = ".tcmrc";
  
  Config::Config(const char *s) {