- Move include files to ${PREFIX}/include/cactid to avoid compile time

conflicts with php.h from lang/php* ports.

Spotted by:	pav
This commit is contained in:
Clement Laforet 2005-03-21 14:48:31 +00:00
parent 3d0ae372d4
commit 911e76f94c
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=131840
6 changed files with 56 additions and 18 deletions

View file

@ -7,6 +7,7 @@
PORTNAME= cactid
PORTVERSION= 0.8.6.d
PORTREVISION= 1
CATEGORIES= net
MASTER_SITES= http://www.cacti.net/downloads/cactid/
DISTNAME= cacti-${PORTNAME}-0.8.6d

View file

@ -0,0 +1,18 @@
--- Makefile.in.orig Wed Jan 19 06:04:10 2005
+++ Makefile.in Mon Mar 21 16:41:51 2005
@@ -227,12 +227,12 @@
includeHEADERS_INSTALL = $(INSTALL_HEADER)
install-includeHEADERS: $(include_HEADERS)
@$(NORMAL_INSTALL)
- $(mkinstalldirs) $(DESTDIR)$(includedir)
+ $(mkinstalldirs) $(DESTDIR)$(pkgincludedir)
@list='$(include_HEADERS)'; for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " $(includeHEADERS_INSTALL) $$d$$p $(DESTDIR)$(includedir)/$$f"; \
- $(includeHEADERS_INSTALL) $$d$$p $(DESTDIR)$(includedir)/$$f; \
+ echo " $(includeHEADERS_INSTALL) $$d$$p $(DESTDIR)$(pkgincludedir)/$$f"; \
+ $(includeHEADERS_INSTALL) $$d$$p $(DESTDIR)$(pkgincludedir)/$$f; \
done
uninstall-includeHEADERS:

View file

@ -2,13 +2,13 @@ bin/cactid
@unexec if cmp -s %D/etc/cactid.conf %D/%%EXAMPLESDIR%%/cactid.conf; then rm -f %D/etc/cactid.conf; fi
%%EXAMPLESDIR%%/cactid.conf
@exec [ -f %D/etc/cactid.conf ] || cp %D/%%EXAMPLESDIR%%/httpd-std.conf %D/etc/cactid.conf
include/cactid.h
include/common.h
include/locks.h
include/nft_popen.h
include/php.h
include/poller.h
include/snmp.h
include/sql.h
include/util.h
include/cactid/cactid.h
include/cactid/common.h
include/cactid/locks.h
include/cactid/nft_popen.h
include/cactid/php.h
include/cactid/poller.h
include/cactid/snmp.h
include/cactid/sql.h
include/cactid/util.h
@dirrm %%EXAMPLESDIR%%

View file

@ -7,6 +7,7 @@
PORTNAME= cactid
PORTVERSION= 0.8.6.d
PORTREVISION= 1
CATEGORIES= net
MASTER_SITES= http://www.cacti.net/downloads/cactid/
DISTNAME= cacti-${PORTNAME}-0.8.6d

View file

@ -0,0 +1,18 @@
--- Makefile.in.orig Wed Jan 19 06:04:10 2005
+++ Makefile.in Mon Mar 21 16:41:51 2005
@@ -227,12 +227,12 @@
includeHEADERS_INSTALL = $(INSTALL_HEADER)
install-includeHEADERS: $(include_HEADERS)
@$(NORMAL_INSTALL)
- $(mkinstalldirs) $(DESTDIR)$(includedir)
+ $(mkinstalldirs) $(DESTDIR)$(pkgincludedir)
@list='$(include_HEADERS)'; for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " $(includeHEADERS_INSTALL) $$d$$p $(DESTDIR)$(includedir)/$$f"; \
- $(includeHEADERS_INSTALL) $$d$$p $(DESTDIR)$(includedir)/$$f; \
+ echo " $(includeHEADERS_INSTALL) $$d$$p $(DESTDIR)$(pkgincludedir)/$$f"; \
+ $(includeHEADERS_INSTALL) $$d$$p $(DESTDIR)$(pkgincludedir)/$$f; \
done
uninstall-includeHEADERS:

View file

@ -2,13 +2,13 @@ bin/cactid
@unexec if cmp -s %D/etc/cactid.conf %D/%%EXAMPLESDIR%%/cactid.conf; then rm -f %D/etc/cactid.conf; fi
%%EXAMPLESDIR%%/cactid.conf
@exec [ -f %D/etc/cactid.conf ] || cp %D/%%EXAMPLESDIR%%/httpd-std.conf %D/etc/cactid.conf
include/cactid.h
include/common.h
include/locks.h
include/nft_popen.h
include/php.h
include/poller.h
include/snmp.h
include/sql.h
include/util.h
include/cactid/cactid.h
include/cactid/common.h
include/cactid/locks.h
include/cactid/nft_popen.h
include/cactid/php.h
include/cactid/poller.h
include/cactid/snmp.h
include/cactid/sql.h
include/cactid/util.h
@dirrm %%EXAMPLESDIR%%