Index: head/databases/opentsdb/Makefile =================================================================== --- head/databases/opentsdb/Makefile (revision 405339) +++ head/databases/opentsdb/Makefile (revision 405340) @@ -1,58 +1,58 @@ # Created by: Johannes Meixner # $FreeBSD$ PORTNAME= opentsdb PORTVERSION= 2.1.3 +PORTREVISION= 1 CATEGORIES= databases java MASTER_SITES= https://github.com/OpenTSDB/opentsdb/releases/download/v${PORTVERSION}/ MAINTAINER= xmj@chaot.net COMMENT= OpenTSDB is the Scalable Timeseries Database LICENSE= LGPL3 BUILD_DEPENDS= bash:${PORTSDIR}/shells/bash \ curl:${PORTSDIR}/ftp/curl \ gawk:${PORTSDIR}/lang/gawk LIB_DEPENDS= libhadoop.so:${PORTSDIR}/devel/hadoop2 RUN_DEPENDS= hbase>0:${PORTSDIR}/databases/hbase USES= gmake python USE_JAVA= yes OPTIONS_DEFINE= GNUPLOT OPTIONS_DEFAULT= GNUPLOT GNUPLOT_RUN_DEPENDS= gnuplot:${PORTSDIR}/math/gnuplot HAS_CONFIGURE= yes MAKE_JOBS_UNSAFE= yes OPENTSDB_LOGDIR= /var/log/${PORTNAME} OPENTSDB_RUNDIR= /var/run/${PORTNAME} OPENTSDB_USER= opentsdb OPENTSDB_GROUP= opentsdb USERS= ${OPENTSDB_USER} GROUPS= ${OPENTSDB_GROUP} USE_RC_SUBR= opentsdb SUB_LIST= OPENTSDB_USER="${OPENTSDB_USER}" \ OPENTSDB_LOGDIR="${OPENTSDB_LOGDIR}" \ OPENTSDB_RUNDIR="${OPENTSDB_RUNDIR}" post-patch: ${REINPLACE_CMD} -i "" -e "s|python|${PYTHON_CMD}|" ${WRKSRC}/build-aux/gen_build_data.sh - #${REINPLACE_CMD} -i "" -e "s|%%PREFIX%%|${PREFIX}|" ${WRKSRC}/Makefile.in ${REINPLACE_CMD} -i "" -e "s|%%PREFIX%%|${PREFIX}|" ${WRKSRC}/src/utils/Config.java ${REINPLACE_CMD} -i "" -e "s|tsd.http.staticroot =|tsd.http.staticroot = ${DATADIR}/static|; s|tsd.http.cachedir =|tsd.http.cachedir = /tmp/opentsdb|; s|tsd.network.port =|tsd.network.port = 4242|;" ${WRKSRC}/src/opentsdb.conf post-install: ${MKDIR} ${STAGEDIR}${ETCDIR} ${STAGEDIR}${OPENTSDB_LOGDIR} ${STAGEDIR}${OPENTSDB_RUNDIR} ${INSTALL_DATA} ${WRKSRC}/src/logback.xml ${STAGEDIR}${ETCDIR} ${INSTALL_DATA} ${WRKSRC}/src/opentsdb.conf ${STAGEDIR}${ETCDIR}/opentsdb.conf.sample (cd "${STAGEDIR}${PREFIX}"; ${FIND} -s share/${PORTNAME}/static -name \*cache.html) >> ${TMPPLIST} .include Index: head/databases/opentsdb/files/patch-Makefile.in =================================================================== --- head/databases/opentsdb/files/patch-Makefile.in (revision 405339) +++ head/databases/opentsdb/files/patch-Makefile.in (revision 405340) @@ -1,21 +1,24 @@ --- Makefile.in.orig 2015-11-11 20:54:56 UTC +++ Makefile.in -@@ -1315,7 +1315,9 @@ printdeps: +@@ -1313,9 +1313,11 @@ printdeps: + # This is kind of a hack, but I couldn't find a better way to adjust the paths + # in the script before it gets installed... install-exec-hook: - script=tsdb; pkgdatadir='$(pkgdatadir)'; configdir='$(sysconfigdir)/etc/opentsdb'; \ +- script=tsdb; pkgdatadir='$(pkgdatadir)'; configdir='$(sysconfigdir)/etc/opentsdb'; \ ++ script=tsdb; pkgdatadir='$(pkgdatadir)'; configdir='$(sysconfdir)/opentsdb'; \ abs_srcdir=''; abs_builddir=''; $(edit_tsdb_script) + chmod u+w "$(DESTDIR)$(bindir)/tsdb" cat tsdb.tmp >"$(DESTDIR)$(bindir)/tsdb" + chmod u-w "$(DESTDIR)$(bindir)/tsdb" rm -f tsdb.tmp $(builddata_SRC): .git/HEAD $(tsdb_SRC) $(top_srcdir)/build-aux/gen_build_data.sh @@ -1366,7 +1368,7 @@ gwttsd: staticroot # how to tell it to install a bunch of files recursively for which I don't # know ahead of time what the file names are. install-data-local: staticroot install-data-lib install-data-tools \ - install-data-bin install-data-etc + install-data-bin @$(NORMAL_INSTALL) test -z "$(staticdir)" || $(mkdir_p) "$(DESTDIR)$(staticdir)" @set -e; pwd; ls -lFh; cd "$(DEV_TSD_STATICROOT)"; \ Property changes on: head/databases/opentsdb/files/patch-Makefile.in ___________________________________________________________________ Modified: fbsd:nokeywords ## -1 +1 ## -on \ No newline at end of property +yes \ No newline at end of property