Discussion:
[freenas/ports] e2f647c: ports-mgmt/bpm: Stagify.
(too old to reply)
d***@public.gmane.org
2014-08-24 00:14:18 UTC
Permalink
branch: masters/2014q2
Repository: freenas/ports
Pushed by: git
Pushed to: branch masters/2014q2
commit e2f647c317666e9da5ab05a7dcf74c479421cee5
Author: rene <rene-***@public.gmane.org>
Date: Thu Aug 21 23:25:41 2014 +0000

ports-mgmt/bpm: Stagify.
---
ports-mgmt/bpm/Makefile | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/ports-mgmt/bpm/Makefile b/ports-mgmt/bpm/Makefile
index 555497d..22eeb93 100644
--- a/ports-mgmt/bpm/Makefile
+++ b/ports-mgmt/bpm/Makefile
@@ -21,7 +21,6 @@ MAKE_ENV+= OSTYPE="${OPSYS}"

SUB_FILES= bpm.desktop

-NO_STAGE= yes
post-patch:
@${FIND} ${WRKSRC} -name Makefile | ${XARGS} \
${REINPLACE_CMD} -e "s|-lintl|-lintl -L${LOCALBASE}/lib|g"
@@ -32,6 +31,6 @@ post-patch:
${WRKSRC}/src/*.h

post-install:
- ${INSTALL_DATA} ${WRKDIR}/bpm.desktop ${PREFIX}/share/applications/bpm.desktop
+ ${INSTALL_DATA} ${WRKDIR}/bpm.desktop ${STAGEDIR}${PREFIX}/share/applications/bpm.desktop

.include <bsd.port.mk>
d***@public.gmane.org
2014-08-24 00:14:18 UTC
Permalink
branch: masters/2014q2
Repository: freenas/ports
Pushed by: git
Pushed to: branch masters/2014q2
commit 6a523d3b055926b979abeabeb7c3ebfc6b0cf62e
Author: marino <marino-***@public.gmane.org>
Date: Thu Aug 21 23:37:08 2014 +0000

databases/postgis21: Restore build of non-default raster option

Upstream made a change to support Debian's kFreeBSD and broke FreeBSD
in the process.

PR: 192840
patch by: Robert Kruus
staging: marino
---
databases/postgis21/Makefile | 1 +
databases/postgis21/files/patch-raster_rt__core_rt__api.h | 11 +++++++++++
databases/postgis21/pkg-plist | 12 ++++++++++++
3 files changed, 24 insertions(+)

diff --git a/databases/postgis21/Makefile b/databases/postgis21/Makefile
index 5e1d02f..dcad266 100644
--- a/databases/postgis21/Makefile
+++ b/databases/postgis21/Makefile
@@ -2,6 +2,7 @@

PORTNAME= postgis
PORTVERSION= 2.1.3
+PORTREVISION= 1
CATEGORIES= databases geography
MASTER_SITES= http://download.osgeo.org/postgis/source/

diff --git a/databases/postgis21/files/patch-raster_rt__core_rt__api.h b/databases/postgis21/files/patch-raster_rt__core_rt__api.h
new file mode 100644
index 0000000..c5d0236
--- /dev/null
+++ b/databases/postgis21/files/patch-raster_rt__core_rt__api.h
@@ -0,0 +1,11 @@
+--- raster/rt_core/rt_api.h.orig 2014-05-04 17:15:13 UTC
++++ raster/rt_core/rt_api.h
+@@ -42,7 +42,7 @@
+ #endif
+
+
+-#if defined(__FreeBSD_kernel__) || defined(__OpenBSD__) /* seems to work like Linux... */
++#if defined(__FreeBSD__) || defined(__DragonFly__) /* seems to work like Linux... */
+ #if !defined(LINUX)
+ #define LINUX
+ #endif
diff --git a/databases/postgis21/pkg-plist b/databases/postgis21/pkg-plist
index 5add088..3cef363 100644
--- a/databases/postgis21/pkg-plist
+++ b/databases/postgis21/pkg-plist
@@ -104,6 +104,10 @@ share/postgresql/contrib/postgis-2.1/uninstall_sfcgal.sql
%%RASTER%%share/postgresql/extension/postgis--2.0.2--%%PORTVERSION%%.sql
%%RASTER%%share/postgresql/extension/postgis--2.0.3--%%PORTVERSION%%.sql
%%RASTER%%share/postgresql/extension/postgis--2.0.4--%%PORTVERSION%%.sql
+%%RASTER%%share/postgresql/extension/postgis--2.0.5--%%PORTVERSION%%.sql
+%%RASTER%%share/postgresql/extension/postgis--2.1.0--%%PORTVERSION%%.sql
+%%RASTER%%share/postgresql/extension/postgis--2.1.1--%%PORTVERSION%%.sql
+%%RASTER%%share/postgresql/extension/postgis--2.1.2--%%PORTVERSION%%.sql
%%RASTER%%share/postgresql/extension/postgis--%%PORTVERSION%%--%%PORTVERSION%%next.sql
%%RASTER%%share/postgresql/extension/postgis--%%PORTVERSION%%.sql
%%RASTER%%share/postgresql/extension/postgis--%%PORTVERSION%%next--%%PORTVERSION%%.sql
@@ -117,6 +121,10 @@ share/postgresql/contrib/postgis-2.1/uninstall_sfcgal.sql
%%RASTER%%share/postgresql/extension/postgis_tiger_geocoder--2.0.2--%%PORTVERSION%%.sql
%%RASTER%%share/postgresql/extension/postgis_tiger_geocoder--2.0.3--%%PORTVERSION%%.sql
%%RASTER%%share/postgresql/extension/postgis_tiger_geocoder--2.0.4--%%PORTVERSION%%.sql
+%%RASTER%%share/postgresql/extension/postgis_tiger_geocoder--2.0.5--%%PORTVERSION%%.sql
+%%RASTER%%share/postgresql/extension/postgis_tiger_geocoder--2.1.0--%%PORTVERSION%%.sql
+%%RASTER%%share/postgresql/extension/postgis_tiger_geocoder--2.1.1--%%PORTVERSION%%.sql
+%%RASTER%%share/postgresql/extension/postgis_tiger_geocoder--2.1.2--%%PORTVERSION%%.sql
%%RASTER%%share/postgresql/extension/postgis_tiger_geocoder--%%PORTVERSION%%--%%PORTVERSION%%next.sql
%%RASTER%%share/postgresql/extension/postgis_tiger_geocoder--%%PORTVERSION%%.sql
%%RASTER%%share/postgresql/extension/postgis_tiger_geocoder--%%PORTVERSION%%next--%%PORTVERSION%%.sql
@@ -130,6 +138,10 @@ share/postgresql/contrib/postgis-2.1/uninstall_sfcgal.sql
%%RASTER%%share/postgresql/extension/postgis_topology--2.0.2--%%PORTVERSION%%.sql
%%RASTER%%share/postgresql/extension/postgis_topology--2.0.3--%%PORTVERSION%%.sql
%%RASTER%%share/postgresql/extension/postgis_topology--2.0.4--%%PORTVERSION%%.sql
+%%RASTER%%share/postgresql/extension/postgis_topology--2.0.5--%%PORTVERSION%%.sql
+%%RASTER%%share/postgresql/extension/postgis_topology--2.1.0--%%PORTVERSION%%.sql
+%%RASTER%%share/postgresql/extension/postgis_topology--2.1.1--%%PORTVERSION%%.sql
+%%RASTER%%share/postgresql/extension/postgis_topology--2.1.2--%%PORTVERSION%%.sql
%%RASTER%%share/postgresql/extension/postgis_topology--%%PORTVERSION%%--%%PORTVERSION%%next.sql
%%RASTER%%share/postgresql/extension/postgis_topology--%%PORTVERSION%%.sql
%%RASTER%%share/postgresql/extension/postgis_topology--%%PORTVERSION%%next--%%PORTVERSION%%.sql
d***@public.gmane.org
2014-08-24 00:14:18 UTC
Permalink
branch: masters/2014q2
Repository: freenas/ports
Pushed by: git
Pushed to: branch masters/2014q2
commit 1eec98868ac9be5aa2a00c0fb3ad30603186085e
Author: stephen <stephen-***@public.gmane.org>
Date: Thu Aug 21 23:38:59 2014 +0000

- Stage support.
---
devel/noweb/Makefile | 11 +++--------
devel/noweb/files/patch-Makefile | 21 +++++++++++++++------
devel/noweb/pkg-install | 3 ---
devel/noweb/pkg-plist | 14 ++++++++++++++
4 files changed, 32 insertions(+), 17 deletions(-)

diff --git a/devel/noweb/Makefile b/devel/noweb/Makefile
index 7d2bab7..baf8f98 100644
--- a/devel/noweb/Makefile
+++ b/devel/noweb/Makefile
@@ -20,16 +20,12 @@ RUN_DEPENDS= iconx:${PORTSDIR}/lang/icon

WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}/src
INSTALL_TARGET= install-code install-man install-elisp
+MAKE_ENV+= INSTALL_PREFIX=${STAGEDIR}${PREFIX}
MAKE_JOBS_UNSAFE= yes
-MAN1= cpif.1 htmltoc.1 nodefs.1 noindex.1 noroff.1 noroots.1 \
- notangle.1 noweb.1 nuweb2noweb.1 sl2h.1
-MAN7= nowebfilters.7 nowebstyle.7
-MLINKS= notangle.1 noweave.1 notangle.1 nountangle.1

-NOWEBTEXDIR= ${PREFIX}/share/texmf-local/tex/plain/noweb
-NOWEBLATEXDIR= ${PREFIX}/share/texmf-local/tex/latex/noweb
+NOWEBTEXDIR= ${STAGEDIR}${PREFIX}/share/texmf-local/tex/plain/noweb
+NOWEBLATEXDIR= ${STAGEDIR}${PREFIX}/share/texmf-local/tex/latex/noweb

-NO_STAGE= yes
post-patch:
@${TOUCH} ${WRKSRC}/c/modules.[ch]

@@ -41,6 +37,5 @@ post-install:
${INSTALL_DATA} ${WRKSRC}/tex/nwmac.tex ${NOWEBTEXDIR}
@${MKDIR} ${NOWEBLATEXDIR}
${INSTALL_DATA} ${WRKSRC}/tex/noweb.sty ${NOWEBLATEXDIR}
- @${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL

.include <bsd.port.mk>
diff --git a/devel/noweb/files/patch-Makefile b/devel/noweb/files/patch-Makefile
index 861c194..34aca80 100644
--- a/devel/noweb/files/patch-Makefile
+++ b/devel/noweb/files/patch-Makefile
@@ -1,5 +1,5 @@
---- Makefile.orig Mon Jun 12 20:14:20 2006
-+++ Makefile Sat Sep 1 22:34:43 2007
+--- Makefile.orig 2006-06-12 20:14:20.000000000 +0000
++++ Makefile 2014-08-21 23:22:20.000000000 +0000
@@ -2,13 +2,14 @@
# See file COPYRIGHT for more information.
#
@@ -26,18 +26,27 @@
-BIN=/usr/local/noweb
-LIB=/usr/local/noweb/lib
-MAN=/usr/local/noweb/man
-+BIN=${PREFIX}/bin
-+LIB=${PREFIX}/share/noweb
-+MAN=${PREFIX}/man
++BIN=${INSTALL_PREFIX}/bin
++LIB=${INSTALL_PREFIX}/share/noweb
++MAN=${INSTALL_PREFIX}/man
MANEXT=1
MAN7EXT=7
-TEXINPUTS=/usr/local/tex/inputs
-ELISP=/dev/null
+TEXINPUTS=${LIB}/tex
-+ELISP=${PREFIX}/share/emacs/site-lisp
++ELISP=${INSTALL_PREFIX}/share/emacs/site-lisp

# change WEAVE if you want a different version of noweave to be installed
WEAVE=noweave
+@@ -37,7 +38,7 @@
+ MAN7DIR=$(MAN)/man$(MAN7EXT)
+ CATDIR=$(MAN)/cat$(MANEXT)
+ CAT7DIR=$(MAN)/cat$(MAN7EXT)
+-LIBNAME=$(LIB)
++LIBNAME=${PREFIX}/share/noweb
+ TEXNAME=$(TEXINPUTS)
+
+ all:
@@ -179,7 +180,7 @@
rm -f $(CATDIR)/nountangle.$(MANEXT).gz
(cd $(CATDIR); ln notangle.$(MANEXT).gz nountangle.$(MANEXT).gz)
diff --git a/devel/noweb/pkg-install b/devel/noweb/pkg-install
index fa745d4..5483370 100644
--- a/devel/noweb/pkg-install
+++ b/devel/noweb/pkg-install
@@ -1,7 +1,4 @@
#!/bin/sh
-if [ "$2" != "POST-INSTALL" ]; then
- exit 0
-fi
if ! which mktexlsr >/dev/null; then
echo "I can't find mktexlsr in your search path."
echo "If you want to use noweb's (La)TeX output"
diff --git a/devel/noweb/pkg-plist b/devel/noweb/pkg-plist
index e36729d..83d12ed 100644
--- a/devel/noweb/pkg-plist
+++ b/devel/noweb/pkg-plist
@@ -10,6 +10,20 @@ bin/noweb
bin/nuweb2noweb
bin/cpif
bin/sl2h
+man/man1/cpif.1.gz
+man/man1/htmltoc.1.gz
+man/man1/nodefs.1.gz
+man/man1/noindex.1.gz
+man/man1/noroff.1.gz
+man/man1/noroots.1.gz
+man/man1/notangle.1.gz
+man/man1/nountangle.1.gz
+man/man1/noweave.1.gz
+man/man1/noweb.1.gz
+man/man1/nuweb2noweb.1.gz
+man/man1/sl2h.1.gz
+man/man7/nowebfilters.7.gz
+man/man7/nowebstyle.7.gz
share/emacs/site-lisp/noweb-mode.el
share/noweb/autodefs.asdl
share/noweb/autodefs.c
d***@public.gmane.org
2014-08-24 00:14:18 UTC
Permalink
branch: masters/2014q2
Repository: freenas/ports
Pushed by: git
Pushed to: branch masters/2014q2
commit 8e738d54bf32d93b6233186f8d3fa8e0c55f382e
Author: adamw <adamw-***@public.gmane.org>
Date: Fri Aug 22 00:16:56 2014 +0000

The MDOCS check was backwards, which broke packaging. The whole check was
unnecessary, so I've just ripped it out entirely.
---
textproc/tokyodystopia/Makefile | 7 -------
1 file changed, 7 deletions(-)

diff --git a/textproc/tokyodystopia/Makefile b/textproc/tokyodystopia/Makefile
index 202ebf4..1732a77 100644
--- a/textproc/tokyodystopia/Makefile
+++ b/textproc/tokyodystopia/Makefile
@@ -25,8 +25,6 @@ PLIST_SUB= SHLIB_VER=${SHLIB_VER} SHLIB_VER_MAJ=${SHLIB_VER_MAJ}

OPTIONS_DEFINE= DOCS

-.include <bsd.port.options.mk>
-
post-extract:
@${RM} ${WRKSRC}/doc/index.html~

@@ -34,10 +32,5 @@ post-patch:
@${REINPLACE_CMD} -e 's|@libdir@/pkgconfig|@prefix@/libdata/pkgconfig|' \
-e 's|DATADIR =.*|DATADIR = ${DOCSDIR}|' \
${WRKSRC}/Makefile.in
-.if ${PORT_OPTIONS:MDOCS}
- @${REINPLACE_CMD} -e 's|mkdir -p $$(DESTDIR)$$(DATADIR)||' \
- -e 's|cp -Rf $$(DOCUMENTFILES) $$(DESTDIR)$$(DATADIR)||' \
- ${WRKSRC}/Makefile.in
-.endif

.include <bsd.port.mk>
d***@public.gmane.org
2014-08-24 00:14:18 UTC
Permalink
branch: masters/2014q2
Repository: freenas/ports
Pushed by: git
Pushed to: branch masters/2014q2
commit f4bf883ee4604658708bca8c791e80c20a21c293
Author: rene <rene-***@public.gmane.org>
Date: Fri Aug 22 00:30:08 2014 +0000

ports-mgmt/bpm: Fix staging
---
ports-mgmt/bpm/files/patch-mk_sk.lib.mk | 25 +++++++++++++++++++++++++
ports-mgmt/bpm/files/patch-mk_sk.localerule.mk | 18 ++++++++++++++++++
ports-mgmt/bpm/files/patch-mk_sk.progrule.mk | 16 ++++++++++++++++
ports-mgmt/bpm/files/patch-mk_sk.scriptrule.mk | 17 +++++++++++++++++
ports-mgmt/bpm/files/patch-mk_sk.sharerule.mk | 17 +++++++++++++++++
5 files changed, 93 insertions(+)

diff --git a/ports-mgmt/bpm/files/patch-mk_sk.lib.mk b/ports-mgmt/bpm/files/patch-mk_sk.lib.mk
new file mode 100644
index 0000000..f269cdb
--- /dev/null
+++ b/ports-mgmt/bpm/files/patch-mk_sk.lib.mk
@@ -0,0 +1,25 @@
+--- ./mk/sk.lib.mk.orig 2004-06-08 02:31:49.000000000 +0200
++++ ./mk/sk.lib.mk 2014-08-22 02:02:31.000000000 +0200
+@@ -83,16 +83,16 @@
+ install:
+ .ifndef INTERNAL_LIB
+ .ifndef NO_STATIC
+- [ -d ${PREFIX}/${LIB_DIR} ] ||\
+- mkdir -p -m ${DIR_MODE} ${PREFIX}/${LIB_DIR}
++ [ -d ${DESTDIR}${PREFIX}/${LIB_DIR} ] ||\
++ mkdir -p -m ${DIR_MODE} ${DESTDIR}${PREFIX}/${LIB_DIR}
+ ${INSTALL} ${INST_FLAGS} ${STRIP} -o ${LIB_OWN} -g ${LIB_GRP}\
+- -m ${LIB_MODE} ${LIB}.a ${PREFIX}/${LIB_DIR}
++ -m ${LIB_MODE} ${LIB}.a ${DESTDIR}${PREFIX}/${LIB_DIR}
+ .endif
+ .ifndef NO_SHARED
+- [ -d ${PREFIX}/${LIB_DIR} ] ||\
+- mkdir -p -m ${DIR_MODE} ${PREFIX}/${LIB_DIR}
++ [ -d ${DESTDIR}${PREFIX}/${LIB_DIR} ] ||\
++ mkdir -p -m ${DIR_MODE} ${DESTDIR}${PREFIX}/${LIB_DIR}
+ ${INSTALL} ${INST_FLAGS} ${STRIP} -o ${LIB_OWN} -g ${LIB_GRP}\
+- -m ${LIB_MODE} ${LIB}.so${SO_SUFFIX} ${PREFIX}/${LIB_DIR}
++ -m ${LIB_MODE} ${LIB}.so${SO_SUFFIX} ${DESTDIR}${PREFIX}/${LIB_DIR}
+ .endif
+ .endif # INTERNAL_LIB
+
diff --git a/ports-mgmt/bpm/files/patch-mk_sk.localerule.mk b/ports-mgmt/bpm/files/patch-mk_sk.localerule.mk
new file mode 100644
index 0000000..8c9ec1a
--- /dev/null
+++ b/ports-mgmt/bpm/files/patch-mk_sk.localerule.mk
@@ -0,0 +1,18 @@
+--- ./mk/sk.localerule.mk.orig 2004-08-24 05:15:03.000000000 +0200
++++ ./mk/sk.localerule.mk 2014-08-22 02:03:51.000000000 +0200
+@@ -36,12 +36,12 @@
+
+ install:
+ @set -x; for l in ${LANGS}; do\
+- [ -d ${PREFIX}/${LOCALE_DIR}/$$l/LC_MESSAGES ] ||\
++ [ -d ${DESTDIR}${PREFIX}/${LOCALE_DIR}/$$l/LC_MESSAGES ] ||\
+ mkdir -p -m ${DIR_MODE}\
+- ${PREFIX}/${LOCALE_DIR}/$$l/LC_MESSAGES;\
++ ${DESTDIR}${PREFIX}/${LOCALE_DIR}/$$l/LC_MESSAGES;\
+ ${INSTALL} ${INST_FLAGS} -o ${SHARE_OWN} -g ${SHARE_GRP} -m\
+ ${SHARE_MODE} $$l.mo\
+- ${PREFIX}/${LOCALE_DIR}/$$l/LC_MESSAGES/${PACKAGE}.mo;\
++ ${DESTDIR}${PREFIX}/${LOCALE_DIR}/$$l/LC_MESSAGES/${PACKAGE}.mo;\
+ done
+
+ .include "sk.targets.mk"
diff --git a/ports-mgmt/bpm/files/patch-mk_sk.progrule.mk b/ports-mgmt/bpm/files/patch-mk_sk.progrule.mk
new file mode 100644
index 0000000..6383ad2
--- /dev/null
+++ b/ports-mgmt/bpm/files/patch-mk_sk.progrule.mk
@@ -0,0 +1,16 @@
+--- ./mk/sk.progrule.mk.orig 2004-06-08 01:11:45.000000000 +0200
++++ ./mk/sk.progrule.mk 2014-08-22 02:04:46.000000000 +0200
+@@ -40,10 +40,10 @@
+ .endif
+
+ install::
+- [ -d ${PREFIX}/${BIN_DIR} ] ||\
+- mkdir -p -m ${DIR_MODE} ${PREFIX}/${BIN_DIR}
++ [ -d ${DESTDIR}${PREFIX}/${BIN_DIR} ] ||\
++ mkdir -p -m ${DIR_MODE} ${DESTDIR}${PREFIX}/${BIN_DIR}
+ ${INSTALL} ${INST_FLAGS} ${STRIP} -o ${BIN_OWN} -g ${BIN_GRP} ${PROG}\
+- ${PREFIX}/${BIN_DIR}
++ ${DESTDIR}${PREFIX}/${BIN_DIR}
+ .ifndef NOMAN
+ [ -d ${MAN_DIR} ] || @mkdir -p -m ${DIR_MODE} ${MAN_DIR}
+ ${INSTALL} ${INST_FLAGS} -o ${SHARE_OWN} -g ${SHARE_GRP}\
diff --git a/ports-mgmt/bpm/files/patch-mk_sk.scriptrule.mk b/ports-mgmt/bpm/files/patch-mk_sk.scriptrule.mk
new file mode 100644
index 0000000..6c98797
--- /dev/null
+++ b/ports-mgmt/bpm/files/patch-mk_sk.scriptrule.mk
@@ -0,0 +1,17 @@
+--- ./mk/sk.scriptrule.mk.orig 2004-06-02 04:09:53.000000000 +0200
++++ ./mk/sk.scriptrule.mk 2014-08-22 02:06:04.000000000 +0200
+@@ -37,11 +37,11 @@
+ all:
+
+ install:
+- [ -d ${PREFIX}/${SCRIPT_DIR} ] ||\
+- mkdir -p -m ${DIR_MODE} ${PREFIX}/${SCRIPT_DIR}
++ [ -d ${DESTDIR}${PREFIX}/${SCRIPT_DIR} ] ||\
++ mkdir -p -m ${DIR_MODE} ${DESTDIR}${PREFIX}/${SCRIPT_DIR}
+ @set -x; for s in ${SCRIPTS}; do\
+ ${INSTALL} ${INST_FLAGS} -o ${BIN_OWN} -g ${BIN_GRP}\
+- -m ${BIN_MODE} $$s.*sh ${PREFIX}/${SCRIPT_DIR}/$$s;\
++ -m ${BIN_MODE} $$s.*sh ${DESTDIR}${PREFIX}/${SCRIPT_DIR}/$$s;\
+ done
+
+ .include "${BASE_DIR}/mk/sk.targets.mk"
diff --git a/ports-mgmt/bpm/files/patch-mk_sk.sharerule.mk b/ports-mgmt/bpm/files/patch-mk_sk.sharerule.mk
new file mode 100644
index 0000000..7818614
--- /dev/null
+++ b/ports-mgmt/bpm/files/patch-mk_sk.sharerule.mk
@@ -0,0 +1,17 @@
+--- ./mk/sk.sharerule.mk.orig 2004-07-23 05:45:59.000000000 +0200
++++ ./mk/sk.sharerule.mk 2014-08-22 02:06:57.000000000 +0200
+@@ -37,11 +37,11 @@
+ all: ${SHARES}
+
+ install:
+- [ -d ${PREFIX}/${SHARE_DIR} ] ||\
+- mkdir -p -m ${DIR_MODE} ${PREFIX}/${SHARE_DIR}
++ [ -d ${DESTDIR}${PREFIX}/${SHARE_DIR} ] ||\
++ mkdir -p -m ${DIR_MODE} ${DESTDIR}${PREFIX}/${SHARE_DIR}
+ @set -x; for s in ${SHARES}; do\
+ ${INSTALL} -o ${SHARE_OWN} -g ${SHARE_GRP} -m ${SHARE_MODE}\
+- $$s ${PREFIX}/${SHARE_DIR};\
++ $$s ${DESTDIR}${PREFIX}/${SHARE_DIR};\
+ done
+
+ .include "${BASE_DIR}/mk/sk.targets.mk"
d***@public.gmane.org
2014-08-24 00:14:18 UTC
Permalink
branch: masters/2014q2
Repository: freenas/ports
Pushed by: git
Pushed to: branch masters/2014q2
commit f30545ccdbcaaad8f62ab57225bfabca5880cc39
Author: adamw <adamw-***@public.gmane.org>
Date: Fri Aug 22 00:33:16 2014 +0000

Fix build. Hopefully it doesn't break the app.
---
biology/p5-AcePerl/files/patch-RPC__RPC.xs | 11 +++++++++++
1 file changed, 11 insertions(+)

diff --git a/biology/p5-AcePerl/files/patch-RPC__RPC.xs b/biology/p5-AcePerl/files/patch-RPC__RPC.xs
new file mode 100644
index 0000000..b2869ae
--- /dev/null
+++ b/biology/p5-AcePerl/files/patch-RPC__RPC.xs
@@ -0,0 +1,11 @@
+--- ./RPC/RPC.xs.orig 2014-08-21 20:31:10.000000000 -0400
++++ ./RPC/RPC.xs 2014-08-21 20:31:34.000000000 -0400
+@@ -153,7 +153,7 @@
+ break;
+ case '_':
+ if (strEQ(name, "_ACECLIENT_"))
+-#ifdef _ACECLIENT_
++#if 0
+ return _ACECLIENT_;
+ #else
+ goto not_there;
d***@public.gmane.org
2014-08-24 00:14:18 UTC
Permalink
branch: masters/2014q2
Repository: freenas/ports
Pushed by: git
Pushed to: branch masters/2014q2
commit 8b52717ea49b58545ba5ce67d68be6c406e7d087
Author: hrs <hrs-***@public.gmane.org>
Date: Fri Aug 22 05:05:02 2014 +0000

- Add BSIM3v3 support. This is disabled by default because its license is
not compatible with SPICE3f5.
- Remove bsd.prog.mk dependency.
- Put variables in ${FILESDIR}/FreeBSD* configuration file into
${FILES}/Makefile.
- Use opt_USE instead of .if ${PORT_OPTIONS:Mopt}.
- Remove unnecessary changes in patch-conf_defaults.
---
cad/spice/Makefile | 42 ++++++++++++++------------
cad/spice/distinfo | 2 ++
cad/spice/files/FreeBSD | 5 ----
cad/spice/files/FreeBSD.without_x11 | 8 -----
cad/spice/files/Makefile | 60 +++++++++++++++++++++++++++++--------
cad/spice/files/patch-conf_defaults | 22 ++------------
6 files changed, 75 insertions(+), 64 deletions(-)

diff --git a/cad/spice/Makefile b/cad/spice/Makefile
index 9b337c9..0d1d332 100644
--- a/cad/spice/Makefile
+++ b/cad/spice/Makefile
@@ -3,12 +3,14 @@

PORTNAME= spice
PORTVERSION= 3f5.2
-PORTREVISION= 10
+PORTREVISION= 11
CATEGORIES= cad
MASTER_SITES= http://embedded.eecs.berkeley.edu/pubs/downloads/spice/:srcs \
+ http://www-device.eecs.berkeley.edu/~bsim/Files/BSIM3/ftpv330/src/:bsim3 \
LOCAL/hrs/${PORTNAME}:docs
-PKGNAMESUFFIX= ${NOX11SUFX}
-DISTFILES= spice3f5${EXTRACT_SUFX}:srcs cp.ps:docs toc.ps:docs doc.ps:docs
+DISTFILES= spice3f5${EXTRACT_SUFX}:srcs \
+ BSIM3v330.tar.Z:bsim3 \
+ cp.ps:docs toc.ps:docs doc.ps:docs
DIST_SUBDIR= spice
EXTRACT_ONLY= spice3f5${EXTRACT_SUFX}

@@ -20,8 +22,8 @@ LICENSE_FILE= ${WRKSRC}/COPYRIGHT

WRKSRC= ${WRKDIR}/${PORTNAME}3f5
MAKEFILE= ${FILESDIR}/Makefile
-MAKE_ENV= WITH_INSTALL_AS_USER=yes
-ALL_TARGET= build _manpages
+CONFIGURE_ENV= CONFIGFILE="${WRKSRC}/conf/FreeBSD" \
+ LOCALBASE="${LOCALBASE}"

PORTDOCS= spice3f3.ps.gz
PORTEXAMPLES= bjtnoise.cir bsim1tst.cir bsim2tst.cir diffpair.cir \
@@ -30,27 +32,29 @@ PORTEXAMPLES= bjtnoise.cir bsim1tst.cir bsim2tst.cir diffpair.cir \
process.pro pz2.cir pzt.cir rc.cir rca3040.cir resnoise.cir \
rtlinv.cir schmitt.cir simplepz.cir

-OPTIONS_DEFINE= DOCS EXAMPLES X11
+OPTIONS_DEFINE= DOCS EXAMPLES X11 DEV_BSIM3
OPTIONS_DEFAULT=DOCS EXAMPLES X11

+X11_USE= XORG=x11,xaw,xext,xmu,xt
+X11_CONFIGURE_ENV= WITH_X11=yes
+DEV_BSIM3_DESC= BSIM3v3 MOS Transistor Model Support
+DEV_BSIM3_CONFIGURE_ENV=DEV_BSIM3=yes
+
.include <bsd.port.options.mk>

-.if ${PORT_OPTIONS:MX11}
-USE_XORG= x11 xaw xext xmu xt
-NOX11SUFX=
-CONFIGFILE= ${FILESDIR}/FreeBSD
-.else
-NOX11SUFX= -nox11
-CONFIGFILE= ${FILESDIR}/FreeBSD.without_x11
+.if ${PORT_OPTIONS:MDEV_BSIM3}
+post-extract:
+ @${MKDIR} ${WRKSRC}/src/lib/dev/bsim3
+ ${TAR} -xf ${DISTDIR}/${DIST_SUBDIR}/BSIM3v330.tar.Z \
+ -C ${WRKSRC}/src/lib/dev/bsim3
.endif

do-configure:
- (${CAT} ${CONFIGFILE}; \
- ${ECHO_CMD} "CC= ${CC}"; \
- ${ECHO_CMD} "MAKE= ${MAKE}"; \
- ${ECHO_CMD} "CC_OPT+= ${CFLAGS}"; \
- ${ECHO_CMD} "LOCALBASE=${LOCALBASE}"; \
- ) > ${WRKSRC}/conf/FreeBSD
+ @${SETENV} ${CONFIGURE_ENV} ${MAKE} -f ${MAKEFILE} configure
+ @(${ECHO_CMD} "CC= ${CC}"; \
+ ${ECHO_CMD} "MAKE= ${MAKE}"; \
+ ${ECHO_CMD} "CC_OPT= ${CFLAGS}"; \
+ ) >> ${WRKSRC}/conf/FreeBSD

post-install:
.if ${PORT_OPTIONS:MDOCS}
diff --git a/cad/spice/distinfo b/cad/spice/distinfo
index c7b8342..4db27a1 100644
--- a/cad/spice/distinfo
+++ b/cad/spice/distinfo
@@ -1,5 +1,7 @@
SHA256 (spice/spice3f5.tar.gz) = cac11fe2a761241e6b6c9eaa31b938c7ffa76aeaecac09809609d3a4125cd269
SIZE (spice/spice3f5.tar.gz) = 1226185
+SHA256 (spice/BSIM3v330.tar.Z) = 3d8d1739c5fb7f1e56af70e5dc05a6f9014d0954a4f3c1bcf778a494ae0087b2
+SIZE (spice/BSIM3v330.tar.Z) = 113719
SHA256 (spice/cp.ps) = 3bab6c3487def4ce2e817bf7ef3c1a7d199ea8e790da3a786f936872b35d0920
SIZE (spice/cp.ps) = 10297
SHA256 (spice/toc.ps) = 22228246f98f38e39a22911251fa52782ca6a2a7fb273fd78cf3da833d1f52e8
diff --git a/cad/spice/files/FreeBSD b/cad/spice/files/FreeBSD
deleted file mode 100644
index 990cd46..0000000
--- a/cad/spice/files/FreeBSD
+++ /dev/null
@@ -1,5 +0,0 @@
-# FreeBSD config exception file
-
-INTERFACE_OPTS = -DWANT_MFB -DWANT_X11
-LDFLAGS += -L${LOCALBASE}/lib -lm -ltermcap
-SYS_CFLAGS = -Dbsd
diff --git a/cad/spice/files/FreeBSD.without_x11 b/cad/spice/files/FreeBSD.without_x11
deleted file mode 100644
index 73e2e28..0000000
--- a/cad/spice/files/FreeBSD.without_x11
+++ /dev/null
@@ -1,8 +0,0 @@
-# FreeBSD config exception file (non-x11 version)
-
-INTERFACE_OPTS = -DWANT_MFB
-LDFLAGS += -lm -ltermcap
-SYS_CFLAGS = -Dbsd
-X_DIR =
-INCX =
-LIBX =
diff --git a/cad/spice/files/Makefile b/cad/spice/files/Makefile
index 71da645..7f978b2 100644
--- a/cad/spice/files/Makefile
+++ b/cad/spice/files/Makefile
@@ -1,9 +1,33 @@
#
# $FreeBSD$
#
-build:
+all:
${SH} util/build FreeBSD default
- strip ${PROGRAMS:S,^,FreeBSD/obj/bin/,}
+
+# Configuration parameters
+DEVLIST=
+VARLIST= SYS_CFLAGS LDFLAGS INTERFACE_OPTS X_DIR
+SYS_CFLAGS= -Dbsd
+LDFLAGS= -lm -ltermcap
+INTERFACE_OPTS= -DWANT_MFB
+.if defined(WITH_X11) && !empty(WITH_X11)
+INTERFACE_OPTS+=-DWANT_X11
+.else
+VARLIST+= INCX LIBX
+.endif
+X_DIR= ${LOCALBASE}
+.if defined(DEV_BSIM3) && !empty(DEV_BSIM3)
+DEVLIST+= bsim3
+.endif
+
+configure:
+ rm -f ${CONFIGFILE}
+.for V in ${VARLIST}
+ echo "$V=${${V}}" >> ${CONFIGFILE}
+.endfor
+.for V in ${DEVLIST}
+ echo "$V+=${${V}}" >> ${CONFIGFILE}
+.endfor

PREFIX?= /usr/local

@@ -12,23 +36,35 @@ SHAREFILESDIR= ${PREFIX}/share/spice
HELPFILESDIR= ${SHAREFILESDIR}/helpdir
SCRIPTFILESDIR= ${SHAREFILESDIR}/scripts

-FILESGROUPS= PROGRAMS HELPFILES SCRIPTFILES SHAREFILES
-
-PROGRAMSMODE= ${BINMODE}
-PROGRAMSOWN= ${BINOWN}
-PROGRAMSGRP= ${BINGRP}
-
PROGRAMS= spice3 nutmeg sconvert help proc2mod multidec
HELPFILES= spice.txt
SCRIPTFILES= setplot spinit
SHAREFILES= mfbcap news

MAN= spice.1 nutmeg.1 sconvert.1 mfb.3 mfbcap.5
-MLINKS= spice.1 spice3.1
MANDIR= ${PREFIX}/man/man

-beforeinstall:
- mkdir -p ${DESTDIR}${HELPFILESDIR} ${DESTDIR}${SCRIPTFILESDIR}
+.for P in ${PROGRAMS}
+install:: ${DESTDIR}${BINDIR}/$P
+${DESTDIR}${BINDIR}/$P: $P
+ ${BSD_INSTALL_PROGRAM} ${.ALLSRC} ${.TARGET}
+.endfor
... 54 lines suppressed ...
d***@public.gmane.org
2014-08-24 00:14:18 UTC
Permalink
branch: masters/2014q2
Repository: freenas/ports
Pushed by: git
Pushed to: branch masters/2014q2
commit 223dad2c273e331e92c59a3e8fc11113486f40e3
Author: mandree <mandree-***@public.gmane.org>
Date: Fri Aug 22 07:13:51 2014 +0000

Catch and report substitution failure on lines such as PORTREVISION=${SOME_VAR}.
---
Tools/scripts/bump-revision.sh | 31 ++++++++++++++++++++++---------
1 file changed, 22 insertions(+), 9 deletions(-)

diff --git a/Tools/scripts/bump-revision.sh b/Tools/scripts/bump-revision.sh
index 3b22b88..ed18d2b 100755
--- a/Tools/scripts/bump-revision.sh
+++ b/Tools/scripts/bump-revision.sh
@@ -43,6 +43,7 @@ printc () {
#

tempfile=$(mktemp)
+rm -f $tempfile
trap "rm -f $tempfile" 0 1 2 3 15

while [ $# -gt 0 ]
@@ -50,15 +51,27 @@ do
if [ -f "$1/Makefile" ]; then
echo -n > $tempfile
revision=`grep "^PORTREVISION?\?=" "$1/Makefile"`
- if [ $? == 0 ]; then
- printc "$1: $revision found, bumping it by 1." "green"
- awk -F "\t" '/^PORTREVISION\??=/{ gsub ($2,$2+1) };{ print }' "$1/Makefile" > $tempfile
- cat $tempfile > "$1/Makefile"
- else
- printc "$1: PORTREVISION not found, adding PORTREVISION=1" "red"
- awk '/^PORTVERSION\??=\t/{print;print "PORTREVISION=\t1";next}1' "$1/Makefile" > $tempfile
- cat $tempfile > "$1/Makefile"
- fi
+ case $? in
+ 0)
+ # fixme: gsub fails massively if there are any special
+ # characters inside PORTREVISION. For now, we will only
+ # catch this bug by checking the replace count, and if not
+ # 1, bail out and complain.
+ # The proper fix is to do a stricter check that PORTREVISION
+ # is an integer.
+ awk -F "\t" '/^PORTREVISION\??=/{ rplc = gsub ($2,$2+1); if (rplc != 1) { exit 1 } };{ print }' "$1/Makefile" > $tempfile \
+ && { cat $tempfile > "$1/Makefile" ; printc "$1: $revision found, bumping it by 1." "green" ; } \
+ || printc "$1: FAILED TO BUMP PORTREVISION" red
+ ;;
+ 1)
+ awk '/^PORTVERSION\??=\t/{print;print "PORTREVISION=\t1";next}' "$1/Makefile" > $tempfile \
+ && { cat $tempfile > "$1/Makefile" ;printc "$1: PORTREVISION not found, adding PORTREVISION=1" "green" ; } \
+ || printc "$1: FAILED TO BUMP PORTREVISION" red
+ ;;
+ *)
+ printc "$1: grepping $1/Makefile failed!" red
+ ;;
+ esac
else
printc "$1: might not be a port directory as $1/Makefile is missing!" "red"
fi
d***@public.gmane.org
2014-08-24 00:14:18 UTC
Permalink
branch: masters/2014q2
Repository: freenas/ports
Pushed by: git
Pushed to: branch masters/2014q2
commit 4a6a8497b2870f0bbad39c01f18f09dd824a5641
Author: mandree <mandree-***@public.gmane.org>
Date: Fri Aug 22 06:29:53 2014 +0000

Remove orphaned directories; remove gslin's blanket approval from db48.
---
databases/db48/Makefile | 2 --
1 file changed, 2 deletions(-)

diff --git a/databases/db48/Makefile b/databases/db48/Makefile
index f4304e0..cc5b581 100644
--- a/databases/db48/Makefile
+++ b/databases/db48/Makefile
@@ -11,8 +11,6 @@ DISTNAME= db-${PORTVERSION:R}
DIST_SUBDIR= bdb

MAINTAINER= mandree-***@public.gmane.org
-# I allow all freebsd committer to do changes to this package without
-# my permission.
COMMENT= The Berkeley DB package, revision 4.8

DEPRECATED= Please move to db5 or db6.
d***@public.gmane.org
2014-08-24 00:14:18 UTC
Permalink
branch: masters/2014q2
Repository: freenas/ports
Pushed by: git
Pushed to: branch masters/2014q2
commit 406d3501ec2fa176ae467a881be355b5cc35ef3d
Author: swills <swills-***@public.gmane.org>
Date: Fri Aug 22 01:34:53 2014 +0000

devel/rubygem-little_plugger: remove unneeded rspec dependency

PR: 192512
Submitted by: Michael Moll <kvedulv-***@public.gmane.org>
---
devel/rubygem-little_plugger/Makefile | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/devel/rubygem-little_plugger/Makefile b/devel/rubygem-little_plugger/Makefile
index 3bb84fd..45a6a02 100644
--- a/devel/rubygem-little_plugger/Makefile
+++ b/devel/rubygem-little_plugger/Makefile
@@ -3,6 +3,7 @@

PORTNAME= little_plugger
PORTVERSION= 1.1.3
+PORTREVISION= 1
CATEGORIES= devel rubygems
MASTER_SITES= RG
DISTNAME= little-plugger-${PORTVERSION}
@@ -15,6 +16,4 @@ USE_RUBYGEMS= yes
GEM_NAME= ${DISTNAME}
RUBYGEM_AUTOPLIST= yes

-RUN_DEPENDS= rubygem-rspec>=0:${PORTSDIR}/devel/rubygem-rspec
-
.include <bsd.port.mk>
d***@public.gmane.org
2014-08-24 00:14:18 UTC
Permalink
branch: masters/2014q2
Repository: freenas/ports
Pushed by: git
Pushed to: branch masters/2014q2
commit 3b1f983597188b6a162a88df610d4ec709dc409a
Author: mandree <mandree-***@public.gmane.org>
Date: Fri Aug 22 06:56:48 2014 +0000

Fix up missed or botched PORTREVISION bumps from r365599.
Apparently Tools/scripts/bump-revision.sh isn't too robust...

PR: 192690
---
comms/trustedqsl/Makefile | 1 +
databases/dbtool/Makefile | 2 +-
mail/opendkim/Makefile | 2 +-
net/openldap24-server/Makefile | 4 ++--
security/pks/Makefile | 2 +-
www/oops/Makefile | 2 +-
6 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/comms/trustedqsl/Makefile b/comms/trustedqsl/Makefile
index 6cd9f488..d81f756 100644
--- a/comms/trustedqsl/Makefile
+++ b/comms/trustedqsl/Makefile
@@ -2,6 +2,7 @@

PORTNAME= trustedqsl
PORTVERSION= 2.0.3
+PORTREVISION= 1
CATEGORIES= comms hamradio
MASTER_SITES= SF/${PORTNAME}/TrustedQSL/v${PORTVERSION}/
DISTNAME= tqsl-${PORTVERSION}
diff --git a/databases/dbtool/Makefile b/databases/dbtool/Makefile
index 7807082..20b9fa4 100644
--- a/databases/dbtool/Makefile
+++ b/databases/dbtool/Makefile
@@ -3,7 +3,7 @@

PORTNAME= dbtool
PORTVERSION= 1.7
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= databases
MASTER_SITES= http://www.daemon.de/idisk/Apps/dbtool/

diff --git a/mail/opendkim/Makefile b/mail/opendkim/Makefile
index 03352f4..71ca379 100644
--- a/mail/opendkim/Makefile
+++ b/mail/opendkim/Makefile
@@ -3,7 +3,7 @@

PORTNAME= opendkim
PORTVERSION= 2.9.2
-1P1O1R1T1R1E1V1I1S1I1O1N1=1 1 131
+PORTREVISION= 4
CATEGORIES= mail security
MASTER_SITES= SF
MASTER_SITE_SUBDIR= ${PORTNAME} \
diff --git a/net/openldap24-server/Makefile b/net/openldap24-server/Makefile
index b521452..e831874 100644
--- a/net/openldap24-server/Makefile
+++ b/net/openldap24-server/Makefile
@@ -3,7 +3,7 @@

PORTNAME= openldap
DISTVERSION= 2.4.39
-1P1O1R1T1R1E1V1I1S1I1O1N1=1 1 1$1{1O1P1E1N1L1D1A1P1_1P1O1R1T1R1E1V1I1S1I1O1N1}1
+PORTREVISION= ${OPENLDAP_PORTREVISION}
CATEGORIES= net databases
MASTER_SITES= ftp://ftp.OpenLDAP.org/pub/OpenLDAP/%SUBDIR%/ \
ftp://gd.tuwien.ac.at/infosys/network/OpenLDAP/%SUBDIR%/ \
@@ -59,7 +59,7 @@ BROKEN= incompatible OpenLDAP version: ${WANT_OPENLDAP_VER}
.endif

PORTREVISION_CLIENT= 1
-PORTREVISION_SERVER= 2
+PORTREVISION_SERVER= 3
OPENLDAP_SHLIB_MAJOR= 2
OPENLDAP_MAJOR= ${DISTVERSION:R}

diff --git a/security/pks/Makefile b/security/pks/Makefile
index 6e712e1..f6aa862 100644
--- a/security/pks/Makefile
+++ b/security/pks/Makefile
@@ -3,7 +3,7 @@

PORTNAME= pks
PORTVERSION= 0.9.6.20040312
-1P1O1R1T1R1E1V1I1S1I1O1N1=1 1 121
+PORTREVISION= 1
CATEGORIES= security www
MASTER_SITES= http://pks.sourceforge.net/:sf ${MASTER_SITE_LOCAL}:local
MASTER_SITE_SUBDIR= .:sf mandree:local
diff --git a/www/oops/Makefile b/www/oops/Makefile
index a851952..1939eb4 100644
--- a/www/oops/Makefile
+++ b/www/oops/Makefile
@@ -3,7 +3,7 @@

PORTNAME= oops
PORTVERSION= ${OOPSVERSION}
-PORTREVISION= 12
+PORTREVISION= 13
CATEGORIES= www
MASTER_SITES= http://oops-cache.org/ \
ftp://kucha.ru/pub/misc/oops/
d***@public.gmane.org
2014-08-24 00:14:18 UTC
Permalink
branch: masters/2014q2
Repository: freenas/ports
Pushed by: git
Pushed to: branch masters/2014q2
commit 86eadd0b5cdeef4a77f80251daa7dc8ed9e5960d
Author: hrs <hrs-***@public.gmane.org>
Date: Fri Aug 22 07:19:37 2014 +0000

Remove print/tex-omegaware-old. This is no longer maintained and
there is no application which requires it.
---
MOVED | 1 +
print/Makefile | 1 -
print/tex-omegaware-old/Makefile | 40 ----------------------
print/tex-omegaware-old/distinfo | 4 ---
.../files/Makefile.tex-omegaware-old | 31 -----------------
print/tex-omegaware-old/pkg-descr | 4 ---
print/tex-omegaware-old/pkg-plist | 4 ---
7 files changed, 1 insertion(+), 84 deletions(-)

diff --git a/MOVED b/MOVED
index 8d78ce5..38aba62 100644
--- a/MOVED
+++ b/MOVED
@@ -6476,3 +6476,4 @@ databases/db43|databases/db48|2014-08-15|Superseded by databases/db48
databases/db44|databases/db48|2014-08-15|Superseded by databases/db48
databases/db46|databases/db48|2014-08-15|Superseded by databases/db48
databases/db47|databases/db48|2014-08-15|Superseded by databases/db48
+print/tex-omegaware-old||2014-08-22|Deprecated in favor of print/tex-aleph
diff --git a/print/Makefile b/print/Makefile
index f44aba2..05946c0 100644
--- a/print/Makefile
+++ b/print/Makefile
@@ -258,7 +258,6 @@
SUBDIR += tex-formats
SUBDIR += tex-jadetex
SUBDIR += tex-luatex
- SUBDIR += tex-omegaware-old
SUBDIR += tex-ptexenc
SUBDIR += tex-texmflocal
SUBDIR += tex-xdvik
diff --git a/print/tex-omegaware-old/Makefile b/print/tex-omegaware-old/Makefile
deleted file mode 100644
index fd8a95f..0000000
--- a/print/tex-omegaware-old/Makefile
+++ /dev/null
@@ -1,40 +0,0 @@
-# Created by: hrs-***@public.gmane.org
-# $FreeBSD$
-
-PORTNAME= tex-omegaware-old
-PORTVERSION= 2.0.2
-PORTREVISION= 5
-CATEGORIES= print
-MASTER_SITES= ${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR= hrs/teTeX
-DISTFILES= ${TETEX_SRC} ${TETEX_TEXMF}
-EXTRACT_ONLY= ${TETEX_SRC}
-
-MAINTAINER= ports-***@public.gmane.org
-COMMENT= Old version of ovf2ovp, ovp2ovf, ofm2opl, and opl2ofm
-
-USE_TEX= base texmf
-DIST_SUBDIR= teTeX
-WRKSRC= ${WRKDIR}/tetex-src-${PORTVERSION}/texk/web2c
-CONFIGURE_WRKSRC= ${WRKDIR}/tetex-src-${PORTVERSION}
-USES= perl5 gmake
-USE_PERL5= build
-
-TETEX_SRC= tetex-src-${PORTVERSION}.tar.gz
-TETEX_TEXMF= tetex-texmf-${PORTVERSION}.tar.gz
-TEXMF_TREE= ${PREFIX}/share/texmf
-
-MAKE_ENV= LN="${LN}" \
- INSTALL_PROGRAM="${INSTALL_PROGRAM}"
-GNU_CONFIGURE= YES
-CONFIGURE_ARGS= --disable-multiplatform \
- --without-texinfo --without-dialog \
- --without-xdvik --without-dvipdfm \
- --with-system-ncurses --with-system-zlib
-CONFIGURE_ENV= INSTALL_PROGRAM="${BSD_INSTALL_SCRIPT}"
-
-NO_STAGE= yes
-pre-build:
- ${CP} ${FILESDIR}/Makefile.${PORTNAME} ${WRKSRC}/Makefile
-
-.include <bsd.port.mk>
diff --git a/print/tex-omegaware-old/distinfo b/print/tex-omegaware-old/distinfo
deleted file mode 100644
index 9118200..0000000
--- a/print/tex-omegaware-old/distinfo
+++ /dev/null
@@ -1,4 +0,0 @@
-SHA256 (teTeX/tetex-src-2.0.2.tar.gz) = 9f8a35b3abd293d71fa6785a4c3e6aa4fdaeff03ae71863ad5ec9e1a9fc087f5
-SIZE (teTeX/tetex-src-2.0.2.tar.gz) = 11745933
-SHA256 (teTeX/tetex-texmf-2.0.2.tar.gz) = 0d5c4adb7a72a33fffa9eeb5e3137e0094c912eafc45e358ca20cd9257f79f0d
-SIZE (teTeX/tetex-texmf-2.0.2.tar.gz) = 52424280
diff --git a/print/tex-omegaware-old/files/Makefile.tex-omegaware-old b/print/tex-omegaware-old/files/Makefile.tex-omegaware-old
deleted file mode 100644
index d66a260..0000000
--- a/print/tex-omegaware-old/files/Makefile.tex-omegaware-old
+++ /dev/null
@@ -1,31 +0,0 @@
-# $FreeBSD$
-
-all:
- cd lib && ${MAKE}
- cd web2c && ${MAKE}
- ${LN} -s omegaware/ovp2ovf.web ./ovp2ovf.web
- ${LN} -s omegaware/ovp2ovf.ch ./ovp2ovf.ch
- ${LOCALBASE}/bin/tangle ovp2ovf.web ovp2ovf.ch
- /bin/sh ./web2c/convert ovp2ovf
- ${CC} -o ovp2ovf -I ../ ovp2ovf.c ./lib/lib.a ../kpathsea/STATIC/libkpathsea.a
- ${LN} -s omegaware/ovf2ovp.web ovf2ovp.web
- ln -s omegaware/ovf2ovp.ch ovf2ovp.ch
- ${LOCALBASE}/bin/tangle ovf2ovp.web ovf2ovp.ch
- /bin/sh ./web2c/convert ovf2ovp
- ${CC} -o ovf2ovp -I ../ ovf2ovp.c ./lib/lib.a ../kpathsea/STATIC/libkpathsea.a
- ${LN} -s omegaware/ofm2opl.web ofm2opl.web
- ${LN} -s omegaware/ofm2opl.ch ofm2opl.ch
- ${LOCALBASE}/bin/tangle ofm2opl.web ofm2opl.ch
- /bin/sh ./web2c/convert ofm2opl
- ${CC} -o ofm2opl -I ../ ofm2opl.c ./lib/lib.a ../kpathsea/STATIC/libkpathsea.a
- ${LN} -s omegaware/opl2ofm.ch opl2ofm.ch
- ${LN} -s omegaware/opl2ofm.web opl2ofm.web
- ${LOCALBASE}/bin/tangle opl2ofm.web opl2ofm.ch
- /bin/sh ./web2c/convert opl2ofm
- ${CC} -o opl2ofm -I ../ opl2ofm.c ./lib/lib.a ../kpathsea/STATIC/libkpathsea.a
-
-install:
- ${INSTALL_PROGRAM} ovf2ovp ${PREFIX}/bin/ovf2ovp-old
- ${INSTALL_PROGRAM} ovp2ovf ${PREFIX}/bin/ovp2ovf-old
- ${INSTALL_PROGRAM} ofm2opl ${PREFIX}/bin/ofm2opl-old
- ${INSTALL_PROGRAM} opl2ofm ${PREFIX}/bin/opl2ofm-old
diff --git a/print/tex-omegaware-old/pkg-descr b/print/tex-omegaware-old/pkg-descr
deleted file mode 100644
index e4fba8f..0000000
--- a/print/tex-omegaware-old/pkg-descr
+++ /dev/null
@@ -1,4 +0,0 @@
-These are old versions of ovf2ovp, ovp2ovf, ofm2opl, and opl2ofm,
-which are utilities in Omega distribution.
-
-WWW: http://www.tug.org/tetex/
diff --git a/print/tex-omegaware-old/pkg-plist b/print/tex-omegaware-old/pkg-plist
deleted file mode 100644
index a9beaf7..0000000
--- a/print/tex-omegaware-old/pkg-plist
+++ /dev/null
@@ -1,4 +0,0 @@
-bin/ovf2ovp-old
-bin/ovp2ovf-old
-bin/ofm2opl-old
-bin/opl2ofm-old
d***@public.gmane.org
2014-08-24 00:14:18 UTC
Permalink
branch: masters/2014q2
Repository: freenas/ports
Pushed by: git
Pushed to: branch masters/2014q2
commit 4faa49a1a8f8906afd30ca4514e6b137a8f6f990
Author: antoine <antoine-***@public.gmane.org>
Date: Fri Aug 22 07:20:30 2014 +0000

Canonicalize a few LICENSE_PERMS

With hat: portmgr
---
databases/tdbc/Makefile | 2 +-
devel/icu/Makefile | 2 +-
devel/p5-Sys-Trace/Makefile | 2 +-
devel/p5-Thread-Apartment/Makefile | 2 +-
devel/p5-Thread-Queue-Duplex/Makefile | 2 +-
devel/tcllib/Makefile | 2 +-
devel/tcltls/Makefile | 2 +-
games/monsterz/Makefile | 2 +-
graphics/multiraw/Makefile | 2 +-
japanese/p5-nkf/Makefile | 2 +-
java/visualvm/Makefile | 2 +-
lang/mmix/Makefile | 2 +-
lang/ocaml/Makefile | 2 +-
lang/tcl84/Makefile | 2 +-
lang/tcl85/Makefile | 2 +-
lang/tcl86/Makefile | 2 +-
lang/tclX/Makefile | 2 +-
math/py-pymc/Makefile | 2 +-
multimedia/vtkmpeg2encode/Makefile | 2 +-
net-im/ttytter/Makefile | 2 +-
ports-mgmt/chucky/Makefile | 2 +-
ports-mgmt/prhistory/Makefile | 2 +-
sysutils/radmind/Makefile | 2 +-
www/yabb/Makefile | 2 +-
x11-fonts/gohufont/Makefile | 2 +-
x11-toolkits/tk84/Makefile | 2 +-
x11-toolkits/tk85/Makefile | 2 +-
x11-toolkits/tk86/Makefile | 2 +-
x11/xsel-conrad/Makefile | 2 +-
29 files changed, 29 insertions(+), 29 deletions(-)

diff --git a/databases/tdbc/Makefile b/databases/tdbc/Makefile
index fe4e83e..d22a9f4 100644
--- a/databases/tdbc/Makefile
+++ b/databases/tdbc/Makefile
@@ -13,7 +13,7 @@ COMMENT= Common database access interface for Tcl
LICENSE= TclTk
LICENSE_NAME= Tcl/Tk License
LICENSE_FILE= ${WRKDIR}/${PORTNAME}${PORTVERSION}/license.terms
-LICENSE_PERMS= auto-accept dist-mirror dist-sell pkg-mirror pkg-sell
+LICENSE_PERMS= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept

OPTIONS_DEFINE= MYSQL PGSQL SQLITE ODBC

diff --git a/devel/icu/Makefile b/devel/icu/Makefile
index 65a7261..ee6869d 100644
--- a/devel/icu/Makefile
+++ b/devel/icu/Makefile
@@ -15,7 +15,7 @@ COMMENT= International Components for Unicode (from IBM)
LICENSE= ICU
LICENSE_NAME= ICU license
LICENSE_FILE= ${WRKSRC}/../license.html
-LICENSE_PERMS= ${_LICENSE_PERMS_DEFAULT}
+LICENSE_PERMS= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept

GNU_CONFIGURE= yes
OPTIONS_DEFINE= THREADS
diff --git a/devel/p5-Sys-Trace/Makefile b/devel/p5-Sys-Trace/Makefile
index b516625..0d39de5 100644
--- a/devel/p5-Sys-Trace/Makefile
+++ b/devel/p5-Sys-Trace/Makefile
@@ -13,7 +13,7 @@ COMMENT= Interface to system call tracing interfaces
LICENSE= WTFPL2
LICENSE_NAME= Do What The Fuck You Want To Public License version 2
LICENSE_FILE= ${WRKSRC}/README
-LICENSE_PERMS= auto-accept dist-mirror dist-sell pkg-mirror pkg-sell
+LICENSE_PERMS= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept

USES= perl5
USE_PERL5= configure
diff --git a/devel/p5-Thread-Apartment/Makefile b/devel/p5-Thread-Apartment/Makefile
index 0e83bac..5eaa228 100644
--- a/devel/p5-Thread-Apartment/Makefile
+++ b/devel/p5-Thread-Apartment/Makefile
@@ -13,7 +13,7 @@ COMMENT= Apartment threading wrapper for Perl objects
LICENSE= AFL21
LICENSE_NAME= Academic Free License version 2.1
LICENSE_FILE= ${WRKSRC}/License.txt
-LICENSE_PERMS= auto-accept dist-mirror dist-sell pkg-mirror pkg-sell
+LICENSE_PERMS= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept

BUILD_DEPENDS= p5-Class-ISA>=0.32:${PORTSDIR}/devel/p5-Class-ISA \
p5-Class-Inspector>=1.08:${PORTSDIR}/devel/p5-Class-Inspector \
diff --git a/devel/p5-Thread-Queue-Duplex/Makefile b/devel/p5-Thread-Queue-Duplex/Makefile
index b63da3f..8d6d726 100644
--- a/devel/p5-Thread-Queue-Duplex/Makefile
+++ b/devel/p5-Thread-Queue-Duplex/Makefile
@@ -13,7 +13,7 @@ COMMENT= Thread-safe request/response queue with identifiable elements
LICENSE= AFL21
LICENSE_NAME= Academic Free License version 2.1
LICENSE_FILE= ${WRKSRC}/License.txt
-LICENSE_PERMS= auto-accept dist-mirror dist-sell pkg-mirror pkg-sell
+LICENSE_PERMS= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept

USES= perl5
USE_PERL5= configure
diff --git a/devel/tcllib/Makefile b/devel/tcllib/Makefile
index cc2520d..7140739 100644
--- a/devel/tcllib/Makefile
+++ b/devel/tcllib/Makefile
@@ -11,7 +11,7 @@ COMMENT= Collection of utility modules for Tcl
LICENSE= TclTk
LICENSE_NAME= Tcl/Tk License
LICENSE_FILE= ${WRKSRC}/license.terms
-LICENSE_PERMS= auto-accept dist-mirror dist-sell pkg-mirror pkg-sell
+LICENSE_PERMS= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept

OPTIONS_DEFINE= DOCS MANPAGES

diff --git a/devel/tcltls/Makefile b/devel/tcltls/Makefile
index 781d9d4..1e6abc6 100644
--- a/devel/tcltls/Makefile
+++ b/devel/tcltls/Makefile
@@ -14,7 +14,7 @@ COMMENT= SSL extensions for TCL; dynamicly loadable
LICENSE= TclTk
LICENSE_NAME= Tcl/Tk License
LICENSE_FILE= ${WRKSRC}/license.terms
-LICENSE_PERMS= auto-accept dist-mirror dist-sell pkg-mirror pkg-sell
+LICENSE_PERMS= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept

OPTIONS_DEFINE= DOCS

diff --git a/games/monsterz/Makefile b/games/monsterz/Makefile
index 5b3484b..4d303dc 100644
--- a/games/monsterz/Makefile
+++ b/games/monsterz/Makefile
@@ -17,7 +17,7 @@ COMMENT= Monsterz - arcade puzzle game
LICENSE= WTFPL
LICENSE_NAME= Do What The [expletive] You Want To Public License, Version 2
LICENSE_FILE= ${WRKSRC}/COPYING
-LICENSE_PERMS= ${_LICENSE_PERMS_DEFAULT}
+LICENSE_PERMS= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept

RUN_DEPENDS= ${PYGAME}

diff --git a/graphics/multiraw/Makefile b/graphics/multiraw/Makefile
index 41847ff..354a9a3 100644
--- a/graphics/multiraw/Makefile
+++ b/graphics/multiraw/Makefile
@@ -15,7 +15,7 @@ COMMENT= Parallel process Camera RAW files using pthreads
LICENSE= MULTIRAW
LICENSE_NAME= MULTIRAW BSD LICENSE
LICENSE_FILE= ${WRKSRC}/LICENSE
-LICENSE_PERMS= ${_LICENSE_PERMS_DEFAULT}
+LICENSE_PERMS= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept

RUN_DEPENDS= ${LOCALBASE}/bin/dcraw:${PORTSDIR}/graphics/dcraw \
${LOCALBASE}/bin/dcraw-m:${PORTSDIR}/graphics/dcraw-m
diff --git a/japanese/p5-nkf/Makefile b/japanese/p5-nkf/Makefile
index 1247034..1147948 100644
--- a/japanese/p5-nkf/Makefile
+++ b/japanese/p5-nkf/Makefile
@@ -16,7 +16,7 @@ LICENSE_COMB= multi
LICENSE_NAME_NKF= NKF License
LICENSE_FILE_ZLIB= ${WRKSRC}/NKF.pm
LICENSE_FILE_NKF= ${WRKSRC}/NKF.xs
-LICENSE_PERMS_NKF= ${_LICENSE_PERMS_DEFAULT}
+LICENSE_PERMS_NKF= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept

USES= perl5
USE_PERL5= configure
diff --git a/java/visualvm/Makefile b/java/visualvm/Makefile
index 8543bc8..3e183d1 100644
--- a/java/visualvm/Makefile
+++ b/java/visualvm/Makefile
@@ -13,7 +13,7 @@ COMMENT= GUI tool combining CLI JDK tools and profiling capabilities
LICENSE= VISUALVM
LICENSE_NAME= VISUALVM with ClassPath Exception
LICENSE_FILE= ${WRKSRC}/LICENSE.txt
-LICENSE_PERMS= ${_LICENSE_PERMS_DEFAULT}
+LICENSE_PERMS= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept

USES= zip:infozip
NO_BUILD= yes
diff --git a/lang/mmix/Makefile b/lang/mmix/Makefile
index 5e52ad7..61b0526 100644
--- a/lang/mmix/Makefile
+++ b/lang/mmix/Makefile
@@ -13,7 +13,7 @@ COMMENT= RISC computer designed by Donald E. Knuth
LICENSE= mmix
LICENSE_NAME= mmix license
LICENSE_FILE= ${FILESDIR}/LICENSE.txt
-LICENSE_PERMS= ${_LICENSE_PERMS_DEFAULT}
+LICENSE_PERMS= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept

BUILD_DEPENDS= ctangle:${PORTSDIR}/devel/cweb

diff --git a/lang/ocaml/Makefile b/lang/ocaml/Makefile
index 173aa92..91ed56e 100644
--- a/lang/ocaml/Makefile
+++ b/lang/ocaml/Makefile
@@ -20,7 +20,7 @@ LICENSE= QPL10 LGPL20
... 216 lines suppressed ...
d***@public.gmane.org
2014-08-24 00:14:18 UTC
Permalink
branch: masters/2014q2
Repository: freenas/ports
Pushed by: git
Pushed to: branch masters/2014q2
commit e069757084a27a9af022193a3326c56022f0e1ac
Author: sunpoet <sunpoet-***@public.gmane.org>
Date: Fri Aug 22 08:43:35 2014 +0000

- Add JSON_C option
- Fix build with devel/json-c 0.12

Obtained from: http://trac.osgeo.org/gdal/changeset/27267
---
graphics/gdal/Makefile | 18 +++++++++++++++---
1 file changed, 15 insertions(+), 3 deletions(-)

diff --git a/graphics/gdal/Makefile b/graphics/gdal/Makefile
index 65e0966..9ec462c 100644
--- a/graphics/gdal/Makefile
+++ b/graphics/gdal/Makefile
@@ -15,8 +15,8 @@ COMMENT= Translator library for raster geospatial data formats
LICENSE= MIT

OPTIONS_DEFINE= ARMADILLO CFITSIO CURL ECW EXPAT FREEXL GEOS GEOTIFF GIF GTA \
- HDF5 ICONV JASPER JPEG KML LIBXML2 MYSQL NETCDF ODBC PCRE \
- PGSQL PNG PROJ SQLITE TIFF WEBP XERCES
+ HDF5 ICONV JASPER JPEG JSON_C KML LIBXML2 MYSQL NETCDF ODBC \
+ PCRE PGSQL PNG PROJ SQLITE TIFF WEBP XERCES
OPTIONS_RADIO= PDF
OPTIONS_RADIO_PDF= PODOFO POPPLER
OPTIONS_DEFAULT=GEOTIFF GIF JASPER JPEG PNG TIFF
@@ -82,6 +82,9 @@ JASPER_LIB_DEPENDS= libjasper.so:${PORTSDIR}/graphics/jasper
JPEG_CONFIGURE_OFF= --with-jpeg=internal
JPEG_CONFIGURE_ON= --with-jpeg=${LOCALBASE}
JPEG_LIB_DEPENDS= libjpeg.so:${PORTSDIR}/graphics/jpeg
+JSON_C_CONFIGURE_OFF= --with-libjson-c=internal
+JSON_C_CONFIGURE_ON= --with-libjson-c=${LOCALBASE}
+JSON_C_LIB_DEPENDS= libjson-c.so:${PORTSDIR}/devel/json-c
KML_CONFIGURE_OFF= --with-libkml=no
KML_CONFIGURE_ON= --with-libkml=${LOCALBASE}
KML_LIB_DEPENDS= libkmlbase.so:${PORTSDIR}/science/libkml
@@ -129,8 +132,17 @@ XERCES_CONFIGURE_ON= --with-xerces=${LOCALBASE}
XERCES_LIB_DEPENDS= libxerces-c.so:${PORTSDIR}/textproc/xerces-c3

post-patch:
- @${REINPLACE_CMD} -e 's|-lpthread|-pthread|g' ${WRKSRC}/configure
@${REINPLACE_CMD} -e 's|$$(INST_LIB)/pkgconfig|${PREFIX}/libdata/pkgconfig|' ${WRKSRC}/GNUmakefile
+ @${REINPLACE_CMD} -e 's|-lpthread|-pthread|g' ${WRKSRC}/configure
+# patch for json-c 0.12
+ @${REINPLACE_CMD} -e 's|json_tokener_errors\[jstok->err\]|json_tokener_error_desc(jstok->err)|' \
+ ${WRKSRC}/frmts/mbtiles/mbtilesdataset.cpp \
+ ${WRKSRC}/ogr/ogrsf_frmts/cartodb/ogrcartodbdatasource.cpp \
+ ${WRKSRC}/ogr/ogrsf_frmts/couchdb/ogrcouchdbdatasource.cpp \
+ ${WRKSRC}/ogr/ogrsf_frmts/geojson/ogresrijsonreader.cpp \
+ ${WRKSRC}/ogr/ogrsf_frmts/geojson/ogrgeojsonreader.cpp \
+ ${WRKSRC}/ogr/ogrsf_frmts/geojson/ogrtopojsonreader.cpp \
+ ${WRKSRC}/ogr/ogrsf_frmts/gme/ogrgmejson.cpp

post-install:
${INSTALL_LIB} ${WRKSRC}/libgdal.a ${STAGEDIR}${PREFIX}/lib/
d***@public.gmane.org
2014-08-24 00:14:18 UTC
Permalink
branch: masters/2014q2
Repository: freenas/ports
Pushed by: git
Pushed to: branch masters/2014q2
commit 11fb921f1890a93027aaaa3764924f0de5976363
Author: antoine <antoine-***@public.gmane.org>
Date: Fri Aug 22 08:27:52 2014 +0000

noweb license allows distribution
---
devel/noweb/Makefile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/devel/noweb/Makefile b/devel/noweb/Makefile
index baf8f98..74d6b64 100644
--- a/devel/noweb/Makefile
+++ b/devel/noweb/Makefile
@@ -13,7 +13,7 @@ COMMENT= Simple, extensible literate-programming tool
LICENSE= noweb
LICENSE_NAME= noweb
LICENSE_FILE= ${WRKSRC}/COPYRIGHT
-LICENSE_PERMS= auto-accept # no restrictions
+LICENSE_PERMS= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept

BUILD_DEPENDS= icont:${PORTSDIR}/lang/icon
RUN_DEPENDS= iconx:${PORTSDIR}/lang/icon
d***@public.gmane.org
2014-08-24 00:14:18 UTC
Permalink
branch: masters/2014q2
Repository: freenas/ports
Pushed by: git
Pushed to: branch masters/2014q2
commit 8e0107e9b0b578f5155e071e823a058523a6c4d4
Author: rene <rene-***@public.gmane.org>
Date: Fri Aug 22 08:48:29 2014 +0000

net/appkonference: Stage support
---
net/appkonference/Makefile | 1 -
net/appkonference/files/patch-Makefile | 10 ++++++----
2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/net/appkonference/Makefile b/net/appkonference/Makefile
index d34d72c..b820cdf 100644
--- a/net/appkonference/Makefile
+++ b/net/appkonference/Makefile
@@ -21,5 +21,4 @@ PLIST_FILES= lib/asterisk/modules/app_konference.so
ONLY_FOR_ARCHS= amd64 arm i386 ia64
ONLY_FOR_ARCHS_REASON= not yet ported to this architecture

-NO_STAGE= yes
.include <bsd.port.mk>
diff --git a/net/appkonference/files/patch-Makefile b/net/appkonference/files/patch-Makefile
index 564df45..760af5c 100644
--- a/net/appkonference/files/patch-Makefile
+++ b/net/appkonference/files/patch-Makefile
@@ -1,5 +1,5 @@
---- ./Makefile.orig 2012-06-13 14:10:52.160359057 +0200
-+++ ./Makefile 2012-06-13 14:13:01.635359504 +0200
+--- ./Makefile.orig 2012-01-25 20:40:01.000000000 +0100
++++ ./Makefile 2014-08-22 10:44:57.000000000 +0200
@@ -16,11 +16,11 @@
ASTERISK_SRC_DIR =

@@ -45,7 +45,7 @@
CPPFLAGS += -DRELEASE=\"$(RELEASE)\"
CPPFLAGS += -DASTERISK=$(ASTERISK)
CPPFLAGS += -DCHANNEL_TABLE_SIZE=$(CHANNEL_TABLE_SIZE)
-@@ -182,7 +182,7 @@
+@@ -182,7 +182,8 @@
$(OBJS): $(INCS)

$(TARGET): $(OBJS)
@@ -53,4 +53,6 @@
+ $(CC) $(LDFLAGS) $(SOLINK) -o $@ $(OBJS)

install:
- $(INSTALL) -m 755 $(TARGET) $(INSTALL_MODULES_DIR)
+- $(INSTALL) -m 755 $(TARGET) $(INSTALL_MODULES_DIR)
++ mkdir -p $(DESTDIR)$(INSTALL_MODULES_DIR)
++ $(INSTALL) -m 755 $(TARGET) $(DESTDIR)$(INSTALL_MODULES_DIR)
d***@public.gmane.org
2014-08-24 00:14:18 UTC
Permalink
branch: masters/2014q2
Repository: freenas/ports
Pushed by: git
Pushed to: branch masters/2014q2
commit 9b7ee447c542684bc8ec910182f1d58f3c10e119
Author: antoine <antoine-***@public.gmane.org>
Date: Fri Aug 22 08:51:05 2014 +0000

Fix License
---
dns/idnkit2/Makefile | 7 ++++---
dns/idnkit2/pkg-plist | 8 ++------
2 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/dns/idnkit2/Makefile b/dns/idnkit2/Makefile
index 878b3d9..141f4a9 100644
--- a/dns/idnkit2/Makefile
+++ b/dns/idnkit2/Makefile
@@ -11,9 +11,10 @@ PKGNAMESUFFIX= 2
MAINTAINER= fbsd-f82u26iogXmy/NLVq+***@public.gmane.org
COMMENT= Internationalized Domain Name toolkit 2

-LICENSE_PERMS= # permissive
-LICENSE_NAME= OSCL
-LICENSE_FILE= LICENSE.txt
+LICENSE= OSCL
+LICENSE_NAME= Open Source Code License
+LICENSE_PERMS= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
+LICENSE_FILE= ${WRKSRC}/LICENSE.txt

CONFLICTS_INSTALL= idnkit-1.*

diff --git a/dns/idnkit2/pkg-plist b/dns/idnkit2/pkg-plist
index a147446..fe948d1 100644
--- a/dns/idnkit2/pkg-plist
+++ b/dns/idnkit2/pkg-plist
@@ -2,12 +2,8 @@ bin/idncheck
bin/idncmp
bin/idnconv2
bin/idnslookup2
-@unexec cmp -s %D/etc/idn2.conf.sample %D/etc/idn2.conf && rm -f %D/etc/idn2.conf || true
-etc/idn2.conf.sample
-@exec [ -f %B/idn2.conf ] || cp -p %D/%F %B/idn2.conf
-@unexec cmp -s %D/etc/idnalias.conf.sample %D/etc/idnalias.conf && rm -f %D/etc/idnalias.conf || true
-etc/idnalias.conf.sample
-@exec [ -f %B/idnalias.conf ] || cp -p %D/%F %B/idnalias.conf
+@sample etc/idn2.conf.sample
+@sample etc/idnalias.conf.sample
include/idn/api.h
include/idn/export.h
include/idn/res.h
d***@public.gmane.org
2014-08-24 00:14:18 UTC
Permalink
branch: masters/2014q2
Repository: freenas/ports
Pushed by: git
Pushed to: branch masters/2014q2
commit 22d3a73020654d3f76c11f37effe2b9050e8da97
Author: antoine <antoine-***@public.gmane.org>
Date: Fri Aug 22 09:01:52 2014 +0000

IBM Public License allows distribution
---
net/openafs/Makefile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net/openafs/Makefile b/net/openafs/Makefile
index e748591..3be8338 100644
--- a/net/openafs/Makefile
+++ b/net/openafs/Makefile
@@ -19,7 +19,7 @@ COMMENT= AFS implementation from openafs.org
LICENSE= IPLv1
LICENSE_NAME= IBM Public License Version 1.0
LICENSE_FILE= ${WRKSRC}/doc/LICENSE
-LICENSE_PERMS= auto-accept
+LICENSE_PERMS= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept

AFS_DISTVERSION=1.6.7
DBVERSION= 2013-01-28
d***@public.gmane.org
2014-08-24 00:14:18 UTC
Permalink
branch: masters/2014q2
Repository: freenas/ports
Pushed by: git
Pushed to: branch masters/2014q2
commit cb41cd9c301cf0f00626b9dac3ccc281b8e5ec53
Author: amdmi3 <amdmi3-***@public.gmane.org>
Date: Fri Aug 22 09:06:51 2014 +0000

- Switch to USES=libtool, drop .la files
- Add LICENSE_FILE

Approved by: portmgr blanket
---
dns/ldns/Makefile | 7 ++++---
dns/ldns/pkg-plist | 2 +-
dns/py-ldns/pkg-plist | 2 +-
3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/dns/ldns/Makefile b/dns/ldns/Makefile
index 4e5254d..bc3c666 100644
--- a/dns/ldns/Makefile
+++ b/dns/ldns/Makefile
@@ -3,7 +3,7 @@

PORTNAME= ldns
PORTVERSION= 1.6.17
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= dns
MASTER_SITES= http://www.nlnetlabs.nl/downloads/ldns/ \
CRITICAL
@@ -12,9 +12,10 @@ MAINTAINER= jaap-wkbRRPzrzX3/D1n+***@public.gmane.org
COMMENT= Library for programs conforming to DNS RFCs and drafts

LICENSE= BSD3CLAUSE
+LICENSE_FILE= ${WRKSRC}/LICENSE

-USES= gmake
-USE_AUTOTOOLS= libtool
+USES= gmake libtool
+USE_AUTOTOOLS= libtoolize
USE_OPENSSL= yes
USE_LDCONFIG= yes

diff --git a/dns/ldns/pkg-plist b/dns/ldns/pkg-plist
index e851d9e..3721f8c 100644
--- a/dns/ldns/pkg-plist
+++ b/dns/ldns/pkg-plist
@@ -529,8 +529,8 @@ include/ldns/util.h
include/ldns/wire2host.h
include/ldns/zone.h
lib/libldns.a
-lib/libldns.la
lib/libldns.so
lib/libldns.so.1
+lib/libldns.so.1.6.17
libdata/pkgconfig/libldns.pc
@dirrm include/ldns
diff --git a/dns/py-ldns/pkg-plist b/dns/py-ldns/pkg-plist
index c1313ba..ca654b4 100644
--- a/dns/py-ldns/pkg-plist
+++ b/dns/py-ldns/pkg-plist
@@ -1,6 +1,6 @@
+%%PYTHON_SITELIBDIR%%/_ldns.so.1.6.17
%%PYTHON_SITELIBDIR%%/_ldns.so.1
%%PYTHON_SITELIBDIR%%/ldns.py
%%PYTHON_SITELIBDIR%%/_ldns.so
-%%PYTHON_SITELIBDIR%%/_ldns.la
%%PYTHON_SITELIBDIR%%/_ldns.a
@dirrm %%PYTHON_SITELIBDIR%%/ldns
d***@public.gmane.org
2014-08-24 00:14:18 UTC
Permalink
branch: masters/2014q2
Repository: freenas/ports
Pushed by: git
Pushed to: branch masters/2014q2
commit 94f2258693d28c3003509df6b6c8e81ad461d716
Author: amdmi3 <amdmi3-***@public.gmane.org>
Date: Fri Aug 22 09:06:34 2014 +0000

- Switch dns/unbound to USES=libtool, drop .la files
- Bump dependent ports as .so version has changed
- While here, add LICENSE_FILE to dns/getdns

Approved by: portmgr blanket
---
dns/autotrust/Makefile | 2 +-
dns/getdns/Makefile | 2 ++
dns/unbound/Makefile | 6 +++---
dns/unbound/pkg-plist | 5 ++---
mail/opendkim/Makefile | 2 +-
security/gnutls/Makefile | 2 +-
security/strongswan/Makefile | 1 +
7 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/dns/autotrust/Makefile b/dns/autotrust/Makefile
index 28b4cbd..8b1d5da 100644
--- a/dns/autotrust/Makefile
+++ b/dns/autotrust/Makefile
@@ -3,7 +3,7 @@

PORTNAME= autotrust
PORTVERSION= 0.3.1
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= dns
MASTER_SITES= http://www.nlnetlabs.nl/downloads/autotrust/

diff --git a/dns/getdns/Makefile b/dns/getdns/Makefile
index d559754..63b4963 100644
--- a/dns/getdns/Makefile
+++ b/dns/getdns/Makefile
@@ -3,6 +3,7 @@

PORTNAME= getdns
PORTVERSION= 0.1.3
+PORTREVISION= 1
CATEGORIES= dns ipv6
MASTER_SITES= http://getdnsapi.net/dist/ \
http://mirrors.rit.edu/zi/
@@ -11,6 +12,7 @@ MAINTAINER= zi-***@public.gmane.org
COMMENT= Modern asynchronous DNS API

LICENSE= BSD3CLAUSE
+LICENSE_FILE= ${WRKSRC}/LICENSE

LIB_DEPENDS= libexpat.so:${PORTSDIR}/textproc/expat2 \
libidn.so:${PORTSDIR}/dns/libidn \
diff --git a/dns/unbound/Makefile b/dns/unbound/Makefile
index 7878bc9..0e0a7e8 100644
--- a/dns/unbound/Makefile
+++ b/dns/unbound/Makefile
@@ -3,7 +3,7 @@

PORTNAME= unbound
PORTVERSION= 1.4.22
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= dns
MASTER_SITES= http://unbound.net/downloads/

@@ -13,7 +13,7 @@ COMMENT= Validating, recursive, and caching DNS resolver
LICENSE= BSD4CLAUSE
LICENSE_FILE= ${WRKSRC}/LICENSE

-USES+= gmake
+USES+= gmake libtool
USE_OPENSSL= yes
GNU_CONFIGURE= yes
CONFIGURE_ARGS+=--with-ssl=${OPENSSLBASE} --with-libexpat=${LOCALBASE}
@@ -43,7 +43,7 @@ MUNIN_DESC= Install Munin plugin
LIB_DEPENDS+= libexpat.so:${PORTSDIR}/textproc/expat2 \
libldns.so:${PORTSDIR}/dns/ldns

-STRIP_FILES= .libs/libunbound.so.4 unbound-checkconf unbound \
+STRIP_FILES= .libs/libunbound.so unbound-checkconf unbound \
unbound-control .libs/unbound-host .libs/unbound-anchor

.if ${PORT_OPTIONS:MPYTHON}
diff --git a/dns/unbound/pkg-plist b/dns/unbound/pkg-plist
index 103acd3..182fcce 100644
--- a/dns/unbound/pkg-plist
+++ b/dns/unbound/pkg-plist
@@ -1,8 +1,8 @@
etc/unbound/unbound.conf.sample
include/unbound.h
-lib/libunbound.so.4
+lib/libunbound.so.2.2.1
+lib/libunbound.so.2
lib/libunbound.so
-lib/libunbound.la
lib/libunbound.a
man/man1/unbound-host.1.gz
man/man3/libunbound.3.gz
@@ -49,7 +49,6 @@ sbin/unbound-control
sbin/unbound-control-setup
sbin/unbound-host
%%PYTHON%%%%PYTHON_SITELIBDIR%%/_unbound.a
-%%PYTHON%%%%PYTHON_SITELIBDIR%%/_unbound.la
%%PYTHON%%%%PYTHON_SITELIBDIR%%/_unbound.so
%%PYTHON%%%%PYTHON_SITELIBDIR%%/_unbound.so.4
%%PYTHON%%%%PYTHON_SITELIBDIR%%/unbound.py
diff --git a/mail/opendkim/Makefile b/mail/opendkim/Makefile
index 71ca379..75639b8 100644
--- a/mail/opendkim/Makefile
+++ b/mail/opendkim/Makefile
@@ -3,7 +3,7 @@

PORTNAME= opendkim
PORTVERSION= 2.9.2
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= mail security
MASTER_SITES= SF
MASTER_SITE_SUBDIR= ${PORTNAME} \
diff --git a/security/gnutls/Makefile b/security/gnutls/Makefile
index 7872a947..ab88440 100644
--- a/security/gnutls/Makefile
+++ b/security/gnutls/Makefile
@@ -2,7 +2,7 @@

PORTNAME= gnutls
PORTVERSION= 3.2.16
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= security net
MASTER_SITES= GNUPG/gnutls/v3.2

diff --git a/security/strongswan/Makefile b/security/strongswan/Makefile
index f7f400f..98d111a 100644
--- a/security/strongswan/Makefile
+++ b/security/strongswan/Makefile
@@ -3,6 +3,7 @@

PORTNAME= strongswan
PORTVERSION= 5.2.0
+PORTREVISION= 1
CATEGORIES= security
MASTER_SITES= http://download.strongswan.org/ \
http://download2.strongswan.org/
d***@public.gmane.org
2014-08-24 00:14:18 UTC
Permalink
branch: masters/2014q2
Repository: freenas/ports
Pushed by: git
Pushed to: branch masters/2014q2
commit 711c7d565c938849018251326ae53974ac4297a7
Author: rene <rene-***@public.gmane.org>
Date: Fri Aug 22 09:16:44 2014 +0000

Remove expired ports:
2014-08-22 databases/pg_filedump: Broken for more than 6 months
2014-08-22 devel/svnmerge: Broken for more than 6 months
2014-08-22 net-mgmt/circe: Broken for more than 6 months
2014-08-22 print/latex-aa: Broken for more than 6 months
2014-08-22 textproc/rast: Broken for more than 6 months
2014-08-22 www/abyssws: Broken for more than 6 months
2014-08-22 www/docebo: Not maintained upstream
2014-08-22 www/rejik: Broken for more than 6 months and depends on www/squid which reached EOL 2 years ago
---
MOVED | 8 +
databases/Makefile | 1 -
databases/pg_filedump/Makefile | 36 -
databases/pg_filedump/distinfo | 2 -
databases/pg_filedump/files/patch-Makefile | 28 -
databases/pg_filedump/pkg-descr | 7 -
databases/pg_filedump/pkg-plist | 4 -
devel/Makefile | 1 -
devel/svnmerge/Makefile | 48 -
devel/svnmerge/pkg-descr | 6 -
net-mgmt/Makefile | 1 -
net-mgmt/circe/Makefile | 53 -
net-mgmt/circe/distinfo | 2 -
net-mgmt/circe/pkg-descr | 5 -
net-mgmt/circe/pkg-plist | 20 -
print/Makefile | 1 -
print/latex-aa/Makefile | 48 -
print/latex-aa/distinfo | 2 -
print/latex-aa/pkg-descr | 12 -
print/latex-aa/pkg-plist | 11 -
textproc/Makefile | 1 -
textproc/rast/Makefile | 75 -
textproc/rast/distinfo | 2 -
textproc/rast/files/patch-local_db.c | 11 -
textproc/rast/files/patch-merger.c | 18 -
textproc/rast/pkg-descr | 3 -
textproc/rast/pkg-plist | 93 -
www/Makefile | 3 -
www/abyssws/Makefile | 54 -
www/abyssws/distinfo | 2 -
www/abyssws/files/abyssws.in | 35 -
www/abyssws/pkg-deinstall | 35 -
www/abyssws/pkg-descr | 17 -
www/abyssws/pkg-install | 53 -
www/abyssws/pkg-plist | 115 -
www/docebo/Makefile | 46 -
www/docebo/distinfo | 2 -
www/docebo/files/pkg-message.in | 24 -
www/docebo/pkg-descr | 7 -
www/docebo/pkg-plist | 6597 ----------------------------
www/rejik/Makefile | 122 -
www/rejik/distinfo | 8 -
www/rejik/files/patch-Makefile | 11 -
www/rejik/files/pkg-message.in | 10 -
www/rejik/pkg-descr | 4 -
www/rejik/pkg-plist | 45 -
46 files changed, 8 insertions(+), 7681 deletions(-)

diff --git a/MOVED b/MOVED
index 38aba62..1dbd182 100644
--- a/MOVED
+++ b/MOVED
@@ -6477,3 +6477,11 @@ databases/db44|databases/db48|2014-08-15|Superseded by databases/db48
databases/db46|databases/db48|2014-08-15|Superseded by databases/db48
databases/db47|databases/db48|2014-08-15|Superseded by databases/db48
print/tex-omegaware-old||2014-08-22|Deprecated in favor of print/tex-aleph
+databases/pg_filedump||2014-08-22|Has expired: Broken for more than 6 months
+devel/svnmerge||2014-08-22|Has expired: Broken for more than 6 months
+net-mgmt/circe||2014-08-22|Has expired: Broken for more than 6 months
+print/latex-aa||2014-08-22|Has expired: Broken for more than 6 months
+textproc/rast||2014-08-22|Has expired: Broken for more than 6 months
+www/abyssws||2014-08-22|Has expired: Broken for more than 6 months
+www/docebo||2014-08-22|Has expired: Not maintained upstream
+www/rejik||2014-08-22|Has expired: Broken for more than 6 months and depends on www/squid which reached EOL 2 years ago
diff --git a/databases/Makefile b/databases/Makefile
index 22a2714..868ed35 100644
--- a/databases/Makefile
+++ b/databases/Makefile
@@ -540,7 +540,6 @@
SUBDIR += percona56-client
SUBDIR += percona56-server
SUBDIR += pg_activity
- SUBDIR += pg_filedump
SUBDIR += pg_reorg
SUBDIR += pg_rman
SUBDIR += pg_statsinfo
diff --git a/databases/pg_filedump/Makefile b/databases/pg_filedump/Makefile
deleted file mode 100644
index 302aa0b..0000000
--- a/databases/pg_filedump/Makefile
+++ /dev/null
@@ -1,36 +0,0 @@
-# $FreeBSD$
-
-PORTNAME= pg_filedump
-PORTVERSION= 8.4
-CATEGORIES= databases
-MASTER_SITES= http://sources.redhat.com/rhdb/tools/
-EXTRACT_SUFX= .tar
-
-MAINTAINER= ports-***@public.gmane.org
-COMMENT= Utility to format PostgreSQL heap, index, etc into human-readable form
-
-FETCH_DEPENDS= ${NONEXISTENT}:${PORTSDIR}/databases/postgresql84-client:patch
-BUILD_DEPENDS= ${NONEXISTENT}:${PORTSDIR}/databases/postgresql84-client:patch
-
-WRKSRC= ${WRKDIR}/${PORTNAME}-8.4.0
-
-OPTIONS_DEFINE= DOCS
-
-.include <bsd.port.pre.mk>
-
-BROKEN= Does not compile
-DEPRECATED= Broken for more than 6 months
-EXPIRATION_DATE= 2014-08-22
-
-PG84VER!= cd ${PORTSDIR}/databases/postgresql84-client && ${MAKE} -V PORTVERSION
-
-post-patch:
- ${REINPLACE_CMD} -e "s|8.4.0|${PG84VER}|" ${WRKSRC}/Makefile
-
-do-install:
- ${INSTALL_PROGRAM} ${WRKSRC}/pg_filedump ${STAGEDIR}${PREFIX}/bin
- ${MKDIR} ${STAGEDIR}${DOCSDIR}
- ${INSTALL_DATA} ${WRKSRC}/ChangeLog ${STAGEDIR}${DOCSDIR}
- ${INSTALL_DATA} ${WRKSRC}/README.pg_filedump ${STAGEDIR}${DOCSDIR}
-
-.include <bsd.port.post.mk>
diff --git a/databases/pg_filedump/distinfo b/databases/pg_filedump/distinfo
deleted file mode 100644
index c01152c..0000000
--- a/databases/pg_filedump/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (pg_filedump-8.4.tar) = 75f6607cc78942683bda0967ebe72b7d411e5ba06b2dcd645d0eee2930e6595a
-SIZE (pg_filedump-8.4.tar) = 71680
diff --git a/databases/pg_filedump/files/patch-Makefile b/databases/pg_filedump/files/patch-Makefile
deleted file mode 100644
index 6b34345..0000000
--- a/databases/pg_filedump/files/patch-Makefile
+++ /dev/null
@@ -1,28 +0,0 @@
---- Makefile.orig 2008-02-28 23:12:21.000000000 +0900
-+++ Makefile 2009-08-17 23:37:15.000000000 +0900
-@@ -3,10 +3,10 @@
- CC=gcc
- CFLAGS=-g -O -Wall -Wmissing-prototypes -Wmissing-declarations
-
--INCLUDE=/usr/include/pgsql/server
-+INCLUDE=${LOCALBASE}/include/postgresql/server
-
- # PGSQL MUST POINT TO pgsql SOURCE DIRECTORY
--PGSQL=../../../../postgres/pgsql
-+PGSQL=../../../postgresql84-client/work/postgresql-8.4.0
-
- CRC_SRC=${PGSQL}/src/backend/utils/hash
- CRC_INCLUDE=${PGSQL}/src
-@@ -17,10 +17,10 @@
- ${CC} ${CFLAGS} -o pg_filedump pg_filedump.o pg_crc.o
-
- pg_filedump.o: pg_filedump.c
-- ${CC} ${CFLAGS} -I${INCLUDE} pg_filedump.c -c
-+ ${CC} ${CFLAGS} -I${INCLUDE} -I${LOCALBASE}/include pg_filedump.c -c
-
- pg_crc.o: ${CRC_SRC}/pg_crc.c
-- ${CC} ${CFLAGS} -I${CRC_INCLUDE} -I${INCLUDE} ${CRC_SRC}/pg_crc.c -c
-+ ${CC} ${CFLAGS} -I${CRC_INCLUDE} -I${INCLUDE} -I${LOCALBASE}/include ${CRC_SRC}/pg_crc.c -c
-
- clean:
- rm -rf *.o pg_filedump
diff --git a/databases/pg_filedump/pkg-descr b/databases/pg_filedump/pkg-descr
deleted file mode 100644
index 2b7cce4..0000000
--- a/databases/pg_filedump/pkg-descr
+++ /dev/null
@@ -1,7 +0,0 @@
-pg_filedump is a utility to format PostgreSQL heap, index, and control
-files into a human-readable form. You can format/dump the files
-several ways as well as dumping straight binary. This utility is
-intended to aid in the understanding of the internal contents of a
-PostgreSQL block.
-
-WWW: http://sources.redhat.com/rhdb/utilities.html
diff --git a/databases/pg_filedump/pkg-plist b/databases/pg_filedump/pkg-plist
deleted file mode 100644
index a5b9b0b..0000000
--- a/databases/pg_filedump/pkg-plist
+++ /dev/null
@@ -1,4 +0,0 @@
-bin/pg_filedump
-%%PORTDOCS%%%%DOCSDIR%%/ChangeLog
-%%PORTDOCS%%%%DOCSDIR%%/README.pg_filedump
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
diff --git a/devel/Makefile b/devel/Makefile
index 5bc14f9..9d8918e 100644
--- a/devel/Makefile
... 7873 lines suppressed ...
d***@public.gmane.org
2014-08-24 00:14:18 UTC
Permalink
branch: masters/2014q2
Repository: freenas/ports
Pushed by: git
Pushed to: branch masters/2014q2
commit c647088f38dc37eb21d31b5000faa379ec598f8e
Author: sunpoet <sunpoet-***@public.gmane.org>
Date: Fri Aug 22 09:07:49 2014 +0000

- Sort LIB_DEPENDS
- Use REINPLACE_CMD instead of patch file
- Cleanup Makefile
- Update WWW and pkg-descr
- Take maintainership
---
graphics/openjpeg/Makefile | 14 ++++++-----
graphics/openjpeg/files/patch-CMakeLists.txt | 37 ----------------------------
graphics/openjpeg/pkg-descr | 24 +++++++++++-------
graphics/openjpeg/pkg-plist | 6 ++---
4 files changed, 26 insertions(+), 55 deletions(-)

diff --git a/graphics/openjpeg/Makefile b/graphics/openjpeg/Makefile
index 0d32394..54a097f 100644
--- a/graphics/openjpeg/Makefile
+++ b/graphics/openjpeg/Makefile
@@ -4,21 +4,23 @@
PORTNAME= openjpeg
PORTVERSION= 2.1.0
CATEGORIES= graphics
-MASTER_SITES= SF/openjpeg.mirror/${PORTVERSION}/
-#??
+MASTER_SITES= SF/openjpeg.mirror/${PORTVERSION}

-MAINTAINER= ports-***@public.gmane.org
+MAINTAINER= sunpoet-***@public.gmane.org
COMMENT= Open-source JPEG 2000 codec

LICENSE= BSD2CLAUSE

-LIB_DEPENDS= libtiff.so:${PORTSDIR}/graphics/tiff \
+LIB_DEPENDS= liblcms2.so:${PORTSDIR}/graphics/lcms2 \
libpng15.so:${PORTSDIR}/graphics/png \
- liblcms2.so:${PORTSDIR}/graphics/lcms2
+ libtiff.so:${PORTSDIR}/graphics/tiff

-USES= cmake pkgconfig
USE_LDCONFIG= yes
+USES= cmake pkgconfig

PLIST_SUB= VER=${PORTVERSION:R}

+post-patch:
+ @${REINPLACE_CMD} -e 's|$${OPENJPEG_INSTALL_LIB_DIR}/pkgconfig|libdata/pkgconfig|' ${WRKSRC}/CMakeLists.txt
+
.include <bsd.port.mk>
diff --git a/graphics/openjpeg/files/patch-CMakeLists.txt b/graphics/openjpeg/files/patch-CMakeLists.txt
deleted file mode 100644
index 49af929..0000000
--- a/graphics/openjpeg/files/patch-CMakeLists.txt
+++ /dev/null
@@ -1,37 +0,0 @@
---- CMakeLists.txt.orig 2014-05-23 22:46:07.000000000 +0200
-+++ CMakeLists.txt 2014-05-23 22:48:32.000000000 +0200
-@@ -334,14 +334,14 @@
- configure_file(${CMAKE_CURRENT_SOURCE_DIR}/src/lib/openjp2/libopenjp2.pc.cmake.in
- ${CMAKE_CURRENT_BINARY_DIR}/libopenjp2.pc @ONLY)
- install( FILES ${CMAKE_CURRENT_BINARY_DIR}/libopenjp2.pc DESTINATION
-- ${OPENJPEG_INSTALL_LIB_DIR}/pkgconfig )
-+ libdata/pkgconfig )
- #
- if(BUILD_JPWL)
- # install in lib and not share (see multi-arch note above)
- configure_file(${CMAKE_CURRENT_SOURCE_DIR}/src/lib/openjpwl/libopenjpwl.pc.cmake.in
- ${CMAKE_CURRENT_BINARY_DIR}/libopenjpwl.pc @ONLY)
- install( FILES ${CMAKE_CURRENT_BINARY_DIR}/libopenjpwl.pc DESTINATION
-- ${OPENJPEG_INSTALL_LIB_DIR}/pkgconfig )
-+ libdata/pkgconfig )
- endif()
- #
- if(BUILD_JPIP)
-@@ -349,7 +349,7 @@
- configure_file(${CMAKE_CURRENT_SOURCE_DIR}/src/lib/openjpip/libopenjpip.pc.cmake.in
- ${CMAKE_CURRENT_BINARY_DIR}/libopenjpip.pc @ONLY)
- install( FILES ${CMAKE_CURRENT_BINARY_DIR}/libopenjpip.pc DESTINATION
-- ${OPENJPEG_INSTALL_LIB_DIR}/pkgconfig )
-+ libdata/pkgconfig )
- endif()
- #
- if(BUILD_JP3D)
-@@ -357,7 +357,7 @@
- configure_file(${CMAKE_CURRENT_SOURCE_DIR}/src/lib/openjp3d/libopenjp3d.pc.cmake.in
- ${CMAKE_CURRENT_BINARY_DIR}/libopenjp3d.pc @ONLY)
- install( FILES ${CMAKE_CURRENT_BINARY_DIR}/libopenjp3d.pc DESTINATION
-- ${OPENJPEG_INSTALL_LIB_DIR}/pkgconfig )
-+ libdata/pkgconfig )
- endif()
- endif()
-
diff --git a/graphics/openjpeg/pkg-descr b/graphics/openjpeg/pkg-descr
index ce3b146..055e519 100644
--- a/graphics/openjpeg/pkg-descr
+++ b/graphics/openjpeg/pkg-descr
@@ -1,10 +1,16 @@
-The OpenJPEG library is an open-source JPEG 2000 codec written in
-C language. It has been developed in order to promote the use of
-JPEG 2000, the new still-image compression standard from the Joint
-Photographic Experts Group (JPEG). In addition to the basic codec,
-various other features are under development, among them the JP2
-and MJ2 (Motion JPEG 2000) file formats, an indexing tool useful
-for the JPIP protocol, JPWL-tools for error-resilience, a Java-viewer
-for j2k-images, ...
+The OpenJPEG library is an open-source JPEG 2000 library developed in order to
+promote the use of JPEG 2000.

-WWW: http://code.google.com/p/openjpeg/
+The main part of the project consists in a JPEG 2000 codec compliant with the
+Part 1 of the standard (Class-1 Profile-1 compliance).
+
+Besides this main codec, OpenJPEG integrates several other modules:
+- JP2 (JPEG 2000 standard Part 2 - Handling of JP2 boxes and extended multiple
+ component transforms for multispectral and hyperspectral imagery)
+- MJ2 (JPEG 2000 standard Part 3)
+- JPWL (JPEG 2000 standard Part 11)
+- JPIP (JPEG 2000 standard Part 9)
+- OPJViewer, a GUI viewer for J2K, JP2, JPWL and MJ2 files
+
+WWW: https://code.google.com/p/openjpeg/
+WWW: http://openjpeg.mirror.sourceforge.net/
diff --git a/graphics/openjpeg/pkg-plist b/graphics/openjpeg/pkg-plist
index 8d0234b..d7d990d 100644
--- a/graphics/openjpeg/pkg-plist
+++ b/graphics/openjpeg/pkg-plist
@@ -5,11 +5,11 @@ include/openjpeg-%%VER%%/openjpeg.h
include/openjpeg-%%VER%%/opj_config.h
include/openjpeg-%%VER%%/opj_stdint.h
lib/libopenjp2.so
-lib/libopenjp2.so.2.1.0
+lib/libopenjp2.so.%%VER%%.0
lib/libopenjp2.so.7
lib/openjpeg-%%VER%%/OpenJPEGConfig.cmake
lib/openjpeg-%%VER%%/OpenJPEGTargets-%%CMAKE_BUILD_TYPE%%.cmake
lib/openjpeg-%%VER%%/OpenJPEGTargets.cmake
libdata/pkgconfig/libopenjp2.pc
-@dirrmtry lib/openjpeg-%%VER%%
-@dirrmtry include/openjpeg-%%VER%%
+@dirrm lib/openjpeg-%%VER%%
+@dirrm include/openjpeg-%%VER%%
d***@public.gmane.org
2014-08-24 00:14:19 UTC
Permalink
branch: masters/2014q2
Repository: freenas/ports
Pushed by: git
Pushed to: branch masters/2014q2
commit 03ff5c9f422faaef2a717b97214eb4c438824370
Author: sunpoet <sunpoet-***@public.gmane.org>
Date: Fri Aug 22 09:20:30 2014 +0000

- Fix PLIST

PR: ports/192909
Submitted by: Takefu <takefu-***@public.gmane.org> (maintainer)
---
www/p5-HTML-Defaultify/pkg-plist | 2 --
1 file changed, 2 deletions(-)

diff --git a/www/p5-HTML-Defaultify/pkg-plist b/www/p5-HTML-Defaultify/pkg-plist
index 29923ed..d42cb27 100644
--- a/www/p5-HTML-Defaultify/pkg-plist
+++ b/www/p5-HTML-Defaultify/pkg-plist
@@ -1,6 +1,4 @@
%%SITE_PERL%%/HTML/Defaultify.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/Defaultify/.packlist
%%PERL5_MAN3%%/HTML::Defaultify.3.gz
-@dirrmtry %%SITE_PERL%%/HTML
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML/Defaultify
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/HTML
d***@public.gmane.org
2014-08-24 00:14:19 UTC
Permalink
branch: masters/2014q2
Repository: freenas/ports
Pushed by: git
Pushed to: branch masters/2014q2
commit c1b9dc48712c4ed438a18b9a2fe69e7fee2a7f8f
Author: sunpoet <sunpoet-***@public.gmane.org>
Date: Fri Aug 22 09:20:26 2014 +0000

- Fix PLIST

PR: ports/192908
Submitted by: Takefu <takefu-***@public.gmane.org> (maintainer)
---
devel/p5-POE-Quickie/Makefile | 1 -
devel/p5-POE-Quickie/pkg-plist | 2 --
2 files changed, 3 deletions(-)

diff --git a/devel/p5-POE-Quickie/Makefile b/devel/p5-POE-Quickie/Makefile
index dfd5a76..2e22637 100644
--- a/devel/p5-POE-Quickie/Makefile
+++ b/devel/p5-POE-Quickie/Makefile
@@ -16,7 +16,6 @@ LICENSE_FILE= ${WRKSRC}/LICENSE

BUILD_DEPENDS= p5-POE>=1.350:${PORTSDIR}/devel/p5-POE
RUN_DEPENDS:= ${BUILD_DEPENDS}
-
TEST_DEPENDS= p5-Capture-Tiny>=0.07:${PORTSDIR}/devel/p5-Capture-Tiny \
p5-Test-Deep>=0:${PORTSDIR}/devel/p5-Test-Deep

diff --git a/devel/p5-POE-Quickie/pkg-plist b/devel/p5-POE-Quickie/pkg-plist
index 4ea3af1..ab4c17a 100644
--- a/devel/p5-POE-Quickie/pkg-plist
+++ b/devel/p5-POE-Quickie/pkg-plist
@@ -2,5 +2,3 @@
%%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Quickie/.packlist
%%PERL5_MAN3%%/POE::Quickie.3.gz
@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/POE/Quickie
-@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/POE
-@dirrmtry %%SITE_PERL%%/POE
d***@public.gmane.org
2014-08-24 00:14:19 UTC
Permalink
branch: masters/2014q2
Repository: freenas/ports
Pushed by: git
Pushed to: branch masters/2014q2
commit 9223fe37d998e31bab002c80e9042393b0247e02
Author: sunpoet <sunpoet-***@public.gmane.org>
Date: Fri Aug 22 09:29:10 2014 +0000

- Add CPE information
---
graphics/openjpeg/Makefile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/graphics/openjpeg/Makefile b/graphics/openjpeg/Makefile
index 54a097f..fa6c037 100644
--- a/graphics/openjpeg/Makefile
+++ b/graphics/openjpeg/Makefile
@@ -16,7 +16,7 @@ LIB_DEPENDS= liblcms2.so:${PORTSDIR}/graphics/lcms2 \
libtiff.so:${PORTSDIR}/graphics/tiff

USE_LDCONFIG= yes
-USES= cmake pkgconfig
+USES= cmake cpe pkgconfig

PLIST_SUB= VER=${PORTVERSION:R}
d***@public.gmane.org
2014-08-24 00:14:19 UTC
Permalink
branch: masters/2014q2
Repository: freenas/ports
Pushed by: git
Pushed to: branch masters/2014q2
commit c3edf882f9dd685c148e107127ac0017eba9ef5d
Author: antoine <antoine-***@public.gmane.org>
Date: Fri Aug 22 09:50:16 2014 +0000

MIT license with a copyright holder can be distributed
---
graphics/R-cran-munsell/Makefile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/graphics/R-cran-munsell/Makefile b/graphics/R-cran-munsell/Makefile
index 914e12e..eecc33c 100644
--- a/graphics/R-cran-munsell/Makefile
+++ b/graphics/R-cran-munsell/Makefile
@@ -14,7 +14,7 @@ LICENSE= MIT CW
LICENSE_COMB= multi
LICENSE_NAME_CW= Charlotte Wickham COPYRIGHT
LICENSE_FILE_CW= ${WRKSRC}/LICENSE
-LICENSE_PERMS_CW= auto-accept
+LICENSE_PERMS_CW= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept

RUN_DEPENDS= R-cran-colorspace>0:${PORTSDIR}/graphics/R-cran-colorspace
d***@public.gmane.org
2014-08-24 00:14:19 UTC
Permalink
branch: masters/2014q2
Repository: freenas/ports
Pushed by: git
Pushed to: branch masters/2014q2
commit dacd0a0c5e119f9c584f052671ff487c5209d609
Author: amdmi3 <amdmi3-***@public.gmane.org>
Date: Fri Aug 22 10:01:19 2014 +0000

- Switch to bundled SFML in preparation to ports' SFML update (bundled one was used anyway, probably conflictiong with systemwide one)
- Add USES=compiler:c++11-lib to fix build on 9.x
- Patch build system to not pick up includes from systemwide SFML (also submitted upstream)
- Minor whitespace fix

Approved by: portmgr blanket (for bits not related to sfml update)
---
emulators/dolphin-emu/Makefile | 7 +++----
emulators/dolphin-emu/files/patch-CMakeLists.txt | 21 +++++++++++++++++++--
2 files changed, 22 insertions(+), 6 deletions(-)

diff --git a/emulators/dolphin-emu/Makefile b/emulators/dolphin-emu/Makefile
index b00f1df..deaf334 100644
--- a/emulators/dolphin-emu/Makefile
+++ b/emulators/dolphin-emu/Makefile
@@ -3,7 +3,7 @@

PORTNAME= dolphin-emu
PORTVERSION= 4.0.0
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= emulators
MASTER_SITES= http://contribs.martymac.org/FreeBSD-ports/distfiles/ \
LOCAL/martymac
@@ -17,16 +17,15 @@ LIB_DEPENDS= libexecinfo.so:${PORTSDIR}/devel/libexecinfo \
libfreetype.so:${PORTSDIR}/print/freetype2 \
liblzo2.so:${PORTSDIR}/archivers/lzo2 \
libSoundTouch.so:${PORTSDIR}/audio/soundtouch \
- libsfml-network.so:${PORTSDIR}/devel/sfml \
libpolarssl.so:${PORTSDIR}/security/polarssl

USE_SDL= sdl
USE_XORG= ice xext x11 xrandr xi
USE_WX= 3.0+
WX_UNICODE= yes
-USE_GL= gl glew glu
+USE_GL= gl glew glu

-USES= dos2unix cmake iconv openal pkgconfig tar:tgz
+USES= dos2unix cmake iconv openal pkgconfig tar:tgz compiler:c++11-lib
DOS2UNIX_REGEX= .*\.(h|c|cpp)

# Disable ALSA (emulated) and ao (buggy)
diff --git a/emulators/dolphin-emu/files/patch-CMakeLists.txt b/emulators/dolphin-emu/files/patch-CMakeLists.txt
index 4faf9d3..45ad27d 100644
--- a/emulators/dolphin-emu/files/patch-CMakeLists.txt
+++ b/emulators/dolphin-emu/files/patch-CMakeLists.txt
@@ -1,5 +1,5 @@
---- CMakeLists.txt.orig 2013-09-16 04:58:51.000000000 +0200
-+++ CMakeLists.txt 2013-09-16 05:15:59.000000000 +0200
+--- CMakeLists.txt.orig 2013-09-23 16:15:52.000000000 +0400
++++ CMakeLists.txt 2014-08-20 17:37:42.000000000 +0400
@@ -351,51 +351,81 @@
message("OpenMP parallelization disabled")
endif()
@@ -158,3 +158,20 @@

if(OPROFILING)
check_lib(OPROFILE opagent opagent.h)
+@@ -577,14 +618,14 @@
+ set(SFML_FIND_VERSION_MAJOR 1)
+ set(SFML_FIND_VERSION_MINOR 5)
+ if(NOT ${CMAKE_SYSTEM_NAME} MATCHES "Darwin" AND NOT ANDROID)
+- include(FindSFML OPTIONAL)
++ #include(FindSFML OPTIONAL)
+ endif()
+ if(SFML_FOUND AND NOT SFML_VERSION_MAJOR) # SFML 1.x doesn't define SFML_VERSION_MAJOR
+ message("Using shared SFML")
+ else()
+ message("Using static SFML ${SFML_FIND_VERSION_MAJOR}.${SFML_FIND_VERSION_MINOR} from Externals")
+ add_subdirectory(Externals/SFML)
+- include_directories(Externals/SFML/include)
++ include_directories(BEFORE Externals/SFML/include)
+ endif()
+
+ if(USE_UPNP)
d***@public.gmane.org
2014-08-24 00:14:19 UTC
Permalink
branch: masters/2014q2
Repository: freenas/ports
Pushed by: git
Pushed to: branch masters/2014q2
commit b5638930cd397aaabc7a4da81cdde4728b357ecf
Author: amdmi3 <amdmi3-***@public.gmane.org>
Date: Fri Aug 22 10:01:59 2014 +0000

- Add missing patch
---
emulators/dolphin-emu/files/patch-Externals-SFML-CMakeLists.txt | 8 ++++++++
1 file changed, 8 insertions(+)

diff --git a/emulators/dolphin-emu/files/patch-Externals-SFML-CMakeLists.txt b/emulators/dolphin-emu/files/patch-Externals-SFML-CMakeLists.txt
new file mode 100644
index 0000000..fee7202
--- /dev/null
+++ b/emulators/dolphin-emu/files/patch-Externals-SFML-CMakeLists.txt
@@ -0,0 +1,8 @@
+--- Externals/SFML/CMakeLists.txt.orig 2011-08-22 19:09:51.000000000 +0400
++++ Externals/SFML/CMakeLists.txt 2014-08-20 17:38:07.000000000 +0400
+@@ -1,4 +1,4 @@
+-include_directories(include)
++include_directories(BEFORE include)
+
+ set(SRCS src/SFML/Network/Ftp.cpp
+ src/SFML/Network/Http.cpp
d***@public.gmane.org
2014-08-24 00:14:19 UTC
Permalink
branch: masters/2014q2
Repository: freenas/ports
Pushed by: git
Pushed to: branch masters/2014q2
commit a5083d0ed367d18496071f51b5015ae4d595d99e
Author: danfe <danfe-***@public.gmane.org>
Date: Fri Aug 22 10:01:48 2014 +0000

- Update OpenTTD to version 1.4.2
- Trim @dirrmtry entries owned by dependency
---
games/openttd/Makefile | 2 +-
games/openttd/distinfo | 4 ++--
games/openttd/pkg-plist | 14 --------------
3 files changed, 3 insertions(+), 17 deletions(-)

diff --git a/games/openttd/Makefile b/games/openttd/Makefile
index fb0b1e75..cb4d913 100644
--- a/games/openttd/Makefile
+++ b/games/openttd/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$

PORTNAME= openttd
-PORTVERSION= 1.4.1
+PORTVERSION= 1.4.2
CATEGORIES= games
MASTER_SITES= http://gb.binaries.openttd.org/binaries/releases/${PORTVERSION}/ \
http://ftp.snt.utwente.nl/pub/games/openttd/binaries/releases/${PORTVERSION}/ \
diff --git a/games/openttd/distinfo b/games/openttd/distinfo
index 1037200..5c4c035 100644
--- a/games/openttd/distinfo
+++ b/games/openttd/distinfo
@@ -1,2 +1,2 @@
-SHA256 (openttd-1.4.1-source.tar.xz) = 1face3af7a9b2169c0e284f3916f4b7b82947364e836107c404be520a570753e
-SIZE (openttd-1.4.1-source.tar.xz) = 6664600
+SHA256 (openttd-1.4.2-source.tar.xz) = e286c7e82fc5a9d5b52902ffab566c5924ff27eced165cb2583aa6df2d52eccf
+SIZE (openttd-1.4.2-source.tar.xz) = 6666864
diff --git a/games/openttd/pkg-plist b/games/openttd/pkg-plist
index 7cb06e7..8fe62f8 100644
--- a/games/openttd/pkg-plist
+++ b/games/openttd/pkg-plist
@@ -91,17 +91,3 @@ share/icons/hicolor/48x48/apps/openttd.png
share/icons/hicolor/64x64/apps/openttd.png
share/icons/hicolor/128x128/apps/openttd.png
share/icons/hicolor/256x256/apps/openttd.png
-@dirrmtry share/icons/hicolor/256x256/apps
-@dirrmtry share/icons/hicolor/256x256
-@dirrmtry share/icons/hicolor/128x128/apps
-@dirrmtry share/icons/hicolor/128x128
-@dirrmtry share/icons/hicolor/64x64/apps
-@dirrmtry share/icons/hicolor/64x64
-@dirrmtry share/icons/hicolor/48x48/apps
-@dirrmtry share/icons/hicolor/48x48
-@dirrmtry share/icons/hicolor/32x32/apps
-@dirrmtry share/icons/hicolor/32x32
-@dirrmtry share/icons/hicolor/16x16/apps
-@dirrmtry share/icons/hicolor/16x16
-@dirrmtry share/icons/hicolor
-@dirrmtry share/icons
d***@public.gmane.org
2014-08-24 00:14:19 UTC
Permalink
branch: masters/2014q2
Repository: freenas/ports
Pushed by: git
Pushed to: branch masters/2014q2
commit 6a6d37d37c1f984eb3ccd4c921459bd0e87a141d
Author: amdmi3 <amdmi3-***@public.gmane.org>
Date: Fri Aug 22 10:02:21 2014 +0000

- Update to 2.1
---
devel/sfml/Makefile | 37 ++--
devel/sfml/distinfo | 4 +-
devel/sfml/files/patch-CMakeLists.txt | 11 ++
devel/sfml/files/patch-src-SFML-Audio-Makefile | 19 --
devel/sfml/files/patch-src-SFML-Graphics-Makefile | 21 ---
devel/sfml/files/patch-src-SFML-Makefile | 40 ----
devel/sfml/files/patch-src-SFML-Network-Makefile | 15 --
devel/sfml/files/patch-src-SFML-System-Makefile | 15 --
.../patch-src-SFML-Window-Linux-JoystickImpl.cpp | 209 +++++++++++++++++++++
.../patch-src-SFML-Window-Linux-WindowImplX11.cpp | 10 +
devel/sfml/files/patch-src-SFML-Window-Makefile | 15 --
devel/sfml/pkg-plist | 110 ++++++-----
12 files changed, 308 insertions(+), 198 deletions(-)

diff --git a/devel/sfml/Makefile b/devel/sfml/Makefile
index bb12c74..a8f6d84 100644
--- a/devel/sfml/Makefile
+++ b/devel/sfml/Makefile
@@ -2,44 +2,33 @@
# $FreeBSD$

PORTNAME= sfml
-PORTVERSION= 1.6
-PORTREVISION= 3
+PORTVERSION= 2.1
CATEGORIES= devel
-MASTER_SITES= SF
-DISTNAME= SFML-${PORTVERSION}-sdk-linux-32
+MASTER_SITES= http://www.sfml-dev.org/download/sfml/${PORTVERSION}/
+DISTNAME= SFML-${PORTVERSION}-sources

MAINTAINER= amdmi3-***@public.gmane.org
COMMENT= Simple and Fast Multimedia Library

LIB_DEPENDS= libsndfile.so:${PORTSDIR}/audio/libsndfile \
libjpeg.so:${PORTSDIR}/graphics/jpeg \
- libpng.so:${PORTSDIR}/graphics/png \
- libfreetype.so:${PORTSDIR}/print/freetype2
+ libfreetype.so:${PORTSDIR}/print/freetype2 \
+ libGLEW.so:${PORTSDIR}/graphics/glew

-USES= gmake openal:al pkgconfig dos2unix
-DOS2UNIX_GLOB= Makefile
+USES= cmake zip:infozip openal:al dos2unix
+DOS2UNIX_FILES= CMakeLists.txt
USE_XORG= x11 xrandr
-USE_GL= gl glu
+USE_GL= gl
USE_LDCONFIG= yes
-DESTDIRNAME= STAGEDIR

WRKSRC= ${WRKDIR}/SFML-${PORTVERSION}

-PORTDOCS= *
+DATADIR= ${PREFIX}/share/SFML
+PORTDATA= *

-PORTSCOUT= limit:[^c]$$
+OPTIONS_DEFINE= DOXYGEN

-OPTIONS_DEFINE= DOCS
-
-post-extract:
- @${RM} -f ${WRKSRC}/lib/*
- @${FIND} ${WRKSRC}/samples/bin/ -type f -maxdepth 1 -delete
-
-post-install:
-.for lib in audio graphics network system window
- @${LN} -s libsfml-${lib}.so.${PORTVERSION} ${STAGEDIR}${PREFIX}/lib/libsfml-${lib}.so.${PORTVERSION:C/^([0-9]).*/\1/}
-.endfor
- ${MKDIR} ${STAGEDIR}${DOCSDIR}
- cd ${WRKSRC}/doc && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR}/
+DOXYGEN_CMAKE_ON= -DSFML_BUILD_DOC:BOOL=YES
+DOXYGEN_BUILD_DEPENDS= doxygen:${PORTSDIR}/devel/doxygen

.include <bsd.port.mk>
diff --git a/devel/sfml/distinfo b/devel/sfml/distinfo
index 65042a5..f38c0cb 100644
--- a/devel/sfml/distinfo
+++ b/devel/sfml/distinfo
@@ -1,2 +1,2 @@
-SHA256 (SFML-1.6-sdk-linux-32.tar.gz) = b1c18f9b99c54ebb4cd433792f33ed2b85c846cca28eb871a12b3191dc1532f8
-SIZE (SFML-1.6-sdk-linux-32.tar.gz) = 12937755
+SHA256 (SFML-2.1-sources.zip) = 5f46d7748223be3f0c6a9fcf18c0016d227f7b1903cdbcd85f61ddbc82ef95bf
+SIZE (SFML-2.1-sources.zip) = 9728420
diff --git a/devel/sfml/files/patch-CMakeLists.txt b/devel/sfml/files/patch-CMakeLists.txt
new file mode 100644
index 0000000..ceb8e86
--- /dev/null
+++ b/devel/sfml/files/patch-CMakeLists.txt
@@ -0,0 +1,11 @@
+--- CMakeLists.txt.orig 2013-07-21 11:30:08.000000000 +0400
++++ CMakeLists.txt 2014-08-15 18:24:11.785377335 +0400
+@@ -113,7 +113,7 @@
+ "tools/pkg-config/sfml-${sfml_module}.pc"
+ @ONLY)
+ INSTALL(FILES "${CMAKE_CURRENT_BINARY_DIR}/tools/pkg-config/sfml-${sfml_module}.pc"
+- DESTINATION "${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}/pkgconfig")
++ DESTINATION "${CMAKE_INSTALL_PREFIX}/libdata/pkgconfig")
+ endforeach()
+ endif()
+ else()
diff --git a/devel/sfml/files/patch-src-SFML-Audio-Makefile b/devel/sfml/files/patch-src-SFML-Audio-Makefile
deleted file mode 100644
index 7b5aa53..0000000
--- a/devel/sfml/files/patch-src-SFML-Audio-Makefile
+++ /dev/null
@@ -1,19 +0,0 @@
---- src/SFML/Audio/Makefile.orig 2010-01-27 15:00:19.000000000 +0100
-+++ src/SFML/Audio/Makefile 2013-02-14 09:39:53.000000000 +0100
-@@ -19,13 +19,13 @@
- $(AR) $(ARFLAGS) $(LIBNAME) $(OBJ) $(OBJVORBIS)
-
- libsfml-audio.so: $(OBJ) $(OBJVORBIS)
-- $(CPP) $(LDFLAGS) -Wl,-soname,$(LIB).$(VERSION) -o $(LIBNAME) $(OBJ) $(OBJVORBIS) -lsndfile -lopenal
-+ $(CXX) $(LDFLAGS) -Wl,-soname,$(LIB).$(VERSION) -o $(LIBNAME) $(OBJ) $(OBJVORBIS) -lsndfile -lopenal
-
- $(OBJ): %.o: %.cpp
-- $(CPP) -o $@ -c $< $(CFLAGS)
-+ $(CXX) -o $@ -c $< $(CXXFLAGS)
-
- $(OBJVORBIS): %.o: %.c
-- $(CC) -o $@ -c $< $(CFLAGSEXT)
-+ $(CC) -o $@ -c $< $(CFLAGS)
-
- .PHONY: clean mrproper
-
diff --git a/devel/sfml/files/patch-src-SFML-Graphics-Makefile b/devel/sfml/files/patch-src-SFML-Graphics-Makefile
deleted file mode 100644
index 69fcc9e..0000000
--- a/devel/sfml/files/patch-src-SFML-Graphics-Makefile
+++ /dev/null
@@ -1,21 +0,0 @@
---- src/SFML/Graphics/Makefile.orig 2010-01-27 17:00:05.000000000 +0300
-+++ src/SFML/Graphics/Makefile 2010-08-25 07:07:23.000000000 +0400
-@@ -26,14 +26,14 @@
- libsfml-graphics-s.a: $(OBJ) $(OBJGLEW) $(OBJJPEG) $(OBJPNG) $(OBJSOIL) $(OBJZLIB)
- $(AR) $(ARFLAGS) $(LIBNAME) $(OBJ) $(OBJGLEW) $(OBJJPEG) $(OBJPNG) $(OBJSOIL) $(OBJZLIB)
-
--libsfml-graphics.so: $(OBJ) $(OBJGLEW) $(OBJJPEG) $(OBJPNG) $(OBJSOIL) $(OBJZLIB)
-- $(CPP) $(LDFLAGS) -Wl,-soname,$(LIB).$(VERSION) -o $(LIBNAME) $(OBJ) $(OBJGLEW) $(OBJJPEG) $(OBJPNG) $(OBJSOIL) $(OBJZLIB) -lfreetype -lX11 -lGL
-+libsfml-graphics.so: $(OBJ) $(OBJGLEW) $(OBJSOIL)
-+ $(CXX) $(LDFLAGS) -Wl,-soname,$(LIB).$(VERSION) -o $(LIBNAME) $(OBJ) $(OBJGLEW) $(OBJSOIL) -lfreetype -lX11 -lGL -lpng -ljpeg -lz
-
- $(OBJ): %.o: %.cpp
-- $(CPP) -o $@ -c $< $(CFLAGS) -I/usr/include/freetype2
-+ $(CXX) -o $@ -c $< $(CFLAGS) -I/usr/include/freetype2
-
- $(OBJGLEW) $(OBJJPEG) $(OBJPNG) $(OBJSOIL) $(OBJZLIB): %.o: %.c
-- $(CC) -o $@ -c $< $(CFLAGSEXT) -DSTBI_FAILURE_USERMSG
-+ $(CC) -o $@ -c $< $(CFLAGS) -DSTBI_FAILURE_USERMSG
-
- .PHONY: clean mrproper
-
diff --git a/devel/sfml/files/patch-src-SFML-Makefile b/devel/sfml/files/patch-src-SFML-Makefile
deleted file mode 100644
index e135231..0000000
--- a/devel/sfml/files/patch-src-SFML-Makefile
+++ /dev/null
@@ -1,40 +0,0 @@
---- src/SFML/Makefile.orig 2010-01-27 17:00:37.000000000 +0300
-+++ src/SFML/Makefile 2010-08-25 07:08:45.000000000 +0400
-@@ -4,7 +4,7 @@
- ifeq ($(DEBUGBUILD), yes)
- DEBUGFLAGS = -g -DDEBUG
- else
-- DEBUGFLAGS = -O2 -DNDEBUG
-+ DEBUGFLAGS =
- endif
-
- ifeq ($(STATIC), no)
-@@ -15,11 +15,11 @@
- LINKFLAGS =
- endif
-
--export CC = gcc
--export CPP = g++
--export CFLAGS = -W -Wall -pedantic -I../../../include -I../../ $(DEBUGFLAGS) $(BUILDFLAGS)
--export CFLAGSEXT = -I../../../include -I../.. $(DEBUGFLAGS) $(BUILDFLAGS)
--export LDFLAGS = $(LINKFLAGS)
-+export CC ?= gcc
-+export CXX ?= g++
-+export CFLAGS += -I../../../include -I../.. $(DEBUGFLAGS) $(BUILDFLAGS) -I${LOCALBASE}/include -I${LOCALBASE}/include/freetype2
-+export CXXFLAGS += -W -Wall -pedantic -I../../../include -I../../ $(DEBUGFLAGS) $(BUILDFLAGS) -I${LOCALBASE}/include -I${LOCALBASE}/include/freetype2
-+export LDFLAGS = -L${LOCALBASE}/lib $(LINKFLAGS)
- export LIBPATH = ../../../lib
- export VERSION = 1.6
- export CP = cp
-@@ -27,9 +27,9 @@
- export LNFLAGS = -s -f
- export AR = ar
- export ARFLAGS = rcs
--export DESTDIR = /usr/local
-+export DESTDIR = ${STAGEDIR}${PREFIX}
... 466 lines suppressed ...
d***@public.gmane.org
2014-08-24 00:14:19 UTC
Permalink
branch: masters/2014q2
Repository: freenas/ports
Pushed by: git
Pushed to: branch masters/2014q2
commit c6b51d027c9d92f860ea83abcf1b4a115f9b875b
Author: sunpoet <sunpoet-***@public.gmane.org>
Date: Fri Aug 22 10:22:52 2014 +0000

- Remove Author line
---
devel/libmpcbdm/pkg-descr | 1 -
1 file changed, 1 deletion(-)

diff --git a/devel/libmpcbdm/pkg-descr b/devel/libmpcbdm/pkg-descr
index 5f14599..3069853 100644
--- a/devel/libmpcbdm/pkg-descr
+++ b/devel/libmpcbdm/pkg-descr
@@ -9,5 +9,4 @@ about connected board using libmpcbdm library.

The schematic of adapter itself can be found at project homepage.

-Author: Erwin Rol <erwin-CjB7TE1d4Lcdnm+***@public.gmane.org>
WWW: http://libmpc8xx.sourceforge.net/
d***@public.gmane.org
2014-08-24 00:14:19 UTC
Permalink
branch: masters/2014q2
Repository: freenas/ports
Pushed by: git
Pushed to: branch masters/2014q2
commit 74e903f585bc03f7b94baef5e42ebb1e6663bf7d
Author: sunpoet <sunpoet-***@public.gmane.org>
Date: Fri Aug 22 10:33:03 2014 +0000

- Update to 0.048

Changes: http://search.cpan.org/dist/HTTP-Tiny/Changes
---
www/p5-HTTP-Tiny/Makefile | 2 +-
www/p5-HTTP-Tiny/distinfo | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/www/p5-HTTP-Tiny/Makefile b/www/p5-HTTP-Tiny/Makefile
index f638998..cc852f47 100644
--- a/www/p5-HTTP-Tiny/Makefile
+++ b/www/p5-HTTP-Tiny/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$

PORTNAME= HTTP-Tiny
-PORTVERSION= 0.047
+PORTVERSION= 0.048
CATEGORIES= www perl5
MASTER_SITES= CPAN
MASTER_SITE_SUBDIR= CPAN:DAGOLDEN
diff --git a/www/p5-HTTP-Tiny/distinfo b/www/p5-HTTP-Tiny/distinfo
index ba453d7..163001b 100644
--- a/www/p5-HTTP-Tiny/distinfo
+++ b/www/p5-HTTP-Tiny/distinfo
@@ -1,2 +1,2 @@
-SHA256 (HTTP-Tiny-0.047.tar.gz) = f7fe489f5abebdf486591013c234cc27d2846afe97b0f9ec5cecbd18af287503
-SIZE (HTTP-Tiny-0.047.tar.gz) = 60941
+SHA256 (HTTP-Tiny-0.048.tar.gz) = d6cc3d4372af66429dfbd5558f25c2428dc778c0801e14af1a9f7c8ad2a62ff8
+SIZE (HTTP-Tiny-0.048.tar.gz) = 61025
d***@public.gmane.org
2014-08-24 00:14:19 UTC
Permalink
branch: masters/2014q2
Repository: freenas/ports
Pushed by: git
Pushed to: branch masters/2014q2
commit 097fc31a8742bd21bb672b6d9525b306c0074fdf
Author: danfe <danfe-***@public.gmane.org>
Date: Fri Aug 22 10:21:08 2014 +0000

Unbreak on big-endian architectures (e.g., PowerPC).
---
games/doomlegacy/Makefile | 5 +++++
1 file changed, 5 insertions(+)

diff --git a/games/doomlegacy/Makefile b/games/doomlegacy/Makefile
index 2cfabd0..cbaedcd 100644
--- a/games/doomlegacy/Makefile
+++ b/games/doomlegacy/Makefile
@@ -44,6 +44,11 @@ post-patch: .SILENT
# Provide better support for relative paths (for `-iwad' switch)
${REINPLACE_CMD} -e "s|s\[0\] ==[^)]*|strchr(s, '/')|" \
${WRKSRC}/d_main.c
+# Unbreak on big-endian architectures
+ ${REINPLACE_CMD} -e '150s|^|#include "m_swap.h"|' \
+ ${WRKSRC}/p_spec.c
+ ${REINPLACE_CMD} -e '60s|^|#include "m_swap.h"|' \
+ ${WRKSRC}/p_switch.c
.if ! ${PORT_OPTIONS:MIPX}
${REINPLACE_CMD} -e '/USE_IPX/s|define|undef|' ${WRKSRC}/doomdef.h
${REINPLACE_CMD} -e 's| -lipx||' ${WRKSRC}/Makefile
d***@public.gmane.org
2014-08-24 00:14:19 UTC
Permalink
branch: masters/2014q2
Repository: freenas/ports
Pushed by: git
Pushed to: branch masters/2014q2
commit 38553edccae2745a324214b845247ad4fab100f8
Author: sunpoet <sunpoet-***@public.gmane.org>
Date: Fri Aug 22 10:36:40 2014 +0000

- Update to 4.1.4

Changes: http://www.tinymce.com/develop/changelog/index.php?type=tinymce
---
www/tinymce/Makefile | 2 +-
www/tinymce/distinfo | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/www/tinymce/Makefile b/www/tinymce/Makefile
index 2051bbb..6f5820f 100644
--- a/www/tinymce/Makefile
+++ b/www/tinymce/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$

PORTNAME= tinymce
-PORTVERSION= 4.1.3
+PORTVERSION= 4.1.4
CATEGORIES= www
MASTER_SITES= http://download.moxiecode.com/${PORTNAME}/ \
LOCAL/sunpoet
diff --git a/www/tinymce/distinfo b/www/tinymce/distinfo
index d9b7982..2117d62 100644
--- a/www/tinymce/distinfo
+++ b/www/tinymce/distinfo
@@ -1,2 +1,2 @@
-SHA256 (tinymce_4.1.3.zip) = ecdeeda7c478d86f47c66cd62213d1003503c8939d0f5ed11da0effcd0a7f677
-SIZE (tinymce_4.1.3.zip) = 318868
+SHA256 (tinymce_4.1.4.zip) = 21168deed31f2d6e0c6dccdc0ff053d64c8a5cff9aa47194ec28195b80d718cc
+SIZE (tinymce_4.1.4.zip) = 319736
d***@public.gmane.org
2014-08-24 00:14:19 UTC
Permalink
branch: masters/2014q2
Repository: freenas/ports
Pushed by: git
Pushed to: branch masters/2014q2
commit 8cd8f23c7fff0820165439aa6fdc4ec2ea639d26
Author: sunpoet <sunpoet-***@public.gmane.org>
Date: Fri Aug 22 11:01:43 2014 +0000

- Add OPENJPEG option
- Fix build with graphics/openjpeg 2.1.0

Obtained from: https://trac.osgeo.org/gdal/changeset/27538
---
graphics/gdal/Makefile | 5 +-
graphics/gdal/files/patch-GDALmake.opt.in | 10 +++
graphics/gdal/files/patch-configure | 98 ++++++++++++++++++++++
.../gdal/files/patch-frmts-openjpeg-GNUmakefile | 13 +++
.../gdal/files/patch-frmts-openjpeg-makefile.vc | 15 ++++
.../files/patch-frmts-openjpeg-openjpegdataset.cpp | 51 +++++++++++
6 files changed, 191 insertions(+), 1 deletion(-)

diff --git a/graphics/gdal/Makefile b/graphics/gdal/Makefile
index 9ec462c..a77f903 100644
--- a/graphics/gdal/Makefile
+++ b/graphics/gdal/Makefile
@@ -16,7 +16,7 @@ LICENSE= MIT

OPTIONS_DEFINE= ARMADILLO CFITSIO CURL ECW EXPAT FREEXL GEOS GEOTIFF GIF GTA \
HDF5 ICONV JASPER JPEG JSON_C KML LIBXML2 MYSQL NETCDF ODBC \
- PCRE PGSQL PNG PROJ SQLITE TIFF WEBP XERCES
+ OPENJPEG PCRE PGSQL PNG PROJ SQLITE TIFF WEBP XERCES
OPTIONS_RADIO= PDF
OPTIONS_RADIO_PDF= PODOFO POPPLER
OPTIONS_DEFAULT=GEOTIFF GIF JASPER JPEG PNG TIFF
@@ -100,6 +100,9 @@ NETCDF_LIB_DEPENDS= libnetcdf.so:${PORTSDIR}/science/netcdf
ODBC_CONFIGURE_OFF= --with-odbc=no
ODBC_CONFIGURE_ON= --with-odbc=${LOCALBASE}
ODBC_LIB_DEPENDS= libodbc.so:${PORTSDIR}/databases/unixODBC
+OPENJPEG_CONFIGURE_OFF= --with-openjpeg=no
+OPENJPEG_CONFIGURE_ON= --with-openjpeg=${LOCALBASE}
+OPENJPEG_LIB_DEPENDS= libopenjp2.so:${PORTSDIR}/graphics/openjpeg
PCRE_CONFIGURE_OFF= --with-pcre=no
PCRE_CONFIGURE_ON= --with-pcre=${LOCALBASE}
PCRE_LIB_DEPENDS= libpcre.so:${PORTSDIR}/devel/pcre
diff --git a/graphics/gdal/files/patch-GDALmake.opt.in b/graphics/gdal/files/patch-GDALmake.opt.in
new file mode 100644
index 0000000..16d9dd6
--- /dev/null
+++ b/graphics/gdal/files/patch-GDALmake.opt.in
@@ -0,0 +1,10 @@
+--- GDALmake.opt.in.orig 2014-04-17 04:04:49.000000000 +0800
++++ GDALmake.opt.in 2014-08-22 15:05:34.068301293 +0800
+@@ -192,6 +192,7 @@
+ # JPEG-2000 Support via OpenJPEG library.
+ #
+ HAVE_OPENJPEG = @HAVE_OPENJPEG@
++OPENJPEG_VERSION = @OPENJPEG_VERSION@
+
+ #
+ # MrSID support via LizardTech's DSDK
diff --git a/graphics/gdal/files/patch-configure b/graphics/gdal/files/patch-configure
new file mode 100644
index 0000000..9b87b88
--- /dev/null
+++ b/graphics/gdal/files/patch-configure
@@ -0,0 +1,98 @@
+--- configure.orig 2014-04-17 04:04:49.000000000 +0800
++++ configure 2014-08-22 15:05:34.087308378 +0800
+@@ -746,6 +746,7 @@
+ FGDB_INC
+ FGDB_LIB
+ FGDB_ENABLED
++OPENJPEG_VERSION
+ HAVE_OPENJPEG
+ JASPER_FLAGS
+ HAVE_JASPER
+@@ -22200,14 +22201,78 @@
+ if test "$HAVE_OPENJPEG" = "yes"; then
+ LIBS="-lopenjp2 $LIBS"
+ fi
++ else
++ for ac_header in openjpeg-2.1/openjpeg.h
++do :
++ ac_fn_c_check_header_mongrel "$LINENO" "openjpeg-2.1/openjpeg.h" "ac_cv_header_openjpeg_2_1_openjpeg_h" "$ac_includes_default"
++if test "x$ac_cv_header_openjpeg_2_1_openjpeg_h" = xyes; then :
++ cat >>confdefs.h <<_ACEOF
++#define HAVE_OPENJPEG_2_1_OPENJPEG_H 1
++_ACEOF
++
++fi
++
++done
++
++ if test "$ac_cv_header_openjpeg_2_1_openjpeg_h" = "yes"; then
++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for opj_stream_set_user_data_length in -lopenjp2" >&5
++$as_echo_n "checking for opj_stream_set_user_data_length in -lopenjp2... " >&6; }
++if ${ac_cv_lib_openjp2_opj_stream_set_user_data_length+:} false; then :
++ $as_echo_n "(cached) " >&6
++else
++ ac_check_lib_save_LIBS=$LIBS
++LIBS="-lopenjp2 $LIBS"
++cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h. */
++
++/* Override any GCC internal prototype to avoid an error.
++ Use char because int might match the return type of a GCC
++ builtin and then its argument prototype would still apply. */
++#ifdef __cplusplus
++extern "C"
++#endif
++char opj_stream_set_user_data_length ();
++int
++main ()
++{
++return opj_stream_set_user_data_length ();
++ ;
++ return 0;
++}
++_ACEOF
++if ac_fn_c_try_link "$LINENO"; then :
++ ac_cv_lib_openjp2_opj_stream_set_user_data_length=yes
++else
++ ac_cv_lib_openjp2_opj_stream_set_user_data_length=no
++fi
++rm -f core conftest.err conftest.$ac_objext \
++ conftest$ac_exeext conftest.$ac_ext
++LIBS=$ac_check_lib_save_LIBS
++fi
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_openjp2_opj_stream_set_user_data_length" >&5
++$as_echo "$ac_cv_lib_openjp2_opj_stream_set_user_data_length" >&6; }
++if test "x$ac_cv_lib_openjp2_opj_stream_set_user_data_length" = xyes; then :
++ HAVE_OPENJPEG=yes
++else
++ HAVE_OPENJPEG=no
++fi
++
++ if test "$HAVE_OPENJPEG" = "yes"; then
++ OPENJPEG_VERSION=20100
++ LIBS="-lopenjp2 $LIBS"
++ fi
++ fi
+ fi
+ else
+
+ HAVE_OPENJPEG=yes
+ if test -r $with_openjpeg/include/openjpeg-2.0/openjpeg.h ; then
+ EXTRA_INCLUDES="-I$with_openjpeg/include $EXTRA_INCLUDES"
++ elif test -r $with_openjpeg/include/openjpeg-2.1/openjpeg.h ; then
++ OPENJPEG_VERSION=20100
++ EXTRA_INCLUDES="-I$with_openjpeg/include $EXTRA_INCLUDES"
+ else
+- as_fn_error $? "openjpeg.h not found in $with_openjpeg/include/openjpeg-2.0" "$LINENO" 5
++ as_fn_error $? "openjpeg.h not found in $with_openjpeg/include/openjpeg-2.0 or $with_openjpeg/include/openjpeg-2.1" "$LINENO" 5
+ fi
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for opj_stream_set_user_data_length in -lopenjp2" >&5
+@@ -22266,6 +22331,7 @@
+
+ HAVE_OPENJPEG=$HAVE_OPENJPEG
+
++OPENJPEG_VERSION=$OPENJPEG_VERSION
+
+
+
diff --git a/graphics/gdal/files/patch-frmts-openjpeg-GNUmakefile b/graphics/gdal/files/patch-frmts-openjpeg-GNUmakefile
new file mode 100644
index 0000000..aa564a6
--- /dev/null
+++ b/graphics/gdal/files/patch-frmts-openjpeg-GNUmakefile
@@ -0,0 +1,13 @@
+--- frmts/openjpeg/GNUmakefile.orig 2014-04-17 04:04:48.000000000 +0800
++++ frmts/openjpeg/GNUmakefile 2014-08-22 15:05:34.071310422 +0800
+@@ -5,6 +5,10 @@
+
+ CPPFLAGS := $(GDAL_INCLUDE) $(CPPFLAGS)
+
++ifneq ($(OPENJPEG_VERSION),)
++CPPFLAGS := $(CPPFLAGS) -DOPENJPEG_VERSION=$(OPENJPEG_VERSION)
++endif
++
+ default: $(OBJ:.o=.$(OBJ_EXT))
+
+ clean:
diff --git a/graphics/gdal/files/patch-frmts-openjpeg-makefile.vc b/graphics/gdal/files/patch-frmts-openjpeg-makefile.vc
new file mode 100644
index 0000000..2fb86da
--- /dev/null
+++ b/graphics/gdal/files/patch-frmts-openjpeg-makefile.vc
@@ -0,0 +1,15 @@
+--- frmts/openjpeg/makefile.vc.orig 2014-04-17 04:04:48.000000000 +0800
++++ frmts/openjpeg/makefile.vc 2014-08-22 15:05:34.090310184 +0800
+@@ -5,7 +5,11 @@
+
+ !INCLUDE $(GDAL_ROOT)\nmake.opt
+
+-EXTRAFLAGS = $(OPENJPEG_CFLAGS)
++EXTRAFLAGS = $(OPENJPEG_CFLAGS) $(OPENJPEG_VERSION_CFLAGS)
++
++!IFDEF OPENJPEG_VERSION
++OPENJPEG_VERSION_CFLAGS = -DOPENJPEG_VERSION=$(OPENJPEG_VERSION)
++!ENDIF
+
+ default: $(OBJ)
+ xcopy /D /Y *.obj ..\o
... 57 lines suppressed ...
d***@public.gmane.org
2014-08-24 00:14:20 UTC
Permalink
branch: masters/2014q2
Repository: freenas/ports
Pushed by: git
Pushed to: branch masters/2014q2
commit a576edf14c15886f591f430b4dc5df1a962af708
Author: hrs <hrs-***@public.gmane.org>
Date: Fri Aug 22 11:08:48 2014 +0000

Add BSIM4v4 support.
---
cad/spice/Makefile | 16 ++++++++++++++--
cad/spice/distinfo | 4 ++++
cad/spice/files/Makefile | 10 ++++++----
3 files changed, 24 insertions(+), 6 deletions(-)

diff --git a/cad/spice/Makefile b/cad/spice/Makefile
index 0d1d332..79bc1d0 100644
--- a/cad/spice/Makefile
+++ b/cad/spice/Makefile
@@ -7,9 +7,11 @@ PORTREVISION= 11
CATEGORIES= cad
MASTER_SITES= http://embedded.eecs.berkeley.edu/pubs/downloads/spice/:srcs \
http://www-device.eecs.berkeley.edu/~bsim/Files/BSIM3/ftpv330/src/:bsim3 \
+ http://www-device.eecs.berkeley.edu/~bsim/Files/BSIM4/BSIM480/:bsim4 \
LOCAL/hrs/${PORTNAME}:docs
DISTFILES= spice3f5${EXTRACT_SUFX}:srcs \
BSIM3v330.tar.Z:bsim3 \
+ BSIM480_Code.zip:bsim4 \
cp.ps:docs toc.ps:docs doc.ps:docs
DIST_SUBDIR= spice
EXTRACT_ONLY= spice3f5${EXTRACT_SUFX}
@@ -20,6 +22,8 @@ COMMENT= General-purpose circuit simulation program
LICENSE= MIT
LICENSE_FILE= ${WRKSRC}/COPYRIGHT

+EXTRACT_DEPENDS= ${LOCALBASE}/bin/unzip:${PORTSDIR}/archivers/unzip
+
WRKSRC= ${WRKDIR}/${PORTNAME}3f5
MAKEFILE= ${FILESDIR}/Makefile
CONFIGURE_ENV= CONFIGFILE="${WRKSRC}/conf/FreeBSD" \
@@ -32,22 +36,30 @@ PORTEXAMPLES= bjtnoise.cir bsim1tst.cir bsim2tst.cir diffpair.cir \
process.pro pz2.cir pzt.cir rc.cir rca3040.cir resnoise.cir \
rtlinv.cir schmitt.cir simplepz.cir

-OPTIONS_DEFINE= DOCS EXAMPLES X11 DEV_BSIM3
+OPTIONS_DEFINE= DOCS EXAMPLES X11 DEV_BSIM3 DEV_BSIM4
OPTIONS_DEFAULT=DOCS EXAMPLES X11

X11_USE= XORG=x11,xaw,xext,xmu,xt
X11_CONFIGURE_ENV= WITH_X11=yes
DEV_BSIM3_DESC= BSIM3v3 MOS Transistor Model Support
DEV_BSIM3_CONFIGURE_ENV=DEV_BSIM3=yes
+DEV_BSIM4_DESC= BSIM4v4 MOS Transistor Model Support
+DEV_BSIM4_CONFIGURE_ENV=DEV_BSIM4=yes

.include <bsd.port.options.mk>

-.if ${PORT_OPTIONS:MDEV_BSIM3}
post-extract:
+ @${DO_NADA}
+.if ${PORT_OPTIONS:MDEV_BSIM3}
@${MKDIR} ${WRKSRC}/src/lib/dev/bsim3
${TAR} -xf ${DISTDIR}/${DIST_SUBDIR}/BSIM3v330.tar.Z \
-C ${WRKSRC}/src/lib/dev/bsim3
.endif
+.if ${PORT_OPTIONS:MDEV_BSIM4}
+ @${MKDIR} ${WRKSRC}/src/lib/dev/bsim4
+ ${UNZIP_CMD} -qo ${DISTDIR}/${DIST_SUBDIR}/BSIM480_Code.zip \
+ -d ${WRKSRC}/src/lib/dev/bsim4
+.endif

do-configure:
@${SETENV} ${CONFIGURE_ENV} ${MAKE} -f ${MAKEFILE} configure
diff --git a/cad/spice/distinfo b/cad/spice/distinfo
index 4db27a1..5618428 100644
--- a/cad/spice/distinfo
+++ b/cad/spice/distinfo
@@ -2,6 +2,10 @@ SHA256 (spice/spice3f5.tar.gz) = cac11fe2a761241e6b6c9eaa31b938c7ffa76aeaecac098
SIZE (spice/spice3f5.tar.gz) = 1226185
SHA256 (spice/BSIM3v330.tar.Z) = 3d8d1739c5fb7f1e56af70e5dc05a6f9014d0954a4f3c1bcf778a494ae0087b2
SIZE (spice/BSIM3v330.tar.Z) = 113719
+SHA256 (spice/BSIM480_Code.zip) = 76850257fefc9d76369538ba5aa1cac7b09fb98311c39564e9e6d044b49db9c8
+SIZE (spice/BSIM480_Code.zip) = 158442
+SHA256 (spice/BSIM6.1.0_Release_March20_2014.zip) = 664e6c2138b35f45f8883a74557abff3b18f59e9da7d89adc30d0c854919c423
+SIZE (spice/BSIM6.1.0_Release_March20_2014.zip) = 1060937
SHA256 (spice/cp.ps) = 3bab6c3487def4ce2e817bf7ef3c1a7d199ea8e790da3a786f936872b35d0920
SIZE (spice/cp.ps) = 10297
SHA256 (spice/toc.ps) = 22228246f98f38e39a22911251fa52782ca6a2a7fb273fd78cf3da833d1f52e8
diff --git a/cad/spice/files/Makefile b/cad/spice/files/Makefile
index 7f978b2..efffbda 100644
--- a/cad/spice/files/Makefile
+++ b/cad/spice/files/Makefile
@@ -16,9 +16,11 @@ INTERFACE_OPTS+=-DWANT_X11
VARLIST+= INCX LIBX
.endif
X_DIR= ${LOCALBASE}
-.if defined(DEV_BSIM3) && !empty(DEV_BSIM3)
-DEVLIST+= bsim3
-.endif
+.for D in BSIM3 BSIM4
+. if defined(DEV_$D) && !empty(DEV_$D)
+DEVLIST+= ${D:tl}
+. endif
+.endfor

configure:
rm -f ${CONFIGFILE}
@@ -26,7 +28,7 @@ configure:
echo "$V=${${V}}" >> ${CONFIGFILE}
.endfor
.for V in ${DEVLIST}
- echo "$V+=${${V}}" >> ${CONFIGFILE}
+ echo "DEVICES+=${V}" >> ${CONFIGFILE}
.endfor

PREFIX?= /usr/local
d***@public.gmane.org
2014-08-24 00:14:19 UTC
Permalink
branch: masters/2014q2
Repository: freenas/ports
Pushed by: git
Pushed to: branch masters/2014q2
commit 91f24e6eecdb1e1f3a701409d114d13305a46ff9
Author: hrs <hrs-***@public.gmane.org>
Date: Fri Aug 22 11:04:23 2014 +0000

Update TeXLive to 2014.

- Note that full support of configuration tools such as tlmgr and texconfig
is not ready yet.

- Most of dviware now supports libpaper to choose the default papersize.
Use paperconfig(8) utility or print/papersize-default-* packages.

- Some quite old macros of the age of latex209 have been removed, and
there are user-visible/invisible incompatibilities. Please send a report
to freebsd-tex-***@public.gmane.org or file a PR if you have trouble.
---
Mk/bsd.tex.mk | 195 +-
devel/tex-kpathsea/Makefile | 9 +-
devel/tex-kpathsea/distinfo | 4 +-
devel/tex-kpathsea/files/patch-Makefile.in | 37 +-
devel/tex-kpathsea/files/patch-texmf.cnf | 20 +-
devel/tex-kpathsea/pkg-plist | 9 +-
devel/tex-web2c/Makefile | 17 +-
devel/tex-web2c/distinfo | 4 +-
devel/tex-web2c/pkg-plist | 1 -
japanese/tex-ptex/Makefile | 21 +-
japanese/tex-ptex/distinfo | 8 +-
japanese/tex-ptex/files/patch-Makefile.in | 59 +-
japanese/tex-ptex/files/patch-web2c-Makefile.in | 22 -
japanese/tex-ptex/pkg-plist | 7630 +-
print/cm-super/Makefile | 4 +-
print/tex-aleph/Makefile | 28 +-
print/tex-aleph/distinfo | 8 +-
print/tex-aleph/files/patch-Makefile.in | 61 +-
print/tex-aleph/files/patch-man-Makefile.in | 24 +
print/tex-aleph/files/patch-web2c-Makefile.in | 22 -
print/tex-aleph/pkg-plist | 21 +-
print/tex-dvipdfmx/Makefile | 53 +-
print/tex-dvipdfmx/distinfo | 8 +-
print/tex-dvipdfmx/files/m4-cho-libs.m4 | 12 -
.../files/patch-texk-dvipdfmx-Makefile.in | 24 -
.../files/patch-texk-dvipdfmx-config.h.in | 12 -
.../files/patch-texk-dvipdfmx-configure | 160 -
.../files/patch-texk-dvipdfmx-configure.ac | 12 -
...x.cfg => patch-texk-dvipdfmx-data-dvipdfmx.cfg} | 4 +-
print/tex-dvipdfmx/pkg-plist | 61 +-
print/tex-dvipsk/Makefile | 28 +-
print/tex-dvipsk/distinfo | 8 +-
print/tex-dvipsk/files/patch-texk-dvipsk-configure | 31 +-
print/tex-dvipsk/pkg-plist | 3413 +-
print/tex-formats/Makefile | 9 +-
print/tex-jadetex/Makefile | 10 +-
print/tex-jadetex/distinfo | 4 +-
print/tex-jadetex/pkg-plist | 2 -
print/tex-luatex/Makefile | 54 +-
print/tex-luatex/distinfo | 8 +-
print/tex-luatex/files/patch-Makefile.in | 56 +-
print/tex-luatex/files/patch-web2c-Makefile.in | 22 -
print/tex-luatex/pkg-plist | 1239 +-
print/tex-ptexenc/Makefile | 9 +-
print/tex-ptexenc/distinfo | 4 +-
print/tex-ptexenc/files/patch-Makefile.in | 12 +
print/tex-ptexenc/files/patch-ptexenc.c | 61 +-
print/tex-ptexenc/pkg-plist | 3 +-
print/tex-xdvik/Makefile | 13 +-
print/tex-xdvik/distinfo | 4 +-
print/tex-xdvik/files/patch-texk-xdvik-Makefile.in | 6 +-
print/tex-xdvik/pkg-plist | 12 +-
print/tex-xetex/Makefile | 28 +-
print/tex-xetex/distinfo | 8 +-
print/tex-xetex/files/patch-Makefile.in | 22 +-
print/tex-xetex/pkg-plist | 1200 +-
print/tex-xmltex/Makefile | 8 +-
print/tex-xmltex/distinfo | 4 +-
print/tex-xmltex/pkg-plist | 9 +-
print/texlive-base/Makefile | 186 +-
print/texlive-base/distinfo | 4 +-
print/texlive-base/files/patch-libc++ | 60 -
...Makefile.in => patch-texk-bibtex-x-Makefile.in} | 20 +-
.../files/patch-texk-bibtexu-Makefile.in | 30 -
.../files/patch-texk-chktex-Makefile.in | 35 +
...ch-texk-dvisvgm-dvisvgm-1.60-src-FileFinder.cpp | 10 +
.../patch-texk-dvisvgm-dvisvgm-1.60-src-Font.cpp | 10 +
...-texk-dvisvgm-dvisvgm-1.60-src-FontEncoding.cpp | 10 +
...patch-texk-dvisvgm-dvisvgm-1.60-src-Message.cpp | 10 +
.../files/patch-texk-lcdf-typetools-Makefile.in | 30 -
...lcdf-typetools-lcdf-typetools-2.100-Makefile.in | 22 +
...-typetools-lcdf-typetools-2.100-libefont-cff.cc | 10 +
...tools-lcdf-typetools-2.100-libefont-t1interp.cc | 10 +
.../files/patch-texk-tetex-Makefile.in | 35 -
print/texlive-base/files/patch-texk-tetex-fmtutil | 12 -
.../files/patch-texk-tetex-fmtutil-sys | 8 -
.../files/patch-texk-tetex-fmtutil.cnf | 134 -
.../files/patch-texk-tetex-texconfig-sys | 8 -
.../files/patch-texk-tetex-updmap-sys.sh | 8 -
.../patch-texk-texlive-tl_scripts-Makefile.in | 35 +
.../patch-texk-texlive-tl_scripts-fmtutil-sys.sh | 8 +
.../patch-texk-texlive-tl_scripts-fmtutil.cnf | 150 +
.../files/patch-texk-texlive-tl_scripts-fmtutil.sh | 22 +
.../patch-texk-texlive-tl_scripts-texconfig-sys.sh | 8 +
.../patch-texk-texlive-tl_scripts-updmap-sys.sh | 8 +
...-Makefile.in => patch-texk-ttf2pk2-Makefile.in} | 4 +-
.../files/patch-utils-chktex-Makefile.in | 32 -
print/texlive-base/pkg-plist | 308 +-
print/texlive-docs/Makefile | 13 +-
print/texlive-docs/distinfo | 4 +-
print/texlive-docs/pkg-plist | 58063 +++----
print/texlive-full/Makefile | 4 +-
print/texlive-infra/Makefile | 18 +-
print/texlive-infra/distinfo | 4 +-
print/texlive-infra/pkg-plist | 6 +-
print/texlive-texmf/Makefile | 334 +-
print/texlive-texmf/distinfo | 4 +-
print/texlive-texmf/pkg-plist | 152984 ++++++++++--------
98 files changed, 124074 insertions(+), 103424 deletions(-)

diff --git a/Mk/bsd.tex.mk b/Mk/bsd.tex.mk
index 4382f4a..fb8f9be 100644
--- a/Mk/bsd.tex.mk
+++ b/Mk/bsd.tex.mk
@@ -10,7 +10,7 @@ TEX_MAINTAINER= hrs-***@public.gmane.org
# USE_TEX= yes
# imports variables only, and
# USE_TEX= full
-# means TeXLive dependency.
+# means full TeXLive dependency.
#
# The other valid keywords
#
@@ -29,7 +29,7 @@ TEX_MAINTAINER= hrs-***@public.gmane.org
# gbklatex: gbklatex
#
# formats: TeX, LaTeX, PDFTeX, AMSTeX, ConTeXT, CSLaTeX, EplainTeX,
-# METAFONT, MLTeX, PDFTeX, TeXsis[*]
+# CSplainTeX, METAFONT, MLTeX, PDFTeX, TeXsis
# tex: TeX
# latex: LaTeX
# pdftex: PDFTeX
@@ -41,12 +41,12 @@ TEX_MAINTAINER= hrs-***@public.gmane.org
# xmltex: XMLTeX
#
# texhash: directory search hash regeneration
-# updmap: font map regeneration[*]
-# fmtutil: format regeneration[*]
+# updmap: font map regeneration
+# fmtutil: format regeneration
#
# Examples:
# USE_TEX= latex:build
-# USE_TEX= formats texlive
+# USE_TEX= formats
# USE_TEX= latex:build dvipsk:build

# default TeX distribution. "texlive"
@@ -68,58 +68,24 @@ TEXHASHDIRS?= ${TEXMFDIR} ${TEXMFDISTDIR} ${TEXMFLOCALDIR} ${TEXMFVARDIR} ${TEXM
PLIST_SUB+= $V="${$V}"
.endfor

-CONFLICTS_TEXLIVE= \
- texlive-[0-9]* tex-web2c-[0-9]* \
- tex-kpathsea-[0-9]* tex-xdvik-[0-9]* \
- tex-dvipsk-[0-9]* tex-dvipdfmx-[0-9]*
-CONFLICTS_TETEX= \
- teTeX-[0-9]* *-teTeX-[0-9]* \
- teTeX-*-[0-9]* *-teTeX-*-[0-9]* \
- latex2e-[0-9]*
-
-# override the user configuration
.if !empty(USE_TEX:tu:MTEXLIVE)
-TEX_DEFAULT= texlive
-.endif
-
-.if !empty(TEX_DEFAULT:tu:MTETEX)
-CONFLICTS_INSTALL+= ${CONFLICTS_TEXLIVE}
-.elif !empty(TEX_DEFAULT:tu:MTEXLIVE)
-CONFLICTS_INSTALL+= ${CONFLICTS_TETEX}
-.else
-.error malformed TEX_DEFAULT: ${TEX_DEFAULT}
+IGNORE= "texlive" must not be defined in USE_TEX
.endif

-_TEX_LABEL:= ${TEX_DEFAULT:tu:S/TEXLIVE/TEX/}
-
_USE_TEX_TEXMF= ${LOCALBASE}/${TEXMFDISTDIR}/README:${PORTSDIR}/print/texlive-texmf
-
_USE_TEX_BASE= tlmgr:${PORTSDIR}/print/texlive-base
-
_USE_TEX_GBKLATEX= gbklatex:${PORTSDIR}/print/texlive-base
-
-_USE_TEX_DOCS= ${LOCALBASE}/${TEXMFDIR}/doc/texlive/texlive-en/README:${PORTSDIR}/print/texlive-docs
-
+_USE_TEX_DOCS= ${LOCALBASE}/${TEXMFDISTDIR}/doc/texlive/texlive-en/README:${PORTSDIR}/print/texlive-docs
_USE_TEX_INFRA= texlive-infra>=0:${PORTSDIR}/print/texlive-infra
-
_USE_TEX_DVIPSK= dvips:${PORTSDIR}/print/tex-dvipsk
-
_USE_TEX_XDVIK= xdvi:${PORTSDIR}/print/tex-xdvik
-
_USE_TEX_DVIPDFMX= dvipdfmx:${PORTSDIR}/print/tex-dvipdfmx
-
... 234721 lines suppressed ...
d***@public.gmane.org
2014-08-24 00:14:21 UTC
Permalink
branch: masters/2014q2
Repository: freenas/ports
Pushed by: git
Pushed to: branch masters/2014q2
commit ffe760267eade64cb0c2c7e3f69e93122d0629a2
Author: zi <zi-***@public.gmane.org>
Date: Fri Aug 22 12:50:05 2014 +0000

New port: security/p5-Crypt-RHash:

Crypt::Rhash module is an object-oriented interface to the LibRHash library,
allowing simultaneous calculation of several hash functions for a file or a
text message.

Resulting hash digest can be obtained in hexadecimal, BASE32, BASE64, raw
binary format or as a magnet link.

WWW: http://search.cpan.org/dist/Crypt-RHash/

PR: 192899
Submitted by: proler-***@public.gmane.org
---
security/Makefile | 1 +
security/p5-Crypt-RHash/Makefile | 21 +++++++++++++++++++++
security/p5-Crypt-RHash/distinfo | 2 ++
.../files/patch-librhash__rhash_torrent.h | 11 +++++++++++
security/p5-Crypt-RHash/pkg-descr | 8 ++++++++
security/p5-Crypt-RHash/pkg-plist | 7 +++++++
6 files changed, 50 insertions(+)

diff --git a/security/Makefile b/security/Makefile
index cbb8849..57b74a2 100644
--- a/security/Makefile
+++ b/security/Makefile
@@ -494,6 +494,7 @@
SUBDIR += p5-Crypt-RandPasswd
SUBDIR += p5-Crypt-Random
SUBDIR += p5-Crypt-Random-Source
+ SUBDIR += p5-Crypt-RHash
SUBDIR += p5-Crypt-Rijndael
SUBDIR += p5-Crypt-Rijndael_PP
SUBDIR += p5-Crypt-SKey
diff --git a/security/p5-Crypt-RHash/Makefile b/security/p5-Crypt-RHash/Makefile
new file mode 100644
index 0000000..0c0e12b
--- /dev/null
+++ b/security/p5-Crypt-RHash/Makefile
@@ -0,0 +1,21 @@
+# Created by: perl-***@public.gmane.org
+# $FreeBSD$
+
+PORTNAME= Crypt-RHash
+PORTVERSION= 0.91
+CATEGORIES= security perl5
+MASTER_SITES= CPAN
+PKGNAMEPREFIX= p5-
+
+MAINTAINER= perl-***@public.gmane.org
+COMMENT= Compute hash sums and magnet links
+
+LICENSE= MIT
+
+USES= perl5
+USE_PERL5= configure fixpacklist
+
+post-install:
+ @${STRIP_CMD} ${STAGEDIR}${SITE_PERL}/mach/auto/Crypt/Rhash/Rhash.so
+
+.include <bsd.port.mk>
diff --git a/security/p5-Crypt-RHash/distinfo b/security/p5-Crypt-RHash/distinfo
new file mode 100644
index 0000000..25b8af2
--- /dev/null
+++ b/security/p5-Crypt-RHash/distinfo
@@ -0,0 +1,2 @@
+SHA256 (Crypt-RHash-0.91.tar.gz) = ce615fb0214c83c3ee7484937c7c64410d33882f0c9287baafee43b8755e55bc
+SIZE (Crypt-RHash-0.91.tar.gz) = 153862
diff --git a/security/p5-Crypt-RHash/files/patch-librhash__rhash_torrent.h b/security/p5-Crypt-RHash/files/patch-librhash__rhash_torrent.h
new file mode 100644
index 0000000..4f97af2
--- /dev/null
+++ b/security/p5-Crypt-RHash/files/patch-librhash__rhash_torrent.h
@@ -0,0 +1,11 @@
+--- ./librhash/rhash_torrent.h.orig 2014-08-22 08:37:39.000000000 -0400
++++ ./librhash/rhash_torrent.h 2014-08-22 08:37:46.000000000 -0400
+@@ -11,8 +11,6 @@
+ # define RHASH_API
+ #endif
+
+-typedef struct rhash_context* rhash;
+-
+ /* a binary string with length */
+ typedef struct rhash_str
+ {
diff --git a/security/p5-Crypt-RHash/pkg-descr b/security/p5-Crypt-RHash/pkg-descr
new file mode 100644
index 0000000..efe8f0c
--- /dev/null
+++ b/security/p5-Crypt-RHash/pkg-descr
@@ -0,0 +1,8 @@
+Crypt::Rhash module is an object-oriented interface to the LibRHash library,
+allowing simultaneous calculation of several hash functions for a file or a
+text message.
+
+Resulting hash digest can be obtained in hexadecimal, BASE32, BASE64, raw
+binary format or as a magnet link.
+
+WWW: http://search.cpan.org/dist/Crypt-RHash/
diff --git a/security/p5-Crypt-RHash/pkg-plist b/security/p5-Crypt-RHash/pkg-plist
new file mode 100644
index 0000000..5aea5bd
--- /dev/null
+++ b/security/p5-Crypt-RHash/pkg-plist
@@ -0,0 +1,7 @@
+%%PERL5_MAN3%%/Crypt::Rhash.3.gz
+%%SITE_PERL%%/%%PERL_ARCH%%/Crypt/Rhash.pm
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/Rhash/.packlist
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/Rhash/Rhash.so
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/Rhash
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt
+@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Crypt
d***@public.gmane.org
2014-08-24 00:14:21 UTC
Permalink
branch: masters/2014q2
Repository: freenas/ports
Pushed by: git
Pushed to: branch masters/2014q2
commit 9d14af5eefe876b88fbac98b368751c022261683
Author: sunpoet <sunpoet-***@public.gmane.org>
Date: Fri Aug 22 11:31:34 2014 +0000

- Add shared JSON_C description
---
Mk/bsd.options.desc.mk | 1 +
1 file changed, 1 insertion(+)

diff --git a/Mk/bsd.options.desc.mk b/Mk/bsd.options.desc.mk
index 201b5d9..8a9d5dd 100644
--- a/Mk/bsd.options.desc.mk
+++ b/Mk/bsd.options.desc.mk
@@ -164,6 +164,7 @@ JAVA_DESC?= Java platform support
JBIG_DESC?= JBIG image format support
JHEAD_DESC?= jhead EXIF manipulator support
JPEG_DESC?= JPEG image format support
+JSON_C_DESC?= JSON file/format parser support via json-c
JSON_DESC?= JSON file/format/parser support
KDE4_DESC?= KDE 4 desktop environment support
KERBEROS_DESC?= Kerberos support
d***@public.gmane.org
2014-08-24 00:14:21 UTC
Permalink
branch: masters/2014q2
Repository: freenas/ports
Pushed by: git
Pushed to: branch masters/2014q2
commit 82c6b5fd03fc03948bdbd7e7a958c14398824e46
Author: amdmi3 <amdmi3-***@public.gmane.org>
Date: Fri Aug 22 13:06:29 2014 +0000

- Add PNG option to fix plist (libimage.so is optional)
- DSSI option requires alsa library
- Fix DOCS option
---
audio/csound/Makefile | 21 ++++++++++++++++++---
audio/csound/files/patch-SConstruct | 11 +++++++++++
audio/csound/pkg-plist | 2 +-
3 files changed, 30 insertions(+), 4 deletions(-)

diff --git a/audio/csound/Makefile b/audio/csound/Makefile
index fd20a0f..8718fd7b0 100644
--- a/audio/csound/Makefile
+++ b/audio/csound/Makefile
@@ -3,6 +3,7 @@

PORTNAME= csound
PORTVERSION= 5.19.01
+PORTREVISION= 1
CATEGORIES= audio lang
MASTER_SITES= SF/${PORTNAME}/${PORTNAME}5/${PORTNAME}${PORTVERSION:R} \
SF/${PORTNAME}/${PORTNAME}5/${PORTNAME}${PORTVERSION:R}/manual:manual
@@ -22,10 +23,11 @@ LIB_DEPENDS= libsndfile.so:${PORTSDIR}/audio/libsndfile

PORTSCOUT= limit:^5\.

-OPTIONS_DEFINE= ALSA DSSI FLTK FLUIDSYNTH JACK OSC PORTAUDIO PULSEAUDIO DOCS
+OPTIONS_DEFINE= ALSA PNG DSSI FLTK FLUIDSYNTH JACK OSC PORTAUDIO PULSEAUDIO DOCS
OPTIONS_DEFAULT=FLTK
OPTIONS_SUB= yes
ALSA_DESC= Build ALSA I/O module
+PNG_DESC= Build image opcodes
DSSI_DESC= Build DSSI/LADSPA host opcodes
FLUIDSYNTH_DESC=Building FluidSynth opcodes
JACK_DESC= Build Jack I/O module and opcodes
@@ -38,8 +40,7 @@ CONFLICTS_INSTALL= outguess-* csound6

WRKSRC= ${WRKDIR}/${PORTNAME:S/c/C/}${PORTVERSION}

-USES= bison gettext scons compiler:openmp
-USE_PYTHON= yes
+USES= bison gettext scons compiler:openmp python
MAKE_ARGS= instdir="${STAGEDIR}" prefix="${PREFIX}" \
CC="${CC}" CXX="${CXX}" \
buildCsoundAC=0 buildCsoundVST=0 buildInterfaces=1 \
@@ -65,8 +66,16 @@ MAKE_ARGS+= useALSA=0
ALSA_H= ##alsa/asoundlib.h##
.endif

+.if ${PORT_OPTIONS:MPNG}
+LIB_DEPENDS+= libpng.so:${PORTSDIR}/graphics/png
+MAKE_ARGS+= buildImageOpcodes=1
+.else
+MAKE_ARGS+= buildImageOpcodes=0
+.endif
+
.if ${PORT_OPTIONS:MDSSI}
BUILD_DEPENDS+= dssi>=0:${PORTSDIR}/audio/dssi
+LIB_DEPENDS+= libasound.so:${PORTSDIR}/audio/alsa-lib
RUN_DEPENDS+= dssi>=0:${PORTSDIR}/audio/dssi
MAKE_ARGS+= buildDSSI=1
.else
@@ -141,6 +150,8 @@ CXXLIB= c++
CXXLIB= # empty
.endif

+.include <bsd.port.options.mk>
+
post-patch:
@${SED} -e "s|%%LOCALBASE%%|${LOCALBASE}|g; \
s|%%PYTHON_INCLUDEDIR%%|${PYTHON_INCLUDEDIR}|; \
@@ -179,7 +190,11 @@ post-patch:

post-install:
${LN} -sf libcsound64.so.5 ${STAGEDIR}${PREFIX}/lib/libcsound64.so
+.if ${PORT_OPTIONS:MDOCS}
@${MKDIR} ${STAGEDIR}${DOCSDIR}
(cd ${WRKDIR}/html && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR})
+.endif
+ ${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/* ${STAGEDIR}${PREFIX}/lib/*.so* \
+ ${STAGEDIR}${PREFIX}/lib/csound/plugins64/*.so

.include <bsd.port.post.mk>
diff --git a/audio/csound/files/patch-SConstruct b/audio/csound/files/patch-SConstruct
new file mode 100644
index 0000000..da73267
--- /dev/null
+++ b/audio/csound/files/patch-SConstruct
@@ -0,0 +1,11 @@
+--- SConstruct.orig 2013-01-07 16:49:34.000000000 +0400
++++ SConstruct 2014-08-22 15:37:51.000000000 +0400
+@@ -2057,7 +2057,7 @@
+
+ # DSSI HOST OPCODES
+
+-if (commonEnvironment['buildDSSI'] == '1' and (getPlatform() == 'linux' or getPlatform() == 'darwin') and configure.CheckHeader("ladspa.h", language = "C")) and configure.CheckHeader("dssi.h", language = "C"):
++if (commonEnvironment['buildDSSI'] == '1'):
+ print "CONFIGURATION DECISION: Building DSSI plugin host opcodes."
+ dssiEnvironment = pluginEnvironment.Clone()
+ dssiEnvironment.Append(LIBS = ['dl'])
diff --git a/audio/csound/pkg-plist b/audio/csound/pkg-plist
index fbcf211..a59cbf2 100644
--- a/audio/csound/pkg-plist
+++ b/audio/csound/pkg-plist
@@ -58,7 +58,7 @@ lib/csound/plugins64/libdoppler.so
lib/csound/plugins64/libfareygen.so
%%FLUIDSYNTH%%lib/csound/plugins64/libfluidOpcodes.so
lib/csound/plugins64/libfractalnoise.so
-lib/csound/plugins64/libimage.so
+%%PNG%%lib/csound/plugins64/libimage.so
lib/csound/plugins64/libipmidi.so
%%JACK%%lib/csound/plugins64/libjackTransport.so
%%JACK%%lib/csound/plugins64/libjacko.so
d***@public.gmane.org
2014-08-24 00:14:21 UTC
Permalink
branch: masters/2014q2
Repository: freenas/ports
Pushed by: git
Pushed to: branch masters/2014q2
commit 2b88e46be27f2f74add49696dfe981d2fdbe1d30
Author: amdmi3 <amdmi3-***@public.gmane.org>
Date: Fri Aug 22 13:05:51 2014 +0000

- DSSI option requires alsa library
- Convert USE_PYTHON to USES
---
audio/csound6/Makefile | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/audio/csound6/Makefile b/audio/csound6/Makefile
index f64b9f9..7724581 100644
--- a/audio/csound6/Makefile
+++ b/audio/csound6/Makefile
@@ -20,8 +20,7 @@ BUILD_DEPENDS= boost-libs>0:${PORTSDIR}/devel/boost-libs \
gmm++>0:${PORTSDIR}/math/gmm++
LIB_DEPENDS= libsndfile.so:${PORTSDIR}/audio/libsndfile

-USES= bison cmake
-USE_PYTHON= 2
+USES= bison cmake python:2
CMAKE_ARGS= -DBUILD_CSOUNDVST:BOOL=OFF \
-DBUILD_JAVA_INTERFACE:BOOL=OFF \
-DBUILD_PD_CLASS:BOOL=OFF \
@@ -51,6 +50,7 @@ CURL_LIB_DEPENDS= libcurl.so:${PORTSDIR}/ftp/curl
CURL_CMAKE_OFF= -DUSE_CURL:BOOL=OFF
DSSI_DESC= Build DSSI/LADSPA host opcodes
DSSI_BUILD_DEPENDS= dssi>0:${PORTSDIR}/audio/dssi
+DSSI_LIB_DEPENDS= libasound.so:${PORTSDIR}/audio/alsa-lib
DSSI_RUN_DEPENDS= dssi>0:${PORTSDIR}/audio/dssi
DSSI_CMAKE_OFF= -DBUILD_DSSI_OPCODES:BOOL=OFF
FLTK_DESC= Build FLTK plugin and GUI
d***@public.gmane.org
2014-08-24 00:14:21 UTC
Permalink
branch: masters/2014q2
Repository: freenas/ports
Pushed by: git
Pushed to: branch masters/2014q2
commit ea6e3cf6835d904f04d00eaf7a2d27be67a73259
Author: amdmi3 <amdmi3-***@public.gmane.org>
Date: Fri Aug 22 13:06:41 2014 +0000

- Drop .la files, no dependees require them

Approved by: portmgr blanket
---
audio/libdssialsacompat/Makefile | 4 ++--
audio/libdssialsacompat/pkg-plist | 1 -
2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/audio/libdssialsacompat/Makefile b/audio/libdssialsacompat/Makefile
index ccf4233..8c39c90 100644
--- a/audio/libdssialsacompat/Makefile
+++ b/audio/libdssialsacompat/Makefile
@@ -3,14 +3,14 @@

PORTNAME= libdssialsacompat
PORTVERSION= 1.0.8a
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= audio
MASTER_SITES= http://smbolton.com/linux/

MAINTAINER= ports-***@public.gmane.org
COMMENT= Alsa compatibility library to build DSSI

-USES= pathfix libtool:keepla
+USES= pathfix libtool
GNU_CONFIGURE= yes
USE_LDCONFIG= yes
INSTALL_TARGET= install-strip
diff --git a/audio/libdssialsacompat/pkg-plist b/audio/libdssialsacompat/pkg-plist
index 4fa352d..74ec365 100644
--- a/audio/libdssialsacompat/pkg-plist
+++ b/audio/libdssialsacompat/pkg-plist
@@ -5,7 +5,6 @@ include/dssi/alsa/seq_event.h
include/dssi/alsa/seq_midi_event.h
include/dssi/alsa/sound/asequencer.h
lib/libdssialsacompat.a
-lib/libdssialsacompat.la
lib/libdssialsacompat.so
lib/libdssialsacompat.so.0
lib/libdssialsacompat.so.0.0.0
d***@public.gmane.org
2014-08-24 00:14:21 UTC
Permalink
branch: masters/2014q2
Repository: freenas/ports
Pushed by: git
Pushed to: branch masters/2014q2
commit 9d4561aa4f604d70bd5abb769a27e693fcf6285e
Author: amdmi3 <amdmi3-***@public.gmane.org>
Date: Fri Aug 22 13:06:47 2014 +0000

- Drop .la files, no dependees require them

Approved by: portmgr blanket
---
audio/dssi/Makefile | 4 ++--
audio/dssi/pkg-plist | 4 ----
2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/audio/dssi/Makefile b/audio/dssi/Makefile
index 4de93ba..1f1e36b 100644
--- a/audio/dssi/Makefile
+++ b/audio/dssi/Makefile
@@ -3,7 +3,7 @@

PORTNAME= dssi
PORTVERSION= 1.1.1
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= audio
MASTER_SITES= SF

@@ -20,7 +20,7 @@ LIB_DEPENDS= libdssialsacompat.so:${PORTSDIR}/audio/libdssialsacompat \
libjack.so:${PORTSDIR}/audio/jack
RUN_DEPENDS= ${LOCALBASE}/include/ladspa.h:${PORTSDIR}/audio/ladspa

-USES= gmake pathfix pkgconfig libtool:keepla
+USES= gmake pathfix pkgconfig libtool
GNU_CONFIGURE= yes

CPPFLAGS+= -I${LOCALBASE}/include
diff --git a/audio/dssi/pkg-plist b/audio/dssi/pkg-plist
index 0f31c43..70297bb 100644
--- a/audio/dssi/pkg-plist
+++ b/audio/dssi/pkg-plist
@@ -8,15 +8,11 @@ bin/less_trivial_synth
bin/trivial_sampler
bin/trivial_synth
include/dssi.h
-lib/dssi/karplong.la
lib/dssi/karplong.so
-lib/dssi/less_trivial_synth.la
lib/dssi/less_trivial_synth.so
%%QT4%%lib/dssi/less_trivial_synth/LTS_qt
-lib/dssi/trivial_sampler.la
lib/dssi/trivial_sampler.so
%%QT4%%lib/dssi/trivial_sampler/trivial_sampler_qt
-lib/dssi/trivial_synth.la
lib/dssi/trivial_synth.so
libdata/pkgconfig/dssi.pc
man/man1/dssi_analyse_plugin.1.gz
d***@public.gmane.org
2014-08-24 00:14:21 UTC
Permalink
branch: masters/2014q2
Repository: freenas/ports
Pushed by: git
Pushed to: branch masters/2014q2
commit f129495e705b45ae93ea3285942d9d61e8bad227
Author: brooks <brooks-***@public.gmane.org>
Date: Fri Aug 22 13:07:44 2014 +0000

Clay has seen no development in over a year and depends on an obsolete
and unmaintained version of LLVM/Clang.

Deprecate the port and give it a longish expiration date in case someone
actually uses it.
---
lang/clay/Makefile | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/lang/clay/Makefile b/lang/clay/Makefile
index cdada4c..5b060db 100644
--- a/lang/clay/Makefile
+++ b/lang/clay/Makefile
@@ -3,7 +3,7 @@

PORTNAME= clay
PORTVERSION= 0.1.2
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= lang
MASTER_SITES= https://github.com/jckarter/${PORTNAME}/tarball/v${PORTVERSION}/
DISTNAME= jckarter-${PORTNAME}-v${PORTVERSION}-0-g${GITVERSION}
@@ -13,6 +13,9 @@ COMMENT= Language designed for generic programming

LICENSE= BSD2CLAUSE

+DEPRECATED= No development since July 2013, depends on obsolete clang-3.2
+EXPIRATION_DATE= 2014-12-01
+
BUILD_DEPENDS= llvm-config32:${PORTSDIR}/devel/llvm32 \
clang32:${PORTSDIR}/lang/clang32
RUN_DEPENDS= clang32:${PORTSDIR}/lang/clang32
d***@public.gmane.org
2014-08-24 00:14:21 UTC
Permalink
branch: masters/2014q2
Repository: freenas/ports
Pushed by: git
Pushed to: branch masters/2014q2
commit 3a096312fe3474b905927211980d02795c71da15
Author: swills <swills-***@public.gmane.org>
Date: Fri Aug 22 13:08:31 2014 +0000

devel/rubygem-grape-entity: update to 0.4.3, assign maintainer to submitter

PR: 192593
Submitted by: Michael Moll <kvedulv-***@public.gmane.org>
---
devel/rubygem-grape-entity/Makefile | 4 ++--
devel/rubygem-grape-entity/distinfo | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/devel/rubygem-grape-entity/Makefile b/devel/rubygem-grape-entity/Makefile
index eff21c2..45a9994 100644
--- a/devel/rubygem-grape-entity/Makefile
+++ b/devel/rubygem-grape-entity/Makefile
@@ -1,11 +1,11 @@
# $FreeBSD$

PORTNAME= grape-entity
-PORTVERSION= 0.4.1
+PORTVERSION= 0.4.3
CATEGORIES= devel rubygems
MASTER_SITES= RG

-MAINTAINER= ruby-***@public.gmane.org
+MAINTAINER= kvedulv-***@public.gmane.org
COMMENT= Entities - a simple Facade to use with your models and API

RUN_DEPENDS= rubygem-activesupport>=0:${PORTSDIR}/devel/rubygem-activesupport \
diff --git a/devel/rubygem-grape-entity/distinfo b/devel/rubygem-grape-entity/distinfo
index 9fbc4f3..62d4552 100644
--- a/devel/rubygem-grape-entity/distinfo
+++ b/devel/rubygem-grape-entity/distinfo
@@ -1,2 +1,2 @@
-SHA256 (rubygem/grape-entity-0.4.1.gem) = f006ac21949e4ea0477bc34713fc8572aea7969ab4ac0aa188d65c1d9f3e7dc6
-SIZE (rubygem/grape-entity-0.4.1.gem) = 23040
+SHA256 (rubygem/grape-entity-0.4.3.gem) = 5f841abc7e7a0418d388327b77357b7097953dcc124f71b7deaca2f5b6d476ee
+SIZE (rubygem/grape-entity-0.4.3.gem) = 23552
d***@public.gmane.org
2014-08-24 00:14:21 UTC
Permalink
branch: masters/2014q2
Repository: freenas/ports
Pushed by: git
Pushed to: branch masters/2014q2
commit 5adc346d377e9fb0ec3c7ebecb67b465adb00c3f
Author: antoine <antoine-***@public.gmane.org>
Date: Fri Aug 22 13:18:08 2014 +0000

devel/rubygem-railsless-deploy: Obsolete, Capistrano 3 does not ship with any Railsisms and is better than Capistrano 2 and railsless-deploy
---
MOVED | 1 +
devel/Makefile | 1 -
devel/rubygem-railsless-deploy/Makefile | 22 ----------------------
devel/rubygem-railsless-deploy/distinfo | 2 --
devel/rubygem-railsless-deploy/pkg-descr | 6 ------
5 files changed, 1 insertion(+), 31 deletions(-)

diff --git a/MOVED b/MOVED
index 1dbd182..dfc4152 100644
--- a/MOVED
+++ b/MOVED
@@ -6485,3 +6485,4 @@ textproc/rast||2014-08-22|Has expired: Broken for more than 6 months
www/abyssws||2014-08-22|Has expired: Broken for more than 6 months
www/docebo||2014-08-22|Has expired: Not maintained upstream
www/rejik||2014-08-22|Has expired: Broken for more than 6 months and depends on www/squid which reached EOL 2 years ago
+devel/rubygem-railsless-deploy||2014-08-22|Removed: Obsolete, Capistrano 3 does not ship with any Railsisms and is better than Capistrano 2 and railsless-deploy
diff --git a/devel/Makefile b/devel/Makefile
index 9d8918e..d3d2786 100644
--- a/devel/Makefile
+++ b/devel/Makefile
@@ -4438,7 +4438,6 @@
SUBDIR += rubygem-r18n-core
SUBDIR += rubygem-racc
SUBDIR += rubygem-rack-raw-upload
- SUBDIR += rubygem-railsless-deploy
SUBDIR += rubygem-rainbow
SUBDIR += rubygem-rake
SUBDIR += rubygem-rake-compiler
diff --git a/devel/rubygem-railsless-deploy/Makefile b/devel/rubygem-railsless-deploy/Makefile
deleted file mode 100644
index 0a954d1..0000000
--- a/devel/rubygem-railsless-deploy/Makefile
+++ /dev/null
@@ -1,22 +0,0 @@
-# Created by: Steve Wills <swills-***@public.gmane.org>
-# $FreeBSD$
-
-PORTNAME= railsless-deploy
-PORTVERSION= 1.1.2
-CATEGORIES= devel rubygems
-MASTER_SITES= RG
-
-MAINTAINER= ruby-***@public.gmane.org
-COMMENT= Replacement for the rails deploy strategy which ships with Capistrano
-
-LICENSE= MIT
-
-RUN_DEPENDS= rubygem-capistrano>=1.0.0:${PORTSDIR}/sysutils/rubygem-capistrano
-
-DEPRECATED= Obsolete, Capistrano 3 does not ship with any Railsisms and is better than Capistrano 2 and railsless-deploy
-
-USE_RUBY= yes
-USE_RUBYGEMS= yes
-RUBYGEM_AUTOPLIST= yes
-
-.include <bsd.port.mk>
diff --git a/devel/rubygem-railsless-deploy/distinfo b/devel/rubygem-railsless-deploy/distinfo
deleted file mode 100644
index ed01748..0000000
--- a/devel/rubygem-railsless-deploy/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (rubygem/railsless-deploy-1.1.2.gem) = af5331fa0cfe8286f0d0dbd9c0714fa521cf708751ba9a0ccdd51e8c7a27d201
-SIZE (rubygem/railsless-deploy-1.1.2.gem) = 12288
diff --git a/devel/rubygem-railsless-deploy/pkg-descr b/devel/rubygem-railsless-deploy/pkg-descr
deleted file mode 100644
index 61ed9d0..0000000
--- a/devel/rubygem-railsless-deploy/pkg-descr
+++ /dev/null
@@ -1,6 +0,0 @@
-Replacement for the rails deploy strategy which ships with Capistrano, allows
-you to deploy any platform with ease; some people have had huge success with
-this deploying rails projects where they needed to customise their deploy
-strategy beyond the code which ships with the Capistrano gem.
-
-WWW: https://github.com/leehambley/railsless-deploy/
d***@public.gmane.org
2014-08-24 00:14:21 UTC
Permalink
branch: masters/2014q2
Repository: freenas/ports
Pushed by: git
Pushed to: branch masters/2014q2
commit cc8e246f98f00cc8a1653f470574e76a08b46ba7
Author: brooks <brooks-***@public.gmane.org>
Date: Fri Aug 22 13:09:39 2014 +0000

In practice this port only builds on i386 and amd64 and that is not going
to change given that it is unmaintailed.

PR: 192898
Submitted by: sbruno
---
devel/llvm32/Makefile | 2 ++
1 file changed, 2 insertions(+)

diff --git a/devel/llvm32/Makefile b/devel/llvm32/Makefile
index f4413310..de7152e 100644
--- a/devel/llvm32/Makefile
+++ b/devel/llvm32/Makefile
@@ -22,6 +22,8 @@ GNU_CONFIGURE= yes
GNU_CONFIGURE_PREFIX= ${LLVM_PREFIX}
USE_LDCONFIG= ${LLVM_PREFIX}/lib

+ONLY_FOR_ARCHS= i386 amd64
+
python_OLD_CMD= /usr/bin/env python
python_CMD= /usr/bin/env python2
SHEBANG_FILES= test/Scripts/coff-dump.py test/Scripts/elf-dump \
d***@public.gmane.org
2014-08-24 00:14:21 UTC
Permalink
branch: masters/2014q2
Repository: freenas/ports
Pushed by: git
Pushed to: branch masters/2014q2
commit e2e46714d55a610170bcda3b00730e8d5ce018be
Author: des <des-***@public.gmane.org>
Date: Fri Aug 22 13:31:42 2014 +0000

Add a dependency on Catalyst::DispatchType::Regex, which is no longer
part of the Catalyst core.
---
www/p5-Catalyst-Plugin-Server/Makefile | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/www/p5-Catalyst-Plugin-Server/Makefile b/www/p5-Catalyst-Plugin-Server/Makefile
index 9cf7d48..5fd5c57 100644
--- a/www/p5-Catalyst-Plugin-Server/Makefile
+++ b/www/p5-Catalyst-Plugin-Server/Makefile
@@ -3,7 +3,7 @@

PORTNAME= Catalyst-Plugin-Server
PORTVERSION= 0.28
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= www devel perl5
MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
@@ -15,6 +15,7 @@ LICENSE= ART10 GPLv1
LICENSE_COMB= dual

BUILD_DEPENDS= p5-Catalyst-Runtime>=5.7000:${PORTSDIR}/www/p5-Catalyst-Runtime \
+ p5-Catalyst-DispatchType-Regex>=5.7000:${PORTSDIR}/www/p5-Catalyst-DispatchType-Regex \
p5-Class-Data-Inheritable>=0:${PORTSDIR}/devel/p5-Class-Data-Inheritable \
p5-MRO-Compat>=0:${PORTSDIR}/devel/p5-MRO-Compat \
p5-Clone-Fast>=0:${PORTSDIR}/devel/p5-Clone-Fast \
d***@public.gmane.org
2014-08-24 00:14:21 UTC
Permalink
branch: masters/2014q2
Repository: freenas/ports
Pushed by: git
Pushed to: branch masters/2014q2
commit 82bf03b19bec99cc472965a0a5fe1dcff91b1023
Author: swills <swills-***@public.gmane.org>
Date: Fri Aug 22 13:28:15 2014 +0000

devel/rubygem-clamp: patch for i18n, assign maintainer to submitter

PR: 192635
Submitted by: Michael Moll <kvedulv-***@public.gmane.org>
Obtained from: https://github.com/mdub/clamp/pull/43
---
devel/rubygem-clamp/Makefile | 3 +-
devel/rubygem-clamp/files/patch-i18n | 191 +++++++++++++++++++++++++++++++++++
2 files changed, 193 insertions(+), 1 deletion(-)

diff --git a/devel/rubygem-clamp/Makefile b/devel/rubygem-clamp/Makefile
index ad8d4c3..7d3c1c4 100644
--- a/devel/rubygem-clamp/Makefile
+++ b/devel/rubygem-clamp/Makefile
@@ -3,10 +3,11 @@

PORTNAME= clamp
PORTVERSION= 0.6.3
+PORTREVISION= 1
CATEGORIES= devel ruby
MASTER_SITES= RG

-MAINTAINER= ruby-***@public.gmane.org
+MAINTAINER= kvedulv-***@public.gmane.org
COMMENT= Command-line utility framework for Ruby

LICENSE= MIT
diff --git a/devel/rubygem-clamp/files/patch-i18n b/devel/rubygem-clamp/files/patch-i18n
new file mode 100644
index 0000000..97b5d37
--- /dev/null
+++ b/devel/rubygem-clamp/files/patch-i18n
@@ -0,0 +1,191 @@
+diff --git a/clamp-0.6.3.gemspec b/clamp-0.6.3.gemspec
+index 8f51cc3..acab485 100644
+--- clamp-0.6.3.gemspec
++++ clamp-0.6.3.gemspec
+@@ -43,6 +43,7 @@
+ - lib/clamp/command.rb
+ - lib/clamp/errors.rb
+ - lib/clamp/help.rb
++- lib/clamp/messages.rb
+ - lib/clamp/option/declaration.rb
+ - lib/clamp/option/definition.rb
+ - lib/clamp/option/parsing.rb
+
+diff --git a/lib/clamp/attribute/instance.rb b/lib/clamp/attribute/instance.rb
+index 8f51cc3..acab485 100644
+--- lib/clamp/attribute/instance.rb
++++ lib/clamp/attribute/instance.rb
+@@ -72,7 +72,7 @@ def default_from_environment
+ begin
+ take(value)
+ rescue ArgumentError => e
+- command.send(:signal_usage_error, "$#{attribute.environment_variable}: #{e.message}")
++ command.send(:signal_usage_error, Clamp.message(:env_argument_error, :env => attribute.environment_variable, :message => e.message))
+ end
+ end
+
+diff --git a/lib/clamp/command.rb b/lib/clamp/command.rb
+index c6c50f4..52187ab 100644
+--- lib/clamp/command.rb
++++ lib/clamp/command.rb
+@@ -1,3 +1,4 @@
++require 'clamp/messages'
+ require 'clamp/errors'
+ require 'clamp/help'
+ require 'clamp/option/declaration'
+@@ -91,7 +92,7 @@ def help
+
+ def handle_remaining_arguments
+ unless remaining_arguments.empty?
+- signal_usage_error "too many arguments"
++ signal_usage_error Clamp.message(:too_many_arguments)
+ end
+ end
+
+diff --git a/lib/clamp/help.rb b/lib/clamp/help.rb
+index e09731a..1e57530 100644
+--- lib/clamp/help.rb
++++ lib/clamp/help.rb
+@@ -61,7 +61,7 @@ def string
+ end
+
+ def add_usage(invocation_path, usage_descriptions)
+- puts "Usage:"
++ puts usage_heading
+ usage_descriptions.each do |usage|
+ puts " #{invocation_path} #{usage}".rstrip
+ end
+@@ -87,6 +87,12 @@ def add_list(heading, items)
+ end
+ end
+
++ protected
++
++ def usage_heading
++ "Usage:"
++ end
++
+ private
+
+ def puts(*args)
+diff --git a/lib/clamp/messages.rb b/lib/clamp/messages.rb
+new file mode 100644
+index 0000000..61cce94
+--- /dev/null
++++ lib/clamp/messages.rb
+@@ -0,0 +1,39 @@
++module Clamp
++
++ def self.messages=(messages)
++ @user_defined_messages = messages
++ end
++
++ def self.message(key, options={})
++ @user_defined_messages ||= {}
++ msg = @user_defined_messages[key] || messages[key]
++ format_string(msg, options)
++ end
++
++ def self.messages
++ {
++ :too_many_arguments => "too many arguments",
++ :option_required => "option '%<option>s' is required",
++ :option_or_env_required => "option '%<option>s' (or env %<env>s) is required",
++ :option_argument_error => "option '%<switch>s': %<message>s",
++ :parameter_argument_error => "parameter '%<param>s': %<message>s",
++ :env_argument_error => "$%<env>s: %<message>s",
++ :unrecognised_option => "Unrecognised option '%<switch>s'",
++ :no_such_subcommand => "No such sub-command '%<name>s'",
++ :no_value_provided => "no value provided"
++ }
++ end
++
++ private
++
++ # string formatting for ruby 1.8
++ def self.format_string(string, params)
++ array_params = string.scan(/%[<{]([^>}]*)[>}]/).collect do |name|
++ name = name[0]
++ params[name.to_s] || params[name.to_sym]
++ end
++
++ string.gsub(/%[<]([^>]*)[>]/, '%').gsub(/%[{]([^}]*)[}]/, '%s') % array_params
++ end
++
++end
+diff --git a/lib/clamp/option/parsing.rb b/lib/clamp/option/parsing.rb
+index 9f057f1..bb7b41c 100644
+--- lib/clamp/option/parsing.rb
++++ lib/clamp/option/parsing.rb
+@@ -31,7 +31,7 @@ def parse_options
+ begin
+ option.of(self).take(value)
+ rescue ArgumentError => e
+- signal_usage_error "option '#{switch}': #{e.message}"
++ signal_usage_error Clamp.message(:option_argument_error, :switch => switch, :message => e.message)
+ end
+
+ end
+@@ -45,11 +45,11 @@ def parse_options
+ self.class.recognised_options.each do |option|
+ # If this option is required and the value is nil, there's an error.
+ if option.required? and send(option.attribute_name).nil?
+- message = "option '#{option.switches.first}'"
+ if option.environment_variable
+- message += " (or env #{option.environment_variable})"
++ message = Clamp.message(:option_or_env_required, :option => option.switches.first, :env => option.environment_variable)
++ else
++ message = Clamp.message(:option_required, :option => option.switches.first)
+ end
+- message += " is required"
+ signal_usage_error message
+ end
+ end
+@@ -59,7 +59,7 @@ def parse_options
+
+ def find_option(switch)
+ self.class.find_option(switch) ||
+- signal_usage_error("Unrecognised option '#{switch}'")
++ signal_usage_error(Clamp.message(:unrecognised_option, :switch => switch))
+ end
+
+ end
+diff --git a/lib/clamp/parameter/definition.rb b/lib/clamp/parameter/definition.rb
+index 6412546..a276dea 100644
+--- lib/clamp/parameter/definition.rb
++++ lib/clamp/parameter/definition.rb
+@@ -22,7 +22,7 @@ def help_lhs
+ end
+
+ def consume(arguments)
+- raise ArgumentError, "no value provided" if required? && arguments.empty?
++ raise ArgumentError, Clamp.message(:no_value_provided) if required? && arguments.empty?
+ arguments.shift(multivalued? ? arguments.length : 1)
... 28 lines suppressed ...
d***@public.gmane.org
2014-08-24 00:14:21 UTC
Permalink
branch: masters/2014q2
Repository: freenas/ports
Pushed by: git
Pushed to: branch masters/2014q2
commit ee73c8c3cb6061e28aaa491eb520061e8110e1d2
Author: amdmi3 <amdmi3-***@public.gmane.org>
Date: Fri Aug 22 13:10:53 2014 +0000

- Fix whitespace
- Switch to USES=libtool, drop .la files
- Stagify
- Convert USE_BZIP2 to USES
- Fix plist
---
deskutils/global-menu/Makefile | 42 +++++++++++++++++++----------------------
deskutils/global-menu/pkg-plist | 9 ++-------
2 files changed, 21 insertions(+), 30 deletions(-)

diff --git a/deskutils/global-menu/Makefile b/deskutils/global-menu/Makefile
index ac47934..0ad57eb 100644
--- a/deskutils/global-menu/Makefile
+++ b/deskutils/global-menu/Makefile
@@ -1,33 +1,33 @@
# Created by: Gustavo Perez
# $FreeBSD$

-PORTNAME= gnome-globalmenu
-PORTVERSION= 0.7.10
-PORTREVISION= 3
-CATEGORIES= deskutils
-MASTER_SITES= http://gnome2-globalmenu.googlecode.com/files/
+PORTNAME= gnome-globalmenu
+PORTVERSION= 0.7.10
+PORTREVISION= 4
+CATEGORIES= deskutils
+MASTER_SITES= http://gnome2-globalmenu.googlecode.com/files/

MAINTAINER= ports-***@public.gmane.org
-COMMENT= Global menu for gnome
+COMMENT= Global menu for gnome

-LIB_DEPENDS= libnotify.so:${PORTSDIR}/devel/libnotify
+LIB_DEPENDS= libnotify.so:${PORTSDIR}/devel/libnotify

-USE_GNOME= gnomepanel gnomedesktop
+USE_GNOME= gnomepanel gnomedesktop

-USE_BZIP2= yes
-USE_LDCONFIG= yes
-GNU_CONFIGURE= yes
-USES= gmake pkgconfig
-USE_AUTOTOOLS= libtool automake:env autoheader:env
-INSTALLS_ICONS= yes
+USE_LDCONFIG= yes
+GNU_CONFIGURE= yes
+USES= gmake libtool pkgconfig tar:bzip2
+USE_AUTOTOOLS= automake:env autoheader:env
+INSTALLS_ICONS= yes
+INSTALL_TARGET= install-strip
CPPFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib

+GCONF_SCHEMAS= gnome-globalmenu.schemas
+
OPTIONS_DEFINE= XFCE4_PANEL NLS
XFCE4_PANEL_DESC= Xfce panel applet

-NO_STAGE= yes
-
BROKEN_sparc64= Leaves files behind on deinstall on sparc64

.include <bsd.port.options.mk>
@@ -49,13 +49,9 @@ CONFIGURE_ARGS+= --disable-nls
PLIST_SUB+= NLS="@comment "
.endif

-MAN1= gnome-globalmenu.1
-
-GCONF_SCHEMAS= gnome-globalmenu.schemas
-
post-install:
- @${INSTALL_DATA} ${WRKSRC}/applet/GlobalMenu_PanelApplet.server \
- ${LOCALBASE}/libdata/bonobo/servers
- @${CAT} ${PKGMESSAGE}
+ ${MKDIR} ${STAGEDIR}${PREFIX}/libdata/bonobo/servers
+ ${INSTALL_DATA} ${WRKSRC}/applet/GlobalMenu_PanelApplet.server \
+ ${STAGEDIR}${PREFIX}/libdata/bonobo/servers

.include <bsd.port.mk>
diff --git a/deskutils/global-menu/pkg-plist b/deskutils/global-menu/pkg-plist
index db060d0..18faa97 100644
--- a/deskutils/global-menu/pkg-plist
+++ b/deskutils/global-menu/pkg-plist
@@ -1,16 +1,15 @@
bin/globalmenu-settings
include/gnome-globalmenu/globalmenu-server.h
lib/bonobo/servers/GlobalMenu_PanelApplet.server
-lib/libglobalmenu-server.la
lib/libglobalmenu-server.so
lib/libglobalmenu-server.so.3
+lib/libglobalmenu-server.so.3.0.0
libdata/pkgconfig/globalmenu-server.pc
libdata/bonobo/servers/GlobalMenu_PanelApplet.server
lib/gtk-2.0/modules/libglobalmenu-plugin.so
-lib/gtk-2.0/modules/libglobalmenu-plugin.la
lib/gtk-2.0/modules/libglobalmenu-gnome-panel.so
-lib/gtk-2.0/modules/libglobalmenu-gnome-panel.la
libexec/GlobalMenu.PanelApplet
+man/man1/gnome-globalmenu.1.gz
%%DOCSDIR%%/README
%%DOCSDIR%%/COPYING
%%DOCSDIR%%/ChangeLog
@@ -49,9 +48,5 @@ share/locale/uk/LC_MESSAGES/gnome-globalmenu.mo
share/locale/zh_CN/LC_MESSAGES/gnome-globalmenu.mo
share/pixmaps/globalmenu.png
@dirrm include/gnome-globalmenu
-@dirrmtry etc/gconf/gconf.xml.defaults
-@dirrmtry etc/gconf/schemas
-@dirrmtry etc/gconf
@dirrmtry lib/bonobo/servers
-@dirrmtry libdata/bonobo/servers
@dirrm %%DOCSDIR%%
d***@public.gmane.org
2014-08-24 00:14:21 UTC
Permalink
branch: masters/2014q2
Repository: freenas/ports
Pushed by: git
Pushed to: branch masters/2014q2
commit 4b4fe2ce5e5758d744e5d22cb488222fe1aaeb04
Author: swills <swills-***@public.gmane.org>
Date: Fri Aug 22 13:22:22 2014 +0000

devel/rubygem-fast_gettext: update to 0.9.0, assign maintainer to submitter

PR: 192592
Submitted by: Michael Moll <kvedulv-***@public.gmane.org>
---
devel/rubygem-fast_gettext/Makefile | 4 ++--
devel/rubygem-fast_gettext/distinfo | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/devel/rubygem-fast_gettext/Makefile b/devel/rubygem-fast_gettext/Makefile
index 98a61a5..23ffb8a 100644
--- a/devel/rubygem-fast_gettext/Makefile
+++ b/devel/rubygem-fast_gettext/Makefile
@@ -2,11 +2,11 @@
# $FreeBSD$

PORTNAME= fast_gettext
-PORTVERSION= 0.8.1
+PORTVERSION= 0.9.0
CATEGORIES= devel rubygems
MASTER_SITES= RG

-MAINTAINER= ruby-***@public.gmane.org
+MAINTAINER= kvedulv-***@public.gmane.org
COMMENT= Fast, memory-efficient and threadsafe GetText for Ruby

LICENSE= MIT
diff --git a/devel/rubygem-fast_gettext/distinfo b/devel/rubygem-fast_gettext/distinfo
index 9e49792..56f94cd 100644
--- a/devel/rubygem-fast_gettext/distinfo
+++ b/devel/rubygem-fast_gettext/distinfo
@@ -1,2 +1,2 @@
-SHA256 (rubygem/fast_gettext-0.8.1.gem) = 85b78738c05af23cdfc75c64e3dcf2a1a6966536723aad5c8619f05cd8ba15e5
-SIZE (rubygem/fast_gettext-0.8.1.gem) = 89600
+SHA256 (rubygem/fast_gettext-0.9.0.gem) = 3897df000b816bac7e1058c1d12a5840e74cf95f0eeb46ebc67cc5efbfafb316
+SIZE (rubygem/fast_gettext-0.9.0.gem) = 22016
d***@public.gmane.org
2014-08-24 00:14:21 UTC
Permalink
branch: masters/2014q2
Repository: freenas/ports
Pushed by: git
Pushed to: branch masters/2014q2
commit c2d327aed5dd1782fa353880d7eeacb0f22c9c13
Author: swills <swills-***@public.gmane.org>
Date: Fri Aug 22 13:37:59 2014 +0000

sysutils/rubygem-hammer_cli_foreman: update to 0.1.2

PR: 192660
Submitted by: Michael Moll <kvedulv-***@public.gmane.org> (maintainer)
---
sysutils/rubygem-hammer_cli_foreman/Makefile | 4 ++--
sysutils/rubygem-hammer_cli_foreman/distinfo | 4 ++--
sysutils/rubygem-hammer_cli_foreman/pkg-descr | 2 +-
3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/sysutils/rubygem-hammer_cli_foreman/Makefile b/sysutils/rubygem-hammer_cli_foreman/Makefile
index d74e7bb..455d976 100644
--- a/sysutils/rubygem-hammer_cli_foreman/Makefile
+++ b/sysutils/rubygem-hammer_cli_foreman/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$

PORTNAME= hammer_cli_foreman
-PORTVERSION= 0.1.1
+PORTVERSION= 0.1.2
CATEGORIES= sysutils ruby
MASTER_SITES= RG

@@ -12,7 +12,7 @@ COMMENT= Foreman commands for Hammer CLI
LICENSE= GPLv3

RUN_DEPENDS= rubygem-apipie-bindings>=0.0.8:${PORTSDIR}/devel/rubygem-apipie-bindings \
- rubygem-hammer_cli=0.1.1:${PORTSDIR}/sysutils/rubygem-hammer_cli \
+ rubygem-hammer_cli=0.1.2:${PORTSDIR}/sysutils/rubygem-hammer_cli \
rubygem-rest-client>=1.6.7:${PORTSDIR}/www/rubygem-rest-client

USE_RUBY= yes
diff --git a/sysutils/rubygem-hammer_cli_foreman/distinfo b/sysutils/rubygem-hammer_cli_foreman/distinfo
index 9a62339..748a7b0 100644
--- a/sysutils/rubygem-hammer_cli_foreman/distinfo
+++ b/sysutils/rubygem-hammer_cli_foreman/distinfo
@@ -1,2 +1,2 @@
-SHA256 (rubygem/hammer_cli_foreman-0.1.1.gem) = e97c7ec12eb60c088a47bb8a3b37bb91f9daba087a66c6bf778eadd12a9f97d5
-SIZE (rubygem/hammer_cli_foreman-0.1.1.gem) = 114688
+SHA256 (rubygem/hammer_cli_foreman-0.1.2.gem) = d7905d84291e3aa38841284bbde53f63bfd5e83dee56ed84f9f19bedd45afeec
+SIZE (rubygem/hammer_cli_foreman-0.1.2.gem) = 199168
diff --git a/sysutils/rubygem-hammer_cli_foreman/pkg-descr b/sysutils/rubygem-hammer_cli_foreman/pkg-descr
index ecf77ce..828526c 100644
--- a/sysutils/rubygem-hammer_cli_foreman/pkg-descr
+++ b/sysutils/rubygem-hammer_cli_foreman/pkg-descr
@@ -1,3 +1,3 @@
-This Hammer CLI plugin contains set of commands for Foreman.
+This Hammer CLI plugin contains Foreman specific commands

WWW: https://github.com/theforeman/hammer-cli-foreman
d***@public.gmane.org
2014-08-24 00:14:21 UTC
Permalink
branch: masters/2014q2
Repository: freenas/ports
Pushed by: git
Pushed to: branch masters/2014q2
commit ba10f7efd5ac3dd9ae1caccccb39fc727fe9b535
Author: swills <swills-***@public.gmane.org>
Date: Fri Aug 22 13:33:54 2014 +0000

sysutils/rubygem-hammer_cli: update to 0.1.2

PR: 192658
Submitted by: Michael Moll <kvedulv-***@public.gmane.org>
---
sysutils/rubygem-hammer_cli/Makefile | 6 +++---
sysutils/rubygem-hammer_cli/distinfo | 4 ++--
.../rubygem-hammer_cli/files/cli_config.yml.sample | 18 +++++++++++++++---
sysutils/rubygem-hammer_cli/pkg-plist | 4 +---
4 files changed, 21 insertions(+), 11 deletions(-)

diff --git a/sysutils/rubygem-hammer_cli/Makefile b/sysutils/rubygem-hammer_cli/Makefile
index eb8ad27..895c6a1 100644
--- a/sysutils/rubygem-hammer_cli/Makefile
+++ b/sysutils/rubygem-hammer_cli/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$

PORTNAME= hammer_cli
-PORTVERSION= 0.1.1
+PORTVERSION= 0.1.2
CATEGORIES= sysutils ruby
MASTER_SITES= RG

@@ -11,9 +11,9 @@ COMMENT= Provides CLI interfaces for Ruby apps

LICENSE= GPLv3

-RUN_DEPENDS= rubygem-apipie-bindings>=0.0.6:${PORTSDIR}/devel/rubygem-apipie-bindings \
+RUN_DEPENDS= rubygem-apipie-bindings>=0.0.8:${PORTSDIR}/devel/rubygem-apipie-bindings \
rubygem-awesome_print>=1.1.0:${PORTSDIR}/devel/rubygem-awesome_print \
- rubygem-clamp>=0.6.3:${PORTSDIR}/devel/rubygem-clamp \
+ rubygem-clamp>=0.6.3_1:${PORTSDIR}/devel/rubygem-clamp \
rubygem-fastercsv>=1.5.5:${PORTSDIR}/devel/rubygem-fastercsv \
rubygem-fast_gettext>=0.8.1:${PORTSDIR}/devel/rubygem-fast_gettext \
rubygem-highline>=1.6.20:${PORTSDIR}/devel/rubygem-highline \
diff --git a/sysutils/rubygem-hammer_cli/distinfo b/sysutils/rubygem-hammer_cli/distinfo
index 2b54748..0cbdf61 100644
--- a/sysutils/rubygem-hammer_cli/distinfo
+++ b/sysutils/rubygem-hammer_cli/distinfo
@@ -1,2 +1,2 @@
-SHA256 (rubygem/hammer_cli-0.1.1.gem) = 8ed6878847894b69bd0c09317fc4e2e0557662bf2bf38d53f851d8ad85a6c7e2
-SIZE (rubygem/hammer_cli-0.1.1.gem) = 93696
+SHA256 (rubygem/hammer_cli-0.1.2.gem) = 0b62e1d955a98c46dd691694145889948807c8ca7a629356dd81e7a2325ceb1b
+SIZE (rubygem/hammer_cli-0.1.2.gem) = 121344
diff --git a/sysutils/rubygem-hammer_cli/files/cli_config.yml.sample b/sysutils/rubygem-hammer_cli/files/cli_config.yml.sample
index e11161e..39519d4 100644
--- a/sysutils/rubygem-hammer_cli/files/cli_config.yml.sample
+++ b/sysutils/rubygem-hammer_cli/files/cli_config.yml.sample
@@ -1,15 +1,27 @@
+# User interface related settings
:ui:
+ # Enable interactive queries?
:interactive: true
+ # Number of records listed per page
:per_page: 20
+ # Location of shell history file
:history_file: '~/.hammer/history'


-# enable/disable color output of logger in Clamp commands
+# Enable/disable color output of logger in Clamp commands
:watch_plain: false

+# Directory where the logs are stored. The default is /var/log/hammer/ and the log file is named hammer.log
:log_dir: '~/.hammer/log'
+
+# Logging level. One of debug, info, warning, error, fatal
:log_level: 'error'
-:log_api_calls: false
+
#:log_owner: 'foreman'
#:log_group: 'foreman'
-#:log_size: 5 #MB
+
+# Maximum log size in bytes. Log rotates when the value gets exceeded
+#:log_size: 5 #in MB
+
+# Mark translated strings with X characters (for developers)
+#:mark_translated: false
diff --git a/sysutils/rubygem-hammer_cli/pkg-plist b/sysutils/rubygem-hammer_cli/pkg-plist
index 78cc797..ccedd52 100644
--- a/sysutils/rubygem-hammer_cli/pkg-plist
+++ b/sysutils/rubygem-hammer_cli/pkg-plist
@@ -1,6 +1,4 @@
bin/hammer
-@unexec if cmp -s %D/etc/hammer/cli_config.yml.sample %D/etc/hammer/cli_config.yml; then rm -f %D/etc/hammer/cli_config.yml; fi
-etc/hammer/cli_config.yml.sample
-@exec if [ ! -f %D/etc/hammer/cli_config.yml ] ; then cp -p %D/etc/hammer/cli_config.yml.sample %D/etc/hammer/cli_config.yml; fi
+@sample etc/hammer/cli_config.yml.sample
@dirrmtry etc/hammer/cli.modules.d
@dirrmtry etc/hammer
d***@public.gmane.org
2014-08-24 00:14:21 UTC
Permalink
branch: masters/2014q2
Repository: freenas/ports
Pushed by: git
Pushed to: branch masters/2014q2
commit 55e3f10e805d44bf18fb88770800cc10fa7426d3
Author: ehaupt <ehaupt-***@public.gmane.org>
Date: Fri Aug 22 13:38:14 2014 +0000

- Support staging
- Add LICENSE
---
www/junkbuster/Makefile | 25 +++++++++++--------------
www/junkbuster/pkg-plist | 1 +
2 files changed, 12 insertions(+), 14 deletions(-)

diff --git a/www/junkbuster/Makefile b/www/junkbuster/Makefile
index 25185a8..13e93ce 100644
--- a/www/junkbuster/Makefile
+++ b/www/junkbuster/Makefile
@@ -12,16 +12,16 @@ EXTRACT_SUFX= .tgz
MAINTAINER= ports-***@public.gmane.org
COMMENT= HTTP proxy server that eliminates ads

+LICENSE= GPLv2
+
ALL_TARGET= # yes, an empty target.
JDIR= ${PREFIX}/etc/junkbuster
-MAN1= junkbuster.1
SUB_FILES= junkbuster pkg-message
USE_RC_SUBR= ${PORTNAME}
PKGMESSAGE= ${WRKDIR}/pkg-message

GNUREGEXP= 's:gnu_regex.h:gnu/regex.h:'

-NO_STAGE= yes
post-patch:
.for f in junkbstr.ini saclfile.ini sblock.ini scookie.ini sforward.ini strust.ini win32.h
@${REINPLACE_CMD} -e "s:`/usr/bin/printf '\r'`::" ${WRKSRC}/${f}
@@ -31,17 +31,14 @@ post-patch:
.endfor

do-install:
- @${INSTALL_PROGRAM} ${WRKSRC}/junkbuster ${PREFIX}/sbin/junkbuster
- @${MKDIR} -m 755 ${JDIR}
- @${INSTALL_DATA} ${WRKSRC}/junkbstr.ini ${JDIR}/configfile.sample
- @${INSTALL_DATA} ${WRKSRC}/sblock.ini ${JDIR}/blockfile.sample
- @${INSTALL_DATA} ${WRKSRC}/saclfile.ini ${JDIR}/aclfile.sample
- @${INSTALL_DATA} ${WRKSRC}/scookie.ini ${JDIR}/cookiefile.sample
- @${INSTALL_DATA} ${WRKSRC}/sforward.ini ${JDIR}/forwardfile.sample
- @${INSTALL_DATA} ${WRKSRC}/strust.ini ${JDIR}/trustfile.sample
- @${INSTALL_MAN} ${WRKSRC}/junkbuster.1 ${PREFIX}/man/man1/
-
-post-install:
- @${CAT} ${PKGMESSAGE}
+ ${INSTALL_PROGRAM} ${WRKSRC}/junkbuster ${STAGEDIR}${PREFIX}/sbin/junkbuster
+ @${MKDIR} -m 755 ${STAGEDIR}${JDIR}
+ ${INSTALL_DATA} ${WRKSRC}/junkbstr.ini ${STAGEDIR}${JDIR}/configfile.sample
+ ${INSTALL_DATA} ${WRKSRC}/sblock.ini ${STAGEDIR}${JDIR}/blockfile.sample
+ ${INSTALL_DATA} ${WRKSRC}/saclfile.ini ${STAGEDIR}${JDIR}/aclfile.sample
+ ${INSTALL_DATA} ${WRKSRC}/scookie.ini ${STAGEDIR}${JDIR}/cookiefile.sample
+ ${INSTALL_DATA} ${WRKSRC}/sforward.ini ${STAGEDIR}${JDIR}/forwardfile.sample
+ ${INSTALL_DATA} ${WRKSRC}/strust.ini ${STAGEDIR}${JDIR}/trustfile.sample
+ ${INSTALL_MAN} ${WRKSRC}/junkbuster.1 ${STAGEDIR}${MANPREFIX}/man/man1

.include <bsd.port.mk>
diff --git a/www/junkbuster/pkg-plist b/www/junkbuster/pkg-plist
index 9f6d19c3..072bc4a 100644
--- a/www/junkbuster/pkg-plist
+++ b/www/junkbuster/pkg-plist
@@ -5,4 +5,5 @@ etc/junkbuster/cookiefile.sample
etc/junkbuster/configfile.sample
etc/junkbuster/forwardfile.sample
etc/junkbuster/trustfile.sample
+man/man1/junkbuster.1.gz
@dirrmtry etc/junkbuster
d***@public.gmane.org
2014-08-24 00:14:21 UTC
Permalink
branch: masters/2014q2
Repository: freenas/ports
Pushed by: git
Pushed to: branch masters/2014q2
commit 19d75bdf0cbf126fe0f5c6d64057dd61cf2f99d5
Author: swills <swills-***@public.gmane.org>
Date: Fri Aug 22 13:53:52 2014 +0000

devel/rubygem-pygments.rb: patch for newer yajl-ruby

PR: 189983
Submitted by: Michael Moll <kvedulv-***@public.gmane.org>
---
devel/rubygem-pygments.rb/Makefile | 2 +-
.../rubygem-pygments.rb/files/patch-pygments.rb-0.5.4.gemspec | 11 +++++++++++
devel/rubygem-pygments.rb/files/patch-pygments.rb.gemspec | 11 +++++++++++
3 files changed, 23 insertions(+), 1 deletion(-)

diff --git a/devel/rubygem-pygments.rb/Makefile b/devel/rubygem-pygments.rb/Makefile
index f001eca..89652f1 100644
--- a/devel/rubygem-pygments.rb/Makefile
+++ b/devel/rubygem-pygments.rb/Makefile
@@ -12,7 +12,7 @@ COMMENT= Exposes the pygments syntax highlighter to Ruby
LICENSE= MIT

RUN_DEPENDS= rubygem-posix-spawn>=0.3.6:${PORTSDIR}/devel/rubygem-posix-spawn \
- rubygem-yajl-ruby>=1.1.0:${PORTSDIR}/devel/rubygem-yajl-ruby
+ rubygem-yajl-ruby>=1.2.0:${PORTSDIR}/devel/rubygem-yajl-ruby

USE_RUBY= yes
USE_RUBYGEMS= yes
diff --git a/devel/rubygem-pygments.rb/files/patch-pygments.rb-0.5.4.gemspec b/devel/rubygem-pygments.rb/files/patch-pygments.rb-0.5.4.gemspec
new file mode 100644
index 0000000..20f8734
--- /dev/null
+++ b/devel/rubygem-pygments.rb/files/patch-pygments.rb-0.5.4.gemspec
@@ -0,0 +1,11 @@
+--- pygments.rb-0.5.4.gemspec.orig 2014-05-20 06:57:41.000000000 +0200
++++ pygments.rb-0.5.4.gemspec 2014-05-20 06:54:40.000000000 +0200
+@@ -19,7 +19,7 @@
+ requirements:
+ - - ~>
+ - !ruby/object:Gem::Version
+- version: 1.1.0
++ version: 1.2.0
+ type: :runtime
+ prerelease: false
+ version_requirements: !ruby/object:Gem::Requirement
diff --git a/devel/rubygem-pygments.rb/files/patch-pygments.rb.gemspec b/devel/rubygem-pygments.rb/files/patch-pygments.rb.gemspec
new file mode 100644
index 0000000..29e996e
--- /dev/null
+++ b/devel/rubygem-pygments.rb/files/patch-pygments.rb.gemspec
@@ -0,0 +1,11 @@
+--- pygments.rb.gemspec.orig 2014-05-20 06:53:31.000000000 +0200
++++ pygments.rb.gemspec 2014-05-20 06:53:45.000000000 +0200
+@@ -13,7 +13,7 @@
+ s.authors = ['Aman Gupta', 'Ted Nyman']
+ s.email = ['[email protected]']
+
+- s.add_dependency 'yajl-ruby', '~> 1.1.0'
++ s.add_dependency 'yajl-ruby', '~> 1.2.0'
+ s.add_dependency 'posix-spawn', '~> 0.3.6'
+ s.add_development_dependency 'rake-compiler', '~> 0.7.6'
+
d***@public.gmane.org
2014-08-24 00:14:21 UTC
Permalink
branch: masters/2014q2
Repository: freenas/ports
Pushed by: git
Pushed to: branch masters/2014q2
commit 20a74ca5209407090198f227be0b43459ac17af0
Author: des <des-***@public.gmane.org>
Date: Fri Aug 22 13:40:47 2014 +0000

The previous commit was broken - don't know how I managed to install the
result. Fix the version requirement for Catalyst::DispatchType::Regex.
While there, add a patch that ensures that errors are reported correctly,
i.e. 500 for an internal error and 400 for an invalid request.
---
www/p5-Catalyst-Plugin-Server/Makefile | 4 +-
.../patch-lib-Catalyst-Plugin-Server-XMLRPC.pm | 44 +++++++++++++++++++---
2 files changed, 40 insertions(+), 8 deletions(-)

diff --git a/www/p5-Catalyst-Plugin-Server/Makefile b/www/p5-Catalyst-Plugin-Server/Makefile
index 5fd5c57..ea7c9f7 100644
--- a/www/p5-Catalyst-Plugin-Server/Makefile
+++ b/www/p5-Catalyst-Plugin-Server/Makefile
@@ -14,8 +14,8 @@ COMMENT= Catalyst Server Plugin: Base & XMLRPC
LICENSE= ART10 GPLv1
LICENSE_COMB= dual

-BUILD_DEPENDS= p5-Catalyst-Runtime>=5.7000:${PORTSDIR}/www/p5-Catalyst-Runtime \
- p5-Catalyst-DispatchType-Regex>=5.7000:${PORTSDIR}/www/p5-Catalyst-DispatchType-Regex \
+BUILD_DEPENDS= p5-Catalyst-Runtime>=5.90:${PORTSDIR}/www/p5-Catalyst-Runtime \
+ p5-Catalyst-DispatchType-Regex>=5.90:${PORTSDIR}/www/p5-Catalyst-DispatchType-Regex \
p5-Class-Data-Inheritable>=0:${PORTSDIR}/devel/p5-Class-Data-Inheritable \
p5-MRO-Compat>=0:${PORTSDIR}/devel/p5-MRO-Compat \
p5-Clone-Fast>=0:${PORTSDIR}/devel/p5-Clone-Fast \
diff --git a/www/p5-Catalyst-Plugin-Server/files/patch-lib-Catalyst-Plugin-Server-XMLRPC.pm b/www/p5-Catalyst-Plugin-Server/files/patch-lib-Catalyst-Plugin-Server-XMLRPC.pm
index 7b356d3..e4423bc 100644
--- a/www/p5-Catalyst-Plugin-Server/files/patch-lib-Catalyst-Plugin-Server-XMLRPC.pm
+++ b/www/p5-Catalyst-Plugin-Server/files/patch-lib-Catalyst-Plugin-Server-XMLRPC.pm
@@ -1,6 +1,15 @@
---- lib/Catalyst/Plugin/Server/XMLRPC.pm.orig
-+++ lib/Catalyst/Plugin/Server/XMLRPC.pm
-@@ -512,7 +512,7 @@ Alias of $c->req->parameters
+--- lib/Catalyst/Plugin/Server/XMLRPC.pm.orig 2010-07-08 20:39:58.000000000 +0200
++++ lib/Catalyst/Plugin/Server/XMLRPC.pm 2014-08-22 15:37:10.637508261 +0200
+@@ -349,7 +349,7 @@
+ }
+ ) {
+ $c->req->xmlrpc->_error(
+- $c, qq[Invalid XMLRPC request: No such method]
++ $c, 400, qq[Invalid XMLRPC request: No such method]
+ );
+ last PREPARE;
+ }
+@@ -512,7 +512,7 @@

__PACKAGE__->mk_accessors(
qw/ path prefix separator attribute convert_params
@@ -9,7 +18,7 @@
/
);

-@@ -532,6 +532,8 @@ Alias of $c->req->parameters
+@@ -532,6 +532,8 @@
|| $DefaultShowErrors );
$self->xml_encoding( $c->config->{xmlrpc}->{xml_encoding} )
if $c->config->{xmlrpc}->{xml_encoding};
@@ -18,7 +27,16 @@
$self->attribute($DefaultAttr);
$self->convert_params( 1 );

-@@ -690,6 +692,9 @@ Alias of $c->req->parameters
+@@ -668,7 +670,7 @@
+
+ ### an error in parsing the request
+ } elsif ( $@ ) {
+- $self->_error( $c, qq[Invalid XMLRPC request "$@"] );
++ $self->_error( $c, 400, qq[Invalid XMLRPC request "$@"] );
+ return;
+
+ ### something is wrong, but who knows what...
+@@ -690,6 +692,9 @@
local $RPC::XML::ENCODING = $c->server->xmlrpc->config->xml_encoding
if $c->server->xmlrpc->config->xml_encoding;

@@ -28,7 +46,21 @@
local $Clone::Fast::BREAK_REFS = 1;

my $res = RPC::XML::response->new(clone($status));
-@@ -808,6 +813,13 @@ default encoding to C<UTF-8> for instance.
+@@ -700,10 +705,11 @@
+
+ ### record errors in the error and debug log -- just for convenience
+ sub _error {
+- my($self, $c, $msg) = @_;
++ my($self, $c, $code, $msg) = @_;
+
++ ($code, $msg) = (500, $code) unless defined $msg;
+ $c->log->debug( $msg ) if $c->debug;
+- $c->error( $msg );
++ $self->error( [ $code, $msg ] );
+ }
+ }
+
+@@ -808,6 +814,13 @@

Defaults to C<us-ascii> which is the default of C<RPC::XML>.
d***@public.gmane.org
2014-08-24 00:14:21 UTC
Permalink
branch: masters/2014q2
Repository: freenas/ports
Pushed by: git
Pushed to: branch masters/2014q2
commit be6637f7deb80df778d8e3c563113377d7952052
Author: hrs <hrs-***@public.gmane.org>
Date: Fri Aug 22 14:32:10 2014 +0000

Fix bugs which prevented papersize configuration from working.
---
print/tex-xdvik/Makefile | 1 +
print/tex-xdvik/files/patch-texk-xdvik-dvi-init.c | 12 ++++---
print/tex-xdvik/files/patch-texk-xdvik-main.c | 38 +++++++++++++++++++++++
3 files changed, 46 insertions(+), 5 deletions(-)

diff --git a/print/tex-xdvik/Makefile b/print/tex-xdvik/Makefile
index 7ea8b31..f7bb63c 100644
--- a/print/tex-xdvik/Makefile
+++ b/print/tex-xdvik/Makefile
@@ -3,6 +3,7 @@

PORTNAME= xdvik
PORTVERSION= 22.87
+PORTREVISION= 1
CATEGORIES= print
MASTER_SITES= SF/xdvi/${PORTNAME}/${PORTVERSION}
PKGNAMEPREFIX= tex-
diff --git a/print/tex-xdvik/files/patch-texk-xdvik-dvi-init.c b/print/tex-xdvik/files/patch-texk-xdvik-dvi-init.c
index 75b97b2..42e6a3c 100644
--- a/print/tex-xdvik/files/patch-texk-xdvik-dvi-init.c
+++ b/print/tex-xdvik/files/patch-texk-xdvik-dvi-init.c
@@ -1,5 +1,5 @@
--- dvi-init.c.orig 2013-04-05 09:14:54.000000000 +0900
-+++ dvi-init.c 2013-05-06 05:13:12.000000000 +0900
++++ dvi-init.c 2014-08-22 23:26:27.000000000 +0900
@@ -53,6 +53,9 @@
#include "statusline.h"
#include "events.h"
@@ -26,7 +26,7 @@
if (*arg == '+') {
++arg;
ignore_papersize_specials = True;
-@@ -884,6 +892,55 @@
+@@ -884,6 +892,57 @@
break;
}
arg = temp;
@@ -38,12 +38,14 @@
+ name = systempapername();
+ if (name == NULL)
+ name = defaultpapername();
++ if (strcmp(name, "libpaper") == 0)
++ name = "a4";
+
+ strncpy(temp, name, sizeof(temp));
+ temp[sizeof(temp) - 1] = '\0';
+ }
-+ if (strcmp(temp, "letter") != 0 ||
-+ strcmp(temp, "ledgar") != 0) {
++ if (strcmp(temp, "letter") != 0 &&
++ strcmp(temp, "ledger") != 0) {
+ if (temp[strlen(temp) - 1] == 'r') {
+ temp[strlen(temp) - 1] = '\0';
+ landscape = 1;
@@ -82,7 +84,7 @@
/* perform substitutions */
for (p = paper_types; p < paper_types + paper_types_size; p += 2) {
if (strcmp(temp, *p) == 0) {
-@@ -898,6 +955,7 @@
+@@ -898,6 +957,7 @@
m_paper_unshrunk_h = atopix(arg1 + 1, False);

globals.grid_paper_unit = atopixunit(arg);
diff --git a/print/tex-xdvik/files/patch-texk-xdvik-main.c b/print/tex-xdvik/files/patch-texk-xdvik-main.c
new file mode 100644
index 0000000..9c82084
--- /dev/null
+++ b/print/tex-xdvik/files/patch-texk-xdvik-main.c
@@ -0,0 +1,38 @@
+--- main.c.orig 2014-04-03 10:17:12.000000000 +0900
++++ main.c 2014-08-22 23:24:13.000000000 +0900
+@@ -39,6 +39,9 @@
+ #include "filehist.h"
+ #include "mag.h"
+ #include "message-window.h"
++#ifdef HAVE_LIBPAPER
++#include <paper.h>
++#endif
+
+ #if FREETYPE
+ # include <ft2build.h>
+@@ -651,8 +654,16 @@
+
+ /* paper type */
+ if (!set_paper_type(resource.paper)) {
+- const char **p;
+ char *helpmsg = xstrdup("Possible paper types are:\n ");
++#ifdef HAVE_LIBPAPER
++ const struct paper *pp;
++
++ for (pp = paperfirst(); pp; pp = papernext(pp)) {
++ helpmsg = xstrcat(helpmsg, papername(pp));
++ helpmsg = xstrcat(helpmsg, " ");
++ }
++#else
++ const char **p;
+ const char **paper_types = get_paper_types();
+ for (p = paper_types; p < paper_types + get_paper_types_size(); p += 2) {
+ if (**p == '\0') { /* next line of list */
+@@ -663,6 +674,7 @@
+ helpmsg = xstrcat(helpmsg, " ");
+ }
+ }
++#endif
+ helpmsg = xstrcat(helpmsg,
+ "\n(the names ending with `r' are `rotated' or `landscape' variants).\n"
+ "Alternatively, you can specify the dimensions as `WIDTHxHEIGHT', followed "
d***@public.gmane.org
2014-08-24 00:14:21 UTC
Permalink
branch: masters/2014q2
Repository: freenas/ports
Pushed by: git
Pushed to: branch masters/2014q2
commit 6d23f3fd86f3dff2272f20e3de9d24334b604744
Author: robak <robak-***@public.gmane.org>
Date: Fri Aug 22 14:50:18 2014 +0000

sysutils/rubygem-chef-zero: update 2.0.2 -> 2.2

PR: 192338
Submitted by: Renaud Chaput <renchap-***@public.gmane.org>
Approved by: swills (mentor)
---
sysutils/rubygem-chef-zero/Makefile | 2 +-
sysutils/rubygem-chef-zero/distinfo | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/sysutils/rubygem-chef-zero/Makefile b/sysutils/rubygem-chef-zero/Makefile
index 2a7bb5e..c43d4d4 100644
--- a/sysutils/rubygem-chef-zero/Makefile
+++ b/sysutils/rubygem-chef-zero/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$

PORTNAME= chef-zero
-PORTVERSION= 2.0.2
+PORTVERSION= 2.2
CATEGORIES= sysutils
MASTER_SITES= RG

diff --git a/sysutils/rubygem-chef-zero/distinfo b/sysutils/rubygem-chef-zero/distinfo
index 7c91074..c4f8fdf 100644
--- a/sysutils/rubygem-chef-zero/distinfo
+++ b/sysutils/rubygem-chef-zero/distinfo
@@ -1,2 +1,2 @@
-SHA256 (rubygem/chef-zero-2.0.2.gem) = a8d12f3f59f2e6442353c1d4c8c0df1ac9dd2cc88a134244fb15d5f8c1e2fc1b
-SIZE (rubygem/chef-zero-2.0.2.gem) = 40448
+SHA256 (rubygem/chef-zero-2.2.gem) = 9138769e483b7f2585c64e5bcce5329b84be7ce9256effcaded785aa5e98dcf7
+SIZE (rubygem/chef-zero-2.2.gem) = 43520
d***@public.gmane.org
2014-08-24 00:14:21 UTC
Permalink
branch: masters/2014q2
Repository: freenas/ports
Pushed by: git
Pushed to: branch masters/2014q2
commit 99cefa8824887f20f36879230d6ec6fd360bd0bd
Author: ak <ak-***@public.gmane.org>
Date: Fri Aug 22 13:54:37 2014 +0000

- Update to 1.33

PR: 192684
Submitted by: Hardy Schumacher <hardy.schumacher-***@public.gmane.org>
---
emulators/dgen-sdl/Makefile | 2 +-
emulators/dgen-sdl/distinfo | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/emulators/dgen-sdl/Makefile b/emulators/dgen-sdl/Makefile
index 0e77759..91ca4cf 100644
--- a/emulators/dgen-sdl/Makefile
+++ b/emulators/dgen-sdl/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$

PORTNAME= dgen-sdl
-PORTVERSION= 1.32
+PORTVERSION= 1.33
CATEGORIES= emulators
MASTER_SITES= SF/dgen/dgen/${PORTVERSION}

diff --git a/emulators/dgen-sdl/distinfo b/emulators/dgen-sdl/distinfo
index 7434b36..59e054a 100644
--- a/emulators/dgen-sdl/distinfo
+++ b/emulators/dgen-sdl/distinfo
@@ -1,2 +1,2 @@
-SHA256 (dgen-sdl-1.32.tar.gz) = 23f8344f3f4717584bd0bcbc7d374e7c9ac40f155be9fac36544d82c7d603c30
-SIZE (dgen-sdl-1.32.tar.gz) = 885601
+SHA256 (dgen-sdl-1.33.tar.gz) = 99e2c06017c22873c77f88186ebcc09867244eb6e042c763bb094b02b8def61e
+SIZE (dgen-sdl-1.33.tar.gz) = 939297
d***@public.gmane.org
2014-08-24 00:14:21 UTC
Permalink
branch: masters/2014q2
Repository: freenas/ports
Pushed by: git
Pushed to: branch masters/2014q2
commit 1ff96fe0765732d18e4df43d601d6c4d33ca5050
Author: robak <robak-***@public.gmane.org>
Date: Fri Aug 22 14:43:47 2014 +0000

sysutils/rubygem-ohai: update 7.0.2 -> 7.2.0

PR: 192339
Submitted by: Renaud Chaput <renchap-***@public.gmane.org>
Approved by: swills (mentor)
---
sysutils/rubygem-ohai/Makefile | 10 ++++++----
sysutils/rubygem-ohai/distinfo | 4 ++--
2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/sysutils/rubygem-ohai/Makefile b/sysutils/rubygem-ohai/Makefile
index 8d4982c..2d3dd80 100644
--- a/sysutils/rubygem-ohai/Makefile
+++ b/sysutils/rubygem-ohai/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$

PORTNAME= ohai
-PORTVERSION= 7.0.2
+PORTVERSION= 7.2.0
CATEGORIES= sysutils rubygems
MASTER_SITES= RG

@@ -11,14 +11,16 @@ COMMENT= Ohai profiles your system and emits JSON

LICENSE= APACHE20

-RUN_DEPENDS= rubygem-ipaddress>=0:${PORTSDIR}/net/rubygem-ipaddress \
+RUN_DEPENDS= rubygem-ffi>=1.9.0:${PORTSDIR}/devel/rubygem-ffi \
+ rubygem-ffi-yajl>=1.0.1:${PORTSDIR}/devel/rubygem-ffi-yajl \
+ rubygem-ipaddress>=0:${PORTSDIR}/net/rubygem-ipaddress \
rubygem-mime-types>=1.16:${PORTSDIR}/misc/rubygem-mime-types \
rubygem-mixlib-cli>=0:${PORTSDIR}/devel/rubygem-mixlib-cli \
rubygem-mixlib-config>=0:${PORTSDIR}/devel/rubygem-mixlib-config \
rubygem-mixlib-log>=0:${PORTSDIR}/devel/rubygem-mixlib-log \
rubygem-mixlib-shellout>=0:${PORTSDIR}/devel/rubygem-mixlib-shellout \
- rubygem-systemu>=2.5.2:${PORTSDIR}/devel/rubygem-systemu \
- rubygem-yajl-ruby>=0:${PORTSDIR}/devel/rubygem-yajl-ruby
+ rubygem-systemu>=2.6.4:${PORTSDIR}/devel/rubygem-systemu \
+ rubygem-wmi-lite>=1.0.0:${PORTSDIR}/devel/rubygem-wmi-lite

USE_RUBY= yes
USE_RUBYGEMS= yes
diff --git a/sysutils/rubygem-ohai/distinfo b/sysutils/rubygem-ohai/distinfo
index a2fae40..5ee67e7 100644
--- a/sysutils/rubygem-ohai/distinfo
+++ b/sysutils/rubygem-ohai/distinfo
@@ -1,2 +1,2 @@
-SHA256 (rubygem/ohai-7.0.2.gem) = 74eefcc9ee53e27788fbb3350d72dd0b999706e3b297c1047350c0be5940ff55
-SIZE (rubygem/ohai-7.0.2.gem) = 410112
+SHA256 (rubygem/ohai-7.2.0.gem) = d8ffea96af40a836dbd146ffd6279a8ae0cebe010b4753ad7b5224d785174647
+SIZE (rubygem/ohai-7.2.0.gem) = 419328
d***@public.gmane.org
2014-08-24 00:14:21 UTC
Permalink
branch: masters/2014q2
Repository: freenas/ports
Pushed by: git
Pushed to: branch masters/2014q2
commit be01a041c211e8f3971e0c3c1ffc3cf35b887407
Author: amdmi3 <amdmi3-***@public.gmane.org>
Date: Fri Aug 22 15:31:16 2014 +0000

- Stagify
---
games/joequake/Makefile | 22 ++++++++--------------
1 file changed, 8 insertions(+), 14 deletions(-)

diff --git a/games/joequake/Makefile b/games/joequake/Makefile
index 75c1f1d..bb77dd2 100644
--- a/games/joequake/Makefile
+++ b/games/joequake/Makefile
@@ -31,7 +31,6 @@ HUD_DESC= High quality HUD images (for OpenGL)
HUD_SA_DESC= Same for Scourge of Armagon (hipnotic)
X86_ASM_DESC= Enable x86 assembly code

-NO_STAGE= yes
.include "${.CURDIR}/../quake-data/Makefile.include"

.include <bsd.port.options.mk>
@@ -82,28 +81,23 @@ PLIST_SUB+= X11="@comment "
.endif

do-install:
- ${MKDIR} ${Q1DIR}/${PORTNAME}
- ${INSTALL_DATA} ${WRKDIR}/${PORTNAME}/pak0.pak ${Q1DIR}/${PORTNAME}
+ ${MKDIR} ${STAGEDIR}${Q1DIR}/${PORTNAME}
+ ${INSTALL_DATA} ${WRKDIR}/${PORTNAME}/pak0.pak ${STAGEDIR}${Q1DIR}/${PORTNAME}
.if ${PORT_OPTIONS:MOPENGL}
${INSTALL_PROGRAM} ${WRKSRC}/release_glx/joequake-gl.glx \
- ${PREFIX}/bin/joequake-glx
+ ${STAGEDIR}${PREFIX}/bin/joequake-glx
.endif
.if ${PORT_OPTIONS:MHUD} || !empty(PORT_OPTIONS:MHUD_SA)
- ${MKDIR} ${Q1DIR}/${PORTNAME}/textures/wad
- ${INSTALL_DATA} ${WRKDIR}/wad/* ${Q1DIR}/${PORTNAME}/textures/wad
+ ${MKDIR} ${STAGEDIR}${Q1DIR}/${PORTNAME}/textures/wad
+ ${INSTALL_DATA} ${WRKDIR}/wad/* ${STAGEDIR}${Q1DIR}/${PORTNAME}/textures/wad
.endif
.if ${PORT_OPTIONS:MX11}
${INSTALL_PROGRAM} ${WRKSRC}/release_x11/joequake.x11 \
- ${PREFIX}/bin/joequake-x11
+ ${STAGEDIR}${PREFIX}/bin/joequake-x11
.endif
.if ${PORT_OPTIONS:MDOCS}
- ${MKDIR} ${DOCSDIR}
- ${INSTALL_DATA} ${WRKDIR}/${PORTNAME}/doc/*.txt ${DOCSDIR}
+ ${MKDIR} ${STAGEDIR}${DOCSDIR}
+ ${INSTALL_DATA} ${WRKDIR}/${PORTNAME}/doc/*.txt ${STAGEDIR}${DOCSDIR}
.endif

-post-install:
- @${ECHO_CMD}
- @${CAT} ${PKGMESSAGE}
- @${ECHO_CMD}
-
.include <bsd.port.mk>
d***@public.gmane.org
2014-08-24 00:14:21 UTC
Permalink
branch: masters/2014q2
Repository: freenas/ports
Pushed by: git
Pushed to: branch masters/2014q2
commit 3b31890b1d39794c465e7efd480523d8a35f66bf
Author: tijl <tijl-***@public.gmane.org>
Date: Fri Aug 22 15:33:29 2014 +0000

- Unconditionally depend on intltool to fix build with NLS disabled [1]
- Add OpenGL rendering support [2]

PR: 192856 [1]
Submitted by: Nils Beyer <nbe-JSyxANCgrHysTnJN9+***@public.gmane.org> [2]
---
net/mediastreamer/Makefile | 24 ++++++++++++++++++------
1 file changed, 18 insertions(+), 6 deletions(-)

diff --git a/net/mediastreamer/Makefile b/net/mediastreamer/Makefile
index dfb6015..1a930bd 100644
--- a/net/mediastreamer/Makefile
+++ b/net/mediastreamer/Makefile
@@ -3,7 +3,7 @@

PORTNAME= mediastreamer
PORTVERSION= 2.10.0
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= net
MASTER_SITES= SAVANNAH/linphone/mediastreamer

@@ -18,23 +18,23 @@ LIB_DEPENDS= libortp.so:${PORTSDIR}/net/ortp
CONFLICTS_INSTALL= linphone-base-[0-9]*

GNU_CONFIGURE= yes
-CONFIGURE_ARGS= --disable-alsa --disable-glx --disable-pulseaudio \
+CONFIGURE_ARGS= --disable-alsa --disable-pulseaudio \
--disable-silent-rules --disable-strict \
--with-gsm=${LOCALBASE} xxd_found=yes
CPPFLAGS+= -I${LOCALBASE}/include
LIBS+= -L${LOCALBASE}/lib
INSTALL_TARGET= install-strip
USES= gmake libtool pathfix pkgconfig
-USE_GNOME= gnomehier
+USE_GNOME= gnomehier intltool
USE_LDCONFIG= yes

OPTIONS_DEFINE= IPV6 NLS UPNP VIDEO
OPTIONS_GROUP= AUDIOOPT VIDEOOPT
OPTIONS_GROUP_AUDIOOPT= GSM OPUS SPANDSP SPEEX
-OPTIONS_GROUP_VIDEOOPT= FFMPEG THEORA V4L VPX XVIDEO
+OPTIONS_GROUP_VIDEOOPT= FFMPEG GLX THEORA V4L VPX XVIDEO
OPTIONS_DEFAULT= UPNP VIDEO \
GSM OPUS SPANDSP SPEEX \
- FFMPEG THEORA V4L VPX XVIDEO
+ FFMPEG GLX THEORA V4L VPX XVIDEO
OPTIONS_SUB= yes

AUDIOOPT_DESC= Audio options
@@ -42,6 +42,9 @@ AUDIOOPT_DESC= Audio options
FFMPEG_CONFIGURE_ENABLE=ffmpeg
FFMPEG_LIB_DEPENDS= libavcodec.so:${PORTSDIR}/multimedia/ffmpeg

+GLX_CONFIGURE_ENABLE= glx
+GLX_USE= GL=glew
+
GSM_CONFIGURE_ENABLE= gsm
GSM_LIB_DEPENDS= libgsm.so:${PORTSDIR}/audio/gsm

@@ -49,7 +52,6 @@ IPV6_CONFIGURE_ENABLE= ipv6

NLS_CONFIGURE_ENABLE= nls
NLS_USES= gettext
-NLS_USE= GNOME=intltool

OPUS_CONFIGURE_ENABLE= opus
OPUS_LIB_DEPENDS= libopus.so:${PORTSDIR}/audio/opus
@@ -88,4 +90,14 @@ post-patch:
@${REINPLACE_CMD} 's,gsm/gsm\.h,gsm.h,' \
${WRKSRC}/configure ${WRKSRC}/src/audiofilters/gsm.c

+pre-build:
+# Transform file to C array (similar to xxd -i from editors/vim)
+.for i in yuv2rgb.fs yuv2rgb.vs
+ (cd ${WRKSRC}/src && { \
+ ${ECHO_CMD} 'unsigned char ${i:S/./_/}[] = {' && \
+ /usr/bin/hexdump -v -e '" " 12/1 " 0x%02x," "\n" \
+ " 0x00 };\nunsigned int ${i:S/./_/}_len = %_Ad;"' ${i} | \
+ ${SED} 's/ 0x ,//g' ; } > ${i}.h)
+.endfor
+
.include <bsd.port.mk>
d***@public.gmane.org
2014-08-24 00:14:21 UTC
Permalink
branch: masters/2014q2
Repository: freenas/ports
Pushed by: git
Pushed to: branch masters/2014q2
commit 2f0733b755606c181e96213d252482a1627b386e
Author: danilo <danilo-***@public.gmane.org>
Date: Fri Aug 22 13:54:12 2014 +0000

- Update from 7.40.5 to 7.40.6
---
graphics/nip2/Makefile | 2 +-
graphics/vips/Makefile | 2 +-
graphics/vips/distinfo | 4 ++--
graphics/vips/pkg-plist | 4 ++--
4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/graphics/nip2/Makefile b/graphics/nip2/Makefile
index 293434c..be98045 100644
--- a/graphics/nip2/Makefile
+++ b/graphics/nip2/Makefile
@@ -3,7 +3,7 @@

PORTNAME= nip2
PORTVERSION= 7.40.3
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= graphics
MASTER_SITES= http://www.vips.ecs.soton.ac.uk/supported/${PORTVERSION:R}/

diff --git a/graphics/vips/Makefile b/graphics/vips/Makefile
index fa4bd40..bc20410 100644
--- a/graphics/vips/Makefile
+++ b/graphics/vips/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$

PORTNAME= vips
-PORTVERSION= 7.40.5
+PORTVERSION= 7.40.6
CATEGORIES= graphics
MASTER_SITES= http://www.vips.ecs.soton.ac.uk/supported/${PORTVERSION:R}/

diff --git a/graphics/vips/distinfo b/graphics/vips/distinfo
index 509c4bb..e13e01f 100644
--- a/graphics/vips/distinfo
+++ b/graphics/vips/distinfo
@@ -1,2 +1,2 @@
-SHA256 (vips-7.40.5.tar.gz) = f6c8810d592fce6af88837da455d2c0e86288bec231e2abbc8ed113584d9c38c
-SIZE (vips-7.40.5.tar.gz) = 3509942
+SHA256 (vips-7.40.6.tar.gz) = b76f3fcb30dc31503927497ed6fbc18b9e359c88967a265c231bb9368861404e
+SIZE (vips-7.40.6.tar.gz) = 3520166
diff --git a/graphics/vips/pkg-plist b/graphics/vips/pkg-plist
index 24d74a0..628cff3 100644
--- a/graphics/vips/pkg-plist
+++ b/graphics/vips/pkg-plist
@@ -66,11 +66,11 @@ include/vips/vipscpp.h
lib/libvips.a
lib/libvips.so
lib/libvips.so.38
-lib/libvips.so.38.0.3
+lib/libvips.so.38.0.4
lib/libvipsCC.a
lib/libvipsCC.so
lib/libvipsCC.so.38
-lib/libvipsCC.so.38.0.3
+lib/libvipsCC.so.38.0.4
%%PYTHON%%%%PYTHON_SITELIBDIR%%/vipsCC/VDisplay.py
%%PYTHON%%%%PYTHON_SITELIBDIR%%/vipsCC/VDisplay.pyc
%%PYTHON%%%%PYTHON_SITELIBDIR%%/vipsCC/VDisplay.pyo
d***@public.gmane.org
2014-08-24 00:14:21 UTC
Permalink
branch: masters/2014q2
Repository: freenas/ports
Pushed by: git
Pushed to: branch masters/2014q2
commit 2d45a056c764a57beafe26de5381854bb8dd8302
Author: ak <ak-***@public.gmane.org>
Date: Fri Aug 22 14:16:56 2014 +0000

- Update to 2014.65
---
security/dropbear/Makefile | 2 +-
security/dropbear/distinfo | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/security/dropbear/Makefile b/security/dropbear/Makefile
index 3324a54..b981fba 100644
--- a/security/dropbear/Makefile
+++ b/security/dropbear/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$

PORTNAME= dropbear
-PORTVERSION= 2014.63
+PORTVERSION= 2014.65
CATEGORIES= security ipv6
MASTER_SITES= http://matt.ucc.asn.au/dropbear/releases/

diff --git a/security/dropbear/distinfo b/security/dropbear/distinfo
index 0fe434e..19f3b5c 100644
--- a/security/dropbear/distinfo
+++ b/security/dropbear/distinfo
@@ -1,2 +1,2 @@
-SHA256 (dropbear-2014.63.tar.bz2) = 595992de432ba586a0e7e191bbb1ad587727678bb3e345b018c395b8c55b57ae
-SIZE (dropbear-2014.63.tar.bz2) = 1598479
+SHA256 (dropbear-2014.65.tar.bz2) = e20057aa7db0f9ea4efdcbfc6fc6b73a648b47b6ab6a01659472142b06f5f56c
+SIZE (dropbear-2014.65.tar.bz2) = 1604532
d***@public.gmane.org
2014-08-24 00:14:21 UTC
Permalink
branch: masters/2014q2
Repository: freenas/ports
Pushed by: git
Pushed to: branch masters/2014q2
commit 1c9e9cbd1647441cb445319d25597d070f31c82c
Author: danilo <danilo-***@public.gmane.org>
Date: Fri Aug 22 13:54:40 2014 +0000

- Update from 1.2.1 to 1.3.0
---
games/solarus/Makefile | 2 +-
games/solarus/distinfo | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/games/solarus/Makefile b/games/solarus/Makefile
index f19dffd..75e5225 100644
--- a/games/solarus/Makefile
+++ b/games/solarus/Makefile
@@ -1,7 +1,7 @@
# $FreeBSD$

PORTNAME= solarus
-PORTVERSION= 1.2.1
+PORTVERSION= 1.3.0
CATEGORIES= games
MASTER_SITES= http://www.solarus-games.org/downloads/solarus/
DISTNAME= solarus-${PORTVERSION}-src
diff --git a/games/solarus/distinfo b/games/solarus/distinfo
index 6ed14b3..f4fbdeb 100644
--- a/games/solarus/distinfo
+++ b/games/solarus/distinfo
@@ -1,2 +1,2 @@
-SHA256 (solarus-1.2.1-src.tar.gz) = 169e97f5d15e312bca043f5938bccade75924d5fdea8aff5572fd79c6f4c3af7
-SIZE (solarus-1.2.1-src.tar.gz) = 2421802
+SHA256 (solarus-1.3.0-src.tar.gz) = d295ebd9c13d7a72a08dd35d76502e1ed5410996d110fc69c070ff67925aaf26
+SIZE (solarus-1.3.0-src.tar.gz) = 2449710
d***@public.gmane.org
2014-08-24 00:14:21 UTC
Permalink
branch: masters/2014q2
Repository: freenas/ports
Pushed by: git
Pushed to: branch masters/2014q2
commit 89e404621856d6c62d52329d4b2b4cbea12b0d80
Author: robak <robak-***@public.gmane.org>
Date: Fri Aug 22 14:56:50 2014 +0000

sysutils/rubygem-chef: update 11.12.2 -> 11.14.2

PR: 192340
Submitted by: Renaud Chaput <renchap-***@public.gmane.org>
Approved by: swills (mentor)
---
sysutils/rubygem-chef/Makefile | 17 +++++++++--------
sysutils/rubygem-chef/distinfo | 4 ++--
sysutils/rubygem-chef/pkg-plist | 3 +++
3 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/sysutils/rubygem-chef/Makefile b/sysutils/rubygem-chef/Makefile
index 686ff9c..6fb6ed9 100644
--- a/sysutils/rubygem-chef/Makefile
+++ b/sysutils/rubygem-chef/Makefile
@@ -2,18 +2,20 @@
# $FreeBSD$

PORTNAME= chef
-PORTVERSION= 11.12.2
+PORTVERSION= 11.14.2
CATEGORIES= sysutils
MASTER_SITES= RG

MAINTAINER= renchap-***@public.gmane.org
COMMENT= Systems integration framework. Client part

-RUN_DEPENDS= rubygem-chef-zero>=2.0.2:${PORTSDIR}/sysutils/rubygem-chef-zero \
+LICENSE= APACHE20
+
+RUN_DEPENDS= rubygem-chef-zero>=2.1.0:${PORTSDIR}/sysutils/rubygem-chef-zero \
rubygem-diff-lcs>=0.0.0:${PORTSDIR}/textproc/rubygem-diff-lcs \
rubygem-erubis>=0:${PORTSDIR}/www/rubygem-erubis \
+ rubygem-ffi-yajl>=1.0.1:${PORTSDIR}/devel/rubygem-ffi-yajl \
rubygem-highline>=1.6.9:${PORTSDIR}/devel/rubygem-highline \
- rubygem-json>=1.8.1:${PORTSDIR}/devel/rubygem-json \
rubygem-mime-types>=1.16:${PORTSDIR}/misc/rubygem-mime-types \
rubygem-mixlib-authentication>=1.3.0:${PORTSDIR}/devel/rubygem-mixlib-authentication \
rubygem-mixlib-cli>=1.4.0:${PORTSDIR}/devel/rubygem-mixlib-cli \
@@ -22,10 +24,9 @@ RUN_DEPENDS= rubygem-chef-zero>=2.0.2:${PORTSDIR}/sysutils/rubygem-chef-zero \
rubygem-mixlib-shellout>=1.4.0:${PORTSDIR}/devel/rubygem-mixlib-shellout \
rubygem-net-ssh>=2.6:${PORTSDIR}/security/rubygem-net-ssh \
rubygem-net-ssh-multi>=1.1.0:${PORTSDIR}/security/rubygem-net-ssh-multi \
- rubygem-ohai>=7.0.0:${PORTSDIR}/sysutils/rubygem-ohai \
+ rubygem-ohai>=7.2.0:${PORTSDIR}/sysutils/rubygem-ohai \
rubygem-pry>=0.9.0:${PORTSDIR}/devel/rubygem-pry \
- rubygem-rest-client>=1.0.4:${PORTSDIR}/www/rubygem-rest-client \
- rubygem-yajl-ruby>=1.1.0:${PORTSDIR}/devel/rubygem-yajl-ruby
+ rubygem-rest-client>=1.0.4:${PORTSDIR}/www/rubygem-rest-client

USE_RUBY= yes
USE_RUBYGEMS= yes
@@ -40,8 +41,8 @@ post-install:
knife-cookbook.1 knife-data-bag.1 knife-delete.1 knife-deps.1 knife-diff.1 \
knife-download.1 knife-edit.1 knife-environment.1 knife-exec.1 knife-index-rebuild.1 \
knife-list.1 knife-node.1 knife-raw.1 knife-recipe-list.1 knife-role.1 knife-search.1 \
- knife-show.1 knife-ssh.1 knife-status.1 knife-tag.1 knife-upload.1 knife-user.1 \
- knife-xargs.1 knife.1
+ knife-serve.1 knife-show.1 knife-ssh.1 knife-ssl-check.1 knife-ssl-fetch.1 knife-status.1 \
+ knife-tag.1 knife-upload.1 knife-user.1 knife-xargs.1 knife.1
@cd ${WRKSRC}/distro/common/man/man1 && ${INSTALL_MAN} ${M1} ${STAGEDIR}${MANPREFIX}/man/man1/
.endfor
.for M8 in chef-client.8 chef-solo.8
diff --git a/sysutils/rubygem-chef/distinfo b/sysutils/rubygem-chef/distinfo
index 5bdf641..3302bb1 100644
--- a/sysutils/rubygem-chef/distinfo
+++ b/sysutils/rubygem-chef/distinfo
@@ -1,2 +1,2 @@
-SHA256 (rubygem/chef-11.12.2.gem) = 9371569b4ed10330a4aeb531e2e0a80e95c378d802e0587a0fc286c294ccedfd
-SIZE (rubygem/chef-11.12.2.gem) = 1299456
+SHA256 (rubygem/chef-11.14.2.gem) = b8f4180b85467e1670f7b795b19a80d378b670b6ff001cedc5f8e3fb34a0ee47
+SIZE (rubygem/chef-11.14.2.gem) = 1310720
diff --git a/sysutils/rubygem-chef/pkg-plist b/sysutils/rubygem-chef/pkg-plist
index 41d6b4e..76f22f5 100644
--- a/sysutils/rubygem-chef/pkg-plist
+++ b/sysutils/rubygem-chef/pkg-plist
@@ -26,8 +26,11 @@ man/man1/knife-raw.1.gz
man/man1/knife-recipe-list.1.gz
man/man1/knife-role.1.gz
man/man1/knife-search.1.gz
+man/man1/knife-serve.1.gz
man/man1/knife-show.1.gz
man/man1/knife-ssh.1.gz
+man/man1/knife-ssl-check.1.gz
+man/man1/knife-ssl-fetch.1.gz
man/man1/knife-status.1.gz
man/man1/knife-tag.1.gz
man/man1/knife-upload.1.gz
d***@public.gmane.org
2014-08-24 00:14:21 UTC
Permalink
branch: masters/2014q2
Repository: freenas/ports
Pushed by: git
Pushed to: branch masters/2014q2
commit 7bcabdbad27272b0ee7c2402318cfe354c17588d
Author: amdmi3 <amdmi3-***@public.gmane.org>
Date: Fri Aug 22 15:31:08 2014 +0000

- Stagify
---
games/cleanq3/Makefile | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/games/cleanq3/Makefile b/games/cleanq3/Makefile
index d1b4076..4908504 100644
--- a/games/cleanq3/Makefile
+++ b/games/cleanq3/Makefile
@@ -32,7 +32,6 @@ PLIST_SUB= LIBDIR="${LIBDIR:S/${PREFIX}\///}"
LIBDIR= ${PREFIX}/lib/${PORTNAME}
VM_ARCHS= i386

-NO_STAGE= yes
.include <bsd.port.options.mk>

.if ${ARCH} == "i386"
@@ -99,12 +98,12 @@ post-patch:

do-install:
.for bin in ${Q3BIN}
- ${INSTALL_PROGRAM} ${BUILD_WRKSRC}/release/${bin} ${PREFIX}/bin
+ ${INSTALL_PROGRAM} ${BUILD_WRKSRC}/release/${bin} ${STAGEDIR}${PREFIX}/bin
.endfor
.if ${PORT_OPTIONS:MGAMELIBS} || !defined(HAVE_VM_COMPILED)
.for dir in baseq3 missionpack
- @${MKDIR} ${LIBDIR}/${dir}
- ${INSTALL_PROGRAM} ${BUILD_WRKSRC}/release/${dir}/*.so ${LIBDIR}/${dir}
+ @${MKDIR} ${STAGEDIR}${LIBDIR}/${dir}
+ ${INSTALL_PROGRAM} ${BUILD_WRKSRC}/release/${dir}/*.so ${STAGEDIR}${LIBDIR}/${dir}
.endfor
.endif
d***@public.gmane.org
2014-08-24 00:14:22 UTC
Permalink
branch: masters/2014q2
Repository: freenas/ports
Pushed by: git
Pushed to: branch masters/2014q2
commit e23207560391d76d2a09815e27236e4289ff775e
Author: olgeni <olgeni-***@public.gmane.org>
Date: Fri Aug 22 15:37:00 2014 +0000

Upgrade to version 0.24.1.
---
textproc/the_silver_searcher/Makefile | 4 ++--
textproc/the_silver_searcher/distinfo | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/textproc/the_silver_searcher/Makefile b/textproc/the_silver_searcher/Makefile
index 9601992..f867287 100644
--- a/textproc/the_silver_searcher/Makefile
+++ b/textproc/the_silver_searcher/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$

PORTNAME= the_silver_searcher
-PORTVERSION= 0.24.0
+PORTVERSION= 0.24.1
CATEGORIES= textproc

MAINTAINER= olgeni-***@public.gmane.org
@@ -15,7 +15,7 @@ LIB_DEPENDS= libpcre.so:${PORTSDIR}/devel/pcre
USE_GITHUB= yes
GH_ACCOUNT= ggreer
GH_TAGNAME= ${PORTVERSION}
-GH_COMMIT= 7b24ee5
+GH_COMMIT= 4b270d1

ACLOCAL_ARGS+= -I ${ACLOCAL_DIR}
AUTOMAKE_ARGS+= --add-missing
diff --git a/textproc/the_silver_searcher/distinfo b/textproc/the_silver_searcher/distinfo
index 487c040..cb4662c 100644
--- a/textproc/the_silver_searcher/distinfo
+++ b/textproc/the_silver_searcher/distinfo
@@ -1,2 +1,2 @@
-SHA256 (the_silver_searcher-0.24.0.tar.gz) = caeee240868c3d06d6eb5d3c7cc6ef547205046b5cbd5157c0163349cae9d174
-SIZE (the_silver_searcher-0.24.0.tar.gz) = 57738
+SHA256 (the_silver_searcher-0.24.1.tar.gz) = d1e20247aaea327b4df478054a1c5f212635cd78c3a668bc9c52d79b8562ef9e
+SIZE (the_silver_searcher-0.24.1.tar.gz) = 58382
d***@public.gmane.org
2014-08-24 00:14:22 UTC
Permalink
branch: masters/2014q2
Repository: freenas/ports
Pushed by: git
Pushed to: branch masters/2014q2
commit 4de0f79451f7ca87af32dcebf1b5569f3ee7afa2
Author: amdmi3 <amdmi3-***@public.gmane.org>
Date: Fri Aug 22 15:57:21 2014 +0000

- Stagify
---
games/pvpgn/Makefile | 13 +++----------
games/pvpgn/pkg-plist | 14 ++++++++++++++
2 files changed, 17 insertions(+), 10 deletions(-)

diff --git a/games/pvpgn/Makefile b/games/pvpgn/Makefile
index 8253a14..67bcf58 100644
--- a/games/pvpgn/Makefile
+++ b/games/pvpgn/Makefile
@@ -38,16 +38,11 @@ CONFIGURE_ARGS= --sysconfdir=${PREFIX}/etc/pvpgn \

USE_RC_SUBR= bnetd

-MAN1= bnbot.1 bnchat.1 bnetd.1 bnftp.1 bni2tga.1 bnibuild.1 \
- bniextract.1 bnilist.1 bnpass.1 bnstat.1 bntrackd.1 tgainfo.1
-MAN5= bnetd.conf.5 bntext.5
-
OPTIONS_DEFINE= MYSQL PGSQL SQLITE3 D2
D2_DESC= Diablo II server (D2CS/D2DBS)

OPTIONS_DEFAULT= D2

-NO_STAGE= yes
.include <bsd.port.options.mk>

.if ${PORT_OPTIONS:MMYSQL}
@@ -91,18 +86,16 @@ post-install:
bnserver-D2XP.ini bnserver-WAR3.ini bnserver.ini icons-WAR3.bni \
icons.bni icons_STAR.bni ver-ix86-1.mpq

- ${INSTALL_DATA} ${WRKSRC}/${SUPPORT_FILES}/${i} ${DATADIR}/files
+ ${INSTALL_DATA} ${WRKSRC}/${SUPPORT_FILES}/${i} ${STAGEDIR}${DATADIR}/files
.endfor

## Additional documentation

.if ${PORT_OPTIONS:MDOCS}
- ${MKDIR} ${DOCSDIR}
+ ${MKDIR} ${STAGEDIR}${DOCSDIR}
.for i in INSTALL.unix PORTS README.fdwatch README.storage bnmotd.txt
- ${INSTALL_MAN} ${WRKSRC}/../docs/${i} ${DOCSDIR}
+ ${INSTALL_DATA} ${WRKSRC}/../docs/${i} ${STAGEDIR}${DOCSDIR}
.endfor
.endif

- @${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
-
.include <bsd.port.mk>
diff --git a/games/pvpgn/pkg-plist b/games/pvpgn/pkg-plist
index fec664a..508af40 100644
--- a/games/pvpgn/pkg-plist
+++ b/games/pvpgn/pkg-plist
@@ -43,6 +43,20 @@ etc/pvpgn/supportfile.conf-sample
etc/pvpgn/topics.conf-sample
etc/pvpgn/tournament.conf-sample
etc/pvpgn/versioncheck.conf-sample
+man/man1/bnbot.1.gz
+man/man1/bnchat.1.gz
+man/man1/bnetd.1.gz
+man/man1/bnftp.1.gz
+man/man1/bni2tga.1.gz
+man/man1/bnibuild.1.gz
+man/man1/bniextract.1.gz
+man/man1/bnilist.1.gz
+man/man1/bnpass.1.gz
+man/man1/bnstat.1.gz
+man/man1/bntrackd.1.gz
+man/man1/tgainfo.1.gz
+man/man5/bnetd.conf.5.gz
+man/man5/bntext.5.gz
sbin/bnetd
sbin/bntrackd
%%WITH_D2%%sbin/d2cs
d***@public.gmane.org
2014-08-24 00:14:21 UTC
Permalink
branch: masters/2014q2
Repository: freenas/ports
Pushed by: git
Pushed to: branch masters/2014q2
commit 46d7e97a9b2b5c5543ffda749031e9e2b3dd57c6
Author: hrs <hrs-***@public.gmane.org>
Date: Fri Aug 22 15:35:04 2014 +0000

Fix duplicated files.

Spotted by: Jan Henrik Sylvester
---
print/tex-luatex/Makefile | 2 ++
print/tex-luatex/pkg-plist | 51 ++++++++++++++++++++++++++
print/texlive-texmf/Makefile | 3 ++
print/texlive-texmf/pkg-plist | 84 +------------------------------------------
4 files changed, 57 insertions(+), 83 deletions(-)

diff --git a/print/tex-luatex/Makefile b/print/tex-luatex/Makefile
index 0766baf..984faac 100644
--- a/print/tex-luatex/Makefile
+++ b/print/tex-luatex/Makefile
@@ -2,6 +2,7 @@

PORTNAME= luatex
PORTVERSION= 0.79.1
+PORTREVISION= 1
CATEGORIES= print
MASTER_SITES= ftp://tug.org/historic/systems/texlive/2014/
PKGNAMEPREFIX= tex-
@@ -42,6 +43,7 @@ DISTNAME_TEXMF= texlive-${DISTVERSION_TEXMF}-texmf
EXTRACT_FILES_TEXMF= \
texmf-dist/doc/lualatex \
texmf-dist/doc/luatex \
+ texmf-dist/scripts/context/lua \
texmf-dist/source/luatex \
texmf-dist/source/lualatex \
texmf-dist/fonts/map/luatex \
diff --git a/print/tex-luatex/pkg-plist b/print/tex-luatex/pkg-plist
index 82ff898..43621de 100644
--- a/print/tex-luatex/pkg-plist
+++ b/print/tex-luatex/pkg-plist
@@ -428,6 +428,50 @@
%%TEXMFDISTDIR%%/doc/luatex/spelling/spelling-doc.pdf
%%TEXMFDISTDIR%%/doc/luatex/spelling/spelling-doc.tex
%%TEXMFDISTDIR%%/fonts/map/luatex/context/demo-font.lum
+%%TEXMFDISTDIR%%/scripts/context/lua/mtx-babel.lua
+%%TEXMFDISTDIR%%/scripts/context/lua/mtx-base.lua
+%%TEXMFDISTDIR%%/scripts/context/lua/mtx-bibtex.lua
+%%TEXMFDISTDIR%%/scripts/context/lua/mtx-cache.lua
+%%TEXMFDISTDIR%%/scripts/context/lua/mtx-chars.lua
+%%TEXMFDISTDIR%%/scripts/context/lua/mtx-check.lua
+%%TEXMFDISTDIR%%/scripts/context/lua/mtx-colors.lua
+%%TEXMFDISTDIR%%/scripts/context/lua/mtx-context.lua
+%%TEXMFDISTDIR%%/scripts/context/lua/mtx-context.xml
+%%TEXMFDISTDIR%%/scripts/context/lua/mtx-convert.lua
+%%TEXMFDISTDIR%%/scripts/context/lua/mtx-epub.lua
+%%TEXMFDISTDIR%%/scripts/context/lua/mtx-fcd.lua
+%%TEXMFDISTDIR%%/scripts/context/lua/mtx-flac.lua
+%%TEXMFDISTDIR%%/scripts/context/lua/mtx-fonts.lua
+%%TEXMFDISTDIR%%/scripts/context/lua/mtx-grep.lua
+%%TEXMFDISTDIR%%/scripts/context/lua/mtx-interface.lua
+%%TEXMFDISTDIR%%/scripts/context/lua/mtx-metapost.lua
+%%TEXMFDISTDIR%%/scripts/context/lua/mtx-metatex.lua
+%%TEXMFDISTDIR%%/scripts/context/lua/mtx-mk-help.lua
+%%TEXMFDISTDIR%%/scripts/context/lua/mtx-modules.lua
+%%TEXMFDISTDIR%%/scripts/context/lua/mtx-mtxworks.lua
+%%TEXMFDISTDIR%%/scripts/context/lua/mtx-package.lua
+%%TEXMFDISTDIR%%/scripts/context/lua/mtx-patterns.lua
+%%TEXMFDISTDIR%%/scripts/context/lua/mtx-pdf.lua
+%%TEXMFDISTDIR%%/scripts/context/lua/mtx-plain.lua
+%%TEXMFDISTDIR%%/scripts/context/lua/mtx-profile.lua
+%%TEXMFDISTDIR%%/scripts/context/lua/mtx-rsync.lua
+%%TEXMFDISTDIR%%/scripts/context/lua/mtx-scite.lua
+%%TEXMFDISTDIR%%/scripts/context/lua/mtx-server-ctx-fonttest.lua
+%%TEXMFDISTDIR%%/scripts/context/lua/mtx-server-ctx-help.lua
+%%TEXMFDISTDIR%%/scripts/context/lua/mtx-server-ctx-startup.lua
+%%TEXMFDISTDIR%%/scripts/context/lua/mtx-server.lua
+%%TEXMFDISTDIR%%/scripts/context/lua/mtx-texworks.lua
+%%TEXMFDISTDIR%%/scripts/context/lua/mtx-timing.lua
+%%TEXMFDISTDIR%%/scripts/context/lua/mtx-tools.lua
+%%TEXMFDISTDIR%%/scripts/context/lua/mtx-unzip.lua
+%%TEXMFDISTDIR%%/scripts/context/lua/mtx-update.lua
+%%TEXMFDISTDIR%%/scripts/context/lua/mtx-watch.lua
+%%TEXMFDISTDIR%%/scripts/context/lua/mtx-youless.lua
+%%TEXMFDISTDIR%%/scripts/context/lua/mtxlibs.lua
+%%TEXMFDISTDIR%%/scripts/context/lua/mtxrun.lua
+%%TEXMFDISTDIR%%/scripts/context/lua/third/enigma/mtx-t-enigma.lua/mtx-t-enigma.lua
+%%TEXMFDISTDIR%%/scripts/context/lua/third/rst/mtx-t-rst.lua
+%%TEXMFDISTDIR%%/scripts/context/lua/third/simpleslides/mtx-simpleslides.lua
%%TEXMFDISTDIR%%/source/lualatex/luabibentry/Makefile
%%TEXMFDISTDIR%%/source/lualatex/luabibentry/luabibentry.dtx
%%TEXMFDISTDIR%%/source/lualatex/luacode/Makefile
@@ -964,6 +1008,13 @@
@dirrm %%TEXMFDISTDIR%%/source/lualatex/luacode
@dirrm %%TEXMFDISTDIR%%/source/lualatex/luabibentry
@dirrm %%TEXMFDISTDIR%%/source/lualatex
+@dirrm %%TEXMFDISTDIR%%/scripts/context/lua/third/simpleslides
+@dirrm %%TEXMFDISTDIR%%/scripts/context/lua/third/rst
+@dirrm %%TEXMFDISTDIR%%/scripts/context/lua/third/enigma/mtx-t-enigma.lua
+@dirrm %%TEXMFDISTDIR%%/scripts/context/lua/third/enigma
+@dirrm %%TEXMFDISTDIR%%/scripts/context/lua/third
+@dirrm %%TEXMFDISTDIR%%/scripts/context/lua
+@dirrmtry %%TEXMFDISTDIR%%/scripts/context
@dirrm %%TEXMFDISTDIR%%/fonts/map/luatex/context
@dirrm %%TEXMFDISTDIR%%/fonts/map/luatex
@dirrm %%TEXMFDISTDIR%%/doc/luatex/spelling
diff --git a/print/texlive-texmf/Makefile b/print/texlive-texmf/Makefile
index e3c063c..c255136 100644
--- a/print/texlive-texmf/Makefile
+++ b/print/texlive-texmf/Makefile
@@ -2,6 +2,7 @@

PORTNAME= texlive
PORTVERSION= 20140525
+PORTREVISION= 1
CATEGORIES= print
MASTER_SITES= ftp://ftp.tug.org/historic/systems/texlive/2014/
PKGNAMESUFFIX= -texmf
@@ -57,6 +58,7 @@ EXCLUDE_FILES= \*/doc/man \
texmf-dist/source/xmltex \
texmf-dist/tex/generic/config/luatex-unicode-letters.tex \
texmf-dist/tex/generic/config/luatexiniconfig.tex \
+ texmf-dist/tex/generic/context/luatex \
texmf-dist/tex/generic/dvips \
texmf-dist/tex/generic/hyph-utf8/patterns/ptex \
texmf-dist/tex/generic/xetexconfig \
@@ -107,6 +109,7 @@ EXCLUDE_FILES= \*/doc/man \
texmf-dist/scripts/context/stubs/unix/mtxrunjit \
texmf-dist/scripts/context/stubs/unix/texexec \
texmf-dist/scripts/context/stubs/unix/texmfstart \
+ texmf-dist/scripts/context/lua \
texmf-dist/scripts/convbkmk/convbkmk.rb \
texmf-dist/scripts/ctanify/ctanify \
texmf-dist/scripts/ctanupload/ctanupload.pl \
diff --git a/print/texlive-texmf/pkg-plist b/print/texlive-texmf/pkg-plist
index 0041a6a..b57a34d 100644
--- a/print/texlive-texmf/pkg-plist
+++ b/print/texlive-texmf/pkg-plist
@@ -59516,50 +59516,6 @@
%%TEXMFDISTDIR%%/scripts/cachepic/cachepic.cmd
%%TEXMFDISTDIR%%/scripts/chktex/chkweb.sh
%%TEXMFDISTDIR%%/scripts/chktex/deweb.pl
-%%TEXMFDISTDIR%%/scripts/context/lua/mtx-babel.lua
-%%TEXMFDISTDIR%%/scripts/context/lua/mtx-base.lua
-%%TEXMFDISTDIR%%/scripts/context/lua/mtx-bibtex.lua
-%%TEXMFDISTDIR%%/scripts/context/lua/mtx-cache.lua
-%%TEXMFDISTDIR%%/scripts/context/lua/mtx-chars.lua
-%%TEXMFDISTDIR%%/scripts/context/lua/mtx-check.lua
-%%TEXMFDISTDIR%%/scripts/context/lua/mtx-colors.lua
-%%TEXMFDISTDIR%%/scripts/context/lua/mtx-context.lua
-%%TEXMFDISTDIR%%/scripts/context/lua/mtx-context.xml
-%%TEXMFDISTDIR%%/scripts/context/lua/mtx-convert.lua
-%%TEXMFDISTDIR%%/scripts/context/lua/mtx-epub.lua
-%%TEXMFDISTDIR%%/scripts/context/lua/mtx-fcd.lua
-%%TEXMFDISTDIR%%/scripts/context/lua/mtx-flac.lua
-%%TEXMFDISTDIR%%/scripts/context/lua/mtx-fonts.lua
-%%TEXMFDISTDIR%%/scripts/context/lua/mtx-grep.lua
-%%TEXMFDISTDIR%%/scripts/context/lua/mtx-interface.lua
-%%TEXMFDISTDIR%%/scripts/context/lua/mtx-metapost.lua
-%%TEXMFDISTDIR%%/scripts/context/lua/mtx-metatex.lua
-%%TEXMFDISTDIR%%/scripts/context/lua/mtx-mk-help.lua
-%%TEXMFDISTDIR%%/scripts/context/lua/mtx-modules.lua
-%%TEXMFDISTDIR%%/scripts/context/lua/mtx-mtxworks.lua
-%%TEXMFDISTDIR%%/scripts/context/lua/mtx-package.lua
-%%TEXMFDISTDIR%%/scripts/context/lua/mtx-patterns.lua
-%%TEXMFDISTDIR%%/scripts/context/lua/mtx-pdf.lua
-%%TEXMFDISTDIR%%/scripts/context/lua/mtx-plain.lua
-%%TEXMFDISTDIR%%/scripts/context/lua/mtx-profile.lua
-%%TEXMFDISTDIR%%/scripts/context/lua/mtx-rsync.lua
-%%TEXMFDISTDIR%%/scripts/context/lua/mtx-scite.lua
-%%TEXMFDISTDIR%%/scripts/context/lua/mtx-server-ctx-fonttest.lua
-%%TEXMFDISTDIR%%/scripts/context/lua/mtx-server-ctx-help.lua
-%%TEXMFDISTDIR%%/scripts/context/lua/mtx-server-ctx-startup.lua
-%%TEXMFDISTDIR%%/scripts/context/lua/mtx-server.lua
-%%TEXMFDISTDIR%%/scripts/context/lua/mtx-texworks.lua
-%%TEXMFDISTDIR%%/scripts/context/lua/mtx-timing.lua
-%%TEXMFDISTDIR%%/scripts/context/lua/mtx-tools.lua
-%%TEXMFDISTDIR%%/scripts/context/lua/mtx-unzip.lua
-%%TEXMFDISTDIR%%/scripts/context/lua/mtx-update.lua
-%%TEXMFDISTDIR%%/scripts/context/lua/mtx-watch.lua
-%%TEXMFDISTDIR%%/scripts/context/lua/mtx-youless.lua
-%%TEXMFDISTDIR%%/scripts/context/lua/mtxlibs.lua
-%%TEXMFDISTDIR%%/scripts/context/lua/mtxrun.lua
-%%TEXMFDISTDIR%%/scripts/context/lua/third/enigma/mtx-t-enigma.lua/mtx-t-enigma.lua
-%%TEXMFDISTDIR%%/scripts/context/lua/third/rst/mtx-t-rst.lua
-%%TEXMFDISTDIR%%/scripts/context/lua/third/simpleslides/mtx-simpleslides.lua
%%TEXMFDISTDIR%%/scripts/context/perl/makempy.pl
%%TEXMFDISTDIR%%/scripts/context/perl/path_tre.pm
%%TEXMFDISTDIR%%/scripts/context/perl/pdftrimwhite.pl
@@ -67352,37 +67308,6 @@
%%TEXMFDISTDIR%%/tex/generic/config/language.us.lua
%%TEXMFDISTDIR%%/tex/generic/config/pdftex-dvi.tex
%%TEXMFDISTDIR%%/tex/generic/config/pdftexconfig.tex
-%%TEXMFDISTDIR%%/tex/generic/context/luatex/luatex-basics-gen.lua
-%%TEXMFDISTDIR%%/tex/generic/context/luatex/luatex-basics-nod.lua
-%%TEXMFDISTDIR%%/tex/generic/context/luatex/luatex-basics.tex
-%%TEXMFDISTDIR%%/tex/generic/context/luatex/luatex-fonts-cbk.lua
-%%TEXMFDISTDIR%%/tex/generic/context/luatex/luatex-fonts-def.lua
-%%TEXMFDISTDIR%%/tex/generic/context/luatex/luatex-fonts-demo-vf-1.lua
-%%TEXMFDISTDIR%%/tex/generic/context/luatex/luatex-fonts-enc.lua
-%%TEXMFDISTDIR%%/tex/generic/context/luatex/luatex-fonts-ext.lua
-%%TEXMFDISTDIR%%/tex/generic/context/luatex/luatex-fonts-inj.lua
-%%TEXMFDISTDIR%%/tex/generic/context/luatex/luatex-fonts-lua.lua
... 47 lines suppressed ...
d***@public.gmane.org
2014-08-24 00:14:22 UTC
Permalink
branch: masters/2014q2
Repository: freenas/ports
Pushed by: git
Pushed to: branch masters/2014q2
commit e665d4ae5e11bf9e5d1bd7c788d60613fc6289b6
Author: pi <pi-***@public.gmane.org>
Date: Fri Aug 22 16:32:36 2014 +0000

devel/py-itools: 0.62.9 -> 0.75.2, unbreak

PR: 192668
Submitted by: Carlos Jacobo Puga Medina <cpm-***@public.gmane.org>
---
devel/py-itools/Makefile | 51 +++--
devel/py-itools/distinfo | 4 +-
devel/py-itools/pkg-plist | 554 ----------------------------------------------
3 files changed, 38 insertions(+), 571 deletions(-)

diff --git a/devel/py-itools/Makefile b/devel/py-itools/Makefile
index bdfa927..28690a8 100644
--- a/devel/py-itools/Makefile
+++ b/devel/py-itools/Makefile
@@ -2,33 +2,54 @@
# $FreeBSD$

PORTNAME= itools
-PORTVERSION= 0.62.9
-PORTREVISION= 1
+PORTVERSION= 0.75.2
CATEGORIES= devel python
-MASTER_SITES= http://download.hforge.org/itools/0.62/
+MASTER_SITES= CHEESESHOP
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}

-MAINTAINER= ports-***@public.gmane.org
+MAINTAINER= cpm-***@public.gmane.org
COMMENT= Python library Provides Wide Range Of Capabilities

LICENSE= GPLv3
+LICENSE_FILE= ${WRKSRC}/LICENSE.txt

-BROKEN= Fails to build
-
-BUILD_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}reportlab2>=2.3:${PORTSDIR}/print/py-reportlab2 \
+BUILD_DEPENDS= ${LOCALBASE}/include/poppler/goo/gtypes.h:${PORTSDIR}/graphics/poppler \
+ ${LOCALBASE}/include/git2.h:${PORTSDIR}/devel/libgit2 \
+ ${PYTHON_PKGNAMEPREFIX}reportlab2>=2.3:${PORTSDIR}/print/py-reportlab2 \
${PYTHON_PKGNAMEPREFIX}imaging>0:${PORTSDIR}/graphics/py-imaging \
${PYTHON_PKGNAMEPREFIX}matplotlib>0:${PORTSDIR}/math/py-matplotlib \
${PYTHON_PKGNAMEPREFIX}gobject>=2.16.1:${PORTSDIR}/devel/py-gobject \
- ${PYTHON_PKGNAMEPREFIX}pygit2>=0:${PORTSDIR}/devel/py-pygit2 \
+ gettext:${PORTSDIR}/devel/gettext \
python:${PORTSDIR}/lang/python
-RUN_DEPENDS+= ${BUILD_DEPENDS}
-LIB_DEPENDS= libglib.so:${PORTSDIR}/devel/glib20 \
- libsoup.so:${PORTSDIR}/devel/libsoup
+RUN_DEPENDS:= ${BUILD_DEPENDS}
+LIB_DEPENDS= libglib-2.0.so:${PORTSDIR}/devel/glib20 \
+ libsoup-2.4.so:${PORTSDIR}/devel/libsoup \
+ libwv2.so:${PORTSDIR}/textproc/wv2

+CFLAGS+= -I${LOCALBASE}/include -I${LOCALBASE}/include/poppler
LDFLAGS+= -L${LOCALBASE}/lib
-USES= pkgconfig
-USE_PYTHON= yes
-USE_PYDISTUTILS= yes

-NO_STAGE= yes
+USES= pkgconfig python:2.7+
+USE_PYTHON= autoplist distutils
+
+OPTIONS_DEFINE= DOCS
+
+PORTDOCS= INSTALL.txt LICENSE.txt MANIFEST README.rst RELEASE-0.75.0 \
+ RELEASE-0.75.1 RELEASE-0.75.2 UPGRADE-0.75.0
+
+.include <bsd.port.options.mk>
+
+post-install:
+.for f in office pdf web xml
+ ${STRIP_CMD} ${STAGEDIR}${PYTHON_SITELIBDIR}/${PORTNAME}/${f}/*.so
+.endfor
+
+.if ${PORT_OPTIONS:MDOCS}
+ ${MKDIR} ${STAGEDIR}${DOCSDIR}
+ cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}
+.endif
+
+regression-test: build
+ cd ${WRKSRC}/test && ${PYTHON_CMD} test.py
+
.include <bsd.port.mk>
diff --git a/devel/py-itools/distinfo b/devel/py-itools/distinfo
index 2e218ce..3bb880b 100644
--- a/devel/py-itools/distinfo
+++ b/devel/py-itools/distinfo
@@ -1,2 +1,2 @@
-SHA256 (itools-0.62.9.tar.gz) = 3fec662a0ea77d70df1a6c9e599baaf7ded3a9f774c43d626e57be8ba0bfd027
-SIZE (itools-0.62.9.tar.gz) = 854398
+SHA256 (itools-0.75.2.tar.gz) = ade21dcd815ded81b1fd3f35c9a48f20afccd6d2dff441fd54cd970459d88df4
+SIZE (itools-0.75.2.tar.gz) = 852116
diff --git a/devel/py-itools/pkg-plist b/devel/py-itools/pkg-plist
deleted file mode 100644
index f647f0a..0000000
--- a/devel/py-itools/pkg-plist
+++ /dev/null
@@ -1,554 +0,0 @@
-bin/iodf-greek.py
-bin/igettext-build.py
-bin/igettext-extract.py
-bin/igettext-merge.py
-bin/ipkg-build.py
-bin/ipkg-docs.py
-bin/ipkg-copyright.py
-bin/ipkg-info.py
-bin/ipkg-quality.py
-bin/ipkg-update-locale.py
-bin/idb-inspect.py
-%%PYTHON_SITELIBDIR%%/itools/.mailmap
-%%PYTHON_SITELIBDIR%%/itools/CREDITS
-%%PYTHON_SITELIBDIR%%/itools/CREDITS.txt
-%%PYTHON_SITELIBDIR%%/itools/LICENSE.txt
-%%PYTHON_SITELIBDIR%%/itools/MANIFEST
-%%PYTHON_SITELIBDIR%%/itools/README.txt
-%%PYTHON_SITELIBDIR%%/itools/INSTALL.txt
-%%PYTHON_SITELIBDIR%%/itools/RELEASE-0.62.0
-%%PYTHON_SITELIBDIR%%/itools/RELEASE-0.62.1
-%%PYTHON_SITELIBDIR%%/itools/RELEASE-0.62.2
-%%PYTHON_SITELIBDIR%%/itools/RELEASE-0.62.3
-%%PYTHON_SITELIBDIR%%/itools/RELEASE-0.62.4
-%%PYTHON_SITELIBDIR%%/itools/UPGRADE-0.62.0
-%%PYTHON_SITELIBDIR%%/itools/RELEASE-0.62.5
-%%PYTHON_SITELIBDIR%%/itools/RELEASE-0.62.6
-%%PYTHON_SITELIBDIR%%/itools/RELEASE-0.62.7
-%%PYTHON_SITELIBDIR%%/itools/RELEASE-0.62.8
-%%PYTHON_SITELIBDIR%%/itools/RELEASE-0.62.9
-%%PYTHON_SITELIBDIR%%/itools/__init__.py
-%%PYTHON_SITELIBDIR%%/itools/__init__.pyc
-%%PYTHON_SITELIBDIR%%/itools/__init__.pyo
-%%PYTHON_SITELIBDIR%%/itools/abnf/__init__.py
-%%PYTHON_SITELIBDIR%%/itools/abnf/__init__.pyc
-%%PYTHON_SITELIBDIR%%/itools/abnf/__init__.pyo
-%%PYTHON_SITELIBDIR%%/itools/abnf/abnf.py
-%%PYTHON_SITELIBDIR%%/itools/abnf/abnf.pyc
-%%PYTHON_SITELIBDIR%%/itools/abnf/abnf.pyo
-%%PYTHON_SITELIBDIR%%/itools/abnf/grammar.py
-%%PYTHON_SITELIBDIR%%/itools/abnf/grammar.pyc
-%%PYTHON_SITELIBDIR%%/itools/abnf/grammar.pyo
-%%PYTHON_SITELIBDIR%%/itools/abnf/parser.py
-%%PYTHON_SITELIBDIR%%/itools/abnf/parser.pyc
-%%PYTHON_SITELIBDIR%%/itools/abnf/parser.pyo
-%%PYTHON_SITELIBDIR%%/itools/abnf/tokenizer.py
-%%PYTHON_SITELIBDIR%%/itools/abnf/tokenizer.pyc
-%%PYTHON_SITELIBDIR%%/itools/abnf/tokenizer.pyo
-%%PYTHON_SITELIBDIR%%/itools/core/__init__.py
-%%PYTHON_SITELIBDIR%%/itools/core/__init__.pyc
-%%PYTHON_SITELIBDIR%%/itools/core/__init__.pyo
-%%PYTHON_SITELIBDIR%%/itools/core/_unix.py
-%%PYTHON_SITELIBDIR%%/itools/core/_unix.pyc
-%%PYTHON_SITELIBDIR%%/itools/core/_unix.pyo
-%%PYTHON_SITELIBDIR%%/itools/core/_win.py
-%%PYTHON_SITELIBDIR%%/itools/core/_win.pyc
-%%PYTHON_SITELIBDIR%%/itools/core/_win.pyo
-%%PYTHON_SITELIBDIR%%/itools/core/cache.py
-%%PYTHON_SITELIBDIR%%/itools/core/cache.pyc
-%%PYTHON_SITELIBDIR%%/itools/core/cache.pyo
-%%PYTHON_SITELIBDIR%%/itools/core/freeze.py
-%%PYTHON_SITELIBDIR%%/itools/core/freeze.pyc
-%%PYTHON_SITELIBDIR%%/itools/core/freeze.pyo
-%%PYTHON_SITELIBDIR%%/itools/core/lazy.py
-%%PYTHON_SITELIBDIR%%/itools/core/lazy.pyc
-%%PYTHON_SITELIBDIR%%/itools/core/lazy.pyo
-%%PYTHON_SITELIBDIR%%/itools/core/mimetypes_.py
-%%PYTHON_SITELIBDIR%%/itools/core/mimetypes_.pyc
-%%PYTHON_SITELIBDIR%%/itools/core/mimetypes_.pyo
-%%PYTHON_SITELIBDIR%%/itools/core/odict.py
-%%PYTHON_SITELIBDIR%%/itools/core/odict.pyc
-%%PYTHON_SITELIBDIR%%/itools/core/odict.pyo
-%%PYTHON_SITELIBDIR%%/itools/core/subprocess_.py
-%%PYTHON_SITELIBDIR%%/itools/core/subprocess_.pyc
-%%PYTHON_SITELIBDIR%%/itools/core/subprocess_.pyo
-%%PYTHON_SITELIBDIR%%/itools/core/thingy.py
-%%PYTHON_SITELIBDIR%%/itools/core/thingy.pyc
-%%PYTHON_SITELIBDIR%%/itools/core/thingy.pyo
-%%PYTHON_SITELIBDIR%%/itools/core/timezones.py
-%%PYTHON_SITELIBDIR%%/itools/core/timezones.pyc
-%%PYTHON_SITELIBDIR%%/itools/core/timezones.pyo
-%%PYTHON_SITELIBDIR%%/itools/core/utils.py
-%%PYTHON_SITELIBDIR%%/itools/core/utils.pyc
-%%PYTHON_SITELIBDIR%%/itools/core/utils.pyo
-%%PYTHON_SITELIBDIR%%/itools/csv/__init__.py
-%%PYTHON_SITELIBDIR%%/itools/csv/__init__.pyc
-%%PYTHON_SITELIBDIR%%/itools/csv/__init__.pyo
-%%PYTHON_SITELIBDIR%%/itools/csv/csv_.py
-%%PYTHON_SITELIBDIR%%/itools/csv/csv_.pyc
-%%PYTHON_SITELIBDIR%%/itools/csv/csv_.pyo
-%%PYTHON_SITELIBDIR%%/itools/csv/parser.py
-%%PYTHON_SITELIBDIR%%/itools/csv/parser.pyc
-%%PYTHON_SITELIBDIR%%/itools/csv/parser.pyo
-%%PYTHON_SITELIBDIR%%/itools/csv/table.py
-%%PYTHON_SITELIBDIR%%/itools/csv/table.pyc
-%%PYTHON_SITELIBDIR%%/itools/csv/table.pyo
-%%PYTHON_SITELIBDIR%%/itools/database/__init__.py
-%%PYTHON_SITELIBDIR%%/itools/database/__init__.pyc
... 457 lines suppressed ...
d***@public.gmane.org
2014-08-24 00:14:22 UTC
Permalink
branch: masters/2014q2
Repository: freenas/ports
Pushed by: git
Pushed to: branch masters/2014q2
commit 10772072ed9af5f0d161029ded33a5cdfd4a2b69
Author: swills <swills-***@public.gmane.org>
Date: Fri Aug 22 16:29:02 2014 +0000

www/rubygem-fcgi: add port based on ruby-fcgi, update to 0.9.2.1

PR: 190446
Submitted by: Takumi Takahashi <takumiiinn-***@public.gmane.org>
---
www/Makefile | 1 +
www/rubygem-fcgi/Makefile | 17 +++++++++++++++++
www/rubygem-fcgi/distinfo | 2 ++
www/rubygem-fcgi/pkg-descr | 3 +++
4 files changed, 23 insertions(+)

diff --git a/www/Makefile b/www/Makefile
index f446144..4c8790c 100644
--- a/www/Makefile
+++ b/www/Makefile
@@ -1784,6 +1784,7 @@
SUBDIR += rubygem-eventmachine_httpserver
SUBDIR += rubygem-faraday
SUBDIR += rubygem-faraday_middleware
+ SUBDIR += rubygem-fcgi
SUBDIR += rubygem-feed-normalizer
SUBDIR += rubygem-feedzirra
SUBDIR += rubygem-flowdock
diff --git a/www/rubygem-fcgi/Makefile b/www/rubygem-fcgi/Makefile
new file mode 100644
index 0000000..20a1254
--- /dev/null
+++ b/www/rubygem-fcgi/Makefile
@@ -0,0 +1,17 @@
+# $FreeBSD$
+
+PORTNAME= fcgi
+PORTVERSION= 0.9.2.1
+CATEGORIES= www ruby
+MASTER_SITES= RG
+
+MAINTAINER= ruby-***@public.gmane.org
+COMMENT= FastCGI library for Ruby
+
+LIB_DEPENDS= libfcgi.so:${PORTSDIR}/www/fcgi
+
+USE_RUBY= yes
+USE_RUBYGEMS= yes
+RUBYGEM_AUTOPLIST= yes
+
+.include <bsd.port.mk>
diff --git a/www/rubygem-fcgi/distinfo b/www/rubygem-fcgi/distinfo
new file mode 100644
index 0000000..8cfed1e
--- /dev/null
+++ b/www/rubygem-fcgi/distinfo
@@ -0,0 +1,2 @@
+SHA256 (rubygem/fcgi-0.9.2.1.gem) = f5e18b6769dfea1760e3da1dae1df7ade140cd5c1394e9318e36d9834f13ca1e
+SIZE (rubygem/fcgi-0.9.2.1.gem) = 15872
diff --git a/www/rubygem-fcgi/pkg-descr b/www/rubygem-fcgi/pkg-descr
new file mode 100644
index 0000000..357924d
--- /dev/null
+++ b/www/rubygem-fcgi/pkg-descr
@@ -0,0 +1,3 @@
+Ruby/fcgi is the FastCGI library for Ruby.
+
+WWW: https://rubygems.org/gems/fcgi
d***@public.gmane.org
2014-08-24 00:14:22 UTC
Permalink
branch: masters/2014q2
Repository: freenas/ports
Pushed by: git
Pushed to: branch masters/2014q2
commit 86c7b15dd6f5be04eb0744fbf68d9c7fc406f185
Author: amdmi3 <amdmi3-***@public.gmane.org>
Date: Fri Aug 22 16:36:53 2014 +0000

- Stagify

PR: 192791
Submitted by: tkato432-/***@public.gmane.org
---
finance/beanie/Makefile | 9 ++++++---
finance/beanie/pkg-plist | 1 +
2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/finance/beanie/Makefile b/finance/beanie/Makefile
index ffb6354..ca45fdc 100644
--- a/finance/beanie/Makefile
+++ b/finance/beanie/Makefile
@@ -7,14 +7,17 @@ CATEGORIES= finance
MASTER_SITES= SF

MAINTAINER= ports-***@public.gmane.org
-COMMENT= Beanie is a fully-fledged accounting and payroll system
+COMMENT= Open Source accounting system
+
+LICENSE= GPLv2 # (or later)
+LICENSE_FILE= ${WRKSRC}/COPYING

-LIB_DEPENDS= libexpat.so:${PORTSDIR}/textproc/expat2
BUILD_DEPENDS= dbow:${PORTSDIR}/databases/dbow
+LIB_DEPENDS= libexpat.so:${PORTSDIR}/textproc/expat2

+LATE_INSTALL_ARGS= BEANIEROOT="${STAGEDIR}${PREFIX}/beanie"
MAKE_JOBS_UNSAFE= yes

-NO_STAGE= yes
post-patch:
@${CP} ${WRKSRC}/beanie.mk.sample $(WRKSRC)/beanie.mk
@${CP} ${WRKSRC}/tmac/lhead.sample.r ${WRKSRC}/tmac/lhead.r
diff --git a/finance/beanie/pkg-plist b/finance/beanie/pkg-plist
index 3f3e37e..821c3f9 100644
--- a/finance/beanie/pkg-plist
+++ b/finance/beanie/pkg-plist
@@ -58,6 +58,7 @@ beanie/roff/payslip.tmac
beanie/roff/porder.tmac
beanie/roff/sharecert.tmac
beanie/roff/statement.tmac
+@exec mkdir -p %D/beanie/tmp
@dirrm beanie/tmp
@dirrm beanie/roff
@dirrm beanie/bin
d***@public.gmane.org
2014-08-24 00:14:22 UTC
Permalink
branch: masters/2014q2
Repository: freenas/ports
Pushed by: git
Pushed to: branch masters/2014q2
commit a9677de670ee6f628df00967efbbb933898e9eac
Author: amdmi3 <amdmi3-***@public.gmane.org>
Date: Fri Aug 22 16:45:38 2014 +0000

- Update to 1.0.2
- Add LICENSE
- Stagify

PR: 192795
Submitted by: tkato432-/***@public.gmane.org
---
games/criticalmass/Makefile | 49 ++++++++++++++--------
games/criticalmass/distinfo | 4 +-
.../criticalmass/files/patch-tinyxml__tinyxml.cpp | 21 ++++++++++
.../files/patch-tinyxml__tinyxmlparser.cpp | 12 ++++++
.../files/patch-utils_WalkDirectory.hpp | 10 -----
.../files/patch-utils__ResourceManager.cpp | 10 +++++
games/criticalmass/files/patch-utils__Value.hpp | 23 ++++++++++
games/criticalmass/files/patch-utils__zStream.cpp | 11 +++++
.../files/patch-utils__zStreamBufferImplZLib.cpp | 11 +++++
games/criticalmass/files/patch-utilsgl_gl++.hpp | 10 -----
games/criticalmass/files/patch-utilssdl_PNG.cpp | 19 +++++----
games/criticalmass/pkg-descr | 2 +-
12 files changed, 133 insertions(+), 49 deletions(-)

diff --git a/games/criticalmass/Makefile b/games/criticalmass/Makefile
index 1dbe3de..a3f157b 100644
--- a/games/criticalmass/Makefile
+++ b/games/criticalmass/Makefile
@@ -2,8 +2,7 @@
# $FreeBSD$

PORTNAME= criticalmass
-PORTVERSION= 1.0.0
-PORTREVISION= 11
+PORTVERSION= 1.0.2
PORTEPOCH= 1
CATEGORIES= games
MASTER_SITES= SF/${PORTNAME}/Critical%20Mass/${PORTVERSION}
@@ -12,36 +11,52 @@ DISTNAME= CriticalMass-${PORTVERSION}
MAINTAINER= ports-***@public.gmane.org
COMMENT= SDL/OpenGL space shoot'em up game

-LIB_DEPENDS= libpng15.so:${PORTSDIR}/graphics/png
+LICENSE= GPLv2 # (or later)
+LICENSE_FILE= ${WRKSRC}/COPYING

-CONFLICTS= shaaft-[0-9]*
+LIB_DEPENDS= libcurl.so:${PORTSDIR}/ftp/curl \
+ libpng15.so:${PORTSDIR}/graphics/png

-USES= tar:bzip2
-USE_SDL= image mixer sdl
-USE_GL= gl
+USES= dos2unix tar:bzip2
+DOS2UNIX_FILES= tinyxml/*.cpp tinyxml/*.h
USE_XORG= x11
+USE_GL= gl
+USE_SDL= image mixer sdl
+USE_GCC= any
GNU_CONFIGURE= yes
-CFLAGS= -I${LOCALBASE}/include/libpng15
CONFIGURE_ARGS= --disable-optimize

-MAN6= critter.6
+CPPFLAGS+= $$(libpng-config --I_opts) $$(curl-config --cflags) \
+ -I${LOCALBASE}/include
+LDFLAGS+= $$(libpng-config --L_opts) $$(curl-config --libs) \
+ -L${LOCALBASE}/lib
+
+CONFLICTS= shaaft-[0-9]*
+
PLIST_FILES= bin/Packer \
bin/critter \
+ man/man6/critter.6.gz \
share/Critical_Mass/lg-criti.xm \
share/Critical_Mass/resource.dat
PLIST_DIRS= share/Critical_Mass

-NO_STAGE= yes
-.include <bsd.port.pre.mk>
+DESKTOP_ENTRIES="CriticallMass" "" "" "critter" "" ""

post-patch:
@${GREP} -lR "SDL/SDL" ${WRKSRC} | ${XARGS} ${REINPLACE_CMD} -e \
's|SDL/SDL|SDL|g'
- @${REINPLACE_CMD} -e 's|sdl-config|${SDL_CONFIG:T}|g ; \
- s|^CXXFLAGS|#CXXFLAGS|g ; \
- s|/usr/X11R6|${LOCALBASE}|g ; \
- s|-lSDL | |g ; \
- s|-lpng12|-lpng|g' ${WRKSRC}/configure
+ @${REINPLACE_CMD} -e \
+ 's| curl|| ; \
+ s|^CXXFLAGS|#CXXFLAGS| ; \
+ s|-lSDL | | ; \
+ s|sdl-config|${SDL_CONFIG:T}| ; \
+ s|-L/usr/local/lib -L/usr/X11R6/lib|| ; \
+ s|-I/usr/X11R6/include|| ; \
+ s|-lpng12|-lpng|' ${WRKSRC}/configure
+ @${REINPLACE_CMD} -e \
+ '/^SUBDIRS/s| curl||' ${WRKSRC}/Makefile.in
+ @${REINPLACE_CMD} -e \
+ 's|../curl/lib/libcurl.a||' ${WRKSRC}/game/Makefile.in
@${REINPLACE_CMD} -e 's|and def|\&\& def|g' ${WRKSRC}/utils/OSName.hpp

-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/games/criticalmass/distinfo b/games/criticalmass/distinfo
index 869b367..ffdbc54 100644
--- a/games/criticalmass/distinfo
+++ b/games/criticalmass/distinfo
@@ -1,2 +1,2 @@
-SHA256 (CriticalMass-1.0.0.tar.bz2) = 94cedac39f9279faa63f6ce4098f2a778a8c8f9013ba8dd7d5b85766739e0858
-SIZE (CriticalMass-1.0.0.tar.bz2) = 5092549
+SHA256 (CriticalMass-1.0.2.tar.bz2) = 846db2d30d39e559612328594084a7aef980169948b2cfaee9fddec8ffdef724
+SIZE (CriticalMass-1.0.2.tar.bz2) = 5122126
diff --git a/games/criticalmass/files/patch-tinyxml__tinyxml.cpp b/games/criticalmass/files/patch-tinyxml__tinyxml.cpp
new file mode 100644
index 0000000..312d685
--- /dev/null
+++ b/games/criticalmass/files/patch-tinyxml__tinyxml.cpp
@@ -0,0 +1,21 @@
+--- tinyxml/tinyxml.cpp.orig
++++ tinyxml/tinyxml.cpp
+@@ -22,6 +22,9 @@
+ */
+
+ #include "tinyxml.h"
++#include <cstdlib>
++#include <cstring>
++#include <climits>
+
+
+ TiXmlNode::TiXmlNode( NodeType _type )
+@@ -377,7 +380,7 @@
+ {
+ const std::string* s = Attribute( name );
+ if ( s )
+- *i = atoi( s->c_str() );
++ *i = ( int )strtol( s->c_str(), ( char ** )NULL, 10 );
+ else
+ *i = 0;
+ return s;
diff --git a/games/criticalmass/files/patch-tinyxml__tinyxmlparser.cpp b/games/criticalmass/files/patch-tinyxml__tinyxmlparser.cpp
new file mode 100644
index 0000000..754eadf
--- /dev/null
+++ b/games/criticalmass/files/patch-tinyxml__tinyxmlparser.cpp
@@ -0,0 +1,12 @@
+--- tinyxml/tinyxmlparser.cpp.orig
++++ tinyxml/tinyxmlparser.cpp
+@@ -23,7 +23,8 @@
+
+
+ #include "tinyxml.h"
+-#include <ctype.h>
++#include <cctype>
++#include <cstring>
+
+ const char* TiXmlBase::SkipWhiteSpace( const char* p )
+ {
diff --git a/games/criticalmass/files/patch-utils_WalkDirectory.hpp b/games/criticalmass/files/patch-utils_WalkDirectory.hpp
deleted file mode 100644
index 679cdfa..0000000
--- a/games/criticalmass/files/patch-utils_WalkDirectory.hpp
+++ /dev/null
@@ -1,10 +0,0 @@
---- utils/WalkDirectory.hpp.orig Sun Dec 19 15:18:06 2004
-+++ utils/WalkDirectory.hpp Sun Mar 6 08:49:51 2005
-@@ -16,6 +16,7 @@
- #define _WalkDirectory_hpp_
-
- #include <iostream>
-+#include <string>
- using namespace std;
-
- #ifdef VCPP
diff --git a/games/criticalmass/files/patch-utils__ResourceManager.cpp b/games/criticalmass/files/patch-utils__ResourceManager.cpp
new file mode 100644
index 0000000..9d5978b
--- /dev/null
+++ b/games/criticalmass/files/patch-utils__ResourceManager.cpp
@@ -0,0 +1,10 @@
+--- utils/ResourceManager.cpp.orig
++++ utils/ResourceManager.cpp
+@@ -12,6 +12,7 @@
+ // ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ // FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details
+ //
++#include <cstring>
+ #include <iomanip>
+ #include <sys/types.h>
+ #include <sys/stat.h>
diff --git a/games/criticalmass/files/patch-utils__Value.hpp b/games/criticalmass/files/patch-utils__Value.hpp
new file mode 100644
index 0000000..0066c6b
--- /dev/null
+++ b/games/criticalmass/files/patch-utils__Value.hpp
@@ -0,0 +1,23 @@
+--- utils/Value.hpp.orig
... 115 lines suppressed ...
d***@public.gmane.org
2014-08-24 00:14:22 UTC
Permalink
branch: masters/2014q2
Repository: freenas/ports
Pushed by: git
Pushed to: branch masters/2014q2
commit c12107e60eb40e5620695a64a349dc3fbdfe94c1
Author: wg <wg-***@public.gmane.org>
Date: Fri Aug 22 16:55:01 2014 +0000

net-mgmt/pandorafms_server: fix startup script

PR: 192915
Submitted by: maintainer
---
net-mgmt/pandorafms_server/Makefile | 2 +
net-mgmt/pandorafms_server/files/patch-update | 65 +++++++++++++--------------
2 files changed, 34 insertions(+), 33 deletions(-)

diff --git a/net-mgmt/pandorafms_server/Makefile b/net-mgmt/pandorafms_server/Makefile
index fa9d6f4..77f82ff 100644
--- a/net-mgmt/pandorafms_server/Makefile
+++ b/net-mgmt/pandorafms_server/Makefile
@@ -2,6 +2,8 @@
# $FreeBSD$

PORTNAME= pandora_server
+PORTREVISION= 1
+
CATEGORIES= net-mgmt

MAINTAINER= koichiro-/***@public.gmane.org
diff --git a/net-mgmt/pandorafms_server/files/patch-update b/net-mgmt/pandorafms_server/files/patch-update
index 79510c7..13de3c1 100644
--- a/net-mgmt/pandorafms_server/files/patch-update
+++ b/net-mgmt/pandorafms_server/files/patch-update
@@ -4370,7 +4370,7 @@ Index: FreeBSD/pandora_server
#
# **********************************************************************

-@@ -10,27 +11,66 @@
+@@ -10,27 +11,65 @@
# REQUIRE: LOGIN mysql
# KEYWORD: shutdown

@@ -4392,25 +4392,19 @@ Index: FreeBSD/pandora_server

-# read configuration and set defaults
-pandora_server_enable=${pandora_server_enable:-"NO"}
--load_rc_config $name
+: ${pandora_server_enable:=NO}
+: ${pandora_server_configfile:=/usr/local/etc/pandora/pandora_server.conf}
-
--PATH=/bin:/usr/bin:/sbin:/usr/sbin:/usr/local/bin
--
--pidfile=/var/run/$name.pid
- command=/usr/local/bin/${name}
--command_args="-D -P ${pidfile} /usr/local/etc/pandora/pandora_server.conf"
--required_files="/usr/local/etc/pandora/pandora_server.conf"
++
++command=/usr/local/bin/${name}
+command_args="-D"
+command_interpreter=/usr/local/bin/perl
+_pidprefix=/var/run/$name
+pidfile=${_pidprefix}.pid
+required_files="$pandora_server_configfile"
++
+ load_rc_config $name

--procname="/usr/local/bin/perl"
-+load_rc_config $name
-
+-PATH=/bin:/usr/bin:/sbin:/usr/sbin:/usr/local/bin
+if [ "$2" ]; then
+ profile="$2"
+ if [ "$pandora_server_profiles" ]; then
@@ -4424,31 +4418,36 @@ Index: FreeBSD/pandora_server
+ eval pandora_server_enable="\${pandora_server_${profile}_enable:-$pandora_server_enable}"
+ eval pandora_server_flags="\${pandora_server_${profile}_flags:-$pandora_server_flags}"
+ eval pidfile="\${pandora_server_${profile}_pidfile:-$pidfile}"
-+ pandora_server_flags="$pandora_server_flags -P $pidfile $pandora_server_configfile"
+ else
+ echo "$0: extra argument ignored"
+ fi
-+else
-+ if [ "${pandora_server_profiles}" ] && [ "$1" ]; then
-+ for profile in ${pandora_server_profiles}; do
-+ eval _enable="\${pandora_server_${profile}_enable}"
-+ case "${_enable:-${pandora_server_enable}}" in
-+ [Yy][Ee][Ss]);;
-+ *) continue;;
-+ esac
-+ echo "===> pandora_server profile: ${profile}"
-+ /usr/local/etc/rc.d/pandora_server $1 ${profile}
-+ retcode="$?"
-+ if [ "0${retcode}" -ne 0 ]; then
-+ failed="${profile} (${retcode}) ${failed:-}"
-+ else
-+ success="${profile} ${success:-}"
-+ fi
-+ done
-+ exit 0
-+ fi
++elif [ "${pandora_server_profiles}" ] && [ "$1" ]; then
++ for profile in ${pandora_server_profiles}; do
++ eval _enable="\${pandora_server_${profile}_enable}"
++ case "${_enable:-${pandora_server_enable}}" in
++ [Yy][Ee][Ss]);;
++ *) continue;;
++ esac
++ echo "===> pandora_server profile: ${profile}"
++ /usr/local/etc/rc.d/pandora_server $1 ${profile}
++ retcode="$?"
++ if [ "0${retcode}" -ne 0 ]; then
++ failed="${profile} (${retcode}) ${failed:-}"
++ else
++ success="${profile} ${success:-}"
++ fi
++ done
++ exit 0
+fi
-+
+
+-pidfile=/var/run/$name.pid
+-command=/usr/local/bin/${name}
+-command_args="-D -P ${pidfile} /usr/local/etc/pandora/pandora_server.conf"
+-required_files="/usr/local/etc/pandora/pandora_server.conf"
++pandora_server_flags="$pandora_server_flags -P $pidfile $pandora_server_configfile"
+
+-procname="/usr/local/bin/perl"
+-
run_rc_command "$1"
Index: FreeBSD/pandora_server.conf
===================================================================
d***@public.gmane.org
2014-08-24 00:14:22 UTC
Permalink
branch: masters/2014q2
Repository: freenas/ports
Pushed by: git
Pushed to: branch masters/2014q2
commit c732177285fb1054c51706d01e6ea3d170bc1da1
Author: wg <wg-***@public.gmane.org>
Date: Fri Aug 22 16:56:36 2014 +0000

games/wtf: update to 20140820

PR: 192887
Submitted by: maintainer
---
games/wtf/Makefile | 2 +-
games/wtf/distinfo | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/games/wtf/Makefile b/games/wtf/Makefile
index a716e85..800eebc 100644
--- a/games/wtf/Makefile
+++ b/games/wtf/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$

PORTNAME= wtf
-PORTVERSION= 20140614
+PORTVERSION= 20140820
CATEGORIES= games
MASTER_SITES= SF/bsdwtf

diff --git a/games/wtf/distinfo b/games/wtf/distinfo
index d7e11bc..5253908 100644
--- a/games/wtf/distinfo
+++ b/games/wtf/distinfo
@@ -1,2 +1,2 @@
-SHA256 (wtf-20140614.tar.gz) = db77077737ac2eb4b6eb00bbf023928f7fe14ef8313ae4dffa78588af54511a5
-SIZE (wtf-20140614.tar.gz) = 23112
+SHA256 (wtf-20140820.tar.gz) = a610cbc56987e5d820ff0664413a34c95707183e912f0270991eb2dd2b4882d8
+SIZE (wtf-20140820.tar.gz) = 23128
d***@public.gmane.org
2014-08-24 00:14:22 UTC
Permalink
branch: masters/2014q2
Repository: freenas/ports
Pushed by: git
Pushed to: branch masters/2014q2
commit 033a59b136a4b9306e4b7aed58990b4004389b60
Author: danfe <danfe-***@public.gmane.org>
Date: Fri Aug 22 17:10:20 2014 +0000

- Optionize for Graphviz and LaTeX (enabled by default, so hopefully the
rest of the ports tree that uses Doxygen for their documentation aren't
adversely affected)
- Use new OPTIONS framework helpers
- PDFDOCS relies on both the LATEX and HTMLDOCS options to be enabled
- Remove a couple patches that believed to have no effect on PDFDOCS build
because it should've been setting HAVE_LATEX in MAKE_ARGS instead of
HAVE_PDFDOCS (which was done by a previous commit that submitter was
unaware of back when it happened, but never should've happened to begin
with)
- While here: sort USES, remove MAKE_JOBS_UNSAFE [*], and cleanup Makefile,
use correct spelling of PostScript and PDF in port description text

[*] Except cleaning targets, use more robust make(1) syntax of -C, albeit
I did not find evidence that cd ... ; $(MAKE) syntax was causing build
failures with -jX. Still, -C is better and safer in general.

PR: 192732
Submitted by: maintainer
Reviewed by: marino
---
devel/doxygen/Makefile | 81 ++++++++++++++++-------------------
devel/doxygen/files/patch-Makefile.in | 40 ++++++++++++++---
devel/doxygen/files/patch-latex | 30 -------------
devel/doxygen/files/patch-refman | 42 ------------------
devel/doxygen/pkg-descr | 2 +-
5 files changed, 72 insertions(+), 123 deletions(-)

diff --git a/devel/doxygen/Makefile b/devel/doxygen/Makefile
index 9f7db75..860921c 100644
--- a/devel/doxygen/Makefile
+++ b/devel/doxygen/Makefile
@@ -3,6 +3,7 @@

PORTNAME= doxygen
PORTVERSION= 1.8.7
+PORTREVISION= 1
PORTEPOCH= 1
CATEGORIES= devel
MASTER_SITES= ftp://ftp.stack.nl/pub/users/dimitri/ \
@@ -16,25 +17,18 @@ LICENSE= GPLv2
LICENSE_FILE= ${WRKSRC}/LICENSE

BUILD_DEPENDS= tmake:${PORTSDIR}/devel/tmake \
- flex>0:${PORTSDIR}/textproc/flex \
- python:${PORTSDIR}/lang/python \
- dvips:${PORTSDIR}/print/tex-dvipsk \
- ${LOCALBASE}/share/fonts/cm-super/README:${PORTSDIR}/print/cm-super
-
+ ${LOCALBASE}/bin/flex:${PORTSDIR}/textproc/flex
LIB_DEPENDS= libpng15.so:${PORTSDIR}/graphics/png

-USES= bison iconv perl5 gmake
-USE_PYTHON= 2
-ALL_TARGET= all
+USES= bison gmake iconv perl5 python:2
HAS_CONFIGURE= yes
-MAKE_JOBS_UNSAFE= yes
QT_NONSTANDARD= yes # non-standard configure arguments
CONFIGURE_ARGS= --prefix ${PREFIX} --perl ${PERL} --make ${MAKE_CMD} \
--install "${INSTALL}" --flex ${LOCALBASE}/bin/flex
REINPLACE_ARGS= -i ''

-EXTRACT_AFTER_ARGS= --exclude '*/libmd5' \
- --exclude '*/libpng' \
+EXTRACT_AFTER_ARGS= --exclude '*/libmd5' \
+ --exclude '*/libpng' \
--exclude '*/tmake'

PLIST= ${WRKDIR}/plist
@@ -42,45 +36,47 @@ TMPDOCDEST= ${WRKDIR}/tmpdocdest

PLIST_FILES= bin/doxygen

-OPTIONS_DEFINE= HTMLDOCS QT4 PDFDOCS
+OPTIONS_DEFINE= GRAPHVIZ LATEX QT4 HTMLDOCS PDFDOCS
+OPTIONS_DEFAULT= GRAPHVIZ LATEX
QT4_DESC= Install Doxywizard GUI
HTMLDOCS_DESC= Install documentation in HTML format
PDFDOCS_DESC= Install documentation in PDF format

+GRAPHVIZ_RUN_DEPENDS= dot:${PORTSDIR}/graphics/graphviz
+
+LATEX_USE= TEX=full
+
+QT4_USE= QT4=corelib,gui,xml,qmake_build,moc_build,rcc_build
+QT4_CONFIGURE_ENV= QTDIR="${QTDIR}"
+QT4_CONFIGURE_ON= --with-doxywizard
+QT4_PLIST_FILES= bin/doxywizard
+
+HTMLDOCS_ALL_TARGET= docs
+HTMLDOCS_BUILD_DEPENDS= dot:${PORTSDIR}/graphics/graphviz
+
+PDFDOCS_ALL_TARGET= pdf
+PDFDOCS_MAKE_ARGS= HAVE_LATEX=yes
+
.include <bsd.port.options.mk>

-.if ${PORT_OPTIONS:MHTMLDOCS}
-ALL_TARGET+= docs
-BUILD_DEPENDS+= dot:${PORTSDIR}/graphics/graphviz
+.if ${PORT_OPTIONS:MPDFDOCS} && \
+ (empty(PORT_OPTIONS:MHTMLDOCS) || empty(PORT_OPTIONS:MLATEX))
+IGNORE= PDFDOCS option requires HTMLDOCS and LATEX options to be set
+.endif

.if ${PORT_OPTIONS:MPDFDOCS}
-ALL_TARGET+= pdf
-USE_TEX= latex:build
USE_GHOSTSCRIPT_BUILD= yes
-MAKE_ARGS+= HAVE_PDFDOCS=yes
-.endif # PDFDOCS
-.endif # HTMLDOCS
+.endif

.if ${PORT_OPTIONS:MQT4}
-USE_QT4= corelib gui xml qmake_build moc_build rcc_build
-
-# Need this in env for build
+# Need this in env for the build
QTDIR?= ${QT_PREFIX}
-CONFIGURE_ENV= QTDIR="${QTDIR}"
-CONFIGURE_ARGS+=--with-doxywizard
-.endif # QT4
-
-.if ${MACHINE_ARCH:tl} == alpha
-CONFIGURE_ARGS+= --enable-langs no
.endif

-.if ${PORT_OPTIONS:MQT4}
-PLIST_FILES+= bin/doxywizard
-.endif # QT4
-
pre-configure:
- @cd ${WRKSRC};for pro in src/*.pro.in addon/doxywizard/doxywizard.pro.in;do \
- ${ECHO} "unix:LIBS += ${ICONV_LIB}" >> $$pro; done
+ @cd ${WRKSRC}; for pro in src/*.pro.in \
+ addon/doxywizard/doxywizard.pro.in; do \
+ ${ECHO} "unix:LIBS += ${ICONV_LIB}" >> $$pro; done
@${CHMOD} +x ${WRKSRC}/configure

post-configure:
@@ -90,8 +86,7 @@ post-configure:
${WRKSRC}/addon/doxywizard/Makefile

post-build:
- cd ${BUILD_WRKSRC}/examples; \
- ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_FLAGS} Makefile ${MAKE_ARGS} all
+ ${DO_MAKE_BUILD} -C ${BUILD_WRKSRC}/examples all

pre-install:
${RM} -rf ${TMPDOCDEST} ${PLIST}
@@ -109,23 +104,23 @@ pre-install:
${INSTALL_DATA} ${WRKSRC}/latex/doxygen_manual.pdf \
${WRKSRC}/latex/archoverview.eps \
${TMPDOCDEST}/doxygen
-.endif # PDFDOCS
+.endif
@cd ${TMPDOCDEST} \
&& ${FIND} -s * -type f -o -type l \
| ${SED} -e 's|^|share/doc/|' >> ${PLIST} \
&& ${FIND} -d * -type d \
| ${SED} -e 's|^|@dirrm share/doc/|' >> ${PLIST}
-.endif # HTMLDOCS
+.endif

do-install:
- ${INSTALL_PROGRAM} ${WRKSRC}/bin/doxygen ${STAGEDIR}${PREFIX}/bin/
+ ${INSTALL_PROGRAM} ${WRKSRC}/bin/doxygen ${STAGEDIR}${PREFIX}/bin
.if ${PORT_OPTIONS:MQT4}
- ${INSTALL_PROGRAM} ${WRKSRC}/bin/doxywizard ${STAGEDIR}${PREFIX}/bin/
-.endif # QT4
+ ${INSTALL_PROGRAM} ${WRKSRC}/bin/doxywizard ${STAGEDIR}${PREFIX}/bin
+.endif
.if ${PORT_OPTIONS:MHTMLDOCS}
${MKDIR} ${STAGEDIR}${PREFIX}/share/doc/doxygen
${TAR} -C ${TMPDOCDEST} -cf - doxygen \
| ${TAR} -C ${STAGEDIR}${PREFIX}/share/doc --unlink -xf -
-.endif # HTMLDOCS
+.endif

.include <bsd.port.mk>
diff --git a/devel/doxygen/files/patch-Makefile.in b/devel/doxygen/files/patch-Makefile.in
index 7eb9850..e9404e7 100644
--- a/devel/doxygen/files/patch-Makefile.in
+++ b/devel/doxygen/files/patch-Makefile.in
@@ -1,7 +1,27 @@
--- Makefile.in-orig 2014-06-14 08:30:10.000000000 +0200
+++ Makefile.in 2014-06-14 08:31:21.000000000 +0200
-@@ -16,11 +16,10 @@
- cd addon/doxyapp ; $(MAKE) clean
+@@ -2,25 +2,24 @@
+ DESTDIR =
+
+ doxywizard:
+- cd addon/doxywizard ; $(MAKE)
... 157 lines suppressed ...
d***@public.gmane.org
2014-08-24 00:14:22 UTC
Permalink
branch: masters/2014q2
Repository: freenas/ports
Pushed by: git
Pushed to: branch masters/2014q2
commit 6b4f66b8f6b863959f8e76b0244831edf2225230
Author: wg <wg-***@public.gmane.org>
Date: Fri Aug 22 17:05:46 2014 +0000

deskutils/fet: update to 5.23.2

PR: 192882
Submitted by: maintainer
---
deskutils/fet/Makefile | 2 +-
deskutils/fet/distinfo | 4 +-
deskutils/fet/files/patch-mutex | 337 ----------------------------------------
3 files changed, 3 insertions(+), 340 deletions(-)

diff --git a/deskutils/fet/Makefile b/deskutils/fet/Makefile
index 5bcc087..ddac871 100644
--- a/deskutils/fet/Makefile
+++ b/deskutils/fet/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$

PORTNAME= fet
-PORTVERSION= 5.23.1
+PORTVERSION= 5.23.2
CATEGORIES= deskutils kde
MASTER_SITES= http://lalescu.ro/liviu/fet/download/ \
http://lalescu.ro/liviu/fet/download/old/ \
diff --git a/deskutils/fet/distinfo b/deskutils/fet/distinfo
index d405edb..87574a2 100644
--- a/deskutils/fet/distinfo
+++ b/deskutils/fet/distinfo
@@ -1,2 +1,2 @@
-SHA256 (fet-5.23.1.tar.bz2) = 7952a98b1a79f22ad169553f0ec45109af8aa785bb026385c826f61920c4aaac
-SIZE (fet-5.23.1.tar.bz2) = 8463474
+SHA256 (fet-5.23.2.tar.bz2) = edbb9671e2f6d1c0028beafc968b428d7bf603955bd9d28087b84ceead16d6d7
+SIZE (fet-5.23.2.tar.bz2) = 8467459
diff --git a/deskutils/fet/files/patch-mutex b/deskutils/fet/files/patch-mutex
deleted file mode 100644
index 5ae9481..0000000
--- a/deskutils/fet/files/patch-mutex
+++ /dev/null
@@ -1,337 +0,0 @@
---- src/engine/generate.cpp.orig 2014-03-02 16:22:17.052250281 +0100
-+++ src/engine/generate.cpp 2014-03-02 16:16:52.423231858 +0100
-@@ -50,7 +50,7 @@
-
- #include <QSemaphore>
-
--extern QMutex mutex; //timetablegenerateform.cpp
-+extern QMutex fet_mutex; //timetablegenerateform.cpp
-
- #ifndef FET_COMMAND_LINE
- extern QSemaphore semaphorePlacedActivity;
-@@ -2596,7 +2596,7 @@
- }
-
- if(threaded){
-- mutex.lock();
-+ fet_mutex.lock();
- }
- c.makeUnallocated(gt.rules);
-
-@@ -2612,7 +2612,7 @@
- maxActivitiesPlaced=0;
-
- if(threaded){
-- mutex.unlock();
-+ fet_mutex.unlock();
- }
-
- triedRemovals.resize(gt.rules.nInternalActivities, gt.rules.nHoursPerWeek);
-@@ -2645,13 +2645,13 @@
- time(&starting_time);
-
- if(threaded){
-- mutex.lock();
-+ fet_mutex.lock();
- }
- timeToHighestStage=0;
- searchTime=0;
- generationStartDateTime=QDateTime::currentDateTime();
- if(threaded){
-- mutex.unlock();
-+ fet_mutex.unlock();
- }
-
- //2000 was before
-@@ -2666,11 +2666,11 @@
- prevvalue:
-
- if(threaded){
-- mutex.lock();
-+ fet_mutex.lock();
- }
- if(abortOptimization){
- if(threaded){
-- mutex.unlock();
-+ fet_mutex.unlock();
- }
- return;
- }
-@@ -2680,7 +2680,7 @@
-
- if(searchTime>=maxSeconds){
- if(threaded){
-- mutex.unlock();
-+ fet_mutex.unlock();
- }
-
- timeExceeded=true;
-@@ -2945,7 +2945,7 @@
- if(!foundGoodSwap){
- if(impossibleActivity){
- if(threaded){
-- mutex.unlock();
-+ fet_mutex.unlock();
- }
- nDifficultActivities=1;
- difficultActivities[0]=permutation[added_act];
-@@ -3075,7 +3075,7 @@
-
- added_act=q+1;
- if(threaded){
-- mutex.unlock();
-+ fet_mutex.unlock();
- }
-
- //if(semaphorePlacedActivity){
-@@ -3119,18 +3119,18 @@
- }
-
- if(threaded){
-- mutex.unlock();
-+ fet_mutex.unlock();
- }
- emit(activityPlaced(added_act+1));
- if(threaded){
- semaphorePlacedActivity.acquire();
- }
- if(threaded){
-- mutex.lock();
-+ fet_mutex.lock();
- }
- if(added_act==gt.rules.nInternalActivities && foundGoodSwap){
- if(threaded){
-- mutex.unlock();
-+ fet_mutex.unlock();
- }
- break;
- }
-@@ -3150,7 +3150,7 @@
- }
-
- if(threaded){
-- mutex.unlock();
-+ fet_mutex.unlock();
- }
- }
-
-@@ -9111,8 +9111,8 @@
- if(level==0 && (nConflActivities[perm[0]]==MAX_ACTIVITIES)){
- //to check if generation was stopped
- if(this->isThreaded){
-- mutex.unlock();
-- mutex.lock();
-+ fet_mutex.unlock();
-+ fet_mutex.lock();
- }
- if(!abortOptimization && activity_count_impossible_tries<MAX_RETRIES_FOR_AN_ACTIVITY_AT_LEVEL_0){
- activity_count_impossible_tries++;
---- src/interface/fet.cpp.orig 2014-03-02 16:22:44.447319626 +0100
-+++ src/interface/fet.cpp 2014-03-02 16:18:50.547263613 +0100
-@@ -102,9 +102,9 @@
- extern bool students_schedule_ready, teachers_schedule_ready, rooms_schedule_ready;
-
- #ifndef FET_COMMAND_LINE
--extern QMutex mutex;
-+extern QMutex fet_mutex;
- #else
--QMutex mutex;
-+QMutex fet_mutex;
- #endif
-
- void writeDefaultSimulationParameters();
---- src/interface/timetablegenerateform.cpp.orig 2014-03-02 16:23:08.548355931 +0100
-+++ src/interface/timetablegenerateform.cpp 2014-03-02 16:19:40.633349485 +0100
-@@ -38,7 +38,7 @@
-
- #include "longtextmessagebox.h"
-
--QMutex mutex;
-+QMutex fet_mutex;
-
- static GenerateThread generateThread;
-
-@@ -189,11 +189,11 @@
-
- simulation_running=false;
-
-- mutex.lock();
... 179 lines suppressed ...
d***@public.gmane.org
2014-08-24 00:14:22 UTC
Permalink
branch: masters/2014q2
Repository: freenas/ports
Pushed by: git
Pushed to: branch masters/2014q2
commit b470d71fa74ef8fc6f8ef0a079c520755d114447
Author: swills <swills-***@public.gmane.org>
Date: Fri Aug 22 17:34:51 2014 +0000

japanese/ruby-mecab: fix LICENSE, strip shared library

PR: 191310
Submitted by: Yasuhiro KIMURA <yasu-***@public.gmane.org>
---
japanese/ruby-mecab/Makefile | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/japanese/ruby-mecab/Makefile b/japanese/ruby-mecab/Makefile
index 1dcde12..906e992 100644
--- a/japanese/ruby-mecab/Makefile
+++ b/japanese/ruby-mecab/Makefile
@@ -3,6 +3,7 @@

PORTNAME= mecab
PORTVERSION= 0.996
+PORTREVISION= 1
CATEGORIES= japanese textproc ruby
MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE}
DISTNAME= ${PORTNAME}-ruby-${PORTVERSION}
@@ -10,7 +11,7 @@ DISTNAME= ${PORTNAME}-ruby-${PORTVERSION}
MAINTAINER= ruby-***@public.gmane.org
COMMENT= MeCab library module for Ruby

-LICENSE= BSD GPLv2 LGPL21
+LICENSE= BSD3CLAUSE GPLv2 LGPL21
LICENSE_COMB= dual

LIB_DEPENDS= libmecab.so:${PORTSDIR}/japanese/mecab
@@ -28,6 +29,7 @@ OPTIONSFILE= ${PORT_DBDIR}/ja-ruby-${PORTNAME}/options
PKGNAMEPREFIX:= ${PKGNAMEPREFIX}${RUBY_PKGNAMEPREFIX}

post-install:
+ ${STRIP_CMD} ${STAGEDIR}${RUBY_SITEARCHLIBDIR}/MeCab.so
@${MKDIR} ${STAGEDIR}${RUBY_MODDOCDIR}
${INSTALL_DATA} ${WRKSRC}/bindings.html ${STAGEDIR}${RUBY_MODDOCDIR}/
@${MKDIR} ${STAGEDIR}${RUBY_MODEXAMPLESDIR}
d***@public.gmane.org
2014-08-24 00:14:22 UTC
Permalink
branch: masters/2014q2
Repository: freenas/ports
Pushed by: git
Pushed to: branch masters/2014q2
commit 69126eba623f2b79af88eab793514f8b5d247177
Author: tijl <tijl-***@public.gmane.org>
Date: Fri Aug 22 17:36:50 2014 +0000

Convert to USES=libtool and add INSTALL_TARGET=install-strip
---
graphics/sswf/Makefile | 9 +++++----
graphics/sswf/pkg-plist | 15 +++++----------
2 files changed, 10 insertions(+), 14 deletions(-)

diff --git a/graphics/sswf/Makefile b/graphics/sswf/Makefile
index b3f6103..347d7e8 100644
--- a/graphics/sswf/Makefile
+++ b/graphics/sswf/Makefile
@@ -3,7 +3,7 @@

PORTNAME= sswf
PORTVERSION= 1.8.4
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= graphics
MASTER_SITES= SF
DISTNAME= ${PORTNAME}-${PORTVERSION}-src
@@ -16,15 +16,16 @@ LIB_DEPENDS= libjpeg.so:${PORTSDIR}/graphics/jpeg \

WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}

-USES= bison pkgconfig iconv
-USE_AUTOTOOLS= libtool
+USES= bison iconv libtool pkgconfig
+GNU_CONFIGURE= yes
CONFIGURE_ARGS= --with-pkgconfigdir=${PREFIX}/libdata/pkgconfig
+INSTALL_TARGET= install-strip
USE_LDCONFIG= yes

PLIST_SUB= VERSION="${PORTVERSION}"

CPPFLAGS+= -I${LOCALBASE}/include
-LDFLAGS+= -L${LOCALBASE}/lib
+LIBS+= -L${LOCALBASE}/lib

OPTIONS_DEFINE= DEBUG

diff --git a/graphics/sswf/pkg-plist b/graphics/sswf/pkg-plist
index 10bb483..1bfac06 100644
--- a/graphics/sswf/pkg-plist
+++ b/graphics/sswf/pkg-plist
@@ -9,30 +9,25 @@ include/sswf/libsswf.h
include/sswf/libsswf_as.h
include/sswf/libsswf_asas.h
include/sswf/libsswf_c.h
-lib/libsswf-%%VERSION%%.so
lib/libsswf-%%VERSION%%.so.3
+lib/libsswf-%%VERSION%%.so.3.0.0
lib/libsswf.a
-lib/libsswf.la
lib/libsswf.so
-lib/libsswf_as-%%VERSION%%.so
lib/libsswf_as-%%VERSION%%.so.2
+lib/libsswf_as-%%VERSION%%.so.2.0.0
lib/libsswf_as.a
-lib/libsswf_as.la
lib/libsswf_as.so
-lib/libsswf_asas-%%VERSION%%.so
lib/libsswf_asas-%%VERSION%%.so.2
+lib/libsswf_asas-%%VERSION%%.so.2.0.0
lib/libsswf_asas.a
-lib/libsswf_asas.la
lib/libsswf_asas.so
-lib/libsswf_asc-%%VERSION%%.so
lib/libsswf_asc-%%VERSION%%.so.1
+lib/libsswf_asc-%%VERSION%%.so.1.0.0
lib/libsswf_asc.a
-lib/libsswf_asc.la
lib/libsswf_asc.so
-lib/libsswf_c-%%VERSION%%.so
lib/libsswf_c-%%VERSION%%.so.2
+lib/libsswf_c-%%VERSION%%.so.2.0.0
lib/libsswf_c.a
-lib/libsswf_c.la
lib/libsswf_c.so
libdata/pkgconfig/libsswf.pc
libdata/pkgconfig/libsswf_as.pc
d***@public.gmane.org
2014-08-24 00:14:22 UTC
Permalink
branch: masters/2014q2
Repository: freenas/ports
Pushed by: git
Pushed to: branch masters/2014q2
commit 3ca7940f243202914f2db62d7d93ced1e7fa3f2e
Author: tijl <tijl-***@public.gmane.org>
Date: Fri Aug 22 17:37:28 2014 +0000

Add USES=libtool
---
graphics/py-goocanvas/Makefile | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/graphics/py-goocanvas/Makefile b/graphics/py-goocanvas/Makefile
index 2bc4ea6..9b17e6a 100644
--- a/graphics/py-goocanvas/Makefile
+++ b/graphics/py-goocanvas/Makefile
@@ -4,7 +4,7 @@

PORTNAME= goocanvas
PORTVERSION= 0.14.1
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= graphics python
MASTER_SITES= GNOME
MASTER_SITE_SUBDIR= sources/py${PORTNAME}/${PORTVERSION:C/..$//}
@@ -16,14 +16,13 @@ COMMENT= GooCanvas python bindings

LIB_DEPENDS= libgoocanvas.so:${PORTSDIR}/graphics/goocanvas

-PLIST_FILES= %%PYTHON_SITELIBDIR%%/goocanvasmodule.la \
- %%PYTHON_SITELIBDIR%%/goocanvasmodule.so \
+PLIST_FILES= %%PYTHON_SITELIBDIR%%/goocanvasmodule.so \
libdata/pkgconfig/pygoocanvas.pc
USE_PYTHON= yes
USE_GNOME= pygtk2
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --disable-docs
-USES= gmake pathfix pkgconfig tar:bzip2
+USES= gmake libtool pathfix pkgconfig tar:bzip2
INSTALL_TARGET= install-strip

post-patch:
d***@public.gmane.org
2014-08-24 00:14:22 UTC
Permalink
branch: masters/2014q2
Repository: freenas/ports
Pushed by: git
Pushed to: branch masters/2014q2
commit 598072f6a459ec8429d768773218f17f0f9886fa
Author: amdmi3 <amdmi3-***@public.gmane.org>
Date: Fri Aug 22 18:06:48 2014 +0000

- Stagify
- Update WWW

PR: 192810
Submitted by: tkato432-/***@public.gmane.org
---
textproc/sowing/Makefile | 12 ++++++++----
textproc/sowing/pkg-descr | 2 +-
textproc/sowing/pkg-plist | 3 +++
3 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/textproc/sowing/Makefile b/textproc/sowing/Makefile
index 863008b..f68f6b9 100644
--- a/textproc/sowing/Makefile
+++ b/textproc/sowing/Makefile
@@ -13,15 +13,20 @@ COMMENT= Text processing tools to generate documentation from source files
BUILD_DEPENDS= ppmtogif:${PORTSDIR}/graphics/netpbm
RUN_DEPENDS= ppmtogif:${PORTSDIR}/graphics/netpbm

-USES= perl5 gmake
+USES= gmake perl5
USE_GHOSTSCRIPT=yes
USE_TEX= latex dvipsk
GNU_CONFIGURE= yes
-CONFIGURE_ENV= INSTALL_SCRIPT="${INSTALL_SCRIPT}"
CONFIGURE_ARGS= --datadir=${DATADIR}
ALL_TARGET= all-redirect

-MAN1= bfort.1 doctext.1 tohtml.1
+post-patch:
+ @${REINPLACE_CMD} -e \
+ 's|\([[:blank:]]\)\($$(exec_prefix)\)|\1$$(DESTDIR)\2| ; \
+ s|\([[:blank:]]\)\($$(bindir)\)|\1$$(DESTDIR)\2| ; \
+ s|\([[:blank:]]\)\($$(datadir)\)|\1$$(DESTDIR)\2| ; \
+ s|\([[:blank:]]\)\($$(man1dir)\)|\1$$(DESTDIR)\2|' \
+ ${WRKSRC}/Makefile.in

.if defined(MAINTAINER_MODE)
regression-test: install
@@ -29,5 +34,4 @@ regression-test: install
${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} testing)
.endif

-NO_STAGE= yes
.include <bsd.port.mk>
diff --git a/textproc/sowing/pkg-descr b/textproc/sowing/pkg-descr
index cf3aeb5..74e380e 100644
--- a/textproc/sowing/pkg-descr
+++ b/textproc/sowing/pkg-descr
@@ -1,4 +1,4 @@
Text processing tools developed by Bill Gropp.
It might be used to build the PETSc & MPICH documentation.

-WWW: http://www.mcs.anl.gov/petsc/petsc-2/developers/
+WWW: http://web.engr.illinois.edu/~wgropp/projects/software/sowing/
diff --git a/textproc/sowing/pkg-plist b/textproc/sowing/pkg-plist
index 061dfa3..fa0f315 100644
--- a/textproc/sowing/pkg-plist
+++ b/textproc/sowing/pkg-plist
@@ -6,6 +6,9 @@ bin/mapnames
bin/pstogif
bin/pstoxbm
bin/tohtml
+man/man1/bfort.1.gz
+man/man1/doctext.1.gz
+man/man1/tohtml.1.gz
%%DATADIR%%/basedefs.txt
%%DATADIR%%/blueball.gif
%%DATADIR%%/doctext/html.def
d***@public.gmane.org
2014-08-24 00:14:22 UTC
Permalink
branch: masters/2014q2
Repository: freenas/ports
Pushed by: git
Pushed to: branch masters/2014q2
commit 8ff1468a4709e1d0696e0e59146a05fa4750f6fc
Author: swills <swills-***@public.gmane.org>
Date: Fri Aug 22 18:31:21 2014 +0000

sysutils/rubygem-capistrano: update to 3.2.1

PR: 190035
Submitted by: Rustem Alimov <rustem.alimov-***@public.gmane.org
---
sysutils/rubygem-capistrano/Makefile | 2 +-
sysutils/rubygem-capistrano/distinfo | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/sysutils/rubygem-capistrano/Makefile b/sysutils/rubygem-capistrano/Makefile
index 63dfb1d..8c21c31 100644
--- a/sysutils/rubygem-capistrano/Makefile
+++ b/sysutils/rubygem-capistrano/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$

PORTNAME= capistrano
-PORTVERSION= 3.1.0
+PORTVERSION= 3.2.1
CATEGORIES= sysutils rubygems
MASTER_SITES= RG

diff --git a/sysutils/rubygem-capistrano/distinfo b/sysutils/rubygem-capistrano/distinfo
index 53fb175..482e848 100644
--- a/sysutils/rubygem-capistrano/distinfo
+++ b/sysutils/rubygem-capistrano/distinfo
@@ -1,2 +1,2 @@
-SHA256 (rubygem/capistrano-3.1.0.gem) = 1050effddeb41c587c0798bdbd4caaca86115d4291089b01e889a5e3fe93fdd5
-SIZE (rubygem/capistrano-3.1.0.gem) = 38400
+SHA256 (rubygem/capistrano-3.2.1.gem) = a052919883c824e566682085b5ef971b99e474583fcbd3e42d80ee25a3449d49
+SIZE (rubygem/capistrano-3.2.1.gem) = 40448
d***@public.gmane.org
2014-08-24 00:14:22 UTC
Permalink
branch: masters/2014q2
Repository: freenas/ports
Pushed by: git
Pushed to: branch masters/2014q2
commit f9acc12962d648d4db6ecbe538b17d33f995f620
Author: swills <swills-***@public.gmane.org>
Date: Fri Aug 22 18:46:57 2014 +0000

databases/rubygem-mysql2: Update to 0.3.16
---
databases/rubygem-mysql2/Makefile | 2 +-
databases/rubygem-mysql2/distinfo | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/databases/rubygem-mysql2/Makefile b/databases/rubygem-mysql2/Makefile
index b73012e..71359e4 100644
--- a/databases/rubygem-mysql2/Makefile
+++ b/databases/rubygem-mysql2/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$

PORTNAME= mysql2
-PORTVERSION= 0.3.13
+PORTVERSION= 0.3.16
CATEGORIES= databases rubygems
MASTER_SITES= RG

diff --git a/databases/rubygem-mysql2/distinfo b/databases/rubygem-mysql2/distinfo
index e03b61a..575c654 100644
--- a/databases/rubygem-mysql2/distinfo
+++ b/databases/rubygem-mysql2/distinfo
@@ -1,2 +1,2 @@
-SHA256 (rubygem/mysql2-0.3.13.gem) = 2db9bc0d2abf6b505625984300c74705cdd6a0464404095499d728cc897d307d
-SIZE (rubygem/mysql2-0.3.13.gem) = 40448
+SHA256 (rubygem/mysql2-0.3.16.gem) = 2e1c5f06fc49138f2c42248d11d86a0f369be4361b58affbc671fbbd44426f46
+SIZE (rubygem/mysql2-0.3.16.gem) = 48128
d***@public.gmane.org
2014-08-24 00:14:22 UTC
Permalink
branch: masters/2014q2
Repository: freenas/ports
Pushed by: git
Pushed to: branch masters/2014q2
commit 7f2be3d9460093d062ff79b6bbf63656905252cc
Author: madpilot <madpilot-***@public.gmane.org>
Date: Fri Aug 22 18:51:46 2014 +0000

Fix staging when port is alredy installed on system.

Reported by: Jeff Molofee <jeff.molofee at pro-westernplastics.com>
---
www/squidguard/Makefile | 2 +-
www/squidguard/files/patch-Makefile.in | 23 ++++++++++++-----------
2 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/www/squidguard/Makefile b/www/squidguard/Makefile
index ecae3a5..d404f4b 100644
--- a/www/squidguard/Makefile
+++ b/www/squidguard/Makefile
@@ -2,7 +2,7 @@

PORTNAME= squidGuard
PORTVERSION= 1.4
-PORTREVISION= 12
+PORTREVISION= 13
CATEGORIES= www
MASTER_SITES= http://www.squidguard.org/Downloads/:a \
http://www.squidguard.org/Downloads/Contrib/:b
diff --git a/www/squidguard/files/patch-Makefile.in b/www/squidguard/files/patch-Makefile.in
index b2ba416..90b88a1 100644
--- a/www/squidguard/files/patch-Makefile.in
+++ b/www/squidguard/files/patch-Makefile.in
@@ -1,5 +1,5 @@
--- Makefile.in.orig 2008-05-17 20:36:44.000000000 +0200
-+++ Makefile.in 2014-08-21 00:04:09.188333006 +0200
++++ Makefile.in 2014-08-22 19:47:56.566781181 +0200
@@ -47,48 +47,31 @@

install-conf:
@@ -9,26 +9,27 @@
- echo Created directory $(prefix)/squidGuard ; \
- chown -R $(SQUIDUSER) $(prefix)/squidGuard || exit 1 ; \
- echo Assigned $(prefix)/squidGuard to user $(SQUIDUSER) ; \
-- fi ;
++ @if [ ! -d $(DESTDIR)$(dbhomedir) ]; then \
++ $(MKINSTALLDIRS) $(DESTDIR)$(dbhomedir) ; \
++ echo Created directory $(DESTDIR)$(dbhomedir) ; \
++ echo Assigned $(DESTDIR)$(dbhomedir) to user $(SQUIDUSER) ; \
+ fi ;
- @if [ ! -d $(dbhomedir) ]; then \
- $(MKINSTALLDIRS) $(dbhomedir) ; \
- echo Created directory $(dbhomedir) ; \
- chown -R $(SQUIDUSER) $(dbhomedir) || exit 1 ; \
- echo Assigned $(dbhomedir) to user $(SQUIDUSER) ; \
-+ @if [ ! -d $(DESTDIR)$(dbhomedir) ]; then \
-+ $(MKINSTALLDIRS) $(DESTDIR)$(dbhomedir) ; \
-+ echo Created directory $(DESTDIR)$(dbhomedir) ; \
-+ echo Assigned $(DESTDIR)$(dbhomedir) to user $(SQUIDUSER) ; \
++ @if [ ! -d $(DESTDIR)$(logdir) ]; then \
++ $(MKINSTALLDIRS) $(DESTDIR)$(logdir) ; \
++ echo Created directory $(DESTDIR)$(logdir) ; \
++ echo Assigned $(DESTDIR)$(logdir) to user $(SQUIDUSER) ; \
fi ;
- @if [ ! -d $(logdir) ]; then \
+- @if [ ! -d $(logdir) ]; then \
- $(MKINSTALLDIRS) $(logdir) ; \
- echo Created directory $(logdir) ; \
- chown -R $(SQUIDUSER) $(logdir) || exit 1 ; \
- echo Assigned $(logdir) to user $(SQUIDUSER) ; \
-+ $(MKINSTALLDIRS) $(DESTDIR)$(logdir) ; \
-+ echo Created directory $(DESTDIR)$(logdir) ; \
-+ echo Assigned $(DESTDIR)$(logdir) to user $(SQUIDUSER) ; \
- fi ;
+- fi ;
- @if [ ! -d `dirname $(configfile)` ]; then \
+ @if [ ! -d `dirname $(DESTDIR)$(configfile)` ]; then \
umask 022 ; \
d***@public.gmane.org
2014-08-24 00:14:22 UTC
Permalink
branch: masters/2014q2
Repository: freenas/ports
Pushed by: git
Pushed to: branch masters/2014q2
commit b4cce60df751fc2ce2b7298b6303caa04f811ce5
Author: tijl <tijl-***@public.gmane.org>
Date: Fri Aug 22 19:08:37 2014 +0000

- graphics/ming: Add USES=libtool and bump dependent ports
- graphics/autotrace: Remove PTHREAD_CFLAGS and PTHREAD_LIBS
- graphics/pencil: Fix dependencies
---
graphics/autotrace/Makefile | 6 +++---
graphics/ming/Makefile | 7 +++----
graphics/ming/pkg-plist | 4 ++--
graphics/p5-ming/Makefile | 2 +-
graphics/pencil/Makefile | 24 ++++++++----------------
graphics/pstoedit/Makefile | 2 +-
graphics/py-ming/Makefile | 2 +-
graphics/ruby-ming/Makefile | 2 +-
graphics/zphoto/Makefile | 2 +-
math/ploticus/Makefile | 2 +-
10 files changed, 22 insertions(+), 31 deletions(-)

diff --git a/graphics/autotrace/Makefile b/graphics/autotrace/Makefile
index fb6de2c8..4c09f9a 100644
--- a/graphics/autotrace/Makefile
+++ b/graphics/autotrace/Makefile
@@ -3,7 +3,7 @@

PORTNAME= autotrace
PORTVERSION= 0.31.1
-PORTREVISION= 25
+PORTREVISION= 26
CATEGORIES= graphics
MASTER_SITES= SF/${PORTNAME}/AutoTrace/${PORTVERSION}

@@ -18,8 +18,8 @@ LIB_DEPENDS= libpng15.so:${PORTSDIR}/graphics/png
USES= pathfix pkgconfig libtool
GNU_CONFIGURE= yes
USE_LDCONFIG= yes
-CPPFLAGS+= $$(libpng-config --I_opts) ${PTHREAD_CFLAGS}
-LDFLAGS+= $$(libpng-config --L_opts) ${PTHREAD_LIBS}
+CPPFLAGS+= $$(libpng-config --I_opts)
+LDFLAGS+= $$(libpng-config --L_opts)
INSTALL_TARGET= install-strip

OPTIONS_DEFINE= IMAGEMAGICK MING PSTOEDIT
diff --git a/graphics/ming/Makefile b/graphics/ming/Makefile
index 9c37d96..9ef53b0 100644
--- a/graphics/ming/Makefile
+++ b/graphics/ming/Makefile
@@ -3,7 +3,7 @@

PORTNAME= ming
PORTVERSION= 0.4.5
-PORTREVISION?= 1
+PORTREVISION?= 2
CATEGORIES= graphics
MASTER_SITES= SF/${PORTNAME}/Releases/

@@ -25,14 +25,14 @@ LIB_DEPENDS+= libming.so:${PORTSDIR}/graphics/ming
OPTIONS_DEFINE= DOCS
.endif

-CFLAGS+= -I${LOCALBASE}/include
CONFIGURE_ARGS+=--includedir=${PREFIX}/include/ming
CPPFLAGS+= -I. -I.. -I${LOCALBASE}/include
LDFLAGS+= -L. -L.. -L${LOCALBASE}/lib
GNU_CONFIGURE= yes
+INSTALL_TARGET= install-strip
MAKE_JOBS_UNSAFE= yes
USE_LDCONFIG= yes
-USES+= bison gmake pathfix shebangfix
+USES+= bison gmake libtool pathfix shebangfix

DOCS= HISTORY NEWS README TODO
DOCS_UTIL= README TIPS TODO swftoperl.html
@@ -67,7 +67,6 @@ post-install:
${MKDIR} ${STAGEDIR}${DOCSDIR}/ ${STAGEDIR}${DOCSDIR}/util/
cd ${WRKSRC}/ && ${INSTALL_DATA} ${DOCS} ${STAGEDIR}${DOCSDIR}/
cd ${WRKSRC}/util/ && ${INSTALL_DATA} ${DOCS_UTIL} ${STAGEDIR}${DOCSDIR}/util/
- ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libming.so.5
.endif
.if defined(SLAVEPORT) && ${SLAVEPORT} == "p5"
${MKDIR} ${STAGEDIR}${EXAMPLESDIR}/
diff --git a/graphics/ming/pkg-plist b/graphics/ming/pkg-plist
index 17ea429..0224c93 100644
--- a/graphics/ming/pkg-plist
+++ b/graphics/ming/pkg-plist
@@ -101,9 +101,9 @@ include/ming/util/swfoutput.h
include/ming/util/swftypes.h
include/ming/util/vasprintf.h
lib/libming.a
-lib/libming.la
lib/libming.so
-lib/libming.so.5
+lib/libming.so.1
+lib/libming.so.1.4.4
libdata/pkgconfig/libming.pc
%%PORTDOCS%%%%DOCSDIR%%/HISTORY
%%PORTDOCS%%%%DOCSDIR%%/NEWS
diff --git a/graphics/p5-ming/Makefile b/graphics/p5-ming/Makefile
index 9b7b007..69fe0ef 100644
--- a/graphics/p5-ming/Makefile
+++ b/graphics/p5-ming/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$

PORTNAME= ming
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= graphics perl5
PKGNAMEPREFIX= p5-

diff --git a/graphics/pencil/Makefile b/graphics/pencil/Makefile
index 5ba05e3..d0bac4d 100644
--- a/graphics/pencil/Makefile
+++ b/graphics/pencil/Makefile
@@ -3,7 +3,7 @@

PORTNAME= pencil
PORTVERSION= 0.4.4b
-PORTREVISION= 10
+PORTREVISION= 11
CATEGORIES= graphics
MASTER_SITES= SF/${PORTNAME}-planner/Pencil/${PORTVERSION}eta
DISTNAME= ${PORTNAME}-${PORTVERSION}-src${EXTRACT_SUFFIX}
@@ -13,21 +13,13 @@ COMMENT= Pencil - a traditional 2D animation software

LICENSE= GPLv2

-LIB_DEPENDS+= libming.so:${PORTSDIR}/graphics/ming \
- libpng15.so:${PORTSDIR}/graphics/png \
- libfreetype.so:${PORTSDIR}/print/freetype2 \
- libfontconfig.so:${PORTSDIR}/x11-fonts/fontconfig \
- libexpat.so:${PORTSDIR}/textproc/expat2 \
- libpcre.so:${PORTSDIR}/devel/pcre \
- libdrm.so:${PORTSDIR}/graphics/libdrm
-
-USES= gettext iconv qmake zip
-USE_GNOME= glib20
-USE_QT4= gui moc_build rcc_build xml_build opengl_build
-USE_XORG= xi xrender xrandr xfixes xcursor xinerama xext x11 xau xdmcp \
- xxf86vm xdamage
-USE_GL= gl glu
-QMAKE_ARGS+= INCLUDEPATH+=${LOCALBASE}/include/ming
+LIB_DEPENDS= libming.so:${PORTSDIR}/graphics/ming \
+ libpng.so:${PORTSDIR}/graphics/png
+
+USES= qmake zip
+USE_QT4= gui opengl xml moc_build rcc_build
+USE_GL= gl
+QMAKE_ARGS= INCLUDEPATH+=${LOCALBASE}/include/ming
WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}-source

PLIST_FILES= bin/pencil
diff --git a/graphics/pstoedit/Makefile b/graphics/pstoedit/Makefile
index 6ab97e8..428a9ff 100644
--- a/graphics/pstoedit/Makefile
+++ b/graphics/pstoedit/Makefile
@@ -3,7 +3,7 @@

PORTNAME= pstoedit
PORTVERSION= 3.62
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= graphics print
MASTER_SITES= SF

diff --git a/graphics/py-ming/Makefile b/graphics/py-ming/Makefile
index 6dc1462..c7d5622 100644
--- a/graphics/py-ming/Makefile
+++ b/graphics/py-ming/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$

PORTNAME= ming
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= graphics python
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}

diff --git a/graphics/ruby-ming/Makefile b/graphics/ruby-ming/Makefile
index 4a393a8..f41b509 100644
--- a/graphics/ruby-ming/Makefile
+++ b/graphics/ruby-ming/Makefile
@@ -3,7 +3,7 @@

PORTNAME= ming
PORTVERSION= 0.4.3.${RUBY_MING_VERSION}
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES+= graphics ruby
MASTER_SITES= RF
MASTER_SITE_SUBDIR= mingruby
diff --git a/graphics/zphoto/Makefile b/graphics/zphoto/Makefile
index a7f6578..766a501 100644
--- a/graphics/zphoto/Makefile
+++ b/graphics/zphoto/Makefile
@@ -3,7 +3,7 @@

PORTNAME= zphoto
PORTVERSION= 1.2
... 18 lines suppressed ...
d***@public.gmane.org
2014-08-24 00:14:22 UTC
Permalink
branch: masters/2014q2
Repository: freenas/ports
Pushed by: git
Pushed to: branch masters/2014q2
commit a047b38940832c7b31ea133351e46d015a0cabb6
Author: antoine <antoine-***@public.gmane.org>
Date: Fri Aug 22 19:14:15 2014 +0000

Remove double slash to pass check-plist
---
security/p5-Crypt-Juniper/pkg-plist | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/security/p5-Crypt-Juniper/pkg-plist b/security/p5-Crypt-Juniper/pkg-plist
index 92195d0..5456b3f 100644
--- a/security/p5-Crypt-Juniper/pkg-plist
+++ b/security/p5-Crypt-Juniper/pkg-plist
@@ -1,4 +1,4 @@
-%%SITE_PERL%%//Crypt/Juniper.pm
+%%SITE_PERL%%/Crypt/Juniper.pm
%%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/Juniper/.packlist
%%PERL5_MAN3%%/Crypt::Juniper.3.gz
@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Crypt/Juniper
d***@public.gmane.org
2014-08-24 00:14:22 UTC
Permalink
branch: masters/2014q2
Repository: freenas/ports
Pushed by: git
Pushed to: branch masters/2014q2
commit 5ee694ba04682fb0c9482c35e1dc503753a3d05f
Author: antoine <antoine-***@public.gmane.org>
Date: Fri Aug 22 19:16:28 2014 +0000

Package something
---
textproc/tth/Makefile | 7 +++++--
textproc/tth/pkg-plist | 9 +++++++++
2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/textproc/tth/Makefile b/textproc/tth/Makefile
index cc3a580..170ded5 100644
--- a/textproc/tth/Makefile
+++ b/textproc/tth/Makefile
@@ -3,19 +3,23 @@

PORTNAME= tth
PORTVERSION= 4.03
+PORTREVISION= 1
CATEGORIES= textproc
MASTER_SITES= http://hutchinson.belmont.ma.us/tth/tth-noncom/ \
http://redundancy.redundancy.org/mirror/
DISTNAME= tth_C
-EXTRACT_SUFX= .tgz

MAINTAINER= lx-***@public.gmane.org
COMMENT= TeX to HTML translator

RUN_DEPENDS= ppmtogif:${PORTSDIR}/graphics/netpbm

+USES= shebangfix tar:tgz
USE_GHOSTSCRIPT_RUN= yes
#USE_TEX= latex
+SHEBANG_FILES= Xfonts.fix
+
+OPTIONS_DEFINE= DOCS

do-build:
cd ${WRKSRC}; ${CC} ${CFLAGS} tth.c -o tth -ll
@@ -30,6 +34,5 @@ do-install:
@${INSTALL_DATA} ${WRKSRC}/license.txt ${STAGEDIR}${DOCSDIR}
@${INSTALL_DATA} ${WRKSRC}/tth_manual.html ${STAGEDIR}${DOCSDIR}
@${INSTALL_MAN} ${WRKSRC}/${PORTNAME}.1 ${STAGEDIR}${MAN1PREFIX}/man/man1
- @${SED} -e "s,%%PREFIX%%,${PREFIX}," ${PKGMESSAGE}

.include <bsd.port.mk>
diff --git a/textproc/tth/pkg-plist b/textproc/tth/pkg-plist
new file mode 100644
index 0000000..b19f9cf
--- /dev/null
+++ b/textproc/tth/pkg-plist
@@ -0,0 +1,9 @@
+bin/Xfonts.fix
+bin/latex2gif
+bin/ps2gif
+bin/ps2png
+bin/tth
+man/man1/tth.1.gz
+%%PORTDOCS%%%%DOCSDIR%%/license.txt
+%%PORTDOCS%%%%DOCSDIR%%/tth_manual.html
+%%PORTDOCS%%@dirrmtry %%DOCSDIR%%
d***@public.gmane.org
2014-08-24 00:14:22 UTC
Permalink
branch: masters/2014q2
Repository: freenas/ports
Pushed by: git
Pushed to: branch masters/2014q2
commit 5d39a5ac7015007919cad62a15b11044f2558486
Author: bdrewery <bdrewery-***@public.gmane.org>
Date: Fri Aug 22 19:33:20 2014 +0000

- Fix CXX not being respected. This original fix seemed to work only because
scons tries c++, then g++. If you had g++ installed then it would use that
regardless of CXX. Just pull CXX out of the environment intead.
---
devel/jsoncpp/Makefile | 3 ---
devel/jsoncpp/files/patch-SConstruct | 12 ++++++++++--
2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/devel/jsoncpp/Makefile b/devel/jsoncpp/Makefile
index 6d2d59c..130fa46 100644
--- a/devel/jsoncpp/Makefile
+++ b/devel/jsoncpp/Makefile
@@ -17,9 +17,6 @@ USE_LDCONFIG= yes

MAKE_ARGS= platform=linux-gcc

-post-patch:
- @${REINPLACE_CMD} -e 's|g++|${CXX}|' ${WRKSRC}/SConstruct
-
do-install:
@${MKDIR} ${STAGEDIR}${PREFIX}/include/jsoncpp
(cd ${WRKSRC}/include/ && ${COPYTREE_SHARE} json/ ${STAGEDIR}${PREFIX}/include/jsoncpp/)
diff --git a/devel/jsoncpp/files/patch-SConstruct b/devel/jsoncpp/files/patch-SConstruct
index 4b93cd5..c44bf94 100644
--- a/devel/jsoncpp/files/patch-SConstruct
+++ b/devel/jsoncpp/files/patch-SConstruct
@@ -1,5 +1,5 @@
---- ./SConstruct.orig 2014-01-21 02:29:19.000000000 -0200
-+++ ./SConstruct 2014-01-21 02:29:28.000000000 -0200
+--- ./SConstruct.orig 2014-08-22 14:25:14.780951671 -0500
++++ ./SConstruct 2014-08-22 14:25:37.478948513 -0500
@@ -26,7 +26,7 @@
if platform == 'linux-gcc':
CXX = 'g++' # not quite right, but env is not yet available.
@@ -9,3 +9,11 @@
platform = 'linux-gcc-%s' %version
print "Using platform '%s'" %platform
LD_LIBRARY_PATH = os.environ.get('LD_LIBRARY_PATH', '')
+@@ -121,6 +121,7 @@
+ env.Tool( 'default' )
+ env.Append( LIBS = ['pthread'], CCFLAGS = "-Wall" )
+ env['SHARED_LIB_ENABLED'] = True
++ env['CXX'] = os.environ['CXX']
+ else:
+ print "UNSUPPORTED PLATFORM."
+ env.Exit(1)
d***@public.gmane.org
2014-08-24 00:14:22 UTC
Permalink
branch: masters/2014q2
Repository: freenas/ports
Pushed by: git
Pushed to: branch masters/2014q2
commit c05155e26310f8d016bf596a6592797cccc0ffc1
Author: tijl <tijl-***@public.gmane.org>
Date: Fri Aug 22 19:38:15 2014 +0000

- Convert to USES=libtool and INSTALL_TARGET=install-strip
- Remove old patch for gcc 2.x
---
graphics/libvisual/Makefile | 7 ++++---
graphics/libvisual/files/patch-configure | 14 --------------
graphics/libvisual/pkg-plist | 3 +--
3 files changed, 5 insertions(+), 19 deletions(-)

diff --git a/graphics/libvisual/Makefile b/graphics/libvisual/Makefile
index 9ad413f..56b443e 100644
--- a/graphics/libvisual/Makefile
+++ b/graphics/libvisual/Makefile
@@ -6,18 +6,19 @@

PORTNAME= libvisual
PORTVERSION= 0.2.0
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= graphics
MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}

MAINTAINER= ports-***@public.gmane.org
COMMENT= Abstraction library that sits between apps and visual plugin

-USES= pathfix pkgconfig
-USE_AUTOTOOLS= libtool
+USES= libtool pathfix pkgconfig
USE_LDCONFIG= yes
+GNU_CONFIGURE= yes
CPPFLAGS+= -I${LOCALBASE}/include
LIBS+= -L${LOCALBASE}/lib
+INSTALL_TARGET= install-strip

.include <bsd.port.pre.mk>

diff --git a/graphics/libvisual/files/patch-configure b/graphics/libvisual/files/patch-configure
deleted file mode 100644
index d8f1678..0000000
--- a/graphics/libvisual/files/patch-configure
+++ /dev/null
@@ -1,14 +0,0 @@
---- configure.orig Thu Jun 23 13:09:46 2005
-+++ configure Thu Jun 23 13:10:48 2005
-@@ -25450,7 +25450,11 @@
- if test x$lv_ix86 = xyes ; then
- cat >>$outfile <<_______EOF
-
-+#if defined(__GNUC__) && __GNUC__ <= 2
-+#define VISUAL_ARCH_UNKNOWN
-+#else
- #define VISUAL_ARCH_X86
-+#endif
- _______EOF
- fi
-
diff --git a/graphics/libvisual/pkg-plist b/graphics/libvisual/pkg-plist
index 7f6eec2..21daaf6 100644
--- a/graphics/libvisual/pkg-plist
+++ b/graphics/libvisual/pkg-plist
@@ -30,9 +30,8 @@ include/libvisual/lv_types.h
include/libvisual/lv_ui.h
include/libvisual/lv_video.h
include/libvisual/lvconfig.h
-lib/libvisual.a
-lib/libvisual.la
lib/libvisual.so
lib/libvisual.so.0
+lib/libvisual.so.0.0.0
libdata/pkgconfig/libvisual.pc
@dirrm include/libvisual
d***@public.gmane.org
2014-08-24 00:14:22 UTC
Permalink
branch: masters/2014q2
Repository: freenas/ports
Pushed by: git
Pushed to: branch masters/2014q2
commit bd59463b2682ce5a5ff58809de84a22d5dc6086c
Author: amdmi3 <amdmi3-***@public.gmane.org>
Date: Fri Aug 22 19:56:58 2014 +0000

XT gyoretsu - extended ncurses version of "Renshu-cho gyoretsu"

Goal of the game is to clear entire field by matching pairs of
neighbouring (adjacent or on the same line/column without any other
numbers in between) numbers, which must be either equal, or their
sum must be equal to strike out sum.

WWW: https://github.com/Penguinum/xtgyoretsu-forked/
WWW: http://saahriktu.org/games.html
---
games/Makefile | 1 +
games/xtgyoretsu/Makefile | 31 +++++++++++++++++++++++++++++++
games/xtgyoretsu/distinfo | 2 ++
games/xtgyoretsu/pkg-descr | 9 +++++++++
4 files changed, 43 insertions(+)

diff --git a/games/Makefile b/games/Makefile
index 449e66c..4acc45d 100644
--- a/games/Makefile
+++ b/games/Makefile
@@ -1142,6 +1142,7 @@
SUBDIR += xspringies
SUBDIR += xteddy
SUBDIR += xtet42
+ SUBDIR += xtgyoretsu
SUBDIR += xtic
SUBDIR += xtriangles
SUBDIR += xtris
diff --git a/games/xtgyoretsu/Makefile b/games/xtgyoretsu/Makefile
new file mode 100644
index 0000000..22fb4f4
--- /dev/null
+++ b/games/xtgyoretsu/Makefile
@@ -0,0 +1,31 @@
+# Created by: Dmitry Marakasov <amdmi3-***@public.gmane.org>
+# $FreeBSD$
+
+PORTNAME= xtgyoretsu
+PORTVERSION= git20140822
+CATEGORIES= games
+
+MAINTAINER= amdmi3-***@public.gmane.org
+COMMENT= Extended ncurses version of "Renshu-cho gyoretsu"
+
+LICENSE= GPLv3
+LICENSE_FILE= ${WRKSRC}/COPYING
+
+USE_GITHUB= yes
+GH_ACCOUNT= Penguinum
+GH_PROJECT= ${PORTNAME}-forked
+GH_TAGNAME= ${GH_COMMIT}
+GH_COMMIT= d052143
+
+USES= ncurses
+
+PLIST_FILES= bin/${PORTNAME}
+PORTDOCS= *
+
+OPTIONS_DEFINE= DOCS
+
+post-install:
+ ${MKDIR} ${STAGEDIR}${DOCSDIR}
+ ${INSTALL_DATA} ${WRKSRC}/Readme ${STAGEDIR}${DOCSDIR}/
+
+.include <bsd.port.mk>
diff --git a/games/xtgyoretsu/distinfo b/games/xtgyoretsu/distinfo
new file mode 100644
index 0000000..fddc0be
--- /dev/null
+++ b/games/xtgyoretsu/distinfo
@@ -0,0 +1,2 @@
+SHA256 (xtgyoretsu-git20140822.tar.gz) = 2d01e15d8d0188b46a80bce008409f2525b4e82b38d64f338d1d355fa9544a9f
+SIZE (xtgyoretsu-git20140822.tar.gz) = 15794
diff --git a/games/xtgyoretsu/pkg-descr b/games/xtgyoretsu/pkg-descr
new file mode 100644
index 0000000..898c5ed
--- /dev/null
+++ b/games/xtgyoretsu/pkg-descr
@@ -0,0 +1,9 @@
+XT gyoretsu - extended ncurses version of "Renshu-cho gyoretsu"
+
+Goal of the game is to clear entire field by matching pairs of
+neighbouring (adjacent or on the same line/column without any other
+numbers in between) numbers, which must be either equal, or their
+sum must be equal to strike out sum.
+
+WWW: https://github.com/Penguinum/xtgyoretsu-forked/
+WWW: http://saahriktu.org/games.html
d***@public.gmane.org
2014-08-24 00:14:22 UTC
Permalink
branch: masters/2014q2
Repository: freenas/ports
Pushed by: git
Pushed to: branch masters/2014q2
commit 698097f2774071eff6d01453aaf78922b0f6b83e
Author: cy <cy-***@public.gmane.org>
Date: Fri Aug 22 20:01:49 2014 +0000

Update 3.6.0alpha2 --> 3.6.0a3

Submitted by: Peter Czanik <peter.czanik-***@public.gmane.org> (syslog-ng upline)
---
sysutils/syslog-ng-devel/Makefile | 3 +--
sysutils/syslog-ng-devel/distinfo | 4 ++--
sysutils/syslog-ng-devel/pkg-plist | 5 +++++
3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/sysutils/syslog-ng-devel/Makefile b/sysutils/syslog-ng-devel/Makefile
index 45178c9..67a123f 100644
--- a/sysutils/syslog-ng-devel/Makefile
+++ b/sysutils/syslog-ng-devel/Makefile
@@ -2,8 +2,7 @@
# $FreeBSD$

PORTNAME= syslog-ng
-PORTVERSION= 3.6.0a2
-PORTREVISION= 2
+PORTVERSION= 3.6.0a3
PKGNAMESUFFIX= -devel
CATEGORIES= sysutils
DISTVERSION= $(PORTVERSION:S/a/alpha/:S/b/beta/:S/r/rc/)
diff --git a/sysutils/syslog-ng-devel/distinfo b/sysutils/syslog-ng-devel/distinfo
index 261ee01..2e6c015 100644
--- a/sysutils/syslog-ng-devel/distinfo
+++ b/sysutils/syslog-ng-devel/distinfo
@@ -1,2 +1,2 @@
-SHA256 (syslog-ng_3.6.0alpha2.tar.gz) = 839954620acaddd7d4cb600f0da1c783992f5dd5cdf2b79567ba55be0706992e
-SIZE (syslog-ng_3.6.0alpha2.tar.gz) = 3111386
+SHA256 (syslog-ng_3.6.0alpha3.tar.gz) = df79de19a658a9719c73ace6c321f5fb3ee6fd7ea03fe995319c1a62f9087918
+SIZE (syslog-ng_3.6.0alpha3.tar.gz) = 3155320
diff --git a/sysutils/syslog-ng-devel/pkg-plist b/sysutils/syslog-ng-devel/pkg-plist
index e69ffc5..09fb79f 100644
--- a/sysutils/syslog-ng-devel/pkg-plist
+++ b/sysutils/syslog-ng-devel/pkg-plist
@@ -26,6 +26,7 @@ include/syslog-ng/compat/getutent.h
include/syslog-ng/compat/glib.h
include/syslog-ng/compat/lfs.h
include/syslog-ng/compat/pio.h
+include/syslog-ng/compat/time.h
include/syslog-ng/compat/socket.h
include/syslog-ng/compat/string.h
include/syslog-ng/control/control-server.h
@@ -184,6 +185,7 @@ lib/syslog-ng/libconfgen.so
lib/syslog-ng/libcryptofuncs.so
lib/syslog-ng/libcsvparser.so
lib/syslog-ng/libdbparser.so
+lib/syslog-ng/libgraphite.so
lib/syslog-ng/liblinux-kmsg-format.so
lib/syslog-ng/libpseudofile.so
lib/syslog-ng/libsyslog-ng-crypto.so
@@ -199,6 +201,8 @@ man/man5/syslog-ng.conf.5.gz
man/man8/syslog-ng.8.gz
sbin/syslog-ng
sbin/syslog-ng-ctl
+share/syslog-ng/include/scl/graphite/plugin.conf
+share/syslog-ng/include/scl/graphite/README
share/syslog-ng/include/scl/nodejs/plugin.conf
share/syslog-ng/include/scl/pacct/plugin.conf
share/syslog-ng/include/scl/syslogconf/README
@@ -220,6 +224,7 @@ share/syslog-ng/xsd/patterndb-4.xsd
%%PORTDOCS%%@dirrm %%DOCSDIR%%
@dirrm share/syslog-ng/xsd
@dirrm share/syslog-ng/tools
+@dirrm share/syslog-ng/include/scl/graphite
@dirrm share/syslog-ng/include/scl/nodejs
@dirrm share/syslog-ng/include/scl/system
@dirrm share/syslog-ng/include/scl/syslogconf
d***@public.gmane.org
2014-08-24 00:14:22 UTC
Permalink
branch: masters/2014q2
Repository: freenas/ports
Pushed by: git
Pushed to: branch masters/2014q2
commit 8f856f8c7beaaf7eca3694a0e5a3d41247ed7779
Author: tijl <tijl-***@public.gmane.org>
Date: Fri Aug 22 20:14:26 2014 +0000

Add USES=libtool and INSTALL_TARGET=install-strip
---
graphics/libGLw/Makefile | 9 ++++-----
graphics/libGLw/pkg-plist | 2 +-
2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/graphics/libGLw/Makefile b/graphics/libGLw/Makefile
index 17b0b48..5469c91 100644
--- a/graphics/libGLw/Makefile
+++ b/graphics/libGLw/Makefile
@@ -3,6 +3,7 @@

PORTNAME= libGLw
PORTVERSION= 8.0.0
+PORTREVISION= 1
CATEGORIES= graphics
MASTER_SITES= ftp://ftp.freedesktop.org/pub/mesa/glw/
DISTNAME= glw-${PORTVERSION}
@@ -11,16 +12,14 @@ DIST_SUBDIR= GL
MAINTAINER= x11-***@public.gmane.org
COMMENT= OpenGL widgets library

-USES= motif pathfix pkgconfig tar:bzip2
+USES= motif libtool pathfix pkgconfig tar:bzip2
USE_LDCONFIG= yes
USE_GL= gl
USE_XORG= x11 xt xext
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --disable-static --enable-motif
CPPFLAGS+= -I${LOCALBASE}/include
-LDFLAGS+= -L${LOCALBASE}/lib
-
-post-install:
- @${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libGLw.so.1
+LIBS+= -L${LOCALBASE}/lib
+INSTALL_TARGET= install-strip

.include <bsd.port.mk>
diff --git a/graphics/libGLw/pkg-plist b/graphics/libGLw/pkg-plist
index 87418e6..c2cf93f 100644
--- a/graphics/libGLw/pkg-plist
+++ b/graphics/libGLw/pkg-plist
@@ -2,7 +2,7 @@ include/GL/GLwDrawA.h
include/GL/GLwDrawAP.h
include/GL/GLwMDrawA.h
include/GL/GLwMDrawAP.h
-lib/libGLw.la
lib/libGLw.so
lib/libGLw.so.1
+lib/libGLw.so.1.0.0
libdata/pkgconfig/glw.pc
d***@public.gmane.org
2014-08-24 00:14:22 UTC
Permalink
branch: masters/2014q2
Repository: freenas/ports
Pushed by: git
Pushed to: branch masters/2014q2
commit cfdf9d27807a383d6509494e20bfa12cfa634c59
Author: gerald <gerald-***@public.gmane.org>
Date: Fri Aug 22 20:26:23 2014 +0000

GCC 4.10 has been renamed to GCC 5 upstream; rename our gcc410 port
to gcc5 accordingly.
---
MOVED | 1 +
lang/Makefile | 2 +-
lang/{gcc410 => gcc5}/Makefile | 0
lang/{gcc410 => gcc5}/Makefile.DragonFly | 0
lang/{gcc410 => gcc5}/distinfo | 0
lang/{gcc410 => gcc5}/files/java-patch-hier | 0
lang/{gcc410 => gcc5}/files/patch-unwind-ia64.h | 0
lang/{gcc410 => gcc5}/files/pkg-message.in | 0
lang/{gcc410 => gcc5}/pkg-descr | 0
lang/{gcc410 => gcc5}/pkg-plist | 0
10 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/MOVED b/MOVED
index dfc4152..c43fd2a 100644
--- a/MOVED
+++ b/MOVED
@@ -6486,3 +6486,4 @@ www/abyssws||2014-08-22|Has expired: Broken for more than 6 months
www/docebo||2014-08-22|Has expired: Not maintained upstream
www/rejik||2014-08-22|Has expired: Broken for more than 6 months and depends on www/squid which reached EOL 2 years ago
devel/rubygem-railsless-deploy||2014-08-22|Removed: Obsolete, Capistrano 3 does not ship with any Railsisms and is better than Capistrano 2 and railsless-deploy
+lang/gcc410|lang/gcc5|2014-08-22|Renamed to GCC 5 upstream
diff --git a/lang/Makefile b/lang/Makefile
index 2cd9450..535c614 100644
--- a/lang/Makefile
+++ b/lang/Makefile
@@ -87,7 +87,7 @@
SUBDIR += gcc47-aux
SUBDIR += gcc48
SUBDIR += gcc49
- SUBDIR += gcc410
+ SUBDIR += gcc5
SUBDIR += gcl
SUBDIR += gforth
SUBDIR += ghc
diff --git a/lang/gcc410/Makefile b/lang/gcc5/Makefile
similarity index 100%
rename from lang/gcc410/Makefile
rename to lang/gcc5/Makefile
diff --git a/lang/gcc410/Makefile.DragonFly b/lang/gcc5/Makefile.DragonFly
similarity index 100%
rename from lang/gcc410/Makefile.DragonFly
rename to lang/gcc5/Makefile.DragonFly
diff --git a/lang/gcc410/distinfo b/lang/gcc5/distinfo
similarity index 100%
rename from lang/gcc410/distinfo
rename to lang/gcc5/distinfo
diff --git a/lang/gcc410/files/java-patch-hier b/lang/gcc5/files/java-patch-hier
similarity index 100%
rename from lang/gcc410/files/java-patch-hier
rename to lang/gcc5/files/java-patch-hier
diff --git a/lang/gcc410/files/patch-unwind-ia64.h b/lang/gcc5/files/patch-unwind-ia64.h
similarity index 100%
rename from lang/gcc410/files/patch-unwind-ia64.h
rename to lang/gcc5/files/patch-unwind-ia64.h
diff --git a/lang/gcc410/files/pkg-message.in b/lang/gcc5/files/pkg-message.in
similarity index 100%
rename from lang/gcc410/files/pkg-message.in
rename to lang/gcc5/files/pkg-message.in
diff --git a/lang/gcc410/pkg-descr b/lang/gcc5/pkg-descr
similarity index 100%
rename from lang/gcc410/pkg-descr
rename to lang/gcc5/pkg-descr
diff --git a/lang/gcc410/pkg-plist b/lang/gcc5/pkg-plist
similarity index 100%
rename from lang/gcc410/pkg-plist
rename to lang/gcc5/pkg-plist
d***@public.gmane.org
2014-08-24 00:14:22 UTC
Permalink
branch: masters/2014q2
Repository: freenas/ports
Pushed by: git
Pushed to: branch masters/2014q2
commit d384be06290b13ad0ff2e8828f298eb45402c397
Author: antoine <antoine-***@public.gmane.org>
Date: Fri Aug 22 20:51:20 2014 +0000

Package something
---
sysutils/doinkd/Makefile | 6 ++----
sysutils/doinkd/pkg-descr | 2 +-
sysutils/doinkd/pkg-plist | 5 +++++
3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/sysutils/doinkd/Makefile b/sysutils/doinkd/Makefile
index c018347..c14ca9e 100644
--- a/sysutils/doinkd/Makefile
+++ b/sysutils/doinkd/Makefile
@@ -3,7 +3,7 @@

PORTNAME= doinkd
PORTVERSION= 0.01
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= sysutils
MASTER_SITES= SF/idled/${PORTNAME}/${PORTVERSION}/

@@ -14,8 +14,6 @@ USE_RC_SUBR= ${PORTNAME}

MAKE_ARGS= STAGEDIR=${STAGEDIR}

-.include <bsd.port.pre.mk>
-
post-extract:
(cd ${WRKSRC}; make clean)

@@ -25,4 +23,4 @@ pre-install:
post-install:
@${STRIP_CMD} ${STAGEDIR}${PREFIX}/sbin/doinkd

-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/sysutils/doinkd/pkg-descr b/sysutils/doinkd/pkg-descr
index 7d03cdd..5424f33 100644
--- a/sysutils/doinkd/pkg-descr
+++ b/sysutils/doinkd/pkg-descr
@@ -8,4 +8,4 @@ predefined rules are met. These include session time, multiple logins,
tty, idletime and group limits. Similar to the Unix idleout command,
but much more configurable. Formerly idled.

-http://idled.sourceforge.net/
+WWW: http://idled.sourceforge.net/
diff --git a/sysutils/doinkd/pkg-plist b/sysutils/doinkd/pkg-plist
new file mode 100644
index 0000000..511a96e
--- /dev/null
+++ b/sysutils/doinkd/pkg-plist
@@ -0,0 +1,5 @@
+%%ETCDIR%%/doinkd.cf.template
+man/man5/doinkd.cf.5.gz
+man/man8/doinkd.8.gz
+sbin/doinkd
+@dirrm %%ETCDIR%%
d***@public.gmane.org
2014-08-24 00:14:22 UTC
Permalink
branch: masters/2014q2
Repository: freenas/ports
Pushed by: git
Pushed to: branch masters/2014q2
commit 403ef503e9fc4da11cc60140aaaf2c525ca9215e
Author: tijl <tijl-***@public.gmane.org>
Date: Fri Aug 22 21:18:04 2014 +0000

Add USES=libtool and INSTALL_TARGET=install-strip
---
graphics/gstreamer-plugins-gl/Makefile | 13 +++++--------
graphics/gstreamer-plugins-gl/pkg-plist | 5 +----
2 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/graphics/gstreamer-plugins-gl/Makefile b/graphics/gstreamer-plugins-gl/Makefile
index 9ede8aa..8d9737c 100644
--- a/graphics/gstreamer-plugins-gl/Makefile
+++ b/graphics/gstreamer-plugins-gl/Makefile
@@ -3,7 +3,7 @@

PORTNAME= gstreamer-plugins-gl
PORTVERSION= 0.10.3
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= graphics
MASTER_SITES= http://gstreamer.freedesktop.org/src/gst-plugins-gl/
DISTNAME= ${PORTNAME:S/gstreamer/gst/}-${PORTVERSION}
@@ -14,20 +14,17 @@ COMMENT= GStreamer OpenGL video plugin
LIB_DEPENDS= libpng15.so:${PORTSDIR}/graphics/png \
libjpeg.so:${PORTSDIR}/graphics/jpeg

+USES= gettext gmake libtool pathfix pkgconfig tar:bzip2
USE_LDCONFIG= yes
-USES= pathfix gettext gmake pkgconfig tar:bzip2
USE_GSTREAMER= yes
USE_XORG= ice x11
USE_GL= gl glu glew
GNU_CONFIGURE= yes
+CONFIGURE_ARGS= --disable-examples --disable-static
CPPFLAGS+= -I${LOCALBASE}/include
-LDFLAGS+= -L${LOCALBASE}/lib
-CONFIGURE_ARGS=--disable-examples
+LIBS+= -L${LOCALBASE}/lib
+INSTALL_TARGET= install-strip

PLIST_SUB= VERSION="0.10"

-post-install:
- @${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libgstgl-0.10.so.1
- @${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/gstreamer-0.10/libgst*.so
-
.include <bsd.port.mk>
diff --git a/graphics/gstreamer-plugins-gl/pkg-plist b/graphics/gstreamer-plugins-gl/pkg-plist
index 116e6b5..4c910b2 100644
--- a/graphics/gstreamer-plugins-gl/pkg-plist
+++ b/graphics/gstreamer-plugins-gl/pkg-plist
@@ -7,13 +7,10 @@ include/gstreamer-0.10/gst/gl/gstglmixerpad.h
include/gstreamer-0.10/gst/gl/gstglshader.h
include/gstreamer-0.10/gst/gl/gstglshadervariables.h
include/gstreamer-0.10/gst/gl/gstglwindow.h
-lib/gstreamer-0.10/libgstopengl.a
-lib/gstreamer-0.10/libgstopengl.la
lib/gstreamer-0.10/libgstopengl.so
-lib/libgstgl-0.10.a
-lib/libgstgl-0.10.la
lib/libgstgl-0.10.so
lib/libgstgl-0.10.so.1
+lib/libgstgl-0.10.so.1.0.0
libdata/pkgconfig/gstreamer-gl-0.10.pc
share/gtk-doc/html/gst-plugins-gl-libs-0.10/api-index.html
share/gtk-doc/html/gst-plugins-gl-libs-0.10/ch01.html
d***@public.gmane.org
2014-08-24 00:14:22 UTC
Permalink
branch: masters/2014q2
Repository: freenas/ports
Pushed by: git
Pushed to: branch masters/2014q2
commit 148445ef666183f8d9272f1bc811ce18de508b3c
Author: antoine <antoine-***@public.gmane.org>
Date: Fri Aug 22 21:12:28 2014 +0000

Package the DOCS
---
textproc/sgmls/Makefile | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/textproc/sgmls/Makefile b/textproc/sgmls/Makefile
index 1181bd5..6338378 100644
--- a/textproc/sgmls/Makefile
+++ b/textproc/sgmls/Makefile
@@ -3,20 +3,20 @@

PORTNAME= sgmls
PORTVERSION= 1.1.91
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= textproc
MASTER_SITES= ftp://ftp.jclark.com/pub/sgmls/
-EXTRACT_SUFX= .tar.Z

MAINTAINER= ports-***@public.gmane.org
COMMENT= SGML parser

+USES= tar:Z
WRKSRC= ${WRKDIR}/${PORTNAME}
HAS_CONFIGURE= yes
INSTALL_TARGET= install install.man

PROGS= sgmls sgmlsasp rast
-PKGDOCS= ChangeLog INSTALL LICENSE NEWS README TODO
+PORTDOCS= ChangeLog INSTALL LICENSE NEWS README TODO

OPTIONS_DEFINE= DOCS

@@ -30,9 +30,8 @@ post-build:
cd ${WRKSRC} && ${MAKE} test

post-install:
- @${ECHO_MSG} "===> Installing documentation for ${PKGNAME}"
@-${MKDIR} ${STAGEDIR}${DOCSDIR}
-.for f in ${PKGDOCS}
+.for f in ${PORTDOCS}
${INSTALL_DATA} ${WRKSRC}/${f} ${STAGEDIR}${DOCSDIR}
.endfor
d***@public.gmane.org
2014-08-24 00:14:23 UTC
Permalink
branch: masters/2014q2
Repository: freenas/ports
Pushed by: git
Pushed to: branch masters/2014q2
commit 5f0849a4f0f7e65ab3e43ab31c879925879c2f34
Author: marino <marino-***@public.gmane.org>
Date: Fri Aug 22 21:49:41 2014 +0000

devel/hs-readline: Restore adamw's -current fix

The massive ghc update (rev 364579) removed Adam's fix (rev 362452)
unintentionally. Add USES=readline back again; DF needs it too.
---
devel/hs-readline/Makefile | 2 ++
1 file changed, 2 insertions(+)

diff --git a/devel/hs-readline/Makefile b/devel/hs-readline/Makefile
index a5c59c0..8d85492 100644
--- a/devel/hs-readline/Makefile
+++ b/devel/hs-readline/Makefile
@@ -11,5 +11,7 @@ COMMENT= Interface to the GNU readline library

LICENSE= GPLv2

+USES= readline
+
.include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
.include <bsd.port.mk>
d***@public.gmane.org
2014-08-24 00:14:23 UTC
Permalink
branch: masters/2014q2
Repository: freenas/ports
Pushed by: git
Pushed to: branch masters/2014q2
commit 022605d7f3acd40aec38917f95f82adff2e64d85
Author: brian <brian-***@public.gmane.org>
Date: Fri Aug 22 21:42:11 2014 +0000

Update to version 1.4

This fixes an issue generating filesystems with a size exactly divisible
by 4GB.
---
sysutils/vmdktool/Makefile | 2 +-
sysutils/vmdktool/distinfo | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/sysutils/vmdktool/Makefile b/sysutils/vmdktool/Makefile
index ffe4890..c69c0ba 100644
--- a/sysutils/vmdktool/Makefile
+++ b/sysutils/vmdktool/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$

PORTNAME= vmdktool
-PORTVERSION= 1.3
+PORTVERSION= 1.4
CATEGORIES= sysutils
MASTER_SITES= http://www.Awfulhak.org/vmdktool/ \
ftp://ftp.Awfulhak.org/pub/vmdktool/ \
diff --git a/sysutils/vmdktool/distinfo b/sysutils/vmdktool/distinfo
index 1c116ba..561f406 100644
--- a/sysutils/vmdktool/distinfo
+++ b/sysutils/vmdktool/distinfo
@@ -1,2 +1,2 @@
-SHA256 (vmdktool-1.3.tar.gz) = 4582ffb5127c7f69e0da53beff3d5466f2408e15f42e1d067623c21f9ca336cc
-SIZE (vmdktool-1.3.tar.gz) = 12562
+SHA256 (vmdktool-1.4.tar.gz) = 981eb43d3db172144f2344886040424ef525e15c85f84023a7502b238aa7b89c
+SIZE (vmdktool-1.4.tar.gz) = 12566
d***@public.gmane.org
2014-08-24 00:14:23 UTC
Permalink
branch: masters/2014q2
Repository: freenas/ports
Pushed by: git
Pushed to: branch masters/2014q2
commit 9deb3bb52523e3849b097d85f9c16931a33dbdd7
Author: swills <swills-***@public.gmane.org>
Date: Fri Aug 22 22:05:51 2014 +0000

devel/rubygem-rubygems-tasks: add port for rubygem-rubygems-tasks

Agnostic and unobtrusive Rake tasks for managing and releasing Ruby Gems.

WWW: https://github.com/postmodern/rubygems-tasks#readme
---
devel/Makefile | 1 +
devel/rubygem-rubygems-tasks/Makefile | 16 ++++++++++++++++
devel/rubygem-rubygems-tasks/distinfo | 2 ++
devel/rubygem-rubygems-tasks/pkg-descr | 3 +++
4 files changed, 22 insertions(+)

diff --git a/devel/Makefile b/devel/Makefile
index d3d2786..03eb67a 100644
--- a/devel/Makefile
+++ b/devel/Makefile
@@ -4472,6 +4472,7 @@
SUBDIR += rubygem-ruby_parser
SUBDIR += rubygem-rubyforge
SUBDIR += rubygem-rubygame
+ SUBDIR += rubygem-rubygems-tasks
SUBDIR += rubygem-rubyinlineaccel
SUBDIR += rubygem-rubytree
SUBDIR += rubygem-rufus-scheduler
diff --git a/devel/rubygem-rubygems-tasks/Makefile b/devel/rubygem-rubygems-tasks/Makefile
new file mode 100644
index 0000000..919d877
--- /dev/null
+++ b/devel/rubygem-rubygems-tasks/Makefile
@@ -0,0 +1,16 @@
+# Created by: Steve Wills <swills-***@public.gmane.org>
+# $FreeBSD$
+
+PORTNAME= rubygems-tasks
+PORTVERSION= 0.2.4
+CATEGORIES= devel rubygems
+MASTER_SITES= RG
+
+MAINTAINER= ruby-***@public.gmane.org
+COMMENT= Rake tasks for managing and releasing Ruby Gems
+
+USE_RUBY= yes
+USE_RUBYGEMS= yes
+RUBYGEM_AUTOPLIST=yes
+
+.include <bsd.port.mk>
diff --git a/devel/rubygem-rubygems-tasks/distinfo b/devel/rubygem-rubygems-tasks/distinfo
new file mode 100644
index 0000000..2d70146
--- /dev/null
+++ b/devel/rubygem-rubygems-tasks/distinfo
@@ -0,0 +1,2 @@
+SHA256 (rubygem/rubygems-tasks-0.2.4.gem) = 52fc573970545df3f3bb586922c026bf711fdb903b38521bb6f4b14571219799
+SIZE (rubygem/rubygems-tasks-0.2.4.gem) = 18944
diff --git a/devel/rubygem-rubygems-tasks/pkg-descr b/devel/rubygem-rubygems-tasks/pkg-descr
new file mode 100644
index 0000000..190abfa
--- /dev/null
+++ b/devel/rubygem-rubygems-tasks/pkg-descr
@@ -0,0 +1,3 @@
+Agnostic and unobtrusive Rake tasks for managing and releasing Ruby Gems.
+
+WWW: https://github.com/postmodern/rubygems-tasks#readme

Loading...