Fri Mar 9 19:15:19 2012 UTC ()
clean-ups (adapted for recent mk-configure)


(cheusov)
diff -r1.8 -r1.9 pkgsrc/pkgtools/pkg_online-client/Makefile
diff -r1.6 -r1.7 pkgsrc/pkgtools/pkg_online-server/Makefile
cvs diff -r1.8 -r1.9 pkgsrc/pkgtools/pkg_online-client/Makefile (expand / switch to unified diff)

--- pkgsrc/pkgtools/pkg_online-client/Makefile 2012/01/08 15:16:37 1.8
+++ pkgsrc/pkgtools/pkg_online-client/Makefile 2012/03/09 19:15:19 1.9
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.8 2012/01/08 15:16:37 cheusov Exp $ 1# $NetBSD: Makefile,v 1.9 2012/03/09 19:15:19 cheusov Exp $
2# 2#
3 3
4.include "../../pkgtools/pkg_online-server/Makefile.common" 4.include "../../pkgtools/pkg_online-server/Makefile.common"
5 5
6PKGNAME= ${DISTNAME:C/online/online-client/} 6PKGNAME= ${DISTNAME:C/online/online-client/}
7CATEGORIES= pkgtools 7CATEGORIES= pkgtools
8MAINTAINER= cheusov@NetBSD.org 8MAINTAINER= cheusov@NetBSD.org
9COMMENT+= (client tools) 9COMMENT+= (client tools)
10 10
11DEPENDS+= dict-client>=1.10.9:../../textproc/dict-client 11DEPENDS+= dict-client>=1.10.9:../../textproc/dict-client
12DEPENDS+= pkg_summary-utils>=0.49:../../pkgtools/pkg_summary-utils 12DEPENDS+= pkg_summary-utils>=0.49:../../pkgtools/pkg_summary-utils
13DEPENDS+= pipestatus-[0-9]*:../../devel/pipestatus 13DEPENDS+= pipestatus-[0-9]*:../../devel/pipestatus
14DEPENDS+= netcat-[0-9]*:../../net/netcat 14DEPENDS+= netcat-[0-9]*:../../net/netcat
@@ -18,17 +18,15 @@ BUILD_DEPENDS+= mk-configure>=0.20.0:../ @@ -18,17 +18,15 @@ BUILD_DEPENDS+= mk-configure>=0.20.0:../
18 18
19INSTALL_TARGET= install-client install-doc 19INSTALL_TARGET= install-client install-doc
20 20
21DOCDIR= ${PREFIX}/share/doc/pkg_online-client 21DOCDIR= ${PREFIX}/share/doc/pkg_online-client
22EGDIR= ${PREFIX}/share/examples/pkg_online-client 22EGDIR= ${PREFIX}/share/examples/pkg_online-client
23 23
24MAKE_ENV+= DOCDIR=${DOCDIR} EGDIR=${EGDIR} 24MAKE_ENV+= DOCDIR=${DOCDIR} EGDIR=${EGDIR}
25 25
26CONF_FILES= ${EGDIR}/pkg_online_client.conf \ 26CONF_FILES= ${EGDIR}/pkg_online_client.conf \
27 ${PKG_SYSCONFDIR}/pkg_online_client.conf 27 ${PKG_SYSCONFDIR}/pkg_online_client.conf
28 28
29REPLACE_SH= client/pkg_online_client client/pkg_online_find 29REPLACE_SH= client/pkg_online_client client/pkg_online_find
30 30
31MAKE_PROGRAM= mkcmake 31.include "../../devel/mk-configure/mk-c.mk"
32 
33.include "../../devel/mk-configure/configure.mk" 
34.include "../../mk/bsd.pkg.mk" 32.include "../../mk/bsd.pkg.mk"
cvs diff -r1.6 -r1.7 pkgsrc/pkgtools/pkg_online-server/Makefile (expand / switch to unified diff)

--- pkgsrc/pkgtools/pkg_online-server/Makefile 2011/10/09 10:02:45 1.6
+++ pkgsrc/pkgtools/pkg_online-server/Makefile 2012/03/09 19:15:19 1.7
@@ -1,30 +1,28 @@ @@ -1,30 +1,28 @@
1# $NetBSD: Makefile,v 1.6 2011/10/09 10:02:45 cheusov Exp $ 1# $NetBSD: Makefile,v 1.7 2012/03/09 19:15:19 cheusov Exp $
2# 2#
3 3
4.include "../../pkgtools/pkg_online-server/Makefile.common" 4.include "../../pkgtools/pkg_online-server/Makefile.common"
5 5
6PKGNAME= ${DISTNAME:C/online/online-server/} 6PKGNAME= ${DISTNAME:C/online/online-server/}
7CATEGORIES= pkgtools 7CATEGORIES= pkgtools
8MAINTAINER= cheusov@NetBSD.org 8MAINTAINER= cheusov@NetBSD.org
9COMMENT+= (server tools) 9COMMENT+= (server tools)
10 10
11DEPENDS+= dict-server>=1.10.10nb2:../../textproc/dict-server 11DEPENDS+= dict-server>=1.10.10nb2:../../textproc/dict-server
12DEPENDS+= pkg_summary-utils>=0.18.1:../../pkgtools/pkg_summary-utils 12DEPENDS+= pkg_summary-utils>=0.18.1:../../pkgtools/pkg_summary-utils
13DEPENDS+= pipestatus-[0-9]*:../../devel/pipestatus 13DEPENDS+= pipestatus-[0-9]*:../../devel/pipestatus
14 14
15BUILD_DEPENDS+= mk-configure>=0.20.0:../../devel/mk-configure 15BUILD_DEPENDS+= mk-configure>=0.20.0:../../devel/mk-configure
16 16
17INSTALL_TARGET= install-server install-doc 17INSTALL_TARGET= install-server install-doc
18 18
19DOCDIR= ${PREFIX}/share/doc/pkg_online-server 19DOCDIR= ${PREFIX}/share/doc/pkg_online-server
20EGDIR= ${PREFIX}/share/examples/pkg_online-server 20EGDIR= ${PREFIX}/share/examples/pkg_online-server
21 21
22MAKE_ENV+= DOCDIR=${DOCDIR} EGDIR=${EGDIR} 22MAKE_ENV+= DOCDIR=${DOCDIR} EGDIR=${EGDIR}
23 23
24CONF_FILES= ${EGDIR}/pkg_online_server.conf \ 24CONF_FILES= ${EGDIR}/pkg_online_server.conf \
25 ${PKG_SYSCONFDIR}/pkg_online_server.conf 25 ${PKG_SYSCONFDIR}/pkg_online_server.conf
26 26
27MAKE_PROGRAM= mkcmake 27.include "../../devel/mk-configure/mk-c.mk"
28 
29.include "../../devel/mk-configure/configure.mk" 
30.include "../../mk/bsd.pkg.mk" 28.include "../../mk/bsd.pkg.mk"