diff options
| author | clement <clement@FreeBSD.org> | 2005-03-21 14:48:31 +0000 |
|---|---|---|
| committer | clement <clement@FreeBSD.org> | 2005-03-21 14:48:31 +0000 |
| commit | df3b2a3fa465d034532c9816b723a587bacee5ae (patch) | |
| tree | 03c6dd71b17e042213ca813abbf4d789fb54d508 /net | |
| parent | 8b9b3ce6d22cf6c608bf0e00feba12387d0a5bb5 (diff) | |
| download | FreeBSD-ports-df3b2a3fa465d034532c9816b723a587bacee5ae.zip FreeBSD-ports-df3b2a3fa465d034532c9816b723a587bacee5ae.tar.gz | |
- Move include files to ${PREFIX}/include/cactid to avoid compile time
conflicts with php.h from lang/php* ports.
Spotted by: pav
Diffstat (limited to 'net')
| -rw-r--r-- | net/cactid/Makefile | 1 | ||||
| -rw-r--r-- | net/cactid/files/patch-Makefile.in | 18 | ||||
| -rw-r--r-- | net/cactid/pkg-plist | 18 |
3 files changed, 28 insertions, 9 deletions
diff --git a/net/cactid/Makefile b/net/cactid/Makefile index 00e4525..cc3561b 100644 --- a/net/cactid/Makefile +++ b/net/cactid/Makefile @@ -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 diff --git a/net/cactid/files/patch-Makefile.in b/net/cactid/files/patch-Makefile.in new file mode 100644 index 0000000..5d48834 --- /dev/null +++ b/net/cactid/files/patch-Makefile.in @@ -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: diff --git a/net/cactid/pkg-plist b/net/cactid/pkg-plist index 79c4f4c..d75f2e5 100644 --- a/net/cactid/pkg-plist +++ b/net/cactid/pkg-plist @@ -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%% |
