Discussion:
[freenas/ports] e2f647c: ports-mgmt/bpm: Stagify.
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 ...