Index: head/net/mpd5/Makefile =================================================================== --- head/net/mpd5/Makefile (revision 546342) +++ head/net/mpd5/Makefile (revision 546343) @@ -1,51 +1,51 @@ # Created by: Archie Cobbs # $FreeBSD$ PORTNAME= mpd DISTVERSION= 5.8 -PORTREVISION= 10 +PORTREVISION= 11 CATEGORIES= net MASTER_SITES= SF/${PORTNAME}/Mpd5/Mpd-${PORTVERSION} PKGNAMESUFFIX= 5 DIST_SUBDIR= mpd5 MAINTAINER= eugen@FreeBSD.org COMMENT= Multi-link PPP daemon based on netgraph(4) LICENSE= BSD3CLAUSE OPTIONS_DEFINE= DOCS NG_IPACCT NG_IPACCT_DESC= Use ng_ipacct kernel module from port HAS_CONFIGURE= YES CONFIGURE_WRKSRC= "${WRKSRC}/src" USES= ssl .include MAKE_ARGS+= OSVERSION=${OSVERSION} .if ${PORT_OPTIONS:MNG_IPACCT} BUILD_DEPENDS+= ${LOCALBASE}/include/netgraph/ng_ipacct.h:net-mgmt/ng_ipacct .if exists(${KMODDIR}/ng_ipacct.ko) RUN_DEPENDS+= ${KMODDIR}/ng_ipacct.ko:net-mgmt/ng_ipacct .else RUN_DEPENDS+= /boot/modules/ng_ipacct.ko:net-mgmt/ng_ipacct .endif .else CONFIGURE_ENV+= USE_NG_IPACCT=no EXTRA_PATCHES+= ${FILESDIR}/extra-patch-no-ng_ipacct .endif USE_RC_SUBR= mpd5 CONFSUF= conf secret script DOCSDIR= ${PREFIX}/share/doc/mpd5 PORTDOCS= README mpd* PLIST_FILES= ${CONFSUF:S/^/etc\/mpd5\/mpd./:S/$/.sample/} sbin/mpd5 .if !defined(WITHOUT_MAN) PLIST_FILES+= man/man8/mpd5.8.gz .endif .include Index: head/net/mpd5/files/patch-write-abortmsg =================================================================== --- head/net/mpd5/files/patch-write-abortmsg (nonexistent) +++ head/net/mpd5/files/patch-write-abortmsg (revision 546343) @@ -0,0 +1,51 @@ +Index: src/log.h +=================================================================== +--- src/log.h (revision 2328) ++++ src/log.h (revision 2329) +@@ -14,6 +14,10 @@ + #ifndef _LG_H_ + #define _LG_H_ + ++#include "mbuf.h" ++ ++#include ++ + /* + * DEFINITIONS + */ +Index: src/contrib/libpdel/util/gtree.c +=================================================================== +--- src/contrib/libpdel/util/gtree.c (revision 2372) ++++ src/contrib/libpdel/util/gtree.c (revision 2373) +@@ -58,6 +58,9 @@ + #include "util/gtree.h" + #include "util/typed_mem.h" + ++#include "defs.h" ++#include "log.h" ++ + /* Enabled debug tracing: only use this when keys are strings */ + #define GTREE_TRACE 0 + +@@ -1091,7 +1094,7 @@ gtree_assert(int pred, const char *s, co + { + if (pred) + return; +- printf("FAILURE: %s:%u: %s\n", func, line, s); ++ Perror("FAILURE: %s:%u: %s\n", func, line, s); + gtree_print(g, stdout); + kill(getpid(), SIGABRT); + } +Index: src/Makefile +=================================================================== +--- src/Makefile (revision 2372) ++++ src/Makefile (revision 2373) +@@ -162,7 +162,7 @@ STDSRCS+= web.c + LDADD+= -lssl + .endif + +-CFLAGS+= -DNOLIBPDEL -I./contrib/libpdel ++CFLAGS+= -DNOLIBPDEL -I. -I./contrib/libpdel + PDPATH1= contrib/libpdel/util:contrib/libpdel/structs + PDPATH2= contrib/libpdel/structs/type + .if defined ( NOWEB ) Property changes on: head/net/mpd5/files/patch-write-abortmsg ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property