diff options
| author | Max Khon <fjoe@FreeBSD.org> | 2012-06-08 09:45:15 +0000 |
|---|---|---|
| committer | Max Khon <fjoe@FreeBSD.org> | 2012-06-08 09:45:15 +0000 |
| commit | 960d281773abe1a366414fc38b61af23e884e445 (patch) | |
| tree | 839b0316f5a11c52f68c3c0ddd3ab392be8117f1 /misc/dahdi | |
| parent | 0220ed5a0a7d0b0c55b4c225d6b0ad511133a27b (diff) | |
| download | ports-960d281773abe1a366414fc38b61af23e884e445.tar.gz ports-960d281773abe1a366414fc38b61af23e884e445.zip | |
Fix dahdi-kmod userland headers installation without /usr/src
Notes
Notes:
svn path=/head/; revision=298746
Diffstat (limited to 'misc/dahdi')
| -rw-r--r-- | misc/dahdi/Makefile | 3 | ||||
| -rw-r--r-- | misc/dahdi/files/patch-freebsd-freebsd-dahdi-Makefile | 10 | ||||
| -rw-r--r-- | misc/dahdi/files/patch-tools-Makefile | 4 |
3 files changed, 14 insertions, 3 deletions
diff --git a/misc/dahdi/Makefile b/misc/dahdi/Makefile index 07cf690824a3..068150f7454d 100644 --- a/misc/dahdi/Makefile +++ b/misc/dahdi/Makefile @@ -27,6 +27,7 @@ USE_GMAKE= yes CONFIGURE_ARGS= --with-dahdi=../freebsd --sysconfdir=${PREFIX}/etc --with-newt=${LOCALBASE} CONFIGURE_ENV= WGET=/usr/bin/fetch WRKSRC= ${WRKDIR}/${DISTNAME}/tools +PATCH_WRKSRC= ${WRKDIR}/${DISTNAME} USE_LDCONFIG= yes CONFLICTS= zaptel-[0-9]* @@ -46,7 +47,7 @@ post-patch: post-install: @${ECHO_CMD} "==> Installing dahdi-kmod userland includes" @${MKDIR} ${PREFIX}/include/dahdi/compat - @for i in `${MAKE} -C ${WRKSRC}/../freebsd/freebsd/dahdi -V INCS`; do\ + @for i in `${MAKE} -C ${WRKSRC}/../freebsd/freebsd/dahdi -DPRINT_INCS -V INCS`; do\ ${ECHO_CMD} "Installing $$i";\ ${INSTALL_DATA} ${WRKSRC}/../freebsd/include/dahdi/$$i ${PREFIX}/include/dahdi/$$i;\ done diff --git a/misc/dahdi/files/patch-freebsd-freebsd-dahdi-Makefile b/misc/dahdi/files/patch-freebsd-freebsd-dahdi-Makefile new file mode 100644 index 000000000000..672c29a24bb4 --- /dev/null +++ b/misc/dahdi/files/patch-freebsd-freebsd-dahdi-Makefile @@ -0,0 +1,10 @@ +--- freebsd/freebsd/dahdi/Makefile.orig 2012-06-08 16:19:22.000000000 +0700 ++++ freebsd/freebsd/dahdi/Makefile 2012-06-08 16:19:09.000000000 +0700 +@@ -20,5 +20,7 @@ + ${INSTALL_DATA} ${INCLUDEDIR}/dahdi/${_h} ${PREFIX}/include/dahdi/${_h:H} + .endfor + ++.if !defined(PRINT_INCS) + .include <bsd.kmod.mk> ++.endif + .include <bsd.own.mk> diff --git a/misc/dahdi/files/patch-tools-Makefile b/misc/dahdi/files/patch-tools-Makefile index 44ce633fbd29..48028dd64066 100644 --- a/misc/dahdi/files/patch-tools-Makefile +++ b/misc/dahdi/files/patch-tools-Makefile @@ -1,5 +1,5 @@ ---- Makefile.orig 2010-04-01 22:45:47.000000000 +0700 -+++ Makefile 2010-06-01 17:18:37.000000000 +0700 +--- tools/Makefile.orig 2010-04-01 22:45:47.000000000 +0700 ++++ tools/Makefile 2010-06-01 17:18:37.000000000 +0700 @@ -27,7 +27,7 @@ endif |