Radish alpha
H
HardenedBSD-pkg
rad:z3QDZAW2FAfuLvihrhiyDC9fAD8G9
HardenedBSD Package Manager
Radicle
Git
Commits › 34fb392
Add support for PORTSDIR values other than the default /usr/ports
John Marino committed 12 years ago
commit 34fb392d11f078f661cc6670b3c0008839b29e8e
parent 28bf592
3 files changed +12 -1
modified libpkg/Makefile
@@ -119,6 +119,10 @@ LDADD+= -ledit


CFLAGS+=	-DPREFIX=\"${PREFIX}\"
+ 
.if defined(PKG_PORTSDIR)
+ 
CFLAGS+=	-DPORTSDIR=\"${PKG_PORTSDIR}\"
+ 
.endif
+ 


.if defined(DEBUG_FLAGS)

.if ${DEBUG_FLAGS} == 1

DEBUG_FLAGS=	-ggdb -O0
modified pkg/Makefile
@@ -44,6 +44,10 @@ GITHASH!= cd ${.CURDIR} && git rev-parse --short HEAD
CFLAGS+=	-DGITHASH="\"${GITHASH}\""

.endif
+ 
.if defined(PKG_PORTSDIR)
+ 
CFLAGS+=	-DPORTSDIR=\"${PKG_PORTSDIR}\"
+ 
.endif
+ 


.if defined(DEBUG_FLAGS)

.if ${DEBUG_FLAGS} == 1

DEBUG_FLAGS=	-ggdb -O0
modified pkg/rquery.c
@@ -80,9 +80,12 @@ usage_rquery(void)
static void

print_index(struct pkg *pkg)

{
+ 
#ifndef PORTSDIR
+ 
#define PORTSDIR "/usr/ports"
+ 
#endif

	struct pkg_category *cat = NULL;
- 
	pkg_printf("%n-%v|/usr/ports/%o|%p|%c|/usr/ports/%o/pkg-descr|%m|",
+ 
	pkg_printf("%n-%v|" PORTSDIR "/%o|%p|%c|" PORTSDIR "/%o/pkg-descr|%m|",

	    pkg, pkg, pkg, pkg, pkg, pkg, pkg);

	while (pkg_categories(pkg, &cat) == EPKG_OK)

		pkg_printf("%Cn ", cat);