diff options
| -rw-r--r-- | textproc/dict-client/Makefile | 6 | ||||
| -rw-r--r-- | textproc/dict-server/Makefile | 14 | ||||
| -rw-r--r-- | textproc/dict-server/PLIST | 7 |
3 files changed, 19 insertions, 8 deletions
diff --git a/textproc/dict-client/Makefile b/textproc/dict-client/Makefile index af7f987f922..74fa21a65c4 100644 --- a/textproc/dict-client/Makefile +++ b/textproc/dict-client/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.11 2004/01/24 15:13:19 grant Exp $ +# $NetBSD: Makefile,v 1.12 2004/03/28 21:43:26 jmmv Exp $ DISTNAME= dictd-1.8.0 PKGNAME= dict-client-1.8.0 -PKGREVISION= 2 +PKGREVISION= 3 CATEGORIES= textproc MASTER_SITES= ftp://ftp.dict.org/pub/dict/ @@ -21,6 +21,8 @@ FILESDIR= ${.CURDIR}/../../textproc/dict-server/files PATCHDIR= ${.CURDIR}/../../textproc/dict-server/patches DISTINFO_FILE= ${.CURDIR}/../../textproc/dict-server/distinfo +CONFIGURE_ARGS+= --with-etcdir=${PKG_SYSCONFDIR} + # XXX This is needed by libltdl. .include "../../devel/libtool/buildlink2.mk" .include "../../mk/bsd.pkg.mk" diff --git a/textproc/dict-server/Makefile b/textproc/dict-server/Makefile index cd498987d83..5dccb685860 100644 --- a/textproc/dict-server/Makefile +++ b/textproc/dict-server/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.9 2004/01/24 15:13:19 grant Exp $ +# $NetBSD: Makefile,v 1.10 2004/03/28 21:43:26 jmmv Exp $ DISTNAME= dictd-1.8.0 PKGNAME= dict-server-1.8.0 -PKGREVISION= 1 +PKGREVISION= 2 CATEGORIES= textproc MASTER_SITES= ftp://ftp.dict.org/pub/dict/ #MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=/dict} @@ -13,12 +13,17 @@ COMMENT= Dictionary Service Protocol server USE_BUILDLINK2= # defined USE_GNU_TOOLS+= make +USE_PKGINSTALL= yes GNU_CONFIGURE= # defined -CONFIGURE_ARGS+=--with-etcdir=${PREFIX}/etc +CONFIGURE_ARGS+=--with-etcdir=${PKG_SYSCONFDIR} ALL_TARGET= dictd dictzip INSTALL_TARGET= install.dictd install.dictzip install.dictfmt +EGDIR= ${PREFIX}/share/examples/dict-server +CONF_FILES= ${EGDIR}/dictd.conf \ + ${PKG_SYSCONFDIR}/dictd.conf + # A symbol T_USER is defined in trap.h so... post-patch: ${GREP} -lr T_USER ${WRKSRC} | \ @@ -31,8 +36,9 @@ post-patch: done post-install: + ${INSTALL_DATA_DIR} ${EGDIR} ${SED} "s#/usr/lib/dict#${PREFIX}/share/dictd#" \ - ${WRKSRC}/dictd.conf >${PREFIX}/etc/dictd.conf + ${WRKSRC}/dictd.conf >${EGDIR}/dictd.conf ${INSTALL_DATA_DIR} ${PREFIX}/share/dictd .include "../../devel/libtool/buildlink2.mk" diff --git a/textproc/dict-server/PLIST b/textproc/dict-server/PLIST index d3c103bf1e6..f36607c7645 100644 --- a/textproc/dict-server/PLIST +++ b/textproc/dict-server/PLIST @@ -1,9 +1,12 @@ -@comment $NetBSD: PLIST,v 1.3 2002/12/27 02:40:19 uebayasi Exp $ +@comment $NetBSD: PLIST,v 1.4 2004/03/28 21:43:26 jmmv Exp $ bin/dictfmt bin/dictfmt_index2suffix bin/dictzip -etc/dictd.conf man/man1/dictfmt.1 man/man1/dictzip.1 man/man8/dictd.8 sbin/dictd +share/examples/dict-server/dictd.conf +@dirrm share/examples/dict-server +@exec ${MKDIR} %D/share/dictd +@dirrm share/dictd |