Index: cfengine/Makefile
===================================================================
RCS file: /cvs/ports/sysutils/cfengine/Makefile,v
retrieving revision 1.30
diff -u cfengine/Makefile
--- cfengine/Makefile	25 Apr 2009 22:07:37 -0000	1.30
+++ cfengine/Makefile	28 Apr 2010 01:30:41 -0000
@@ -2,7 +2,7 @@
 
 COMMENT=	GNU system administration tool for networks
 
-DISTNAME=      	cfengine-2.2.9
+DISTNAME=      	cfengine-3.0.4
 CATEGORIES=	sysutils
 
 HOMEPAGE=	http://www.cfengine.org/
@@ -17,11 +17,14 @@
 
 WANTLIB=		c crypto m pthread
 
-MASTER_SITES=		${HOMEPAGE}downloads/
+MASTER_SITES=		${HOMEPAGE}tarballs/
 
+CONFIGURE_ENV=		LDFLAGS="-L${LOCALBASE}/lib"
+
 CONFIGURE_STYLE=	gnu
-CONFIGURE_ARGS+=	--with-docs
+CONFIGURE_ARGS+=	--with-pcre=${LOCALBASE} --with-tokyocabinet
 
-LIB_DEPENDS=		lib/db4/db.>=4:db->=4,<5:databases/db/v4
+LIB_DEPENDS=		tokyocabinet::databases/tokyocabinet \
+			pcre::devel/pcre
 
 .include <bsd.port.mk>
Index: cfengine/distinfo
===================================================================
RCS file: /cvs/ports/sysutils/cfengine/distinfo,v
retrieving revision 1.11
diff -u cfengine/distinfo
--- cfengine/distinfo	25 Apr 2009 22:07:37 -0000	1.11
+++ cfengine/distinfo	28 Apr 2010 01:30:41 -0000
@@ -1,5 +1,5 @@
-MD5 (cfengine-2.2.9.tar.gz) = zhFVhweKeoNF3KUokflVEw==
-RMD160 (cfengine-2.2.9.tar.gz) = U3tqJnuxcORyLz0OJZ4NS3hkL04=
-SHA1 (cfengine-2.2.9.tar.gz) = kCwzetrocq2MnhYvhvag0aIINSU=
-SHA256 (cfengine-2.2.9.tar.gz) = mEid1JoVxObyBlQ11BWkpdC3nWexBHjusKDeV5prreI=
-SIZE (cfengine-2.2.9.tar.gz) = 2933246
+MD5 (cfengine-3.0.4.tar.gz) = h3/5YbRFwbfd1plKuACUMw==
+RMD160 (cfengine-3.0.4.tar.gz) = bHUH1ytkawVbglE8lDzs0jdDAHI=
+SHA1 (cfengine-3.0.4.tar.gz) = ccbEG8cXoD3224WF4RpnNBXx+Uw=
+SHA256 (cfengine-3.0.4.tar.gz) = fgqngH5oynqczantC1f9IMkQIL0oEMIUCygC6MpGGiE=
+SIZE (cfengine-3.0.4.tar.gz) = 2217103
Index: cfengine/pkg/PLIST
===================================================================
RCS file: /cvs/ports/sysutils/cfengine/pkg/PLIST,v
retrieving revision 1.11
diff -u cfengine/pkg/PLIST
--- cfengine/pkg/PLIST	25 Apr 2009 22:07:37 -0000	1.11
+++ cfengine/pkg/PLIST	28 Apr 2010 01:30:41 -0000
@@ -1,60 +1,223 @@
 @comment $OpenBSD: PLIST,v 1.11 2009/04/25 22:07:37 okan Exp $
-@info info/cfengine-Anomalies.info
-@info info/cfengine-Reference.info
-@info info/cfengine-Tutorial.info
-lib/libcfengine.a
-lib/libcfengine.la
-@man man/man8/cfagent.8
-@man man/man8/cfengine.8
-@man man/man8/cfenvd.8
-@man man/man8/cfenvgraph.8
-@man man/man8/cfetoolcheck.8
-@man man/man8/cfetoolcreate.8
-@man man/man8/cfetooldump.8
-@man man/man8/cfetoolgraph.8
-@man man/man8/cfetoolimport.8
-@man man/man8/cfetoolinfo.8
-@man man/man8/cfetoolupdate.8
-@man man/man8/cfexecd.8
-@man man/man8/cfkey.8
-@man man/man8/cfrun.8
-@man man/man8/cfservd.8
-@man man/man8/cfshow.8
-@bin sbin/cfagent
-sbin/cfdoc
-@bin sbin/cfenvd
-@bin sbin/cfenvgraph
-@bin sbin/cfetool
-@bin sbin/cfetoolgraph
-@bin sbin/cfexecd
-@bin sbin/cfkey
-@bin sbin/cfrun
-@bin sbin/cfservd
-@bin sbin/cfshow
-share/cfengine/
-share/cfengine/ChangeLog
-share/cfengine/INSTALL
-share/cfengine/NEWS
-share/cfengine/README
-share/cfengine/cfengine.el
-share/examples/cfengine/
-share/examples/cfengine/cf.chflags.example
-share/examples/cfengine/cf.freebsd.example
-share/examples/cfengine/cf.ftp.example
-share/examples/cfengine/cf.groups.example
-share/examples/cfengine/cf.linux.example
-share/examples/cfengine/cf.main.example
-share/examples/cfengine/cf.motd.example
-share/examples/cfengine/cf.preconf.example
-share/examples/cfengine/cf.services.example
-share/examples/cfengine/cf.site.example
-share/examples/cfengine/cf.solaris.example
-share/examples/cfengine/cf.sun4.example
-share/examples/cfengine/cf.users.example
-share/examples/cfengine/cfagent.conf-advanced.example
-share/examples/cfengine/cfagent.conf.example
-share/examples/cfengine/cfrc.example
-share/examples/cfengine/cfrun.hosts.example
-share/examples/cfengine/cfservd.conf.example
-share/examples/cfengine/update.conf.example
+lib/libpromises.a
+lib/libpromises.la
+@man man/man8/cf-agent.8
+@man man/man8/cf-execd.8
+@man man/man8/cf-key.8
+@man man/man8/cf-know.8
+@man man/man8/cf-monitord.8
+@man man/man8/cf-promises.8
+@man man/man8/cf-report.8
+@man man/man8/cf-runagent.8
+@man man/man8/cf-serverd.8
+@bin sbin/cf-agent
+@bin sbin/cf-execd
+@bin sbin/cf-key
+@bin sbin/cf-know
+@bin sbin/cf-monitord
+@bin sbin/cf-promises
+@bin sbin/cf-report
+@bin sbin/cf-runagent
+@bin sbin/cf-serverd
+share/doc/cfengine/
+share/doc/cfengine/ChangeLog
+share/doc/cfengine/INSTALL
+share/doc/cfengine/NEWS
+share/doc/cfengine/README
+share/doc/cfengine/cfengine_stdlib.cf
+share/doc/cfengine/inputs/
+share/doc/cfengine/inputs/failsafe.cf
+share/doc/cfengine/inputs/library.cf
+share/doc/cfengine/inputs/promises.cf
+share/doc/cfengine/inputs/site.cf
+share/doc/cfengine/inputs/update.cf
+share/doc/cfengine/promise_knowledge.cf
+share/doc/cfengine/unit_accessed_before.cf
+share/doc/cfengine/unit_accumulated_time.cf
+share/doc/cfengine/unit_acl.cf
+share/doc/cfengine/unit_acl_generic.cf
+share/doc/cfengine/unit_acl_secret.cf
+share/doc/cfengine/unit_ago.cf
+share/doc/cfengine/unit_arrays.cf
+share/doc/cfengine/unit_backreferences_files.cf
+share/doc/cfengine/unit_badpromise.cf
+share/doc/cfengine/unit_badtype.cf
+share/doc/cfengine/unit_bsdflags.cf
+share/doc/cfengine/unit_cf2_integration.cf
+share/doc/cfengine/unit_change_detect.cf
+share/doc/cfengine/unit_changedbefore.cf
+share/doc/cfengine/unit_chdir.cf
+share/doc/cfengine/unit_classes_global.cf
+share/doc/cfengine/unit_classmatch.cf
+share/doc/cfengine/unit_classvar_convergence.cf
+share/doc/cfengine/unit_compare.cf
+share/doc/cfengine/unit_control_expand.cf
+share/doc/cfengine/unit_controlclasses.cf
+share/doc/cfengine/unit_copy.cf
+share/doc/cfengine/unit_copy_classes.cf
+share/doc/cfengine/unit_copy_edit.cf
+share/doc/cfengine/unit_copylinks.cf
+share/doc/cfengine/unit_countclassesmatching.cf
+share/doc/cfengine/unit_countlinesmatching.cf
+share/doc/cfengine/unit_create_filedir.cf
+share/doc/cfengine/unit_createdb.cf
+share/doc/cfengine/unit_customize_by_named_list.cf
+share/doc/cfengine/unit_definitions.cf
+share/doc/cfengine/unit_deletelines.cf
+share/doc/cfengine/unit_disable_and_rotate_files.cf
+share/doc/cfengine/unit_diskfree.cf
+share/doc/cfengine/unit_dollar.cf
+share/doc/cfengine/unit_edit_column_files.cf
+share/doc/cfengine/unit_edit_comment_lines.cf
+share/doc/cfengine/unit_edit_deletenotmatch.cf
+share/doc/cfengine/unit_edit_insert_lines.cf
+share/doc/cfengine/unit_edit_insert_lines_silly.cf
+share/doc/cfengine/unit_edit_passwd_file.cf
+share/doc/cfengine/unit_edit_replace_string.cf
+share/doc/cfengine/unit_edit_sectioned_file.cf
+share/doc/cfengine/unit_edit_setvar.cf
+share/doc/cfengine/unit_edit_triggerclass.cf
+share/doc/cfengine/unit_env.cf
+share/doc/cfengine/unit_epimenides.cf
+share/doc/cfengine/unit_escape.cf
+share/doc/cfengine/unit_exec_args.cf
+share/doc/cfengine/unit_exec_in_sequence.cf
+share/doc/cfengine/unit_execd.cf
+share/doc/cfengine/unit_execresult.cf
+share/doc/cfengine/unit_expand.cf
+share/doc/cfengine/unit_failsafe.cf
+share/doc/cfengine/unit_file_change_detection.cf
+share/doc/cfengine/unit_file_owner_list_template.cf
+share/doc/cfengine/unit_fileexists.cf
+share/doc/cfengine/unit_filenames.cf
+share/doc/cfengine/unit_fileperms.cf
+share/doc/cfengine/unit_filesexist.cf
+share/doc/cfengine/unit_filesexist2.cf
+share/doc/cfengine/unit_fix_names.cf
+share/doc/cfengine/unit_getenv.cf
+share/doc/cfengine/unit_getfields.cf
+share/doc/cfengine/unit_getgid.cf
+share/doc/cfengine/unit_getindices.cf
+share/doc/cfengine/unit_getindixes.cf
+share/doc/cfengine/unit_getregistry.cf
+share/doc/cfengine/unit_getuid.cf
+share/doc/cfengine/unit_global_list_expansion.cf
+share/doc/cfengine/unit_global_list_expansion_2.cf
+share/doc/cfengine/unit_grep.cf
+share/doc/cfengine/unit_groupexists.cf
+share/doc/cfengine/unit_hash.cf
+share/doc/cfengine/unit_hashcomment.cf
+share/doc/cfengine/unit_hashmatch.cf
+share/doc/cfengine/unit_hashuncomment.cf
+share/doc/cfengine/unit_helloworld.cf
+share/doc/cfengine/unit_host2ip.cf
+share/doc/cfengine/unit_hostrange.cf
+share/doc/cfengine/unit_hostsseen.cf
+share/doc/cfengine/unit_id.cf
+share/doc/cfengine/unit_insert_users.cf
+share/doc/cfengine/unit_intarray.cf
+share/doc/cfengine/unit_iprange.cf
+share/doc/cfengine/unit_irange.cf
+share/doc/cfengine/unit_isdir.cf
+share/doc/cfengine/unit_islink.cf
+share/doc/cfengine/unit_isnewerthan.cf
+share/doc/cfengine/unit_isplain.cf
+share/doc/cfengine/unit_isvariable.cf
+share/doc/cfengine/unit_iteration.cf
+share/doc/cfengine/unit_join.cf
+share/doc/cfengine/unit_knowledge_driver.cf
+share/doc/cfengine/unit_knowledge_txt.cf
+share/doc/cfengine/unit_lastnode.cf
+share/doc/cfengine/unit_ldap.cf
+share/doc/cfengine/unit_linking.cf
+share/doc/cfengine/unit_literal_server.cf
+share/doc/cfengine/unit_locate_files_and_compress.cf
+share/doc/cfengine/unit_log_private.cf
+share/doc/cfengine/unit_loops.cf
+share/doc/cfengine/unit_measure_log.cf
+share/doc/cfengine/unit_measurements.cf
+share/doc/cfengine/unit_method.cf
+share/doc/cfengine/unit_method_validate.cf
+share/doc/cfengine/unit_module_exec.cf
+share/doc/cfengine/unit_module_exec_2.cf
+share/doc/cfengine/unit_monitord.cf
+share/doc/cfengine/unit_mount_fs.cf
+share/doc/cfengine/unit_multipassvars.cf
+share/doc/cfengine/unit_neighbourhood_watch.cf
+share/doc/cfengine/unit_null_config.cf
+share/doc/cfengine/unit_occurrences.cf
+share/doc/cfengine/unit_ordering.cf
+share/doc/cfengine/unit_package_apt.cf
+share/doc/cfengine/unit_package_freebsd.cf
+share/doc/cfengine/unit_package_hash.cf
+share/doc/cfengine/unit_package_msi_file.cf
+share/doc/cfengine/unit_package_msi_version.cf
+share/doc/cfengine/unit_package_rpm.cf
+share/doc/cfengine/unit_package_solaris.cf
+share/doc/cfengine/unit_package_yum.cf
+share/doc/cfengine/unit_package_zypper.cf
+share/doc/cfengine/unit_parallel_exec.cf
+share/doc/cfengine/unit_pathtype.cf
+share/doc/cfengine/unit_pattern_and_edit.cf
+share/doc/cfengine/unit_peers.cf
+share/doc/cfengine/unit_postfix.cf
+share/doc/cfengine/unit_process_kill.cf
+share/doc/cfengine/unit_process_matching.cf
+share/doc/cfengine/unit_process_matching2.cf
+share/doc/cfengine/unit_process_matching3.cf
+share/doc/cfengine/unit_process_signalling.cf
+share/doc/cfengine/unit_promises.cf
+share/doc/cfengine/unit_readlist.cf
+share/doc/cfengine/unit_readtcp.cf
+share/doc/cfengine/unit_regarray.cf
+share/doc/cfengine/unit_regex_win.cf
+share/doc/cfengine/unit_regextract.cf
+share/doc/cfengine/unit_registry.cf
+share/doc/cfengine/unit_registry_cache.cf
+share/doc/cfengine/unit_regline.cf
+share/doc/cfengine/unit_reglist.cf
+share/doc/cfengine/unit_remoteclasses.cf
+share/doc/cfengine/unit_remove_deadlinks.cf
+share/doc/cfengine/unit_rename.cf
+share/doc/cfengine/unit_report_custom.cf
+share/doc/cfengine/unit_report_diffs.cf
+share/doc/cfengine/unit_report_state.cf
+share/doc/cfengine/unit_reporting.cf
+share/doc/cfengine/unit_reporttofile.cf
+share/doc/cfengine/unit_resolveconf.cf
+share/doc/cfengine/unit_returnszero.cf
+share/doc/cfengine/unit_root_passwd.cf
+share/doc/cfengine/unit_select_mode.cf
+share/doc/cfengine/unit_select_region.cf
+share/doc/cfengine/unit_select_size.cf
+share/doc/cfengine/unit_selectservers.cf
+share/doc/cfengine/unit_server_copy_localhost.cf
+share/doc/cfengine/unit_server_copy_purge.cf
+share/doc/cfengine/unit_server_copy_remote.cf
+share/doc/cfengine/unit_server_flatcopy_localhost.cf
+share/doc/cfengine/unit_service_disable.cf
+share/doc/cfengine/unit_service_start.cf
+share/doc/cfengine/unit_setuidlog.cf
+share/doc/cfengine/unit_setvar.cf
+share/doc/cfengine/unit_splitstring.cf
+share/doc/cfengine/unit_sql.cf
+share/doc/cfengine/unit_storage.cf
+share/doc/cfengine/unit_strcmp.cf
+share/doc/cfengine/unit_stringarray.cf
+share/doc/cfengine/unit_switchcase.cf
+share/doc/cfengine/unit_syslog.cf
+share/doc/cfengine/unit_syslog2.cf
+share/doc/cfengine/unit_template.cf
+share/doc/cfengine/unit_template2.cf
+share/doc/cfengine/unit_tidy_all_files.cf
+share/doc/cfengine/unit_translatepath.cf
+share/doc/cfengine/unit_update.cf
+share/doc/cfengine/unit_user_edit.cf
+share/doc/cfengine/unit_user_edit_method.cf
+share/doc/cfengine/unit_userexists.cf
+share/doc/cfengine/unit_varclass.cf
+share/doc/cfengine/unit_varnet.cf
+share/doc/cfengine/unit_vars.cf
+share/doc/cfengine/unit_warnifline.cf
+share/doc/cfengine/unit_webserver.cf
 @extraunexec rm -fr /var/cfengine
