Radish alpha
H
HardenedBSD-pkg
rad:z3QDZAW2FAfuLvihrhiyDC9fAD8G9
HardenedBSD Package Manager
Radicle
Git
Commits › 7ef54a9
Cleanup the build time settable (macros) options
Baptiste Daroussin committed 12 years ago
commit 7ef54a96b7a81fab56a5685a704e0c3281b2a329
parent 4bc7073
1 file changed +6 -18
modified libpkg/pkg_config.c
@@ -45,6 +45,12 @@
#include "private/event.h"



#define REPO_NAME_PREFIX "repo-"
+ 
#ifndef PORTSDIR
+ 
#define PORTSDIR "/usr/ports"
+ 
#endif
+ 
#ifndef DEFAULT_VULNXML_URL
+ 
#define DEFAULT_VULNXML_URL "http://www.vuxml.org/freebsd/vuln.xml.bz2",
+ 
#endif



int eventpipe = -1;
@@ -75,11 +81,7 @@ static struct config_entry c[] = {
	{

		PKG_STRING,

		"PORTSDIR",
- 
#ifdef PORTSDIR
- 
		PORTSDIR,
- 
#else

		"/usr/ports",
- 
#endif

		"Location of the ports collection",

	},

	{
@@ -132,22 +134,8 @@ static struct config_entry c[] = {
	},

	{

		PKG_STRING,
- 
		"PORTAUDIT_SITE",
- 
#ifdef DEFAULT_AUDIT_URL
- 
		DEFAULT_AUDIT_URL,
- 
#else
- 
		"http://portaudit.FreeBSD.org/auditfile.tbz",
- 
#endif
- 
		"URL giving location of the audit database",
- 
	},
- 
	{
- 
		PKG_STRING,

		"VULNXML_SITE",
- 
#ifdef DEFAULT_VULNXML_URL

		DEFAULT_VULNXML_URL,
- 
#else
- 
		"http://www.vuxml.org/freebsd/vuln.xml.bz2",
- 
#endif

		"URL giving location of the vulnxml database",

	},

	{