1
0
mirror of https://git.FreeBSD.org/ports.git synced 2024-12-24 04:33:24 +00:00

Per the instructions of the software, cfengine is now dependent on BerkleyDB 3.

In fact, the only thing (that I can tell anyway) that uses the DB functions is
cfd. I'm guessing most people don't use it, especially since I haven't heard
any complaints about it.

Also, it was putting some of the docs in / (for some really strange reason).
That should be fixed too. They are now put in {PREFIX}/share/doc/cfengine,
depending on NOPORTSDOC (somewhat reverse logic than normal, but it made the
amount of changes less).

Finally, strip the binaries.

PR:		26189
Submitted by:	    maintainer
This commit is contained in:
Michael Haro 2001-04-02 10:21:20 +00:00
parent 6897c38223
commit 985047d96a
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=40737
16 changed files with 116 additions and 36 deletions

View File

@ -7,6 +7,7 @@
PORTNAME= cfengine
PORTVERSION= 1.6.3
PORTREVISION= 1
CATEGORIES= sysutils
MASTER_SITES= ftp://ftp.iu.hioslo.no/pub/cfengine/ \
${MASTER_SITE_GNU}
@ -14,8 +15,9 @@ MASTER_SITE_SUBDIR= ${PORTNAME}
MAINTAINER= gordont@bluemtn.net
LIB_DEPENDS= db3:${PORTSDIR}/databases/db3
.if defined(PACKAGE_BUILDING) && !exists(/usr/include/tcpd.h)
LIB_DEPENDS= wrap.7:${PORTSDIR}/security/tcp_wrapper
LIB_DEPENDS+= wrap.7:${PORTSDIR}/security/tcp_wrapper
.endif
USE_GMAKE= yes
@ -27,11 +29,11 @@ pre-configure:
@cd ${WRKSRC} && aclocal && autoheader
post-install:
.if !defined(NOPORTDOCS)
@${MKDIR} ${PREFIX}/share/doc/${PORTNAME}
.for docfile in cf-security.html cfengine-Reference.html cfengine-Tutorial.html
${INSTALL_MAN} ${WRKSRC}/doc/${docfile} ${PREFIX}/share/doc/${PORTNAME}
.endfor
.if defined(NOPORTDOCS)
@${RM} -rf ${PREFIX}/share/doc/${PORTNAME}
.endif
.for binary in cfd cfengine cfrun cfkey
@strip ${PREFIX}/sbin/${binary}
.endfor
.include <bsd.port.mk>

View File

@ -1,3 +1,6 @@
This moves the documentation out of /usr/local/share/cfengine/{doc,html} into
/usr/local/shared/doc/cfengine to keep it inline with the rest of the ports.
--- doc/Makefile.am.orig Fri Dec 1 19:24:39 2000
+++ doc/Makefile.am Tue Jan 23 02:07:04 2001
@@ -2,7 +2,7 @@
@ -5,7 +8,7 @@
# Info used in building and installing HTML files
-htmldir = $(pkgdatadir)/html
+htmldir = # $(pkgdatadir)/html
+htmldir = $(datadir)/doc/cfengine
htmlfiles = cfengine-Reference.html cfengine-Tutorial.html
html_DATA = $(htmlfiles) cf-security.html
@ -14,7 +17,7 @@
psfiles = $(ps1) # $(ps2)
-psdir = $(pkgdatadir)/doc
+psdir = # $(pkgdatadir)/doc
+psdir = $(datadir)/doc/cfengine
ps_DATA = $(psfiles)
# Make sure these get distributed with everything else.

View File

@ -0,0 +1,15 @@
This patch only makes sense if you subscribe to the FreeBSD port model.
Basically this only works if you have installed BerkleyDB from the ports
collection.
--- src/misc.c.orig Wed Jan 24 07:28:01 2001
+++ src/misc.c Wed Mar 28 12:41:06 2001
@@ -39,7 +39,7 @@
#ifdef HAVE_DB_H
-# include <db.h>
+#include <db3/db.h>
#endif
/*******************************************************************/

View File

@ -46,8 +46,8 @@ share/cfengine/cfengine.el
share/cfengine/cfrc.example
share/cfengine/cfrun.hosts.example
share/cfengine/start-cfd
@dirrm share/cfengine
%%PORTDOCS%%share/doc/cfengine/cf-security.html
%%PORTDOCS%%share/doc/cfengine/cfengine-Reference.html
%%PORTDOCS%%share/doc/cfengine/cfengine-Tutorial.html
%%PORTDOCS%%@dirrm share/doc/cfengine
@dirrm share/cfengine

View File

@ -7,6 +7,7 @@
PORTNAME= cfengine
PORTVERSION= 1.6.3
PORTREVISION= 1
CATEGORIES= sysutils
MASTER_SITES= ftp://ftp.iu.hioslo.no/pub/cfengine/ \
${MASTER_SITE_GNU}
@ -14,8 +15,9 @@ MASTER_SITE_SUBDIR= ${PORTNAME}
MAINTAINER= gordont@bluemtn.net
LIB_DEPENDS= db3:${PORTSDIR}/databases/db3
.if defined(PACKAGE_BUILDING) && !exists(/usr/include/tcpd.h)
LIB_DEPENDS= wrap.7:${PORTSDIR}/security/tcp_wrapper
LIB_DEPENDS+= wrap.7:${PORTSDIR}/security/tcp_wrapper
.endif
USE_GMAKE= yes
@ -27,11 +29,11 @@ pre-configure:
@cd ${WRKSRC} && aclocal && autoheader
post-install:
.if !defined(NOPORTDOCS)
@${MKDIR} ${PREFIX}/share/doc/${PORTNAME}
.for docfile in cf-security.html cfengine-Reference.html cfengine-Tutorial.html
${INSTALL_MAN} ${WRKSRC}/doc/${docfile} ${PREFIX}/share/doc/${PORTNAME}
.endfor
.if defined(NOPORTDOCS)
@${RM} -rf ${PREFIX}/share/doc/${PORTNAME}
.endif
.for binary in cfd cfengine cfrun cfkey
@strip ${PREFIX}/sbin/${binary}
.endfor
.include <bsd.port.mk>

View File

@ -1,3 +1,6 @@
This moves the documentation out of /usr/local/share/cfengine/{doc,html} into
/usr/local/shared/doc/cfengine to keep it inline with the rest of the ports.
--- doc/Makefile.am.orig Fri Dec 1 19:24:39 2000
+++ doc/Makefile.am Tue Jan 23 02:07:04 2001
@@ -2,7 +2,7 @@
@ -5,7 +8,7 @@
# Info used in building and installing HTML files
-htmldir = $(pkgdatadir)/html
+htmldir = # $(pkgdatadir)/html
+htmldir = $(datadir)/doc/cfengine
htmlfiles = cfengine-Reference.html cfengine-Tutorial.html
html_DATA = $(htmlfiles) cf-security.html
@ -14,7 +17,7 @@
psfiles = $(ps1) # $(ps2)
-psdir = $(pkgdatadir)/doc
+psdir = # $(pkgdatadir)/doc
+psdir = $(datadir)/doc/cfengine
ps_DATA = $(psfiles)
# Make sure these get distributed with everything else.

View File

@ -0,0 +1,15 @@
This patch only makes sense if you subscribe to the FreeBSD port model.
Basically this only works if you have installed BerkleyDB from the ports
collection.
--- src/misc.c.orig Wed Jan 24 07:28:01 2001
+++ src/misc.c Wed Mar 28 12:41:06 2001
@@ -39,7 +39,7 @@
#ifdef HAVE_DB_H
-# include <db.h>
+#include <db3/db.h>
#endif
/*******************************************************************/

View File

@ -46,8 +46,8 @@ share/cfengine/cfengine.el
share/cfengine/cfrc.example
share/cfengine/cfrun.hosts.example
share/cfengine/start-cfd
@dirrm share/cfengine
%%PORTDOCS%%share/doc/cfengine/cf-security.html
%%PORTDOCS%%share/doc/cfengine/cfengine-Reference.html
%%PORTDOCS%%share/doc/cfengine/cfengine-Tutorial.html
%%PORTDOCS%%@dirrm share/doc/cfengine
@dirrm share/cfengine

View File

@ -7,6 +7,7 @@
PORTNAME= cfengine
PORTVERSION= 1.6.3
PORTREVISION= 1
CATEGORIES= sysutils
MASTER_SITES= ftp://ftp.iu.hioslo.no/pub/cfengine/ \
${MASTER_SITE_GNU}
@ -14,8 +15,9 @@ MASTER_SITE_SUBDIR= ${PORTNAME}
MAINTAINER= gordont@bluemtn.net
LIB_DEPENDS= db3:${PORTSDIR}/databases/db3
.if defined(PACKAGE_BUILDING) && !exists(/usr/include/tcpd.h)
LIB_DEPENDS= wrap.7:${PORTSDIR}/security/tcp_wrapper
LIB_DEPENDS+= wrap.7:${PORTSDIR}/security/tcp_wrapper
.endif
USE_GMAKE= yes
@ -27,11 +29,11 @@ pre-configure:
@cd ${WRKSRC} && aclocal && autoheader
post-install:
.if !defined(NOPORTDOCS)
@${MKDIR} ${PREFIX}/share/doc/${PORTNAME}
.for docfile in cf-security.html cfengine-Reference.html cfengine-Tutorial.html
${INSTALL_MAN} ${WRKSRC}/doc/${docfile} ${PREFIX}/share/doc/${PORTNAME}
.endfor
.if defined(NOPORTDOCS)
@${RM} -rf ${PREFIX}/share/doc/${PORTNAME}
.endif
.for binary in cfd cfengine cfrun cfkey
@strip ${PREFIX}/sbin/${binary}
.endfor
.include <bsd.port.mk>

View File

@ -1,3 +1,6 @@
This moves the documentation out of /usr/local/share/cfengine/{doc,html} into
/usr/local/shared/doc/cfengine to keep it inline with the rest of the ports.
--- doc/Makefile.am.orig Fri Dec 1 19:24:39 2000
+++ doc/Makefile.am Tue Jan 23 02:07:04 2001
@@ -2,7 +2,7 @@
@ -5,7 +8,7 @@
# Info used in building and installing HTML files
-htmldir = $(pkgdatadir)/html
+htmldir = # $(pkgdatadir)/html
+htmldir = $(datadir)/doc/cfengine
htmlfiles = cfengine-Reference.html cfengine-Tutorial.html
html_DATA = $(htmlfiles) cf-security.html
@ -14,7 +17,7 @@
psfiles = $(ps1) # $(ps2)
-psdir = $(pkgdatadir)/doc
+psdir = # $(pkgdatadir)/doc
+psdir = $(datadir)/doc/cfengine
ps_DATA = $(psfiles)
# Make sure these get distributed with everything else.

View File

@ -0,0 +1,15 @@
This patch only makes sense if you subscribe to the FreeBSD port model.
Basically this only works if you have installed BerkleyDB from the ports
collection.
--- src/misc.c.orig Wed Jan 24 07:28:01 2001
+++ src/misc.c Wed Mar 28 12:41:06 2001
@@ -39,7 +39,7 @@
#ifdef HAVE_DB_H
-# include <db.h>
+#include <db3/db.h>
#endif
/*******************************************************************/

View File

@ -46,8 +46,8 @@ share/cfengine/cfengine.el
share/cfengine/cfrc.example
share/cfengine/cfrun.hosts.example
share/cfengine/start-cfd
@dirrm share/cfengine
%%PORTDOCS%%share/doc/cfengine/cf-security.html
%%PORTDOCS%%share/doc/cfengine/cfengine-Reference.html
%%PORTDOCS%%share/doc/cfengine/cfengine-Tutorial.html
%%PORTDOCS%%@dirrm share/doc/cfengine
@dirrm share/cfengine

View File

@ -7,6 +7,7 @@
PORTNAME= cfengine
PORTVERSION= 1.6.3
PORTREVISION= 1
CATEGORIES= sysutils
MASTER_SITES= ftp://ftp.iu.hioslo.no/pub/cfengine/ \
${MASTER_SITE_GNU}
@ -14,8 +15,9 @@ MASTER_SITE_SUBDIR= ${PORTNAME}
MAINTAINER= gordont@bluemtn.net
LIB_DEPENDS= db3:${PORTSDIR}/databases/db3
.if defined(PACKAGE_BUILDING) && !exists(/usr/include/tcpd.h)
LIB_DEPENDS= wrap.7:${PORTSDIR}/security/tcp_wrapper
LIB_DEPENDS+= wrap.7:${PORTSDIR}/security/tcp_wrapper
.endif
USE_GMAKE= yes
@ -27,11 +29,11 @@ pre-configure:
@cd ${WRKSRC} && aclocal && autoheader
post-install:
.if !defined(NOPORTDOCS)
@${MKDIR} ${PREFIX}/share/doc/${PORTNAME}
.for docfile in cf-security.html cfengine-Reference.html cfengine-Tutorial.html
${INSTALL_MAN} ${WRKSRC}/doc/${docfile} ${PREFIX}/share/doc/${PORTNAME}
.endfor
.if defined(NOPORTDOCS)
@${RM} -rf ${PREFIX}/share/doc/${PORTNAME}
.endif
.for binary in cfd cfengine cfrun cfkey
@strip ${PREFIX}/sbin/${binary}
.endfor
.include <bsd.port.mk>

View File

@ -1,3 +1,6 @@
This moves the documentation out of /usr/local/share/cfengine/{doc,html} into
/usr/local/shared/doc/cfengine to keep it inline with the rest of the ports.
--- doc/Makefile.am.orig Fri Dec 1 19:24:39 2000
+++ doc/Makefile.am Tue Jan 23 02:07:04 2001
@@ -2,7 +2,7 @@
@ -5,7 +8,7 @@
# Info used in building and installing HTML files
-htmldir = $(pkgdatadir)/html
+htmldir = # $(pkgdatadir)/html
+htmldir = $(datadir)/doc/cfengine
htmlfiles = cfengine-Reference.html cfengine-Tutorial.html
html_DATA = $(htmlfiles) cf-security.html
@ -14,7 +17,7 @@
psfiles = $(ps1) # $(ps2)
-psdir = $(pkgdatadir)/doc
+psdir = # $(pkgdatadir)/doc
+psdir = $(datadir)/doc/cfengine
ps_DATA = $(psfiles)
# Make sure these get distributed with everything else.

View File

@ -0,0 +1,15 @@
This patch only makes sense if you subscribe to the FreeBSD port model.
Basically this only works if you have installed BerkleyDB from the ports
collection.
--- src/misc.c.orig Wed Jan 24 07:28:01 2001
+++ src/misc.c Wed Mar 28 12:41:06 2001
@@ -39,7 +39,7 @@
#ifdef HAVE_DB_H
-# include <db.h>
+#include <db3/db.h>
#endif
/*******************************************************************/

View File

@ -46,8 +46,8 @@ share/cfengine/cfengine.el
share/cfengine/cfrc.example
share/cfengine/cfrun.hosts.example
share/cfengine/start-cfd
@dirrm share/cfengine
%%PORTDOCS%%share/doc/cfengine/cf-security.html
%%PORTDOCS%%share/doc/cfengine/cfengine-Reference.html
%%PORTDOCS%%share/doc/cfengine/cfengine-Tutorial.html
%%PORTDOCS%%@dirrm share/doc/cfengine
@dirrm share/cfengine