From owner-svn-ports-head@FreeBSD.ORG Sun Dec 15 00:03:00 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 97E0BFBF; Sun, 15 Dec 2013 00:03:00 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 817E61860; Sun, 15 Dec 2013 00:03:00 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBF030YK027342; Sun, 15 Dec 2013 00:03:00 GMT (envelope-from bapt@svn.freebsd.org) Received: (from bapt@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBF030L1027337; Sun, 15 Dec 2013 00:03:00 GMT (envelope-from bapt@svn.freebsd.org) Message-Id: <201312150003.rBF030L1027337@svn.freebsd.org> From: Baptiste Daroussin Date: Sun, 15 Dec 2013 00:03:00 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r336501 - head/x11/vdesk X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 15 Dec 2013 00:03:00 -0000 Author: bapt Date: Sun Dec 15 00:02:59 2013 New Revision: 336501 URL: http://svnweb.freebsd.org/changeset/ports/336501 Log: Support stage Modified: head/x11/vdesk/Makefile Modified: head/x11/vdesk/Makefile ============================================================================== --- head/x11/vdesk/Makefile Sat Dec 14 23:30:36 2013 (r336500) +++ head/x11/vdesk/Makefile Sun Dec 15 00:02:59 2013 (r336501) @@ -10,27 +10,20 @@ MASTER_SITES= http://offog.org/files/ MAINTAINER= ports@FreeBSD.org COMMENT= Command-line utility for setting up and using virtual desktops -DOCS= AUTHORS COPYING ChangeLog INSTALL NEWS README +OPTIONS_DEFINE= DOCS + +PORTDOCS= AUTHORS COPYING ChangeLog INSTALL NEWS README PLIST_DIRS= share/doc/vdesk PLIST_FILES= bin/vdesk -NO_STAGE= yes -.include -.if ${PORT_OPTIONS:MDOCS} -.for ii in ${DOCS} -PLIST_FILES+= share/doc/vdesk/${ii} -.endfor -.endif USE_AUTOTOOLS= autoconf USE_XORG= x11 do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/vdesk ${PREFIX}/bin -.if ${PORT_OPTIONS:MDOCS} - ${MKDIR} ${DOCSDIR} -.for ii in ${DOCS} - ${INSTALL_DATA} ${WRKSRC}/${ii} ${DOCSDIR} + ${INSTALL_PROGRAM} ${WRKSRC}/vdesk ${STAGEDIR}${PREFIX}/bin + ${MKDIR} ${STAGEDIR}${DOCSDIR} +.for ii in ${PORTDOCS} + ${INSTALL_DATA} ${WRKSRC}/${ii} ${STAGEDIR}${DOCSDIR} .endfor -.endif .include From owner-svn-ports-head@FreeBSD.ORG Sun Dec 15 00:50:41 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 840413D7; Sun, 15 Dec 2013 00:50:41 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 6EA551A6D; Sun, 15 Dec 2013 00:50:41 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBF0ofim043582; Sun, 15 Dec 2013 00:50:41 GMT (envelope-from db@svn.freebsd.org) Received: (from db@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBF0obVx043425; Sun, 15 Dec 2013 00:50:37 GMT (envelope-from db@svn.freebsd.org) Message-Id: <201312150050.rBF0obVx043425@svn.freebsd.org> From: Diane Bruce Date: Sun, 15 Dec 2013 00:50:37 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r336502 - in head/comms/soundmodem: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 15 Dec 2013 00:50:41 -0000 Author: db Date: Sun Dec 15 00:50:37 2013 New Revision: 336502 URL: http://svnweb.freebsd.org/changeset/ports/336502 Log: - Fix build on 10 - Add STAGEDIR - Add LICENSE Added: head/comms/soundmodem/files/patch-configapp_src_Makefile.in (contents, props changed) head/comms/soundmodem/files/patch-configapp_src_diag.c (contents, props changed) head/comms/soundmodem/files/patch-fsk_gendf9icfilt.cc (contents, props changed) head/comms/soundmodem/files/patch-matlib_mat.hh (contents, props changed) head/comms/soundmodem/files/patch-newqpsk_complex.h (contents, props changed) head/comms/soundmodem/files/patch-newqpsk_fec.h (contents, props changed) head/comms/soundmodem/files/patch-newqpsk_filter-i386.h (contents, props changed) head/comms/soundmodem/files/patch-newqpsk_filter.h (contents, props changed) head/comms/soundmodem/files/patch-newqpsk_misc.h (contents, props changed) head/comms/soundmodem/files/patch-p3dmodem_genp3dtbl.c (contents, props changed) head/comms/soundmodem/files/patch-pammodem_genpamtbl.c (contents, props changed) head/comms/soundmodem/files/patch-pskmodem_genpsktbl.c (contents, props changed) head/comms/soundmodem/files/patch-pskmodem_pskmodem.c (contents, props changed) head/comms/soundmodem/files/patch-soundcard_modem.h (contents, props changed) head/comms/soundmodem/files/patch-soundcard_simd.h (contents, props changed) head/comms/soundmodem/files/patch-soundcard_winlog.c (contents, props changed) Modified: head/comms/soundmodem/Makefile head/comms/soundmodem/pkg-plist Modified: head/comms/soundmodem/Makefile ============================================================================== --- head/comms/soundmodem/Makefile Sun Dec 15 00:02:59 2013 (r336501) +++ head/comms/soundmodem/Makefile Sun Dec 15 00:50:37 2013 (r336502) @@ -10,16 +10,16 @@ MASTER_SITES= http://www.baycom.org/~tom MAINTAINER= db@FreeBSD.org COMMENT= Amateur Radio sound modem +LICENSE= GPLv1 + LIB_DEPENDS= libaudiofile.so:${PORTSDIR}/audio/libaudiofile CONFIGURE_ARGS= --disable-alsatest WRKSRC= ${WRKDIR}/${DISTNAME} -USES= gmake pkgconfig +USES= gmake pkgconfig gettext HAS_CONFIGURE= yes USE_GNOME= gtk20 libxml2 -MAN8= soundmodem.8 soundmodemconfig.8 -NO_STAGE= yes pre-patch: @${CP} ${FILESDIR}/soundmodem ${WRKSRC} @@ -31,6 +31,6 @@ post-patch: ${WRKSRC}/configapp/src/main.c \ ${WRKSRC}/soundmodem post-install: - ${INSTALL_SCRIPT} ${WRKSRC}/soundmodem ${PREFIX}/etc/rc.d + ${INSTALL_SCRIPT} ${WRKSRC}/soundmodem ${STAGEDIR}${PREFIX}/etc/rc.d .include Added: head/comms/soundmodem/files/patch-configapp_src_Makefile.in ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/comms/soundmodem/files/patch-configapp_src_Makefile.in Sun Dec 15 00:50:37 2013 (r336502) @@ -0,0 +1,20 @@ +--- configapp/src/Makefile.in.orig 2012-11-07 05:55:36.000000000 -0500 ++++ configapp/src/Makefile.in 2013-12-14 12:09:14.352210905 -0500 +@@ -87,7 +87,7 @@ + COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ + $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) + CCLD = $(CC) +-LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ ++LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(INTLLIBS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ + SOURCES = $(soundmodemconfig_SOURCES) + DIST_SOURCES = $(soundmodemconfig_SOURCES) + am__can_run_installinfo = \ +@@ -300,7 +300,7 @@ + + soundmodemconfig_LDADD = ../../soundcard/liblog.a ../../soundcard/libaudioio.a ../../soundcard/libpttio.a \ + $(MODEMLIBS) ../../matlib/libmat.a ../../libmisc/libmisc.a ../../soundcard/libcommon.a \ +- @LIBTHREAD@ @GTK_LIBS@ @XML_LIBS@ @AUDIOFILE_LIBS@ @ALSA_LIBS@ $(RCOBJ) ++ @LIBINTL@ @LIBTHREAD@ @GTK_LIBS@ @XML_LIBS@ @AUDIOFILE_LIBS@ @ALSA_LIBS@ $(RCOBJ) + + soundmodemconfig_LDFLAGS = $(MWINDOWS) + EXTRA_DIST = configapp.rc soundmodemconfig.8 Added: head/comms/soundmodem/files/patch-configapp_src_diag.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/comms/soundmodem/files/patch-configapp_src_diag.c Sun Dec 15 00:50:37 2013 (r336502) @@ -0,0 +1,11 @@ +--- configapp/src/diag.c.orig 2013-12-13 14:39:25.388350545 -0500 ++++ configapp/src/diag.c 2013-12-13 14:40:12.600347047 -0500 +@@ -473,7 +473,7 @@ + cp += sprintf(cp, "%c", diagstate.p3d.packet[i+j]); + } + } +- cp += sprintf(cp, "\n%04x: %02x %02x%44s", 512, diagstate.p3d.packet[512], diagstate.p3d.packet[514], " "); ++ cp += sprintf(cp, "\n%04x: %02x %02x%44s", 512, diagstate.p3d.packet[512], diagstate.p3d.packet[513], " "); + for (i = 512; i < 514; i++) { + if (diagstate.p3d.packet[i] < ' ' || diagstate.p3d.packet[i] >= 0x80) + cp += sprintf(cp, "."); Added: head/comms/soundmodem/files/patch-fsk_gendf9icfilt.cc ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/comms/soundmodem/files/patch-fsk_gendf9icfilt.cc Sun Dec 15 00:50:37 2013 (r336502) @@ -0,0 +1,21 @@ +--- fsk/gendf9icfilt.cc.orig 2013-12-13 08:19:49.459920041 -0500 ++++ fsk/gendf9icfilt.cc 2013-12-13 08:43:50.641820677 -0500 +@@ -41,6 +41,8 @@ + + #include "getopt.h" + ++#define FFTSZ 2048 ++ + /* --------------------------------------------------------------------- */ + + template complex rxfilter(T freq) +@@ -173,7 +175,8 @@ + printtransferfunc(os, fftsz, over); + else + os << "/* this file is automatically generated, do not edit!! */\n\n"; +- complex fftb[fftsz]; ++// complex fftb[fftsz]; ++ complex fftb[FFTSZ]; + double rpulse[fftsz], tpulse[fftsz]; + double dover = double(over) / fftsz; + double sum; Added: head/comms/soundmodem/files/patch-matlib_mat.hh ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/comms/soundmodem/files/patch-matlib_mat.hh Sun Dec 15 00:50:37 2013 (r336502) @@ -0,0 +1,63 @@ +--- matlib/mat.hh.orig 2013-12-13 08:25:15.148898287 -0500 ++++ matlib/mat.hh 2013-12-13 08:45:23.061999828 -0500 +@@ -91,36 +91,6 @@ + memcpy(c, r, d1 * d3 * sizeof(c[0])); + } + +-template void mdet(const T *c, unsigned int d) +-{ +- T *c2; +- unsigned int i, j, k, l; +- T det = 0, dr; +- +- if (!d) +- return 0; +- if (d == 1) +- return c[0]; +- if (d == 2) +- return c[0] * c[3] - c[1] * c[2]; +- c2 = alloca(sizeof(T)*(d-1)*(d-1)); +- for (i = 0; i < d; i++) { +- for (j = k = 0; j < d; j++) { +- if (j == i) +- continue; +- for (l = 0; l < d-1; l++) +- c2[l*(d-1)+k] = c[(l+1)*d+j]; +- k++; +- } +- dr = mdet(c2, d-1); +- if (i & 1) +- det -= dr * c[i]; +- else +- det += dr * c[i]; +- } +- return det; +-} +- + /* Transpose a matrix (a el C^{d1 x d2}, b el C^{d2 x d1}) */ + template void mtranspose(T *b, const T *a, unsigned int d1, unsigned int d2) + { +@@ -440,23 +410,6 @@ + } + } + +-template void minv(T *ainv, const T *a, unsigned int d) +-{ +- T *u, *y; +- unsigned int *p; +- unsigned int k; +- +- u = alloca(d * d * sizeof(u[0])); +- p = alloca((d-1) * sizeof(p[0])); +- mlufact(u, p, a, d); +- for (k = 0; k < d; k++) { +- y = &ainv[k*d]; +- memset(y, 0, d * sizeof(y[0])); +- y[k] = T(1); +- mlusolve(y, y, u, p, d); +- } +- mtranspose(ainv, ainv, d, d); +-} + + /* + * Gauss-Seidel iterative solver Added: head/comms/soundmodem/files/patch-newqpsk_complex.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/comms/soundmodem/files/patch-newqpsk_complex.h Sun Dec 15 00:50:37 2013 (r336502) @@ -0,0 +1,65 @@ +--- newqpsk/complex.h.orig 2008-12-14 09:47:34.000000000 -0500 ++++ newqpsk/complex.h 2013-12-14 17:54:58.000000000 -0500 +@@ -13,7 +13,7 @@ + /* + * Complex multiplication. + */ +-extern __inline__ complex cmul(complex x, complex y) ++static __inline__ complex cmul(complex x, complex y) + { + complex z; + +@@ -27,7 +27,7 @@ + * Complex ... yeah, what??? Returns a complex number that has the + * properties: |z| = |x| * |y| and arg(z) = arg(y) - arg(x) + */ +-extern __inline__ complex ccor(complex x, complex y) ++static __inline__ complex ccor(complex x, complex y) + { + complex z; + +@@ -40,7 +40,7 @@ + /* + * Real part of the complex ??? + */ +-extern __inline__ float ccorI(complex x, complex y) ++static __inline__ float ccorI(complex x, complex y) + { + return x.re * y.re + x.im * y.im; + } +@@ -48,7 +48,7 @@ + /* + * Imaginary part of the complex ??? + */ +-extern __inline__ float ccorQ(complex x, complex y) ++static __inline__ float ccorQ(complex x, complex y) + { + return x.re * y.im - x.im * y.re; + } +@@ -56,7 +56,7 @@ + /* + * Modulo (absolute value) of a complex number. + */ +-extern __inline__ float cmod(complex x) ++static __inline__ float cmod(complex x) + { + return sqrt(x.re * x.re + x.im * x.im); + } +@@ -64,7 +64,7 @@ + /* + * Square of the absolute value (power). + */ +-extern __inline__ float cpwr(complex x) ++static __inline__ float cpwr(complex x) + { + return (x.re * x.re + x.im * x.im); + } +@@ -72,7 +72,7 @@ + /* + * Argument of a complex number. + */ +-extern __inline__ float carg(complex x) ++static __inline__ float carg(complex x) + { + return atan2(x.im, x.re); + } Added: head/comms/soundmodem/files/patch-newqpsk_fec.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/comms/soundmodem/files/patch-newqpsk_fec.h Sun Dec 15 00:50:37 2013 (r336502) @@ -0,0 +1,20 @@ +--- newqpsk/fec.h.orig 2002-08-09 15:01:52.000000000 -0500 ++++ newqpsk/fec.h 2013-12-14 17:37:25.000000000 -0500 +@@ -13,7 +13,7 @@ + + /* --------------------------------------------------------------------- */ + +-extern inline void init_fec(struct fecstate *f) ++static inline void init_fec(struct fecstate *f) + { + switch (f->feclevel) { + case 0: +@@ -33,7 +33,7 @@ + + /* --------------------------------------------------------------------- */ + +-extern inline void init_inlv(struct fecstate *f) ++static inline void init_inlv(struct fecstate *f) + { + int i; + Added: head/comms/soundmodem/files/patch-newqpsk_filter-i386.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/comms/soundmodem/files/patch-newqpsk_filter-i386.h Sun Dec 15 00:50:37 2013 (r336502) @@ -0,0 +1,11 @@ +--- newqpsk/filter-i386.h.orig 2012-11-07 05:41:08.000000000 -0500 ++++ newqpsk/filter-i386.h 2013-12-14 17:39:18.000000000 -0500 +@@ -1,7 +1,7 @@ + #ifndef _FILTER_I386_H + #define _FILTER_I386_H + #define __HAVE_ARCH_MAC +-extern inline float mac(const float *a, const float *b, unsigned int size) ++static inline float mac(const float *a, const float *b, unsigned int size) + { + float f; + asm volatile ( Added: head/comms/soundmodem/files/patch-newqpsk_filter.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/comms/soundmodem/files/patch-newqpsk_filter.h Sun Dec 15 00:50:37 2013 (r336502) @@ -0,0 +1,11 @@ +--- newqpsk/filter.h.orig 2002-08-09 15:01:52.000000000 -0500 ++++ newqpsk/filter.h 2013-12-14 17:39:02.000000000 -0500 +@@ -12,7 +12,7 @@ + /* ---------------------------------------------------------------------- */ + + #ifndef __HAVE_ARCH_MAC +-extern inline float mac(const float *a, const float *b, unsigned int size) ++static inline float mac(const float *a, const float *b, unsigned int size) + { + float sum = 0; + unsigned int i; Added: head/comms/soundmodem/files/patch-newqpsk_misc.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/comms/soundmodem/files/patch-newqpsk_misc.h Sun Dec 15 00:50:37 2013 (r336502) @@ -0,0 +1,80 @@ +--- newqpsk/misc.h.orig 2002-08-09 15:01:52.000000000 -0500 ++++ newqpsk/misc.h 2013-12-14 17:36:50.000000000 -0500 +@@ -10,7 +10,7 @@ + /* + * Hamming weight (number of bits that are ones). + */ +-extern inline unsigned int hweight32(unsigned int w) ++static inline unsigned int hweight32(unsigned int w) + { + w = (w & 0x55555555) + ((w >> 1) & 0x55555555); + w = (w & 0x33333333) + ((w >> 2) & 0x33333333); +@@ -20,7 +20,7 @@ + return w; + } + +-extern inline unsigned int hweight16(unsigned short w) ++static inline unsigned int hweight16(unsigned short w) + { + w = (w & 0x5555) + ((w >> 1) & 0x5555); + w = (w & 0x3333) + ((w >> 2) & 0x3333); +@@ -29,7 +29,7 @@ + return w; + } + +-extern inline unsigned int hweight8(unsigned char w) ++static inline unsigned int hweight8(unsigned char w) + { + w = (w & 0x55) + ((w >> 1) & 0x55); + w = (w & 0x33) + ((w >> 2) & 0x33); +@@ -42,7 +42,7 @@ + /* + * Reverse order of bits. + */ +-extern inline unsigned int rbits32(unsigned int w) ++static inline unsigned int rbits32(unsigned int w) + { + w = ((w >> 1) & 0x55555555) | ((w << 1) & 0xaaaaaaaa); + w = ((w >> 2) & 0x33333333) | ((w << 2) & 0xcccccccc); +@@ -52,7 +52,7 @@ + return w; + } + +-extern inline unsigned short rbits16(unsigned short w) ++static inline unsigned short rbits16(unsigned short w) + { + w = ((w >> 1) & 0x5555) | ((w << 1) & 0xaaaa); + w = ((w >> 2) & 0x3333) | ((w << 2) & 0xcccc); +@@ -61,7 +61,7 @@ + return w; + } + +-extern inline unsigned char rbits8(unsigned char w) ++static inline unsigned char rbits8(unsigned char w) + { + w = ((w >> 1) & 0x55) | ((w << 1) & 0xaa); + w = ((w >> 2) & 0x33) | ((w << 2) & 0xcc); +@@ -71,7 +71,7 @@ + + /* ---------------------------------------------------------------------- */ + +-extern inline float avg(float average, float input, int scale) ++static inline float avg(float average, float input, int scale) + { + int i; + +@@ -82,12 +82,12 @@ + return (average + input); + } + +-extern inline float avg2(float average, float input, float weight) ++static inline float avg2(float average, float input, float weight) + { + return input * weight + average * (1.0 - weight); + } + +-extern inline float phaseavg(float *data, int len) ++static inline float phaseavg(float *data, int len) + { + float sum = 0.0; + float min = M_PI; Added: head/comms/soundmodem/files/patch-p3dmodem_genp3dtbl.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/comms/soundmodem/files/patch-p3dmodem_genp3dtbl.c Sun Dec 15 00:50:37 2013 (r336502) @@ -0,0 +1,11 @@ +--- p3dmodem/genp3dtbl.c.orig 2002-08-09 15:01:52.000000000 -0500 ++++ p3dmodem/genp3dtbl.c 2013-12-14 17:48:45.000000000 -0500 +@@ -39,6 +39,8 @@ + #include + #include + ++unsigned int log_verblevel; ++ + /* ---------------------------------------------------------------------- */ + + extern inline unsigned int hweight32(unsigned int w) Added: head/comms/soundmodem/files/patch-pammodem_genpamtbl.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/comms/soundmodem/files/patch-pammodem_genpamtbl.c Sun Dec 15 00:50:37 2013 (r336502) @@ -0,0 +1,11 @@ +--- pammodem/genpamtbl.c.orig 2002-08-09 15:01:52.000000000 -0500 ++++ pammodem/genpamtbl.c 2013-12-14 17:52:08.000000000 -0500 +@@ -38,6 +38,8 @@ + #include + #include + ++unsigned int log_verblevel; ++ + /* ---------------------------------------------------------------------- */ + + /* Added: head/comms/soundmodem/files/patch-pskmodem_genpsktbl.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/comms/soundmodem/files/patch-pskmodem_genpsktbl.c Sun Dec 15 00:50:37 2013 (r336502) @@ -0,0 +1,11 @@ +--- pskmodem/genpsktbl.c.orig 2013-12-14 14:02:09.000000000 -0500 ++++ pskmodem/genpsktbl.c 2013-12-14 14:02:34.000000000 -0500 +@@ -40,6 +40,8 @@ + #include + #include + ++unsigned int log_verblevel; ++ + /* ---------------------------------------------------------------------- */ + + /* Added: head/comms/soundmodem/files/patch-pskmodem_pskmodem.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/comms/soundmodem/files/patch-pskmodem_pskmodem.c Sun Dec 15 00:50:37 2013 (r336502) @@ -0,0 +1,11 @@ +--- pskmodem/pskmodem.c.orig 2013-12-13 20:07:01.214995855 -0500 ++++ pskmodem/pskmodem.c 2013-12-13 20:07:04.005995698 -0500 +@@ -262,7 +262,7 @@ + } + } + +-extern inline int calcsync(int *toten, int *corren, cplxshort_t *samples) ++inline int calcsync(int *toten, int *corren, cplxshort_t *samples) + { + const cplxshort_t *tr = traincorrrotated; + unsigned int i; Added: head/comms/soundmodem/files/patch-soundcard_modem.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/comms/soundmodem/files/patch-soundcard_modem.h Sun Dec 15 00:50:37 2013 (r336502) @@ -0,0 +1,11 @@ +--- soundcard/modem.h.orig 2003-01-02 13:53:04.000000000 -0500 ++++ soundcard/modem.h 2013-12-14 17:32:44.000000000 -0500 +@@ -103,7 +103,7 @@ + extern void logprintf(unsigned int level, const char *fmt, ...); + extern void logerr(unsigned int level, const char *st); + extern unsigned int log_verblevel; +-extern inline int logcheck(unsigned int vl) ++static inline int logcheck(unsigned int vl) + { + return vl <= log_verblevel; + } Added: head/comms/soundmodem/files/patch-soundcard_simd.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/comms/soundmodem/files/patch-soundcard_simd.h Sun Dec 15 00:50:37 2013 (r336502) @@ -0,0 +1,79 @@ +--- soundcard/simd.h.orig 2002-08-09 15:01:52.000000000 -0500 ++++ soundcard/simd.h 2013-12-14 17:34:29.000000000 -0500 +@@ -54,16 +54,16 @@ + + #if !defined(USEMMX) && !defined(USEVIS) + +-extern inline void initsimd(int enable) ++static inline void initsimd(int enable) + { + } + +-extern inline int checksimd(void) ++static inline int checksimd(void) + { + return 0; + } + +-extern inline int simdfir16(const int16_t *p1, const int16_t *p2, unsigned int nr) ++static inline int simdfir16(const int16_t *p1, const int16_t *p2, unsigned int nr) + { + int s = 0; + +@@ -72,7 +72,7 @@ + return s; + } + +-extern inline void simdpreparefpu(void) ++static inline void simdpreparefpu(void) + { + } + +@@ -80,9 +80,9 @@ + + extern unsigned int simd_enabled; + +-extern void initsimd(int enable); ++void initsimd(int enable); + +-extern inline int checksimd(void) ++static inline int checksimd(void) + { + return simd_enabled; + } +@@ -91,7 +91,7 @@ + + #define MMXCLOBBER "st", "st(1)", "st(2)", "st(3)", "st(4)", "st(5)", "st(6)", "st(7)" + +-extern inline int simdfir16(const int16_t *p1, const int16_t *p2, unsigned int nr) ++static inline int simdfir16(const int16_t *p1, const int16_t *p2, unsigned int nr) + { + unsigned int i, j; + int s = 0; +@@ -114,7 +114,7 @@ + return s; + } + +-extern inline void simdpreparefpu(void) ++static inline void simdpreparefpu(void) + { + if (checksimd()) + asm volatile("emms"); +@@ -122,7 +122,7 @@ + + #elif defined(USEVIS) + +-/*extern inline*/static int simdfir16(const int16_t *p1, const int16_t *p2, unsigned int nr) ++/*extern static inline*/static int simdfir16(const int16_t *p1, const int16_t *p2, unsigned int nr) + { + double dsum1, dsum2, dsum3, dsum4, arg1, arg2, arg3, arg4; + float sum, sum1, sum2; +@@ -157,7 +157,7 @@ + return s; + } + +-extern inline void simdpreparefpu(void) ++static inline void simdpreparefpu(void) + { + } + Added: head/comms/soundmodem/files/patch-soundcard_winlog.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/comms/soundmodem/files/patch-soundcard_winlog.c Sun Dec 15 00:50:37 2013 (r336502) @@ -0,0 +1,11 @@ +--- soundcard/winlog.c.orig 2013-12-13 08:55:02.797125391 -0500 ++++ soundcard/winlog.c 2013-12-13 08:55:35.636772475 -0500 +@@ -44,7 +44,7 @@ + + /* ---------------------------------------------------------------------- */ + +-unsigned int log_verblevel = 0; ++extern unsigned int log_verblevel = 0; + static HANDLE logh = NULL; + + /* ---------------------------------------------------------------------- */ Modified: head/comms/soundmodem/pkg-plist ============================================================================== --- head/comms/soundmodem/pkg-plist Sun Dec 15 00:02:59 2013 (r336501) +++ head/comms/soundmodem/pkg-plist Sun Dec 15 00:50:37 2013 (r336502) @@ -5,6 +5,8 @@ include/modem.h include/simd.h share/locale/fr/LC_MESSAGES/soundmodem.mo share/locale/sv/LC_MESSAGES/soundmodem.mo +man/man8/soundmodem.8.gz +man/man8/soundmodemconfig.8.gz @dirrmtry share/locale/fr/LC_MESSAGES @dirrmtry share/locale/sv/LC_MESSAGES @dirrmtry share/locale/fr From owner-svn-ports-head@FreeBSD.ORG Sun Dec 15 00:56:06 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 9E5624D5; Sun, 15 Dec 2013 00:56:06 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 7C5AC1AC0; Sun, 15 Dec 2013 00:56:06 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBF0u6MU046146; Sun, 15 Dec 2013 00:56:06 GMT (envelope-from bapt@svn.freebsd.org) Received: (from bapt@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBF0u522046140; Sun, 15 Dec 2013 00:56:05 GMT (envelope-from bapt@svn.freebsd.org) Message-Id: <201312150056.rBF0u522046140@svn.freebsd.org> From: Baptiste Daroussin Date: Sun, 15 Dec 2013 00:56:05 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r336503 - in head/lang/lua52: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 15 Dec 2013 00:56:06 -0000 Author: bapt Date: Sun Dec 15 00:56:05 2013 New Revision: 336503 URL: http://svnweb.freebsd.org/changeset/ports/336503 Log: Update to 5.2.3 Pass maintainership to lua@ Lots of cleanup in the Makefile Reduce patching Support stage Deleted: head/lang/lua52/files/patch-Makefile Modified: head/lang/lua52/Makefile head/lang/lua52/distinfo head/lang/lua52/pkg-plist Modified: head/lang/lua52/Makefile ============================================================================== --- head/lang/lua52/Makefile Sun Dec 15 00:50:37 2013 (r336502) +++ head/lang/lua52/Makefile Sun Dec 15 00:56:05 2013 (r336503) @@ -2,74 +2,60 @@ # $FreeBSD$ PORTNAME= lua -PORTVERSION= 5.2.2 -PORTREVISION= 1 +PORTVERSION= 5.2.3 CATEGORIES= lang MASTER_SITES= http://www.lua.org/ftp/ -PKGNAMESUFFIX= ${LUA_VER_STR} +PKGNAMESUFFIX= 52 -MAINTAINER= fiziologus@gmail.com +MAINTAINER= lua@FreeBSD.org COMMENT= Small, compilable scripting language providing easy access to C code LICENSE= MIT -#USE_LUA= 5.2 LUA_VER= 5.2 -LUA_VER_SH= 1 -LUA_VER_STR= 52 -LUA_SUBDIR= lua${LUA_VER_STR} -LUA_PREFIX= ${PREFIX} -LUA_BINDIR= ${LUA_PREFIX}/bin/${LUA_SUBDIR} -LUA_INCDIR= ${LUA_PREFIX}/include/${LUA_SUBDIR} -LUA_LIBDIR= ${LUA_PREFIX}/lib/${LUA_SUBDIR} -LUA_MODLIBDIR= ${LUA_PREFIX}/lib/lua/${LUA_VER} -LUA_MODSHAREDIR= ${LUA_PREFIX}/share/lua/${LUA_VER} - -ALL_TARGET= freebsd +USES= pkgconfig readline USE_LDCONFIG= yes -MAKE_ENV= LUA_SONAME="liblua-${LUA_VER}.so.${LUA_VER_SH}" \ - MYCFLAGS="${CFLAGS}" MYLDFLAGS="${LDFLAGS}" + +# Overriding __MAKE_CONF makes sure that we don't re-parse +# /etc/make.conf during do-build, which would jeopardize the build +# if, for instance, the user set CFLAGS=mumble +# NOTE: /etc/make.conf is read BEFORE Makefile, so we already +# have its settings when we get here. +# See http://wiki.freebsd.org/MatthiasAndree/LuaLessonsLearnt +MAKE_ARGS= __MAKE_CONF=${NONEXISTENT} # liblua.so requires libm, so make sure it has an explicit dependency # so that applications need not second-guess lua's dependencies. LDFLAGS+= -lm -pthread +BUILD_WRKSRC= ${WRKSRC}/src +MAKE_ARGS+= MYCFLAGS="${CFLAGS} -DLUA_USE_LINUX" \ + MYLDFLAGS="${LDFLAGS} -Wl,-E -lreadline" \ + CC="${CC}" \ + LUA_T=lua52 \ + LUAC_T=luac52 \ + LUA_A=liblua-${LUA_VER}.a \ + LUA_SO=liblua-${LUA_VER}.so \ + TO_BIN="lua52 luac52" \ + TO_LIB="liblua-${LUA_VER}.a liblua-${LUA_VER}.so" \ + INSTALL_TOP=${STAGEDIR}${PREFIX} \ + INSTALL_INC=${STAGEDIR}${PREFIX}/include/lua52 \ + INSTALL_EXEC="${INSTALL_PROGRAM}" -MAN1= lua-${LUA_VER}.1 luac-${LUA_VER}.1 -DOCSDIR= ${PREFIX}/share/doc/${LUA_SUBDIR} - -NO_STAGE= yes -.include +.include .if ${ARCH} == "amd64" || ${ARCH} == "powerpc" CFLAGS+= -fPIC .endif post-patch: - @${REINPLACE_CMD} -Ee \ - "s|%%LUA_PREFIX%%|${LUA_PREFIX}| ; \ - s|%%LUA_BINDIR%%|${LUA_BINDIR}| ; \ - s|%%LUA_INCDIR%%|${LUA_INCDIR}| ; \ - s|%%LUA_LIBDIR%%|${LUA_LIBDIR}| ; \ - s|%%LUA_MODSHAREDIR%%|${LUA_MODSHAREDIR}| ; \ - s|%%LUA_MODLIBDIR%%|${LUA_MODLIBDIR}| ; \ - s|%%LUA_VER_SH%%|${LUA_VER_SH}|" \ - ${WRKSRC}/Makefile @${REINPLACE_CMD} -e 's,rand *(,random(,g' \ ${WRKSRC}/src/lmathlib.c @${REINPLACE_CMD} -e "/LUA_ROOT/s|/usr/local|${LUA_PREFIX}|" \ ${WRKSRC}/src/luaconf.h post-install: -.for f in lua luac - ${LN} -sf ${LUA_BINDIR}/${f} ${PREFIX}/bin/${f}-${LUA_VER} -.endfor - ${LN} -sf ${LUA_LIBDIR}/liblua-${LUA_VER}.so.${LUA_VER_SH} ${LUA_LIBDIR}/liblua.so - ${LN} -sf ${LUA_SUBDIR}/liblua-${LUA_VER}.so.${LUA_VER_SH} ${PREFIX}/lib - ${LN} -sf liblua-${LUA_VER}.so.${LUA_VER_SH} ${PREFIX}/lib/liblua-${LUA_VER}.so - -# Documentation. -.if ${PORT_OPTIONS:MDOCS} - ${MKDIR} ${DOCSDIR} - cd ${WRKSRC}/doc && ${INSTALL_DATA} *.html *.gif *.css *.png ${DOCSDIR} -.endif + @${MV} ${STAGEDIR}${PREFIX}/man/man1/lua.1 \ + ${STAGEDIR}${PREFIX}/man/man1/lua52.1 + @${MV} ${STAGEDIR}${PREFIX}/man/man1/luac.1 \ + ${STAGEDIR}${PREFIX}/man/man1/luac52.1 -.include +.include Modified: head/lang/lua52/distinfo ============================================================================== --- head/lang/lua52/distinfo Sun Dec 15 00:50:37 2013 (r336502) +++ head/lang/lua52/distinfo Sun Dec 15 00:56:05 2013 (r336503) @@ -1,2 +1,2 @@ -SHA256 (lua-5.2.2.tar.gz) = 3fd67de3f5ed133bf312906082fa524545c6b9e1b952e8215ffbd27113f49f00 -SIZE (lua-5.2.2.tar.gz) = 251713 +SHA256 (lua-5.2.3.tar.gz) = 13c2fb97961381f7d06d5b5cea55b743c163800896fd5c5e2356201d3619002d +SIZE (lua-5.2.3.tar.gz) = 251195 Modified: head/lang/lua52/pkg-plist ============================================================================== --- head/lang/lua52/pkg-plist Sun Dec 15 00:50:37 2013 (r336502) +++ head/lang/lua52/pkg-plist Sun Dec 15 00:56:05 2013 (r336503) @@ -1,29 +1,16 @@ -bin/lua-5.2 -bin/lua52/lua -bin/lua52/luac -bin/luac-5.2 +bin/lua52 +bin/luac52 include/lua52/lauxlib.h include/lua52/lua.h include/lua52/lua.hpp include/lua52/luaconf.h include/lua52/lualib.h +lib/liblua-5.2.a lib/liblua-5.2.so -lib/liblua-5.2.so.1 -lib/lua52/liblua-5.2.so.1 -lib/lua52/liblua.a -lib/lua52/liblua.so -%%PORTDOCS%%%%DOCSDIR%%/contents.html -%%PORTDOCS%%%%DOCSDIR%%/logo.gif -%%PORTDOCS%%%%DOCSDIR%%/lua.css -%%PORTDOCS%%%%DOCSDIR%%/manual.css -%%PORTDOCS%%%%DOCSDIR%%/manual.html -%%PORTDOCS%%%%DOCSDIR%%/osi-certified-72x60.png -%%PORTDOCS%%%%DOCSDIR%%/readme.html -%%PORTDOCS%%@dirrm %%DOCSDIR%% -@dirrm bin/lua52 -@dirrm include/lua52 -@dirrm lib/lua52 +man/man1/lua52.1.gz +man/man1/luac52.1.gz +@dirrmtry %%DATADIR%%/5.2 +@dirrmtry %%DATADIR%% @dirrmtry lib/lua/5.2 @dirrmtry lib/lua -@dirrmtry share/lua/5.2 -@dirrmtry share/lua +@dirrmtry include/lua52 From owner-svn-ports-head@FreeBSD.ORG Sun Dec 15 02:25:08 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 9A803CF5; Sun, 15 Dec 2013 02:25:08 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 867F71FE6; Sun, 15 Dec 2013 02:25:08 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBF2P8Ix078376; Sun, 15 Dec 2013 02:25:08 GMT (envelope-from bdrewery@svn.freebsd.org) Received: (from bdrewery@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBF2P8be078374; Sun, 15 Dec 2013 02:25:08 GMT (envelope-from bdrewery@svn.freebsd.org) Message-Id: <201312150225.rBF2P8be078374@svn.freebsd.org> From: Bryan Drewery Date: Sun, 15 Dec 2013 02:25:08 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r336504 - head/ports-mgmt/portupgrade X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 15 Dec 2013 02:25:08 -0000 Author: bdrewery Date: Sun Dec 15 02:25:07 2013 New Revision: 336504 URL: http://svnweb.freebsd.org/changeset/ports/336504 Log: - Update to 2.4.12 Changes: * Fix namespace clash with TSort when using bundler Modified: head/ports-mgmt/portupgrade/Makefile head/ports-mgmt/portupgrade/distinfo Modified: head/ports-mgmt/portupgrade/Makefile ============================================================================== --- head/ports-mgmt/portupgrade/Makefile Sun Dec 15 00:56:05 2013 (r336503) +++ head/ports-mgmt/portupgrade/Makefile Sun Dec 15 02:25:07 2013 (r336504) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= portupgrade -PORTVERSION= 2.4.11.3 +PORTVERSION= 2.4.12 PORTEPOCH= 2 CATEGORIES= ports-mgmt MASTER_SITES= SF/portupgrade/pkgtools/dist/ \ Modified: head/ports-mgmt/portupgrade/distinfo ============================================================================== --- head/ports-mgmt/portupgrade/distinfo Sun Dec 15 00:56:05 2013 (r336503) +++ head/ports-mgmt/portupgrade/distinfo Sun Dec 15 02:25:07 2013 (r336504) @@ -1,2 +1,2 @@ -SHA256 (portupgrade/pkgtools-2.4.11.3.tar.bz2) = f80b2cef05c940eddf5326f5dcb87442ac922d924bd2301135eb69e2a69b2c06 -SIZE (portupgrade/pkgtools-2.4.11.3.tar.bz2) = 85885 +SHA256 (portupgrade/pkgtools-2.4.12.tar.bz2) = 5b389fc877798d5948698923daf2d166fa724ba9d932505253398fc7721e1d82 +SIZE (portupgrade/pkgtools-2.4.12.tar.bz2) = 85928 From owner-svn-ports-head@FreeBSD.ORG Sun Dec 15 08:37:07 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 8FFBC95B; Sun, 15 Dec 2013 08:37:07 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 6223C13CF; Sun, 15 Dec 2013 08:37:07 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBF8b7DM011505; Sun, 15 Dec 2013 08:37:07 GMT (envelope-from koobs@svn.freebsd.org) Received: (from koobs@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBF8b7sM011503; Sun, 15 Dec 2013 08:37:07 GMT (envelope-from koobs@svn.freebsd.org) Message-Id: <201312150837.rBF8b7sM011503@svn.freebsd.org> From: Kubilay Kocak Date: Sun, 15 Dec 2013 08:37:07 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r336505 - head/databases/py-fdb X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 15 Dec 2013 08:37:07 -0000 Author: koobs Date: Sun Dec 15 08:37:06 2013 New Revision: 336505 URL: http://svnweb.freebsd.org/changeset/ports/336505 Log: databases/py-fdb: Update to 1.4, Set BROKEN on 9+ i386 - Update to 1.4 - Set BROKEN on FreeBSD 9+ i386 - Enable STAGE support - Enable AUTOPLIST support delete pkg-plist accordingly - Remove py3k-fix-pkg-plist.inc hack (AUTOPLIST) - Whitespace alignment PR: ports/184357 Submitted by: Jose jachuf Deleted: head/databases/py-fdb/pkg-plist Modified: head/databases/py-fdb/Makefile head/databases/py-fdb/distinfo (contents, props changed) Modified: head/databases/py-fdb/Makefile ============================================================================== --- head/databases/py-fdb/Makefile Sun Dec 15 02:25:07 2013 (r336504) +++ head/databases/py-fdb/Makefile Sun Dec 15 08:37:06 2013 (r336505) @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= fdb -PORTVERSION= 1.1 -PORTREVISION= 1 +PORTVERSION= 1.4 CATEGORIES= databases python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -15,14 +14,14 @@ LICENSE= BSD LIB_DEPENDS= libfbclient.so:${PORTSDIR}/databases/firebird25-client -USE_PYTHON= yes -USE_PYDISTUTILS=easy_install +USE_PYTHON= yes +USE_PYDISTUTILS= easy_install +PYDISTUTILS_AUTOPLIST= yes -NO_STAGE= yes .include -.if ${PYTHON_REL} >= 320 -.include "${FILESDIR}/py3k-fix-pkg-plist.inc" +.if ${ARCH} == i386 && ${OSVERSION} >= 900000 +BROKEN= Does not compile on FreeBSD 9 i386 .endif post-patch: Modified: head/databases/py-fdb/distinfo ============================================================================== --- head/databases/py-fdb/distinfo Sun Dec 15 02:25:07 2013 (r336504) +++ head/databases/py-fdb/distinfo Sun Dec 15 08:37:06 2013 (r336505) @@ -1,2 +1,2 @@ -SHA256 (fdb-1.1.tar.gz) = 82bc531e3f09b8dd8e1e720a0fc6e685ef8eae34abc4f3ec6aa7c3da926bc503 -SIZE (fdb-1.1.tar.gz) = 485256 +SHA256 (fdb-1.4.tar.gz) = 531b4b7c1f13bf60f216e0b83c835f62c817ce0372fe8afd82f447554235d633 +SIZE (fdb-1.4.tar.gz) = 895928 From owner-svn-ports-head@FreeBSD.ORG Sun Dec 15 08:53:08 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 089C2D57; Sun, 15 Dec 2013 08:53:08 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id E88A71502; Sun, 15 Dec 2013 08:53:07 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBF8r7UO018160; Sun, 15 Dec 2013 08:53:07 GMT (envelope-from antoine@svn.freebsd.org) Received: (from antoine@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBF8r7vC018159; Sun, 15 Dec 2013 08:53:07 GMT (envelope-from antoine@svn.freebsd.org) Message-Id: <201312150853.rBF8r7vC018159@svn.freebsd.org> From: Antoine Brodin Date: Sun, 15 Dec 2013 08:53:07 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r336506 - head/www/mohawk X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 15 Dec 2013 08:53:08 -0000 Author: antoine Date: Sun Dec 15 08:53:07 2013 New Revision: 336506 URL: http://svnweb.freebsd.org/changeset/ports/336506 Log: Finish stage support Reviewed by: maintainer Modified: head/www/mohawk/Makefile Modified: head/www/mohawk/Makefile ============================================================================== --- head/www/mohawk/Makefile Sun Dec 15 08:37:06 2013 (r336505) +++ head/www/mohawk/Makefile Sun Dec 15 08:53:07 2013 (r336506) @@ -15,16 +15,15 @@ LICENSE= BSD LIB_DEPENDS= event-2:${PORTSDIR}/devel/libevent2 PLIST_FILES+= bin/mhtpasswd \ + man/man5/mohawk.conf.5.gz \ + man/man8/mhtpasswd.8.gz \ + man/man8/mohawk.8.gz \ sbin/mohawk \ etc/mohawk.conf.sample PORTEXAMPLES= * USE_RC_SUBR= mohawk -MAN5= mohawk.conf.5 -MAN8= mhtpasswd.8 \ - mohawk.8 - CFLAGS+= -I${LOCALBASE}/include/event2/compat -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib/event2 From owner-svn-ports-head@FreeBSD.ORG Sun Dec 15 08:55:55 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 86C44E4A; Sun, 15 Dec 2013 08:55:55 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 6F340150F; Sun, 15 Dec 2013 08:55:55 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBF8ttro018746; Sun, 15 Dec 2013 08:55:55 GMT (envelope-from az@svn.freebsd.org) Received: (from az@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBF8tpwx018726; Sun, 15 Dec 2013 08:55:51 GMT (envelope-from az@svn.freebsd.org) Message-Id: <201312150855.rBF8tpwx018726@svn.freebsd.org> From: Andrej Zverev Date: Sun, 15 Dec 2013 08:55:51 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r336507 - in head: databases/p5-DBIx-Class-MooseColumns devel/p5-Class-Load devel/p5-Data-ParseBinary devel/p5-Hash-Flatten devel/p5-MooseX-Types-LoadableClass net/p5-Net-BGP X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 15 Dec 2013 08:55:55 -0000 Author: az Date: Sun Dec 15 08:55:51 2013 New Revision: 336507 URL: http://svnweb.freebsd.org/changeset/ports/336507 Log: - add stage support - pet portlint Modified: head/databases/p5-DBIx-Class-MooseColumns/Makefile head/databases/p5-DBIx-Class-MooseColumns/pkg-descr (contents, props changed) head/databases/p5-DBIx-Class-MooseColumns/pkg-plist (contents, props changed) head/devel/p5-Class-Load/Makefile head/devel/p5-Class-Load/pkg-descr (contents, props changed) head/devel/p5-Class-Load/pkg-plist (contents, props changed) head/devel/p5-Data-ParseBinary/Makefile head/devel/p5-Data-ParseBinary/pkg-descr (contents, props changed) head/devel/p5-Data-ParseBinary/pkg-plist (contents, props changed) head/devel/p5-Hash-Flatten/Makefile head/devel/p5-Hash-Flatten/pkg-descr (contents, props changed) head/devel/p5-Hash-Flatten/pkg-plist head/devel/p5-MooseX-Types-LoadableClass/Makefile head/devel/p5-MooseX-Types-LoadableClass/pkg-descr (contents, props changed) head/devel/p5-MooseX-Types-LoadableClass/pkg-plist (contents, props changed) head/net/p5-Net-BGP/Makefile head/net/p5-Net-BGP/pkg-plist (contents, props changed) Modified: head/databases/p5-DBIx-Class-MooseColumns/Makefile ============================================================================== --- head/databases/p5-DBIx-Class-MooseColumns/Makefile Sun Dec 15 08:53:07 2013 (r336506) +++ head/databases/p5-DBIx-Class-MooseColumns/Makefile Sun Dec 15 08:55:51 2013 (r336507) @@ -33,11 +33,4 @@ TEST_DEPENDS= p5-Test-Aggregate>=0.363:$ USES= perl5 USE_PERL5= configure -MAN3= \ - DBIx::Class::MooseColumns.3 \ - DBIx::Class::MooseColumns::Meta::Role::Attribute.3 \ - DBIx::Class::MooseColumns::Meta::Role::Attribute::DBICColumn.3 \ - DBIx::Class::MooseColumns::Meta::Role::Attribute::DBICColumn::Inflated.3 - -NO_STAGE= yes .include Modified: head/databases/p5-DBIx-Class-MooseColumns/pkg-descr ============================================================================== --- head/databases/p5-DBIx-Class-MooseColumns/pkg-descr Sun Dec 15 08:53:07 2013 (r336506) +++ head/databases/p5-DBIx-Class-MooseColumns/pkg-descr Sun Dec 15 08:55:51 2013 (r336507) @@ -6,4 +6,4 @@ Class::Accessor::Grouped-generated acces Moose-generated accessor methods so that you can use more of the wonderful powers of Moose (eg. type constraints, triggers, ...). -WWW: http://search.cpan.org/dist/DBIx-Class-MooseColumns/ +WWW: http://search.cpan.org/dist/DBIx-Class-MooseColumns/ Modified: head/databases/p5-DBIx-Class-MooseColumns/pkg-plist ============================================================================== --- head/databases/p5-DBIx-Class-MooseColumns/pkg-plist Sun Dec 15 08:53:07 2013 (r336506) +++ head/databases/p5-DBIx-Class-MooseColumns/pkg-plist Sun Dec 15 08:55:51 2013 (r336507) @@ -3,6 +3,10 @@ %%SITE_PERL%%/DBIx/Class/MooseColumns/Meta/Role/Attribute.pm %%SITE_PERL%%/DBIx/Class/MooseColumns.pm %%SITE_PERL%%/%%PERL_ARCH%%/auto/DBIx/Class/MooseColumns/.packlist +%%PERL5_MAN3%%/DBIx::Class::MooseColumns.3.gz +%%PERL5_MAN3%%/DBIx::Class::MooseColumns::Meta::Role::Attribute.3.gz +%%PERL5_MAN3%%/DBIx::Class::MooseColumns::Meta::Role::Attribute::DBICColumn.3.gz +%%PERL5_MAN3%%/DBIx::Class::MooseColumns::Meta::Role::Attribute::DBICColumn::Inflated.3.gz @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/DBIx/Class/MooseColumns @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/DBIx/Class @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/DBIx Modified: head/devel/p5-Class-Load/Makefile ============================================================================== --- head/devel/p5-Class-Load/Makefile Sun Dec 15 08:53:07 2013 (r336506) +++ head/devel/p5-Class-Load/Makefile Sun Dec 15 08:55:51 2013 (r336507) @@ -18,7 +18,6 @@ BUILD_DEPENDS= p5-Data-OptList>0:${PORTS p5-Package-Stash>=0.14:${PORTSDIR}/devel/p5-Package-Stash \ p5-Try-Tiny>=0:${PORTSDIR}/lang/p5-Try-Tiny RUN_DEPENDS:= ${BUILD_DEPENDS} - TEST_DEPENDS= p5-Test-Fatal>=0:${PORTSDIR}/devel/p5-Test-Fatal \ p5-Test-Requires>=0:${PORTSDIR}/devel/p5-Test-Requires \ p5-Test-Without-Module>=0:${PORTSDIR}/devel/p5-Test-Without-Module @@ -26,7 +25,4 @@ TEST_DEPENDS= p5-Test-Fatal>=0:${PORTSDI USES= perl5 USE_PERL5= configure -MAN3= Class::Load.3 - -NO_STAGE= yes .include Modified: head/devel/p5-Class-Load/pkg-descr ============================================================================== --- head/devel/p5-Class-Load/pkg-descr Sun Dec 15 08:53:07 2013 (r336506) +++ head/devel/p5-Class-Load/pkg-descr Sun Dec 15 08:55:51 2013 (r336507) @@ -8,4 +8,4 @@ Asking %INC is an option, but that will which the filename does not correspond to the package name. For that, we provide is_class_loaded 'Class::Name'. -WWW: http://search.cpan.org/dist/Class-Load/ +WWW: http://search.cpan.org/dist/Class-Load/ Modified: head/devel/p5-Class-Load/pkg-plist ============================================================================== --- head/devel/p5-Class-Load/pkg-plist Sun Dec 15 08:53:07 2013 (r336506) +++ head/devel/p5-Class-Load/pkg-plist Sun Dec 15 08:55:51 2013 (r336507) @@ -1,6 +1,7 @@ %%SITE_PERL%%/Class/Load/PP.pm %%SITE_PERL%%/Class/Load.pm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/Load/.packlist +%%PERL5_MAN3%%/Class::Load.3.gz @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Class/Load @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Class @dirrmtry %%SITE_PERL%%/Class/Load Modified: head/devel/p5-Data-ParseBinary/Makefile ============================================================================== --- head/devel/p5-Data-ParseBinary/Makefile Sun Dec 15 08:53:07 2013 (r336506) +++ head/devel/p5-Data-ParseBinary/Makefile Sun Dec 15 08:55:51 2013 (r336507) @@ -11,22 +11,9 @@ MAINTAINER= az@FreeBSD.org COMMENT= Yet Another parser for binary structures BUILD_DEPENDS= p5-Math-BigInt>=1.993:${PORTSDIR}/math/p5-Math-BigInt - TEST_DEPENDS= p5-Test-Simple>=0.96:${PORTSDIR}/devel/p5-Test-Simple USES= perl5 USE_PERL5= configure -MAN3= Data::ParseBinary::Graphics::WMF.3 \ - Data::ParseBinary::Graphics::EMF.3 \ - Data::ParseBinary.3 \ - Data::ParseBinary::Graphics::BMP.3 \ - Data::ParseBinary::Executable::ELF32.3 \ - Data::ParseBinary::Executable::PE32.3 \ - Data::ParseBinary::Data::Cap.3 \ - Data::ParseBinary::Data::Netflow.3 \ - Data::ParseBinary::Graphics::PNG.3 \ - Data::ParseBinary::FileSystem::MBR.3 - -NO_STAGE= yes .include Modified: head/devel/p5-Data-ParseBinary/pkg-descr ============================================================================== --- head/devel/p5-Data-ParseBinary/pkg-descr Sun Dec 15 08:53:07 2013 (r336506) +++ head/devel/p5-Data-ParseBinary/pkg-descr Sun Dec 15 08:55:51 2013 (r336507) @@ -3,4 +3,4 @@ structures, parsing binary to hash/array binary data from hash/array data structure. -WWW: http://search.cpan.org/dist/Data-ParseBinary/ +WWW: http://search.cpan.org/dist/Data-ParseBinary/ Modified: head/devel/p5-Data-ParseBinary/pkg-plist ============================================================================== --- head/devel/p5-Data-ParseBinary/pkg-plist Sun Dec 15 08:53:07 2013 (r336506) +++ head/devel/p5-Data-ParseBinary/pkg-plist Sun Dec 15 08:55:51 2013 (r336507) @@ -18,6 +18,16 @@ %%SITE_PERL%%/Data/ParseBinary/Core.pm %%SITE_PERL%%/Data/ParseBinary.pm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Data/ParseBinary/.packlist +%%PERL5_MAN3%%/Data::ParseBinary::Graphics::WMF.3.gz +%%PERL5_MAN3%%/Data::ParseBinary::Graphics::EMF.3.gz +%%PERL5_MAN3%%/Data::ParseBinary.3.gz +%%PERL5_MAN3%%/Data::ParseBinary::Graphics::BMP.3.gz +%%PERL5_MAN3%%/Data::ParseBinary::Executable::ELF32.3.gz +%%PERL5_MAN3%%/Data::ParseBinary::Executable::PE32.3.gz +%%PERL5_MAN3%%/Data::ParseBinary::Data::Cap.3.gz +%%PERL5_MAN3%%/Data::ParseBinary::Data::Netflow.3.gz +%%PERL5_MAN3%%/Data::ParseBinary::Graphics::PNG.3.gz +%%PERL5_MAN3%%/Data::ParseBinary::FileSystem::MBR.3.gz @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Data/ParseBinary @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Data @dirrmtry %%SITE_PERL%%/Data/ParseBinary/Stream Modified: head/devel/p5-Hash-Flatten/Makefile ============================================================================== --- head/devel/p5-Hash-Flatten/Makefile Sun Dec 15 08:53:07 2013 (r336506) +++ head/devel/p5-Hash-Flatten/Makefile Sun Dec 15 08:55:51 2013 (r336507) @@ -16,7 +16,4 @@ RUN_DEPENDS:= ${BUILD_DEPENDS} USES= perl5 USE_PERL5= configure -MAN3= Hash::Flatten.3 - -NO_STAGE= yes .include Modified: head/devel/p5-Hash-Flatten/pkg-descr ============================================================================== --- head/devel/p5-Hash-Flatten/pkg-descr Sun Dec 15 08:53:07 2013 (r336506) +++ head/devel/p5-Hash-Flatten/pkg-descr Sun Dec 15 08:55:51 2013 (r336507) @@ -2,4 +2,4 @@ Converts back and forth between a nested delimited key-value pairs. Useful for protocols that only support key-value pairs (such as CGI and DBMs). -WWW: http://search.cpan.org/dist/Hash-Flatten/ +WWW: http://search.cpan.org/dist/Hash-Flatten/ Modified: head/devel/p5-Hash-Flatten/pkg-plist ============================================================================== --- head/devel/p5-Hash-Flatten/pkg-plist Sun Dec 15 08:53:07 2013 (r336506) +++ head/devel/p5-Hash-Flatten/pkg-plist Sun Dec 15 08:55:51 2013 (r336507) @@ -1,5 +1,6 @@ %%SITE_PERL%%/Hash/Flatten.pm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Hash/Flatten/.packlist +%%PERL5_MAN3%%/Hash::Flatten.3.gz @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Hash/Flatten @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Hash @dirrmtry %%SITE_PERL%%/Hash Modified: head/devel/p5-MooseX-Types-LoadableClass/Makefile ============================================================================== --- head/devel/p5-MooseX-Types-LoadableClass/Makefile Sun Dec 15 08:53:07 2013 (r336506) +++ head/devel/p5-MooseX-Types-LoadableClass/Makefile Sun Dec 15 08:55:51 2013 (r336507) @@ -25,7 +25,4 @@ TEST_DEPENDS= p5-Moose>=0:${PORTSDIR}/de USES= perl5 USE_PERL5= configure -MAN3= MooseX::Types::LoadableClass.3 - -NO_STAGE= yes .include Modified: head/devel/p5-MooseX-Types-LoadableClass/pkg-descr ============================================================================== --- head/devel/p5-MooseX-Types-LoadableClass/pkg-descr Sun Dec 15 08:53:07 2013 (r336506) +++ head/devel/p5-MooseX-Types-LoadableClass/pkg-descr Sun Dec 15 08:55:51 2013 (r336507) @@ -1,4 +1,4 @@ MooseX::Types::LoadableClass - ClassName type constraint with coercion to load the class. -WWW: http://search.cpan.org/dist/MooseX-Types-LoadableClass/ +WWW: http://search.cpan.org/dist/MooseX-Types-LoadableClass/ Modified: head/devel/p5-MooseX-Types-LoadableClass/pkg-plist ============================================================================== --- head/devel/p5-MooseX-Types-LoadableClass/pkg-plist Sun Dec 15 08:53:07 2013 (r336506) +++ head/devel/p5-MooseX-Types-LoadableClass/pkg-plist Sun Dec 15 08:55:51 2013 (r336507) @@ -1,5 +1,6 @@ %%SITE_PERL%%/%%PERL_ARCH%%/auto/MooseX/Types/LoadableClass/.packlist %%SITE_PERL%%/MooseX/Types/LoadableClass.pm +%%PERL5_MAN3%%/MooseX::Types::LoadableClass.3.gz @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/MooseX/Types/LoadableClass @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/MooseX/Types @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/MooseX Modified: head/net/p5-Net-BGP/Makefile ============================================================================== --- head/net/p5-Net-BGP/Makefile Sun Dec 15 08:53:07 2013 (r336506) +++ head/net/p5-Net-BGP/Makefile Sun Dec 15 08:55:51 2013 (r336507) @@ -13,9 +13,4 @@ COMMENT= Border Gateway Protocol version USES= perl5 USE_PERL5= configure -MAN3= Net::BGP.3 Net::BGP::ASPath.3 Net::BGP::NLRI.3 \ - Net::BGP::Notification.3 Net::BGP::Peer.3 Net::BGP::Process.3 \ - Net::BGP::Refresh.3 Net::BGP::Transport.3 Net::BGP::Update.3 - -NO_STAGE= yes .include Modified: head/net/p5-Net-BGP/pkg-plist ============================================================================== --- head/net/p5-Net-BGP/pkg-plist Sun Dec 15 08:53:07 2013 (r336506) +++ head/net/p5-Net-BGP/pkg-plist Sun Dec 15 08:55:51 2013 (r336507) @@ -8,6 +8,15 @@ %%SITE_PERL%%/Net/BGP/Refresh.pm %%SITE_PERL%%/Net/BGP/Transport.pm %%SITE_PERL%%/Net/BGP/Update.pm +%%PERL5_MAN3%%/Net::BGP.3.gz +%%PERL5_MAN3%%/Net::BGP::ASPath.3.gz +%%PERL5_MAN3%%/Net::BGP::NLRI.3.gz +%%PERL5_MAN3%%/Net::BGP::Notification.3.gz +%%PERL5_MAN3%%/Net::BGP::Peer.3.gz +%%PERL5_MAN3%%/Net::BGP::Process.3.gz +%%PERL5_MAN3%%/Net::BGP::Refresh.3.gz +%%PERL5_MAN3%%/Net::BGP::Transport.3.gz +%%PERL5_MAN3%%/Net::BGP::Update.3.gz @dirrm %%SITE_PERL%%/Net/BGP @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Net/BGP @dirrmtry %%SITE_PERL%%/Net From owner-svn-ports-head@FreeBSD.ORG Sun Dec 15 09:09:31 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id A5336F8F; Sun, 15 Dec 2013 09:09:31 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 767B315A3; Sun, 15 Dec 2013 09:09:31 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBF99VEj023093; Sun, 15 Dec 2013 09:09:31 GMT (envelope-from ohauer@svn.freebsd.org) Received: (from ohauer@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBF99V07023091; Sun, 15 Dec 2013 09:09:31 GMT (envelope-from ohauer@svn.freebsd.org) Message-Id: <201312150909.rBF99V07023091@svn.freebsd.org> From: Olli Hauer Date: Sun, 15 Dec 2013 09:09:31 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r336508 - in head/ports-mgmt/tinderbox: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 15 Dec 2013 09:09:31 -0000 Author: ohauer Date: Sun Dec 15 09:09:30 2013 New Revision: 336508 URL: http://svnweb.freebsd.org/changeset/ports/336508 Log: - update to 4.1.0 Changes in this release include: - Major rework of dependency calculations for initial Makefile building. Dependencies are now built inside of Build jails to prevent any cross-contamination. OPTIONS are handled properly via a new static d4p port (needs to be installed on the host). - Fix enterbuild so that the sleepme file can be properly deleted - Add support for protocol flag in createJail command when using LFTP update method. - Add some more variable exceptions that are used by bmake - Fix ports fetching on IPv6 hosts - Correct some clang issues, typos and style problems in pnohang - Add support for 11.X - Force CC and CXX to be the GNU versions for FreeBSD < 9 PR: 184391 Submitted by: ohauer Approved by: maintainer timeout (14 days) Deleted: head/ports-mgmt/tinderbox/files/patch-chroot Modified: head/ports-mgmt/tinderbox/Makefile head/ports-mgmt/tinderbox/distinfo Modified: head/ports-mgmt/tinderbox/Makefile ============================================================================== --- head/ports-mgmt/tinderbox/Makefile Sun Dec 15 08:55:51 2013 (r336507) +++ head/ports-mgmt/tinderbox/Makefile Sun Dec 15 09:09:30 2013 (r336508) @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= tinderbox -PORTVERSION= 4.0.1 -PORTREVISION= 4 +PORTVERSION= 4.1.0 CATEGORIES= ports-mgmt MASTER_SITES= http://tinderbox.marcuscom.com/ \ http://T32.TecNik93.com/FreeBSD/ports/${PORTNAME}/sources/ Modified: head/ports-mgmt/tinderbox/distinfo ============================================================================== --- head/ports-mgmt/tinderbox/distinfo Sun Dec 15 08:55:51 2013 (r336507) +++ head/ports-mgmt/tinderbox/distinfo Sun Dec 15 09:09:30 2013 (r336508) @@ -1,2 +1,2 @@ -SHA256 (tinderbox/tinderbox-4.0.1.tar.gz) = 4d49e62bcfd94438f4dce3481fab7d89c86cc200fc73a9c0744ddd01b36bc92e -SIZE (tinderbox/tinderbox-4.0.1.tar.gz) = 150826 +SHA256 (tinderbox/tinderbox-4.1.0.tar.gz) = b2950034fe66ab36b741b99dc3d59626cef3f75a46b128d77f08e679bf69e5ee +SIZE (tinderbox/tinderbox-4.1.0.tar.gz) = 151397 From owner-svn-ports-head@FreeBSD.ORG Sun Dec 15 09:22:11 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id CF8991C0; Sun, 15 Dec 2013 09:22:11 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id BC420166F; Sun, 15 Dec 2013 09:22:11 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBF9MBxm029486; Sun, 15 Dec 2013 09:22:11 GMT (envelope-from ohauer@svn.freebsd.org) Received: (from ohauer@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBF9MBlh029485; Sun, 15 Dec 2013 09:22:11 GMT (envelope-from ohauer@svn.freebsd.org) Message-Id: <201312150922.rBF9MBlh029485@svn.freebsd.org> From: Olli Hauer Date: Sun, 15 Dec 2013 09:22:11 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r336509 - head/www/mod_auth_imap2 X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 15 Dec 2013 09:22:11 -0000 Author: ohauer Date: Sun Dec 15 09:22:11 2013 New Revision: 336509 URL: http://svnweb.freebsd.org/changeset/ports/336509 Log: - works only with apache22 not with apache24 PR: 184769 Submitted by: Kenneth Lind Modified: head/www/mod_auth_imap2/Makefile Modified: head/www/mod_auth_imap2/Makefile ============================================================================== --- head/www/mod_auth_imap2/Makefile Sun Dec 15 09:09:30 2013 (r336508) +++ head/www/mod_auth_imap2/Makefile Sun Dec 15 09:22:11 2013 (r336509) @@ -10,13 +10,13 @@ DISTNAME= mod_auth_imap2-${PORTVERSION} DIST_SUBDIR= apache2 MAINTAINER= apache@FreeBSD.org -COMMENT= An Apache 2 module to provide authentication via an IMAP mail server +COMMENT= Apache 2 module to provide authentication via an IMAP mail server LICENSE= GPLv2 WRKSRC= ${WRKDIR}/${PORTNAME}2-${PORTVERSION} -USE_APACHE= 22+ +USE_APACHE= 22 NO_STAGE= yes LATEST_LINK= mod_auth_imap2 AP_FAST_BUILD= yes From owner-svn-ports-head@FreeBSD.ORG Sun Dec 15 09:43:06 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 65177387; Sun, 15 Dec 2013 09:43:06 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 5153C1751; Sun, 15 Dec 2013 09:43:06 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBF9h69H037413; Sun, 15 Dec 2013 09:43:06 GMT (envelope-from ohauer@svn.freebsd.org) Received: (from ohauer@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBF9h6kP037412; Sun, 15 Dec 2013 09:43:06 GMT (envelope-from ohauer@svn.freebsd.org) Message-Id: <201312150943.rBF9h6kP037412@svn.freebsd.org> From: Olli Hauer Date: Sun, 15 Dec 2013 09:43:06 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r336510 - head/www/mod_auth_imap2 X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 15 Dec 2013 09:43:06 -0000 Author: ohauer Date: Sun Dec 15 09:43:05 2013 New Revision: 336510 URL: http://svnweb.freebsd.org/changeset/ports/336510 Log: - enable staging Modified: head/www/mod_auth_imap2/Makefile Modified: head/www/mod_auth_imap2/Makefile ============================================================================== --- head/www/mod_auth_imap2/Makefile Sun Dec 15 09:22:11 2013 (r336509) +++ head/www/mod_auth_imap2/Makefile Sun Dec 15 09:43:05 2013 (r336510) @@ -14,20 +14,16 @@ COMMENT= Apache 2 module to provide auth LICENSE= GPLv2 - WRKSRC= ${WRKDIR}/${PORTNAME}2-${PORTVERSION} USE_APACHE= 22 -NO_STAGE= yes LATEST_LINK= mod_auth_imap2 AP_FAST_BUILD= yes AP_GENPLIST= yes PORTDOCS= htaccess-example httpd.conf-append-example -.if !defined(NOPORTDOCS) post-install: - @${MKDIR} ${DOCSDIR} - @cd ${WRKSRC}/examples && ${INSTALL_DATA} ${PORTDOCS} ${DOCSDIR} -.endif + @${MKDIR} ${STAGEDIR}${DOCSDIR} + ${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/examples/|} ${STAGEDIR}${DOCSDIR} .include From owner-svn-ports-head@FreeBSD.ORG Sun Dec 15 10:02:59 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 40AB3579; Sun, 15 Dec 2013 10:02:59 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 2CDBB1856; Sun, 15 Dec 2013 10:02:59 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBFA2x4O044705; Sun, 15 Dec 2013 10:02:59 GMT (envelope-from antoine@svn.freebsd.org) Received: (from antoine@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBFA2wnI044703; Sun, 15 Dec 2013 10:02:58 GMT (envelope-from antoine@svn.freebsd.org) Message-Id: <201312151002.rBFA2wnI044703@svn.freebsd.org> From: Antoine Brodin Date: Sun, 15 Dec 2013 10:02:58 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r336511 - head/www/mohawk X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 15 Dec 2013 10:02:59 -0000 Author: antoine Date: Sun Dec 15 10:02:58 2013 New Revision: 336511 URL: http://svnweb.freebsd.org/changeset/ports/336511 Log: - Update to 2.0.10 - BSD License has 2 clauses - New LIB_DEPENDS syntax Submitted by: maintainer on IRC Modified: head/www/mohawk/Makefile head/www/mohawk/distinfo Modified: head/www/mohawk/Makefile ============================================================================== --- head/www/mohawk/Makefile Sun Dec 15 09:43:05 2013 (r336510) +++ head/www/mohawk/Makefile Sun Dec 15 10:02:58 2013 (r336511) @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= mohawk -PORTVERSION= 2.0.9 +PORTVERSION= 2.0.10 CATEGORIES= www ipv6 MASTER_SITES= http://fossil.etoilebsd.net/mohawk/tarball/ \ http://fossil.bsdsx.fr/mohawk/tarball/ @@ -10,9 +10,9 @@ DISTFILES= ${PORTNAME}-${PORTVERSION}.ta MAINTAINER= mohawk@bsdsx.fr COMMENT= Simple and lightweight HTTP daemon -LICENSE= BSD +LICENSE= BSD2CLAUSE -LIB_DEPENDS= event-2:${PORTSDIR}/devel/libevent2 +LIB_DEPENDS= libevent-2.0.so:${PORTSDIR}/devel/libevent2 PLIST_FILES+= bin/mhtpasswd \ man/man5/mohawk.conf.5.gz \ Modified: head/www/mohawk/distinfo ============================================================================== --- head/www/mohawk/distinfo Sun Dec 15 09:43:05 2013 (r336510) +++ head/www/mohawk/distinfo Sun Dec 15 10:02:58 2013 (r336511) @@ -1,2 +1,2 @@ -SHA256 (mohawk-2.0.9.tar.gz?uuid=2.0.9) = c940e6bdaee60b6665a59d513dce12db91adace8ef9ea70cebd44357e802f95b -SIZE (mohawk-2.0.9.tar.gz?uuid=2.0.9) = 37926 +SHA256 (mohawk-2.0.10.tar.gz?uuid=2.0.10) = 3267309ecd4fb9a40fd56bb00624293dc86ce97c1d4d6a6f38e67df1503b50da +SIZE (mohawk-2.0.10.tar.gz?uuid=2.0.10) = 37872 From owner-svn-ports-head@FreeBSD.ORG Sun Dec 15 10:18:01 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 64903709; Sun, 15 Dec 2013 10:18:01 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 367BD18EF; Sun, 15 Dec 2013 10:18:01 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBFAI1vN049198; Sun, 15 Dec 2013 10:18:01 GMT (envelope-from ohauer@svn.freebsd.org) Received: (from ohauer@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBFAI1FA049197; Sun, 15 Dec 2013 10:18:01 GMT (envelope-from ohauer@svn.freebsd.org) Message-Id: <201312151018.rBFAI1FA049197@svn.freebsd.org> From: Olli Hauer Date: Sun, 15 Dec 2013 10:18:01 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r336512 - head/www/mod_auth_kerb2 X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 15 Dec 2013 10:18:01 -0000 Author: ohauer Date: Sun Dec 15 10:18:00 2013 New Revision: 336512 URL: http://svnweb.freebsd.org/changeset/ports/336512 Log: - change to new LIB_DEPENDS notation - s/LATEST_LINK/PKGNAMESUFFIX/ Modified: head/www/mod_auth_kerb2/Makefile Modified: head/www/mod_auth_kerb2/Makefile ============================================================================== --- head/www/mod_auth_kerb2/Makefile Sun Dec 15 10:02:58 2013 (r336511) +++ head/www/mod_auth_kerb2/Makefile Sun Dec 15 10:18:00 2013 (r336512) @@ -7,13 +7,12 @@ PORTREVISION= 5 CATEGORIES= www MASTER_SITES= SF/modauthkerb/${PORTNAME}/${PORTNAME}-${PORTVERSION} PKGNAMEPREFIX= ${APACHE_PKGNAMEPREFIX} +PKGNAMESUFFIX= 2 MAINTAINER= apache@FreeBSD.org -COMMENT= An Apache module for authenticating users with Kerberos v5 - - -LATEST_LINK= mod_auth_kerb2 +COMMENT= Apache module for authenticating users with Kerberos v5 +NO_STAGE= yes USE_APACHE= 22 USE_GMAKE= yes GNU_CONFIGURE= yes @@ -21,22 +20,21 @@ GNU_CONFIGURE= yes PORTSCOUT= limit:^5.4 .if defined(KRB5_HOME) -BUILD_DEPENDS+= ${KRB5_HOME}/lib/libgssapi_krb5.so:${PORTSDIR}/security/krb5 -RUN_DEPENDS+= ${KRB5_HOME}/lib/libgssapi_krb5.so:${PORTSDIR}/security/krb5 +BUILD_DEPENDS+= ${KRB5_HOME}/lib/libgssapi_krb5.so:${PORTSDIR}/security/krb5 +RUN_DEPENDS+= ${KRB5_HOME}/lib/libgssapi_krb5.so:${PORTSDIR}/security/krb5 CONFIGURE_ARGS+= --with-krb5=${KRB5_HOME} --without-krb4 .elif defined(HEIMDAL_HOME) -BUILD_DEPENDS+= ${HEIMDAL_HOME}/lib/libgssapi.so:${PORTSDIR}/security/heimdal -RUN_DEPENDS+= ${HEIMDAL_HOME}/lib/libgssapi.so:${PORTSDIR}/security/heimdal +BUILD_DEPENDS+= ${HEIMDAL_HOME}/lib/libgssapi.so:${PORTSDIR}/security/heimdal +RUN_DEPENDS+= ${HEIMDAL_HOME}/lib/libgssapi.so:${PORTSDIR}/security/heimdal CONFIGURE_ARGS+= --with-krb5=${HEIMDAL_HOME} --without-krb4 .elif exists(${DESTDIR}/usr/lib/libkrb5.a) && exists(${DESTDIR}/usr/bin/krb5-config) CONFIGURE_ARGS+= --with-krb5=${DESTDIR}/usr --without-krb4 .else -LIB_DEPENDS+= gssapi_krb5:${PORTSDIR}/security/krb5 +LIB_DEPENDS+= libgssapi_krb5.so:${PORTSDIR}/security/krb5 CONFIGURE_ARGS+= --with-krb5=${LOCALBASE} --without-krb4 .endif -NO_STAGE= yes .include From owner-svn-ports-head@FreeBSD.ORG Sun Dec 15 11:43:28 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id E2E7B1F1; Sun, 15 Dec 2013 11:43:28 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id CF3C31EE7; Sun, 15 Dec 2013 11:43:28 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBFBhSbH080355; Sun, 15 Dec 2013 11:43:28 GMT (envelope-from dinoex@svn.freebsd.org) Received: (from dinoex@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBFBhSj6080354; Sun, 15 Dec 2013 11:43:28 GMT (envelope-from dinoex@svn.freebsd.org) Message-Id: <201312151143.rBFBhSj6080354@svn.freebsd.org> From: Dirk Meyer Date: Sun, 15 Dec 2013 11:43:28 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r336513 - head/mail/milter-regex X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 15 Dec 2013 11:43:29 -0000 Author: dinoex Date: Sun Dec 15 11:43:28 2013 New Revision: 336513 URL: http://svnweb.freebsd.org/changeset/ports/336513 Log: - fix pkgng problem do not use @dirrmtry PR: 184695 Modified: head/mail/milter-regex/pkg-plist Modified: head/mail/milter-regex/pkg-plist ============================================================================== --- head/mail/milter-regex/pkg-plist Sun Dec 15 10:18:00 2013 (r336512) +++ head/mail/milter-regex/pkg-plist Sun Dec 15 11:43:28 2013 (r336513) @@ -1,5 +1,3 @@ libexec/milter-regex man/man8/milter-regex.8.gz -@cwd / -@dirrmtry %%SPOOLDIR%% -@cwd +@unexec rmdir %%SPOOLDIR%% 2>/dev/null || true From owner-svn-ports-head@FreeBSD.ORG Sun Dec 15 11:45:20 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 2A5312EC; Sun, 15 Dec 2013 11:45:20 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id F1EF61EFB; Sun, 15 Dec 2013 11:45:19 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBFBjJqN080682; Sun, 15 Dec 2013 11:45:19 GMT (envelope-from dinoex@svn.freebsd.org) Received: (from dinoex@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBFBjJN6080681; Sun, 15 Dec 2013 11:45:19 GMT (envelope-from dinoex@svn.freebsd.org) Message-Id: <201312151145.rBFBjJN6080681@svn.freebsd.org> From: Dirk Meyer Date: Sun, 15 Dec 2013 11:45:19 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r336514 - head/www/opera X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 15 Dec 2013 11:45:20 -0000 Author: dinoex Date: Sun Dec 15 11:45:19 2013 New Revision: 336514 URL: http://svnweb.freebsd.org/changeset/ports/336514 Log: - new option COMPAT9 - add USES=desktop-file-utils Modified: head/www/opera/Makefile Modified: head/www/opera/Makefile ============================================================================== --- head/www/opera/Makefile Sun Dec 15 11:43:28 2013 (r336513) +++ head/www/opera/Makefile Sun Dec 15 11:45:19 2013 (r336514) @@ -16,8 +16,8 @@ DISTNAME= ${PORTNAME}-${OPERA_VER}-${OPE MAINTAINER= dinoex@FreeBSD.org COMMENT= Blazingly fast, full-featured, standards-compliant browser -LIB_DEPENDS= freetype:${PORTSDIR}/print/freetype2 \ - fontconfig:${PORTSDIR}/x11-fonts/fontconfig +LIB_DEPENDS= libfreetype.so:${PORTSDIR}/print/freetype2 \ + libfontconfig.so:${PORTSDIR}/x11-fonts/fontconfig BUILD_DEPENDS= ${LOCALBASE}/bin/update-mime-database:${PORTSDIR}/misc/shared-mime-info RUN_DEPENDS= ${LOCALBASE}/bin/update-mime-database:${PORTSDIR}/misc/shared-mime-info @@ -27,9 +27,9 @@ OPERA_VER?= 12.16 OPERA_BUILD?= 1860 MASTER_SITES_VER_PATH= unix/${OPERA_VER:S/.//} +USES= desktop-file-utils USE_XZ= yes USE_XORG= x11 xext sm ice xft xrender -USE_GNOME= desktopfileutils INSTALLS_ICONS= yes MAN1= opera.1 @@ -38,11 +38,15 @@ MANCOMPRESSED= yes NO_BUILD= yes EXPLICIT_PACKAGE_DEPENDS= yes -OPTIONS_DEFINE= CUPS VIDEO GTK2 KDE4 +OPTIONS_DEFINE= CUPS VIDEO GTK2 KDE4 COMPAT9 OPTIONS_DEFAULT= CUPS VIDEO +NO_OPTIONS_SORT=yes CUPS_DESC= support for printing (requires CUPS) VIDEO_DESC= support for HTML5 video (requires GStreamer) +COMPAT9_DESC= use libstdc++.so.6 from compat9x instead of gcc46 + +CUPS_LIB_DEPENDS= libcups.so:${PORTSDIR}/print/cups-client .include @@ -57,10 +61,6 @@ DISTFILES= ${DISTNAME}${EXTRACT_SUFX} \ .endif .endif -.if ${PORT_OPTIONS:MCUPS} -LIB_DEPENDS+= cups:${PORTSDIR}/print/cups-client -.endif - .if ${PORT_OPTIONS:MVIDEO} USE_GSTREAMER+= vorbis ogg theora vp8 good .endif @@ -84,7 +84,11 @@ IGNORE= only for FreeBSD 7.x and higher .endif .if ${OSVERSION} >= 1000054 +.if ${PORT_OPTIONS:MCOMPAT9} RUN_DEPENDS+= ${LOCALBASE}/lib/compat/libstdc++.so.6:${PORTSDIR}/misc/compat9x +.else +RUN_DEPENDS+= ${LOCALBASE}/lib/gcc46/libstdc++.so.6:${PORTSDIR}/lang/gcc46 +.endif .endif post-extract: From owner-svn-ports-head@FreeBSD.ORG Sun Dec 15 11:47:34 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id C28573D0; Sun, 15 Dec 2013 11:47:34 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id A33E91F05; Sun, 15 Dec 2013 11:47:34 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBFBlYIN081004; Sun, 15 Dec 2013 11:47:34 GMT (envelope-from lwhsu@svn.freebsd.org) Received: (from lwhsu@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBFBlYwM081001; Sun, 15 Dec 2013 11:47:34 GMT (envelope-from lwhsu@svn.freebsd.org) Message-Id: <201312151147.rBFBlYwM081001@svn.freebsd.org> From: Li-Wen Hsu Date: Sun, 15 Dec 2013 11:47:34 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r336515 - head/textproc/py-sphinx X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 15 Dec 2013 11:47:34 -0000 Author: lwhsu Date: Sun Dec 15 11:47:33 2013 New Revision: 336515 URL: http://svnweb.freebsd.org/changeset/ports/336515 Log: - Update to 1.2 Deleted: head/textproc/py-sphinx/pkg-plist Modified: head/textproc/py-sphinx/Makefile head/textproc/py-sphinx/distinfo head/textproc/py-sphinx/pkg-descr Modified: head/textproc/py-sphinx/Makefile ============================================================================== --- head/textproc/py-sphinx/Makefile Sun Dec 15 11:45:19 2013 (r336514) +++ head/textproc/py-sphinx/Makefile Sun Dec 15 11:47:33 2013 (r336515) @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= sphinx -PORTVERSION= 1.1.3 -PORTREVISION= 1 +PORTVERSION= 1.2 CATEGORIES= textproc python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -15,19 +14,26 @@ COMMENT= Python documentation generator LICENSE= BSD -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}pygments>=1.2:${PORTSDIR}/textproc/py-pygments \ - ${PYTHON_PKGNAMEPREFIX}Jinja2>=2.3:${PORTSDIR}/devel/py-Jinja2 \ +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Jinja2>=2.3:${PORTSDIR}/devel/py-Jinja2 \ ${PYTHON_PKGNAMEPREFIX}docutils>=0.7:${PORTSDIR}/textproc/py-docutils +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}Jinja2>=2.3:${PORTSDIR}/devel/py-Jinja2 \ + ${PYTHON_PKGNAMEPREFIX}docutils>=0.7:${PORTSDIR}/textproc/py-docutils \ + ${PYTHON_PKGNAMEPREFIX}pygments>=1.2:${PORTSDIR}/textproc/py-pygments USE_PYTHON= yes USE_PYDISTUTILS= easy_install +PYDISTUTILS_AUTOPLIST= yes PYDISTUTILS_PKGNAME= Sphinx -PLIST_SUB= PYTHON_VER=${PYTHON_VER} +post-build: + cd ${WRKSRC} && \ + ${SETENV} PYTHONPATH=${STAGEDIR}/${PYTHONPREFIX_SITELIBDIR}:${PYTHONPREFIX_SITELIBDIR} \ + ${PYTHON_CMD} -m sphinx.pycode.pgen2.driver -c 'import load_grammar' -NO_STAGE= yes post-install: - @${SETENV} PYTHONPATH=${PYTHONPREFIX_SITELIBDIR} \ - ${PYTHON_CMD} -m sphinx.pycode.pgen2.driver -c 'import load_grammar' + ${INSTALL_DATA} ${WRKSRC}/sphinx/pycode/Grammar${PYTHON_VER}.pickle \ + ${STAGEDIR}/${PYTHONPREFIX_SITELIBDIR}/${PYEASYINSTALL_EGG}/sphinx/pycode/ + + ${ECHO_CMD} ${PYTHON_SITELIBDIR:S;${PYTHONBASE}/;;}/${PYEASYINSTALL_EGG}/sphinx/pycode/Grammar${PYTHON_VER}.pickle >> ${TMPPLIST} .include Modified: head/textproc/py-sphinx/distinfo ============================================================================== --- head/textproc/py-sphinx/distinfo Sun Dec 15 11:45:19 2013 (r336514) +++ head/textproc/py-sphinx/distinfo Sun Dec 15 11:47:33 2013 (r336515) @@ -1,2 +1,2 @@ -SHA256 (python/Sphinx-1.1.3.tar.gz) = 34dc95b70a2b07a61b5d61034c34b05f82514aab54ad27adedb49cee911bb8e9 -SIZE (python/Sphinx-1.1.3.tar.gz) = 2632059 +SHA256 (python/Sphinx-1.2.tar.gz) = bc3c424a0114ff4711f64353cc3eaca30682a5bbfabf3a7f338cd5ea70af79da +SIZE (python/Sphinx-1.2.tar.gz) = 3123291 Modified: head/textproc/py-sphinx/pkg-descr ============================================================================== --- head/textproc/py-sphinx/pkg-descr Sun Dec 15 11:45:19 2013 (r336514) +++ head/textproc/py-sphinx/pkg-descr Sun Dec 15 11:47:33 2013 (r336515) @@ -2,4 +2,4 @@ Sphinx is a tool that makes it easy to c documentation for Python projects, written by Georg Brandl and licensed under the BSD license. -WWW: http://sphinx.pocoo.org/ +WWW: http://sphinx-doc.org/ From owner-svn-ports-head@FreeBSD.ORG Sun Dec 15 12:15:54 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 1FFA7744; Sun, 15 Dec 2013 12:15:54 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 0A98C1092; Sun, 15 Dec 2013 12:15:54 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBFCFslf091987; Sun, 15 Dec 2013 12:15:54 GMT (envelope-from wg@svn.freebsd.org) Received: (from wg@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBFCFrUH091985; Sun, 15 Dec 2013 12:15:53 GMT (envelope-from wg@svn.freebsd.org) Message-Id: <201312151215.rBFCFrUH091985@svn.freebsd.org> From: William Grzybowski Date: Sun, 15 Dec 2013 12:15:53 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r336516 - in head/net/minidlna: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 15 Dec 2013 12:15:54 -0000 Author: wg Date: Sun Dec 15 12:15:53 2013 New Revision: 336516 URL: http://svnweb.freebsd.org/changeset/ports/336516 Log: net/minidlna: fix patch for kqueue support Added: head/net/minidlna/files/patch-kqueue (contents, props changed) Deleted: head/net/minidlna/files/patch-configure.ac head/net/minidlna/files/patch-inotify.c head/net/minidlna/files/patch-inotify.h head/net/minidlna/files/patch-metadata.c head/net/minidlna/files/patch-minidlna.c head/net/minidlna/files/patch-scanner.c Modified: head/net/minidlna/Makefile Modified: head/net/minidlna/Makefile ============================================================================== --- head/net/minidlna/Makefile Sun Dec 15 11:47:33 2013 (r336515) +++ head/net/minidlna/Makefile Sun Dec 15 12:15:53 2013 (r336516) @@ -3,7 +3,7 @@ PORTNAME= minidlna PORTVERSION= 1.1.1 -PORTREVISION= 1 +PORTREVISION= 2 PORTEPOCH= 1 CATEGORIES= net multimedia www MASTER_SITES= SF Added: head/net/minidlna/files/patch-kqueue ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net/minidlna/files/patch-kqueue Sun Dec 15 12:15:53 2013 (r336516) @@ -0,0 +1,520 @@ +diff -ruN configure.ac.orig configure.ac +--- configure.ac.orig 2013-11-02 02:06:41.000000000 +0100 ++++ configure.ac 2013-11-21 13:22:46.000000000 +0100 +@@ -453,7 +453,7 @@ + ################################################################################################################ + ### Header checks + +-AC_CHECK_HEADERS([arpa/inet.h asm/unistd.h endian.h machine/endian.h fcntl.h libintl.h locale.h netdb.h netinet/in.h stddef.h stdlib.h string.h sys/file.h sys/inotify.h sys/ioctl.h sys/param.h sys/socket.h sys/time.h unistd.h]) ++AC_CHECK_HEADERS([arpa/inet.h asm/unistd.h endian.h machine/endian.h fcntl.h libintl.h locale.h netdb.h netinet/in.h stddef.h stdlib.h string.h sys/file.h sys/inotify.h sys/ioctl.h sys/param.h sys/socket.h sys/time.h unistd.h sys/event.h]) + + AC_CHECK_FUNCS(inotify_init, AC_DEFINE(HAVE_INOTIFY,1,[Whether kernel has inotify support]), [ + AC_MSG_CHECKING([for __NR_inotify_init syscall]) +diff -ruN inotify.c.orig inotify.c +--- inotify.c.orig 2013-11-02 02:06:41.000000000 +0100 ++++ inotify.c 2013-11-21 13:49:58.000000000 +0100 +@@ -17,7 +17,7 @@ + */ + #include "config.h" + +-#ifdef HAVE_INOTIFY ++#if defined(HAVE_INOTIFY) || defined(HAVE_SYS_EVENT_H) + #include + #include + #include +@@ -31,11 +31,16 @@ + #include + #include + #include ++#ifdef HAVE_INOTIFY + #ifdef HAVE_SYS_INOTIFY_H + #include +-#else ++#else /*HAVE_SYS_INOTIFY_H*/ + #include "linux/inotify.h" + #include "linux/inotify-syscalls.h" ++#endif /*HAVE_SYS_INOTIFY_H*/ ++#else ++#include ++#include + #endif + #include "libav.h" + +@@ -49,11 +54,13 @@ + #include "playlist.h" + #include "log.h" + ++#ifdef HAVE_INOTIFY + #define EVENT_SIZE ( sizeof (struct inotify_event) ) + #define BUF_LEN ( 1024 * ( EVENT_SIZE + 16 ) ) + #define DESIRED_WATCH_LIMIT 65536 + + #define PATH_BUF_SIZE PATH_MAX ++#endif + + struct watch + { +@@ -86,6 +93,7 @@ + struct watch *nw; + int wd; + ++ #ifdef HAVE_INOTIFY + wd = inotify_add_watch(fd, path, IN_CREATE|IN_CLOSE_WRITE|IN_DELETE|IN_MOVE); + if( wd < 0 ) + { +@@ -93,6 +101,25 @@ + return -1; + } + ++#else /*HAVE_INOTIFY*/ ++ wd = open(path, O_RDONLY); ++ if (wd == -1) ++ { ++ DPRINTF(E_ERROR, L_INOTIFY, "inotify_add_watch[kqueue,open](%s) [%s]\n", path, strerror(errno)); ++ return -1; ++ } ++ struct kevent ke; ++ EV_SET(&ke, wd, ++ EVFILT_VNODE, ++ EV_ADD | EV_ENABLE | EV_CLEAR, ++ NOTE_DELETE | NOTE_WRITE | NOTE_EXTEND /*| NOTE_ATTRB*/, ++ 0, NULL); ++ if( kevent(fd, &ke, 1, NULL, 0, NULL) == -1 ) ++ { ++ DPRINTF(E_ERROR, L_INOTIFY, "inotify_add_watch[kqueue](%s) [%s]\n", path, strerror(errno)); ++ return -1; ++ } ++#endif + nw = malloc(sizeof(struct watch)); + if( nw == NULL ) + { +@@ -125,9 +152,15 @@ + for( w = watches; w; w = w->next ) + { + if( strcmp(path, w->path) == 0 ) ++ #ifdef HAVE_INOTIFY + return(inotify_rm_watch(fd, w->wd)); +- } ++ #else ++ close(w->wd); /* kqueue cleans up events when handle dies*/ ++ return(0); ++ #endif ++ } + ++ + return 1; + } + +@@ -145,8 +178,7 @@ + int + inotify_create_watches(int fd) + { +- FILE * max_watches; +- unsigned int num_watches = 0, watch_limit; ++ unsigned int num_watches = 0; + char **result; + int i, rows = 0; + struct media_dir_s * media_path; +@@ -165,6 +197,9 @@ + num_watches++; + } + sqlite3_free_table(result); ++ #ifdef HAVE_INOTIFY ++ FILE * max_watches; ++ unsigned int watch_limit; + + max_watches = fopen("/proc/sys/fs/inotify/max_user_watches", "r"); + if( max_watches ) +@@ -204,7 +239,7 @@ + DPRINTF(E_WARN, L_INOTIFY, "WARNING: Could not read inotify max_user_watches! " + "Hopefully it is enough to cover %u current directories plus any new ones added.\n", num_watches); + } +- ++#endif + return rows; + } + +@@ -218,7 +253,11 @@ + while( w ) + { + last_w = w; ++ #ifdef HAVE_INOTIFY + inotify_rm_watch(fd, w->wd); ++ #else ++ close(w->wd); /*kqueue cleans up after fhandle dies*/ ++ #endif + free(w->path); + rm_watches++; + w = w->next; +@@ -294,6 +333,8 @@ + struct media_dir_s * media_path = media_dirs; + struct stat st; + ++ DPRINTF(E_DEBUG, L_INOTIFY, "inotify_insert_file: %s @ %s\n", name, path); ++ + /* Is it cover art for another file? */ + if( is_image(path) ) + update_if_album_art(path); +@@ -421,7 +462,7 @@ + + if( !depth ) + { +- //DEBUG DPRINTF(E_DEBUG, L_INOTIFY, "Inserting %s\n", name); ++ DPRINTF(E_DEBUG, L_INOTIFY, "Inserting %s\n", name); + insert_file(name, path, id+2, get_next_available_id("OBJECTS", id)); + sqlite3_free(id); + if( (is_audio(path) || is_playlist(path)) && next_pl_fill != 1 ) +@@ -446,6 +487,8 @@ + struct media_dir_s* media_path; + struct stat st; + ++ DPRINTF(E_DEBUG, L_INOTIFY, "inotify_insert_directory: %s @ %s\n", name, path); ++ + if( access(path, R_OK|X_OK) != 0 ) + { + DPRINTF(E_WARN, L_INOTIFY, "Could not access %s [%s]\n", path, strerror(errno)); +@@ -537,6 +580,7 @@ + char **result; + int64_t detailID; + int rows, playlist; ++ DPRINTF(E_DEBUG, L_INOTIFY, "inotify_remove_file: %s\n", path); + + if( ends_with(path, ".srt") ) + { +@@ -582,6 +626,8 @@ + continue; + if( children < 2 ) + { ++ sql_exec(db, "DELETE from DETAILS where ID =" ++ " (SELECT DETAIL_ID from OBJECTS where OBJECT_ID = '%s')", result[i]); + sql_exec(db, "DELETE from OBJECTS where OBJECT_ID = '%s'", result[i]); + + ptr = strrchr(result[i], '$'); +@@ -589,7 +635,9 @@ + *ptr = '\0'; + if( sql_get_int_field(db, "SELECT count(*) from OBJECTS where PARENT_ID = '%s'", result[i]) == 0 ) + { +- sql_exec(db, "DELETE from OBJECTS where OBJECT_ID = '%s'", result[i]); ++ sql_exec(db, "DELETE from DETAILS where ID =" ++ " (SELECT DETAIL_ID from OBJECTS where OBJECT_ID = '%s')", result[i]); ++ sql_exec(db, "DELETE from OBJECTS where OBJECT_ID = '%s'", result[i]); + } + } + } +@@ -612,7 +660,7 @@ + char **result; + int64_t detailID = 0; + int rows, i, ret = 1; +- ++ DPRINTF(E_DEBUG, L_INOTIFY, "inotify_remove_directory: %s\n", path); + /* Invalidate the scanner cache so we don't insert files into non-existent containers */ + valid_cache = 0; + remove_watch(fd, path); +@@ -638,7 +686,7 @@ + + return ret; + } +- ++#ifdef HAVE_INOTIFY + void * + start_inotify() + { +@@ -755,4 +803,218 @@ + + return 0; + } ++ ++#else ++void * ++start_kqueue() ++{ ++ int global_kqueue_handle = -1; ++ ++ global_kqueue_handle = kqueue(); ++ if ( global_kqueue_handle < 0 ) ++ DPRINTF(E_ERROR, L_INOTIFY, "kqueue() failed: %s\n", strerror(errno)); ++ ++ while( scanning ) ++ { ++ if( quitting ) ++ goto quitting; ++ sleep(1); ++ } ++ ++ inotify_create_watches(global_kqueue_handle); ++ if (setpriority(PRIO_PROCESS, 0, 19) == -1) ++ DPRINTF(E_WARN, L_INOTIFY, "Failed to reduce kqueue thread priority\n"); ++ sqlite3_release_memory(1<<31); ++ av_register_all(); ++ ++ while( !quitting ) ++ { ++ struct kevent ke; ++ if ( kevent(global_kqueue_handle, NULL, 0, &ke, 1, NULL) == -1 ) ++ { ++ DPRINTF(E_WARN, L_INOTIFY, "kevent polling failure: %s\n", strerror(errno)); ++ } ++ ++ /*DPRINTF(E_DEBUG, L_INOTIFY, "GOT KEVENT:\n" ++ "ident=0x%X, filter=0x%X, flags=0x%X, fflags=0x%X, data=0x%X, udata=0x%X\n", ++ ke.ident, ke.filter, ke.flags, ke.fflags, ke.data, ke.udata);*/ ++ char* dir_path = get_path_from_wd(ke.ident); ++ if (dir_path == NULL) ++ { ++ DPRINTF(E_ERROR, L_INOTIFY, "Path with FD=0x%X can't be resolved.\n", ke.ident); ++ continue; ++ } ++ ++ ++ ++ if (ke.fflags & NOTE_DELETE) ++ { ++ DPRINTF(E_DEBUG, L_INOTIFY, "Path [%s] deleted.\n", dir_path); ++ inotify_remove_directory(ke.ident, dir_path); ++ } ++ else if ((ke.fflags & (NOTE_WRITE | NOTE_LINK)) == (NOTE_WRITE | NOTE_LINK)) ++ { ++ DPRINTF(E_DEBUG, L_INOTIFY, "Path [%s] content updated (directory).\n", dir_path); ++ char * sql; ++ char **result; ++ int i, rows; ++ sql = sqlite3_mprintf("SELECT PATH from DETAILS where (PATH > '%q/' and PATH <= '%q/%c')" ++ " and SIZE = ''", dir_path, dir_path, 0xFF); ++ if( (sql_get_table(db, sql, &result, &rows, NULL) != SQLITE_OK) ) ++ { ++ DPRINTF(E_WARN, L_INOTIFY, "Read state [%s]: Query failed, not updating\n", dir_path); ++ sqlite3_free(sql); ++ continue; ++ } ++ ++ ++ for( i=1; i <= rows; i++ ) ++ { ++ DPRINTF(E_DEBUG, L_INOTIFY, "Indexed content: %s\n", result[i]); ++ if (access(result[i], R_OK) == -1) ++ { ++ /* actually, global_kqueue_handle is not used here */ ++ inotify_remove_directory(global_kqueue_handle, result[i]); ++ } ++ } ++ DIR* d; ++ struct dirent * entry; ++ d = opendir(dir_path); ++ if (!d) ++ { ++ DPRINTF(E_ERROR, L_INOTIFY, "Can't list [%s] (%s)\n", dir_path, strerror(errno)); ++ continue; ++ } ++ ++ for ( entry = readdir(d); entry != NULL; entry = readdir(d) ) ++ { ++ if ( (entry->d_type == DT_DIR) && ++ (strcmp(entry->d_name, "..") != 0) && ++ (strcmp(entry->d_name, ".") != 0) ) ++ { ++ ++ char tmp_path[PATH_MAX]; ++ int result_path_len; ++ result_path_len = snprintf(tmp_path, PATH_MAX, ++ "%s/%s", dir_path, entry->d_name); ++ if (result_path_len >= PATH_MAX) ++ { ++ DPRINTF(E_ERROR, L_INOTIFY, "File path too long for %s!", entry->d_name); ++ continue; ++ } ++ DPRINTF(E_DEBUG, L_INOTIFY, "Walking %s\n", tmp_path); ++ char found_flag = 0; ++ for( i=1; i <= rows; i++ ) ++ { ++ if (strcmp(result[i], tmp_path) == 0) ++ { ++ found_flag = 1; ++ break; ++ } ++ } ++ if ( !found_flag ) ++ { ++ char * esc_name = NULL; ++ esc_name = modifyString(strdup(entry->d_name), "&", "&amp;"); ++ inotify_insert_directory(global_kqueue_handle, esc_name, tmp_path); ++ free(esc_name); ++ } ++ } ++ } ++ ++ sqlite3_free_table(result); ++ sqlite3_free(sql); ++ } ++ else if (ke.fflags & NOTE_WRITE) ++ { ++ DPRINTF(E_DEBUG, L_INOTIFY, "Path [%s] content updated (file).\n", dir_path); ++ char * sql; ++ char **result; ++ int i, rows; ++ sql = sqlite3_mprintf("SELECT PATH from DETAILS where (PATH > '%q/' and PATH <= '%q/%c')" ++ " and SIZE <> ''", dir_path, dir_path, 0xFF); ++ if( (sql_get_table(db, sql, &result, &rows, NULL) != SQLITE_OK) ) ++ ++ { ++ DPRINTF(E_WARN, L_INOTIFY, "Read state [%s]: Query failed, not updating\n", dir_path); ++ sqlite3_free(sql); ++ continue; ++ } ++ for( i=1; i <= rows; i++ ) ++ { ++ DPRINTF(E_DEBUG, L_INOTIFY, "Indexed content: %s\n", result[i]); ++ if (access(result[i], R_OK) == -1) /*oops, our file is gone*/ ++ { ++ inotify_remove_file(result[i]); ++ } ++ } ++ ++ DIR* d; ++ struct dirent * entry; ++ d = opendir(dir_path); ++ if (!d) ++ { ++ DPRINTF(E_ERROR, L_INOTIFY, "Can't list [%s] (%s)\n", dir_path, strerror(errno)); ++ continue; ++ } ++ ++ for ( entry = readdir(d); entry != NULL; entry = readdir(d) ) ++ { ++ if ( (entry->d_type == DT_REG) || ++ (entry->d_type == DT_LNK) ) ++ { ++ char tmp_path[PATH_MAX]; ++ int result_path_len; ++ result_path_len = snprintf(tmp_path, PATH_MAX, ++ "%s/%s", dir_path, entry->d_name); ++ if (result_path_len >= PATH_MAX) ++ { ++ DPRINTF(E_ERROR, L_INOTIFY, "File path too long for %s!", entry->d_name); ++ continue; ++ } ++ ++ DPRINTF(E_DEBUG, L_INOTIFY, "Walking %s\n", tmp_path); ++ char found_flag = 0; ++ for( i=1; i <= rows; i++ ) ++ { ++ if (strcmp(result[i], tmp_path) == 0) ++ { ++ found_flag = 1; ++ break; ++ } ++ } ++ if ( !found_flag ) ++ { ++ char * esc_name = NULL; ++ struct stat st; ++ if( stat(tmp_path, &st) != 0 ) ++ { ++ DPRINTF(E_ERROR, L_INOTIFY, "'%s' disappeared!", tmp_path); ++ continue; ++ } ++ ++ esc_name = modifyString(strdup(entry->d_name), "&", "&amp;"); ++ if ( S_ISDIR(st.st_mode) ) ++ inotify_insert_directory(global_kqueue_handle, esc_name, tmp_path); ++ else ++ inotify_insert_file(esc_name, tmp_path); ++ free(esc_name); ++ } ++ } ++ } ++ ++ ++ ++ sqlite3_free_table(result); ++ sqlite3_free(sql); ++ } ++ } ++ ++ inotify_remove_watches(global_kqueue_handle); ++quitting: ++ ++ return 0; ++} ++ + #endif ++#endif // defined(HAVE_INOTIFY) || defined(HAVE_SYS_EVENT_H) +\ No newline at end of file +diff -ruN inotify.h.orig inotify.h +--- inotify.h.orig 2013-11-02 02:06:41.000000000 +0100 ++++ inotify.h 2013-11-21 13:50:46.000000000 +0100 +@@ -1,7 +1,11 @@ + #ifdef HAVE_INOTIFY + int + inotify_remove_file(const char * path); +- ++#elif defined(HAVE_SYS_EVENT_H) ++int ++inotify_remove_file(const char* path); ++void * ++start_kqueue(); + void * + start_inotify(); + #endif +diff -ruN metadata.c.orig metadata.c +--- metadata.c.orig 2013-11-02 02:06:41.000000000 +0100 ++++ metadata.c 2013-11-21 13:54:22.000000000 +0100 +@@ -492,7 +492,8 @@ + m.dlna_pn, song.mime?song.mime:m.mime, album_art); + if( ret != SQLITE_OK ) + { +- fprintf(stderr, "Error inserting details for '%s'!\n", path); ++ DPRINTF(E_ERROR, L_DB_SQL, "Error inserting details for '%s'!\n", path); ++ DPRINTF(E_ERROR, L_DB_SQL, "Error inserting details for '%s'!\n", path); + ret = 0; + } + else +@@ -675,7 +676,7 @@ + m.rotation, thumb, m.creator, m.dlna_pn, m.mime); + if( ret != SQLITE_OK ) + { +- fprintf(stderr, "Error inserting details for '%s'!\n", path); ++ DPRINTF(E_ERROR, L_DB_SQL, "Error inserting details for '%s'!\n", path); + ret = 0; + } + else +@@ -1587,7 +1588,7 @@ + m.mime, album_art); + if( ret != SQLITE_OK ) + { +- fprintf(stderr, "Error inserting details for '%s'!\n", path); ++ DPRINTF(E_ERROR, L_DB_SQL, "Error inserting details for '%s'!\n", path); + ret = 0; + } + else +diff -ruN minidlna.c.orig minidlna.c +--- minidlna.c.orig 2013-11-02 02:06:41.000000000 +0100 ++++ minidlna.c 2013-11-21 13:55:45.000000000 +0100 +@@ -997,6 +997,16 @@ + else if (pthread_create(&inotify_thread, NULL, start_inotify, NULL) != 0) + DPRINTF(E_FATAL, L_GENERAL, "ERROR: pthread_create() failed for start_inotify. EXITING\n"); + } ++#elif defined(HAVE_SYS_EVENT_H) ++ if( GETFLAG(INOTIFY_MASK) ) ++ { ++ if (!sqlite3_threadsafe() || sqlite3_libversion_number() < 3005001) ++ DPRINTF(E_ERROR, L_GENERAL, "SQLite library is not threadsafe! " ++ "Kqueue will be disabled.\n"); ++ else if (pthread_create(&inotify_thread, NULL, start_kqueue, NULL) != 0) ++ DPRINTF(E_FATAL, L_GENERAL, "ERROR: pthread_create() failed for start_kqueue. EXITING\n"); ++ } ++ + #endif + smonitor = OpenAndConfMonitorSocket(); + +diff -ruN scanner.c.orig scanner.c +--- scanner.c.orig 2013-11-02 02:06:41.000000000 +0100 ++++ scanner.c 2013-11-21 13:56:07.000000000 +0100 +@@ -590,7 +590,7 @@ + + sql_failed: + if( ret != SQLITE_OK ) +- fprintf(stderr, "Error creating SQLite3 database!\n"); ++ DPRINTF(E_ERROR, L_DB_SQL, "Error creating SQLite3 database!\n"); + return (ret != SQLITE_OK); + } + From owner-svn-ports-head@FreeBSD.ORG Sun Dec 15 12:19:34 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 1564B831; Sun, 15 Dec 2013 12:19:34 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 01B5D10A1; Sun, 15 Dec 2013 12:19:34 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBFCJXZm092446; Sun, 15 Dec 2013 12:19:33 GMT (envelope-from wg@svn.freebsd.org) Received: (from wg@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBFCJXTL092445; Sun, 15 Dec 2013 12:19:33 GMT (envelope-from wg@svn.freebsd.org) Message-Id: <201312151219.rBFCJXTL092445@svn.freebsd.org> From: William Grzybowski Date: Sun, 15 Dec 2013 12:19:33 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r336517 - head/shells/jailkit X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 15 Dec 2013 12:19:34 -0000 Author: wg Date: Sun Dec 15 12:19:33 2013 New Revision: 336517 URL: http://svnweb.freebsd.org/changeset/ports/336517 Log: shells/jailkit: fix python usage Reported by: exp-run (PR 184591) Approved by: portmgr (blanket) Modified: head/shells/jailkit/Makefile Modified: head/shells/jailkit/Makefile ============================================================================== --- head/shells/jailkit/Makefile Sun Dec 15 12:15:53 2013 (r336516) +++ head/shells/jailkit/Makefile Sun Dec 15 12:19:33 2013 (r336517) @@ -11,7 +11,8 @@ MAINTAINER= sylvio@FreeBSD.org COMMENT= Utilities to limit user account GNU_CONFIGURE= yes -USE_PYTHON= 2.5+ +CONFIGURE_ENV= PYTHONINTERPRETER=${PYTHON_CMD} +USE_PYTHON= 2 SHELLS= /etc/shells From owner-svn-ports-head@FreeBSD.ORG Sun Dec 15 12:22:30 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 8DE25961; Sun, 15 Dec 2013 12:22:30 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 7A4771108; Sun, 15 Dec 2013 12:22:30 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBFCMUqi095244; Sun, 15 Dec 2013 12:22:30 GMT (envelope-from dinoex@svn.freebsd.org) Received: (from dinoex@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBFCMULG095242; Sun, 15 Dec 2013 12:22:30 GMT (envelope-from dinoex@svn.freebsd.org) Message-Id: <201312151222.rBFCMULG095242@svn.freebsd.org> From: Dirk Meyer Date: Sun, 15 Dec 2013 12:22:30 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r336518 - head/graphics/tiff X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 15 Dec 2013 12:22:30 -0000 Author: dinoex Date: Sun Dec 15 12:22:29 2013 New Revision: 336518 URL: http://svnweb.freebsd.org/changeset/ports/336518 Log: - use X11_CONFIGURE_WITH, X11_USE Modified: head/graphics/tiff/Makefile head/graphics/tiff/pkg-plist Modified: head/graphics/tiff/Makefile ============================================================================== --- head/graphics/tiff/Makefile Sun Dec 15 12:19:33 2013 (r336517) +++ head/graphics/tiff/Makefile Sun Dec 15 12:22:29 2013 (r336518) @@ -81,6 +81,9 @@ MLINKS= TIFFError.3tiff TIFFSet OPTIONS_DEFINE= X11 OPTIONS_DEFAULT=X11 +OPTIONS_SUB= yes +X11_CONFIGURE_WITH= x libgl +X11_USE= xorg=sm,ice,xmu,xi,x11 gl=glut,glu,gl .include @@ -93,15 +96,6 @@ __pmlinks3!= ${ECHO_CMD} '${MLINKS:S/ } }' .endif -.if ${PORT_OPTIONS:MX11} -USE_XORG= sm ice xmu xi x11 -USE_GL= glut glu gl -PLIST_SUB+= WITH_X11="" -.else -CONFIGURE_ARGS+= --without-x --without-libgl -PLIST_SUB+= WITH_X11="@comment " -.endif - pre-configure: ${REINPLACE_CMD} \ -e 's|^LIBTIFF_VERSION_INFO =.*$$|LIBTIFF_VERSION_INFO = 4:0:0|' \ Modified: head/graphics/tiff/pkg-plist ============================================================================== --- head/graphics/tiff/pkg-plist Sun Dec 15 12:19:33 2013 (r336517) +++ head/graphics/tiff/pkg-plist Sun Dec 15 12:22:29 2013 (r336518) @@ -17,7 +17,7 @@ bin/tiffcp bin/tiffcrop bin/tiffdither bin/tiffdump -%%WITH_X11%%bin/tiffgt +%%X11%%bin/tiffgt bin/tiffinfo bin/tiffmedian bin/tiffset From owner-svn-ports-head@FreeBSD.ORG Sun Dec 15 12:25:14 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 57D2CA63; Sun, 15 Dec 2013 12:25:14 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 444D61119; Sun, 15 Dec 2013 12:25:14 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBFCPEWT095606; Sun, 15 Dec 2013 12:25:14 GMT (envelope-from wg@svn.freebsd.org) Received: (from wg@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBFCPE8v095605; Sun, 15 Dec 2013 12:25:14 GMT (envelope-from wg@svn.freebsd.org) Message-Id: <201312151225.rBFCPE8v095605@svn.freebsd.org> From: William Grzybowski Date: Sun, 15 Dec 2013 12:25:14 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r336519 - head/security/py-pyme X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 15 Dec 2013 12:25:14 -0000 Author: wg Date: Sun Dec 15 12:25:13 2013 New Revision: 336519 URL: http://svnweb.freebsd.org/changeset/ports/336519 Log: security/py-pyme: fix usage of python - Fix usage of python - USES gmake Reported by: exp-run (PR 184591) Approved by: portmgr (blanket) Modified: head/security/py-pyme/Makefile Modified: head/security/py-pyme/Makefile ============================================================================== --- head/security/py-pyme/Makefile Sun Dec 15 12:22:29 2013 (r336518) +++ head/security/py-pyme/Makefile Sun Dec 15 12:25:13 2013 (r336519) @@ -14,11 +14,13 @@ COMMENT= Python interface to GPGME libra BUILD_DEPENDS= swig1.3:${PORTSDIR}/devel/swig13 LIB_DEPENDS= libgpgme.so:${PORTSDIR}/security/gpgme -USE_GMAKE= yes -USE_PYTHON= 2.5+ +USES= gmake +USE_PYTHON= 2 USE_PYDISTUTILS=yes PYDISTUTILS_PKGNAME=pygpgme +MAKE_ARGS= PYTHON=${PYTHON_CMD} + NO_STAGE= yes .include From owner-svn-ports-head@FreeBSD.ORG Sun Dec 15 12:28:11 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 54D7CB55; Sun, 15 Dec 2013 12:28:11 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 4152B1127; Sun, 15 Dec 2013 12:28:11 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBFCSBwI096024; Sun, 15 Dec 2013 12:28:11 GMT (envelope-from wg@svn.freebsd.org) Received: (from wg@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBFCSBp3096023; Sun, 15 Dec 2013 12:28:11 GMT (envelope-from wg@svn.freebsd.org) Message-Id: <201312151228.rBFCSBp3096023@svn.freebsd.org> From: William Grzybowski Date: Sun, 15 Dec 2013 12:28:11 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r336520 - head/security/cfv X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 15 Dec 2013 12:28:11 -0000 Author: wg Date: Sun Dec 15 12:28:10 2013 New Revision: 336520 URL: http://svnweb.freebsd.org/changeset/ports/336520 Log: security/cfv: fix usage of python and limit to 2.x Reported by: exp-run (PR 184591) Approved by: portmgr (blanket) Modified: head/security/cfv/Makefile Modified: head/security/cfv/Makefile ============================================================================== --- head/security/cfv/Makefile Sun Dec 15 12:25:13 2013 (r336519) +++ head/security/cfv/Makefile Sun Dec 15 12:28:10 2013 (r336520) @@ -9,9 +9,10 @@ MASTER_SITES= SF MAINTAINER= ports@FreeBSD.org COMMENT= Utility to both test and create .sfv, .csv, and md5sum files -USE_PYTHON= yes +USE_PYTHON= 2 ALL_TARGET= cfv.wrapper INSTALL_TARGET= install-wrapper +MAKE_ARGS= PYTHON=${PYTHON_CMD} MAN1= cfv.1 From owner-svn-ports-head@FreeBSD.ORG Sun Dec 15 12:30:54 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id C0F6AC4F; Sun, 15 Dec 2013 12:30:54 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id AC66C117B; Sun, 15 Dec 2013 12:30:54 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBFCUsvZ098563; Sun, 15 Dec 2013 12:30:54 GMT (envelope-from ohauer@svn.freebsd.org) Received: (from ohauer@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBFCUs5t098560; Sun, 15 Dec 2013 12:30:54 GMT (envelope-from ohauer@svn.freebsd.org) Message-Id: <201312151230.rBFCUs5t098560@svn.freebsd.org> From: Olli Hauer Date: Sun, 15 Dec 2013 12:30:54 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r336521 - head/www/mod_authz_unixgroup X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 15 Dec 2013 12:30:54 -0000 Author: ohauer Date: Sun Dec 15 12:30:53 2013 New Revision: 336521 URL: http://svnweb.freebsd.org/changeset/ports/336521 Log: - update to 1.0.3 - allow staging - change MASTER_SITE Changes: v1.0.3 (Jan Wolter - Oct 6, 2011) ------------------------------------ * Allow group names to be quoted, so that you can have group names with spaces in them. This change was suggested by David Homborg. * Document updated with references to versions for Apache 2.4. v1.0.2 (Jan Wolter - May 21, 2009) ------------------------------------ * Adding copyright and Apache Version 2.0 license in LICENSE and NOTICE files. * New directive: AuthzUnixgroupError, can be used to specify the HTTP error number to be returned on failure. Modified: head/www/mod_authz_unixgroup/Makefile head/www/mod_authz_unixgroup/distinfo head/www/mod_authz_unixgroup/pkg-descr Modified: head/www/mod_authz_unixgroup/Makefile ============================================================================== --- head/www/mod_authz_unixgroup/Makefile Sun Dec 15 12:28:10 2013 (r336520) +++ head/www/mod_authz_unixgroup/Makefile Sun Dec 15 12:30:53 2013 (r336521) @@ -2,19 +2,20 @@ # $FreeBSD$ PORTNAME= mod_authz_unixgroup -PORTVERSION= 1.0.1 -PORTREVISION= 2 +PORTVERSION= 1.0.3 CATEGORIES= www -MASTER_SITES= http://www.unixpapa.com/software/ +MASTER_SITES= http://mod-auth-external.googlecode.com/files/ MAINTAINER= apache@FreeBSD.org -COMMENT= A unix group access control module for Apache 2.1 and later +COMMENT= UNIX group access control module for Apache 2.2 +LICENSE= AL2 + +PORTSCOUT= limit:^1\.0\. USE_APACHE= 22 AP_FAST_BUILD= yes AP_GENPLIST= yes SHORTMODNAME= authz_unixgroup -NO_STAGE= yes .include Modified: head/www/mod_authz_unixgroup/distinfo ============================================================================== --- head/www/mod_authz_unixgroup/distinfo Sun Dec 15 12:28:10 2013 (r336520) +++ head/www/mod_authz_unixgroup/distinfo Sun Dec 15 12:30:53 2013 (r336521) @@ -1,2 +1,2 @@ -SHA256 (mod_authz_unixgroup-1.0.1.tar.gz) = 217ca24b2ad8f8e74fd247f6d21845a28a2a7b6529ba1d121da15265a522aefa -SIZE (mod_authz_unixgroup-1.0.1.tar.gz) = 5909 +SHA256 (mod_authz_unixgroup-1.0.3.tar.gz) = 2792f736fdc3831a613747c78938cad58487486a606535eba2c4bb20009b7e2b +SIZE (mod_authz_unixgroup-1.0.3.tar.gz) = 10427 Modified: head/www/mod_authz_unixgroup/pkg-descr ============================================================================== --- head/www/mod_authz_unixgroup/pkg-descr Sun Dec 15 12:28:10 2013 (r336520) +++ head/www/mod_authz_unixgroup/pkg-descr Sun Dec 15 12:30:53 2013 (r336521) @@ -1,8 +1,9 @@ -This is a port of mod_authz_unixgroup for apache22, written by Jan Wolter. +Mod_Authz_Unixgroup 1.0.x is a unix group access control modules for Apache +version 2.2. If you have Apache 2.3 or Apache 2.4, you should be using +version 1.1.x of this module instead. -Mod_Authz_Unixgroup is a unix group access control modules for Apache 2.1 and -later. If you are having users authenticate with real Unix login ID over the -net, using something like my mod_authnz_external / pwauth combination, and you +If you are having users authenticate with real Unix login ID over the net, +using something like my mod_authnz_external / pwauth combination, and you want to do access control based on unix group membership, then mod_authz_unixgroup is exactly what you need. From owner-svn-ports-head@FreeBSD.ORG Sun Dec 15 12:34:18 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id DA12FE60; Sun, 15 Dec 2013 12:34:18 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id C647411A0; Sun, 15 Dec 2013 12:34:18 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBFCYIk4099259; Sun, 15 Dec 2013 12:34:18 GMT (envelope-from ohauer@svn.freebsd.org) Received: (from ohauer@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBFCYI79099257; Sun, 15 Dec 2013 12:34:18 GMT (envelope-from ohauer@svn.freebsd.org) Message-Id: <201312151234.rBFCYI79099257@svn.freebsd.org> From: Olli Hauer Date: Sun, 15 Dec 2013 12:34:18 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r336522 - head/www/mod_authz_unixgroup X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 15 Dec 2013 12:34:18 -0000 Author: ohauer Date: Sun Dec 15 12:34:18 2013 New Revision: 336522 URL: http://svnweb.freebsd.org/changeset/ports/336522 Log: - add DIST_SUBDIR Modified: head/www/mod_authz_unixgroup/Makefile head/www/mod_authz_unixgroup/distinfo Modified: head/www/mod_authz_unixgroup/Makefile ============================================================================== --- head/www/mod_authz_unixgroup/Makefile Sun Dec 15 12:30:53 2013 (r336521) +++ head/www/mod_authz_unixgroup/Makefile Sun Dec 15 12:34:18 2013 (r336522) @@ -5,6 +5,7 @@ PORTNAME= mod_authz_unixgroup PORTVERSION= 1.0.3 CATEGORIES= www MASTER_SITES= http://mod-auth-external.googlecode.com/files/ +DIST_SUBDIR= apache2 MAINTAINER= apache@FreeBSD.org COMMENT= UNIX group access control module for Apache 2.2 Modified: head/www/mod_authz_unixgroup/distinfo ============================================================================== --- head/www/mod_authz_unixgroup/distinfo Sun Dec 15 12:30:53 2013 (r336521) +++ head/www/mod_authz_unixgroup/distinfo Sun Dec 15 12:34:18 2013 (r336522) @@ -1,2 +1,2 @@ -SHA256 (mod_authz_unixgroup-1.0.3.tar.gz) = 2792f736fdc3831a613747c78938cad58487486a606535eba2c4bb20009b7e2b -SIZE (mod_authz_unixgroup-1.0.3.tar.gz) = 10427 +SHA256 (apache2/mod_authz_unixgroup-1.0.3.tar.gz) = 2792f736fdc3831a613747c78938cad58487486a606535eba2c4bb20009b7e2b +SIZE (apache2/mod_authz_unixgroup-1.0.3.tar.gz) = 10427 From owner-svn-ports-head@FreeBSD.ORG Sun Dec 15 12:49:28 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id E9646D1; Sun, 15 Dec 2013 12:49:28 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id D57231239; Sun, 15 Dec 2013 12:49:28 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBFCnSrd003368; Sun, 15 Dec 2013 12:49:28 GMT (envelope-from wg@svn.freebsd.org) Received: (from wg@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBFCnSDg003367; Sun, 15 Dec 2013 12:49:28 GMT (envelope-from wg@svn.freebsd.org) Message-Id: <201312151249.rBFCnSDg003367@svn.freebsd.org> From: William Grzybowski Date: Sun, 15 Dec 2013 12:49:28 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r336523 - head/science/abinit X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 15 Dec 2013 12:49:29 -0000 Author: wg Date: Sun Dec 15 12:49:28 2013 New Revision: 336523 URL: http://svnweb.freebsd.org/changeset/ports/336523 Log: science/abinit: depends explicitly on "python" Reported by: exp-run (PR 184591) Approved by: portmgr (blanket) Modified: head/science/abinit/Makefile Modified: head/science/abinit/Makefile ============================================================================== --- head/science/abinit/Makefile Sun Dec 15 12:34:18 2013 (r336522) +++ head/science/abinit/Makefile Sun Dec 15 12:49:28 2013 (r336523) @@ -10,7 +10,8 @@ MASTER_SITES= ftp://ftp.abinit.org/pub/a MAINTAINER= maho@FreeBSD.org COMMENT= Abinit calculates electronic structure of systems -BUILD_DEPENDS= ${PYTHON_SITELIBDIR}/numarray/__init__.py:${PORTSDIR}/math/py-numarray +BUILD_DEPENDS= python:${PORTSDIR}/lang/python \ + ${PYTHON_SITELIBDIR}/numarray/__init__.py:${PORTSDIR}/math/py-numarray LIB_DEPENDS= netcdff.4:${PORTSDIR}/science/netcdf3-ftn \ gsl:${PORTSDIR}/math/gsl From owner-svn-ports-head@FreeBSD.ORG Sun Dec 15 12:58:07 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id B3393345; Sun, 15 Dec 2013 12:58:07 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 9EF0C12E6; Sun, 15 Dec 2013 12:58:07 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBFCw7B0006702; Sun, 15 Dec 2013 12:58:07 GMT (envelope-from ohauer@svn.freebsd.org) Received: (from ohauer@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBFCw7Cw006701; Sun, 15 Dec 2013 12:58:07 GMT (envelope-from ohauer@svn.freebsd.org) Message-Id: <201312151258.rBFCw7Cw006701@svn.freebsd.org> From: Olli Hauer Date: Sun, 15 Dec 2013 12:58:07 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r336524 - head/www/mod_auth_external2 X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 15 Dec 2013 12:58:07 -0000 Author: ohauer Date: Sun Dec 15 12:58:07 2013 New Revision: 336524 URL: http://svnweb.freebsd.org/changeset/ports/336524 Log: - allow staging - s/LATEST_LINK/PKGNAMESUFFIX/ - change MASTERSITE to GOOGLE_CODE Modified: head/www/mod_auth_external2/Makefile Modified: head/www/mod_auth_external2/Makefile ============================================================================== --- head/www/mod_auth_external2/Makefile Sun Dec 15 12:49:28 2013 (r336523) +++ head/www/mod_auth_external2/Makefile Sun Dec 15 12:58:07 2013 (r336524) @@ -5,28 +5,24 @@ PORTNAME= mod_auth_external PORTVERSION= 2.2.11 PORTREVISION= 1 CATEGORIES= www -MASTER_SITES= http://www.unixpapa.com/software/ +MASTER_SITES= GOGLE_CODE +PKGNAMESUFFIX= 2 DIST_SUBDIR= apache2 MAINTAINER= apache@FreeBSD.org COMMENT= Allows users authentication based on external mechanisms +LICENSE= AL2 USE_APACHE= 22 AP_FAST_BUILD= yes AP_GENPLIST= yes -LATEST_LINK= mod_auth_external2 SHORTMODNAME= auth_external PORTDOCS= AUTHENTICATORS INSTALL README -NO_STAGE= yes post-install: -.if !defined(NOPORTDOCS) - @${MKDIR} ${DOCSDIR}/ -. for f in ${PORTDOCS} - @${INSTALL_DATA} ${WRKSRC}/${f} ${DOCSDIR}/ -. endfor -.endif + @${MKDIR} ${STAGEDIR}${DOCSDIR} + ${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR} .include From owner-svn-ports-head@FreeBSD.ORG Sun Dec 15 13:04:55 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id A7FE161B; Sun, 15 Dec 2013 13:04:55 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 940301377; Sun, 15 Dec 2013 13:04:55 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBFD4tMS010100; Sun, 15 Dec 2013 13:04:55 GMT (envelope-from wg@svn.freebsd.org) Received: (from wg@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBFD4tcT010099; Sun, 15 Dec 2013 13:04:55 GMT (envelope-from wg@svn.freebsd.org) Message-Id: <201312151304.rBFD4tcT010099@svn.freebsd.org> From: William Grzybowski Date: Sun, 15 Dec 2013 13:04:55 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r336525 - head/net/xorp-devel X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 15 Dec 2013 13:04:55 -0000 Author: wg Date: Sun Dec 15 13:04:55 2013 New Revision: 336525 URL: http://svnweb.freebsd.org/changeset/ports/336525 Log: net/xorp-devel: depends explicitly on "python" to build Reported by: exp-run (PR 184591) Approved by: portmgr (blanket) Modified: head/net/xorp-devel/Makefile Modified: head/net/xorp-devel/Makefile ============================================================================== --- head/net/xorp-devel/Makefile Sun Dec 15 12:58:07 2013 (r336524) +++ head/net/xorp-devel/Makefile Sun Dec 15 13:04:55 2013 (r336525) @@ -12,6 +12,7 @@ DISTNAME= xorp-${PORTVERSION} MAINTAINER= ports@FreeBSD.org COMMENT= Open source network routing platform, development branch +BUILD_DEPENDS= python:${PORTSDIR}/lang/python # Uses libcurses, libcrypto, librt from base system. LIB_DEPENDS= libboost_regex.so:${PORTSDIR}/devel/boost-libs \ libpcap.so:${PORTSDIR}/net/libpcap @@ -22,6 +23,7 @@ NOMAN= defined USE_BZIP2= yes USE_GCC= 4.2+ +USE_PYTHON_BUILD= 2 USE_SCONS= yes NO_STAGE= yes #USE_OPENSSL= yes From owner-svn-ports-head@FreeBSD.ORG Sun Dec 15 13:20:01 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 5BBC5A0E; Sun, 15 Dec 2013 13:20:01 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 487FB1468; Sun, 15 Dec 2013 13:20:01 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBFDK144014582; Sun, 15 Dec 2013 13:20:01 GMT (envelope-from koobs@svn.freebsd.org) Received: (from koobs@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBFDK1og014580; Sun, 15 Dec 2013 13:20:01 GMT (envelope-from koobs@svn.freebsd.org) Message-Id: <201312151320.rBFDK1og014580@svn.freebsd.org> From: Kubilay Kocak Date: Sun, 15 Dec 2013 13:20:01 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r336526 - head/math/py-numpy X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 15 Dec 2013 13:20:01 -0000 Author: koobs Date: Sun Dec 15 13:20:00 2013 New Revision: 336526 URL: http://svnweb.freebsd.org/changeset/ports/336526 Log: math/py-numpy: Add missing ending quotation to ECHO_MSG Add a missing ending quotation from the last ECHO_MSG command added in r336423. PR: ports/184775 Reported by: Roland Smith Modified: head/math/py-numpy/Makefile Modified: head/math/py-numpy/Makefile ============================================================================== --- head/math/py-numpy/Makefile Sun Dec 15 13:04:55 2013 (r336525) +++ head/math/py-numpy/Makefile Sun Dec 15 13:20:00 2013 (r336526) @@ -62,7 +62,7 @@ BUILD_DEPENDS+= ${LOCALBASE}/lib/libalap @${ECHO_MSG} "for numpy to function correctly. Ensure it is" @${ECHO_MSG} "selected in the configuration dialog when prompted, or" @${ECHO_MSG} "Ctrl-C now and reinstall the atlas port with the option" -@${ECHO_MSG} "enabled. +@${ECHO_MSG} "enabled." sleep 5 .else LIB_DEPENDS+= lapack.4:${PORTSDIR}/math/lapack \ From owner-svn-ports-head@FreeBSD.ORG Sun Dec 15 13:21:13 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id DFDAFB00; Sun, 15 Dec 2013 13:21:13 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id CC64114C4; Sun, 15 Dec 2013 13:21:13 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBFDLDs9017093; Sun, 15 Dec 2013 13:21:13 GMT (envelope-from mva@svn.freebsd.org) Received: (from mva@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBFDLDZf017092; Sun, 15 Dec 2013 13:21:13 GMT (envelope-from mva@svn.freebsd.org) Message-Id: <201312151321.rBFDLDZf017092@svn.freebsd.org> From: Marcus von Appen Date: Sun, 15 Dec 2013 13:21:13 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r336527 - head/games/pykawari X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 15 Dec 2013 13:21:14 -0000 Author: mva Date: Sun Dec 15 13:21:13 2013 New Revision: 336527 URL: http://svnweb.freebsd.org/changeset/ports/336527 Log: - Fix the usage of 'python' to get rid of the implicit lang/python dependency Reported by: exp-run (PR 184591) Approved by: portmgr (blanket) Modified: head/games/pykawari/Makefile (contents, props changed) Modified: head/games/pykawari/Makefile ============================================================================== --- head/games/pykawari/Makefile Sun Dec 15 13:20:00 2013 (r336526) +++ head/games/pykawari/Makefile Sun Dec 15 13:21:13 2013 (r336527) @@ -34,6 +34,10 @@ NO_STAGE= yes CFLAGS+= -fPIC .endif +post-patch: + @${REINPLACE_CMD} -e 's|shell python|shell ${PYTHON_CMD}|' \ + ${WRKSRC}/build/src/gcc.mak + do-build: (cd ${WRKSRC}/build/src; CFLAGS="${CFLAGS}" ${GMAKE} -f gcc.mak PYTHONBASE=${PYTHONBASE} PYTHON_VERSION=${PYTHON_VERSION} PTHREAD_LIBS=${PTHREAD_LIBS} CXX=${CXX}) From owner-svn-ports-head@FreeBSD.ORG Sun Dec 15 13:27:54 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id A81FAC1A; Sun, 15 Dec 2013 13:27:54 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 9413A14E8; Sun, 15 Dec 2013 13:27:54 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBFDRsNx017861; Sun, 15 Dec 2013 13:27:54 GMT (envelope-from pawel@svn.freebsd.org) Received: (from pawel@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBFDRseV017859; Sun, 15 Dec 2013 13:27:54 GMT (envelope-from pawel@svn.freebsd.org) Message-Id: <201312151327.rBFDRseV017859@svn.freebsd.org> From: Pawel Pekala Date: Sun, 15 Dec 2013 13:27:54 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r336528 - head/net-p2p/vuze X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 15 Dec 2013 13:27:54 -0000 Author: pawel Date: Sun Dec 15 13:27:53 2013 New Revision: 336528 URL: http://svnweb.freebsd.org/changeset/ports/336528 Log: Update to version 5.2.0.0 Modified: head/net-p2p/vuze/Makefile head/net-p2p/vuze/distinfo Modified: head/net-p2p/vuze/Makefile ============================================================================== --- head/net-p2p/vuze/Makefile Sun Dec 15 13:21:13 2013 (r336527) +++ head/net-p2p/vuze/Makefile Sun Dec 15 13:27:53 2013 (r336528) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= vuze -PORTVERSION= 5.1.0.0 +PORTVERSION= 5.2.0.0 CATEGORIES= net-p2p java MASTER_SITES= SF/azureus/vuze/Vuze_${PORTVERSION:S/.//g} DISTNAME= Vuze_${PORTVERSION:S/.//g}_source Modified: head/net-p2p/vuze/distinfo ============================================================================== --- head/net-p2p/vuze/distinfo Sun Dec 15 13:21:13 2013 (r336527) +++ head/net-p2p/vuze/distinfo Sun Dec 15 13:27:53 2013 (r336528) @@ -1,2 +1,2 @@ -SHA256 (Vuze_5100_source.zip) = 017e56175dc194621f4201e43ccf1af6f0cbc36518ad1b1de0263fd6b0869c46 -SIZE (Vuze_5100_source.zip) = 9873092 +SHA256 (Vuze_5200_source.zip) = 399c97df898c94aa0c9d5c72d7beb8df808c6a52944ea2d3fa29540e89c36e46 +SIZE (Vuze_5200_source.zip) = 9934436 From owner-svn-ports-head@FreeBSD.ORG Sun Dec 15 13:28:38 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id E3DBECF9; Sun, 15 Dec 2013 13:28:38 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id CFB0C14EE; Sun, 15 Dec 2013 13:28:38 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBFDSc97018000; Sun, 15 Dec 2013 13:28:38 GMT (envelope-from mva@svn.freebsd.org) Received: (from mva@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBFDScMY017999; Sun, 15 Dec 2013 13:28:38 GMT (envelope-from mva@svn.freebsd.org) Message-Id: <201312151328.rBFDScMY017999@svn.freebsd.org> From: Marcus von Appen Date: Sun, 15 Dec 2013 13:28:38 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r336529 - head/games/starfighter X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 15 Dec 2013 13:28:39 -0000 Author: mva Date: Sun Dec 15 13:28:38 2013 New Revision: 336529 URL: http://svnweb.freebsd.org/changeset/ports/336529 Log: - Fix the usage of 'python' to get rid of the implicit lang/python dependency Reported by: exp-run (PR 184591) Approved by: portmgr (blanket) Modified: head/games/starfighter/Makefile Modified: head/games/starfighter/Makefile ============================================================================== --- head/games/starfighter/Makefile Sun Dec 15 13:27:53 2013 (r336528) +++ head/games/starfighter/Makefile Sun Dec 15 13:28:38 2013 (r336529) @@ -17,12 +17,17 @@ COMMENT= Liberate the universe from the LICENSE= GPLv2 -USES= gmake iconv +USES= gmake iconv shebangfix +USE_PYTHON_BUILD= -2.7 USE_XORG= x11 xau xdmcp USE_SDL= image mixer WITH_ZLIB= yes MAKEFILE= makefile +SHEBANG_FILES= pack.py unpack.py +python_OLD_CMD= ${SETENV} python +python_CMD= ${PYTHON_CMD} + INSTALLS_ICONS= yes PLIST_FILES= bin/${PORTNAME} \ From owner-svn-ports-head@FreeBSD.ORG Sun Dec 15 13:35:53 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 48E2112E; Sun, 15 Dec 2013 13:35:53 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 350241598; Sun, 15 Dec 2013 13:35:53 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBFDZrOZ021284; Sun, 15 Dec 2013 13:35:53 GMT (envelope-from mva@svn.freebsd.org) Received: (from mva@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBFDZrPQ021283; Sun, 15 Dec 2013 13:35:53 GMT (envelope-from mva@svn.freebsd.org) Message-Id: <201312151335.rBFDZrPQ021283@svn.freebsd.org> From: Marcus von Appen Date: Sun, 15 Dec 2013 13:35:53 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r336530 - head/games/teeworlds X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 15 Dec 2013 13:35:53 -0000 Author: mva Date: Sun Dec 15 13:35:52 2013 New Revision: 336530 URL: http://svnweb.freebsd.org/changeset/ports/336530 Log: - Fix the usage of 'python' to get rid of the implicit lang/python dependency - Restrict the build to the supported Python versions Reported by: exp-run (PR 184591) Approved by: portmgr (blanket) Modified: head/games/teeworlds/Makefile Modified: head/games/teeworlds/Makefile ============================================================================== --- head/games/teeworlds/Makefile Sun Dec 15 13:28:38 2013 (r336529) +++ head/games/teeworlds/Makefile Sun Dec 15 13:35:52 2013 (r336530) @@ -16,7 +16,7 @@ LICENSE= ZLIB LIB_DEPENDS= libfreetype.so:${PORTSDIR}/print/freetype2 -USE_PYTHON_BUILD= yes +USE_PYTHON_BUILD= 2 BAM_VERSION= 0.4.0 BAM_WRKSRC= ${WRKDIR}/bam-${BAM_VERSION} @@ -52,6 +52,8 @@ DESKTOP_ENTRIES="Teeworlds" \ .endif post-patch: + @${REINPLACE_CMD} -e 's|"python "|"${PYTHON_CMD} "|' \ + ${WRKSRC}/bam.lua @${REINPLACE_CMD} -e 's|-O.||; s|-lpthread|${PTHREAD_LIBS}|; s|^gcc|${CC} ${CFLAGS}|; s|-ldl||g' \ ${BAM_WRKSRC}/make_unix.sh @${REINPLACE_CMD} -e 's|sdl-config|${SDL_CONFIG}|' ${WRKSRC}/other/sdl/sdl.lua From owner-svn-ports-head@FreeBSD.ORG Sun Dec 15 13:37:15 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 2D32C21B; Sun, 15 Dec 2013 13:37:15 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 19A5115A7; Sun, 15 Dec 2013 13:37:15 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBFDbEWt021486; Sun, 15 Dec 2013 13:37:14 GMT (envelope-from wg@svn.freebsd.org) Received: (from wg@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBFDbEGE021485; Sun, 15 Dec 2013 13:37:14 GMT (envelope-from wg@svn.freebsd.org) Message-Id: <201312151337.rBFDbEGE021485@svn.freebsd.org> From: William Grzybowski Date: Sun, 15 Dec 2013 13:37:14 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r336531 - head/net/samba4 X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 15 Dec 2013 13:37:15 -0000 Author: wg Date: Sun Dec 15 13:37:14 2013 New Revision: 336531 URL: http://svnweb.freebsd.org/changeset/ports/336531 Log: net/samba4: fix usage of python to remove implicit dependency Reported by: exp-run (PR 184591) Approved by: portmgr (blanket) Modified: head/net/samba4/Makefile Modified: head/net/samba4/Makefile ============================================================================== --- head/net/samba4/Makefile Sun Dec 15 13:35:52 2013 (r336530) +++ head/net/samba4/Makefile Sun Dec 15 13:37:14 2013 (r336531) @@ -471,7 +471,7 @@ post-patch: ${PATCH_WRKSRC}/dynconfig/config.m4 # Make sure that the right version of Python is used by the tools # https://bugzilla.samba.org/show_bug.cgi?id=7305 - @for f in ${PATCH_WRKSRC}/source4/scripting/bin/*; do \ + @for f in ${PATCH_WRKSRC}/source4/scripting/bin/* ${WRKSRC}/${WAF_TOOL}; do \ ${REINPLACE_CMD} -e '1,1 s|.*python.*|#!${PYTHON_CMD}|' $${f}; \ done From owner-svn-ports-head@FreeBSD.ORG Sun Dec 15 13:50:32 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 1A692362; Sun, 15 Dec 2013 13:50:32 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 06A61165C; Sun, 15 Dec 2013 13:50:32 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBFDoVEg027429; Sun, 15 Dec 2013 13:50:31 GMT (envelope-from mva@svn.freebsd.org) Received: (from mva@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBFDoVZt027428; Sun, 15 Dec 2013 13:50:31 GMT (envelope-from mva@svn.freebsd.org) Message-Id: <201312151350.rBFDoVZt027428@svn.freebsd.org> From: Marcus von Appen Date: Sun, 15 Dec 2013 13:50:31 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r336532 - head/graphics/lcms-python X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 15 Dec 2013 13:50:32 -0000 Author: mva Date: Sun Dec 15 13:50:31 2013 New Revision: 336532 URL: http://svnweb.freebsd.org/changeset/ports/336532 Log: - Fix the usage of 'python' to get rid of the implicit lang/python dependency - Restrict python to the supported versions Reported by: exp-run (PR 184591) Approved by: portmgr (blanket) Modified: head/graphics/lcms-python/Makefile (contents, props changed) Modified: head/graphics/lcms-python/Makefile ============================================================================== --- head/graphics/lcms-python/Makefile Sun Dec 15 13:37:14 2013 (r336531) +++ head/graphics/lcms-python/Makefile Sun Dec 15 13:50:31 2013 (r336532) @@ -17,9 +17,10 @@ LIB_DEPENDS+= lcms:${PORTSDIR}/graphics/ BUILD_WRKSRC= ${WRKSRC}/python INSTALL_WRKSRC= ${WRKSRC}/python -USE_PYTHON= yes +USE_PYTHON= 2 GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-python +CONFIGURE_ENV= PYTHON="${PYTHON_CMD}" CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib From owner-svn-ports-head@FreeBSD.ORG Sun Dec 15 13:51:16 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id D5DF4444; Sun, 15 Dec 2013 13:51:16 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id C28961664; Sun, 15 Dec 2013 13:51:16 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBFDpGbv027784; Sun, 15 Dec 2013 13:51:16 GMT (envelope-from wg@svn.freebsd.org) Received: (from wg@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBFDpGgc027783; Sun, 15 Dec 2013 13:51:16 GMT (envelope-from wg@svn.freebsd.org) Message-Id: <201312151351.rBFDpGgc027783@svn.freebsd.org> From: William Grzybowski Date: Sun, 15 Dec 2013 13:51:16 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r336533 - head/net/py-pypcap X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 15 Dec 2013 13:51:16 -0000 Author: wg Date: Sun Dec 15 13:51:16 2013 New Revision: 336533 URL: http://svnweb.freebsd.org/changeset/ports/336533 Log: net/py-pypcap: fix usage of python Reported by: exp-run (PR 184591) Approved by: portmgr (blanket) Modified: head/net/py-pypcap/Makefile Modified: head/net/py-pypcap/Makefile ============================================================================== --- head/net/py-pypcap/Makefile Sun Dec 15 13:50:31 2013 (r336532) +++ head/net/py-pypcap/Makefile Sun Dec 15 13:51:16 2013 (r336533) @@ -14,8 +14,7 @@ COMMENT= Simplified object-oriented Pyth BUILD_DEPENDS= pyrexc:${PORTSDIR}/devel/pyrex USE_PYTHON= yes -USE_PYTHON_PREFIX= yes -INSTALLS_EGGINFO= yes +USE_PYDISTUTILS=yes PYDISTUTILS_PKGNAME= pcap PLIST_FILES= %%PYTHON_SITELIBDIR%%/pcap.so @@ -24,4 +23,7 @@ NO_STAGE= yes post-patch: @${RM} ${WRKDIR}/${PORTNAME}-${PORTVERSION}/pcap.c +pre-build: + (cd ${WRKSRC}; pyrexc pcap.pyx) + .include From owner-svn-ports-head@FreeBSD.ORG Sun Dec 15 13:54:32 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id B563E545; Sun, 15 Dec 2013 13:54:32 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 9F4FE1675; Sun, 15 Dec 2013 13:54:32 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBFDsWdj028263; Sun, 15 Dec 2013 13:54:32 GMT (envelope-from ohauer@svn.freebsd.org) Received: (from ohauer@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBFDsUsB028251; Sun, 15 Dec 2013 13:54:30 GMT (envelope-from ohauer@svn.freebsd.org) Message-Id: <201312151354.rBFDsUsB028251@svn.freebsd.org> From: Olli Hauer Date: Sun, 15 Dec 2013 13:54:30 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r336534 - in head/www: mod_auth_cookie_mysql2 mod_auth_imap2 mod_auth_pam2 mod_auth_pgsql2 mod_authn_sasl mod_bw mod_chroot mod_jail X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 15 Dec 2013 13:54:32 -0000 Author: ohauer Date: Sun Dec 15 13:54:30 2013 New Revision: 336534 URL: http://svnweb.freebsd.org/changeset/ports/336534 Log: - allow staging - change to new LIB_DEPENDS notation - s/LATEST_LINK/PKGNAMESUFFIX/ - fix MASTERSITE Modified: head/www/mod_auth_cookie_mysql2/Makefile head/www/mod_auth_imap2/Makefile head/www/mod_auth_pam2/Makefile head/www/mod_auth_pgsql2/Makefile head/www/mod_authn_sasl/Makefile head/www/mod_bw/Makefile head/www/mod_bw/pkg-descr head/www/mod_chroot/Makefile head/www/mod_jail/Makefile Modified: head/www/mod_auth_cookie_mysql2/Makefile ============================================================================== --- head/www/mod_auth_cookie_mysql2/Makefile Sun Dec 15 13:51:16 2013 (r336533) +++ head/www/mod_auth_cookie_mysql2/Makefile Sun Dec 15 13:54:30 2013 (r336534) @@ -10,8 +10,7 @@ DISTNAME= ${PORTNAME}_1.0 DIST_SUBDIR= apache2 MAINTAINER= apache@FreeBSD.org -COMMENT= Allows authentication against a MySQL database via a secure cookie - +COMMENT= Allows authentication against MySQL database via secure cookie USE_MYSQL= yes USE_APACHE= 22 @@ -23,5 +22,4 @@ AP_INC= ${LOCALBASE}/include/mysql AP_LIB= ${LOCALBASE}/lib/mysql -lmysqlclient SRC_FILE= mod_auth_cookie_sql2.c mod_auth_cookie_sql2_mysql.c -NO_STAGE= yes .include Modified: head/www/mod_auth_imap2/Makefile ============================================================================== --- head/www/mod_auth_imap2/Makefile Sun Dec 15 13:51:16 2013 (r336533) +++ head/www/mod_auth_imap2/Makefile Sun Dec 15 13:54:30 2013 (r336534) @@ -6,6 +6,7 @@ PORTVERSION= 2.2.0 PORTREVISION= 2 CATEGORIES= www MASTER_SITES= http://ben.brillat.net/files/projects/mod_auth_imap2/ +PKGNAMESUFFIX= 2 DISTNAME= mod_auth_imap2-${PORTVERSION} DIST_SUBDIR= apache2 @@ -16,7 +17,6 @@ LICENSE= GPLv2 WRKSRC= ${WRKDIR}/${PORTNAME}2-${PORTVERSION} USE_APACHE= 22 -LATEST_LINK= mod_auth_imap2 AP_FAST_BUILD= yes AP_GENPLIST= yes Modified: head/www/mod_auth_pam2/Makefile ============================================================================== --- head/www/mod_auth_pam2/Makefile Sun Dec 15 13:51:16 2013 (r336533) +++ head/www/mod_auth_pam2/Makefile Sun Dec 15 13:54:30 2013 (r336534) @@ -7,14 +7,12 @@ PORTREVISION= 4 CATEGORIES= www MASTER_SITES= http://pam.sourceforge.net/mod_auth_pam/dist/ PKGNAMEPREFIX= ${APACHE_PKGNAMEPREFIX} +PKGNAMESUFFIX= 2 DISTNAME= ${PORTNAME}-2.0-${PORTVERSION} MAINTAINER= apache@FreeBSD.org COMMENT= Allows users to use PAM modules for user authentication - -LATEST_LINK= mod_auth_pam2 - USE_APACHE= 22+ WRKSRC= ${WRKDIR}/${PORTNAME} @@ -26,15 +24,10 @@ AP_GENPLIST= yes AP_EXTRAS+= -lpam -NO_STAGE= yes post-install: -.if !defined(NOPORTEXAMPLES) - ${MKDIR} ${EXAMPLESDIR}/ - ${INSTALL_DATA} ${WRKSRC}/samples/httpd ${EXAMPLESDIR}/pam-httpd.sample -.endif -.if !defined(NOPORTDOCS) - ${MKDIR} ${DOCSDIR}/ - ${INSTALL_DATA} ${WRKSRC}/doc/*.html ${DOCSDIR}/ -.endif + @${MKDIR} ${STAGEDIR}${EXAMPLESDIR} + ${INSTALL_DATA} ${WRKSRC}/samples/httpd ${STAGEDIR}${EXAMPLESDIR}/pam-httpd.sample + ${MKDIR} ${STAGEDIR}${DOCSDIR} + ${INSTALL_DATA} ${WRKSRC}/doc/*.html ${STAGEDIR}${DOCSDIR} .include Modified: head/www/mod_auth_pgsql2/Makefile ============================================================================== --- head/www/mod_auth_pgsql2/Makefile Sun Dec 15 13:51:16 2013 (r336533) +++ head/www/mod_auth_pgsql2/Makefile Sun Dec 15 13:54:30 2013 (r336534) @@ -6,27 +6,22 @@ PORTVERSION= 2.0.3 PORTREVISION= 2 CATEGORIES= www MASTER_SITES= http://www.giuseppetanzilli.it/mod_auth_pgsql2/dist/ +PKGNAMESUFFIX= 2 MAINTAINER= apache@FreeBSD.org COMMENT= Allows users to use PostgreSQL databases for user authentication - USE_PGSQL= yes USE_APACHE= 22 -LATEST_LINK= mod_auth_pgsql2 - AP_INC?= ${LOCALBASE}/include AP_LIB?= ${LOCALBASE}/lib -lpq AP_FAST_BUILD= yes AP_GENPLIST= yes PORTDOCS= mod_auth_pgsql.html -NO_STAGE= yes post-install: -.if !defined(NOPORTDOCS) - @${MKDIR} ${DOCSDIR} - @${INSTALL_DATA} ${WRKSRC}/mod_auth_pgsql.html ${DOCSDIR} -.endif + @${MKDIR} ${STAGEDIR}${DOCSDIR} + ${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR} .include Modified: head/www/mod_authn_sasl/Makefile ============================================================================== --- head/www/mod_authn_sasl/Makefile Sun Dec 15 13:51:16 2013 (r336533) +++ head/www/mod_authn_sasl/Makefile Sun Dec 15 13:54:30 2013 (r336534) @@ -13,13 +13,12 @@ COMMENT= Allows user authentication base LICENSE= AL2 -LIB_DEPENDS= sasl2:${PORTSDIR}/security/cyrus-sasl2 - +LIB_DEPENDS= libsasl2.so:${PORTSDIR}/security/cyrus-sasl2 OPTIONS_DEFINE= SASLAUTHD SASLAUTHD_DESC= cyrus-sasl2-saslauthd support -NO_STAGE= yes +SASLAUTHD_RUN_DEPENDS= saslauthd:${PORTSDIR}/security/cyrus-sasl2-saslauthd .include USE_BZIP2= yes @@ -31,18 +30,10 @@ AP_LIB= ${LOCALBASE}/lib -lsasl2 PORTDOCS1= AUTHORS LICENSE PORTDOCS= * -.if ${PORT_OPTIONS:MSASLAUTHD} -RUN_DEPENDS+= saslauthd:${PORTSDIR}/security/cyrus-sasl2-saslauthd -.endif - post-install: -.if ${PORT_OPTIONS:MDOCS} - @${MKDIR} ${DOCSDIR}/ - @${FIND} ${WRKSRC}/doc \( -name "*.in" -o -name "*.am" \) -delete -. for f in ${PORTDOCS1} - @${INSTALL_DATA} ${WRKSRC}/${f} ${DOCSDIR}/ -. endfor - @(cd ${WRKSRC} && ${COPYTREE_SHARE} doc ${DOCSDIR}) -.endif + @${MKDIR} ${STAGEDIR}${DOCSDIR} + ${INSTALL_DATA} ${PORTDOCS1:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR}/ + @(cd ${WRKSRC} && ${COPYTREE_SHARE} doc ${STAGEDIR}${DOCSDIR} \ + "! ( -name *\.in -o -name *\.am )" ) .include Modified: head/www/mod_bw/Makefile ============================================================================== --- head/www/mod_bw/Makefile Sun Dec 15 13:51:16 2013 (r336533) +++ head/www/mod_bw/Makefile Sun Dec 15 13:54:30 2013 (r336534) @@ -5,13 +5,14 @@ PORTNAME= mod_bw PORTVERSION= 0.8 PORTREVISION= 1 CATEGORIES= www -MASTER_SITES= http://www.ivn.cl/apache/files/source/ +MASTER_SITES= http://legacy.ivn.cl/files/source/ EXTRACT_SUFX= .tgz DIST_SUBDIR= apache2 MAINTAINER= apache@FreeBSD.org COMMENT= Bandwidth and Connection control per Virtual Host or Directory +LICENSE= AL2 WRKSRC= ${WRKDIR}/mod_bw USE_APACHE= 22 @@ -19,14 +20,10 @@ AP_FAST_BUILD= yes AP_GENPLIST= yes SRC_FILE= mod_bw.c -PORTDOCS= LICENSE mod_bw.txt +PORTDOCS= mod_bw.txt -NO_STAGE= yes post-install: -.ifndef NOPORTDOCS - @${MKDIR} ${DOCSDIR} - @cd ${WRKSRC} && \ - ${INSTALL_DATA} ${PORTDOCS} ${DOCSDIR} -.endif + @${MKDIR} ${STAGEDIR}${DOCSDIR} + ${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR} .include Modified: head/www/mod_bw/pkg-descr ============================================================================== --- head/www/mod_bw/pkg-descr Sun Dec 15 13:51:16 2013 (r336533) +++ head/www/mod_bw/pkg-descr Sun Dec 15 13:54:30 2013 (r336534) @@ -3,4 +3,4 @@ It can: * Restrict the number of simultaneous connections per vhost/dir * Limit the bandwidth for files on vhost/dir -WWW: http://www.ivn.cl/apache/ +WWW: http://ivn.cl/category/apache/ Modified: head/www/mod_chroot/Makefile ============================================================================== --- head/www/mod_chroot/Makefile Sun Dec 15 13:51:16 2013 (r336533) +++ head/www/mod_chroot/Makefile Sun Dec 15 13:54:30 2013 (r336534) @@ -10,17 +10,14 @@ MASTER_SITES= http://core.segfault.pl/~h MAINTAINER= apache@FreeBSD.org COMMENT= The mod_chroot makes running Apache in a chroot easy - USE_APACHE= 22+ AP_FAST_BUILD= yes AP_GENPLIST= yes PORTDOCS= INSTALL CAVEATS README.Apache20 README -NO_STAGE= yes post-install: -.if !defined(NOPORTDOCS) - @${MKDIR} ${DOCSDIR} - @cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${DOCSDIR} -.endif + @${MKDIR} ${STAGEDIR}${DOCSDIR} + ${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR} + .include Modified: head/www/mod_jail/Makefile ============================================================================== --- head/www/mod_jail/Makefile Sun Dec 15 13:51:16 2013 (r336533) +++ head/www/mod_jail/Makefile Sun Dec 15 13:54:30 2013 (r336534) @@ -9,26 +9,15 @@ MASTER_SITES= http://mod-jail.googlecode MAINTAINER= apache@FreeBSD.org COMMENT= Apache module to enable an easy alternative to mod_chroot +LICENSE= AL2 USE_APACHE= 22+ AP_FAST_BUILD= yes AP_GENPLIST= yes -NOPORTDOCS= yes -PORTDOCS= changelog.html documentation.html download.html \ - index.html - -NO_STAGE= yes .include post-extract: @${REINPLACE_CMD} -e "s|= apxs|= ${APXS}|" ${WRKSRC}/Makefile -post-install: -.if !defined(NOPORTDOCS) - @${MKDIR} ${DOCSDIR} - @cd ${WRKSRC}/doc && \ - ${INSTALL_DATA} ${PORTDOCS} ${DOCSDIR} -.endif - .include From owner-svn-ports-head@FreeBSD.ORG Sun Dec 15 13:56:48 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id C748D653; Sun, 15 Dec 2013 13:56:48 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id B3281168E; Sun, 15 Dec 2013 13:56:48 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBFDumsD028673; Sun, 15 Dec 2013 13:56:48 GMT (envelope-from wg@svn.freebsd.org) Received: (from wg@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBFDum7S028671; Sun, 15 Dec 2013 13:56:48 GMT (envelope-from wg@svn.freebsd.org) Message-Id: <201312151356.rBFDum7S028671@svn.freebsd.org> From: William Grzybowski Date: Sun, 15 Dec 2013 13:56:48 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r336536 - in head/net: rabbitmq-c rabbitmq-c-devel X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 15 Dec 2013 13:56:48 -0000 Author: wg Date: Sun Dec 15 13:56:47 2013 New Revision: 336536 URL: http://svnweb.freebsd.org/changeset/ports/336536 Log: net/rabbitmq-c(-devel)?: depends explicitly on "python" Reported by: exp-run (PR 184591) Approved by: portmgr (blanket) Modified: head/net/rabbitmq-c-devel/Makefile head/net/rabbitmq-c/Makefile Modified: head/net/rabbitmq-c-devel/Makefile ============================================================================== --- head/net/rabbitmq-c-devel/Makefile Sun Dec 15 13:56:46 2013 (r336535) +++ head/net/rabbitmq-c-devel/Makefile Sun Dec 15 13:56:47 2013 (r336536) @@ -19,7 +19,8 @@ COMMENT= RabbitMQ C AMQP client library LICENSE= GPLv2 MPL LICENSE_COMB= dual -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}simplejson>=2.0:${PORTSDIR}/devel/py-simplejson +BUILD_DEPENDS= python:${PORTSDIR}/lang/python \ + ${PYTHON_PKGNAMEPREFIX}simplejson>=2.0:${PORTSDIR}/devel/py-simplejson CONFLICTS= rabbitmq-c-[0-9]* Modified: head/net/rabbitmq-c/Makefile ============================================================================== --- head/net/rabbitmq-c/Makefile Sun Dec 15 13:56:46 2013 (r336535) +++ head/net/rabbitmq-c/Makefile Sun Dec 15 13:56:47 2013 (r336536) @@ -18,7 +18,8 @@ COMMENT= RabbitMQ C AMQP client library LICENSE= GPLv2 MPL LICENSE_COMB= dual -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}simplejson>=2.0:${PORTSDIR}/devel/py-simplejson +BUILD_DEPENDS= python:${PORTSDIR}/lang/python \ + ${PYTHON_PKGNAMEPREFIX}simplejson>=2.0:${PORTSDIR}/devel/py-simplejson CONFLICTS= rabbitmq-c-devel-[0-9]* From owner-svn-ports-head@FreeBSD.ORG Sun Dec 15 13:56:46 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id AA903652; Sun, 15 Dec 2013 13:56:46 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 966D6168D; Sun, 15 Dec 2013 13:56:46 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBFDukGg028604; Sun, 15 Dec 2013 13:56:46 GMT (envelope-from az@svn.freebsd.org) Received: (from az@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBFDuklH028603; Sun, 15 Dec 2013 13:56:46 GMT (envelope-from az@svn.freebsd.org) Message-Id: <201312151356.rBFDuklH028603@svn.freebsd.org> From: Andrej Zverev Date: Sun, 15 Dec 2013 13:56:46 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r336535 - head/net-p2p/libtorrent-devel/files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 15 Dec 2013 13:56:46 -0000 Author: az Date: Sun Dec 15 13:56:46 2013 New Revision: 336535 URL: http://svnweb.freebsd.org/changeset/ports/336535 Log: - Try fix under fbsd > 10 Added: head/net-p2p/libtorrent-devel/files/patch-src__torrent__connection_manager.h (contents, props changed) Added: head/net-p2p/libtorrent-devel/files/patch-src__torrent__connection_manager.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net-p2p/libtorrent-devel/files/patch-src__torrent__connection_manager.h Sun Dec 15 13:56:46 2013 (r336535) @@ -0,0 +1,10 @@ +--- ./src/torrent/connection_manager.h.orig 2013-12-15 17:55:18.427951513 +0400 ++++ ./src/torrent/connection_manager.h 2013-12-15 17:55:43.459221755 +0400 +@@ -42,6 +42,7 @@ + + #include + #include ++#include + #include + #include + #include From owner-svn-ports-head@FreeBSD.ORG Sun Dec 15 14:04:58 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 52E91989; Sun, 15 Dec 2013 14:04:58 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 3EDE116FE; Sun, 15 Dec 2013 14:04:58 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBFE4wXZ032243; Sun, 15 Dec 2013 14:04:58 GMT (envelope-from mva@svn.freebsd.org) Received: (from mva@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBFE4wN0032242; Sun, 15 Dec 2013 14:04:58 GMT (envelope-from mva@svn.freebsd.org) Message-Id: <201312151404.rBFE4wN0032242@svn.freebsd.org> From: Marcus von Appen Date: Sun, 15 Dec 2013 14:04:58 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r336537 - head/graphics/libosmesa X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 15 Dec 2013 14:04:58 -0000 Author: mva Date: Sun Dec 15 14:04:57 2013 New Revision: 336537 URL: http://svnweb.freebsd.org/changeset/ports/336537 Log: - Restrict the python version to be used to the proper value Reported by: exp-run (PR 184591) Approved by: portmgr (blanket) Modified: head/graphics/libosmesa/Makefile Modified: head/graphics/libosmesa/Makefile ============================================================================== --- head/graphics/libosmesa/Makefile Sun Dec 15 13:56:47 2013 (r336536) +++ head/graphics/libosmesa/Makefile Sun Dec 15 14:04:57 2013 (r336537) @@ -16,7 +16,7 @@ BUILD_DEPENDS= ${PYTHON_SITELIBDIR}/libx USES+= gmake pkgconfig USE_BZIP2= yes USE_LDCONFIG= yes -USE_PYTHON= yes +USE_PYTHON= 2 USE_XORG= x11 xext USE_AUTOTOOLS= autoconf automake libtool GNU_CONFIGURE= yes From owner-svn-ports-head@FreeBSD.ORG Sun Dec 15 14:14:53 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 6D27AAAC; Sun, 15 Dec 2013 14:14:53 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 593011769; Sun, 15 Dec 2013 14:14:53 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBFEErVR036091; Sun, 15 Dec 2013 14:14:53 GMT (envelope-from mva@svn.freebsd.org) Received: (from mva@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBFEEr6W036090; Sun, 15 Dec 2013 14:14:53 GMT (envelope-from mva@svn.freebsd.org) Message-Id: <201312151414.rBFEEr6W036090@svn.freebsd.org> From: Marcus von Appen Date: Sun, 15 Dec 2013 14:14:53 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r336538 - head/graphics/nathive X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 15 Dec 2013 14:14:53 -0000 Author: mva Date: Sun Dec 15 14:14:52 2013 New Revision: 336538 URL: http://svnweb.freebsd.org/changeset/ports/336538 Log: - Fix the usage of 'python' to get rid of the implicit lang/python dependency Reported by: exp-run (PR 184591) Approved by: portmgr (blanket) Modified: head/graphics/nathive/Makefile (contents, props changed) Modified: head/graphics/nathive/Makefile ============================================================================== --- head/graphics/nathive/Makefile Sun Dec 15 14:04:57 2013 (r336537) +++ head/graphics/nathive/Makefile Sun Dec 15 14:14:52 2013 (r336538) @@ -31,7 +31,8 @@ NO_STAGE= yes post-patch: @${REINPLACE_CMD} -e '/BASE =/ s|=.*|= ${PREFIX}/|; \ - s|cp -r \([^ ]*\)/|cp -R \1|' ${WRKSRC}/${MAKEFILE} + s|cp -r \([^ ]*\)/|cp -R \1|; \ + s|python |${PYTHON_CMD} |' ${WRKSRC}/${MAKEFILE} @${REINPLACE_CMD} -e 's|/usr/share/nathive|${DATADIR}|' \ ${WRKSRC}/${PORTNAME}.desktop .if ! ${PORT_OPTIONS:MDOCS} From owner-svn-ports-head@FreeBSD.ORG Sun Dec 15 14:19:48 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id DA8EFBCE; Sun, 15 Dec 2013 14:19:48 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id C59E01786; Sun, 15 Dec 2013 14:19:48 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBFEJms2036769; Sun, 15 Dec 2013 14:19:48 GMT (envelope-from rene@svn.freebsd.org) Received: (from rene@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBFEJm9L036767; Sun, 15 Dec 2013 14:19:48 GMT (envelope-from rene@svn.freebsd.org) Message-Id: <201312151419.rBFEJm9L036767@svn.freebsd.org> From: Rene Ladan Date: Sun, 15 Dec 2013 14:19:48 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r336539 - head/comms/dcf77pi X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 15 Dec 2013 14:19:48 -0000 Author: rene Date: Sun Dec 15 14:19:48 2013 New Revision: 336539 URL: http://svnweb.freebsd.org/changeset/ports/336539 Log: Update to 1.1.1 Changes: dcf77pi: - Calculate century (modulo 400) from year, month, day of week, day of month - New parameter -S to set the system time - Improvements to DST handling - Set error state if day of month is too large, not just when greater than 31 readpin: - New parameter -t for readpin to adjust nanosleep() delay - Determine realfreq dynamically, do not use realfreq from config.txt general: - Documentation updates - Code cleanups Modified: head/comms/dcf77pi/Makefile head/comms/dcf77pi/distinfo Modified: head/comms/dcf77pi/Makefile ============================================================================== --- head/comms/dcf77pi/Makefile Sun Dec 15 14:14:52 2013 (r336538) +++ head/comms/dcf77pi/Makefile Sun Dec 15 14:19:48 2013 (r336539) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= dcf77pi -PORTVERSION= 1.1.0 +PORTVERSION= 1.1.1 CATEGORIES= comms MAINTAINER= rene@FreeBSD.org @@ -12,7 +12,7 @@ LICENSE= BSD USE_GITHUB= yes GH_ACCOUNT= rene0 -GH_COMMIT= 82252fd +GH_COMMIT= 8be074e MAKE_ARGS= FULLPREFIX="${STAGEDIR}${PREFIX}" Modified: head/comms/dcf77pi/distinfo ============================================================================== --- head/comms/dcf77pi/distinfo Sun Dec 15 14:14:52 2013 (r336538) +++ head/comms/dcf77pi/distinfo Sun Dec 15 14:19:48 2013 (r336539) @@ -1,2 +1,2 @@ -SHA256 (dcf77pi-1.1.0.tar.gz) = e2f8284228c49cb385d3479bd3f14cf39b205ad6a69d5f6bf55a5ed1f2f2a000 -SIZE (dcf77pi-1.1.0.tar.gz) = 11976 +SHA256 (dcf77pi-1.1.1.tar.gz) = 4849ff943c3e74480e86e6719302daffcc6140008e0d4f076e32cc31440fc87a +SIZE (dcf77pi-1.1.1.tar.gz) = 13058 From owner-svn-ports-head@FreeBSD.ORG Sun Dec 15 14:32:29 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id A874FD64; Sun, 15 Dec 2013 14:32:29 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 9254F186C; Sun, 15 Dec 2013 14:32:29 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBFEWTSj043180; Sun, 15 Dec 2013 14:32:29 GMT (envelope-from rene@svn.freebsd.org) Received: (from rene@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBFEWSnq043175; Sun, 15 Dec 2013 14:32:28 GMT (envelope-from rene@svn.freebsd.org) Message-Id: <201312151432.rBFEWSnq043175@svn.freebsd.org> From: Rene Ladan Date: Sun, 15 Dec 2013 14:32:28 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r336540 - in head: . audio/liteamp graphics graphics/openexr_ctl net-p2p net-p2p/libtorrent-rasterbar-15-python security security/bubblegum security/opieprint security/snortsms sysutils... X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 15 Dec 2013 14:32:29 -0000 Author: rene Date: Sun Dec 15 14:32:28 2013 New Revision: 336540 URL: http://svnweb.freebsd.org/changeset/ports/336540 Log: Remove expired ports: 2013-12-01 audio/liteamp: Dead upstream since 2004, does not build with clang 2013-12-08 security/opieprint: No more active upstream 2013-12-08 security/bubblegum: No more active upstream 2013-12-08 security/snortsms: Not active since several years. 2013-12-08 sysutils/hammerhead: Development no more active 2013-12-13 net-p2p/libtorrent-rasterbar-15-python: Unusable, development ceased 2013-12-13 graphics/openexr_ctl: Now distributed with ampasCTL-1.5 Deleted: head/audio/liteamp/ head/graphics/openexr_ctl/ head/net-p2p/libtorrent-rasterbar-15-python/ head/security/bubblegum/ head/security/opieprint/ head/security/snortsms/ head/sysutils/hammerhead/ Modified: head/MOVED head/graphics/Makefile head/net-p2p/Makefile head/security/Makefile head/sysutils/Makefile Modified: head/MOVED ============================================================================== --- head/MOVED Sun Dec 15 14:19:48 2013 (r336539) +++ head/MOVED Sun Dec 15 14:32:28 2013 (r336540) @@ -5299,3 +5299,10 @@ security/pdfcrack||2013-12-08|Has expire security/rarcrack||2013-12-08|Has expired: Not active since several years java/subversion-java|java/java-subversion|2013-12-08|Rename to reflect subversion child port naming scheme games/flare|games/flare-game|2013-12-10|Flare port was split into engine and game counterparts, as upstream did +audio/liteamp||2013-12-15|Has expired: Dead upstream since 2004, does not build with clang +security/opieprint||2013-12-15|Has expired: No more active upstream +security/bubblegum||2013-12-15|Has expired: No more active upstream +security/snortsms||2013-12-15|Has expired: Not active since several years. +sysutils/hammerhead||2013-12-15|Has expired: Development no more active +net-p2p/libtorrent-rasterbar-15-python||2013-12-15|Has expired: Unusable, development ceased +graphics/openexr_ctl||2013-12-15|Has expired: Now distributed with ampasCTL-1.5 Modified: head/graphics/Makefile ============================================================================== --- head/graphics/Makefile Sun Dec 15 14:19:48 2013 (r336539) +++ head/graphics/Makefile Sun Dec 15 14:32:28 2013 (r336540) @@ -618,7 +618,6 @@ SUBDIR += opencv-java SUBDIR += opendis SUBDIR += opendx - SUBDIR += openexr_ctl SUBDIR += opengl-man SUBDIR += opengtl SUBDIR += openimageio Modified: head/net-p2p/Makefile ============================================================================== --- head/net-p2p/Makefile Sun Dec 15 14:19:48 2013 (r336539) +++ head/net-p2p/Makefile Sun Dec 15 14:32:28 2013 (r336540) @@ -47,7 +47,6 @@ SUBDIR += libtorrent-devel SUBDIR += libtorrent-rasterbar SUBDIR += libtorrent-rasterbar-15 - SUBDIR += libtorrent-rasterbar-15-python SUBDIR += libtorrent-rasterbar-python SUBDIR += linux-jigdo SUBDIR += linuxdcpp Modified: head/security/Makefile ============================================================================== --- head/security/Makefile Sun Dec 15 14:19:48 2013 (r336539) +++ head/security/Makefile Sun Dec 15 14:32:28 2013 (r336540) @@ -51,7 +51,6 @@ SUBDIR += bsdsfv SUBDIR += bsmtrace SUBDIR += bsp_upektfmess - SUBDIR += bubblegum SUBDIR += bugs SUBDIR += burpsuite SUBDIR += ca_root_nss @@ -374,7 +373,6 @@ SUBDIR += openvpn-beta SUBDIR += openvpn-devel SUBDIR += ophcrack - SUBDIR += opieprint SUBDIR += orthrus SUBDIR += osiris SUBDIR += ossec-hids-client @@ -929,7 +927,6 @@ SUBDIR += snort-rep SUBDIR += snortreport SUBDIR += snortsam - SUBDIR += snortsms SUBDIR += snortsnarf SUBDIR += softhsm SUBDIR += spass Modified: head/sysutils/Makefile ============================================================================== --- head/sysutils/Makefile Sun Dec 15 14:19:48 2013 (r336539) +++ head/sysutils/Makefile Sun Dec 15 14:32:28 2013 (r336540) @@ -367,7 +367,6 @@ SUBDIR += hachoir-wx SUBDIR += hal SUBDIR += hal-info - SUBDIR += hammerhead SUBDIR += hardlink SUBDIR += hatop SUBDIR += hdup From owner-svn-ports-head@FreeBSD.ORG Sun Dec 15 15:02:30 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id D908A22A; Sun, 15 Dec 2013 15:02:30 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id C45591A0B; Sun, 15 Dec 2013 15:02:30 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBFF2ULi053684; Sun, 15 Dec 2013 15:02:30 GMT (envelope-from koobs@svn.freebsd.org) Received: (from koobs@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBFF2U7x053683; Sun, 15 Dec 2013 15:02:30 GMT (envelope-from koobs@svn.freebsd.org) Message-Id: <201312151502.rBFF2U7x053683@svn.freebsd.org> From: Kubilay Kocak Date: Sun, 15 Dec 2013 15:02:30 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r336541 - head/math/py-numpy X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 15 Dec 2013 15:02:30 -0000 Author: koobs Date: Sun Dec 15 15:02:30 2013 New Revision: 336541 URL: http://svnweb.freebsd.org/changeset/ports/336541 Log: math/py-numpy: Remove Atlas WITH_STATIC notification using ECHO_MSG Shell commands can't be used in a Makefile without a target. Remove the atlas WITH_STATIC messaging until a more suitable mechanism can be found. PR: ports/184775 Reported by: Roland Smith Modified: head/math/py-numpy/Makefile Modified: head/math/py-numpy/Makefile ============================================================================== --- head/math/py-numpy/Makefile Sun Dec 15 14:32:28 2013 (r336540) +++ head/math/py-numpy/Makefile Sun Dec 15 15:02:30 2013 (r336541) @@ -56,14 +56,6 @@ DISTFILES+= ${FP_ARCH}/fenv.c?p=203441:f .if ${PORT_OPTIONS:MATLAS} LIB_DEPENDS+= atlas.2:${PORTSDIR}/math/atlas -BUILD_DEPENDS+= ${LOCALBASE}/lib/libalapack.a -@${ECHO_MSG} -@${ECHO_MSG} "Atlas *must* be built with the WITH_STATIC option" -@${ECHO_MSG} "for numpy to function correctly. Ensure it is" -@${ECHO_MSG} "selected in the configuration dialog when prompted, or" -@${ECHO_MSG} "Ctrl-C now and reinstall the atlas port with the option" -@${ECHO_MSG} "enabled." -sleep 5 .else LIB_DEPENDS+= lapack.4:${PORTSDIR}/math/lapack \ blas.2:${PORTSDIR}/math/blas From owner-svn-ports-head@FreeBSD.ORG Sun Dec 15 15:13:14 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 95EC7380; Sun, 15 Dec 2013 15:13:14 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 674E41A80; Sun, 15 Dec 2013 15:13:14 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBFFDEbH057650; Sun, 15 Dec 2013 15:13:14 GMT (envelope-from demon@svn.freebsd.org) Received: (from demon@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBFFDD8T057646; Sun, 15 Dec 2013 15:13:13 GMT (envelope-from demon@svn.freebsd.org) Message-Id: <201312151513.rBFFDD8T057646@svn.freebsd.org> From: Dmitry Sivachenko Date: Sun, 15 Dec 2013 15:13:13 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r336542 - in head/net-mgmt/nagios-plugins: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 15 Dec 2013 15:13:14 -0000 Author: demon Date: Sun Dec 15 15:13:13 2013 New Revision: 336542 URL: http://svnweb.freebsd.org/changeset/ports/336542 Log: Use drill(1) instead of dig(1) on fresh FreeBSD-10. Disable check_dns for now because there is no nslookup in base. Several people pointed out drill can be use instead of dig (mat@, Alexander Wittig , et al). Added: head/net-mgmt/nagios-plugins/files/extra-patch-dig-to-drill.diff (contents, props changed) Modified: head/net-mgmt/nagios-plugins/Makefile head/net-mgmt/nagios-plugins/pkg-plist Modified: head/net-mgmt/nagios-plugins/Makefile ============================================================================== --- head/net-mgmt/nagios-plugins/Makefile Sun Dec 15 15:02:30 2013 (r336541) +++ head/net-mgmt/nagios-plugins/Makefile Sun Dec 15 15:13:13 2013 (r336542) @@ -148,6 +148,14 @@ CONFIGURE_ARGS+= --without-dbi PLIST_SUB+= SUB_DBI="@comment " .endif +.if ${OSVERSION} > 1000055 +EXTRA_PATCHES+= ${FILESDIR}/extra-patch-dig-to-drill.diff +CONFIGURE_ARGS+=--with-dig-command=/usr/bin/drill +PLIST_SUB+= SUB_DNS="@comment " +.else +PLIST_SUB+= SUB_DNS="" +.endif + post-patch: .for file in check_by_ssh.c check_disk.c check_http.c check_mrtgtraf.c \ check_nagios.c check_ntp.c check_ntp_peer.c check_ntp_time.c \ Added: head/net-mgmt/nagios-plugins/files/extra-patch-dig-to-drill.diff ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net-mgmt/nagios-plugins/files/extra-patch-dig-to-drill.diff Sun Dec 15 15:13:13 2013 (r336542) @@ -0,0 +1,11 @@ +--- plugins/check_dig.c.orig 2013-10-02 19:22:21.000000000 +0400 ++++ plugins/check_dig.c 2013-12-15 16:55:26.000000000 +0400 +@@ -88,7 +88,7 @@ main (int argc, char **argv) + usage_va(_("Could not parse arguments")); + + /* get the command to run */ +- xasprintf (&command_line, "%s @%s -p %d %s -t %s %s %s", ++ xasprintf (&command_line, "%s @%s -p %d %s %s %s %s", + PATH_TO_DIG, dns_server, server_port, query_address, record_type, dig_args, query_transport); + + alarm (timeout_interval); Modified: head/net-mgmt/nagios-plugins/pkg-plist ============================================================================== --- head/net-mgmt/nagios-plugins/pkg-plist Sun Dec 15 15:02:30 2013 (r336541) +++ head/net-mgmt/nagios-plugins/pkg-plist Sun Dec 15 15:13:13 2013 (r336542) @@ -8,7 +8,7 @@ libexec/nagios/check_dhcp libexec/nagios/check_dig libexec/nagios/check_disk libexec/nagios/check_disk_smb -libexec/nagios/check_dns +%%SUB_DNS%%libexec/nagios/check_dns libexec/nagios/check_dummy libexec/nagios/check_file_age libexec/nagios/check_flexlm From owner-svn-ports-head@FreeBSD.ORG Sun Dec 15 15:18:07 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id E86234AB; Sun, 15 Dec 2013 15:18:07 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id D46081AA7; Sun, 15 Dec 2013 15:18:07 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBFFI7ps058303; Sun, 15 Dec 2013 15:18:07 GMT (envelope-from demon@svn.freebsd.org) Received: (from demon@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBFFI7lf058302; Sun, 15 Dec 2013 15:18:07 GMT (envelope-from demon@svn.freebsd.org) Message-Id: <201312151518.rBFFI7lf058302@svn.freebsd.org> From: Dmitry Sivachenko Date: Sun, 15 Dec 2013 15:18:07 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r336543 - head/net-mgmt/nagios-plugins X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 15 Dec 2013 15:18:08 -0000 Author: demon Date: Sun Dec 15 15:18:07 2013 New Revision: 336543 URL: http://svnweb.freebsd.org/changeset/ports/336543 Log: Add new option: EXTRAOPTS. It enables parsing of plugins ini config files for extra options. Submitted by: Chris 'sh0shin' Frage Modified: head/net-mgmt/nagios-plugins/Makefile Modified: head/net-mgmt/nagios-plugins/Makefile ============================================================================== --- head/net-mgmt/nagios-plugins/Makefile Sun Dec 15 15:13:13 2013 (r336542) +++ head/net-mgmt/nagios-plugins/Makefile Sun Dec 15 15:18:07 2013 (r336543) @@ -18,8 +18,8 @@ USE_AUTOTOOLS= libtool aclocal autoconf ACLOCAL_ARGS= -I m4 -I gl/m4 AUTOMAKE_ARGS= --add-missing -OPTIONS_DEFINE= QSTAT FPING NETSNMP RADIUS MYSQL PGSQL LDAP IPV6 JAIL NLS DBI -OPTIONS_DEFAULT=IPV6 +OPTIONS_DEFINE= QSTAT FPING NETSNMP RADIUS MYSQL PGSQL LDAP IPV6 JAIL NLS DBI EXTRAOPTS +OPTIONS_DEFAULT=IPV6 EXTRAOPTS QSTAT_DESC= Game server query support (check_game) FPING_DESC= Support for non-flooding fast ping (check_fping) @@ -30,6 +30,7 @@ PGSQL_DESC= PostgreSQL support (check_pg LDAP_DESC= OpenLDAP support (check_ldap) JAIL_DESC= Compilation within jail(8) (see Makefile) DBI_DESC= Check database using DBI +EXTRAOPTS_DESC= Parsing of plugins ini config files for extra options GNU_CONFIGURE= yes @@ -156,6 +157,10 @@ PLIST_SUB+= SUB_DNS="@comment " PLIST_SUB+= SUB_DNS="" .endif +.if ${PORT_OPTIONS:MEXTRAOPTS} +CONFIGURE_ARGS+= --enable-extra-opts +.endif + post-patch: .for file in check_by_ssh.c check_disk.c check_http.c check_mrtgtraf.c \ check_nagios.c check_ntp.c check_ntp_peer.c check_ntp_time.c \ From owner-svn-ports-head@FreeBSD.ORG Sun Dec 15 15:22:15 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 3476159A; Sun, 15 Dec 2013 15:22:15 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 1FC3D1AF7; Sun, 15 Dec 2013 15:22:15 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBFFMExx061188; Sun, 15 Dec 2013 15:22:14 GMT (envelope-from mva@svn.freebsd.org) Received: (from mva@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBFFMEUd061187; Sun, 15 Dec 2013 15:22:14 GMT (envelope-from mva@svn.freebsd.org) Message-Id: <201312151522.rBFFMEUd061187@svn.freebsd.org> From: Marcus von Appen Date: Sun, 15 Dec 2013 15:22:14 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r336544 - head/graphics/opencolorio X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 15 Dec 2013 15:22:15 -0000 Author: mva Date: Sun Dec 15 15:22:14 2013 New Revision: 336544 URL: http://svnweb.freebsd.org/changeset/ports/336544 Log: - Depend explicitly on lang/python Reported by: exp-run (PR 184591) Approved by: portmgr (blanket) Modified: head/graphics/opencolorio/Makefile Modified: head/graphics/opencolorio/Makefile ============================================================================== --- head/graphics/opencolorio/Makefile Sun Dec 15 15:18:07 2013 (r336543) +++ head/graphics/opencolorio/Makefile Sun Dec 15 15:22:14 2013 (r336544) @@ -37,6 +37,7 @@ CMAKE_ARGS+= -DOCIO_USE_SSE:BOOL=OFF .include .if ${SLAVE_PORT} == no +BUILD_DEPENDS= python:${PORTSDIR}/lang/python LIB_DEPENDS= libtinyxml.so:${PORTSDIR}/textproc/tinyxml \ libyaml-cpp.so:${PORTSDIR}/devel/yaml-cpp USE_PYTHON= 2.6+ From owner-svn-ports-head@FreeBSD.ORG Sun Dec 15 15:34:31 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 90ECA70C; Sun, 15 Dec 2013 15:34:31 +0000 (UTC) Received: from 0.mx.codelabs.ru (0.mx.codelabs.ru [144.206.233.71]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 268BB1C99; Sun, 15 Dec 2013 15:34:31 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=codelabs.ru; s=three; h=Sender:In-Reply-To:Content-Type:MIME-Version:References:Message-ID:Subject:Cc:To:From:Date; bh=SNn+D7eEPmc4Eh2xm78aJFyaKCr++AHURHOvcUJiDYs=; b=jJiIlpCsh4tSpy/K/uku3Efb0eoVwVv9IEmScDggKOii+S5hzdzP4gK/yau0qgNL+xI4e4wOjuIBmYI63ZD0GLuV8rOpVBqCkO9lxv282UVki3zSPU2bAyVl1N4m9LmeAV8urIUI48RWXDLZnOV8rfOX2Kuw5i4DkSdjCIDB9ci0fNzAP8rVajLx8jrm1rgx2IGvGGT87+VjhrP1t4sz8uy7dRwYVz49Ex/j+p7lzWyyhLophD097VBx7mflxN909bZso7UN4gSDbG4w3Boljz8Mkcwtxxr8VE0uPLHLAtahgKRGYemxfNRmmydIl8Un0L/b6J1POreCvZTL4GmE7uVfja2/WEaBwk5c5a0T5RB2eCJc1521+oGu3gflpq08hO98qf0fkV06Xgf+uShHU/S870ZKAtdf4NFk6ms7k/0IB6g7sIB6V2km9r1jhEO6BOp6Iy7sJZBz4RqjCe1MAzl25fCqddkbJaKQUH24JHZuxjADP1ih+3Mu+S/NAATpTGP0J6cUVe3eD3O3xXTlZ+Jpzy7CKUhPZR4VZWuyfdVbtW29taqlEM79U06Y3Ys0tQcmM5l+5iYa5immStdV3Mn47UK/HqWyEuqRp63rXG+LDIKDnxN/hI7g38AHHz0du4YOnS5bfo66qPrctPClxI05xsoUpScrOEH09sgZB0g=; Received: from light.codelabs.ru (v-light.codelabs.ru [144.206.233.83]) by 0.mx.codelabs.ru with esmtpsa (TLSv1.2:DHE-RSA-AES256-GCM-SHA384:256) id 1VsDi8-000JC0-Tn; Sun, 15 Dec 2013 19:34:29 +0400 Date: Sun, 15 Dec 2013 19:34:22 +0400 From: Eygene Ryabinkin To: Guido Falsi Subject: Re: svn commit: r326307 - in head: . Mk Mk/Uses archivers/rpm archivers/unrar archivers/unrar-iconv archivers/unzip audio/julius audio/mp3unicode audio/mpc audio/mpiosh audio/mpiosh/files audio/osd-lyr... Message-ID: References: <201309041806.r84I680e048857@svn.freebsd.org> <52AC6B4A.2080407@FreeBSD.org> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha512; protocol="application/pgp-signature"; boundary="2oS5YaxWCcQjTEyO" Content-Disposition: inline In-Reply-To: <52AC6B4A.2080407@FreeBSD.org> Sender: rea@codelabs.ru Cc: svn-ports-head@freebsd.org, svn-ports-all@freebsd.org, ports-committers@freebsd.org X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 15 Dec 2013 15:34:31 -0000 --2oS5YaxWCcQjTEyO Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Sat, Dec 14, 2013 at 03:29:30PM +0100, Guido Falsi wrote: > That said, Your solution of renaming iconv.h could be a good idea I did= =20 > not think about. >=20 > Let me understand exactly; you used a procedure like this: >=20 > 1) mv /usr/local/include/iconv.h /usr/local/include/iconv.h.old > 2a) portupgrade -af (I'm not using portupgrade, please confirm correct= =20 > syntax) > 2b) portmaster -af Actually, it was a bit different one: - get a fresh copy of ports tree; - 'portupgrade -a' to get the latest versions of all ports; was patched libiconv's Makefile to omit IGNORE; - mv /usr/local/include/iconv.h /usr/local/include/iconv.h.old - 'portupgrade -fa -x libiconv' - pkg delete libiconv First two phases were done to make sure that "portupgrade -fa" won't really upgrade anything, but will just reinstall with all port being up to date (so there are no unbuildable ports). I am often sync the ports tree to upgrade just one or two ports, so it could be just my local dance that isn't nessessary. I'll try to upgrade my primary workstation with just - mv /usr/local/include/iconv.h /usr/local/include/iconv.h.old - 'portupgrade -fa -x libiconv' - pkg delete libiconv and will report the outcome. Thanks! --=20 Eygene Ryabinkin ,,,^..^,,, [ Life's unfair - but root password helps! | codelabs.ru ] [ 82FE 06BC D497 C0DE 49EC 4FF0 16AF 9EAE 8152 ECFB | freebsd.org ] --2oS5YaxWCcQjTEyO Content-Type: application/pgp-signature -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.22 (FreeBSD) iL4EABEKAGYFAlKty/5fFIAAAAAALgAoaXNzdWVyLWZwckBub3RhdGlvbnMub3Bl bnBncC5maWZ0aGhvcnNlbWFuLm5ldDgyRkUwNkJDRDQ5N0MwREU0OUVDNEZGMDE2 QUY5RUFFODE1MkVDRkIACgkQFq+eroFS7PsjpgD+IWnWOpnEaaTDbUzulwBig7m4 9gRuFII3i3f1Ou6x3JIA/jZGKB1MUtwkE3GygxiOOaNCbJazibk+zcNlc5dIQkaz =WI3Q -----END PGP SIGNATURE----- --2oS5YaxWCcQjTEyO-- From owner-svn-ports-head@FreeBSD.ORG Sun Dec 15 15:43:22 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id E09FEAE6; Sun, 15 Dec 2013 15:43:22 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id CCBA61D1C; Sun, 15 Dec 2013 15:43:22 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBFFhMdZ068167; Sun, 15 Dec 2013 15:43:22 GMT (envelope-from wg@svn.freebsd.org) Received: (from wg@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBFFhMb6068166; Sun, 15 Dec 2013 15:43:22 GMT (envelope-from wg@svn.freebsd.org) Message-Id: <201312151543.rBFFhMb6068166@svn.freebsd.org> From: William Grzybowski Date: Sun, 15 Dec 2013 15:43:22 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r336545 - head/net/mpich2 X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 15 Dec 2013 15:43:22 -0000 Author: wg Date: Sun Dec 15 15:43:22 2013 New Revision: 336545 URL: http://svnweb.freebsd.org/changeset/ports/336545 Log: net/mpich2: fix usage of python Reported by: exp-run (PR 184591) Approved by: portmgr (blanket) Modified: head/net/mpich2/Makefile Modified: head/net/mpich2/Makefile ============================================================================== --- head/net/mpich2/Makefile Sun Dec 15 15:22:14 2013 (r336544) +++ head/net/mpich2/Makefile Sun Dec 15 15:43:22 2013 (r336545) @@ -39,7 +39,8 @@ SMPD_DESC= use SMPD instead of MPD, for X11_DESC= build MPE graphics routines CONFIGURE_ARGS= --enable-romio --enable-shared \ - --docdir="${DOCSDIR}" + --docdir="${DOCSDIR}" \ + --with-python="${PYTHON_CMD}" CONFIGURE_ENV= FCFLAGS="${FFLAGS}" \ PACKAGE=${PORTNAME} \ PTHREAD_LIBS="${PTHREAD_LIBS}" From owner-svn-ports-head@FreeBSD.ORG Sun Dec 15 15:46:16 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id E9839D73; Sun, 15 Dec 2013 15:46:16 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id D5DAA1D35; Sun, 15 Dec 2013 15:46:16 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBFFkGZm068609; Sun, 15 Dec 2013 15:46:16 GMT (envelope-from mva@svn.freebsd.org) Received: (from mva@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBFFkG8D068608; Sun, 15 Dec 2013 15:46:16 GMT (envelope-from mva@svn.freebsd.org) Message-Id: <201312151546.rBFFkG8D068608@svn.freebsd.org> From: Marcus von Appen Date: Sun, 15 Dec 2013 15:46:16 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r336546 - head/graphics/pecomato X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 15 Dec 2013 15:46:17 -0000 Author: mva Date: Sun Dec 15 15:46:16 2013 New Revision: 336546 URL: http://svnweb.freebsd.org/changeset/ports/336546 Log: - Fix ${PYTHON} -> ${PYTHON_CMD} Reported by: exp-run (PR 184591) Approved by: portmgr (blanket) Modified: head/graphics/pecomato/Makefile (contents, props changed) Modified: head/graphics/pecomato/Makefile ============================================================================== --- head/graphics/pecomato/Makefile Sun Dec 15 15:43:22 2013 (r336545) +++ head/graphics/pecomato/Makefile Sun Dec 15 15:46:16 2013 (r336546) @@ -18,7 +18,7 @@ MAKEFILE= Makefile.unix PLIST_FILES= bin/pecomato man/man1/pecomato.1.gz post-build: - ${PYTHON} ${WRKSRC}/devtools/txt2tags.py --no-rc -t man \ + ${PYTHON_CMD} ${WRKSRC}/devtools/txt2tags.py --no-rc -t man \ -i ${WRKSRC}/doc/manpage.t2t -o ${WRKSRC}/doc/${PORTNAME}.1 post-patch: From owner-svn-ports-head@FreeBSD.ORG Sun Dec 15 15:50:29 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id E9BDFE8E; Sun, 15 Dec 2013 15:50:29 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id BC04B1D4E; Sun, 15 Dec 2013 15:50:29 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBFFoTmO069170; Sun, 15 Dec 2013 15:50:29 GMT (envelope-from pawel@svn.freebsd.org) Received: (from pawel@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBFFoTV6069167; Sun, 15 Dec 2013 15:50:29 GMT (envelope-from pawel@svn.freebsd.org) Message-Id: <201312151550.rBFFoTV6069167@svn.freebsd.org> From: Pawel Pekala Date: Sun, 15 Dec 2013 15:50:29 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r336547 - head/textproc/meld X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 15 Dec 2013 15:50:30 -0000 Author: pawel Date: Sun Dec 15 15:50:28 2013 New Revision: 336547 URL: http://svnweb.freebsd.org/changeset/ports/336547 Log: Meld 1.8.3 has been released. Fixes: * Fix subdirectory comparisons for Subversion 1.6 (Ben Ross) * Fix git status parsing for some statuses (Tom Scytale) * Don't disable updating when syncpoints aren't yet active (Kai Willadsen) * Fix modifying column properties causing crashes when using .ini config backend (Kai Willadsen) Translations: * Andika Triwidada (id) * Milo Casagrande (it) * zodiac111 (zh_CN) Modified: head/textproc/meld/Makefile head/textproc/meld/distinfo head/textproc/meld/pkg-plist Modified: head/textproc/meld/Makefile ============================================================================== --- head/textproc/meld/Makefile Sun Dec 15 15:46:16 2013 (r336546) +++ head/textproc/meld/Makefile Sun Dec 15 15:50:28 2013 (r336547) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= meld -PORTVERSION= 1.8.2 +PORTVERSION= 1.8.3 CATEGORIES= textproc devel python MASTER_SITES= GNOME @@ -21,9 +21,11 @@ INSTALLS_OMF= yes OPTIONS_DEFINE= NLS PYGNOMEDESKTOP OPTIONS_SUB= yes -PYGNOMEDESKTOP_DESC= Code syntax highlighting (many dependencies) -NLS_USES= gettext +NLS_USES= gettext + +PYGNOMEDESKTOP_DESC= Code syntax highlighting (many dependencies) +PYGNOMEDESKTOP_USE= gnome=pygnomedesktop .include @@ -40,8 +42,4 @@ post-patch: s|$$(LANG)|$$(LANG_)|g' ${WRKSRC}/${file} .endfor -.if ${PORT_OPTIONS:MPYGNOMEDESKTOP} -USE_GNOME+= pygnomedesktop -.endif - .include Modified: head/textproc/meld/distinfo ============================================================================== --- head/textproc/meld/distinfo Sun Dec 15 15:46:16 2013 (r336546) +++ head/textproc/meld/distinfo Sun Dec 15 15:50:28 2013 (r336547) @@ -1,2 +1,2 @@ -SHA256 (meld-1.8.2.tar.xz) = f272f57f5475ad0b0a555c5e3ce5878feb2dcabb919753bb17534c8559027f69 -SIZE (meld-1.8.2.tar.xz) = 423312 +SHA256 (meld-1.8.3.tar.xz) = 42ba344cacfe4c5afaf5db8a43df2c877ec9e5b8e66621b92f2f9e0dcbf6fed7 +SIZE (meld-1.8.3.tar.xz) = 415704 Modified: head/textproc/meld/pkg-plist ============================================================================== --- head/textproc/meld/pkg-plist Sun Dec 15 15:46:16 2013 (r336546) +++ head/textproc/meld/pkg-plist Sun Dec 15 15:50:28 2013 (r336547) @@ -193,6 +193,7 @@ share/icons/hicolor/scalable/apps/meld.s %%NLS%%share/locale/fr/LC_MESSAGES/meld.mo %%NLS%%share/locale/gl/LC_MESSAGES/meld.mo %%NLS%%share/locale/hu/LC_MESSAGES/meld.mo +%%NLS%%share/locale/id/LC_MESSAGES/meld.mo %%NLS%%share/locale/it/LC_MESSAGES/meld.mo %%NLS%%share/locale/ja/LC_MESSAGES/meld.mo %%NLS%%share/locale/ko/LC_MESSAGES/meld.mo From owner-svn-ports-head@FreeBSD.ORG Sun Dec 15 15:54:19 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 640AB27B; Sun, 15 Dec 2013 15:54:19 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 4E7E41DBB; Sun, 15 Dec 2013 15:54:19 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBFFsJY6072020; Sun, 15 Dec 2013 15:54:19 GMT (envelope-from danfe@svn.freebsd.org) Received: (from danfe@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBFFsIE0072013; Sun, 15 Dec 2013 15:54:18 GMT (envelope-from danfe@svn.freebsd.org) Message-Id: <201312151554.rBFFsIE0072013@svn.freebsd.org> From: Alexey Dokuchaev Date: Sun, 15 Dec 2013 15:54:18 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r336548 - in head/games: gtkradiant gtkradiant/files netradiant netradiant/files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 15 Dec 2013 15:54:19 -0000 Author: danfe Date: Sun Dec 15 15:54:17 2013 New Revision: 336548 URL: http://svnweb.freebsd.org/changeset/ports/336548 Log: - Comment out apparently unused yet offending piece of code to unbreak the build on amd64 (tested on MacBookPro6,2) - Unify the usage of pre/do-install targets in both ports and stagify them Reported by: pkg-fallout Added: head/games/gtkradiant/files/patch-libs__xml__xmlparser.h (contents, props changed) head/games/netradiant/files/patch-libs-xml-xmlparser.h (contents, props changed) Modified: head/games/gtkradiant/Makefile head/games/gtkradiant/pkg-plist head/games/netradiant/Makefile head/games/netradiant/pkg-plist Modified: head/games/gtkradiant/Makefile ============================================================================== --- head/games/gtkradiant/Makefile Sun Dec 15 15:50:28 2013 (r336547) +++ head/games/gtkradiant/Makefile Sun Dec 15 15:54:17 2013 (r336548) @@ -33,7 +33,6 @@ WRKSRC= ${WRKDIR}/GPL/GtkRadiant SUB_FILES= ${PORTNAME} -NO_STAGE= yes post-patch: @${REINPLACE_CMD} -e 's/-ldl//' ${WRKSRC}/SConscript @${GREP} -Rl 'defined[[:blank:]]*([[:blank:]]*__linux__[[:blank:]]*) || defined[[:blank:]]*([[:blank:]]*__APPLE__[[:blank:]]*)' ${WRKSRC} | \ @@ -62,13 +61,13 @@ post-patch: @${FIND} ${WRKSRC} -name '*.cpp' | ${XARGS} ${REINPLACE_CMD} \ -E 's|(gtk_adjustment_new[^)]*,)[^)]*|\1 0|' -post-build: +pre-install: cd ${WRKSRC} && ${PYTHON_CMD} install.py ${CP} -a ${WRKDIR}/${PORTNAME}_gamepacks/* ${WRKSRC}/install do-install: - @${MKDIR} ${DATADIR} - ${CP} -a ${WRKSRC}/install/* ${DATADIR} - ${INSTALL_SCRIPT} ${WRKDIR}/${PORTNAME} ${PREFIX}/bin + @${MKDIR} ${STAGEDIR}${DATADIR} + ${CP} -a ${WRKSRC}/install/* ${STAGEDIR}${DATADIR} + ${INSTALL_SCRIPT} ${WRKDIR}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin .include Added: head/games/gtkradiant/files/patch-libs__xml__xmlparser.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/games/gtkradiant/files/patch-libs__xml__xmlparser.h Sun Dec 15 15:54:17 2013 (r336548) @@ -0,0 +1,18 @@ +--- libs/xml/xmlparser.h.orig 2006-02-11 06:01:20.000000000 +0800 ++++ libs/xml/xmlparser.h 2013-12-15 02:23:59.000000000 +0800 +@@ -113,6 +113,7 @@ inline TextOutputStreamType& ostream_wri + return ostream; + } + ++#if 0 + template + inline TextOutputStreamType& ostream_write(TextOutputStreamType& ostream, const Formatted& formatted) + { +@@ -120,6 +121,7 @@ inline TextOutputStreamType& ostream_wri + ostream.write(buffer, vsnprintf(buffer, 1023, formatted.m_format, formatted.m_arguments)); + return ostream; + } ++#endif + + class XMLSAXImporter + { Modified: head/games/gtkradiant/pkg-plist ============================================================================== --- head/games/gtkradiant/pkg-plist Sun Dec 15 15:50:28 2013 (r336547) +++ head/games/gtkradiant/pkg-plist Sun Dec 15 15:54:17 2013 (r336548) @@ -76,9 +76,7 @@ bin/gtkradiant %%DATADIR%%/games/et.game %%DATADIR%%/games/heretic2.game %%DATADIR%%/games/hl.game -%%DATADIR%%/games/hlcs.game %%DATADIR%%/games/ja.game -%%DATADIR%%/games/jabp.game %%DATADIR%%/games/jk2.game %%DATADIR%%/games/q1.game %%DATADIR%%/games/q2.game @@ -194,14 +192,11 @@ bin/gtkradiant @dirrm %%DATADIR%%/q2.game @dirrm %%DATADIR%%/q1.game/id1 @dirrm %%DATADIR%%/q1.game -@dirrm %%DATADIR%%/plugins @dirrm %%DATADIR%%/modules @dirrm %%DATADIR%%/jk2.game/base @dirrm %%DATADIR%%/jk2.game -@dirrm %%DATADIR%%/jabp.game @dirrm %%DATADIR%%/ja.game/base @dirrm %%DATADIR%%/ja.game -@dirrm %%DATADIR%%/hlcs.game @dirrm %%DATADIR%%/hl.game/valve @dirrm %%DATADIR%%/hl.game/cstrike @dirrm %%DATADIR%%/hl.game Modified: head/games/netradiant/Makefile ============================================================================== --- head/games/netradiant/Makefile Sun Dec 15 15:50:28 2013 (r336547) +++ head/games/netradiant/Makefile Sun Dec 15 15:54:17 2013 (r336548) @@ -33,9 +33,6 @@ LDFLAGS+= -L${LOCALBASE}/lib SUB_FILES= ${PORTNAME} SUB_LIST= ARCH=${ARCH} -MAN6= q3map2.6 - -NO_STAGE= yes post-patch: # Add missing checks for __FreeBSD__ @${FIND} ${WRKSRC}/tools -name '*.[ch]' | ${XARGS} ${REINPLACE_CMD} \ @@ -47,15 +44,17 @@ post-patch: x ; s/^/#include "scenelib.h"/ ; G ; }' \ ${WRKSRC}/plugins/mapq3/parse.h -do-install: +pre-install: # Fix permissions of some files (drop bogus execute bit) @${FIND} ${WRKSRC}/install/osirion.game -type f | ${XARGS} ${CHMOD} a-x @${CHMOD} a-x ${WRKSRC}/install/games/osirion.game # Remove extra copy of GNU GPL from what we install @${RM} ${WRKSRC}/install/GPL.txt - @${MKDIR} ${DATADIR} - ${CP} -a ${WRKSRC}/install/* ${DATADIR} - ${INSTALL_SCRIPT} ${WRKDIR}/${PORTNAME} ${PREFIX}/bin - ${INSTALL_MAN} ${DISTDIR}/${MAN6} ${MANPREFIX}/man/man6 + +do-install: + @${MKDIR} ${STAGEDIR}${DATADIR} + ${CP} -a ${WRKSRC}/install/* ${STAGEDIR}${DATADIR} + ${INSTALL_SCRIPT} ${WRKDIR}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin + ${INSTALL_MAN} ${DISTDIR}/q3map2.6 ${STAGEDIR}${MANPREFIX}/man/man6 .include Added: head/games/netradiant/files/patch-libs-xml-xmlparser.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/games/netradiant/files/patch-libs-xml-xmlparser.h Sun Dec 15 15:54:17 2013 (r336548) @@ -0,0 +1,17 @@ +--- libs/xml/xmlparser.h.orig 2013-06-30 22:04:34.000000000 +0800 ++++ libs/xml/xmlparser.h 2013-12-15 01:59:46.000000000 +0800 +@@ -102,12 +102,14 @@ inline TextOutputStreamType& ostream_wri + return ostream; + } + ++#if 0 + template + inline TextOutputStreamType& ostream_write( TextOutputStreamType& ostream, const Formatted& formatted ){ + char buffer[1024]; + ostream.write( buffer, vsnprintf( buffer, 1023, formatted.m_format, formatted.m_arguments ) ); + return ostream; + } ++#endif + + class XMLSAXImporter + { Modified: head/games/netradiant/pkg-plist ============================================================================== --- head/games/netradiant/pkg-plist Sun Dec 15 15:50:28 2013 (r336547) +++ head/games/netradiant/pkg-plist Sun Dec 15 15:54:17 2013 (r336548) @@ -1,4 +1,5 @@ bin/netradiant +man/man6/q3map2.6.gz %%DATADIR%%/RADIANT_MAJOR %%DATADIR%%/RADIANT_MINOR %%DATADIR%%/README.txt From owner-svn-ports-head@FreeBSD.ORG Sun Dec 15 15:54:57 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 1A139359; Sun, 15 Dec 2013 15:54:57 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 063461DC0; Sun, 15 Dec 2013 15:54:57 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBFFsuk0072134; Sun, 15 Dec 2013 15:54:56 GMT (envelope-from wg@svn.freebsd.org) Received: (from wg@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBFFsu5a072133; Sun, 15 Dec 2013 15:54:56 GMT (envelope-from wg@svn.freebsd.org) Message-Id: <201312151554.rBFFsu5a072133@svn.freebsd.org> From: William Grzybowski Date: Sun, 15 Dec 2013 15:54:56 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r336549 - head/net-im/telepathy-idle X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 15 Dec 2013 15:54:57 -0000 Author: wg Date: Sun Dec 15 15:54:56 2013 New Revision: 336549 URL: http://svnweb.freebsd.org/changeset/ports/336549 Log: net-im/telepathy-idle: fix python depends Reported by: exp-run (PR 184591) Approved by: portmgr (blanket) Modified: head/net-im/telepathy-idle/Makefile Modified: head/net-im/telepathy-idle/Makefile ============================================================================== --- head/net-im/telepathy-idle/Makefile Sun Dec 15 15:54:17 2013 (r336548) +++ head/net-im/telepathy-idle/Makefile Sun Dec 15 15:54:56 2013 (r336549) @@ -19,6 +19,7 @@ USES= pkgconfig USE_OPENSSL= yes USE_GMAKE= yes USE_GNOME= gnomehack glib20 +USE_PYTHON_BUILD=yes MAN8= telepathy-idle.8 From owner-svn-ports-head@FreeBSD.ORG Sun Dec 15 15:59:15 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 6018746B; Sun, 15 Dec 2013 15:59:15 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 4B25E1DD5; Sun, 15 Dec 2013 15:59:15 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBFFxFi0072673; Sun, 15 Dec 2013 15:59:15 GMT (envelope-from wg@svn.freebsd.org) Received: (from wg@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBFFxF5u072672; Sun, 15 Dec 2013 15:59:15 GMT (envelope-from wg@svn.freebsd.org) Message-Id: <201312151559.rBFFxF5u072672@svn.freebsd.org> From: William Grzybowski Date: Sun, 15 Dec 2013 15:59:15 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r336550 - head/net-im/cjc X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 15 Dec 2013 15:59:15 -0000 Author: wg Date: Sun Dec 15 15:59:14 2013 New Revision: 336550 URL: http://svnweb.freebsd.org/changeset/ports/336550 Log: net-im/cjc: fix python usage and minor fixes - Fix python usage to remove implicit dependency on lang/python - Restrict to python 2.x - Remove uselesss LICENSE_FILE - Use new options for docs Reported by: exp-run (PR 184591) Modified: head/net-im/cjc/Makefile Modified: head/net-im/cjc/Makefile ============================================================================== --- head/net-im/cjc/Makefile Sun Dec 15 15:54:56 2013 (r336549) +++ head/net-im/cjc/Makefile Sun Dec 15 15:59:14 2013 (r336550) @@ -10,11 +10,10 @@ MAINTAINER= ports@FreeBSD.org COMMENT= The Console Jabber Client LICENSE= GPLv2 -LICENSE_FILE= ${WRKSRC}/COPYING RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pyxmpp>=1.1.0:${PORTSDIR}/net-im/py-pyxmpp -USE_PYTHON= 2.6+ +USE_PYTHON= 2 NO_STAGE= yes post-patch: @@ -25,10 +24,13 @@ post-patch: /pkg_docdir/s|^|#|g ; \ s|INSTALL=.*|INSTALL=${INSTALL}| ; \ s|INSTALL_DATA=.*|INSTALL_DATA=${INSTALL_DATA}| ; \ - s|INSTALL_DIR=.*|INSTALL_DIR=${MKDIR}|g" ${WRKSRC}/Makefile + s|INSTALL_DIR=.*|INSTALL_DIR=${MKDIR}|g ; \ + s|python |${PYTHON_CMD} |g" ${WRKSRC}/Makefile + +.include post-install: -.if !defined(NOPORTDOCS) +.if ${PORT_OPTIONS:MDOCS} @${MKDIR} ${DOCSDIR} ${INSTALL_DATA} ${WRKSRC}/doc/manual.html ${DOCSDIR} ${INSTALL_DATA} ${WRKSRC}/ChangeLog ${DOCSDIR} From owner-svn-ports-head@FreeBSD.ORG Sun Dec 15 16:13:47 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 7CC8B89C; Sun, 15 Dec 2013 16:13:47 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 68BA61EC2; Sun, 15 Dec 2013 16:13:47 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBFGDlRk079614; Sun, 15 Dec 2013 16:13:47 GMT (envelope-from wg@svn.freebsd.org) Received: (from wg@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBFGDlMd079613; Sun, 15 Dec 2013 16:13:47 GMT (envelope-from wg@svn.freebsd.org) Message-Id: <201312151613.rBFGDlMd079613@svn.freebsd.org> From: William Grzybowski Date: Sun, 15 Dec 2013 16:13:47 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r336551 - head/misc/pylize X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 15 Dec 2013 16:13:47 -0000 Author: wg Date: Sun Dec 15 16:13:46 2013 New Revision: 336551 URL: http://svnweb.freebsd.org/changeset/ports/336551 Log: misc/pylize: depends explicitly on "python" Also restrict to python 2.x. Reported by: exp-run (PR 184591) Approved by: portmgr (blanket) Modified: head/misc/pylize/Makefile Modified: head/misc/pylize/Makefile ============================================================================== --- head/misc/pylize/Makefile Sun Dec 15 15:59:14 2013 (r336550) +++ head/misc/pylize/Makefile Sun Dec 15 16:13:46 2013 (r336551) @@ -12,15 +12,17 @@ DISTNAME= ${PORTNAME}-${PORTVERSION:R}${ MAINTAINER= dryice@dryice.name COMMENT= A presentation generation tool -BUILD_DEPENDS= ${PYTHON_SITELIBDIR}/HTMLgen.py:${PORTSDIR}/www/py-HTMLgen \ +BUILD_DEPENDS= python:${PORTSDIR}/lang/python \ + ${PYTHON_SITELIBDIR}/HTMLgen.py:${PORTSDIR}/www/py-HTMLgen \ ${PYTHON_SITELIBDIR}/PIL.pth:${PORTSDIR}/graphics/py-imaging \ ${PYTHON_SITELIBDIR}/em.py:${PORTSDIR}/textproc/py-empy -RUN_DEPENDS= ${PYTHON_SITELIBDIR}/HTMLgen.py:${PORTSDIR}/www/py-HTMLgen \ +RUN_DEPENDS= python:${PORTSDIR}/lang/python \ + ${PYTHON_SITELIBDIR}/HTMLgen.py:${PORTSDIR}/www/py-HTMLgen \ ${PYTHON_SITELIBDIR}/PIL.pth:${PORTSDIR}/graphics/py-imaging \ ${PYTHON_SITELIBDIR}/em.py:${PORTSDIR}/textproc/py-empy USE_BZIP2= yes -USE_PYTHON= 2.0+ +USE_PYTHON= 2 INSTALLS_EGGINFO= yes PYDISTUTILS_PKGVERSION= ${PORTVERSION:S/.b/b/} From owner-svn-ports-head@FreeBSD.ORG Sun Dec 15 16:17:47 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 70075AFB; Sun, 15 Dec 2013 16:17:47 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 5C4E71EE2; Sun, 15 Dec 2013 16:17:47 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBFGHl6T080209; Sun, 15 Dec 2013 16:17:47 GMT (envelope-from wg@svn.freebsd.org) Received: (from wg@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBFGHlRE080208; Sun, 15 Dec 2013 16:17:47 GMT (envelope-from wg@svn.freebsd.org) Message-Id: <201312151617.rBFGHlRE080208@svn.freebsd.org> From: William Grzybowski Date: Sun, 15 Dec 2013 16:17:47 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r336552 - head/misc/cuecat X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 15 Dec 2013 16:17:47 -0000 Author: wg Date: Sun Dec 15 16:17:46 2013 New Revision: 336552 URL: http://svnweb.freebsd.org/changeset/ports/336552 Log: misc/cuecat: fix python usage Reported by: exp-run (PR 184591) Approved by: portmgr (blanket) Modified: head/misc/cuecat/Makefile Modified: head/misc/cuecat/Makefile ============================================================================== --- head/misc/cuecat/Makefile Sun Dec 15 16:13:46 2013 (r336551) +++ head/misc/cuecat/Makefile Sun Dec 15 16:17:46 2013 (r336552) @@ -26,18 +26,18 @@ WRKSRC= ${WRKDIR}/cuecat NO_STAGE= yes pre-install: @${MV} ${WRKSRC}/cuecat.py ${WRKSRC}/cuecat.py-orig - @${SED} 's;/usr/opt;${PREFIX};' ${WRKSRC}/cuecat.py-orig >${WRKSRC}/cuecat.py + @${SED} 's;/usr/opt/bin/python;${PYTHON_CMD};' ${WRKSRC}/cuecat.py-orig >${WRKSRC}/cuecat.py @${MV} ${WRKSRC}/barcode.py ${WRKSRC}/barcode.py-orig - @${SED} 's;/usr/opt;${PREFIX};' ${WRKSRC}/barcode.py-orig >${WRKSRC}/barcode.py + @${SED} 's;/usr/opt/bin/python;${PYTHON_CMD};' ${WRKSRC}/barcode.py-orig >${WRKSRC}/barcode.py .if !defined(WITHOUT_X11) @${MV} ${WRKSRC}/xcuecat.py ${WRKSRC}/xcuecat.py-orig - @${SED} 's;/usr/opt;${PREFIX};' ${WRKSRC}/xcuecat.py-orig >${WRKSRC}/xcuecat.py + @${SED} 's;/usr/opt/bin/python;${PYTHON_CMD};' ${WRKSRC}/xcuecat.py-orig >${WRKSRC}/xcuecat.py .endif do-install: ${INSTALL_SCRIPT} ${WRKSRC}/cuecat.py ${PYTHON_SITELIBDIR} ${INSTALL_SCRIPT} ${WRKSRC}/barcode.py ${PYTHON_SITELIBDIR} - python -O -c "import barcode, cuecat" + ${PYTHON_CMD} -O -c "import barcode, cuecat" ${LN} -sf ${PYTHON_SITELIBDIR}/cuecat.py ${PREFIX}/bin/cuecat ${INSTALL_MAN} ${WRKSRC}/cuecat.1 ${PREFIX}/man/man1 .if !defined(WITHOUT_X11) From owner-svn-ports-head@FreeBSD.ORG Sun Dec 15 16:22:28 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id AA3ECC10; Sun, 15 Dec 2013 16:22:28 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 81BBF1F46; Sun, 15 Dec 2013 16:22:28 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBFGMS25084017; Sun, 15 Dec 2013 16:22:28 GMT (envelope-from wg@svn.freebsd.org) Received: (from wg@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBFGMH4g083953; Sun, 15 Dec 2013 16:22:17 GMT (envelope-from wg@svn.freebsd.org) Message-Id: <201312151622.rBFGMH4g083953@svn.freebsd.org> From: William Grzybowski Date: Sun, 15 Dec 2013 16:22:17 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r336553 - in head: Mk audio/picard audio/py-eyed3 databases/py-bsddb databases/py-gdbm databases/py-sqlite3 deskutils/tel deskutils/x-tile devel/fnorb devel/hgview devel/py-anonfunc dev... X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 15 Dec 2013 16:22:28 -0000 Author: wg Date: Sun Dec 15 16:22:17 2013 New Revision: 336553 URL: http://svnweb.freebsd.org/changeset/ports/336553 Log: Use setuptools for all Python ports. Setuptools is the preferred method to manage Python distributions after many changes to the packaging ecosystem over the past couple of years. Only ports using USE_PYDISTUTILS= yes are affected by this commit, ports using USE_PYDISTUTILS= easy_install remains the same however this usage is now deprecated and should be converted to USE_PYDISTUTILS= yes. Some Python distributions do not work with setuptools out of the box because they extend the install command from distutils and not setuptools, and so they need to be patched accordingly. pip (which leverages setuptools) works around the issue by using eggs, however we want to get rid of those as well, as support for "flat" installation is unavailable or has other issues associated with it. This work allows us to unify how python packages are built, ensure that Python distributions are installed consistently, reduces complexity for Python port maintainers and paves the way for simplifying the Python ports framework in the future. With hat on: python Reviewed by: koobs, antoine Exp-run: bdrewery Approved by: bdrewery (portmgr) Added: head/devel/py-gyp-devel/files/patch-setup.py (contents, props changed) head/net/py-ldaptor/files/ head/net/py-ldaptor/files/patch-setup.py (contents, props changed) head/www/py-prewikka/files/ head/www/py-prewikka/files/patch-setup.py (contents, props changed) head/x11-toolkits/py-wxPython26/files/patch-config.py (contents, props changed) head/x11-toolkits/py-wxPython28/files/patch-config.py (contents, props changed) Deleted: head/devel/py-anonfunc/pkg-plist head/devel/scons/pkg-plist head/dns/py-dnspython/pkg-plist-py2 head/dns/py-dnspython/pkg-plist-py3 head/math/py-numeric/pkg-plist head/www/py-utidy/pkg-plist Modified: head/Mk/bsd.python.mk head/audio/picard/Makefile head/audio/py-eyed3/Makefile head/databases/py-bsddb/Makefile head/databases/py-gdbm/Makefile head/databases/py-sqlite3/Makefile head/deskutils/tel/Makefile head/deskutils/x-tile/Makefile head/devel/fnorb/Makefile head/devel/fnorb/pkg-plist head/devel/hgview/Makefile head/devel/py-anonfunc/Makefile head/devel/py-cxx/Makefile head/devel/py-libplist/Makefile head/devel/py-mx-experimental/Makefile head/devel/py-protocols/Makefile head/devel/py-setuptools/Makefile head/devel/py-yaml/Makefile head/devel/scons/Makefile head/dns/py-dnspython/Makefile head/editors/zim/Makefile head/games/balazarbrothers/Makefile head/games/balazarbrothers/pkg-plist head/games/gnomesudoku/Makefile head/graphics/py-soya3d/Makefile head/japanese/tegaki-recognize/Makefile head/mail/postfix-policyd-spf-python/Makefile head/mail/svnmailer/Makefile head/math/py-numeric/Makefile head/multimedia/freevo/Makefile head/multimedia/freevo/pkg-plist head/multimedia/gaupol/Makefile head/net/py-ldaptor/Makefile head/science/veusz/Makefile head/security/umit/Makefile head/security/zenmap/Makefile head/textproc/py-4suite-xml/Makefile head/textproc/py-4suite-xml/pkg-plist head/textproc/pychm/Makefile head/www/py-prewikka/Makefile head/www/py-prewikka/pkg-plist head/www/py-utidy/Makefile head/www/trac-wysiwyg/Makefile head/x11-toolkits/py-fltk/Makefile head/x11-toolkits/py-tkinter/Makefile head/x11-toolkits/py-wxPython26/Makefile head/x11-toolkits/py-wxPython28/Makefile head/x11-toolkits/py-wxPython28/pkg-plist head/x11/hotwire-shell/files/patch-hotwire__ui_renderers_file.py (contents, props changed) head/x11/hotwire-shell/files/patch-setup.py (contents, props changed) head/x11/terminator/Makefile Modified: head/Mk/bsd.python.mk ============================================================================== --- head/Mk/bsd.python.mk Sun Dec 15 16:17:46 2013 (r336552) +++ head/Mk/bsd.python.mk Sun Dec 15 16:22:17 2013 (r336553) @@ -420,9 +420,13 @@ PYTHONPREFIX_INCLUDEDIR= ${PYTHON_INCLUD PYTHONPREFIX_LIBDIR= ${PYTHON_LIBDIR:S;${PYTHONBASE};${PREFIX};} PYTHONPREFIX_SITELIBDIR= ${PYTHON_SITELIBDIR:S;${PYTHONBASE};${PREFIX};} +_CURRENTPORT:= ${PKGNAMEPREFIX}${PORTNAME} +.if defined(USE_PYDISTUTILS) && ${_CURRENTPORT} != ${PYTHON_PKGNAMEPREFIX}setuptools +BUILD_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}setuptools>0:${PORTSDIR}/devel/py-setuptools +.endif + # setuptools support .if defined(USE_PYDISTUTILS) && ${USE_PYDISTUTILS} == "easy_install" -BUILD_DEPENDS+= ${PYEASYINSTALL_CMD}:${PORTSDIR}/devel/py-setuptools RUN_DEPENDS+= ${PYEASYINSTALL_CMD}:${PORTSDIR}/devel/py-setuptools PYDISTUTILS_BUILD_TARGET?= bdist_egg @@ -487,33 +491,47 @@ post-install: stage-python-compileall # distutils support PYSETUP?= setup.py +PYDISTUTILS_SETUP?= -c "import setuptools; __file__='${PYSETUP}'; execfile(__file__)" PYDISTUTILS_CONFIGUREARGS?= PYDISTUTILS_BUILDARGS?= PYDISTUTILS_INSTALLARGS?= -c -O1 --prefix=${PREFIX} -.if !defined(NO_STAGE) && defined(USE_PYDISTUTILS) && ${USE_PYDISTUTILS} != "easy_install" +.if defined(USE_PYDISTUTILS) && ${USE_PYDISTUTILS} != "easy_install" +. if !defined(PYDISTUTILS_INSTALLNOSINGLE) +PYDISTUTILS_INSTALLARGS+= --single-version-externally-managed +. endif +. if !defined(NO_STAGE) PYDISTUTILS_INSTALLARGS+= --root=${STAGEDIR} +. endif .endif +_PYTHONPKGLIST= ${WRKDIR}/.PLIST.pymodtmp +PYDISTUTILS_INSTALLARGS:= --record ${_PYTHONPKGLIST} \ + ${PYDISTUTILS_INSTALLARGS} + PYDISTUTILS_PKGNAME?= ${PORTNAME} PYDISTUTILS_PKGVERSION?=${PORTVERSION} PYDISTUTILS_EGGINFO?= ${PYDISTUTILS_PKGNAME:C/[^A-Za-z0-9.]+/_/g}-${PYDISTUTILS_PKGVERSION:C/[^A-Za-z0-9.]+/_/g}-py${PYTHON_VER}.egg-info -PYDISTUTILS_EGGINFODIR?=${PYTHONPREFIX_SITELIBDIR} +PYDISTUTILS_EGGINFODIR?=${STAGEDIR}${PYTHONPREFIX_SITELIBDIR} +add-plist-egginfo: .if !defined(PYDISTUTILS_NOEGGINFO) && \ !defined(PYDISTUTILS_AUTOPLIST) && \ (defined(INSTALLS_EGGINFO) || \ (defined(USE_PYDISTUTILS) && \ ${USE_PYDISTUTILS} != "easy_install")) && \ defined(PYTHON_REL) -. for egg in ${PYDISTUTILS_EGGINFO} -PLIST_FILES+= ${PYDISTUTILS_EGGINFODIR:S;${PREFIX}/;;}/${egg} +. for egginfo in ${PYDISTUTILS_EGGINFO} + if [ -d "${PYDISTUTILS_EGGINFODIR}/${egginfo}" ]; then \ + ${LS} ${PYDISTUTILS_EGGINFODIR}/${egginfo} | while read f; do \ + ${ECHO_CMD} ${PYDISTUTILS_EGGINFODIR:S;^${STAGEDIR}${PYTHONBASE}/;;}/${egginfo}/$${f} >> ${TMPPLIST}; \ + done; \ + ${ECHO_CMD} "@unexec rmdir \"%D/${PYDISTUTILS_EGGINFODIR:S;${STAGEDIR}${PYTHONBASE}/;;}/${egginfo}\" 2>/dev/null || true" >> ${TMPPLIST}; \ + fi; . endfor +.else + @${DO_NADA} .endif .if defined(PYDISTUTILS_AUTOPLIST) && defined(USE_PYDISTUTILS) -_PYTHONPKGLIST= ${WRKDIR}/.PLIST.pymodtmp -PYDISTUTILS_INSTALLARGS:= --record ${_PYTHONPKGLIST} \ - ${PYDISTUTILS_INSTALLARGS} - _RELSITELIBDIR= ${PYTHONPREFIX_SITELIBDIR:S;${PREFIX}/;;} _RELLIBDIR= ${PYTHONPREFIX_LIBDIR:S;${PREFIX}/;;} @@ -637,19 +655,21 @@ MAKE_ENV+= LDSHARED="${LDSHARED}" PYTHON .if !target(do-configure) && !defined(HAS_CONFIGURE) && !defined(GNU_CONFIGURE) do-configure: - @(cd ${BUILD_WRKSRC}; ${SETENV} ${MAKE_ENV} ${PYTHON_CMD} ${PYSETUP} ${PYDISTUTILS_CONFIGURE_TARGET} ${PYDISTUTILS_CONFIGUREARGS}) + @(cd ${BUILD_WRKSRC}; ${SETENV} ${MAKE_ENV} ${PYTHON_CMD} ${PYDISTUTILS_SETUP} ${PYDISTUTILS_CONFIGURE_TARGET} ${PYDISTUTILS_CONFIGUREARGS}) .endif .if !target(do-build) do-build: - @(cd ${BUILD_WRKSRC}; ${SETENV} ${MAKE_ENV} ${PYTHON_CMD} ${PYSETUP} ${PYDISTUTILS_BUILD_TARGET} ${PYDISTUTILS_BUILDARGS}) + @(cd ${BUILD_WRKSRC}; ${SETENV} ${MAKE_ENV} ${PYTHON_CMD} ${PYDISTUTILS_SETUP} ${PYDISTUTILS_BUILD_TARGET} ${PYDISTUTILS_BUILDARGS}) .endif .if !target(do-install) do-install: - @(cd ${INSTALL_WRKSRC}; ${SETENV} ${MAKE_ENV} ${PYTHON_CMD} ${PYSETUP} ${PYDISTUTILS_INSTALL_TARGET} ${PYDISTUTILS_INSTALLARGS}) + @(cd ${INSTALL_WRKSRC}; ${SETENV} ${MAKE_ENV} ${PYTHON_CMD} ${PYDISTUTILS_SETUP} ${PYDISTUTILS_INSTALL_TARGET} ${PYDISTUTILS_INSTALLARGS}) .endif +add-plist-post: add-plist-egginfo + .if defined(PYEASYINSTALL_ARCHDEP) .if !target(easyinstall-setopt) easyinstall-setopt: Modified: head/audio/picard/Makefile ============================================================================== --- head/audio/picard/Makefile Sun Dec 15 16:17:46 2013 (r336552) +++ head/audio/picard/Makefile Sun Dec 15 16:22:17 2013 (r336553) @@ -45,6 +45,7 @@ RUN_DEPENDS+= metaflac:${PORTSDIR}/audio post-patch: @${REINPLACE_CMD} -e "s|'picard.plugins',|'picard.plugins', 'picard.plugins.lastfm', 'picard.plugins.lastfmplus', 'picard.plugins.replaygain',|" \ + -e 's,distutils\.command\.install ,setuptools\.command\.install ,' \ ${WRKSRC}/setup.py @${CP} -R ${WRKSRC}/contrib/plugins/ ${WRKSRC}/picard/plugins Modified: head/audio/py-eyed3/Makefile ============================================================================== --- head/audio/py-eyed3/Makefile Sun Dec 15 16:17:46 2013 (r336552) +++ head/audio/py-eyed3/Makefile Sun Dec 15 16:22:17 2013 (r336553) @@ -12,7 +12,8 @@ MAINTAINER= rm@FreeBSD.org COMMENT= Python module for processing ID3 tags LICENSE= GPLv2 -LICENSE_FILE= ${WRKSRC}/COPYING + +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools>0:${PORTSDIR}/devel/py-setuptools USE_PYTHON= 2.6-2.7 NO_STAGE= yes @@ -21,7 +22,8 @@ USES= gmake GNU_CONFIGURE= yes CONFIGURE_ENV= PYTHON="${PYTHON_CMD}" MAKE_ENV= SETUP_ARGS_BUILD="${PYDISTUTILS_BUILDARGS}" \ - SETUP_ARGS_INSTALL="${PYDISTUTILS_INSTALLARGS}" + SETUP_ARGS_INSTALL="${PYDISTUTILS_INSTALLARGS}" \ + SETUP_COMMAND="${PYDISTUTILS_SETUP:S,",\",g}" DOCSDIR= ${PREFIX}/share/doc/${PKGNAMEPREFIX}${PORTNAME} MAN1= eyeD3.1 @@ -34,8 +36,8 @@ post-patch: ${REINPLACE_CMD} -e 's,PYTHON="",,g' -e 's,/usr/local,${LOCALBASE},g' \ -e 's,2\\\.\[23456789\]\\\.,2.[23456789],g' \ ${WRKSRC}/configure - ${REINPLACE_CMD} -e 's,\(setup.py build\),\1 $${SETUP_ARGS_BUILD},g' \ - -e 's,\(setup.py install\),\1 $${SETUP_ARGS_INSTALL} ,g' \ + ${REINPLACE_CMD} -e 's,\(setup.py build\),$${SETUP_COMMAND} build $${SETUP_ARGS_BUILD},g' \ + -e 's,\(setup.py install\),$${SETUP_COMMAND} install $${SETUP_ARGS_INSTALL} ,g' \ -e 's,^docdir:=.*,docdir:=${DOCSDIR},g' \ ${WRKSRC}/Makefile.in .if defined(NOPORTDOCS) Modified: head/databases/py-bsddb/Makefile ============================================================================== --- head/databases/py-bsddb/Makefile Sun Dec 15 16:17:46 2013 (r336552) +++ head/databases/py-bsddb/Makefile Sun Dec 15 16:22:17 2013 (r336553) @@ -25,15 +25,11 @@ DISTINFO_FILE= ${PORTSDIR}/lang/python${ WRKSRC= ${PYTHON_WRKSRC}/Modules PYDISTUTILS_INSTALLARGS+= --install-lib ${PYTHON_LIBDIR}/lib-dynload -PYDISTUTILS_NOEGGINFO= yes -PYDISTUTILS_PKGNAME= _bsddb +PYDISTUTILS_AUTOPLIST= yes MAKE_ENV= BSDDB_VERSION=${BDB_LIB_NAME} EXTRA_PATCHES+= ${FILESDIR}/extra-patch-py${PYTHON_SUFFIX}-_bsddb.c -PLIST_FILES= %%PYTHON_LIBDIR%%/lib-dynload/_bsddb.so - -NO_STAGE= yes .include .if ${PYTHON_REL} >= 300 Modified: head/databases/py-gdbm/Makefile ============================================================================== --- head/databases/py-gdbm/Makefile Sun Dec 15 16:17:46 2013 (r336552) +++ head/databases/py-gdbm/Makefile Sun Dec 15 16:22:17 2013 (r336553) @@ -26,11 +26,8 @@ DISTINFO_FILE= ${PORTSDIR}/lang/python${ WRKSRC= ${PYTHON_WRKSRC}/Modules PYDISTUTILS_INSTALLARGS+= --install-lib ${PYTHON_LIBDIR}/lib-dynload -PYDISTUTILS_NOEGGINFO= yes +PYDISTUTILS_AUTOPLIST= yes -PLIST_FILES= %%PYTHON_LIBDIR%%/lib-dynload/gdbm.so - -NO_STAGE= yes .include post-extract: Modified: head/databases/py-sqlite3/Makefile ============================================================================== --- head/databases/py-sqlite3/Makefile Sun Dec 15 16:17:46 2013 (r336552) +++ head/databases/py-sqlite3/Makefile Sun Dec 15 16:22:17 2013 (r336553) @@ -26,11 +26,8 @@ DISTINFO_FILE= ${PORTSDIR}/lang/python${ WRKSRC= ${PYTHON_WRKSRC}/Modules PYDISTUTILS_INSTALLARGS+= --install-lib ${PYTHON_LIBDIR}/lib-dynload -PYDISTUTILS_NOEGGINFO= yes +PYDISTUTILS_AUTOPLIST= yes -PLIST_FILES= %%PYTHON_LIBDIR%%/lib-dynload/_sqlite3.so - -NO_STAGE= yes .include post-extract: Modified: head/deskutils/tel/Makefile ============================================================================== --- head/deskutils/tel/Makefile Sun Dec 15 16:17:46 2013 (r336552) +++ head/deskutils/tel/Makefile Sun Dec 15 16:22:17 2013 (r336553) @@ -14,6 +14,11 @@ USE_BZIP2= yes USES= gettext USE_PYTHON= yes USE_PYDISTUTILS=yes - NO_STAGE= yes + +post-patch: + @${REINPLACE_CMD} \ + -e 's,distutils\.command\.install ,setuptools\.command\.install ,' \ + ${WRKSRC}/appdistutils.py + .include Modified: head/deskutils/x-tile/Makefile ============================================================================== --- head/deskutils/x-tile/Makefile Sun Dec 15 16:17:46 2013 (r336552) +++ head/deskutils/x-tile/Makefile Sun Dec 15 16:22:17 2013 (r336553) @@ -8,7 +8,7 @@ CATEGORIES= deskutils devel python MASTER_SITES= http://www.giuspen.com/software/ MAINTAINER= sawp@sawp.com.br -COMMENT= A GNOME applet to tile the opened windows +COMMENT= GNOME applet to tile the opened windows LICENSE= GPLv2 @@ -33,5 +33,8 @@ post-patch: @${REINPLACE_CMD} -e 's|/usr/share|${PREFIX}/share|g' \ ${WRKSRC}/x-tile ${WRKSRC}/linux/x-tile.desktop \ ${WRKSRC}/modules/cons.py + @${REINPLACE_CMD} \ + -e 's,distutils\.command\.install ,setuptools\.command\.install ,' \ + ${WRKSRC}/setup.py .include Modified: head/devel/fnorb/Makefile ============================================================================== --- head/devel/fnorb/Makefile Sun Dec 15 16:17:46 2013 (r336552) +++ head/devel/fnorb/Makefile Sun Dec 15 16:22:17 2013 (r336553) @@ -13,7 +13,12 @@ COMMENT= A CORBA 2.0 ORB written in Pyth RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}tkinter>0:${PORTSDIR}/x11-toolkits/py-tkinter USE_PYTHON= yes -USE_PYDISTUTILS= yes +USE_PYDISTUTILS=yes +PYDISTUTILS_INSTALLNOSINGLE= yes +PYDISTUTILS_NOEGGINFO= yes +PYDISTUTILS_SETUP= ${PYSETUP} + +PLIST_SUB= PYDISTUTILS_EGGINFO=${PYDISTUTILS_EGGINFO} NO_STAGE= yes .include Modified: head/devel/fnorb/pkg-plist ============================================================================== --- head/devel/fnorb/pkg-plist Sun Dec 15 16:17:46 2013 (r336552) +++ head/devel/fnorb/pkg-plist Sun Dec 15 16:22:17 2013 (r336553) @@ -271,6 +271,7 @@ bin/fnping %%PYTHON_SITELIBDIR%%/Fnorb/script/fnping.py %%PYTHON_SITELIBDIR%%/Fnorb/script/fnping.pyc %%PYTHON_SITELIBDIR%%/Fnorb/script/fnping.pyo +%%PYTHON_SITELIBDIR%%/%%PYDISTUTILS_EGGINFO%% %%DOCSDIR%%/CHANGES %%DOCSDIR%%/LICENSE.HTML %%DOCSDIR%%/MANIFEST.in Modified: head/devel/hgview/Makefile ============================================================================== --- head/devel/hgview/Makefile Sun Dec 15 16:17:46 2013 (r336552) +++ head/devel/hgview/Makefile Sun Dec 15 16:22:17 2013 (r336553) @@ -8,7 +8,7 @@ CATEGORIES= devel MASTER_SITES= LOGILAB MAINTAINER= ports@FreeBSD.org -COMMENT= A fast Mercurial log navigator written in pyqt4 +COMMENT= Fast Mercurial log navigator written in pyqt4 RUN_DEPENDS= hg:${PORTSDIR}/devel/mercurial \ ${PYTHON_SITELIBDIR}/PyQt4/QtGui.so:${PORTSDIR}/x11-toolkits/py-qt4-gui \ @@ -22,7 +22,7 @@ BUILD_DEPENDS= hg:${PORTSDIR}/devel/merc USE_PYTHON= yes USE_PYDISTUTILS=yes -USE_GMAKE= yes +USES= gmake PORTDOCS= * MAN1= hgview.1 @@ -38,6 +38,9 @@ post-patch: @${REINPLACE_CMD} -e 's|path/to.*hgview.py|${PYTHON_SITELIBDIR}/hgext/hgview.py|' \ ${WRKSRC}/README @${REINPLACE_CMD} -e 's|'make'|'${GMAKE}'|' ${WRKSRC}/setup.py + @${REINPLACE_CMD} \ + -e 's,distutils\.command\.install ,setuptools\.command\.install ,' \ + ${WRKSRC}/setup.py post-install: .if ${PORT_OPTIONS:MDOCS} Modified: head/devel/py-anonfunc/Makefile ============================================================================== --- head/devel/py-anonfunc/Makefile Sun Dec 15 16:17:46 2013 (r336552) +++ head/devel/py-anonfunc/Makefile Sun Dec 15 16:22:17 2013 (r336553) @@ -14,6 +14,11 @@ COMMENT= Python module that provides eas USE_PYTHON= yes USE_PYDISTUTILS=yes +PYDISTUTILS_AUTOPLIST= yes + +post-patch: + @${REINPLACE_CMD} \ + -e 's,distutils\.command\.install ,setuptools\.command\.install ,' \ + ${WRKSRC}/setup.py -NO_STAGE= yes .include Modified: head/devel/py-cxx/Makefile ============================================================================== --- head/devel/py-cxx/Makefile Sun Dec 15 16:17:46 2013 (r336552) +++ head/devel/py-cxx/Makefile Sun Dec 15 16:22:17 2013 (r336553) @@ -27,4 +27,9 @@ post-install: ${INSTALL_DATA} ${WRKSRC}/Doc/PyCXX.html ${DOCSDIR} .endif +post-patch: + @${REINPLACE_CMD} \ + -e 's,distutils\.command\.install ,setuptools\.command\.install ,' \ + ${WRKSRC}/setup.py + .include Added: head/devel/py-gyp-devel/files/patch-setup.py ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/py-gyp-devel/files/patch-setup.py Sun Dec 15 16:22:17 2013 (r336553) @@ -0,0 +1,11 @@ +--- setup.py.orig 2013-12-13 12:37:02.344425745 -0200 ++++ setup.py 2013-12-13 12:37:14.480426995 -0200 +@@ -20,7 +20,7 @@ + packages=['gyp', 'gyp.generator'], + + scripts = ['gyp'], +- cmdclass = {'install': install, ++ cmdclass = { + 'install_lib': install_lib, + 'install_scripts': install_scripts}, + ) Modified: head/devel/py-libplist/Makefile ============================================================================== --- head/devel/py-libplist/Makefile Sun Dec 15 16:17:46 2013 (r336552) +++ head/devel/py-libplist/Makefile Sun Dec 15 16:22:17 2013 (r336553) @@ -8,7 +8,8 @@ MAINTAINER= avilla@FreeBSD.org COMMENT= Python bindings for libplist LIB_DEPENDS= plist:${PORTSDIR}/${MASTER_PORT} -BUILD_DEPENDS= cython:${PORTSDIR}/lang/cython \ +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools>0:${PORTSDIR}/devel/py-setuptools \ + cython:${PORTSDIR}/lang/cython \ swig2.0:${PORTSDIR}/devel/swig20 USE_PYTHON= yes Modified: head/devel/py-mx-experimental/Makefile ============================================================================== --- head/devel/py-mx-experimental/Makefile Sun Dec 15 16:17:46 2013 (r336552) +++ head/devel/py-mx-experimental/Makefile Sun Dec 15 16:22:17 2013 (r336553) @@ -16,11 +16,13 @@ BUILD_DEPENDS= ${LOCALBASE}/include/gmp. #RUN_DEPENDS= ${PYTHON_SITELIBDIR}/mx/BeeBase/BeeBase.py:${PORTSDIR}/lang/py-mx-base USE_PYTHON= yes -USE_PYDISTUTILS= yes +USE_PYDISTUTILS=yes PYDISTUTILS_PKGNAME= egenix-mx-experimental -NO_STAGE= yes post-patch: @${REINPLACE_CMD} -e "s|LIBGMPH|${PREFIX}/include|" ${WRKSRC}/mxEXPERIMENTAL.py + @${REINPLACE_CMD} \ + -e 's,distutils\.command\.install ,setuptools\.command\.install ,' \ + ${WRKSRC}/mxSetup.py .include Modified: head/devel/py-protocols/Makefile ============================================================================== --- head/devel/py-protocols/Makefile Sun Dec 15 16:17:46 2013 (r336552) +++ head/devel/py-protocols/Makefile Sun Dec 15 16:22:17 2013 (r336553) @@ -17,4 +17,8 @@ USE_PYDISTUTILS= yes PYDISTUTILS_PKGNAME= PyProtocols NO_STAGE= yes + +post-patch: + @${RM} -rf ${WRKSRC}/setuptools + .include Modified: head/devel/py-setuptools/Makefile ============================================================================== --- head/devel/py-setuptools/Makefile Sun Dec 15 16:17:46 2013 (r336552) +++ head/devel/py-setuptools/Makefile Sun Dec 15 16:22:17 2013 (r336553) @@ -20,7 +20,8 @@ PLIST_SUB= PYVER=${PYTHON_VER} VERSION=$ PYDISTUTILS_NOEGGINFO= yes USE_PYTHON= yes -USE_PYDISTUTILS=yes +USE_PYDISTUTILS= yes +PYDISTUTILS_SETUP= ${PYSETUP} PYTHON_PY3K_PLIST_HACK= yes SUB_LIST= IF_DEFAULT=${IF_DEFAULT} Modified: head/devel/py-yaml/Makefile ============================================================================== --- head/devel/py-yaml/Makefile Sun Dec 15 16:17:46 2013 (r336552) +++ head/devel/py-yaml/Makefile Sun Dec 15 16:22:17 2013 (r336553) @@ -38,7 +38,7 @@ post-install: .endif .if ${PORT_OPTIONS:MLIBYAML} -PYSETUP= setup.py --with-libyaml +PYDISTUTILS_SETUP+= --with-libyaml PYDISTUTILS_BUILD_TARGET= build_ext PYDISTUTILS_BUILDARGS+= --include-dirs=${LOCALBASE}/include \ --library-dirs=${LOCALBASE}/lib @@ -47,7 +47,7 @@ LIB_DEPENDS+= yaml-0.2:${PORTSDIR}/text PLIST_SUB+= LIBYAML="" .else -PYSETUP= setup.py --without-libyaml +PYDISTUTILS_SETUP+= --without-libyaml PLIST_SUB+= LIBYAML="@comment " .endif Modified: head/devel/scons/Makefile ============================================================================== --- head/devel/scons/Makefile Sun Dec 15 16:17:46 2013 (r336552) +++ head/devel/scons/Makefile Sun Dec 15 16:22:17 2013 (r336553) @@ -13,10 +13,17 @@ RUN_DEPENDS+= python2:${PORTSDIR}/lang/p USE_PYTHON= yes USE_PYDISTUTILS= yes -PYDISTUTILS_EGGINFODIR= ${PREFIX}/lib/scons-${PORTVERSION} +PYDISTUTILS_AUTOPLIST= yes PLIST_SUB+= SCONS_VER=${PORTVERSION} USE_PYTHON= -2.7 + +post-patch: + @${REINPLACE_CMD} \ + -e 's,distutils\.command\.install$$,setuptools\.command\.install,' \ + -e 's,distutils\.command\.install\.,setuptools\.command\.install\.,' \ + ${WRKSRC}/setup.py + .include Modified: head/dns/py-dnspython/Makefile ============================================================================== --- head/dns/py-dnspython/Makefile Sun Dec 15 16:17:46 2013 (r336552) +++ head/dns/py-dnspython/Makefile Sun Dec 15 16:22:17 2013 (r336553) @@ -13,8 +13,8 @@ COMMENT= DNS toolkit for Python USE_PYTHON= yes USE_PYDISTUTILS= yes +PYDISTUTILS_AUTOPLIST= yes PYDISTUTILS_PKGNAME= ${PORTNAME}${PORTVERSIONSUFFIX} -PYDISTUTILS_NOEGGINFO= yes OPTIONSFILE= ${PORT_DBDIR}/${PORTNAME}/options OPTIONS_DEFINE= PYCRYPTO @@ -32,10 +32,8 @@ NO_STAGE= yes .if ${PYTHON_MAJOR_VER} < 3 PORTVERSIONSUFFIX= -PLIST= ${PKGDIR}/pkg-plist-py2 .else PORTVERSIONSUFFIX=3 -PLIST= ${PKGDIR}/pkg-plist-py3 EXAMPLESDIR:= ${EXAMPLESDIR}3 .endif Modified: head/editors/zim/Makefile ============================================================================== --- head/editors/zim/Makefile Sun Dec 15 16:17:46 2013 (r336552) +++ head/editors/zim/Makefile Sun Dec 15 16:22:17 2013 (r336553) @@ -64,7 +64,10 @@ RUN_DEPENDS+= ditaa:${PORTSDIR}/graphics .endif post-patch: - @${REINPLACE_CMD} -e 's|share/man|man|' ${WRKSRC}/setup.py + @${REINPLACE_CMD} \ + -e 's|share/man|man|' \ + -e 's,distutils\.command\.install ,setuptools\.command\.install ,' \ + ${WRKSRC}/setup.py @${REINPLACE_CMD} -e "s|decode('utf-8')|decode('utf-8','replace')|g" ${WRKSRC}/zim/utils.py post-install: Modified: head/games/balazarbrothers/Makefile ============================================================================== --- head/games/balazarbrothers/Makefile Sun Dec 15 16:17:46 2013 (r336552) +++ head/games/balazarbrothers/Makefile Sun Dec 15 16:22:17 2013 (r336553) @@ -27,8 +27,13 @@ USE_GMAKE= yes PYDISTUTILS_PKGNAME= BalazarBrothers PYDISTUTILS_EGGINFODIR= ${PREFIX}/share +PYDISTUTILS_SETUP= ${PYSETUP} +PYDISTUTILS_NOEGGINFO= yes +PYDISTUTILS_INSTALLNOSINGLE= yes DATADIR= share/balazar_brothers +PLIST_SUB= PYDISTUTILS_EGGINFO=${PYDISTUTILS_EGGINFO} + OPTIONS_DEFINE= OPENAL OPTIONS_DEFAULT= OPENAL Modified: head/games/balazarbrothers/pkg-plist ============================================================================== --- head/games/balazarbrothers/pkg-plist Sun Dec 15 16:17:46 2013 (r336552) +++ head/games/balazarbrothers/pkg-plist Sun Dec 15 16:22:17 2013 (r336553) @@ -367,6 +367,7 @@ bin/balazar_brothers %%DATADIR%%/worlds/scn-tree5.data %%DATADIR%%/worlds/sign_brother_surf.data %%DATADIR%%/worlds/sign_u_turn.data +share/%%PYDISTUTILS_EGGINFO%% @dirrm %%DATADIR%%/fonts @dirrm %%DATADIR%%/images @dirrm %%DATADIR%%/levels Modified: head/games/gnomesudoku/Makefile ============================================================================== --- head/games/gnomesudoku/Makefile Sun Dec 15 16:17:46 2013 (r336552) +++ head/games/gnomesudoku/Makefile Sun Dec 15 16:22:17 2013 (r336553) @@ -14,7 +14,7 @@ COMMENT= GNOME Sudoku game RUN_DEPENDS= ${PYTHON_SITELIBDIR}/Numeric/Numeric.py:${PORTSDIR}/math/py-numeric \ ${PYTHON_SITELIBDIR}/PIL/__init__.py:${PORTSDIR}/graphics/py-imaging -USE_PYTHON= 2.5+ +USE_PYTHON= yes USE_PYDISTUTILS=yes USES= pathfix display USE_GNOME= gnomeprefix pygnome2 pygnomedesktop @@ -22,4 +22,10 @@ USE_GNOME= gnomeprefix pygnome2 pygnomed PYDISTUTILS_PKGNAME= gnome-sudoku NO_STAGE= yes + + +post-patch: + @${REINPLACE_CMD} \ + -e 's,distutils\.command\.install ,setuptools\.command\.install ,' \ + ${WRKSRC}/tools/gsudoku_distutils.py .include Modified: head/graphics/py-soya3d/Makefile ============================================================================== --- head/graphics/py-soya3d/Makefile Sun Dec 15 16:17:46 2013 (r336552) +++ head/graphics/py-soya3d/Makefile Sun Dec 15 16:22:17 2013 (r336553) @@ -26,12 +26,14 @@ USE_BZIP2= yes USE_PYTHON= yes USE_PYDISTUTILS= yes USE_OPENAL= al alut -USE_GL= glew +USE_GL= glew glu USE_GMAKE= yes USE_SDL= sdl PYDISTUTILS_PKGNAME= Soya +LDFLAGS+= -L${LOCALBASE}/lib -lGLU + MANDIR= ${WRKDIR}/${DISTNAME}/manpage/man1 MAN1= soya_editor.1 INSTALL_DIR= ${INSTALL} -d -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} Modified: head/japanese/tegaki-recognize/Makefile ============================================================================== --- head/japanese/tegaki-recognize/Makefile Sun Dec 15 16:17:46 2013 (r336552) +++ head/japanese/tegaki-recognize/Makefile Sun Dec 15 16:22:17 2013 (r336553) @@ -1,11 +1,6 @@ +# Created by: Timothy Beyer # $FreeBSD$ -# Date created: 15 Aug 2010 -# Whom: Timothy Beyer -# -# $FreeBSD$ -# - PORTNAME= tegaki PORTVERSION= 0.3.1.2 CATEGORIES= japanese python @@ -18,7 +13,7 @@ COMMENT= Open-Source Chinese and Japanes LICENSE= GPLv2 -LIB_DEPENDS= zinnia.0:${PORTSDIR}/japanese/zinnia +LIB_DEPENDS= libzinnia.so:${PORTSDIR}/japanese/zinnia RUN_DEPENDS= ${PYTHON_SITELIBDIR}/tegakigtk/recognizer.py:${PORTSDIR}/japanese/py-tegaki-gtk USE_PYTHON= -2.7 @@ -37,4 +32,9 @@ post-install: ${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR} .endif +post-patch: + @${REINPLACE_CMD} \ + -e 's,distutils\.command\.install ,setuptools\.command\.install ,' \ + ${WRKSRC}/setup.py + .include Modified: head/mail/postfix-policyd-spf-python/Makefile ============================================================================== --- head/mail/postfix-policyd-spf-python/Makefile Sun Dec 15 16:17:46 2013 (r336552) +++ head/mail/postfix-policyd-spf-python/Makefile Sun Dec 15 16:22:17 2013 (r336553) @@ -57,7 +57,7 @@ post-patch: do-install: @# Install data to an unused directory to ensure it doesn't pollute the system - @(cd ${INSTALL_WRKSRC}; ${SETENV} ${MAKE_ENV} ${PYTHON_CMD} ${PYSETUP} \ + @(cd ${INSTALL_WRKSRC}; ${SETENV} ${MAKE_ENV} ${PYTHON_CMD} ${PYDISTUTILS_SETUP} \ ${PYDISTUTILS_INSTALL_TARGET} ${PYDISTUTILS_INSTALLARGS} \ --install-data ${WRKDIR}/tmp-datadump-dir) ${INSTALL_MAN} ${WRKSRC}/policyd-spf.1 ${MANPREFIX}/man/man1 Modified: head/mail/svnmailer/Makefile ============================================================================== --- head/mail/svnmailer/Makefile Sun Dec 15 16:17:46 2013 (r336552) +++ head/mail/svnmailer/Makefile Sun Dec 15 16:22:17 2013 (r336553) @@ -31,7 +31,10 @@ PYDISTUTILS_INSTALLARGS+= --no-install-d .endif post-patch: - @${REINPLACE_CMD} -e "1s|^.*|#!${PYTHON_CMD}|" ${WRKSRC}/setup.py + @${REINPLACE_CMD} \ + -e "1s|^.*|#!${PYTHON_CMD}|" \ + -e 's,distutils\.command import install ,setuptools\.command import install ,' \ + ${WRKSRC}/setup.py @${REINPLACE_CMD} -e "1s|^.*|#!${PYTHON_CMD}|" ${WRKSRC}/src/svn-mailer .include Modified: head/math/py-numeric/Makefile ============================================================================== --- head/math/py-numeric/Makefile Sun Dec 15 16:17:46 2013 (r336552) +++ head/math/py-numeric/Makefile Sun Dec 15 16:22:17 2013 (r336553) @@ -17,44 +17,18 @@ COMMENT= The Numeric Extension to Python USE_PYTHON= yes USE_PYDISTUTILS= yes -PYDISTUTILS_PKGNAME= Numeric -PYDISTUTILS_EGGINFODIR= ${PYTHONPREFIX_SITELIBDIR}/Numeric - -# PYDISTUTILS_NOEGGINFO is used as a temporary workaround to fix the plist -PYDISTUTILS_NOEGGINFO= yes +PYDISTUTILS_AUTOPLIST= yes WRKSRC= ${WRKDIR}/Numeric-${PORTVERSION} DOCSDIR= ${PREFIX}/share/doc/py-numeric EXAMPLESDIR= ${PREFIX}/share/examples/py-numeric +PORTDOCS= * +PORTEXAMPLES= * -NO_STAGE= yes -.include +OPTIONS_DEFINE= DOCS EXAMPLES -.if exists(${LOCALBASE}/bin/easy_install-${PYTHON_VER}) -# py-setuptools is installed - adjust pkg-plist to work with -# implicit usage in setup.py -EASY="" -NOTEASY="@comment " -.else -# py-setuptools is not installed - adjust pkg-plist -EASY="@comment " -NOTEASY="" -.endif - -# Adjusting pkg-plist gets weirder here. Python 2.5+ incorporates -# install_egg_info functionality into distutils, so if py-numeric -# is installed into a lesser Python version, make sure all egg-related -# pkg-plist entries are omitted -.if ${PYTHON_SUFFIX} < 25 -NOEGGINFO="@comment " -.else -NOEGGINFO="" -.endif - -PLIST_SUB+= EASY=${EASY} NOTEASY=${NOTEASY} \ - PYDISTUTILS_EGGINFO=${PYDISTUTILS_EGGINFO} \ - NOEGGINFO=${NOEGGINFO} +.include post-extract: @${CP} ${DISTDIR}/numpy.pdf ${WRKDIR} @@ -64,18 +38,17 @@ post-extract: # the correct one, because if one has setuptools and another # doesn't, that could mess with how pkg-plist is constructed. # - @${REINPLACE_CMD} -e "s|/usr/bin/env python|/usr/bin/env python${PYTHON_VER}|" ${WRKSRC}/setup.py + @${REINPLACE_CMD} \ + -e "s|/usr/bin/env python|/usr/bin/env python${PYTHON_VER}|" \ + -e 's,distutils\.command\.install ,setuptools\.command\.install ,' \ + ${WRKSRC}/setup.py post-install: -.if !defined(NOPORTEXAMPLES) - @${INSTALL} -d ${EXAMPLESDIR} - ${INSTALL_DATA} ${WRKSRC}/Demo/*.py ${EXAMPLESDIR} - @${INSTALL} -d ${EXAMPLESDIR}/NumTut - ${INSTALL_DATA} ${WRKSRC}/Demo/NumTut/* ${EXAMPLESDIR}/NumTut -.endif -.if !defined(NOPORTDOCS) - @${INSTALL} -d ${DOCSDIR} - ${INSTALL_DATA} ${WRKDIR}/numpy.pdf ${DOCSDIR} -.endif + @${INSTALL} -d ${STAGEDIR}${EXAMPLESDIR} + ${INSTALL_DATA} ${WRKSRC}/Demo/*.py ${STAGEDIR}${EXAMPLESDIR} + @${INSTALL} -d ${STAGEDIR}${EXAMPLESDIR}/NumTut + ${INSTALL_DATA} ${WRKSRC}/Demo/NumTut/* ${STAGEDIR}${EXAMPLESDIR}/NumTut + @${INSTALL} -d ${STAGEDIR}${DOCSDIR} + ${INSTALL_DATA} ${WRKDIR}/numpy.pdf ${STAGEDIR}${DOCSDIR} .include Modified: head/multimedia/freevo/Makefile ============================================================================== --- head/multimedia/freevo/Makefile Sun Dec 15 16:17:46 2013 (r336552) +++ head/multimedia/freevo/Makefile Sun Dec 15 16:22:17 2013 (r336553) @@ -22,7 +22,6 @@ RUN_DEPENDS= mplayer:${PORTSDIR}/multime ${PYTHON_SITELIBDIR}/BeautifulSoup.py:${PORTSDIR}/www/py-beautifulsoup32 \ ${PYTHON_SITELIBDIR}/pygame/__init__.py:${PORTSDIR}/devel/py-game \ ${PYTHON_SITELIBDIR}/PIL/__init__.py:${PORTSDIR}/graphics/py-imaging \ - ${PYTHON_SITELIBDIR}/twisted/__init__.py:${PORTSDIR}/devel/py-twisted \ ${PYTHON_SITELIBDIR}/Numeric/Numeric_headers/__init__.py:${PORTSDIR}/math/py-numeric FREEVO_USER= freevo @@ -40,8 +39,14 @@ SUB_LIST+= PYTHON_VERSION=${PYTHON_DEFAU FREEVO_HOME=${FREEVO_HOME} SUB_FILES= pkg-message pkg-install pkg-deinstall +USES= twisted:web USE_PYTHON= yes USE_PYDISTUTILS= yes +PYDISTUTILS_INSTALLNOSINGLE= yes +PYDISTUTILS_NOEGGINFO= yes +PYDISTUTILS_SETUP= ${PYSETUP} + +PLIST_SUB= PYDISTUTILS_EGGINFO=${PYDISTUTILS_EGGINFO} USE_RC_SUBR= ${PORTNAME} RC_SCRIPT= ${PREFIX}/etc/rc.d/${PORTNAME} @@ -73,6 +78,9 @@ post-patch: ${WRKSRC}/src/www/htdocs/guidechannel.rpy.orig ${WRKSRC}/src/www/htdocs/proginfo.rpy.orig \ ${WRKSRC}/src/www/htdocs/vlcwin.rpy.orig +do-configure: + @${DO_NADA} + post-install: @${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL ${MKDIR} ${CONFDIR} Modified: head/multimedia/freevo/pkg-plist ============================================================================== --- head/multimedia/freevo/pkg-plist Sun Dec 15 16:17:46 2013 (r336552) +++ head/multimedia/freevo/pkg-plist Sun Dec 15 16:22:17 2013 (r336553) @@ -1074,6 +1074,7 @@ etc/freevo/local_conf.py.example %%PYTHON_SITELIBDIR%%/freevo/www/web_types.py %%PYTHON_SITELIBDIR%%/freevo/www/web_types.pyc %%PYTHON_SITELIBDIR%%/freevo/www/web_types.pyo +%%PYTHON_SITELIBDIR%%/%%PYDISTUTILS_EGGINFO%% %%DOCSDIR%%/COPYING %%DOCSDIR%%/CREDITS %%DOCSDIR%%/ChangeLog Modified: head/multimedia/gaupol/Makefile ============================================================================== --- head/multimedia/gaupol/Makefile Sun Dec 15 16:17:46 2013 (r336552) +++ head/multimedia/gaupol/Makefile Sun Dec 15 16:22:17 2013 (r336553) @@ -17,9 +17,10 @@ RUN_DEPENDS= iso-codes>=0:${PORTSDIR}/mi py*-chardet>=0:${PORTSDIR}/textproc/py-chardet \ py*-enchant>=1.5.1:${PORTSDIR}/textproc/py-enchant -USE_GNOME= pygtk2 desktopfileutils -USE_PYTHON= 2.6+ +USE_GNOME= pygtk2 +USE_PYTHON= yes USE_PYDISTUTILS=yes +USES= desktop-file-utils INSTALLS_ICONS= yes MAN1= ${PORTNAME}.1 @@ -35,6 +36,10 @@ PLIST_SUB+= NLS="@comment " .endif post-patch: - @${REINPLACE_CMD} -e 's|share/man|man|g' ${WRKSRC}/setup.py + @${REINPLACE_CMD} \ + -e 's|share/man|man|g' \ + -e 's,distutils\.command\.install$$,setuptools\.command\.install,g' \ + -e 's,distutils\.command\.install\.,setuptools\.command\.install\.,g' \ + ${WRKSRC}/setup.py .include Modified: head/net/py-ldaptor/Makefile ============================================================================== --- head/net/py-ldaptor/Makefile Sun Dec 15 16:17:46 2013 (r336552) +++ head/net/py-ldaptor/Makefile Sun Dec 15 16:22:17 2013 (r336553) @@ -21,6 +21,8 @@ USE_PYTHON= yes USE_PYDISTUTILS= yes PYDISTUTILS_PKGVERSION= 0.0.0 PYDISTUTILS_PKGNAME= ldaptor +PYDISTUTILS_INSTALL_TARGET= install_locale install +PYDISTUTILS_BUILD_TARGET= build_locale build NO_STAGE= yes .include Added: head/net/py-ldaptor/files/patch-setup.py ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net/py-ldaptor/files/patch-setup.py Sun Dec 15 16:22:17 2013 (r336553) @@ -0,0 +1,10 @@ +--- setup.py.orig 2013-12-13 13:49:46.929425897 -0200 ++++ setup.py 2013-12-13 13:49:58.999423613 -0200 +@@ -154,7 +154,6 @@ + 'build_locale': build_locale, + 'clean': clean, + 'clean_locale': clean_locale, +- 'install': install, + 'install_locale': install_locale, + }, + Modified: head/science/veusz/Makefile ============================================================================== --- head/science/veusz/Makefile Sun Dec 15 16:17:46 2013 (r336552) +++ head/science/veusz/Makefile Sun Dec 15 16:22:17 2013 (r336553) @@ -22,4 +22,10 @@ USE_PYDISTUTILS= yes INSTALLS_EGGINFO= yes NO_STAGE= yes + +post-patch: + @${REINPLACE_CMD} \ + -e 's,distutils\.command\.install ,setuptools\.command\.install ,' \ + ${WRKSRC}/setup.py + .include Modified: head/security/umit/Makefile ============================================================================== --- head/security/umit/Makefile Sun Dec 15 16:17:46 2013 (r336552) +++ head/security/umit/Makefile Sun Dec 15 16:22:17 2013 (r336553) @@ -23,6 +23,9 @@ USE_PYDISTUTILS= yes NO_STAGE= yes post-patch: - ${REINPLACE_CMD} 's/self.build_html_doc()//' ${WRKSRC}/setup.py + ${REINPLACE_CMD} \ + -e 's/self.build_html_doc()//' \ + -e 's,distutils\.command\.install ,setuptools\.command\.install ,' \ + ${WRKSRC}/setup.py .include Modified: head/security/zenmap/Makefile ============================================================================== --- head/security/zenmap/Makefile Sun Dec 15 16:17:46 2013 (r336552) +++ head/security/zenmap/Makefile Sun Dec 15 16:22:17 2013 (r336553) @@ -43,9 +43,13 @@ post-patch: @${REINPLACE_CMD} -e 's|su-to-zenmap.sh %F|su-to-zenmap.sh ${PORTNAME}|' \ ${WRKSRC}/install_scripts/unix/zenmap-root.desktop @${REINPLACE_CMD} \ - -e '/self.create_uninstaller/s|^|#|' ${WRKSRC}/setup.py + -e '/self.create_uninstaller/s|^|#|' \ + -e 's,distutils\.command\.install ,setuptools\.command\.install ,' \ + ${WRKSRC}/setup.py @${REINPLACE_CMD} \ - -e 's|share/man/man1|man/man1|' ${WRKSRC}/../ndiff/setup.py + -e 's|share/man/man1|man/man1|' \ + -e 's,"install": checked_install,,' \ + ${WRKSRC}/../ndiff/setup.py .if ! ${PORT_OPTIONS:MNLS} @${REINPLACE_CMD} -i '' '/locale_dir, mo_find, /d' ${WRKSRC}/setup.py .endif @@ -57,6 +61,6 @@ post-build: post-install: ${INSTALL_MAN} ${WRKSRC}/../docs/zenmap.1 ${MAN1PREFIX}/man/man1 @(cd ${WRKSRC}/../ndiff \ - && ${PYTHON_CMD} setup.py install --prefix ${PREFIX}) + && ${PYTHON_CMD} setup.py install --prefix=${PREFIX}) .include Modified: head/textproc/py-4suite-xml/Makefile ============================================================================== --- head/textproc/py-4suite-xml/Makefile Sun Dec 15 16:17:46 2013 (r336552) +++ head/textproc/py-4suite-xml/Makefile Sun Dec 15 16:22:17 2013 (r336553) @@ -15,6 +15,8 @@ USE_BZIP2= yes REINPLACE_ARGS= -i "" -E USE_PYTHON= yes USE_PYDISTUTILS= yes +PYDISTUTILS_SETUP= ${PYSETUP} +PYDISTUTILS_NOEGGINFO= yes CONFLICTS= py*-4suite-[01]* @@ -31,7 +33,8 @@ LOCALEDIR= share/locale PLIST_SUB+= PACKAGE_DIR=Ft BINDIR=${BINDIR} SYSCONFDIR=${SYSCONFDIR} \ LIBDIR=${LIBDIR} LOCALSTATEDIR=${LOCALSTATEDIR} \ - DATADIR=${DATADIR} DOCSDIR=${DOCSDIR} LOCALEDIR=${LOCALEDIR} + DATADIR=${DATADIR} DOCSDIR=${DOCSDIR} LOCALEDIR=${LOCALEDIR} \ + PYDISTUTILS_EGGINFO=${PYDISTUTILS_EGGINFO} SUB_FILES= pkg-message SUB_LIST+= PACKAGE_DIR=Ft BINDIR=${BINDIR} SYSCONFDIR=${SYSCONFDIR} \ Modified: head/textproc/py-4suite-xml/pkg-plist ============================================================================== --- head/textproc/py-4suite-xml/pkg-plist Sun Dec 15 16:17:46 2013 (r336552) +++ head/textproc/py-4suite-xml/pkg-plist Sun Dec 15 16:22:17 2013 (r336553) @@ -805,6 +805,7 @@ %%PYTHON_SITELIBDIR%%/%%PACKAGE_DIR%%/__config__.py %%PYTHON_SITELIBDIR%%/%%PACKAGE_DIR%%/__init__.py %%PYTHON_SITELIBDIR%%/%%PACKAGE_DIR%%/__init__.pyc +%%PYTHON_SITELIBDIR%%/%%PYDISTUTILS_EGGINFO%% %%DATADIR%%/Data/Stylesheets/commandline.css %%DATADIR%%/Data/Stylesheets/commandline_html.xslt %%DATADIR%%/Data/Stylesheets/docbook_html-css.xslt Modified: head/textproc/pychm/Makefile ============================================================================== --- head/textproc/pychm/Makefile Sun Dec 15 16:17:46 2013 (r336552) +++ head/textproc/pychm/Makefile Sun Dec 15 16:22:17 2013 (r336553) @@ -14,8 +14,10 @@ LIB_DEPENDS= chm.0:${PORTSDIR}/misc/chml NO_BUILD= yes USE_PYTHON= yes USE_PYDISTUTILS= yes -PYDISTUTILS_INSTALLARGS= build_ext -I${LOCALBASE}/include -L${LOCALBASE}/lib \ - install -c -O1 --prefix=${PREFIX} NO_STAGE= yes -.include +.include + +PYDISTUTILS_INSTALLARGS:= ${PYDISTUTILS_INSTALLARGS} build_ext -I${LOCALBASE}/include -L${LOCALBASE}/lib + +.include Modified: head/www/py-prewikka/Makefile ============================================================================== --- head/www/py-prewikka/Makefile Sun Dec 15 16:17:46 2013 (r336552) +++ head/www/py-prewikka/Makefile Sun Dec 15 16:22:17 2013 (r336553) @@ -11,13 +11,12 @@ MAINTAINER= ports@FreeBSD.org COMMENT= Frontend for the Prelude IDS BUILD_DEPENDS= cheetah-compile:${PORTSDIR}/devel/py-cheetah -LIB_DEPENDS= prelude:${PORTSDIR}/security/libprelude \ - preludedb:${PORTSDIR}/security/libpreludedb +LIB_DEPENDS= libprelude.so:${PORTSDIR}/security/libprelude \ + libpreludedb.so:${PORTSDIR}/security/libpreludedb USE_PYTHON= -2.7 USE_PYDISTUTILS= yes -NO_STAGE= yes .include .if ${PORT_OPTIONS:MNLS} @@ -36,10 +35,4 @@ post-patch: ${WRKSRC}/setup.py .endif -post-install: - @if [ ! -f ${PREFIX}/etc/prewikka/prewikka.conf ]; then \ - ${CP} -p ${PREFIX}/etc/prewikka/prewikka.conf-dist \ - ${PREFIX}/etc/prewikka/prewikka.conf ; \ - fi - .include Added: head/www/py-prewikka/files/patch-setup.py ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/www/py-prewikka/files/patch-setup.py Sun Dec 15 16:22:17 2013 (r336553) @@ -0,0 +1,15 @@ +--- setup.py.orig 2013-12-13 13:00:13.747424982 -0200 ++++ setup.py 2013-12-13 13:01:10.453423405 -0200 +@@ -27,9 +27,9 @@ + from distutils.dist import Distribution + from distutils.core import setup + from distutils.command.build import build +-from distutils.command.build_py import build_py +-from distutils.command.install import install +-from distutils.command.install_scripts import install_scripts ++from setuptools.command.build_py import build_py ++from setuptools.command.install import install ++from setuptools.command.install_scripts import install_scripts + from distutils.command.install_data import install_data + from distutils.core import Command + Modified: head/www/py-prewikka/pkg-plist ============================================================================== --- head/www/py-prewikka/pkg-plist Sun Dec 15 16:17:46 2013 (r336552) +++ head/www/py-prewikka/pkg-plist Sun Dec 15 16:22:17 2013 (r336553) @@ -236,6 +236,7 @@ etc/prewikka/prewikka.conf-dist %%DATADIR%%/htdocs/images/table_order_up.gif %%DATADIR%%/htdocs/js/functions.js %%DATADIR%%/htdocs/js/jquery.js +@exec mkdir -p %%DATADIR%%/htdocs/generated_images @dirrm %%DATADIR%%/htdocs/js @dirrm %%DATADIR%%/htdocs/images @dirrm %%DATADIR%%/htdocs/generated_images Modified: head/www/py-utidy/Makefile ============================================================================== --- head/www/py-utidy/Makefile Sun Dec 15 16:17:46 2013 (r336552) +++ head/www/py-utidy/Makefile Sun Dec 15 16:22:17 2013 (r336553) @@ -19,7 +19,11 @@ LIB_DEPENDS= tidy-0.99.0:${PORTSDIR}/www USE_ZIP= yes USE_PYTHON= -2.7 USE_PYDISTUTILS= yes -PYDISTUTILS_PKGNAME= uTidylib +PYDISTUTILS_AUTOPLIST= yes + +post-patch: + @${REINPLACE_CMD} \ + -e 's,distutils\.command\.install ,setuptools\.command\.install ,' \ + ${WRKSRC}/setup.py -NO_STAGE= yes .include Modified: head/www/trac-wysiwyg/Makefile ============================================================================== --- head/www/trac-wysiwyg/Makefile Sun Dec 15 16:17:46 2013 (r336552) +++ head/www/trac-wysiwyg/Makefile Sun Dec 15 16:22:17 2013 (r336553) @@ -19,7 +19,7 @@ USE_BZIP2= yes USE_PYTHON= -2.7 USE_PYDISTUTILS= easy_install PYDISTUTILS_PKGNAME= TracWysiwyg -PYDISTUTILS_PKGVERSION= 0.12.${PORTVERSION:R} +PYDISTUTILS_PKGVERSION= 0.12.0.4 PLIST_FILES= %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%% NO_STAGE= yes Modified: head/x11-toolkits/py-fltk/Makefile ============================================================================== --- head/x11-toolkits/py-fltk/Makefile Sun Dec 15 16:17:46 2013 (r336552) +++ head/x11-toolkits/py-fltk/Makefile Sun Dec 15 16:22:17 2013 (r336553) @@ -13,9 +13,9 @@ DISTNAME= pyFltk-${PORTVERSION:S/.b/b/} MAINTAINER= ports@FreeBSD.org COMMENT= Python interface to FLTK window toolkit -LIB_DEPENDS= fltk.1:${PORTSDIR}/x11-toolkits/fltk +LIB_DEPENDS= libfltk.so:${PORTSDIR}/x11-toolkits/fltk -USE_PYTHON= 2.5+ +USE_PYTHON= yes USE_PYDISTUTILS= yes USE_XORG= x11 @@ -34,8 +34,7 @@ post-patch: post-build: ${REINPLACE_CMD} -e "s|\.\./docs|${DOCSDIR}/html|g" ${WRKSRC}/fltk/test/help.py -do-install: - @(cd ${INSTALL_WRKSRC}; ${SETENV} ${MAKE_ENV} ${PYTHON_CMD} ${PYSETUP} install ${PYDISTUTILS_INSTALLARGS}) +post-install: .if !defined(NOPORTDOCS) ${MKDIR} ${DOCSDIR}/html ${INSTALL_DATA} ${WRKSRC}/fltk/docs/*.html ${DOCSDIR}/html Modified: head/x11-toolkits/py-tkinter/Makefile ============================================================================== --- head/x11-toolkits/py-tkinter/Makefile Sun Dec 15 16:17:46 2013 (r336552) +++ head/x11-toolkits/py-tkinter/Makefile Sun Dec 15 16:22:17 2013 (r336553) @@ -25,12 +25,8 @@ DISTINFO_FILE= ${PORTSDIR}/lang/python${ WRKSRC= ${PYTHON_WRKSRC}/Modules PYDISTUTILS_INSTALLARGS+= --install-lib ${PYTHON_LIBDIR}/lib-dynload -PYDISTUTILS_NOEGGINFO= yes -PYDISTUTILS_PKGNAME= Tkinter +PYDISTUTILS_AUTOPLIST= yes -PLIST_FILES= %%PYTHON_LIBDIR%%/lib-dynload/_tkinter.so - -NO_STAGE= yes .include post-extract: Modified: head/x11-toolkits/py-wxPython26/Makefile ============================================================================== --- head/x11-toolkits/py-wxPython26/Makefile Sun Dec 15 16:17:46 2013 (r336552) +++ head/x11-toolkits/py-wxPython26/Makefile Sun Dec 15 16:22:17 2013 (r336553) @@ -151,6 +151,7 @@ post-install: # fix installation permissions ${CHMOD} -R a+rX \ ${PYTHON_SITELIBDIR:C@^${LOCALBASE}@${PREFIX}@}/${WX_PYTHON_DIR} + @${RM} -rf ${PYTHON_SITELIBDIR:C@^${LOCALBASE}@${PREFIX}@}/${WX_PYTHON_DIR}/*egg-info .endif ## # wxversion wxPython available list Added: head/x11-toolkits/py-wxPython26/files/patch-config.py ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/x11-toolkits/py-wxPython26/files/patch-config.py Sun Dec 15 16:22:17 2013 (r336553) @@ -0,0 +1,26 @@ +--- config.py.orig 2006-07-15 18:20:18.000000000 -0300 ++++ config.py 2013-12-13 11:41:13.788425136 -0200 +@@ -27,7 +27,7 @@ + from distutils.dep_util import newer + from distutils.spawn import spawn + +-import distutils.command.install ++import setuptools.command.install + import distutils.command.install_data *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** From owner-svn-ports-head@FreeBSD.ORG Sun Dec 15 16:44:08 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id E56B2554; Sun, 15 Dec 2013 16:44:08 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id D1D8A109F; Sun, 15 Dec 2013 16:44:08 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBFGi8ku091165; Sun, 15 Dec 2013 16:44:08 GMT (envelope-from wg@svn.freebsd.org) Received: (from wg@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBFGi84p091164; Sun, 15 Dec 2013 16:44:08 GMT (envelope-from wg@svn.freebsd.org) Message-Id: <201312151644.rBFGi84p091164@svn.freebsd.org> From: William Grzybowski Date: Sun, 15 Dec 2013 16:44:08 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r336554 - head/sysutils/linux-crashplan X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 15 Dec 2013 16:44:09 -0000 Author: wg Date: Sun Dec 15 16:44:08 2013 New Revision: 336554 URL: http://svnweb.freebsd.org/changeset/ports/336554 Log: sysutils/linux-crashplan: remove bogus and useless pre-patch target Submitted by: Evan Susarret Modified: head/sysutils/linux-crashplan/Makefile Modified: head/sysutils/linux-crashplan/Makefile ============================================================================== --- head/sysutils/linux-crashplan/Makefile Sun Dec 15 16:22:17 2013 (r336553) +++ head/sysutils/linux-crashplan/Makefile Sun Dec 15 16:44:08 2013 (r336554) @@ -30,9 +30,6 @@ NO_BUILD= yes CRASHDIR= ${PREFIX}/share/crashplan -pre-patch: - @${REINPLACE_CMD} -i '' 's,%%PREFIX%%,${PREFIX},' ${FILESDIR}/patch-CrashPlanDesktop - post-patch: @${REINPLACE_CMD} 's/SRV_JAVA_OPTS="/SRV_JAVA_OPTS="-Djava.nio.channels.spi.SelectorProvider=sun.nio.ch.PollSelectorProvider /' ${WRKSRC}/scripts/run.conf @${REINPLACE_CMD} 's/GUI_JAVA_OPTS="/GUI_JAVA_OPTS="-Djava.nio.channels.spi.SelectorProvider=sun.nio.ch.PollSelectorProvider /' ${WRKSRC}/scripts/run.conf From owner-svn-ports-head@FreeBSD.ORG Sun Dec 15 16:45:41 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 16FF9653; Sun, 15 Dec 2013 16:45:41 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 00ABD10B5; Sun, 15 Dec 2013 16:45:41 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBFGjekU091529; Sun, 15 Dec 2013 16:45:40 GMT (envelope-from ohauer@svn.freebsd.org) Received: (from ohauer@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBFGjckx091516; Sun, 15 Dec 2013 16:45:38 GMT (envelope-from ohauer@svn.freebsd.org) Message-Id: <201312151645.rBFGjckx091516@svn.freebsd.org> From: Olli Hauer Date: Sun, 15 Dec 2013 16:45:38 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r336555 - in head/www: mod_fastcgi mod_line_edit mod_log_config-st mod_log_mysql mod_proctitle mod_proxy_html mod_tidy mod_webkit mod_xmlns X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 15 Dec 2013 16:45:41 -0000 Author: ohauer Date: Sun Dec 15 16:45:38 2013 New Revision: 336555 URL: http://svnweb.freebsd.org/changeset/ports/336555 Log: - add stage support - minor cleanups Deleted: head/www/mod_xmlns/pkg-plist Modified: head/www/mod_fastcgi/Makefile head/www/mod_line_edit/Makefile head/www/mod_log_config-st/Makefile head/www/mod_log_mysql/Makefile head/www/mod_proctitle/Makefile head/www/mod_proxy_html/Makefile head/www/mod_proxy_html/pkg-descr head/www/mod_tidy/Makefile head/www/mod_webkit/Makefile head/www/mod_xmlns/Makefile Modified: head/www/mod_fastcgi/Makefile ============================================================================== --- head/www/mod_fastcgi/Makefile Sun Dec 15 16:44:08 2013 (r336554) +++ head/www/mod_fastcgi/Makefile Sun Dec 15 16:45:38 2013 (r336555) @@ -10,25 +10,16 @@ DISTNAME= mod_fastcgi-SNAP-0910052141 DIST_SUBDIR= apache2 MAINTAINER= apache@FreeBSD.org -COMMENT= A fast-cgi module for Apache - +COMMENT= Apache 2.2 fast-cgi module USE_APACHE= 22 AP_FAST_BUILD= yes AP_GENPLIST= yes SRC_FILE= *.c -PORTDOCS= LICENSE.TERMS mod_fastcgi.html - -NO_STAGE= yes -do-install: - @${APXS} -i -a -n ${SHORTMODNAME} ${WRKSRC}/${MODULENAME}.${AP_BUILDEXT} +PORTDOCS= mod_fastcgi.html post-install: -.if !defined(NOPORTDOCS) - ${MKDIR} ${DOCSDIR} -.for f in ${PORTDOCS} - ${INSTALL_DATA} ${WRKSRC}/docs/${f} ${DOCSDIR} -.endfor -.endif + ${MKDIR} ${STAGEDIR}${DOCSDIR} + ${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/docs/|} ${STAGEDIR}${DOCSDIR} .include Modified: head/www/mod_line_edit/Makefile ============================================================================== --- head/www/mod_line_edit/Makefile Sun Dec 15 16:44:08 2013 (r336554) +++ head/www/mod_line_edit/Makefile Sun Dec 15 16:45:38 2013 (r336555) @@ -13,19 +13,17 @@ EXTRACT_SUFX= MAINTAINER= apache@FreeBSD.org COMMENT= Apache module for simple text rewriting - -WRKSRC= ${WRKDIR} +LICENSE= GPLv2 USE_APACHE= 22+ AP_FAST_BUILD= yes AP_GENPLIST= yes -NO_STAGE= yes pre-extract: - @${MKDIR} ${WRKDIR} + @${MKDIR} ${WRKSRC} do-extract: - @${CP} ${DISTDIR}/${PORTNAME}.c ${WRKDIR}/ + @${CP} ${DISTDIR}/${PORTNAME}.c ${WRKSRC} .include Modified: head/www/mod_log_config-st/Makefile ============================================================================== --- head/www/mod_log_config-st/Makefile Sun Dec 15 16:44:08 2013 (r336554) +++ head/www/mod_log_config-st/Makefile Sun Dec 15 16:45:38 2013 (r336555) @@ -6,22 +6,24 @@ PORTVERSION= 1.0 PORTREVISION= 2 CATEGORIES= www # Original location: http://bitbrook.de/software/mod_log_mysql/mod_log_config.c -MASTER_SITES= http://sheepkiller.nerim.net/ports/${PORTNAME}/ +# Please handle update requests with care! +# sheepkiller was hacked and not cleaned over a long periode. +# (First notice 2011-03 not cleaned until 2011-07) +# Provide distfile now from LOCAL +#MASTER_SITES= http://sheepkiller.nerim.net/ports/${PORTNAME}/ +MASTER_SITES= LOCAL/ohauer DIST_SUBDIR= apache2 MAINTAINER= apache@FreeBSD.org -COMMENT= A modified version of mod_log_config for apache2 +COMMENT= Modified version of mod_log_config for apache2 +EXPIRATION_DATE= 2014-02-08 +DEPRECATED= Upstream site gone since 2011-03 USE_APACHE= 22 - AP_FAST_BUILD= yes SRC_FILE= mod_log_config.c SHORTMODNAME= log_config MODULENAME= mod_log_config-st -NO_STAGE= yes -post-install: - @${CAT} ${PKGMESSAGE} - .include Modified: head/www/mod_log_mysql/Makefile ============================================================================== --- head/www/mod_log_mysql/Makefile Sun Dec 15 16:44:08 2013 (r336554) +++ head/www/mod_log_mysql/Makefile Sun Dec 15 16:45:38 2013 (r336555) @@ -17,8 +17,10 @@ DIST_SUBDIR= apache2 MAINTAINER= apache@FreeBSD.org COMMENT= Allows Apache 2 to log to a MySQL database -RUN_DEPENDS+= ${LOCALBASE}/${APACHEMODDIR}/mod_log_config-st.so:${PORTSDIR}/www/mod_log_config-st +EXPIRATION_DATE= 2014-02-08 +DEPRECATED= Upstream site gone since 2011-03 +RUN_DEPENDS+= ${LOCALBASE}/${APACHEMODDIR}/mod_log_config-st.so:${PORTSDIR}/www/mod_log_config-st USE_APACHE= 22 AP_FAST_BUILD= yes @@ -28,5 +30,4 @@ USE_MYSQL= yes AP_INC+= ${LOCALBASE}/include/mysql AP_LIB+= ${LOCALBASE}/lib/mysql -lmysqlclient -NO_STAGE= yes .include Modified: head/www/mod_proctitle/Makefile ============================================================================== --- head/www/mod_proctitle/Makefile Sun Dec 15 16:44:08 2013 (r336554) +++ head/www/mod_proctitle/Makefile Sun Dec 15 16:45:38 2013 (r336555) @@ -3,7 +3,6 @@ PORTNAME= mod_proctitle PORTVERSION= 0.4.1 -PORTREVISION= 0 CATEGORIES= www MASTER_SITES= ftp://ftp.springdaemons.com/soft/ PKGNAMEPREFIX= ${APACHE_PKGNAMEPREFIX} @@ -11,6 +10,7 @@ PKGNAMEPREFIX= ${APACHE_PKGNAMEPREFIX} MAINTAINER= apache@FreeBSD.org COMMENT= Set httpd process titles to reflect currently processed request +LICENSE= BSD USE_APACHE= 22+ GNU_CONFIGURE= yes @@ -21,9 +21,9 @@ CFLAGS+= -I${LOCALBASE}/include \ PLIST_FILES= ${APACHEMODDIR}/${PORTNAME}.so -NO_STAGE= yes do-install: + @${MKDIR} ${STAGEDIR}${PREFIX}/${APACHEMODDIR} ${INSTALL_PROGRAM} ${WRKSRC}/src/.libs/mod_proctitle.so \ - ${PREFIX}/${APACHEMODDIR}/ + ${STAGEDIR}${PREFIX}/${APACHEMODDIR} .include Modified: head/www/mod_proxy_html/Makefile ============================================================================== --- head/www/mod_proxy_html/Makefile Sun Dec 15 16:44:08 2013 (r336554) +++ head/www/mod_proxy_html/Makefile Sun Dec 15 16:45:38 2013 (r336555) @@ -12,11 +12,12 @@ DIST_SUBDIR= mod_proxy_html MAINTAINER= apache@FreeBSD.org COMMENT= Apache module for rewriting HTML links in proxied content -RUN_DEPENDS= ${LOCALBASE}/${APACHEMODDIR}/mod_xml2enc.so:${PORTSDIR}/www/mod_xml2enc +LICENSE= GPLv2 +RUN_DEPENDS= ${LOCALBASE}/${APACHEMODDIR}/mod_xml2enc.so:${PORTSDIR}/www/mod_xml2enc SUB_FILES= pkg-message -USE_APACHE= 22+ +USE_APACHE= 22 AP_FAST_BUILD= yes AP_GENPLIST= yes SHORTMODNAME= proxy_html @@ -27,16 +28,10 @@ AP_INC+= ${LOCALBASE}/include/libxml2 -I AP_LIB+= ${LOCALBASE}/lib AP_EXTRAS+= -lxml2 -PLIST_FILES= %%DOCSDIR%%/COPYING %%DOCSDIR%%/README \ - %%DOCSDIR%%/proxy_html.conf -PLIST_DIRS= %%DOCSDIR%% +PORTDOCS= README proxy_html.conf -NO_STAGE= yes post-install: - ${MKDIR} ${DOCSDIR} - ${INSTALL_MAN} ${WRKSRC}/COPYING ${DOCSDIR} - ${INSTALL_MAN} ${WRKSRC}/README ${DOCSDIR} - ${INSTALL_MAN} ${WRKSRC}/proxy_html.conf ${DOCSDIR} - @${CAT} ${PKGMESSAGE} + @${MKDIR} ${STAGEDIR}${DOCSDIR} + ${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR} .include Modified: head/www/mod_proxy_html/pkg-descr ============================================================================== --- head/www/mod_proxy_html/pkg-descr Sun Dec 15 16:44:08 2013 (r336554) +++ head/www/mod_proxy_html/pkg-descr Sun Dec 15 16:45:38 2013 (r336555) @@ -3,4 +3,9 @@ situation, to ensure that links work for serves the same purpose as Apache's ProxyPassReverse directive does for HTTP headers, and is an essential component of a reverse proxy. +Note (for apache24 users): +mod_proxy_html has now been relicensed and incorporated into the core +Apache HTTPD distribution at apache.org from HTTPD 2.4. That version is +now likely to be more up-to-date than this one. + WWW: http://apache.webthing.com/mod_proxy_html/ Modified: head/www/mod_tidy/Makefile ============================================================================== --- head/www/mod_tidy/Makefile Sun Dec 15 16:44:08 2013 (r336554) +++ head/www/mod_tidy/Makefile Sun Dec 15 16:45:38 2013 (r336555) @@ -11,8 +11,10 @@ DIST_SUBDIR= apache2 MAINTAINER= apache@FreeBSD.org COMMENT= Validates the HTML output of your apache2 webserver -LIB_DEPENDS= tidy:${PORTSDIR}/www/tidy-lib +LICENSE= AL2 MIT +LICENSE_COMB= multi +LIB_DEPENDS= libtidy.so:${PORTSDIR}/www/tidy-lib WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}/src USE_APACHE= 22+ @@ -20,12 +22,5 @@ AP_FAST_BUILD= yes AP_GENPLIST= yes AP_INC+= ${LOCALBASE}/include/tidy AP_LIB+= ${LOCALBASE}/lib -ltidy -PLIST_FILES= ${DOCSDIR:S/${PREFIX}\///}/LICENSE -PLIST_DIRS= ${DOCSDIR:S/${PREFIX}\///} - -NO_STAGE= yes -post-install: - @${MKDIR} ${DOCSDIR} - @${INSTALL_DATA} ${WRKSRC}/../LICENSE ${DOCSDIR} .include Modified: head/www/mod_webkit/Makefile ============================================================================== --- head/www/mod_webkit/Makefile Sun Dec 15 16:44:08 2013 (r336554) +++ head/www/mod_webkit/Makefile Sun Dec 15 16:45:38 2013 (r336555) @@ -10,6 +10,7 @@ DISTNAME= Webware-${PORTVERSION} MAINTAINER= apache@FreeBSD.org COMMENT= Apache module for WebWare WebKit AppServer +LICENSE= PSFL USE_APACHE= 22+ AP_FAST_BUILD= yes @@ -18,7 +19,6 @@ AP_EXTRAS= marshal.c WRKSRC= ${WRKDIR}/Webware-${PORTVERSION}/WebKit/Adapters/${PORTNAME}2 -NO_STAGE= yes post-patch: @${REINPLACE_CMD} -e 's|/usr/sbin/apxs|${APXS}|' ${WRKSRC}/Makefile Modified: head/www/mod_xmlns/Makefile ============================================================================== --- head/www/mod_xmlns/Makefile Sun Dec 15 16:44:08 2013 (r336554) +++ head/www/mod_xmlns/Makefile Sun Dec 15 16:45:38 2013 (r336555) @@ -12,24 +12,21 @@ DISTFILES= xmlns.h mod_xmlns.c MAINTAINER= apache@FreeBSD.org COMMENT= Apache module for XML namespaces +LICENSE= GPLv2 USE_GNOME= libxml2 USE_APACHE= 22+ -XML2_INC= ${LOCALBASE}/include/libxml2 -XML2_LIB= ${LOCALBASE}/lib +AP_FAST_BUILD= yes +AP_GENPLIST= yes +AP_INC+= ${LOCALBASE}/include/libxml2 +AP_LIB+= ${LOCALBASE}/lib -lxml2 +SRC_FILE= mod_xmlns.c -NO_STAGE= yes pre-extract: - @${MKDIR} ${WRKDIR} + @${MKDIR} ${WRKSRC} do-extract: - @${CP} ${DISTDIR}/xmlns.h ${DISTDIR}/mod_xmlns.c ${WRKDIR} - -do-build: - @(cd ${WRKDIR} && ${APXS} -c -I ${XML2_INC} -L ${XML2_LIB} -lxml2 mod_xmlns.c) - -do-install: - @(cd ${WRKDIR} && ${APXS} -A -i mod_xmlns.la) + @${CP} ${DISTDIR}/xmlns.h ${DISTDIR}/mod_xmlns.c ${WRKSRC} .include From owner-svn-ports-head@FreeBSD.ORG Sun Dec 15 16:54:03 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 5B43D849; Sun, 15 Dec 2013 16:54:03 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 47B43112F; Sun, 15 Dec 2013 16:54:03 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBFGs3fu094823; Sun, 15 Dec 2013 16:54:03 GMT (envelope-from wg@svn.freebsd.org) Received: (from wg@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBFGs391094822; Sun, 15 Dec 2013 16:54:03 GMT (envelope-from wg@svn.freebsd.org) Message-Id: <201312151654.rBFGs391094822@svn.freebsd.org> From: William Grzybowski Date: Sun, 15 Dec 2013 16:54:03 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r336556 - head/devel/py-lxml X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 15 Dec 2013 16:54:03 -0000 Author: wg Date: Sun Dec 15 16:54:02 2013 New Revision: 336556 URL: http://svnweb.freebsd.org/changeset/ports/336556 Log: devel/py-lxml: switch from easy_install and stagify Modified: head/devel/py-lxml/Makefile Modified: head/devel/py-lxml/Makefile ============================================================================== --- head/devel/py-lxml/Makefile Sun Dec 15 16:45:38 2013 (r336555) +++ head/devel/py-lxml/Makefile Sun Dec 15 16:54:02 2013 (r336556) @@ -16,10 +16,8 @@ LIB_DEPENDS= libxml2.so:${PORTSDIR}/text libxslt.so:${PORTSDIR}/textproc/libxslt USE_PYTHON= yes -USE_PYDISTUTILS=easy_install +USE_PYDISTUTILS=yes PYDISTUTILS_AUTOPLIST= yes -PYEASYINSTALL_ARCHDEP= yes -NO_STAGE= yes DOCSDIR= ${PREFIX}/share/doc/py-${PORTNAME} DOCS_FILES= CHANGES.txt CREDITS.txt TODO.txt README.rst From owner-svn-ports-head@FreeBSD.ORG Sun Dec 15 16:58:20 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id B1739977; Sun, 15 Dec 2013 16:58:20 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 9D5FD114A; Sun, 15 Dec 2013 16:58:20 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBFGwKB5095351; Sun, 15 Dec 2013 16:58:20 GMT (envelope-from wg@svn.freebsd.org) Received: (from wg@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBFGwKoW095350; Sun, 15 Dec 2013 16:58:20 GMT (envelope-from wg@svn.freebsd.org) Message-Id: <201312151658.rBFGwKoW095350@svn.freebsd.org> From: William Grzybowski Date: Sun, 15 Dec 2013 16:58:20 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r336557 - head/math/petsc X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 15 Dec 2013 16:58:20 -0000 Author: wg Date: Sun Dec 15 16:58:20 2013 New Revision: 336557 URL: http://svnweb.freebsd.org/changeset/ports/336557 Log: math/petsc: depends explicitly on "python" Reported by: exp-run (PR 184591) Approved by: portmgr (blanket) Modified: head/math/petsc/Makefile Modified: head/math/petsc/Makefile ============================================================================== --- head/math/petsc/Makefile Sun Dec 15 16:54:02 2013 (r336556) +++ head/math/petsc/Makefile Sun Dec 15 16:58:20 2013 (r336557) @@ -11,7 +11,9 @@ MASTER_SITES= ftp://ftp.mcs.anl.gov/pub/ MAINTAINER= bf@FreeBSD.org COMMENT= Portable, Extensible Toolkit for Scientific computation -RUN_DEPENDS= ksh:${PORTSDIR}/shells/pdksh \ +BUILD_DEPENDS= python:${PORTSDIR}/lang/python +RUN_DEPENDS= python:${PORTSDIR}/lang/python \ + ksh:${PORTSDIR}/shells/pdksh \ qsub:${PORTSDIR}/sysutils/torque HAS_CONFIGURE= yes From owner-svn-ports-head@FreeBSD.ORG Sun Dec 15 17:05:57 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 24A70C1C; Sun, 15 Dec 2013 17:05:57 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 0531A11BB; Sun, 15 Dec 2013 17:05:57 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBFH5ugU099022; Sun, 15 Dec 2013 17:05:56 GMT (envelope-from nemysis@svn.freebsd.org) Received: (from nemysis@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBFH5uam099018; Sun, 15 Dec 2013 17:05:56 GMT (envelope-from nemysis@svn.freebsd.org) Message-Id: <201312151705.rBFH5uam099018@svn.freebsd.org> From: Rusmir Dusko Date: Sun, 15 Dec 2013 17:05:56 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r336558 - in head/textproc: . loook X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 15 Dec 2013 17:05:57 -0000 Author: nemysis Date: Sun Dec 15 17:05:55 2013 New Revision: 336558 URL: http://svnweb.freebsd.org/changeset/ports/336558 Log: Loook is a simple Python tool that searches for text strings in LibreOffice and OpenOffice.org files. AND, OR and phrase searches are supported. It doesn't create an index, but searching should be fast enough unless you have really many files. WWW: http://www.danielnaber.de/loook/ PR: ports/171734 Submitted by: nemysis (self) Approved by: wg (mentor) Added: head/textproc/loook/ head/textproc/loook/Makefile (contents, props changed) head/textproc/loook/distinfo (contents, props changed) head/textproc/loook/pkg-descr (contents, props changed) Modified: head/textproc/Makefile Modified: head/textproc/Makefile ============================================================================== --- head/textproc/Makefile Sun Dec 15 16:58:20 2013 (r336557) +++ head/textproc/Makefile Sun Dec 15 17:05:55 2013 (r336558) @@ -404,6 +404,7 @@ SUBDIR += linux-f10-scim-libs SUBDIR += linuxdoc SUBDIR += localize + SUBDIR += loook SUBDIR += lt-aspell SUBDIR += lt-hyphen SUBDIR += lttoolbox Added: head/textproc/loook/Makefile ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/textproc/loook/Makefile Sun Dec 15 17:05:55 2013 (r336558) @@ -0,0 +1,36 @@ +# Created by: Rusmir Dusko +# $FreeBSD$ + +PORTNAME= loook +PORTVERSION= 0.6.5 +CATEGORIES= textproc +MASTER_SITES= http://www.danielnaber.de/loook/ +DISTNAME= ${PORTNAME} +DIST_SUBDIR= python + +MAINTAINER= nemysis@FreeBSD.org +COMMENT= Simple Python tool that search in LibreOffice/OpenOffice files + +LICENSE= GPLv2 + +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}tkinter>=0:${PORTSDIR}/x11-toolkits/py-tkinter \ + ${PYTHON_PKGNAMEPREFIX}iniparse>=0:${PORTSDIR}/devel/py-iniparse + +WRKSRC= ${WRKDIR} + +USE_ZIP= yes +USE_PYTHON= 2.7 +NO_BUILD= yes + +PLIST_FILES= bin/${PORTNAME} + +post-patch: + @${REINPLACE_CMD} -e 's|/usr/bin/python|${PYTHON_CMD}|' \ + ${WRKSRC}/${PORTNAME}.py + @(cd ${WRKSRC} ; ${RM} *.py.bak) + +do-install: + ${INSTALL_SCRIPT} ${WRKSRC}/${PORTNAME}.py \ + ${STAGEDIR}${PREFIX}/bin/${PORTNAME} + +.include Added: head/textproc/loook/distinfo ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/textproc/loook/distinfo Sun Dec 15 17:05:55 2013 (r336558) @@ -0,0 +1,2 @@ +SHA256 (python/loook.zip) = 65cb98991b9e6322af60a7ef1b47c429ad12ec50774375e46a5c733995eccfd4 +SIZE (python/loook.zip) = 11860 Added: head/textproc/loook/pkg-descr ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/textproc/loook/pkg-descr Sun Dec 15 17:05:55 2013 (r336558) @@ -0,0 +1,7 @@ +Loook is a simple Python tool that searches for text strings in +LibreOffice and OpenOffice.org files. + +AND, OR and phrase searches are supported. It doesn't create an index, +but searching should be fast enough unless you have really many files. + +WWW: http://www.danielnaber.de/loook/ From owner-svn-ports-head@FreeBSD.ORG Sun Dec 15 17:17:09 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id C94E2DF9; Sun, 15 Dec 2013 17:17:09 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id B58221240; Sun, 15 Dec 2013 17:17:09 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBFHH9Ys003139; Sun, 15 Dec 2013 17:17:09 GMT (envelope-from wg@svn.freebsd.org) Received: (from wg@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBFHH9A2003138; Sun, 15 Dec 2013 17:17:09 GMT (envelope-from wg@svn.freebsd.org) Message-Id: <201312151717.rBFHH9A2003138@svn.freebsd.org> From: William Grzybowski Date: Sun, 15 Dec 2013 17:17:09 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r336559 - head/math/biggles X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 15 Dec 2013 17:17:09 -0000 Author: wg Date: Sun Dec 15 17:17:09 2013 New Revision: 336559 URL: http://svnweb.freebsd.org/changeset/ports/336559 Log: math/biggles: fix python usage Reported by: exp-run (PR 184591) Approved by: portmgr (blanket) Modified: head/math/biggles/Makefile Modified: head/math/biggles/Makefile ============================================================================== --- head/math/biggles/Makefile Sun Dec 15 17:05:55 2013 (r336558) +++ head/math/biggles/Makefile Sun Dec 15 17:17:09 2013 (r336559) @@ -17,11 +17,12 @@ BUILD_DEPENDS= ${PYNUMPY} LIB_DEPENDS= libplot.so:${PORTSDIR}/graphics/plotutils USES= gmake -USE_PYTHON= yes +USE_PYTHON= 2 MAKE_ARGS= CC="${CC}" \ CFLAGS="${CFLAGS} -fPIC" \ LIBPLOT_CPPFLAGS="-I${LOCALBASE}/include" \ - LIBPLOT_LDFLAGS="-L${LOCALBASE}/lib -lplot" + LIBPLOT_LDFLAGS="-L${LOCALBASE}/lib -lplot" \ + PYTHON="${PYTHON_CMD}" NO_STAGE= yes post-patch: From owner-svn-ports-head@FreeBSD.ORG Sun Dec 15 17:21:06 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id BC7A9F10; Sun, 15 Dec 2013 17:21:06 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id A929112A1; Sun, 15 Dec 2013 17:21:06 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBFHL6Ob005973; Sun, 15 Dec 2013 17:21:06 GMT (envelope-from wg@svn.freebsd.org) Received: (from wg@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBFHL6s4005972; Sun, 15 Dec 2013 17:21:06 GMT (envelope-from wg@svn.freebsd.org) Message-Id: <201312151721.rBFHL6s4005972@svn.freebsd.org> From: William Grzybowski Date: Sun, 15 Dec 2013 17:21:06 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r336560 - head/lang/tinypy X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 15 Dec 2013 17:21:06 -0000 Author: wg Date: Sun Dec 15 17:21:06 2013 New Revision: 336560 URL: http://svnweb.freebsd.org/changeset/ports/336560 Log: lang/tinypy: fix usage of python and examples Reported by: exp-run (PR 184591) Approved by: portmgr (blanket) Modified: head/lang/tinypy/Makefile Modified: head/lang/tinypy/Makefile ============================================================================== --- head/lang/tinypy/Makefile Sun Dec 15 17:17:09 2013 (r336559) +++ head/lang/tinypy/Makefile Sun Dec 15 17:21:06 2013 (r336560) @@ -16,7 +16,6 @@ PYDISTUTILS_BUILD_TARGET= linux PYDISTUTILS_NOEGGINFO= yes PLIST_FILES= bin/tinypy -PORTEXAMPLES= * OPTIONS_DEFINE= PYGAME PYGAME_DESC= PyGame support (requires SDL) @@ -27,12 +26,14 @@ NO_STAGE= yes .if ${PORT_OPTIONS:MPYGAME} PYDISTUTILS_BUILD_TARGET+= pygame USE_SDL= sdl +PORTEXAMPLES= * .endif .include post-patch: @${REINPLACE_CMD} -e 's|-O.||; s|gcc $$WFLAGS|${CC} ${CFLAGS} -std=c89 -Wall|' \ + -e 's|python |${PYTHON_CMD} |g' \ ${WRKSRC}/setup.py do-configure: From owner-svn-ports-head@FreeBSD.ORG Sun Dec 15 17:41:40 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id BE51A29F; Sun, 15 Dec 2013 17:41:40 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 9EF4F13A2; Sun, 15 Dec 2013 17:41:40 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBFHfexC013003; Sun, 15 Dec 2013 17:41:40 GMT (envelope-from rene@svn.freebsd.org) Received: (from rene@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBFHfd2J012998; Sun, 15 Dec 2013 17:41:39 GMT (envelope-from rene@svn.freebsd.org) Message-Id: <201312151741.rBFHfd2J012998@svn.freebsd.org> From: Rene Ladan Date: Sun, 15 Dec 2013 17:41:39 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r336561 - in head: comms/dcf77pi lang/bf2c misc/biosfont-demos sysutils/biosfont www/chromium X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 15 Dec 2013 17:41:40 -0000 Author: rene Date: Sun Dec 15 17:41:39 2013 New Revision: 336561 URL: http://svnweb.freebsd.org/changeset/ports/336561 Log: Specify which BSD licence applies. Submitted by: make check-sanity Modified: head/comms/dcf77pi/Makefile head/lang/bf2c/Makefile head/misc/biosfont-demos/Makefile head/sysutils/biosfont/Makefile head/www/chromium/Makefile Modified: head/comms/dcf77pi/Makefile ============================================================================== --- head/comms/dcf77pi/Makefile Sun Dec 15 17:21:06 2013 (r336560) +++ head/comms/dcf77pi/Makefile Sun Dec 15 17:41:39 2013 (r336561) @@ -8,7 +8,7 @@ CATEGORIES= comms MAINTAINER= rene@FreeBSD.org COMMENT= DCF77 receiver/logger/analyzer for the Raspberry Pi -LICENSE= BSD +LICENSE= BSD2CLAUSE USE_GITHUB= yes GH_ACCOUNT= rene0 Modified: head/lang/bf2c/Makefile ============================================================================== --- head/lang/bf2c/Makefile Sun Dec 15 17:21:06 2013 (r336560) +++ head/lang/bf2c/Makefile Sun Dec 15 17:41:39 2013 (r336561) @@ -8,7 +8,7 @@ CATEGORIES= lang MAINTAINER= rene@FreeBSD.org COMMENT= Optimizing BrainF*ck to C compiler -LICENSE= BSD +LICENSE= BSD2CLAUSE USE_GITHUB= yes GH_ACCOUNT= rene0 Modified: head/misc/biosfont-demos/Makefile ============================================================================== --- head/misc/biosfont-demos/Makefile Sun Dec 15 17:21:06 2013 (r336560) +++ head/misc/biosfont-demos/Makefile Sun Dec 15 17:41:39 2013 (r336561) @@ -10,7 +10,7 @@ MASTER_SITES= ftp://rene-ladan.nl/pub/di MAINTAINER= rene@FreeBSD.org COMMENT= Demos for the biosfont kernel module -LICENSE= BSD +LICENSE= BSD2CLAUSE BUILD_DEPENDS= ${LOCALBASE}/include/biosfont.h:${PORTSDIR}/sysutils/biosfont RUN_DEPENDS= /boot/modules/biosfont.ko:${PORTSDIR}/sysutils/biosfont Modified: head/sysutils/biosfont/Makefile ============================================================================== --- head/sysutils/biosfont/Makefile Sun Dec 15 17:21:06 2013 (r336560) +++ head/sysutils/biosfont/Makefile Sun Dec 15 17:41:39 2013 (r336561) @@ -9,9 +9,9 @@ MASTER_SITES= ftp://rene-ladan.nl/pub/di MAINTAINER= rene@FreeBSD.org COMMENT= Kernel module to retrieve bitmap fonts from BIOS memory -LICENSE= BSD +LICENSE= BSD2CLAUSE -# only platforms guraranteed to be ok, feedback/patches are welcome +# only platforms guaranteed to be ok, feedback/patches are welcome ONLY_FOR_ARCHS= i386 amd64 USES= uidfix kmod Modified: head/www/chromium/Makefile ============================================================================== --- head/www/chromium/Makefile Sun Dec 15 17:21:06 2013 (r336560) +++ head/www/chromium/Makefile Sun Dec 15 17:41:39 2013 (r336561) @@ -16,7 +16,7 @@ DISTFILES= ${DISTNAME}${EXTRACT_SUFX}:br MAINTAINER= chromium@FreeBSD.org COMMENT= Mostly BSD-licensed web browser based on WebKit and Gtk+ -LICENSE= BSD LGPL21 MPL +LICENSE= BSD3CLAUSE LGPL21 MPL LICENSE_COMB= multi WRKSRC= ${WRKDIR}/${PORTNAME}-${DISTVERSION} From owner-svn-ports-head@FreeBSD.ORG Sun Dec 15 17:47:29 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 4E92047D; Sun, 15 Dec 2013 17:47:29 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 3AC9C13D8; Sun, 15 Dec 2013 17:47:29 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBFHlTF0013728; Sun, 15 Dec 2013 17:47:29 GMT (envelope-from ohauer@svn.freebsd.org) Received: (from ohauer@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBFHlTxQ013727; Sun, 15 Dec 2013 17:47:29 GMT (envelope-from ohauer@svn.freebsd.org) Message-Id: <201312151747.rBFHlTxQ013727@svn.freebsd.org> From: Olli Hauer Date: Sun, 15 Dec 2013 17:47:29 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r336562 - head/www/spreadlogd X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 15 Dec 2013 17:47:29 -0000 Author: ohauer Date: Sun Dec 15 17:47:28 2013 New Revision: 336562 URL: http://svnweb.freebsd.org/changeset/ports/336562 Log: - add stage support - add License Modified: head/www/spreadlogd/Makefile Modified: head/www/spreadlogd/Makefile ============================================================================== --- head/www/spreadlogd/Makefile Sun Dec 15 17:41:39 2013 (r336561) +++ head/www/spreadlogd/Makefile Sun Dec 15 17:47:28 2013 (r336562) @@ -9,7 +9,9 @@ MASTER_SITES= http://www.lethargy.org/mo MAINTAINER= apache@FreeBSD.org COMMENT= The backend of mod_log_spread -LIB_DEPENDS= spread.1:${PORTSDIR}/net/spread +LICENSE= ART10 + +LIB_DEPENDS= libspread.so:${PORTSDIR}/net/spread MAKEFILE= makefile @@ -17,22 +19,15 @@ USE_RC_SUBR= spreadlogd PLIST_FILES= sbin/spreadlogd etc/spreadlogd.conf.sample -.if !defined(NOPORTDOCS) -PORTDOCS= README Artistic.txt -.endif +PORTDOCS= README -NO_STAGE= yes post-patch: @${REINPLACE_CMD} -e 's|/etc|${PREFIX}/etc|' ${WRKSRC}/spreadlogd.c do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/spreadlogd ${PREFIX}/sbin - ${INSTALL} ${WRKSRC}/spreadlogd.conf ${PREFIX}/etc/spreadlogd.conf.sample -.if !defined(NOPORTDOCS) - ${MKDIR} ${DOCSDIR} -.for f in ${PORTDOCS} - ${INSTALL_DATA} ${WRKSRC}/${f} ${DOCSDIR} -.endfor -.endif + ${INSTALL_PROGRAM} ${WRKSRC}/spreadlogd ${STAGEDIR}${PREFIX}/sbin + ${INSTALL} ${WRKSRC}/spreadlogd.conf ${STAGEDIR}${PREFIX}/etc/spreadlogd.conf.sample + @${MKDIR} ${STAGEDIR}${DOCSDIR} + ${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR} .include From owner-svn-ports-head@FreeBSD.ORG Sun Dec 15 17:49:27 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 018865AE; Sun, 15 Dec 2013 17:49:27 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id E258A141E; Sun, 15 Dec 2013 17:49:26 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBFHnQi4013979; Sun, 15 Dec 2013 17:49:26 GMT (envelope-from alexey@svn.freebsd.org) Received: (from alexey@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBFHnQRt013978; Sun, 15 Dec 2013 17:49:26 GMT (envelope-from alexey@svn.freebsd.org) Message-Id: <201312151749.rBFHnQRt013978@svn.freebsd.org> From: Alexey Degtyarev Date: Sun, 15 Dec 2013 17:49:26 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r336563 - head/devel/p5-Devel-Leak-Cb X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 15 Dec 2013 17:49:27 -0000 Author: alexey Date: Sun Dec 15 17:49:26 2013 New Revision: 336563 URL: http://svnweb.freebsd.org/changeset/ports/336563 Log: Fix plist. PR: ports/184745 Submitted by: Anes Mukhametov (maintainer) Approved by: wg (mentor) Modified: head/devel/p5-Devel-Leak-Cb/pkg-plist (contents, props changed) Modified: head/devel/p5-Devel-Leak-Cb/pkg-plist ============================================================================== --- head/devel/p5-Devel-Leak-Cb/pkg-plist Sun Dec 15 17:47:28 2013 (r336562) +++ head/devel/p5-Devel-Leak-Cb/pkg-plist Sun Dec 15 17:49:26 2013 (r336563) @@ -4,6 +4,5 @@ @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Devel/Leak/Cb @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Devel/Leak @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Devel -@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Devel @dirrmtry %%SITE_PERL%%/Devel/Leak @dirrmtry %%SITE_PERL%%/Devel From owner-svn-ports-head@FreeBSD.ORG Sun Dec 15 18:35:12 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id EF840865; Sun, 15 Dec 2013 18:35:12 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id C1FD21777; Sun, 15 Dec 2013 18:35:12 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBFIZCcF031919; Sun, 15 Dec 2013 18:35:12 GMT (envelope-from rakuco@svn.freebsd.org) Received: (from rakuco@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBFIZC3v031915; Sun, 15 Dec 2013 18:35:12 GMT (envelope-from rakuco@svn.freebsd.org) Message-Id: <201312151835.rBFIZC3v031915@svn.freebsd.org> From: Raphael Kubo da Costa Date: Sun, 15 Dec 2013 18:35:12 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r336564 - head/textproc/raptor2 X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 15 Dec 2013 18:35:13 -0000 Author: rakuco Date: Sun Dec 15 18:35:11 2013 New Revision: 336564 URL: http://svnweb.freebsd.org/changeset/ports/336564 Log: - Update to 2.0.12. - Set LICENSE. - Adapt to the new LIB_DEPENDS format. Modified: head/textproc/raptor2/Makefile head/textproc/raptor2/distinfo head/textproc/raptor2/pkg-plist Modified: head/textproc/raptor2/Makefile ============================================================================== --- head/textproc/raptor2/Makefile Sun Dec 15 17:49:26 2013 (r336563) +++ head/textproc/raptor2/Makefile Sun Dec 15 18:35:11 2013 (r336564) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= raptor2 -PORTVERSION= 2.0.11 +PORTVERSION= 2.0.12 CATEGORIES= textproc MASTER_SITES= http://download.librdf.org/source/ \ SF/librdf/${PORTNAME}/${PORTVERSION} @@ -10,9 +10,14 @@ MASTER_SITES= http://download.librdf.org MAINTAINER= kde@FreeBSD.org COMMENT= RDF Parser Toolkit for Redland -LIB_DEPENDS= curl:${PORTSDIR}/ftp/curl \ - icuuc:${PORTSDIR}/devel/icu \ - yajl:${PORTSDIR}/devel/yajl +# Even though GPLv3 is not explicitly mentioned in the port's LICENSE.html, one +# of its licenses is "GPLv2 or newer", which includes GPLv3. +LICENSE= AL2 GPLv2 GPLv3 LGPL21 +LICENSE_COMB= dual + +LIB_DEPENDS= libcurl.so:${PORTSDIR}/ftp/curl \ + libicuuc.so:${PORTSDIR}/devel/icu \ + libyajl.so:${PORTSDIR}/devel/yajl CONFLICTS= raptor-1.4.1[0-9]* raptor-1.4.21 Modified: head/textproc/raptor2/distinfo ============================================================================== --- head/textproc/raptor2/distinfo Sun Dec 15 17:49:26 2013 (r336563) +++ head/textproc/raptor2/distinfo Sun Dec 15 18:35:11 2013 (r336564) @@ -1,2 +1,2 @@ -SHA256 (raptor2-2.0.11.tar.gz) = ae033e10f8a87afda4e18ff47ddbbd201b288c38b6bd43932f987131b42371fc -SIZE (raptor2-2.0.11.tar.gz) = 1849212 +SHA256 (raptor2-2.0.12.tar.gz) = b1955565f47e33f8872aa3d5d8e5f246c6c572e84ebeb4910966166e6d508498 +SIZE (raptor2-2.0.12.tar.gz) = 1859726 Modified: head/textproc/raptor2/pkg-plist ============================================================================== --- head/textproc/raptor2/pkg-plist Sun Dec 15 17:49:26 2013 (r336563) +++ head/textproc/raptor2/pkg-plist Sun Dec 15 18:35:11 2013 (r336564) @@ -30,7 +30,8 @@ share/gtk-doc/html/raptor2/raptor-format share/gtk-doc/html/raptor2/raptor-parsers.html share/gtk-doc/html/raptor2/raptor-serializers.html share/gtk-doc/html/raptor2/raptor2-changes-1-4-21-to-2-0-0.html -share/gtk-doc/html/raptor2/raptor2-changes-2-0-10-to-2-0-10.html +share/gtk-doc/html/raptor2/raptor2-changes-2-0-10-to-2-0-11.html +share/gtk-doc/html/raptor2/raptor2-changes-2-0-11-to-2-0-12.html share/gtk-doc/html/raptor2/raptor2-changes-2-0-3-to-2-0-4.html share/gtk-doc/html/raptor2/raptor2-changes-2-0-4-to-2-0-5.html share/gtk-doc/html/raptor2/raptor2-changes-2-0-5-to-2-0-6.html From owner-svn-ports-head@FreeBSD.ORG Sun Dec 15 18:47:23 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 8B1E5B47; Sun, 15 Dec 2013 18:47:23 +0000 (UTC) Received: from mail-oa0-x22d.google.com (mail-oa0-x22d.google.com [IPv6:2607:f8b0:4003:c02::22d]) (using TLSv1 with cipher ECDHE-RSA-RC4-SHA (128/128 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 2C96E1857; Sun, 15 Dec 2013 18:47:23 +0000 (UTC) Received: by mail-oa0-f45.google.com with SMTP id o6so4112244oag.32 for ; Sun, 15 Dec 2013 10:47:22 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:sender:in-reply-to:references:date:message-id:subject :from:to:cc:content-type; bh=9Si0jArYQImyjEr/iHuN6c9hhBuvy3dXc8eZO+xhg8o=; b=ki1uuvYv4Oxz0bymyjmwlPcPylPeaF/7xM/dYc+Acq1vrfyIKBuy4QufHzz/gTRIXv tiEN+tmNal3/48+n/iUSl/C9sAXcBezslz8Q0N97/Wd64Dte6GpVmmmlOYJv6IXVdpaz 1RQrrMNuSkRQKRqoqh9EOzV+DptccUtTnC7T2KRrAI3Ms1mIQjWl8hSkjEeGD3RoXVSm QJGnzMBMR4NlndvakfkiU56MBr1RTnSAbtU1NYXCe8mUfzalDGS+wM0MYLNots6KBDns fS2oHr01Dm9I4etdfQ7hXGzBMDGJKE870VqH7Jil+PTe4GF6H4QQlv3Ro790JG2zXUET zhLg== MIME-Version: 1.0 X-Received: by 10.60.115.164 with SMTP id jp4mr8955071oeb.19.1387133242472; Sun, 15 Dec 2013 10:47:22 -0800 (PST) Sender: andrej.zverev@gmail.com Received: by 10.182.230.131 with HTTP; Sun, 15 Dec 2013 10:47:22 -0800 (PST) In-Reply-To: <201312151749.rBFHnQRt013978@svn.freebsd.org> References: <201312151749.rBFHnQRt013978@svn.freebsd.org> Date: Sun, 15 Dec 2013 22:47:22 +0400 X-Google-Sender-Auth: u5dlAlfyfpY5vOu_Y5b5smdyY8s Message-ID: Subject: Re: svn commit: r336563 - head/devel/p5-Devel-Leak-Cb From: Andrej Zverev To: Alexey Degtyarev Content-Type: text/plain; charset=ISO-8859-1 Cc: "svn-ports-head@freebsd.org" , "svn-ports-all@freebsd.org" , "ports-committers@freebsd.org" X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 15 Dec 2013 18:47:23 -0000 best question for trolling ever :-) why you did not bumped the PORTREVISION? On Sun, Dec 15, 2013 at 9:49 PM, Alexey Degtyarev wrote: > Author: alexey > Date: Sun Dec 15 17:49:26 2013 > New Revision: 336563 > URL: http://svnweb.freebsd.org/changeset/ports/336563 > > Log: > Fix plist. > > PR: ports/184745 > Submitted by: Anes Mukhametov (maintainer) > Approved by: wg (mentor) > > Modified: > head/devel/p5-Devel-Leak-Cb/pkg-plist (contents, props changed) > > Modified: head/devel/p5-Devel-Leak-Cb/pkg-plist > ============================================================================== > --- head/devel/p5-Devel-Leak-Cb/pkg-plist Sun Dec 15 17:47:28 2013 (r336562) > +++ head/devel/p5-Devel-Leak-Cb/pkg-plist Sun Dec 15 17:49:26 2013 (r336563) > @@ -4,6 +4,5 @@ > @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Devel/Leak/Cb > @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Devel/Leak > @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Devel > -@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Devel > @dirrmtry %%SITE_PERL%%/Devel/Leak > @dirrmtry %%SITE_PERL%%/Devel From owner-svn-ports-head@FreeBSD.ORG Sun Dec 15 18:49:16 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id AD47EC50; Sun, 15 Dec 2013 18:49:16 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 99B6B187A; Sun, 15 Dec 2013 18:49:16 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBFInGRp035889; Sun, 15 Dec 2013 18:49:16 GMT (envelope-from crees@svn.freebsd.org) Received: (from crees@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBFInGZ5035887; Sun, 15 Dec 2013 18:49:16 GMT (envelope-from crees@svn.freebsd.org) Message-Id: <201312151849.rBFInGZ5035887@svn.freebsd.org> From: Chris Rees Date: Sun, 15 Dec 2013 18:49:16 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r336565 - in head/audio/musicpd: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 15 Dec 2013 18:49:16 -0000 Author: crees Date: Sun Dec 15 18:49:15 2013 New Revision: 336565 URL: http://svnweb.freebsd.org/changeset/ports/336565 Log: Fix WMA playback. 0.18 update will come soon, but it's proving nontrivial due to a substantial rewrite in c++! PR: ports/184768 Submitted by: Thomas Zander Added: head/audio/musicpd/files/patch-src-decoder-ffmpeg_decoder_plugin-c (contents, props changed) Modified: head/audio/musicpd/Makefile Modified: head/audio/musicpd/Makefile ============================================================================== --- head/audio/musicpd/Makefile Sun Dec 15 18:35:11 2013 (r336564) +++ head/audio/musicpd/Makefile Sun Dec 15 18:49:15 2013 (r336565) @@ -2,7 +2,7 @@ PORTNAME= musicpd PORTVERSION= 0.17.3 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= audio ipv6 MASTER_SITES= SF/${PORTNAME}/mpd/${PORTVERSION} DISTNAME= mpd-${PORTVERSION} Added: head/audio/musicpd/files/patch-src-decoder-ffmpeg_decoder_plugin-c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/audio/musicpd/files/patch-src-decoder-ffmpeg_decoder_plugin-c Sun Dec 15 18:49:15 2013 (r336565) @@ -0,0 +1,15 @@ +--- src/decoder/ffmpeg_decoder_plugin.c.orig 2013-01-07 01:39:40.000000000 +0100 ++++ src/decoder/ffmpeg_decoder_plugin.c 2013-12-14 21:22:19.284609914 +0100 +@@ -395,6 +395,11 @@ + #endif + return SAMPLE_FORMAT_S32; + ++#if LIBAVUTIL_VERSION_INT >= AV_VERSION_INT(51,17,0) ++ case AV_SAMPLE_FMT_FLTP: ++ return SAMPLE_FORMAT_FLOAT; ++#endif ++ + default: + break; + } + From owner-svn-ports-head@FreeBSD.ORG Sun Dec 15 18:50:54 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 421D7EDE; Sun, 15 Dec 2013 18:50:54 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 2DE0E18D3; Sun, 15 Dec 2013 18:50:54 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBFIosUA038628; Sun, 15 Dec 2013 18:50:54 GMT (envelope-from thierry@svn.freebsd.org) Received: (from thierry@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBFIoq2q038615; Sun, 15 Dec 2013 18:50:52 GMT (envelope-from thierry@svn.freebsd.org) Message-Id: <201312151850.rBFIoq2q038615@svn.freebsd.org> From: Thierry Thomas Date: Sun, 15 Dec 2013 18:50:52 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r336566 - in head/multimedia: mencoder mplayer mplayer/files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 15 Dec 2013 18:50:54 -0000 Author: thierry Date: Sun Dec 15 18:50:51 2013 New Revision: 336566 URL: http://svnweb.freebsd.org/changeset/ports/336566 Log: - Update to 1.1.20131109 - Stagify Note: options have been modified, please review your config! PR: ports/184407 Submitted by: Thomas Zander (maintainer) Added: head/multimedia/mplayer/Makefile.optvars (contents, props changed) head/multimedia/mplayer/files/patch-libavutil-x86-asm.h (contents, props changed) Deleted: head/multimedia/mplayer/files/patch-libavcodec-x86-ac3dsp_init.c head/multimedia/mplayer/files/patch-libmpdemux-demux_gif.c head/multimedia/mplayer/files/patch-libmpdemux-demux_rtp.cpp Modified: head/multimedia/mencoder/Makefile head/multimedia/mencoder/distinfo head/multimedia/mencoder/pkg-plist (contents, props changed) head/multimedia/mplayer/Makefile head/multimedia/mplayer/Makefile.options head/multimedia/mplayer/Makefile.shared head/multimedia/mplayer/distinfo head/multimedia/mplayer/files/patch-configure head/multimedia/mplayer/files/patch-stream-tvi_bsdbt848.c (contents, props changed) head/multimedia/mplayer/pkg-plist (contents, props changed) Modified: head/multimedia/mencoder/Makefile ============================================================================== --- head/multimedia/mencoder/Makefile Sun Dec 15 18:49:15 2013 (r336565) +++ head/multimedia/mencoder/Makefile Sun Dec 15 18:50:51 2013 (r336566) @@ -3,31 +3,29 @@ PORTNAME= mencoder PORTVERSION= ${MPLAYER_PORT_VERSION} -PORTREVISION= 1 +PORTREVISION= 0 COMMENT= Convenient video file and movie encoder -NO_STAGE= yes .include "${.CURDIR}/../mplayer/Makefile.shared" -OPTIONS_DEFINE= AMR_NB AMR_WB BLURAY CDIO CDPARANOIA DEBUG DIRAC \ - DV FAAC FONTCONFIG FRIBIDI GIF GSM IPV6 JACK LADSPA \ - LIBMNG LIVEMEDIA LZO MAD NAS OCFLAGS OPENAL OPENJPEG \ - OTCHAIN PULSEAUDIO REAL RTCPU RTMP SCHROEDINGER SMB \ - THEORA TWOLAME V4L VPX WIN32 X264 XVID +OPTIONS_DEFINE= AMR_NB AMR_WB BLURAY CDIO CDPARANOIA DEBUG DIRAC \ + DV FAAC FONTCONFIG FRIBIDI GIF GSM IPV6 JACK \ + LADSPA LIBMNG LZO MAD NAS OCFLAGS OPENAL OPENJPEG \ + OPUS OTCHAIN PULSEAUDIO REAL RTCPU RTMP SCHROEDINGER \ + SMB THEORA TWOLAME V4L VPX WIN32 X264 XVID OPTIONS_DEFAULT=GIF IPV6 OCFLAGS RTCPU WIN32 X264 XVID BLURAY_DESC?= BluRay support LZO_DESC?= Enable external liblzo library OCFLAGS_DESC?= Use optimized compiler flags +OPUS_DESC?= Opus decoding with libopus OTCHAIN_DESC?= Use gcc 4.6+ toolchain on legacy systems REAL_DESC?= Enable realplayer plugin RTCPU_DESC?= Use runtime CPU detection WIN32_DESC?= Install win32 binary codecs -MAN1= mencoder.1 - RESTRICTED= Port has restricted dependencies PATCHDIR= ${.CURDIR}/../mplayer/files @@ -43,9 +41,16 @@ TOOLFILES= aconvert.sh binary_codecs.sh subedit.pl subsearch.sh vobshift.py \ w32codec_dl.pl wma2ogg.pl -.include +USES+= shebangfix +SHEBANG_FILES= TOOLS/calcbpp.pl TOOLS/checktree.sh TOOLS/countquant.pl \ + TOOLS/divx2svcd.sh TOOLS/dvd2divxscript.pl TOOLS/mencvcd.sh \ + TOOLS/mphelp_check.py TOOLS/plotpsnr.pl TOOLS/psnr-video.sh \ + TOOLS/qepdvcd.sh TOOLS/subedit.pl TOOLS/w32codec_dl.pl \ + TOOLS/wma2ogg.pl -LIB_DEPENDS+= mp3lame:${PORTSDIR}/audio/lame +.include "${.CURDIR}/../mplayer/Makefile.optvars" +.include +.include CONFIGURE_ARGS+= --disable-mplayer \ --disable-libdca \ @@ -65,46 +70,12 @@ CONFIGURE_ARGS+= --disable-mplayer \ --disable-enca \ --disable-musepack +LIB_DEPENDS+= libmp3lame.so:${PORTSDIR}/audio/lame + ALL_TARGET= mencoder .include "${.CURDIR}/../mplayer/Makefile.options" -.if ${PORT_OPTIONS:MFONTCONFIG} -LIB_DEPENDS+= fontconfig:${PORTSDIR}/x11-fonts/fontconfig -.else -CONFIGURE_ARGS+= --disable-fontconfig -.endif - -.if ${PORT_OPTIONS:MTWOLAME} -LIB_DEPENDS+= twolame:${PORTSDIR}/audio/twolame -.else -CONFIGURE_ARGS+= --disable-twolame -.endif - -.if ${PORT_OPTIONS:MFAAC} -LIB_DEPENDS+= faac:${PORTSDIR}/audio/faac -.else -CONFIGURE_ARGS+= --disable-faac -.endif - -.if ${PORT_OPTIONS:MX264} -LIB_DEPENDS+= x264:${PORTSDIR}/multimedia/x264 -.else -CONFIGURE_ARGS+= --disable-x264 -.endif - -.if ${PORT_OPTIONS:MXVID} -LIB_DEPENDS+= xvidcore:${PORTSDIR}/multimedia/xvid -.else -CONFIGURE_ARGS+= --disable-xvid -.endif - -.if ${PORT_OPTIONS:MDIRAC} -LIB_DEPENDS+= dirac_encoder:${PORTSDIR}/multimedia/dirac -.else -CONFIGURE_ARGS+= --disable-libdirac-lavc -.endif - pre-everything:: @${ECHO_MSG} "N - O - T - E" @${ECHO_MSG} "" @@ -141,20 +112,16 @@ post-patch: s|/dev/\\:(cdrom[[:alnum:]]*[[:>:]])|${DEFAULT_CDROM_DEVICE:S/dev\//dev\/\\\:/}|g' do-install: - @${INSTALL_PROGRAM} ${WRKSRC}/mencoder ${PREFIX}/bin + @${INSTALL_PROGRAM} ${WRKSRC}/mencoder ${STAGEDIR}${PREFIX}/bin post-install: - @${INSTALL_MAN} ${WRKSRC}/DOCS/man/en/mplayer.1 ${MAN1PREFIX}/man/man1/mencoder.1 - @${MKDIR} ${DATADIR} - @${CHMOD} 755 ${DATADIR} - @${MKDIR} ${DATADIR}/tools - @${CHMOD} 755 ${DATADIR}/tools + @${INSTALL_MAN} ${WRKSRC}/DOCS/man/en/mplayer.1 ${STAGEDIR}${MAN1PREFIX}/man/man1/mencoder.1 + @${MKDIR} ${STAGEDIR}${DATADIR} + @${CHMOD} 755 ${STAGEDIR}${DATADIR} + @${MKDIR} ${STAGEDIR}${DATADIR}/tools + @${CHMOD} 755 ${STAGEDIR}${DATADIR}/tools .for tool in ${TOOLFILES} - @${INSTALL_SCRIPT} ${WRKSRC}/TOOLS/${tool} ${DATADIR}/tools + @${INSTALL_SCRIPT} ${WRKSRC}/TOOLS/${tool} ${STAGEDIR}${DATADIR}/tools .endfor -.if ${ARCH} == "ia64" || ${ARCH} == "sparc64" -BROKEN= Does not detect CPU correctly on ia64 or sparc64 -.endif - .include Modified: head/multimedia/mencoder/distinfo ============================================================================== --- head/multimedia/mencoder/distinfo Sun Dec 15 18:49:15 2013 (r336565) +++ head/multimedia/mencoder/distinfo Sun Dec 15 18:50:51 2013 (r336566) @@ -1,2 +1,2 @@ -SHA256 (mplayer-1.1.20130308.tar.xz) = 920bd69143d5b867fd0041a99b6302a39ed48ecc1673fe3a051b3abccff17258 -SIZE (mplayer-1.1.20130308.tar.xz) = 10326840 +SHA256 (mplayer-1.1.20131109.tar.xz) = 5647919b61f01396af20273419d5fc74f8b3523177c40e7d1ca063ad45eb13eb +SIZE (mplayer-1.1.20131109.tar.xz) = 10738036 Modified: head/multimedia/mencoder/pkg-plist ============================================================================== --- head/multimedia/mencoder/pkg-plist Sun Dec 15 18:49:15 2013 (r336565) +++ head/multimedia/mencoder/pkg-plist Sun Dec 15 18:50:51 2013 (r336566) @@ -1,4 +1,5 @@ bin/mencoder +man/man1/mencoder.1.gz %%DATADIR%%/tools/aconvert.sh %%DATADIR%%/tools/binary_codecs.sh %%DATADIR%%/tools/calcbpp.pl Modified: head/multimedia/mplayer/Makefile ============================================================================== --- head/multimedia/mplayer/Makefile Sun Dec 15 18:49:15 2013 (r336565) +++ head/multimedia/mplayer/Makefile Sun Dec 15 18:50:51 2013 (r336566) @@ -3,17 +3,16 @@ PORTNAME= mplayer PORTVERSION= ${MPLAYER_PORT_VERSION} -PORTREVISION= 1 +PORTREVISION= 0 COMMENT= High performance media player supporting many formats -NO_STAGE= yes .include "${.CURDIR}/Makefile.shared" OPTIONS_DEFINE= AALIB AMR_NB AMR_WB BLURAY CACA DEBUG DV \ ENCA ESOUND FRIBIDI GIF GSM GUI IPV6 JACK \ - JOYSTICK LADSPA LIBMNG LIRC LIVEMEDIA LZO MAD \ - NAS OCFLAGS OPENAL OPENGL OPENJPEG OTCHAIN \ + LADSPA LIBMNG LIRC LZO NAS OCFLAGS \ + OPENAL OPENGL OPENJPEG OPUS OTCHAIN \ PULSEAUDIO REAL RTC RTCPU RTMP SCHROEDINGER SDL \ SKINS SMB SVGALIB V4L VDPAU WIN32 \ X11 X11DGA X11VM XINERAMA XVIDEO XVMC @@ -26,9 +25,9 @@ OPTIONS_DEFAULT=GUI IPV6 OCFLAGS OPENGL BLURAY_DESC?= BluRay support ENCA_DESC?= Charset conversion via enca -JOYSTICK_DESC?= Joystick support LZO_DESC?= External liblzo support OCFLAGS_DESC?= Use optimized compiler flags +OPUS_DESC?= Opus decoding with libopus OTCHAIN_DESC?= Use gcc 4.6+ toolchain on legacy systems REAL_DESC?= Enable realplayer plugin RTC_DESC?= Add support for kernel real time clock @@ -38,24 +37,20 @@ WIN32_DESC?= Install win32 binary codecs X11DGA_DESC?= X11 DGA video driver support X11VM_DESC?= X11 VidMode support -MAN1= mplayer.1 -MANCOMPRESSED= no +#MANCOMPRESSED= no SUB_FILES= pkg-message CONFFILES= example.conf input.conf menu.conf dvb-menu.conf -USES= pkgconfig +USES+= pkgconfig +.include "${.CURDIR}/Makefile.optvars" +.include .include -.if ${ARCH} == "sparc64" -BROKEN= Does not compile on sparc64 -.endif - CONFIGURE_ARGS+= --disable-arts \ --disable-directfb \ --disable-faac \ - --disable-faad \ --disable-libdca \ --disable-toolame \ --disable-twolame \ @@ -67,15 +62,9 @@ CONFIGURE_ARGS+= --disable-arts \ --disable-musepack \ --disable-theora -# Fix a problem with unknown assembly opcodes in embedded ffmpeg -.if ${ARCH} == "ppc" -CONFIGURE_ARGS+= --disable-asm -.endif - .include "${.CURDIR}/Makefile.options" .if ${PORT_OPTIONS:MGUI} && ${PORT_OPTIONS:MX11} -MLINKS+= mplayer.1 gmplayer.1 PLIST_SUB+= GMPLAYER="" DESKTOP_ENTRIES= "MPlayer" "High performance media player" "mplayer" "gmplayer" "" false .if ${PORT_OPTIONS:MSKINS} @@ -94,7 +83,7 @@ PLIST_SUB+= GMPLAYER="@comment " .endif #GUI && X11 .if ${PORT_OPTIONS:MX11} -USE_XORG= x11 +USE_XORG= x11 xscrnsaver .if ${PORT_OPTIONS:MXVIDEO} USE_XORG+= xv .else @@ -130,75 +119,6 @@ CONFIGURE_ARGS+=--disable-x11 \ --disable-fontconfig .endif -.if ${PORT_OPTIONS:MVDPAU} -LIB_DEPENDS+= vdpau:${PORTSDIR}/multimedia/libvdpau -.else -CONFIGURE_ARGS+= --disable-vdpau -.endif - -.if ${PORT_OPTIONS:MRTC} -BUILD_DEPENDS+= ${LOCALBASE}/modules/rtc.ko:${PORTSDIR}/emulators/rtc -RUN_DEPENDS+= ${LOCALBASE}/modules/rtc.ko:${PORTSDIR}/emulators/rtc -CONFIGURE_ARGS+= --enable-rtc -.else -CONFIGURE_ARGS+= --disable-rtc -.endif - -.if ${PORT_OPTIONS:MCACA} -LIB_DEPENDS+= caca:${PORTSDIR}/graphics/libcaca -.else -CONFIGURE_ARGS+= --disable-caca -.endif - -.if ${PORT_OPTIONS:MLIRC} -LIB_DEPENDS+= lirc_client:${PORTSDIR}/comms/lirc -.else -CONFIGURE_ARGS+= --disable-lirc -.endif - -.if ${PORT_OPTIONS:MSDL} -USE_SDL= sdl -.else -CONFIGURE_ARGS+= --disable-sdl -.endif - -.if ${PORT_OPTIONS:MSVGALIB} -LIB_DEPENDS+= vga:${PORTSDIR}/graphics/svgalib -.else -CONFIGURE_ARGS+= --disable-svga -.endif - -.if ${PORT_OPTIONS:MAALIB} || ${PORT_OPTIONS:MSDL} -LIB_DEPENDS+= aa:${PORTSDIR}/graphics/aalib -.else -CONFIGURE_ARGS+= --disable-aa -.endif - -.if ${PORT_OPTIONS:MESOUND} -USE_GNOME+= esound -.else -CONFIGURE_ARGS+= --disable-esd -.endif - -.if defined(WITH_KERN_HZ) -DEFAULT_KERN_HZ=${WITH_KERN_HZ} -.else -DEFAULT_KERN_HZ=1024 -.endif - -.if ${PORT_OPTIONS:MJOYSTICK} -BUILD_DEPENDS+= ${LOCALBASE}/include/linux/joystick.h:${PORTSDIR}/devel/linux-js -CONFIGURE_ARGS+=--enable-joystick -.else -CONFIGURE_ARGS+=--disable-joystick -.endif - -.if ${PORT_OPTIONS:MENCA} -LIB_DEPENDS+= enca:${PORTSDIR}/converters/enca -.else -CONFIGURE_ARGS+= --disable-enca -.endif - pre-everything:: @${ECHO_MSG} "N - O - T - E" @${ECHO_MSG} "" @@ -248,16 +168,17 @@ post-patch: .endif post-install: - @${MKDIR} ${DATADIR} - @${CHMOD} 755 ${DATADIR} - @${MKDIR} ${DATADIR}/examples/etc - @${CHMOD} 755 ${DATADIR}/examples/etc + @${MKDIR} ${STAGEDIR}${DATADIR} + @${CHMOD} 755 ${STAGEDIR}${DATADIR} + @${MKDIR} ${STAGEDIR}${DATADIR}/examples/etc + @${CHMOD} 755 ${STAGEDIR}${DATADIR}/examples/etc .for conf in ${CONFFILES} - ${INSTALL_DATA} ${WRKSRC}/etc/${conf} ${DATADIR}/examples/etc + ${INSTALL_DATA} ${WRKSRC}/etc/${conf} ${STAGEDIR}${DATADIR}/examples/etc .endfor .if ${PORT_OPTIONS:MGUI} && ${PORT_OPTIONS:MX11} - @${LN} -sf ${PREFIX}/bin/mplayer ${PREFIX}/bin/gmplayer - ${CP} -f ${WRKSRC}/etc/mplayer256x256.png ${LOCALBASE}/share/pixmaps/mplayer.png + @${LN} -sf ${PREFIX}/bin/mplayer ${STAGEDIR}${PREFIX}/bin/gmplayer + @(cd ${STAGEDIR}${MAN1PREFIX}/man/man1 && ${LN} -sf mplayer.1.gz gmplayer.1.gz) + ${CP} -f ${WRKSRC}/etc/mplayer256x256.png ${STAGEDIR}${LOCALBASE}/share/pixmaps/mplayer.png .endif @${CAT} ${PKGMESSAGE} Modified: head/multimedia/mplayer/Makefile.options ============================================================================== --- head/multimedia/mplayer/Makefile.options Sun Dec 15 18:49:15 2013 (r336565) +++ head/multimedia/mplayer/Makefile.options Sun Dec 15 18:50:51 2013 (r336566) @@ -1,5 +1,6 @@ -# Contains the options and dependencies that are shared -# among mplayer and mencoder +# Contains non-trivial handling of option variables +# and build environment. Must be included after +# bsd.port.pre.mk # # Some of the knobs are not tunable by the OPTIONS framework. These are # explained here in detail. @@ -27,62 +28,39 @@ # Enables language support bg, cz, de, dk, en, es, fr, gr, hu, it, ko, nl, no, pl, pt_BR, ro, ru, sk, tr, uk, zh # -.if ${OSVERSION} < 802502 -EXTRA_PATCHES+= ${FILESDIR}/extra-patch-base_system_log2f -.endif +# Non-OPTIONS knob handling +# ========================= .if defined(WITH_LANG) CONFIGURE_ARGS+=--language=${WITH_LANG} .endif -#On i386, gcc runs out of general purpose registers when -#trying to compile a debug version with the default flags. -.if ${PORT_OPTIONS:MDEBUG} -.if ${ARCH} == "i386" -DEBUG_FLAGS= -g -O -fomit-frame-pointer -.endif -.else -.if ${PORT_OPTIONS:MOCFLAGS} -CFLAGS+= -O3 -fomit-frame-pointer -ffast-math +.if defined(WITH_DVD_DEVICE) +DEFAULT_DVD_DEVICE=${WITH_DVD_DEVICE} .else -CFLAGS+= -O -fomit-frame-pointer -.endif #OCFLAGS -.endif #DEBUG - -#Supported architectures for clang -.if ${ARCH} == "amd64" || ${ARCH} == "i386" -MPLAYER_CLANG_SUPPORTED_ARCH= yes +DEFAULT_DVD_DEVICE=/dev/cd0 .endif -.if ${PORT_OPTIONS:MRTCPU} -CONFIGURE_ARGS+=--enable-runtime-cpudetection +.if defined(WITH_CDROM_DEVICE) +DEFAULT_CDROM_DEVICE=${WITH_CDROM_DEVICE} +.else +DEFAULT_CDROM_DEVICE=/dev/cd0 .endif -.if ${OSVERSION} >= 900033 \ - && exists(/usr/bin/clang) \ - && defined(MPLAYER_CLANG_SUPPORTED_ARCH) -WITH_BASE_CLANG=yes +.if defined(WITH_KERN_HZ) +DEFAULT_KERN_HZ=${WITH_KERN_HZ} +.else +DEFAULT_KERN_HZ=1024 .endif -.if defined(WITH_BASE_CLANG) -CC= clang -CXX= clang++ -CPP= clang-cpp -EXTRA_PATCHES+= ${FILESDIR}/extra-patch-clang-version -.else -.if ${PORT_OPTIONS:MOTCHAIN} -USE_GCC?= yes -BUILD_DEPENDS+= ${LOCALBASE}/bin/as:${PORTSDIR}/devel/binutils + +# Non-simplified OPTIONS handling +# =============================== + +.if ${PORT_OPTIONS:MESOUND} +USE_GNOME+= esound .else -CONFIGURE_ARGS+=--disable-ssse3 --disable-sse4 --disable-sse42 \ - --disable-avx --disable-fast-cmov -EXTRA_PATCHES+= ${FILESDIR}/extra-patch-base_system_gcc -.if ${ARCH} == "amd64" -BUILD_DEPENDS+= ${LOCALBASE}/bin/as:${PORTSDIR}/devel/binutils -CONFIGURE_ENV+= COMPILER_PATH=${LOCALBASE}/bin -MAKE_ENV+= COMPILER_PATH=${LOCALBASE}/bin -.endif -.endif +CONFIGURE_ARGS+= --disable-esd .endif .if ${PORT_OPTIONS:MIPV6} @@ -91,141 +69,108 @@ CATEGORIES+= ipv6 CONFIGURE_ARGS+= --disable-inet6 .endif -.if ${PORT_OPTIONS:MGIF} -LIB_DEPENDS+= gif:${PORTSDIR}/graphics/giflib +.if ${PORT_OPTIONS:MOPENAL} +USE_OPENAL= soft .else -CONFIGURE_ARGS+= --disable-gif +CONFIGURE_ARGS+= --disable-openal .endif -.if ${PORT_OPTIONS:MOPENJPEG} -LIB_DEPENDS+= openjpeg:${PORTSDIR}/graphics/openjpeg +.if ${PORT_OPTIONS:MRTMP} +LIB_DEPENDS+= librtmp.so:${PORTSDIR}/multimedia/librtmp +CONFIGURE_ARGS+= --enable-librtmp +EXTRA_LIBS+= -lrtmp .else -CONFIGURE_ARGS+= --disable-libopenjpeg +CONFIGURE_ARGS+= --disable-librtmp .endif -.if ${PORT_OPTIONS:MMAD} -LIB_DEPENDS+= mad:${PORTSDIR}/audio/libmad +.if ${PORT_OPTIONS:MSDL} +USE_SDL= sdl +LIB_DEPENDS+= libaa.so:${PORTSDIR}/graphics/aalib .else -CONFIGURE_ARGS+= --disable-mad +CONFIGURE_ARGS+= --disable-sdl .endif -.if ${PORT_OPTIONS:MDV} -LIB_DEPENDS+= dv:${PORTSDIR}/multimedia/libdv +.if ${PORT_OPTIONS:MV4L} +BUILD_DEPENDS+= ${LOCALBASE}/include/linux/videodev2.h:${PORTSDIR}/multimedia/v4l_compat +LIB_DEPENDS+= libv4l2.so:${PORTSDIR}/multimedia/libv4l +CONFIGURE_ARGS+= --enable-tv-v4l1 \ + --enable-tv-v4l2 +EXTRA_LIBS+= -lv4l1 -lv4l2 .else -CONFIGURE_ARGS+= --disable-libdv +CONFIGURE_ARGS+= --disable-tv-v4l1 \ + --disable-tv-v4l2 .endif -.if ${PORT_OPTIONS:MTHEORA} -LIB_DEPENDS+= theora:${PORTSDIR}/multimedia/libtheora -.else -CONFIGURE_ARGS+= --disable-theora -.endif -.if ${PORT_OPTIONS:MVPX} -LIB_DEPENDS+= vpx:${PORTSDIR}/multimedia/libvpx -.else -CONFIGURE_ARGS+= --disable-libvpx-lavc -.endif +# Build system handling (including OPTIONS) +# ========================================= -.if ${PORT_OPTIONS:MSCHROEDINGER} -LIB_DEPENDS+= schroedinger-1.0.11:${PORTSDIR}/multimedia/schroedinger -.else -CONFIGURE_ARGS+= --disable-libschroedinger-lavc +.if ${OSVERSION} < 802502 +EXTRA_PATCHES+= ${FILESDIR}/extra-patch-base_system_log2f .endif -.if ${PORT_OPTIONS:MLIVEMEDIA} -CONFIGURE_ARGS+= --enable-live -LIB_DEPENDS+= libliveMedia.so:${PORTSDIR}/net/liveMedia -CFLAGS+= -I${LOCALBASE}/include/liveMedia \ - -I${LOCALBASE}/include/UsageEnvironment \ - -I${LOCALBASE}/include/groupsock \ - -I${LOCALBASE}/include/BasicUsageEnvironment -LDFLAGS+= -L${LOCALBASE}/lib \ - -lliveMedia \ - -lUsageEnvironment \ - -lBasicUsageEnvironment \ - -lgroupsock \ - -lstdc++ -.else -CONFIGURE_ARGS+= --disable-live +#On i386, gcc runs out of general purpose registers when +#trying to compile a debug version with the default flags. +.if ${PORT_OPTIONS:MDEBUG} +.if ${ARCH} == "i386" +DEBUG_FLAGS= -g -O -fomit-frame-pointer .endif - -.if ${PORT_OPTIONS:MJACK} -LIB_DEPENDS+= jack:${PORTSDIR}/audio/jack .else -CONFIGURE_ARGS+= --disable-jack -.endif - -.if ${PORT_OPTIONS:MNAS} -LIB_DEPENDS+= audio:${PORTSDIR}/audio/nas +.if ${PORT_OPTIONS:MOCFLAGS} +CFLAGS+= -O3 -fomit-frame-pointer -ffast-math .else -CONFIGURE_ARGS+= --disable-nas -.endif +CFLAGS+= -O -fomit-frame-pointer +.endif #OCFLAGS +.endif #DEBUG -.if ${PORT_OPTIONS:MOPENAL} -USE_OPENAL= soft -.else -CONFIGURE_ARGS+= --disable-openal +# Supported architectures for clang +.if ${ARCH} == "amd64" || ${ARCH} == "i386" +MPLAYER_CLANG_SUPPORTED_ARCH= yes .endif -.if ${PORT_OPTIONS:MPULSEAUDIO} -LIB_DEPENDS+= pulse:${PORTSDIR}/audio/pulseaudio -.else -CONFIGURE_ARGS+= --disable-pulse +# Unsupported architectures for inline assembly +.if ${ARCH} == "ppc" +CONFIGURE_ARGS+= --disable-asm .endif -.if ${PORT_OPTIONS:MBLURAY} -LIB_DEPENDS+= bluray:${PORTSDIR}/multimedia/libbluray -.else -CONFIGURE_ARGS+= --disable-bluray +# Unsupported architectures +.if ${ARCH} == "sparc64" +BROKEN= Does not compile on sparc64 .endif - -.if ${PORT_OPTIONS:MSMB} -LIB_DEPENDS+= smbclient:${PORTSDIR}/net/samba-libsmbclient -.else -CONFIGURE_ARGS+= --disable-smb +.if ${ARCH} == "ia64" +BROKEN= Does not detect CPU correctly on ia64 .endif -.if ${PORT_OPTIONS:MFRIBIDI} -LIB_DEPENDS+= fribidi:${PORTSDIR}/converters/fribidi -.else -CONFIGURE_ARGS+= --disable-fribidi -.endif -.if ${PORT_OPTIONS:MCDPARANOIA} -LIB_DEPENDS+= cdda_paranoia:${PORTSDIR}/audio/cdparanoia -.else -CONFIGURE_ARGS+= --disable-cdparanoia +.if ${PORT_OPTIONS:MRTCPU} +CONFIGURE_ARGS+=--enable-runtime-cpudetection .endif -.if ${PORT_OPTIONS:MCDIO} -LIB_DEPENDS+= cdio:${PORTSDIR}/sysutils/libcdio -.else -CONFIGURE_ARGS+= --disable-libcdio +.if ${OSVERSION} >= 900033 \ + && exists(/usr/bin/clang) \ + && defined(MPLAYER_CLANG_SUPPORTED_ARCH) +WITH_BASE_CLANG=yes .endif -.if ${PORT_OPTIONS:MLADSPA} -RUN_DEPENDS+= ${LOCALBASE}/lib/ladspa/amp.so:${PORTSDIR}/audio/ladspa +.if defined(WITH_BASE_CLANG) +CC= clang +CXX= clang++ +CPP= clang-cpp +EXTRA_PATCHES+= ${FILESDIR}/extra-patch-clang-version .else -CONFIGURE_ARGS+= --disable-ladspa -.endif - -.if ${PORT_OPTIONS:MLZO} -LIB_DEPENDS+= lzo2:${PORTSDIR}/archivers/lzo2 +.if ${PORT_OPTIONS:MOTCHAIN} +USE_GCC?= yes +BUILD_DEPENDS+= ${LOCALBASE}/bin/as:${PORTSDIR}/devel/binutils .else -CONFIGURE_ARGS+= --disable-liblzo +CONFIGURE_ARGS+=--disable-ssse3 --disable-sse4 --disable-sse42 \ + --disable-avx --disable-fast-cmov +EXTRA_PATCHES+= ${FILESDIR}/extra-patch-base_system_gcc +.if ${ARCH} == "amd64" +BUILD_DEPENDS+= ${LOCALBASE}/bin/as:${PORTSDIR}/devel/binutils +CONFIGURE_ENV+= COMPILER_PATH=${LOCALBASE}/bin +MAKE_ENV+= COMPILER_PATH=${LOCALBASE}/bin .endif - -.if defined(WITH_DVD_DEVICE) -DEFAULT_DVD_DEVICE=${WITH_DVD_DEVICE} -.else -DEFAULT_DVD_DEVICE=/dev/cd0 .endif - -.if defined(WITH_CDROM_DEVICE) -DEFAULT_CDROM_DEVICE=${WITH_CDROM_DEVICE} -.else -DEFAULT_CDROM_DEVICE=/dev/cd0 .endif .if ${ARCH} == "i386" || ${ARCH} == "amd64" @@ -240,57 +185,7 @@ CONFIGURE_ARGS+= --disable-win32dll \ .endif .endif # ARCH == i386/amd64 -.if ${PORT_OPTIONS:MREAL} -RUN_DEPENDS+= realplay:${PORTSDIR}/multimedia/linux-realplayer -BUILD_DEPENDS+= realplay:${PORTSDIR}/multimedia/linux-realplayer -.else -CONFIGURE_ARGS+= --disable-real -.endif - -.if ${PORT_OPTIONS:MAMR_NB} || ${PORT_OPTIONS:MAMR_WB} -LIB_DEPENDS+= opencore-amrnb:${PORTSDIR}/audio/opencore-amr -.endif - -.if !${PORT_OPTIONS:MAMR_NB} -CONFIGURE_ARGS+= --disable-libopencore_amrnb -.endif - -.if !${PORT_OPTIONS:MAMR_WB} -CONFIGURE_ARGS+= --disable-libopencore_amrwb -.endif - -.if ${PORT_OPTIONS:MGSM} -LIB_DEPENDS+= gsm:${PORTSDIR}/audio/gsm -.else -CONFIGURE_ARGS+= --disable-libgsm -.endif - -.if ${PORT_OPTIONS:MV4L} -BUILD_DEPENDS+= ${LOCALBASE}/include/linux/videodev2.h:${PORTSDIR}/multimedia/v4l_compat -LIB_DEPENDS+= v4l2.0:${PORTSDIR}/multimedia/libv4l -CONFIGURE_ARGS+= --enable-tv-v4l1 \ - --enable-tv-v4l2 -EXTRA_LIBS+= -lv4l1 -lv4l2 -.else -CONFIGURE_ARGS+= --disable-tv-v4l1 \ - --disable-tv-v4l2 -.endif - -.if ${PORT_OPTIONS:MRTMP} -LIB_DEPENDS+= rtmp:${PORTSDIR}/multimedia/rtmpdump -CONFIGURE_ARGS+= --enable-librtmp -EXTRA_LIBS+= -lrtmp -.else -CONFIGURE_ARGS+= --disable-librtmp -.endif - -.if ${PORT_OPTIONS:MLIBMNG} -LIB_DEPENDS+= mng:${PORTSDIR}/graphics/libmng -.else -CONFIGURE_ARGS+= --disable-mng -.endif .if defined(EXTRA_LIBS) CONFIGURE_ARGS+= --extra-libs="${EXTRA_LIBS}" .endif - Added: head/multimedia/mplayer/Makefile.optvars ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/multimedia/mplayer/Makefile.optvars Sun Dec 15 18:50:51 2013 (r336566) @@ -0,0 +1,110 @@ +# Contains simple option variables that are used +# before including bsd.port.options.mk +# in Makefiles + +AALIB_LIB_DEPENDS= libaa.so:${PORTSDIR}/graphics/aalib +AALIB_CONFIGURE_OFF= --disable-aa + +AMR_NB_LIB_DEPENDS= libopencore-amrnb.so:${PORTSDIR}/audio/opencore-amr +AMR_NB_CONFIGURE_OFF= --disable-libopencore_amrnb + +AMR_WB_LIB_DEPENDS= libopencore-amrwb.so:${PORTSDIR}/audio/opencore-amr +AMR_WB_CONFIGURE_OFF= --disable-libopencore_amrwb + +BLURAY_LIB_DEPENDS= libbluray.so:${PORTSDIR}/multimedia/libbluray +BLURAY_CONFIGURE_OFF= --disable-bluray + +CACA_LIB_DEPENDS= libcaca.so:${PORTSDIR}/graphics/libcaca +CACA_CONFIGURE_OFF= --disable-caca + +CDIO_LIB_DEPENDS= libcdio.so:${PORTSDIR}/sysutils/libcdio +CDIO_CONFIGURE_OFF= --disable-libcdio + +CDPARANOIA_LIB_DEPENDS= libcdda_paranoia.so:${PORTSDIR}/audio/cdparanoia +CDPARANOIA_CONFIGURE_OFF= --disable-cdparanoia + +DIRAC_LIB_DEPENDS= libdirac_encoder.so:${PORTSDIR}/multimedia/dirac +DIRAC_CONFIGURE_OFF= --disable-libdirac-lavc + +DV_LIB_DEPENDS= dv.so:${PORTSDIR}/multimedia/libdv +DV_CONFIGURE_OFF= --disable-libdv + +ENCA_LIB_DEPENDS= libenca.so:${PORTSDIR}/converters/enca +ENCA_CONFIGURE_OFF= --disable-enca + +FAAC_LIB_DEPENDS= libfaac.so:${PORTSDIR}/audio/faac +FAAC_CONFIGURE_OFF= --disable-faac + +FONTCONFIG_LIB_DEPENDS= libfontconfig.so:${PORTSDIR}/x11-fonts/fontconfig +FONTCONFIG_CONFIGURE_OFF= --disable-fontconfig + +FRIBIDI_LIB_DEPENDS= libfribidi.so:${PORTSDIR}/converters/fribidi +FRIBIDI_CONFIGURE_OFF= --disable-fribidi + +GIF_LIB_DEPENDS= libgif.so:${PORTSDIR}/graphics/giflib +GIF_CONFIGURE_OFF= --disable-gif + +GSM_LIB_DEPENDS= libgsm.so:${PORTSDIR}/audio/gsm +GSM_CONFIGURE_OFF= --disable-libgsm + +JACK_LIB_DEPENDS= libjack.so:${PORTSDIR}/audio/jack +JACK_CONFIGURE_OFF= --disable-jack + +LADSPA_RUN_DEPENDS= ${LOCALBASE}/lib/ladspa/amp.so:${PORTSDIR}/audio/ladspa +LADSPA_CONFIGURE_OFF= --disable-ladspa + +LIBMNG_LIB_DEPENDS= libmng.so:${PORTSDIR}/graphics/libmng +LIBMNG_CONFIGURE_OFF= --disable-mng + +LIRC_LIB_DEPENDS= liblirc_client.so:${PORTSDIR}/comms/lirc +LIRC_CONFIGURE_OFF= --disable-lirc + +LZO_LIB_DEPENDS= liblzo2.so:${PORTSDIR}/archivers/lzo2 +LZO_CONFIGURE_OFF= --disable-liblzo + +NAS_LIB_DEPENDS= libaudio.so:${PORTSDIR}/audio/nas +NAS_CONFIGURE_OFF= --disable-nas + +OPENJPEG_LIB_DEPENDS= libopenjpeg.so:${PORTSDIR}/graphics/openjpeg +OPENJPEG_CONFIGURE_OFF= --disable-libopenjpeg + +OPUS_LIB_DEPENDS= libopus.so:${PORTSDIR}/audio/opus +OPUS_CONFIGURE_OFF= --disable-libopus + +PULSEAUDIO_LIB_DEPENDS= libpulse.so:${PORTSDIR}/audio/pulseaudio +PULSEAUDIO_CONFIGURE_OFF= --disable-pulse + +REAL_RUN_DEPENDS= realplay:${PORTSDIR}/multimedia/linux-realplayer +REAL_BUILD_DEPENDS= realplay:${PORTSDIR}/multimedia/linux-realplayer +REAL_CONFIGURE_OFF= --disable-real + +RTC_BUILD_DEPENDS= ${LOCALBASE}/modules/rtc.ko:${PORTSDIR}/emulators/rtc +RTC_RUN_DEPENDS= ${LOCALBASE}/modules/rtc.ko:${PORTSDIR}/emulators/rtc +RTC_CONFIGURE_ENABLE= rtc + +SCHROEDINGER_LIB_DEPENDS= libschroedinger-1.0.so:${PORTSDIR}/multimedia/schroedinger +SCHROEDINGER_CONFIGURE_OFF= --disable-libschroedinger-lavc + +SMB_LIB_DEPENDS= libsmbclient.so:${PORTSDIR}/net/samba-libsmbclient +SMB_CONFIGURE_OFF= --disable-smb + +SVGALIB_LIB_DEPENDS= libvga.so:${PORTSDIR}/graphics/svgalib +SVGALIB_CONFIGURE_OFF= --disable-svga + +THEORA_LIB_DEPENDS= libtheora.so:${PORTSDIR}/multimedia/libtheora +THEORA_CONFIGURE_OFF= --disable-theora + +TWOLAME_LIB_DEPENDS= libtwolame.so:${PORTSDIR}/audio/twolame +TWOLAME_CONFIGURE_OFF= --disable-twolame + +VDPAU_LIB_DEPENDS= libvdpau.so:${PORTSDIR}/multimedia/libvdpau +VDPAU_CONFIGURE_OFF= --disable-vdpau + +VPX_LIB_DEPENDS= libvpx.so:${PORTSDIR}/multimedia/libvpx +VPX_CONFIGURE_OFF= --disable-libvpx-lavc + +X264_LIB_DEPENDS= libx264.so:${PORTSDIR}/multimedia/x264 +X264_CONFIGURE_OFF= --disable-x264 + +XVID_LIB_DEPENDS= libxvidcore.so:${PORTSDIR}/multimedia/xvid +XVID_CONFIGURE_OFF= --disable-xvid Modified: head/multimedia/mplayer/Makefile.shared ============================================================================== --- head/multimedia/mplayer/Makefile.shared Sun Dec 15 18:49:15 2013 (r336565) +++ head/multimedia/mplayer/Makefile.shared Sun Dec 15 18:50:51 2013 (r336566) @@ -4,7 +4,7 @@ # # $FreeBSD$ -MPLAYER_SNAPSHOT_DATE= 2013-03-08 +MPLAYER_SNAPSHOT_DATE= 2013-11-09 MPLAYER_PORT_VERSION= 1.1.r${MPLAYER_SNAPSHOT_DATE:S/-//g} CATEGORIES?= multimedia audio MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE} @@ -17,14 +17,13 @@ MAINTAINER?= thomas.e.zander@googlemail. LICENSE= GPLv2 -LIB_DEPENDS= png15:${PORTSDIR}/graphics/png \ - freetype:${PORTSDIR}/print/freetype2 +LIB_DEPENDS= libpng15.so:${PORTSDIR}/graphics/png \ + libfreetype.so:${PORTSDIR}/print/freetype2 BUILD_DEPENDS= ${LOCALBASE}/bin/yasm:${PORTSDIR}/devel/yasm -USES= iconv ncurses +USES= gmake iconv ncurses USE_XZ= yes -USE_GMAKE= yes GNU_CONFIGURE= yes CONFIGURE_ENV= PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \ PTHREAD_LIBS="${PTHREAD_LIBS}" \ @@ -34,16 +33,22 @@ CONFIGURE_ARGS= --cc="${CC}" \ --as="${AS}" \ --extra-cflags="-I${PREFIX}/include -I${LOCALBASE}/include" \ --extra-libs="-L${PREFIX}/lib" \ + --disable-alsa \ --disable-bitmap-font \ + --disable-crystalhd \ + --disable-faad \ --disable-liba52 \ - --disable-alsa \ --disable-libbs2b \ - --disable-mp3lib \ - --enable-ass-internal \ + --disable-libilbc \ + --disable-libnut \ --disable-libvorbis \ + --disable-live \ + --disable-joystick \ + --disable-mad \ + --disable-mp3lib \ + --disable-nemesi \ --disable-speex \ - --disable-libopus \ - --disable-libilbc + --enable-ass-internal WANT_GNOME= yes WANT_SDL= yes Modified: head/multimedia/mplayer/distinfo ============================================================================== --- head/multimedia/mplayer/distinfo Sun Dec 15 18:49:15 2013 (r336565) +++ head/multimedia/mplayer/distinfo Sun Dec 15 18:50:51 2013 (r336566) @@ -1,2 +1,2 @@ -SHA256 (mplayer-1.1.20130308.tar.xz) = 920bd69143d5b867fd0041a99b6302a39ed48ecc1673fe3a051b3abccff17258 -SIZE (mplayer-1.1.20130308.tar.xz) = 10326840 +SHA256 (mplayer-1.1.20131109.tar.xz) = 5647919b61f01396af20273419d5fc74f8b3523177c40e7d1ca063ad45eb13eb +SIZE (mplayer-1.1.20131109.tar.xz) = 10738036 Modified: head/multimedia/mplayer/files/patch-configure ============================================================================== --- head/multimedia/mplayer/files/patch-configure Sun Dec 15 18:49:15 2013 (r336565) +++ head/multimedia/mplayer/files/patch-configure Sun Dec 15 18:50:51 2013 (r336566) @@ -1,6 +1,6 @@ ---- configure.orig 2013-11-16 23:28:21.000000000 +0100 -+++ configure 2013-11-16 23:36:32.000000000 +0100 -@@ -668,7 +668,7 @@ +--- configure.orig 2013-11-08 17:59:55.000000000 +0100 ++++ configure 2013-11-09 14:34:53.996868923 +0100 +@@ -640,7 +640,7 @@ _iwmmxt=auto _mtrr=auto _altivec=auto @@ -9,7 +9,7 @@ _ranlib=ranlib _windres=windres _cc=cc -@@ -1534,7 +1534,6 @@ +@@ -1452,7 +1452,6 @@ *) echo "Unknown parameter: $ac_option" @@ -17,17 +17,8 @@ ;; esac -@@ -1592,7 +1591,7 @@ - esac - echores "$cc_version" - else -- for _cc in "$_cc" gcc cc ; do -+ for _cc in "$_cc" clang cc ; do - cc_name_tmp=$($_cc -v 2>&1 | tail -n 1 | cut -d ' ' -f 1) - if test "$cc_name_tmp" = "gcc"; then - cc_name=$cc_name_tmp -@@ -1669,7 +1668,7 @@ - case "$(uname -m 2>&1)" in +@@ -1689,7 +1688,7 @@ + case "$1" in x86_64|amd64|i[3-9]86*|i86pc|x86|x86pc|k5|k6|k6_2|k6_3|k6-2|k6-3|pentium*|athlon*|i586_i686|i586-i686) host_arch=i386 ;; ia64) host_arch=ia64 ;; - macppc|ppc*|Power*) host_arch=ppc ;; @@ -35,155 +26,7 @@ alpha) host_arch=alpha ;; sun4*|sparc*) host_arch=sparc ;; parisc*|hppa*|9000*) host_arch=hppa ;; -@@ -1709,6 +1708,7 @@ - fi - - extra_cflags="-I. -Iffmpeg $extra_cflags" -+extra_ldflags="$extra_ldflags -L$_prefix/lib" - _timer=timer-linux.c - _getch=getch2.c - -@@ -1945,7 +1945,7 @@ - if test "$_gcc3_ext" != ""; then - # If we had to disable SSE/SSE2 because the active kernel does not - # support this instruction set extension, we also have to tell -- # gcc3 to not generate SSE/SSE2 instructions for normal C code. -+ # clang to not generate SSE/SSE2 instructions for normal C code. - cflag_check $_march $_gcc3_ext && _march="$_march $_gcc3_ext" - fi - -@@ -1996,15 +1996,15 @@ - # AMD CPUs just from their signature. Instead, we check directly - # whether it supports SSE. - if test "$_sse" = yes; then -- # gcc treats athlon-xp, athlon-4 and athlon-mp similarly. -+ # clang treats athlon-xp, athlon-4 and athlon-mp similarly. - proc=athlon-xp - else -- # Again, gcc treats athlon and athlon-tbird similarly. -+ # Again, clang treats athlon and athlon-tbird similarly. - proc=athlon - fi - ;; - 15) iproc=686 -- # k8 CPU type only supported in gcc >= 3.4.0, but that will be -+ # k8 CPU type only supported in clang >= 3.4.0, but that will be - # caught and remedied in the optimization tests below. - proc=k8 - ;; -@@ -2090,11 +2090,11 @@ - fi # test "$_runtime_cpudetection" = no - - -- # check that gcc supports our CPU, if not, fall back to earlier ones -+ # check that clang supports our CPU, if not, fall back to earlier ones - # LGB: check -mcpu and -march swithing step by step with enabling - # to fall back till 386. - -- # gcc >= 3.4.0 doesn't support -mcpu, we have to use -mtune instead -+ # clang >= 3.4.0 doesn't support -mcpu, we have to use -mtune instead - - if [ "$cc_vendor" = "gnu" ] && ([ "$_cc_major" -gt 3 ] || ( [ "$_cc_major" = 3 ] && [ "$_cc_minor" -ge 4 ])) ; then - cpuopt=-mtune -@@ -2224,7 +2224,7 @@ - def_fast_64bit='#define HAVE_FAST_64BIT 1' - iproc='x86_64' - -- # gcc >= 3.4.0 doesn't support -mcpu, we have to use -mtune instead -+ # clang >= 3.4.0 doesn't support -mcpu, we have to use -mtune instead - if test "$cc_vendor" = "gnu" && test "$_cc_major" -gt 3 -o "$_cc_major" -eq 3 -a "$_cc_minor" -ge 4 ; then - cpuopt=-mtune - else -@@ -2280,7 +2280,7 @@ - if test "$proc" = "k8"; then - cflag_check -march=$proc $cpuopt=$proc || proc=athlon-xp - fi -- # This will fail if gcc version < 3.3, which is OK because earlier -+ # This will fail if clang version < 3.3, which is OK because earlier - # versions don't really support 64-bit on amd64. - # Is this a valid assumption? -Corey - if test "$proc" = "athlon-xp"; then -@@ -2400,7 +2400,7 @@ - fi - ;; - NetBSD) -- # only gcc 3.4 works reliably with AltiVec code under NetBSD -+ # only clang 3.4 works reliably with AltiVec code under NetBSD - case $cc_version in - 2*|3.0*|3.1*|3.2*|3.3*) - ;; *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** From owner-svn-ports-head@FreeBSD.ORG Sun Dec 15 19:12:28 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id E3E24955; Sun, 15 Dec 2013 19:12:27 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id CFB5D1A5B; Sun, 15 Dec 2013 19:12:27 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBFJCRE3046299; Sun, 15 Dec 2013 19:12:27 GMT (envelope-from rakuco@svn.freebsd.org) Received: (from rakuco@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBFJCRCs046295; Sun, 15 Dec 2013 19:12:27 GMT (envelope-from rakuco@svn.freebsd.org) Message-Id: <201312151912.rBFJCRCs046295@svn.freebsd.org> From: Raphael Kubo da Costa Date: Sun, 15 Dec 2013 19:12:27 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r336567 - head/textproc/rasqal X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 15 Dec 2013 19:12:28 -0000 Author: rakuco Date: Sun Dec 15 19:12:26 2013 New Revision: 336567 URL: http://svnweb.freebsd.org/changeset/ports/336567 Log: - Update to 0.9.31. - Support staging [1]. - Adapt to the new LIB_DEPENDS and options formats. - Set LICENSE. Submitted by: Schaich Alonso Modified: head/textproc/rasqal/Makefile head/textproc/rasqal/distinfo head/textproc/rasqal/pkg-plist Modified: head/textproc/rasqal/Makefile ============================================================================== --- head/textproc/rasqal/Makefile Sun Dec 15 18:50:51 2013 (r336566) +++ head/textproc/rasqal/Makefile Sun Dec 15 19:12:26 2013 (r336567) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= rasqal -PORTVERSION= 0.9.30 +PORTVERSION= 0.9.31 CATEGORIES= textproc MASTER_SITES= http://download.librdf.org/source/ \ SF/librdf/${PORTNAME}/${PORTVERSION} @@ -10,8 +10,13 @@ MASTER_SITES= http://download.librdf.org MAINTAINER= kde@FreeBSD.org COMMENT= High-level interface for RDF -LIB_DEPENDS= raptor2:${PORTSDIR}/textproc/raptor2 \ - pcre:${PORTSDIR}/devel/pcre +# Even though GPLv3 is not explicitly mentioned in the port's LICENSE.html, one +# of its licenses is "GPLv2 or newer", which includes GPLv3. +LICENSE= AL2 GPLv2 GPLv3 LGPL21 +LICENSE_COMB= dual + +LIB_DEPENDS= libraptor2.so:${PORTSDIR}/textproc/raptor2 \ + libpcre.so:${PORTSDIR}/devel/pcre USE_GNOME= lthack USE_OPENSSL= yes @@ -20,25 +25,20 @@ USES= gmake pathfix pkgconfig perl5 GNU_CONFIGURE= yes USE_LDCONFIG= yes -MAN1= rasqal-config.1 roqet.1 -MAN3= librasqal.3 - OPTIONS_RADIO= DEC OPTIONS_RADIO_DEC= GMP MPFR GMP_DESC= Use GMP library for decimals MPFR_DESC= Use MPFR library for decimals -NO_STAGE= yes +GMP_CONFIGURE_ON= --with-decimal=gmp --with-gmp=${LOCALBASE} +GMP_LIB_DEPENDS= libgmp.so:${PORTSDIR}/math/gmp +MPFR_CONFIGURE_ON= --with-decimal=mpfr --with-mpfr=${LOCALBASE} +MPFR_LIB_DEPENDS= libmpfr.so:${PORTSDIR}/math/mpfr + .include -.if ${PORT_OPTIONS:MMPFR} -CONFIGURE_ARGS+=--with-decimal=mpfr --with-mpfr=${LOCALBASE} -LIB_DEPENDS+= mpfr:${PORTSDIR}/math/mpfr -.elif ${PORT_OPTIONS:MGMP} -CONFIGURE_ARGS+=--with-decimal=gmp -LIB_DEPENDS+= gmp:${PORTSDIR}/math/gmp -.else +.if empty(PORT_OPTIONS:MMPFR) && empty(PORT_OPTIONS:MGMP) CONFIGURE_ARGS+=--with-decimal=none .endif Modified: head/textproc/rasqal/distinfo ============================================================================== --- head/textproc/rasqal/distinfo Sun Dec 15 18:50:51 2013 (r336566) +++ head/textproc/rasqal/distinfo Sun Dec 15 19:12:26 2013 (r336567) @@ -1,2 +1,2 @@ -SHA256 (rasqal-0.9.30.tar.gz) = abf0e93d80cc79bdf383fd3e904255bf98bc729356d6cf2f673bce74b08b1cfd -SIZE (rasqal-0.9.30.tar.gz) = 1469921 +SHA256 (rasqal-0.9.31.tar.gz) = 28d743c9f1b0e5b0486ae4a945fa1e021c8495707e7adbfa0e232244b28b7fee +SIZE (rasqal-0.9.31.tar.gz) = 1530461 Modified: head/textproc/rasqal/pkg-plist ============================================================================== --- head/textproc/rasqal/pkg-plist Sun Dec 15 18:50:51 2013 (r336566) +++ head/textproc/rasqal/pkg-plist Sun Dec 15 19:12:26 2013 (r336567) @@ -6,6 +6,9 @@ lib/librasqal.la lib/librasqal.so lib/librasqal.so.3 libdata/pkgconfig/rasqal.pc +man/man1/rasqal-config.1.gz +man/man1/roqet.1.gz +man/man3/librasqal.3.gz share/gtk-doc/html/rasqal/home.png share/gtk-doc/html/rasqal/index.html share/gtk-doc/html/rasqal/index.sgml @@ -19,6 +22,7 @@ share/gtk-doc/html/rasqal/rasqal-changes share/gtk-doc/html/rasqal/rasqal-changes-0-9-26-to-0-9-27.html share/gtk-doc/html/rasqal/rasqal-changes-0-9-28-to-0-9-29.html share/gtk-doc/html/rasqal/rasqal-changes-0-9-29-to-0-9-30.html +share/gtk-doc/html/rasqal/rasqal-changes-0-9-30-to-0-9-31.html share/gtk-doc/html/rasqal/rasqal-changes.html share/gtk-doc/html/rasqal/rasqal-section-data.html share/gtk-doc/html/rasqal/rasqal-section-expression.html @@ -44,7 +48,7 @@ share/gtk-doc/html/rasqal/reference-manu share/gtk-doc/html/rasqal/right.png share/gtk-doc/html/rasqal/style.css share/gtk-doc/html/rasqal/up.png -@exec mkdir -p %D/share/gtk-doc/html/rasqal @dirrm share/gtk-doc/html/rasqal +@dirrmtry share/gtk-doc/html @dirrmtry share/gtk-doc @dirrm include/rasqal From owner-svn-ports-head@FreeBSD.ORG Sun Dec 15 19:19:20 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 296F9BDD; Sun, 15 Dec 2013 19:19:20 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 095441A8A; Sun, 15 Dec 2013 19:19:20 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBFJJJS6047239; Sun, 15 Dec 2013 19:19:19 GMT (envelope-from dinoex@svn.freebsd.org) Received: (from dinoex@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBFJJJno047237; Sun, 15 Dec 2013 19:19:19 GMT (envelope-from dinoex@svn.freebsd.org) Message-Id: <201312151919.rBFJJJno047237@svn.freebsd.org> From: Dirk Meyer Date: Sun, 15 Dec 2013 19:19:19 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r336568 - head/graphics/gnash X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 15 Dec 2013 19:19:20 -0000 Author: dinoex Date: Sun Dec 15 19:19:19 2013 New Revision: 336568 URL: http://svnweb.freebsd.org/changeset/ports/336568 Log: - use STAGEDIR - use USE_WEBPLUGINS - use OPT_* flags - clean LIB_DEPENDS Modified: head/graphics/gnash/Makefile head/graphics/gnash/pkg-plist Modified: head/graphics/gnash/Makefile ============================================================================== --- head/graphics/gnash/Makefile Sun Dec 15 19:12:26 2013 (r336567) +++ head/graphics/gnash/Makefile Sun Dec 15 19:19:19 2013 (r336568) @@ -18,7 +18,6 @@ LIB_DEPENDS= libboost_thread.so:${PORTSD libnspr4.so:${PORTSDIR}/devel/nspr CONFLICTS= gnash-devel-[0-9]* -NO_STAGE= yes USE_BZIP2= yes USES= gmake pkgconfig @@ -31,13 +30,14 @@ WANT_GSTREAMER= yes USE_GNOME= libxml2 USE_XORG= x11 xau xdmcp xext xi xinerama ice sm xv INSTALLS_ICONS= yes +SYSCONFIGDIR= ${PREFIX}/etc # jemalloc leads to infinite recursion on FreeBSD CONFIGURE_ARGS= --with-boost-incl="${LOCALBASE}/include" \ --with-boost-lib="${LOCALBASE}/lib" \ --disable-testsuite \ --with-plugins-install=prefix \ - --sysconfdir="${WRKDIR}/etc" \ + --sysconfdir="${SYSCONFIGDIR}" \ --disable-kparts3 \ --disable-jemalloc \ --disable-silent-rules @@ -50,10 +50,6 @@ PLIST_SUB+= GNASHVER="${GNASHVER}" USE_LDCONFIG= ${PREFIX}/lib/gnash -MAN1= cygnal.1 findmicrophones.1 findwebcams.1 \ - flvdumper.1 gnash.1 gprocessor.1 \ - rtmpget.1 soldumper.1 - OPTIONS_DEFINE= PLUGIN CYGNAL VAAPI OPTIONS_SINGLE= MEDIA GUI RENDERER OPTIONS_SINGLE_MEDIA= FFMPEG FFMPEG2 GSTREAMER @@ -62,6 +58,7 @@ OPTIONS_SINGLE_RENDERER=AGG OPENGL CAIRO OPTIONS_DEFAULT=GTK2 PLUGIN AGG FFMPEG VAAPI NO_OPTIONS_SORT=yes +OPTIONS_SUB= yes PLUGIN_DESC= browser plugin CYGNAL_DESC= Cygnal media server AGG_DESC= AGG renderer @@ -72,16 +69,13 @@ FFMPEG2_DESC= ffmpeg2 media handler (bro GSTREAMER_DESC= GStreamer media handler VAAPI_DESC= VAAPI support (requires FFMPEG) +CYGNAL_CONFIGURE_ENABLE= cygnal + .include # Cygnal option processing .if ${PORT_OPTIONS:MCYGNAL} -PLIST_SUB+= CYGNAL="" -CONFIGURE_ARGS+= --enable-cygnal CONFIG_FILES+= cygnalrc -.else -PLIST_SUB+= CYGNAL="@comment " -CONFIGURE_ARGS+= --disable-cygnal .endif # NLS option processing (not sure if --disable-nls actually has any effect) @@ -97,11 +91,12 @@ PLIST_SUB+= NLS="@comment " # Plugin configuration # .if ${PORT_OPTIONS:MGTK2} && ${PORT_OPTIONS:MPLUGIN} -USE_WEBPLUGINS= native -WEBPLUGINS_FILES= libgnashplugin.so -.include "${PORTSDIR}/www/firefox/Makefile.webplugins" +USES+= webplugin:native +WEBPLUGIN_NAME= gnash +WEBPLUGIN_FILES= libgnashplugin.so +WEBPLUGIN_DIR=${_WEBPLUGIN_LIBDIR:S,^${LOCALBASE}/,${PREFIX}/,}/${WEBPLUGIN_NAME} PLIST_SUB+= NPAPI="" -CONFIGURE_ARGS+=--with-npapi-plugindir="${WEBPLUGINS_DIR}" +CONFIGURE_ARGS+=--with-npapi-plugindir="${WEBPLUGIN_DIR}" BUILD_DEPENDS+= ${LOCALBASE}/bin/xulrunner:${PORTSDIR}/www/libxul RUN_DEPENDS+= ${LOCALBASE}/bin/xulrunner:${PORTSDIR}/www/libxul .else @@ -126,22 +121,14 @@ GNASH_GUIS= .if ${PORT_OPTIONS:MGTK2} USE_GNOME= gtk20 atk gconf2 GNASH_GUIS+= gtk -PLIST_SUB+= GTK="" -MAN1+= gnash-gtk-launcher.1 gtk-gnash.1 -.else -PLIST_SUB+= GTK="@comment " .endif .if ${PORT_OPTIONS:MKDE4} GNASH_GUIS+= kde4 -PLIST_SUB+= KDE4="" USE_QT4= moc_build QT_NONSTANDARD= yes USE_KDE4= kdehier kdelibs CONFIGURE_ENV+= KDE4_CONFIG="${KDE4_PREFIX}/bin/kde4-config" -MAN1+= gnash-qt-launcher.1 kde4-gnash.1 -.else -PLIST_SUB+= KDE4="@comment " .endif .if ${GNASH_GUIS} == "" @@ -156,7 +143,7 @@ CONFIGURE_ARGS+=--enable-gui=`${ECHO} ${ GNASH_RENDERERS= .if ${PORT_OPTIONS:MAGG} -LIB_DEPENDS+= agg:${PORTSDIR}/graphics/agg +LIB_DEPENDS+= libagg.so:${PORTSDIR}/graphics/agg GNASH_RENDERERS+= agg .endif @@ -164,7 +151,7 @@ GNASH_RENDERERS+= agg USE_GL= yes GNASH_RENDERERS+= ogl .if ${PORT_OPTIONS:MGTK2} -LIB_DEPENDS+= gtkglext-x11-1.0:${PORTSDIR}/x11-toolkits/gtkglext +LIB_DEPENDS+= libgdkglext-x11-1.0.so:${PORTSDIR}/x11-toolkits/gtkglext .endif .endif @@ -172,7 +159,7 @@ LIB_DEPENDS+= gtkglext-x11-1.0:${PORTSD .if ${PORT_OPTIONS:MKDE4} IGNORE= doesn't support Cairo renderer with KDE4 gui. Please rerun 'make config' and select different renderer or disable KDE4 GUI .endif -LIB_DEPENDS+= cairo.2:${PORTSDIR}/graphics/cairo +LIB_DEPENDS+= libcairo.so:${PORTSDIR}/graphics/cairo GNASH_RENDERERS+= cairo .endif @@ -189,11 +176,9 @@ CONFIGURE_ARGS+= --enable-renderer=`${EC .if empty(PORT_OPTIONS:MFFMPEG) && empty(PORT_OPTIONS:MFFMPEG2) IGNORE= VAAPI currently works only with FFMPEG. Please rerun 'make config' and enable FFMPEG .endif -LIB_DEPENDS+= va:${PORTSDIR}/multimedia/libva -PLIST_SUB+= VAAPI="" +LIB_DEPENDS+= libva.so:${PORTSDIR}/multimedia/libva .else CONFIGURE_ARGS+= --enable-hwaccel=none # XVideo -PLIST_SUB+= VAAPI="@comment " .endif # @@ -223,12 +208,6 @@ CONFIGURE_ARGS+= --enable-media=none IGNORE= can't be built with multiple media handlers enabled. Please rerun 'make config' and leave one or none of them (ffmpeg|gstreamer) .endif -.if ${PORT_OPTIONS:MGSTREAMER} -PLIST_SUB+= GSTREAMER="" -.else -PLIST_SUB+= GSTREAMER="@comment " -.endif - .include pre-everything:: @@ -238,33 +217,28 @@ pre-everything:: .endif post-patch: - @${REINPLACE_CMD} -e '/^PTHREAD_[LC][IF]*=/ d; s|-lpthread|${PTHREAD_LIBS}|' \ + ${REINPLACE_CMD} -e '/^PTHREAD_[LC][IF]*=/ d; s|-lpthread|${PTHREAD_LIBS}|' \ -e '/KDE4_APPSDATADIR=/ s|share/kde4|share|' \ -e 's|/usr/local|${LOCALBASE}|g; \ s|/lib64|/lib|g; \ s|/usr/X11R6|${LOCALBASE}|g' ${WRKSRC}/configure \ ${WRKSRC}/macros/libslist ${WRKSRC}/macros/incllist - @${REINPLACE_CMD} -e '/^pkgconfigdir =/ s|libdir)|exec_prefix)/libdata|' \ + ${REINPLACE_CMD} -e '/^pkgconfigdir =/ s|libdir)|exec_prefix)/libdata|' \ ${WRKSRC}/Makefile.in - @${REINPLACE_CMD} -e '/^man1dir =/ s|=.*|= ${MAN1PREFIX}/man/man1|' \ + ${REINPLACE_CMD} -e '/^man1dir =/ s|=.*|= ${MAN1PREFIX}/man/man1|' \ ${WRKSRC}/doc/C/Makefile.in post-install: .for conf in ${CONFIG_FILES} - @${INSTALL_DATA} ${WRKDIR}/etc/${conf} ${PREFIX}/etc/${conf}.dist - if [ ! -f ${PREFIX}/etc/${conf} ]; then \ - ${INSTALL_DATA} ${PREFIX}/etc/${conf}.dist \ - ${PREFIX}/etc/${conf}; \ - fi + ${MV} ${STAGEDIR}/${SYSCONFIGDIR}/${conf} ${STAGEDIR}${SYSCONFIGDIR}/${conf}.dist .endfor .if ${PORT_OPTIONS:MPLUGIN} .if ${PORT_OPTIONS:MGTK2} - ${MKDIR} ${WEBPLUGINS_DIR} - @cd ${INSTALL_WRKSRC}/plugin && \ + cd ${INSTALL_WRKSRC}/plugin && \ ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_ARGS} install-plugin .endif .if ${PORT_OPTIONS:MKDE4} - @cd ${INSTALL_WRKSRC}/plugin/klash4 && \ + cd ${INSTALL_WRKSRC}/plugin/klash4 && \ ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_ARGS} install-plugin .endif .endif Modified: head/graphics/gnash/pkg-plist ============================================================================== --- head/graphics/gnash/pkg-plist Sun Dec 15 19:12:26 2013 (r336567) +++ head/graphics/gnash/pkg-plist Sun Dec 15 19:19:19 2013 (r336568) @@ -1,6 +1,6 @@ bin/gnash -%%GTK%%bin/gnash-gtk-launcher -%%GTK%%bin/gtk-gnash +%%GTK2%%bin/gnash-gtk-launcher +%%GTK2%%bin/gtk-gnash %%KDE4%%bin/gnash-qt-launcher %%KDE4%%bin/kde4-gnash bin/gprocessor @@ -10,7 +10,7 @@ bin/rtmpget %%CYGNAL%%bin/cygnal %%CYGNAL%%bin/flvdumper %%CYGNAL%%bin/soldumper -%%NPAPI%%%%WEBPLUGINS_DIR%%/libgnashplugin.so +%%NPAPI%%%%WEBPLUGIN_DIR%%/libgnashplugin.so %%CYGNAL%%@unexec if cmp -s %D/etc/cygnalrc.dist %D/etc/cygnalrc; then rm -f %D/etc/cygnalrc; fi %%CYGNAL%%etc/cygnalrc.dist %%CYGNAL%%@exec if [ ! -f %B/cygnalrc ]; then cp -p %D/%F %B/cygnalrc; fi @@ -214,15 +214,27 @@ lib/gnash/libgnashrender.so lib/gnash/libgnashsound-%%GNASHVER%%.so lib/gnash/libgnashsound.so libdata/pkgconfig/gnash.pc -%%GTK%%share/applications/gnash.desktop +%%GTK2%%share/applications/gnash.desktop %%KDE4%%share/applications/klash.desktop +man/man1/cygnal.1.gz +man/man1/findmicrophones.1.gz +man/man1/findwebcams.1.gz +man/man1/flvdumper.1.gz +man/man1/gnash.1.gz +man/man1/gprocessor.1.gz +man/man1/rtmpget.1.gz +man/man1/soldumper.1.gz +%%GTK2%%man/man1/gnash-gtk-launcher.1.gz +%%GTK2%%man/man1/gtk-gnash.1.gz +%%KDE4%%man/man1/gnash-qt-launcher.1 +%%KDE4%%man/man1/kde4-gnash.1 %%DATADIR%%/GnashG.png %%DATADIR%%/gnash-splash.swf %%DATADIR%%/gnash_128_96.ico %%DOCSDIR%%/gnashref.html %%DOCSDIR%%/gnashuser.html %%DOCSDIR%%/images/rtmp.png -%%GTK%%share/icons/hicolor/32x32/apps/gnash.xpm +%%GTK2%%share/icons/hicolor/32x32/apps/gnash.xpm %%KDE4%%share/icons/hicolor/32x32/apps/klash.xpm share/locale/cs/LC_MESSAGES/gnash.mo share/locale/da/LC_MESSAGES/gnash.mo @@ -255,4 +267,4 @@ share/locale/zh_TW/LC_MESSAGES/gnash.mo @dirrm include/gnash/asobj @dirrm include/gnash %%KPARTS4%%@dirrm kde4/share/apps/klash -%%NPAPI%%@dirrmtry %%WEBPLUGINS_DIR%% +%%NPAPI%%@dirrmtry %%WEBPLUGIN_DIR%% From owner-svn-ports-head@FreeBSD.ORG Sun Dec 15 19:19:30 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 4ED97C9B; Sun, 15 Dec 2013 19:19:30 +0000 (UTC) Received: from mail-2.renatasystems.org (mail-2.renatasystems.org [83.222.2.161]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id DAC4B1A8C; Sun, 15 Dec 2013 19:19:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=renatasystems.org; s=y2011; h=In-Reply-To:Content-Type:MIME-Version:References:Message-ID:Subject:Cc:To:From:Date; bh=UQ401GuQPkdDWp0xHucmeSXein8zb+DHe/+4xgTHams=; b=Tz3xYEZ/S2CPc8ZdQNMAZWRCz0JXZtWX3ymvw0BOKNDcXwbuMnuMzb9RQzbI9fQclkPPr0WjNn7fL7bNegTJm1EGtjeiXaABy1bvYYxhvqZS1nwSLexdC1LxagPsSYRU; SPF-Debug-Received: data: SPF-Debug-Result: X-ACL-Warn: Received: from home.renatasystems.org ([87.242.77.210]) by mail-2.renatasystems.org with esmtpsa (TLSv1:DHE-RSA-AES256-SHA:256) (Exim 4.80.1 (FreeBSD)) (envelope-from ) id 1VsHDp-0003s4-Pr; Sun, 15 Dec 2013 19:19:27 +0000 Received: by home.renatasystems.org (sSMTP sendmail emulation); Sun, 15 Dec 2013 23:19:25 +0400 Date: Sun, 15 Dec 2013 23:19:25 +0400 From: Alexey Degtyarev To: Andrej Zverev Subject: Re: svn commit: r336563 - head/devel/p5-Devel-Leak-Cb Message-ID: <20131215191925.GE64589@home.renatasystems.org> References: <201312151749.rBFHnQRt013978@svn.freebsd.org> MIME-Version: 1.0 Content-Type: multipart/signed; protocol="application/x-pkcs7-signature"; micalg=sha1; boundary="X7JfAZXCART3xQo9" Content-Disposition: inline In-Reply-To: X-PGP-Key: http://renatasystems.org/pubkey.asc X-Operating-System: FreeBSD 9.0-RELEASE User-Agent: Mutt/1.5.21 (2010-09-15) X-SpamTest-Envelope-From: alexey@renatasystems.org X-SpamTest-Group-ID: 00000000 X-SpamTest-Info: Profiles 54166 [Dec 15 2013] X-SpamTest-Method: none X-SpamTest-Rate: 45 X-SpamTest-SPF: fail X-SpamTest-Status: Not detected X-SpamTest-Status-Extended: not_detected X-SpamTest-Version: SMTP-Filter Version 3.0.0 [0284], KAS30/Release Cc: "svn-ports-head@freebsd.org" , "svn-ports-all@freebsd.org" , Alexey Degtyarev , "ports-committers@freebsd.org" X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 15 Dec 2013 19:19:30 -0000 --X7JfAZXCART3xQo9 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Hi Andrej, On 22:47 Sun 15 Dec, Andrej Zverev wrote: > best question for trolling ever :-) why you did not bumped the PORTREVISI= ON? >=20 Previously this port built just fine, without errors and leftovers. This change is cosmetic only, thus no need to indicate that it should be re-packaged. > On Sun, Dec 15, 2013 at 9:49 PM, Alexey Degtyarev wr= ote: > > Author: alexey > > Date: Sun Dec 15 17:49:26 2013 > > New Revision: 336563 > > URL: http://svnweb.freebsd.org/changeset/ports/336563 > > > > Log: > > Fix plist. > > > > PR: ports/184745 > > Submitted by: Anes Mukhametov (maintainer) > > Approved by: wg (mentor) > > > > Modified: > > head/devel/p5-Devel-Leak-Cb/pkg-plist (contents, props changed) > > > > Modified: head/devel/p5-Devel-Leak-Cb/pkg-plist > > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D > > --- head/devel/p5-Devel-Leak-Cb/pkg-plist Sun Dec 15 17:47:28 201= 3 (r336562) > > +++ head/devel/p5-Devel-Leak-Cb/pkg-plist Sun Dec 15 17:49:26 201= 3 (r336563) > > @@ -4,6 +4,5 @@ > > @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Devel/Leak/Cb > > @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Devel/Leak > > @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/auto/Devel > > -@dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/Devel > > @dirrmtry %%SITE_PERL%%/Devel/Leak > > @dirrmtry %%SITE_PERL%%/Devel --=20 Alexey Degtyarev --X7JfAZXCART3xQo9 Content-Type: application/x-pkcs7-signature Content-Disposition: attachment; filename="smime.p7s" Content-Transfer-Encoding: base64 MIIPNQYJKoZIhvcNAQcCoIIPJjCCDyICAQExCzAJBgUrDgMCGgUAMAsGCSqGSIb3DQEHAaCC DI0wggZRMIIFOaADAgECAgMH/FgwDQYJKoZIhvcNAQEFBQAwgYwxCzAJBgNVBAYTAklMMRYw FAYDVQQKEw1TdGFydENvbSBMdGQuMSswKQYDVQQLEyJTZWN1cmUgRGlnaXRhbCBDZXJ0aWZp Y2F0ZSBTaWduaW5nMTgwNgYDVQQDEy9TdGFydENvbSBDbGFzcyAxIFByaW1hcnkgSW50ZXJt ZWRpYXRlIENsaWVudCBDQTAeFw0xMzEwMjkyMzI0NTlaFw0xNDEwMzEwOTQ1MDhaMGcxGTAX BgNVBA0TEDZKNEpRZUVXaGx0eDZtZ1QxITAfBgNVBAMMGGFsZXhleUByZW5hdGFzeXN0ZW1z Lm9yZzEnMCUGCSqGSIb3DQEJARYYYWxleGV5QHJlbmF0YXN5c3RlbXMub3JnMIIBIjANBgkq hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAvBDczBrWGhFsLVhzEX2mvZ31QhA6qs92cuv6Jj63 gHPeIlD5q7V2YVCeSbFJobic0JH6R8RVV/rZ79vnXAEHaGckds6gHgokENuQsquxOmIPf1Ho QnjIKRJydMZpG1BIQ9i8xlHg5P69u69+PcsqdFeQaDk/NzrjcAYb4MEYgYaV+5iv6yAgaBF5 nYPDHptzCWa7izCshMMB8C9qX1oXM5fcHpaBhY/YppTB0FLlVwwwg2FbHBhKUTs3k356ZYcK S/yDidwYZhPmlNkIGtzTkmKeZZMOqt54W1jJGWeBnRhFlW0SFE5oYIsAPG01+JmzN2DNkpCV xFQBfBLIaLAsHQIDAQABo4IC3jCCAtowCQYDVR0TBAIwADALBgNVHQ8EBAMCBLAwHQYDVR0l BBYwFAYIKwYBBQUHAwIGCCsGAQUFBwMEMB0GA1UdDgQWBBT3q2BJpzPqupi2WIcjW8V0Tqds nDAfBgNVHSMEGDAWgBRTcu2SnODaywFcfH6WNU7y1LhRgjAjBgNVHREEHDAagRhhbGV4ZXlA cmVuYXRhc3lzdGVtcy5vcmcwggFMBgNVHSAEggFDMIIBPzCCATsGCysGAQQBgbU3AQIDMIIB KjAuBggrBgEFBQcCARYiaHR0cDovL3d3dy5zdGFydHNzbC5jb20vcG9saWN5LnBkZjCB9wYI KwYBBQUHAgIwgeowJxYgU3RhcnRDb20gQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkwAwIBARqB vlRoaXMgY2VydGlmaWNhdGUgd2FzIGlzc3VlZCBhY2NvcmRpbmcgdG8gdGhlIENsYXNzIDEg VmFsaWRhdGlvbiByZXF1aXJlbWVudHMgb2YgdGhlIFN0YXJ0Q29tIENBIHBvbGljeSwgcmVs aWFuY2Ugb25seSBmb3IgdGhlIGludGVuZGVkIHB1cnBvc2UgaW4gY29tcGxpYW5jZSBvZiB0 aGUgcmVseWluZyBwYXJ0eSBvYmxpZ2F0aW9ucy4wNgYDVR0fBC8wLTAroCmgJ4YlaHR0cDov L2NybC5zdGFydHNzbC5jb20vY3J0dTEtY3JsLmNybDCBjgYIKwYBBQUHAQEEgYEwfzA5Bggr BgEFBQcwAYYtaHR0cDovL29jc3Auc3RhcnRzc2wuY29tL3N1Yi9jbGFzczEvY2xpZW50L2Nh MEIGCCsGAQUFBzAChjZodHRwOi8vYWlhLnN0YXJ0c3NsLmNvbS9jZXJ0cy9zdWIuY2xhc3Mx LmNsaWVudC5jYS5jcnQwIwYDVR0SBBwwGoYYaHR0cDovL3d3dy5zdGFydHNzbC5jb20vMA0G CSqGSIb3DQEBBQUAA4IBAQA/55i9Y/DqlcV7B3tZ3VHWE9COrOQK2QX3XbRfBjE+zOv8XXu+ 0U7WZk8SAWgep0HTu7fA5xyjFE/Cw4BzjReuh8jVbNyr6yZ6SEaZPunnx/jMaNPUQ9V1Mr9h i2+URdYKaFtA76fJHBWANEXAMgrOwc5oDoBQlInbj8godBGiFDQOREv4mntez8PxuTgV+EeU liBiw30z78lP2n/twdOFZUjJBRWwcuG0ebUq7l7Q3JQDvsrxtKnL0G9Q3pChdyPslatjgHM1 RbWHrAiqDv8jlHsbmpPZ/BC15X2cNhF+HYrnkIFXcLIOkNTKEwZtqpItazVg0Q/YCHugOwpm W2O3MIIGNDCCBBygAwIBAgIBHjANBgkqhkiG9w0BAQUFADB9MQswCQYDVQQGEwJJTDEWMBQG A1UEChMNU3RhcnRDb20gTHRkLjErMCkGA1UECxMiU2VjdXJlIERpZ2l0YWwgQ2VydGlmaWNh dGUgU2lnbmluZzEpMCcGA1UEAxMgU3RhcnRDb20gQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkw HhcNMDcxMDI0MjEwMTU1WhcNMTcxMDI0MjEwMTU1WjCBjDELMAkGA1UEBhMCSUwxFjAUBgNV BAoTDVN0YXJ0Q29tIEx0ZC4xKzApBgNVBAsTIlNlY3VyZSBEaWdpdGFsIENlcnRpZmljYXRl IFNpZ25pbmcxODA2BgNVBAMTL1N0YXJ0Q29tIENsYXNzIDEgUHJpbWFyeSBJbnRlcm1lZGlh dGUgQ2xpZW50IENBMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAxwmDzM4t2Bqx KaQuE6uWvooyg4ymiEGWVUet1G8SD+rqvyNH4QrvnEIaFHxOhESip7vMz39ScLpNLbL1QpOl PW/tFIzNHS3qd2XRNYG5Sv9RcGE+T4qbLtsjjJbi6sL7Ls/f/X9ftTyhxvxWkf8KW37iKrue Ksxw2HqolH7GM6FX5UfNAwAu4ZifkpmZzU1slBhyWwaQPEPPZRsWoTb7q8hmgv6Nv3Hg9rmA 1/VPBIOQ6SKRkHXG0Hhmq1dOFoAFI411+a/9nWm5rcVjGcIWZ2v/43Yksq60jExipA4l5uv9 /+Hm33mbgmCszdj/Dthf13tgAv2O83hLJ0exTqfrlwIDAQABo4IBrTCCAakwDwYDVR0TAQH/ BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAQYwHQYDVR0OBBYEFFNy7ZKc4NrLAVx8fpY1TvLUuFGC MB8GA1UdIwQYMBaAFE4L7xqkQFulF2mHMMo0aEPQQa7yMGYGCCsGAQUFBwEBBFowWDAnBggr BgEFBQcwAYYbaHR0cDovL29jc3Auc3RhcnRzc2wuY29tL2NhMC0GCCsGAQUFBzAChiFodHRw Oi8vd3d3LnN0YXJ0c3NsLmNvbS9zZnNjYS5jcnQwWwYDVR0fBFQwUjAnoCWgI4YhaHR0cDov L3d3dy5zdGFydHNzbC5jb20vc2ZzY2EuY3JsMCegJaAjhiFodHRwOi8vY3JsLnN0YXJ0c3Ns LmNvbS9zZnNjYS5jcmwwgYAGA1UdIAR5MHcwdQYLKwYBBAGBtTcBAgEwZjAuBggrBgEFBQcC ARYiaHR0cDovL3d3dy5zdGFydHNzbC5jb20vcG9saWN5LnBkZjA0BggrBgEFBQcCARYoaHR0 cDovL3d3dy5zdGFydHNzbC5jb20vaW50ZXJtZWRpYXRlLnBkZjANBgkqhkiG9w0BAQUFAAOC AgEACoMIfXirLAZcuGOMXq4cuSN3TaFx2H2GvD5VSy/6rV55BYHbWNaPeQn3oBSU8KgQZn/K ck1JxbLpAxVCNtsxeW1R87ifhsYZ0qjdrA9anrW2MAWCtosmAOT4OxK9QPoSjCMxM3HbkZCD JgnlE8jMopH21BbyAYr7b5EfGRQJNtgWcvqSXwKHnTutR08+Kkn0KAkXCzeQNLeA5LlYUzFy M7kPAp8pIRMQ+seHunmyG642S2+y/qHEdMuGIwpfz3eDF1PdctL04qYK/zu+Qg1Bw0RwgigV Zs/0c5HP2/e9DBHh7eSwtzYlk4AUr6yxLlcwSjOfOmKEQ/Q8tzh0IFiNu9IPuTGAPBn4CPxD 0+Ru8T2wg8/s43R/PT3kd1OEqOJUl7q+h+r6fpvU0Fzxd2tC8Ga6fDEPme+1Nbi+03pVjuZQ KbGwKJ66gEn06WqaxVZC+J8hh/jR0k9mST1iAZPNYulcNJ8tKmVtjYsv0L1TSm2+NwON58tO +pIVzu3DWwSEXSf+qkDavQam+QtEOZxLBXI++aMUEapSn+k3Lxm48ZCYfAWLb/Xj7F5JQMbZ vCexglAbYR0kIHqW5DnsYSdMD/IplJMojx0NBrxJ3fN9dvX2Y6BIXRsF1du4qESm4/3CKuyU V7p9DW3mPlHTGLvYxnyKQy7VFBkoLINszBrOUeIxggJwMIICbAIBATCBlDCBjDELMAkGA1UE BhMCSUwxFjAUBgNVBAoTDVN0YXJ0Q29tIEx0ZC4xKzApBgNVBAsTIlNlY3VyZSBEaWdpdGFs IENlcnRpZmljYXRlIFNpZ25pbmcxODA2BgNVBAMTL1N0YXJ0Q29tIENsYXNzIDEgUHJpbWFy eSBJbnRlcm1lZGlhdGUgQ2xpZW50IENBAgMH/FgwCQYFKw4DAhoFAKCBsTAYBgkqhkiG9w0B CQMxCwYJKoZIhvcNAQcBMBwGCSqGSIb3DQEJBTEPFw0xMzEyMTUxOTE5MjVaMCMGCSqGSIb3 DQEJBDEWBBR2kIOifhuZPQB0icwVlALAiYLNgTBSBgkqhkiG9w0BCQ8xRTBDMAoGCCqGSIb3 DQMHMA4GCCqGSIb3DQMCAgIAgDANBggqhkiG9w0DAgIBQDAHBgUrDgMCBzANBggqhkiG9w0D AgIBKDANBgkqhkiG9w0BAQEFAASCAQBc2+vDof/igwrAxg8kNtxfKGQoZDPhAxYHMVZAdFer EggfkxOxsPzDlwPZFcwIsX6nQVd3a/lucWXYZRK+flwtDxeE5H+juxTpt2NVrxbmO50uSzRP rzcwG6EmaTASIoPxiwQayPbQh3rU/mTWB+vhZcX5bBpyUGoSj3FIUkm74RjBfwa2uKOKDXhs ocEpBp2jj0pfaEjlVBGni2ngyezWRBHXAXFDqXM41KqUTsSVYG1GTYMgDIE/yJoK5km7Hdt7 nO+WBE9xgCADtX7RSKhj9ygxlpnYsWLo6bo4JUh2uDW4U49Brp5t8/r7W4OOPpSgCoRhzhBQ F/8r5E3LaGn1 --X7JfAZXCART3xQo9-- From owner-svn-ports-head@FreeBSD.ORG Sun Dec 15 19:24:24 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id C3C74EA8; Sun, 15 Dec 2013 19:24:24 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id B00D91AF1; Sun, 15 Dec 2013 19:24:24 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBFJOOm9050244; Sun, 15 Dec 2013 19:24:24 GMT (envelope-from dinoex@svn.freebsd.org) Received: (from dinoex@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBFJOOLD050243; Sun, 15 Dec 2013 19:24:24 GMT (envelope-from dinoex@svn.freebsd.org) Message-Id: <201312151924.rBFJOOLD050243@svn.freebsd.org> From: Dirk Meyer Date: Sun, 15 Dec 2013 19:24:24 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r336569 - head/misc/magicpoint X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 15 Dec 2013 19:24:24 -0000 Author: dinoex Date: Sun Dec 15 19:24:24 2013 New Revision: 336569 URL: http://svnweb.freebsd.org/changeset/ports/336569 Log: - update LIB_DEPENDS - use OPT_USE Modified: head/misc/magicpoint/Makefile Modified: head/misc/magicpoint/Makefile ============================================================================== --- head/misc/magicpoint/Makefile Sun Dec 15 19:19:19 2013 (r336568) +++ head/misc/magicpoint/Makefile Sun Dec 15 19:24:24 2013 (r336569) @@ -10,8 +10,8 @@ MASTER_SITES= ftp://sh.wide.ad.jp/WIDE/f MAINTAINER= dinoex@FreeBSD.org COMMENT= An X11-based presentation tool -LIB_DEPENDS+= png15:${PORTSDIR}/graphics/png \ - mng:${PORTSDIR}/graphics/libmng +LIB_DEPENDS+= libpng15.so:${PORTSDIR}/graphics/png \ + libmng.so:${PORTSDIR}/graphics/libmng RUN_DEPENDS+= pnmscale:${PORTSDIR}/graphics/netpbm MAKE_JOBS_UNSAFE= yes @@ -46,24 +46,18 @@ NO_OPTIONS_SORT=yes FREETYPE_CONFIGURE_ENABLE= freetype XFT_USES= iconv +XFT_USE= XORG=xft XFT_LIB_DEPENDS= libttf.so:${PORTSDIR}/print/freetype XFT_CONFIGURE_ENABLE= xft2 XFT_CONFIGURE_ON= --enable-freetype-charset16 GIF_CONFIGURE_ENABLE= gif GIF_LIB_DEPENDS= libgif.so:${PORTSDIR}/graphics/giflib GIF_CPPFLAGS= -I${LOCALBASE}/include +IMLIB_USE= GNOME=imlib IMLIB_CONFIGURE_ENABLE= imlib .include -.if ${PORT_OPTIONS:MXFT} -USE_XORG+= xft -.endif - -.if ${PORT_OPTIONS:MIMLIB} -USE_GNOME+= imlib -.endif - post-patch: ${REINPLACE_CMD} -e 's|-lungif|-lgif|' \ -e 's|png_set_gray_1_2_4_to_8|png_set_expand_gray_1_2_4_to_8|' \ @@ -84,7 +78,7 @@ post-install: ${STAGEDIR}${MANPREFIX}/man/man1/ ${INSTALL} ${WRKSRC}/contrib/xmindpath/xmindpath \ ${STAGEDIR}${PREFIX}/bin/ -.if !defined(NOPORTDOCS) +.if ${PORT_OPTIONS:MDOCS} ${MKDIR} ${STAGEDIR}${DOCSDIR} cd ${WRKSRC} && \ ${INSTALL_DATA} ${DOCS} ${STAGEDIR}${DOCSDIR}/ From owner-svn-ports-head@FreeBSD.ORG Sun Dec 15 19:28:52 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id BB74C1EA; Sun, 15 Dec 2013 19:28:52 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id A7B181B18; Sun, 15 Dec 2013 19:28:52 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBFJSqm8050778; Sun, 15 Dec 2013 19:28:52 GMT (envelope-from trociny@svn.freebsd.org) Received: (from trociny@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBFJSquL050776; Sun, 15 Dec 2013 19:28:52 GMT (envelope-from trociny@svn.freebsd.org) Message-Id: <201312151928.rBFJSquL050776@svn.freebsd.org> From: Mikolaj Golub Date: Sun, 15 Dec 2013 19:28:52 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r336570 - head/sysutils/cmogstored X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 15 Dec 2013 19:28:52 -0000 Author: trociny Date: Sun Dec 15 19:28:51 2013 New Revision: 336570 URL: http://svnweb.freebsd.org/changeset/ports/336570 Log: - Update to 1.3.2. - Add regression-test target. Approved by: bdrewery (mentor) Modified: head/sysutils/cmogstored/Makefile head/sysutils/cmogstored/distinfo Modified: head/sysutils/cmogstored/Makefile ============================================================================== --- head/sysutils/cmogstored/Makefile Sun Dec 15 19:24:24 2013 (r336569) +++ head/sysutils/cmogstored/Makefile Sun Dec 15 19:28:51 2013 (r336570) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= cmogstored -PORTVERSION= 1.3.1 +PORTVERSION= 1.3.2 CATEGORIES= sysutils MASTER_SITES= http://bogomips.org/cmogstored/files/ @@ -20,4 +20,7 @@ CONFIGURE_ARGS+=--bindir=${PREFIX}/sbin --mandir=${PREFIX}/man USE_RC_SUBR= cmogstored +regression-test: build + ${MAKE} -C ${WRKSRC} check + .include Modified: head/sysutils/cmogstored/distinfo ============================================================================== --- head/sysutils/cmogstored/distinfo Sun Dec 15 19:24:24 2013 (r336569) +++ head/sysutils/cmogstored/distinfo Sun Dec 15 19:28:51 2013 (r336570) @@ -1,2 +1,2 @@ -SHA256 (cmogstored-1.3.1.tar.gz) = dc3e8e7e19b3100b8e8eb14a2c5e12a78934895a7f464690ecab793aaffa796f -SIZE (cmogstored-1.3.1.tar.gz) = 958953 +SHA256 (cmogstored-1.3.2.tar.gz) = 9f6629769152a0657f62d240d4acc8f698cd11f31883f78b5e30110fc63bec72 +SIZE (cmogstored-1.3.2.tar.gz) = 966096 From owner-svn-ports-head@FreeBSD.ORG Sun Dec 15 19:29:59 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 2B4042CF; Sun, 15 Dec 2013 19:29:59 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 17CFF1B1E; Sun, 15 Dec 2013 19:29:59 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBFJTwC7050938; Sun, 15 Dec 2013 19:29:58 GMT (envelope-from dinoex@svn.freebsd.org) Received: (from dinoex@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBFJTw2d050937; Sun, 15 Dec 2013 19:29:58 GMT (envelope-from dinoex@svn.freebsd.org) Message-Id: <201312151929.rBFJTw2d050937@svn.freebsd.org> From: Dirk Meyer Date: Sun, 15 Dec 2013 19:29:58 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r336571 - head/www/opera-linuxplugins X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 15 Dec 2013 19:29:59 -0000 Author: dinoex Date: Sun Dec 15 19:29:58 2013 New Revision: 336571 URL: http://svnweb.freebsd.org/changeset/ports/336571 Log: - use STAGEDIR Modified: head/www/opera-linuxplugins/Makefile Modified: head/www/opera-linuxplugins/Makefile ============================================================================== --- head/www/opera-linuxplugins/Makefile Sun Dec 15 19:28:51 2013 (r336570) +++ head/www/opera-linuxplugins/Makefile Sun Dec 15 19:29:58 2013 (r336571) @@ -20,8 +20,6 @@ COMMENT= Linux plugin support for the na RUN_DEPENDS= ${LOCALBASE}/lib/opera/pluginwrapper/operapluginwrapper:${PORTSDIR}/${PKGCATEGORY}/opera -NO_STAGE= yes - OPERA_VER?= 12.16 OPERA_BUILD?= 1860 MASTER_SITES_VER_PATH= linux/${OPERA_VER:S/.//}/ @@ -33,12 +31,14 @@ USE_LINUX_APPS= xorglibs ONLY_FOR_ARCHS= i386 amd64 NO_BUILD= yes +NO_MTREE= yes EXPLICIT_PACKAGE_DEPENDS= yes PLIST_FILES= lib/opera/pluginwrapper/operapluginwrapper-ia32-linux do-install: + ${MKDIR} ${STAGEDIR}${PREFIX}/lib/opera/pluginwrapper ${INSTALL_PROGRAM} ${WRKSRC}/lib/opera/pluginwrapper/operapluginwrapper-native \ - ${PREFIX}/lib/opera/pluginwrapper/operapluginwrapper-ia32-linux + ${STAGEDIR}${PREFIX}/lib/opera/pluginwrapper/operapluginwrapper-ia32-linux .include From owner-svn-ports-head@FreeBSD.ORG Sun Dec 15 19:30:41 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 0BB563E4; Sun, 15 Dec 2013 19:30:41 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id E0E681C80; Sun, 15 Dec 2013 19:30:40 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBFJUe1l053019; Sun, 15 Dec 2013 19:30:40 GMT (envelope-from alexey@svn.freebsd.org) Received: (from alexey@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBFJUd5F053008; Sun, 15 Dec 2013 19:30:39 GMT (envelope-from alexey@svn.freebsd.org) Message-Id: <201312151930.rBFJUd5F053008@svn.freebsd.org> From: Alexey Degtyarev Date: Sun, 15 Dec 2013 19:30:39 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r336572 - in head/devel: awscli py-botocore py-jmespath X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 15 Dec 2013 19:30:41 -0000 Author: alexey Date: Sun Dec 15 19:30:39 2013 New Revision: 336572 URL: http://svnweb.freebsd.org/changeset/ports/336572 Log: * devel/awscli - update to 1.2.8 * devel/py-botocore - update to 0.28.0 * devel/py-jmespath - update to 0.2.0 * While here, change USE_PYDISTUTILS from "easy_install" to "yes". Approved by: wg (mentor) Modified: head/devel/awscli/Makefile head/devel/awscli/distinfo head/devel/py-botocore/Makefile head/devel/py-botocore/distinfo head/devel/py-jmespath/Makefile head/devel/py-jmespath/distinfo Modified: head/devel/awscli/Makefile ============================================================================== --- head/devel/awscli/Makefile Sun Dec 15 19:29:58 2013 (r336571) +++ head/devel/awscli/Makefile Sun Dec 15 19:30:39 2013 (r336572) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= awscli -PORTVERSION= 1.2.6 +PORTVERSION= 1.2.8 CATEGORIES= devel MASTER_SITES= CHEESESHOP MASTER_SITE_SUBDIR=source/a/awscli @@ -13,14 +13,14 @@ COMMENT= Universal Command Line Interfac LICENSE= AL2 RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}bcdoc>=0.12.0:${PORTSDIR}/devel/py-bcdoc \ - ${PYTHON_PKGNAMEPREFIX}botocore>=0.26:${PORTSDIR}/devel/py-botocore \ + ${PYTHON_PKGNAMEPREFIX}botocore>=0.28:${PORTSDIR}/devel/py-botocore \ ${PYTHON_PKGNAMEPREFIX}colorama>=0.2.5:${PORTSDIR}/devel/py-colorama \ ${PYTHON_PKGNAMEPREFIX}docutils>=0.10:${PORTSDIR}/textproc/py-docutils \ ${PYTHON_PKGNAMEPREFIX}rsa>=3.1.2:${PORTSDIR}/security/py-rsa \ ${PYTHON_PKGNAMEPREFIX}six>=1.1.0:${PORTSDIR}/devel/py-six USE_PYTHON= yes -USE_PYDISTUTILS=easy_install +USE_PYDISTUTILS=yes PYDISTUTILS_AUTOPLIST= yes .include Modified: head/devel/awscli/distinfo ============================================================================== --- head/devel/awscli/distinfo Sun Dec 15 19:29:58 2013 (r336571) +++ head/devel/awscli/distinfo Sun Dec 15 19:30:39 2013 (r336572) @@ -1,2 +1,2 @@ -SHA256 (awscli-1.2.6.tar.gz) = 0a4c78855dfe11228f4aaf8418aa8566efc25a3bbb50f235f86b592d7afbef90 -SIZE (awscli-1.2.6.tar.gz) = 142687 +SHA256 (awscli-1.2.8.tar.gz) = 01c5e2ba9a941a2d38cf141bde6f599f06f45132ee21acc1deb34a2cf1b00bed +SIZE (awscli-1.2.8.tar.gz) = 144192 Modified: head/devel/py-botocore/Makefile ============================================================================== --- head/devel/py-botocore/Makefile Sun Dec 15 19:29:58 2013 (r336571) +++ head/devel/py-botocore/Makefile Sun Dec 15 19:30:39 2013 (r336572) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= botocore -PORTVERSION= 0.26.0 +PORTVERSION= 0.28.0 CATEGORIES= devel python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -13,11 +13,11 @@ COMMENT= Low-level, core functionality o LICENSE= MIT RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}dateutil>=2.1:${PORTSDIR}/devel/py-dateutil \ - ${PYTHON_PKGNAMEPREFIX}jmespath>=0.1.0:${PORTSDIR}/devel/py-jmespath \ + ${PYTHON_PKGNAMEPREFIX}jmespath>=0.2.0:${PORTSDIR}/devel/py-jmespath \ ${PYTHON_PKGNAMEPREFIX}six>=1.1.0:${PORTSDIR}/devel/py-six USE_PYTHON= yes -USE_PYDISTUTILS=easy_install +USE_PYDISTUTILS=yes PYDISTUTILS_AUTOPLIST= yes .include Modified: head/devel/py-botocore/distinfo ============================================================================== --- head/devel/py-botocore/distinfo Sun Dec 15 19:29:58 2013 (r336571) +++ head/devel/py-botocore/distinfo Sun Dec 15 19:30:39 2013 (r336572) @@ -1,2 +1,2 @@ -SHA256 (botocore-0.26.0.tar.gz) = 44cd5bd63f89df580bba48278873c2ed1bbe69678c3c1b3b6b158d824cc68a25 -SIZE (botocore-0.26.0.tar.gz) = 1378631 +SHA256 (botocore-0.28.0.tar.gz) = 5a1af796667791ff5b1aa50f53c9685e99ecdba711b352e0de3fa1b5bbd99743 +SIZE (botocore-0.28.0.tar.gz) = 1395138 Modified: head/devel/py-jmespath/Makefile ============================================================================== --- head/devel/py-jmespath/Makefile Sun Dec 15 19:29:58 2013 (r336571) +++ head/devel/py-jmespath/Makefile Sun Dec 15 19:30:39 2013 (r336572) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= jmespath -PORTVERSION= 0.1.0 +PORTVERSION= 0.2.0 CATEGORIES= devel python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -15,7 +15,7 @@ LICENSE= MIT RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}ply>=3.4:${PORTSDIR}/devel/py-ply USE_PYTHON= yes -USE_PYDISTUTILS=easy_install +USE_PYDISTUTILS=yes PYDISTUTILS_AUTOPLIST= yes .include Modified: head/devel/py-jmespath/distinfo ============================================================================== --- head/devel/py-jmespath/distinfo Sun Dec 15 19:29:58 2013 (r336571) +++ head/devel/py-jmespath/distinfo Sun Dec 15 19:30:39 2013 (r336572) @@ -1,2 +1,2 @@ -SHA256 (jmespath-0.1.0.tar.gz) = 8113f1f4188e95a54d3cb91f03e34f291e77b980f57d8bbaf5386ccbe80dae6d -SIZE (jmespath-0.1.0.tar.gz) = 11548 +SHA256 (jmespath-0.2.0.tar.gz) = f2a2d56241ce57b447510b2a637838c4c80248275a5021c1e3eecb2138ed6c57 +SIZE (jmespath-0.2.0.tar.gz) = 12251 From owner-svn-ports-head@FreeBSD.ORG Sun Dec 15 19:41:44 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 6A82468E; Sun, 15 Dec 2013 19:41:44 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 3CB9F1D28; Sun, 15 Dec 2013 19:41:44 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBFJfiV0057177; Sun, 15 Dec 2013 19:41:44 GMT (envelope-from rakuco@svn.freebsd.org) Received: (from rakuco@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBFJfhAE057174; Sun, 15 Dec 2013 19:41:43 GMT (envelope-from rakuco@svn.freebsd.org) Message-Id: <201312151941.rBFJfhAE057174@svn.freebsd.org> From: Raphael Kubo da Costa Date: Sun, 15 Dec 2013 19:41:43 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r336573 - in head/x11-themes/gtk-oxygen-engine: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 15 Dec 2013 19:41:44 -0000 Author: rakuco Date: Sun Dec 15 19:41:43 2013 New Revision: 336573 URL: http://svnweb.freebsd.org/changeset/ports/336573 Log: - Update to 1.4.1. - Support staging. Changes in this version: * Mark zotero as XUL application * Fix some antialias issue on sliders Deleted: head/x11-themes/gtk-oxygen-engine/files/ Modified: head/x11-themes/gtk-oxygen-engine/Makefile head/x11-themes/gtk-oxygen-engine/distinfo head/x11-themes/gtk-oxygen-engine/pkg-plist Modified: head/x11-themes/gtk-oxygen-engine/Makefile ============================================================================== --- head/x11-themes/gtk-oxygen-engine/Makefile Sun Dec 15 19:30:39 2013 (r336572) +++ head/x11-themes/gtk-oxygen-engine/Makefile Sun Dec 15 19:41:43 2013 (r336573) @@ -1,10 +1,10 @@ # $FreeBSD$ PORTNAME= oxygen -PORTVERSION= 1.4.0 +PORTVERSION= 1.4.1 CATEGORIES= x11-themes MASTER_SITES= ${MASTER_SITE_KDE} -MASTER_SITE_SUBDIR= stable/${PORTNAME}-gtk2/${PORTVERSION}/src/ +MASTER_SITE_SUBDIR= stable/${PORTNAME}-gtk2/${PORTVERSION}/src PKGNAMEPREFIX= gtk- PKGNAMESUFFIX= -engine DISTNAME= ${PORTNAME}-gtk2-${PORTVERSION} @@ -14,12 +14,11 @@ COMMENT= Oxygen-Gtk engine and theme LICENSE= LGPL21 -LIB_DEPENDS= cairo:${PORTSDIR}/graphics/cairo \ - dbus-glib-1:${PORTSDIR}/devel/dbus-glib +LIB_DEPENDS= libcairo.so:${PORTSDIR}/graphics/cairo \ + libdbus-glib-1.so:${PORTSDIR}/devel/dbus-glib USE_BZIP2= yes USE_GNOME= gtk20 USES= cmake pkgconfig -NO_STAGE= yes .include Modified: head/x11-themes/gtk-oxygen-engine/distinfo ============================================================================== --- head/x11-themes/gtk-oxygen-engine/distinfo Sun Dec 15 19:30:39 2013 (r336572) +++ head/x11-themes/gtk-oxygen-engine/distinfo Sun Dec 15 19:41:43 2013 (r336573) @@ -1,2 +1,2 @@ -SHA256 (oxygen-gtk2-1.4.0.tar.bz2) = 84e24b78c71a73c38bfe41da609524307344060fe7e74fa9790380da234e1734 -SIZE (oxygen-gtk2-1.4.0.tar.bz2) = 198415 +SHA256 (oxygen-gtk2-1.4.1.tar.bz2) = 8dab594f7ddd133068d2abe18bab023579e78b7108114780edaf40f43e6d798f +SIZE (oxygen-gtk2-1.4.1.tar.bz2) = 197293 Modified: head/x11-themes/gtk-oxygen-engine/pkg-plist ============================================================================== --- head/x11-themes/gtk-oxygen-engine/pkg-plist Sun Dec 15 19:30:39 2013 (r336572) +++ head/x11-themes/gtk-oxygen-engine/pkg-plist Sun Dec 15 19:41:43 2013 (r336573) @@ -12,3 +12,6 @@ share/themes/oxygen-gtk/gtk-2.0/special- @dirrm share/themes/oxygen-gtk/gtk-2.0 @dirrmtry share/themes/oxygen-gtk @dirrmtry share/themes +@dirrmtry lib/gtk-2.0/%%GTK2_VERSION%%/engines +@dirrmtry lib/gtk-2.0/%%GTK2_VERSION%% +@dirrmtry lib/gtk-2.0 From owner-svn-ports-head@FreeBSD.ORG Sun Dec 15 19:44:54 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 7BA3F79B; Sun, 15 Dec 2013 19:44:54 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 4F5781D40; Sun, 15 Dec 2013 19:44:54 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBFJis4S057619; Sun, 15 Dec 2013 19:44:54 GMT (envelope-from alexey@svn.freebsd.org) Received: (from alexey@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBFJir9w057616; Sun, 15 Dec 2013 19:44:53 GMT (envelope-from alexey@svn.freebsd.org) Message-Id: <201312151944.rBFJir9w057616@svn.freebsd.org> From: Alexey Degtyarev Date: Sun, 15 Dec 2013 19:44:53 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r336574 - head/mail/sieve-connect X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 15 Dec 2013 19:44:54 -0000 Author: alexey Date: Sun Dec 15 19:44:53 2013 New Revision: 336574 URL: http://svnweb.freebsd.org/changeset/ports/336574 Log: * Update to 0.87 * STAGE support Approved by: wg (mentor) Modified: head/mail/sieve-connect/Makefile head/mail/sieve-connect/distinfo Modified: head/mail/sieve-connect/Makefile ============================================================================== --- head/mail/sieve-connect/Makefile Sun Dec 15 19:41:43 2013 (r336573) +++ head/mail/sieve-connect/Makefile Sun Dec 15 19:44:53 2013 (r336574) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= sieve-connect -PORTVERSION= 0.86 +PORTVERSION= 0.87 CATEGORIES= mail MASTER_SITES= http://people.spodhuis.org/phil.pennock/software/ \ ftp://ftp.renatasystems.org/pub/FreeBSD/ports/distfiles/ @@ -20,29 +20,24 @@ RUN_DEPENDS= p5-Authen-SASL>=0:${PORTSDI p5-IO-Socket-SSL>=1.14:${PORTSDIR}/security/p5-IO-Socket-SSL \ p5-Mozilla-PublicSuffix>=0:${PORTSDIR}/dns/p5-Mozilla-PublicSuffix \ p5-Net-DNS>=0:${PORTSDIR}/dns/p5-Net-DNS \ + p5-Net-SSLeay>=1.37:${PORTSDIR}/security/p5-Net-SSLeay \ p5-ReadLine-Gnu>=0:${PORTSDIR}/devel/p5-ReadLine-Gnu \ p5-Term-ReadKey>=0:${PORTSDIR}/devel/p5-Term-ReadKey USES= perl5 USE_BZIP2= yes -PLIST_FILES= bin/sieve-connect -MAN1= sieve-connect.1 +PLIST_FILES= bin/sieve-connect \ + man/man1/sieve-connect.1.gz -NO_STAGE= yes -.include - -.if ${PORT_OPTIONS:MDOCS} PORTDOCS= ChangeLog README.md TODO -.endif do-install: - ${INSTALL_SCRIPT} ${WRKSRC}/sieve-connect ${PREFIX}/bin/sieve-connect + ${INSTALL_SCRIPT} ${WRKSRC}/sieve-connect \ + ${STAGEDIR}${PREFIX}/bin/sieve-connect ${INSTALL_MAN} ${WRKSRC}/sieve-connect.1 \ - ${MANPREFIX}/man/man1/sieve-connect.1 -.if ${PORT_OPTIONS:MDOCS} - @${MKDIR} ${DOCSDIR} - ${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/,} ${DOCSDIR}/ -.endif + ${STAGEDIR}${MANPREFIX}/man/man1/sieve-connect.1 + ${MKDIR} ${STAGEDIR}${DOCSDIR} + ${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/,} ${STAGEDIR}${DOCSDIR}/ .include Modified: head/mail/sieve-connect/distinfo ============================================================================== --- head/mail/sieve-connect/distinfo Sun Dec 15 19:41:43 2013 (r336573) +++ head/mail/sieve-connect/distinfo Sun Dec 15 19:44:53 2013 (r336574) @@ -1,2 +1,2 @@ -SHA256 (sieve-connect-0.86.tar.bz2) = e5c06573d97c90baf90b119fba9779463a10596b2b8fb67ecf43e597d878498c -SIZE (sieve-connect-0.86.tar.bz2) = 36292 +SHA256 (sieve-connect-0.87.tar.bz2) = e3de80ab34994de0277fc7bf53b7c08e82db1a1f2762ddac4311d8191cea6c49 +SIZE (sieve-connect-0.87.tar.bz2) = 40023 From owner-svn-ports-head@FreeBSD.ORG Sun Dec 15 19:48:12 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id D04B489E; Sun, 15 Dec 2013 19:48:12 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id BCB751D57; Sun, 15 Dec 2013 19:48:12 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBFJmC3q058076; Sun, 15 Dec 2013 19:48:12 GMT (envelope-from wg@svn.freebsd.org) Received: (from wg@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBFJmCEf058074; Sun, 15 Dec 2013 19:48:12 GMT (envelope-from wg@svn.freebsd.org) Message-Id: <201312151948.rBFJmCEf058074@svn.freebsd.org> From: William Grzybowski Date: Sun, 15 Dec 2013 19:48:12 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r336575 - head/devel/py-billiard X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 15 Dec 2013 19:48:12 -0000 Author: wg Date: Sun Dec 15 19:48:11 2013 New Revision: 336575 URL: http://svnweb.freebsd.org/changeset/ports/336575 Log: devel/py-billiard: update to 3.3.0.13 - Update to 3.3.0.13 - Switch from easy_install - Use BSD3CLAUSE license Modified: head/devel/py-billiard/Makefile head/devel/py-billiard/distinfo Modified: head/devel/py-billiard/Makefile ============================================================================== --- head/devel/py-billiard/Makefile Sun Dec 15 19:44:53 2013 (r336574) +++ head/devel/py-billiard/Makefile Sun Dec 15 19:48:11 2013 (r336575) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= billiard -PORTVERSION= 3.3.0.12 +PORTVERSION= 3.3.0.13 CATEGORIES= devel python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -10,11 +10,10 @@ PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} MAINTAINER= wg@FreeBSD.org COMMENT= Python multiprocessing fork with improvements and bugfixes -LICENSE= BSD +LICENSE= BSD3CLAUSE USE_PYTHON= yes -USE_PYDISTUTILS= easy_install +USE_PYDISTUTILS= yes PYDISTUTILS_AUTOPLIST= yes -PYEASYINSTALL_ARCHDEP= yes .include Modified: head/devel/py-billiard/distinfo ============================================================================== --- head/devel/py-billiard/distinfo Sun Dec 15 19:44:53 2013 (r336574) +++ head/devel/py-billiard/distinfo Sun Dec 15 19:48:11 2013 (r336575) @@ -1,2 +1,2 @@ -SHA256 (billiard-3.3.0.12.tar.gz) = a87fea2ae748b748a3af6b7921a6e77b3fb93e3c32c1c960277a14c2ed89eff7 -SIZE (billiard-3.3.0.12.tar.gz) = 148197 +SHA256 (billiard-3.3.0.13.tar.gz) = 833e294e1302089c6c42a26f796fc15f67a1a81cb6a995ec775bb112650ac270 +SIZE (billiard-3.3.0.13.tar.gz) = 148777 From owner-svn-ports-head@FreeBSD.ORG Sun Dec 15 20:00:47 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 6E885A94; Sun, 15 Dec 2013 20:00:47 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 5B96C1E3F; Sun, 15 Dec 2013 20:00:47 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBFK0l3m064084; Sun, 15 Dec 2013 20:00:47 GMT (envelope-from rene@svn.freebsd.org) Received: (from rene@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBFK0lQb064083; Sun, 15 Dec 2013 20:00:47 GMT (envelope-from rene@svn.freebsd.org) Message-Id: <201312152000.rBFK0lQb064083@svn.freebsd.org> From: Rene Ladan Date: Sun, 15 Dec 2013 20:00:47 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r336576 - head/www/py-ws4py X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 15 Dec 2013 20:00:47 -0000 Author: rene Date: Sun Dec 15 20:00:46 2013 New Revision: 336576 URL: http://svnweb.freebsd.org/changeset/ports/336576 Log: Set license to BSD, 3-claused. Modified: head/www/py-ws4py/Makefile Modified: head/www/py-ws4py/Makefile ============================================================================== --- head/www/py-ws4py/Makefile Sun Dec 15 19:48:11 2013 (r336575) +++ head/www/py-ws4py/Makefile Sun Dec 15 20:00:46 2013 (r336576) @@ -8,10 +8,9 @@ MASTER_SITES= http://www.defuze.org/oss/ PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} MAINTAINER= rene@FreeBSD.org -# python@ is also OK with me COMMENT= WebSocket package for Python -LICENSE= BSD +LICENSE= BSD3CLAUSE USE_PYTHON= yes USE_PYDISTUTILS= easy_install From owner-svn-ports-head@FreeBSD.ORG Sun Dec 15 20:18:02 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 8AA86DA2; Sun, 15 Dec 2013 20:18:02 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 5DD551F00; Sun, 15 Dec 2013 20:18:02 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBFKI2ow069213; Sun, 15 Dec 2013 20:18:02 GMT (envelope-from rakuco@svn.freebsd.org) Received: (from rakuco@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBFKI1Xm069210; Sun, 15 Dec 2013 20:18:01 GMT (envelope-from rakuco@svn.freebsd.org) Message-Id: <201312152018.rBFKI1Xm069210@svn.freebsd.org> From: Raphael Kubo da Costa Date: Sun, 15 Dec 2013 20:18:01 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r336577 - in head/x11-themes/gtk3-oxygen-engine: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 15 Dec 2013 20:18:02 -0000 Author: rakuco Date: Sun Dec 15 20:18:01 2013 New Revision: 336577 URL: http://svnweb.freebsd.org/changeset/ports/336577 Log: - Update to 1.2.1. - Support staging. - Adapt to the new LIB_DEPENDS format. Fixes in this release include: * Some improvement on inner-shadows * Some extra checks on widgets validity to prevent runtime warnings * Some rendering improvements for instance regarding scrollbars and textviews Deleted: head/x11-themes/gtk3-oxygen-engine/files/ Modified: head/x11-themes/gtk3-oxygen-engine/Makefile head/x11-themes/gtk3-oxygen-engine/distinfo head/x11-themes/gtk3-oxygen-engine/pkg-plist Modified: head/x11-themes/gtk3-oxygen-engine/Makefile ============================================================================== --- head/x11-themes/gtk3-oxygen-engine/Makefile Sun Dec 15 20:00:46 2013 (r336576) +++ head/x11-themes/gtk3-oxygen-engine/Makefile Sun Dec 15 20:18:01 2013 (r336577) @@ -1,10 +1,10 @@ # $FreeBSD$ PORTNAME= oxygen -PORTVERSION= 1.2.0 +PORTVERSION= 1.2.1 CATEGORIES= x11-themes MASTER_SITES= ${MASTER_SITE_KDE} -MASTER_SITE_SUBDIR= stable/${PORTNAME}-gtk3/${PORTVERSION}/src/ +MASTER_SITE_SUBDIR= stable/${PORTNAME}-gtk3/${PORTVERSION}/src PKGNAMEPREFIX= gtk3- PKGNAMESUFFIX= -engine DISTNAME= ${PORTNAME}-gtk3-${PORTVERSION} @@ -14,12 +14,11 @@ COMMENT= Oxygen GTK+ 3 engine and theme LICENSE= LGPL21 -LIB_DEPENDS= cairo:${PORTSDIR}/graphics/cairo \ - dbus-glib-1:${PORTSDIR}/devel/dbus-glib +LIB_DEPENDS= libcairo.so:${PORTSDIR}/graphics/cairo \ + libdbus-glib-1.so:${PORTSDIR}/devel/dbus-glib USE_BZIP2= yes USE_GNOME= gtk30 USES= cmake:outsource pkgconfig -NO_STAGE= yes .include Modified: head/x11-themes/gtk3-oxygen-engine/distinfo ============================================================================== --- head/x11-themes/gtk3-oxygen-engine/distinfo Sun Dec 15 20:00:46 2013 (r336576) +++ head/x11-themes/gtk3-oxygen-engine/distinfo Sun Dec 15 20:18:01 2013 (r336577) @@ -1,2 +1,2 @@ -SHA256 (oxygen-gtk3-1.2.0.tar.bz2) = ea550bd215614c89704501d44479e0b3373db033d6026ce2244b70593241c61f -SIZE (oxygen-gtk3-1.2.0.tar.bz2) = 190583 +SHA256 (oxygen-gtk3-1.2.1.tar.bz2) = 91b8a3a024c224b2d0963e7ab2cab807e4361251129f843f6f2876f070950171 +SIZE (oxygen-gtk3-1.2.1.tar.bz2) = 189296 Modified: head/x11-themes/gtk3-oxygen-engine/pkg-plist ============================================================================== --- head/x11-themes/gtk3-oxygen-engine/pkg-plist Sun Dec 15 20:00:46 2013 (r336576) +++ head/x11-themes/gtk3-oxygen-engine/pkg-plist Sun Dec 15 20:18:01 2013 (r336577) @@ -13,3 +13,5 @@ share/themes/oxygen-gtk/gtk-3.0/special- @dirrmtry share/themes/oxygen-gtk @dirrmtry share/themes @dirrmtry lib/gtk-3.0/%%GTK3_VERSION%%/theming-engines +@dirrmtry lib/gtk-3.0/%%GTK3_VERSION%% +@dirrmtry lib/gtk-3.0 From owner-svn-ports-head@FreeBSD.ORG Sun Dec 15 20:19:49 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 7E349E9F; Sun, 15 Dec 2013 20:19:49 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 6AF5E1F13; Sun, 15 Dec 2013 20:19:49 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBFKJnFn069461; Sun, 15 Dec 2013 20:19:49 GMT (envelope-from wg@svn.freebsd.org) Received: (from wg@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBFKJnM9069460; Sun, 15 Dec 2013 20:19:49 GMT (envelope-from wg@svn.freebsd.org) Message-Id: <201312152019.rBFKJnM9069460@svn.freebsd.org> From: William Grzybowski Date: Sun, 15 Dec 2013 20:19:49 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r336578 - head/databases/py-sqlobject X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 15 Dec 2013 20:19:49 -0000 Author: wg Date: Sun Dec 15 20:19:48 2013 New Revision: 336578 URL: http://svnweb.freebsd.org/changeset/ports/336578 Log: databases/py-sqlobject: stagify and minor changes - Allow staging - Switch distutils from easy_install - Use auto plist Deleted: head/databases/py-sqlobject/pkg-plist Modified: head/databases/py-sqlobject/Makefile Modified: head/databases/py-sqlobject/Makefile ============================================================================== --- head/databases/py-sqlobject/Makefile Sun Dec 15 20:18:01 2013 (r336577) +++ head/databases/py-sqlobject/Makefile Sun Dec 15 20:19:48 2013 (r336578) @@ -15,25 +15,16 @@ BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}fo RUN_DEPENDS:= ${BUILD_DEPENDS} USE_PYTHON= yes -USE_PYDISTUTILS= easy_install -PYDISTUTILS_PKGNAME= SQLObject -PYDISTUTILS_NOEGGINFO= yes +USE_PYDISTUTILS= yes +PYDISTUTILS_AUTOPLIST= yes OPTIONS_DEFINE= MYSQL PGSQL SQLITE MSSQL FIREBIRD SYBASE SYBASE_DESC= sybase support -# bypass infrastructure bug -OPTIONSFILE= ${PORT_DBDIR}/py-${PORTNAME}/options - PORTDOCS= * -.if empty(PORT_OPTIONS:MDOCS) -PLIST_SUB+= PORTDOCS="@comment " -.else -PLIST_SUB+= PORTDOCS="" -.endif -NO_STAGE= yes .include + .if ${PORT_OPTIONS:MMYSQL} RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}MySQLdb>=0:${PORTSDIR}/databases/py-MySQLdb .endif @@ -61,10 +52,8 @@ RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}syb # currently MaxDB(SAP), ADODB are not supported post-install: -.if ${PORT_OPTIONS:MDOCS} - ${MKDIR} ${DOCSDIR} - ${INSTALL_MAN} ${WRKSRC}/README.txt ${DOCSDIR} - ${CP} -r ${WRKSRC}/docs/* ${DOCSDIR} -.endif + ${MKDIR} ${STAGEDIR}${DOCSDIR} + ${INSTALL_MAN} ${WRKSRC}/README.txt ${STAGEDIR}${DOCSDIR} + (cd ${WRKSRC}/docs && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR}) .include From owner-svn-ports-head@FreeBSD.ORG Sun Dec 15 20:21:21 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 8BCDDFC6; Sun, 15 Dec 2013 20:21:21 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 7834A1F6F; Sun, 15 Dec 2013 20:21:21 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBFKLLji072059; Sun, 15 Dec 2013 20:21:21 GMT (envelope-from antoine@svn.freebsd.org) Received: (from antoine@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBFKLLP1072058; Sun, 15 Dec 2013 20:21:21 GMT (envelope-from antoine@svn.freebsd.org) Message-Id: <201312152021.rBFKLLP1072058@svn.freebsd.org> From: Antoine Brodin Date: Sun, 15 Dec 2013 20:21:21 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r336579 - head/devel/cxref X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 15 Dec 2013 20:21:21 -0000 Author: antoine Date: Sun Dec 15 20:21:20 2013 New Revision: 336579 URL: http://svnweb.freebsd.org/changeset/ports/336579 Log: Finish stage support Modified: head/devel/cxref/pkg-plist Modified: head/devel/cxref/pkg-plist ============================================================================== --- head/devel/cxref/pkg-plist Sun Dec 15 20:19:48 2013 (r336578) +++ head/devel/cxref/pkg-plist Sun Dec 15 20:21:20 2013 (r336579) @@ -1,6 +1,8 @@ bin/cxref bin/cxref-cc bin/cxref-query +man/man1/cxref-query.1.gz +man/man1/cxref.1.gz %%DATADIR%%/README %%DATADIR%%/README.xrgr %%DATADIR%%/cflow.el From owner-svn-ports-head@FreeBSD.ORG Sun Dec 15 20:28:04 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 3382A418; Sun, 15 Dec 2013 20:28:04 +0000 (UTC) Received: from winston.madpilot.net (winston.madpilot.net [78.47.75.155]) by mx1.freebsd.org (Postfix) with ESMTP id DDABA1FA8; Sun, 15 Dec 2013 20:28:03 +0000 (UTC) Received: from winston.madpilot.net (localhost [127.0.0.1]) by winston.madpilot.net (Postfix) with ESMTP id 3djHHJ1WYkzFTBf; Sun, 15 Dec 2013 21:27:56 +0100 (CET) X-Virus-Scanned: amavisd-new at madpilot.net Received: from winston.madpilot.net ([127.0.0.1]) by winston.madpilot.net (winston.madpilot.net [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id HF_WZPdusR1e; Sun, 15 Dec 2013 21:27:50 +0100 (CET) Received: from tommy.madpilot.net (micro.madpilot.net [88.149.173.206]) by winston.madpilot.net (Postfix) with ESMTPSA; Sun, 15 Dec 2013 21:27:50 +0100 (CET) Message-ID: <52AE10C5.2070800@FreeBSD.org> Date: Sun, 15 Dec 2013 21:27:49 +0100 From: Guido Falsi User-Agent: Mozilla/5.0 (X11; FreeBSD amd64; rv:24.0) Gecko/20100101 Thunderbird/24.2.0 MIME-Version: 1.0 To: Eygene Ryabinkin Subject: Re: svn commit: r326307 - in head: . Mk Mk/Uses archivers/rpm archivers/unrar archivers/unrar-iconv archivers/unzip audio/julius audio/mp3unicode audio/mpc audio/mpiosh audio/mpiosh/files audio/osd-lyr... References: <201309041806.r84I680e048857@svn.freebsd.org> <52AC6B4A.2080407@FreeBSD.org> In-Reply-To: Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Cc: svn-ports-head@freebsd.org, svn-ports-all@freebsd.org, ports-committers@freebsd.org X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 15 Dec 2013 20:28:04 -0000 On 12/15/13 16:34, Eygene Ryabinkin wrote: > Sat, Dec 14, 2013 at 03:29:30PM +0100, Guido Falsi wrote: >> That said, Your solution of renaming iconv.h could be a good idea I did >> not think about. >> >> Let me understand exactly; you used a procedure like this: >> >> 1) mv /usr/local/include/iconv.h /usr/local/include/iconv.h.old >> 2a) portupgrade -af (I'm not using portupgrade, please confirm correct >> syntax) >> 2b) portmaster -af > > Actually, it was a bit different one: > - get a fresh copy of ports tree; > - 'portupgrade -a' to get the latest versions of all ports; > was patched libiconv's Makefile to omit IGNORE; > - mv /usr/local/include/iconv.h /usr/local/include/iconv.h.old > - 'portupgrade -fa -x libiconv' > - pkg delete libiconv > > First two phases were done to make sure that "portupgrade -fa" won't > really upgrade anything, but will just reinstall with all port being > up to date (so there are no unbuildable ports). I am often sync the > ports tree to upgrade just one or two ports, so it could be just my > local dance that isn't nessessary. > > I'll try to upgrade my primary workstation with just > - mv /usr/local/include/iconv.h /usr/local/include/iconv.h.old > - 'portupgrade -fa -x libiconv' > - pkg delete libiconv > and will report the outcome. A better way to preserve old iconv is to save it in /usr/local/lib/compat/pkg then remove the port. It' almost the same as removing the iconv.h file imho. so doing: - cp /usr/local/lib/libiconv* /usr/local/lib/compat/pkg/ - pkg delete -f libiconv - portupgrade -fa -x libiconv should work the same, and should avoid references to the libiconv port from surviving in the pkgng database. Are you able to test this procedure too? I can try building a test jail for this, but that wouldn't be a good testcase, a live system which has been updated for months/years with hundreds of ports is quite different from a test jail with just a bunch of freshly installed ports. -- Guido Falsi From owner-svn-ports-head@FreeBSD.ORG Sun Dec 15 20:32:21 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 9039B55E; Sun, 15 Dec 2013 20:32:21 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 7D1011009; Sun, 15 Dec 2013 20:32:21 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBFKWLlu075768; Sun, 15 Dec 2013 20:32:21 GMT (envelope-from wg@svn.freebsd.org) Received: (from wg@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBFKWLPS075767; Sun, 15 Dec 2013 20:32:21 GMT (envelope-from wg@svn.freebsd.org) Message-Id: <201312152032.rBFKWLPS075767@svn.freebsd.org> From: William Grzybowski Date: Sun, 15 Dec 2013 20:32:21 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r336580 - head/japanese/mozc-server X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 15 Dec 2013 20:32:21 -0000 Author: wg Date: Sun Dec 15 20:32:20 2013 New Revision: 336580 URL: http://svnweb.freebsd.org/changeset/ports/336580 Log: japanese/mozc-server: depends explicitly on "python" to build Reported by: exp-run (PR 184591) Approved by: portmgr (blanket) Modified: head/japanese/mozc-server/Makefile Modified: head/japanese/mozc-server/Makefile ============================================================================== --- head/japanese/mozc-server/Makefile Sun Dec 15 20:21:20 2013 (r336579) +++ head/japanese/mozc-server/Makefile Sun Dec 15 20:32:20 2013 (r336580) @@ -14,6 +14,7 @@ COMMENT?= Mozc Japanese Input Method, Se LICENSE= BSD LICENSE_FILE= ${WRKSRC}/third_party/gyp/LICENSE +BUILD_DEPENDS= python:${PORTSDIR}/lang/python EXTRACT_DEPENDS=${PYTHON_CMD}:${PYTHON_PORTSDIR} LIB_DEPENDS= protobuf:${PORTSDIR}/devel/protobuf \ zinnia:${PORTSDIR}/japanese/zinnia From owner-svn-ports-head@FreeBSD.ORG Sun Dec 15 20:51:38 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 9F47ABAD; Sun, 15 Dec 2013 20:51:38 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 8B869112E; Sun, 15 Dec 2013 20:51:38 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBFKpc8g082761; Sun, 15 Dec 2013 20:51:38 GMT (envelope-from adamw@svn.freebsd.org) Received: (from adamw@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBFKpcqe082759; Sun, 15 Dec 2013 20:51:38 GMT (envelope-from adamw@svn.freebsd.org) Message-Id: <201312152051.rBFKpcqe082759@svn.freebsd.org> From: Adam Weinberger Date: Sun, 15 Dec 2013 20:51:38 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r336581 - in head/mail/spamprobe: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 15 Dec 2013 20:51:38 -0000 Author: adamw Date: Sun Dec 15 20:51:37 2013 New Revision: 336581 URL: http://svnweb.freebsd.org/changeset/ports/336581 Log: Use OPTIONS instead of WITH_XYZ's Default to PBL as the data store (per the author's recommendations) Use OPTIONS helpers where possible Fix with clang PR: ports/184579 Approved by: stefan (maintainer) Added: head/mail/spamprobe/files/patch-src_includes_Ref.h (contents, props changed) Modified: head/mail/spamprobe/Makefile Modified: head/mail/spamprobe/Makefile ============================================================================== --- head/mail/spamprobe/Makefile Sun Dec 15 20:32:20 2013 (r336580) +++ head/mail/spamprobe/Makefile Sun Dec 15 20:51:37 2013 (r336581) @@ -1,10 +1,10 @@ # Created by: Matthew N. Dodd # $FreeBSD$ -PORTNAME= spamprobe +PORTNAME= spamprobe PORTVERSION= 1.4d PORTREVISION= 7 -CATEGORIES= mail +CATEGORIES= mail MASTER_SITES= SF MAINTAINER= stefan@FreeBSD.org @@ -15,53 +15,44 @@ CONFIGURE_ARGS= --enable-default-8bit PLIST_FILES= bin/spamprobe man/man1/spamprobe.1.gz -.include +OPTIONS_DEFINE= GIF JPEG PNG +OPTIONS_MULTI= DATABASE +OPTIONS_MULTI_DATABASE= PBL BDB +OPTIONS_DEFAULT=PBL GIF JPEG PNG +PBL_DESC= PBL database support (author's recommended data store) -.if ${OSVERSION} >= 1000024 -USE_GCC= yes -.endif +CPPFLAGS+= -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib # PBL support -.if !defined(WITHOUT_PBL) -BUILD_DEPENDS+= ${LOCALBASE}/include/pbl.h:${PORTSDIR}/databases/libpbl -CONFIGURE_ARGS+= --with-pbl=${LOCALBASE} -CPPFLAGS+= -I${LOCALBASE}/include -LDFLAGS+= -L${LOCALBASE}/lib -lpbl -.endif +PBL_BUILD_DEPENDS= ${LOCALBASE}/lib/libpbl.a:${PORTSDIR}/databases/libpbl +PBL_RUN_DEPENDS+= ${PBL_BUILD_DEPENDS} +PBL_CONFIGURE_WITH= pbl +PBL_LDFLAGS= -lpbl # BerkleyDB support -.if !defined(WITHOUT_BDB) -USE_BDB= 40+ -CONFIGURE_ARGS+= --enable-cdb -CPPFLAGS+= -I${BDB_INCLUDE_DIR} -DUSE_DB=1 -LDFLAGS+= -L${LOCALBASE}/lib -l${BDB_LIB_NAME} -.endif +BDB_CONFIGURE_ENABLE= cdb +BDB_CONFIGURE_WITH= db +BDB_CPPFLAGS= -DUSE_DB=1 # giflib support -.if defined(WITHOUT_UNGIF) -CONFIGURE_ARGS+= --without-gif -.else -LIB_DEPENDS+= gif.5:${PORTSDIR}/graphics/giflib -CPPFLAGS+= -I${LOCALBASE}/include -LDFLAGS+= -L${LOCALBASE}/lib -.endif +GIF_CONFIGURE_WITH= gif +GIF_LIB_DEPENDS= libgif.so:${PORTSDIR}/graphics/giflib # PNG support -.if defined(WITHOUT_PNG) -CONFIGURE_ARGS+= --without-png -.else -LIB_DEPENDS+= png15:${PORTSDIR}/graphics/png -CPPFLAGS+= -I${LOCALBASE}/include -LDFLAGS+= -L${LOCALBASE}/lib -.endif +PNG_CONFIGURE_WITH= png +PNG_LIB_DEPENDS= libpng15.so:${PORTSDIR}/graphics/png # JPEG support -.if defined(WITHOUT_JPEG) -CONFIGURE_ARGS+= --without-jpeg -.else -LIB_DEPENDS+= jpeg.11:${PORTSDIR}/graphics/jpeg -CPPFLAGS+= -I${LOCALBASE}/include -LDFLAGS+= -L${LOCALBASE}/lib +JPEG_CONFIGURE_WITH=jpeg +JPEG_LIB_DEPENDS= libjpeg.so:${PORTSDIR}/graphics/jpeg + +.include + +.if ${PORT_OPTIONS:MBDB} +USE_BDB= 40+ +CPPFLAGS+= -I${BDB_INCLUDE_DIR} +LDFLAGS+= -l${BDB_LIB_NAME} .endif -.include +.include Added: head/mail/spamprobe/files/patch-src_includes_Ref.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/mail/spamprobe/files/patch-src_includes_Ref.h Sun Dec 15 20:51:37 2013 (r336581) @@ -0,0 +1,20 @@ +--- src/includes/Ref.h.orig 2013-12-07 13:41:33.000000000 -0500 ++++ src/includes/Ref.h 2013-12-07 13:41:49.000000000 -0500 +@@ -189,7 +189,7 @@ + + CRef &operator=(const CRef &other) + { +- assign(other); ++ this->assign(other); + return *this; + } + +@@ -245,7 +245,7 @@ + + Ref &operator=(const Ref &other) + { +- assign(other); ++ this->assign(other); + return *this; + } + From owner-svn-ports-head@FreeBSD.ORG Sun Dec 15 21:26:48 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 4C493F3C; Sun, 15 Dec 2013 21:26:48 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 380A512D4; Sun, 15 Dec 2013 21:26:48 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBFLQmB9094410; Sun, 15 Dec 2013 21:26:48 GMT (envelope-from thierry@svn.freebsd.org) Received: (from thierry@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBFLQmZa094408; Sun, 15 Dec 2013 21:26:48 GMT (envelope-from thierry@svn.freebsd.org) Message-Id: <201312152126.rBFLQmZa094408@svn.freebsd.org> From: Thierry Thomas Date: Sun, 15 Dec 2013 21:26:48 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r336582 - head/x11/rxvt-unicode X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 15 Dec 2013 21:26:48 -0000 Author: thierry Date: Sun Dec 15 21:26:47 2013 New Revision: 336582 URL: http://svnweb.freebsd.org/changeset/ports/336582 Log: Set support for 256 colors on by default. Note: PORTREVISION intentionnally not bumped; this is just for package building, and poudriere should notice it anyway. Requested by: R. Tyler Croy Modified: head/x11/rxvt-unicode/Makefile Modified: head/x11/rxvt-unicode/Makefile ============================================================================== --- head/x11/rxvt-unicode/Makefile Sun Dec 15 20:51:37 2013 (r336581) +++ head/x11/rxvt-unicode/Makefile Sun Dec 15 21:26:47 2013 (r336582) @@ -55,7 +55,8 @@ NOTIFY_DESC= Freedesktop startup notifi OPTIONS_DEFAULT=PERL XIM UNICODE3 ISO14755 COMBINING RXVT_SCROLLBAR \ NEXT_SCROLLBAR XTERM_SCROLLBAR BACKSPACE_KEY DELETE_KEY \ - MOUSEWHEEL SMART_RESIZE IMLOCALE_FIX GDK_PIXBUF + MOUSEWHEEL SMART_RESIZE IMLOCALE_FIX GDK_PIXBUF \ + 256_COLOR PORTDOCS1= Changes README.FAQ README.configure PORTDOCS= README.xvt ${PORTDOCS1} From owner-svn-ports-head@FreeBSD.ORG Sun Dec 15 21:33:14 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 09D0A1AD; Sun, 15 Dec 2013 21:33:14 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id EA22D1370; Sun, 15 Dec 2013 21:33:13 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBFLXDRQ097578; Sun, 15 Dec 2013 21:33:13 GMT (envelope-from mva@svn.freebsd.org) Received: (from mva@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBFLXDHb097577; Sun, 15 Dec 2013 21:33:13 GMT (envelope-from mva@svn.freebsd.org) Message-Id: <201312152133.rBFLXDHb097577@svn.freebsd.org> From: Marcus von Appen Date: Sun, 15 Dec 2013 21:33:13 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r336583 - head/math/biggles X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 15 Dec 2013 21:33:14 -0000 Author: mva Date: Sun Dec 15 21:33:13 2013 New Revision: 336583 URL: http://svnweb.freebsd.org/changeset/ports/336583 Log: - Fix the usage of 'python' to get rid of the implicit lang/python dependency Reported by: exp-run (PR 184591) Approved by: portmgr (blanket) Modified: head/math/biggles/Makefile (contents, props changed) Modified: head/math/biggles/Makefile ============================================================================== --- head/math/biggles/Makefile Sun Dec 15 21:26:47 2013 (r336582) +++ head/math/biggles/Makefile Sun Dec 15 21:33:13 2013 (r336583) @@ -27,6 +27,7 @@ MAKE_ARGS= CC="${CC}" \ NO_STAGE= yes post-patch: @${REINPLACE_CMD} -e '/CC/s,gcc,$$\{CC\},' ${WRKSRC}/make.inc + @${REINPLACE_CMD} -e 's|= python|= ${PYTHON_CMD}|' ${WRKSRC}/make.inc pre-build: @${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py ${WRKSRC} From owner-svn-ports-head@FreeBSD.ORG Sun Dec 15 21:36:44 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id BADFA38D; Sun, 15 Dec 2013 21:36:44 +0000 (UTC) Received: from frv152.fwdcdn.com (frv152.fwdcdn.com [212.42.77.152]) (using TLSv1.2 with cipher DHE-RSA-AES128-SHA (128/128 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 69D54138B; Sun, 15 Dec 2013 21:36:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=ukr.net; s=fsm; h=Content-Transfer-Encoding:Content-Type:Mime-Version:References:In-Reply-To:Message-ID:Subject:Cc:To:From:Date; bh=dTXnxFNNF61VhamKqN9d83X3OyZfaMe6qfr/AX2pHks=; b=bsanqvim/hloc2CDOn9AJ5FjzmmbRLFyI8SXCFlWWtAlL6ZtD5+2mMfVllAK5Hhx5Z/va4DEc8Al8fo6TXWUYwFDFVUrT4tBMNQ96h8NFHacoeluyOiYnRz0NLtwPPnp+Az+faI+/NTNch5sVw8t88rK6AntVkNhlYq6X0v/NIE=; Received: from [37.115.116.138] (helo=nonamehost.local) by frv152.fwdcdn.com with esmtpsa ID 1VsJMV-00043G-WE ; Sun, 15 Dec 2013 23:36:32 +0200 Date: Sun, 15 Dec 2013 23:36:31 +0200 From: Ivan Klymenko To: Thierry Thomas Subject: Re: svn commit: r336566 - in head/multimedia: mencoder mplayer mplayer/files Message-ID: <20131215233631.6096654f@nonamehost.local> In-Reply-To: <201312151850.rBFIoq2q038615@svn.freebsd.org> References: <201312151850.rBFIoq2q038615@svn.freebsd.org> X-Mailer: Claws Mail 3.9.2 (GTK+ 2.24.19; amd64-portbld-freebsd10.0) Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Authentication-Result: IP=37.115.116.138; mail.from=fidaj@ukr.net; dkim=pass; header.d=ukr.net Cc: svn-ports-head@freebsd.org, svn-ports-all@freebsd.org, ports-committers@freebsd.org X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 15 Dec 2013 21:36:44 -0000 =D0=92 Sun, 15 Dec 2013 18:50:52 +0000 (UTC) Thierry Thomas =D0=BF=D0=B8=D1=88=D0=B5=D1=82: > Author: thierry > Date: Sun Dec 15 18:50:51 2013 > New Revision: 336566 > URL: http://svnweb.freebsd.org/changeset/ports/336566 >=20 > Log: > - Update to 1.1.20131109 Please fix Makefile.optvars ---DV_LIB_DEPENDS=3D dv.so:${PORTSDIR}/multimedia/libdv +++DV_LIB_DEPENDS=3D dv:${PORTSDIR}/multimedia/libdv From owner-svn-ports-head@FreeBSD.ORG Sun Dec 15 21:37:51 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 79E66470; Sun, 15 Dec 2013 21:37:51 +0000 (UTC) Received: from mail-we0-x22c.google.com (mail-we0-x22c.google.com [IPv6:2a00:1450:400c:c03::22c]) (using TLSv1 with cipher ECDHE-RSA-RC4-SHA (128/128 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 93C801392; Sun, 15 Dec 2013 21:37:50 +0000 (UTC) Received: by mail-we0-f172.google.com with SMTP id w62so3916243wes.31 for ; Sun, 15 Dec 2013 13:37:49 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:date:from:to:cc:subject:message-id:references:mime-version :content-type:content-disposition:in-reply-to:user-agent; bh=8WdSJa/iIa4vGnBe+Pa3AD1QJSNDqqn8S4b3CMe0JxE=; b=ZQGV9w8rDtFQB4pMev0tsaIQKno0oNL1K3vsIopttwy3lwm8iqjdXV2ztqgSQPa9Af gmgR4y4PMtNHTWnpGAaN8ns76U6CRKg9hvsx2PmOpttgC63zdMD1d+D6AAMjn6NFcBtl L/729khYdx1TB0rWtxJwSrUKrX86n0mVYYQ8u0Z0BzRFlAcUwoWcfDPNSpc5/JZYKXqK gNHB47DRJvAqbb6EDph6F8Ceo/Odjvd3h2IwpPpPeG8Eks2vwFlzwJQsKjJaRgw6sbke kEdnf73jo0b9ZM9VRUKJmocH1zzy340G4I6DZfIHxj084kC8pA1r2EVkID7EALZYxbBa OF+w== X-Received: by 10.194.58.136 with SMTP id r8mr11253765wjq.4.1387143468962; Sun, 15 Dec 2013 13:37:48 -0800 (PST) Received: from ithaqua.etoilebsd.net (ithaqua.etoilebsd.net. [37.59.37.188]) by mx.google.com with ESMTPSA id j3sm19712248wiy.3.2013.12.15.13.37.47 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Sun, 15 Dec 2013 13:37:47 -0800 (PST) Sender: Baptiste Daroussin Date: Sun, 15 Dec 2013 22:37:45 +0100 From: Baptiste Daroussin To: Ivan Klymenko Subject: Re: svn commit: r336566 - in head/multimedia: mencoder mplayer mplayer/files Message-ID: <20131215213745.GM57153@ithaqua.etoilebsd.net> References: <201312151850.rBFIoq2q038615@svn.freebsd.org> <20131215233631.6096654f@nonamehost.local> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="TxukmIqg3MmZ0Kmh" Content-Disposition: inline In-Reply-To: <20131215233631.6096654f@nonamehost.local> User-Agent: Mutt/1.5.21 (2010-09-15) Cc: svn-ports-head@freebsd.org, Thierry Thomas , svn-ports-all@freebsd.org, ports-committers@freebsd.org X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 15 Dec 2013 21:37:51 -0000 --TxukmIqg3MmZ0Kmh Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Sun, Dec 15, 2013 at 11:36:31PM +0200, Ivan Klymenko wrote: > =D0=92 Sun, 15 Dec 2013 18:50:52 +0000 (UTC) > Thierry Thomas =D0=BF=D0=B8=D1=88=D0=B5=D1=82: >=20 > > Author: thierry > > Date: Sun Dec 15 18:50:51 2013 > > New Revision: 336566 > > URL: http://svnweb.freebsd.org/changeset/ports/336566 > >=20 > > Log: > > - Update to 1.1.20131109 >=20 > Please fix Makefile.optvars >=20 > ---DV_LIB_DEPENDS=3D dv.so:${PORTSDIR}/multimedia/libdv > +++DV_LIB_DEPENDS=3D dv:${PORTSDIR}/multimedia/libdv that is not the right fix, libdv.so is. Bapt --TxukmIqg3MmZ0Kmh Content-Type: application/pgp-signature -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.15 (FreeBSD) iEYEARECAAYFAlKuISkACgkQ8kTtMUmk6EzknwCgk699dWrLqLnG5fR4vjyl2R8p W+4An1FFtx5UbD7uzS9Sb70eajQNQZ/n =Hxyr -----END PGP SIGNATURE----- --TxukmIqg3MmZ0Kmh-- From owner-svn-ports-head@FreeBSD.ORG Sun Dec 15 21:50:25 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id A06396A4; Sun, 15 Dec 2013 21:50:25 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 8D1BD14E2; Sun, 15 Dec 2013 21:50:25 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBFLoPNg004018; Sun, 15 Dec 2013 21:50:25 GMT (envelope-from wg@svn.freebsd.org) Received: (from wg@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBFLoPrI003999; Sun, 15 Dec 2013 21:50:25 GMT (envelope-from wg@svn.freebsd.org) Message-Id: <201312152150.rBFLoPrI003999@svn.freebsd.org> From: William Grzybowski Date: Sun, 15 Dec 2013 21:50:25 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r336584 - head/x11-wm/ede X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 15 Dec 2013 21:50:25 -0000 Author: wg Date: Sun Dec 15 21:50:25 2013 New Revision: 336584 URL: http://svnweb.freebsd.org/changeset/ports/336584 Log: x11-wm/ede: depends explicitly on "python" to build Reported by: exp-run (PR 184591) Approved by: portmgr (blanket) Modified: head/x11-wm/ede/Makefile Modified: head/x11-wm/ede/Makefile ============================================================================== --- head/x11-wm/ede/Makefile Sun Dec 15 21:33:13 2013 (r336583) +++ head/x11-wm/ede/Makefile Sun Dec 15 21:50:25 2013 (r336584) @@ -16,7 +16,8 @@ COMMENT= Equinox Desktop Environment LICENSE= GPLv2 LGPL20 LICENSE_COMB= multi -BUILD_DEPENDS= doxygen:${PORTSDIR}/devel/doxygen \ +BUILD_DEPENDS= python:${PORTSDIR}/lang/python \ + doxygen:${PORTSDIR}/devel/doxygen \ jam:${PORTSDIR}/devel/jam \ update-mime-database:${PORTSDIR}/misc/shared-mime-info LIB_DEPENDS= dbus-1.3:${PORTSDIR}/devel/dbus \ From owner-svn-ports-head@FreeBSD.ORG Sun Dec 15 21:50:52 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 0F8E377E; Sun, 15 Dec 2013 21:50:52 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id F017614E6; Sun, 15 Dec 2013 21:50:51 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBFLoptE004399; Sun, 15 Dec 2013 21:50:51 GMT (envelope-from mva@svn.freebsd.org) Received: (from mva@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBFLopXt004398; Sun, 15 Dec 2013 21:50:51 GMT (envelope-from mva@svn.freebsd.org) Message-Id: <201312152150.rBFLopXt004398@svn.freebsd.org> From: Marcus von Appen Date: Sun, 15 Dec 2013 21:50:51 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r336585 - head/japanese/mozc-server X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 15 Dec 2013 21:50:52 -0000 Author: mva Date: Sun Dec 15 21:50:51 2013 New Revision: 336585 URL: http://svnweb.freebsd.org/changeset/ports/336585 Log: - Depend explicitly on lang/python at build time. Reported by: exp-run (PR 184591) Approved by: portmgr (blanket) Modified: head/japanese/mozc-server/Makefile Modified: head/japanese/mozc-server/Makefile ============================================================================== --- head/japanese/mozc-server/Makefile Sun Dec 15 21:50:25 2013 (r336584) +++ head/japanese/mozc-server/Makefile Sun Dec 15 21:50:51 2013 (r336585) @@ -19,6 +19,7 @@ EXTRACT_DEPENDS=${PYTHON_CMD}:${PYTHON_P LIB_DEPENDS= protobuf:${PORTSDIR}/devel/protobuf \ zinnia:${PORTSDIR}/japanese/zinnia RUN_DEPENDS= xdg-open:${PORTSDIR}/devel/xdg-utils +BUILD_DEPENDS= python:${PORTSDIR}/lang/python USES= pkgconfig iconv USE_BZIP2= yes From owner-svn-ports-head@FreeBSD.ORG Sun Dec 15 21:53:30 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 5D1A9887; Sun, 15 Dec 2013 21:53:30 +0000 (UTC) Received: from frv152.fwdcdn.com (frv152.fwdcdn.com [212.42.77.152]) (using TLSv1.2 with cipher DHE-RSA-AES128-SHA (128/128 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id D017A14FF; Sun, 15 Dec 2013 21:53:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=ukr.net; s=fsm; h=Content-Transfer-Encoding:Content-Type:Mime-Version:References:In-Reply-To:Message-ID:Subject:Cc:To:From:Date; bh=o5dAghmGpfri7JIbj6x6McAk5wwvu8X7YkQdhaH7+ak=; b=eZtIVrP+0PKvhaMJDCWmeFv/8cV5X0AHYp8aHZJIGwG2/yaEpg943f4g4RjKTiO5FJd++8KzGl6Ga3liMc23GVeF7otwqOowOMGse1CbNJt1dA2TJt5eGnU5kyW+nla4OOniY0lx9w4u7IwVSLDo22RoV4pDDwKyZ6MRP3TOZzY=; Received: from [37.115.116.138] (helo=nonamehost.local) by frv152.fwdcdn.com with esmtpsa ID 1VsJcu-000NTA-5R ; Sun, 15 Dec 2013 23:53:28 +0200 Date: Sun, 15 Dec 2013 23:53:27 +0200 From: Ivan Klymenko To: Baptiste Daroussin Subject: Re: svn commit: r336566 - in head/multimedia: mencoder mplayer mplayer/files Message-ID: <20131215235327.55b79747@nonamehost.local> In-Reply-To: <20131215213745.GM57153@ithaqua.etoilebsd.net> References: <201312151850.rBFIoq2q038615@svn.freebsd.org> <20131215233631.6096654f@nonamehost.local> <20131215213745.GM57153@ithaqua.etoilebsd.net> X-Mailer: Claws Mail 3.9.2 (GTK+ 2.24.19; amd64-portbld-freebsd10.0) Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Authentication-Result: IP=37.115.116.138; mail.from=fidaj@ukr.net; dkim=pass; header.d=ukr.net Cc: svn-ports-head@freebsd.org, Thierry Thomas , svn-ports-all@freebsd.org, ports-committers@freebsd.org X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 15 Dec 2013 21:53:30 -0000 =D0=92 Sun, 15 Dec 2013 22:37:45 +0100 Baptiste Daroussin =D0=BF=D0=B8=D1=88=D0=B5=D1=82: > On Sun, Dec 15, 2013 at 11:36:31PM +0200, Ivan Klymenko wrote: > > =D0=92 Sun, 15 Dec 2013 18:50:52 +0000 (UTC) > > Thierry Thomas =D0=BF=D0=B8=D1=88=D0=B5=D1=82: > >=20 > > > Author: thierry > > > Date: Sun Dec 15 18:50:51 2013 > > > New Revision: 336566 > > > URL: http://svnweb.freebsd.org/changeset/ports/336566 > > >=20 > > > Log: > > > - Update to 1.1.20131109 > >=20 > > Please fix Makefile.optvars > >=20 > > ---DV_LIB_DEPENDS=3D dv.so:${PORTSDIR}/multimedia/libdv > > +++DV_LIB_DEPENDS=3D dv:${PORTSDIR}/multimedia/libdv >=20 > that is not the right fix, libdv.so is. >=20 > Bapt so then need to fix same way ports: devel/synfig multimedia/dv2jpg multimedia/mlt multimedia/kino multimedia/transcode multimedia/xawtv :) From owner-svn-ports-head@FreeBSD.ORG Sun Dec 15 21:54:20 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 1389D972; Sun, 15 Dec 2013 21:54:20 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 000B0150C; Sun, 15 Dec 2013 21:54:19 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBFLsJhw005035; Sun, 15 Dec 2013 21:54:19 GMT (envelope-from thierry@svn.freebsd.org) Received: (from thierry@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBFLsJKq005034; Sun, 15 Dec 2013 21:54:19 GMT (envelope-from thierry@svn.freebsd.org) Message-Id: <201312152154.rBFLsJKq005034@svn.freebsd.org> From: Thierry Thomas Date: Sun, 15 Dec 2013 21:54:19 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r336586 - head/multimedia/mplayer X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 15 Dec 2013 21:54:20 -0000 Author: thierry Date: Sun Dec 15 21:54:19 2013 New Revision: 336586 URL: http://svnweb.freebsd.org/changeset/ports/336586 Log: Fix libdv entry. Reported by: Ivan Klymenko Modified: head/multimedia/mplayer/Makefile.optvars Modified: head/multimedia/mplayer/Makefile.optvars ============================================================================== --- head/multimedia/mplayer/Makefile.optvars Sun Dec 15 21:50:51 2013 (r336585) +++ head/multimedia/mplayer/Makefile.optvars Sun Dec 15 21:54:19 2013 (r336586) @@ -26,7 +26,7 @@ CDPARANOIA_CONFIGURE_OFF= --disable-cdpa DIRAC_LIB_DEPENDS= libdirac_encoder.so:${PORTSDIR}/multimedia/dirac DIRAC_CONFIGURE_OFF= --disable-libdirac-lavc -DV_LIB_DEPENDS= dv.so:${PORTSDIR}/multimedia/libdv +DV_LIB_DEPENDS= libdv.so:${PORTSDIR}/multimedia/libdv DV_CONFIGURE_OFF= --disable-libdv ENCA_LIB_DEPENDS= libenca.so:${PORTSDIR}/converters/enca From owner-svn-ports-head@FreeBSD.ORG Sun Dec 15 21:56:08 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id DD827A5F; Sun, 15 Dec 2013 21:56:08 +0000 (UTC) Received: from mx1b.lautre.net (etna.lautre.net [80.67.160.72]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id EC3051517; Sun, 15 Dec 2013 21:56:07 +0000 (UTC) Received: from graf.pompo.net (graf.pompo.net [78.225.128.39]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) (Authenticated sender: thierry@pompo.net) by mx1b.lautre.net (Postfix) with ESMTPSA id 6A7C97E071; Sun, 15 Dec 2013 22:56:05 +0100 (CET) Received: by graf.pompo.net (Postfix, from userid 1001) id C5DD242D18AF; Sun, 15 Dec 2013 22:56:04 +0100 (CET) Date: Sun, 15 Dec 2013 22:56:04 +0100 From: Thierry Thomas To: Baptiste Daroussin Subject: Re: svn commit: r336566 - in head/multimedia: mencoder mplayer mplayer/files Message-ID: <20131215215604.GC14741@graf.pompo.net> Mail-Followup-To: Baptiste Daroussin , Ivan Klymenko , ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org References: <201312151850.rBFIoq2q038615@svn.freebsd.org> <20131215233631.6096654f@nonamehost.local> <20131215213745.GM57153@ithaqua.etoilebsd.net> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha512; protocol="application/pgp-signature"; boundary="E13BgyNx05feLLmH" Content-Disposition: inline In-Reply-To: <20131215213745.GM57153@ithaqua.etoilebsd.net> X-Operating-System: FreeBSD 9.2-STABLE i386 Organization: Kabbale Eros X-Face: (hRbQnK~Pt7$ct`!fupO(`y_WL4^-Iwn4@ly-.,[4xC4xc; y=\ipKMNm<1J>lv@PP~7Z<.t KjAnXLs: X-PGP: 0xF1C516B3C8359753 User-Agent: Mutt/1.5.22 (2013-10-16) Cc: Ivan Klymenko , svn-ports-head@freebsd.org, svn-ports-all@freebsd.org, ports-committers@freebsd.org X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 15 Dec 2013 21:56:08 -0000 --E13BgyNx05feLLmH Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On sun 15 dec 13 at 22:37:45 +0100, Baptiste Daroussin wrote: > > Please fix Makefile.optvars > >=20 > > ---DV_LIB_DEPENDS=3D dv.so:${PORTSDIR}/multimedia/libdv > > +++DV_LIB_DEPENDS=3D dv:${PORTSDIR}/multimedia/libdv >=20 > that is not the right fix, libdv.so is. Thanks for the notification! --=20 Th. Thomas. --E13BgyNx05feLLmH Content-Type: application/pgp-signature -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.15 (FreeBSD) iQJ8BAEBCgBmBQJSriV0XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXRFNTM2QkU4NTM4NTM5OUQwMEI2RkFBNzZG MUM1MTZCM0M4MzU5NzUzAAoJEPHFFrPINZdTzU4P+wQcZCf8B1qBqaLc7dv97cSx 9Ne2TR+o0USAAVwsmFZn2k6LRJ38pFIq77XbmdnCOyp3JVXk8/1mQQOM/nPMZHb6 aNoNk1zXdjnXKCYMlH9JVVfFSX3PYiaF1/SG18NHg0VfvxdCntzuETYCCm2OIzV2 v7nntcF9Dd0nDBet9Yx5WN1rhSx1aRRLtOy1oo1Z8CQ/WXLqz//8s+d874a+GHAC hFb1Kee60kqR41rEJvEz5VQTwgYDX9eKs+YJNQVBImrC6gvWYU55UODGkF9bGA/D 1BJi+4Ch4MxEuY/HIwUA9pHSKD4cqNQ2/GY0jVss2TQCce42o39vaupRp1zWWyDj lrYiM0D7ayLmT/LRiScKhluO6BMufvFd6n5nqizb51klX0cmw+ChbEqNO5OykNx4 kdjHQGBNZiqRQCgk7Ez2D9Dtp6wQXCsaGkgp3VnA7wa81bicdvHvmDp0+AQQSmI6 ZDvECySvfVOp5x/JKHkbRwO7qauCePGSe/6ce5UfcEsFFnpx7lPvoxNESR+Kq49q Px4ZtPHDyO5lJ5IqGhBAXLMum/epV1KDit7jm5EYctW8uiIWCvedDj9k+OKXwpXm KmLACKl4HSG7Sgs4GlDVXqBVLws5T8HRu1SdzDii8tbg1/YpASyczxPuR+UjBsUV GWAZiBiwJigQe9B10anV =lxl0 -----END PGP SIGNATURE----- --E13BgyNx05feLLmH-- From owner-svn-ports-head@FreeBSD.ORG Sun Dec 15 21:56:41 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id A8693B3C; Sun, 15 Dec 2013 21:56:41 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 94EF0151E; Sun, 15 Dec 2013 21:56:41 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBFLufIa005401; Sun, 15 Dec 2013 21:56:41 GMT (envelope-from wg@svn.freebsd.org) Received: (from wg@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBFLufun005400; Sun, 15 Dec 2013 21:56:41 GMT (envelope-from wg@svn.freebsd.org) Message-Id: <201312152156.rBFLufun005400@svn.freebsd.org> From: William Grzybowski Date: Sun, 15 Dec 2013 21:56:41 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r336587 - head/Mk X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 15 Dec 2013 21:56:41 -0000 Author: wg Date: Sun Dec 15 21:56:41 2013 New Revision: 336587 URL: http://svnweb.freebsd.org/changeset/ports/336587 Log: Mk/bsd.sanity.mk: note USE_PYDISTUTILS=easy_install deprecation Now that all python packages use setuptools and eggs are undesired for system wide packages the ports should use USE_PYDISTUTILS=yes instead. Approved by: portmgr (bapt) Modified: head/Mk/bsd.sanity.mk Modified: head/Mk/bsd.sanity.mk ============================================================================== --- head/Mk/bsd.sanity.mk Sun Dec 15 21:54:19 2013 (r336586) +++ head/Mk/bsd.sanity.mk Sun Dec 15 21:56:41 2013 (r336587) @@ -145,3 +145,7 @@ DEV_WARNING+= "USE_DOS2UNIX is deprecate DEV_WARNING+= "LICENSE must not contain BSD, instead use BSD[234]CLAUSE" .endif .endif + +.if defined(USE_PYDISTUTILS) && ${USE_PYDISTUTILS} == "easy_install" +DEV_WARNING+= "USE_PYDISTUTILS=easy_install is deprecated, please use USE_PYDISTUTILS=yes" +.endif From owner-svn-ports-head@FreeBSD.ORG Sun Dec 15 21:56:49 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 8B07AC11; Sun, 15 Dec 2013 21:56:49 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 77A681520; Sun, 15 Dec 2013 21:56:49 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBFLunrt005476; Sun, 15 Dec 2013 21:56:49 GMT (envelope-from mva@svn.freebsd.org) Received: (from mva@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBFLuntH005475; Sun, 15 Dec 2013 21:56:49 GMT (envelope-from mva@svn.freebsd.org) Message-Id: <201312152156.rBFLuntH005475@svn.freebsd.org> From: Marcus von Appen Date: Sun, 15 Dec 2013 21:56:49 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r336588 - head/japanese/mozc-server X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 15 Dec 2013 21:56:49 -0000 Author: mva Date: Sun Dec 15 21:56:48 2013 New Revision: 336588 URL: http://svnweb.freebsd.org/changeset/ports/336588 Log: - Back out my change, since wg@ already fixed the port Noticed by: wg@ Modified: head/japanese/mozc-server/Makefile Modified: head/japanese/mozc-server/Makefile ============================================================================== --- head/japanese/mozc-server/Makefile Sun Dec 15 21:56:41 2013 (r336587) +++ head/japanese/mozc-server/Makefile Sun Dec 15 21:56:48 2013 (r336588) @@ -19,7 +19,6 @@ EXTRACT_DEPENDS=${PYTHON_CMD}:${PYTHON_P LIB_DEPENDS= protobuf:${PORTSDIR}/devel/protobuf \ zinnia:${PORTSDIR}/japanese/zinnia RUN_DEPENDS= xdg-open:${PORTSDIR}/devel/xdg-utils -BUILD_DEPENDS= python:${PORTSDIR}/lang/python USES= pkgconfig iconv USE_BZIP2= yes From owner-svn-ports-head@FreeBSD.ORG Sun Dec 15 21:58:41 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 6AC3ECFC; Sun, 15 Dec 2013 21:58:41 +0000 (UTC) Received: from frv154.fwdcdn.com (frv154.fwdcdn.com [212.42.77.154]) (using TLSv1.2 with cipher DHE-RSA-AES128-SHA (128/128 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 20CF21534; Sun, 15 Dec 2013 21:58:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=ukr.net; s=fsm; h=Content-Transfer-Encoding:Content-Type:Mime-Version:References:In-Reply-To:Message-ID:Subject:Cc:To:From:Date; bh=Ah58XeeE4lGluLwIxY5y/hDmynqucVGj6LvBTUJkNww=; b=fC3x4OYr27pZ71T+dZ2YK5S3CkZV2bHdTsimaZHU2FFe2mW1U1IR0HcBFMwUAtQpR/gSgVEz4aYAAe+WN8ithyujbZ678LBQdB7LdeTB66OY7Bp7RFot1H/aHFlIxpI1G8ntB8sWjOYTTnJytmy1qwgCUaFA4J9HsmfnZeaddJ0=; Received: from [37.115.116.138] (helo=nonamehost.local) by frv154.fwdcdn.com with esmtpsa ID 1VsJhp-000Ntf-Gj ; Sun, 15 Dec 2013 23:58:33 +0200 Date: Sun, 15 Dec 2013 23:58:32 +0200 From: Ivan Klymenko To: Thierry Thomas Subject: Re: svn commit: r336586 - head/multimedia/mplayer Message-ID: <20131215235832.5d7263b5@nonamehost.local> In-Reply-To: <201312152154.rBFLsJKq005034@svn.freebsd.org> References: <201312152154.rBFLsJKq005034@svn.freebsd.org> X-Mailer: Claws Mail 3.9.2 (GTK+ 2.24.19; amd64-portbld-freebsd10.0) Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Authentication-Result: IP=37.115.116.138; mail.from=fidaj@ukr.net; dkim=pass; header.d=ukr.net Cc: svn-ports-head@freebsd.org, svn-ports-all@freebsd.org, ports-committers@freebsd.org X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 15 Dec 2013 21:58:41 -0000 =D0=92 Sun, 15 Dec 2013 21:54:19 +0000 (UTC) Thierry Thomas =D0=BF=D0=B8=D1=88=D0=B5=D1=82: > Author: thierry > Date: Sun Dec 15 21:54:19 2013 > New Revision: 336586 > URL: http://svnweb.freebsd.org/changeset/ports/336586 >=20 > Log: > Fix libdv entry. Thanks! From owner-svn-ports-head@FreeBSD.ORG Sun Dec 15 22:11:26 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 61E4DB5; Sun, 15 Dec 2013 22:11:26 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 4ADB51626; Sun, 15 Dec 2013 22:11:26 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBFMBQ85012717; Sun, 15 Dec 2013 22:11:26 GMT (envelope-from ohauer@svn.freebsd.org) Received: (from ohauer@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBFMBLxq012681; Sun, 15 Dec 2013 22:11:21 GMT (envelope-from ohauer@svn.freebsd.org) Message-Id: <201312152211.rBFMBLxq012681@svn.freebsd.org> From: Olli Hauer Date: Sun, 15 Dec 2013 22:11:21 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r336589 - in head/www: mod_auth_mysql2 mod_auth_mysql_another mod_authnz_external mod_domaintree mod_evasive mod_fileiri mod_flickr mod_geoip2 mod_gzip2 mod_hosts_access mod_limitipconn... X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 15 Dec 2013 22:11:26 -0000 Author: ohauer Date: Sun Dec 15 22:11:20 2013 New Revision: 336589 URL: http://svnweb.freebsd.org/changeset/ports/336589 Log: - add stage support - add license - minor cleanups with hat apache@ Modified: head/www/mod_auth_mysql2/Makefile head/www/mod_auth_mysql_another/Makefile head/www/mod_authnz_external/Makefile head/www/mod_domaintree/Makefile head/www/mod_evasive/Makefile head/www/mod_fileiri/Makefile head/www/mod_flickr/Makefile head/www/mod_geoip2/Makefile head/www/mod_gzip2/Makefile head/www/mod_hosts_access/Makefile head/www/mod_limitipconn2/Makefile head/www/mod_log_firstbyte/Makefile head/www/mod_macro22/Makefile head/www/mod_memcache/Makefile head/www/mod_memcache_block/Makefile head/www/mod_proxy_xml/Makefile head/www/mod_qos/Makefile head/www/mod_remoteip/Makefile head/www/mod_reproxy/Makefile head/www/mod_scgi/Makefile head/www/mod_setenvifplus/Makefile head/www/mod_uid/Makefile head/www/mod_umask/Makefile head/www/mod_xml2enc/Makefile head/www/mod_xsendfile/Makefile Modified: head/www/mod_auth_mysql2/Makefile ============================================================================== --- head/www/mod_auth_mysql2/Makefile Sun Dec 15 21:56:48 2013 (r336588) +++ head/www/mod_auth_mysql2/Makefile Sun Dec 15 22:11:20 2013 (r336589) @@ -6,6 +6,7 @@ PORTVERSION= 1.10 PORTREVISION= 2 CATEGORIES= www MASTER_SITES= http://www.heuer.org/mod_auth_mysql/old/ +PKGNAMESUFFIX= 2 DISTNAME= ${PORTNAME}_${PORTVERSION} EXTRACT_SUFX= .tgz DIST_SUBDIR= apache2 @@ -15,8 +16,6 @@ COMMENT= MySQL-based authentication modu LICENSE= AL2 -LATEST_LINK= mod_auth_mysql2 - WRKSRC= ${WRKDIR}/${PORTNAME} USE_MYSQL= yes USE_APACHE= 22+ @@ -30,15 +29,10 @@ USE_OPENSSL= yes AP_EXTRAS+= -DMYSQL_USE_SSL .endif -.if !defined(NOPORTDOCS) PORTDOCS= INSTALL example_data.html htpasswd.sql -.endif -NO_STAGE= yes post-install: -.if !defined(NOPORTDOCS) - @${MKDIR} ${DOCSDIR} - @cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${DOCSDIR} -.endif + @${MKDIR} ${STAGEDIR}${DOCSDIR} + ${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR} .include Modified: head/www/mod_auth_mysql_another/Makefile ============================================================================== --- head/www/mod_auth_mysql_another/Makefile Sun Dec 15 21:56:48 2013 (r336588) +++ head/www/mod_auth_mysql_another/Makefile Sun Dec 15 22:11:20 2013 (r336589) @@ -11,6 +11,7 @@ PKGNAMESUFFIX= _another MAINTAINER= apache@FreeBSD.org COMMENT= Allows users to use MySQL databases for user authentication +#LICENSE= AL10 USE_MYSQL= yes USE_APACHE= 22 @@ -23,23 +24,14 @@ AP_LIB= ${LOCALBASE}/lib/mysql AP_EXTRAS= -lmysqlclient -lz -lm AP_EXTRAS+= -DAPACHE2 -NO_STAGE= yes -.include +PORTDOCS= CONFIGURE CHANGES post-patch: ${REINPLACE_CMD} -e "s|APR_XtOffsetOf|APR_OFFSETOF|g" \ -e "s|APR_XtOffset|APR_OFFSET|g" ${WRKSRC}/mod_auth_mysql.c -.if !defined(NOPORTDOCS) -post-build: - @${ECHO} "%%PORTDOCS%%%%DOCSDIR%%/CONFIGURE" >> ${PLIST} - @${ECHO} "%%PORTDOCS%%%%DOCSDIR%%/CHANGES" >> ${PLIST} - @${ECHO} "%%PORTDOCS%%@dirrm %%DOCSDIR%%" >> ${PLIST} - post-install: - @${MKDIR} ${DOCSDIR} - @${INSTALL_DATA} ${WRKSRC}/CONFIGURE ${DOCSDIR} - @${INSTALL_DATA} ${WRKSRC}/CHANGES ${DOCSDIR} -.endif + @${MKDIR} ${STAGEDIR}${DOCSDIR} + @${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR} -.include +.include Modified: head/www/mod_authnz_external/Makefile ============================================================================== --- head/www/mod_authnz_external/Makefile Sun Dec 15 21:56:48 2013 (r336588) +++ head/www/mod_authnz_external/Makefile Sun Dec 15 22:11:20 2013 (r336589) @@ -11,7 +11,6 @@ DIST_SUBDIR= apache2 MAINTAINER= eg@fbsd.lt COMMENT= Allows users authentication based on external mechanisms on apache 2.2 - USE_APACHE= 22 AP_FAST_BUILD= yes AP_GENPLIST= yes @@ -21,13 +20,8 @@ PROJECTHOST= mod-auth-external PORTDOCS= AUTHENTICATORS INSTALL README \ CHANGES UPGRADE INSTALL.HARDCODE -NO_STAGE= yes post-install: -.if !defined(NOPORTDOCS) - @${MKDIR} ${DOCSDIR} -. for f in ${PORTDOCS} - @${INSTALL_DATA} ${WRKSRC}/${f} ${DOCSDIR} -. endfor -.endif + @${MKDIR} ${STAGEDIR}${DOCSDIR} + @${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR} .include Modified: head/www/mod_domaintree/Makefile ============================================================================== --- head/www/mod_domaintree/Makefile Sun Dec 15 21:56:48 2013 (r336588) +++ head/www/mod_domaintree/Makefile Sun Dec 15 22:11:20 2013 (r336589) @@ -11,7 +11,6 @@ EXTRACT_SUFX= .tgz MAINTAINER= danger@FreeBSD.org COMMENT= Hostname to filesystem mapper for Apache 2 - WRKSRC= ${WRKDIR}/${PORTNAME} USE_APACHE= 22+ AP_FAST_BUILD= yes @@ -19,13 +18,8 @@ AP_GENPLIST= yes PORTDOCS= LICENSE.txt ChangeLog -PLIST_FILES= share/doc/mod_domaintree/LICENSE.txt \ - share/doc/mod_domaintree/ChangeLog -PLIST_DIRS= share/doc/mod_domaintree - -NO_STAGE= yes post-install: - @${MKDIR} ${DOCSDIR} - @cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${DOCSDIR} + @${MKDIR} ${STAGEDIR}${DOCSDIR} + ${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR} .include Modified: head/www/mod_evasive/Makefile ============================================================================== --- head/www/mod_evasive/Makefile Sun Dec 15 21:56:48 2013 (r336588) +++ head/www/mod_evasive/Makefile Sun Dec 15 22:11:20 2013 (r336589) @@ -10,33 +10,26 @@ DISTNAME= mod_evasive_${PORTVERSION} DIST_SUBDIR= apache2 MAINTAINER= kiwi@oav.net -COMMENT= An Apache module to try to protect the HTTP Server from DoS/DDoS attacks +COMMENT= Apache module to try to protect the HTTP Server from DoS/DDoS attacks +LICENSE= GPLv2 WRKSRC= ${WRKDIR}/${PORTNAME} USE_APACHE= 22 AP_FAST_BUILD= yes AP_GENPLIST= yes - -PORTDOCS= LICENSE README test.pl - -NO_STAGE= yes -.include - MODULENAME= ${PORTNAME}20 +PORTDOCS= README test.pl + post-patch: @${REINPLACE_CMD} -e "s|/bin/mail|/usr/bin/mail|g" \ ${WRKSRC}/mod_evasive.c ${WRKSRC}/mod_evasive20.c \ ${WRKSRC}/mod_evasiveNSAPI.c post-install: -.if !defined (NOPORTDOCS) - @${MKDIR} ${DOCSDIR} -. for f in ${PORTDOCS} - @${INSTALL_DATA} ${WRKSRC}/${f} ${DOCSDIR} -. endfor -.endif + @${MKDIR} ${STAGEDIR}${DOCSDIR} + @${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR} -.include +.include Modified: head/www/mod_fileiri/Makefile ============================================================================== --- head/www/mod_fileiri/Makefile Sun Dec 15 21:56:48 2013 (r336588) +++ head/www/mod_fileiri/Makefile Sun Dec 15 22:11:20 2013 (r336589) @@ -10,13 +10,12 @@ PKGNAMEPREFIX= ${APACHE_PKGNAMEPREFIX} DIST_SUBDIR= apache2 MAINTAINER= apache@FreeBSD.org -COMMENT= A http IRIs module for Apache 2 +COMMENT= Apache 2.x http IRIs module +#LICENSE= AL11 USE_APACHE= 22+ - AP_FAST_BUILD= yes AP_GENPLIST= yes -NO_STAGE= yes .include Modified: head/www/mod_flickr/Makefile ============================================================================== --- head/www/mod_flickr/Makefile Sun Dec 15 21:56:48 2013 (r336588) +++ head/www/mod_flickr/Makefile Sun Dec 15 22:11:20 2013 (r336589) @@ -10,8 +10,7 @@ MASTER_SITES= http://www.vshank.com/modc MAINTAINER= venkyshankar@yahoo.com COMMENT= Apache module for Flickr API access -LIB_DEPENDS= curl:${PORTSDIR}/ftp/curl - +LIB_DEPENDS= libcurl.so:${PORTSDIR}/ftp/curl XTRA_FLAGS= -lcurl @@ -29,7 +28,6 @@ USE_APACHE= 22+ AP_FAST_BUILD= yes AP_GENPLIST= yes -NO_STAGE= yes post-patch: @${REINPLACE_CMD} -e '//d' ${WRKSRC}/mod_flickr.c Modified: head/www/mod_geoip2/Makefile ============================================================================== --- head/www/mod_geoip2/Makefile Sun Dec 15 21:56:48 2013 (r336588) +++ head/www/mod_geoip2/Makefile Sun Dec 15 22:11:20 2013 (r336589) @@ -8,16 +8,13 @@ MASTER_SITES= http://geolite.maxmind.com DISTNAME= ${PORTNAME}_${PORTVERSION} MAINTAINER= jau@iki.fi -COMMENT= An Apache module that provides the country code of the client's IP +COMMENT= Apache module that provides the country code of the client IP LICENSE= AL2 BUILD_DEPENDS= GeoIP>=1.4.4:${PORTSDIR}/net/GeoIP RUN_DEPENDS= GeoIP>=1.4.4:${PORTSDIR}/net/GeoIP - -CONFLICTS= mod_geoip-[0-9]* - WRKSRC= ${WRKDIR}/${PORTNAME}_${PORTVERSION} USE_APACHE= 22 @@ -30,12 +27,8 @@ AP_LIB+= ${LOCALBASE}/lib -lGeoIP SUB_FILES+= pkg-message PORTDOCS= Changes INSTALL README README.php -NO_STAGE= yes post-install: -.if !defined(NOPORTDOCS) - ${MKDIR} ${DOCSDIR} - ${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${DOCSDIR} -.endif - @${CAT} ${PKGMESSAGE} + ${MKDIR} ${STAGEDIR}${DOCSDIR} + ${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR} .include Modified: head/www/mod_gzip2/Makefile ============================================================================== --- head/www/mod_gzip2/Makefile Sun Dec 15 21:56:48 2013 (r336588) +++ head/www/mod_gzip2/Makefile Sun Dec 15 22:11:20 2013 (r336589) @@ -9,8 +9,9 @@ MASTER_SITES= http://www.gknw.net/develo DISTNAME= mod_gzip-${PORTVERSION} MAINTAINER= sec@42.org -COMMENT= An Internet Content Acceleration module for Apache2+ +COMMENT= Apache 2.x Internet Content Acceleration module +#LICENSE= AL11 USE_APACHE= 22+ AP_FAST_BUILD= yes @@ -18,24 +19,16 @@ AP_GENPLIST= yes MAKE_ENV+= "APXS=${APXS}" USE_GMAKE= yes -.if !defined(NOPORTDOCS) -PLIST_FILES= ${DOCSDIR:S/${PREFIX}\///}/commands.txt -PLIST_FILES+= ${DOCSDIR:S/${PREFIX}\///}/samples.txt -PLIST_DIRS= ${DOCSDIR:S/${PREFIX}\///} -.endif -PLIST_FILES+= share/examples/mod_gzip2/mod_gzip2.conf.sample -PLIST_DIRS+= share/examples/mod_gzip2 +PORTDOCS= commands.txt samples.txt +PORTEXAMPLES= mod_gzip2.conf.sample -NO_STAGE= yes post-patch: @${MV} ${WRKSRC}/mod_gzip.c ${WRKSRC}/${PORTNAME}.c post-install: - @${MKDIR} ${EXAMPLESDIR} - @${INSTALL_DATA} ${WRKSRC}/my_cfg.txt ${EXAMPLESDIR}/mod_gzip2.conf.sample -.if !defined(NOPORTDOCS) - @${MKDIR} ${DOCSDIR} - @${INSTALL_DATA} ${WRKSRC}/commands.txt ${WRKSRC}/samples.txt ${DOCSDIR} -.endif + @${MKDIR} ${STAGEDIR}${EXAMPLESDIR} + @${INSTALL_DATA} ${WRKSRC}/my_cfg.txt ${STAGEDIR}${EXAMPLESDIR}/mod_gzip2.conf.sample + @${MKDIR} ${STAGEDIR}${DOCSDIR} + @${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR} .include Modified: head/www/mod_hosts_access/Makefile ============================================================================== --- head/www/mod_hosts_access/Makefile Sun Dec 15 21:56:48 2013 (r336588) +++ head/www/mod_hosts_access/Makefile Sun Dec 15 22:11:20 2013 (r336589) @@ -10,6 +10,7 @@ MASTER_SITES= LOCAL/pgollucci MAINTAINER= apache@FreeBSD.org COMMENT= Apache module that makes Apache respect hosts.allow and hosts.deny +LICENSE= AL2 USE_APACHE= 22 AP_FAST_BUILD= yes @@ -17,5 +18,4 @@ AP_GENPLIST= yes AP_LIB+= ${LOCALBASE}/lib -lwrap -NO_STAGE= yes .include Modified: head/www/mod_limitipconn2/Makefile ============================================================================== --- head/www/mod_limitipconn2/Makefile Sun Dec 15 21:56:48 2013 (r336588) +++ head/www/mod_limitipconn2/Makefile Sun Dec 15 22:11:20 2013 (r336589) @@ -7,13 +7,13 @@ PORTREVISION= 3 CATEGORIES= www MASTER_SITES= http://dominia.org/djao/limit/ PKGNAMEPREFIX= ${APACHE_PKGNAMEPREFIX} +PKGNAMESUFFIX= 2 DIST_SUBDIR= apache2 MAINTAINER= ychsiao@ychsiao.org COMMENT= Allows you to limit the number of simultaneous connexions - -LATEST_LINK= mod_limitipconn2 +LICENSE= AL2 USE_APACHE= 22 USE_BZIP2= yes @@ -25,13 +25,8 @@ PLIST_FILES+= ${APACHEMODDIR}/${PORTNAME PORTDOCS= ChangeLog INSTALL README -NO_STAGE= yes post-install: -.if !defined (NOPORTDOCS) - @${MKDIR} ${DOCSDIR}/ -. for f in ${PORTDOCS} - @${INSTALL_DATA} ${WRKSRC}/${f} ${DOCSDIR}/ -. endfor -.endif + @${MKDIR} ${STAGEDIR}${DOCSDIR} + @${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR}/ .include Modified: head/www/mod_log_firstbyte/Makefile ============================================================================== --- head/www/mod_log_firstbyte/Makefile Sun Dec 15 21:56:48 2013 (r336588) +++ head/www/mod_log_firstbyte/Makefile Sun Dec 15 22:11:20 2013 (r336589) @@ -13,7 +13,6 @@ DIST_SUBDIR= ${PORTNAME} MAINTAINER= apache@FreeBSD.org COMMENT= Log the time between request and the first byte of the response served - USE_APACHE= 22+ PROJECTHOST= mod-log-firstbyte @@ -22,12 +21,8 @@ PKGMESSAGE= ${WRKSRC}/readme.txt AP_FAST_BUILD= yes AP_GENPLIST= yes -NO_STAGE= yes do-extract: ${MKDIR} ${WRKSRC} - cd ${DISTDIR}/${DIST_SUBDIR} && ${CP} ${DISTFILES} ${WRKSRC} - -post-install: - @${CAT} ${PKGMESSAGE} + ${CP} ${DISTFILES:S|^|${DISTDIR}/${DIST_SUBDIR}/|} ${WRKSRC} .include Modified: head/www/mod_macro22/Makefile ============================================================================== --- head/www/mod_macro22/Makefile Sun Dec 15 21:56:48 2013 (r336588) +++ head/www/mod_macro22/Makefile Sun Dec 15 22:11:20 2013 (r336589) @@ -14,6 +14,9 @@ LICENSE_NAME= mod_macro license (apache LICENSE_FILE= ${WRKSRC}/LICENSE LICENSE_PERMS= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept +OPTIONS_DEFINE= DOCS + +.include USE_APACHE= 22 LATEST_LINK= mod_macro22 @@ -23,15 +26,8 @@ PORTDOCS= ${PORTNAME}.html PORTSCOUT= limit:^1\.1\. -OPTIONS_DEFINE= DOCS - -NO_STAGE= yes -.include - post-install: -.if ${PORT_OPTIONS:MDOCS} - @${MKDIR} ${DOCSDIR}/ - ${INSTALL_DATA} ${WRKSRC}/${PORTDOCS} ${DOCSDIR}/ -.endif + @${MKDIR} ${STAGEDIR}${DOCSDIR} + ${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR} .include Modified: head/www/mod_memcache/Makefile ============================================================================== --- head/www/mod_memcache/Makefile Sun Dec 15 21:56:48 2013 (r336588) +++ head/www/mod_memcache/Makefile Sun Dec 15 22:11:20 2013 (r336589) @@ -11,7 +11,6 @@ PKGNAMEPREFIX= ${APACHE_PKGNAMEPREFIX} MAINTAINER= gslin@gslin.org COMMENT= Apache 2.2.x module to manage apr_memcache connections - GNU_CONFIGURE= yes PROJECTHOST= modmemcache USE_APACHE= 22+ @@ -20,5 +19,4 @@ AP_FAST_BUILD= yes AP_GENPLIST= yes SRC_FILE= src/${PORTNAME}.c -NO_STAGE= yes .include Modified: head/www/mod_memcache_block/Makefile ============================================================================== --- head/www/mod_memcache_block/Makefile Sun Dec 15 21:56:48 2013 (r336588) +++ head/www/mod_memcache_block/Makefile Sun Dec 15 22:11:20 2013 (r336589) @@ -9,9 +9,9 @@ DISTNAME= mod_memcache_block-${GITVERSIO DIST_SUBDIR= apache2 MAINTAINER= gaod@hychen.org -COMMENT= An Apache 2 module to block ip from lists stored in memcache +COMMENT= Apache 2.2 module to block IPs from lists stored in memcache -LIB_DEPENDS+= memcached:${PORTSDIR}/databases/libmemcached +LIB_DEPENDS+= libmemcached.so:${PORTSDIR}/databases/libmemcached FETCH_ARGS= -Fpr GITVERSION= 7b1fcec @@ -24,5 +24,4 @@ AP_GENPLIST= yes AP_INC= ${LOCALBASE}/include/libmemcached AP_LIB= ${LOCALBASE}/lib -lmemcached -NO_STAGE= yes .include Modified: head/www/mod_proxy_xml/Makefile ============================================================================== --- head/www/mod_proxy_xml/Makefile Sun Dec 15 21:56:48 2013 (r336588) +++ head/www/mod_proxy_xml/Makefile Sun Dec 15 22:11:20 2013 (r336589) @@ -12,9 +12,6 @@ DISTFILES= xmlns.h mod_proxy_xml.c MAINTAINER= apache@FreeBSD.org COMMENT= Apache module for rewriting URI references in XML - -WRKSRC= ${WRKDIR} - USE_GNOME= libxml2 USE_APACHE= 22+ @@ -23,11 +20,10 @@ AP_GENPLIST= yes AP_INC= ${LOCALBASE}/include/libxml2 AP_LIB= ${LOCALBASE}/lib -lxml2 -NO_STAGE= yes pre-extract: - @${MKDIR} ${WRKDIR} + @${MKDIR} ${WRKSRC} do-extract: - @${CP} ${DISTDIR}/xmlns.h ${DISTDIR}/mod_proxy_xml.c ${WRKDIR}/ + @${CP} ${DISTDIR}/xmlns.h ${DISTDIR}/mod_proxy_xml.c ${WRKSRC} .include Modified: head/www/mod_qos/Makefile ============================================================================== --- head/www/mod_qos/Makefile Sun Dec 15 21:56:48 2013 (r336588) +++ head/www/mod_qos/Makefile Sun Dec 15 22:11:20 2013 (r336589) @@ -11,6 +11,7 @@ DIST_SUBDIR= apache2 MAINTAINER= andrea@cervesato.it COMMENT= Qos for Apache +LICENSE= GPLv2 USE_APACHE= 22+ AP_GENPLIST= yes @@ -18,5 +19,4 @@ AP_FAST_BUILD= yes WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}/apache2 -NO_STAGE= yes .include Modified: head/www/mod_remoteip/Makefile ============================================================================== --- head/www/mod_remoteip/Makefile Sun Dec 15 21:56:48 2013 (r336588) +++ head/www/mod_remoteip/Makefile Sun Dec 15 22:11:20 2013 (r336589) @@ -10,12 +10,10 @@ DISTNAME= httpd-2.3.5-alpha MAINTAINER= ports@christianserving.org COMMENT= Replaces the client IP address/hostname with that given by a proxy - USE_APACHE= 22 AP_FAST_BUILD= yes AP_GENPLIST= yes SRC_FILE= modules/metadata/${PORTNAME}.c -NO_STAGE= yes .include Modified: head/www/mod_reproxy/Makefile ============================================================================== --- head/www/mod_reproxy/Makefile Sun Dec 15 21:56:48 2013 (r336588) +++ head/www/mod_reproxy/Makefile Sun Dec 15 22:11:20 2013 (r336589) @@ -9,10 +9,12 @@ MASTER_SITE_SUBDIR= kuriyama MAINTAINER= kuriyama@FreeBSD.org COMMENT= Apache module to support x-reproxy-url header +LICENSE= AL2 + WRKSRC= ${WRKDIR}/lestrrat-mod_reproxy-0f945ff + USE_APACHE= 22+ AP_FAST_BUILD= yes AP_GENPLIST= yes -NO_STAGE= yes .include Modified: head/www/mod_scgi/Makefile ============================================================================== --- head/www/mod_scgi/Makefile Sun Dec 15 21:56:48 2013 (r336588) +++ head/www/mod_scgi/Makefile Sun Dec 15 22:11:20 2013 (r336589) @@ -9,21 +9,13 @@ MASTER_SITES= http://dryice.name/compute DISTNAME= scgi-${PORTVERSION:S/.a/a/} MAINTAINER= dryice@dryice.name -COMMENT= Apache module that implements the client side of the SCGI protocol - +COMMENT= Apache 2.2 module that implements the client side of the SCGI protocol SCGI_DIR= apache2 WRKSRC= ${WRKDIR}/${DISTNAME}/${SCGI_DIR} USE_APACHE= 22 - AP_FAST_BUILD= yes AP_GENPLIST= yes -NO_STAGE= yes -.include - -post-install: - @${CAT} ${PKGMESSAGE} - -.include +.include Modified: head/www/mod_setenvifplus/Makefile ============================================================================== --- head/www/mod_setenvifplus/Makefile Sun Dec 15 21:56:48 2013 (r336588) +++ head/www/mod_setenvifplus/Makefile Sun Dec 15 22:11:20 2013 (r336589) @@ -19,5 +19,4 @@ AP_FAST_BUILD= yes AP_GENPLIST= yes SRC_FILE= ${WRKSRC}/apache2/${MODULENAME}.c -NO_STAGE= yes .include Modified: head/www/mod_uid/Makefile ============================================================================== --- head/www/mod_uid/Makefile Sun Dec 15 21:56:48 2013 (r336588) +++ head/www/mod_uid/Makefile Sun Dec 15 22:11:20 2013 (r336589) @@ -7,31 +7,17 @@ CATEGORIES= www MASTER_SITES= ftp://ftp.lexa.ru/pub/apache-rus/contrib/ MAINTAINER= leeym@FreeBSD.org -COMMENT= A module issuing the "correct" cookies for counting the site visitors - +COMMENT= Apache module issuing the "correct" cookies for counting the site visitors USE_APACHE= 22 - -PORTDOCS= README.html - AP_FAST_BUILD= yes AP_GENPLIST= yes - -NO_STAGE= yes -.include - -.if ${APACHE_VERSION} == 13 -MODULENAME= mod_uid -.else MODULENAME= mod_uid2 -.endif + +PORTDOCS= README.html post-install: -.if !defined(NOPORTDOCS) - @${MKDIR} ${DOCSDIR} -.for f in ${PORTDOCS} - ${INSTALL_DATA} ${WRKSRC}/${f} ${DOCSDIR} -.endfor -.endif + @${MKDIR} ${STAGEDIR}${DOCSDIR} + ${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR} -.include +.include Modified: head/www/mod_umask/Makefile ============================================================================== --- head/www/mod_umask/Makefile Sun Dec 15 21:56:48 2013 (r336588) +++ head/www/mod_umask/Makefile Sun Dec 15 22:11:20 2013 (r336589) @@ -11,6 +11,7 @@ DIST_SUBDIR= apache2 MAINTAINER= gebhart@secnetix.de COMMENT= Apache 2.x module to set umask of created files +LICENSE= AL2 USE_BZIP2= yes GNU_CONFIGURE= yes @@ -20,5 +21,4 @@ AP_FAST_BUILD= yes AP_GENPLIST= yes SRC_FILE= src/${PORTNAME}.c -NO_STAGE= yes .include Modified: head/www/mod_xml2enc/Makefile ============================================================================== --- head/www/mod_xml2enc/Makefile Sun Dec 15 21:56:48 2013 (r336588) +++ head/www/mod_xml2enc/Makefile Sun Dec 15 22:11:20 2013 (r336589) @@ -11,6 +11,7 @@ DIST_SUBDIR= mod_proxy_html MAINTAINER= dnaeon@gmail.com COMMENT= Apache module for converting encoding before and/or after a filter run +LICENSE= GPLv2 # included in apache24 # http://httpd.apache.org/docs/2.4/mod/mod_xml2enc.html @@ -25,12 +26,10 @@ AP_INC+= ${LOCALBASE}/include/libxml2 -I AP_LIB+= ${LOCALBASE}/lib AP_EXTRAS+= -lxml2 -PLIST_FILES= %%DOCSDIR%%/COPYING -PLIST_DIRS= %%DOCSDIR%% +PORTDOCS= COPYING -NO_STAGE= yes post-install: - ${MKDIR} ${DOCSDIR} - ${INSTALL_MAN} ${WRKSRC}/COPYING ${DOCSDIR} + ${MKDIR} ${STAGEDIR}${DOCSDIR} + ${INSTALL_MAN} ${WRKSRC}/COPYING ${STAGEDIR}${DOCSDIR} .include Modified: head/www/mod_xsendfile/Makefile ============================================================================== --- head/www/mod_xsendfile/Makefile Sun Dec 15 21:56:48 2013 (r336588) +++ head/www/mod_xsendfile/Makefile Sun Dec 15 22:11:20 2013 (r336589) @@ -9,12 +9,12 @@ MASTER_SITES= https://tn123.org/mod_xsen http://cloud.github.com/downloads/potatosalad/mod_xsendfile/ MAINTAINER= potatosaladx@gmail.com -COMMENT= An Apache2 module that processes X-SENDFILE headers +COMMENT= Apache2 module that processes X-SENDFILE headers +LICENSE= AL2 USE_APACHE= 22+ AP_FAST_BUILD= yes AP_GENPLIST= yes -NO_STAGE= yes .include From owner-svn-ports-head@FreeBSD.ORG Sun Dec 15 22:14:42 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id DD1101C4; Sun, 15 Dec 2013 22:14:42 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id BCAC41632; Sun, 15 Dec 2013 22:14:42 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBFMEgol013371; Sun, 15 Dec 2013 22:14:42 GMT (envelope-from matthew@svn.freebsd.org) Received: (from matthew@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBFMEeFs013358; Sun, 15 Dec 2013 22:14:40 GMT (envelope-from matthew@svn.freebsd.org) Message-Id: <201312152214.rBFMEeFs013358@svn.freebsd.org> From: Matthew Seaman Date: Sun, 15 Dec 2013 22:14:40 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r336590 - in head/net-im/jabberd: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 15 Dec 2013 22:14:42 -0000 Author: matthew Date: Sun Dec 15 22:14:40 2013 New Revision: 336590 URL: http://svnweb.freebsd.org/changeset/ports/336590 Log: Update to 2.3.1 * Staging support * New style LIB_DEPENDS * Use OPTIONS helpers * OPTIONS_SINGLE to select between Cyrus SASL and gsasl * Two new options: EXPERIMENTAL and SUPERCEDED The port requires OpenSSL >= 1.0.1, so set WANT_OPENSSL_PORTS=yes everywhere except for on FreeBSD 10.x, where it's in the base system. The github.org MASTER_SITE a) redirects to a server in the Amazon cloud and b) requires use of HTTPS. (a) implies setting fetch(1) to follow redirects, which is usually frowned upon. However, this pattern is recommended in bsd.sites.mk for use with GitHub. (b) is troublesome for FreeBSD 8.x, as fetch(1) hasn't grown HTTPS support there yet. Hence provide a copy of the distfile on http://people.freebsd.org/ as a 2nd MASTER_SITE Approved by: mm (maintainer) Added: head/net-im/jabberd/files/patch-etc__Makefile.in (contents, props changed) head/net-im/jabberd/files/patch-etc__templates__Makefile.in (contents, props changed) head/net-im/jabberd/files/patch-sm__mod_iq_time.c (contents, props changed) - copied, changed from r336372, head/net-im/jabberd/files/patch-sm-mod_iq_time.c head/net-im/jabberd/files/patch-storage__authreg_ldapfull.c (contents, props changed) head/net-im/jabberd/files/patch-storage__authreg_mysql.c (contents, props changed) head/net-im/jabberd/files/patch-storage__authreg_pgsql.c (contents, props changed) head/net-im/jabberd/files/patch-storage__authreg_sqlite.c (contents, props changed) head/net-im/jabberd/files/patch-tools__jabberd.in (contents, props changed) - copied, changed from r336452, head/net-im/jabberd/files/patch-tools-jabberd.in Deleted: head/net-im/jabberd/files/patch-etc-Makefile.in head/net-im/jabberd/files/patch-s2s-out.c head/net-im/jabberd/files/patch-sm-mod_iq_time.c head/net-im/jabberd/files/patch-sm-mod_roster.c head/net-im/jabberd/files/patch-tools-jabberd.in Modified: head/net-im/jabberd/Makefile head/net-im/jabberd/distinfo (contents, props changed) head/net-im/jabberd/pkg-plist (contents, props changed) Modified: head/net-im/jabberd/Makefile ============================================================================== --- head/net-im/jabberd/Makefile Sun Dec 15 22:11:20 2013 (r336589) +++ head/net-im/jabberd/Makefile Sun Dec 15 22:14:40 2013 (r336590) @@ -2,35 +2,33 @@ # $FreeBSD$ PORTNAME= jabberd -PORTVERSION= 2.2.17 -PORTREVISION= 1 +DISTVERSION= 2.3.1 CATEGORIES= net-im -MASTER_SITES= http://cloud.github.com/downloads/jabberd2/jabberd2/ +MASTER_SITES= https://github.com/jabberd2/jabberd2/releases/download/${PORTNAME}-${DISTVERSION}/ \ + http://freefall.freebsd.org/~matthew/distfiles/ MAINTAINER= mm@FreeBSD.org COMMENT= Online presence and instant messaging server LICENSE= GPLv2 -LICENSE_FILE= ${WRKSRC}/COPYING -LIB_DEPENDS= expat:${PORTSDIR}/textproc/expat2 \ - idn:${PORTSDIR}/dns/libidn \ - udns:${PORTSDIR}/dns/udns +LIB_DEPENDS= libexpat.so:${PORTSDIR}/textproc/expat2 \ + libidn.so:${PORTSDIR}/dns/libidn \ + libudns.so:${PORTSDIR}/dns/udns OPTIONS_DEFINE= MYSQL PGSQL LDAP BDB SQLITE PAM PIPE ANON FS DEBUG REQUIRES \ - CYRUS DOCS -OPTIONS_DEFAULT= MYSQL DEBUG -PIPE_DESC= Enable pipe (auth/reg) -ANON_DESC= Enable anonymous (auth/reg) -FS_DESC= Filesystem storage (only for testing) -REQUIRES_DESC= Add backend requires to startup script -CYRUS_DESC= Use Cyrus SASL backend (not supported) + DOCS SUPERSEDED EXPERIMENTAL +OPTIONS_SINGLE= SASL +OPTIONS_SINGLE_SASL= CYRUS GSASL +OPTIONS_DEFAULT=MYSQL DEBUG GSASL +OPTIONS_SUB= yes USE_XZ= yes +FETCH_ARGS= -Fpr GNU_CONFIGURE= yes USE_PERL5= run USE_OPENSSL= yes -USES= iconv perl5 +USES= iconv perl5 compiler:c11 USE_RC_SUBR= jabberd USE_LDCONFIG= ${PREFIX}/lib/jabberd CONFIGURE_ARGS+= --localstatedir=/var \ @@ -59,103 +57,81 @@ SUB_FILES+= pkg-install pkg-deinstall PORTDOCS= * -DOCFILES= AUTHORS COPYING ChangeLog INSTALL NEWS README \ - TODO UPGRADE +DOCFILES= AUTHORS ChangeLog NEWS README README.config \ + README.protocol TODO _REQUIRE= LOGIN -NO_STAGE= yes -.include - ELP+= ${OPENSSLLIB} EIP+= ${OPENSSLINC} -.if ${PORT_OPTIONS:MDEBUG} -CONFIGURE_ARGS+=--enable-debug -.endif +DEBUG_CONFIGURE_ENABLE= debug -.if ${PORT_OPTIONS:MPGSQL} -USE_PGSQL= yes -CONFIGURE_ARGS+=--enable-pgsql -PLIST_SUB+= SUB_PGSQL="" -_REQUIRE+= postgresql -.else -CONFIGURE_ARGS+=--disable-pgsql -PLIST_SUB+= SUB_PGSQL="@comment " +PGSQL_USE= PGSQL=yes +PGSQL_CONFIGURE_ENABLE= pgsql + +SQLITE_CONFIGURE_ENABLE=sqlite +SQLITE_LIB_DEPENDS= libsqlite3.so:${PORTSDIR}/databases/sqlite3 +SQLITE_CFLAGS= ${PTHREAD_CFLAGS} + +MYSQL_USE= MYSQL=yes +MYSQL_CONFIGURE_ENABLE= mysql + +BDB_USE= BDB=41+ +BDB_CONFIGURE_ENABLE= db +BDB_CONFIGURE_ON= --oldincludedir=/nonexistant + +LDAP_USE= OPENLDAP=yes +LDAP_CONFIGURE_ENABLE= ldap + +FS_CONFIGURE_ENABLE= fs +FS_DESC= Filesystem storage (only for testing) + +PAM_CONFIGURE_ENABLE= pam + +PIPE_CONFIGURE_ENABLE= pipe +PIPE_DESC= Enable pipe (auth/reg) + +ANON_CONFIGURE_ENABLE= anon +ANON_DESC= Enable anonymous (auth/reg) + +CYRUS_CONFIGURE_ON= --with-sasl=cyrus +CYRUS_DESC= Use Cyrus SASL backend (not supported) +CYRUS_LIB_DEPENDS= libsasl2.so:${PORTSDIR}/security/cyrus-sasl2 + +GSASL_CONFIGURE_ON= --with-sasl=gsasl +GSASL_DESC= Use GSASL backend +GSASL_LIB_DEPENDS= libgsasl.so:${PORTSDIR}/security/gsasl + +SUPERSEDED_CONFIGURE_ENABLE= superseded +SUPERSEDED_DESC= Enable superseded features (ns_TIME) + +EXPERIMENTAL_CONFIGURE_ENABLE= experimental +EXPERIMENTAL_DESC= Enable experimental features (TLS-Everywhere) + +.include + +.if (${OPSYS} != FreeBSD || ${OSVERSION} < 10000000) +WITH_OPENSSL_PORT= yes .endif -.if ${PORT_OPTIONS:MSQLITE} -CONFIGURE_ARGS+=--enable-sqlite -LIB_DEPENDS+= sqlite3:${PORTSDIR}/databases/sqlite3 -CFLAGS+= ${PTHREAD_CFLAGS} -PLIST_SUB+= SUB_SQLITE="" -.else -CONFIGURE_ARGS+=--disable-sqlite -PLIST_SUB+= SUB_SQLITE="@comment " +.if ${PORT_OPTIONS:MPGSQL} +_REQUIRE+= postgresql .endif .if ${PORT_OPTIONS:MMYSQL} -USE_MYSQL= yes -CONFIGURE_ARGS+=--enable-mysql -EIP+=:${LOCALBASE}/include/mysql -ELP+=:${LOCALBASE}/lib/mysql -PLIST_SUB+= SUB_MYSQL="" +EIP+=${LOCALBASE}/include/mysql +ELP+=${LOCALBASE}/lib/mysql _REQUIRE+= mysql -.else -CONFIGURE_ARGS+=--disable-mysql -PLIST_SUB+= SUB_MYSQL="@comment " .endif .if ${PORT_OPTIONS:MBDB} -USE_BDB= 41+ -CONFIGURE_ARGS+=--enable-db -CONFIGURE_ARGS+=--oldincludedir=/nonexistant -EIP+=:${BDB_INCLUDE_DIR} -ELP+=:${BDB_LIB_DIR} -PLIST_SUB+= SUB_BDB="" -.else -CONFIGURE_ARGS+=--disable-db -PLIST_SUB+= SUB_BDB="@comment " +EIP+=${BDB_INCLUDE_DIR} +ELP+=${BDB_LIB_DIR} .endif .if ${PORT_OPTIONS:MLDAP} -USE_OPENLDAP= yes -CONFIGURE_ARGS+=--enable-ldap -PLIST_SUB+= SUB_LDAP="" _REQUIRE+= slapd -.else -CONFIGURE_ARGS+=--disable-ldap -PLIST_SUB+= SUB_LDAP="@comment " -.endif - -.if ${PORT_OPTIONS:MFS} -CONFIGURE_ARGS+=--enable-fs -PLIST_SUB+= SUB_FS="" -.else -CONFIGURE_ARGS+=--disable-fs -PLIST_SUB+= SUB_FS="@comment " -.endif - -.if ${PORT_OPTIONS:MPAM} -CONFIGURE_ARGS+=--enable-pam -PLIST_SUB+= SUB_PAM="" -.else -CONFIGURE_ARGS+=--disable-pam -PLIST_SUB+= SUB_PAM="@comment " -.endif - -.if ${PORT_OPTIONS:MPIPE} -CONFIGURE_ARGS+=--enable-pipe -PLIST_SUB+= SUB_PIPE="" -.else -PLIST_SUB+= SUB_PIPE="@comment " -.endif - -.if ${PORT_OPTIONS:MANON} -CONFIGURE_ARGS+=--enable-anon -PLIST_SUB+= SUB_ANON="" -.else -PLIST_SUB+= SUB_ANON="@comment " .endif .if ${PORT_OPTIONS:MREQUIRES} @@ -163,16 +139,7 @@ SUB_LIST+= REQUIRE="${_REQUIRE}" .else SUB_LIST+= REQUIRE="LOGIN" .endif - -.if ${PORT_OPTIONS:MCYRUS} -CONFIGURE_ARGS+= --with-sasl=cyrus -LIB_DEPENDS+= sasl2:${PORTSDIR}/security/cyrus-sasl2 -.else -CONFIGURE_ARGS+= --with-sasl=gsasl -LIB_DEPENDS+= gsasl:${PORTSDIR}/security/gsasl -.endif - -MAN8= c2s.8 jabberd.8 router.8 s2s.8 sm.8 +REQUIRES_DESC= Add backend requires to startup script post-patch: @${REINPLACE_CMD} -e 's|"-lsqlite3|"-lsqlite3 ${PTHREAD_LIBS}|g' \ @@ -185,17 +152,13 @@ post-patch: .endif post-install: - @PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL - @${CHOWN} -R ${JABBER_USER}:${JABBER_GROUP} ${PREFIX}/etc/jabberd - @${FIND} ${PREFIX}/etc/jabberd -type d | ${XARGS} ${CHMOD} 750 - @${FIND} ${PREFIX}/etc/jabberd -type f | ${XARGS} ${CHMOD} 660 .if ${PORT_OPTIONS:MDOCS} - @${MKDIR} ${DOCSDIR} + @${MKDIR} ${STAGEDIR}${DOCSDIR} .for FILE in ${DOCFILES} - @${INSTALL_DATA} ${WRKSRC}/${FILE} ${DOCSDIR} + ${INSTALL_DATA} ${WRKSRC}/${FILE} ${STAGEDIR}${DOCSDIR} .endfor .for FILE in db-setup.mysql db-setup.pgsql db-setup.sqlite - @${INSTALL_DATA} ${WRKSRC}/tools/${FILE} ${DOCSDIR} + ${INSTALL_DATA} ${WRKSRC}/tools/${FILE} ${STAGEDIR}${DOCSDIR} .endfor .endif Modified: head/net-im/jabberd/distinfo ============================================================================== --- head/net-im/jabberd/distinfo Sun Dec 15 22:11:20 2013 (r336589) +++ head/net-im/jabberd/distinfo Sun Dec 15 22:14:40 2013 (r336590) @@ -1,2 +1,2 @@ -SHA256 (jabberd-2.2.17.tar.xz) = 0be815dfa1e450cd7416a9a2046c6f9ad547b11b562b6d0bf33520594e03b647 -SIZE (jabberd-2.2.17.tar.xz) = 1382124 +SHA256 (jabberd-2.3.1.tar.xz) = feba2eea2c6f003a3e35e49ff301b7346d88660039ba08521dcb1351431afdb0 +SIZE (jabberd-2.3.1.tar.xz) = 1460088 Added: head/net-im/jabberd/files/patch-etc__Makefile.in ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net-im/jabberd/files/patch-etc__Makefile.in Sun Dec 15 22:14:40 2013 (r336590) @@ -0,0 +1,29 @@ +--- ./etc/Makefile.in.orig 2013-11-28 11:16:25.000000000 +0000 ++++ ./etc/Makefile.in 2013-12-15 10:29:42.301779845 +0000 +@@ -336,7 +336,7 @@ + top_srcdir = @top_srcdir@ + sysconf_DATA = c2s.xml.dist router.xml.dist s2s.xml.dist sm.xml.dist jabberd.cfg.dist router-users.xml.dist router-filter.xml.dist + initdir = $(prefix)/etc/init +-init_DATA = jabberd-c2s.conf jabberd-router.conf jabberd-s2s.conf jabberd-sm.conf ++init_DATA = + configs = $(sysconf_DATA) $(init_DATA) + EXTRA_DIST = $(sysconf_DATA:%.dist=%.dist.in) $(init_DATA:%.conf=%.conf.in) + SUBDIRS = templates +@@ -721,14 +721,9 @@ + mv $@.tmp $@ + + install-data-hook: +- @list='$(configs)'; for p in $$list; do \ +- dest=`echo $$p | sed -e s/.dist//`; \ +- if test -f $(DESTDIR)$(sysconfdir)/$$dest; then \ +- echo "$@ will not overwrite existing $(DESTDIR)$(sysconfdir)/$$dest"; \ +- else \ +- echo " $(INSTALL_DATA) $$p $(DESTDIR)$(sysconfdir)/$$dest"; \ +- $(INSTALL_DATA) $$p $(DESTDIR)$(sysconfdir)/$$dest; \ +- fi; \ ++ @list='$(configs)'; for dest in $$list; do \ ++ echo " $(INSTALL_DATA) $$dest $(DESTDIR)$(sysconfdir)/$$dest"; \ ++ $(INSTALL_DATA) $$dest $(DESTDIR)$(sysconfdir)/$$dest; \ + done + + clean-local: Added: head/net-im/jabberd/files/patch-etc__templates__Makefile.in ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net-im/jabberd/files/patch-etc__templates__Makefile.in Sun Dec 15 22:14:40 2013 (r336590) @@ -0,0 +1,20 @@ +--- ./etc/templates/Makefile.in.orig 2013-11-28 11:16:25.000000000 +0000 ++++ ./etc/templates/Makefile.in 2013-12-15 10:29:42.305779574 +0000 +@@ -506,14 +506,9 @@ + mv $@.tmp $@ + + install-data-hook: +- @list='$(templates_DATA)'; for p in $$list; do \ +- dest=`echo $$p | sed -e s/.dist//`; \ +- if test -f $(DESTDIR)$(templatesdir)/$$dest; then \ +- echo "$@ will not overwrite existing $(DESTDIR)$(templatesdir)/$$dest"; \ +- else \ +- echo " $(INSTALL_DATA) $$p $(DESTDIR)$(templatesdir)/$$dest"; \ +- $(INSTALL_DATA) $$p $(DESTDIR)$(templatesdir)/$$dest; \ +- fi; \ ++ @list='$(templates_DATA)'; for dest in $$list; do \ ++ echo " $(INSTALL_DATA) $$dest $(DESTDIR)$(templatesdir)/$$dest"; \ ++ $(INSTALL_DATA) $$dest $(DESTDIR)$(templatesdir)/$$dest; \ + done + + clean-local: Copied and modified: head/net-im/jabberd/files/patch-sm__mod_iq_time.c (from r336372, head/net-im/jabberd/files/patch-sm-mod_iq_time.c) ============================================================================== --- head/net-im/jabberd/files/patch-sm-mod_iq_time.c Fri Dec 13 19:59:42 2013 (r336372, copy source) +++ head/net-im/jabberd/files/patch-sm__mod_iq_time.c Sun Dec 15 22:14:40 2013 (r336590) @@ -1,5 +1,5 @@ ---- sm/mod_iq_time.c.orig 2007-10-17 21:15:26.000000000 +0200 -+++ sm/mod_iq_time.c 2007-10-21 22:13:05.000000000 +0200 +--- ./sm/mod_iq_time.c.orig 2013-10-07 16:27:54.000000000 +0100 ++++ ./sm/mod_iq_time.c 2013-12-15 10:29:42.308777764 +0000 @@ -77,7 +77,7 @@ datetime_out(t, dt_DATETIME, buf, 64); Added: head/net-im/jabberd/files/patch-storage__authreg_ldapfull.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net-im/jabberd/files/patch-storage__authreg_ldapfull.c Sun Dec 15 22:14:40 2013 (r336590) @@ -0,0 +1,11 @@ +--- ./storage/authreg_ldapfull.c.orig 2013-10-07 16:27:54.000000000 +0100 ++++ ./storage/authreg_ldapfull.c 2013-12-15 10:29:42.316778126 +0000 +@@ -29,6 +29,8 @@ + * !!! this blocks for every auth. + */ + ++#include ++ + #define _XOPEN_SOURCE 500 // need this to get crypt() + #include "c2s.h" + Added: head/net-im/jabberd/files/patch-storage__authreg_mysql.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net-im/jabberd/files/patch-storage__authreg_mysql.c Sun Dec 15 22:14:40 2013 (r336590) @@ -0,0 +1,11 @@ +--- ./storage/authreg_mysql.c.orig 2013-11-12 09:53:47.000000000 +0000 ++++ ./storage/authreg_mysql.c 2013-12-15 10:29:42.318779446 +0000 +@@ -20,6 +20,8 @@ + + /* this module talks to a MySQL server via libmysqlclient */ + ++#include ++ + #define _XOPEN_SOURCE 500 + #include "c2s.h" + #include Added: head/net-im/jabberd/files/patch-storage__authreg_pgsql.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net-im/jabberd/files/patch-storage__authreg_pgsql.c Sun Dec 15 22:14:40 2013 (r336590) @@ -0,0 +1,11 @@ +--- ./storage/authreg_pgsql.c.orig 2013-11-12 10:09:39.000000000 +0000 ++++ ./storage/authreg_pgsql.c 2013-12-15 10:29:42.320778996 +0000 +@@ -20,6 +20,8 @@ + + /* this module talks to a PostgreSQL server via libpq */ + ++#include ++ + #define _XOPEN_SOURCE 500 + #include "c2s.h" + #include Added: head/net-im/jabberd/files/patch-storage__authreg_sqlite.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net-im/jabberd/files/patch-storage__authreg_sqlite.c Sun Dec 15 22:14:40 2013 (r336590) @@ -0,0 +1,11 @@ +--- ./storage/authreg_sqlite.c.orig 2013-10-30 12:38:17.000000000 +0000 ++++ ./storage/authreg_sqlite.c 2013-12-15 10:29:42.322779475 +0000 +@@ -29,6 +29,8 @@ + * to the Jabberd project. + */ + ++#include ++ + #define _XOPEN_SOURCE 500 + #include "c2s.h" + #include Copied and modified: head/net-im/jabberd/files/patch-tools__jabberd.in (from r336452, head/net-im/jabberd/files/patch-tools-jabberd.in) ============================================================================== --- head/net-im/jabberd/files/patch-tools-jabberd.in Sat Dec 14 14:57:24 2013 (r336452, copy source) +++ head/net-im/jabberd/files/patch-tools__jabberd.in Sun Dec 15 22:14:40 2013 (r336590) @@ -1,5 +1,5 @@ ---- tools/jabberd.in.orig 2008-05-22 17:36:30.000000000 +0200 -+++ tools/jabberd.in 2008-06-20 13:24:34.000000000 +0200 +--- ./tools/jabberd.in.orig 2013-10-07 16:27:54.000000000 +0100 ++++ ./tools/jabberd.in 2013-12-15 10:29:42.333778600 +0000 @@ -1,9 +1,4 @@ -#!/bin/sh -#-*-Perl-*- @@ -7,12 +7,12 @@ -exec perl -w -x $0 "$@" - -#!perl -+#!%%PERL%% ++#!/usr/local/bin/perl ############################################################################## # -@@ -27,8 +22,7 @@ - my $Bin = "@bindir@"; +@@ -28,8 +23,7 @@ + my $LibExec = "@libexecdir@"; my $VERSION = "@VERSION@"; my $config_dir = "@sysconfdir@"; -my $config = $config_dir."/jabberd.cfg"; @@ -20,8 +20,8 @@ +my $config = "jabberd.cfg"; my $debug = 0; my $daemon = 0; - my $select = IO::Select->new(); -@@ -42,13 +36,20 @@ + my $g_kill_signal = ""; +@@ -44,13 +38,20 @@ # Process the command line arguments #----------------------------------------------------------------------------- my %opts; @@ -43,7 +43,7 @@ $debug = 1 if exists($opts{D}); $daemon = 1 if exists($opts{b}); -@@ -113,6 +114,7 @@ +@@ -120,6 +121,7 @@ &debug("jabberd","stdout","debug on\n"); &debug("jabberd","stdout","version($VERSION)\n"); &debug("jabberd","stdout","config_dir($config_dir)\n"); Modified: head/net-im/jabberd/pkg-plist ============================================================================== --- head/net-im/jabberd/pkg-plist Sun Dec 15 22:11:20 2013 (r336589) +++ head/net-im/jabberd/pkg-plist Sun Dec 15 22:14:40 2013 (r336590) @@ -20,24 +20,24 @@ etc/jabberd/s2s.xml.dist etc/jabberd/sm.xml.dist @unexec if cmp -s %D/etc/jabberd/templates/roster.xml %D/etc/jabberd/templates/roster.xml.dist; then rm -f %D/etc/jabberd/templates/roster.xml; fi etc/jabberd/templates/roster.xml.dist -%%SUB_ANON%%lib/jabberd/authreg_anon.la -%%SUB_ANON%%lib/jabberd/authreg_anon.so -%%SUB_BDB%%lib/jabberd/authreg_db.la -%%SUB_BDB%%lib/jabberd/authreg_db.so -%%SUB_LDAP%%lib/jabberd/authreg_ldap.la -%%SUB_LDAP%%lib/jabberd/authreg_ldap.so -%%SUB_LDAP%%lib/jabberd/authreg_ldapfull.la -%%SUB_LDAP%%lib/jabberd/authreg_ldapfull.so -%%SUB_MYSQL%%lib/jabberd/authreg_mysql.la -%%SUB_MYSQL%%lib/jabberd/authreg_mysql.so -%%SUB_PAM%%lib/jabberd/authreg_pam.la -%%SUB_PAM%%lib/jabberd/authreg_pam.so -%%SUB_PIPE%%lib/jabberd/authreg_pipe.la -%%SUB_PIPE%%lib/jabberd/authreg_pipe.so -%%SUB_PGSQL%%lib/jabberd/authreg_pgsql.la -%%SUB_PGSQL%%lib/jabberd/authreg_pgsql.so -%%SUB_SQLITE%%lib/jabberd/authreg_sqlite.la -%%SUB_SQLITE%%lib/jabberd/authreg_sqlite.so +%%ANON%%lib/jabberd/authreg_anon.la +%%ANON%%lib/jabberd/authreg_anon.so +%%BDB%%lib/jabberd/authreg_db.la +%%BDB%%lib/jabberd/authreg_db.so +%%LDAP%%lib/jabberd/authreg_ldap.la +%%LDAP%%lib/jabberd/authreg_ldap.so +%%LDAP%%lib/jabberd/authreg_ldapfull.la +%%LDAP%%lib/jabberd/authreg_ldapfull.so +%%MYSQL%%lib/jabberd/authreg_mysql.la +%%MYSQL%%lib/jabberd/authreg_mysql.so +%%PAM%%lib/jabberd/authreg_pam.la +%%PAM%%lib/jabberd/authreg_pam.so +%%PIPE%%lib/jabberd/authreg_pipe.la +%%PIPE%%lib/jabberd/authreg_pipe.so +%%PGSQL%%lib/jabberd/authreg_pgsql.la +%%PGSQL%%lib/jabberd/authreg_pgsql.so +%%SQLITE%%lib/jabberd/authreg_sqlite.la +%%SQLITE%%lib/jabberd/authreg_sqlite.so lib/jabberd/libstorage.la lib/jabberd/libstorage.so lib/jabberd/libstorage.so.0 @@ -113,18 +113,23 @@ lib/jabberd/mod_vacation.so.0 lib/jabberd/mod_validate.la lib/jabberd/mod_validate.so lib/jabberd/mod_validate.so.0 -%%SUB_FS%%lib/jabberd/storage_fs.la -%%SUB_FS%%lib/jabberd/storage_fs.so -%%SUB_BDB%%lib/jabberd/storage_db.la -%%SUB_BDB%%lib/jabberd/storage_db.so -%%SUB_LDAP%%lib/jabberd/storage_ldapvcard.la -%%SUB_LDAP%%lib/jabberd/storage_ldapvcard.so -%%SUB_MYSQL%%lib/jabberd/storage_mysql.la -%%SUB_MYSQL%%lib/jabberd/storage_mysql.so -%%SUB_PGSQL%%lib/jabberd/storage_pgsql.la -%%SUB_PGSQL%%lib/jabberd/storage_pgsql.so -%%SUB_SQLITE%%lib/jabberd/storage_sqlite.la -%%SUB_SQLITE%%lib/jabberd/storage_sqlite.so +%%FS%%lib/jabberd/storage_fs.la +%%FS%%lib/jabberd/storage_fs.so +%%BDB%%lib/jabberd/storage_db.la +%%BDB%%lib/jabberd/storage_db.so +%%LDAP%%lib/jabberd/storage_ldapvcard.la +%%LDAP%%lib/jabberd/storage_ldapvcard.so +%%MYSQL%%lib/jabberd/storage_mysql.la +%%MYSQL%%lib/jabberd/storage_mysql.so +%%PGSQL%%lib/jabberd/storage_pgsql.la +%%PGSQL%%lib/jabberd/storage_pgsql.so +%%SQLITE%%lib/jabberd/storage_sqlite.la +%%SQLITE%%lib/jabberd/storage_sqlite.so +man/man8/c2s.8.gz +man/man8/jabberd.8.gz +man/man8/router.8.gz +man/man8/s2s.8.gz +man/man8/sm.8.gz @dirrm lib/jabberd @dirrmtry etc/jabberd/templates @dirrmtry etc/jabberd From owner-svn-ports-head@FreeBSD.ORG Sun Dec 15 22:15:24 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 761332AF; Sun, 15 Dec 2013 22:15:24 +0000 (UTC) Received: from frv154.fwdcdn.com (frv154.fwdcdn.com [212.42.77.154]) (using TLSv1.2 with cipher DHE-RSA-AES128-SHA (128/128 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 2AA71163D; Sun, 15 Dec 2013 22:15:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=ukr.net; s=fsm; h=Content-Transfer-Encoding:Content-Type:Mime-Version:References:In-Reply-To:Message-ID:Subject:Cc:To:From:Date; bh=KX1mOrC68q905xr0huZ4Z2kVqttJM1u7R/dNm+nWgVE=; b=GL1SNlNsDj7hwlYXCTZeAyFimqs8hTulE8ghr64tu/kqcu8CEdb4ndv18n5hHmCxksrAqxPUaNYnh1wxapkGOH9Mh3nH/J0YYhgFqm4jspvQoKapztStfOwPwigI8Ta8fjK+3R9kLE0X1O3EQa37pTbOzEYKwRTMOsAqVneVSh8=; Received: from [37.115.116.138] (helo=nonamehost.local) by frv154.fwdcdn.com with esmtpsa ID 1VsJy5-000Omh-No ; Mon, 16 Dec 2013 00:15:21 +0200 Date: Mon, 16 Dec 2013 00:15:21 +0200 From: Ivan Klymenko To: Thierry Thomas Subject: Re: svn commit: r336566 - in head/multimedia: mencoder mplayer mplayer/files Message-ID: <20131216001521.1e9af233@nonamehost.local> In-Reply-To: <20131215221106.GF14741@graf.pompo.net> References: <201312151850.rBFIoq2q038615@svn.freebsd.org> <20131215233631.6096654f@nonamehost.local> <20131215213745.GM57153@ithaqua.etoilebsd.net> <20131215235327.55b79747@nonamehost.local> <20131215221106.GF14741@graf.pompo.net> X-Mailer: Claws Mail 3.9.2 (GTK+ 2.24.19; amd64-portbld-freebsd10.0) Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Authentication-Result: IP=37.115.116.138; mail.from=fidaj@ukr.net; dkim=pass; header.d=ukr.net Cc: svn-ports-head@freebsd.org, Baptiste Daroussin , svn-ports-all@freebsd.org, ports-committers@freebsd.org X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 15 Dec 2013 22:15:24 -0000 =D0=92 Sun, 15 Dec 2013 23:11:06 +0100 Thierry Thomas =D0=BF=D0=B8=D1=88=D0=B5=D1=82: > On sun 15 dec 13 at 22:53:27 +0100, Ivan Klymenko > wrote: >=20 > > so then need to fix same way ports: > >=20 > > devel/synfig > > multimedia/dv2jpg > > multimedia/mlt > > multimedia/kino > > multimedia/transcode > > multimedia/xawtv > >=20 > > :) >=20 > Not exactly: >=20 > LIB_DEPENDS=3D dv.4:${PORTSDIR}/multimedia/libdv >=20 > is the old syntax, deprecated but still correct. But dv.so was wrong. >=20 > Regards, ok Thanks. From owner-svn-ports-head@FreeBSD.ORG Sun Dec 15 22:17:11 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 3F7823A1; Sun, 15 Dec 2013 22:17:11 +0000 (UTC) Received: from mx1a.lautre.net (mx1a.lautre.net [80.67.160.71]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id BC09F1648; Sun, 15 Dec 2013 22:17:09 +0000 (UTC) Received: from graf.pompo.net (unknown [78.225.128.39]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) (Authenticated sender: thierry@pompo.net) by mx1a.lautre.net (Postfix) with ESMTPSA id 5F9A0400A9; Sun, 15 Dec 2013 23:11:07 +0100 (CET) Received: by graf.pompo.net (Postfix, from userid 1001) id C78BD42D18AF; Sun, 15 Dec 2013 23:11:06 +0100 (CET) Date: Sun, 15 Dec 2013 23:11:06 +0100 From: Thierry Thomas To: Ivan Klymenko Subject: Re: svn commit: r336566 - in head/multimedia: mencoder mplayer mplayer/files Message-ID: <20131215221106.GF14741@graf.pompo.net> Mail-Followup-To: Ivan Klymenko , Baptiste Daroussin , svn-ports-head@freebsd.org, svn-ports-all@freebsd.org, ports-committers@freebsd.org References: <201312151850.rBFIoq2q038615@svn.freebsd.org> <20131215233631.6096654f@nonamehost.local> <20131215213745.GM57153@ithaqua.etoilebsd.net> <20131215235327.55b79747@nonamehost.local> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20131215235327.55b79747@nonamehost.local> X-Operating-System: FreeBSD 9.2-STABLE i386 Organization: Kabbale Eros X-Face: (hRbQnK~Pt7$ct`!fupO(`y_WL4^-Iwn4@ly-.,[4xC4xc; y=\ipKMNm<1J>lv@PP~7Z<.t KjAnXLs: X-PGP: 0xF1C516B3C8359753 User-Agent: Mutt/1.5.22 (2013-10-16) Cc: svn-ports-head@freebsd.org, Baptiste Daroussin , svn-ports-all@freebsd.org, ports-committers@freebsd.org X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 15 Dec 2013 22:17:11 -0000 On sun 15 dec 13 at 22:53:27 +0100, Ivan Klymenko wrote: > so then need to fix same way ports: > > devel/synfig > multimedia/dv2jpg > multimedia/mlt > multimedia/kino > multimedia/transcode > multimedia/xawtv > > :) Not exactly: LIB_DEPENDS= dv.4:${PORTSDIR}/multimedia/libdv is the old syntax, deprecated but still correct. But dv.so was wrong. Regards, -- Th. Thomas. From owner-svn-ports-head@FreeBSD.ORG Sun Dec 15 22:22:22 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 62DE34D9; Sun, 15 Dec 2013 22:22:22 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 3457D16B9; Sun, 15 Dec 2013 22:22:22 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBFMMMiV016721; Sun, 15 Dec 2013 22:22:22 GMT (envelope-from antoine@svn.freebsd.org) Received: (from antoine@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBFMMLMu016719; Sun, 15 Dec 2013 22:22:21 GMT (envelope-from antoine@svn.freebsd.org) Message-Id: <201312152222.rBFMMLMu016719@svn.freebsd.org> From: Antoine Brodin Date: Sun, 15 Dec 2013 22:22:21 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r336591 - in head/security/py-volatility: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 15 Dec 2013 22:22:22 -0000 Author: antoine Date: Sun Dec 15 22:22:21 2013 New Revision: 336591 URL: http://svnweb.freebsd.org/changeset/ports/336591 Log: - switch from easy_install to install - stage support - use PYDISTUTILS_AUTOPLIST Added: head/security/py-volatility/files/ head/security/py-volatility/files/patch-setup.py (contents, props changed) Deleted: head/security/py-volatility/pkg-plist Modified: head/security/py-volatility/Makefile Modified: head/security/py-volatility/Makefile ============================================================================== --- head/security/py-volatility/Makefile Sun Dec 15 22:14:40 2013 (r336590) +++ head/security/py-volatility/Makefile Sun Dec 15 22:22:21 2013 (r336591) @@ -19,20 +19,23 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}dist ${PYTHON_PKGNAMEPREFIX}openpyxl>=0:${PORTSDIR}/textproc/py-openpyxl USE_PYTHON= -2.7 -USE_PYDISTUTILS=easy_install +USE_PYDISTUTILS=yes +PYDISTUTILS_AUTOPLIST=yes OPTIONS_DEFINE= DOCS +DATADIR= ${PREFIX}/share/py-${PORTNAME} PORTDOCS= AUTHORS.txt CHANGELOG.txt CREDITS.txt README.txt DOCSDIR= ${PREFIX}/share/doc/py-${PORTNAME} -NO_STAGE= yes -.include +.include + +PYDISTUTILS_INSTALLARGS+=--install-data ${DATADIR} post-install: .if ${PORT_OPTIONS:MDOCS} - @${MKDIR} ${DOCSDIR} - ${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/,} ${DOCSDIR} + @${MKDIR} ${STAGEDIR}${DOCSDIR} + ${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/,} ${STAGEDIR}${DOCSDIR} .endif -.include +.include Added: head/security/py-volatility/files/patch-setup.py ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/security/py-volatility/files/patch-setup.py Sun Dec 15 22:22:21 2013 (r336591) @@ -0,0 +1,14 @@ +--- ./setup.py.orig 2013-10-15 14:55:22.000000000 +0000 ++++ ./setup.py 2013-12-15 21:41:37.000000000 +0000 +@@ -45,7 +45,10 @@ + ret = [] + for topdir in topdirs: + for r, _ds, fs in os.walk(topdir): +- ret.append((r, [ os.path.join(r, f) for f in fs if (f.endswith('.py') or not py)])) ++ fl = [ os.path.join(r, f) for f in fs if (f.endswith('.py') or not py)] ++ # Do not record directories (with no regular files inside) ++ if len(fl) > 0: ++ ret.append((r, fl)) + return ret + + opts = {} From owner-svn-ports-head@FreeBSD.ORG Sun Dec 15 22:34:57 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 3235E650; Sun, 15 Dec 2013 22:34:57 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 1DC191744; Sun, 15 Dec 2013 22:34:57 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBFMYukK020497; Sun, 15 Dec 2013 22:34:56 GMT (envelope-from antoine@svn.freebsd.org) Received: (from antoine@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBFMYuYk020496; Sun, 15 Dec 2013 22:34:56 GMT (envelope-from antoine@svn.freebsd.org) Message-Id: <201312152234.rBFMYuYk020496@svn.freebsd.org> From: Antoine Brodin Date: Sun, 15 Dec 2013 22:34:56 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r336592 - head/textproc/py-pyelasticsearch X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 15 Dec 2013 22:34:57 -0000 Author: antoine Date: Sun Dec 15 22:34:56 2013 New Revision: 336592 URL: http://svnweb.freebsd.org/changeset/ports/336592 Log: - Switch from easy_install to install - Use PYDISTUTILS_AUTOPLIST - License is BSD3CLAUSE Deleted: head/textproc/py-pyelasticsearch/pkg-plist Modified: head/textproc/py-pyelasticsearch/Makefile Modified: head/textproc/py-pyelasticsearch/Makefile ============================================================================== --- head/textproc/py-pyelasticsearch/Makefile Sun Dec 15 22:22:21 2013 (r336591) +++ head/textproc/py-pyelasticsearch/Makefile Sun Dec 15 22:34:56 2013 (r336592) @@ -10,14 +10,14 @@ PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} MAINTAINER= antoine@FreeBSD.org COMMENT= Flexible, high-scale API to elasticsearch -LICENSE= BSD +LICENSE= BSD3CLAUSE RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}simplejson>0:${PORTSDIR}/devel/py-simplejson \ ${PYTHON_PKGNAMEPREFIX}six>0:${PORTSDIR}/devel/py-six \ ${PYTHON_PKGNAMEPREFIX}requests>0:${PORTSDIR}/www/py-requests USE_PYTHON= yes -USE_PYDISTUTILS=easy_install -PYTHON_PY3K_PLIST_HACK=yes +USE_PYDISTUTILS=yes +PYDISTUTILS_AUTOPLIST=yes .include From owner-svn-ports-head@FreeBSD.ORG Sun Dec 15 22:47:23 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 3134D7F1; Sun, 15 Dec 2013 22:47:23 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 1D17317D0; Sun, 15 Dec 2013 22:47:23 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBFMlM4V024325; Sun, 15 Dec 2013 22:47:22 GMT (envelope-from antoine@svn.freebsd.org) Received: (from antoine@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBFMlM0x024324; Sun, 15 Dec 2013 22:47:22 GMT (envelope-from antoine@svn.freebsd.org) Message-Id: <201312152247.rBFMlM0x024324@svn.freebsd.org> From: Antoine Brodin Date: Sun, 15 Dec 2013 22:47:22 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r336593 - head/security/wapiti X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 15 Dec 2013 22:47:23 -0000 Author: antoine Date: Sun Dec 15 22:47:22 2013 New Revision: 336593 URL: http://svnweb.freebsd.org/changeset/ports/336593 Log: setuptools are now default, no need to bring it explicitly Modified: head/security/wapiti/Makefile Modified: head/security/wapiti/Makefile ============================================================================== --- head/security/wapiti/Makefile Sun Dec 15 22:34:56 2013 (r336592) +++ head/security/wapiti/Makefile Sun Dec 15 22:47:22 2013 (r336593) @@ -11,8 +11,6 @@ COMMENT= Wapiti is a vulnerability scann LICENSE= GPLv2 -# easy_install puts man page and doc in the egg, so use install with setuptools -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools>=0:${PORTSDIR}/devel/py-setuptools RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}beautifulsoup32>=0:${PORTSDIR}/www/py-beautifulsoup32 \ ${PYTHON_PKGNAMEPREFIX}requests>=1.2.3:${PORTSDIR}/www/py-requests From owner-svn-ports-head@FreeBSD.ORG Sun Dec 15 23:22:34 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id A21F7CFE; Sun, 15 Dec 2013 23:22:34 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 725F81A60; Sun, 15 Dec 2013 23:22:34 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBFNMYts038913; Sun, 15 Dec 2013 23:22:34 GMT (envelope-from rene@svn.freebsd.org) Received: (from rene@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBFNMYWH038912; Sun, 15 Dec 2013 23:22:34 GMT (envelope-from rene@svn.freebsd.org) Message-Id: <201312152322.rBFNMYWH038912@svn.freebsd.org> From: Rene Ladan Date: Sun, 15 Dec 2013 23:22:34 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r336594 - head/Mk/Uses X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 15 Dec 2013 23:22:34 -0000 Author: rene Date: Sun Dec 15 23:22:33 2013 New Revision: 336594 URL: http://svnweb.freebsd.org/changeset/ports/336594 Log: Mention nestedfct parameter. Perform some language fixes while here. Approved by: portmgr (bapt) Modified: head/Mk/Uses/compiler.mk Modified: head/Mk/Uses/compiler.mk ============================================================================== --- head/Mk/Uses/compiler.mk Sun Dec 15 22:47:22 2013 (r336593) +++ head/Mk/Uses/compiler.mk Sun Dec 15 23:22:33 2013 (r336594) @@ -1,27 +1,28 @@ # $FreeBSD$ # -# Allows to feature determine the compiler used +# Allows to determine the compiler being used # # MAINTAINER: portmgr@FreeBSD.org # # Feature: compiler # Usage: USES=compiler or USES=compiler:ARGS -# Valid ARGS: env (default, implicit) c++11-lib c++11-lang c11 openmp features +# Valid ARGS: env (default, implicit) c++11-lib c++11-lang c11 openmp nestedfct features # -# c++11-lang: The port need a compiler understanding C++11 -# c++11-lib: The port need a compiler understanding C++11 and with a C++11 ready standard library -# c11: The port need a compiler understanding c11 -# openmp: The port need a compiler understanding openmp +# c++11-lang: The port needs a compiler understanding C++11 +# c++11-lib: The port needs a compiler understanding C++11 and with a C++11 ready standard library +# c11: The port needs a compiler understanding C11 +# openmp: The port needs a compiler understanding openmp +# nestedfct: The port needs a compiler understanding nestedfct # features: The port will determine the features supported by the default compiler # # Variable to test after # # COMPILER_TYPE: can be gcc or clang -# ALT_COMPILER_TYPE: can be gcc or clang depending on COMPILER_TYPE and only set if the base system has 2 compiler -# COMPILER_VERSION: 2 first digit of the version: 33 for clang 3.3.*, 46 for gcc 4.6.* -# ALT_COMPILER_VERSION: 2 first digit of the version: 33 for clang 3.3.*, 46 for gcc 4.6.* of the ALT_COMPILER_TYPE +# ALT_COMPILER_TYPE: can be gcc or clang depending on COMPILER_TYPE, only set if the base system has 2 compilers +# COMPILER_VERSION: first 2 digits of the version: 33 for clang 3.3.*, 46 for gcc 4.6.* +# ALT_COMPILER_VERSION: first 2 digits of the version: 33 for clang 3.3.*, 46 for gcc 4.6.* of the ALT_COMPILER_TYPE # -# COMPILER_FEATURES: the list of features supported by the compiler include the standard C++ library. +# COMPILER_FEATURES: the list of features supported by the compiler includes the standard C++ library. # CHOSEN_COMPILER_TYPE: can be gcc or clang (type of compiler chosen by the framework) .if !defined(_INCLUDE_USES_COMPILER_MK) From owner-svn-ports-head@FreeBSD.ORG Sun Dec 15 23:31:37 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 6400710B; Sun, 15 Dec 2013 23:31:37 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 4FEA31B03; Sun, 15 Dec 2013 23:31:37 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBFNVbl4042283; Sun, 15 Dec 2013 23:31:37 GMT (envelope-from bapt@svn.freebsd.org) Received: (from bapt@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBFNVb5K042282; Sun, 15 Dec 2013 23:31:37 GMT (envelope-from bapt@svn.freebsd.org) Message-Id: <201312152331.rBFNVb5K042282@svn.freebsd.org> From: Baptiste Daroussin Date: Sun, 15 Dec 2013 23:31:37 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r336595 - head/Mk X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 15 Dec 2013 23:31:37 -0000 Author: bapt Date: Sun Dec 15 23:31:36 2013 New Revision: 336595 URL: http://svnweb.freebsd.org/changeset/ports/336595 Log: Do not set again WITHOUT_NLS in old backward compatibility if NLS is in OPTIONS_UNSET Reported by: eadler Modified: head/Mk/bsd.options.mk Modified: head/Mk/bsd.options.mk ============================================================================== --- head/Mk/bsd.options.mk Sun Dec 15 23:22:33 2013 (r336594) +++ head/Mk/bsd.options.mk Sun Dec 15 23:31:36 2013 (r336595) @@ -358,7 +358,7 @@ ALL_OPTIONS= ${OPTIONS_DEFINE} ### to be removed once old OPTIONS disappear .for opt in ${ALL_OPTIONS} .if empty(PORT_OPTIONS:M${opt}) -. if !defined(WITH_${opt}) && !defined(WITHOUT_${opt}) +. if !defined(WITH_${opt}) && !defined(WITHOUT_${opt}) && ${opt} != NLS WITHOUT_${opt}:= true . endif .else From owner-svn-ports-head@FreeBSD.ORG Sun Dec 15 23:44:13 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id C54BC49B; Sun, 15 Dec 2013 23:44:13 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id B1C291CFA; Sun, 15 Dec 2013 23:44:13 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBFNiDgQ046106; Sun, 15 Dec 2013 23:44:13 GMT (envelope-from bapt@svn.freebsd.org) Received: (from bapt@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBFNiDV2046105; Sun, 15 Dec 2013 23:44:13 GMT (envelope-from bapt@svn.freebsd.org) Message-Id: <201312152344.rBFNiDV2046105@svn.freebsd.org> From: Baptiste Daroussin Date: Sun, 15 Dec 2013 23:44:13 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r336596 - head/Mk X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 15 Dec 2013 23:44:13 -0000 Author: bapt Date: Sun Dec 15 23:44:13 2013 New Revision: 336596 URL: http://svnweb.freebsd.org/changeset/ports/336596 Log: fmake doesn't like previous commit (which breaks index) [1] Given we do not support for long enough old OPTIONS framework just get rid of this compat block that doesn't bring anything anymore Kick by: cperciva [1] Modified: head/Mk/bsd.options.mk Modified: head/Mk/bsd.options.mk ============================================================================== --- head/Mk/bsd.options.mk Sun Dec 15 23:31:36 2013 (r336595) +++ head/Mk/bsd.options.mk Sun Dec 15 23:44:13 2013 (r336596) @@ -355,20 +355,6 @@ NOPORTEXAMPLES= yes ALL_OPTIONS= ${OPTIONS_DEFINE} .endif -### to be removed once old OPTIONS disappear -.for opt in ${ALL_OPTIONS} -.if empty(PORT_OPTIONS:M${opt}) -. if !defined(WITH_${opt}) && !defined(WITHOUT_${opt}) && ${opt} != NLS -WITHOUT_${opt}:= true -. endif -.else -. if !defined(WITH_${opt}) && !defined(WITHOUT_${opt}) -WITH_${opt}:= true -. endif -.endif -.endfor -### - .for opt in ${COMPLETE_OPTIONS_LIST} ${OPTIONS_SLAVE} # PLIST_SUB PLIST_SUB?= From owner-svn-ports-head@FreeBSD.ORG Sun Dec 15 23:45:40 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 7A9CF594; Sun, 15 Dec 2013 23:45:40 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 673B51D0E; Sun, 15 Dec 2013 23:45:40 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBFNje1A046343; Sun, 15 Dec 2013 23:45:40 GMT (envelope-from rene@svn.freebsd.org) Received: (from rene@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBFNjeAH046342; Sun, 15 Dec 2013 23:45:40 GMT (envelope-from rene@svn.freebsd.org) Message-Id: <201312152345.rBFNjeAH046342@svn.freebsd.org> From: Rene Ladan Date: Sun, 15 Dec 2013 23:45:40 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r336597 - head/Mk/Uses X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 15 Dec 2013 23:45:40 -0000 Author: rene Date: Sun Dec 15 23:45:39 2013 New Revision: 336597 URL: http://svnweb.freebsd.org/changeset/ports/336597 Log: Spell out "nestedfct" Approved by: portmgr (bapt) Modified: head/Mk/Uses/compiler.mk Modified: head/Mk/Uses/compiler.mk ============================================================================== --- head/Mk/Uses/compiler.mk Sun Dec 15 23:44:13 2013 (r336596) +++ head/Mk/Uses/compiler.mk Sun Dec 15 23:45:39 2013 (r336597) @@ -12,7 +12,7 @@ # c++11-lib: The port needs a compiler understanding C++11 and with a C++11 ready standard library # c11: The port needs a compiler understanding C11 # openmp: The port needs a compiler understanding openmp -# nestedfct: The port needs a compiler understanding nestedfct +# nestedfct: The port needs a compiler understanding nested functions # features: The port will determine the features supported by the default compiler # # Variable to test after From owner-svn-ports-head@FreeBSD.ORG Sun Dec 15 23:46:55 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id DF650683; Sun, 15 Dec 2013 23:46:55 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id BF15E1D1C; Sun, 15 Dec 2013 23:46:55 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBFNkt4a046604; Sun, 15 Dec 2013 23:46:55 GMT (envelope-from kwm@svn.freebsd.org) Received: (from kwm@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBFNksFs046594; Sun, 15 Dec 2013 23:46:54 GMT (envelope-from kwm@svn.freebsd.org) Message-Id: <201312152346.rBFNksFs046594@svn.freebsd.org> From: Koop Mast Date: Sun, 15 Dec 2013 23:46:54 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r336598 - in head/devel/regexxer: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 15 Dec 2013 23:46:55 -0000 Author: kwm Date: Sun Dec 15 23:46:53 2013 New Revision: 336598 URL: http://svnweb.freebsd.org/changeset/ports/336598 Log: Update to 0.10. Adopt. Added: head/devel/regexxer/files/ head/devel/regexxer/files/patch-Makefile.in (contents, props changed) head/devel/regexxer/files/patch-src_fileshared.h (contents, props changed) head/devel/regexxer/files/patch-src_globalstrings.h (contents, props changed) head/devel/regexxer/files/patch-src_translation.h (contents, props changed) Modified: head/devel/regexxer/Makefile head/devel/regexxer/distinfo head/devel/regexxer/pkg-plist Modified: head/devel/regexxer/Makefile ============================================================================== --- head/devel/regexxer/Makefile Sun Dec 15 23:45:39 2013 (r336597) +++ head/devel/regexxer/Makefile Sun Dec 15 23:46:53 2013 (r336598) @@ -1,35 +1,22 @@ # Created by: Rui Lopes # $FreeBSD$ -PORTNAME= regexxer -PORTVERSION= 0.9 -PORTREVISION= 10 -CATEGORIES= devel textproc gnome -MASTER_SITES= SF +PORTNAME= regexxer +PORTVERSION= 0.10 +CATEGORIES= devel textproc gnome +MASTER_SITES= GNOME + +MAINTAINER= kwm@FreeBSD.org +COMMENT= Interactive tool for performing search and replace operations + +USES= gettext gmake pathfix pkgconfig +USE_XZ= yes +GNU_CONFIGURE= yes +USE_GNOME= gnomeprefix intltool intlhack gtkmm30 gtksourceviewmm3 +CPPFLAGS+= -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib +INSTALLS_ICONS= yes -MAINTAINER= ports@FreeBSD.org -COMMENT= An interactive tool for performing search and replace operations - -LIB_DEPENDS= gconfmm-2.6:${PORTSDIR}/devel/gconfmm26 \ - glademm-2.4:${PORTSDIR}/devel/libglademm24 \ - pcre.3:${PORTSDIR}/devel/pcre - -GNU_CONFIGURE= yes -USES= pathfix gettext gmake pkgconfig -USE_GNOME= gnomeprefix intltool intlhack -CPPFLAGS+= -I${LOCALBASE}/include -LDFLAGS+= -L${LOCALBASE}/lib - -GCONF_SCHEMAS= regexxer.schemas -INSTALLS_ICONS= regexxer.png - -# This target is only meant to be used by the port maintainer. -NO_STAGE= yes -x-generate-plist: - (${PORTSDIR}/Tools/scripts/plist -d -m ${MTREE_FILE} ${PREFIX}|${GREP} regexxer) > temp-pkg-plist - -post-patch: - @${REINPLACE_CMD} -e 's|glib/.*\.h>|glib.h>|g' \ - ${WRKSRC}/src/globalstrings.h ${WRKSRC}/src/translation.h +GLIB_SCHEMAS= org.regexxer.gschema.xml .include Modified: head/devel/regexxer/distinfo ============================================================================== --- head/devel/regexxer/distinfo Sun Dec 15 23:45:39 2013 (r336597) +++ head/devel/regexxer/distinfo Sun Dec 15 23:46:53 2013 (r336598) @@ -1,2 +1,2 @@ -SHA256 (regexxer-0.9.tar.gz) = ec6630745e4a87eb57aa498b5d36f014efb91a18293cc7acd9a5b506b6238479 -SIZE (regexxer-0.9.tar.gz) = 299095 +SHA256 (regexxer-0.10.tar.xz) = 2a7832541a0306b3d4eb63a1cf8978d7bbfc7927e9304473fe801d71fd99736c +SIZE (regexxer-0.10.tar.xz) = 251544 Added: head/devel/regexxer/files/patch-Makefile.in ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/regexxer/files/patch-Makefile.in Sun Dec 15 23:46:53 2013 (r336598) @@ -0,0 +1,10 @@ +--- Makefile.in.orig 2013-12-16 00:13:47.000000000 +0100 ++++ Makefile.in 2013-12-16 00:14:26.000000000 +0100 +@@ -1092,7 +1092,6 @@ + @INTLTOOL_XML_NOMERGE_RULE@ + + install-data-hook: install-update-icon-cache +- $(GLIB_COMPILE_SCHEMAS) $(gsettingsschemadir) + #$(gsettingsupdateschemacache) $(gsettingsschemadir) + + uninstall-hook: uninstall-update-icon-cache Added: head/devel/regexxer/files/patch-src_fileshared.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/regexxer/files/patch-src_fileshared.h Sun Dec 15 23:46:53 2013 (r336598) @@ -0,0 +1,11 @@ +--- src/fileshared.h.orig 2011-10-06 14:50:48.000000000 +0200 ++++ src/fileshared.h 2013-12-16 00:09:23.000000000 +0100 +@@ -23,7 +23,7 @@ + + #include "sharedptr.h" + +-#include ++#include + #include + #include + #include Added: head/devel/regexxer/files/patch-src_globalstrings.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/regexxer/files/patch-src_globalstrings.h Sun Dec 15 23:46:53 2013 (r336598) @@ -0,0 +1,11 @@ +--- src/globalstrings.h.orig 2013-12-16 00:04:58.000000000 +0100 ++++ src/globalstrings.h 2013-12-16 00:05:20.000000000 +0100 +@@ -21,7 +21,7 @@ + #ifndef REGEXXER_GLOBALSTRINGS_H_INCLUDED + #define REGEXXER_GLOBALSTRINGS_H_INCLUDED + +-#include /* for G_DIR_SEPARATOR_S */ ++#include /* for G_DIR_SEPARATOR_S */ + + namespace Regexxer + { Added: head/devel/regexxer/files/patch-src_translation.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/regexxer/files/patch-src_translation.h Sun Dec 15 23:46:53 2013 (r336598) @@ -0,0 +1,11 @@ +--- src/translation.h.orig 2013-12-16 00:04:52.000000000 +0100 ++++ src/translation.h 2013-12-16 00:05:10.000000000 +0100 +@@ -21,7 +21,7 @@ + #ifndef REGEXXER_TRANSLATION_H_INCLUDED + #define REGEXXER_TRANSLATION_H_INCLUDED + +-#include ++#include + #include + + #ifndef gettext_noop Modified: head/devel/regexxer/pkg-plist ============================================================================== --- head/devel/regexxer/pkg-plist Sun Dec 15 23:45:39 2013 (r336597) +++ head/devel/regexxer/pkg-plist Sun Dec 15 23:46:53 2013 (r336598) @@ -1,41 +1,54 @@ bin/regexxer share/applications/regexxer.desktop -share/regexxer/mainwindow.glade -share/regexxer/prefdialog.glade share/icons/hicolor/48x48/apps/regexxer.png share/locale/ar/LC_MESSAGES/regexxer.mo share/locale/bg/LC_MESSAGES/regexxer.mo share/locale/ca/LC_MESSAGES/regexxer.mo share/locale/cs/LC_MESSAGES/regexxer.mo +share/locale/da/LC_MESSAGES/regexxer.mo share/locale/de/LC_MESSAGES/regexxer.mo share/locale/dz/LC_MESSAGES/regexxer.mo +share/locale/el/LC_MESSAGES/regexxer.mo share/locale/en_CA/LC_MESSAGES/regexxer.mo share/locale/en_GB/LC_MESSAGES/regexxer.mo share/locale/es/LC_MESSAGES/regexxer.mo share/locale/eu/LC_MESSAGES/regexxer.mo share/locale/fi/LC_MESSAGES/regexxer.mo share/locale/fr/LC_MESSAGES/regexxer.mo +share/locale/gl/LC_MESSAGES/regexxer.mo +share/locale/gu/LC_MESSAGES/regexxer.mo share/locale/hu/LC_MESSAGES/regexxer.mo share/locale/it/LC_MESSAGES/regexxer.mo share/locale/ja/LC_MESSAGES/regexxer.mo +share/locale/nb/LC_MESSAGES/regexxer.mo share/locale/ne/LC_MESSAGES/regexxer.mo share/locale/nl/LC_MESSAGES/regexxer.mo +share/locale/oc/LC_MESSAGES/regexxer.mo share/locale/pa/LC_MESSAGES/regexxer.mo share/locale/pl/LC_MESSAGES/regexxer.mo share/locale/pt/LC_MESSAGES/regexxer.mo share/locale/pt_BR/LC_MESSAGES/regexxer.mo +share/locale/ru/LC_MESSAGES/regexxer.mo share/locale/rw/LC_MESSAGES/regexxer.mo +share/locale/sk/LC_MESSAGES/regexxer.mo share/locale/sl/LC_MESSAGES/regexxer.mo share/locale/sr/LC_MESSAGES/regexxer.mo -share/locale/sr@Latn/LC_MESSAGES/regexxer.mo +share/locale/sr@latin/LC_MESSAGES/regexxer.mo share/locale/sv/LC_MESSAGES/regexxer.mo +share/locale/ta/LC_MESSAGES/regexxer.mo share/locale/uk/LC_MESSAGES/regexxer.mo share/locale/vi/LC_MESSAGES/regexxer.mo share/locale/zh_CN/LC_MESSAGES/regexxer.mo share/locale/zh_HK/LC_MESSAGES/regexxer.mo share/locale/zh_TW/LC_MESSAGES/regexxer.mo +share/regexxer/mainwindow.ui +share/regexxer/prefdialog.ui @dirrm share/regexxer +@dirrmtry share/locale/sr@latin/LC_MESSAGES +@dirrmtry share/locale/sr@latin @dirrmtry share/locale/rw/LC_MESSAGES @dirrmtry share/locale/rw +@dirrmtry share/locale/or/LC_MESSAGES +@dirrmtry share/locale/or @dirrmtry share/locale/dz/LC_MESSAGES @dirrmtry share/locale/dz From owner-svn-ports-head@FreeBSD.ORG Mon Dec 16 00:04:51 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 450A0939; Mon, 16 Dec 2013 00:04:51 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 312F01EE5; Mon, 16 Dec 2013 00:04:51 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBG04pET054446; Mon, 16 Dec 2013 00:04:51 GMT (envelope-from bapt@svn.freebsd.org) Received: (from bapt@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBG04opD054444; Mon, 16 Dec 2013 00:04:50 GMT (envelope-from bapt@svn.freebsd.org) Message-Id: <201312160004.rBG04opD054444@svn.freebsd.org> From: Baptiste Daroussin Date: Mon, 16 Dec 2013 00:04:50 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r336599 - head/devel/loki X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 16 Dec 2013 00:04:51 -0000 Author: bapt Date: Mon Dec 16 00:04:50 2013 New Revision: 336599 URL: http://svnweb.freebsd.org/changeset/ports/336599 Log: Support stage Fix build on head Respect CXXFLAGS Modified: head/devel/loki/Makefile head/devel/loki/pkg-descr Modified: head/devel/loki/Makefile ============================================================================== --- head/devel/loki/Makefile Sun Dec 15 23:46:53 2013 (r336598) +++ head/devel/loki/Makefile Mon Dec 16 00:04:50 2013 (r336599) @@ -7,24 +7,29 @@ CATEGORIES= devel MASTER_SITES= SF/${PORTNAME}-lib/Loki/Loki%20${PORTVERSION} MAINTAINER= snnn119@gmail.com -COMMENT= A C++ library of common design patterns +COMMENT= C++ library of common design patterns -USE_DOS2UNIX= yes -USE_GMAKE= yes +USES= gmake dos2unix USE_LDCONFIG= yes +CXXFLAGS+= -Wno-return-type + DOCS= README CHANGES doc/flex/flex_string.html \ doc/yasli/Notes.txt \ doc/yasli/yasli.html -NO_STAGE= yes +post-patch: + @${REINPLACE_CMD} 's/bad_function_call/Loki::bad_function_call/g' \ + ${WRKSRC}/test/Function/FunctionTest.cpp + @${REINPLACE_CMD} -e '/CXXWARNFLAGS/s/$$/ ${CXXFLAGS}/g' \ + -e 's/\$${PREFIX}/$${DESTDIR}$${PREFIX}/g' \ + ${WRKSRC}/Makefile.common + post-install: -.if !defined(NOPORTDOCS) - ${MKDIR} ${DOCSDIR} + ${MKDIR} ${STAGEDIR}${DOCSDIR} .for i in ${DOCS} - ${INSTALL_MAN} ${WRKSRC}/${i} ${DOCSDIR} + ${INSTALL_MAN} ${WRKSRC}/${i} ${STAGEDIR}${DOCSDIR} .endfor -.endif .include Modified: head/devel/loki/pkg-descr ============================================================================== --- head/devel/loki/pkg-descr Sun Dec 15 23:46:53 2013 (r336598) +++ head/devel/loki/pkg-descr Mon Dec 16 00:04:50 2013 (r336599) @@ -1,5 +1,4 @@ A C++ library of designs, containing flexible implementations of common design patterns and idioms. - WWW: http://sourceforge.net/projects/loki-lib/ From owner-svn-ports-head@FreeBSD.ORG Mon Dec 16 00:54:24 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 613C51DF; Mon, 16 Dec 2013 00:54:24 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 4D52D11A7; Mon, 16 Dec 2013 00:54:24 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBG0sOYg072346; Mon, 16 Dec 2013 00:54:24 GMT (envelope-from gerald@svn.freebsd.org) Received: (from gerald@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBG0sN0T072344; Mon, 16 Dec 2013 00:54:23 GMT (envelope-from gerald@svn.freebsd.org) Message-Id: <201312160054.rBG0sN0T072344@svn.freebsd.org> From: Gerald Pfeifer Date: Mon, 16 Dec 2013 00:54:23 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r336600 - head/lang/gcc47 X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 16 Dec 2013 00:54:24 -0000 Author: gerald Date: Mon Dec 16 00:54:23 2013 New Revision: 336600 URL: http://svnweb.freebsd.org/changeset/ports/336600 Log: Update to the 20131214 snapshot of GCC 4.7.4. Modified: head/lang/gcc47/Makefile head/lang/gcc47/distinfo Modified: head/lang/gcc47/Makefile ============================================================================== --- head/lang/gcc47/Makefile Mon Dec 16 00:04:50 2013 (r336599) +++ head/lang/gcc47/Makefile Mon Dec 16 00:54:23 2013 (r336600) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= gcc47 -PORTVERSION= 4.7.4.20131130 +PORTVERSION= 4.7.4.20131214 CATEGORIES= lang java MASTER_SITES= ${MASTER_SITE_GCC} MASTER_SITE_SUBDIR= snapshots/${DISTVERSION} Modified: head/lang/gcc47/distinfo ============================================================================== --- head/lang/gcc47/distinfo Mon Dec 16 00:04:50 2013 (r336599) +++ head/lang/gcc47/distinfo Mon Dec 16 00:54:23 2013 (r336600) @@ -1,2 +1,2 @@ -SHA256 (gcc-4.7-20131130.tar.bz2) = 0223a1beb8524b26a7193f4c871222a5f6455058fb2ee5d559f0b7b370a8f44c -SIZE (gcc-4.7-20131130.tar.bz2) = 78837894 +SHA256 (gcc-4.7-20131214.tar.bz2) = cc3e695d22801581d16d4e26eabb5a1ca5852d506e88488e721498c7e9828eda +SIZE (gcc-4.7-20131214.tar.bz2) = 78837681 From owner-svn-ports-head@FreeBSD.ORG Mon Dec 16 01:59:26 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id F2A62FE6; Mon, 16 Dec 2013 01:59:25 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id DF8D31551; Mon, 16 Dec 2013 01:59:25 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBG1xPD8094537; Mon, 16 Dec 2013 01:59:25 GMT (envelope-from gerald@svn.freebsd.org) Received: (from gerald@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBG1xP7x094535; Mon, 16 Dec 2013 01:59:25 GMT (envelope-from gerald@svn.freebsd.org) Message-Id: <201312160159.rBG1xP7x094535@svn.freebsd.org> From: Gerald Pfeifer Date: Mon, 16 Dec 2013 01:59:25 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r336601 - head/lang/gcc49 X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 16 Dec 2013 01:59:26 -0000 Author: gerald Date: Mon Dec 16 01:59:25 2013 New Revision: 336601 URL: http://svnweb.freebsd.org/changeset/ports/336601 Log: Update to the 20131215 snapshot of GCC 4.9.0. Modified: head/lang/gcc49/Makefile head/lang/gcc49/distinfo Modified: head/lang/gcc49/Makefile ============================================================================== --- head/lang/gcc49/Makefile Mon Dec 16 00:54:23 2013 (r336600) +++ head/lang/gcc49/Makefile Mon Dec 16 01:59:25 2013 (r336601) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= gcc49 -PORTVERSION= 4.9.0.20131208 +PORTVERSION= 4.9.0.20131215 CATEGORIES= lang java MASTER_SITES= ${MASTER_SITE_GCC} MASTER_SITE_SUBDIR= snapshots/${DISTVERSION} Modified: head/lang/gcc49/distinfo ============================================================================== --- head/lang/gcc49/distinfo Mon Dec 16 00:54:23 2013 (r336600) +++ head/lang/gcc49/distinfo Mon Dec 16 01:59:25 2013 (r336601) @@ -1,2 +1,2 @@ -SHA256 (gcc-4.9-20131208.tar.bz2) = 79ed4244254a6a02925703ba6d207b03d421a57d63aad2110e11e58679038431 -SIZE (gcc-4.9-20131208.tar.bz2) = 84410526 +SHA256 (gcc-4.9-20131215.tar.bz2) = 23cbfc976cb4b89800c1fe41f7ebd9f141e8baf7502bb00d0d012c7fd6c15cb3 +SIZE (gcc-4.9-20131215.tar.bz2) = 84507310 From owner-svn-ports-head@FreeBSD.ORG Mon Dec 16 02:36:24 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 45212997; Mon, 16 Dec 2013 02:36:24 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 31391177A; Mon, 16 Dec 2013 02:36:24 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBG2aOP0009485; Mon, 16 Dec 2013 02:36:24 GMT (envelope-from cperciva@svn.freebsd.org) Received: (from cperciva@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBG2aNMP009483; Mon, 16 Dec 2013 02:36:23 GMT (envelope-from cperciva@svn.freebsd.org) Message-Id: <201312160236.rBG2aNMP009483@svn.freebsd.org> From: Colin Percival Date: Mon, 16 Dec 2013 02:36:23 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r336602 - in head/sysutils/firstboot-pkgs: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 16 Dec 2013 02:36:24 -0000 Author: cperciva Date: Mon Dec 16 02:36:23 2013 New Revision: 336602 URL: http://svnweb.freebsd.org/changeset/ports/336602 Log: pkg uses "is stdin a terminal?" to decide if it's running interactively and thereby whether it should display a progress bar during downloads. While rc.d scripts have a terminal attached, for the common case of unattended installation of servers, this script is not being used interactively; so redirect stdin from /dev/null to silence the progress bars and reduce console spew. The -q option could be used to accomplish this, but that would also eliminate other more useful information, such as the names and versions of packages being installed. Modified: head/sysutils/firstboot-pkgs/Makefile head/sysutils/firstboot-pkgs/files/firstboot_pkgs.in Modified: head/sysutils/firstboot-pkgs/Makefile ============================================================================== --- head/sysutils/firstboot-pkgs/Makefile Mon Dec 16 01:59:25 2013 (r336601) +++ head/sysutils/firstboot-pkgs/Makefile Mon Dec 16 02:36:23 2013 (r336602) @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= firstboot-pkgs -PORTVERSION= 1.2 +PORTVERSION= 1.3 CATEGORIES= sysutils MASTER_SITES= # none DISTFILES= # none Modified: head/sysutils/firstboot-pkgs/files/firstboot_pkgs.in ============================================================================== --- head/sysutils/firstboot-pkgs/files/firstboot_pkgs.in Mon Dec 16 01:59:25 2013 (r336601) +++ head/sysutils/firstboot-pkgs/files/firstboot_pkgs.in Mon Dec 16 02:36:23 2013 (r336602) @@ -37,7 +37,7 @@ firstboot_pkgs_run() # Install requested packages, if any if ! [ -z "$firstboot_pkgs_list" ]; then - env ASSUME_ALWAYS_YES=YES pkg install $firstboot_pkgs_list + env ASSUME_ALWAYS_YES=YES pkg install $firstboot_pkgs_list Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id D360AAA2; Mon, 16 Dec 2013 02:38:59 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id A63DF1792; Mon, 16 Dec 2013 02:38:59 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBG2cxYi009808; Mon, 16 Dec 2013 02:38:59 GMT (envelope-from rene@svn.freebsd.org) Received: (from rene@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBG2cx41009807; Mon, 16 Dec 2013 02:38:59 GMT (envelope-from rene@svn.freebsd.org) Message-Id: <201312160238.rBG2cx41009807@svn.freebsd.org> From: Rene Ladan Date: Mon, 16 Dec 2013 02:38:59 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r336603 - head/www/py-ws4py X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 16 Dec 2013 02:38:59 -0000 Author: rene Date: Mon Dec 16 02:38:59 2013 New Revision: 336603 URL: http://svnweb.freebsd.org/changeset/ports/336603 Log: - Convert to PYDISTUTILS=yes - Stagify - Set NO_ARCH - Drop post-install printing (this is already in the options) - Drop pkg-plist - Bump PORTREVISION so that py-setuptools is not registered as a run-time dependency Deleted: head/www/py-ws4py/pkg-plist Modified: head/www/py-ws4py/Makefile Modified: head/www/py-ws4py/Makefile ============================================================================== --- head/www/py-ws4py/Makefile Mon Dec 16 02:36:23 2013 (r336602) +++ head/www/py-ws4py/Makefile Mon Dec 16 02:38:59 2013 (r336603) @@ -3,6 +3,7 @@ PORTNAME= ws4py PORTVERSION= 0.3.2 +PORTREVISION= 1 CATEGORIES= www python MASTER_SITES= http://www.defuze.org/oss/${PORTNAME}/ PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -13,7 +14,10 @@ COMMENT= WebSocket package for Python LICENSE= BSD3CLAUSE USE_PYTHON= yes -USE_PYDISTUTILS= easy_install +USE_PYDISTUTILS= yes +PYDISTUTILS_AUTOPLIST= yes + +NO_ARCH= yes OPTIONSFILE= ${PORT_DBDIR}/py-${PORTNAME}/options OPTIONS_DEFINE= CHERRYPY GEVENT TORNADO @@ -22,48 +26,28 @@ CHERRYPY_DESC= CherryPy server support GEVENT_DESC= gevent-based client/server support TORNADO_DESC= Tornado client support -CHERRYPY_FILES= test/test_cherrypy.py ws4py/server/cherrypyserver.py -GEVENT_FILES= ws4py/client/geventclient.py ws4py/server/geventserver.py -TORNADO_FILES= ws4py/client/tornadoclient.py - CHERRYPY_RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}cherrypy>=3.2.2:${PORTSDIR}/www/py-cherrypy GEVENT_RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}gevent>=0.13.8:${PORTSDIR}/devel/py-gevent TORNADO_RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}tornado>=3.1:${PORTSDIR}/www/py-tornado -NO_STAGE= yes .include # Do not install files which will not work post-patch: .if ! ${PORT_OPTIONS:MCHERRYPY} -.for f in ${CHERRYPY_FILES} +.for f in test/test_cherrypy.py ws4py/server/cherrypyserver.py ${RM} ${WRKSRC}/${f} .endfor .endif .if ! ${PORT_OPTIONS:MGEVENT} -.for f in ${GEVENT_FILES} +.for f in ws4py/client/geventclient.py ws4py/server/geventserver.py ${RM} ${WRKSRC}/${f} .endfor .endif .if ! ${PORT_OPTIONS:MTORNADO} -.for f in ${TORNADO_FILES} +.for f in ws4py/client/tornadoclient.py ${RM} ${WRKSRC}/${f} .endfor .endif -post-install: -.if ! ${PORT_OPTIONS:MCHERRYPY} || ! ${PORT_OPTIONS:MGEVENT} || ! ${PORT_OPTIONS:MTORNADO} - @${ECHO_MSG} - @${ECHO_MSG} "Note that the following files are not installed:" -.endif -.if ! ${PORT_OPTIONS:MCHERRYPY} - @${ECHO_MSG} ${CHERRYPY_FILES} -.endif -.if ! ${PORT_OPTIONS:MGEVENT} - @${ECHO_MSG} ${GEVENT_FILES} -.endif -.if ! ${PORT_OPTIONS:MTORNADO} - @${ECHO_MSG} ${TORNADO_FILES} -.endif - .include From owner-svn-ports-head@FreeBSD.ORG Mon Dec 16 03:23:24 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 3880C396; Mon, 16 Dec 2013 03:23:24 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 24AE01B14; Mon, 16 Dec 2013 03:23:24 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBG3NOxP028514; Mon, 16 Dec 2013 03:23:24 GMT (envelope-from db@svn.freebsd.org) Received: (from db@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBG3NNSx028510; Mon, 16 Dec 2013 03:23:23 GMT (envelope-from db@svn.freebsd.org) Message-Id: <201312160323.rBG3NNSx028510@svn.freebsd.org> From: Diane Bruce Date: Mon, 16 Dec 2013 03:23:23 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r336604 - in head/comms/hf: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 16 Dec 2013 03:23:24 -0000 Author: db Date: Mon Dec 16 03:23:23 2013 New Revision: 336604 URL: http://svnweb.freebsd.org/changeset/ports/336604 Log: - Fix build on 10 - Add stage support - Add LICENSE Modified: head/comms/hf/Makefile (contents, props changed) head/comms/hf/files/patch-hfkernel_Makefile.in (contents, props changed) head/comms/hf/pkg-plist (contents, props changed) Modified: head/comms/hf/Makefile ============================================================================== --- head/comms/hf/Makefile Mon Dec 16 02:38:59 2013 (r336603) +++ head/comms/hf/Makefile Mon Dec 16 03:23:23 2013 (r336604) @@ -10,20 +10,20 @@ MASTER_SITES= SF/${PORTNAME}term/${PORTN MAINTAINER= db@FreeBSD.org COMMENT= Amateur Radio soundcard fsk, pactor 1, amtor, gtor, mt63 +LICENSE= GPLv2 + RUN_DEPENDS= whiptail:${PORTSDIR}/devel/newt USE_GNOME= gtk12 USE_GMAKE= yes GNU_CONFIGURE= yes -CONFIGURE_ARGS= --prefix=${PREFIX} --sysconfdir=${PREFIX} +CONFIGURE_ARGS= --prefix=${STAGEDIR}${PREFIX} --sysconfdir=${STAGEDIR}${PREFIX} MAKE_JOBS_UNSAFE= yes -MANLANG= "" "de.ISO8859-1" -MAN1= hf.1 hfterm.1 hfkernel.1 -MAN1_EN= dcf77gen.1 dcf77rx.1 +PKGMESSAGE= ${WRKDIR}/pkg-message + CONFLICTS= sysutils/lbl-hf-1.* -NO_STAGE= yes post-configure: @${REINPLACE_CMD} -e 's|-pthread|${PTHREAD_LIBS}|' \ ${WRKSRC}/hfkernel/Makefile @@ -31,18 +31,13 @@ post-configure: ${WRKSRC}/util/reffreq.c ${WRKSRC}/scripts/Makefile post-install: - @${ECHO} "" -.if !defined(NOPORTEXAMPLES) - @${MKDIR} ${EXAMPLESDIR} + @${MKDIR} ${STAGEDIR}${EXAMPLESDIR} .for d in ${WRKSRC}/doc/hf-examplefiles/fix.[0-1]*[0-9]* \ ${WRKSRC}/doc/hf-examplefiles/gag - @${INSTALL_DATA} ${WRKSRC}/${d} ${EXAMPLESDIR} + @${INSTALL_DATA} ${WRKSRC}/${d} ${STAGEDIR}${EXAMPLESDIR} .endfor - @${ECHO} "hf examples installed in ${EXAMPLESDIR}" -.endif - -.if !defined(NOPORTDOCS) - @${MKDIR} ${DOCSDIR} + @${ECHO} "If examples are installed they will be found in ${EXAMPLESDIR}" >> ${WRKDIR}/pkg-message + @${MKDIR} ${STAGEDIR}${DOCSDIR} .for d in ${WRKSRC}/doc/AUTHORS ${WRKSRC}/doc/ChangeLog \ ${WRKSRC}/doc/DE-HF-HOWTO.txt ${WRKSRC}/doc/HF-HOWTO.txt \ ${WRKSRC}/doc/INSTALL ${WRKSRC}/doc/LIESMICH \ @@ -52,10 +47,8 @@ post-install: ${WRKSRC}/doc/lfconv.jpg ${WRKSRC}/doc/mt63.txt \ ${WRKSRC}/doc/pactor.ps ${WRKSRC}/doc/pactor.txt \ ${WRKSRC}/doc/pactor_statediag.fig - @${INSTALL_DATA} ${WRKSRC}/${d} ${DOCSDIR} + @${INSTALL_DATA} ${WRKSRC}/${d} ${STAGEDIR}${DOCSDIR} .endfor - @${ECHO} "hf docs installed in ${DOCSDIR}" -.endif - @${ECHO} "" + @${ECHO} "If docs are installed they will be found in ${DOCSDIR}" >> ${WRKDIR}/pkg-message .include Modified: head/comms/hf/files/patch-hfkernel_Makefile.in ============================================================================== --- head/comms/hf/files/patch-hfkernel_Makefile.in Mon Dec 16 02:38:59 2013 (r336603) +++ head/comms/hf/files/patch-hfkernel_Makefile.in Mon Dec 16 03:23:23 2013 (r336604) @@ -1,5 +1,14 @@ ---- hfkernel/Makefile.in.orig Sun Apr 15 18:33:50 2007 -+++ hfkernel/Makefile.in Sun Apr 15 18:34:48 2007 +--- hfkernel/Makefile.in.orig 2007-02-06 09:44:30.000000000 -0500 ++++ hfkernel/Makefile.in 2013-12-14 21:36:25.710721920 -0500 +@@ -114,7 +114,7 @@ + INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ + LDFLAGS = @LDFLAGS@ + LIBOBJS = @LIBOBJS@ +-LIBS = @LIBS@ ++LIBS = @LIBS@ -lm + LTLIBOBJS = @LTLIBOBJS@ + MAKEINFO = @MAKEINFO@ + OBJEXT = @OBJEXT@ @@ -179,6 +179,7 @@ noinst_HEADERS = main.h msg.h hfkernel_SOURCES = main.c msg.c Modified: head/comms/hf/pkg-plist ============================================================================== --- head/comms/hf/pkg-plist Mon Dec 16 02:38:59 2013 (r336603) +++ head/comms/hf/pkg-plist Mon Dec 16 03:23:23 2013 (r336604) @@ -19,6 +19,14 @@ bin/ratetry bin/reffreq etc/calibrations.samp %%PORTEXAMPLES%%%%EXAMPLESDIR%%/fix.01 +man/de.ISO8859-1/man1/hf.1.gz +man/de.ISO8859-1/man1/hfkernel.1.gz +man/de.ISO8859-1/man1/hfterm.1.gz +man/man1/dcf77gen.1.gz +man/man1/dcf77rx.1.gz +man/man1/hf.1.gz +man/man1/hfkernel.1.gz +man/man1/hfterm.1.gz %%PORTEXAMPLES%%%%EXAMPLESDIR%%/fix.02 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/fix.03 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/fix.04 From owner-svn-ports-head@FreeBSD.ORG Mon Dec 16 03:31:11 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 381AE507; Mon, 16 Dec 2013 03:31:11 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 24DF01CAA; Mon, 16 Dec 2013 03:31:11 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBG3VBFN031751; Mon, 16 Dec 2013 03:31:11 GMT (envelope-from gerald@svn.freebsd.org) Received: (from gerald@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBG3VA66031749; Mon, 16 Dec 2013 03:31:10 GMT (envelope-from gerald@svn.freebsd.org) Message-Id: <201312160331.rBG3VA66031749@svn.freebsd.org> From: Gerald Pfeifer Date: Mon, 16 Dec 2013 03:31:10 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r336605 - head/lang/gcc48 X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 16 Dec 2013 03:31:11 -0000 Author: gerald Date: Mon Dec 16 03:31:10 2013 New Revision: 336605 URL: http://svnweb.freebsd.org/changeset/ports/336605 Log: Update to the 20131212 snapshot of GCC 4.8.3. Modified: head/lang/gcc48/Makefile head/lang/gcc48/distinfo Modified: head/lang/gcc48/Makefile ============================================================================== --- head/lang/gcc48/Makefile Mon Dec 16 03:23:23 2013 (r336604) +++ head/lang/gcc48/Makefile Mon Dec 16 03:31:10 2013 (r336605) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= gcc48 -PORTVERSION= 4.8.3.s20131128 +PORTVERSION= 4.8.3.s20131212 CATEGORIES= lang java MASTER_SITES= ${MASTER_SITE_GCC} MASTER_SITE_SUBDIR= snapshots/${DISTVERSION} Modified: head/lang/gcc48/distinfo ============================================================================== --- head/lang/gcc48/distinfo Mon Dec 16 03:23:23 2013 (r336604) +++ head/lang/gcc48/distinfo Mon Dec 16 03:31:10 2013 (r336605) @@ -1,2 +1,2 @@ -SHA256 (gcc-4.8-20131128.tar.bz2) = 29b416775007906fe6286d7c4a166d5a6c0d8c76b10b70bd0e68f5cc991b0836 -SIZE (gcc-4.8-20131128.tar.bz2) = 81842287 +SHA256 (gcc-4.8-20131212.tar.bz2) = 78986e1464f209c18e19a9fe3ddd5fe676b3d57cb0a88dc0ceea9faf12cd2606 +SIZE (gcc-4.8-20131212.tar.bz2) = 81860364 From owner-svn-ports-head@FreeBSD.ORG Mon Dec 16 04:11:01 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 09DE2643; Mon, 16 Dec 2013 04:11:01 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id EAB6E1F3D; Mon, 16 Dec 2013 04:11:00 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBG4B0N9045907; Mon, 16 Dec 2013 04:11:00 GMT (envelope-from delphij@svn.freebsd.org) Received: (from delphij@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBG4B0x0045905; Mon, 16 Dec 2013 04:11:00 GMT (envelope-from delphij@svn.freebsd.org) Message-Id: <201312160411.rBG4B0x0045905@svn.freebsd.org> From: Xin LI Date: Mon, 16 Dec 2013 04:11:00 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r336606 - head/security/vuxml X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 16 Dec 2013 04:11:01 -0000 Author: delphij Date: Mon Dec 16 04:11:00 2013 New Revision: 336606 URL: http://svnweb.freebsd.org/changeset/ports/336606 Log: Document Zabbix agent remote command execution vulnerability. Modified: head/security/vuxml/vuln.xml Modified: head/security/vuxml/vuln.xml ============================================================================== --- head/security/vuxml/vuln.xml Mon Dec 16 03:31:10 2013 (r336605) +++ head/security/vuxml/vuln.xml Mon Dec 16 04:11:00 2013 (r336606) @@ -51,6 +51,33 @@ Note: Please add new entries to the beg --> + + zabbix -- shell command injection vulnerability + + + zabbix2-agent + 2.0.10 + + + + +

Recurity Labs Team project reports:

+
+

Zabbix agent is vulnerable to remote command execution + from the Zabbix server in some cases.

+
+ + + + CVE-2013-6824 + https://support.zabbix.com/browse/ZBX-7479 + + + 2013-12-03 + 2013-12-16 + + + PHP5 -- memory corruption in openssl_x509_parse() From owner-svn-ports-head@FreeBSD.ORG Mon Dec 16 04:24:13 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id C8DA8436; Mon, 16 Dec 2013 04:24:13 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id B0B22109B; Mon, 16 Dec 2013 04:24:13 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBG4ODLU049908; Mon, 16 Dec 2013 04:24:13 GMT (envelope-from eadler@svn.freebsd.org) Received: (from eadler@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBG4ODmK049907; Mon, 16 Dec 2013 04:24:13 GMT (envelope-from eadler@svn.freebsd.org) Message-Id: <201312160424.rBG4ODmK049907@svn.freebsd.org> From: Eitan Adler Date: Mon, 16 Dec 2013 04:24:13 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r336607 - head X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 16 Dec 2013 04:24:13 -0000 Author: eadler Date: Mon Dec 16 04:24:13 2013 New Revision: 336607 URL: http://svnweb.freebsd.org/changeset/ports/336607 Log: MOVED: remove misc/bibletime-devel as an entry Remove the misc/bibletime-devel entry from which was missed in r336188 Modified: head/MOVED Modified: head/MOVED ============================================================================== --- head/MOVED Mon Dec 16 04:11:00 2013 (r336606) +++ head/MOVED Mon Dec 16 04:24:13 2013 (r336607) @@ -796,7 +796,6 @@ misc/xenmenu||2009-08-08|Removed: Projec security/dns-proxy-tor||2009-08-09|Removed security/trans-proxy-tor||2009-08-09|Removed: trans-proxy-tor is rendered obsolete by Tor's TransPort option (currently only available in tor-devel) science/dft++||2009-08-11|Removed -misc/bibletime-devel||2009-08-17|Has expired devel/p5-MooseX-Policy-SemiAffordanceAccessor|devel/p5-MooseX-SemiAffordanceAccessor|2009-08-18|Renamed www/mediawiki12|www/mediawiki112|2009-08-19|Renamed lang/gcc42-withgcjawt|lang/gcc42|2009-08-19|Not needed any longer, still an option for the regular lang/gcc ports From owner-svn-ports-head@FreeBSD.ORG Mon Dec 16 05:30:30 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 46657299; Mon, 16 Dec 2013 05:30:30 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 31F13159C; Mon, 16 Dec 2013 05:30:30 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBG5UU8O071152; Mon, 16 Dec 2013 05:30:30 GMT (envelope-from ashish@svn.freebsd.org) Received: (from ashish@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBG5USiv071142; Mon, 16 Dec 2013 05:30:28 GMT (envelope-from ashish@svn.freebsd.org) Message-Id: <201312160530.rBG5USiv071142@svn.freebsd.org> From: Ashish SHUKLA Date: Mon, 16 Dec 2013 05:30:28 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r336608 - in head/mail/opensmtpd-devel: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 16 Dec 2013 05:30:30 -0000 Author: ashish Date: Mon Dec 16 05:30:28 2013 New Revision: 336608 URL: http://svnweb.freebsd.org/changeset/ports/336608 Log: - Update to latest snapshot 201312142054 - Add STAGE support - Use OptionsNG helpers - Add OPTION for installing CA bundle Modified: head/mail/opensmtpd-devel/Makefile head/mail/opensmtpd-devel/distinfo head/mail/opensmtpd-devel/files/pkg-deinstall.in head/mail/opensmtpd-devel/files/pkg-install.in head/mail/opensmtpd-devel/pkg-descr head/mail/opensmtpd-devel/pkg-plist Modified: head/mail/opensmtpd-devel/Makefile ============================================================================== --- head/mail/opensmtpd-devel/Makefile Mon Dec 16 04:24:13 2013 (r336607) +++ head/mail/opensmtpd-devel/Makefile Mon Dec 16 05:30:28 2013 (r336608) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= opensmtpd -PORTVERSION= 201308201232 +PORTVERSION= 201312142054 PORTEPOCH= 1 CATEGORIES= mail MASTER_SITES= http://www.opensmtpd.org/archives/ \ @@ -20,9 +20,11 @@ LIB_DEPENDS= event-1:${PORTSDIR}/devel/l OPENSMTPD_SNAPSHOT_VER= p1 -OPTIONS_DEFINE= PAM SQLITE MYSQL PGSQL LDAP +OPTIONS_DEFINE= CA_BUNDLE PAM SQLITE MYSQL PGSQL LDAP -OPTIONS_DEFAULT= PAM +OPTIONS_DEFAULT= CA_BUNDLE PAM + +CA_BUNDLE_DESC= Install CA bundle for OpenSSL GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-libevent-dir=${LOCALBASE} --sysconfdir=${PREFIX}/etc/mail/ \ @@ -39,58 +41,37 @@ MAN5= smtpd.conf.5 aliases.5 forward.5 USERS= _smtpd _smtpq GROUPS= _smtpd -NO_STAGE= yes -.include +OPTIONS_SUB= MYSQL SQLITE PGSQL LDAP -USE_OPENSSL= yes +CA_BUNDLE_CONFIGURE_ON= --with-ca-file=${LOCALBASE}/share/certs/ca-root-nss.crt +CA_BUNDLE_RUN_DEPENDS= ${LOCALBASE}/share/certs/ca-root-nss.crt:${PORTSDIR}/security/ca_root_nss -.if ${PORT_OPTIONS:MMYSQL} -USE_MYSQL= yes -CFLAGS+= -I${LOCALBASE}/include/mysql -LDFLAGS+= -L${LOCALBASE}/lib/mysql -CONFIGURE_ARGS+= --with-experimental-mysql -PLIST_SUB+= MYSQL="" -.else -PLIST_SUB+= MYSQL="@comment " -.endif +MYSQL_USE= MYSQL=yes +MYSQL_CFLAGS= -I${LOCALBASE}/include/mysql +MYSQL_LDFLAGS= -L${LOCALBASE}/lib/mysql +MYSQL_CONFIGURE_ON= --with-experimental-mysql -.if ${PORT_OPTIONS:MSQLITE} -USE_SQLITE= 3 -CONFIGURE_ARGS+= --with-experimental-sqlite -PLIST_SUB+= SQLITE="" -CFLAGS+= -I${LOCALBASE}/include -LDFLAGS+= -L${LOCALBASE}/lib -.else -PLIST_SUB+= SQLITE="@comment " -.endif +SQLITE_USE= SQLITE=3 +SQLITE_CFLAGS= -I${LOCALBASE}/include +SQLITE_LDFLAGS= -L${LOCALBASE}/lib +SQLITE_CONFIGURE_ON= --with-experimental-sqlite -.if ${PORT_OPTIONS:MPGSQL} -USE_PGSQL= yes -CONFIGURE_ARGS+= --with-experimental-postgres -PLIST_SUB+= PGSQL="" -.else -PLIST_SUB+= PGSQL="@comment " -.endif +PGSQL_USE= PGSQL=yes +PGSQL_CONFIGURE_ON= --with-experimental-postgres -.if ${PORT_OPTIONS:MLDAP} -CONFIGURE_ARGS+= --with-experimental-ldap -PLIST_SUB+= LDAP="" -.else -PLIST_SUB+= LDAP="@comment " -.endif +LDAP_CONFIGURE_ON= --with-experimental-ldap -.if ${PORT_OPTIONS:MPAM} -CONFIGURE_ARGS+= --with-pam -.endif +PAM_CONFIGURE_ON= --with-pam + +.include + +USE_OPENSSL= yes # FreeBSD 7.3 and earlier need to use OpenSSL from ports .if ${OSVERSION} < 704000 WITH_OPENSSL_PORT= yes .endif -post-install: - @${SETENV} ${SCRIPTS_ENV} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL - post-deinstall: @${SETENV} ${SCRIPTS_ENV} ${SH} ${PKGINSTALL} ${PKGNAME} POST-DEINSTALL Modified: head/mail/opensmtpd-devel/distinfo ============================================================================== --- head/mail/opensmtpd-devel/distinfo Mon Dec 16 04:24:13 2013 (r336607) +++ head/mail/opensmtpd-devel/distinfo Mon Dec 16 05:30:28 2013 (r336608) @@ -1,2 +1,2 @@ -SHA256 (opensmtpd-201308201232p1.tar.gz) = 419fb0f2109ce4c155919cac163b8ac3b50578d19b723caf946a76199b636dea -SIZE (opensmtpd-201308201232p1.tar.gz) = 780516 +SHA256 (opensmtpd-201312142054p1.tar.gz) = 1ba9763825373a7fc5eb405117bfb0329cf360ea7839006632f30f144abf4e1c +SIZE (opensmtpd-201312142054p1.tar.gz) = 870900 Modified: head/mail/opensmtpd-devel/files/pkg-deinstall.in ============================================================================== --- head/mail/opensmtpd-devel/files/pkg-deinstall.in Mon Dec 16 04:24:13 2013 (r336607) +++ head/mail/opensmtpd-devel/files/pkg-deinstall.in Mon Dec 16 05:30:28 2013 (r336608) @@ -8,7 +8,7 @@ PREFIX=$(echo %%PREFIX%% |sed -e 's,/,\\ if [ "$TARGET" = POST-DEINSTALL ]; then sed -e '/[[:space:]]'$PREFIX'\/sbin\/smtpctl/d' \ -e '/[[:space:]]'$PREFIX'\/libexec\/opensmtpd\/makemap/d' \ - -e 's/^### smtpd: //g' -i '' /etc/mail/mailer.conf + -e 's/^### opensmtpd: //g' -i '' /etc/mail/mailer.conf fi exit 0 Modified: head/mail/opensmtpd-devel/files/pkg-install.in ============================================================================== --- head/mail/opensmtpd-devel/files/pkg-install.in Mon Dec 16 04:24:13 2013 (r336607) +++ head/mail/opensmtpd-devel/files/pkg-install.in Mon Dec 16 05:30:28 2013 (r336608) @@ -4,7 +4,7 @@ PKGNAME=$1 TARGET=$2 if [ "$TARGET" = POST-INSTALL ]; then - sed -e '/^[^#]/s/^/### smtpd: /g' -i '' /etc/mail/mailer.conf + sed -e '/^[^#]/s/^/### opensmtpd: /g' -i '' /etc/mail/mailer.conf cat >>/etc/mail/mailer.conf < Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 557CB6C; Mon, 16 Dec 2013 05:57:05 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 35C13175E; Mon, 16 Dec 2013 05:57:05 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBG5v51Z081073; Mon, 16 Dec 2013 05:57:05 GMT (envelope-from kevlo@svn.freebsd.org) Received: (from kevlo@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBG5v4nm081068; Mon, 16 Dec 2013 05:57:04 GMT (envelope-from kevlo@svn.freebsd.org) Message-Id: <201312160557.rBG5v4nm081068@svn.freebsd.org> From: Kevin Lo Date: Mon, 16 Dec 2013 05:57:04 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r336609 - head/www/owncloud X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 16 Dec 2013 05:57:05 -0000 Author: kevlo Date: Mon Dec 16 05:57:04 2013 New Revision: 336609 URL: http://svnweb.freebsd.org/changeset/ports/336609 Log: Update to 6.0.0a Modified: head/www/owncloud/Makefile head/www/owncloud/distinfo head/www/owncloud/pkg-plist Modified: head/www/owncloud/Makefile ============================================================================== --- head/www/owncloud/Makefile Mon Dec 16 05:30:28 2013 (r336608) +++ head/www/owncloud/Makefile Mon Dec 16 05:57:04 2013 (r336609) @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= owncloud -PORTVERSION= 6.0.0 +PORTVERSION= 6.0.0a CATEGORIES= www MASTER_SITES= http://download.owncloud.org/community/ Modified: head/www/owncloud/distinfo ============================================================================== --- head/www/owncloud/distinfo Mon Dec 16 05:30:28 2013 (r336608) +++ head/www/owncloud/distinfo Mon Dec 16 05:57:04 2013 (r336609) @@ -1,2 +1,2 @@ -SHA256 (owncloud-6.0.0.tar.bz2) = 69f6d003f9c05238238e8df900efb435c6b577012be58a2fa48237c67a0e6552 -SIZE (owncloud-6.0.0.tar.bz2) = 48279985 +SHA256 (owncloud-6.0.0a.tar.bz2) = ccd0d1da176f5b268912f483c0b9809ad42f8e461f4ec0eeafe9ffd51e363d70 +SIZE (owncloud-6.0.0a.tar.bz2) = 48257271 Modified: head/www/owncloud/pkg-plist ============================================================================== --- head/www/owncloud/pkg-plist Mon Dec 16 05:30:28 2013 (r336608) +++ head/www/owncloud/pkg-plist Mon Dec 16 05:57:04 2013 (r336609) @@ -1429,13 +1429,6 @@ %%WWWDIR%%/3rdparty/fontawesome/font/fontawesome-webfont.svg %%WWWDIR%%/3rdparty/fontawesome/font/fontawesome-webfont.ttf %%WWWDIR%%/3rdparty/fontawesome/font/fontawesome-webfont.woff -%%WWWDIR%%/3rdparty/fullcalendar/GPL-LICENSE.txt -%%WWWDIR%%/3rdparty/fullcalendar/MIT-LICENSE.txt -%%WWWDIR%%/3rdparty/fullcalendar/css/fullcalendar.css -%%WWWDIR%%/3rdparty/fullcalendar/css/fullcalendar.print.css -%%WWWDIR%%/3rdparty/fullcalendar/js/fullcalendar.js -%%WWWDIR%%/3rdparty/fullcalendar/js/fullcalendar.min.js -%%WWWDIR%%/3rdparty/fullcalendar/js/gcal.js %%WWWDIR%%/3rdparty/getid3/extension.cache.dbm.php %%WWWDIR%%/3rdparty/getid3/extension.cache.mysql.php %%WWWDIR%%/3rdparty/getid3/extension.cache.sqlite3.php @@ -1528,8 +1521,6 @@ %%WWWDIR%%/3rdparty/miniColors/css/jquery.miniColors.css %%WWWDIR%%/3rdparty/miniColors/js/jquery.miniColors.js %%WWWDIR%%/3rdparty/miniColors/js/jquery.miniColors.min.js -%%WWWDIR%%/3rdparty/openid/class.openid.v3.php -%%WWWDIR%%/3rdparty/openid/phpmyid.php %%WWWDIR%%/3rdparty/phpass/PasswordHash.php %%WWWDIR%%/3rdparty/phpass/c/Makefile %%WWWDIR%%/3rdparty/phpass/c/crypt_private.c @@ -2306,7 +2297,6 @@ %%WWWDIR%%/3rdparty/phpdocx/templates/xmls/settings.xml %%WWWDIR%%/3rdparty/phpdocx/templates/xmls/styles.xml %%WWWDIR%%/3rdparty/phpdocx/xsl/docx2html.xsl -%%WWWDIR%%/3rdparty/smb4php/smb.php %%WWWDIR%%/3rdparty/symfony/console/Symfony/Component/Console/Application.php %%WWWDIR%%/3rdparty/symfony/console/Symfony/Component/Console/CHANGELOG.md %%WWWDIR%%/3rdparty/symfony/console/Symfony/Component/Console/Command/Command.php @@ -6850,6 +6840,7 @@ %%WWWDIR%%/apps/search_lucene/appinfo/app.php %%WWWDIR%%/apps/search_lucene/appinfo/database.xml %%WWWDIR%%/apps/search_lucene/appinfo/info.xml +%%WWWDIR%%/apps/search_lucene/appinfo/preupdate.php %%WWWDIR%%/apps/search_lucene/appinfo/update.php %%WWWDIR%%/apps/search_lucene/appinfo/version %%WWWDIR%%/apps/search_lucene/css/lucene.css @@ -7286,14 +7277,17 @@ %%WWWDIR%%/core/doc/admin/_images/custom_mount_config_gui-2.png %%WWWDIR%%/core/doc/admin/_images/custom_mount_config_gui-3.png %%WWWDIR%%/core/doc/admin/_images/custom_mount_config_gui-4.png -%%WWWDIR%%/core/doc/admin/_images/ldap-advanced-settings-connection-settings-oc5.png -%%WWWDIR%%/core/doc/admin/_images/ldap-advanced-settings-directory-settings-oc5.png -%%WWWDIR%%/core/doc/admin/_images/ldap-advanced-settings-oc5.png -%%WWWDIR%%/core/doc/admin/_images/ldap-advanced-settings-special-attributes-oc5.png -%%WWWDIR%%/core/doc/admin/_images/ldap-basic-settings-oc5.png -%%WWWDIR%%/core/doc/admin/_images/ldap-expert-settings-oc5.png +%%WWWDIR%%/core/doc/admin/_images/ldap-advanced-1-connection.png +%%WWWDIR%%/core/doc/admin/_images/ldap-advanced-2-directory.png +%%WWWDIR%%/core/doc/admin/_images/ldap-advanced-3-attributes.png +%%WWWDIR%%/core/doc/admin/_images/ldap-expert.png +%%WWWDIR%%/core/doc/admin/_images/ldap-fetched-avatar.png %%WWWDIR%%/core/doc/admin/_images/ldap-settings-invalid-oc45.png %%WWWDIR%%/core/doc/admin/_images/ldap-settings-valid-oc45.png +%%WWWDIR%%/core/doc/admin/_images/ldap-wizard-1-server.png +%%WWWDIR%%/core/doc/admin/_images/ldap-wizard-2-user.png +%%WWWDIR%%/core/doc/admin/_images/ldap-wizard-3-login.png +%%WWWDIR%%/core/doc/admin/_images/ldap-wizard-4-group.png %%WWWDIR%%/core/doc/admin/_images/ucs-app-center-install.png %%WWWDIR%%/core/doc/admin/_images/ucs-app-center-module.png %%WWWDIR%%/core/doc/admin/_images/ucsint.png @@ -10723,7 +10717,6 @@ @dirrmtry %%WWWDIR%%/3rdparty/symfony/console/Symfony @dirrmtry %%WWWDIR%%/3rdparty/symfony/console @dirrmtry %%WWWDIR%%/3rdparty/symfony -@dirrmtry %%WWWDIR%%/3rdparty/smb4php @dirrmtry %%WWWDIR%%/3rdparty/phpdocx/xsl @dirrmtry %%WWWDIR%%/3rdparty/phpdocx/templates/xmls @dirrmtry %%WWWDIR%%/3rdparty/phpdocx/templates @@ -10795,7 +10788,6 @@ @dirrmtry %%WWWDIR%%/3rdparty/phpdocx @dirrmtry %%WWWDIR%%/3rdparty/phpass/c @dirrmtry %%WWWDIR%%/3rdparty/phpass -@dirrmtry %%WWWDIR%%/3rdparty/openid @dirrmtry %%WWWDIR%%/3rdparty/miniColors/js @dirrmtry %%WWWDIR%%/3rdparty/miniColors/css/images @dirrmtry %%WWWDIR%%/3rdparty/miniColors/css @@ -10805,9 +10797,6 @@ @dirrmtry %%WWWDIR%%/3rdparty/js/chosen @dirrmtry %%WWWDIR%%/3rdparty/js @dirrmtry %%WWWDIR%%/3rdparty/getid3 -@dirrmtry %%WWWDIR%%/3rdparty/fullcalendar/js -@dirrmtry %%WWWDIR%%/3rdparty/fullcalendar/css -@dirrmtry %%WWWDIR%%/3rdparty/fullcalendar @dirrmtry %%WWWDIR%%/3rdparty/fontawesome/font @dirrmtry %%WWWDIR%%/3rdparty/fontawesome/docs/assets/less/twbs-222/tests @dirrmtry %%WWWDIR%%/3rdparty/fontawesome/docs/assets/less/twbs-222 From owner-svn-ports-head@FreeBSD.ORG Mon Dec 16 06:02:24 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 48E7468F; Mon, 16 Dec 2013 06:02:24 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 28F8E182C; Mon, 16 Dec 2013 06:02:24 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBG62OgU084331; Mon, 16 Dec 2013 06:02:24 GMT (envelope-from delphij@svn.freebsd.org) Received: (from delphij@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBG62MHI084323; Mon, 16 Dec 2013 06:02:22 GMT (envelope-from delphij@svn.freebsd.org) Message-Id: <201312160602.rBG62MHI084323@svn.freebsd.org> From: Xin LI Date: Mon, 16 Dec 2013 06:02:22 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r336610 - in head/net-mgmt: zabbix2-frontend zabbix2-server zabbix2-server/files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 16 Dec 2013 06:02:24 -0000 Author: delphij Date: Mon Dec 16 06:02:22 2013 New Revision: 336610 URL: http://svnweb.freebsd.org/changeset/ports/336610 Log: Update to 2.0.10. PR: ports/184495 Submitted by: maintainer (with changes to update to 2.0.10) Added: head/net-mgmt/zabbix2-server/files/patch-src_shutdown.sh (contents, props changed) head/net-mgmt/zabbix2-server/files/patch-src_startup.sh (contents, props changed) Modified: head/net-mgmt/zabbix2-frontend/Makefile head/net-mgmt/zabbix2-server/Makefile head/net-mgmt/zabbix2-server/distinfo head/net-mgmt/zabbix2-server/pkg-plist head/net-mgmt/zabbix2-server/pkg-plist.frontend Modified: head/net-mgmt/zabbix2-frontend/Makefile ============================================================================== --- head/net-mgmt/zabbix2-frontend/Makefile Mon Dec 16 05:57:04 2013 (r336609) +++ head/net-mgmt/zabbix2-frontend/Makefile Mon Dec 16 06:02:22 2013 (r336610) @@ -12,11 +12,11 @@ PATCHDIR= PLIST= ${PKGDIR}/pkg-plist.frontend USE_PHP= bcmath ctype gd pcre snmp sockets mbstring session dom xml \ - xmlreader xmlwriter simplexml gettext + xmlreader xmlwriter simplexml gettext ldap WANT_PHP_WEB= yes OPTIONSFILE= ${PORT_DBDIR}/${PORTNAME}${PKGNAMESUFFIX}/options -OPTIONS_DEFINE= MYSQL MYSQLI PGSQL SQLITE +OPTIONS_DEFINE= MYSQL MYSQLI PGSQL SQLITE ORACLE OPTIONS_DEFAULT= MYSQL MYSQLI MYSQLI_DESC= MySQLI backend @@ -39,6 +39,11 @@ USE_PHP+= pgsql USE_PHP+= sqlite3 .endif +.if ${PORT_OPTIONS:MORACLE} +ZABBIX_REQUIRE= +CONFIGURE_ARGS+= --with-oracle +.endif + do-install: @${INSTALL} -d ${WWWDIR} @cd ${WRKSRC}/frontends/php/ && ${COPYTREE_SHARE} . ${WWWDIR} Modified: head/net-mgmt/zabbix2-server/Makefile ============================================================================== --- head/net-mgmt/zabbix2-server/Makefile Mon Dec 16 05:57:04 2013 (r336609) +++ head/net-mgmt/zabbix2-server/Makefile Mon Dec 16 06:02:22 2013 (r336610) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= zabbix2 -PORTVERSION= 2.0.8 +PORTVERSION= 2.0.10 PORTREVISION?= 0 CATEGORIES= net-mgmt MASTER_SITES= SF/zabbix/ZABBIX%20Latest%20Stable/${PORTVERSION} @@ -16,6 +16,8 @@ LICENSE= GPLv2 CONFLICTS= ${PKGBASE}-1.[0-8]* +IGNORE_WITH_MYSQL= 41 + .if ${PKGNAMESUFFIX} != "-agent" CONFLICTS+= ${PORTNAME}-1.[0-8]* .endif @@ -68,8 +70,8 @@ CONFIGURE_ARGS+= --with-net-snmp OPTIONSFILE= ${PORT_DBDIR}/${PORTNAME}${PKGNAMESUFFIX}/options -OPTIONS_DEFINE= IPV6 FPING JABBER CURL LDAP IPMI SSH NMAP ODBC JAVAGW -OPTIONS_DEFAULT= MYSQL IPV6 FPING JABBER CURL LDAP +OPTIONS_DEFINE= IPV6 FPING JABBER CURL LDAP IPMI SSH NMAP ODBC JAVAGW MYSQL +OPTIONS_DEFAULT= MYSQL IPV6 FPING JABBER CURL CURL_DESC= Support for web monitoring FPING_DESC= Build/install fping for ping checks @@ -84,7 +86,7 @@ IODBC_DESC= Use iODBC for ODBC support UNIXODBC_DESC= Use UnixODBC for ODBC support OPTIONS_SINGLE= DB ODBC -OPTIONS_SINGLE_DB= MYSQL PGSQL SQLITE +OPTIONS_SINGLE_DB= MYSQL PGSQL SQLITE ORACLE OPTIONS_SINGLE_ODBC= IODBC UNIXODBC NO_STAGE= yes @@ -103,11 +105,16 @@ CONFIGURE_ARGS+= --with-postgresql .endif .if ${PORT_OPTIONS:MSQLITE} -ZABBIX_REQUIRE= +ZABBIX_REQUIRE= " sqlite" USE_SQLITE= 3 CONFIGURE_ARGS+= --with-sqlite3 .endif +.if ${PORT_OPTIONS:MORACLE} +ZABBIX_REQUIRE= +CONFIGURE_ARGS+= --with-oracle +.endif + .if ${PORT_OPTIONS:MCURL} LIB_DEPENDS+= curl:${PORTSDIR}/ftp/curl CONFIGURE_ARGS+= --with-libcurl @@ -173,13 +180,12 @@ post-patch: .if ${ZABBIX_BUILD} != "agent" .if empty(PORT_OPTIONS:MFPING) - @${ECHO} 'DisablePinger=yes' >> ${WRKSRC}/conf/zabbix_${ZABBIX_BUILD}.conf .endif .for d in mysql oracle postgresql sqlite3 @${REINPLACE_CMD} -e 's|/bin/ping|/sbin/ping|g; \ - s|/usr/bin/traceroute|/usr/sbin/traceroute|g; \ - s|sudo /usr/bin/nmap|sudo ${LOCALBASE}/bin/nmap|g;' \ - ${WRKSRC}/database/${d}/data.sql + s|/usr/bin/traceroute|/usr/sbin/traceroute|g; \ + s|sudo /usr/bin/nmap|sudo ${LOCALBASE}/bin/nmap|g;' \ + ${WRKSRC}/database/${d}/data.sql .endfor .endif @${REINPLACE_CMD} -Ee 's|(@sysconfdir@/(\$$\([A-Z]*_CONFIG\)))" ([|][|] cp "../../conf/\$$\([A-Z]*_CONFIG\)" "\$$\(DESTDIR\)@sysconfdir@)"|\1.sample" \3/\2.sample"|;' \ @@ -187,6 +193,11 @@ post-patch: @${FIND} ${WRKSRC} -type f \( -name '*.bak' -or -name '*.orig' \) -exec ${RM} -f {} + post-install: + +.if defined(WITH_JAVAGW) + @${MV} ${PREFIX}/sbin/zabbix_java/settings.sh ${PREFIX}/sbin/zabbix_java/settings.sh.sample +.endif + .if ${ZABBIX_BUILD} != "agent" @${MKDIR} "${DATADIR}/${ZABBIX_BUILD}/database" @cd ${WRKSRC}/upgrades/ && ${COPYTREE_SHARE} dbpatches ${DATADIR}/${ZABBIX_BUILD}/upgrades/ Modified: head/net-mgmt/zabbix2-server/distinfo ============================================================================== --- head/net-mgmt/zabbix2-server/distinfo Mon Dec 16 05:57:04 2013 (r336609) +++ head/net-mgmt/zabbix2-server/distinfo Mon Dec 16 06:02:22 2013 (r336610) @@ -1,2 +1,2 @@ -SHA256 (zabbix-2.0.8.tar.gz) = c4b94960de0a1d0b20604a08503e9715c15845409368162c1e321040b8e4519a -SIZE (zabbix-2.0.8.tar.gz) = 13457936 +SHA256 (zabbix-2.0.10.tar.gz) = 71415b5da223c6c0ba2f1c21c3c03cad9a5be0c8986791d7031c014986a9065d +SIZE (zabbix-2.0.10.tar.gz) = 13671284 Added: head/net-mgmt/zabbix2-server/files/patch-src_shutdown.sh ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net-mgmt/zabbix2-server/files/patch-src_shutdown.sh Mon Dec 16 06:02:22 2013 (r336610) @@ -0,0 +1,12 @@ +--- src/zabbix_java/shutdown.sh.orig 2013-11-12 10:07:23.000000000 +0400 ++++ src/zabbix_java/shutdown.sh 2013-12-04 16:37:38.000000000 +0400 +@@ -1,7 +1,7 @@ +-#!/bin/bash ++#!/bin/sh + + cd $(dirname $0) +-source settings.sh ++. settings.sh + + if [ -n "$PID_FILE" ]; then + if [ -e "$PID_FILE" ]; then Added: head/net-mgmt/zabbix2-server/files/patch-src_startup.sh ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net-mgmt/zabbix2-server/files/patch-src_startup.sh Mon Dec 16 06:02:22 2013 (r336610) @@ -0,0 +1,32 @@ +--- src/zabbix_java/startup.sh.orig 2013-11-12 10:07:23.000000000 +0400 ++++ src/zabbix_java/startup.sh 2013-12-04 16:37:05.000000000 +0400 +@@ -1,7 +1,7 @@ +-#!/bin/bash ++#!/bin/sh + + cd $(dirname $0) +-source settings.sh ++. settings.sh + + if [ -n "$PID_FILE" -a -e "$PID_FILE" ]; then + echo "Zabbix Java Gateway is already running" +@@ -16,8 +16,8 @@ + fi + + CLASSPATH="lib" +-for jar in {lib,bin}/*.jar; do +- if [[ $jar != *junit* ]]; then ++for jar in lib/*.jar bin/*.jar; do ++ if [ "$jar" != "*junit*" ]; then + CLASSPATH="$CLASSPATH:$jar" + fi + done +@@ -39,7 +39,7 @@ + COMMAND_LINE="$JAVA $JAVA_OPTIONS -classpath $CLASSPATH $ZABBIX_OPTIONS com.zabbix.gateway.JavaGateway" + + if [ -n "$PID_FILE" ]; then +- PID=$(/bin/bash -c "$COMMAND_LINE > /dev/null 2>&1 & echo \$!") ++ PID=$(/bin/sh -c "$COMMAND_LINE > /dev/null 2>&1 & echo \$!") + if ps -p $PID > /dev/null 2>&1; then + echo $PID > $PID_FILE + else Modified: head/net-mgmt/zabbix2-server/pkg-plist ============================================================================== --- head/net-mgmt/zabbix2-server/pkg-plist Mon Dec 16 05:57:04 2013 (r336609) +++ head/net-mgmt/zabbix2-server/pkg-plist Mon Dec 16 06:02:22 2013 (r336610) @@ -38,7 +38,7 @@ sbin/zabbix_%%ZABBIX_BUILD%% %%JAVAGW%%%%ZABBIX_JAVA%%/lib/logback-classic-0.9.27.jar %%JAVAGW%%%%ZABBIX_JAVA%%/lib/logback.xml %%JAVAGW%%%%ZABBIX_JAVA%%/lib/slf4j-api-1.6.1.jar -%%JAVAGW%%%%ZABBIX_JAVA%%/settings.sh +%%JAVAGW%%%%ZABBIX_JAVA%%/settings.sh.sample %%JAVAGW%%%%ZABBIX_JAVA%%/startup.sh %%JAVAGW%%%%ZABBIX_JAVA%%/bin/zabbix-java-gateway-%%PORTVERSION%%.jar %%JAVAGW%%@dirrmtry %%ZABBIX_JAVA%%/lib Modified: head/net-mgmt/zabbix2-server/pkg-plist.frontend ============================================================================== --- head/net-mgmt/zabbix2-server/pkg-plist.frontend Mon Dec 16 05:57:04 2013 (r336609) +++ head/net-mgmt/zabbix2-server/pkg-plist.frontend Mon Dec 16 06:02:22 2013 (r336610) @@ -645,6 +645,8 @@ %%WWWDIR%%/locale/bg/LC_MESSAGES/frontend.mo %%WWWDIR%%/locale/lt/LC_MESSAGES/frontend.po %%WWWDIR%%/locale/lt/LC_MESSAGES/frontend.mo +%%WWWDIR%%/locale/ro/LC_MESSAGES/frontend.po +%%WWWDIR%%/locale/ro/LC_MESSAGES/frontend.mo %%WWWDIR%%/locale/add_new_language.sh %%WWWDIR%%/conf/zabbix.conf.php.example %%WWWDIR%%/conf/maintenance.inc.php @@ -858,6 +860,8 @@ @dirrm %%WWWDIR%%/locale/bg/ @dirrm %%WWWDIR%%/locale/lt/LC_MESSAGES/ @dirrm %%WWWDIR%%/locale/lt/ +@dirrm %%WWWDIR%%/locale/ro/LC_MESSAGES/ +@dirrm %%WWWDIR%%/locale/ro/ @dirrm %%WWWDIR%%/locale @dirrm %%WWWDIR%%/conf @dirrm %%WWWDIR%%/js/jquery From owner-svn-ports-head@FreeBSD.ORG Mon Dec 16 07:30:28 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id BB39AC7A; Mon, 16 Dec 2013 07:30:28 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id A769410B0; Mon, 16 Dec 2013 07:30:28 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBG7USCF014317; Mon, 16 Dec 2013 07:30:28 GMT (envelope-from bapt@svn.freebsd.org) Received: (from bapt@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBG7US2u014316; Mon, 16 Dec 2013 07:30:28 GMT (envelope-from bapt@svn.freebsd.org) Message-Id: <201312160730.rBG7US2u014316@svn.freebsd.org> From: Baptiste Daroussin Date: Mon, 16 Dec 2013 07:30:28 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r336611 - head/security/tripwire X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 16 Dec 2013 07:30:28 -0000 Author: bapt Date: Mon Dec 16 07:30:28 2013 New Revision: 336611 URL: http://svnweb.freebsd.org/changeset/ports/336611 Log: Remove redondant variable testing which are now irrelevant with this part of the compatibility with the old framework being removed Modified: head/security/tripwire/Makefile Modified: head/security/tripwire/Makefile ============================================================================== --- head/security/tripwire/Makefile Mon Dec 16 06:02:22 2013 (r336610) +++ head/security/tripwire/Makefile Mon Dec 16 07:30:28 2013 (r336611) @@ -161,8 +161,8 @@ make-pkg-install: @ ${SED} "/^\. /s/^/: /;/^BASE_DIR=/d;s/BIN_DIR=/: BIN_DIR=/;/^POLICYSRC/d" ${WRKSRC}/install/install.sh >> ${PKGINSTALL} create-database: -.if ${PORT_OPTIONS:MDB_BUILD} && ${WITH_DB_BUILD} == "true" -.if ${PORT_OPTIONS:MSW_ONLY} && ${WITH_SW_ONLY} == "true" +.if ${PORT_OPTIONS:MDB_BUILD} +.if ${PORT_OPTIONS:MSW_ONLY} @ ${ECHO} SW_ONLY has been specified, database will not be built. .else @ ${MKDIR} ${TWCFG} ${TWPOLICY} ${TWSITEKEYDIR} ${TWLOCALKEYDIR} \ From owner-svn-ports-head@FreeBSD.ORG Mon Dec 16 07:32:52 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id E73C3D75; Mon, 16 Dec 2013 07:32:52 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id D2DEA10CA; Mon, 16 Dec 2013 07:32:52 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBG7WqPl016738; Mon, 16 Dec 2013 07:32:52 GMT (envelope-from demon@svn.freebsd.org) Received: (from demon@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBG7WqxM016735; Mon, 16 Dec 2013 07:32:52 GMT (envelope-from demon@svn.freebsd.org) Message-Id: <201312160732.rBG7WqxM016735@svn.freebsd.org> From: Dmitry Sivachenko Date: Mon, 16 Dec 2013 07:32:52 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r336612 - head/net/haproxy-devel X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 16 Dec 2013 07:32:53 -0000 Author: demon Date: Mon Dec 16 07:32:51 2013 New Revision: 336612 URL: http://svnweb.freebsd.org/changeset/ports/336612 Log: Update to -dev20. Modified: head/net/haproxy-devel/Makefile head/net/haproxy-devel/distinfo head/net/haproxy-devel/pkg-plist Modified: head/net/haproxy-devel/Makefile ============================================================================== --- head/net/haproxy-devel/Makefile Mon Dec 16 07:30:28 2013 (r336611) +++ head/net/haproxy-devel/Makefile Mon Dec 16 07:32:51 2013 (r336612) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= haproxy -DISTVERSION= 1.5-dev19 +DISTVERSION= 1.5-dev20 CATEGORIES= net MASTER_SITES= http://haproxy.1wt.eu/download/1.5/src/devel/ PKGNAMESUFFIX= -devel Modified: head/net/haproxy-devel/distinfo ============================================================================== --- head/net/haproxy-devel/distinfo Mon Dec 16 07:30:28 2013 (r336611) +++ head/net/haproxy-devel/distinfo Mon Dec 16 07:32:51 2013 (r336612) @@ -1,2 +1,2 @@ -SHA256 (haproxy-1.5-dev19.tar.gz) = cb411f3dae1309d2ad848681bc7af1c4c60f102993bb2c22d5d4fd9f5d53d30f -SIZE (haproxy-1.5-dev19.tar.gz) = 1143258 +SHA256 (haproxy-1.5-dev20.tar.gz) = 8cd2260f5392b8e135a838754cb08ecd2d571d83dd6a2a4589c2085c75484359 +SIZE (haproxy-1.5-dev20.tar.gz) = 1197573 Modified: head/net/haproxy-devel/pkg-plist ============================================================================== --- head/net/haproxy-devel/pkg-plist Mon Dec 16 07:30:28 2013 (r336611) +++ head/net/haproxy-devel/pkg-plist Mon Dec 16 07:32:51 2013 (r336612) @@ -34,6 +34,7 @@ sbin/haproxy %%PORTDOCS%%%%DOCSDIR%%/internals/entities.pdf %%PORTDOCS%%%%DOCSDIR%%/internals/entities.svg %%PORTDOCS%%%%DOCSDIR%%/internals/entities.txt +%%PORTDOCS%%%%DOCSDIR%%/internals/hashing.txt %%PORTDOCS%%%%DOCSDIR%%/internals/header-parser-speed.txt %%PORTDOCS%%%%DOCSDIR%%/internals/header-tree.txt %%PORTDOCS%%%%DOCSDIR%%/internals/http-cookies.txt From owner-svn-ports-head@FreeBSD.ORG Mon Dec 16 07:53:20 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 58F6150E; Mon, 16 Dec 2013 07:53:20 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 387511234; Mon, 16 Dec 2013 07:53:20 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBG7rKGa023733; Mon, 16 Dec 2013 07:53:20 GMT (envelope-from novel@svn.freebsd.org) Received: (from novel@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBG7rJaX023730; Mon, 16 Dec 2013 07:53:19 GMT (envelope-from novel@svn.freebsd.org) Message-Id: <201312160753.rBG7rJaX023730@svn.freebsd.org> From: Roman Bogorodskiy Date: Mon, 16 Dec 2013 07:53:19 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r336613 - head/audio/easytag X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 16 Dec 2013 07:53:20 -0000 Author: novel Date: Mon Dec 16 07:53:19 2013 New Revision: 336613 URL: http://svnweb.freebsd.org/changeset/ports/336613 Log: - easytag depends on taglib not on mp4v2 since 2.1.8 - support staging - add license - make NLS support conditional PR: 184499 Submitted by: Vladimir Kondratiev Modified: head/audio/easytag/Makefile head/audio/easytag/pkg-plist Modified: head/audio/easytag/Makefile ============================================================================== --- head/audio/easytag/Makefile Mon Dec 16 07:32:51 2013 (r336612) +++ head/audio/easytag/Makefile Mon Dec 16 07:53:19 2013 (r336613) @@ -3,45 +3,37 @@ PORTNAME= easytag PORTVERSION= 2.1.8 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= audio MASTER_SITES= GNOME MAINTAINER= novel@FreeBSD.org COMMENT= GTK2 Tag editor for MP3 and OGG files +LICENSE= GPLv2 + LIB_DEPENDS= libid3.so:${PORTSDIR}/audio/id3lib \ libid3tag.so:${PORTSDIR}/audio/libid3tag \ libvorbis.so:${PORTSDIR}/audio/libvorbis \ libFLAC.so:${PORTSDIR}/audio/flac \ - libmp4v2.so:${PORTSDIR}/multimedia/mp4v2 + libtag.so:${PORTSDIR}/audio/taglib -MAN1= easytag.1 CONFLICTS= easytag-devel-[0-9]* -NO_STAGE= yes USE_XZ= yes -USES= gettext gmake pkgconfig -USE_GNOME= gnomehack gnomeprefix gtk20 desktopfileutils +USES= gmake pkgconfig pathfix desktop-file-utils +USE_GNOME= gtk20 INSTALLS_ICONS= yes GNU_CONFIGURE= yes CPPFLAGS+= -I${LOCALBASE}/include -DHAVE_GTK LDFLAGS+= -L${LOCALBASE}/lib -OPTIONS_DEFINE= WAVPACK - -.include +OPTIONS_DEFINE= WAVPACK NLS -.if ${PORT_OPTIONS:MWAVPACK} -LIB_DEPENDS+= libwavpack.so:${PORTSDIR}/audio/wavpack -CONFIGURE_ARGS+= --enable-wavpack -.else -CONFIGURE_ARGS+= --disable-wavpack -.endif - -post-patch: - @${REINPLACE_CMD} -e 's|||g' \ - ${WRKSRC}/src/mp4_header.c \ - ${WRKSRC}/src/mp4_tag.c +OPTIONS_SUB= yes +WAVPACK_LIB_DEPENDS= libwavpack.so:${PORTSDIR}/audio/wavpack +WAVPACK_CONFIGURE_ENABLE= wavpack +NLS_USES= gettext +NLS_CONFIGURE_ENABLE= nls .include Modified: head/audio/easytag/pkg-plist ============================================================================== --- head/audio/easytag/pkg-plist Mon Dec 16 07:32:51 2013 (r336612) +++ head/audio/easytag/pkg-plist Mon Dec 16 07:53:19 2013 (r336613) @@ -1,33 +1,9 @@ bin/easytag -%%DOCSDIR%%/HACKING -%%DOCSDIR%%/THANKS -%%DOCSDIR%%/TODO +man/man1/easytag.1.gz share/applications/easytag.desktop -share/locale/bg/LC_MESSAGES/easytag.mo -share/locale/cs/LC_MESSAGES/easytag.mo -share/locale/da/LC_MESSAGES/easytag.mo -share/locale/de/LC_MESSAGES/easytag.mo -share/locale/el/LC_MESSAGES/easytag.mo -share/locale/es/LC_MESSAGES/easytag.mo -share/locale/fr/LC_MESSAGES/easytag.mo -share/locale/he/LC_MESSAGES/easytag.mo -share/locale/hu/LC_MESSAGES/easytag.mo -share/locale/it/LC_MESSAGES/easytag.mo -share/locale/ja/LC_MESSAGES/easytag.mo -share/locale/lt/LC_MESSAGES/easytag.mo -share/locale/nl/LC_MESSAGES/easytag.mo -share/locale/pl/LC_MESSAGES/easytag.mo -share/locale/pt_BR/LC_MESSAGES/easytag.mo -share/locale/ro/LC_MESSAGES/easytag.mo -share/locale/ru/LC_MESSAGES/easytag.mo -share/locale/sl/LC_MESSAGES/easytag.mo -share/locale/sr/LC_MESSAGES/easytag.mo -share/locale/sr@Latn/LC_MESSAGES/easytag.mo -share/locale/sr@latin/LC_MESSAGES/easytag.mo -share/locale/sv/LC_MESSAGES/easytag.mo -share/locale/uk/LC_MESSAGES/easytag.mo -share/locale/zh_CN/LC_MESSAGES/easytag.mo -share/locale/zh_TW/LC_MESSAGES/easytag.mo +%%PORTDOCS%%%%DOCSDIR%%/HACKING +%%PORTDOCS%%%%DOCSDIR%%/THANKS +%%PORTDOCS%%%%DOCSDIR%%/TODO share/icons/hicolor/128x128/apps/easytag.png share/icons/hicolor/16x16/apps/easytag.png share/icons/hicolor/256x256/apps/easytag.png @@ -35,6 +11,47 @@ share/icons/hicolor/32x32/apps/easytag.p share/icons/hicolor/48x48/apps/easytag.png share/icons/hicolor/64x64/apps/easytag.png share/icons/hicolor/scalable/apps/easytag.svg -@exec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true -@unexec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true -@dirrm %%DOCSDIR%% +%%NLS%%share/locale/bg/LC_MESSAGES/easytag.mo +%%NLS%%share/locale/cs/LC_MESSAGES/easytag.mo +%%NLS%%share/locale/da/LC_MESSAGES/easytag.mo +%%NLS%%share/locale/de/LC_MESSAGES/easytag.mo +%%NLS%%share/locale/el/LC_MESSAGES/easytag.mo +%%NLS%%share/locale/es/LC_MESSAGES/easytag.mo +%%NLS%%share/locale/fr/LC_MESSAGES/easytag.mo +%%NLS%%share/locale/he/LC_MESSAGES/easytag.mo +%%NLS%%share/locale/hu/LC_MESSAGES/easytag.mo +%%NLS%%share/locale/it/LC_MESSAGES/easytag.mo +%%NLS%%share/locale/ja/LC_MESSAGES/easytag.mo +%%NLS%%share/locale/lt/LC_MESSAGES/easytag.mo +%%NLS%%share/locale/nl/LC_MESSAGES/easytag.mo +%%NLS%%share/locale/pl/LC_MESSAGES/easytag.mo +%%NLS%%share/locale/pt_BR/LC_MESSAGES/easytag.mo +%%NLS%%share/locale/ro/LC_MESSAGES/easytag.mo +%%NLS%%share/locale/ru/LC_MESSAGES/easytag.mo +%%NLS%%share/locale/sl/LC_MESSAGES/easytag.mo +%%NLS%%share/locale/sr/LC_MESSAGES/easytag.mo +%%NLS%%share/locale/sr@Latn/LC_MESSAGES/easytag.mo +%%NLS%%share/locale/sr@latin/LC_MESSAGES/easytag.mo +%%NLS%%share/locale/sv/LC_MESSAGES/easytag.mo +%%NLS%%share/locale/uk/LC_MESSAGES/easytag.mo +%%NLS%%share/locale/zh_CN/LC_MESSAGES/easytag.mo +%%NLS%%share/locale/zh_TW/LC_MESSAGES/easytag.mo +%%NLS%%@dirrmtry share/locale/sr@latin/LC_MESSAGES +%%NLS%%@dirrmtry share/locale/sr@latin +@dirrmtry share/icons/hicolor/scalable/apps +@dirrmtry share/icons/hicolor/scalable +@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/256x256/apps +@dirrmtry share/icons/hicolor/256x256 +@dirrmtry share/icons/hicolor/16x16/apps +@dirrmtry share/icons/hicolor/16x16 +@dirrmtry share/icons/hicolor/128x128/apps +@dirrmtry share/icons/hicolor/128x128 +@dirrmtry share/icons/hicolor +@dirrmtry share/icons +%%PORTDOCS%%@dirrm %%DOCSDIR%% From owner-svn-ports-head@FreeBSD.ORG Mon Dec 16 08:00:17 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 0ECA58EB; Mon, 16 Dec 2013 08:00:17 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id D4FA112AE; Mon, 16 Dec 2013 08:00:16 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBG80GGp024985; Mon, 16 Dec 2013 08:00:16 GMT (envelope-from bapt@svn.freebsd.org) Received: (from bapt@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBG80Gxi024981; Mon, 16 Dec 2013 08:00:16 GMT (envelope-from bapt@svn.freebsd.org) Message-Id: <201312160800.rBG80Gxi024981@svn.freebsd.org> From: Baptiste Daroussin Date: Mon, 16 Dec 2013 08:00:16 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r336614 - in head/ports-mgmt: pkg pkg-devel X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 16 Dec 2013 08:00:17 -0000 Author: bapt Date: Mon Dec 16 08:00:15 2013 New Revision: 336614 URL: http://svnweb.freebsd.org/changeset/ports/336614 Log: Update to 1.2.4 Changes: - Fix segfault in pkg audit -F [1] - Fix multiple segfault when using eventpipe [2] - Fix REPOS_DIR being appended instead of overwritten when modified from pkg.conf Reported by: many [1] Reported by: kmoore [2] Modified: head/ports-mgmt/pkg-devel/Makefile head/ports-mgmt/pkg-devel/distinfo head/ports-mgmt/pkg/Makefile head/ports-mgmt/pkg/distinfo Modified: head/ports-mgmt/pkg-devel/Makefile ============================================================================== --- head/ports-mgmt/pkg-devel/Makefile Mon Dec 16 07:53:19 2013 (r336613) +++ head/ports-mgmt/pkg-devel/Makefile Mon Dec 16 08:00:15 2013 (r336614) @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= pkg -DISTVERSION= 1.2.3 +DISTVERSION= 1.2.4 CATEGORIES= ports-mgmt MASTER_SITES= http://files.etoilebsd.net/pkg/ \ http://mirror.shatow.net/freebsd/${PORTNAME}/ \ @@ -11,7 +11,7 @@ PKGNAMESUFFIX= -devel MAINTAINER= portmgr@FreeBSD.org COMMENT= New generation package manager -LICENSE= BSD +LICENSE= BSD2CLAUSE USE_XZ= yes Modified: head/ports-mgmt/pkg-devel/distinfo ============================================================================== --- head/ports-mgmt/pkg-devel/distinfo Mon Dec 16 07:53:19 2013 (r336613) +++ head/ports-mgmt/pkg-devel/distinfo Mon Dec 16 08:00:15 2013 (r336614) @@ -1,2 +1,2 @@ -SHA256 (pkg-1.2.3.tar.xz) = a84e00b9c5153beab4122fdc01735cc6829c3dc83c6e9ab335bb09b32468ef27 -SIZE (pkg-1.2.3.tar.xz) = 1807516 +SHA256 (pkg-1.2.4.tar.xz) = d6f838f94912893be9ea6e61d72515b7c7e63d5cd4a3084bfe7cbc2e909876cb +SIZE (pkg-1.2.4.tar.xz) = 1808120 Modified: head/ports-mgmt/pkg/Makefile ============================================================================== --- head/ports-mgmt/pkg/Makefile Mon Dec 16 07:53:19 2013 (r336613) +++ head/ports-mgmt/pkg/Makefile Mon Dec 16 08:00:15 2013 (r336614) @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= pkg -DISTVERSION= 1.2.3 +DISTVERSION= 1.2.4 CATEGORIES= ports-mgmt MASTER_SITES= http://files.etoilebsd.net/pkg/ \ http://mirror.shatow.net/freebsd/${PORTNAME}/ \ @@ -10,7 +10,7 @@ MASTER_SITES= http://files.etoilebsd.net MAINTAINER= portmgr@FreeBSD.org COMMENT= New generation package manager -LICENSE= BSD +LICENSE= BSD2CLAUSE USE_XZ= yes Modified: head/ports-mgmt/pkg/distinfo ============================================================================== --- head/ports-mgmt/pkg/distinfo Mon Dec 16 07:53:19 2013 (r336613) +++ head/ports-mgmt/pkg/distinfo Mon Dec 16 08:00:15 2013 (r336614) @@ -1,2 +1,2 @@ -SHA256 (pkg-1.2.3.tar.xz) = a84e00b9c5153beab4122fdc01735cc6829c3dc83c6e9ab335bb09b32468ef27 -SIZE (pkg-1.2.3.tar.xz) = 1807516 +SHA256 (pkg-1.2.4.tar.xz) = d6f838f94912893be9ea6e61d72515b7c7e63d5cd4a3084bfe7cbc2e909876cb +SIZE (pkg-1.2.4.tar.xz) = 1808120 From owner-svn-ports-head@FreeBSD.ORG Mon Dec 16 08:46:24 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 5F7A04F7; Mon, 16 Dec 2013 08:46:24 +0000 (UTC) Received: from mailrelay012.isp.belgacom.be (mailrelay012.isp.belgacom.be [195.238.6.179]) by mx1.freebsd.org (Postfix) with ESMTP id 714CA16E3; Mon, 16 Dec 2013 08:46:23 +0000 (UTC) X-Belgacom-Dynamic: yes X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: AlkGAJS9rlJR8mk//2dsb2JhbABZFoJ0OEm4I06BHxd0giUBAQU6HCMQCxQECSUPKh4GHId/AQjHRReOZjMHhDYEmBWBMZBkgys7 Received: from 63.105-242-81.adsl-dyn.isp.belgacom.be (HELO kalimero.tijl.coosemans.org) ([81.242.105.63]) by relay.skynet.be with ESMTP; 16 Dec 2013 09:46:15 +0100 Received: from kalimero.tijl.coosemans.org (kalimero.tijl.coosemans.org [127.0.0.1]) by kalimero.tijl.coosemans.org (8.14.7/8.14.7) with ESMTP id rBG8kENT001309; Mon, 16 Dec 2013 09:46:14 +0100 (CET) (envelope-from tijl@FreeBSD.org) Date: Mon, 16 Dec 2013 09:46:13 +0100 From: Tijl Coosemans To: Matthew Seaman Subject: Re: svn commit: r336590 - in head/net-im/jabberd: . files Message-ID: <20131216094613.0e2ea432@kalimero.tijl.coosemans.org> In-Reply-To: <201312152214.rBFMEeFs013358@svn.freebsd.org> References: <201312152214.rBFMEeFs013358@svn.freebsd.org> MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Cc: svn-ports-head@freebsd.org, svn-ports-all@freebsd.org, ports-committers@freebsd.org X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 16 Dec 2013 08:46:24 -0000 On Sun, 15 Dec 2013 22:14:40 +0000 (UTC) Matthew Seaman wrote: > Author: matthew > Date: Sun Dec 15 22:14:40 2013 > New Revision: 336590 > URL: http://svnweb.freebsd.org/changeset/ports/336590 > > Log: > Update to 2.3.1 > > * Staging support > * New style LIB_DEPENDS > * Use OPTIONS helpers > * OPTIONS_SINGLE to select between Cyrus SASL and gsasl > * Two new options: EXPERIMENTAL and SUPERCEDED > > The port requires OpenSSL >= 1.0.1, so set WANT_OPENSSL_PORTS=yes > everywhere except for on FreeBSD 10.x, where it's in the base system. > > The github.org MASTER_SITE a) redirects to a server in the Amazon > cloud and b) requires use of HTTPS. > > (a) implies setting fetch(1) to follow redirects, which is usually > frowned upon. However, this pattern is recommended in bsd.sites.mk > for use with GitHub. > > (b) is troublesome for FreeBSD 8.x, as fetch(1) hasn't grown HTTPS > support there yet. Hence provide a copy of the distfile on > http://people.freebsd.org/ as a 2nd MASTER_SITE > > Approved by: mm (maintainer) > > Added: > head/net-im/jabberd/files/patch-etc__Makefile.in (contents, props changed) > head/net-im/jabberd/files/patch-etc__templates__Makefile.in (contents, props changed) > head/net-im/jabberd/files/patch-sm__mod_iq_time.c (contents, props changed) > - copied, changed from r336372, head/net-im/jabberd/files/patch-sm-mod_iq_time.c > head/net-im/jabberd/files/patch-storage__authreg_ldapfull.c (contents, props changed) > head/net-im/jabberd/files/patch-storage__authreg_mysql.c (contents, props changed) > head/net-im/jabberd/files/patch-storage__authreg_pgsql.c (contents, props changed) > head/net-im/jabberd/files/patch-storage__authreg_sqlite.c (contents, props changed) > head/net-im/jabberd/files/patch-tools__jabberd.in (contents, props changed) > - copied, changed from r336452, head/net-im/jabberd/files/patch-tools-jabberd.in > Deleted: > head/net-im/jabberd/files/patch-etc-Makefile.in > head/net-im/jabberd/files/patch-s2s-out.c > head/net-im/jabberd/files/patch-sm-mod_iq_time.c > head/net-im/jabberd/files/patch-sm-mod_roster.c > head/net-im/jabberd/files/patch-tools-jabberd.in > Modified: > head/net-im/jabberd/Makefile > head/net-im/jabberd/distinfo (contents, props changed) > head/net-im/jabberd/pkg-plist (contents, props changed) > > Modified: head/net-im/jabberd/Makefile > ============================================================================== > --- head/net-im/jabberd/Makefile Sun Dec 15 22:11:20 2013 (r336589) > +++ head/net-im/jabberd/Makefile Sun Dec 15 22:14:40 2013 (r336590) > @@ -2,35 +2,33 @@ > # $FreeBSD$ > > PORTNAME= jabberd > -PORTVERSION= 2.2.17 > -PORTREVISION= 1 > +DISTVERSION= 2.3.1 > CATEGORIES= net-im > -MASTER_SITES= http://cloud.github.com/downloads/jabberd2/jabberd2/ > +MASTER_SITES= https://github.com/jabberd2/jabberd2/releases/download/${PORTNAME}-${DISTVERSION}/ \ > + http://freefall.freebsd.org/~matthew/distfiles/ You should put the file in ~/public_distfiles instead of ~/distfiles and then put LOCAL/matthew in MASTER_SITES. See for instance: http://www.freebsd.org/doc/en/books/porters-handbook/book.html#slow-sources From owner-svn-ports-head@FreeBSD.ORG Mon Dec 16 08:55:00 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 75DE3F89; Mon, 16 Dec 2013 08:55:00 +0000 (UTC) Received: from ainaz.pair.com (ainaz.pair.com [209.68.2.66]) by mx1.freebsd.org (Postfix) with ESMTP id 5286A17AD; Mon, 16 Dec 2013 08:55:00 +0000 (UTC) Received: from [192.168.1.218] (114-142-222-93.dsl.static.teleguam.net [114.142.222.93]) by ainaz.pair.com (Postfix) with ESMTPSA id 65F893F410; Mon, 16 Dec 2013 03:54:47 -0500 (EST) Date: Mon, 16 Dec 2013 09:54:33 +0100 (CET) From: Gerald Pfeifer To: Tijl Coosemans Subject: Re: svn commit: r336343 - in head: . Mk/Uses In-Reply-To: <201312131322.rBDDMWZC038800@svn.freebsd.org> Message-ID: References: <201312131322.rBDDMWZC038800@svn.freebsd.org> MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII Cc: svn-ports-head@freebsd.org, svn-ports-all@freebsd.org, ports-committers@freebsd.org X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 16 Dec 2013 08:55:00 -0000 On Fri, 13 Dec 2013, Tijl Coosemans wrote: > Log: > New USES=fortran to replace USE_FORTRAN. I was already surprised when Bapt introduced USES=compiler and later made changes to the default version of GCC there without ever giving me a heads up. Now USE_FORTRAN, which I maintain, is being replaced without you reaching out to me. And there is an aweful lot of redundancy and even some inconsistency now. Not that I oppose in principle, or would have, but a little bit more communications and collaboration would be nice. Gerald (sad) PS: I'm starting vacation as we speak and will have limited connectivity the coming weeks, and likely none from the 17th to the 27th. From owner-svn-ports-head@FreeBSD.ORG Mon Dec 16 09:00:00 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id B865E3A0; Mon, 16 Dec 2013 09:00:00 +0000 (UTC) Received: from mail-wi0-x230.google.com (mail-wi0-x230.google.com [IPv6:2a00:1450:400c:c05::230]) (using TLSv1 with cipher ECDHE-RSA-RC4-SHA (128/128 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id D34E6181D; Mon, 16 Dec 2013 08:59:59 +0000 (UTC) Received: by mail-wi0-f176.google.com with SMTP id hq4so1777259wib.9 for ; Mon, 16 Dec 2013 00:59:58 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:date:from:to:cc:subject:message-id:references:mime-version :content-type:content-disposition:in-reply-to:user-agent; bh=4aWzkVfsNsjLIJtbpGbLC1meIiRb2zWv+8wGZ2nkFnk=; b=YmjuG98KHyaOsYTAKbSE5hHSf5AX6nwNPfy3vkFCmDihYt0NwQFbXlXX4XMgyd3UGx IaSk43uwBNH3MSL3r/el8mYmd2riFzQsFMDSAVDLLph5DXwtIIF5gAUEkj7r0K9oKthb IKVWJAwKhpelL5ygYH4EMPiSS6103nUuu5MCou+DASE9lQ3RZ9scUyIENwuJbT7PyyS7 NIDcs2jv6EXyLwTrwD2dTYYtU3MnIkdaUCSnwY7nDHcq29UBI+pjmB6ZcHCypmjttmHA sHEVXQyaBplpX7aKjVOmsrgdUOtezr8QlPBoeJcbYxFXsBfP+eEEIjKYZmlO4fHwogjL aWlQ== X-Received: by 10.194.206.5 with SMTP id lk5mr12642468wjc.46.1387184398329; Mon, 16 Dec 2013 00:59:58 -0800 (PST) Received: from ithaqua.etoilebsd.net (ithaqua.etoilebsd.net. [37.59.37.188]) by mx.google.com with ESMTPSA id x19sm23808718wia.5.2013.12.16.00.59.56 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Mon, 16 Dec 2013 00:59:57 -0800 (PST) Sender: Baptiste Daroussin Date: Mon, 16 Dec 2013 09:59:55 +0100 From: Baptiste Daroussin To: Gerald Pfeifer Subject: Re: svn commit: r336343 - in head: . Mk/Uses Message-ID: <20131216085954.GP57153@ithaqua.etoilebsd.net> References: <201312131322.rBDDMWZC038800@svn.freebsd.org> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="RtGa12sjXv8gVUZO" Content-Disposition: inline In-Reply-To: User-Agent: Mutt/1.5.21 (2010-09-15) Cc: svn-ports-head@freebsd.org, Tijl Coosemans , svn-ports-all@freebsd.org, ports-committers@freebsd.org X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 16 Dec 2013 09:00:00 -0000 --RtGa12sjXv8gVUZO Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Mon, Dec 16, 2013 at 09:54:33AM +0100, Gerald Pfeifer wrote: > On Fri, 13 Dec 2013, Tijl Coosemans wrote: > > Log: > > New USES=3Dfortran to replace USE_FORTRAN. >=20 > I was already surprised when Bapt introduced USES=3Dcompiler and later > made changes to the default version of GCC there without ever giving=20 > me a heads up. Now USE_FORTRAN, which I maintain, is being replaced=20 > without you reaching out to me. >=20 > And there is an aweful lot of redundancy and even some inconsistency now. >=20 > Not that I oppose in principle, or would have, but a little bit more=20 > communications and collaboration would be nice. >=20 > Gerald (sad) >=20 Both of them are my fault and I appologies for them, next time I will get y= ou included since the begining, for compiler.mk I felt rushy as there were mor= e and more hacks around the ports tree that were leading to more and more mixup o= f STL libraries. For fortran it was rushy as well, as package building for 10.0 a= re coming, tijl solution was working and allowing to have octave packages for = 10.0. I'm sorry and I'm really looking forward to more collaboration on next step= s on compilers. I'll try as well to improve my communication. regards, Bapt --RtGa12sjXv8gVUZO Content-Type: application/pgp-signature -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.15 (FreeBSD) iEYEARECAAYFAlKuwQoACgkQ8kTtMUmk6Ex9pwCgkSxk0BSWTp72xDeuBD4xWerr 1pgAn00yHE9msVtaxlpxNsUoMo0TuvPR =7EUi -----END PGP SIGNATURE----- --RtGa12sjXv8gVUZO-- From owner-svn-ports-head@FreeBSD.ORG Mon Dec 16 09:43:55 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id B080F155; Mon, 16 Dec 2013 09:43:55 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 9C9031CC5; Mon, 16 Dec 2013 09:43:55 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBG9htrR062740; Mon, 16 Dec 2013 09:43:55 GMT (envelope-from nemysis@svn.freebsd.org) Received: (from nemysis@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBG9ht6h062739; Mon, 16 Dec 2013 09:43:55 GMT (envelope-from nemysis@svn.freebsd.org) Message-Id: <201312160943.rBG9ht6h062739@svn.freebsd.org> From: Rusmir Dusko Date: Mon, 16 Dec 2013 09:43:55 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r336616 - head/games/pyspacewar X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 16 Dec 2013 09:43:55 -0000 Author: nemysis Date: Mon Dec 16 09:43:55 2013 New Revision: 336616 URL: http://svnweb.freebsd.org/changeset/ports/336616 Log: - Bump PORTREVISION - Use PYDISTUTILS_AUTOPLIST=yes and PLIST_FILES instead of pkg-plist Approved by: pawel / wg (mentors, implicit) Deleted: head/games/pyspacewar/pkg-plist Modified: head/games/pyspacewar/Makefile Modified: head/games/pyspacewar/Makefile ============================================================================== --- head/games/pyspacewar/Makefile Mon Dec 16 08:04:39 2013 (r336615) +++ head/games/pyspacewar/Makefile Mon Dec 16 09:43:55 2013 (r336616) @@ -3,7 +3,7 @@ PORTNAME= pyspacewar PORTVERSION= 0.9.7 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= games python MASTER_SITES= http://mg.pov.lt/${PORTNAME}/\ LOCAL/beech @@ -18,6 +18,13 @@ RUN_DEPENDS= ${PYGAME} USE_PYTHON= yes USE_PYDISTUTILS=yes +PYDISTUTILS_AUTOPLIST= yes + +PLIST_FILES= share/icons/hicolor/16x16/apps/pyspacewar.png \ + share/icons/hicolor/22x22/apps/pyspacewar.png \ + share/icons/hicolor/32x32/apps/pyspacewar.png \ + share/icons/hicolor/48x48/apps/pyspacewar.png \ + share/pixmaps/${PORTNAME}.png PORTDOCS= NEWS.txt README.txt TODO.txt performance-notes.txt From owner-svn-ports-head@FreeBSD.ORG Mon Dec 16 10:51:28 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 4F6D34AA; Mon, 16 Dec 2013 10:51:28 +0000 (UTC) Received: from smtp.infracaninophile.co.uk (smtp6.infracaninophile.co.uk [IPv6:2001:8b0:151:1:3cd3:cd67:fafa:3d78]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id D253011AD; Mon, 16 Dec 2013 10:51:27 +0000 (UTC) Received: from ox-dell39.ox.adestra.com (no-reverse-dns.metronet-uk.com [85.199.232.226] (may be forged)) (authenticated bits=0) by smtp.infracaninophile.co.uk (8.14.7/8.14.7) with ESMTP id rBGApGAL033162 (version=TLSv1/SSLv3 cipher=DHE-RSA-CAMELLIA256-SHA bits=256 verify=NO); Mon, 16 Dec 2013 10:51:23 GMT (envelope-from matthew@freebsd.org) DKIM-Filter: OpenDKIM Filter v2.8.3 smtp.infracaninophile.co.uk rBGApGAL033162 Authentication-Results: smtp.infracaninophile.co.uk/rBGApGAL033162; dkim=none reason="no signature"; dkim-adsp=none X-Authentication-Warning: lucid-nonsense.infracaninophile.co.uk: Host no-reverse-dns.metronet-uk.com [85.199.232.226] (may be forged) claimed to be ox-dell39.ox.adestra.com Message-ID: <52AEDB17.1070205@freebsd.org> Date: Mon, 16 Dec 2013 10:51:03 +0000 From: Matthew Seaman User-Agent: Mozilla/5.0 (X11; FreeBSD amd64; rv:24.0) Gecko/20100101 Thunderbird/24.1.0 MIME-Version: 1.0 To: Tijl Coosemans Subject: Re: svn commit: r336590 - in head/net-im/jabberd: . files References: <201312152214.rBFMEeFs013358@svn.freebsd.org> <20131216094613.0e2ea432@kalimero.tijl.coosemans.org> In-Reply-To: <20131216094613.0e2ea432@kalimero.tijl.coosemans.org> X-Enigmail-Version: 1.6 Content-Type: multipart/signed; micalg=pgp-sha512; protocol="application/pgp-signature"; boundary="GboIOVFQ5kXK8V3vwAnOlqW9Fa3Gg14ww" X-Virus-Scanned: clamav-milter 0.98 at lucid-nonsense.infracaninophile.co.uk X-Virus-Status: Clean X-Spam-Status: No, score=1.1 required=5.0 tests=AWL,BAYES_00,DCC_CHECK, RCVD_IN_RP_RNBL,RDNS_NONE,SPF_SOFTFAIL autolearn=no version=3.3.2 X-Spam-Level: * X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on lucid-nonsense.infracaninophile.co.uk Cc: svn-ports-head@freebsd.org, svn-ports-all@freebsd.org, ports-committers@freebsd.org X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 16 Dec 2013 10:51:28 -0000 This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --GboIOVFQ5kXK8V3vwAnOlqW9Fa3Gg14ww Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: quoted-printable On 12/16/13 08:46, Tijl Coosemans wrote: > You should put the file in ~/public_distfiles instead of ~/distfiles > and then put LOCAL/matthew in MASTER_SITES. See for instance: > http://www.freebsd.org/doc/en/books/porters-handbook/book.html#slow-sou= rces I've created ~/public_distfiles and placed the distfile there. Just waiting for that to propagate to ftp.freebsd.org et al before I update the port. Thanks, Matthew --GboIOVFQ5kXK8V3vwAnOlqW9Fa3Gg14ww Content-Type: application/pgp-signature; name="signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="signature.asc" -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.22 (FreeBSD) Comment: Using GnuPG with Thunderbird - http://www.enigmail.net/ iQJ8BAEBCgBmBQJSrtskXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQxOUYxNTRFQ0JGMTEyRTUwNTQ0RTNGMzAw MDUxM0YxMEUwQTlFNEU3AAoJEABRPxDgqeTn5VQQAInpKyegVTDpRmBTmipMzUtR fgl5KGc2usVfTXeutGEZkUgZdQ+hFkCBRTnjO4b+3P7/hv6z1+HsoIZ1s8CSI5kj 3Hlv7tEzrH1yEBdMSWNAoSxoPiuk9qgfefSBNiqJhKUIHyeSrM999gLd14imwod1 Anq4zJ3yjcvItmvLSqBVX5AhSpVeTbhDOezFa26FEBIFS60fjwEhedUcnNrGQDBf RgPIm1UV1Zg8+Y3maAkGDhhDD3NdtJGCiTJQeytOLqlsSO04jfS6xD5mmxA9JFV6 uzXdfoIbF2GhftIpYhNOWY9c0xKGczzpqCsPIyVa9oqk2j5HkUda5PSkMfV1zYuq M+faj851jH5OQpk3rUHGZo5TjyQ7DQ6kaXvf/By1y5cEFH8RMTTIBgs9Kr8uyUvR ka992jq4MvxOd0xw9S/DRFTYtXEO0YuKTNV/7buiVkAQzIMjo10SH9RPXUS8ERt6 62FZHvvEs2LoRW1UyTJPTrlOlA99fAIyPW7ix4OvVtCJUTtaNVRZYI8Q+UXg7zCb M17XZT3H7HqVMjgddj142aOA0ESwyoNttlGmTTYhGECITmFutZLf4FKQL/Rp+H/a UVbPeu9mCg/A7nOhzcjmigCvHHj6OMUPXCnKDDNCk59nknZ6w+IQbJ62XXrFmBed XGllslbGAO662PHz73TH =Fl0K -----END PGP SIGNATURE----- --GboIOVFQ5kXK8V3vwAnOlqW9Fa3Gg14ww-- From owner-svn-ports-head@FreeBSD.ORG Mon Dec 16 10:55:16 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id B8158722; Mon, 16 Dec 2013 10:55:16 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id A2BE011EC; Mon, 16 Dec 2013 10:55:16 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBGAtGvQ088231; Mon, 16 Dec 2013 10:55:16 GMT (envelope-from amdmi3@svn.freebsd.org) Received: (from amdmi3@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBGAtF1k088222; Mon, 16 Dec 2013 10:55:15 GMT (envelope-from amdmi3@svn.freebsd.org) Message-Id: <201312161055.rBGAtF1k088222@svn.freebsd.org> From: Dmitry Marakasov Date: Mon, 16 Dec 2013 10:55:15 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r336617 - in head/games/springlobby: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 16 Dec 2013 10:55:16 -0000 Author: amdmi3 Date: Mon Dec 16 10:55:14 2013 New Revision: 336617 URL: http://svnweb.freebsd.org/changeset/ports/336617 Log: - Update to 0.180 - Support staging - Use new LIB_DEPENDS syntax - Use new OPTIONS features Added: head/games/springlobby/files/patch-lsl-fmemopen (contents, props changed) head/games/springlobby/files/patch-src-downloader-lib-src-lib-xmlrpc++-src-base64.h (contents, props changed) head/games/springlobby/files/patch-src-lsl-src-lslunitsync-unitsync.cpp (contents, props changed) head/games/springlobby/files/patch-src-lsl-src-lslutils-misc.cpp (contents, props changed) head/games/springlobby/files/patch-src-spring.cpp (contents, props changed) Deleted: head/games/springlobby/files/patch-CMakeLists.txt head/games/springlobby/files/patch-src-battlelistctrl.cpp Modified: head/games/springlobby/Makefile head/games/springlobby/distinfo head/games/springlobby/pkg-plist Modified: head/games/springlobby/Makefile ============================================================================== --- head/games/springlobby/Makefile Mon Dec 16 09:43:55 2013 (r336616) +++ head/games/springlobby/Makefile Mon Dec 16 10:55:14 2013 (r336617) @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= springlobby -PORTVERSION= 0.143 -PORTREVISION= 2 +PORTVERSION= 0.180 CATEGORIES= games net MASTER_SITES= http://www.springlobby.info/tarballs/ \ http://mirror.amdmi3.ru/distfiles/ @@ -11,11 +10,14 @@ MASTER_SITES= http://www.springlobby.inf MAINTAINER= amdmi3@FreeBSD.org COMMENT= Cross-platform lobby client for the Spring RTS project +LICENSE= GPLv2 + RUN_DEPENDS= spring:${PORTSDIR}/games/spring -LIB_DEPENDS= curl:${PORTSDIR}/ftp/curl +LIB_DEPENDS= libcurl.so:${PORTSDIR}/ftp/curl \ + libboost_thread.so:${PORTSDIR}/devel/boost-libs USE_BZIP2= yes -USES= cmake +USES= cmake pkgconfig compiler:c++11-lib CMAKE_ARGS= -DwxWidgets_CONFIG_EXECUTABLE="${WX_CONFIG}" \ -DENABLE_DEBUG_REPORT=FALSE USE_WX= 2.8+ @@ -23,41 +25,24 @@ WX_UNICODE= yes PORTDOCS= * -OPTIONS_DEFINE= TORRENT SOUND DOCS NLS -OPTIONS_DEFAULT= TORRENT SOUND -TORRENT_DESC= Support automatic content downloads via torrent -SOUND_DESC= Enable sound - -NO_STAGE= yes -.include - -.if ${PORT_OPTIONS:MNLS} -USES+= gettext -PLIST_SUB+= NLS="" -.else -CMAKE_ARGS+= -DOPTION_TRANSLATION_SUPPORT:BOOL=OFF -PLIST_SUB+= NLS="@comment " -.endif - -.if ${PORT_OPTIONS:MTORRENT} -LIB_DEPENDS+= torrent-rasterbar:${PORTSDIR}/net-p2p/libtorrent-rasterbar-15 -.else -CMAKE_ARGS+= -DOPTION_TORRENT_SYSTEM:BOOL=OFF -.endif - -.if ${PORT_OPTIONS:MSOUND} -USE_OPENAL= al -.else -CMAKE_ARGS+= -DOPTION_SOUND:BOOL=OFF -.endif - -post-patch: - @${REINPLACE_CMD} -e '//d' \ - ${WRKSRC}/src/utils/curlhelper.h \ - ${WRKSRC}/src/utils/downloader.cpp -.if ! ${PORT_OPTIONS:MDOCS} - @${REINPLACE_CMD} -e '/install.*FILES.*share\/doc/ d' \ - ${WRKSRC}/CMakeLists.txt -.endif +OPTIONS_DEFINE= SOUND NLS NOTIFY DOCS +OPTIONS_DEFAULT=SOUND NOTIFY +OPTIONS_SUB= yes + +SOUND_DESC= Enable sound notifications +NOTIFY_DESC= Enable libnotify support for popup status messages + +NLS_CMAKE_ON= -DOPTION_TRANSLATION_SUPPORT:BOOL=ON +NLS_CMAKE_OFF= -DOPTION_TRANSLATION_SUPPORT:BOOL=OFF +NLS_USES= gettext + +SOUND_CMAKE_ON= -DOPTION_SOUND:BOOL=ON +SOUND_CMAKE_OFF= -DOPTION_SOUND:BOOL=OFF +SOUND_LIB_DEPENDS= libalure.so:${PORTSDIR}/audio/alure +SOUND_USE= OPENAL=al + +NOTIFY_CMAKE_ON= -DOPTION_NOTIFY=ON +NOTIFY_CMAKE_OFF= -DOPTION_NOTIFY=OFF +NOTIFY_LIB_DEPENDS= libnotify.so:${PORTSDIR}/devel/libnotify .include Modified: head/games/springlobby/distinfo ============================================================================== --- head/games/springlobby/distinfo Mon Dec 16 09:43:55 2013 (r336616) +++ head/games/springlobby/distinfo Mon Dec 16 10:55:14 2013 (r336617) @@ -1,2 +1,2 @@ -SHA256 (springlobby-0.143.tar.bz2) = 4694a0d88c7409a42cc83cd10b80226aa2cc5b2f0f83fa95351638fee3e77b61 -SIZE (springlobby-0.143.tar.bz2) = 1797369 +SHA256 (springlobby-0.180.tar.bz2) = ca9612fd4b8beb940169dfdbca76d15a73daee90ceb35c12f5ef451e79e6576c +SIZE (springlobby-0.180.tar.bz2) = 2543659 Added: head/games/springlobby/files/patch-lsl-fmemopen ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/games/springlobby/files/patch-lsl-fmemopen Mon Dec 16 10:55:14 2013 (r336617) @@ -0,0 +1,32 @@ +diff --git src/CMakeLists.txt src/CMakeLists.txt +index a1d9e3a..d82dac8 100644 +--- src/lsl/src/CMakeLists.txt ++++ src/lsl/src/CMakeLists.txt +@@ -11,6 +11,14 @@ ENDIF ( EXISTS ${libSpringLobby_BINARY_DIR}/libSpringLobby_config.h OR EXISTS + INCLUDE_DIRECTORIES(${libSpringLobby_SOURCE_DIR}/lib) + INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) + ++INCLUDE (CheckFunctionExists) ++ ++SET(CMAKE_REQUIRED_INCLUDES stdio.h) ++CHECK_FUNCTION_EXISTS(fmemopen HAVE_FMEMOPEN) ++IF(HAVE_FMEMOPEN) ++ ADD_DEFINITIONS(-DHAVE_FMEMOPEN) ++ENDIF(HAVE_FMEMOPEN) ++ + add_subdirectory( lslutils ) + if (LSLSERVER) + add_subdirectory( lsl ) +diff --git src/lslunitsync/image.cpp src/lslunitsync/image.cpp +index fbc4591..e26215c 100644 +--- src/lsl/src/lslunitsync/image.cpp ++++ src/lsl/src/lslunitsync/image.cpp +@@ -14,7 +14,7 @@ + #include + + +-#ifdef WIN32 ++#if !defined(HAVE_FMEMOPEN) + #include + //! we need our own fmemopen implementation since its posix only + FILE* fmemopen(void* data, size_t size, const char* mode) Added: head/games/springlobby/files/patch-src-downloader-lib-src-lib-xmlrpc++-src-base64.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/games/springlobby/files/patch-src-downloader-lib-src-lib-xmlrpc++-src-base64.h Mon Dec 16 10:55:14 2013 (r336617) @@ -0,0 +1,11 @@ +--- src/downloader/lib/src/lib/xmlrpc++/src/base64.h.orig 2013-02-10 22:02:43.000000000 +0400 ++++ src/downloader/lib/src/lib/xmlrpc++/src/base64.h 2013-12-10 04:19:12.257112752 +0400 +@@ -13,6 +13,8 @@ + # include + #endif + ++#include ++ + static + int _base64Chars[]= {'A','B','C','D','E','F','G','H','I','J','K','L','M','N','O','P','Q','R','S','T','U','V','W','X','Y','Z', + 'a','b','c','d','e','f','g','h','i','j','k','l','m','n','o','p','q','r','s','t','u','v','w','x','y','z', Added: head/games/springlobby/files/patch-src-lsl-src-lslunitsync-unitsync.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/games/springlobby/files/patch-src-lsl-src-lslunitsync-unitsync.cpp Mon Dec 16 10:55:14 2013 (r336617) @@ -0,0 +1,17 @@ +--- src/lsl/src/lslunitsync/unitsync.cpp.orig 2013-11-23 01:34:07.000000000 +0400 ++++ src/lsl/src/lslunitsync/unitsync.cpp 2013-12-10 04:23:40.875093997 +0400 +@@ -55,13 +55,7 @@ + { + static std::locale l("C"); + static boost::is_iless il(l); +- try { +- //this fails on certain names +- return il(first,second); +- } +- catch(...) { +- return first < second; +- } ++ return first < second; + } + + bool Unitsync::LoadUnitSyncLib( const std::string& unitsyncloc ) Added: head/games/springlobby/files/patch-src-lsl-src-lslutils-misc.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/games/springlobby/files/patch-src-lsl-src-lslutils-misc.cpp Mon Dec 16 10:55:14 2013 (r336617) @@ -0,0 +1,10 @@ +--- src/lsl/src/lslutils/misc.cpp.orig 2013-08-31 14:17:00.000000000 +0400 ++++ src/lsl/src/lslutils/misc.cpp 2013-12-10 04:20:26.887107289 +0400 +@@ -3,6 +3,7 @@ + + #include + #include ++#include + + namespace LSL { + namespace Util { Added: head/games/springlobby/files/patch-src-spring.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/games/springlobby/files/patch-src-spring.cpp Mon Dec 16 10:55:14 2013 (r336617) @@ -0,0 +1,10 @@ +--- src/spring.cpp.orig 2013-11-23 01:34:04.000000000 +0400 ++++ src/spring.cpp 2013-12-10 04:26:29.352082590 +0400 +@@ -28,6 +28,7 @@ + #include + #include + #include ++#include + #include + + #include "spring.h" Modified: head/games/springlobby/pkg-plist ============================================================================== --- head/games/springlobby/pkg-plist Mon Dec 16 09:43:55 2013 (r336616) +++ head/games/springlobby/pkg-plist Mon Dec 16 10:55:14 2013 (r336617) @@ -18,8 +18,6 @@ share/icons/hicolor/scalable/apps/spring %%NLS%%share/locale/sv/LC_MESSAGES/springlobby.mo %%NLS%%share/locale/uk/LC_MESSAGES/springlobby.mo %%NLS%%share/locale/zh_CN/LC_MESSAGES/springlobby.mo -%%NLS%%@dirrmtry share/locale/en_US/LC_MESSAGES -%%NLS%%@dirrmtry share/locale/en_US @dirrmtry share/icons/hicolor/scalable/apps @dirrmtry share/icons/hicolor/scalable @dirrmtry share/icons/hicolor From owner-svn-ports-head@FreeBSD.ORG Mon Dec 16 10:55:39 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 1D9C5800; Mon, 16 Dec 2013 10:55:39 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 09B2A11F2; Mon, 16 Dec 2013 10:55:39 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBGAtcln088338; Mon, 16 Dec 2013 10:55:38 GMT (envelope-from koobs@svn.freebsd.org) Received: (from koobs@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBGAtcX3088336; Mon, 16 Dec 2013 10:55:38 GMT (envelope-from koobs@svn.freebsd.org) Message-Id: <201312161055.rBGAtcX3088336@svn.freebsd.org> From: Kubilay Kocak Date: Mon, 16 Dec 2013 10:55:38 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r336618 - head/www/py-django-dpaste X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 16 Dec 2013 10:55:39 -0000 Author: koobs Date: Mon Dec 16 10:55:38 2013 New Revision: 336618 URL: http://svnweb.freebsd.org/changeset/ports/336618 Log: www/py-django-dpaste: Update commit hash, switch to setuptools new world order - Dont point to a direct commit since upstream tagged 2.1 - Deprecate easy_install Modified: head/www/py-django-dpaste/Makefile head/www/py-django-dpaste/distinfo Modified: head/www/py-django-dpaste/Makefile ============================================================================== --- head/www/py-django-dpaste/Makefile Mon Dec 16 10:55:14 2013 (r336617) +++ head/www/py-django-dpaste/Makefile Mon Dec 16 10:55:38 2013 (r336618) @@ -23,11 +23,10 @@ MIGRATIONS_RUN_DEPENDS= ${PYTHON_PKGNAME USE_GITHUB= yes USE_PYTHON= yes -USE_PYDISTUTILS= easy_install +USE_PYDISTUTILS= yes PYDISTUTILS_AUTOPLIST= yes GH_ACCOUNT= bartTC -GH_TAGNAME= ${GH_COMMIT} -GH_COMMIT= bb089fe +GH_COMMIT= 4ffd0ed .include Modified: head/www/py-django-dpaste/distinfo ============================================================================== --- head/www/py-django-dpaste/distinfo Mon Dec 16 10:55:14 2013 (r336617) +++ head/www/py-django-dpaste/distinfo Mon Dec 16 10:55:38 2013 (r336618) @@ -1,2 +1,2 @@ -SHA256 (dpaste-2.1.tar.gz) = f87a83b603bc2985e3eeb42df383871aa11f39c10d8088d6d16dcb9bc8c67e8a -SIZE (dpaste-2.1.tar.gz) = 113855 +SHA256 (dpaste-2.1.tar.gz) = 3ca5e2d2a5f7ae7125ce3d479a61c42aef76c71ebed9a7e481da9c6cc7394981 +SIZE (dpaste-2.1.tar.gz) = 113997 From owner-svn-ports-head@FreeBSD.ORG Mon Dec 16 11:07:04 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 8F44D9E; Mon, 16 Dec 2013 11:07:04 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 7BACA137B; Mon, 16 Dec 2013 11:07:04 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBGB74gi092213; Mon, 16 Dec 2013 11:07:04 GMT (envelope-from demon@svn.freebsd.org) Received: (from demon@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBGB74ED092212; Mon, 16 Dec 2013 11:07:04 GMT (envelope-from demon@svn.freebsd.org) Message-Id: <201312161107.rBGB74ED092212@svn.freebsd.org> From: Dmitry Sivachenko Date: Mon, 16 Dec 2013 11:07:04 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r336619 - head/net/haproxy-devel/files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 16 Dec 2013 11:07:04 -0000 Author: demon Date: Mon Dec 16 11:07:04 2013 New Revision: 336619 URL: http://svnweb.freebsd.org/changeset/ports/336619 Log: Fix double-free. Obtained from: upstream Added: head/net/haproxy-devel/files/patch-0001-BUG-MAJOR-patterns-fix-double-free-caused-by-loading.patch (contents, props changed) Added: head/net/haproxy-devel/files/patch-0001-BUG-MAJOR-patterns-fix-double-free-caused-by-loading.patch ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net/haproxy-devel/files/patch-0001-BUG-MAJOR-patterns-fix-double-free-caused-by-loading.patch Mon Dec 16 11:07:04 2013 (r336619) @@ -0,0 +1,33 @@ +From 6762a3061ac0d1d8c8860a2191c602a3c526205c Mon Sep 17 00:00:00 2001 +From: Willy Tarreau +Date: Mon, 16 Dec 2013 10:40:28 +0100 +Subject: BUG/MAJOR: patterns: fix double free caused by loading strings from + files + +A null pointer assignment was missing after a free in commit 7148ce6 (MEDIUM: +pattern: Extract the index process from the pat_parse_*() functions), causing +a double free after loading a file of string patterns. + +This bug was introduced in 1.5-dev20, no backport is needed. + +Thanks to Sander Klein for reporting this bug and providing the config +needed to trigger it. +--- + src/pattern.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/pattern.c b/src/pattern.c +index ce60f76..8380c63 100644 +--- src/pattern.c ++++ src/pattern.c +@@ -882,6 +882,7 @@ int pattern_register(struct pattern_expr *expr, const char **args, + + /* the "map_parser_str()" function always duplicate string information */ + free((*pattern)->ptr.str); ++ (*pattern)->ptr.str = NULL; + + /* we pre-set the data pointer to the tree's head so that functions + * which are able to insert in a tree know where to do that. +-- +1.7.12.2.21.g234cd45.dirty + From owner-svn-ports-head@FreeBSD.ORG Mon Dec 16 11:09:21 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id D6B298FA; Mon, 16 Dec 2013 11:09:21 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id C31F01519; Mon, 16 Dec 2013 11:09:21 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBGB9Ln4092503; Mon, 16 Dec 2013 11:09:21 GMT (envelope-from wg@svn.freebsd.org) Received: (from wg@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBGB9LwN092501; Mon, 16 Dec 2013 11:09:21 GMT (envelope-from wg@svn.freebsd.org) Message-Id: <201312161109.rBGB9LwN092501@svn.freebsd.org> From: William Grzybowski Date: Mon, 16 Dec 2013 11:09:21 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r336620 - head/databases/py-sqlobject X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 16 Dec 2013 11:09:21 -0000 Author: wg Date: Mon Dec 16 11:09:21 2013 New Revision: 336620 URL: http://svnweb.freebsd.org/changeset/ports/336620 Log: databases/py-sqlobject: update to 1.5.1 Modified: head/databases/py-sqlobject/Makefile head/databases/py-sqlobject/distinfo Modified: head/databases/py-sqlobject/Makefile ============================================================================== --- head/databases/py-sqlobject/Makefile Mon Dec 16 11:07:04 2013 (r336619) +++ head/databases/py-sqlobject/Makefile Mon Dec 16 11:09:21 2013 (r336620) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= sqlobject -PORTVERSION= 1.5.0 +PORTVERSION= 1.5.1 CATEGORIES= databases python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} Modified: head/databases/py-sqlobject/distinfo ============================================================================== --- head/databases/py-sqlobject/distinfo Mon Dec 16 11:07:04 2013 (r336619) +++ head/databases/py-sqlobject/distinfo Mon Dec 16 11:09:21 2013 (r336620) @@ -1,2 +1,2 @@ -SHA256 (SQLObject-1.5.0.tar.gz) = ff39291437670b8533921493c7f89ea6a826fbe365be87adc237433c8a80e4e1 -SIZE (SQLObject-1.5.0.tar.gz) = 276189 +SHA256 (SQLObject-1.5.1.tar.gz) = 68f86ae270b59f9cb57eadbd6b82264c2684cf0ab582e62e1188d5f8d1456a8d +SIZE (SQLObject-1.5.1.tar.gz) = 276686 From owner-svn-ports-head@FreeBSD.ORG Mon Dec 16 11:11:24 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 32B45A32; Mon, 16 Dec 2013 11:11:24 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 1BB8F1598; Mon, 16 Dec 2013 11:11:24 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBGBBNCe099799; Mon, 16 Dec 2013 11:11:23 GMT (envelope-from zeising@svn.freebsd.org) Received: (from zeising@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBGBBA7k099723; Mon, 16 Dec 2013 11:11:10 GMT (envelope-from zeising@svn.freebsd.org) Message-Id: <201312161111.rBGBBA7k099723@svn.freebsd.org> From: Niclas Zeising Date: Mon, 16 Dec 2013 11:11:10 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r336621 - in head: . Mk astro/viking cad/pdnmesh cad/repsnapper deskutils/pinot devel/gccmakedep devel/libpciaccess devel/makedepend devel/xorg-macros emulators/catapult emulators/qemu-... X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 16 Dec 2013 11:11:24 -0000 Author: zeising Date: Mon Dec 16 11:11:09 2013 New Revision: 336621 URL: http://svnweb.freebsd.org/changeset/ports/336621 Log: Switch FreeBSD CURRENT to use the new xorg stack (WITH_NEW_XORG=) [0] If the old xorg stack is still needed, it is possible to add WITHOUT_NEW_XORG= to /etc/make.conf to get the old version. Update several xorg related ports, including: x11/libxcb 1.9.1 -> 1.9.3 graphics/libdrm 2.4.46 -> 2.4.50 x11/pixman 0.30.2 -> 0.32.4 x11/xkeyboard-config 2.9 -> 2.10.1 x11-drivers/xf86-input-keyboard 1.7.0 -> 1.8.0 Fix dissapearing cursor in xf86-video-vmware [2] Stagify all x11@-owned ports Bump portrevisions for xf86-* ports due to xserver version change. Fix fallout from updates where needed. Thanks to: all testersi, bdrewery and the FreeBSD x11@ team exp-run by: bdrewery [1] PR: ports/184684 [1], ports/181385 [2] Submitted by: Douglas Carmichael [2] Approved by: portmgr (bdrewery), core (jhb) [0] Added: head/graphics/libdrm/files/extra-tests__radeon__radeon_ttm.c (contents, props changed) head/x11-drivers/xf86-input-keyboard/files/patch-src__bsd_kbd.c (contents, props changed) head/x11-drivers/xf86-input-keyboard/files/patch-src__kbd.c (contents, props changed) head/x11-drivers/xf86-video-vmware/files/ head/x11-drivers/xf86-video-vmware/files/patch-src_vmware.c (contents, props changed) head/x11/dri3proto/ head/x11/dri3proto/Makefile (contents, props changed) head/x11/dri3proto/distinfo (contents, props changed) head/x11/dri3proto/pkg-descr (contents, props changed) head/x11/dri3proto/pkg-plist (contents, props changed) head/x11/libxcb/files/patch-src__c_client.py (contents, props changed) head/x11/libxshmfence/ head/x11/libxshmfence/Makefile (contents, props changed) head/x11/libxshmfence/distinfo (contents, props changed) head/x11/libxshmfence/files/ head/x11/libxshmfence/files/patch-config.h.in (contents, props changed) head/x11/libxshmfence/files/patch-configure (contents, props changed) head/x11/libxshmfence/files/patch-src__xshmfence_alloc.c (contents, props changed) head/x11/libxshmfence/files/patch-src__xshmfence_futex.h (contents, props changed) head/x11/libxshmfence/files/patch-src__xshmfenceint.h (contents, props changed) head/x11/libxshmfence/pkg-descr (contents, props changed) head/x11/libxshmfence/pkg-plist (contents, props changed) head/x11/presentproto/ head/x11/presentproto/Makefile (contents, props changed) head/x11/presentproto/distinfo (contents, props changed) head/x11/presentproto/pkg-descr (contents, props changed) head/x11/presentproto/pkg-plist (contents, props changed) head/x11/xcb-proto/files/ head/x11/xcb-proto/files/patch-src_sync.xml (contents, props changed) head/x11/xtrans/files/ head/x11/xtrans/files/patch-Xtransint.h (contents, props changed) Deleted: head/x11/libxcb/files/patch-Makefile.in head/x11/xkeyboard-config/files/etersoft-patch-symbols-typo Modified: head/Mk/bsd.port.mk head/Mk/bsd.xorg.mk head/UPDATING head/astro/viking/Makefile head/cad/pdnmesh/Makefile head/cad/repsnapper/Makefile head/deskutils/pinot/Makefile head/devel/gccmakedep/Makefile head/devel/libpciaccess/Makefile head/devel/makedepend/Makefile head/devel/xorg-macros/Makefile head/devel/xorg-macros/distinfo head/emulators/catapult/Makefile head/emulators/qemu-devel/Makefile head/emulators/tme/Makefile head/emulators/virtualbox-ose-additions/Makefile head/games/fuhquake/files/Makefile head/games/klavaro/Makefile head/graphics/cairo/Makefile head/graphics/freeglut/Makefile head/graphics/libdrm/Makefile head/graphics/libdrm/distinfo head/graphics/libdrm/files/extra-tests_modetest_Makefile.in head/graphics/libdrm/files/extra-tests_modetest_modetest.c head/graphics/libdrm/pkg-plist head/graphics/libreatlas/Makefile head/graphics/mesa-demos/Makefile head/multimedia/freetuxtv/Makefile head/net/cvsup/Makefile head/net/tigervnc/Makefile head/print/photoprint/Makefile head/sysutils/gtk-imonc/Makefile head/sysutils/nitrogen/Makefile head/textproc/xorg-sgml-doctools/Makefile head/x11-clocks/oclock/Makefile head/x11-clocks/oclock/pkg-plist head/x11-clocks/xclock/Makefile head/x11-clocks/xclock/pkg-plist head/x11-drivers/input-wacom/Makefile head/x11-drivers/xf86-input-acecad/Makefile head/x11-drivers/xf86-input-acecad/pkg-plist head/x11-drivers/xf86-input-elographics/Makefile head/x11-drivers/xf86-input-elographics/pkg-plist head/x11-drivers/xf86-input-fpit/Makefile head/x11-drivers/xf86-input-hyperpen/Makefile head/x11-drivers/xf86-input-joystick/Makefile head/x11-drivers/xf86-input-joystick/pkg-plist head/x11-drivers/xf86-input-keyboard/Makefile head/x11-drivers/xf86-input-keyboard/distinfo head/x11-drivers/xf86-input-keyboard/pkg-plist head/x11-drivers/xf86-input-magictouch/Makefile head/x11-drivers/xf86-input-magictouch/pkg-plist head/x11-drivers/xf86-input-mouse/Makefile head/x11-drivers/xf86-input-mouse/pkg-plist head/x11-drivers/xf86-input-mutouch/Makefile head/x11-drivers/xf86-input-mutouch/pkg-plist head/x11-drivers/xf86-input-penmount/Makefile head/x11-drivers/xf86-input-penmount/pkg-plist head/x11-drivers/xf86-input-synaptics/Makefile head/x11-drivers/xf86-input-synaptics/distinfo head/x11-drivers/xf86-input-synaptics/pkg-plist head/x11-drivers/xf86-input-vmmouse/Makefile head/x11-drivers/xf86-input-vmmouse/pkg-plist head/x11-drivers/xf86-input-void/Makefile head/x11-drivers/xf86-input-void/pkg-plist head/x11-drivers/xf86-video-apm/Makefile head/x11-drivers/xf86-video-apm/pkg-plist head/x11-drivers/xf86-video-ark/Makefile head/x11-drivers/xf86-video-ati/Makefile head/x11-drivers/xf86-video-ati/pkg-plist head/x11-drivers/xf86-video-chips/Makefile head/x11-drivers/xf86-video-chips/pkg-plist head/x11-drivers/xf86-video-cirrus/Makefile head/x11-drivers/xf86-video-cirrus/pkg-plist head/x11-drivers/xf86-video-cyrix/Makefile head/x11-drivers/xf86-video-cyrix/pkg-plist head/x11-drivers/xf86-video-dummy/Makefile head/x11-drivers/xf86-video-fbdev/Makefile head/x11-drivers/xf86-video-fbdev/pkg-plist head/x11-drivers/xf86-video-glint/Makefile head/x11-drivers/xf86-video-glint/pkg-plist head/x11-drivers/xf86-video-i128/Makefile head/x11-drivers/xf86-video-i128/pkg-plist head/x11-drivers/xf86-video-i740/Makefile head/x11-drivers/xf86-video-i740/pkg-plist head/x11-drivers/xf86-video-imstt/Makefile head/x11-drivers/xf86-video-imstt/pkg-plist head/x11-drivers/xf86-video-intel/Makefile head/x11-drivers/xf86-video-intel/pkg-plist head/x11-drivers/xf86-video-mach64/Makefile head/x11-drivers/xf86-video-mga/Makefile head/x11-drivers/xf86-video-neomagic/Makefile head/x11-drivers/xf86-video-newport/Makefile head/x11-drivers/xf86-video-newport/pkg-plist head/x11-drivers/xf86-video-nouveau/Makefile head/x11-drivers/xf86-video-nouveau/pkg-plist head/x11-drivers/xf86-video-nv/Makefile head/x11-drivers/xf86-video-nv/pkg-plist head/x11-drivers/xf86-video-openchrome/Makefile head/x11-drivers/xf86-video-openchrome/pkg-plist head/x11-drivers/xf86-video-r128/Makefile head/x11-drivers/xf86-video-radeonhd/Makefile head/x11-drivers/xf86-video-radeonhd/pkg-plist head/x11-drivers/xf86-video-rdc/Makefile head/x11-drivers/xf86-video-rendition/Makefile head/x11-drivers/xf86-video-rendition/pkg-plist head/x11-drivers/xf86-video-s3/Makefile head/x11-drivers/xf86-video-s3/pkg-plist head/x11-drivers/xf86-video-s3virge/Makefile head/x11-drivers/xf86-video-s3virge/pkg-plist head/x11-drivers/xf86-video-savage/Makefile head/x11-drivers/xf86-video-siliconmotion/Makefile head/x11-drivers/xf86-video-siliconmotion/pkg-plist head/x11-drivers/xf86-video-sis-intel/Makefile head/x11-drivers/xf86-video-sis/Makefile head/x11-drivers/xf86-video-sis/pkg-plist head/x11-drivers/xf86-video-sunffb/Makefile head/x11-drivers/xf86-video-tdfx/Makefile head/x11-drivers/xf86-video-tdfx/pkg-plist head/x11-drivers/xf86-video-tga/Makefile head/x11-drivers/xf86-video-trident/Makefile head/x11-drivers/xf86-video-trident/pkg-plist head/x11-drivers/xf86-video-tseng/Makefile head/x11-drivers/xf86-video-tseng/pkg-plist head/x11-drivers/xf86-video-vesa/Makefile head/x11-drivers/xf86-video-vesa/pkg-plist head/x11-drivers/xf86-video-via/Makefile head/x11-drivers/xf86-video-via/pkg-plist head/x11-drivers/xf86-video-vmware/Makefile head/x11-drivers/xf86-video-vmware/pkg-plist head/x11-drivers/xf86-video-voodoo/Makefile head/x11-drivers/xf86-video-voodoo/pkg-plist head/x11-drivers/xorg-drivers/Makefile head/x11-fonts/bdftopcf/Makefile head/x11-fonts/encodings/Makefile head/x11-fonts/font-adobe-100dpi/Makefile head/x11-fonts/font-adobe-75dpi/Makefile head/x11-fonts/font-adobe-utopia-100dpi/Makefile head/x11-fonts/font-adobe-utopia-75dpi/Makefile head/x11-fonts/font-adobe-utopia-type1/Makefile head/x11-fonts/font-alias/Makefile head/x11-fonts/font-arabic-misc/Makefile head/x11-fonts/font-bh-100dpi/Makefile head/x11-fonts/font-bh-75dpi/Makefile head/x11-fonts/font-bh-lucidatypewriter-100dpi/Makefile head/x11-fonts/font-bh-lucidatypewriter-75dpi/Makefile head/x11-fonts/font-bh-ttf/Makefile head/x11-fonts/font-bh-type1/Makefile head/x11-fonts/font-bitstream-100dpi/Makefile head/x11-fonts/font-bitstream-75dpi/Makefile head/x11-fonts/font-bitstream-speedo/Makefile head/x11-fonts/font-bitstream-type1/Makefile head/x11-fonts/font-cronyx-cyrillic/Makefile head/x11-fonts/font-cursor-misc/Makefile head/x11-fonts/font-daewoo-misc/Makefile head/x11-fonts/font-dec-misc/Makefile head/x11-fonts/font-ibm-type1/Makefile head/x11-fonts/font-isas-misc/Makefile head/x11-fonts/font-jis-misc/Makefile head/x11-fonts/font-micro-misc/Makefile head/x11-fonts/font-misc-cyrillic/Makefile head/x11-fonts/font-misc-ethiopic/Makefile head/x11-fonts/font-misc-meltho/Makefile head/x11-fonts/font-misc-misc/Makefile head/x11-fonts/font-mutt-misc/Makefile head/x11-fonts/font-schumacher-misc/Makefile head/x11-fonts/font-screen-cyrillic/Makefile head/x11-fonts/font-sony-misc/Makefile head/x11-fonts/font-sun-misc/Makefile head/x11-fonts/font-util/Makefile head/x11-fonts/font-util/pkg-plist head/x11-fonts/font-winitzki-cyrillic/Makefile head/x11-fonts/font-xfree86-type1/Makefile head/x11-fonts/fonttosfnt/Makefile head/x11-fonts/fslsfonts/Makefile head/x11-fonts/libXfont/Makefile head/x11-fonts/libXfontcache/Makefile head/x11-fonts/libXfontcache/pkg-plist head/x11-fonts/mkfontdir/Makefile head/x11-fonts/mkfontscale/Makefile head/x11-fonts/showfont/Makefile head/x11-fonts/xfontsel/Makefile head/x11-fonts/xfontsel/pkg-plist head/x11-fonts/xfs/Makefile head/x11-fonts/xfs/pkg-plist head/x11-fonts/xfsinfo/Makefile head/x11-fonts/xlsfonts/Makefile head/x11-fonts/xorg-fonts-100dpi/Makefile head/x11-fonts/xorg-fonts-75dpi/Makefile head/x11-fonts/xorg-fonts-cyrillic/Makefile head/x11-fonts/xorg-fonts-miscbitmaps/Makefile head/x11-fonts/xorg-fonts-truetype/Makefile head/x11-fonts/xorg-fonts-type1/Makefile head/x11-fonts/xorg-fonts/Makefile head/x11-servers/mga_hal/Makefile head/x11-servers/xephyr/Makefile head/x11-servers/xorg-dmx/Makefile head/x11-servers/xorg-dmx/pkg-plist head/x11-servers/xorg-nestserver/Makefile head/x11-servers/xorg-server/Makefile head/x11-servers/xorg-server/pkg-plist head/x11-servers/xorg-vfbserver/Makefile head/x11-themes/gtk-murrine-engine/Makefile head/x11-themes/xcursor-themes/Makefile head/x11-toolkits/gtkglext/Makefile head/x11-toolkits/libXaw/Makefile head/x11-toolkits/libXaw/pkg-plist head/x11-toolkits/libXmu/Makefile head/x11-toolkits/libXt/Makefile head/x11-toolkits/libXt/pkg-plist head/x11-toolkits/termit/Makefile head/x11-wm/awesome/Makefile head/x11-wm/transset/Makefile head/x11-wm/xcompmgr/Makefile head/x11/Makefile head/x11/beforelight/Makefile head/x11/beforelight/pkg-plist head/x11/bitmap/Makefile head/x11/bitmap/pkg-plist head/x11/editres/Makefile head/x11/editres/pkg-plist head/x11/fstobdf/Makefile head/x11/glproto/Makefile head/x11/glproto/distinfo head/x11/iceauth/Makefile head/x11/ico/Makefile head/x11/libXScrnSaver/Makefile head/x11/libXScrnSaver/pkg-plist head/x11/libXTrap/Makefile head/x11/libXau/Makefile head/x11/libXau/pkg-plist head/x11/libXcomposite/Makefile head/x11/libXcomposite/pkg-plist head/x11/libXcursor/Makefile head/x11/libXcursor/pkg-plist head/x11/libXdamage/Makefile head/x11/libXevie/Makefile head/x11/libXevie/pkg-plist head/x11/libXext/Makefile head/x11/libXext/pkg-plist head/x11/libXfixes/Makefile head/x11/libXfixes/pkg-plist head/x11/libXi/Makefile head/x11/libXi/pkg-plist head/x11/libXinerama/Makefile head/x11/libXinerama/pkg-plist head/x11/libXp/Makefile head/x11/libXp/pkg-plist head/x11/libXpm/Makefile head/x11/libXpm/pkg-plist head/x11/libXrandr/Makefile head/x11/libXrandr/pkg-plist head/x11/libXrender/Makefile head/x11/libXres/Makefile head/x11/libXres/pkg-plist head/x11/libXtst/Makefile head/x11/libXtst/pkg-plist head/x11/libXv/Makefile head/x11/libXv/pkg-plist head/x11/libXvMC/Makefile head/x11/libXxf86dga/Makefile head/x11/libXxf86dga/pkg-plist head/x11/libXxf86misc/Makefile head/x11/libXxf86misc/pkg-plist head/x11/libXxf86vm/Makefile head/x11/libXxf86vm/pkg-plist head/x11/libdmx/Makefile head/x11/libdmx/pkg-plist head/x11/libxcb/Makefile head/x11/libxcb/distinfo head/x11/libxcb/pkg-plist head/x11/libxkbfile/Makefile head/x11/listres/Makefile head/x11/luit/Makefile head/x11/mkcomposecache/Makefile head/x11/pixman/Makefile head/x11/pixman/distinfo head/x11/printproto/Makefile head/x11/printproto/pkg-plist head/x11/rstart/Makefile head/x11/rstart/pkg-plist head/x11/scripts/Makefile head/x11/scripts/pkg-plist head/x11/sessreg/Makefile head/x11/setxkbmap/Makefile head/x11/smproxy/Makefile head/x11/trapproto/Makefile head/x11/viewres/Makefile head/x11/x11perf/Makefile head/x11/x11perf/pkg-plist head/x11/xcalc/Makefile head/x11/xcalc/pkg-plist head/x11/xcb-proto/Makefile head/x11/xcb-proto/distinfo head/x11/xcb-proto/pkg-plist head/x11/xclipboard/Makefile head/x11/xclipboard/pkg-plist head/x11/xcmsdb/Makefile head/x11/xconsole/Makefile head/x11/xconsole/pkg-plist head/x11/xdbedizzy/Makefile head/x11/xditview/Makefile head/x11/xditview/pkg-plist head/x11/xdm/Makefile head/x11/xdm/pkg-plist head/x11/xdpyinfo/Makefile head/x11/xdriinfo/Makefile head/x11/xedit/Makefile head/x11/xedit/pkg-plist head/x11/xev/Makefile head/x11/xeyes/Makefile head/x11/xf86dga/Makefile head/x11/xfindproxy/Makefile head/x11/xfwp/Makefile head/x11/xgamma/Makefile head/x11/xgc/Makefile head/x11/xgc/pkg-plist head/x11/xhost/Makefile head/x11/xinit/Makefile head/x11/xinit/pkg-plist head/x11/xinput/Makefile head/x11/xkbcomp/Makefile head/x11/xkbevd/Makefile head/x11/xkbprint/Makefile head/x11/xkbutils/Makefile head/x11/xkbutils/pkg-plist head/x11/xkeyboard-config/Makefile head/x11/xkeyboard-config/distinfo head/x11/xkeyboard-config/pkg-plist head/x11/xkill/Makefile head/x11/xload/Makefile head/x11/xload/pkg-plist head/x11/xlogo/Makefile head/x11/xlogo/pkg-plist head/x11/xlsatoms/Makefile head/x11/xlsclients/Makefile head/x11/xmag/Makefile head/x11/xmag/pkg-plist head/x11/xman/Makefile head/x11/xman/pkg-plist head/x11/xmessage/Makefile head/x11/xmessage/pkg-plist head/x11/xmh/Makefile head/x11/xmh/pkg-plist head/x11/xmodmap/Makefile head/x11/xmore/Makefile head/x11/xmore/pkg-plist head/x11/xorg-apps/Makefile head/x11/xorg-docs/Makefile head/x11/xorg-docs/pkg-plist head/x11/xorg-libraries/Makefile head/x11/xorg/Makefile head/x11/xplsprinters/Makefile head/x11/xprehashprinterlist/Makefile head/x11/xprop/Makefile head/x11/xproto/Makefile head/x11/xproto/distinfo head/x11/xrandr/Makefile head/x11/xrdb/Makefile head/x11/xrefresh/Makefile head/x11/xrx/Makefile head/x11/xrx/pkg-plist head/x11/xsetmode/Makefile head/x11/xsetpointer/Makefile head/x11/xtrans/Makefile head/x11/xtrans/distinfo head/x11/xtrans/pkg-plist head/x11/xvidtune/Makefile head/x11/xvmcinfo/Makefile Modified: head/Mk/bsd.port.mk ============================================================================== --- head/Mk/bsd.port.mk Mon Dec 16 11:09:21 2013 (r336620) +++ head/Mk/bsd.port.mk Mon Dec 16 11:11:09 2013 (r336621) @@ -1222,6 +1222,16 @@ WITH_PKGNG?= yes .endif .endif +# Enable new xorg for FreeBSD versions after Radeon KMS was imported unless +# WITHOUT_NEW_XORG is set. +.if ${OSVERSION} >= 1100000 +. if !defined(WITHOUT_NEW_XORG) +WITH_NEW_XORG?= yes +. else +.undef WITH_NEW_XORG +. endif +.endif + # Only define tools here (for transition period with between pkg tools) .include "${PORTSDIR}/Mk/bsd.commands.mk" Modified: head/Mk/bsd.xorg.mk ============================================================================== --- head/Mk/bsd.xorg.mk Mon Dec 16 11:09:21 2013 (r336620) +++ head/Mk/bsd.xorg.mk Mon Dec 16 11:11:09 2013 (r336621) @@ -56,21 +56,15 @@ USE_XORG+= xorg-macros . endif . if ${XORG_CAT} == "driver" -USE_XORG+= xorg-server xproto randrproto xi +USE_XORG+= xorg-server xproto randrproto xi renderproto xextproto \ + inputproto kbproto fontsproto videoproto dri2proto xf86driproto \ + glproto xineramaproto resourceproto scrnsaverproto # work around a llvm bug on i386, llvm bug #15806 # reproduced with clang 3.2 (current release) and 3.1 . if ${ARCH} == i386 CFLAGS+= -fno-optimize-sibling-calls . endif CONFIGURE_ENV+= DRIVER_MAN_SUFFIX=4x DRIVER_MAN_DIR='$$(mandir)/man4' -. if ${PORTNAME:M*input*}x != x -USE_XORG+= inputproto videoproto fontsproto renderproto xextproto \ - dri2proto -. elif ${PORTNAME:M*video*}x != x -USE_XORG+= videoproto fontsproto renderproto xextproto dri2proto -. else -IGNORE= doesn't contain either "video" or "input" -. endif . endif . if ${XORG_CAT} == "font" @@ -147,7 +141,7 @@ USES+= pathfix CONFIGURE_ARGS+= --with-xkb-path=${LOCALBASE}/share/X11/xkb LIB_PC_DEPENDS+= ${LOCALBASE}/libdata/pkgconfig/dri.pc:${PORTSDIR}/graphics/dri -USE_XORG+= pciaccess xextproto videoproto fontsproto dri2proto +USE_XORG+= pciaccess xextproto videoproto fontsproto dri2proto fontutil:build . endif .endif @@ -171,6 +165,7 @@ XORG_MODULES= bigreqsproto \ dmx \ dmxproto \ dri2proto \ + dri3proto \ evieproto \ fixesproto \ fontcacheproto \ @@ -185,6 +180,7 @@ XORG_MODULES= bigreqsproto \ oldx \ pciaccess \ pixman \ + presentproto \ printproto \ randrproto \ recordproto \ @@ -238,6 +234,7 @@ XORG_MODULES= bigreqsproto \ xrender \ xres \ xscrnsaver \ + xshmfence \ xt \ xtrans \ xtrap \ @@ -254,6 +251,7 @@ damageproto_BUILD_DEPENDS= ${LOCALBASE}/ dmx_LIB_PC_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/dmx.pc:${PORTSDIR}/x11/libdmx dmxproto_BUILD_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/dmxproto.pc:${PORTSDIR}/x11/dmxproto dri2proto_BUILD_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/dri2proto.pc:${PORTSDIR}/x11/dri2proto +dri3proto_BUILD_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/dri3proto.pc:${PORTSDIR}/x11/dri3proto evieproto_BUILD_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/evieproto.pc:${PORTSDIR}/x11/evieext fixesproto_BUILD_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/fixesproto.pc:${PORTSDIR}/x11/fixesproto fontcacheproto_BUILD_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/fontcacheproto.pc:${PORTSDIR}/x11-fonts/fontcacheproto @@ -268,6 +266,7 @@ libfs_LIB_PC_DEPENDS= ${LOCALBASE}/libd oldx_LIB_PC_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/oldx.pc:${PORTSDIR}/x11/liboldX pciaccess_LIB_PC_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/pciaccess.pc:${PORTSDIR}/devel/libpciaccess pixman_LIB_PC_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/pixman-1.pc:${PORTSDIR}/x11/pixman +presentproto_BUILD_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/presentproto.pc:${PORTSDIR}/x11/presentproto printproto_BUILD_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/printproto.pc:${PORTSDIR}/x11/printproto randrproto_BUILD_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/randrproto.pc:${PORTSDIR}/x11/randrproto recordproto_BUILD_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/recordproto.pc:${PORTSDIR}/x11/recordproto @@ -322,6 +321,7 @@ xrender_LIB_PC_DEPENDS= ${LOCALBASE}/li xres_LIB_PC_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/xres.pc:${PORTSDIR}/x11/libXres xscrnsaver_LIB_PC_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/xscrnsaver.pc:${PORTSDIR}/x11/libXScrnSaver xt_LIB_PC_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/xt.pc:${PORTSDIR}/x11-toolkits/libXt +xshmfence_LIB_PC_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/xshmfence.pc:${PORTSDIR}/x11/libxshmfence xtrans_BUILD_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/xtrans.pc:${PORTSDIR}/x11/xtrans xtrap_LIB_PC_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/xtrap.pc:${PORTSDIR}/x11/libXTrap xtst_LIB_PC_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/xtst.pc:${PORTSDIR}/x11/libXtst Modified: head/UPDATING ============================================================================== --- head/UPDATING Mon Dec 16 11:09:21 2013 (r336620) +++ head/UPDATING Mon Dec 16 11:11:09 2013 (r336621) @@ -5,6 +5,35 @@ they are unavoidable. You should get into the habit of checking this file for changes each time you update your ports collection, before attempting any port upgrades. +20131216: + AFFECTS: users of x11/xorg, graphics/libGL, graphics/dri, all xorg ports + AUTHOR: zeising@FreeBSD.org + + The default xorg version has been switched on FreeBSD CURRENT. + + To upgrade graphics/libGL, graphics/dri and related MESA ports, it is + neccessary to first remove the old versions of those ports. + No special upgrade procedure is needed for xorg port but it is + necessary to recompile all xorg drivers (xf86-*) and other ports that + depend on the xserver version, including + emulators/virtualbox-ose-additions. Portrevisions have been bumped + where needed, but users of drivers not in the ports tree will need to + recompile those. + + If it is important to stay on the old versions, it is possible to + specify WITHOUT_NEW_XORG= in /etc/make.conf to get the old xorg + distribution. + + To update: + + # pkg_delete -f libGL-\* dri-\* + or + # pkg delete -f libGL dri + followed by + # portmaster -a + or + # portupgrade -a + 20131214: AFFECTS: users of databases/db4* AUTHOR: mandree@FreeBSD.org Modified: head/astro/viking/Makefile ============================================================================== --- head/astro/viking/Makefile Mon Dec 16 11:09:21 2013 (r336620) +++ head/astro/viking/Makefile Mon Dec 16 11:11:09 2013 (r336621) @@ -3,6 +3,7 @@ PORTNAME= viking PORTVERSION= 1.5 +PORTREVISION= 1 CATEGORIES= astro MASTER_SITES= SF/${PORTNAME}/ Modified: head/cad/pdnmesh/Makefile ============================================================================== --- head/cad/pdnmesh/Makefile Mon Dec 16 11:09:21 2013 (r336620) +++ head/cad/pdnmesh/Makefile Mon Dec 16 11:11:09 2013 (r336621) @@ -3,7 +3,7 @@ PORTNAME= pdnmesh PORTVERSION= 0.2.2 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= cad MASTER_SITES= SF/${PORTNAME}/${PORTNAME}-source/${PORTVERSION} Modified: head/cad/repsnapper/Makefile ============================================================================== --- head/cad/repsnapper/Makefile Mon Dec 16 11:09:21 2013 (r336620) +++ head/cad/repsnapper/Makefile Mon Dec 16 11:11:09 2013 (r336621) @@ -3,6 +3,7 @@ PORTNAME= repsnapper PORTVERSION= 2.3.2a3 +PORTREVISION= 1 CATEGORIES= cad MASTER_SITES= https://codeload.github.com/timschmidt/repsnapper/tar.gz/ DISTNAME= ${PORTVERSION} Modified: head/deskutils/pinot/Makefile ============================================================================== --- head/deskutils/pinot/Makefile Mon Dec 16 11:09:21 2013 (r336620) +++ head/deskutils/pinot/Makefile Mon Dec 16 11:11:09 2013 (r336621) @@ -3,7 +3,7 @@ PORTNAME= pinot PORTVERSION= 1.06 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= deskutils MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE} #MASTER_SITES= http://colinf.chez.com/pinot/ Modified: head/devel/gccmakedep/Makefile ============================================================================== --- head/devel/gccmakedep/Makefile Mon Dec 16 11:09:21 2013 (r336620) +++ head/devel/gccmakedep/Makefile Mon Dec 16 11:11:09 2013 (r336621) @@ -13,10 +13,7 @@ XORG_CAT= util BUILD_DEPENDS= tradcpp:${PORTSDIR}/devel/tradcpp -MAN1= gccmakedep.1 - -PLIST_FILES= bin/gccmakedep +PLIST_FILES= bin/gccmakedep man/man1/gccmakedep.1.gz CONFIGURE_ENV+= ac_cv_path_RAWCPP=tradcpp -NO_STAGE= yes .include Modified: head/devel/libpciaccess/Makefile ============================================================================== --- head/devel/libpciaccess/Makefile Mon Dec 16 11:09:21 2013 (r336620) +++ head/devel/libpciaccess/Makefile Mon Dec 16 11:11:09 2013 (r336621) @@ -14,5 +14,4 @@ CONFIGURE_ARGS+= --with-pciids-path=${LO XORG_CAT= lib -NO_STAGE= yes .include Modified: head/devel/makedepend/Makefile ============================================================================== --- head/devel/makedepend/Makefile Mon Dec 16 11:09:21 2013 (r336620) +++ head/devel/makedepend/Makefile Mon Dec 16 11:11:09 2013 (r336621) @@ -12,9 +12,6 @@ COMMENT= Dependency generator for makefi XORG_CAT= util USE_XORG= xproto -PLIST_FILES= bin/makedepend +PLIST_FILES= bin/makedepend man/man1/makedepend.1.gz -MAN1= makedepend.1 - -NO_STAGE= yes .include Modified: head/devel/xorg-macros/Makefile ============================================================================== --- head/devel/xorg-macros/Makefile Mon Dec 16 11:09:21 2013 (r336620) +++ head/devel/xorg-macros/Makefile Mon Dec 16 11:11:09 2013 (r336621) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= xorg-macros -PORTVERSION= 1.17.1 +PORTVERSION= 1.18.0 CATEGORIES= devel x11 DISTNAME= util-macros-$(PORTVERSION) Modified: head/devel/xorg-macros/distinfo ============================================================================== --- head/devel/xorg-macros/distinfo Mon Dec 16 11:09:21 2013 (r336620) +++ head/devel/xorg-macros/distinfo Mon Dec 16 11:11:09 2013 (r336621) @@ -1,2 +1,2 @@ -SHA256 (xorg/util/util-macros-1.17.1.tar.bz2) = 5e52654f2a0b04223cf28a9d7fd62cf288852e639ac13a75172fd47d0d6ac625 -SIZE (xorg/util/util-macros-1.17.1.tar.bz2) = 79105 +SHA256 (xorg/util/util-macros-1.18.0.tar.bz2) = e5e3d132a852f0576ea2cf831a9813c54a58810a59cdb198f56b884c5a78945b +SIZE (xorg/util/util-macros-1.18.0.tar.bz2) = 77830 Modified: head/emulators/catapult/Makefile ============================================================================== --- head/emulators/catapult/Makefile Mon Dec 16 11:09:21 2013 (r336620) +++ head/emulators/catapult/Makefile Mon Dec 16 11:11:09 2013 (r336621) @@ -3,7 +3,7 @@ PORTNAME= catapult PORTVERSION= 0.9.1 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= emulators MASTER_SITES= SF/openmsx/openmsx/${PORTVERSION} DISTNAME= openmsx-${PORTNAME}-${PORTVERSION} Modified: head/emulators/qemu-devel/Makefile ============================================================================== --- head/emulators/qemu-devel/Makefile Mon Dec 16 11:09:21 2013 (r336620) +++ head/emulators/qemu-devel/Makefile Mon Dec 16 11:11:09 2013 (r336621) @@ -3,6 +3,7 @@ PORTNAME= qemu PORTVERSION= 1.6.1 +PORTREVISION= 1 CATEGORIES= emulators MASTER_SITES= http://wiki.qemu.org/download/:release \ LOCAL/nox:snapshot Modified: head/emulators/tme/Makefile ============================================================================== --- head/emulators/tme/Makefile Mon Dec 16 11:09:21 2013 (r336620) +++ head/emulators/tme/Makefile Mon Dec 16 11:11:09 2013 (r336621) @@ -3,7 +3,7 @@ PORTNAME= tme PORTVERSION= 0.8 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= emulators MASTER_SITES= http://people.csail.mit.edu/fredette/tme/ Modified: head/emulators/virtualbox-ose-additions/Makefile ============================================================================== --- head/emulators/virtualbox-ose-additions/Makefile Mon Dec 16 11:09:21 2013 (r336620) +++ head/emulators/virtualbox-ose-additions/Makefile Mon Dec 16 11:11:09 2013 (r336621) @@ -3,6 +3,7 @@ PORTNAME= virtualbox-ose DISTVERSION= 4.2.20 +PORTREVISION= 1 CATEGORIES= emulators MASTER_SITES= http://download.virtualbox.org/virtualbox/${DISTVERSION}/ \ http://tmp.chruetertee.ch/ \ Modified: head/games/fuhquake/files/Makefile ============================================================================== --- head/games/fuhquake/files/Makefile Mon Dec 16 11:09:21 2013 (r336620) +++ head/games/fuhquake/files/Makefile Mon Dec 16 11:11:09 2013 (r336621) @@ -187,7 +187,7 @@ CL_GLX_OBJS = \ CL_COMMON_LIBS = -lm CL_X11_LIBS = -L${LOCALBASE}/lib -lX11 -lXext -CL_GLX_LIBS = -L${LOCALBASE}/lib -lpng -ljpeg -L${LOCALBASE}/lib -lGL -lXxf86dga -lXxf86vm +CL_GLX_LIBS = -L${LOCALBASE}/lib -lpng -ljpeg -L${LOCALBASE}/lib -lX11 -lGL -lXxf86dga -lXxf86vm .c.o: ${CC} ${DO_CFLAGS} -c $< -o $*.o Modified: head/games/klavaro/Makefile ============================================================================== --- head/games/klavaro/Makefile Mon Dec 16 11:09:21 2013 (r336620) +++ head/games/klavaro/Makefile Mon Dec 16 11:11:09 2013 (r336621) @@ -3,7 +3,7 @@ PORTNAME= klavaro PORTVERSION= 1.9.9 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= games MASTER_SITES= SF/${PORTNAME}/ Modified: head/graphics/cairo/Makefile ============================================================================== --- head/graphics/cairo/Makefile Mon Dec 16 11:09:21 2013 (r336620) +++ head/graphics/cairo/Makefile Mon Dec 16 11:11:09 2013 (r336621) @@ -4,7 +4,7 @@ PORTNAME= cairo PORTVERSION= 1.10.2 -PORTREVISION= 6 +PORTREVISION= 7 PORTEPOCH?= 2 CATEGORIES= graphics MASTER_SITES= http://cairographics.org/releases/ Modified: head/graphics/freeglut/Makefile ============================================================================== --- head/graphics/freeglut/Makefile Mon Dec 16 11:09:21 2013 (r336620) +++ head/graphics/freeglut/Makefile Mon Dec 16 11:11:09 2013 (r336621) @@ -28,7 +28,6 @@ DOCS= download.html freeglut.html freegl progress.html structure.html BINS= CallbackMaker Fractals Fractals_random Lorenz One shapes -NO_STAGE= yes .include pre-configure: @@ -43,17 +42,17 @@ post-build: post-install: .if ${PORT_OPTIONS:MDOCS} - @${MKDIR} ${DOCSDIR} + @${MKDIR} ${STAGEDIR}${DOCSDIR} .for FILE in ${DOCS} - @${INSTALL_DATA} ${WRKSRC}/doc/${FILE} ${DOCSDIR} + @${INSTALL_DATA} ${WRKSRC}/doc/${FILE} ${STAGEDIR}${DOCSDIR} .endfor @${ECHO_MSG} "===> Documentation installed in ${DOCSDIR}." .endif .if ${PORT_OPTIONS:MEXAMPLES} - @${MKDIR} ${EXAMPLESDIR} - @${INSTALL_DATA} ${WRKSRC}/progs/demos/Fractals/fractals.dat ${EXAMPLESDIR} + @${MKDIR} ${STAGEDIR}${EXAMPLESDIR} + @${INSTALL_DATA} ${WRKSRC}/progs/demos/Fractals/fractals.dat ${STAGEDIR}${EXAMPLESDIR} .for prog in ${BINS} - @${INSTALL_PROGRAM} ${WRKSRC}/progs/demos/${prog}/.libs/${prog:L} ${EXAMPLESDIR} + @${INSTALL_PROGRAM} ${WRKSRC}/progs/demos/${prog}/.libs/${prog:L} ${STAGEDIR}${EXAMPLESDIR} .endfor @${ECHO_MSG} "===> Examples installed in ${EXAMPLESDIR}." .endif Modified: head/graphics/libdrm/Makefile ============================================================================== --- head/graphics/libdrm/Makefile Mon Dec 16 11:09:21 2013 (r336620) +++ head/graphics/libdrm/Makefile Mon Dec 16 11:11:09 2013 (r336621) @@ -17,7 +17,6 @@ USES= pkgconfig USE_BZIP2= yes GNU_CONFIGURE= yes USE_LDCONFIG= yes -NO_STAGE= yes OPTIONS_DEFINE= MANPAGES @@ -42,28 +41,22 @@ PLIST_SUB+= KMS="@comment " NOUVEAU="@co .endif .if ${PORT_OPTIONS:MMANPAGES} -BUILD_DEPENDS+= ${LOCALBASE}/share/xsl/docbook/manpages/docbook.xsl:${PORTSDIR}/textproc/docbook-xsl \ - xsltproc:${PORTSDIR}/textproc/libxslt -MAN3= drmAvailable.3 \ - drmHandleEvent.3 \ - drmModeGetResources.3 -MAN7= drm-gem.7 \ - drm-kms.7 \ - drm-memory.7 \ - drm-mm.7 \ - drm-ttm.7 \ - drm.7 +BUILD_DEPENDS+= ${LOCALBASE}/share/xsl/docbook/manpages/docbook.xsl:${PORTSDIR}/textproc/docbook-xsl +USE_GNOME+= libxslt:build +PLIST_SUB+= MAN="" .else CONFIGURE_ARGS+=--disable-manpages +PLIST_SUB+= MAN="@comment " .endif -LIBDRM_VERSION= 2.4.46 +LIBDRM_VERSION= 2.4.50 LIBDRM_REVISION=0 PLIST_SUB+= OLD="@comment " NEW="" EXTRA_PATCHES+= ${FILESDIR}/extra-configure \ ${FILESDIR}/extra-tests_modetest_Makefile.in \ ${FILESDIR}/extra-tests_modetest_modetest.c \ - ${FILESDIR}/extra-tests_modetest_strchrnul.c + ${FILESDIR}/extra-tests_modetest_strchrnul.c \ + ${FILESDIR}/extra-tests__radeon__radeon_ttm.c CONFIGURE_ARGS+=--disable-vmwgfx .else CONFIGURE_ARGS= --enable-nouveau-experimental-api @@ -85,4 +78,7 @@ pre-patch: s,i?86|x86_64),i?86|amd64|x86_64),g' \ ${WRKSRC}/configure +post-install: + @${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/lib*.so.* + .include Modified: head/graphics/libdrm/distinfo ============================================================================== --- head/graphics/libdrm/distinfo Mon Dec 16 11:09:21 2013 (r336620) +++ head/graphics/libdrm/distinfo Mon Dec 16 11:11:09 2013 (r336621) @@ -1,4 +1,4 @@ SHA256 (libdrm-2.4.17.tar.bz2) = b8a4e7c610b0e970546d791c06e28882857a49d34698633a89292d7ae142316a SIZE (libdrm-2.4.17.tar.bz2) = 408882 -SHA256 (libdrm-2.4.46.tar.bz2) = 33cf320dad4e8060768714792e12643ddf6756a719d262ba7d60b39c2b2650f1 -SIZE (libdrm-2.4.46.tar.bz2) = 554190 +SHA256 (libdrm-2.4.50.tar.bz2) = 3823d24cda800c2cd36995e01830b890edb8fb1bebf97d5ea4318b8c3933b045 +SIZE (libdrm-2.4.50.tar.bz2) = 563613 Added: head/graphics/libdrm/files/extra-tests__radeon__radeon_ttm.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/graphics/libdrm/files/extra-tests__radeon__radeon_ttm.c Mon Dec 16 11:11:09 2013 (r336621) @@ -0,0 +1,13 @@ +--- tests/radeon/radeon_ttm.c.orig 2013-11-07 11:34:28.207096353 +0100 ++++ tests/radeon/radeon_ttm.c 2013-11-07 11:37:41.571085931 +0100 +@@ -25,6 +25,10 @@ + */ + #include + #include ++#include ++ ++#include ++ + #include "rbo.h" + + /* allocate as many single page bo to try to starve the kernel Modified: head/graphics/libdrm/files/extra-tests_modetest_Makefile.in ============================================================================== --- head/graphics/libdrm/files/extra-tests_modetest_Makefile.in Mon Dec 16 11:09:21 2013 (r336620) +++ head/graphics/libdrm/files/extra-tests_modetest_Makefile.in Mon Dec 16 11:11:09 2013 (r336621) @@ -1,6 +1,6 @@ ---- tests/modetest/Makefile.in.orig 2013-04-04 15:41:48.212028807 +0200 -+++ tests/modetest/Makefile.in 2013-04-04 15:45:21.384003991 +0200 -@@ -36,8 +52,11 @@ +--- tests/modetest/Makefile.in.orig 2013-10-11 18:46:07.000000000 +0200 ++++ tests/modetest/Makefile.in 2013-11-07 11:30:15.274123603 +0100 +@@ -80,8 +80,11 @@ host_triplet = @host@ @HAVE_INSTALL_TESTS_TRUE@bin_PROGRAMS = modetest$(EXEEXT) @HAVE_INSTALL_TESTS_FALSE@noinst_PROGRAMS = modetest$(EXEEXT) @@ -12,9 +12,9 @@ +@HAVE_CAIRO_TRUE@am__append_2 = $(CAIRO_CFLAGS) +@HAVE_CAIRO_TRUE@am__append_3 = $(CAIRO_LIBS) subdir = tests/modetest - DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in - ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -@@ -53,7 +72,10 @@ + DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ + $(top_srcdir)/build-aux/depcomp +@@ -98,7 +101,10 @@ CONFIG_CLEAN_VPATH_FILES = am__installdirs = "$(DESTDIR)$(bindir)" PROGRAMS = $(bin_PROGRAMS) $(noinst_PROGRAMS) @@ -26,23 +26,23 @@ modetest_OBJECTS = $(am_modetest_OBJECTS) am__DEPENDENCIES_1 = @HAVE_CAIRO_TRUE@am__DEPENDENCIES_2 = $(am__DEPENDENCIES_1) -@@ -229,12 +265,10 @@ - top_builddir = @top_builddir@ +@@ -306,12 +312,12 @@ top_srcdir = @top_srcdir@ - AM_CFLAGS = -I$(top_srcdir)/include/drm -I$(top_srcdir)/libkms/ \ + AM_CFLAGS = $(filter-out -Wpointer-arith, $(WARN_CFLAGS)) \ + -I$(top_srcdir)/include/drm -I$(top_srcdir)/libkms/ \ - -I$(top_srcdir) $(am__append_1) --modetest_SOURCES = \ -- buffers.c modetest.c buffers.h -- + -I$(top_srcdir) $(am__append_2) -+modetest_SOURCES = buffers.c modetest.c buffers.h $(am__append_1) + modetest_SOURCES = \ +- buffers.c modetest.c buffers.h ++ buffers.c modetest.c buffers.h $(am__append_1) + modetest_LDADD = $(top_builddir)/libdrm.la \ - $(top_builddir)/libkms/libkms.la $(am__append_2) + $(top_builddir)/libkms/libkms.la $(am__append_3) all: all-am .SUFFIXES: -@@ -333,6 +370,7 @@ +@@ -417,6 +423,7 @@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/buffers.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/modetest.Po@am__quote@ Modified: head/graphics/libdrm/files/extra-tests_modetest_modetest.c ============================================================================== --- head/graphics/libdrm/files/extra-tests_modetest_modetest.c Mon Dec 16 11:09:21 2013 (r336620) +++ head/graphics/libdrm/files/extra-tests_modetest_modetest.c Mon Dec 16 11:11:09 2013 (r336621) @@ -1,6 +1,6 @@ ---- tests/modetest/modetest.c.orig 2013-02-22 00:44:28.203705216 +0100 -+++ tests/modetest/modetest.c 2013-02-22 00:44:56.803699770 +0100 -@@ -57,6 +57,10 @@ +--- tests/modetest/modetest.c.orig 2013-09-16 22:56:20.000000000 +0200 ++++ tests/modetest/modetest.c 2013-11-07 11:32:10.534114644 +0100 +@@ -59,6 +59,10 @@ #include "buffers.h" @@ -8,6 +8,6 @@ +char *strchrnul(const char *, int); +#endif + - drmModeRes *resources; - int fd, modes; - + struct crtc { + drmModeCrtc *crtc; + drmModeObjectProperties *props; Modified: head/graphics/libdrm/pkg-plist ============================================================================== --- head/graphics/libdrm/pkg-plist Mon Dec 16 11:09:21 2013 (r336620) +++ head/graphics/libdrm/pkg-plist Mon Dec 16 11:11:09 2013 (r336621) @@ -70,6 +70,15 @@ libdata/pkgconfig/libdrm.pc %%NOUVEAU%%libdata/pkgconfig/libdrm_nouveau.pc %%NEW%%%%RADEON_DRIVERS%%libdata/pkgconfig/libdrm_radeon.pc %%NEW%%%%KMS%%libdata/pkgconfig/libkms.pc +%%NEW%%%%MAN%%man/man3/drmAvailable.3.gz +%%NEW%%%%MAN%%man/man3/drmHandleEvent.3.gz +%%NEW%%%%MAN%%man/man3/drmModeGetResources.3.gz +%%NEW%%%%MAN%%man/man7/drm-gem.7.gz +%%NEW%%%%MAN%%man/man7/drm-kms.7.gz +%%NEW%%%%MAN%%man/man7/drm-memory.7.gz +%%NEW%%%%MAN%%man/man7/drm-mm.7.gz +%%NEW%%%%MAN%%man/man7/drm-ttm.7.gz +%%NEW%%%%MAN%%man/man7/drm.7.gz %%OLD%%@dirrm include/nouveau %%NEW%%%%KMS%%@dirrm include/libkms %%NEW%%@dirrm include/libdrm Modified: head/graphics/libreatlas/Makefile ============================================================================== --- head/graphics/libreatlas/Makefile Mon Dec 16 11:09:21 2013 (r336620) +++ head/graphics/libreatlas/Makefile Mon Dec 16 11:11:09 2013 (r336621) @@ -3,7 +3,7 @@ PORTNAME= libreatlas PORTVERSION= 1.0.0a -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= graphics geography MASTER_SITES= http://www.gaia-gis.it/gaia-sins/ Modified: head/graphics/mesa-demos/Makefile ============================================================================== --- head/graphics/mesa-demos/Makefile Mon Dec 16 11:09:21 2013 (r336620) +++ head/graphics/mesa-demos/Makefile Mon Dec 16 11:11:09 2013 (r336621) @@ -23,7 +23,6 @@ DATADIR= ${PREFIX}/share/${PKGNAMEPREFIX OPTIONS_DEFINE= NVIDIA NVIDIA_DESC= Use NVIDIA's libraries -NO_STAGE= yes post-patch: @${REINPLACE_CMD} -e 's|-ffast-math|${FAST_MATH}|' -e 's|x86_64|amd64|' \ ${WRKSRC}/configure Modified: head/multimedia/freetuxtv/Makefile ============================================================================== --- head/multimedia/freetuxtv/Makefile Mon Dec 16 11:09:21 2013 (r336620) +++ head/multimedia/freetuxtv/Makefile Mon Dec 16 11:11:09 2013 (r336621) @@ -3,7 +3,7 @@ PORTNAME= freetuxtv PORTVERSION= 0.6.5 -PORTREVISION= 7 +PORTREVISION= 8 CATEGORIES= multimedia MASTER_SITES= GOOGLE_CODE Modified: head/net/cvsup/Makefile ============================================================================== --- head/net/cvsup/Makefile Mon Dec 16 11:09:21 2013 (r336620) +++ head/net/cvsup/Makefile Mon Dec 16 11:11:09 2013 (r336621) @@ -3,7 +3,7 @@ PORTNAME= cvsup PORTVERSION= 16.1h -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= net devel MASTER_SITES= ${MASTER_SITE_FREEBSD_ORG} MASTER_SITE_SUBDIR=development/CVSup/snapshots Modified: head/net/tigervnc/Makefile ============================================================================== --- head/net/tigervnc/Makefile Mon Dec 16 11:09:21 2013 (r336620) +++ head/net/tigervnc/Makefile Mon Dec 16 11:11:09 2013 (r336621) @@ -3,7 +3,7 @@ PORTNAME= tigervnc PORTVERSION= 1.3.0 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= net x11-servers MASTER_SITES= SF:tigervnc MASTER_SITE_SUBDIR= ${PORTNAME}/${PORTNAME}/${PORTVERSION}/:tigervnc Modified: head/print/photoprint/Makefile ============================================================================== --- head/print/photoprint/Makefile Mon Dec 16 11:09:21 2013 (r336620) +++ head/print/photoprint/Makefile Mon Dec 16 11:11:09 2013 (r336621) @@ -2,7 +2,7 @@ PORTNAME= photoprint DISTVERSION= 0.4.2-pre2 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= print graphics MASTER_SITES= http://www.blackfiveimaging.co.uk/photoprint/ Modified: head/sysutils/gtk-imonc/Makefile ============================================================================== --- head/sysutils/gtk-imonc/Makefile Mon Dec 16 11:09:21 2013 (r336620) +++ head/sysutils/gtk-imonc/Makefile Mon Dec 16 11:11:09 2013 (r336621) @@ -3,7 +3,7 @@ PORTNAME= gtk-imonc PORTVERSION= 0.6.4.1 -PORTREVISION= 13 +PORTREVISION= 14 CATEGORIES= sysutils MASTER_SITES= http://stefan-strigler.de/download/ Modified: head/sysutils/nitrogen/Makefile ============================================================================== --- head/sysutils/nitrogen/Makefile Mon Dec 16 11:09:21 2013 (r336620) +++ head/sysutils/nitrogen/Makefile Mon Dec 16 11:11:09 2013 (r336621) @@ -3,7 +3,7 @@ PORTNAME= nitrogen PORTVERSION= 1.5.2 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= sysutils MASTER_SITES= http://projects.l3ib.org/nitrogen/files/ Modified: head/textproc/xorg-sgml-doctools/Makefile ============================================================================== --- head/textproc/xorg-sgml-doctools/Makefile Mon Dec 16 11:09:21 2013 (r336620) +++ head/textproc/xorg-sgml-doctools/Makefile Mon Dec 16 11:11:09 2013 (r336621) @@ -13,5 +13,4 @@ XORG_CAT= doc USE_GMAKE= yes USES= pathfix -NO_STAGE= yes .include Modified: head/x11-clocks/oclock/Makefile ============================================================================== --- head/x11-clocks/oclock/Makefile Mon Dec 16 11:09:21 2013 (r336620) +++ head/x11-clocks/oclock/Makefile Mon Dec 16 11:11:09 2013 (r336621) @@ -10,7 +10,4 @@ COMMENT= Round clock application for X XORG_CAT= app USE_XORG= x11 xmu xext xt xkbfile -MAN1= oclock.1 - -NO_STAGE= yes .include Modified: head/x11-clocks/oclock/pkg-plist ============================================================================== --- head/x11-clocks/oclock/pkg-plist Mon Dec 16 11:09:21 2013 (r336620) +++ head/x11-clocks/oclock/pkg-plist Mon Dec 16 11:11:09 2013 (r336621) @@ -1,4 +1,5 @@ bin/oclock +man/man1/oclock.1.gz share/X11/app-defaults/Clock-color @dirrmtry share/X11/app-defaults @dirrmtry share/X11 Modified: head/x11-clocks/xclock/Makefile ============================================================================== --- head/x11-clocks/xclock/Makefile Mon Dec 16 11:09:21 2013 (r336620) +++ head/x11-clocks/xclock/Makefile Mon Dec 16 11:11:09 2013 (r336621) @@ -12,7 +12,4 @@ XORG_CAT= app USE_XORG= xrender xft xkbfile xt xaw USES= iconv -MAN1= xclock.1 - -NO_STAGE= yes .include Modified: head/x11-clocks/xclock/pkg-plist ============================================================================== --- head/x11-clocks/xclock/pkg-plist Mon Dec 16 11:09:21 2013 (r336620) +++ head/x11-clocks/xclock/pkg-plist Mon Dec 16 11:11:09 2013 (r336621) @@ -1,4 +1,5 @@ bin/xclock +man/man1/xclock.1.gz share/X11/app-defaults/XClock-color share/X11/app-defaults/XClock @dirrmtry share/X11/app-defaults Modified: head/x11-drivers/input-wacom/Makefile ============================================================================== --- head/x11-drivers/input-wacom/Makefile Mon Dec 16 11:09:21 2013 (r336620) +++ head/x11-drivers/input-wacom/Makefile Mon Dec 16 11:11:09 2013 (r336621) @@ -3,7 +3,7 @@ PORTNAME= input-wacom PORTVERSION= ${KLD_VERSION}.${WACOM_VERSION:C/-/./g} -PORTREVISION= 1 +PORTREVISION= 3 CATEGORIES= x11-drivers kld MASTER_SITES= http://www.chillt.de/bsdwacom/:bsdwacom \ SF/linuxwacom/xf86-input-wacom/:linuxwacom Modified: head/x11-drivers/xf86-input-acecad/Makefile ============================================================================== --- head/x11-drivers/xf86-input-acecad/Makefile Mon Dec 16 11:09:21 2013 (r336620) +++ head/x11-drivers/xf86-input-acecad/Makefile Mon Dec 16 11:11:09 2013 (r336621) @@ -2,13 +2,12 @@ PORTNAME= xf86-input-acecad PORTVERSION= 1.5.0 +PORTREVISION= 1 CATEGORIES= x11-drivers MAINTAINER= x11@FreeBSD.org COMMENT= X.Org acecad input driver XORG_CAT= driver -MAN4= acecad.4x -NO_STAGE= yes .include Modified: head/x11-drivers/xf86-input-acecad/pkg-plist ============================================================================== --- head/x11-drivers/xf86-input-acecad/pkg-plist Mon Dec 16 11:09:21 2013 (r336620) +++ head/x11-drivers/xf86-input-acecad/pkg-plist Mon Dec 16 11:11:09 2013 (r336621) @@ -1,5 +1,6 @@ lib/xorg/modules/input/acecad_drv.la lib/xorg/modules/input/acecad_drv.so +man/man4/acecad.4x.gz @dirrmtry lib/xorg/modules/input @dirrmtry lib/xorg/modules @dirrmtry lib/xorg Modified: head/x11-drivers/xf86-input-elographics/Makefile ============================================================================== --- head/x11-drivers/xf86-input-elographics/Makefile Mon Dec 16 11:09:21 2013 (r336620) +++ head/x11-drivers/xf86-input-elographics/Makefile Mon Dec 16 11:11:09 2013 (r336621) @@ -9,7 +9,8 @@ MAINTAINER= x11@FreeBSD.org COMMENT= X.Org elographics input driver XORG_CAT= driver -MAN4= elographics.4x + +.include .if defined(WITH_NEW_XORG) ELO_VERSION= 1.4.1 @@ -19,5 +20,4 @@ ELO_VERSION= 1.2.4 ELO_REVISION= 0 .endif -NO_STAGE= yes .include Modified: head/x11-drivers/xf86-input-elographics/pkg-plist ============================================================================== --- head/x11-drivers/xf86-input-elographics/pkg-plist Mon Dec 16 11:09:21 2013 (r336620) +++ head/x11-drivers/xf86-input-elographics/pkg-plist Mon Dec 16 11:11:09 2013 (r336621) @@ -1,5 +1,6 @@ lib/xorg/modules/input/elographics_drv.la lib/xorg/modules/input/elographics_drv.so +man/man4/elographics.4x.gz @dirrmtry lib/xorg/modules/input @dirrmtry lib/xorg/modules @dirrmtry lib/xorg Modified: head/x11-drivers/xf86-input-fpit/Makefile ============================================================================== --- head/x11-drivers/xf86-input-fpit/Makefile Mon Dec 16 11:09:21 2013 (r336620) +++ head/x11-drivers/xf86-input-fpit/Makefile Mon Dec 16 11:11:09 2013 (r336621) @@ -2,6 +2,7 @@ PORTNAME= xf86-input-fpit PORTVERSION= 1.4.0 +PORTREVISION= 1 CATEGORIES= x11-drivers MAINTAINER= x11@FreeBSD.org @@ -10,6 +11,8 @@ COMMENT= X.Org fpit input driver XORG_CAT= driver USE_XORG= xrandr +.include + .if !defined(WITH_NEW_XORG) IGNORE= does not build with X server 1.7.7 .endif Modified: head/x11-drivers/xf86-input-hyperpen/Makefile ============================================================================== --- head/x11-drivers/xf86-input-hyperpen/Makefile Mon Dec 16 11:09:21 2013 (r336620) +++ head/x11-drivers/xf86-input-hyperpen/Makefile Mon Dec 16 11:11:09 2013 (r336621) @@ -10,6 +10,8 @@ COMMENT= X.Org hyperpen input driver XORG_CAT= driver +.include + .if defined(WITH_NEW_XORG) HYPERVER= 1.4.1 HYPERREVISION= 0 @@ -19,5 +21,4 @@ HYPERREVISION= 6 EXTRA_PATCHES+= ${FILESDIR}/extra-patch-src_xf86HyperPen.c .endif -NO_STAGE= yes .include Modified: head/x11-drivers/xf86-input-joystick/Makefile ============================================================================== --- head/x11-drivers/xf86-input-joystick/Makefile Mon Dec 16 11:09:21 2013 (r336620) +++ head/x11-drivers/xf86-input-joystick/Makefile Mon Dec 16 11:11:09 2013 (r336621) @@ -9,7 +9,8 @@ MAINTAINER= x11@FreeBSD.org COMMENT= X.Org joystick input driver XORG_CAT= driver -MAN4= joystick.4x + +.include .if defined(WITH_NEW_XORG) JOYVER= 1.6.2 @@ -19,7 +20,6 @@ JOYVER= 1.5.0 JOYREVISION= 1 .endif -NO_STAGE= yes post-patch: @${REINPLACE_CMD} -e 's|[(]libdir[)]/pkgconfig|(prefix)/libdata/pkgconfig|g' \ ${WRKSRC}/Makefile.in Modified: head/x11-drivers/xf86-input-joystick/pkg-plist ============================================================================== --- head/x11-drivers/xf86-input-joystick/pkg-plist Mon Dec 16 11:09:21 2013 (r336620) +++ head/x11-drivers/xf86-input-joystick/pkg-plist Mon Dec 16 11:11:09 2013 (r336621) @@ -2,6 +2,7 @@ include/xorg/joystick-properties.h lib/xorg/modules/input/joystick_drv.la lib/xorg/modules/input/joystick_drv.so libdata/pkgconfig/xorg-joystick.pc +man/man4/joystick.4x.gz @dirrmtry lib/xorg/modules/input @dirrmtry lib/xorg/modules @dirrmtry lib/xorg Modified: head/x11-drivers/xf86-input-keyboard/Makefile ============================================================================== --- head/x11-drivers/xf86-input-keyboard/Makefile Mon Dec 16 11:09:21 2013 (r336620) +++ head/x11-drivers/xf86-input-keyboard/Makefile Mon Dec 16 11:11:09 2013 (r336621) @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= xf86-input-keyboard -PORTVERSION= 1.7.0 +PORTVERSION= 1.8.0 CATEGORIES= x11-drivers MAINTAINER= x11@FreeBSD.org @@ -9,7 +9,5 @@ COMMENT= X.Org keyboard input driver XORG_CAT= driver USE_XORG= kbproto -MAN4= kbd.4x -NO_STAGE= yes .include Modified: head/x11-drivers/xf86-input-keyboard/distinfo ============================================================================== --- head/x11-drivers/xf86-input-keyboard/distinfo Mon Dec 16 11:09:21 2013 (r336620) +++ head/x11-drivers/xf86-input-keyboard/distinfo Mon Dec 16 11:11:09 2013 (r336621) @@ -1,2 +1,2 @@ -SHA256 (xorg/driver/xf86-input-keyboard-1.7.0.tar.bz2) = 0cd5e2845149c7f0e19ec830c6914b7f3d154bff134ce84519e39f16ce65523c -SIZE (xorg/driver/xf86-input-keyboard-1.7.0.tar.bz2) = 319043 +SHA256 (xorg/driver/xf86-input-keyboard-1.8.0.tar.bz2) = 41c51c4e0a87aad6a1c4973c68a8de23b61162d0223f4ab36c627c307830cb5b +SIZE (xorg/driver/xf86-input-keyboard-1.8.0.tar.bz2) = 323838 Added: head/x11-drivers/xf86-input-keyboard/files/patch-src__bsd_kbd.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/x11-drivers/xf86-input-keyboard/files/patch-src__bsd_kbd.c Mon Dec 16 11:11:09 2013 (r336621) @@ -0,0 +1,14 @@ +Index: src/bsd_kbd.c +@@ -205,6 +205,12 @@ + #endif + } + } ++/* ++ * Switch keyboards which are not attached to console in RAW mode ++ */ ++#if defined (SYSCONS_SUPPORT) || defined (PCVT_SUPPORT) ++ ioctl(pInfo->fd, KDSKBMODE, K_RAW); ++#endif + return Success; + } + Added: head/x11-drivers/xf86-input-keyboard/files/patch-src__kbd.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/x11-drivers/xf86-input-keyboard/files/patch-src__kbd.c Mon Dec 16 11:11:09 2013 (r336621) @@ -0,0 +1,24 @@ +Index: src/kbd.c +@@ -25,6 +25,7 @@ + + #include "xf86.h" + #include "atKeynames.h" ++#include "xf86Priv.h" + #include "xf86Privstr.h" + + #include +@@ -392,6 +393,14 @@ + RemoveEnabledDevice(pInfo->fd); + pKbd->KbdOff(pInfo, what); + device->public.on = FALSE; ++ /* ++ * Close device file for keyboards which are not attached ++ * to console, otherwise they can't be opened again after ++ * relogin when using session manager like xdm. ++ * X server will take care about console attached keyboards. ++ */ ++ if (pInfo->fd != xf86Info.consoleFd) ++ close(pInfo->fd); + break; + + default: Modified: head/x11-drivers/xf86-input-keyboard/pkg-plist ============================================================================== --- head/x11-drivers/xf86-input-keyboard/pkg-plist Mon Dec 16 11:09:21 2013 (r336620) +++ head/x11-drivers/xf86-input-keyboard/pkg-plist Mon Dec 16 11:11:09 2013 (r336621) @@ -1,5 +1,6 @@ lib/xorg/modules/input/kbd_drv.la lib/xorg/modules/input/kbd_drv.so +man/man4/kbd.4x.gz @dirrmtry lib/xorg/modules/input @dirrmtry lib/xorg/modules @dirrmtry lib/xorg Modified: head/x11-drivers/xf86-input-magictouch/Makefile ============================================================================== --- head/x11-drivers/xf86-input-magictouch/Makefile Mon Dec 16 11:09:21 2013 (r336620) +++ head/x11-drivers/xf86-input-magictouch/Makefile Mon Dec 16 11:11:09 2013 (r336621) @@ -8,11 +8,13 @@ CATEGORIES= x11-drivers MAINTAINER= x11@FreeBSD.org COMMENT= X.Org magictouch input driver +.include + +.if defined(WITH_NEW_XORG) IGNORE= needs xf86_ansic.h which doesn't exist with recent xserver +.endif XORG_CAT= driver -MAN4= magictouch.4x USE_AUTOTOOLS= libtool -NO_STAGE= yes .include Modified: head/x11-drivers/xf86-input-magictouch/pkg-plist ============================================================================== --- head/x11-drivers/xf86-input-magictouch/pkg-plist Mon Dec 16 11:09:21 2013 (r336620) +++ head/x11-drivers/xf86-input-magictouch/pkg-plist Mon Dec 16 11:11:09 2013 (r336621) @@ -1,6 +1,7 @@ lib/xorg/modules/input/magictouch_drv.a lib/xorg/modules/input/magictouch_drv.la lib/xorg/modules/input/magictouch_drv.so +man/man4/magictouch.4x.gz @dirrmtry lib/xorg/modules/input @dirrmtry lib/xorg/modules @dirrmtry lib/xorg Modified: head/x11-drivers/xf86-input-mouse/Makefile ============================================================================== --- head/x11-drivers/xf86-input-mouse/Makefile Mon Dec 16 11:09:21 2013 (r336620) +++ head/x11-drivers/xf86-input-mouse/Makefile Mon Dec 16 11:11:09 2013 (r336621) @@ -2,6 +2,7 @@ PORTNAME= xf86-input-mouse PORTVERSION= 1.9.0 +PORTREVISION= 1 CATEGORIES= x11-drivers MAINTAINER= x11@FreeBSD.org @@ -9,7 +10,5 @@ COMMENT= X.Org mouse input driver XORG_CAT= driver USES= pathfix -MAN4= mousedrv.4x -NO_STAGE= yes .include Modified: head/x11-drivers/xf86-input-mouse/pkg-plist ============================================================================== --- head/x11-drivers/xf86-input-mouse/pkg-plist Mon Dec 16 11:09:21 2013 (r336620) +++ head/x11-drivers/xf86-input-mouse/pkg-plist Mon Dec 16 11:11:09 2013 (r336621) @@ -2,6 +2,7 @@ include/xorg/xf86-mouse-properties.h lib/xorg/modules/input/mouse_drv.la lib/xorg/modules/input/mouse_drv.so libdata/pkgconfig/xorg-mouse.pc +man/man4/mousedrv.4x.gz @dirrmtry lib/xorg/modules/input @dirrmtry lib/xorg/modules @dirrmtry lib/xorg Modified: head/x11-drivers/xf86-input-mutouch/Makefile ============================================================================== --- head/x11-drivers/xf86-input-mutouch/Makefile Mon Dec 16 11:09:21 2013 (r336620) +++ head/x11-drivers/xf86-input-mutouch/Makefile Mon Dec 16 11:11:09 2013 (r336621) @@ -8,13 +8,11 @@ MAINTAINER= x11@FreeBSD.org COMMENT= X.Org mutouch input driver XORG_CAT= driver -MAN4= mutouch.4x + +.include .if !defined(WITH_NEW_XORG) IGNORE= does not build with xorg-server 1.7.7 -.else - .endif -NO_STAGE= yes .include Modified: head/x11-drivers/xf86-input-mutouch/pkg-plist ============================================================================== --- head/x11-drivers/xf86-input-mutouch/pkg-plist Mon Dec 16 11:09:21 2013 (r336620) +++ head/x11-drivers/xf86-input-mutouch/pkg-plist Mon Dec 16 11:11:09 2013 (r336621) @@ -1,5 +1,6 @@ lib/xorg/modules/input/mutouch_drv.la lib/xorg/modules/input/mutouch_drv.so +man/man4/mutouch.4x.gz @dirrmtry lib/xorg/modules/input @dirrmtry lib/xorg/modules @dirrmtry lib/xorg Modified: head/x11-drivers/xf86-input-penmount/Makefile ============================================================================== --- head/x11-drivers/xf86-input-penmount/Makefile Mon Dec 16 11:09:21 2013 (r336620) +++ head/x11-drivers/xf86-input-penmount/Makefile Mon Dec 16 11:11:09 2013 (r336621) @@ -9,7 +9,8 @@ MAINTAINER= x11@FreeBSD.org COMMENT= X.Org penmount input driver XORG_CAT= driver -MAN4= penmount.4x + +.include .if defined(WITH_NEW_XORG) PEN_VERSION= 1.5.0 @@ -19,5 +20,4 @@ PEN_VERSION= 1.4.1 PEN_REVISION= 1 .endif -NO_STAGE= yes .include Modified: head/x11-drivers/xf86-input-penmount/pkg-plist ============================================================================== --- head/x11-drivers/xf86-input-penmount/pkg-plist Mon Dec 16 11:09:21 2013 (r336620) +++ head/x11-drivers/xf86-input-penmount/pkg-plist Mon Dec 16 11:11:09 2013 (r336621) @@ -1,5 +1,6 @@ lib/xorg/modules/input/penmount_drv.la lib/xorg/modules/input/penmount_drv.so +man/man4/penmount.4x.gz @dirrmtry lib/xorg/modules/input @dirrmtry lib/xorg/modules @dirrmtry lib/xorg Modified: head/x11-drivers/xf86-input-synaptics/Makefile ============================================================================== --- head/x11-drivers/xf86-input-synaptics/Makefile Mon Dec 16 11:09:21 2013 (r336620) +++ head/x11-drivers/xf86-input-synaptics/Makefile Mon Dec 16 11:11:09 2013 (r336621) @@ -10,29 +10,12 @@ COMMENT= X.Org synaptics input driver CONFLICTS= synaptics-[0-9]* -OPTIONS_DEFINE= HAL -OPTIONS_DEFAULT=HAL - -NO_STAGE= yes -.include - USES= pathfix USE_XORG= x11 xtst XORG_CAT= driver -.if ${PORT_OPTIONS:MHAL} -PLIST_SUB+= HAL="" -LIB_DEPENDS+= hal.1:${PORTSDIR}/sysutils/hal -.else -PLIST_SUB+= HAL="@comment " -.endif - -MAN1= syndaemon.1 \ - synclient.1 -MAN4= synaptics.4x - .if defined(WITH_NEW_XORG) -SYNAPTICS_VERSION= 1.7.1 +SYNAPTICS_VERSION= 1.7.2 *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** From owner-svn-ports-head@FreeBSD.ORG Mon Dec 16 11:16:43 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id DD1A3BDB; Mon, 16 Dec 2013 11:16:42 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id B3FA815D6; Mon, 16 Dec 2013 11:16:42 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBGBGg4E000564; Mon, 16 Dec 2013 11:16:42 GMT (envelope-from bapt@svn.freebsd.org) Received: (from bapt@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBGBGfcC000560; Mon, 16 Dec 2013 11:16:41 GMT (envelope-from bapt@svn.freebsd.org) Message-Id: <201312161116.rBGBGfcC000560@svn.freebsd.org> From: Baptiste Daroussin Date: Mon, 16 Dec 2013 11:16:41 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r336622 - in head/ports-mgmt: pkg pkg-devel pkg-devel/files pkg/files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 16 Dec 2013 11:16:43 -0000 Author: bapt Date: Mon Dec 16 11:16:41 2013 New Revision: 336622 URL: http://svnweb.freebsd.org/changeset/ports/336622 Log: Fix sefault while cleaning up It only happens if one has list or key/value list in pkg.conf a workaround to update is to comment it out the time to upgrade Reported by: many Pointyhat to: bapt (again) Added: head/ports-mgmt/pkg-devel/files/patch-libpkg_pkg_config (contents, props changed) head/ports-mgmt/pkg/files/patch-libpkg_pkg_config (contents, props changed) Modified: head/ports-mgmt/pkg-devel/Makefile head/ports-mgmt/pkg/Makefile Modified: head/ports-mgmt/pkg-devel/Makefile ============================================================================== --- head/ports-mgmt/pkg-devel/Makefile Mon Dec 16 11:11:09 2013 (r336621) +++ head/ports-mgmt/pkg-devel/Makefile Mon Dec 16 11:16:41 2013 (r336622) @@ -2,6 +2,7 @@ PORTNAME= pkg DISTVERSION= 1.2.4 +PORTREVISION= 1 CATEGORIES= ports-mgmt MASTER_SITES= http://files.etoilebsd.net/pkg/ \ http://mirror.shatow.net/freebsd/${PORTNAME}/ \ Added: head/ports-mgmt/pkg-devel/files/patch-libpkg_pkg_config ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/ports-mgmt/pkg-devel/files/patch-libpkg_pkg_config Mon Dec 16 11:16:41 2013 (r336622) @@ -0,0 +1,28 @@ +--- libpkg/pkg_config.c.orig 2013-12-16 08:52:39.000000000 +0100 ++++ libpkg/pkg_config.c 2013-12-16 12:09:13.093549000 +0100 +@@ -293,6 +293,7 @@ + static size_t c_size = sizeof(c) / sizeof(struct config_entry); + + static void pkg_config_kv_free(struct pkg_config_kv *); ++static void pkg_config_value_free(struct pkg_config_value *); + static void pkg_config_free(struct pkg_config *conf); + static struct pkg_repo *pkg_repo_new(const char *name, const char *url); + +@@ -440,7 +441,7 @@ + continue; + } + if (!conf->fromenv) { +- pkg_config_free(conf); ++ HASH_FREE(conf->list, pkg_config_value, pkg_config_value_free); + conf->list = NULL; + obj_walk_array(cur, conf); + } +@@ -452,7 +453,7 @@ + continue; + } + if (!conf->fromenv) { +- pkg_config_free(conf); ++ HASH_FREE(conf->kvlist, pkg_config_kv, pkg_config_kv_free); + conf->kvlist = NULL; + obj_walk_object(cur, conf); + } Modified: head/ports-mgmt/pkg/Makefile ============================================================================== --- head/ports-mgmt/pkg/Makefile Mon Dec 16 11:11:09 2013 (r336621) +++ head/ports-mgmt/pkg/Makefile Mon Dec 16 11:16:41 2013 (r336622) @@ -2,6 +2,7 @@ PORTNAME= pkg DISTVERSION= 1.2.4 +PORTREVISION= 1 CATEGORIES= ports-mgmt MASTER_SITES= http://files.etoilebsd.net/pkg/ \ http://mirror.shatow.net/freebsd/${PORTNAME}/ \ Added: head/ports-mgmt/pkg/files/patch-libpkg_pkg_config ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/ports-mgmt/pkg/files/patch-libpkg_pkg_config Mon Dec 16 11:16:41 2013 (r336622) @@ -0,0 +1,28 @@ +--- libpkg/pkg_config.c.orig 2013-12-16 08:52:39.000000000 +0100 ++++ libpkg/pkg_config.c 2013-12-16 12:09:13.093549000 +0100 +@@ -293,6 +293,7 @@ + static size_t c_size = sizeof(c) / sizeof(struct config_entry); + + static void pkg_config_kv_free(struct pkg_config_kv *); ++static void pkg_config_value_free(struct pkg_config_value *); + static void pkg_config_free(struct pkg_config *conf); + static struct pkg_repo *pkg_repo_new(const char *name, const char *url); + +@@ -440,7 +441,7 @@ + continue; + } + if (!conf->fromenv) { +- pkg_config_free(conf); ++ HASH_FREE(conf->list, pkg_config_value, pkg_config_value_free); + conf->list = NULL; + obj_walk_array(cur, conf); + } +@@ -452,7 +453,7 @@ + continue; + } + if (!conf->fromenv) { +- pkg_config_free(conf); ++ HASH_FREE(conf->kvlist, pkg_config_kv, pkg_config_kv_free); + conf->kvlist = NULL; + obj_walk_object(cur, conf); + } From owner-svn-ports-head@FreeBSD.ORG Mon Dec 16 11:17:43 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 45EB2CD3; Mon, 16 Dec 2013 11:17:43 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 2623915EA; Mon, 16 Dec 2013 11:17:43 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBGBHhG7000744; Mon, 16 Dec 2013 11:17:43 GMT (envelope-from amdmi3@svn.freebsd.org) Received: (from amdmi3@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBGBHgZC000742; Mon, 16 Dec 2013 11:17:42 GMT (envelope-from amdmi3@svn.freebsd.org) Message-Id: <201312161117.rBGBHgZC000742@svn.freebsd.org> From: Dmitry Marakasov Date: Mon, 16 Dec 2013 11:17:42 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r336623 - head/games/instead X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 16 Dec 2013 11:17:43 -0000 Author: amdmi3 Date: Mon Dec 16 11:17:42 2013 New Revision: 336623 URL: http://svnweb.freebsd.org/changeset/ports/336623 Log: - Support staging - Convert USE_GMAKE to USES - Suppport new OPTIONS features - Fix build when both sdl12 and sdl2 installed and add OPTIONS to choose SDL version to use Modified: head/games/instead/Makefile head/games/instead/pkg-plist Modified: head/games/instead/Makefile ============================================================================== --- head/games/instead/Makefile Mon Dec 16 11:16:41 2013 (r336622) +++ head/games/instead/Makefile Mon Dec 16 11:17:42 2013 (r336623) @@ -3,6 +3,7 @@ PORTNAME= instead PORTVERSION= 1.9.1 +PORTREVISION= 1 CATEGORIES= games MASTER_SITES= SF/instead/instead/${PORTVERSION}/ \ http://mirror.amdmi3.ru/distfiles/ @@ -12,27 +13,40 @@ MAINTAINER= amdmi3@FreeBSD.org COMMENT= Simple Text Adventure, The Interpreter HAS_CONFIGURE= yes -USE_GMAKE= yes +USES= pkgconfig iconv gmake USE_GNOME= gtk20 USE_LUA= 5.1 -USE_SDL= sdl image ttf mixer -USES= pkgconfig iconv LDFLAGS+= -L${LOCALBASE}/lib ${ICONV_LIB} CONFIGURE_SCRIPT= configure.sh CONFIGURE_ENV= PREFIX="${PREFIX}" WRKSRC= ${WRKDIR}/instead-${PORTVERSION} -MAN6= instead.6 PORTDOCS= * +PORTDATA= * + +OPTIONS_DEFINE= DOCS +OPTIONS_DEFAULT=SDL +OPTIONS_SINGLE= SDL_VERSION +OPTIONS_SINGLE_SDL_VERSION= SDL SDL2 + +SDL_VERSION_DESC=SDL version +SDL_DESC= Use SDL 1.2 +SDL2_DESC= Use SDL 2.0 -NO_STAGE= yes .include -.if ! ${PORT_OPTIONS:MDOCS} +.if ${PORT_OPTIONS:MSDL2} +USE_SDL= sdl2 image2 ttf2 mixer2 + +post-patch: + @${REINPLACE_CMD} -e 's|sdl-config|&-nonexistent|' ${WRKSRC}/configure.sh +.else +USE_SDL= sdl image ttf mixer + post-patch: - @${REINPLACE_CMD} -e '/INSTALL.*DOCPATH/ d' ${WRKSRC}/doc/Makefile + @${REINPLACE_CMD} -e 's|sdl2-config|&-nonexistent|' ${WRKSRC}/configure.sh .endif .include Modified: head/games/instead/pkg-plist ============================================================================== --- head/games/instead/pkg-plist Mon Dec 16 11:16:41 2013 (r336622) +++ head/games/instead/pkg-plist Mon Dec 16 11:17:42 2013 (r336623) @@ -1,113 +1,7 @@ bin/instead bin/sdl-instead +man/man6/instead.6.gz share/applications/instead.desktop -%%DATADIR%%/games/tutorial3/br.png -%%DATADIR%%/games/tutorial3/es.png -%%DATADIR%%/games/tutorial3/gb.png -%%DATADIR%%/games/tutorial3/instead.ogg -%%DATADIR%%/games/tutorial3/instead.png -%%DATADIR%%/games/tutorial3/it.png -%%DATADIR%%/games/tutorial3/main-en.lua -%%DATADIR%%/games/tutorial3/main-es.lua -%%DATADIR%%/games/tutorial3/main-it.lua -%%DATADIR%%/games/tutorial3/main-pt.lua -%%DATADIR%%/games/tutorial3/main-ru.lua -%%DATADIR%%/games/tutorial3/main-ua.lua -%%DATADIR%%/games/tutorial3/main.lua -%%DATADIR%%/games/tutorial3/ru.png -%%DATADIR%%/games/tutorial3/ua.png -%%DATADIR%%/lang/en.ini -%%DATADIR%%/lang/es.ini -%%DATADIR%%/lang/it.ini -%%DATADIR%%/lang/pt.ini -%%DATADIR%%/lang/ru.ini -%%DATADIR%%/lang/ua.ini -%%DATADIR%%/stead/click.lua -%%DATADIR%%/stead/counters.lua -%%DATADIR%%/stead/dash.lua -%%DATADIR%%/stead/dbg.lua -%%DATADIR%%/stead/dlg.lua -%%DATADIR%%/stead/format.lua -%%DATADIR%%/stead/gui.lua -%%DATADIR%%/stead/hideinv.lua -%%DATADIR%%/stead/hotkeys.lua -%%DATADIR%%/stead/input.lua -%%DATADIR%%/stead/kbd.lua -%%DATADIR%%/stead/nolife.lua -%%DATADIR%%/stead/nouse.lua -%%DATADIR%%/stead/object.lua -%%DATADIR%%/stead/para.lua -%%DATADIR%%/stead/prefs.lua -%%DATADIR%%/stead/proxymenu.lua -%%DATADIR%%/stead/quotes.lua -%%DATADIR%%/stead/snapshots.lua -%%DATADIR%%/stead/sound.lua -%%DATADIR%%/stead/sprites.lua -%%DATADIR%%/stead/stead.lua -%%DATADIR%%/stead/theme.lua -%%DATADIR%%/stead/timer.lua -%%DATADIR%%/stead/vars.lua -%%DATADIR%%/stead/walk.lua -%%DATADIR%%/stead/wroom.lua -%%DATADIR%%/stead/xact.lua -%%DATADIR%%/themes/arctic/adown.png -%%DATADIR%%/themes/arctic/aup.png -%%DATADIR%%/themes/arctic/bg.png -%%DATADIR%%/themes/arctic/cursor-use.png -%%DATADIR%%/themes/arctic/cursor.png -%%DATADIR%%/themes/arctic/menu.png -%%DATADIR%%/themes/arctic/theme.ini -%%DATADIR%%/themes/bluesteel/bg.png -%%DATADIR%%/themes/bluesteel/cursor-use.png -%%DATADIR%%/themes/bluesteel/cursor.png -%%DATADIR%%/themes/bluesteel/downarrow.png -%%DATADIR%%/themes/bluesteel/menu.png -%%DATADIR%%/themes/bluesteel/theme.ini -%%DATADIR%%/themes/bluesteel/uparrow.png -%%DATADIR%%/themes/book/book.png -%%DATADIR%%/themes/book/theme.ini -%%DATADIR%%/themes/clearlooks/adown.png -%%DATADIR%%/themes/clearlooks/aup.png -%%DATADIR%%/themes/clearlooks/bg.jpg -%%DATADIR%%/themes/clearlooks/cursor-use.png -%%DATADIR%%/themes/clearlooks/cursor.png -%%DATADIR%%/themes/clearlooks/menu.png -%%DATADIR%%/themes/clearlooks/theme.ini -%%DATADIR%%/themes/default/adown.png -%%DATADIR%%/themes/default/aup.png -%%DATADIR%%/themes/default/bg.png -%%DATADIR%%/themes/default/click.ogg -%%DATADIR%%/themes/default/click.wav -%%DATADIR%%/themes/default/cursor-use.png -%%DATADIR%%/themes/default/cursor.png -%%DATADIR%%/themes/default/menu.png -%%DATADIR%%/themes/default/sans-b.ttf -%%DATADIR%%/themes/default/sans-bi.ttf -%%DATADIR%%/themes/default/sans-i.ttf -%%DATADIR%%/themes/default/sans.ttf -%%DATADIR%%/themes/default/theme.ini -%%DATADIR%%/themes/default/use.png -%%DATADIR%%/themes/fantasy/bg.png -%%DATADIR%%/themes/fantasy/down.png -%%DATADIR%%/themes/fantasy/menu.png -%%DATADIR%%/themes/fantasy/theme.ini -%%DATADIR%%/themes/fantasy/up.png -%%DATADIR%%/themes/original/theme.ini -%%DATADIR%%/themes/wide/theme.ini share/pixmaps/sdl_instead.ico share/pixmaps/sdl_instead.png share/pixmaps/sdl_instead_1.png -@dirrm %%DATADIR%%/themes/wide -@dirrm %%DATADIR%%/themes/original -@dirrm %%DATADIR%%/themes/fantasy -@dirrm %%DATADIR%%/themes/default -@dirrm %%DATADIR%%/themes/clearlooks -@dirrm %%DATADIR%%/themes/book -@dirrm %%DATADIR%%/themes/bluesteel -@dirrm %%DATADIR%%/themes/arctic -@dirrm %%DATADIR%%/themes -@dirrm %%DATADIR%%/stead -@dirrm %%DATADIR%%/lang -@dirrm %%DATADIR%%/games/tutorial3 -@dirrm %%DATADIR%%/games -@dirrm %%DATADIR%% From owner-svn-ports-head@FreeBSD.ORG Mon Dec 16 11:22:31 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 00DD7188; Mon, 16 Dec 2013 11:22:30 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id DE0FC167B; Mon, 16 Dec 2013 11:22:30 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBGBMU6u004111; Mon, 16 Dec 2013 11:22:30 GMT (envelope-from amdmi3@svn.freebsd.org) Received: (from amdmi3@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBGBMOiT004074; Mon, 16 Dec 2013 11:22:24 GMT (envelope-from amdmi3@svn.freebsd.org) Message-Id: <201312161122.rBGBMOiT004074@svn.freebsd.org> From: Dmitry Marakasov Date: Mon, 16 Dec 2013 11:22:24 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r336624 - in head/games/spring: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 16 Dec 2013 11:22:31 -0000 Author: amdmi3 Date: Mon Dec 16 11:22:24 2013 New Revision: 336624 URL: http://svnweb.freebsd.org/changeset/ports/336624 Log: - Update to 94.1 - Unbreak - Support staging - Use new LIB_DEPENDS syntax Added: head/games/spring/files/patch-AI-Skirmish-KAIK-AIClasses.hpp (contents, props changed) head/games/spring/files/patch-AI-Skirmish-KAIK-AttackHandler.cpp (contents, props changed) head/games/spring/files/patch-AI-Skirmish-KAIK-BuildUp.cpp (contents, props changed) head/games/spring/files/patch-AI-Skirmish-KAIK-DGunController.cpp (contents, props changed) head/games/spring/files/patch-AI-Skirmish-KAIK-DefenseMatrix.cpp (contents, props changed) head/games/spring/files/patch-AI-Skirmish-KAIK-KAIK.cpp (contents, props changed) head/games/spring/files/patch-AI-Skirmish-KAIK-Logger.cpp (contents, props changed) head/games/spring/files/patch-AI-Skirmish-KAIK-Logger.h (contents, props changed) head/games/spring/files/patch-AI-Skirmish-KAIK-MetalMap.cpp (contents, props changed) head/games/spring/files/patch-AI-Skirmish-KAIK-Unit.cpp (contents, props changed) head/games/spring/files/patch-CMakeLists.txt (contents, props changed) head/games/spring/files/patch-rts-Rendering-Shaders-ShaderStates.h (contents, props changed) head/games/spring/files/patch-rts-Sim-Misc-DefinitionTag.h (contents, props changed) head/games/spring/files/patch-rts-System-Platform-Linux-CrashHandler.cpp (contents, props changed) head/games/spring/files/patch-rts-System-Platform-Threading.cpp (contents, props changed) head/games/spring/files/patch-rts-System-Rectangle.h (contents, props changed) head/games/spring/files/patch-rts-System-creg-creg.h (contents, props changed) head/games/spring/files/patch-rts-build-cmake-FindAsciiDoc.cmake (contents, props changed) head/games/spring/files/patch-rts-builds-dedicated-CMakeLists.txt (contents, props changed) head/games/spring/files/patch-rts-lib-assimp-code-STEPFile.h (contents, props changed) head/games/spring/files/patch-rts-lib-headlessStubs-CMakeLists.txt (contents, props changed) head/games/spring/files/patch-rts-lib-minizip-CMakeLists.txt (contents, props changed) head/games/spring/files/patch-tools-pr-downloader-src-lib-pugixml-pugixml.hpp (contents, props changed) head/games/spring/files/patch-tools-pr-downloader-src-lib-xmlrpc++-src-base64.h (contents, props changed) Deleted: head/games/spring/files/patch-rts-System-SpringApp.cpp head/games/spring/files/patch-rts-builds-DS-CMakeLists.txt head/games/spring/files/patch-rts-lib-lobby-Connection.h head/games/spring/files/patch-tools-unitsync-unitsync.cpp Modified: head/games/spring/Makefile head/games/spring/distinfo head/games/spring/files/patch-rts-CMakeLists.txt head/games/spring/files/patch-rts-System-Platform-Misc.cpp head/games/spring/files/patch-rts-lib-gml-gmlcls.h head/games/spring/pkg-plist Modified: head/games/spring/Makefile ============================================================================== --- head/games/spring/Makefile Mon Dec 16 11:17:42 2013 (r336623) +++ head/games/spring/Makefile Mon Dec 16 11:22:24 2013 (r336624) @@ -2,19 +2,16 @@ # $FreeBSD$ PORTNAME= spring -PORTVERSION= 0.82.7.1 -PORTREVISION= 3 +PORTVERSION= 94.1 CATEGORIES= games -MASTER_SITES= SF/springrts/springrts/${PORTNAME}-${PORTVERSION} +MASTER_SITES= SF/springrts/springrts/${PORTNAME}-${PORTVERSION} \ + http://springrts.com/dl/ DISTNAME= ${PORTNAME}_${PORTVERSION}_src MAINTAINER= amdmi3@FreeBSD.org COMMENT= A project aiming to create a new and versatile RTS Engine -DEPRECATED= Broken for more than 6 month -EXPIRATION_DATE= 2013-12-22 - -BROKEN= Does not build with recent boost +LICENSE= GPLv2 LIB_DEPENDS= libfreetype.so:${PORTSDIR}/print/freetype2 \ libboost_thread.so:${PORTSDIR}/devel/boost-libs \ @@ -29,52 +26,82 @@ ONLY_FOR_ARCHS_REASON= relies on x86 flo USE_SDL= sdl USE_OPENAL= al -USE_GL= glew +USE_GL= gl glu glew USE_XORG= x11 xcursor USE_LDCONFIG= yes +USE_DOS2UNIX= *.h *.hpp *.cpp -USES= cmake +USES= cmake compiler:c++11-lib CMAKE_ARGS= -DDATADIR:STRING="share/${PORTNAME}" \ - -DMARCH_FLAG:STRING= \ -DAI_TYPES:STRING="NATIVE" \ - -DMANDIR:STRING="man" \ - -DCREATE_MAN_PAGES:BOOL=false + -DDOCDIR:STRING="share/doc/${PORTNAME}" \ + -DCREATE_MAN_PAGES:BOOL=false \ + -DUNITSYNC_PYTHON_WRAPPER:BOOL=false \ + -DCUSTOM_CFLAGS:BOOL=true WRKSRC= ${WRKDIR}/${PORTNAME}_${PORTVERSION} PORTDOCS= * +PORTDATA= * + +OPTIONS_DEFINE= MANPAGES PR_DOWNLOADER DOCS +OPTIONS_DEFAULT=MANPAGES PR_DOWNLOADER +OPTIONS_SUB= * + +HTMLDOCS_DESC= Build and install HTML documentation +PR_DOWNLOADER_DESC= Map and game downloader + +MANPAGES_CMAKE_ON= -DCREATE_MAN_PAGES:BOOL=true -DMANDIR:STRING="man" +MANPAGES_CMAKE_OFF= -DCREATE_MAN_PAGES:BOOL=false +MANPAGES_BUILD_DEPENDS= 7z:${PORTSDIR}/archivers/p7zip \ + asciidoc:${PORTSDIR}/textproc/asciidoc \ + xsltproc:${PORTSDIR}/textproc/libxslt \ + ${LOCALBASE}/share/xsl/docbook/manpages/docbook.xsl:${PORTSDIR}/textproc/docbook-xsl \ + bash:${PORTSDIR}/shells/bash +MANPAGES_DOCS_ON= -DUSERDOCS_PLAIN:BOOL=true +MANPAGES_DOCS_OFF= -DUSERDOCS_PLAIN:BOOL=false + +PR_DOWNLOADER_LIB_DEPENDS=libcurl.so:${PORTSDIR}/ftp/curl -NO_STAGE= yes -.include +.include + +.if ${ARCH} == "i386" +BROKEN= does not build on i386 (undefined reference to __sync_fetch_and_add_8) +.endif .if defined(WITH_SYNC_DEBUG) CFLAGS= # empty CXXFLAGS= # empty CMAKE_ARGS+= -DTRACE_SYNC=true -DSYNCDEBUG=true -CMAKE_BUILD_TYPE= DEBUG2 +CMAKE_BUILD_TYPE=DEBUG2 +.endif + +.if ! ${PORT_OPTIONS:MPR_DOWNLOADER} +post-extract: + @${RM} ${WRKSRC}/tools/pr-downloader/CMakeLists.txt .endif post-patch: - @${REINPLACE_CMD} -E -e '/FIND_PACKAGE.*(Python|JNI)/ d' \ - ${WRKSRC}/tools/unitsync/CMakeLists.txt - @${REINPLACE_CMD} -e 's|/etc/\(spring/datadir\)|${PREFIX}/\1|g; \ - /AddDirs.*GetBinaryPath/ d' \ + @${REINPLACE_CMD} -e 's|-O2||' ${WRKSRC}/CMakeLists.txt + @${REINPLACE_CMD} -e 's|/etc/\(spring/datadir\)|${PREFIX}/\1|g' \ ${WRKSRC}/rts/System/FileSystem/DataDirLocater.cpp @${REINPLACE_CMD} -e 's|x1F3F|x0F3F|g' \ - ${WRKSRC}/rts/System/FPUCheck.h + ${WRKSRC}/rts/System/Sync/FPUCheck.cpp @${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g' \ ${WRKSRC}/rts/build/cmake/*.cmake @${REINPLACE_CMD} -e 's|execinfo|${LOCALBASE}/lib/libexecinfo.so|' \ - ${WRKSRC}/rts/CMakeLists.txt + ${WRKSRC}/rts/CMakeLists.txt \ + ${WRKSRC}/rts/builds/dedicated/CMakeLists.txt @${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|' \ ${WRKSRC}/rts/System/Platform/Misc.cpp - -post-install: -.if ${PORT_OPTIONS:MDOCS} - ${MKDIR} ${DOCSDIR} - cd ${WRKSRC}/doc && ${COPYTREE_SHARE} "userdocs DevGuide.html HowTo* \ - SelectionKeys.txt StartScriptFormat.txt changelog.txt" ${DOCSDIR}/ + @${REINPLACE_CMD} -e 's|/bin/bash|${LOCALBASE}&|' \ + ${WRKSRC}/doc/manpages/make_manpages.sh +.if ! ${PORT_OPTIONS:MMANPAGES} + @${REINPLACE_CMD} -e '/set(CREATE_MAN_PAGES)/ d' \ + ${WRKSRC}/doc/CMakeLists.txt .endif - @${ECHO_CMD}; ${CAT} ${PKGMESSAGE}; ${ECHO_CMD} -.include +pre-build: + cd ${WRKSRC} && ${MAKE} generateVersionFiles + +.include Modified: head/games/spring/distinfo ============================================================================== --- head/games/spring/distinfo Mon Dec 16 11:17:42 2013 (r336623) +++ head/games/spring/distinfo Mon Dec 16 11:22:24 2013 (r336624) @@ -1,2 +1,2 @@ -SHA256 (spring_0.82.7.1_src.tar.gz) = 24a02b9489a52d96bc78899dda577e05ab24933f501ea50b504ae197777fde74 -SIZE (spring_0.82.7.1_src.tar.gz) = 11277409 +SHA256 (spring_94.1_src.tar.gz) = 26da7271baa8b3dd57022541d98e6a4841084d749788b698c4f8a914cf9e7004 +SIZE (spring_94.1_src.tar.gz) = 11793404 Added: head/games/spring/files/patch-AI-Skirmish-KAIK-AIClasses.hpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/games/spring/files/patch-AI-Skirmish-KAIK-AIClasses.hpp Mon Dec 16 11:22:24 2013 (r336624) @@ -0,0 +1,11 @@ +--- AI/Skirmish/KAIK/AIClasses.hpp.orig 2013-03-26 03:58:45.000000000 +0400 ++++ AI/Skirmish/KAIK/AIClasses.hpp 2013-11-11 03:13:58.779774182 +0400 +@@ -111,7 +111,7 @@ + #define math GetMathHandler() + #define pather GetPathFinder() + #define ut GetUnitTable() +-#define tm GetThreatMap() ++#define thm GetThreatMap() + #define uh GetUnitHandler() + #define dm GetDefenseMatrix() + #define ah GetAttackHandler() Added: head/games/spring/files/patch-AI-Skirmish-KAIK-AttackHandler.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/games/spring/files/patch-AI-Skirmish-KAIK-AttackHandler.cpp Mon Dec 16 11:22:24 2013 (r336624) @@ -0,0 +1,28 @@ +--- AI/Skirmish/KAIK/AttackHandler.cpp.orig 2013-03-26 03:58:45.000000000 +0400 ++++ AI/Skirmish/KAIK/AttackHandler.cpp 2013-11-11 03:16:31.073773664 +0400 +@@ -829,9 +829,9 @@ + + ai->pather->micropather->SetMapData( + ai->pather->MoveArrays[group_in->GetWorstMoveType()], +- ai->tm->GetThreatArray(), +- ai->tm->GetThreatMapWidth(), +- ai->tm->GetThreatMapHeight() ++ ai->thm->GetThreatArray(), ++ ai->thm->GetThreatMapWidth(), ++ ai->thm->GetThreatMapHeight() + ); + + +@@ -930,9 +930,9 @@ + // in each group (movement map PATHTOUSE is hack) + ai->pather->micropather->SetMapData( + ai->pather->MoveArrays[PATHTOUSE], +- ai->tm->GetThreatArray(), +- ai->tm->GetThreatMapWidth(), +- ai->tm->GetThreatMapHeight() ++ ai->thm->GetThreatArray(), ++ ai->thm->GetThreatMapWidth(), ++ ai->thm->GetThreatMapHeight() + ); + + // calculate and draw k-means for the base perimeters every 10 seconds Added: head/games/spring/files/patch-AI-Skirmish-KAIK-BuildUp.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/games/spring/files/patch-AI-Skirmish-KAIK-BuildUp.cpp Mon Dec 16 11:22:24 2013 (r336624) @@ -0,0 +1,11 @@ +--- AI/Skirmish/KAIK/BuildUp.cpp.orig 2013-03-26 03:58:45.000000000 +0400 ++++ AI/Skirmish/KAIK/BuildUp.cpp 2013-11-11 03:15:30.794774021 +0400 +@@ -32,7 +32,7 @@ + void CBuildUp::Update(int frame) { + if (frame % 15 == 0) { + // update current threat map +- ai->tm->Update(); ++ ai->thm->Update(); + ai->uh->UpdateUpgradeTasks(frame); + + GetEconState(&econState); Added: head/games/spring/files/patch-AI-Skirmish-KAIK-DGunController.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/games/spring/files/patch-AI-Skirmish-KAIK-DGunController.cpp Mon Dec 16 11:22:24 2013 (r336624) @@ -0,0 +1,11 @@ +--- AI/Skirmish/KAIK/DGunController.cpp.orig 2013-03-26 03:58:45.000000000 +0400 ++++ AI/Skirmish/KAIK/DGunController.cpp 2013-11-11 03:17:24.007772549 +0400 +@@ -166,7 +166,7 @@ + if (canDGun) { + IssueOrder(dgunPos, CMD_DGUN, 0); + } else { +- bool bDanger = ai->tm->ThreatAtThisPoint(commanderPos/*curTargetPos*/) > ai->tm->GetAverageThreat(); ++ bool bDanger = ai->thm->ThreatAtThisPoint(commanderPos/*curTargetPos*/) > ai->thm->GetAverageThreat(); + + if (bDanger) { + state.Reset(currentFrame, true); Added: head/games/spring/files/patch-AI-Skirmish-KAIK-DefenseMatrix.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/games/spring/files/patch-AI-Skirmish-KAIK-DefenseMatrix.cpp Mon Dec 16 11:22:24 2013 (r336624) @@ -0,0 +1,38 @@ +--- AI/Skirmish/KAIK/DefenseMatrix.cpp.orig 2013-03-26 03:58:45.000000000 +0400 ++++ AI/Skirmish/KAIK/DefenseMatrix.cpp 2013-11-11 03:16:52.800773805 +0400 +@@ -84,7 +84,7 @@ + int y = (int) (builderpos.z / f3multiplier); + float fastSumMap = sumMap[y * ai->pather->PathMapXSize + x]; + float3 spotpos = float3(x * f3multiplier, 0, y * f3multiplier); +- float myscore = fastSumMap / (builderpos.distance2D(spotpos) + averagemapsize / 8) * ((ai->pather->HeightMap[y * ai->pather->PathMapXSize + x] + 200) / (ai->pather->AverageHeight + 10)) / (ai->tm->ThreatAtThisPoint(spotpos) + 0.01); ++ float myscore = fastSumMap / (builderpos.distance2D(spotpos) + averagemapsize / 8) * ((ai->pather->HeightMap[y * ai->pather->PathMapXSize + x] + 200) / (ai->pather->AverageHeight + 10)) / (ai->thm->ThreatAtThisPoint(spotpos) + 0.01); + bestscore_fast = myscore; + bestspotx_fast = x; + bestspoty_fast = y; +@@ -131,7 +131,7 @@ + + float3 bestPosibleSpotpos = float3(bestX * f3multiplier, 0, bestY * f3multiplier); + // this must be guessed, set it to the best possible (slow) +- float bestThreatAtThisPoint = 0.01 + ai->tm->GetAverageThreat() - 1; ++ float bestThreatAtThisPoint = 0.01 + ai->thm->GetAverageThreat() - 1; + float bestDistance = builderpos.distance2D(bestPosibleSpotpos); + float bestHeight = ai->pather->HeightMap[cachePoint->y * ai->pather->PathMapXSize + cachePoint->x] + 200; + float bestPosibleMyScore = bestScoreInThisBox / (bestDistance + averagemapsize / 4) * (bestHeight + 200) / bestThreatAtThisPoint; +@@ -145,7 +145,7 @@ + for (int sy = y * CACHEFACTOR; sy < ai->pather->PathMapYSize && sy < (y * CACHEFACTOR + CACHEFACTOR); sy++) { + float fastSumMap = sumMap[sy * ai->pather->PathMapXSize + sx]; + float3 spotpos = float3(sx * f3multiplier, 0, sy * f3multiplier); +- float myscore = fastSumMap / (builderpos.distance2D(spotpos) + averagemapsize / 4) * (ai->pather->HeightMap[sy * ai->pather->PathMapXSize + sx]+200) / (ai->tm->ThreatAtThisPoint(spotpos) + 0.01); ++ float myscore = fastSumMap / (builderpos.distance2D(spotpos) + averagemapsize / 4) * (ai->pather->HeightMap[sy * ai->pather->PathMapXSize + sx]+200) / (ai->thm->ThreatAtThisPoint(spotpos) + 0.01); + // THIS COULD BE REALLY SLOW! + if (myscore > bestscore_fast && BuildMaskArray[sy * ai->pather->PathMapXSize + sx] == 0 && ai->cb->CanBuildAt(def, spotpos)) { + bestscore_fast = myscore; +@@ -199,7 +199,7 @@ + } + + spotFinder->InvalidateSumMap(x, y, Range + 1); +- // ai->debug->MakeBWTGA(Chokepointmap, ai->tm->GetThreatMapWidth(), ai->tm->GetThreatMapHeight(), "DebugPathMatrix", 1); ++ // ai->debug->MakeBWTGA(Chokepointmap, ai->thm->GetThreatMapWidth(), ai->thm->GetThreatMapHeight(), "DebugPathMatrix", 1); + } + + Added: head/games/spring/files/patch-AI-Skirmish-KAIK-KAIK.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/games/spring/files/patch-AI-Skirmish-KAIK-KAIK.cpp Mon Dec 16 11:22:24 2013 (r336624) @@ -0,0 +1,51 @@ +--- AI/Skirmish/KAIK/KAIK.cpp.orig 2013-03-26 03:58:45.000000000 +0400 ++++ AI/Skirmish/KAIK/KAIK.cpp 2013-11-11 03:15:53.601773605 +0400 +@@ -194,13 +194,13 @@ + void CKAIK::EnemyDestroyed(int enemyUnitID, int attackerUnitID) { + if (ai->Initialized()) { + ai->dgunConHandler->NotifyEnemyDestroyed(enemyUnitID, attackerUnitID); +- ai->tm->EnemyDestroyed(enemyUnitID, attackerUnitID); ++ ai->thm->EnemyDestroyed(enemyUnitID, attackerUnitID); + } + } + + void CKAIK::EnemyDamaged(int enemyUnitID, int attackerUnitID, float damage, float3 dir) { + if (ai->Initialized()) { +- ai->tm->EnemyDamaged(enemyUnitID, attackerUnitID); ++ ai->thm->EnemyDamaged(enemyUnitID, attackerUnitID); + + damage = damage; + dir = dir; +@@ -209,12 +209,12 @@ + + void CKAIK::EnemyCreated(int enemyUnitID) { + if (ai->Initialized()) { +- ai->tm->EnemyCreated(enemyUnitID); ++ ai->thm->EnemyCreated(enemyUnitID); + } + } + void CKAIK::EnemyFinished(int enemyUnitID) { + if (ai->Initialized()) { +- ai->tm->EnemyFinished(enemyUnitID); ++ ai->thm->EnemyFinished(enemyUnitID); + } + } + +@@ -229,7 +229,7 @@ + } + + if ((msg = strstr(msg, "ThreatMap::DBG")) != NULL) { +- ai->tm->ToggleVisOverlay(); ++ ai->thm->ToggleVisOverlay(); + } + } + } +@@ -298,7 +298,7 @@ + ai->dgunConHandler->Update(frame); + + if ((frame - ai->InitFrame()) == 1) { +- // ai->tm->Init(); ++ // ai->thm->Init(); + ai->dm->Init(); + } + Added: head/games/spring/files/patch-AI-Skirmish-KAIK-Logger.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/games/spring/files/patch-AI-Skirmish-KAIK-Logger.cpp Mon Dec 16 11:22:24 2013 (r336624) @@ -0,0 +1,12 @@ +--- AI/Skirmish/KAIK/Logger.cpp.orig 2013-03-26 03:58:45.000000000 +0400 ++++ AI/Skirmish/KAIK/Logger.cpp 2013-11-11 03:18:04.431773779 +0400 +@@ -14,8 +14,7 @@ + + time_t now1; + time(&now1); +-//FIXME:compile hack for macosx +-#undef tm ++ + struct tm* now2 = localtime(&now1); + + std::stringstream ss; Added: head/games/spring/files/patch-AI-Skirmish-KAIK-Logger.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/games/spring/files/patch-AI-Skirmish-KAIK-Logger.h Mon Dec 16 11:22:24 2013 (r336624) @@ -0,0 +1,14 @@ +--- AI/Skirmish/KAIK/Logger.h.orig 2013-03-26 03:58:45.000000000 +0400 ++++ AI/Skirmish/KAIK/Logger.h 2013-11-11 04:04:46.414772522 +0400 +@@ -2,10 +2,8 @@ + #define KAIK_LOGGER_HDR + + #include +-//FIXME:compile hack for macosx +-#undef tm + #include +-#define tm GetThreatMap() ++#define thm GetThreatMap() + + namespace springLegacyAI { + class IAICallback; Added: head/games/spring/files/patch-AI-Skirmish-KAIK-MetalMap.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/games/spring/files/patch-AI-Skirmish-KAIK-MetalMap.cpp Mon Dec 16 11:22:24 2013 (r336624) @@ -0,0 +1,20 @@ +--- AI/Skirmish/KAIK/MetalMap.cpp.orig 2013-03-26 03:58:45.000000000 +0400 ++++ AI/Skirmish/KAIK/MetalMap.cpp 2013-11-11 03:17:46.615772673 +0400 +@@ -57,7 +57,7 @@ + + if (spotCoords.x >= 0.0f) { + float distance = spotCoords.distance2D(ai->cb->GetUnitPos(builderid)) + 150; +- float myThreat = ai->tm->ThreatAtThisPoint(spotCoords); ++ float myThreat = ai->thm->ThreatAtThisPoint(spotCoords); + float spotScore = VectoredSpots[i].y / distance / (myThreat + 10); + + // along with threatmap try to search for enemy armed units around cause +@@ -92,7 +92,7 @@ + // by presence of ARMED enemy units or buildings + bool b1 = (TempScore < spotScore); + bool b2 = (numEnemies == 0); +- bool b3 = (myThreat <= (ai->tm->GetAverageThreat() * 1.5)); ++ bool b3 = (myThreat <= (ai->thm->GetAverageThreat() * 1.5)); + bool b4 = (ai->uh->TaskPlanExist(spotCoords, extractor)); + + if (b1 && b2 && b3 && !b4 && !bOccupied) { Added: head/games/spring/files/patch-AI-Skirmish-KAIK-Unit.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/games/spring/files/patch-AI-Skirmish-KAIK-Unit.cpp Mon Dec 16 11:22:24 2013 (r336624) @@ -0,0 +1,48 @@ +--- AI/Skirmish/KAIK/Unit.cpp.orig 2013-03-26 03:58:45.000000000 +0400 ++++ AI/Skirmish/KAIK/Unit.cpp 2013-11-11 03:16:19.873774077 +0400 +@@ -256,7 +256,7 @@ + const FeatureDef* fDef = ai->cb->GetFeatureDef(featureIDs[i]); + const float3& fPos = ai->cb->GetFeaturePos(featureIDs[i]); + const float fDist = fPos.distance2D(ai->cb->GetUnitPos(uid)); +- const float fThreat = ai->tm->ThreatAtThisPoint(fPos); ++ const float fThreat = ai->thm->ThreatAtThisPoint(fPos); + + if (fDef == 0) + continue; +@@ -266,11 +266,11 @@ + continue; + } + +- if (fDef->metal > bestScore && fThreat <= ai->tm->GetAverageThreat()) { ++ if (fDef->metal > bestScore && fThreat <= ai->thm->GetAverageThreat()) { + bestScore = fDef->metal; + bestFeatureID = featureIDs[i]; + } +- else if (bestScore == fDef->metal && fThreat <= ai->tm->GetAverageThreat()) { ++ else if (bestScore == fDef->metal && fThreat <= ai->thm->GetAverageThreat()) { + if (fDist < bestDist) { + bestFeatureID = featureIDs[i]; + bestDist = fDist; +@@ -282,7 +282,7 @@ + const FeatureDef* fDef = ai->cb->GetFeatureDef(featureIDs[i]); + const float3& fPos = ai->cb->GetFeaturePos(featureIDs[i]); + const float fDist = fPos.distance2D(ai->cb->GetUnitPos(uid)); +- const float fThreat = ai->tm->ThreatAtThisPoint(fPos); ++ const float fThreat = ai->thm->ThreatAtThisPoint(fPos); + + if (fDef == 0) + continue; +@@ -291,11 +291,11 @@ + continue; + } + +- if (fDef->energy > bestScore && fThreat < ai->tm->GetAverageThreat()) { ++ if (fDef->energy > bestScore && fThreat < ai->thm->GetAverageThreat()) { + bestScore = fDef->energy; + bestFeatureID = featureIDs[i]; + } +- else if (bestScore == fDef->energy && fThreat < ai->tm->GetAverageThreat()) { ++ else if (bestScore == fDef->energy && fThreat < ai->thm->GetAverageThreat()) { + if (fDist < bestDist) { + bestFeatureID = featureIDs[i]; + bestDist = fDist; Added: head/games/spring/files/patch-CMakeLists.txt ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/games/spring/files/patch-CMakeLists.txt Mon Dec 16 11:22:24 2013 (r336624) @@ -0,0 +1,10 @@ +--- CMakeLists.txt.orig 2013-03-26 03:58:35.000000000 +0400 ++++ CMakeLists.txt 2013-11-09 07:51:04.829392176 +0400 +@@ -364,7 +364,6 @@ + elseif (MSVC) + # nothing to be done here + else (MSVC) +- Message(FATAL_ERROR "unknown compiler") + endif ($ENV{CXX} MATCHES "icpc") + + add_definitions(-DSTREFLOP_SSE) # would break AI compiling, but is undefined in ./AI/CMakeLists.txt Modified: head/games/spring/files/patch-rts-CMakeLists.txt ============================================================================== --- head/games/spring/files/patch-rts-CMakeLists.txt Mon Dec 16 11:17:42 2013 (r336623) +++ head/games/spring/files/patch-rts-CMakeLists.txt Mon Dec 16 11:22:24 2013 (r336624) @@ -1,20 +1,11 @@ ---- ./rts/CMakeLists.txt.orig 2010-09-06 16:16:17.000000000 +0400 -+++ ./rts/CMakeLists.txt 2010-09-15 23:05:01.000000000 +0400 -@@ -46,6 +46,8 @@ +--- rts/CMakeLists.txt.orig 2013-11-09 00:09:15.910054493 +0400 ++++ rts/CMakeLists.txt 2013-11-09 00:18:23.355754880 +0400 +@@ -63,7 +63,7 @@ + ENDIF (PREFER_STATIC_LIBS) - LIST(APPEND engineCommonLibraries ${DEVIL_IL_LIBRARY}) - -+LIST(APPEND spring_libraries execinfo) -+ - ### Find include directories and add platform specific libraries - LIST(APPEND engineCommonLibraries ${Boost_REGEX_LIBRARY} ${Boost_THREAD_LIBRARY} ${Boost_PROGRAM_OPTIONS_LIBRARY} ${Boost_SYSTEM_LIBRARY} ${Boost_SIGNALS_LIBRARY}) - -@@ -53,7 +55,7 @@ - - IF (UNIX) # Needed for dynamically loading shared libraries (on some OS) - LIST(APPEND engineCommonLibraries dl) -+ LIST(APPEND engineCommonLibraries execinfo) - ENDIF (UNIX) ++ LIST(APPEND engineCommonLibraries ${CMAKE_DL_LIBS} execinfo) + ENDIF (UNIX AND NOT MINGW) - IF (MINGW) + FIND_PACKAGE_STATIC(ZLIB REQUIRED) Added: head/games/spring/files/patch-rts-Rendering-Shaders-ShaderStates.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/games/spring/files/patch-rts-Rendering-Shaders-ShaderStates.h Mon Dec 16 11:22:24 2013 (r336624) @@ -0,0 +1,11 @@ +--- rts/Rendering/Shaders/ShaderStates.h.orig 2013-12-06 06:06:48.795486079 +0400 ++++ rts/Rendering/Shaders/ShaderStates.h 2013-12-06 06:30:20.577430223 +0400 +@@ -227,7 +227,7 @@ + { + std::map::const_iterator it = flags.find(flag); + if (it != flags.end()) { +- std::istringstream buf(*it); ++ std::istringstream buf(it->second); + T temp; + buf >> temp; + return temp; Added: head/games/spring/files/patch-rts-Sim-Misc-DefinitionTag.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/games/spring/files/patch-rts-Sim-Misc-DefinitionTag.h Mon Dec 16 11:22:24 2013 (r336624) @@ -0,0 +1,18 @@ +--- rts/Sim/Misc/DefinitionTag.h.orig 2013-12-06 22:23:53.818446384 +0400 ++++ rts/Sim/Misc/DefinitionTag.h 2013-12-06 22:42:16.128369497 +0400 +@@ -15,7 +15,6 @@ + #include + #include "Lua/LuaParser.h" + #include "System/float3.h" +-#include "System/Util.h" + + //example usage: DUMMYTAG(Defs, DefClass, table, customParams) + struct table {}; +@@ -43,6 +42,7 @@ + } + }; + ++#include "System/Util.h" + + /** + * @brief Untyped definition tag meta data. Added: head/games/spring/files/patch-rts-System-Platform-Linux-CrashHandler.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/games/spring/files/patch-rts-System-Platform-Linux-CrashHandler.cpp Mon Dec 16 11:22:24 2013 (r336624) @@ -0,0 +1,11 @@ +--- rts/System/Platform/Linux/CrashHandler.cpp.orig 2013-03-26 03:58:36.000000000 +0400 ++++ rts/System/Platform/Linux/CrashHandler.cpp 2013-11-09 00:15:32.446878961 +0400 +@@ -323,7 +323,7 @@ + + static void ForcedExitAfterTenSecs() { + boost::this_thread::sleep(boost::posix_time::seconds(10)); +- std::_Exit(-1); ++ exit(-1); + } + + Modified: head/games/spring/files/patch-rts-System-Platform-Misc.cpp ============================================================================== --- head/games/spring/files/patch-rts-System-Platform-Misc.cpp Mon Dec 16 11:17:42 2013 (r336623) +++ head/games/spring/files/patch-rts-System-Platform-Misc.cpp Mon Dec 16 11:22:24 2013 (r336624) @@ -1,7 +1,16 @@ ---- rts/System/Platform/Misc.cpp.orig 2010-09-06 16:16:18.000000000 +0400 -+++ rts/System/Platform/Misc.cpp 2010-09-15 22:44:06.000000000 +0400 -@@ -106,7 +106,7 @@ - procExeFilePath = std::string(pathReal); +--- rts/System/Platform/Misc.cpp.orig 2012-02-12 22:27:27.502768102 +0400 ++++ rts/System/Platform/Misc.cpp 2012-02-13 01:50:43.365521912 +0400 +@@ -2,7 +2,7 @@ + + #include "Misc.h" + +-#ifdef linux ++#if defined(linux) || defined(__FreeBSD__) + #include + #include // for dladdr(), dlopen() + +@@ -187,7 +187,7 @@ + procExeFilePath = GetRealPath(path); } #else - #error implement this @@ -9,3 +18,12 @@ #endif if (procExeFilePath.empty()) { +@@ -208,7 +208,7 @@ + // this will only be used if moduleFilePath stays empty + const char* error = NULL; + +-#if defined(linux) || defined(__APPLE__) ++#if defined(linux) || defined(__APPLE__) || defined(__FreeBSD__) + #ifdef __APPLE__ + #define SHARED_LIBRARY_EXTENSION "dylib" + #else Added: head/games/spring/files/patch-rts-System-Platform-Threading.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/games/spring/files/patch-rts-System-Platform-Threading.cpp Mon Dec 16 11:22:24 2013 (r336624) @@ -0,0 +1,47 @@ +--- rts/System/Platform/Threading.cpp.orig 2013-03-26 03:58:36.000000000 +0400 ++++ rts/System/Platform/Threading.cpp 2013-11-09 00:13:03.263078447 +0400 +@@ -39,7 +39,7 @@ + static boost::thread::id simThreadID; + static boost::thread::id batchThreadID; + #endif +-#if defined(__APPLE__) ++#if defined(__APPLE__) || defined(__FreeBSD__) + #elif defined(WIN32) + static DWORD cpusSystem = 0; + #else +@@ -52,7 +52,7 @@ + if (inited) + return; + +- #if defined(__APPLE__) ++ #if defined(__APPLE__) || defined(__FreeBSD__) + // no-op + + #elif defined(WIN32) +@@ -76,7 +76,7 @@ + return ~0; + } + +- #if defined(__APPLE__) ++ #if defined(__APPLE__) || defined(__FreeBSD__) + // no-op + + #elif defined(WIN32) +@@ -151,7 +151,7 @@ + boost::uint32_t GetAvailableCoresMask() + { + boost::uint32_t systemCores = 0; +- #if defined(__APPLE__) ++ #if defined(__APPLE__) || defined(__FreeBSD__) + // no-op + systemCores = ~0; + +@@ -269,7 +269,7 @@ + + void SetThreadScheduler() + { +- #if defined(__APPLE__) ++ #if defined(__APPLE__) || defined(__FreeBSD__) + // no-op + + #elif defined(WIN32) Added: head/games/spring/files/patch-rts-System-Rectangle.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/games/spring/files/patch-rts-System-Rectangle.h Mon Dec 16 11:22:24 2013 (r336624) @@ -0,0 +1,11 @@ +--- ./rts/System/Rectangle.h.orig 2013-03-26 03:58:36.000000000 +0400 ++++ ./rts/System/Rectangle.h 2013-11-11 00:22:51.737774094 +0400 +@@ -45,7 +45,7 @@ + y1 < rect.y2 && y2 > rect.y1; + } + +- bool operator< (const SRectangle& other) { ++ bool operator< (const SRectangle& other) const { + if (x1 == other.x1) { + return (z1 < other.z1); + } else { Added: head/games/spring/files/patch-rts-System-creg-creg.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/games/spring/files/patch-rts-System-creg-creg.h Mon Dec 16 11:22:24 2013 (r336624) @@ -0,0 +1,15 @@ +--- rts/System/creg/creg.h.orig 2013-12-06 06:06:48.806486080 +0400 ++++ rts/System/creg/creg.h 2013-12-06 07:18:09.477443592 +0400 +@@ -442,10 +442,10 @@ + // Stupid GCC likes this template<> crap very much + #define CR_BIND_TEMPLATE(TCls, ctor_args) \ + template<> creg::IMemberRegistrator* TCls::memberRegistrator=0; \ +- template<> creg::Class* TCls::GetClass() const { return binder.class_; } \ + template<> void TCls::_ConstructInstance(void* d) { new(d) MyType ctor_args; } \ + template<> void TCls::_DestructInstance(void* d) { ((MyType*)d)->~MyType(); } \ +- template<> creg::ClassBinder TCls::binder(#TCls, 0, 0, &TCls::memberRegistrator, sizeof(TCls), alignof(TCls), TCls::hasVTable, TCls::_ConstructInstance, TCls::_DestructInstance); ++ template<> creg::ClassBinder TCls::binder(#TCls, 0, 0, &TCls::memberRegistrator, sizeof(TCls), alignof(TCls), TCls::hasVTable, TCls::_ConstructInstance, TCls::_DestructInstance); \ ++ template<> creg::Class* TCls::GetClass() const { return binder.class_; } + + /** @def CR_BIND_DERIVED_INTERFACE + * Bind an abstract derived class Added: head/games/spring/files/patch-rts-build-cmake-FindAsciiDoc.cmake ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/games/spring/files/patch-rts-build-cmake-FindAsciiDoc.cmake Mon Dec 16 11:22:24 2013 (r336624) @@ -0,0 +1,10 @@ +--- rts/build/cmake/FindAsciiDoc.cmake.orig 2013-11-09 03:59:29.984998154 +0400 ++++ rts/build/cmake/FindAsciiDoc.cmake 2013-11-09 04:04:52.833206309 +0400 +@@ -41,6 +41,7 @@ + PATH_SUFFIXES + xml/docbook/stylesheet/nwalsh/manpages + sgml/docbook/xsl-stylesheets/manpages ++ xsl/docbook/manpages + DOC "DocBook XSL Style-Sheet" + ) + Added: head/games/spring/files/patch-rts-builds-dedicated-CMakeLists.txt ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/games/spring/files/patch-rts-builds-dedicated-CMakeLists.txt Mon Dec 16 11:22:24 2013 (r336624) @@ -0,0 +1,11 @@ +--- ./rts/builds/dedicated/CMakeLists.txt.orig 2013-03-26 03:58:36.000000000 +0400 ++++ ./rts/builds/dedicated/CMakeLists.txt 2013-11-09 00:39:09.704093624 +0400 +@@ -24,7 +24,7 @@ + LIST(APPEND engineDedicatedLibraries headlessStubs) + IF (UNIX) + # Needed for dynamically loading shared libraries (on some OS) +- LIST(APPEND engineDedicatedLibraries dl) ++ LIST(APPEND engineDedicatedLibraries ${CMAKE_DL_LIBS} execinfo) + ENDIF (UNIX) + + IF (MINGW OR APPLE) Added: head/games/spring/files/patch-rts-lib-assimp-code-STEPFile.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/games/spring/files/patch-rts-lib-assimp-code-STEPFile.h Mon Dec 16 11:22:24 2013 (r336624) @@ -0,0 +1,18 @@ +--- rts/lib/assimp/code/STEPFile.h.orig 2013-03-26 03:58:36.000000000 +0400 ++++ rts/lib/assimp/code/STEPFile.h 2013-11-11 04:15:43.177772957 +0400 +@@ -195,13 +195,13 @@ + // conversion support. + template + const T& ResolveSelect(const DB& db) const { +- return Couple(db).MustGetObject(To())->To(); ++ return Couple(db).MustGetObject(To())->template To(); + } + + template + const T* ResolveSelectPtr(const DB& db) const { + const EXPRESS::ENTITY* e = ToPtr(); +- return e?Couple(db).MustGetObject(*e)->ToPtr():(const T*)0; ++ return e?Couple(db).MustGetObject(*e)->template ToPtr():(const T*)0; + } + + public: Modified: head/games/spring/files/patch-rts-lib-gml-gmlcls.h ============================================================================== --- head/games/spring/files/patch-rts-lib-gml-gmlcls.h Mon Dec 16 11:17:42 2013 (r336623) +++ head/games/spring/files/patch-rts-lib-gml-gmlcls.h Mon Dec 16 11:22:24 2013 (r336624) @@ -1,7 +1,7 @@ ---- ./rts/lib/gml/gmlcls.h.orig 2010-09-06 16:16:18.000000000 +0400 -+++ ./rts/lib/gml/gmlcls.h 2010-09-15 23:36:35.000000000 +0400 -@@ -60,7 +60,7 @@ - //#define BOOST_AC_USE_PTHREADS +--- rts/lib/gml/gmlcls.h.orig 2013-12-07 00:06:39.928020847 +0400 ++++ rts/lib/gml/gmlcls.h 2013-12-07 00:09:21.477010398 +0400 +@@ -43,7 +43,7 @@ + extern bool ThreadRegistered(); // memory barriers for different platforms -#if defined(__APPLE__) || defined(__FreeBSD__) @@ -9,7 +9,7 @@ # include # define GML_MEMBAR OSMemoryBarrier() #elif defined(__GNUC__) -@@ -112,7 +112,7 @@ +@@ -95,7 +95,7 @@ # define GML_TYPENAME #endif @@ -18,3 +18,16 @@ # define GML_USE_SPEEDY_TLS 1 # include "System/Platform/errorhandler.h" # include "speedy-tls.h" +@@ -234,11 +234,7 @@ + } + virtual ~gmlBaseMutexLock() { + if (GML::Enabled()) { +-#if (BOOST_VERSION >= 103500) +- ((T*)lockdata)->boost::unique_lock::~unique_lock(); +-#else +- ((T*)lockdata)->boost::scoped_lock::~scoped_lock(); +-#endif ++ ((T*)lockdata)->~T(); + } + } + }; Added: head/games/spring/files/patch-rts-lib-headlessStubs-CMakeLists.txt ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/games/spring/files/patch-rts-lib-headlessStubs-CMakeLists.txt Mon Dec 16 11:22:24 2013 (r336624) @@ -0,0 +1,13 @@ +--- rts/lib/headlessStubs/CMakeLists.txt.orig 2013-03-26 03:58:36.000000000 +0400 ++++ rts/lib/headlessStubs/CMakeLists.txt 2013-12-07 07:05:38.984034014 +0400 +@@ -15,8 +15,8 @@ + ELSE (MINGW) + # Use a direct copy of the GL and SDL headers, + # as these may not be available on headless systems. +- INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/include) +- INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/include/SDL) ++ INCLUDE_DIRECTORIES(BEFORE ${CMAKE_SOURCE_DIR}/include) ++ INCLUDE_DIRECTORIES(BEFORE ${CMAKE_SOURCE_DIR}/include/SDL) + ENDIF (MINGW) + + ADD_LIBRARY(headlessStubs STATIC EXCLUDE_FROM_ALL ${headlessStubsSources}) Added: head/games/spring/files/patch-rts-lib-minizip-CMakeLists.txt ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/games/spring/files/patch-rts-lib-minizip-CMakeLists.txt Mon Dec 16 11:22:24 2013 (r336624) @@ -0,0 +1,10 @@ +--- rts/lib/minizip/CMakeLists.txt.orig 2013-03-26 03:58:36.000000000 +0400 ++++ rts/lib/minizip/CMakeLists.txt 2013-11-09 04:02:41.051969166 +0400 +@@ -1,7 +1,6 @@ + # Spring supplied CMake build file + + Set(MINIZIP_FIND_QUIETLY TRUE) +-FIND_PACKAGE_STATIC(MiniZip) + + If (MINIZIP_FOUND) + # Use the system supplied MiniZip library Added: head/games/spring/files/patch-tools-pr-downloader-src-lib-pugixml-pugixml.hpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/games/spring/files/patch-tools-pr-downloader-src-lib-pugixml-pugixml.hpp Mon Dec 16 11:22:24 2013 (r336624) @@ -0,0 +1,38 @@ +--- tools/pr-downloader/src/lib/pugixml/pugixml.hpp.orig 2013-12-06 06:19:54.039431635 +0400 ++++ tools/pr-downloader/src/lib/pugixml/pugixml.hpp 2013-12-06 06:24:02.124415606 +0400 +@@ -17,32 +17,9 @@ + #include "pugiconfig.hpp" + + #ifndef PUGIXML_NO_STL +-namespace std +-{ +- struct bidirectional_iterator_tag; +- +-#ifdef __SUNPRO_CC +- // Sun C++ compiler has a bug which forces template argument names in forward declarations to be the same as in actual definitions +- template class allocator; +- template struct char_traits; +- template class basic_istream; +- template class basic_ostream; +- template class basic_string; +-#else +- // Borland C++ compiler has a bug which forces template argument names in forward declarations to be the same as in actual definitions +- template class allocator; +- template struct char_traits; +- template class basic_istream; +- template class basic_ostream; +- template class basic_string; +-#endif +- +- // Digital Mars compiler has a bug which requires a forward declaration for explicit instantiation (otherwise type selection is messed up later, producing link errors) +- // Also note that we have to declare char_traits as a class here, since it's defined that way +-#ifdef __DMC__ +- template <> class char_traits; +-#endif +-} ++# include ++# include ++# include + #endif + + // Macro for deprecated features Added: head/games/spring/files/patch-tools-pr-downloader-src-lib-xmlrpc++-src-base64.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/games/spring/files/patch-tools-pr-downloader-src-lib-xmlrpc++-src-base64.h Mon Dec 16 11:22:24 2013 (r336624) @@ -0,0 +1,11 @@ +--- tools/pr-downloader/src/lib/xmlrpc++/src/base64.h.orig 2013-03-26 03:58:49.000000000 +0400 ++++ tools/pr-downloader/src/lib/xmlrpc++/src/base64.h 2013-11-09 14:42:21.013340982 +0400 +@@ -13,6 +13,8 @@ + # include + #endif + ++#include ++ + static + int _base64Chars[]= {'A','B','C','D','E','F','G','H','I','J','K','L','M','N','O','P','Q','R','S','T','U','V','W','X','Y','Z', + 'a','b','c','d','e','f','g','h','i','j','k','l','m','n','o','p','q','r','s','t','u','v','w','x','y','z', Modified: head/games/spring/pkg-plist ============================================================================== --- head/games/spring/pkg-plist Mon Dec 16 11:17:42 2013 (r336623) +++ head/games/spring/pkg-plist Mon Dec 16 11:22:24 2013 (r336624) @@ -1,200 +1,19 @@ +%%PR_DOWNLOADER%%bin/pr-downloader bin/spring bin/spring-dedicated bin/spring-headless bin/spring-multithreaded +%%PR_DOWNLOADER%%lib/libpr-downloader_shared.so +%%PR_DOWNLOADER%%lib/libpr-downloader_static.a lib/libspringserver.so lib/libunitsync.so +%%MANPAGES%%man/man6/spring-dedicated.6.gz +%%MANPAGES%%man/man6/spring-headless.6.gz +%%MANPAGES%%man/man6/spring-multithreaded.6.gz +%%MANPAGES%%man/man6/spring.6.gz share/applications/spring.desktop share/mime/packages/spring.xml share/pixmaps/application-x-spring-demo.png share/pixmaps/spring.png -%%DATADIR%%/AI/Interfaces/C/0.1/InterfaceInfo.lua -%%DATADIR%%/AI/Interfaces/C/0.1/libAIInterface.so -%%DATADIR%%/AI/Skirmish/AAI/0.9/AIInfo.lua -%%DATADIR%%/AI/Skirmish/AAI/0.9/AIOptions.lua -%%DATADIR%%/AI/Skirmish/AAI/0.9/FAQ.txt -%%DATADIR%%/AI/Skirmish/AAI/0.9/ReadMe.txt -%%DATADIR%%/AI/Skirmish/AAI/0.9/cfg/general.cfg -%%DATADIR%%/AI/Skirmish/AAI/0.9/cfg/help/example_general.cfg -%%DATADIR%%/AI/Skirmish/AAI/0.9/cfg/help/example_mod.cfg -%%DATADIR%%/AI/Skirmish/AAI/0.9/cfg/mod/AA5.0project.cfg -%%DATADIR%%/AI/Skirmish/AAI/0.9/cfg/mod/AAIA10.cfg -%%DATADIR%%/AI/Skirmish/AAI/0.9/cfg/mod/BA.cfg -%%DATADIR%%/AI/Skirmish/AAI/0.9/cfg/mod/BOTA.cfg -%%DATADIR%%/AI/Skirmish/AAI/0.9/cfg/mod/BOTA_14.cfg -%%DATADIR%%/AI/Skirmish/AAI/0.9/cfg/mod/CA-BETA1.cfg -%%DATADIR%%/AI/Skirmish/AAI/0.9/cfg/mod/Expand_and_Exterminate_v_0.171.cfg -%%DATADIR%%/AI/Skirmish/AAI/0.9/cfg/mod/FF_1.21_S.cfg -%%DATADIR%%/AI/Skirmish/AAI/0.9/cfg/mod/KuroTA-v047.cfg -%%DATADIR%%/AI/Skirmish/AAI/0.9/cfg/mod/PURE0.51.cfg -%%DATADIR%%/AI/Skirmish/AAI/0.9/cfg/mod/S44Lyuban_v106.cfg -%%DATADIR%%/AI/Skirmish/AAI/0.9/cfg/mod/StarWars01.cfg -%%DATADIR%%/AI/Skirmish/AAI/0.9/cfg/mod/XTA.cfg -%%DATADIR%%/AI/Skirmish/AAI/0.9/cfg/mod/XTAPEV9585.cfg -%%DATADIR%%/AI/Skirmish/AAI/0.9/cfg/mod/gundam_1.1_epic.cfg -%%DATADIR%%/AI/Skirmish/AAI/0.9/cfg/mod/gundam_1.1_tiny.cfg -%%DATADIR%%/AI/Skirmish/AAI/0.9/cfg/mod/tc.cfg -%%DATADIR%%/AI/Skirmish/AAI/0.9/libSkirmishAI.so -%%DATADIR%%/AI/Skirmish/CppTestAI/0.1/AIInfo.lua -%%DATADIR%%/AI/Skirmish/CppTestAI/0.1/AIOptions.lua -%%DATADIR%%/AI/Skirmish/CppTestAI/0.1/libSkirmishAI.so -%%DATADIR%%/AI/Skirmish/E323AI/3.25.0/AIInfo.lua -%%DATADIR%%/AI/Skirmish/E323AI/3.25.0/AIOptions.lua -%%DATADIR%%/AI/Skirmish/E323AI/3.25.0/configs/BA-categorization-patch.cfg -%%DATADIR%%/AI/Skirmish/E323AI/3.25.0/configs/BA-categorization.cfg -%%DATADIR%%/AI/Skirmish/E323AI/3.25.0/configs/BA-config.cfg -%%DATADIR%%/AI/Skirmish/E323AI/3.25.0/configs/BOTA-categorization.cfg -%%DATADIR%%/AI/Skirmish/E323AI/3.25.0/configs/BOTA-config.cfg -%%DATADIR%%/AI/Skirmish/E323AI/3.25.0/configs/NOTA-categorization.cfg -%%DATADIR%%/AI/Skirmish/E323AI/3.25.0/configs/NOTA-config.cfg -%%DATADIR%%/AI/Skirmish/E323AI/3.25.0/configs/SA-categorization.cfg -%%DATADIR%%/AI/Skirmish/E323AI/3.25.0/configs/SA-config.cfg -%%DATADIR%%/AI/Skirmish/E323AI/3.25.0/configs/XTA-categorization.cfg -%%DATADIR%%/AI/Skirmish/E323AI/3.25.0/configs/XTA-config.cfg -%%DATADIR%%/AI/Skirmish/E323AI/3.25.0/configs/ca-categorization.cfg -%%DATADIR%%/AI/Skirmish/E323AI/3.25.0/configs/ca-config.cfg -%%DATADIR%%/AI/Skirmish/E323AI/3.25.0/configs/ct-categorization.cfg -%%DATADIR%%/AI/Skirmish/E323AI/3.25.0/configs/ct-config.cfg -%%DATADIR%%/AI/Skirmish/E323AI/3.25.0/configs/template-config.cfg -%%DATADIR%%/AI/Skirmish/E323AI/3.25.0/libSkirmishAI.so -%%DATADIR%%/AI/Skirmish/KAIK/0.13/AIInfo.lua -%%DATADIR%%/AI/Skirmish/KAIK/0.13/AIOptions.lua -%%DATADIR%%/AI/Skirmish/KAIK/0.13/libSkirmishAI.so -%%DATADIR%%/AI/Skirmish/NullAI/0.1/AIInfo.lua -%%DATADIR%%/AI/Skirmish/NullAI/0.1/AIOptions.lua -%%DATADIR%%/AI/Skirmish/NullAI/0.1/libSkirmishAI.so -%%DATADIR%%/AI/Skirmish/RAI/0.601/AIInfo.lua -%%DATADIR%%/AI/Skirmish/RAI/0.601/AIOptions.lua -%%DATADIR%%/AI/Skirmish/RAI/0.601/libSkirmishAI.so -%%DATADIR%%/LuaUI/CHANGELOG.txt -%%DATADIR%%/LuaUI/Config/README.txt -%%DATADIR%%/LuaUI/Fonts/FreeMonoBold_12.lua -%%DATADIR%%/LuaUI/Fonts/FreeMonoBold_12.png -%%DATADIR%%/LuaUI/Fonts/README -%%DATADIR%%/LuaUI/Headers/colors.h.lua -%%DATADIR%%/LuaUI/Headers/keysym.h.lua -%%DATADIR%%/LuaUI/Icons/chi.png -%%DATADIR%%/LuaUI/Icons/cross.png -%%DATADIR%%/LuaUI/Icons/diamond.png -%%DATADIR%%/LuaUI/Icons/e.png -%%DATADIR%%/LuaUI/Icons/hemi-down.png -%%DATADIR%%/LuaUI/Icons/hemi-up.png -%%DATADIR%%/LuaUI/Icons/hemi.png -%%DATADIR%%/LuaUI/Icons/hourglass-side.png -%%DATADIR%%/LuaUI/Icons/hourglass.png -%%DATADIR%%/LuaUI/Icons/m-down.png -%%DATADIR%%/LuaUI/Icons/m-up.png -%%DATADIR%%/LuaUI/Icons/m.png -%%DATADIR%%/LuaUI/Icons/sphere.png -%%DATADIR%%/LuaUI/Icons/square.png -%%DATADIR%%/LuaUI/Icons/square_+.png -%%DATADIR%%/LuaUI/Icons/square_x.png -%%DATADIR%%/LuaUI/Icons/star-dark.png -%%DATADIR%%/LuaUI/Icons/star.png -%%DATADIR%%/LuaUI/Icons/tri-down.png -%%DATADIR%%/LuaUI/Icons/tri-up.png -%%DATADIR%%/LuaUI/Icons/triangle-down.png -%%DATADIR%%/LuaUI/Icons/triangle-up.png -%%DATADIR%%/LuaUI/Icons/x.png -%%DATADIR%%/LuaUI/Images/flags25x15.png -%%DATADIR%%/LuaUI/Images/highlight_strip.png -%%DATADIR%%/LuaUI/Images/players.png -%%DATADIR%%/LuaUI/Models/colors.lua -%%DATADIR%%/LuaUI/Models/colors.mtl -%%DATADIR%%/LuaUI/Models/colors.obj -%%DATADIR%%/LuaUI/NEWS.txt -%%DATADIR%%/LuaUI/README.txt -%%DATADIR%%/LuaUI/Sounds/README.txt -%%DATADIR%%/LuaUI/Sounds/bounce.wav -%%DATADIR%%/LuaUI/Sounds/flag_grab.wav -%%DATADIR%%/LuaUI/Sounds/land.wav -%%DATADIR%%/LuaUI/Sounds/message_admin.wav -%%DATADIR%%/LuaUI/Sounds/message_private.wav -%%DATADIR%%/LuaUI/Sounds/message_team.wav -%%DATADIR%%/LuaUI/Sounds/pop.wav -%%DATADIR%%/LuaUI/Sounds/teamgrab.wav -%%DATADIR%%/LuaUI/Widgets/camera_shake.lua -%%DATADIR%%/LuaUI/Widgets/camera_smooth_move.lua -%%DATADIR%%/LuaUI/Widgets/gui_buildspacing.lua -%%DATADIR%%/LuaUI/Widgets/gui_comm_ends.lua -%%DATADIR%%/LuaUI/Widgets/gui_hilight_unit.lua -%%DATADIR%%/LuaUI/Widgets/gui_selbuttons.lua -%%DATADIR%%/LuaUI/Widgets/gui_team_platter.lua -%%DATADIR%%/LuaUI/Widgets/gui_xray_shader.lua -%%DATADIR%%/LuaUI/Widgets/headless_setup.lua -%%DATADIR%%/LuaUI/Widgets/ingame_lobby.example.lua -%%DATADIR%%/LuaUI/Widgets/minimap_relative.lua -%%DATADIR%%/LuaUI/Widgets/minimap_startbox.lua -%%DATADIR%%/LuaUI/Widgets/unit_factory_guard.lua -%%DATADIR%%/LuaUI/Widgets/unit_immobile_buider.lua -%%DATADIR%%/LuaUI/Widgets/unit_metal_maker.lua -%%DATADIR%%/LuaUI/Widgets/unit_stockpile.lua -%%DATADIR%%/LuaUI/actions.lua -%%DATADIR%%/LuaUI/callins.lua -%%DATADIR%%/LuaUI/ctrlpanel.txt -%%DATADIR%%/LuaUI/debug.lua -%%DATADIR%%/LuaUI/flags.lua -%%DATADIR%%/LuaUI/fonts.lua -%%DATADIR%%/LuaUI/layout.lua -%%DATADIR%%/LuaUI/loadmodel.lua -%%DATADIR%%/LuaUI/main.lua -%%DATADIR%%/LuaUI/savetable.lua -%%DATADIR%%/LuaUI/selector.lua -%%DATADIR%%/LuaUI/setupdefs.lua -%%DATADIR%%/LuaUI/system.lua -%%DATADIR%%/LuaUI/tweakmode.lua -%%DATADIR%%/LuaUI/utils.lua -%%DATADIR%%/LuaUI/widgets.lua -%%DATADIR%%/PALETTE.PAL -%%DATADIR%%/base/cursors.sdz -%%DATADIR%%/base/maphelper.sdz -%%DATADIR%%/base/spring/bitmaps.sdz -%%DATADIR%%/base/springcontent.sdz -%%DATADIR%%/cmdcolors.txt -%%DATADIR%%/ctrlpanel.txt -%%DATADIR%%/fonts/AUTHORS -%%DATADIR%%/fonts/COPYING -%%DATADIR%%/fonts/CREDITS -%%DATADIR%%/fonts/FreeSansBold.otf -%%DATADIR%%/fonts/README -%%DATADIR%%/luaui.lua -%%DATADIR%%/selectkeys.txt -%%DATADIR%%/springrc-template-headless.txt -%%DATADIR%%/teamcolors.lua -%%DATADIR%%/uikeys.txt -@dirrm %%DATADIR%%/fonts -@dirrm %%DATADIR%%/base/spring -@dirrm %%DATADIR%%/base -@dirrm %%DATADIR%%/LuaUI/Widgets -@dirrm %%DATADIR%%/LuaUI/Sounds -@dirrm %%DATADIR%%/LuaUI/Models -@dirrm %%DATADIR%%/LuaUI/Images -@dirrm %%DATADIR%%/LuaUI/Icons -@dirrm %%DATADIR%%/LuaUI/Headers -@dirrm %%DATADIR%%/LuaUI/Fonts -@dirrm %%DATADIR%%/LuaUI/Config -@dirrm %%DATADIR%%/LuaUI -@dirrm %%DATADIR%%/AI/Skirmish/RAI/0.601 -@dirrm %%DATADIR%%/AI/Skirmish/RAI -@dirrm %%DATADIR%%/AI/Skirmish/NullAI/0.1 -@dirrm %%DATADIR%%/AI/Skirmish/NullAI -@dirrm %%DATADIR%%/AI/Skirmish/KAIK/0.13 -@dirrm %%DATADIR%%/AI/Skirmish/KAIK -@dirrm %%DATADIR%%/AI/Skirmish/E323AI/3.25.0/configs -@dirrm %%DATADIR%%/AI/Skirmish/E323AI/3.25.0 -@dirrm %%DATADIR%%/AI/Skirmish/E323AI -@dirrm %%DATADIR%%/AI/Skirmish/CppTestAI/0.1 -@dirrm %%DATADIR%%/AI/Skirmish/CppTestAI -@dirrm %%DATADIR%%/AI/Skirmish/AAI/0.9/cfg/mod -@dirrm %%DATADIR%%/AI/Skirmish/AAI/0.9/cfg/help -@dirrm %%DATADIR%%/AI/Skirmish/AAI/0.9/cfg -@dirrm %%DATADIR%%/AI/Skirmish/AAI/0.9 -@dirrm %%DATADIR%%/AI/Skirmish/AAI -@dirrm %%DATADIR%%/AI/Skirmish -@dirrm %%DATADIR%%/AI/Interfaces/C/0.1 -@dirrm %%DATADIR%%/AI/Interfaces/C -@dirrm %%DATADIR%%/AI/Interfaces *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** From owner-svn-ports-head@FreeBSD.ORG Mon Dec 16 11:25:09 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id C90E6295; Mon, 16 Dec 2013 11:25:09 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id B4D441693; Mon, 16 Dec 2013 11:25:09 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBGBP9pf004511; Mon, 16 Dec 2013 11:25:09 GMT (envelope-from rene@svn.freebsd.org) Received: (from rene@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBGBP9tP004509; Mon, 16 Dec 2013 11:25:09 GMT (envelope-from rene@svn.freebsd.org) Message-Id: <201312161125.rBGBP9tP004509@svn.freebsd.org> From: Rene Ladan Date: Mon, 16 Dec 2013 11:25:09 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r336625 - in head: . net-p2p net-p2p/libtorrent-rasterbar-15 X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 16 Dec 2013 11:25:09 -0000 Author: rene Date: Mon Dec 16 11:25:09 2013 New Revision: 336625 URL: http://svnweb.freebsd.org/changeset/ports/336625 Log: Remove expired port: 2013-12-13 net-p2p/libtorrent-rasterbar-15: Unusable, development ceased Deleted: head/net-p2p/libtorrent-rasterbar-15/ Modified: head/MOVED head/net-p2p/Makefile Modified: head/MOVED ============================================================================== --- head/MOVED Mon Dec 16 11:22:24 2013 (r336624) +++ head/MOVED Mon Dec 16 11:25:09 2013 (r336625) @@ -5305,3 +5305,4 @@ security/snortsms||2013-12-15|Has expire sysutils/hammerhead||2013-12-15|Has expired: Development no more active net-p2p/libtorrent-rasterbar-15-python||2013-12-15|Has expired: Unusable, development ceased graphics/openexr_ctl||2013-12-15|Has expired: Now distributed with ampasCTL-1.5 +net-p2p/libtorrent-rasterbar-15||2013-12-16|Has expired: Unusable, development ceased Modified: head/net-p2p/Makefile ============================================================================== --- head/net-p2p/Makefile Mon Dec 16 11:22:24 2013 (r336624) +++ head/net-p2p/Makefile Mon Dec 16 11:25:09 2013 (r336625) @@ -46,7 +46,6 @@ SUBDIR += libtorrent SUBDIR += libtorrent-devel SUBDIR += libtorrent-rasterbar - SUBDIR += libtorrent-rasterbar-15 SUBDIR += libtorrent-rasterbar-python SUBDIR += linux-jigdo SUBDIR += linuxdcpp From owner-svn-ports-head@FreeBSD.ORG Mon Dec 16 11:26:25 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 324AF3A2; Mon, 16 Dec 2013 11:26:25 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 1E4C016A0; Mon, 16 Dec 2013 11:26:25 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBGBQOiT004687; Mon, 16 Dec 2013 11:26:24 GMT (envelope-from wg@svn.freebsd.org) Received: (from wg@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBGBQOX9004686; Mon, 16 Dec 2013 11:26:24 GMT (envelope-from wg@svn.freebsd.org) Message-Id: <201312161126.rBGBQOX9004686@svn.freebsd.org> From: William Grzybowski Date: Mon, 16 Dec 2013 11:26:24 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r336626 - head/databases/py-south X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 16 Dec 2013 11:26:25 -0000 Author: wg Date: Mon Dec 16 11:26:24 2013 New Revision: 336626 URL: http://svnweb.freebsd.org/changeset/ports/336626 Log: databases/py-south: switch from easy_install to install Modified: head/databases/py-south/Makefile Modified: head/databases/py-south/Makefile ============================================================================== --- head/databases/py-south/Makefile Mon Dec 16 11:25:09 2013 (r336625) +++ head/databases/py-south/Makefile Mon Dec 16 11:26:24 2013 (r336626) @@ -14,8 +14,7 @@ COMMENT= Intelligent schema migrations f LICENSE= AL2 USE_PYTHON= yes -USE_PYDISTUTILS=easy_install +USE_PYDISTUTILS=yes PYDISTUTILS_AUTOPLIST= yes -PYDISTUTILS_PKGNAME= South .include From owner-svn-ports-head@FreeBSD.ORG Mon Dec 16 11:49:55 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 106988C9; Mon, 16 Dec 2013 11:49:55 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id F0CE1182B; Mon, 16 Dec 2013 11:49:54 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBGBns9A011957; Mon, 16 Dec 2013 11:49:54 GMT (envelope-from wg@svn.freebsd.org) Received: (from wg@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBGBnspo011956; Mon, 16 Dec 2013 11:49:54 GMT (envelope-from wg@svn.freebsd.org) Message-Id: <201312161149.rBGBnspo011956@svn.freebsd.org> From: William Grzybowski Date: Mon, 16 Dec 2013 11:49:54 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r336627 - head/databases/pymongo X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 16 Dec 2013 11:49:55 -0000 Author: wg Date: Mon Dec 16 11:49:54 2013 New Revision: 336627 URL: http://svnweb.freebsd.org/changeset/ports/336627 Log: databases/pymongo: allow staging and minor changes - Allow staging - Switch from easy_install to install - Use python auto plist Deleted: head/databases/pymongo/pkg-plist Modified: head/databases/pymongo/Makefile Modified: head/databases/pymongo/Makefile ============================================================================== --- head/databases/pymongo/Makefile Mon Dec 16 11:26:24 2013 (r336626) +++ head/databases/pymongo/Makefile Mon Dec 16 11:49:54 2013 (r336627) @@ -12,11 +12,8 @@ COMMENT= Python driver for MongoDB LICENSE= AL2 USE_PYTHON= yes -USE_PYDISTUTILS= easy_install -PYEASYINSTALL_ARCHDEP= yes -PYDISTUTILS_NOEGGINFO= yes -PYTHON_PY3K_PLIST_HACK= yes -NO_STAGE= yes +USE_PYDISTUTILS= yes +PYDISTUTILS_AUTOPLIST= yes .include From owner-svn-ports-head@FreeBSD.ORG Mon Dec 16 12:03:48 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 73C8BD1C; Mon, 16 Dec 2013 12:03:48 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 45DB61950; Mon, 16 Dec 2013 12:03:48 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBGC3mZ2018358; Mon, 16 Dec 2013 12:03:48 GMT (envelope-from rene@svn.freebsd.org) Received: (from rene@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBGC3mVF018357; Mon, 16 Dec 2013 12:03:48 GMT (envelope-from rene@svn.freebsd.org) Message-Id: <201312161203.rBGC3mVF018357@svn.freebsd.org> From: Rene Ladan Date: Mon, 16 Dec 2013 12:03:48 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r336628 - head/audio/py-mpd2 X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 16 Dec 2013 12:03:48 -0000 Author: rene Date: Mon Dec 16 12:03:47 2013 New Revision: 336628 URL: http://svnweb.freebsd.org/changeset/ports/336628 Log: - Stagify - Switch to PYDISTUTILS=yes - Bump PORTREVISION to drop runtime dependency on py-setuptools - Drop pkg-plist - Mark as architecture-independent Deleted: head/audio/py-mpd2/pkg-plist Modified: head/audio/py-mpd2/Makefile Modified: head/audio/py-mpd2/Makefile ============================================================================== --- head/audio/py-mpd2/Makefile Mon Dec 16 11:49:54 2013 (r336627) +++ head/audio/py-mpd2/Makefile Mon Dec 16 12:03:47 2013 (r336628) @@ -3,6 +3,7 @@ PORTNAME= mpd2 PORTVERSION= 0.5.2 +PORTREVISION= 1 CATEGORIES= audio python PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} DISTNAME= python-${PORTNAME}-${PORTVERSION} @@ -11,15 +12,17 @@ MAINTAINER= rene@FreeBSD.org COMMENT= Fork of the Python MPD client library USE_GITHUB= yes -NO_STAGE= yes GH_ACCOUNT= Mic92 GH_PROJECT= python-${PORTNAME} GH_TAGNAME= v${PORTVERSION} GH_COMMIT= df508d4 USE_PYTHON= yes -USE_PYDISTUTILS= easy_install +USE_PYDISTUTILS= yes PYDISTUTILS_PKGNAME= python_mpd2 +PYDISTUTILS_AUTOPLIST= yes + +NO_ARCH= yes OPTIONSFILE= ${PORT_DBDIR}/py-${PORTNAME}/options OPTIONS_DEFINE= DOCS EXAMPLES @@ -31,24 +34,19 @@ PORTDOCS_2= topics/advanced.rst topics/c PORTDOCS= ${PORTDOCS_1} ${PORTDOCS_2} EXAMPLESDIR= ${PREFIX}/share/examples/py-${PORTNAME} PORTEXAMPLES= locking.py logger.py - -.include +PLIST_DIRSTRY= ${DOCSDIR}/topics post-install: -.if ${PORT_OPTIONS:MDOCS} - @${MKDIR} ${DOCSDIR}/topics + ${MKDIR} ${STAGEDIR}${DOCSDIR}/topics .for f in ${PORTDOCS_1} - ${INSTALL_DATA} ${WRKSRC}/doc/${f} ${DOCSDIR} + ${INSTALL_DATA} ${WRKSRC}/doc/${f} ${STAGEDIR}${DOCSDIR} .endfor .for f in ${PORTDOCS_2} - ${INSTALL_DATA} ${WRKSRC}/doc/${f} ${DOCSDIR}/topics + ${INSTALL_DATA} ${WRKSRC}/doc/${f} ${STAGEDIR}${DOCSDIR}/topics .endfor -.endif -.if ${PORT_OPTIONS:MEXAMPLES} - @${MKDIR} ${EXAMPLESDIR} + ${MKDIR} ${STAGEDIR}${EXAMPLESDIR} .for f in ${PORTEXAMPLES} - ${INSTALL_SCRIPT} ${WRKSRC}/examples/${f} ${EXAMPLESDIR} + ${INSTALL_SCRIPT} ${WRKSRC}/examples/${f} ${STAGEDIR}${EXAMPLESDIR} .endfor -.endif .include From owner-svn-ports-head@FreeBSD.ORG Mon Dec 16 12:06:29 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 46BC7E19; Mon, 16 Dec 2013 12:06:29 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 32F87196A; Mon, 16 Dec 2013 12:06:29 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBGC6Txt018731; Mon, 16 Dec 2013 12:06:29 GMT (envelope-from demon@svn.freebsd.org) Received: (from demon@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBGC6SAK018728; Mon, 16 Dec 2013 12:06:28 GMT (envelope-from demon@svn.freebsd.org) Message-Id: <201312161206.rBGC6SAK018728@svn.freebsd.org> From: Dmitry Sivachenko Date: Mon, 16 Dec 2013 12:06:28 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r336629 - head/net-mgmt/nagios-plugins X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 16 Dec 2013 12:06:29 -0000 Author: demon Date: Mon Dec 16 12:06:28 2013 New Revision: 336629 URL: http://svnweb.freebsd.org/changeset/ports/336629 Log: Fix PLIST for users with world built WITHOUT_OPENSSH. PR: 184736 Submitted by: wallman (he proposed different solution) Modified: head/net-mgmt/nagios-plugins/Makefile head/net-mgmt/nagios-plugins/pkg-plist Modified: head/net-mgmt/nagios-plugins/Makefile ============================================================================== --- head/net-mgmt/nagios-plugins/Makefile Mon Dec 16 12:03:47 2013 (r336628) +++ head/net-mgmt/nagios-plugins/Makefile Mon Dec 16 12:06:28 2013 (r336629) @@ -149,6 +149,10 @@ CONFIGURE_ARGS+= --without-dbi PLIST_SUB+= SUB_DBI="@comment " .endif +.if ${PORT_OPTIONS:MEXTRAOPTS} +CONFIGURE_ARGS+= --enable-extra-opts +.endif + .if ${OSVERSION} > 1000055 EXTRA_PATCHES+= ${FILESDIR}/extra-patch-dig-to-drill.diff CONFIGURE_ARGS+=--with-dig-command=/usr/bin/drill @@ -157,8 +161,10 @@ PLIST_SUB+= SUB_DNS="@comment " PLIST_SUB+= SUB_DNS="" .endif -.if ${PORT_OPTIONS:MEXTRAOPTS} -CONFIGURE_ARGS+= --enable-extra-opts +.if !exists(/usr/bin/ssh) +PLIST_SUB+= SUB_SSH="@comment " +.else +PLIST_SUB+= SUB_SSH="" .endif post-patch: Modified: head/net-mgmt/nagios-plugins/pkg-plist ============================================================================== --- head/net-mgmt/nagios-plugins/pkg-plist Mon Dec 16 12:03:47 2013 (r336628) +++ head/net-mgmt/nagios-plugins/pkg-plist Mon Dec 16 12:06:28 2013 (r336629) @@ -1,6 +1,6 @@ libexec/nagios/check_apt libexec/nagios/check_breeze -libexec/nagios/check_by_ssh +%%SUB_SSH%%libexec/nagios/check_by_ssh libexec/nagios/check_clamd libexec/nagios/check_cluster %%SUB_DBI%%libexec/nagios/check_dbi From owner-svn-ports-head@FreeBSD.ORG Mon Dec 16 12:25:30 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 97731689; Mon, 16 Dec 2013 12:25:30 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 840581B21; Mon, 16 Dec 2013 12:25:30 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBGCPULP025602; Mon, 16 Dec 2013 12:25:30 GMT (envelope-from rene@svn.freebsd.org) Received: (from rene@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBGCPUs0025601; Mon, 16 Dec 2013 12:25:30 GMT (envelope-from rene@svn.freebsd.org) Message-Id: <201312161225.rBGCPUs0025601@svn.freebsd.org> From: Rene Ladan Date: Mon, 16 Dec 2013 12:25:30 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r336630 - head/audio/py-mpd2 X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 16 Dec 2013 12:25:30 -0000 Author: rene Date: Mon Dec 16 12:25:30 2013 New Revision: 336630 URL: http://svnweb.freebsd.org/changeset/ports/336630 Log: Drop now useless PYDISTUTILS_PKGNAME assignment. Submitted by: wg Modified: head/audio/py-mpd2/Makefile Modified: head/audio/py-mpd2/Makefile ============================================================================== --- head/audio/py-mpd2/Makefile Mon Dec 16 12:06:28 2013 (r336629) +++ head/audio/py-mpd2/Makefile Mon Dec 16 12:25:30 2013 (r336630) @@ -19,7 +19,6 @@ GH_COMMIT= df508d4 USE_PYTHON= yes USE_PYDISTUTILS= yes -PYDISTUTILS_PKGNAME= python_mpd2 PYDISTUTILS_AUTOPLIST= yes NO_ARCH= yes From owner-svn-ports-head@FreeBSD.ORG Mon Dec 16 12:52:19 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 0960BA1F; Mon, 16 Dec 2013 12:52:19 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id EA4221DBA; Mon, 16 Dec 2013 12:52:18 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBGCqIkf035681; Mon, 16 Dec 2013 12:52:18 GMT (envelope-from wg@svn.freebsd.org) Received: (from wg@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBGCqIlK035680; Mon, 16 Dec 2013 12:52:18 GMT (envelope-from wg@svn.freebsd.org) Message-Id: <201312161252.rBGCqIlK035680@svn.freebsd.org> From: William Grzybowski Date: Mon, 16 Dec 2013 12:52:18 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r336631 - head/Mk X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 16 Dec 2013 12:52:19 -0000 Author: wg Date: Mon Dec 16 12:52:18 2013 New Revision: 336631 URL: http://svnweb.freebsd.org/changeset/ports/336631 Log: Mk/bsd.sanity.mk: note about python auto plist and pkgname PYDISTUTILS_PKGNAME is useless when used with USE_PYDISTUTILS=yes and PYDISTUTILS_AUTOPLIST as its only function is to determine egg info name. Approved by: portmgr (bapt) Modified: head/Mk/bsd.sanity.mk Modified: head/Mk/bsd.sanity.mk ============================================================================== --- head/Mk/bsd.sanity.mk Mon Dec 16 12:25:30 2013 (r336630) +++ head/Mk/bsd.sanity.mk Mon Dec 16 12:52:18 2013 (r336631) @@ -149,3 +149,7 @@ DEV_WARNING+= "LICENSE must not contain .if defined(USE_PYDISTUTILS) && ${USE_PYDISTUTILS} == "easy_install" DEV_WARNING+= "USE_PYDISTUTILS=easy_install is deprecated, please use USE_PYDISTUTILS=yes" .endif + +.if defined(USE_PYDISTUTILS) && ${USE_PYDISTUTILS} != "easy_install" && defined(PYDISTUTILS_AUTOPLIST) && defined(PYDISTUTILS_PKGNAME) +DEV_WARNING+= "PYDISTUTILS_PKGNAME has no effect for USE_PYDISTUTILS=yes and PYDISTUTILS_AUTOPLIST=yes" +.endif From owner-svn-ports-head@FreeBSD.ORG Mon Dec 16 13:16:00 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 1499211E; Mon, 16 Dec 2013 13:16:00 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id EAD601F0B; Mon, 16 Dec 2013 13:15:59 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBGDFxpv043519; Mon, 16 Dec 2013 13:15:59 GMT (envelope-from amdmi3@svn.freebsd.org) Received: (from amdmi3@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBGDFxJk043517; Mon, 16 Dec 2013 13:15:59 GMT (envelope-from amdmi3@svn.freebsd.org) Message-Id: <201312161315.rBGDFxJk043517@svn.freebsd.org> From: Dmitry Marakasov Date: Mon, 16 Dec 2013 13:15:59 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r336634 - head/games/sea-defender X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 16 Dec 2013 13:16:00 -0000 Author: amdmi3 Date: Mon Dec 16 13:15:59 2013 New Revision: 336634 URL: http://svnweb.freebsd.org/changeset/ports/336634 Log: - Add LICENSE - Add icon - Fetch sources from GitHub - Set PORTVERSION corresponding to what's shown by the game (NO source changes from previously used tarball rolled by me) PR: 182950 Submitted by: nemysis Modified: head/games/sea-defender/Makefile head/games/sea-defender/distinfo Modified: head/games/sea-defender/Makefile ============================================================================== --- head/games/sea-defender/Makefile Mon Dec 16 13:11:40 2013 (r336633) +++ head/games/sea-defender/Makefile Mon Dec 16 13:15:59 2013 (r336634) @@ -2,36 +2,48 @@ # $FreeBSD$ PORTNAME= sea-defender -PORTVERSION= r20100723 -PORTREVISION= 3 +PORTVERSION= 0.9 CATEGORIES= games -MASTER_SITES= http://mirror.amdmi3.ru/distfiles/ +MASTER_SITES= http://mirror.amdmi3.ru/distfiles/:DEFAULT,icon \ + SF/nemysisfreebsdp/:icon +DISTFILES= ${DISTNAME}${EXTRACT_SUFX} \ + ${PORTNAME}.png:icon +EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX} MAINTAINER= amdmi3@FreeBSD.org COMMENT= Simple missile command clone +LICENSE= MIT + BUILD_DEPENDS= ${LOCALBASE}/lib/libglfw.a:${PORTSDIR}/graphics/glfw -USE_BZIP2= yes +USE_GITHUB= yes +GH_ACCOUNT= snoutmate +GH_PROJECT= Sea-Defender +GH_TAGNAME= ${GH_COMMIT} +GH_COMMIT= d628051 + USES= gmake USE_SDL= sdl mixer image ttf USE_GL= gl glu USE_XORG= x11 xrandr SUB_FILES= ${PORTNAME}.sh -PLIST_FILES= libexec/${PORTNAME} bin/${PORTNAME} - -WRKSRC= ${WRKDIR}/${PORTNAME} +PLIST_FILES= bin/${PORTNAME} \ + libexec/${PORTNAME} \ + share/pixmaps/${PORTNAME}.png -PORTDOCS= README +PORTDOCS= * DESKTOP_ENTRIES="Sea Defender" \ "${COMMENT}" \ - "" \ + "${PORTNAME}" \ "${PORTNAME}" \ "Game;ArcadeGame;" \ "" +OPTIONS_DEFINE= DOCS + .include .if defined(WITH_NEW_XORG) @@ -41,7 +53,8 @@ EXTRA_PATCHES+= ${FILESDIR}/extra-snoutl do-install: ${INSTALL_PROGRAM} ${WRKSRC}/sea ${STAGEDIR}${PREFIX}/libexec/${PORTNAME} ${INSTALL_SCRIPT} ${WRKDIR}/${PORTNAME}.sh ${STAGEDIR}${PREFIX}/bin/${PORTNAME} + ${INSTALL_DATA} ${_DISTDIR}/${PORTNAME}.png ${STAGEDIR}${PREFIX}/share/pixmaps/ ${MKDIR} ${STAGEDIR}${DOCSDIR} - ${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR} + ${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR}/ .include Modified: head/games/sea-defender/distinfo ============================================================================== --- head/games/sea-defender/distinfo Mon Dec 16 13:11:40 2013 (r336633) +++ head/games/sea-defender/distinfo Mon Dec 16 13:15:59 2013 (r336634) @@ -1,2 +1,4 @@ -SHA256 (sea-defender-r20100723.tar.bz2) = 2f8b11b3f047653d58b0dabc4384486bb3f3c173bed5f5592df070079cd73624 -SIZE (sea-defender-r20100723.tar.bz2) = 164757 +SHA256 (sea-defender-0.9.tar.gz) = d6a2ed363fb642960addcd8e43422f74f5516e6d331691703f920252d4f0596c +SIZE (sea-defender-0.9.tar.gz) = 191267 +SHA256 (sea-defender.png) = 823fe77ea032db6186ed71eec995a6038705757816f61112dc8dfb19e2e58aba +SIZE (sea-defender.png) = 2928 From owner-svn-ports-head@FreeBSD.ORG Mon Dec 16 13:41:56 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id CFB7C838; Mon, 16 Dec 2013 13:41:56 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id BC28310E6; Mon, 16 Dec 2013 13:41:56 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBGDfuXT053475; Mon, 16 Dec 2013 13:41:56 GMT (envelope-from amdmi3@svn.freebsd.org) Received: (from amdmi3@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBGDfuBl053473; Mon, 16 Dec 2013 13:41:56 GMT (envelope-from amdmi3@svn.freebsd.org) Message-Id: <201312161341.rBGDfuBl053473@svn.freebsd.org> From: Dmitry Marakasov Date: Mon, 16 Dec 2013 13:41:56 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r336635 - in head/games/lander: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 16 Dec 2013 13:41:56 -0000 Author: amdmi3 Date: Mon Dec 16 13:41:56 2013 New Revision: 336635 URL: http://svnweb.freebsd.org/changeset/ports/336635 Log: - Update to 0.6.5 Deleted: head/games/lander/files/ Modified: head/games/lander/Makefile head/games/lander/distinfo Modified: head/games/lander/Makefile ============================================================================== --- head/games/lander/Makefile Mon Dec 16 13:15:59 2013 (r336634) +++ head/games/lander/Makefile Mon Dec 16 13:41:56 2013 (r336635) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= lander -PORTVERSION= 0.6.4 +PORTVERSION= 0.6.5 PORTREVISION= 2 CATEGORIES= games MASTER_SITES= http://www.nickg.me.uk/files/ \ Modified: head/games/lander/distinfo ============================================================================== --- head/games/lander/distinfo Mon Dec 16 13:15:59 2013 (r336634) +++ head/games/lander/distinfo Mon Dec 16 13:41:56 2013 (r336635) @@ -1,2 +1,2 @@ -SHA256 (lander-0.6.4.tar.gz) = 48e26b117d7a15701bf8a5594734a80e2e5701e8bed8dab59823a436962f23e9 -SIZE (lander-0.6.4.tar.gz) = 1867588 +SHA256 (lander-0.6.5.tar.gz) = f9c30dda9d3d1244d2860f91a3c480d81c025efa5ef94d8880fdf28919c462db +SIZE (lander-0.6.5.tar.gz) = 1888502 From owner-svn-ports-head@FreeBSD.ORG Mon Dec 16 13:52:48 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id D7C9FC8D; Mon, 16 Dec 2013 13:52:48 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id C3D8411BD; Mon, 16 Dec 2013 13:52:48 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBGDqmmr057297; Mon, 16 Dec 2013 13:52:48 GMT (envelope-from zeising@svn.freebsd.org) Received: (from zeising@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBGDqmeK057296; Mon, 16 Dec 2013 13:52:48 GMT (envelope-from zeising@svn.freebsd.org) Message-Id: <201312161352.rBGDqmeK057296@svn.freebsd.org> From: Niclas Zeising Date: Mon, 16 Dec 2013 13:52:48 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r336637 - head/x11-servers/xorg-dmx X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 16 Dec 2013 13:52:48 -0000 Author: zeising Date: Mon Dec 16 13:52:48 2013 New Revision: 336637 URL: http://svnweb.freebsd.org/changeset/ports/336637 Log: Fix whitespace, no functional changes. Modified: head/x11-servers/xorg-dmx/pkg-plist Modified: head/x11-servers/xorg-dmx/pkg-plist ============================================================================== --- head/x11-servers/xorg-dmx/pkg-plist Mon Dec 16 13:50:57 2013 (r336636) +++ head/x11-servers/xorg-dmx/pkg-plist Mon Dec 16 13:52:48 2013 (r336637) @@ -15,4 +15,3 @@ man/man1/Xdmx.1.gz man/man1/dmxtodmx.1.gz man/man1/vdltodmx.1.gz man/man1/xdmxconfig.1.gz - From owner-svn-ports-head@FreeBSD.ORG Mon Dec 16 14:02:07 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id BA80AFAB; Mon, 16 Dec 2013 14:02:07 +0000 (UTC) Received: from prod2.absolight.net (mx3.absolight.net [IPv6:2a01:678:2:100::25]) (using TLSv1 with cipher ADH-CAMELLIA256-SHA (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 7910B126B; Mon, 16 Dec 2013 14:02:07 +0000 (UTC) Received: from prod2.absolight.net (localhost [127.0.0.1]) by prod2.absolight.net (Postfix) with ESMTP id 68679BDC6B; Mon, 16 Dec 2013 15:02:03 +0100 (CET) Received: from gw.in.absolight.net (gw-ecl.in.absolight.net [79.143.241.69]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client CN "gw.in.absolight.net", Issuer "CA Cert Signing Authority" (not verified)) by prod2.absolight.net (Postfix) with ESMTPSA id 1BA37BDC30; Mon, 16 Dec 2013 15:02:03 +0100 (CET) Received: from ogg.in.absolight.net (ogg.in.absolight.net [79.143.241.239]) by gw.in.absolight.net (Postfix) with ESMTP id 65C3B60E8; Mon, 16 Dec 2013 15:02:02 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by ogg.in.absolight.net (Postfix) with ESMTP id EB282661FAF5; Mon, 16 Dec 2013 15:02:01 +0100 (CET) Date: Mon, 16 Dec 2013 15:02:01 +0100 From: Mathieu Arnold To: Dmitry Sivachenko , ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: Re: svn commit: r336629 - head/net-mgmt/nagios-plugins Message-ID: <100C19230FBC9256A5F4117C@ogg.in.absolight.net> In-Reply-To: <201312161206.rBGC6SAK018728@svn.freebsd.org> References: <201312161206.rBGC6SAK018728@svn.freebsd.org> X-Mailer: Mulberry/4.0.8 (Mac OS X) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Content-Disposition: inline X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 16 Dec 2013 14:02:07 -0000 +--On 16 d=C3=A9cembre 2013 12:06:28 +0000 Dmitry Sivachenko wrote: | +.if ${PORT_OPTIONS:MEXTRAOPTS} | +CONFIGURE_ARGS+=3D --enable-extra-opts | +.endif Those three lines could be condensed into one : EXTRAOPTS_CONFIGURE_ENABLE=3D extra-opts --=20 Mathieu Arnold From owner-svn-ports-head@FreeBSD.ORG Mon Dec 16 14:12:52 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id F3B721E4; Mon, 16 Dec 2013 14:12:51 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id DFB5F130B; Mon, 16 Dec 2013 14:12:51 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBGECpUg066148; Mon, 16 Dec 2013 14:12:51 GMT (envelope-from zeising@svn.freebsd.org) Received: (from zeising@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBGECpcL066147; Mon, 16 Dec 2013 14:12:51 GMT (envelope-from zeising@svn.freebsd.org) Message-Id: <201312161412.rBGECpcL066147@svn.freebsd.org> From: Niclas Zeising Date: Mon, 16 Dec 2013 14:12:51 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r336638 - head/x11/xorg-libraries X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 16 Dec 2013 14:12:52 -0000 Author: zeising Date: Mon Dec 16 14:12:51 2013 New Revision: 336638 URL: http://svnweb.freebsd.org/changeset/ports/336638 Log: Readd missing portrevision. Noticed by: Jan Henrik Sylvester Modified: head/x11/xorg-libraries/Makefile Modified: head/x11/xorg-libraries/Makefile ============================================================================== --- head/x11/xorg-libraries/Makefile Mon Dec 16 13:52:48 2013 (r336637) +++ head/x11/xorg-libraries/Makefile Mon Dec 16 14:12:51 2013 (r336638) @@ -3,6 +3,7 @@ PORTNAME= xorg-libraries PORTVERSION= 7.7 +PORTREVISION= 1 CATEGORIES= x11 MASTER_SITES= # none DISTFILES= # none From owner-svn-ports-head@FreeBSD.ORG Mon Dec 16 14:14:39 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 587C7319; Mon, 16 Dec 2013 14:14:39 +0000 (UTC) Received: from mail-bk0-x234.google.com (mail-bk0-x234.google.com [IPv6:2a00:1450:4008:c01::234]) (using TLSv1 with cipher ECDHE-RSA-RC4-SHA (128/128 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 645F41323; Mon, 16 Dec 2013 14:14:38 +0000 (UTC) Received: by mail-bk0-f52.google.com with SMTP id u14so2337721bkz.39 for ; Mon, 16 Dec 2013 06:14:36 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:content-type:mime-version:subject:from:in-reply-to:date:cc :content-transfer-encoding:message-id:references:to; bh=ZAYlq2730q/zIuSUd050rfrz5CiQKDznxUQxCYfOQHc=; b=Y4RS5rDKW4nxBg+DyTNEIbB5CCclv1N7snakpdd3zO0GFXEBXn2c3gkd4fQMTZ4a6T RLvrdGhP4igd7V9h7E6NDJRors5S5XeZgIuAX9Hecd3zWfXS3/FZiL4LkegjN9sirveF dDJOXSkdg7Ha6dBNsxj41hG+Krgc7E3+u7z4cFJwnYx8kccX6RqAB66phZF/PgYvxlX3 Q3mxWJKycgPyzJ5+zus/Ns8qlz4KXx3F16paNrNXzkKDwJxVqXfGzBSfJqe4czB5G0M0 wxnW8jrI67bco5IUffG03P0Xds2jkJ75SeLjj288LBFOn91SwURxDkUkYC4teklDPDqc oo5A== X-Received: by 10.205.68.69 with SMTP id xx5mr389476bkb.143.1387203276560; Mon, 16 Dec 2013 06:14:36 -0800 (PST) Received: from ?IPv6:2a02:6b8::408:f459:ab36:e345:809f? ([2a02:6b8:0:408:f459:ab36:e345:809f]) by mx.google.com with ESMTPSA id tn8sm10651706bkb.16.2013.12.16.06.14.33 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 16 Dec 2013 06:14:34 -0800 (PST) Sender: Dmitry Sivachenko Content-Type: text/plain; charset=utf-8 Mime-Version: 1.0 (Mac OS X Mail 7.0 \(1822\)) Subject: Re: svn commit: r336629 - head/net-mgmt/nagios-plugins From: Dmitry Sivachenko In-Reply-To: <100C19230FBC9256A5F4117C@ogg.in.absolight.net> Date: Mon, 16 Dec 2013 18:14:31 +0400 Content-Transfer-Encoding: quoted-printable Message-Id: References: <201312161206.rBGC6SAK018728@svn.freebsd.org> <100C19230FBC9256A5F4117C@ogg.in.absolight.net> To: Mathieu Arnold X-Mailer: Apple Mail (2.1822) Cc: "svn-ports-head@FreeBSD.org" , "svn-ports-all@FreeBSD.org" , "ports-committers@FreeBSD.org" X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 16 Dec 2013 14:14:39 -0000 I tried this, but I do not see =E2=80=94enable-extra-opts in make -V = CONDFIGURE_ARGS output with EXTRAOPTS enabled. On 16 =D0=B4=D0=B5=D0=BA. 2013 =D0=B3., at 18:02, Mathieu Arnold = wrote: > +--On 16 d=C3=A9cembre 2013 12:06:28 +0000 Dmitry Sivachenko > wrote: > | +.if ${PORT_OPTIONS:MEXTRAOPTS} > | +CONFIGURE_ARGS+=3D --enable-extra-opts > | +.endif >=20 > Those three lines could be condensed into one : > EXTRAOPTS_CONFIGURE_ENABLE=3D extra-opts >=20 > --=20 > Mathieu Arnold From owner-svn-ports-head@FreeBSD.ORG Mon Dec 16 14:17:10 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id B397F437; Mon, 16 Dec 2013 14:17:10 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 9F2DB1348; Mon, 16 Dec 2013 14:17:10 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBGEHAw5066693; Mon, 16 Dec 2013 14:17:10 GMT (envelope-from zeising@svn.freebsd.org) Received: (from zeising@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBGEHAoY066692; Mon, 16 Dec 2013 14:17:10 GMT (envelope-from zeising@svn.freebsd.org) Message-Id: <201312161417.rBGEHAoY066692@svn.freebsd.org> From: Niclas Zeising Date: Mon, 16 Dec 2013 14:17:10 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r336639 - head/x11/xorg-libraries X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 16 Dec 2013 14:17:10 -0000 Author: zeising Date: Mon Dec 16 14:17:10 2013 New Revision: 336639 URL: http://svnweb.freebsd.org/changeset/ports/336639 Log: readd libXp as dependency. This got lost in the update. Modified: head/x11/xorg-libraries/Makefile Modified: head/x11/xorg-libraries/Makefile ============================================================================== --- head/x11/xorg-libraries/Makefile Mon Dec 16 14:12:51 2013 (r336638) +++ head/x11/xorg-libraries/Makefile Mon Dec 16 14:17:10 2013 (r336639) @@ -40,6 +40,7 @@ RUN_DEPENDS= ${LOCALBASE}/libdata/pkgcon ${LOCALBASE}/libdata/pkgconfig/xkbfile.pc:${PORTSDIR}/x11/libxkbfile \ ${LOCALBASE}/libdata/pkgconfig/xkbui.pc:${PORTSDIR}/x11/libxkbui \ ${LOCALBASE}/libdata/pkgconfig/xmu.pc:${PORTSDIR}/x11-toolkits/libXmu \ + ${LOCALBASE}/libdata/pkgconfig/xp.pc:${PORTSDIR}/x11/libXp \ ${LOCALBASE}/libdata/pkgconfig/xpm.pc:${PORTSDIR}/x11/libXpm \ ${LOCALBASE}/libdata/pkgconfig/xrandr.pc:${PORTSDIR}/x11/libXrandr \ ${LOCALBASE}/libdata/pkgconfig/xrender.pc:${PORTSDIR}/x11/libXrender \ From owner-svn-ports-head@FreeBSD.ORG Mon Dec 16 14:27:41 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 2E3D7791; Mon, 16 Dec 2013 14:27:41 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 19BE81435; Mon, 16 Dec 2013 14:27:41 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBGERegY070244; Mon, 16 Dec 2013 14:27:40 GMT (envelope-from gahr@svn.freebsd.org) Received: (from gahr@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBGEReRN070241; Mon, 16 Dec 2013 14:27:40 GMT (envelope-from gahr@svn.freebsd.org) Message-Id: <201312161427.rBGEReRN070241@svn.freebsd.org> From: Pietro Cerutti Date: Mon, 16 Dec 2013 14:27:40 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r336640 - head/print/lilypond-devel X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 16 Dec 2013 14:27:41 -0000 Author: gahr Date: Mon Dec 16 14:27:40 2013 New Revision: 336640 URL: http://svnweb.freebsd.org/changeset/ports/336640 Log: - Update to 2.17.97 - STAGE-clean - Explicitely depend on Python 2 Modified: head/print/lilypond-devel/Makefile head/print/lilypond-devel/distinfo head/print/lilypond-devel/pkg-plist Modified: head/print/lilypond-devel/Makefile ============================================================================== --- head/print/lilypond-devel/Makefile Mon Dec 16 14:17:10 2013 (r336639) +++ head/print/lilypond-devel/Makefile Mon Dec 16 14:27:40 2013 (r336640) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= lilypond -PORTVERSION= 2.17.26 +PORTVERSION= 2.17.97 CATEGORIES= print audio MASTER_SITES= http://download.linuxaudio.org/lilypond/sources/v${PORTVERSION:R}/ PKGNAMESUFFIX= -devel @@ -10,15 +10,17 @@ PKGNAMESUFFIX= -devel MAINTAINER= gahr@FreeBSD.org COMMENT= The GNU music typesetter +LICENSE= GPLv3 + BUILD_DEPENDS= pdftexi2dvi:${PORTSDIR}/print/texinfo \ t1ascii:${PORTSDIR}/print/t1utils \ bash:${PORTSDIR}/shells/bash \ fontforge:${PORTSDIR}/print/fontforge \ ${LOCALBASE}/share/ghostscript/fonts/c059033l.pfb:${PORTSDIR}/print/gsfonts -LIB_DEPENDS= guile:${PORTSDIR}/lang/guile \ - gmp:${PORTSDIR}/math/gmp \ - freetype:${PORTSDIR}/print/freetype2 +LIB_DEPENDS= libguile.so:${PORTSDIR}/lang/guile \ + libgmp.so:${PORTSDIR}/math/gmp \ + libfreetype.so:${PORTSDIR}/print/freetype2 RUN_DEPENDS= dblatex:${PORTSDIR}/textproc/dblatex \ mftrace:${PORTSDIR}/print/mftrace \ @@ -26,10 +28,6 @@ RUN_DEPENDS= dblatex:${PORTSDIR}/textpro convert:${PORTSDIR}/graphics/ImageMagick \ ${LOCALBASE}/lib/X11/fonts/dejavu/DejaVuSans-Bold.ttf:${PORTSDIR}/x11-fonts/dejavu -MAN1= lilymidi.1 lilypond-book.1 lilypond-invoke-editor.1 \ - lilypond.1 lilysong.1 convert-ly.1 abc2ly.1 etf2ly.1 \ - midi2ly.1 musicxml2ly.1 - INFO= lilypond-notation \ lilypond-usage \ lilypond-internals \ @@ -45,7 +43,7 @@ INFO= lilypond-notation \ USES= bison gettext gmake pkgconfig perl5 USE_GHOSTSCRIPT=9 -USE_PYTHON= yes +USE_PYTHON= 2 USE_PERL5= build USE_TEX= latex USE_GNOME= pango @@ -65,7 +63,6 @@ NOCCACHE= yes PLIST_SUB= PORTVERSION=${PORTVERSION} -NO_STAGE= yes .include .if ${PORT_OPTIONS:MNLS} @@ -82,6 +79,6 @@ post-patch: .endif post-install: - @${LN} -fs ${DATADIR}/${PORTVERSION} ${DATADIR}/current + @${LN} -fs ${DATADIR}/${PORTVERSION} ${STAGEDIR}${DATADIR}/current .include Modified: head/print/lilypond-devel/distinfo ============================================================================== --- head/print/lilypond-devel/distinfo Mon Dec 16 14:17:10 2013 (r336639) +++ head/print/lilypond-devel/distinfo Mon Dec 16 14:27:40 2013 (r336640) @@ -1,2 +1,2 @@ -SHA256 (lilypond-2.17.26.tar.gz) = 76f9d1c0302a4cf42a39dfc5876e6e3560b1f9c999a054d40129b1dece07cc2e -SIZE (lilypond-2.17.26.tar.gz) = 15953761 +SHA256 (lilypond-2.17.97.tar.gz) = ca8d1bc03f35399d40f768d773282e44c903a6315669d0cd385fb0c473d4aebf +SIZE (lilypond-2.17.97.tar.gz) = 15982053 Modified: head/print/lilypond-devel/pkg-plist ============================================================================== --- head/print/lilypond-devel/pkg-plist Mon Dec 16 14:17:10 2013 (r336639) +++ head/print/lilypond-devel/pkg-plist Mon Dec 16 14:27:40 2013 (r336640) @@ -8,6 +8,16 @@ bin/abc2ly bin/convert-ly bin/etf2ly bin/midi2ly +man/man1/lilymidi.1.gz +man/man1/lilypond-book.1.gz +man/man1/lilypond-invoke-editor.1.gz +man/man1/lilypond.1.gz +man/man1/lilysong.1.gz +man/man1/convert-ly.1.gz +man/man1/abc2ly.1.gz +man/man1/etf2ly.1.gz +man/man1/midi2ly.1.gz +man/man1/musicxml2ly.1.gz lib/lilypond/%%PORTVERSION%%/python/midi.so %%DATADIR%%/%%PORTVERSION%%/fonts/otf/CenturySchL-Bold.otf %%DATADIR%%/%%PORTVERSION%%/fonts/otf/CenturySchL-BoldItal.otf From owner-svn-ports-head@FreeBSD.ORG Mon Dec 16 14:45:40 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 333CCDAA; Mon, 16 Dec 2013 14:45:40 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 1D74D15A7; Mon, 16 Dec 2013 14:45:40 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBGEjehv077010; Mon, 16 Dec 2013 14:45:40 GMT (envelope-from wg@svn.freebsd.org) Received: (from wg@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBGEjdQj077008; Mon, 16 Dec 2013 14:45:39 GMT (envelope-from wg@svn.freebsd.org) Message-Id: <201312161445.rBGEjdQj077008@svn.freebsd.org> From: William Grzybowski Date: Mon, 16 Dec 2013 14:45:39 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r336641 - in head/net/minidlna: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 16 Dec 2013 14:45:40 -0000 Author: wg Date: Mon Dec 16 14:45:39 2013 New Revision: 336641 URL: http://svnweb.freebsd.org/changeset/ports/336641 Log: net/minidlna: use newer kqueue patch - Use newer kqueue patch - Use autotools to regenerate configure required for the patch Modified: head/net/minidlna/Makefile head/net/minidlna/files/patch-kqueue Modified: head/net/minidlna/Makefile ============================================================================== --- head/net/minidlna/Makefile Mon Dec 16 14:27:40 2013 (r336640) +++ head/net/minidlna/Makefile Mon Dec 16 14:45:39 2013 (r336641) @@ -3,7 +3,7 @@ PORTNAME= minidlna PORTVERSION= 1.1.1 -PORTREVISION= 2 +PORTREVISION= 3 PORTEPOCH= 1 CATEGORIES= net multimedia www MASTER_SITES= SF @@ -21,11 +21,13 @@ LIB_DEPENDS= libsqlite3.so:${PORTSDIR}/d libavformat.so:${PORTSDIR}/multimedia/ffmpeg GNU_CONFIGURE= yes -CONFIGURE_ARGS+=--with-db-path=/var/db/minidlna \ +CONFIGURE_ARGS= --with-db-path=/var/db/minidlna \ --with-os-url="http://www.FreeBSD.org" CFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib USES= iconv +USE_AUTOTOOLS= autoconf aclocal automake +AUTOMAKE_ARGS= --add-missing PKGMESSAGE= ${WRKSRC}/pkg-message SUB_FILES+= pkg-message Modified: head/net/minidlna/files/patch-kqueue ============================================================================== --- head/net/minidlna/files/patch-kqueue Mon Dec 16 14:27:40 2013 (r336640) +++ head/net/minidlna/files/patch-kqueue Mon Dec 16 14:45:39 2013 (r336641) @@ -1,6 +1,5 @@ -diff -ruN configure.ac.orig configure.ac ---- configure.ac.orig 2013-11-02 02:06:41.000000000 +0100 -+++ configure.ac 2013-11-21 13:22:46.000000000 +0100 +--- ./configure.ac.orig 2013-11-02 05:06:41.000000000 +0400 ++++ ./configure.ac 2013-11-13 17:25:27.000000000 +0400 @@ -453,7 +453,7 @@ ################################################################################################################ ### Header checks @@ -10,11 +9,13 @@ diff -ruN configure.ac.orig configure.ac AC_CHECK_FUNCS(inotify_init, AC_DEFINE(HAVE_INOTIFY,1,[Whether kernel has inotify support]), [ AC_MSG_CHECKING([for __NR_inotify_init syscall]) -diff -ruN inotify.c.orig inotify.c ---- inotify.c.orig 2013-11-02 02:06:41.000000000 +0100 -+++ inotify.c 2013-11-21 13:49:58.000000000 +0100 -@@ -17,7 +17,7 @@ +--- ./inotify.c.orig 2013-11-02 05:06:41.000000000 +0400 ++++ ./inotify.c 2013-11-13 17:25:27.000000000 +0400 +@@ -15,9 +15,10 @@ + * You should have received a copy of the GNU General Public License + * along with MiniDLNA. If not, see . */ ++ #include "config.h" -#ifdef HAVE_INOTIFY @@ -22,7 +23,7 @@ diff -ruN inotify.c.orig inotify.c #include #include #include -@@ -31,11 +31,16 @@ +@@ -31,11 +32,16 @@ #include #include #include @@ -40,13 +41,15 @@ diff -ruN inotify.c.orig inotify.c #endif #include "libav.h" -@@ -49,11 +54,13 @@ +@@ -49,11 +55,13 @@ #include "playlist.h" #include "log.h" +-#define EVENT_SIZE ( sizeof (struct inotify_event) ) +-#define BUF_LEN ( 1024 * ( EVENT_SIZE + 16 ) ) +#ifdef HAVE_INOTIFY - #define EVENT_SIZE ( sizeof (struct inotify_event) ) - #define BUF_LEN ( 1024 * ( EVENT_SIZE + 16 ) ) ++#define EVENT_SIZE ( sizeof (struct inotify_event) ) ++#define BUF_LEN ( 1024 * ( EVENT_SIZE + 16 ) ) #define DESIRED_WATCH_LIMIT 65536 #define PATH_BUF_SIZE PATH_MAX @@ -54,58 +57,55 @@ diff -ruN inotify.c.orig inotify.c struct watch { -@@ -86,6 +93,7 @@ +@@ -86,12 +94,34 @@ struct watch *nw; int wd; -+ #ifdef HAVE_INOTIFY ++#ifdef HAVE_INOTIFY wd = inotify_add_watch(fd, path, IN_CREATE|IN_CLOSE_WRITE|IN_DELETE|IN_MOVE); if( wd < 0 ) { -@@ -93,6 +101,25 @@ + DPRINTF(E_ERROR, L_INOTIFY, "inotify_add_watch(%s) [%s]\n", path, strerror(errno)); return -1; } - +#else /*HAVE_INOTIFY*/ -+ wd = open(path, O_RDONLY); -+ if (wd == -1) -+ { -+ DPRINTF(E_ERROR, L_INOTIFY, "inotify_add_watch[kqueue,open](%s) [%s]\n", path, strerror(errno)); -+ return -1; -+ } -+ struct kevent ke; -+ EV_SET(&ke, wd, -+ EVFILT_VNODE, -+ EV_ADD | EV_ENABLE | EV_CLEAR, -+ NOTE_DELETE | NOTE_WRITE | NOTE_EXTEND /*| NOTE_ATTRB*/, -+ 0, NULL); -+ if( kevent(fd, &ke, 1, NULL, 0, NULL) == -1 ) -+ { -+ DPRINTF(E_ERROR, L_INOTIFY, "inotify_add_watch[kqueue](%s) [%s]\n", path, strerror(errno)); -+ return -1; -+ } -+#endif ++ wd = open(path, O_RDONLY); ++ if (wd == -1) ++ { ++ DPRINTF(E_ERROR, L_INOTIFY, "inotify_add_watch[kqueue,open](%s) [%s]\n", path, strerror(errno)); ++ return -1; ++ } ++ ++ struct kevent ke; ++ EV_SET(&ke, wd, ++ EVFILT_VNODE, ++ EV_ADD | EV_ENABLE | EV_CLEAR, ++ NOTE_DELETE | NOTE_WRITE | NOTE_EXTEND /*| NOTE_ATTRB*/, ++ 0, NULL); ++ ++ if( kevent(fd, &ke, 1, NULL, 0, NULL) == -1 ) ++ { ++ DPRINTF(E_ERROR, L_INOTIFY, "inotify_add_watch[kqueue](%s) [%s]\n", path, strerror(errno)); ++ return -1; ++ } ++#endif + nw = malloc(sizeof(struct watch)); if( nw == NULL ) - { -@@ -125,9 +152,15 @@ +@@ -125,7 +155,12 @@ for( w = watches; w; w = w->next ) { if( strcmp(path, w->path) == 0 ) -+ #ifdef HAVE_INOTIFY ++#ifdef HAVE_INOTIFY return(inotify_rm_watch(fd, w->wd)); -- } -+ #else ++#else + close(w->wd); /* kqueue cleans up events when handle dies*/ + return(0); -+ #endif -+ } ++#endif + } -+ return 1; - } - -@@ -145,8 +178,7 @@ +@@ -145,15 +180,14 @@ int inotify_create_watches(int fd) { @@ -115,406 +115,681 @@ diff -ruN inotify.c.orig inotify.c char **result; int i, rows = 0; struct media_dir_s * media_path; -@@ -165,6 +197,9 @@ + + for( media_path = media_dirs; media_path != NULL; media_path = media_path->next ) + { +- DPRINTF(E_DEBUG, L_INOTIFY, "Add watch to %s\n", media_path->path); ++ DPRINTF(E_DEBUG, L_INOTIFY, "Setiing up monitoring on %s\n", media_path->path); + add_watch(fd, media_path->path); + num_watches++; + } +@@ -165,7 +199,11 @@ num_watches++; } sqlite3_free_table(result); -+ #ifdef HAVE_INOTIFY -+ FILE * max_watches; -+ unsigned int watch_limit; - +- ++ ++#ifdef HAVE_INOTIFY ++ FILE * max_watches; ++ unsigned int watch_limit; ++ max_watches = fopen("/proc/sys/fs/inotify/max_user_watches", "r"); if( max_watches ) -@@ -204,7 +239,7 @@ - DPRINTF(E_WARN, L_INOTIFY, "WARNING: Could not read inotify max_user_watches! " - "Hopefully it is enough to cover %u current directories plus any new ones added.\n", num_watches); + { +@@ -194,16 +232,17 @@ + else + { + DPRINTF(E_WARN, L_INOTIFY, "WARNING: Inotify max_user_watches [%u] is low or close to the number of used watches [%u] " +- "and I do not have permission to increase this limit. Please do so manually by " +- "writing a higher value into /proc/sys/fs/inotify/max_user_watches.\n", watch_limit, num_watches); ++ "and I do not have permission to increase this limit. Please do so manually by " ++ "writing a higher value into /proc/sys/fs/inotify/max_user_watches.\n", watch_limit, num_watches); + } + } + } + else + { +- DPRINTF(E_WARN, L_INOTIFY, "WARNING: Could not read inotify max_user_watches! " +- "Hopefully it is enough to cover %u current directories plus any new ones added.\n", num_watches); ++ DPRINTF(E_WARN, L_INOTIFY, "WARNING: Could not read inotify max_user_watches! " ++ "Hopefully it is enough to cover %u current directories plus any new ones added.\n", num_watches); } -- +#endif + return rows; } - -@@ -218,7 +253,11 @@ +@@ -218,7 +257,11 @@ while( w ) { last_w = w; -+ #ifdef HAVE_INOTIFY ++#ifdef HAVE_INOTIFY inotify_rm_watch(fd, w->wd); -+ #else -+ close(w->wd); /*kqueue cleans up after fhandle dies*/ -+ #endif ++#else ++ close(w->wd); /*kqueue cleans up after fhandle dies*/ ++#endif free(w->path); rm_watches++; w = w->next; -@@ -294,6 +333,8 @@ +@@ -261,10 +304,10 @@ + while( (e = readdir(ds)) ) + { + if( strcmp(e->d_name, ".") == 0 || +- strcmp(e->d_name, "..") == 0 ) ++ strcmp(e->d_name, "..") == 0 ) + continue; + if( (e->d_type == DT_DIR) || +- (e->d_type == DT_UNKNOWN && resolve_unknown_type(dir, NO_MEDIA) == TYPE_DIR) ) ++ (e->d_type == DT_UNKNOWN && resolve_unknown_type(dir, NO_MEDIA) == TYPE_DIR) ) + i += add_dir_watch(fd, dir, e->d_name); + } + } +@@ -294,6 +337,8 @@ struct media_dir_s * media_path = media_dirs; struct stat st; + DPRINTF(E_DEBUG, L_INOTIFY, "inotify_insert_file: %s @ %s\n", name, path); -+ ++ /* Is it cover art for another file? */ if( is_image(path) ) update_if_album_art(path); -@@ -421,7 +462,7 @@ +@@ -314,25 +359,25 @@ + { + case ALL_MEDIA: + if( !is_image(path) && +- !is_audio(path) && +- !is_video(path) && +- !is_playlist(path) ) ++ !is_audio(path) && ++ !is_video(path) && ++ !is_playlist(path) ) + return -1; + break; + case TYPE_AUDIO: + if( !is_audio(path) && +- !is_playlist(path) ) ++ !is_playlist(path) ) + return -1; + break; + case TYPE_AUDIO|TYPE_VIDEO: + if( !is_audio(path) && +- !is_video(path) && +- !is_playlist(path) ) ++ !is_video(path) && ++ !is_playlist(path) ) + break; + case TYPE_AUDIO|TYPE_IMAGES: + if( !is_image(path) && +- !is_audio(path) && +- !is_playlist(path) ) ++ !is_audio(path) && ++ !is_playlist(path) ) + return -1; + break; + case TYPE_VIDEO: +@@ -341,14 +386,14 @@ + break; + case TYPE_VIDEO|TYPE_IMAGES: + if( !is_image(path) && +- !is_video(path) ) ++ !is_video(path) ) + return -1; + break; + case TYPE_IMAGES: + if( !is_image(path) ) + return -1; + break; +- default: ++ default: + return -1; + break; + } +@@ -371,11 +416,11 @@ + inotify_remove_file(path); + } + +- /* Find the parentID. If it's not found, create all necessary parents. */ ++ /* Find the parentID. If it's not found, create all necessary parents. */ + len = strlen(path)+1; + if( !(path_buf = malloc(len)) || +- !(last_dir = malloc(len)) || +- !(base_name = malloc(len)) ) ++ !(last_dir = malloc(len)) || ++ !(base_name = malloc(len)) ) + return -1; + base_copy = base_name; + while( depth ) +@@ -386,9 +431,9 @@ + + do + { +- //DEBUG DPRINTF(E_DEBUG, L_INOTIFY, "Checking %s\n", parent_buf); ++ /*DEBUG DPRINTF(E_DEBUG, L_INOTIFY, "Checking %s\n", parent_buf);*/ + id = sql_get_text_field(db, "SELECT OBJECT_ID from OBJECTS o left join DETAILS d on (d.ID = o.DETAIL_ID)" +- " where d.PATH = '%q' and REF_ID is NULL", parent_buf); ++ " where d.PATH = '%q' and REF_ID is NULL", parent_buf); + if( id ) + { + if( !depth ) +@@ -421,13 +466,13 @@ if( !depth ) { - //DEBUG DPRINTF(E_DEBUG, L_INOTIFY, "Inserting %s\n", name); -+ DPRINTF(E_DEBUG, L_INOTIFY, "Inserting %s\n", name); ++ DPRINTF(E_DEBUG, L_INOTIFY, "Inserting %s\n", name); insert_file(name, path, id+2, get_next_available_id("OBJECTS", id)); sqlite3_free(id); if( (is_audio(path) || is_playlist(path)) && next_pl_fill != 1 ) -@@ -446,6 +487,8 @@ + { + next_pl_fill = time(NULL) + 120; // Schedule a playlist scan for 2 minutes from now. +- //DEBUG DPRINTF(E_WARN, L_INOTIFY, "Playlist scan scheduled for %s", ctime(&next_pl_fill)); ++ //DEBUG DPRINTF(E_WARN, L_INOTIFY, "Playlist scan scheduled for %s", ctime(&next_pl_fill)); + } + } + return depth; +@@ -446,6 +491,8 @@ struct media_dir_s* media_path; struct stat st; + DPRINTF(E_DEBUG, L_INOTIFY, "inotify_insert_directory: %s @ %s\n", name, path); -+ ++ if( access(path, R_OK|X_OK) != 0 ) { DPRINTF(E_WARN, L_INOTIFY, "Could not access %s [%s]\n", path, strerror(errno)); -@@ -537,6 +580,7 @@ - char **result; +@@ -459,7 +506,7 @@ + + parent_buf = strdup(path); + id = sql_get_text_field(db, "SELECT OBJECT_ID from OBJECTS o left join DETAILS d on (d.ID = o.DETAIL_ID)" +- " where d.PATH = '%q' and REF_ID is NULL", dirname(parent_buf)); ++ " where d.PATH = '%q' and REF_ID is NULL", dirname(parent_buf)); + if( !id ) + id = sqlite3_mprintf("%s", BROWSEDIR_ID); + insert_directory(name, path, BROWSEDIR_ID, id+2, get_next_available_id("OBJECTS", id)); +@@ -538,9 +585,12 @@ int64_t detailID; int rows, playlist; -+ DPRINTF(E_DEBUG, L_INOTIFY, "inotify_remove_file: %s\n", path); ++ DPRINTF(E_DEBUG, L_INOTIFY, "inotify_remove_file: %s\n", path); ++ if( ends_with(path, ".srt") ) { -@@ -582,6 +626,8 @@ +- return sql_exec(db, "DELETE from CAPTIONS where PATH = '%q'", path); ++ rows = sql_exec(db, "DELETE from CAPTIONS where PATH = '%q'", path); ++ return rows; + } + /* Invalidate the scanner cache so we don't insert files into non-existent containers */ + valid_cache = 0; +@@ -554,27 +604,25 @@ + { + sql_exec(db, "DELETE from PLAYLISTS where ID = %lld", detailID); + sql_exec(db, "DELETE from DETAILS where ID =" +- " (SELECT DETAIL_ID from OBJECTS where OBJECT_ID = '%s$%llX')", +- MUSIC_PLIST_ID, detailID); ++ " (SELECT DETAIL_ID from OBJECTS where OBJECT_ID = '%s$%llX')", ++ MUSIC_PLIST_ID, detailID); + sql_exec(db, "DELETE from OBJECTS where OBJECT_ID = '%s$%llX' or PARENT_ID = '%s$%llX'", +- MUSIC_PLIST_ID, detailID, MUSIC_PLIST_ID, detailID); ++ MUSIC_PLIST_ID, detailID, MUSIC_PLIST_ID, detailID); + } + else + { + /* Delete the parent containers if we are about to empty them. */ +- snprintf(sql, sizeof(sql), "SELECT PARENT_ID from OBJECTS where DETAIL_ID = %lld" +- " and PARENT_ID not like '64$%%'", +- (long long int)detailID); ++ snprintf(sql, sizeof(sql), "SELECT PARENT_ID from OBJECTS where DETAIL_ID = %lld", (long long int)detailID); + if( (sql_get_table(db, sql, &result, &rows, NULL) == SQLITE_OK) ) + { + int i, children; +- for( i = 1; i <= rows; i++ ) ++ for( i=1; i <= rows; i++ ) + { + /* If it's a playlist item, adjust the item count of the playlist */ + if( strncmp(result[i], MUSIC_PLIST_ID, strlen(MUSIC_PLIST_ID)) == 0 ) + { + sql_exec(db, "UPDATE PLAYLISTS set FOUND = (FOUND-1) where ID = %d", +- atoi(strrchr(result[i], '$') + 1)); ++ atoi(strrchr(result[i], '$') + 1)); + } + + children = sql_get_int_field(db, "SELECT count(*) from OBJECTS where PARENT_ID = '%s'", result[i]); +@@ -582,6 +630,8 @@ continue; if( children < 2 ) { + sql_exec(db, "DELETE from DETAILS where ID =" -+ " (SELECT DETAIL_ID from OBJECTS where OBJECT_ID = '%s')", result[i]); ++ " (SELECT DETAIL_ID from OBJECTS where OBJECT_ID = '%s')", result[i]); sql_exec(db, "DELETE from OBJECTS where OBJECT_ID = '%s'", result[i]); ptr = strrchr(result[i], '$'); -@@ -589,7 +635,9 @@ +@@ -589,6 +639,8 @@ *ptr = '\0'; if( sql_get_int_field(db, "SELECT count(*) from OBJECTS where PARENT_ID = '%s'", result[i]) == 0 ) { -- sql_exec(db, "DELETE from OBJECTS where OBJECT_ID = '%s'", result[i]); -+ sql_exec(db, "DELETE from DETAILS where ID =" -+ " (SELECT DETAIL_ID from OBJECTS where OBJECT_ID = '%s')", result[i]); -+ sql_exec(db, "DELETE from OBJECTS where OBJECT_ID = '%s'", result[i]); ++ sql_exec(db, "DELETE from DETAILS where ID =" ++ " (SELECT DETAIL_ID from OBJECTS where OBJECT_ID = '%s')", result[i]); + sql_exec(db, "DELETE from OBJECTS where OBJECT_ID = '%s'", result[i]); } } - } -@@ -612,7 +660,7 @@ - char **result; +@@ -613,11 +665,13 @@ int64_t detailID = 0; int rows, i, ret = 1; -- + + DPRINTF(E_DEBUG, L_INOTIFY, "inotify_remove_directory: %s\n", path); ++ /* Invalidate the scanner cache so we don't insert files into non-existent containers */ valid_cache = 0; remove_watch(fd, path); -@@ -638,7 +686,7 @@ - + sql = sqlite3_mprintf("SELECT ID from DETAILS where (PATH > '%q/' and PATH <= '%q/%c')" +- " or PATH = '%q'", path, path, 0xFF, path); ++ " or PATH = '%q'", path, path, 0xFF, path); + if( (sql_get_table(db, sql, &result, &rows, NULL) == SQLITE_OK) ) + { + if( rows ) +@@ -639,6 +693,7 @@ return ret; } -- + +#ifdef HAVE_INOTIFY void * start_inotify() { -@@ -755,4 +803,218 @@ +@@ -649,7 +704,7 @@ + int length, i = 0; + char * esc_name = NULL; + struct stat st; +- ++ + pollfds[0].fd = inotify_init(); + pollfds[0].events = POLLIN; + +@@ -664,13 +719,13 @@ + } + inotify_create_watches(pollfds[0].fd); + if (setpriority(PRIO_PROCESS, 0, 19) == -1) +- DPRINTF(E_WARN, L_INOTIFY, "Failed to reduce inotify thread priority\n"); ++ DPRINTF(E_WARN, L_INOTIFY, "Failed to reduce inotify thread priority\n"); + sqlite3_release_memory(1<<31); + av_register_all(); +- ++ + while( !quitting ) + { +- length = poll(pollfds, 1, timeout); ++ length = poll(pollfds, 1, timeout); + if( !length ) + { + if( next_pl_fill && (time(NULL) >= next_pl_fill) ) +@@ -682,14 +737,14 @@ + } + else if( length < 0 ) + { +- if( (errno == EINTR) || (errno == EAGAIN) ) +- continue; +- else ++ if( (errno == EINTR) || (errno == EAGAIN) ) ++ continue; ++ else + DPRINTF(E_ERROR, L_INOTIFY, "read failed!\n"); + } + else + { +- length = read(pollfds[0].fd, buffer, BUF_LEN); ++ length = read(pollfds[0].fd, buffer, BUF_LEN); + } + + i = 0; +@@ -707,12 +762,12 @@ + sprintf(path_buf, "%s/%s", get_path_from_wd(event->wd), event->name); + if ( event->mask & IN_ISDIR && (event->mask & (IN_CREATE|IN_MOVED_TO)) ) + { +- DPRINTF(E_DEBUG, L_INOTIFY, "The directory %s was %s.\n", ++ DPRINTF(E_DEBUG, L_INOTIFY, "The directory %s was %s.\n", + path_buf, (event->mask & IN_MOVED_TO ? "moved here" : "created")); + inotify_insert_directory(pollfds[0].fd, esc_name, path_buf); + } + else if ( (event->mask & (IN_CLOSE_WRITE|IN_MOVED_TO|IN_CREATE)) && +- (lstat(path_buf, &st) == 0) ) ++ (lstat(path_buf, &st) == 0) ) + { + if( S_ISLNK(st.st_mode) ) + { +@@ -726,7 +781,7 @@ + else if( event->mask & (IN_CLOSE_WRITE|IN_MOVED_TO) && st.st_size > 0 ) + { + if( (event->mask & IN_MOVED_TO) || +- (sql_get_int_field(db, "SELECT TIMESTAMP from DETAILS where PATH = '%q'", path_buf) != st.st_mtime) ) ++ (sql_get_int_field(db, "SELECT TIMESTAMP from DETAILS where PATH = '%q'", path_buf) != st.st_mtime) ) + { + DPRINTF(E_DEBUG, L_INOTIFY, "The file %s was %s.\n", + path_buf, (event->mask & IN_MOVED_TO ? "moved here" : "changed")); +@@ -755,4 +810,234 @@ return 0; } -+ +#else +void * +start_kqueue() +{ -+ int global_kqueue_handle = -1; ++ int global_kqueue_handle = -1; + -+ global_kqueue_handle = kqueue(); -+ if ( global_kqueue_handle < 0 ) -+ DPRINTF(E_ERROR, L_INOTIFY, "kqueue() failed: %s\n", strerror(errno)); -+ -+ while( scanning ) -+ { -+ if( quitting ) -+ goto quitting; -+ sleep(1); -+ } -+ -+ inotify_create_watches(global_kqueue_handle); -+ if (setpriority(PRIO_PROCESS, 0, 19) == -1) -+ DPRINTF(E_WARN, L_INOTIFY, "Failed to reduce kqueue thread priority\n"); -+ sqlite3_release_memory(1<<31); -+ av_register_all(); -+ -+ while( !quitting ) -+ { -+ struct kevent ke; -+ if ( kevent(global_kqueue_handle, NULL, 0, &ke, 1, NULL) == -1 ) -+ { -+ DPRINTF(E_WARN, L_INOTIFY, "kevent polling failure: %s\n", strerror(errno)); -+ } -+ -+ /*DPRINTF(E_DEBUG, L_INOTIFY, "GOT KEVENT:\n" -+ "ident=0x%X, filter=0x%X, flags=0x%X, fflags=0x%X, data=0x%X, udata=0x%X\n", -+ ke.ident, ke.filter, ke.flags, ke.fflags, ke.data, ke.udata);*/ -+ char* dir_path = get_path_from_wd(ke.ident); -+ if (dir_path == NULL) -+ { -+ DPRINTF(E_ERROR, L_INOTIFY, "Path with FD=0x%X can't be resolved.\n", ke.ident); -+ continue; -+ } -+ -+ -+ -+ if (ke.fflags & NOTE_DELETE) -+ { -+ DPRINTF(E_DEBUG, L_INOTIFY, "Path [%s] deleted.\n", dir_path); -+ inotify_remove_directory(ke.ident, dir_path); -+ } -+ else if ((ke.fflags & (NOTE_WRITE | NOTE_LINK)) == (NOTE_WRITE | NOTE_LINK)) -+ { -+ DPRINTF(E_DEBUG, L_INOTIFY, "Path [%s] content updated (directory).\n", dir_path); -+ char * sql; -+ char **result; -+ int i, rows; -+ sql = sqlite3_mprintf("SELECT PATH from DETAILS where (PATH > '%q/' and PATH <= '%q/%c')" -+ " and SIZE = ''", dir_path, dir_path, 0xFF); -+ if( (sql_get_table(db, sql, &result, &rows, NULL) != SQLITE_OK) ) -+ { -+ DPRINTF(E_WARN, L_INOTIFY, "Read state [%s]: Query failed, not updating\n", dir_path); -+ sqlite3_free(sql); -+ continue; -+ } -+ -+ -+ for( i=1; i <= rows; i++ ) -+ { -+ DPRINTF(E_DEBUG, L_INOTIFY, "Indexed content: %s\n", result[i]); -+ if (access(result[i], R_OK) == -1) -+ { -+ /* actually, global_kqueue_handle is not used here */ -+ inotify_remove_directory(global_kqueue_handle, result[i]); -+ } -+ } -+ DIR* d; -+ struct dirent * entry; -+ d = opendir(dir_path); -+ if (!d) -+ { -+ DPRINTF(E_ERROR, L_INOTIFY, "Can't list [%s] (%s)\n", dir_path, strerror(errno)); -+ continue; -+ } -+ -+ for ( entry = readdir(d); entry != NULL; entry = readdir(d) ) -+ { -+ if ( (entry->d_type == DT_DIR) && -+ (strcmp(entry->d_name, "..") != 0) && -+ (strcmp(entry->d_name, ".") != 0) ) -+ { -+ -+ char tmp_path[PATH_MAX]; -+ int result_path_len; -+ result_path_len = snprintf(tmp_path, PATH_MAX, -+ "%s/%s", dir_path, entry->d_name); -+ if (result_path_len >= PATH_MAX) -+ { -+ DPRINTF(E_ERROR, L_INOTIFY, "File path too long for %s!", entry->d_name); -+ continue; -+ } -+ DPRINTF(E_DEBUG, L_INOTIFY, "Walking %s\n", tmp_path); -+ char found_flag = 0; -+ for( i=1; i <= rows; i++ ) -+ { -+ if (strcmp(result[i], tmp_path) == 0) -+ { -+ found_flag = 1; -+ break; -+ } -+ } -+ if ( !found_flag ) -+ { -+ char * esc_name = NULL; -+ esc_name = modifyString(strdup(entry->d_name), "&", "&amp;"); -+ inotify_insert_directory(global_kqueue_handle, esc_name, tmp_path); -+ free(esc_name); -+ } -+ } -+ } -+ -+ sqlite3_free_table(result); -+ sqlite3_free(sql); -+ } -+ else if (ke.fflags & NOTE_WRITE) -+ { -+ DPRINTF(E_DEBUG, L_INOTIFY, "Path [%s] content updated (file).\n", dir_path); -+ char * sql; -+ char **result; -+ int i, rows; -+ sql = sqlite3_mprintf("SELECT PATH from DETAILS where (PATH > '%q/' and PATH <= '%q/%c')" -+ " and SIZE <> ''", dir_path, dir_path, 0xFF); -+ if( (sql_get_table(db, sql, &result, &rows, NULL) != SQLITE_OK) ) -+ -+ { -+ DPRINTF(E_WARN, L_INOTIFY, "Read state [%s]: Query failed, not updating\n", dir_path); -+ sqlite3_free(sql); -+ continue; -+ } -+ for( i=1; i <= rows; i++ ) -+ { -+ DPRINTF(E_DEBUG, L_INOTIFY, "Indexed content: %s\n", result[i]); -+ if (access(result[i], R_OK) == -1) /*oops, our file is gone*/ -+ { -+ inotify_remove_file(result[i]); -+ } -+ } -+ -+ DIR* d; -+ struct dirent * entry; -+ d = opendir(dir_path); -+ if (!d) -+ { -+ DPRINTF(E_ERROR, L_INOTIFY, "Can't list [%s] (%s)\n", dir_path, strerror(errno)); -+ continue; -+ } -+ -+ for ( entry = readdir(d); entry != NULL; entry = readdir(d) ) -+ { -+ if ( (entry->d_type == DT_REG) || -+ (entry->d_type == DT_LNK) ) -+ { -+ char tmp_path[PATH_MAX]; -+ int result_path_len; -+ result_path_len = snprintf(tmp_path, PATH_MAX, -+ "%s/%s", dir_path, entry->d_name); -+ if (result_path_len >= PATH_MAX) -+ { -+ DPRINTF(E_ERROR, L_INOTIFY, "File path too long for %s!", entry->d_name); -+ continue; -+ } -+ -+ DPRINTF(E_DEBUG, L_INOTIFY, "Walking %s\n", tmp_path); -+ char found_flag = 0; -+ for( i=1; i <= rows; i++ ) -+ { -+ if (strcmp(result[i], tmp_path) == 0) -+ { -+ found_flag = 1; -+ break; -+ } -+ } -+ if ( !found_flag ) -+ { -+ char * esc_name = NULL; -+ struct stat st; -+ if( stat(tmp_path, &st) != 0 ) -+ { -+ DPRINTF(E_ERROR, L_INOTIFY, "'%s' disappeared!", tmp_path); -+ continue; -+ } -+ -+ esc_name = modifyString(strdup(entry->d_name), "&", "&amp;"); -+ if ( S_ISDIR(st.st_mode) ) -+ inotify_insert_directory(global_kqueue_handle, esc_name, tmp_path); -+ else -+ inotify_insert_file(esc_name, tmp_path); -+ free(esc_name); -+ } -+ } -+ } -+ -+ -+ -+ sqlite3_free_table(result); -+ sqlite3_free(sql); -+ } -+ } ++ global_kqueue_handle = kqueue(); ++ if ( global_kqueue_handle < 0 ) ++ { ++ DPRINTF(E_ERROR, L_INOTIFY, "kqueue() failed: %s\n", strerror(errno)); ++ return 0; ++ } ++ ++ while( scanning ) ++ { ++ if( quitting ) ++ goto quitting; ++ ++ DPRINTF(E_DEBUG, L_INOTIFY, "..waiting for scanning to complete...\n"); ++ sleep(1); ++ } ++ ++ DPRINTF(E_DEBUG, L_INOTIFY, "GOING WILD!\n"); ++ ++ inotify_create_watches(global_kqueue_handle); ++ if (setpriority(PRIO_PROCESS, 0, 19) == -1) ++ DPRINTF(E_WARN, L_INOTIFY, "Failed to reduce kqueue thread priority\n"); ++ sqlite3_release_memory(1<<31); ++ av_register_all(); ++ ++ while( !quitting ) ++ { ++ struct kevent ke; ++ if ( kevent(global_kqueue_handle, NULL, 0, &ke, 1, NULL) == -1 ) ++ { ++ DPRINTF(E_WARN, L_INOTIFY, "kevent polling failure: %s\n", strerror(errno)); ++ continue; ++ } ++ ++ /*DPRINTF(E_DEBUG, L_INOTIFY, "GOT KEVENT:\n" ++ "ident=0x%X, filter=0x%X, flags=0x%X, fflags=0x%X, data=0x%X, udata=0x%X\n", ++ ke.ident, ke.filter, ke.flags, ke.fflags, ke.data, ke.udata);*/ ++ ++ char* dir_path = get_path_from_wd(ke.ident); ++ if (dir_path == NULL) ++ { ++ DPRINTF(E_ERROR, L_INOTIFY, "Path with FD=0x%X can't be resolved.\n", ke.ident); ++ continue; ++ } ++ ++ if (ke.fflags & NOTE_DELETE) ++ { ++ DPRINTF(E_DEBUG, L_INOTIFY, "Path [%s] deleted.\n", dir_path); ++ inotify_remove_directory(ke.ident, dir_path); ++ } ++ else if ((ke.fflags & (NOTE_WRITE | NOTE_LINK)) == (NOTE_WRITE | NOTE_LINK)) ++ { ++ DPRINTF(E_DEBUG, L_INOTIFY, "Path [%s] content updated (directory).\n", dir_path); ++ ++ char * sql; ++ char **result; ++ int i, rows; ++ sql = sqlite3_mprintf("SELECT PATH from DETAILS where (PATH > '%q/' and PATH <= '%q/%c')" ++ " and SIZE = ''", dir_path, dir_path, 0xFF); ++ if( (sql_get_table(db, sql, &result, &rows, NULL) != SQLITE_OK) ) ++ { ++ DPRINTF(E_WARN, L_INOTIFY, "Read state [%s]: Query failed, not updating\n", dir_path); ++ sqlite3_free(sql); ++ continue; ++ } ++ ++ for( i=1; i <= rows; i++ ) ++ { ++ DPRINTF(E_DEBUG, L_INOTIFY, "Indexed content: %s\n", result[i]); ++ if (access(result[i], R_OK) == -1) ++ { ++ /* actually, global_kqueue_handle is not used here */ ++ inotify_remove_directory(global_kqueue_handle, result[i]); ++ } ++ } + -+ inotify_remove_watches(global_kqueue_handle); ++ DIR* d; ++ struct dirent * entry; ++ d = opendir(dir_path); ++ if (!d) ++ { ++ DPRINTF(E_ERROR, L_INOTIFY, "Can't list [%s] (%s)\n", dir_path, strerror(errno)); ++ continue; ++ } ++ ++ for ( entry = readdir(d); entry != NULL; entry = readdir(d) ) ++ { ++ if ( (entry->d_type == DT_DIR) && ++ (strcmp(entry->d_name, "..") != 0) && ++ (strcmp(entry->d_name, ".") != 0) ) ++ { ++ char tmp_path[PATH_MAX]; ++ int result_path_len; ++ ++ result_path_len = snprintf(tmp_path, PATH_MAX, ++ "%s/%s", dir_path, entry->d_name); ++ if (result_path_len >= PATH_MAX) ++ { ++ DPRINTF(E_ERROR, L_INOTIFY, "File path too long for %s!", entry->d_name); ++ continue; ++ } ++ ++ DPRINTF(E_DEBUG, L_INOTIFY, "Walking %s\n", tmp_path); ++ char found_flag = 0; ++ for( i=1; i <= rows; i++ ) ++ { ++ if (strcmp(result[i], tmp_path) == 0) ++ { ++ found_flag = 1; ++ break; ++ } ++ } ++ ++ if ( !found_flag ) ++ { ++ char * esc_name = NULL; ++ esc_name = modifyString(strdup(entry->d_name), "&", "&amp;"); ++ inotify_insert_directory(global_kqueue_handle, esc_name, tmp_path); ++ free(esc_name); ++ } ++ } ++ } ++ ++ closedir(d); ++ ++ sqlite3_free_table(result); ++ sqlite3_free(sql); ++ } ++ else if (ke.fflags & NOTE_WRITE) ++ { ++ DPRINTF(E_DEBUG, L_INOTIFY, "Path [%s] content updated (file).\n", dir_path); ++ ++ char * sql; ++ char **result; ++ int i, rows; ++ sql = sqlite3_mprintf("SELECT PATH from DETAILS where (PATH > '%q/' and PATH <= '%q/%c')" ++ " and SIZE <> ''", dir_path, dir_path, 0xFF); ++ if( (sql_get_table(db, sql, &result, &rows, NULL) != SQLITE_OK) ) ++ { ++ DPRINTF(E_WARN, L_INOTIFY, "Read state [%s]: Query failed, not updating\n", dir_path); ++ sqlite3_free(sql); ++ continue; ++ } ++ ++ for( i=1; i <= rows; i++ ) ++ { ++ DPRINTF(E_DEBUG, L_INOTIFY, "Indexed content: %s\n", result[i]); ++ if (access(result[i], R_OK) == -1) /*oops, our file is gone*/ ++ { ++ inotify_remove_file(result[i]); ++ } ++ } ++ ++ DIR* d; ++ struct dirent * entry; ++ d = opendir(dir_path); ++ if (!d) ++ { ++ DPRINTF(E_ERROR, L_INOTIFY, "Can't list [%s] (%s)\n", dir_path, strerror(errno)); ++ continue; ++ } ++ ++ for ( entry = readdir(d); entry != NULL; entry = readdir(d) ) ++ { ++ if ( (entry->d_type == DT_REG) || ++ (entry->d_type == DT_LNK) ) ++ { ++ char tmp_path[PATH_MAX]; ++ int result_path_len; ++ ++ result_path_len = snprintf(tmp_path, PATH_MAX, ++ "%s/%s", dir_path, entry->d_name); ++ if (result_path_len >= PATH_MAX) ++ { ++ DPRINTF(E_ERROR, L_INOTIFY, "File path too long for %s!", entry->d_name); ++ continue; ++ } ++ ++ DPRINTF(E_DEBUG, L_INOTIFY, "Walking %s\n", tmp_path); ++ ++ char found_flag = 0; ++ for( i=1; i <= rows; i++ ) ++ { ++ if (strcmp(result[i], tmp_path) == 0) ++ { ++ found_flag = 1; ++ break; ++ } ++ } ++ ++ if ( !found_flag ) ++ { ++ char * esc_name = NULL; ++ struct stat st; ++ ++ if( stat(tmp_path, &st) != 0 ) ++ { ++ DPRINTF(E_ERROR, L_INOTIFY, "'%s' disappeared!", tmp_path); ++ continue; ++ } ++ ++ esc_name = modifyString(strdup(entry->d_name), "&", "&amp;"); ++ if ( S_ISDIR(st.st_mode) ) ++ inotify_insert_directory(global_kqueue_handle, esc_name, tmp_path); ++ else ++ inotify_insert_file(esc_name, tmp_path); ++ free(esc_name); ++ } ++ } ++ } ++ ++ closedir(d); ++ ++ sqlite3_free_table(result); ++ sqlite3_free(sql); ++ } ++ } ++ inotify_remove_watches(global_kqueue_handle); +quitting: + -+ return 0; ++ return 0; +} -+ #endif ++ +#endif // defined(HAVE_INOTIFY) || defined(HAVE_SYS_EVENT_H) *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** From owner-svn-ports-head@FreeBSD.ORG Mon Dec 16 14:52:29 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 275E2F1; Mon, 16 Dec 2013 14:52:29 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 11F591661; Mon, 16 Dec 2013 14:52:29 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBGEqSbP080272; Mon, 16 Dec 2013 14:52:28 GMT (envelope-from zeising@svn.freebsd.org) Received: (from zeising@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBGEqQbR080259; Mon, 16 Dec 2013 14:52:26 GMT (envelope-from zeising@svn.freebsd.org) Message-Id: <201312161452.rBGEqQbR080259@svn.freebsd.org> From: Niclas Zeising Date: Mon, 16 Dec 2013 14:52:26 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r336642 - in head/devel/binutils: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 16 Dec 2013 14:52:29 -0000 Author: zeising Date: Mon Dec 16 14:52:26 2013 New Revision: 336642 URL: http://svnweb.freebsd.org/changeset/ports/336642 Log: Update to 2.24 Do not install libiberty.a to aviod conflicts with devel/gnulibiberty [0] Do not install include/ansidecl.h, to avoid conflicts with gcc49 [1] Fix gold usage when linking c++ code, related to ctors [2] Thanks to dim for help with getting gold to build with libc++! PR: ports/176406 [0], ports/184327 [1] Submitted by: Craig Leres [0] Gerald Pfeifer [1] Requested by: rdivacky [2] Added: head/devel/binutils/files/patch-gold_config.in (contents, props changed) head/devel/binutils/files/patch-gold_configure (contents, props changed) head/devel/binutils/files/patch-gold_options.h (contents, props changed) head/devel/binutils/files/patch-gold_stringpool.cc (contents, props changed) head/devel/binutils/files/patch-gold_system.h (contents, props changed) Deleted: head/devel/binutils/files/patch-bfd_Makefile.in head/devel/binutils/files/patch-gold_gold.h head/devel/binutils/files/patch-src_gas_config_tc-sparc.h Modified: head/devel/binutils/Makefile head/devel/binutils/distinfo head/devel/binutils/files/patch-gold_Makefile.in (contents, props changed) head/devel/binutils/files/patch-gold_script.cc (contents, props changed) head/devel/binutils/pkg-plist Modified: head/devel/binutils/Makefile ============================================================================== --- head/devel/binutils/Makefile Mon Dec 16 14:45:39 2013 (r336641) +++ head/devel/binutils/Makefile Mon Dec 16 14:52:26 2013 (r336642) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= binutils -PORTVERSION= 2.23.2 +PORTVERSION= 2.24 CATEGORIES= devel MASTER_SITES= ${MASTER_SITE_SOURCEWARE} MASTER_SITE_SUBDIR= binutils/releases @@ -36,26 +36,6 @@ CONFIGURE_ARGS+= --with-system-zlib \ --with-gmp=${LOCALBASE} \ --with-mpfr=${LOCALBASE} -MAN1= addr2line.1 \ - ar.1 \ - as.1 \ - c++filt.1 \ - gprof.1 \ - dlltool.1 \ - elfedit.1 \ - ld.1 \ - nlmconv.1 \ - nm.1 \ - objcopy.1 \ - objdump.1 \ - ranlib.1 \ - readelf.1 \ - size.1 \ - strings.1 \ - strip.1 \ - windmc.1 \ - windres.1 - INFO= as \ binutils \ standards \ @@ -64,7 +44,6 @@ INFO= as \ configure \ ld -NO_STAGE= yes .include # Actual earliest version may differ slightly @@ -91,11 +70,11 @@ CONFIGURE_TARGET= ${ARCH}-portbld-freebs post-install: .if ${OSVERSION} >= 900044 - ${INSTALL_DATA} ${WRKSRC}/include/plugin-api.h ${PREFIX}/include/ + ${INSTALL_DATA} ${WRKSRC}/include/plugin-api.h ${STAGEDIR}${PREFIX}/include/ .endif - @${FIND} -ds ${PREFIX}/${CONFIGURE_TARGET} ! -type d | \ - ${SED} -e 's,^${PREFIX}/,,' >> ${TMPPLIST} - @${FIND} -ds ${PREFIX}/${CONFIGURE_TARGET} -type d | \ - ${SED} -e 's,^${PREFIX}/,@dirrm ,' >> ${TMPPLIST} + @${FIND} -ds ${STAGEDIR}${PREFIX}/${CONFIGURE_TARGET} ! -type d | \ + ${SED} -e 's,^${STAGEDIR}${PREFIX}/,,' >> ${TMPPLIST} + @${FIND} -ds ${STAGEDIR}${PREFIX}/${CONFIGURE_TARGET} -type d | \ + ${SED} -e 's,^${STAGEDIR}${PREFIX}/,@dirrm ,' >> ${TMPPLIST} .include Modified: head/devel/binutils/distinfo ============================================================================== --- head/devel/binutils/distinfo Mon Dec 16 14:45:39 2013 (r336641) +++ head/devel/binutils/distinfo Mon Dec 16 14:52:26 2013 (r336642) @@ -1,2 +1,2 @@ -SHA256 (binutils-2.23.2.tar.bz2) = fe914e56fed7a9ec2eb45274b1f2e14b0d8b4f41906a5194eac6883cfe5c1097 -SIZE (binutils-2.23.2.tar.bz2) = 21440347 +SHA256 (binutils-2.24.tar.bz2) = e5e8c5be9664e7f7f96e0d09919110ab5ad597794f5b1809871177a0f0f14137 +SIZE (binutils-2.24.tar.bz2) = 22716802 Modified: head/devel/binutils/files/patch-gold_Makefile.in ============================================================================== --- head/devel/binutils/files/patch-gold_Makefile.in Mon Dec 16 14:45:39 2013 (r336641) +++ head/devel/binutils/files/patch-gold_Makefile.in Mon Dec 16 14:52:26 2013 (r336642) @@ -1,12 +1,11 @@ - -$FreeBSD$ - ---- gold/Makefile.in.orig -+++ gold/Makefile.in -@@ -368,7 +368,6 @@ - @INCINTL@ +--- gold/Makefile.in.orig 2013-11-04 16:33:39.000000000 +0100 ++++ gold/Makefile.in 2013-12-13 17:15:03.279391312 +0100 +@@ -419,7 +419,7 @@ + -DTOOLLIBDIR="\"$(tooldir)/lib\"" @INCINTL@ LIBIBERTY = ../libiberty/libiberty.a --@PLUGINS_TRUE@LIBDL = -ldl +-@PLUGINS_TRUE@LIBDL = @DLOPEN_LIBS@ ++@PLUGINS_TRUE@LIBDL = @THREADS_TRUE@THREADSLIB = -lpthread AM_YFLAGS = -d + Added: head/devel/binutils/files/patch-gold_config.in ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/binutils/files/patch-gold_config.in Mon Dec 16 14:52:26 2013 (r336642) @@ -0,0 +1,15 @@ +--- gold/config.in.orig 2012-09-11 11:20:40.000000000 +0200 ++++ gold/config.in 2013-06-22 20:44:46.000000000 +0200 +@@ -190,6 +190,12 @@ + /* Define to 1 if you have the header file. */ + #undef HAVE_WINDOWS_H + ++/* Define to 1 if you have the header file. */ ++#undef HAVE_UNORDERED_MAP ++ ++/* Define to 1 if you have the header file. */ ++#undef HAVE_UNORDERED_SET ++ + /* Define to 1 if you have the header file. */ + #undef HAVE_ZLIB_H + Added: head/devel/binutils/files/patch-gold_configure ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/binutils/files/patch-gold_configure Mon Dec 16 14:52:26 2013 (r336642) @@ -0,0 +1,23 @@ +--- gold/configure.orig 2013-11-08 11:13:48.000000000 +0100 ++++ gold/configure 2013-12-14 13:03:48.000000000 +0100 +@@ -7133,6 +7133,20 @@ + ac_compiler_gnu=$ac_cv_cxx_compiler_gnu + + ++for ac_header in unordered_set unordered_map ++do : ++ as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` ++ac_fn_cxx_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default" ++eval as_val=\$$as_ac_Header ++ if test "x$as_val" = x""yes; then : ++ cat >>confdefs.h <<_ACEOF ++#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 ++_ACEOF ++ ++fi ++ ++done ++ + for ac_header in tr1/unordered_set tr1/unordered_map + do : + as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` Added: head/devel/binutils/files/patch-gold_options.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/binutils/files/patch-gold_options.h Mon Dec 16 14:52:26 2013 (r336642) @@ -0,0 +1,15 @@ +--- gold/options.h.orig 2013-12-13 18:39:11.252052912 +0100 ++++ gold/options.h 2013-12-13 18:41:04.363051429 +0100 +@@ -716,9 +716,9 @@ + N_("Output cross reference table"), + N_("Do not output cross reference table")); + +- DEFINE_bool(ctors_in_init_array, options::TWO_DASHES, '\0', true, +- N_("Use DT_INIT_ARRAY for all constructors (default)"), +- N_("Handle constructors as directed by compiler")); ++ DEFINE_bool(ctors_in_init_array, options::TWO_DASHES, '\0', false, ++ N_("Use DT_INIT_ARRAY for all constructors"), ++ N_("Handle constructors as directed by compiler (default)")); + + DEFINE_bool(define_common, options::TWO_DASHES, 'd', false, + N_("Define common symbols"), Modified: head/devel/binutils/files/patch-gold_script.cc ============================================================================== --- head/devel/binutils/files/patch-gold_script.cc Mon Dec 16 14:45:39 2013 (r336641) +++ head/devel/binutils/files/patch-gold_script.cc Mon Dec 16 14:52:26 2013 (r336642) @@ -1,6 +1,3 @@ - -$FreeBSD$ - --- gold/script.cc.dist 2012-09-01 19:52:34.000000000 -0500 +++ gold/script.cc 2012-09-01 19:53:22.000000000 -0500 @@ -2534,8 +2534,6 @@ Added: head/devel/binutils/files/patch-gold_stringpool.cc ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/binutils/files/patch-gold_stringpool.cc Mon Dec 16 14:52:26 2013 (r336642) @@ -0,0 +1,23 @@ +--- gold/stringpool.cc.orig 2010-08-25 10:36:54.000000000 +0200 ++++ gold/stringpool.cc 2013-06-22 21:09:24.000000000 +0200 +@@ -73,7 +73,10 @@ Stringpool_template::re + { + this->key_to_offset_.reserve(n); + +-#if defined(HAVE_TR1_UNORDERED_MAP) ++#if defined(HAVE_UNORDERED_MAP) ++ this->string_set_.rehash(this->string_set_.size() + n); ++ return; ++#elif defined(HAVE_TR1_UNORDERED_MAP) + // rehash() implementation is broken in gcc 4.0.3's stl + //this->string_set_.rehash(this->string_set_.size() + n); + //return; +@@ -503,7 +506,7 @@ template + void + Stringpool_template::print_stats(const char* name) const + { +-#if defined(HAVE_TR1_UNORDERED_MAP) || defined(HAVE_EXT_HASH_MAP) ++#if defined(HAVE_UNORDERED_MAP) || defined(HAVE_TR1_UNORDERED_MAP) || defined(HAVE_EXT_HASH_MAP) + fprintf(stderr, _("%s: %s entries: %zu; buckets: %zu\n"), + program_name, name, this->string_set_.size(), + this->string_set_.bucket_count()); Added: head/devel/binutils/files/patch-gold_system.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/binutils/files/patch-gold_system.h Mon Dec 16 14:52:26 2013 (r336642) @@ -0,0 +1,24 @@ +--- gold/system.h.orig 2013-11-04 16:33:39.000000000 +0100 ++++ gold/system.h 2013-12-14 12:51:17.000000000 +0100 +@@ -57,7 +57,20 @@ + + // Figure out how to get a hash set and a hash map. + +-#if defined(HAVE_TR1_UNORDERED_SET) && defined(HAVE_TR1_UNORDERED_MAP) \ ++#if defined(HAVE_UNORDERED_SET) && defined(HAVE_UNORDERED_MAP) ++ ++#include ++#include ++ ++// We need a template typedef here. ++ ++#define Unordered_set std::unordered_set ++#define Unordered_map std::unordered_map ++#define Unordered_multimap std::unordered_multimap ++ ++#define reserve_unordered_map(map, n) ((map)->rehash(n)) ++ ++#elif defined(HAVE_TR1_UNORDERED_SET) && defined(HAVE_TR1_UNORDERED_MAP) \ + && defined(HAVE_TR1_UNORDERED_MAP_REHASH) + + #include Modified: head/devel/binutils/pkg-plist ============================================================================== --- head/devel/binutils/pkg-plist Mon Dec 16 14:45:39 2013 (r336641) +++ head/devel/binutils/pkg-plist Mon Dec 16 14:52:26 2013 (r336642) @@ -2,6 +2,7 @@ bin/addr2line bin/ar bin/as bin/c++filt +%%GOLD%%bin/dwp bin/elfedit bin/gprof bin/ld @@ -15,7 +16,6 @@ bin/readelf bin/size bin/strings bin/strip -include/ansidecl.h include/bfd.h include/bfdlink.h include/dis-asm.h @@ -23,9 +23,27 @@ include/dis-asm.h include/symcat.h lib/libbfd.a lib/libbfd.la -lib/libiberty.a lib/libopcodes.a lib/libopcodes.la +man/man1/addr2line.1.gz +man/man1/ar.1.gz +man/man1/as.1.gz +man/man1/c++filt.1.gz +man/man1/gprof.1.gz +man/man1/dlltool.1.gz +man/man1/elfedit.1.gz +man/man1/ld.1.gz +man/man1/nlmconv.1.gz +man/man1/nm.1.gz +man/man1/objcopy.1.gz +man/man1/objdump.1.gz +man/man1/ranlib.1.gz +man/man1/readelf.1.gz +man/man1/size.1.gz +man/man1/strings.1.gz +man/man1/strip.1.gz +man/man1/windmc.1.gz +man/man1/windres.1.gz %%NLS%%share/locale/bg/LC_MESSAGES/binutils.mo %%NLS%%share/locale/bg/LC_MESSAGES/gprof.mo %%NLS%%share/locale/bg/LC_MESSAGES/ld.mo @@ -60,6 +78,7 @@ lib/libopcodes.la %%NLS%%share/locale/ga/LC_MESSAGES/gprof.mo %%NLS%%share/locale/ga/LC_MESSAGES/ld.mo %%NLS%%share/locale/ga/LC_MESSAGES/opcodes.mo +%%NLS%%share/locale/hr/LC_MESSAGES/binutils.mo %%NLS%%share/locale/id/LC_MESSAGES/gprof.mo %%NLS%%share/locale/id/LC_MESSAGES/opcodes.mo %%NLS%%share/locale/id/LC_MESSAGES/bfd.mo From owner-svn-ports-head@FreeBSD.ORG Mon Dec 16 15:44:55 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 9740BA1; Mon, 16 Dec 2013 15:44:55 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 82E3A1A61; Mon, 16 Dec 2013 15:44:55 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBGFitwJ098098; Mon, 16 Dec 2013 15:44:55 GMT (envelope-from zeising@svn.freebsd.org) Received: (from zeising@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBGFitIF098097; Mon, 16 Dec 2013 15:44:55 GMT (envelope-from zeising@svn.freebsd.org) Message-Id: <201312161544.rBGFitIF098097@svn.freebsd.org> From: Niclas Zeising Date: Mon, 16 Dec 2013 15:44:55 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r336643 - head/x11-drivers/xf86-video-radeonhd X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 16 Dec 2013 15:44:55 -0000 Author: zeising Date: Mon Dec 16 15:44:55 2013 New Revision: 336643 URL: http://svnweb.freebsd.org/changeset/ports/336643 Log: Fix staging with the non-default UTILS option. Noticed by: "O. Hartmann" Modified: head/x11-drivers/xf86-video-radeonhd/Makefile Modified: head/x11-drivers/xf86-video-radeonhd/Makefile ============================================================================== --- head/x11-drivers/xf86-video-radeonhd/Makefile Mon Dec 16 14:52:26 2013 (r336642) +++ head/x11-drivers/xf86-video-radeonhd/Makefile Mon Dec 16 15:44:55 2013 (r336643) @@ -30,8 +30,8 @@ PLIST_SUB= UTILS="@comment " .if ${PORT_OPTIONS:MUTILS} post-install: - ${INSTALL_PROGRAM} ${WRKSRC}/utils/conntest/rhd_conntest ${PREFIX}/sbin - ${INSTALL_PROGRAM} ${WRKSRC}/utils/conntest/rhd_dump ${PREFIX}/sbin + ${INSTALL_PROGRAM} ${WRKSRC}/utils/conntest/rhd_conntest ${STAGEDIR}${PREFIX}/sbin + ${INSTALL_PROGRAM} ${WRKSRC}/utils/conntest/rhd_dump ${STAGEDIR}${PREFIX}/sbin .endif .include From owner-svn-ports-head@FreeBSD.ORG Mon Dec 16 15:49:56 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 7D9F5649; Mon, 16 Dec 2013 15:49:56 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 68B8B1AFF; Mon, 16 Dec 2013 15:49:56 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBGFnuJw098729; Mon, 16 Dec 2013 15:49:56 GMT (envelope-from zeising@svn.freebsd.org) Received: (from zeising@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBGFnuo0098728; Mon, 16 Dec 2013 15:49:56 GMT (envelope-from zeising@svn.freebsd.org) Message-Id: <201312161549.rBGFnuo0098728@svn.freebsd.org> From: Niclas Zeising Date: Mon, 16 Dec 2013 15:49:56 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r336644 - head/x11-drivers/xf86-video-radeonhd X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 16 Dec 2013 15:49:56 -0000 Author: zeising Date: Mon Dec 16 15:49:55 2013 New Revision: 336644 URL: http://svnweb.freebsd.org/changeset/ports/336644 Log: Mark as ignore and set expiration date. Port abandoned upstream, reports of it causing trouble using KMS. Please use x11-drivers/xf86-video-ati instead. Modified: head/x11-drivers/xf86-video-radeonhd/Makefile Modified: head/x11-drivers/xf86-video-radeonhd/Makefile ============================================================================== --- head/x11-drivers/xf86-video-radeonhd/Makefile Mon Dec 16 15:44:55 2013 (r336643) +++ head/x11-drivers/xf86-video-radeonhd/Makefile Mon Dec 16 15:49:55 2013 (r336644) @@ -17,6 +17,10 @@ USE_XORG= damageproto glproto videoproto CONFIGURE_ARGS= --enable-exa CONFLICTS= xf86-video-radeonhd-devel-[0-9]* +IGNORE= Reports of issues with KMS, unsupported, use xf86-video-ati. +DEPRECATED= Abandond upstream since 2010 +EXPIRATION_DATE=2014-02-28 + .include .if ${PORT_OPTIONS:MUTILS} From owner-svn-ports-head@FreeBSD.ORG Mon Dec 16 16:24:35 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 9436B449; Mon, 16 Dec 2013 16:24:35 +0000 (UTC) Received: from prod2.absolight.net (mx3.absolight.net [IPv6:2a01:678:2:100::25]) (using TLSv1 with cipher ADH-CAMELLIA256-SHA (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 4E3201F35; Mon, 16 Dec 2013 16:24:35 +0000 (UTC) Received: from prod2.absolight.net (localhost [127.0.0.1]) by prod2.absolight.net (Postfix) with ESMTP id E9E7CBDC79; Mon, 16 Dec 2013 17:24:33 +0100 (CET) Received: from gw.in.absolight.net (gw-ecl.in.absolight.net [79.143.241.69]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client CN "gw.in.absolight.net", Issuer "CA Cert Signing Authority" (not verified)) by prod2.absolight.net (Postfix) with ESMTPSA id C0D31BDC6B; Mon, 16 Dec 2013 17:24:33 +0100 (CET) Received: from ogg.in.absolight.net (ogg.in.absolight.net [79.143.241.239]) by gw.in.absolight.net (Postfix) with ESMTP id 04B7960E8; Mon, 16 Dec 2013 17:24:32 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by ogg.in.absolight.net (Postfix) with ESMTP id 795676621FCB; Mon, 16 Dec 2013 17:24:32 +0100 (CET) Date: Mon, 16 Dec 2013 17:24:31 +0100 From: Mathieu Arnold To: Dmitry Sivachenko , Mathieu Arnold Subject: Re: svn commit: r336629 - head/net-mgmt/nagios-plugins Message-ID: In-Reply-To: References: <201312161206.rBGC6SAK018728@svn.freebsd.org> <100C19230FBC9256A5F4117C@ogg.in.absolight.net> X-Mailer: Mulberry/4.0.8 (Mac OS X) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Content-Disposition: inline Cc: "svn-ports-head@FreeBSD.org" , "svn-ports-all@FreeBSD.org" , "ports-committers@FreeBSD.org" X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 16 Dec 2013 16:24:35 -0000 +--On 16 d=C3=A9cembre 2013 18:14:31 +0400 Dmitry Sivachenko wrote: | I tried this, but I do not see =E2=80=94enable-extra-opts in make -V | CONDFIGURE_ARGS output with EXTRAOPTS enabled. Hum, yes, but, you have a : CONFIGURE_ARGS=3D --with-nagios-users... *after* you include bsd.port.options.mk, and it overwrites what the options framework would have set. Plus, you'd want to put all the new options variables before that include anyway. --=20 Mathieu Arnold From owner-svn-ports-head@FreeBSD.ORG Mon Dec 16 16:50:00 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 22B65F41; Mon, 16 Dec 2013 16:50:00 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id E7DCF11F0; Mon, 16 Dec 2013 16:49:59 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBGGnxIU019725; Mon, 16 Dec 2013 16:49:59 GMT (envelope-from nemysis@svn.freebsd.org) Received: (from nemysis@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBGGnxTA019724; Mon, 16 Dec 2013 16:49:59 GMT (envelope-from nemysis@svn.freebsd.org) Message-Id: <201312161649.rBGGnxTA019724@svn.freebsd.org> From: Rusmir Dusko Date: Mon, 16 Dec 2013 16:49:59 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r336645 - head/security/libscrypt X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 16 Dec 2013 16:50:00 -0000 Author: nemysis Date: Mon Dec 16 16:49:59 2013 New Revision: 336645 URL: http://svnweb.freebsd.org/changeset/ports/336645 Log: - Bump PORTREVISION - Change license BSD --> BSD2CLAUSE - Add USES compiler - Add DOCS and Option - Change REINPLACE_CMD - Fix build, tabs - Support STAGEDIR PR: ports/184723 Submitted by: Reed Loefgren Approved by: wg (mentor) Modified: head/security/libscrypt/Makefile Modified: head/security/libscrypt/Makefile ============================================================================== --- head/security/libscrypt/Makefile Mon Dec 16 15:49:55 2013 (r336644) +++ head/security/libscrypt/Makefile Mon Dec 16 16:49:59 2013 (r336645) @@ -3,40 +3,47 @@ PORTNAME= libscrypt PORTVERSION= 1.14 +PORTREVISION= 1 CATEGORIES= security MAINTAINER= horia@racoviceanu.com COMMENT= C library for the scrypt key derivation function -LICENSE= BSD +LICENSE= BSD2CLAUSE -NO_STAGE= yes +USES= compiler USE_LDCONFIG= yes USE_GITHUB= yes GH_ACCOUNT= technion -GH_COMMIT= 8e6966e GH_TAGNAME= ${GH_COMMIT} +GH_COMMIT= 8e6966e PLIST_FILES= include/libscrypt.h \ lib/libscrypt.a \ lib/libscrypt.so \ lib/libscrypt.so.0 -.include +PORTDOCS= README.md + +OPTIONS_DEFINE= DOCS post-patch: - @${REINPLACE_CMD} -e '/^CC=gcc/d' -e '/CFLAGS=/s,$$, ${CFLAGS},' \ - -e 's,/usr/local,${PREFIX},' -e 's,install: library,& install-static,' \ - -e 's,$$(LDFLAGS),,' ${WRKSRC}/Makefile + @${REINPLACE_CMD} -e '/^CC=gcc/d' -e '/CFLAGS=/s|$$| ${CFLAGS}|' \ + -e 's|/usr/local|${PREFIX}| ; \ + s|install: library|& install-static| ; \ + s|$$(LDFLAGS)||' ${WRKSRC}/Makefile regression-test: build (cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE} check) -.if ${ARCH} == i386 -CCVERSION!= ${CC} --version -.if !empty(CCVERSION:tl:M*gcc*) -CFLAGS+= -fno-stack-protector -.endif +post-install: + @${MKDIR} ${STAGEDIR}${DOCSDIR} + ${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR} + +.include + +.if ${ARCH} == i386 && ${COMPILER_TYPE} == gcc +CFLAGS+= -fno-stack-protector .endif .include From owner-svn-ports-head@FreeBSD.ORG Mon Dec 16 16:52:07 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 9B012108; Mon, 16 Dec 2013 16:52:07 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 6D2D21254; Mon, 16 Dec 2013 16:52:07 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBGGq7V9022417; Mon, 16 Dec 2013 16:52:07 GMT (envelope-from swills@svn.freebsd.org) Received: (from swills@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBGGq6kv022414; Mon, 16 Dec 2013 16:52:06 GMT (envelope-from swills@svn.freebsd.org) Message-Id: <201312161652.rBGGq6kv022414@svn.freebsd.org> From: Steve Wills Date: Mon, 16 Dec 2013 16:52:06 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r336646 - head/graphics/p5-Image-ExifTool-devel X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 16 Dec 2013 16:52:07 -0000 Author: swills Date: Mon Dec 16 16:52:06 2013 New Revision: 336646 URL: http://svnweb.freebsd.org/changeset/ports/336646 Log: - Update to 9.44 PR: ports/184790 Submitted by: Jin-Sih Lin (maintainer) Modified: head/graphics/p5-Image-ExifTool-devel/Makefile head/graphics/p5-Image-ExifTool-devel/distinfo head/graphics/p5-Image-ExifTool-devel/pkg-plist Modified: head/graphics/p5-Image-ExifTool-devel/Makefile ============================================================================== --- head/graphics/p5-Image-ExifTool-devel/Makefile Mon Dec 16 16:49:59 2013 (r336645) +++ head/graphics/p5-Image-ExifTool-devel/Makefile Mon Dec 16 16:52:06 2013 (r336646) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= Image-ExifTool -PORTVERSION= 9.41 +PORTVERSION= 9.44 CATEGORIES= graphics perl5 MASTER_SITES= http://www.sno.phy.queensu.ca/~phil/exiftool/ PKGNAMEPREFIX= p5- Modified: head/graphics/p5-Image-ExifTool-devel/distinfo ============================================================================== --- head/graphics/p5-Image-ExifTool-devel/distinfo Mon Dec 16 16:49:59 2013 (r336645) +++ head/graphics/p5-Image-ExifTool-devel/distinfo Mon Dec 16 16:52:06 2013 (r336646) @@ -1,2 +1,2 @@ -SHA256 (Image-ExifTool-9.41.tar.gz) = 6f9d1e1503c8ffba90485a7aef0685771ff162461ef1d928c7f27977a1ca1132 -SIZE (Image-ExifTool-9.41.tar.gz) = 3714034 +SHA256 (Image-ExifTool-9.44.tar.gz) = e16964aee84531aa8f97250f0ea3adfc210a744603e369f02bebc2941da6f380 +SIZE (Image-ExifTool-9.44.tar.gz) = 3723274 Modified: head/graphics/p5-Image-ExifTool-devel/pkg-plist ============================================================================== --- head/graphics/p5-Image-ExifTool-devel/pkg-plist Mon Dec 16 16:49:59 2013 (r336645) +++ head/graphics/p5-Image-ExifTool-devel/pkg-plist Mon Dec 16 16:52:06 2013 (r336646) @@ -329,8 +329,6 @@ bin/exiftool %%PORTDOCS%%@dirrm %%DOCSDIR%% @dirrm %%SITE_PERL%%/mach/auto/Image/ExifTool @dirrm %%SITE_PERL%%/mach/auto/Image -@dirrm %%SITE_PERL%%/mach/auto -@dirrm %%SITE_PERL%%/mach @dirrm %%SITE_PERL%%/Image/ExifTool/Lang @dirrm %%SITE_PERL%%/Image/ExifTool/Charset @dirrm %%SITE_PERL%%/Image/ExifTool From owner-svn-ports-head@FreeBSD.ORG Mon Dec 16 17:24:55 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 7A5DCEC4; Mon, 16 Dec 2013 17:24:55 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 66322150C; Mon, 16 Dec 2013 17:24:55 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBGHOt6F033889; Mon, 16 Dec 2013 17:24:55 GMT (envelope-from zeising@svn.freebsd.org) Received: (from zeising@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBGHOtNU033888; Mon, 16 Dec 2013 17:24:55 GMT (envelope-from zeising@svn.freebsd.org) Message-Id: <201312161724.rBGHOtNU033888@svn.freebsd.org> From: Niclas Zeising Date: Mon, 16 Dec 2013 17:24:55 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r336647 - head/x11-drivers/xorg-drivers X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 16 Dec 2013 17:24:55 -0000 Author: zeising Date: Mon Dec 16 17:24:54 2013 New Revision: 336647 URL: http://svnweb.freebsd.org/changeset/ports/336647 Log: Disconnect deprecated drivers. Modified: head/x11-drivers/xorg-drivers/Makefile Modified: head/x11-drivers/xorg-drivers/Makefile ============================================================================== --- head/x11-drivers/xorg-drivers/Makefile Mon Dec 16 16:52:06 2013 (r336646) +++ head/x11-drivers/xorg-drivers/Makefile Mon Dec 16 17:24:54 2013 (r336647) @@ -34,7 +34,6 @@ VIDEO_DRIVERS= ati \ mach64 \ nv \ r128 \ - radeonhd \ vesa \ apm \ ark \ @@ -45,7 +44,6 @@ VIDEO_DRIVERS= ati \ glint \ i128 \ i740 \ - imstt \ mga \ neomagic \ newport \ @@ -68,7 +66,6 @@ OPTIONS_DEFAULT= MOUSE \ MACH64 \ NV \ R128 \ - RADEONHD \ VESA .for type in input video From owner-svn-ports-head@FreeBSD.ORG Mon Dec 16 17:26:55 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 8064D1EF; Mon, 16 Dec 2013 17:26:55 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 4F9F9152D; Mon, 16 Dec 2013 17:26:55 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBGHQtKT034507; Mon, 16 Dec 2013 17:26:55 GMT (envelope-from bapt@svn.freebsd.org) Received: (from bapt@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBGHQnHk034475; Mon, 16 Dec 2013 17:26:49 GMT (envelope-from bapt@svn.freebsd.org) Message-Id: <201312161726.rBGHQnHk034475@svn.freebsd.org> From: Baptiste Daroussin Date: Mon, 16 Dec 2013 17:26:49 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r336648 - in head: audio/gogglesmm benchmarks/siege devel/cdk devel/yajl graphics/jbig2dec graphics/libpuzzle graphics/pngrewrite lang/picoc mail/prayer misc/toilet misc/xsw multimedia/... X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 16 Dec 2013 17:26:55 -0000 Author: bapt Date: Mon Dec 16 17:26:49 2013 New Revision: 336648 URL: http://svnweb.freebsd.org/changeset/ports/336648 Log: Drop maintainership Modified: head/audio/gogglesmm/Makefile head/benchmarks/siege/Makefile head/devel/cdk/Makefile head/devel/yajl/Makefile head/graphics/jbig2dec/Makefile head/graphics/libpuzzle/Makefile head/graphics/pngrewrite/Makefile head/lang/picoc/Makefile head/mail/prayer/Makefile head/misc/toilet/Makefile head/misc/xsw/Makefile head/multimedia/atomicparsley/Makefile head/multimedia/libass/Makefile head/multimedia/libdv/Makefile head/multimedia/mkclean/Makefile head/multimedia/mkvalidator/Makefile head/net-p2p/btpd/Makefile head/net/libvncserver/Makefile head/security/arirang/Makefile head/security/netpgp/Makefile head/sysutils/dfc/Makefile head/sysutils/ftwin/Makefile head/sysutils/fusefs-libs/Makefile head/sysutils/tmpwatch/Makefile head/textproc/jshon/Makefile head/x11-wm/pekwm/Makefile Modified: head/audio/gogglesmm/Makefile ============================================================================== --- head/audio/gogglesmm/Makefile Mon Dec 16 17:24:54 2013 (r336647) +++ head/audio/gogglesmm/Makefile Mon Dec 16 17:26:49 2013 (r336648) @@ -7,7 +7,7 @@ PORTREVISION= 6 CATEGORIES= audio MASTER_SITES= GOOGLE_CODE -MAINTAINER= bapt@FreeBSD.org +MAINTAINER= ports@FreeBSD.org COMMENT= Music collection manager and player LICENSE= GPLv3 Modified: head/benchmarks/siege/Makefile ============================================================================== --- head/benchmarks/siege/Makefile Mon Dec 16 17:24:54 2013 (r336647) +++ head/benchmarks/siege/Makefile Mon Dec 16 17:26:49 2013 (r336648) @@ -6,7 +6,7 @@ PORTVERSION= 3.0.5 CATEGORIES= benchmarks MASTER_SITES= http://www.joedog.org/pub/siege/ -MAINTAINER= bapt@FreeBSD.org +MAINTAINER= ports@FreeBSD.org COMMENT= HTTP regression testing and benchmarking utility LICENSE= GPLv2 Modified: head/devel/cdk/Makefile ============================================================================== --- head/devel/cdk/Makefile Mon Dec 16 17:24:54 2013 (r336647) +++ head/devel/cdk/Makefile Mon Dec 16 17:26:49 2013 (r336648) @@ -11,7 +11,7 @@ MASTER_SITES= ftp://invisible-island.net DISTNAME= ${PORTNAME}-${PORTVERSION:R}-${PORTVERSION:E} EXTRACT_SUFX= .tgz -MAINTAINER= bapt@FreeBSD.org +MAINTAINER= ports@FreeBSD.org COMMENT= Curses Development Kit for speedy development of full screen programs LICENSE= BSD Modified: head/devel/yajl/Makefile ============================================================================== --- head/devel/yajl/Makefile Mon Dec 16 17:24:54 2013 (r336647) +++ head/devel/yajl/Makefile Mon Dec 16 17:26:49 2013 (r336648) @@ -5,7 +5,7 @@ PORTVERSION= 2.0.4 PORTREVISION= 1 CATEGORIES= devel -MAINTAINER= bapt@FreeBSD.org +MAINTAINER= ports@FreeBSD.org COMMENT= Portable JSON parsing and serialization library in ANSI C USE_GITHUB= yes Modified: head/graphics/jbig2dec/Makefile ============================================================================== --- head/graphics/jbig2dec/Makefile Mon Dec 16 17:24:54 2013 (r336647) +++ head/graphics/jbig2dec/Makefile Mon Dec 16 17:26:49 2013 (r336648) @@ -8,7 +8,7 @@ MASTER_SITES= SF \ http://ghostscript.com/~giles/jbig2/jbig2dec/ DISTFILES+= ${DISTNAME}${EXTRACT_SUFX} -MAINTAINER= bapt@FreeBSD.org +MAINTAINER= ports@FreeBSD.org COMMENT= Decoder implementation of the JBIG2 image compression format USE_XZ= yes:src Modified: head/graphics/libpuzzle/Makefile ============================================================================== --- head/graphics/libpuzzle/Makefile Mon Dec 16 17:24:54 2013 (r336647) +++ head/graphics/libpuzzle/Makefile Mon Dec 16 17:26:49 2013 (r336648) @@ -6,7 +6,7 @@ PORTREVISION= 6 CATEGORIES= graphics MASTER_SITES= ftp://ftp.pureftpd.org/pub/pure-ftpd/misc/libpuzzle/releases/ -MAINTAINER= bapt@FreeBSD.org +MAINTAINER= ports@FreeBSD.org COMMENT= Library to find similar pictures LICENSE= BSD Modified: head/graphics/pngrewrite/Makefile ============================================================================== --- head/graphics/pngrewrite/Makefile Mon Dec 16 17:24:54 2013 (r336647) +++ head/graphics/pngrewrite/Makefile Mon Dec 16 17:26:49 2013 (r336648) @@ -8,7 +8,7 @@ CATEGORIES= graphics MASTER_SITES= http://entropymine.com/jason/pngrewrite/ \ http://mirror.roe.ch/dist/pngrewrite/ -MAINTAINER= bapt@FreeBSD.org +MAINTAINER= ports@FreeBSD.org COMMENT= PNG palette optimizer LIB_DEPENDS= libpng15.so:${PORTSDIR}/graphics/png Modified: head/lang/picoc/Makefile ============================================================================== --- head/lang/picoc/Makefile Mon Dec 16 17:24:54 2013 (r336647) +++ head/lang/picoc/Makefile Mon Dec 16 17:26:49 2013 (r336648) @@ -5,7 +5,7 @@ PORTVERSION= 2.1 CATEGORIES= lang devel MASTER_SITES= GOOGLE_CODE -MAINTAINER= bapt@FreeBSD.org +MAINTAINER= ports@FreeBSD.org COMMENT= Very small C interpreter for scripting LICENSE= BSD Modified: head/mail/prayer/Makefile ============================================================================== --- head/mail/prayer/Makefile Mon Dec 16 17:24:54 2013 (r336647) +++ head/mail/prayer/Makefile Mon Dec 16 17:26:49 2013 (r336648) @@ -5,7 +5,7 @@ PORTVERSION= 1.3.5 CATEGORIES= mail www MASTER_SITES= ftp://ftp.csx.cam.ac.uk/pub/software/email/prayer/ -MAINTAINER= bapt@FreeBSD.org +MAINTAINER= ports@FreeBSD.org COMMENT= Prayer Webmail System LICENSE= GPLv2 Modified: head/misc/toilet/Makefile ============================================================================== --- head/misc/toilet/Makefile Mon Dec 16 17:24:54 2013 (r336647) +++ head/misc/toilet/Makefile Mon Dec 16 17:26:49 2013 (r336648) @@ -7,7 +7,7 @@ PORTREVISION= 1 CATEGORIES= misc MASTER_SITES= http://caca.zoy.org/raw-attachment/wiki/toilet/ -MAINTAINER= bapt@FreeBSD.org +MAINTAINER= ports@FreeBSD.org COMMENT= Enhanced figlet(6) LIB_DEPENDS= libcaca.so:${PORTSDIR}/graphics/libcaca Modified: head/misc/xsw/Makefile ============================================================================== --- head/misc/xsw/Makefile Mon Dec 16 17:24:54 2013 (r336647) +++ head/misc/xsw/Makefile Mon Dec 16 17:26:49 2013 (r336648) @@ -7,7 +7,7 @@ PORTREVISION= 3 CATEGORIES= misc MASTER_SITES= GOOGLE_CODE -MAINTAINER= bapt@FreeBSD.org +MAINTAINER= ports@FreeBSD.org COMMENT= Tool for creating presentations OPTIONS_DEFINE= DOCS Modified: head/multimedia/atomicparsley/Makefile ============================================================================== --- head/multimedia/atomicparsley/Makefile Mon Dec 16 17:24:54 2013 (r336647) +++ head/multimedia/atomicparsley/Makefile Mon Dec 16 17:26:49 2013 (r336648) @@ -7,7 +7,7 @@ CATEGORIES= multimedia MASTER_SITES= SF/${PORTNAME:L}/${PORTNAME:L}/${PORTNAME}%20v${PORTVERSION} DISTNAME= ${PORTNAME}-source-${PORTVERSION} -MAINTAINER= bapt@FreeBSD.org +MAINTAINER= ports@FreeBSD.org COMMENT= Command line program for reading parsing and setting MP4/M4A metadata LICENSE= GPLv2 Modified: head/multimedia/libass/Makefile ============================================================================== --- head/multimedia/libass/Makefile Mon Dec 16 17:24:54 2013 (r336647) +++ head/multimedia/libass/Makefile Mon Dec 16 17:26:49 2013 (r336648) @@ -5,7 +5,7 @@ PORTVERSION= 0.10.2 CATEGORIES= multimedia devel MASTER_SITES= GOOGLE_CODE -MAINTAINER= bapt@FreeBSD.org +MAINTAINER= ports@FreeBSD.org COMMENT= Portable ASS/SSA subtitle renderer LICENSE= ISCL Modified: head/multimedia/libdv/Makefile ============================================================================== --- head/multimedia/libdv/Makefile Mon Dec 16 17:24:54 2013 (r336647) +++ head/multimedia/libdv/Makefile Mon Dec 16 17:26:49 2013 (r336648) @@ -7,7 +7,7 @@ PORTREVISION= 4 CATEGORIES= multimedia MASTER_SITES= SF -MAINTAINER= bapt@FreeBSD.org +MAINTAINER= ports@FreeBSD.org COMMENT= Quasar DV codec (libdv): software codec for DV video encoding format LICENSE= LGPL21 Modified: head/multimedia/mkclean/Makefile ============================================================================== --- head/multimedia/mkclean/Makefile Mon Dec 16 17:24:54 2013 (r336647) +++ head/multimedia/mkclean/Makefile Mon Dec 16 17:26:49 2013 (r336648) @@ -5,7 +5,7 @@ PORTVERSION= 0.8.7 CATEGORIES= multimedia MASTER_SITES= SF/matroska/${PORTNAME}/ -MAINTAINER= bapt@FreeBSD.org +MAINTAINER= ports@FreeBSD.org COMMENT= Clean and optimize Matroska and WebM files LICENSE= BSD Modified: head/multimedia/mkvalidator/Makefile ============================================================================== --- head/multimedia/mkvalidator/Makefile Mon Dec 16 17:24:54 2013 (r336647) +++ head/multimedia/mkvalidator/Makefile Mon Dec 16 17:26:49 2013 (r336648) @@ -5,7 +5,7 @@ PORTVERSION= 0.4.2 CATEGORIES= multimedia MASTER_SITES= SF/matroska/${PORTNAME}/ -MAINTAINER= bapt@FreeBSD.org +MAINTAINER= ports@FreeBSD.org COMMENT= Command line tool to verify Matroska and WebM files LICENSE= BSD Modified: head/net-p2p/btpd/Makefile ============================================================================== --- head/net-p2p/btpd/Makefile Mon Dec 16 17:24:54 2013 (r336647) +++ head/net-p2p/btpd/Makefile Mon Dec 16 17:26:49 2013 (r336648) @@ -6,7 +6,7 @@ PORTREVISION= 2 CATEGORIES= net-p2p MASTER_SITES= http://cloud.github.com/downloads/btpd/btpd/ -MAINTAINER= bapt@FreeBSD.org +MAINTAINER= ports@FreeBSD.org COMMENT= Bittorrent client consisting of a daemon and client commands LICENSE= BSD Modified: head/net/libvncserver/Makefile ============================================================================== --- head/net/libvncserver/Makefile Mon Dec 16 17:24:54 2013 (r336647) +++ head/net/libvncserver/Makefile Mon Dec 16 17:26:49 2013 (r336648) @@ -8,7 +8,7 @@ CATEGORIES= net devel MASTER_SITES= SF DISTNAME= LibVNCServer-${PORTVERSION} -MAINTAINER= bapt@FreeBSD.org +MAINTAINER= ports@FreeBSD.org COMMENT= Provide an easy API to write one's own vnc server LICENSE= GPLv2 Modified: head/security/arirang/Makefile ============================================================================== --- head/security/arirang/Makefile Mon Dec 16 17:24:54 2013 (r336647) +++ head/security/arirang/Makefile Mon Dec 16 17:26:49 2013 (r336648) @@ -8,7 +8,7 @@ CATEGORIES= security www MASTER_SITES= http://monkey.org/~pilot/arirang/ MASTER_SITE_SUBDIR= UNIX/cgi-scanners -MAINTAINER= bapt@FreeBSD.org +MAINTAINER= ports@FreeBSD.org COMMENT= Powerful webserver security scanner for network LICENSE= BSD Modified: head/security/netpgp/Makefile ============================================================================== --- head/security/netpgp/Makefile Mon Dec 16 17:24:54 2013 (r336647) +++ head/security/netpgp/Makefile Mon Dec 16 17:26:49 2013 (r336648) @@ -5,7 +5,7 @@ PORTVERSION= 20101107 CATEGORIES= security MASTER_SITES= NETBSD/LOCAL_PORTS -MAINTAINER= bapt@FreeBSD.org +MAINTAINER= ports@FreeBSD.org COMMENT= PGP signing, verification, encryption, and decryption program LICENSE= BSD Modified: head/sysutils/dfc/Makefile ============================================================================== --- head/sysutils/dfc/Makefile Mon Dec 16 17:24:54 2013 (r336647) +++ head/sysutils/dfc/Makefile Mon Dec 16 17:26:49 2013 (r336648) @@ -5,7 +5,7 @@ PORTVERSION= 3.0.4 CATEGORIES= sysutils MASTER_SITES= http://projects.gw-computing.net/attachments/download/79/ -MAINTAINER= bapt@FreeBSD.org +MAINTAINER= ports@FreeBSD.org COMMENT= Display file system space usage using graph and colors LICENSE= BSD Modified: head/sysutils/ftwin/Makefile ============================================================================== --- head/sysutils/ftwin/Makefile Mon Dec 16 17:24:54 2013 (r336647) +++ head/sysutils/ftwin/Makefile Mon Dec 16 17:26:49 2013 (r336648) @@ -7,7 +7,7 @@ CATEGORIES= sysutils MASTER_SITES= http://files.etoilebsd.net/ftwin/ \ http://download.meroware.org/ftwin/ -MAINTAINER= bapt@FreeBSD.org +MAINTAINER= ports@FreeBSD.org COMMENT= Useful tool to find duplicate files LIB_DEPENDS= libpuzzle.so:${PORTSDIR}/graphics/libpuzzle \ Modified: head/sysutils/fusefs-libs/Makefile ============================================================================== --- head/sysutils/fusefs-libs/Makefile Mon Dec 16 17:24:54 2013 (r336647) +++ head/sysutils/fusefs-libs/Makefile Mon Dec 16 17:26:49 2013 (r336648) @@ -9,7 +9,7 @@ MASTER_SITES= SF/fuse/fuse-2.X/${PORTVER PKGNAMESUFFIX= -libs DISTNAME= fuse-${PORTVERSION} -MAINTAINER= bapt@FreeBSD.org +MAINTAINER= ports@FreeBSD.org COMMENT= FUSE allows filesystem implementation in userspace OPTIONS_DEFINE= DOCS Modified: head/sysutils/tmpwatch/Makefile ============================================================================== --- head/sysutils/tmpwatch/Makefile Mon Dec 16 17:24:54 2013 (r336647) +++ head/sysutils/tmpwatch/Makefile Mon Dec 16 17:26:49 2013 (r336648) @@ -5,8 +5,8 @@ PORTVERSION= 2.11 CATEGORIES= sysutils MASTER_SITES= https://fedorahosted.org/releases/t/m/tmpwatch/ -MAINTAINER= bapt@FreeBSD.org -COMMENT= A utility for removing files based on when they were last accessed +MAINTAINER= ports@FreeBSD.org +COMMENT= Utility for removing files based on when they were last accessed LICENSE= GPLv2 Modified: head/textproc/jshon/Makefile ============================================================================== --- head/textproc/jshon/Makefile Mon Dec 16 17:24:54 2013 (r336647) +++ head/textproc/jshon/Makefile Mon Dec 16 17:26:49 2013 (r336648) @@ -5,7 +5,7 @@ PORTVERSION= 20121210 PORTREVISION= 1 CATEGORIES= textproc -MAINTAINER= bapt@FreeBSD.org +MAINTAINER= ports@FreeBSD.org COMMENT= json parser for the shell. LICENSE= MIT Modified: head/x11-wm/pekwm/Makefile ============================================================================== --- head/x11-wm/pekwm/Makefile Mon Dec 16 17:24:54 2013 (r336647) +++ head/x11-wm/pekwm/Makefile Mon Dec 16 17:26:49 2013 (r336648) @@ -8,7 +8,7 @@ PORTEPOCH= 1 CATEGORIES= x11-wm MASTER_SITES= https://pekwm.org/projects/3/files/ -MAINTAINER= bapt@FreeBSD.org +MAINTAINER= ports@FreeBSD.org COMMENT= Light, Unobtrusive, and configurable windowmanager LIB_DEPENDS= libjpeg.so:${PORTSDIR}/graphics/jpeg \ From owner-svn-ports-head@FreeBSD.ORG Mon Dec 16 17:27:56 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id A7D712F0; Mon, 16 Dec 2013 17:27:56 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 935791538; Mon, 16 Dec 2013 17:27:56 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBGHRuhi034687; Mon, 16 Dec 2013 17:27:56 GMT (envelope-from bapt@svn.freebsd.org) Received: (from bapt@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBGHRumk034685; Mon, 16 Dec 2013 17:27:56 GMT (envelope-from bapt@svn.freebsd.org) Message-Id: <201312161727.rBGHRumk034685@svn.freebsd.org> From: Baptiste Daroussin Date: Mon, 16 Dec 2013 17:27:56 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r336649 - in head/ports-mgmt: poudriere poudriere-devel X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 16 Dec 2013 17:27:56 -0000 Author: bapt Date: Mon Dec 16 17:27:55 2013 New Revision: 336649 URL: http://svnweb.freebsd.org/changeset/ports/336649 Log: Pass maintainership to bdrewery Modified: head/ports-mgmt/poudriere-devel/Makefile head/ports-mgmt/poudriere/Makefile Modified: head/ports-mgmt/poudriere-devel/Makefile ============================================================================== --- head/ports-mgmt/poudriere-devel/Makefile Mon Dec 16 17:26:49 2013 (r336648) +++ head/ports-mgmt/poudriere-devel/Makefile Mon Dec 16 17:27:55 2013 (r336649) @@ -9,8 +9,7 @@ MASTER_SITES= http://fossil.etoilebsd.ne PKGNAMESUFFIX= -devel DISTFILES= ${PORTNAME}-${PORTVERSION}.tar.gz?uuid=${FSL_CHKIN} -# Also maintained by bdrewery@FreeBSD.org -MAINTAINER= bapt@FreeBSD.org +MAINTAINER= bdrewery@FreeBSD.org COMMENT= Port build and test system LICENSE= BSD Modified: head/ports-mgmt/poudriere/Makefile ============================================================================== --- head/ports-mgmt/poudriere/Makefile Mon Dec 16 17:26:49 2013 (r336648) +++ head/ports-mgmt/poudriere/Makefile Mon Dec 16 17:27:55 2013 (r336649) @@ -7,8 +7,7 @@ MASTER_SITES= http://fossil.etoilebsd.ne LOCAL/bdrewery/${PORTNAME}/ DISTFILES= ${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX}?uuid=${PORTVERSION} -# Also maintained by bdrewery@FreeBSD.org -MAINTAINER= bapt@FreeBSD.org +MAINTAINER= bdrewery@FreeBSD.org COMMENT= Port build and test system LICENSE= BSD From owner-svn-ports-head@FreeBSD.ORG Mon Dec 16 17:40:25 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 53C6A8DF; Mon, 16 Dec 2013 17:40:25 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 35AA51624; Mon, 16 Dec 2013 17:40:25 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBGHePq2041266; Mon, 16 Dec 2013 17:40:25 GMT (envelope-from amdmi3@svn.freebsd.org) Received: (from amdmi3@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBGHeElE041017; Mon, 16 Dec 2013 17:40:14 GMT (envelope-from amdmi3@svn.freebsd.org) Message-Id: <201312161740.rBGHeElE041017@svn.freebsd.org> From: Dmitry Marakasov Date: Mon, 16 Dec 2013 17:40:14 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r336650 - in head: astro/libosmpbf astro/mkgmap astro/osmium audio/ximp3 deskutils/qrfcview devel/gitg devel/gnucflow devel/tokamak games/apricots games/blackshadeselite games/brainpart... X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 16 Dec 2013 17:40:25 -0000 Author: amdmi3 Date: Mon Dec 16 17:40:13 2013 New Revision: 336650 URL: http://svnweb.freebsd.org/changeset/ports/336650 Log: - Remove DOCS, NLS and EXAMPLES from OPTIONS_DEFAULT in my ports, as suggested by Porter's Handbook Modified: head/astro/libosmpbf/Makefile head/astro/mkgmap/Makefile head/astro/osmium/Makefile head/audio/ximp3/Makefile head/deskutils/qrfcview/Makefile head/devel/gitg/Makefile head/devel/gnucflow/Makefile head/devel/tokamak/Makefile head/games/apricots/Makefile head/games/blackshadeselite/Makefile head/games/brainparty/Makefile head/games/brickshooter/Makefile head/games/bumprace/Makefile head/games/caph/Makefile head/games/crrcsim/Makefile head/games/enigma/Makefile head/games/fillets-ng/Makefile head/games/funnyboat/Makefile head/games/jigzo/Makefile head/games/meandmyshadow/Makefile head/games/meritous/Makefile head/games/npush/Makefile head/games/opencity/Makefile head/games/phlipple/Makefile head/games/pipepanic/Makefile head/games/pipewalker/Makefile head/games/plee-the-bear/Makefile head/games/quantumminigolf/Makefile head/games/redeclipse/Makefile head/games/reminiscence/Makefile head/games/rezerwar/Makefile head/games/sdb/Makefile head/games/sdlsand/Makefile head/games/spacejunk/Makefile head/games/stormbaancoureur/Makefile head/games/toycars/Makefile head/games/valyriatear/Makefile head/games/xtron/Makefile head/graphics/devil/Makefile head/graphics/geeqie/Makefile head/graphics/glosm/Makefile head/graphics/liblqr-1/Makefile head/graphics/nvidia-texture-tools/Makefile head/graphics/py-pyglet/Makefile head/graphics/quesoglc/Makefile head/graphics/scrot/Makefile head/graphics/tiled/Makefile head/mail/findmaildirs/Makefile head/misc/metromap/Makefile head/multimedia/avbin/Makefile head/sysutils/pacman/Makefile head/textproc/uncrustify/Makefile Modified: head/astro/libosmpbf/Makefile ============================================================================== --- head/astro/libosmpbf/Makefile Mon Dec 16 17:27:55 2013 (r336649) +++ head/astro/libosmpbf/Makefile Mon Dec 16 17:40:13 2013 (r336650) @@ -27,7 +27,6 @@ CXXFLAGS+= -I${LOCALBASE}/include PORTDOCS= * OPTIONS_DEFINE= DOCS -OPTIONS_DEFAULT=DOCS post-install: ${MKDIR} ${STAGEDIR}${DOCSDIR} Modified: head/astro/mkgmap/Makefile ============================================================================== --- head/astro/mkgmap/Makefile Mon Dec 16 17:27:55 2013 (r336649) +++ head/astro/mkgmap/Makefile Mon Dec 16 17:40:13 2013 (r336650) @@ -22,7 +22,6 @@ PORTDOCS= * PORTDATA= * OPTIONS_DEFINE= DOCS -OPTIONS_DEFAULT=DOCS .include Modified: head/astro/osmium/Makefile ============================================================================== --- head/astro/osmium/Makefile Mon Dec 16 17:27:55 2013 (r336649) +++ head/astro/osmium/Makefile Mon Dec 16 17:40:13 2013 (r336650) @@ -32,7 +32,7 @@ CXXFLAGS+= -I${LOCALBASE}/include \ PORTDOCS= * OPTIONS_DEFINE= JAVASCRIPT DOXYGEN DOCS -OPTIONS_DEFAULT=JAVASCRIPT DOCS +OPTIONS_DEFAULT=JAVASCRIPT JAVASCRIPT_DESC=Enable javascript support .include Modified: head/audio/ximp3/Makefile ============================================================================== --- head/audio/ximp3/Makefile Mon Dec 16 17:27:55 2013 (r336649) +++ head/audio/ximp3/Makefile Mon Dec 16 17:40:13 2013 (r336650) @@ -15,7 +15,6 @@ PORTDOCS= * PLIST_FILES= bin/${PORTNAME} OPTIONS_DEFINE= DOCS -OPTIONS_DEFAULT=DOCS post-install: @${MKDIR} ${STAGEDIR}${DOCSDIR} Modified: head/deskutils/qrfcview/Makefile ============================================================================== --- head/deskutils/qrfcview/Makefile Mon Dec 16 17:27:55 2013 (r336649) +++ head/deskutils/qrfcview/Makefile Mon Dec 16 17:40:13 2013 (r336650) @@ -17,7 +17,6 @@ PLIST_FILES= bin/qRFCView PORTDOCS= * OPTIONS_DEFINE= DOCS -OPTIONS_DEFAULT=DOCS do-install: ${INSTALL_PROGRAM} ${WRKSRC}/bin/qRFCView ${STAGEDIR}${PREFIX}/bin/ Modified: head/devel/gitg/Makefile ============================================================================== --- head/devel/gitg/Makefile Mon Dec 16 17:27:55 2013 (r336649) +++ head/devel/gitg/Makefile Mon Dec 16 17:40:13 2013 (r336650) @@ -30,7 +30,6 @@ GLIB_SCHEMAS= org.gnome.gitg.gschema.xml LDFLAGS= -L${LOCALBASE}/lib OPTIONS_DEFINE= NLS -OPTIONS_DEFAULT=NLS OPTIONS_SUB= yes NLS_USES= gettext NLS_CONFIGURE_ENABLE=nls Modified: head/devel/gnucflow/Makefile ============================================================================== --- head/devel/gnucflow/Makefile Mon Dec 16 17:27:55 2013 (r336649) +++ head/devel/gnucflow/Makefile Mon Dec 16 17:40:13 2013 (r336650) @@ -22,7 +22,6 @@ INFO= cflow PLIST_FILES= bin/cflow OPTIONS_DEFINE= NLS -OPTIONS_DEFAULT=NLS .include Modified: head/devel/tokamak/Makefile ============================================================================== --- head/devel/tokamak/Makefile Mon Dec 16 17:27:55 2013 (r336649) +++ head/devel/tokamak/Makefile Mon Dec 16 17:40:13 2013 (r336650) @@ -23,7 +23,6 @@ BUILD_WRKSRC= ${WRKSRC}/build/gnu PORTDOCS= * OPTIONS_DEFINE= DOCS -OPTIONS_DEFAULT=DOCS .include Modified: head/games/apricots/Makefile ============================================================================== --- head/games/apricots/Makefile Mon Dec 16 17:27:55 2013 (r336649) +++ head/games/apricots/Makefile Mon Dec 16 17:40:13 2013 (r336650) @@ -28,7 +28,7 @@ DESKTOP_ENTRIES="Apricots" \ false OPTIONS_DEFINE= DOCS OPENAL -OPTIONS_DEFAULT=DOCS OPENAL +OPTIONS_DEFAULT=OPENAL .include Modified: head/games/blackshadeselite/Makefile ============================================================================== --- head/games/blackshadeselite/Makefile Mon Dec 16 17:27:55 2013 (r336649) +++ head/games/blackshadeselite/Makefile Mon Dec 16 17:40:13 2013 (r336650) @@ -28,7 +28,6 @@ PORTDOCS= Readme Readme.elite PORTDATA= * OPTIONS_DEFINE= DOCS -OPTIONS_DEFAULT=DOCS post-extract: @${FIND} ${WRKSRC}/Data -name '._*' -delete Modified: head/games/brainparty/Makefile ============================================================================== --- head/games/brainparty/Makefile Mon Dec 16 17:27:55 2013 (r336649) +++ head/games/brainparty/Makefile Mon Dec 16 17:40:13 2013 (r336650) @@ -23,7 +23,6 @@ PORTDOCS= * PORTDATA= * OPTIONS_DEFINE= DOCS -OPTIONS_DEFAULT=DOCS post-patch: @${REINPLACE_CMD} -e 's|Content/|${DATADIR}/|' ${WRKSRC}/*.cpp Modified: head/games/brickshooter/Makefile ============================================================================== --- head/games/brickshooter/Makefile Mon Dec 16 17:27:55 2013 (r336649) +++ head/games/brickshooter/Makefile Mon Dec 16 17:40:13 2013 (r336650) @@ -18,7 +18,6 @@ PORTDOCS= * PORTDATA= * OPTIONS_DEFINE= DOCS -OPTIONS_DEFAULT=DOCS post-patch: .for dir in gfx levels snd Modified: head/games/bumprace/Makefile ============================================================================== --- head/games/bumprace/Makefile Mon Dec 16 17:27:55 2013 (r336649) +++ head/games/bumprace/Makefile Mon Dec 16 17:40:13 2013 (r336650) @@ -23,7 +23,6 @@ PORTDOCS= * PORTDATA= * OPTIONS_DEFINE= DOCS -OPTIONS_DEFAULT=DOCS post-patch: @${REINPLACE_CMD} -e '/LIBS/ s|-lSDL_[a-z]*|& $${SDL_LIBS}|' ${WRKSRC}/configure Modified: head/games/caph/Makefile ============================================================================== --- head/games/caph/Makefile Mon Dec 16 17:27:55 2013 (r336649) +++ head/games/caph/Makefile Mon Dec 16 17:40:13 2013 (r336650) @@ -33,7 +33,7 @@ DESKTOP_ENTRIES="Caph" \ false OPTIONS_DEFINE= DOCS OPTIMIZED_CFLAGS -OPTIONS_DEFAULT=DOCS OPTIMIZED_CFLAGS +OPTIONS_DEFAULT=OPTIMIZED_CFLAGS .include Modified: head/games/crrcsim/Makefile ============================================================================== --- head/games/crrcsim/Makefile Mon Dec 16 17:27:55 2013 (r336649) +++ head/games/crrcsim/Makefile Mon Dec 16 17:40:13 2013 (r336650) @@ -34,7 +34,6 @@ DESKTOP_ENTRIES="CRRCsim" \ "" OPTIONS_DEFINE= DOCS -OPTIONS_DEFAULT=DOCS post-patch: @${REINPLACE_CMD} -e '/portaudio/ s|==|=|' ${WRKSRC}/configure Modified: head/games/enigma/Makefile ============================================================================== --- head/games/enigma/Makefile Mon Dec 16 17:27:55 2013 (r336649) +++ head/games/enigma/Makefile Mon Dec 16 17:40:13 2013 (r336650) @@ -33,7 +33,6 @@ PORTDOCS= * PORTDATA= * OPTIONS_DEFINE= DOCS NLS -OPTIONS_DEFAULT=DOCS NLS OPTIONS_SUB= yes NLS_USES= gettext Modified: head/games/fillets-ng/Makefile ============================================================================== --- head/games/fillets-ng/Makefile Mon Dec 16 17:27:55 2013 (r336649) +++ head/games/fillets-ng/Makefile Mon Dec 16 17:40:13 2013 (r336650) @@ -38,7 +38,7 @@ DESKTOP_ENTRIES="Fish Fillets - Next Gen false OPTIONS_DEFINE= DOCS FRIBIDI -OPTIONS_DEFAULT=DOCS FRIBIDI +OPTIONS_DEFAULT=FRIBIDI .include Modified: head/games/funnyboat/Makefile ============================================================================== --- head/games/funnyboat/Makefile Mon Dec 16 17:27:55 2013 (r336649) +++ head/games/funnyboat/Makefile Mon Dec 16 17:40:13 2013 (r336650) @@ -25,7 +25,6 @@ SUB_LIST= PROGRAM_DIR="${PREFIX}/lib/${P PORTDOCS= * OPTIONS_DEFINE= DOCS -OPTIONS_DEFAULT=DOCS do-install: cd ${WRKSRC} && ${COPYTREE_SHARE} "*.py data" ${STAGEDIR}${PREFIX}/lib/${PORTNAME} Modified: head/games/jigzo/Makefile ============================================================================== --- head/games/jigzo/Makefile Mon Dec 16 17:27:55 2013 (r336649) +++ head/games/jigzo/Makefile Mon Dec 16 17:40:13 2013 (r336650) @@ -32,7 +32,6 @@ DESKTOP_ENTRIES="Jigzo" \ false OPTIONS_DEFINE= DOCS -OPTIONS_DEFAULT=DOCS .include Modified: head/games/meandmyshadow/Makefile ============================================================================== --- head/games/meandmyshadow/Makefile Mon Dec 16 17:27:55 2013 (r336649) +++ head/games/meandmyshadow/Makefile Mon Dec 16 17:40:13 2013 (r336650) @@ -31,7 +31,6 @@ DESKTOP_ENTRIES="Me and My Shadow" \ false OPTIONS_DEFINE= DOCS -OPTIONS_DEFAULT=DOCS post-patch: @${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|' \ Modified: head/games/meritous/Makefile ============================================================================== --- head/games/meritous/Makefile Mon Dec 16 17:27:55 2013 (r336649) +++ head/games/meritous/Makefile Mon Dec 16 17:40:13 2013 (r336650) @@ -33,7 +33,6 @@ DESKTOP_ENTRIES="Meritous" \ false OPTIONS_DEFINE= DOCS -OPTIONS_DEFAULT=DOCS post-patch: @${REINPLACE_CMD} -e 's|dat/|${DATADIR}/|' ${WRKSRC}/src/*.c Modified: head/games/npush/Makefile ============================================================================== --- head/games/npush/Makefile Mon Dec 16 17:27:55 2013 (r336649) +++ head/games/npush/Makefile Mon Dec 16 17:40:13 2013 (r336650) @@ -14,7 +14,6 @@ PORTDOCS= * PORTDATA= * OPTIONS_DEFINE= DOCS -OPTIONS_DEFAULT=DOCS post-patch: @${REINPLACE_CMD} -e 's|"levels|"${DATADIR}/levels|' \ Modified: head/games/opencity/Makefile ============================================================================== --- head/games/opencity/Makefile Mon Dec 16 17:27:55 2013 (r336649) +++ head/games/opencity/Makefile Mon Dec 16 17:40:13 2013 (r336650) @@ -22,6 +22,5 @@ PORTDOCS= * PORTDATA= * OPTIONS_DEFINE= DOCS -OPTIONS_DEFAULT=DOCS .include Modified: head/games/phlipple/Makefile ============================================================================== --- head/games/phlipple/Makefile Mon Dec 16 17:27:55 2013 (r336649) +++ head/games/phlipple/Makefile Mon Dec 16 17:40:13 2013 (r336650) @@ -28,7 +28,6 @@ PORTDOCS= * PORTDATA= * OPTIONS_DEFINE= DOCS -OPTIONS_DEFAULT=DOCS post-patch: @${REINPLACE_CMD} -e 's|malloc.h|stdlib.h|' ${WRKSRC}/src/*.c Modified: head/games/pipepanic/Makefile ============================================================================== --- head/games/pipepanic/Makefile Mon Dec 16 17:27:55 2013 (r336649) +++ head/games/pipepanic/Makefile Mon Dec 16 17:40:13 2013 (r336650) @@ -20,7 +20,6 @@ PORTDOCS= * PORTDATA= * OPTIONS_DEFINE= DOCS -OPTIONS_DEFAULT=DOCS post-patch: @${REINPLACE_CMD} \ Modified: head/games/pipewalker/Makefile ============================================================================== --- head/games/pipewalker/Makefile Mon Dec 16 17:27:55 2013 (r336649) +++ head/games/pipewalker/Makefile Mon Dec 16 17:40:13 2013 (r336650) @@ -24,7 +24,6 @@ PORTDOCS= * PORTDATA= * OPTIONS_DEFINE= DOCS -OPTIONS_DEFAULT=DOCS post-patch: @${CHMOD} a+x ${WRKSRC}/install-sh Modified: head/games/plee-the-bear/Makefile ============================================================================== --- head/games/plee-the-bear/Makefile Mon Dec 16 17:27:55 2013 (r336649) +++ head/games/plee-the-bear/Makefile Mon Dec 16 17:40:13 2013 (r336650) @@ -31,7 +31,6 @@ CMAKE_ARGS= -Dlibclaw_DIR="${LOCALBASE}/ -DBEAR_NO_EDITOR=YES OPTIONS_DEFINE= NLS -OPTIONS_DEFAULT=NLS OPTIONS_SUB= yes .include Modified: head/games/quantumminigolf/Makefile ============================================================================== --- head/games/quantumminigolf/Makefile Mon Dec 16 17:27:55 2013 (r336649) +++ head/games/quantumminigolf/Makefile Mon Dec 16 17:40:13 2013 (r336650) @@ -29,7 +29,7 @@ DESKTOP_ENTRIES="Quantum Minigolf" \ false OPTIONS_DEFINE= OPTIMIZED_CFLAGS DOCS -OPTIONS_DEFAULT=OPTIMIZED_CFLAGS DOCS +OPTIONS_DEFAULT=OPTIMIZED_CFLAGS .include Modified: head/games/redeclipse/Makefile ============================================================================== --- head/games/redeclipse/Makefile Mon Dec 16 17:27:55 2013 (r336649) +++ head/games/redeclipse/Makefile Mon Dec 16 17:40:13 2013 (r336650) @@ -35,7 +35,7 @@ PORTDOCS= * OPTIONS_DEFINE= OPTIMIZED_CFLAGS DOCS OPTIONS_MULTI= COMPONENTS OPTIONS_MULTI_COMPONENTS=CLIENT DEDICATED -OPTIONS_DEFAULT=CLIENT DEDICATED OPTIMIZED_CFLAGS DOCS +OPTIONS_DEFAULT=CLIENT DEDICATED OPTIMIZED_CFLAGS CLIENT_DESC= Build client DEDICATED_DESC= Build dedicated server Modified: head/games/reminiscence/Makefile ============================================================================== --- head/games/reminiscence/Makefile Mon Dec 16 17:27:55 2013 (r336649) +++ head/games/reminiscence/Makefile Mon Dec 16 17:40:13 2013 (r336650) @@ -25,7 +25,6 @@ PLIST_FILES= bin/remin PLIST_DIRSTRY= %%DATADIR%%/data %%DATADIR%% OPTIONS_DEFINE= DOCS -OPTIONS_DEFAULT=DOCS post-patch: @${REINPLACE_CMD} -e 's|DATA|${DATADIR}/data|' ${WRKSRC}/main.cpp Modified: head/games/rezerwar/Makefile ============================================================================== --- head/games/rezerwar/Makefile Mon Dec 16 17:27:55 2013 (r336649) +++ head/games/rezerwar/Makefile Mon Dec 16 17:40:13 2013 (r336650) @@ -24,7 +24,6 @@ PORTDOCS= * PORTDATA= * OPTIONS_DEFINE= DOCS -OPTIONS_DEFAULT=DOCS post-patch: @${REINPLACE_CMD} -e 's|gcc|${CC}|' ${WRKSRC}/configure Modified: head/games/sdb/Makefile ============================================================================== --- head/games/sdb/Makefile Mon Dec 16 17:27:55 2013 (r336649) +++ head/games/sdb/Makefile Mon Dec 16 17:40:13 2013 (r336650) @@ -37,7 +37,6 @@ DESKTOP_ENTRIES="Shotgun Debugger" \ "" OPTIONS_DEFINE= DOCS -OPTIONS_DEFAULT=DOCS .include Modified: head/games/sdlsand/Makefile ============================================================================== --- head/games/sdlsand/Makefile Mon Dec 16 17:27:55 2013 (r336649) +++ head/games/sdlsand/Makefile Mon Dec 16 17:40:13 2013 (r336650) @@ -19,9 +19,6 @@ PLIST_FILES= bin/${PORTNAME} PORTDOCS= * OPTIONS_DEFINE= DOCS -OPTIONS_DEFAULT=DOCS - -.include post-patch: @${REINPLACE_CMD} -e '/crtdbg/ d' ${WRKSRC}/CmdLine.cpp Modified: head/games/spacejunk/Makefile ============================================================================== --- head/games/spacejunk/Makefile Mon Dec 16 17:27:55 2013 (r336649) +++ head/games/spacejunk/Makefile Mon Dec 16 17:40:13 2013 (r336650) @@ -33,7 +33,6 @@ DESKTOP_ENTRIES="Spacejunk" \ false OPTIONS_DEFINE= DOCS -OPTIONS_DEFAULT=DOCS .include Modified: head/games/stormbaancoureur/Makefile ============================================================================== --- head/games/stormbaancoureur/Makefile Mon Dec 16 17:27:55 2013 (r336649) +++ head/games/stormbaancoureur/Makefile Mon Dec 16 17:40:13 2013 (r336650) @@ -26,7 +26,6 @@ PORTDOCS= * PORTDATA= * OPTIONS_DEFINE= DOCS -OPTIONS_DEFAULT=DOCS post-patch: @${REINPLACE_CMD} -e 's|__DATADIR|"${DATADIR}"|' \ Modified: head/games/toycars/Makefile ============================================================================== --- head/games/toycars/Makefile Mon Dec 16 17:27:55 2013 (r336649) +++ head/games/toycars/Makefile Mon Dec 16 17:40:13 2013 (r336650) @@ -27,7 +27,6 @@ PORTDOCS= * PORTDATA= * OPTIONS_DEFINE= DOCS -OPTIONS_DEFAULT=DOCS post-extract: @${RM} ${WRKSRC}/data/.*Store Modified: head/games/valyriatear/Makefile ============================================================================== --- head/games/valyriatear/Makefile Mon Dec 16 17:27:55 2013 (r336649) +++ head/games/valyriatear/Makefile Mon Dec 16 17:40:13 2013 (r336650) @@ -35,7 +35,6 @@ PORTDOCS= * PORTDATA= * OPTIONS_DEFINE= DOCS NLS -OPTIONS_DEFAULT=DOCS NLS OPTIONS_SUB= yes NLS_CMAKE_OFF= -DDISABLE_TRANSLATIONS=ON Modified: head/games/xtron/Makefile ============================================================================== --- head/games/xtron/Makefile Mon Dec 16 17:27:55 2013 (r336649) +++ head/games/xtron/Makefile Mon Dec 16 17:40:13 2013 (r336650) @@ -25,7 +25,6 @@ DESKTOP_ENTRIES="xtron" \ false OPTIONS_DEFINE= DOCS -OPTIONS_DEFAULT=DOCS post-patch: @${REINPLACE_CMD} -e "s|%%PREFIX%%|${PREFIX}|g" ${WRKSRC}/xtronrc Modified: head/graphics/devil/Makefile ============================================================================== --- head/graphics/devil/Makefile Mon Dec 16 17:27:55 2013 (r336649) +++ head/graphics/devil/Makefile Mon Dec 16 17:40:13 2013 (r336650) @@ -30,7 +30,7 @@ LDFLAGS+= -L${LOCALBASE}/lib PORTDOCS= * OPTIONS_DEFINE= JPEG JASPER LCMS MNG PNG TIFF EXR X11 SDL NVTT SIMD DOCS -OPTIONS_DEFAULT=JPEG JASPER LCMS MNG PNG TIFF EXR X11 SDL NVTT DOCS +OPTIONS_DEFAULT=JPEG JASPER LCMS MNG PNG TIFF EXR X11 SDL NVTT OPTIONS_DEFAULT_amd64=SIMD JPEG_DESC= Enable JPEG support Modified: head/graphics/geeqie/Makefile ============================================================================== --- head/graphics/geeqie/Makefile Mon Dec 16 17:27:55 2013 (r336649) +++ head/graphics/geeqie/Makefile Mon Dec 16 17:40:13 2013 (r336650) @@ -27,7 +27,7 @@ MAKE_ARGS+= top_builddir="${WRKSRC}" PORTDOCS= * OPTIONS_DEFINE= EXIV2 LCMS LIRC GPS DOCS -OPTIONS_DEFAULT=EXIV2 LCMS DOCS +OPTIONS_DEFAULT=EXIV2 LCMS EXIV2_DESC= Metadata editing LCMS_DESC= Color adjusting LIRC_DESC= Remote control Modified: head/graphics/glosm/Makefile ============================================================================== --- head/graphics/glosm/Makefile Mon Dec 16 17:27:55 2013 (r336649) +++ head/graphics/glosm/Makefile Mon Dec 16 17:40:13 2013 (r336650) @@ -22,7 +22,6 @@ USE_SDL= sdl PORTDOCS= README ChangeLog OPTIONS_DEFINE= DOCS -OPTIONS_DEFAULT=DOCS regression-test: cd ${BUILD_WRKSRC} && ctest Modified: head/graphics/liblqr-1/Makefile ============================================================================== --- head/graphics/liblqr-1/Makefile Mon Dec 16 17:27:55 2013 (r336649) +++ head/graphics/liblqr-1/Makefile Mon Dec 16 17:40:13 2013 (r336650) @@ -23,7 +23,6 @@ USE_CSTD= gnu89 PORTEXAMPLES= * OPTIONS_DEFINE= EXAMPLES HTMLDOCS -OPTIONS_DEFAULT=EXAMPLES HTMLDOCS_DESC= Build and install HTML documentation .include Modified: head/graphics/nvidia-texture-tools/Makefile ============================================================================== --- head/graphics/nvidia-texture-tools/Makefile Mon Dec 16 17:27:55 2013 (r336649) +++ head/graphics/nvidia-texture-tools/Makefile Mon Dec 16 17:40:13 2013 (r336650) @@ -27,7 +27,6 @@ WRKSRC= ${WRKDIR}/${PORTNAME} PORTDOCS= NVIDIA_Texture_Tools_README.txt ChangeLog OPTIONS_DEFINE= COMPRESSUI DOCS -OPTIONS_DEFAULT=DOCS COMPRESSUI_DESC=Build compressor UI (requires Qt4) Modified: head/graphics/py-pyglet/Makefile ============================================================================== --- head/graphics/py-pyglet/Makefile Mon Dec 16 17:27:55 2013 (r336649) +++ head/graphics/py-pyglet/Makefile Mon Dec 16 17:40:13 2013 (r336650) @@ -25,7 +25,6 @@ PORTDOCS= * PORTEXAMPLES= * OPTIONS_DEFINE= DOCS EXAMPLES -OPTIONS_DEFAULT=DOCS EXAMPLES .include Modified: head/graphics/quesoglc/Makefile ============================================================================== --- head/graphics/quesoglc/Makefile Mon Dec 16 17:27:55 2013 (r336649) +++ head/graphics/quesoglc/Makefile Mon Dec 16 17:40:13 2013 (r336650) @@ -28,7 +28,6 @@ CONFIGURE_ARGS= --without-glew --with-fr PORTDOCS= README OPTIONS_DEFINE= DOCS -OPTIONS_DEFAULT=DOCS post-install: ${MKDIR} ${STAGEDIR}${DOCSDIR} Modified: head/graphics/scrot/Makefile ============================================================================== --- head/graphics/scrot/Makefile Mon Dec 16 17:27:55 2013 (r336649) +++ head/graphics/scrot/Makefile Mon Dec 16 17:40:13 2013 (r336650) @@ -19,6 +19,5 @@ PLIST_FILES= bin/${PORTNAME} man/man1/${ PORTDOCS= * OPTIONS_DEFINE= DOCS -OPTIONS_DEFAULT=DOCS .include Modified: head/graphics/tiled/Makefile ============================================================================== --- head/graphics/tiled/Makefile Mon Dec 16 17:27:55 2013 (r336649) +++ head/graphics/tiled/Makefile Mon Dec 16 17:40:13 2013 (r336650) @@ -18,9 +18,6 @@ USE_LDCONFIG= yes PORTDOCS= * OPTIONS_DEFINE= DOCS -OPTIONS_DEFAULT=DOCS - -.include post-patch: @${REINPLACE_CMD} -e 's|lrelease|&-qt4|' \ Modified: head/mail/findmaildirs/Makefile ============================================================================== --- head/mail/findmaildirs/Makefile Mon Dec 16 17:27:55 2013 (r336649) +++ head/mail/findmaildirs/Makefile Mon Dec 16 17:40:13 2013 (r336650) @@ -19,7 +19,6 @@ PLIST_FILES= bin/${PORTNAME} PORTDOCS= README OPTIONS_DEFINE= DOCS -OPTIONS_DEFAULT=DOCS post-install: ${MKDIR} ${STAGEDIR}${DOCSDIR} Modified: head/misc/metromap/Makefile ============================================================================== --- head/misc/metromap/Makefile Mon Dec 16 17:27:55 2013 (r336649) +++ head/misc/metromap/Makefile Mon Dec 16 17:40:13 2013 (r336650) @@ -22,7 +22,6 @@ USES= gettext gmake PORTDOCS= AUTHORS NEWS README README.data TODO OPTIONS_DEFINE= DOCS -OPTIONS_DEFAULT=DOCS post-patch: @${REINPLACE_CMD} -e 's,/usr/bin/python,${SETENV} python,' ${WRKSRC}/metromap.py Modified: head/multimedia/avbin/Makefile ============================================================================== --- head/multimedia/avbin/Makefile Mon Dec 16 17:27:55 2013 (r336649) +++ head/multimedia/avbin/Makefile Mon Dec 16 17:40:13 2013 (r336650) @@ -21,7 +21,6 @@ USE_LDCONFIG= yes PORTDOCS= * OPTIONS_DEFINE= DOCS -OPTIONS_DEFAULT=DOCS .include Modified: head/sysutils/pacman/Makefile ============================================================================== --- head/sysutils/pacman/Makefile Mon Dec 16 17:27:55 2013 (r336649) +++ head/sysutils/pacman/Makefile Mon Dec 16 17:40:13 2013 (r336650) @@ -40,7 +40,7 @@ MAN8= makepkg.8 pacman-key.8 pacman.8 p MLINKS= repo-add.8 repo-remove.8 OPTIONS_DEFINE= CURL GPGME EXAMPLES NLS -OPTIONS_DEFAULT=CURL GPGME EXAMPLES NLS +OPTIONS_DEFAULT=CURL GPGME CURL_DESC= Use libcurl fetcher instead of external curl/wget GPGME_DESC= Use GPGME for PGP signature verification Modified: head/textproc/uncrustify/Makefile ============================================================================== --- head/textproc/uncrustify/Makefile Mon Dec 16 17:27:55 2013 (r336649) +++ head/textproc/uncrustify/Makefile Mon Dec 16 17:40:13 2013 (r336650) @@ -18,7 +18,6 @@ PORTDATA= * PORTDOCS= * OPTIONS_DEFINE= DOCS -OPTIONS_DEFAULT=DOCS post-install: cd ${WRKSRC}/documentation && ${COPYTREE_SHARE} '*' ${STAGEDIR}${DOCSDIR}/ From owner-svn-ports-head@FreeBSD.ORG Mon Dec 16 17:46:50 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 75B48B55; Mon, 16 Dec 2013 17:46:50 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 6191416C2; Mon, 16 Dec 2013 17:46:50 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBGHkoRk042274; Mon, 16 Dec 2013 17:46:50 GMT (envelope-from antoine@svn.freebsd.org) Received: (from antoine@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBGHkoUt042273; Mon, 16 Dec 2013 17:46:50 GMT (envelope-from antoine@svn.freebsd.org) Message-Id: <201312161746.rBGHkoUt042273@svn.freebsd.org> From: Antoine Brodin Date: Mon, 16 Dec 2013 17:46:50 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r336651 - head/devel/chrpath X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 16 Dec 2013 17:46:50 -0000 Author: antoine Date: Mon Dec 16 17:46:49 2013 New Revision: 336651 URL: http://svnweb.freebsd.org/changeset/ports/336651 Log: Finish stage support Modified: head/devel/chrpath/Makefile Modified: head/devel/chrpath/Makefile ============================================================================== --- head/devel/chrpath/Makefile Mon Dec 16 17:40:13 2013 (r336650) +++ head/devel/chrpath/Makefile Mon Dec 16 17:46:49 2013 (r336651) @@ -17,7 +17,7 @@ GNU_CONFIGURE= yes USES= fmake -PLIST_FILES= bin/chrpath +PLIST_FILES= bin/chrpath man/man1/chrpath.1.gz PORTDOCS= AUTHORS ChangeLog NEWS README From owner-svn-ports-head@FreeBSD.ORG Mon Dec 16 18:01:52 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 514362A7; Mon, 16 Dec 2013 18:01:52 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 3BC441853; Mon, 16 Dec 2013 18:01:52 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBGI1qUP048855; Mon, 16 Dec 2013 18:01:52 GMT (envelope-from antoine@svn.freebsd.org) Received: (from antoine@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBGI1pIr048846; Mon, 16 Dec 2013 18:01:51 GMT (envelope-from antoine@svn.freebsd.org) Message-Id: <201312161801.rBGI1pIr048846@svn.freebsd.org> From: Antoine Brodin Date: Mon, 16 Dec 2013 18:01:51 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r336652 - in head/devel/libreadline-java: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 16 Dec 2013 18:01:52 -0000 Author: antoine Date: Mon Dec 16 18:01:50 2013 New Revision: 336652 URL: http://svnweb.freebsd.org/changeset/ports/336652 Log: - Fix build with clang - Stage support - Do not hardcode /usr/local PR: ports/184751 Submitted by: Martin Kammerhofer (maintainer) Added: head/devel/libreadline-java/files/jython.sh.in - copied, changed from r336651, head/devel/libreadline-java/files/jython.sh head/devel/libreadline-java/files/pkg-message.in - copied unchanged from r336651, head/devel/libreadline-java/pkg-message Deleted: head/devel/libreadline-java/files/jython.sh head/devel/libreadline-java/pkg-message Modified: head/devel/libreadline-java/Makefile head/devel/libreadline-java/files/JReadlineCompleter.py head/devel/libreadline-java/files/patch-src-native-Makefile head/devel/libreadline-java/files/patch-src-native-org_gnu_readline_Readline.c Modified: head/devel/libreadline-java/Makefile ============================================================================== --- head/devel/libreadline-java/Makefile Mon Dec 16 17:46:49 2013 (r336651) +++ head/devel/libreadline-java/Makefile Mon Dec 16 18:01:50 2013 (r336652) @@ -4,7 +4,7 @@ PORTNAME= libreadline-java PORTVERSION= 0.8.0 DISTVERSIONSUFFIX= -src -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= devel java MASTER_SITES= SF/java-readline/java-readline/${PORTVERSION} @@ -17,39 +17,33 @@ RUN_DEPENDS= ${LOCALBASE}/include/editli ALL_TARGET= # empty MAKE_ENV= JAVA_HOME="${JAVA_HOME}" JAVA="${JAVA}" JAVAC="${JAVAC}" \ JAVAH="${JAVAH}" JAR_="${JAR}" -PKGMESSAGE= ${WRKDIR}/pkg-message +SUB_FILES= pkg-message jython.sh PLIST_FILES= %%JAVAJARDIR%%/libreadline-java.jar lib/libJavaReadline.so \ lib/libJavaEditline.so lib/libJavaGetline.so -.if !defined(NOPORTDOCS) -PLIST_FILES+= %%DOCSDIR%%/README.1st %%DOCSDIR%%/README \ - %%DOCSDIR%%/jython.sh %%DOCSDIR%%/JReadlineCompleter.py \ - @dirrm\ %%DOCSDIR%% -.endif -USE_GMAKE= yes +PORTDOCS= README.1st README jython.sh JReadlineCompleter.py +USES= gmake USE_JAVA= yes USE_LDCONFIG= yes WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} MAKE_JOBS_UNSAFE= yes -NO_STAGE= yes +OPTIONS_DEFINE= DOCS + +.include + do-install: - ${INSTALL_DATA} ${WRKSRC}/libreadline-java.jar ${JAVAJARDIR} - ${INSTALL_DATA} ${WRKSRC}/libJavaReadline.so ${PREFIX}/lib - ${INSTALL_DATA} ${WRKSRC}/libJavaEditline.so ${PREFIX}/lib - ${INSTALL_DATA} ${WRKSRC}/libJavaGetline.so ${PREFIX}/lib -.if !defined(NOPORTDOCS) - ${MKDIR} ${DOCSDIR} - ${INSTALL_DATA} ${WRKSRC}/README.1st ${DOCSDIR} - ${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR} - ${INSTALL_DATA} ${FILESDIR}/jython.sh ${DOCSDIR} - ${INSTALL_DATA} ${FILESDIR}/JReadlineCompleter.py ${DOCSDIR} + ${INSTALL_DATA} ${WRKSRC}/libreadline-java.jar ${STAGEDIR}${JAVAJARDIR} + ${INSTALL_DATA} ${WRKSRC}/libJavaReadline.so ${STAGEDIR}${PREFIX}/lib + ${INSTALL_DATA} ${WRKSRC}/libJavaEditline.so ${STAGEDIR}${PREFIX}/lib + ${INSTALL_DATA} ${WRKSRC}/libJavaGetline.so ${STAGEDIR}${PREFIX}/lib +.if ${PORT_OPTIONS:MDOCS} + @${MKDIR} ${STAGEDIR}${DOCSDIR} + ${INSTALL_DATA} ${WRKSRC}/README.1st ${STAGEDIR}${DOCSDIR} + ${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR} + ${INSTALL_DATA} ${WRKDIR}/jython.sh ${STAGEDIR}${DOCSDIR} + ${INSTALL_DATA} ${FILESDIR}/JReadlineCompleter.py ${STAGEDIR}${DOCSDIR} .endif -post-install: - @${SED} -e 's|%%JAVAJARDIR%%|${JAVAJARDIR}|g' -- \ - ${.CURDIR}/pkg-message >${PKGMESSAGE} - @${CAT} ${PKGMESSAGE} - .if !defined(BATCH) test: cd ${WRKSRC} && ${MAKE_ENV} ${GMAKE} test # Now type something! Modified: head/devel/libreadline-java/files/JReadlineCompleter.py ============================================================================== --- head/devel/libreadline-java/files/JReadlineCompleter.py Mon Dec 16 17:46:49 2013 (r336651) +++ head/devel/libreadline-java/files/JReadlineCompleter.py Mon Dec 16 18:01:50 2013 (r336652) @@ -4,6 +4,10 @@ # # This is rlcompleter.py from CPython 2.5.1 adapted for Jython # and libreadline-java. +# +# NOTE: Jython >= 2.5 already includes rlcompleter, +# see http://www.jython.org/docs/library/rlcompleter.html +# This is useful for older Jython versions only! """TAB-completion for Jython + libreadline-java @@ -105,9 +109,13 @@ class PyCompleter: try: if state == 0: if "." in text: - self.matches = self.attr_matches(text) + matches = self.attr_matches(text) else: - self.matches = self.global_matches(text) + matches = self.global_matches(text) + # remove duplicates and sort + matches = list(set(matches)) + matches.sort() + self.matches = matches return self.matches[state] except (AttributeError, IndexError, NameError): return None Copied and modified: head/devel/libreadline-java/files/jython.sh.in (from r336651, head/devel/libreadline-java/files/jython.sh) ============================================================================== --- head/devel/libreadline-java/files/jython.sh Mon Dec 16 17:46:49 2013 (r336651, copy source) +++ head/devel/libreadline-java/files/jython.sh.in Mon Dec 16 18:01:50 2013 (r336652) @@ -2,31 +2,39 @@ # Invoke Jython. # jython.sh,v 1.5 2007/09/28 09:13:55 martin Exp # -# The path names below are for Jython 2.2 on FreeBSD. +# The path names below are for Jython 2.5.3 on FreeBSD. # - -CP="/usr/local/lib/jython22/jython.jar" +# NOTE: Jython >= 2.5 already includes rlcompleter, +# see http://www.jython.org/docs/library/rlcompleter.html +# This is useful for older Jython versions only! + +if [ -d "%%LOCALBASE%%/lib/jython22" ] ; then + _ver=22 +else + _ver= +fi +CP="%%LOCALBASE%%/lib/jython${_ver}/jython.jar" defs= wrapper= case "${JYTHON_CONSOLE:-Editline}" in *[Ee]dit[Ll]ine) - CP="$CP:/usr/local/share/java/classes/libreadline-java.jar" + CP="$CP:%%LOCALBASE%%/share/java/classes/libreadline-java.jar" defs="-Dpython.console=org.python.util.ReadlineConsole" defs="$defs -Dpython.console.readlinelib=Editline" ;; *[Gg]et[Ll]ine) - CP="$CP:/usr/local/share/java/classes/libreadline-java.jar" + CP="$CP:%%LOCALBASE%%/share/java/classes/libreadline-java.jar" defs="-Dpython.console=org.python.util.ReadlineConsole" defs="$defs -Dpython.console.readlinelib=Getline" ;; *[Jj][Ll]ine) - CP="$CP:/usr/local/share/java/classes/jline.jar" + CP="$CP:%%LOCALBASE%%/share/java/classes/jline.jar" defs="-Dpython.console=" wrapper=jline.ConsoleRunner ;; *[Rr]ead[Ll]ine) - CP="$CP:/usr/local/share/java/classes/libreadline-java.jar" + CP="$CP:%%LOCALBASE%%/share/java/classes/libreadline-java.jar" defs="-Dpython.console=org.python.util.ReadlineConsole" defs="$defs -Dpython.console.readlinelib=GnuReadline" ;; @@ -41,7 +49,7 @@ if [ -n "$CLASSPATH" ]; then CP="$CP:$CLASSPATH" fi -exec java -Dpython.home="/usr/local/lib/jython22" \ +exec java -Dpython.home="%%LOCALBASE%%/lib/jython${_ver}" \ -Dpython.cachedir="${HOME}/.jython-cachedir" \ -classpath "$CP" $wrapper org.python.util.jython $defs "$@" Modified: head/devel/libreadline-java/files/patch-src-native-Makefile ============================================================================== --- head/devel/libreadline-java/files/patch-src-native-Makefile Mon Dec 16 17:46:49 2013 (r336651) +++ head/devel/libreadline-java/files/patch-src-native-Makefile Mon Dec 16 18:01:50 2013 (r336652) @@ -1,6 +1,13 @@ ---- src/native/Makefile.orig 2003-01-07 07:14:35.000000000 -0300 -+++ src/native/Makefile 2008-02-16 18:53:37.000000000 -0300 -@@ -44,10 +44,12 @@ +--- src/native/Makefile.orig 2003-01-07 11:14:35.000000000 +0100 ++++ src/native/Makefile 2013-12-13 08:29:23.000000000 +0100 +@@ -38,25 +38,28 @@ + INCLUDES = -I "c:/Programme/DevStudio/VC/include" \ + -I $(JAVAINCLUDE) -I $(JAVANATINC) + LIB = "c:/Programme/DevStudio/VC/lib" +-CC = cl ++#CC = gcc + OBJ_EXT := obj + LIB_PRE := LIB_EXT := dll CFLAGS=-DWIN32=$(WIN32) -D__IBMC__ else @@ -16,7 +23,8 @@ ifeq (cygwin,$(WIN32)) JavaGetline_LIBS = -lcygwin endif -@@ -55,8 +57,9 @@ +-CC = gcc ++CC = cc OBJ_EXT := o LIB_PRE := lib LIB_EXT := so Modified: head/devel/libreadline-java/files/patch-src-native-org_gnu_readline_Readline.c ============================================================================== --- head/devel/libreadline-java/files/patch-src-native-org_gnu_readline_Readline.c Mon Dec 16 17:46:49 2013 (r336651) +++ head/devel/libreadline-java/files/patch-src-native-org_gnu_readline_Readline.c Mon Dec 16 18:01:50 2013 (r336652) @@ -1,5 +1,14 @@ --- src/native/org_gnu_readline_Readline.c.orig 2003-01-07 11:14:35.000000000 +0100 -+++ src/native/org_gnu_readline_Readline.c 2007-09-27 09:21:14.000000000 +0200 ++++ src/native/org_gnu_readline_Readline.c 2013-12-12 20:40:36.000000000 +0100 +@@ -430,7 +430,7 @@ + jtext = (*jniEnv)->NewStringUTF(jniEnv,text); + + if (jniMethodId == 0) { +- return; ++ return 0; + } + + completion = (*jniEnv)->CallObjectMethod(jniEnv, jniObject, @@ -560,6 +560,21 @@ #endif Copied: head/devel/libreadline-java/files/pkg-message.in (from r336651, head/devel/libreadline-java/pkg-message) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/libreadline-java/files/pkg-message.in Mon Dec 16 18:01:50 2013 (r336652, copy of r336651, head/devel/libreadline-java/pkg-message) @@ -0,0 +1,5 @@ +-------------------------------------------------- +To use readline-java add the file +%%JAVAJARDIR%%/libreadline-java.jar +to your classpath! +-------------------------------------------------- From owner-svn-ports-head@FreeBSD.ORG Mon Dec 16 18:06:07 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 543A6420; Mon, 16 Dec 2013 18:06:07 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 406A118B0; Mon, 16 Dec 2013 18:06:07 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBGI67sP049465; Mon, 16 Dec 2013 18:06:07 GMT (envelope-from rene@svn.freebsd.org) Received: (from rene@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBGI66nD049463; Mon, 16 Dec 2013 18:06:06 GMT (envelope-from rene@svn.freebsd.org) Message-Id: <201312161806.rBGI66nD049463@svn.freebsd.org> From: Rene Ladan Date: Mon, 16 Dec 2013 18:06:06 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r336653 - head/multimedia/spotify-websocket-api X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 16 Dec 2013 18:06:07 -0000 Author: rene Date: Mon Dec 16 18:06:06 2013 New Revision: 336653 URL: http://svnweb.freebsd.org/changeset/ports/336653 Log: - Convert to PYDISTUTILS=yes - Stagify - Mark as architecture-independent. - Use option helpers - Bump PORTREVISION to remove runtime dependency on py-setuptools Modified: head/multimedia/spotify-websocket-api/Makefile head/multimedia/spotify-websocket-api/pkg-plist Modified: head/multimedia/spotify-websocket-api/Makefile ============================================================================== --- head/multimedia/spotify-websocket-api/Makefile Mon Dec 16 18:01:50 2013 (r336652) +++ head/multimedia/spotify-websocket-api/Makefile Mon Dec 16 18:06:06 2013 (r336653) @@ -3,13 +3,15 @@ PORTNAME= SpotifyWebsocketAPI PORTVERSION= 0.2 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= multimedia python PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} MAINTAINER= rene@FreeBSD.org COMMENT= Websocket API and client for Spotify +NO_ARCH= yes + USE_GITHUB= yes GH_COMMIT= 08ee326 GH_ACCOUNT= Hexxeh @@ -17,7 +19,8 @@ GH_PROJECT= spotify-websocket-api GH_TAGNAME= ${GH_COMMIT} USE_PYTHON= yes # tested with 2.7 -USE_PYDISTUTILS= easy_install +USE_PYDISTUTILS= yes +PYDISTUTILS_AUTOPLIST= yes OPTIONSFILE= ${PORT_DBDIR}/py-${PORTNAME}/options OPTIONS_DEFINE= EXAMPLES @@ -27,9 +30,6 @@ PORTEXAMPLES= blocking.py nonblocking.py CLIENTFILES= respotify.py respotify-helper.py -NO_STAGE= yes -.include - RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}requests>=1.1.0:${PORTSDIR}/www/py-requests \ ${PYTHON_PKGNAMEPREFIX}ws4py>=0.2.4:${PORTSDIR}/www/py-ws4py \ ${PYTHON_PKGNAMEPREFIX}protobuf>=2.4.1:${PORTSDIR}/devel/py-protobuf \ @@ -41,9 +41,7 @@ EXAMPLES_LIB_DEPENDS=libao.so:${PORTSDIR libmpg123.so:${PORTSDIR}/audio/mpg123 EXAMPLES_RUN_DEPENDS=${PYTHON_PKGNAMEPREFIX}curl>=0:${PORTSDIR}/ftp/py-curl \ ${PYTHON_PKGNAMEPREFIX}gobject>=0:${PORTSDIR}/devel/py-gobject -.if ${PORT_OPTIONS:MEXAMPLES} -USE_GSTREAMER= python -.endif +EXAMPLES_USE= GSTREAMER=python post-patch: ${REINPLACE_CMD} -e "s|%%PREFIX%%|${PREFIX}|" \ @@ -51,16 +49,15 @@ post-patch: post-install: .for f in ${CLIENTFILES} - @${INSTALL_SCRIPT} ${WRKSRC}/clients/respotify/${f} ${PREFIX}/bin - @${PYTHON_CMD} -O -mcompileall ${PREFIX}/bin/${f} - @${PYTHON_CMD} -mcompileall ${PREFIX}/bin/${f} + @${INSTALL_SCRIPT} ${WRKSRC}/clients/respotify/${f} ${STAGEDIR}${PREFIX}/bin + @${PYTHON_CMD} -O -mcompileall ${STAGEDIR}${PREFIX}/bin/${f} + @${PYTHON_CMD} -mcompileall ${STAGEDIR}${PREFIX}/bin/${f} .endfor - @${LN} -s ${PREFIX}/bin/respotify.py ${PREFIX}/bin/respotify -.if ${PORT_OPTIONS:MEXAMPLES} - @${MKDIR} ${EXAMPLESDIR} + @${LN} -s ${PREFIX}/bin/respotify.py ${STAGEDIR}${PREFIX}/bin/respotify + + @${MKDIR} ${STAGEDIR}${EXAMPLESDIR} .for f in ${PORTEXAMPLES} - @${INSTALL_SCRIPT} ${WRKSRC}/examples/${f} ${EXAMPLESDIR} + @${INSTALL_SCRIPT} ${WRKSRC}/examples/${f} ${STAGEDIR}${EXAMPLESDIR} .endfor -.endif .include Modified: head/multimedia/spotify-websocket-api/pkg-plist ============================================================================== --- head/multimedia/spotify-websocket-api/pkg-plist Mon Dec 16 18:01:50 2013 (r336652) +++ head/multimedia/spotify-websocket-api/pkg-plist Mon Dec 16 18:06:06 2013 (r336653) @@ -5,4 +5,3 @@ bin/respotify-helper.pyo bin/respotify.py bin/respotify.pyc bin/respotify.pyo -%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%% From owner-svn-ports-head@FreeBSD.ORG Mon Dec 16 18:10:04 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 7410968E; Mon, 16 Dec 2013 18:10:04 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 60AF01916; Mon, 16 Dec 2013 18:10:04 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBGIA4bk050129; Mon, 16 Dec 2013 18:10:04 GMT (envelope-from glarkin@svn.freebsd.org) Received: (from glarkin@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBGIA4rW050128; Mon, 16 Dec 2013 18:10:04 GMT (envelope-from glarkin@svn.freebsd.org) Message-Id: <201312161810.rBGIA4rW050128@svn.freebsd.org> From: Greg Larkin Date: Mon, 16 Dec 2013 18:10:04 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r336654 - head/sysutils/rubygem-hiera X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 16 Dec 2013 18:10:04 -0000 Author: glarkin Date: Mon Dec 16 18:10:03 2013 New Revision: 336654 URL: http://svnweb.freebsd.org/changeset/ports/336654 Log: - Reassign maintainership Submitted by: Bartek Rutkowski (via private email) Modified: head/sysutils/rubygem-hiera/Makefile Modified: head/sysutils/rubygem-hiera/Makefile ============================================================================== --- head/sysutils/rubygem-hiera/Makefile Mon Dec 16 18:06:06 2013 (r336653) +++ head/sysutils/rubygem-hiera/Makefile Mon Dec 16 18:10:03 2013 (r336654) @@ -6,7 +6,7 @@ PORTVERSION= 1.3.0 CATEGORIES= sysutils rubygems MASTER_SITES= RG -MAINTAINER= glarkin@FreeBSD.org +MAINTAINER= r@robakdesign.com COMMENT= A pluggable data store for hierarchical data RUN_DEPENDS= ${PKGNAMEPREFIX}json_pure>=0:${PORTSDIR}/devel/rubygem-json_pure From owner-svn-ports-head@FreeBSD.ORG Mon Dec 16 18:18:11 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 893E69FB; Mon, 16 Dec 2013 18:18:11 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 6B8531B7B; Mon, 16 Dec 2013 18:18:11 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBGIIB8E053916; Mon, 16 Dec 2013 18:18:11 GMT (envelope-from amdmi3@svn.freebsd.org) Received: (from amdmi3@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBGII8ob053895; Mon, 16 Dec 2013 18:18:08 GMT (envelope-from amdmi3@svn.freebsd.org) Message-Id: <201312161818.rBGII8ob053895@svn.freebsd.org> From: Dmitry Marakasov Date: Mon, 16 Dec 2013 18:18:08 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r336655 - in head: games/brikx games/caph games/fillets-ng games/formido games/freera games/gondola games/linwarrior games/meritous games/pouetchess games/redeclipse games/spacejunk gam... X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 16 Dec 2013 18:18:11 -0000 Author: amdmi3 Date: Mon Dec 16 18:18:07 2013 New Revision: 336655 URL: http://svnweb.freebsd.org/changeset/ports/336655 Log: - Use '.' instead of '*' in COPYTREE_* all over my ports Suggested by: danfe Modified: head/games/brikx/Makefile head/games/caph/Makefile head/games/fillets-ng/Makefile head/games/formido/Makefile head/games/freera/Makefile head/games/gondola/Makefile head/games/linwarrior/Makefile head/games/meritous/Makefile head/games/pouetchess/Makefile head/games/redeclipse/Makefile head/games/spacejunk/Makefile head/games/trimines/Makefile head/graphics/mandelbulber/Makefile head/graphics/py-pyglet/Makefile head/multimedia/avbin/Makefile head/textproc/uncrustify/Makefile Modified: head/games/brikx/Makefile ============================================================================== --- head/games/brikx/Makefile Mon Dec 16 18:10:03 2013 (r336654) +++ head/games/brikx/Makefile Mon Dec 16 18:18:07 2013 (r336655) @@ -33,6 +33,6 @@ post-patch: ${WRKSRC}/src/brikx.h post-install: - cd ${WRKSRC}/src/data && ${COPYTREE_SHARE} "*" ${STAGEDIR}${DATADIR}/ + cd ${WRKSRC}/src/data && ${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR}/ .include Modified: head/games/caph/Makefile ============================================================================== --- head/games/caph/Makefile Mon Dec 16 18:10:03 2013 (r336654) +++ head/games/caph/Makefile Mon Dec 16 18:18:07 2013 (r336655) @@ -50,7 +50,7 @@ post-patch: do-install: ${INSTALL_PROGRAM} ${BUILD_WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin/ - cd ${WRKSRC}/share/caph && ${COPYTREE_SHARE} '*' ${STAGEDIR}${DATADIR}/ + cd ${WRKSRC}/share/caph && ${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR}/ ${MKDIR} ${STAGEDIR}${DOCSDIR} cd ${WRKSRC}/doc/caph && ${INSTALL_DATA} README CHANGELOG ${STAGEDIR}${DOCSDIR}/ Modified: head/games/fillets-ng/Makefile ============================================================================== --- head/games/fillets-ng/Makefile Mon Dec 16 18:10:03 2013 (r336654) +++ head/games/fillets-ng/Makefile Mon Dec 16 18:18:07 2013 (r336655) @@ -61,6 +61,6 @@ post-install: cd ${WRKDIR}/${PORTNAME}-data-${DATAVERSION} && \ ${COPYTREE_SHARE} "font images music script sound" ${STAGEDIR}${DATADIR}/ cd ${WRKDIR}/${PORTNAME}-data-${DATAVERSION}/doc && \ - ${COPYTREE_SHARE} "*" ${STAGEDIR}${DOCSDIR}/ + ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR}/ .include Modified: head/games/formido/Makefile ============================================================================== --- head/games/formido/Makefile Mon Dec 16 18:10:03 2013 (r336654) +++ head/games/formido/Makefile Mon Dec 16 18:18:07 2013 (r336655) @@ -29,7 +29,7 @@ pre-build: do-install: ${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin/ - cd ${WRKSRC}/data && ${COPYTREE_SHARE} '*' ${STAGEDIR}${DATADIR}/ + cd ${WRKSRC}/data && ${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR}/ ${INSTALL_DATA} ${WRKSRC}/${PORTNAME}.cfg ${STAGEDIR}${DATADIR}/ ${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR}/ Modified: head/games/freera/Makefile ============================================================================== --- head/games/freera/Makefile Mon Dec 16 18:10:03 2013 (r336654) +++ head/games/freera/Makefile Mon Dec 16 18:18:07 2013 (r336655) @@ -34,6 +34,6 @@ post-patch: do-install: ${INSTALL_PROGRAM} ${WRKSRC}/freera ${STAGEDIR}${PREFIX}/bin/ - cd ${WRKSRC}/data && ${COPYTREE_SHARE} '*' ${STAGEDIR}${DATADIR}/ + cd ${WRKSRC}/data && ${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR}/ .include Modified: head/games/gondola/Makefile ============================================================================== --- head/games/gondola/Makefile Mon Dec 16 18:10:03 2013 (r336654) +++ head/games/gondola/Makefile Mon Dec 16 18:18:07 2013 (r336655) @@ -43,7 +43,7 @@ post-patch: do-install: cd ${WRKSRC} && ${COPYTREE_SHARE} "snowui gamelib simplejson run_game.py" \ ${STAGEDIR}${PREFIX}/lib/${PORTNAME}/ - cd ${WRKSRC}/data && ${COPYTREE_SHARE} '*' ${STAGEDIR}${DATADIR}/ + cd ${WRKSRC}/data && ${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR}/ ${INSTALL_SCRIPT} ${WRKDIR}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin/ .include Modified: head/games/linwarrior/Makefile ============================================================================== --- head/games/linwarrior/Makefile Mon Dec 16 18:10:03 2013 (r336654) +++ head/games/linwarrior/Makefile Mon Dec 16 18:18:07 2013 (r336655) @@ -39,7 +39,7 @@ post-patch: ${REINPLACE_CMD} -e 's|data/|${DATADIR}/|' do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/dist/${PORTNAME} ${STAGEDIR}${PREFIX}/bin - cd ${WRKSRC}/data && ${COPYTREE_SHARE} '*' ${STAGEDIR}${DATADIR}/ + ${INSTALL_PROGRAM} ${WRKSRC}/dist/${PORTNAME} ${STAGEDIR}${PREFIX}/bin/ + cd ${WRKSRC}/data && ${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR}/ .include Modified: head/games/meritous/Makefile ============================================================================== --- head/games/meritous/Makefile Mon Dec 16 18:10:03 2013 (r336654) +++ head/games/meritous/Makefile Mon Dec 16 18:18:07 2013 (r336655) @@ -38,10 +38,10 @@ post-patch: @${REINPLACE_CMD} -e 's|dat/|${DATADIR}/|' ${WRKSRC}/src/*.c do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/meritous ${STAGEDIR}${PREFIX}/bin + ${INSTALL_PROGRAM} ${WRKSRC}/meritous ${STAGEDIR}${PREFIX}/bin/ ${MKDIR} ${STAGEDIR}${DATADIR} - cd ${WRKSRC}/dat && ${COPYTREE_SHARE} \* ${STAGEDIR}${DATADIR} + cd ${WRKSRC}/dat && ${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR}/ ${MKDIR} ${STAGEDIR}${DOCSDIR} - ${INSTALL_DATA} ${WRKSRC}/readme.txt ${STAGEDIR}${DOCSDIR} + ${INSTALL_DATA} ${WRKSRC}/readme.txt ${STAGEDIR}${DOCSDIR}/ .include Modified: head/games/pouetchess/Makefile ============================================================================== --- head/games/pouetchess/Makefile Mon Dec 16 18:10:03 2013 (r336654) +++ head/games/pouetchess/Makefile Mon Dec 16 18:18:07 2013 (r336655) @@ -41,8 +41,8 @@ post-patch: @${REINPLACE_CMD} -e 's|data/|${DATADIR}/|' ${WRKSRC}/src/globalInfos.h do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/bin/pouetChess ${STAGEDIR}${PREFIX}/bin + ${INSTALL_PROGRAM} ${WRKSRC}/bin/pouetChess ${STAGEDIR}${PREFIX}/bin/ ${INSTALL_DATA} ${WRKSRC}/bin/config.ini ${STAGEDIR}${PREFIX}/etc/pouetChess.conf.sample - cd ${WRKSRC}/bin/data && ${COPYTREE_SHARE} "*" ${STAGEDIR}${DATADIR} + cd ${WRKSRC}/bin/data && ${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR}/ .include Modified: head/games/redeclipse/Makefile ============================================================================== --- head/games/redeclipse/Makefile Mon Dec 16 18:10:03 2013 (r336654) +++ head/games/redeclipse/Makefile Mon Dec 16 18:18:07 2013 (r336655) @@ -78,7 +78,7 @@ do-install: ${INSTALL_PROGRAM} ${BUILD_WRKSRC}/${f} ${STAGEDIR}${PREFIX}/libexec .endfor ${MKDIR} ${STAGEDIR}${DOCSDIR} - cd ${WRKSRC}/doc && ${COPYTREE_SHARE} "*" ${STAGEDIR}${DOCSDIR}/ + cd ${WRKSRC}/doc && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR}/ ${MKDIR} ${STAGEDIR}${DATADIR} cd ${WRKSRC} && ${COPYTREE_SHARE} "game data" ${STAGEDIR}${DATADIR}/ .if ${PORT_OPTIONS:MCLIENT} Modified: head/games/spacejunk/Makefile ============================================================================== --- head/games/spacejunk/Makefile Mon Dec 16 18:10:03 2013 (r336654) +++ head/games/spacejunk/Makefile Mon Dec 16 18:18:07 2013 (r336655) @@ -49,6 +49,6 @@ do-install: ${INSTALL_PROGRAM} ${WRKSRC}/src/spacejunk ${STAGEDIR}${PREFIX}/libexec/ cd ${WRKSRC} && ${COPYTREE_SHARE} 'data config.txt' ${STAGEDIR}${DATADIR}/ ${INSTALL_SCRIPT} ${WRKDIR}/spacejunk ${STAGEDIR}${PREFIX}/bin/ - cd ${WRKSRC}/doc && ${COPYTREE_SHARE} '*' ${STAGEDIR}${DOCSDIR}/ + cd ${WRKSRC}/doc && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR}/ .include Modified: head/games/trimines/Makefile ============================================================================== --- head/games/trimines/Makefile Mon Dec 16 18:10:03 2013 (r336654) +++ head/games/trimines/Makefile Mon Dec 16 18:18:07 2013 (r336655) @@ -33,8 +33,8 @@ do-build: do-install: ${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin/ - cd ${WRKSRC}/data && ${COPYTREE_SHARE} "*" ${STAGEDIR}${DATADIR} + cd ${WRKSRC}/data && ${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR}/ ${MKDIR} ${STAGEDIR}${DOCSDIR} - ${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR} + ${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR}/ .include Modified: head/graphics/mandelbulber/Makefile ============================================================================== --- head/graphics/mandelbulber/Makefile Mon Dec 16 18:10:03 2013 (r336654) +++ head/graphics/mandelbulber/Makefile Mon Dec 16 18:18:07 2013 (r336655) @@ -28,10 +28,10 @@ post-patch: ${WRKSRC}/${PORTNAME}.desktop do-install: - ${INSTALL_PROGRAM} ${BUILD_WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin - ${INSTALL_DATA} ${WRKSRC}/${PORTNAME}.desktop ${STAGEDIR}${PREFIX}/share/applications + ${INSTALL_PROGRAM} ${BUILD_WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin/ + ${INSTALL_DATA} ${WRKSRC}/${PORTNAME}.desktop ${STAGEDIR}${PREFIX}/share/applications/ ${MKDIR} ${STAGEDIR}${DATADIR} - cd ${WRKSRC}/usr/share && ${COPYTREE_SHARE} '*' ${STAGEDIR}${DATADIR}/ + cd ${WRKSRC}/usr/share && ${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR}/ ${MKDIR} ${STAGEDIR}${DOCSDIR} .for f in ${PORTDOCS} ${INSTALL_DATA} ${WRKSRC}/${f} ${STAGEDIR}${DOCSDIR}/ Modified: head/graphics/py-pyglet/Makefile ============================================================================== --- head/graphics/py-pyglet/Makefile Mon Dec 16 18:10:03 2013 (r336654) +++ head/graphics/py-pyglet/Makefile Mon Dec 16 18:18:07 2013 (r336655) @@ -33,7 +33,7 @@ IGNORE= crashes or doesn't work on !i38 .endif post-install: - cd ${WRKSRC}/doc && ${COPYTREE_SHARE} \* ${STAGEDIR}${DOCSDIR}/ - cd ${WRKSRC}/examples && ${COPYTREE_SHARE} \* ${STAGEDIR}${EXAMPLESDIR}/ + cd ${WRKSRC}/doc && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR}/ + cd ${WRKSRC}/examples && ${COPYTREE_SHARE} . ${STAGEDIR}${EXAMPLESDIR}/ .include Modified: head/multimedia/avbin/Makefile ============================================================================== --- head/multimedia/avbin/Makefile Mon Dec 16 18:10:03 2013 (r336654) +++ head/multimedia/avbin/Makefile Mon Dec 16 18:18:07 2013 (r336655) @@ -39,6 +39,6 @@ do-build: do-install: ${INSTALL_DATA} ${WRKSRC}/${LIBNAME} ${STAGEDIR}${PREFIX}/lib/ ${INSTALL_DATA} ${WRKSRC}/include/avbin.h ${STAGEDIR}${PREFIX}/include/ - cd ${WRKSRC}/doc && ${COPYTREE_SHARE} '*' ${STAGEDIR}${DOCSDIR}/ + cd ${WRKSRC}/doc && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR}/ .include Modified: head/textproc/uncrustify/Makefile ============================================================================== --- head/textproc/uncrustify/Makefile Mon Dec 16 18:10:03 2013 (r336654) +++ head/textproc/uncrustify/Makefile Mon Dec 16 18:18:07 2013 (r336655) @@ -20,6 +20,6 @@ PORTDOCS= * OPTIONS_DEFINE= DOCS post-install: - cd ${WRKSRC}/documentation && ${COPYTREE_SHARE} '*' ${STAGEDIR}${DOCSDIR}/ + cd ${WRKSRC}/documentation && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR}/ .include From owner-svn-ports-head@FreeBSD.ORG Mon Dec 16 18:25:09 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id A8160E86; Mon, 16 Dec 2013 18:25:09 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 9137A1D09; Mon, 16 Dec 2013 18:25:09 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBGIP9Rs058532; Mon, 16 Dec 2013 18:25:09 GMT (envelope-from glarkin@svn.freebsd.org) Received: (from glarkin@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBGIOnot058373; Mon, 16 Dec 2013 18:24:49 GMT (envelope-from glarkin@svn.freebsd.org) Message-Id: <201312161824.rBGIOnot058373@svn.freebsd.org> From: Greg Larkin Date: Mon, 16 Dec 2013 18:24:49 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r336656 - in head: databases/libdrizzle databases/pear-Doctrine12 databases/pecl-drizzle databases/sqlite-ext-miscfuncs devel/cvs-syncmail devel/cvsbook devel/cvschangelogbuilder devel/... X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 16 Dec 2013 18:25:09 -0000 Author: glarkin Date: Mon Dec 16 18:24:49 2013 New Revision: 336656 URL: http://svnweb.freebsd.org/changeset/ports/336656 Log: [Errno 11] Resource Temporarily Unavailable Reassigning my ports back to the pool with the hope of freeing up to do more FreeBSD work in the future. Submitted by: glarkin Modified: head/databases/libdrizzle/Makefile head/databases/pear-Doctrine12/Makefile head/databases/pecl-drizzle/Makefile head/databases/sqlite-ext-miscfuncs/Makefile head/devel/cvs-syncmail/Makefile head/devel/cvsbook/Makefile head/devel/cvschangelogbuilder/Makefile head/devel/cvsstat/Makefile head/devel/cvstrac/Makefile head/devel/eventxx/Makefile head/devel/gearmand-devel/Makefile head/devel/gearmand/Makefile head/devel/p5-Data-HashArray/Makefile head/devel/p5-JIRA-Client/Makefile head/devel/p5-MooseX-StrictConstructor/Makefile head/devel/p5-SVN-Access/Makefile head/devel/p5-SVN-Dumpfile/Makefile head/devel/p5-SVN-Hook/Makefile head/devel/p5-SVN-Hooks/Makefile head/devel/p5-SVN-Look/Makefile head/devel/p5-SVN-Notify-Config/Makefile head/devel/p5-SVN-Notify-Filter-AuthZMail/Makefile head/devel/p5-SVN-Notify-Filter-EmailFlatFileDB/Makefile head/devel/p5-SVN-Notify-Filter-Markdown/Makefile head/devel/p5-SVN-Notify-Filter-Watchers/Makefile head/devel/p5-SVN-Notify-Mirror/Makefile head/devel/p5-SVN-Notify-Snapshot/Makefile head/devel/p5-XML-Pastor/Makefile head/devel/patch/Makefile head/devel/pear-VersionControl_SVN/Makefile head/devel/pecl-spl_types/Makefile head/devel/rsvndump/Makefile head/devel/ruby-cvs/Makefile head/devel/rubygem-childprocess/Makefile head/devel/statcvs/Makefile head/devel/statsvn/Makefile head/devel/zthread/Makefile head/graphics/GraphicsMagick/Makefile head/graphics/GraphicsMagick12/Makefile head/graphics/GraphicsMagick13/Makefile head/lang/pecl-perl/Makefile head/mail/ezmlm-idx/Makefile head/mail/nullmailer/Makefile head/mail/smtptrapd/Makefile head/math/freemat/Makefile head/math/pecl-bitset/Makefile head/math/py-numeric/Makefile head/net/easysoap/Makefile head/net/p5-Amazon-SQS-Simple/Makefile head/net/p5-Net-Amazon-EC2/Makefile head/net/p5-Net-Amazon-MechanicalTurk/Makefile head/net/p5-Net-Amazon-Signature/Makefile head/net/p5-Net-Amazon-Thumbnail/Makefile head/net/p5-Net-Mosso-CloudFiles/Makefile head/net/rubygem-rightaws/Makefile head/net/rubygem-rightflexiscale/Makefile head/net/rubygem-rightgogrid/Makefile head/net/rubygem-righthttpconnection/Makefile head/net/rubygem-rightslicehost/Makefile head/print/pdftk/Makefile head/security/libksba/Makefile head/security/logcheck/Makefile head/security/ossec-hids-server/Makefile head/security/p5-Apache-Htpasswd/Makefile head/security/phpdeadlock/Makefile head/security/rubygem-gpgr/Makefile head/sysutils/aimage/Makefile head/sysutils/feather/Makefile head/sysutils/pmt/Makefile head/sysutils/rubygem-hiera-json/Makefile head/sysutils/rubygem-hiera-puppet/Makefile head/textproc/docbook2X/Makefile head/textproc/p5-File-Inplace/Makefile head/www/cakephp11/Makefile head/www/cakephp12/Makefile head/www/codeigniter17/Makefile head/www/dojo-shrinksafe/Makefile head/www/p5-LWP-ConnCache-MaxKeepAliveRequests/Makefile head/www/p5-Template-GD/Makefile head/www/prado/Makefile head/www/smarty2/Makefile head/www/trac-batchmodify/Makefile head/www/trac-calendar/Makefile head/www/trac-ccselector/Makefile head/www/trac-codetags/Makefile head/www/trac-customfieldadmin/Makefile head/www/trac-estimator/Makefile head/www/trac-hierwiki/Makefile head/www/trac-ldap/Makefile head/www/trac-macropost/Makefile head/www/trac-mastertickets/Makefile head/www/trac-nav/Makefile head/www/trac-pagelist/Makefile head/www/trac-pagetopdf/Makefile head/www/trac-pendingticket/Makefile head/www/trac-remind/Makefile head/www/trac-revtree/Makefile head/www/trac-scrumburndown/Makefile head/www/trac-simpleticket/Makefile head/www/trac-timingandestimation/Makefile head/www/trac-tocmacro/Makefile head/www/trac-tweakui/Makefile head/www/trac-wantedpages/Makefile head/www/trac-wikinegotiator/Makefile head/www/trac-wikinotification/Makefile head/www/trac-wikitemplates/Makefile head/www/trac-wysiwyg/Makefile head/www/trac-xmlrpc/Makefile head/www/webcalendar-devel/Makefile head/www/webcalendar/Makefile head/www/yahoo-ui/Makefile Modified: head/databases/libdrizzle/Makefile ============================================================================== --- head/databases/libdrizzle/Makefile Mon Dec 16 18:18:07 2013 (r336655) +++ head/databases/libdrizzle/Makefile Mon Dec 16 18:24:49 2013 (r336656) @@ -8,7 +8,7 @@ CATEGORIES= databases MASTER_SITES= http://launchpadlibrarian.net/41155299/ \ LOCAL/glarkin -MAINTAINER= glarkin@FreeBSD.org +MAINTAINER= ports@FreeBSD.org COMMENT= Client and protocol library for the Drizzle database LIB_DEPENDS= libsqlite3.so:${PORTSDIR}/databases/sqlite3 Modified: head/databases/pear-Doctrine12/Makefile ============================================================================== --- head/databases/pear-Doctrine12/Makefile Mon Dec 16 18:18:07 2013 (r336655) +++ head/databases/pear-Doctrine12/Makefile Mon Dec 16 18:24:49 2013 (r336656) @@ -7,7 +7,7 @@ CATEGORIES= databases pear MASTER_SITES= http://www.doctrine-project.org/downloads/ \ LOCAL/glarkin -MAINTAINER= glarkin@FreeBSD.org +MAINTAINER= ports@FreeBSD.org COMMENT= Doctrine is a PHP object relational mapper LICENSE= LGPL21 Modified: head/databases/pecl-drizzle/Makefile ============================================================================== --- head/databases/pecl-drizzle/Makefile Mon Dec 16 18:18:07 2013 (r336655) +++ head/databases/pecl-drizzle/Makefile Mon Dec 16 18:24:49 2013 (r336656) @@ -9,7 +9,7 @@ PKGNAMEPREFIX= pecl- EXTRACT_SUFX= .tgz DIST_SUBDIR= PECL -MAINTAINER= glarkin@FreeBSD.org +MAINTAINER= ports@FreeBSD.org COMMENT= A PHP wrapper for the libdrizzle library LIB_DEPENDS= libdrizzle.so:${PORTSDIR}/databases/libdrizzle Modified: head/databases/sqlite-ext-miscfuncs/Makefile ============================================================================== --- head/databases/sqlite-ext-miscfuncs/Makefile Mon Dec 16 18:18:07 2013 (r336655) +++ head/databases/sqlite-ext-miscfuncs/Makefile Mon Dec 16 18:24:49 2013 (r336656) @@ -9,7 +9,7 @@ MASTER_SITES= http://www.sourcehosting.n DISTNAME= ${SRCFILE} EXTRACT_SUFX= -MAINTAINER= glarkin@FreeBSD.org +MAINTAINER= ports@FreeBSD.org COMMENT= Math, string, and aggregate function library for SQLite USE_SQLITE= yes Modified: head/devel/cvs-syncmail/Makefile ============================================================================== --- head/devel/cvs-syncmail/Makefile Mon Dec 16 18:18:07 2013 (r336655) +++ head/devel/cvs-syncmail/Makefile Mon Dec 16 18:24:49 2013 (r336656) @@ -8,7 +8,7 @@ MASTER_SITES= SF DISTNAME= syncmail EXTRACT_SUFX= -MAINTAINER= glarkin@FreeBSD.org +MAINTAINER= ports@FreeBSD.org COMMENT= CVS notification tool .if defined(WITH_CVSNT) Modified: head/devel/cvsbook/Makefile ============================================================================== --- head/devel/cvsbook/Makefile Mon Dec 16 18:18:07 2013 (r336655) +++ head/devel/cvsbook/Makefile Mon Dec 16 18:24:49 2013 (r336656) @@ -8,7 +8,7 @@ CATEGORIES= devel MASTER_SITES= http://cvsbook.red-bean.com/ DISTNAME= ${PORTNAME}-${PORTVERSION}-all -MAINTAINER= glarkin@FreeBSD.org +MAINTAINER= ports@FreeBSD.org COMMENT= A tutorial and reference for CVS OPTIONS_MULTI= CVSBOOK Modified: head/devel/cvschangelogbuilder/Makefile ============================================================================== --- head/devel/cvschangelogbuilder/Makefile Mon Dec 16 18:18:07 2013 (r336655) +++ head/devel/cvschangelogbuilder/Makefile Mon Dec 16 18:24:49 2013 (r336656) @@ -6,7 +6,7 @@ PORTVERSION= 2.5 CATEGORIES= devel MASTER_SITES= SF/cvschangelogb/CVSChangelogBuilder/${PORTVERSION} -MAINTAINER= glarkin@FreeBSD.org +MAINTAINER= ports@FreeBSD.org COMMENT= Utility to generate changelogs and reports from a CVS repository LICENSE= GPLv2 Modified: head/devel/cvsstat/Makefile ============================================================================== --- head/devel/cvsstat/Makefile Mon Dec 16 18:18:07 2013 (r336655) +++ head/devel/cvsstat/Makefile Mon Dec 16 18:24:49 2013 (r336656) @@ -10,7 +10,7 @@ EXTRACT_SUFX= # empty DIST_SUBDIR= ${PORTNAME}-${PORTVERSION} EXTRACT_ONLY= # empty -MAINTAINER= glarkin@FreeBSD.org +MAINTAINER= ports@FreeBSD.org COMMENT= Transforms the output of 'cvs status' to a sorted ASCII table USES= perl5 Modified: head/devel/cvstrac/Makefile ============================================================================== --- head/devel/cvstrac/Makefile Mon Dec 16 18:18:07 2013 (r336655) +++ head/devel/cvstrac/Makefile Mon Dec 16 18:24:49 2013 (r336656) @@ -7,7 +7,7 @@ CATEGORIES= devel MASTER_SITES= http://www.cvstrac.org/ DISTNAME= cvstrac-${PORTVERSION} -MAINTAINER= glarkin@FreeBSD.org +MAINTAINER= ports@FreeBSD.org COMMENT?= Web-Based Bug And Patch-Set Tracking System For CVS WRKSRC= ${WRKDIR}/cvstrac-${PORTVERSION} Modified: head/devel/eventxx/Makefile ============================================================================== --- head/devel/eventxx/Makefile Mon Dec 16 18:18:07 2013 (r336655) +++ head/devel/eventxx/Makefile Mon Dec 16 18:24:49 2013 (r336656) @@ -9,7 +9,7 @@ MASTER_SITES= http://proj.llucax.com.ar/ LOCAL/glarkin MASTER_SITE_SUBDIR= gahr -MAINTAINER= glarkin@FreeBSD.org +MAINTAINER= ports@FreeBSD.org COMMENT= A C++ wrapper for libevent LIB_DEPENDS= event-1.4:${PORTSDIR}/devel/libevent Modified: head/devel/gearmand-devel/Makefile ============================================================================== --- head/devel/gearmand-devel/Makefile Mon Dec 16 18:18:07 2013 (r336655) +++ head/devel/gearmand-devel/Makefile Mon Dec 16 18:24:49 2013 (r336656) @@ -6,7 +6,7 @@ PORTVERSION= 1.1.8 CATEGORIES= devel MASTER_SITES= http://launchpad.net/gearmand/1.2/${PORTVERSION}/+download/ -MAINTAINER= glarkin@FreeBSD.org +MAINTAINER= ports@FreeBSD.org COMMENT= Gearman C Server and Library BUILD_DEPENDS= boost-libs>=0:${PORTSDIR}/devel/boost-libs \ Modified: head/devel/gearmand/Makefile ============================================================================== --- head/devel/gearmand/Makefile Mon Dec 16 18:18:07 2013 (r336655) +++ head/devel/gearmand/Makefile Mon Dec 16 18:24:49 2013 (r336656) @@ -6,7 +6,7 @@ PORTVERSION= 1.0.6 CATEGORIES= devel MASTER_SITES= http://launchpad.net/gearmand/1.0/${PORTVERSION}/+download/ -MAINTAINER= glarkin@FreeBSD.org +MAINTAINER= ports@FreeBSD.org COMMENT= Gearman C Server and Library BUILD_DEPENDS= boost-libs>=0:${PORTSDIR}/devel/boost-libs \ Modified: head/devel/p5-Data-HashArray/Makefile ============================================================================== --- head/devel/p5-Data-HashArray/Makefile Mon Dec 16 18:18:07 2013 (r336655) +++ head/devel/p5-Data-HashArray/Makefile Mon Dec 16 18:24:49 2013 (r336656) @@ -7,7 +7,7 @@ CATEGORIES= devel perl5 MASTER_SITES= CPAN PKGNAMEPREFIX= p5- -MAINTAINER= glarkin@FreeBSD.org +MAINTAINER= ports@FreeBSD.org COMMENT= Array class of hashes with properties via overloading and AUTOLOAD USES= perl5 Modified: head/devel/p5-JIRA-Client/Makefile ============================================================================== --- head/devel/p5-JIRA-Client/Makefile Mon Dec 16 18:18:07 2013 (r336655) +++ head/devel/p5-JIRA-Client/Makefile Mon Dec 16 18:24:49 2013 (r336656) @@ -8,7 +8,7 @@ MASTER_SITES= GOOGLE_CODE \ LOCAL/glarkin PKGNAMEPREFIX= p5- -MAINTAINER= glarkin@FreeBSD.org +MAINTAINER= ports@FreeBSD.org COMMENT= An extended interface to JIRA's SOAP API RUN_DEPENDS= p5-SOAP-Lite>=0:${PORTSDIR}/net/p5-SOAP-Lite Modified: head/devel/p5-MooseX-StrictConstructor/Makefile ============================================================================== --- head/devel/p5-MooseX-StrictConstructor/Makefile Mon Dec 16 18:18:07 2013 (r336655) +++ head/devel/p5-MooseX-StrictConstructor/Makefile Mon Dec 16 18:24:49 2013 (r336656) @@ -7,7 +7,7 @@ CATEGORIES= devel perl5 MASTER_SITES= CPAN PKGNAMEPREFIX= p5- -MAINTAINER= glarkin@FreeBSD.org +MAINTAINER= ports@FreeBSD.org COMMENT= Make your MooseX object constructors blow up on unknown attributes BUILD_DEPENDS= p5-Moose>=0.94:${PORTSDIR}/devel/p5-Moose \ Modified: head/devel/p5-SVN-Access/Makefile ============================================================================== --- head/devel/p5-SVN-Access/Makefile Mon Dec 16 18:18:07 2013 (r336655) +++ head/devel/p5-SVN-Access/Makefile Mon Dec 16 18:24:49 2013 (r336656) @@ -7,7 +7,7 @@ CATEGORIES= devel perl5 MASTER_SITES= CPAN PKGNAMEPREFIX= p5- -MAINTAINER= glarkin@FreeBSD.org +MAINTAINER= ports@FreeBSD.org COMMENT= Perl extension to manipulate SVN Access files BUILD_DEPENDS= p5-subversion>=0:${PORTSDIR}/devel/p5-subversion \ Modified: head/devel/p5-SVN-Dumpfile/Makefile ============================================================================== --- head/devel/p5-SVN-Dumpfile/Makefile Mon Dec 16 18:18:07 2013 (r336655) +++ head/devel/p5-SVN-Dumpfile/Makefile Mon Dec 16 18:24:49 2013 (r336656) @@ -8,7 +8,7 @@ CATEGORIES= devel perl5 MASTER_SITES= CPAN PKGNAMEPREFIX= p5- -MAINTAINER= glarkin@FreeBSD.org +MAINTAINER= ports@FreeBSD.org COMMENT= Perl extension to access and manipulate Subversion dumpfiles BUILD_DEPENDS= p5-Data-GUID>=0:${PORTSDIR}/devel/p5-Data-GUID \ Modified: head/devel/p5-SVN-Hook/Makefile ============================================================================== --- head/devel/p5-SVN-Hook/Makefile Mon Dec 16 18:18:07 2013 (r336655) +++ head/devel/p5-SVN-Hook/Makefile Mon Dec 16 18:24:49 2013 (r336656) @@ -7,7 +7,7 @@ CATEGORIES= devel perl5 MASTER_SITES= CPAN PKGNAMEPREFIX= p5- -MAINTAINER= glarkin@FreeBSD.org +MAINTAINER= ports@FreeBSD.org COMMENT= Perl module for managing Subversion hook scripts RUN_DEPENDS= p5-Path-Class>=0:${PORTSDIR}/devel/p5-Path-Class \ Modified: head/devel/p5-SVN-Hooks/Makefile ============================================================================== --- head/devel/p5-SVN-Hooks/Makefile Mon Dec 16 18:18:07 2013 (r336655) +++ head/devel/p5-SVN-Hooks/Makefile Mon Dec 16 18:24:49 2013 (r336656) @@ -7,7 +7,7 @@ CATEGORIES= devel perl5 MASTER_SITES= CPAN PKGNAMEPREFIX= p5- -MAINTAINER= glarkin@FreeBSD.org +MAINTAINER= ports@FreeBSD.org COMMENT= A framework for implementing Subversion hooks BUILD_DEPENDS= p5-Data-Util>=0:${PORTSDIR}/devel/p5-Data-Util \ Modified: head/devel/p5-SVN-Look/Makefile ============================================================================== --- head/devel/p5-SVN-Look/Makefile Mon Dec 16 18:18:07 2013 (r336655) +++ head/devel/p5-SVN-Look/Makefile Mon Dec 16 18:24:49 2013 (r336656) @@ -7,7 +7,7 @@ CATEGORIES= devel perl5 MASTER_SITES= CPAN PKGNAMEPREFIX= p5- -MAINTAINER= glarkin@FreeBSD.org +MAINTAINER= ports@FreeBSD.org COMMENT= Caching wrapper around the svnlook command BUILD_DEPENDS= subversion>=1.7.0:${PORTSDIR}/devel/subversion \ Modified: head/devel/p5-SVN-Notify-Config/Makefile ============================================================================== --- head/devel/p5-SVN-Notify-Config/Makefile Mon Dec 16 18:18:07 2013 (r336655) +++ head/devel/p5-SVN-Notify-Config/Makefile Mon Dec 16 18:24:49 2013 (r336656) @@ -9,7 +9,7 @@ CATEGORIES= devel perl5 MASTER_SITES= CPAN PKGNAMEPREFIX= p5- -MAINTAINER= glarkin@FreeBSD.org +MAINTAINER= ports@FreeBSD.org COMMENT= Perl module for config-driven Subversion notification RUN_DEPENDS= ${LOCALBASE}/bin/svnlook:${PORTSDIR}/devel/subversion \ Modified: head/devel/p5-SVN-Notify-Filter-AuthZMail/Makefile ============================================================================== --- head/devel/p5-SVN-Notify-Filter-AuthZMail/Makefile Mon Dec 16 18:18:07 2013 (r336655) +++ head/devel/p5-SVN-Notify-Filter-AuthZMail/Makefile Mon Dec 16 18:24:49 2013 (r336656) @@ -8,7 +8,7 @@ CATEGORIES= devel perl5 MASTER_SITES= CPAN PKGNAMEPREFIX= p5- -MAINTAINER= glarkin@FreeBSD.org +MAINTAINER= ports@FreeBSD.org COMMENT= Determines Subversion accounts to receive email via the authz file RUN_DEPENDS= p5-SVN-Notify>=2.72:${PORTSDIR}/devel/p5-SVN-Notify \ Modified: head/devel/p5-SVN-Notify-Filter-EmailFlatFileDB/Makefile ============================================================================== --- head/devel/p5-SVN-Notify-Filter-EmailFlatFileDB/Makefile Mon Dec 16 18:18:07 2013 (r336655) +++ head/devel/p5-SVN-Notify-Filter-EmailFlatFileDB/Makefile Mon Dec 16 18:24:49 2013 (r336656) @@ -7,7 +7,7 @@ CATEGORIES= devel perl5 MASTER_SITES= CPAN PKGNAMEPREFIX= p5- -MAINTAINER= glarkin@FreeBSD.org +MAINTAINER= ports@FreeBSD.org COMMENT= Converts account names to email address based on a flat-file database RUN_DEPENDS= p5-SVN-Notify>=2.72:${PORTSDIR}/devel/p5-SVN-Notify Modified: head/devel/p5-SVN-Notify-Filter-Markdown/Makefile ============================================================================== --- head/devel/p5-SVN-Notify-Filter-Markdown/Makefile Mon Dec 16 18:18:07 2013 (r336655) +++ head/devel/p5-SVN-Notify-Filter-Markdown/Makefile Mon Dec 16 18:24:49 2013 (r336656) @@ -7,7 +7,7 @@ CATEGORIES= devel perl5 MASTER_SITES= CPAN PKGNAMEPREFIX= p5- -MAINTAINER= glarkin@FreeBSD.org +MAINTAINER= ports@FreeBSD.org COMMENT= Perl module to convert SVN::Notify log messages from Markdown to HTML RUN_DEPENDS= p5-SVN-Notify>=2.70:${PORTSDIR}/devel/p5-SVN-Notify \ Modified: head/devel/p5-SVN-Notify-Filter-Watchers/Makefile ============================================================================== --- head/devel/p5-SVN-Notify-Filter-Watchers/Makefile Mon Dec 16 18:18:07 2013 (r336655) +++ head/devel/p5-SVN-Notify-Filter-Watchers/Makefile Mon Dec 16 18:24:49 2013 (r336656) @@ -7,7 +7,7 @@ CATEGORIES= devel perl5 MASTER_SITES= CPAN PKGNAMEPREFIX= p5- -MAINTAINER= glarkin@FreeBSD.org +MAINTAINER= ports@FreeBSD.org COMMENT= Subscribe to SVN::Notify commits with a Subversion property RUN_DEPENDS= p5-SVN-Notify>=2.72:${PORTSDIR}/devel/p5-SVN-Notify Modified: head/devel/p5-SVN-Notify-Mirror/Makefile ============================================================================== --- head/devel/p5-SVN-Notify-Mirror/Makefile Mon Dec 16 18:18:07 2013 (r336655) +++ head/devel/p5-SVN-Notify-Mirror/Makefile Mon Dec 16 18:24:49 2013 (r336656) @@ -8,7 +8,7 @@ CATEGORIES= devel perl5 MASTER_SITES= CPAN PKGNAMEPREFIX= p5- -MAINTAINER= glarkin@FreeBSD.org +MAINTAINER= ports@FreeBSD.org COMMENT= Keep a mirrored working copy of a repository path BUILD_DEPENDS= p5-SVN-Notify>=2.83:${PORTSDIR}/devel/p5-SVN-Notify \ Modified: head/devel/p5-SVN-Notify-Snapshot/Makefile ============================================================================== --- head/devel/p5-SVN-Notify-Snapshot/Makefile Mon Dec 16 18:18:07 2013 (r336655) +++ head/devel/p5-SVN-Notify-Snapshot/Makefile Mon Dec 16 18:24:49 2013 (r336656) @@ -7,7 +7,7 @@ CATEGORIES= devel perl5 MASTER_SITES= CPAN PKGNAMEPREFIX= p5- -MAINTAINER= glarkin@FreeBSD.org +MAINTAINER= ports@FreeBSD.org COMMENT= Take snapshots from Subversion activity BUILD_DEPENDS= ${LOCALBASE}/bin/svnnotify:${PORTSDIR}/devel/p5-SVN-Notify Modified: head/devel/p5-XML-Pastor/Makefile ============================================================================== --- head/devel/p5-XML-Pastor/Makefile Mon Dec 16 18:18:07 2013 (r336655) +++ head/devel/p5-XML-Pastor/Makefile Mon Dec 16 18:24:49 2013 (r336656) @@ -7,7 +7,7 @@ CATEGORIES= devel perl5 MASTER_SITES= CPAN PKGNAMEPREFIX= p5- -MAINTAINER= glarkin@FreeBSD.org +MAINTAINER= ports@FreeBSD.org COMMENT= Generate Perl classes with XML bindings from a W3C XSD schema BUILD_DEPENDS= p5-Class-Accessor>=0:${PORTSDIR}/devel/p5-Class-Accessor \ Modified: head/devel/patch/Makefile ============================================================================== --- head/devel/patch/Makefile Mon Dec 16 18:18:07 2013 (r336655) +++ head/devel/patch/Makefile Mon Dec 16 18:24:49 2013 (r336656) @@ -8,7 +8,7 @@ CATEGORIES= devel MASTER_SITES= ${MASTER_SITE_GNU} MASTER_SITE_SUBDIR= patch -MAINTAINER= glarkin@FreeBSD.org +MAINTAINER= ports@FreeBSD.org COMMENT= GNU patch utility LICENSE= GPLv3 Modified: head/devel/pear-VersionControl_SVN/Makefile ============================================================================== --- head/devel/pear-VersionControl_SVN/Makefile Mon Dec 16 18:18:07 2013 (r336655) +++ head/devel/pear-VersionControl_SVN/Makefile Mon Dec 16 18:24:49 2013 (r336656) @@ -5,7 +5,7 @@ PORTNAME= VersionControl_SVN PORTVERSION= 0.5.0 CATEGORIES= devel pear -MAINTAINER= glarkin@FreeBSD.org +MAINTAINER= ports@FreeBSD.org COMMENT= Wrapper interface for the Subversion command-line client BUILD_DEPENDS= pear>=1.9.4:${PORTSDIR}/devel/pear \ Modified: head/devel/pecl-spl_types/Makefile ============================================================================== --- head/devel/pecl-spl_types/Makefile Mon Dec 16 18:18:07 2013 (r336655) +++ head/devel/pecl-spl_types/Makefile Mon Dec 16 18:24:49 2013 (r336656) @@ -11,7 +11,7 @@ DISTNAME= SPL_Types-${PORTVERSION} EXTRACT_SUFX= .tgz DIST_SUBDIR= PECL -MAINTAINER= glarkin@FreeBSD.org +MAINTAINER= ports@FreeBSD.org COMMENT= A PECL extension of a collection of special typehandling classes LICENSE= PHP301 Modified: head/devel/rsvndump/Makefile ============================================================================== --- head/devel/rsvndump/Makefile Mon Dec 16 18:18:07 2013 (r336655) +++ head/devel/rsvndump/Makefile Mon Dec 16 18:24:49 2013 (r336656) @@ -6,7 +6,7 @@ PORTVERSION= 0.5.8 CATEGORIES= devel MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION} -MAINTAINER= glarkin@FreeBSD.org +MAINTAINER= ports@FreeBSD.org COMMENT= Remote Subversion repository dumpfile generator GNU_CONFIGURE= yes Modified: head/devel/ruby-cvs/Makefile ============================================================================== --- head/devel/ruby-cvs/Makefile Mon Dec 16 18:18:07 2013 (r336655) +++ head/devel/ruby-cvs/Makefile Mon Dec 16 18:24:49 2013 (r336656) @@ -9,7 +9,7 @@ PKGNAMEPREFIX= ${RUBY_PKGNAMEPREFIX} DISTNAME= ruby-${PORTNAME}.tar.gz\?only_with_tag=ruby-${PORTNAME}-${PORTVERSION:S/./_/g}\&view=tar DIST_SUBDIR= ruby -MAINTAINER= glarkin@FreeBSD.org +MAINTAINER= ports@FreeBSD.org COMMENT= A Ruby library to provide a high level interface to a CVS repository DEPRECATED= Broken for more than 6 month Modified: head/devel/rubygem-childprocess/Makefile ============================================================================== --- head/devel/rubygem-childprocess/Makefile Mon Dec 16 18:18:07 2013 (r336655) +++ head/devel/rubygem-childprocess/Makefile Mon Dec 16 18:24:49 2013 (r336656) @@ -6,7 +6,7 @@ PORTVERSION= 0.3.9 CATEGORIES= devel rubygems MASTER_SITES= RG -MAINTAINER= glarkin@FreeBSD.org +MAINTAINER= ports@FreeBSD.org COMMENT= External background process controller RUN_DEPENDS= rubygem-ffi>=1.0.11:${PORTSDIR}/devel/rubygem-ffi Modified: head/devel/statcvs/Makefile ============================================================================== --- head/devel/statcvs/Makefile Mon Dec 16 18:18:07 2013 (r336655) +++ head/devel/statcvs/Makefile Mon Dec 16 18:24:49 2013 (r336656) @@ -7,7 +7,7 @@ CATEGORIES= devel java MASTER_SITES= SF/${PORTNAME}/Download%20StatCVS/${PORTVERSION} DISTNAME= ${PORTNAME}-${PORTVERSION}-source -MAINTAINER= glarkin@FreeBSD.org +MAINTAINER= ports@FreeBSD.org COMMENT= CVS repository activity report generator RUN_DEPENDS= java:${PORTSDIR}/java/javavmwrapper Modified: head/devel/statsvn/Makefile ============================================================================== --- head/devel/statsvn/Makefile Mon Dec 16 18:18:07 2013 (r336655) +++ head/devel/statsvn/Makefile Mon Dec 16 18:24:49 2013 (r336656) @@ -8,7 +8,7 @@ CATEGORIES= devel java MASTER_SITES= SF DISTNAME= ${PORTNAME}-${PORTVERSION}-source -MAINTAINER= glarkin@FreeBSD.org +MAINTAINER= ports@FreeBSD.org COMMENT= Subversion repository activity report generator RUN_DEPENDS= java:${PORTSDIR}/java/javavmwrapper \ Modified: head/devel/zthread/Makefile ============================================================================== --- head/devel/zthread/Makefile Mon Dec 16 18:18:07 2013 (r336655) +++ head/devel/zthread/Makefile Mon Dec 16 18:24:49 2013 (r336656) @@ -8,7 +8,7 @@ CATEGORIES= devel MASTER_SITES= SF/${PORTNAME}/ZThread/${PORTVERSION} DISTNAME= ZThread-${PORTVERSION} -MAINTAINER= glarkin@FreeBSD.org +MAINTAINER= ports@FreeBSD.org COMMENT= A platform-independent object-oriented C++ threading library USE_AUTOTOOLS= libtool Modified: head/graphics/GraphicsMagick/Makefile ============================================================================== --- head/graphics/GraphicsMagick/Makefile Mon Dec 16 18:18:07 2013 (r336655) +++ head/graphics/GraphicsMagick/Makefile Mon Dec 16 18:24:49 2013 (r336656) @@ -10,7 +10,7 @@ MASTER_SITES= SF \ ftp://ftp.graphicsmagick.org/pub/GraphicsMagick/1.1/ PORTSCOUT= limit:^1\.1\. -MAINTAINER= glarkin@FreeBSD.org +MAINTAINER= ports@FreeBSD.org COMMENT= Fast image processing tools based on ImageMagick CONFLICTS= GraphicsMagick-1.[23].* GraphicsMagick1[23]-* Modified: head/graphics/GraphicsMagick12/Makefile ============================================================================== --- head/graphics/GraphicsMagick12/Makefile Mon Dec 16 18:18:07 2013 (r336655) +++ head/graphics/GraphicsMagick12/Makefile Mon Dec 16 18:24:49 2013 (r336656) @@ -10,7 +10,7 @@ MASTER_SITES= SF \ PORTSCOUT= limit:^1\.2\. PKGNAMESUFFIX= 12 -MAINTAINER= glarkin@FreeBSD.org +MAINTAINER= ports@FreeBSD.org COMMENT= Fast image processing tools based on ImageMagick CONFLICTS= GraphicsMagick-1.[13].* GraphicsMagick13-* Modified: head/graphics/GraphicsMagick13/Makefile ============================================================================== --- head/graphics/GraphicsMagick13/Makefile Mon Dec 16 18:18:07 2013 (r336655) +++ head/graphics/GraphicsMagick13/Makefile Mon Dec 16 18:24:49 2013 (r336656) @@ -9,7 +9,7 @@ MASTER_SITES= SF \ MASTER_SITE_SUBDIR= ${PORTNAME:L}/${PORTNAME:L}/${PORTVERSION} PKGNAMESUFFIX= 13 -MAINTAINER= glarkin@FreeBSD.org +MAINTAINER= ports@FreeBSD.org COMMENT= Fast image processing tools based on ImageMagick LIB_DEPENDS= libfreetype.so:${PORTSDIR}/print/freetype2 \ Modified: head/lang/pecl-perl/Makefile ============================================================================== --- head/lang/pecl-perl/Makefile Mon Dec 16 18:18:07 2013 (r336655) +++ head/lang/pecl-perl/Makefile Mon Dec 16 18:24:49 2013 (r336656) @@ -9,7 +9,7 @@ PKGNAMEPREFIX= pecl- EXTRACT_SUFX= .tgz DIST_SUBDIR= PECL -MAINTAINER= glarkin@FreeBSD.org +MAINTAINER= ports@FreeBSD.org COMMENT= Embedded Perl USE_PHP= yes Modified: head/mail/ezmlm-idx/Makefile ============================================================================== --- head/mail/ezmlm-idx/Makefile Mon Dec 16 18:18:07 2013 (r336655) +++ head/mail/ezmlm-idx/Makefile Mon Dec 16 18:24:49 2013 (r336656) @@ -8,7 +8,7 @@ CATEGORIES= mail MASTER_SITES= http://www.ezmlm.org/archive/${PORTVERSION}/ \ http://ezmlm.sericyb.com.au/archive/${PORTVERSION}/ -MAINTAINER= glarkin@FreeBSD.org +MAINTAINER= ports@FreeBSD.org COMMENT= Improved version of the ezmlm mailing list manager MAKE_JOBS_UNSAFE= yes Modified: head/mail/nullmailer/Makefile ============================================================================== --- head/mail/nullmailer/Makefile Mon Dec 16 18:18:07 2013 (r336655) +++ head/mail/nullmailer/Makefile Mon Dec 16 18:24:49 2013 (r336656) @@ -9,7 +9,7 @@ MASTER_SITES= http://untroubled.org/null http://untroubled.org/nullmailer/archive/ MASTER_SITE_SUBDIR= ${PORTVERSION} -MAINTAINER= glarkin@FreeBSD.org +MAINTAINER= ports@FreeBSD.org COMMENT= MTA for hosts which relay to a fixed set of smart relays LICENSE= GPLv2 Modified: head/mail/smtptrapd/Makefile ============================================================================== --- head/mail/smtptrapd/Makefile Mon Dec 16 18:18:07 2013 (r336655) +++ head/mail/smtptrapd/Makefile Mon Dec 16 18:24:49 2013 (r336656) @@ -6,7 +6,7 @@ PORTVERSION= 1.6 CATEGORIES= mail MASTER_SITES= SF -MAINTAINER= glarkin@FreeBSD.org +MAINTAINER= ports@FreeBSD.org COMMENT= RFC 2821 compliant SMTP service that always returns a 4xx soft error CFLAGS+= ${PTHREAD_CFLAGS} ${PTHREAD_LIBS} Modified: head/math/freemat/Makefile ============================================================================== --- head/math/freemat/Makefile Mon Dec 16 18:18:07 2013 (r336655) +++ head/math/freemat/Makefile Mon Dec 16 18:24:49 2013 (r336656) @@ -12,7 +12,7 @@ MASTER_SITE_SUBDIR= freemat/FreeMat4 PKGNAMESUFFIX= -mpi .endif -MAINTAINER= glarkin@FreeBSD.org +MAINTAINER= ports@FreeBSD.org COMMENT= An environment for rapid engineering and scientific processing LIB_DEPENDS= lapack.4:${PORTSDIR}/math/lapack \ Modified: head/math/pecl-bitset/Makefile ============================================================================== --- head/math/pecl-bitset/Makefile Mon Dec 16 18:18:07 2013 (r336655) +++ head/math/pecl-bitset/Makefile Mon Dec 16 18:24:49 2013 (r336656) @@ -9,7 +9,7 @@ PKGNAMEPREFIX= pecl- EXTRACT_SUFX= .tgz DIST_SUBDIR= PECL -MAINTAINER= glarkin@FreeBSD.org +MAINTAINER= ports@FreeBSD.org COMMENT= A PECL extension for manipulating bitsets USE_PHP= yes Modified: head/math/py-numeric/Makefile ============================================================================== --- head/math/py-numeric/Makefile Mon Dec 16 18:18:07 2013 (r336655) +++ head/math/py-numeric/Makefile Mon Dec 16 18:24:49 2013 (r336656) @@ -12,7 +12,7 @@ DISTFILES= Numeric-${PORTVERSION}${EXTRA numpy.pdf:doc EXTRACT_ONLY= Numeric-${PORTVERSION}${EXTRACT_SUFX} -MAINTAINER= glarkin@FreeBSD.org +MAINTAINER= ports@FreeBSD.org COMMENT= The Numeric Extension to Python USE_PYTHON= yes Modified: head/net/easysoap/Makefile ============================================================================== --- head/net/easysoap/Makefile Mon Dec 16 18:18:07 2013 (r336655) +++ head/net/easysoap/Makefile Mon Dec 16 18:24:49 2013 (r336656) @@ -8,7 +8,7 @@ CATEGORIES= net MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/SWANSONG DISTNAME= EasySoap++-${PORTVERSION} -MAINTAINER= glarkin@FreeBSD.org +MAINTAINER= ports@FreeBSD.org COMMENT= C++ SOAP Library based on expat LIB_DEPENDS= expat.6:${PORTSDIR}/textproc/expat2 Modified: head/net/p5-Amazon-SQS-Simple/Makefile ============================================================================== --- head/net/p5-Amazon-SQS-Simple/Makefile Mon Dec 16 18:18:07 2013 (r336655) +++ head/net/p5-Amazon-SQS-Simple/Makefile Mon Dec 16 18:24:49 2013 (r336656) @@ -8,7 +8,7 @@ MASTER_SITES= CPAN MASTER_SITE_SUBDIR= CPAN:SWHITAKER PKGNAMEPREFIX= p5- -MAINTAINER= glarkin@FreeBSD.org +MAINTAINER= ports@FreeBSD.org COMMENT= OO API for accessing the Amazon Simple Queue Service BUILD_DEPENDS= p5-XML-Simple>=0:${PORTSDIR}/textproc/p5-XML-Simple \ Modified: head/net/p5-Net-Amazon-EC2/Makefile ============================================================================== --- head/net/p5-Net-Amazon-EC2/Makefile Mon Dec 16 18:18:07 2013 (r336655) +++ head/net/p5-Net-Amazon-EC2/Makefile Mon Dec 16 18:24:49 2013 (r336656) @@ -7,7 +7,7 @@ CATEGORIES= net perl5 MASTER_SITES= CPAN PKGNAMEPREFIX= p5- -MAINTAINER= glarkin@FreeBSD.org +MAINTAINER= ports@FreeBSD.org COMMENT= Perl interface to the Amazon Elastic Compute Cloud RUN_DEPENDS= p5-Params-Validate>=0:${PORTSDIR}/devel/p5-Params-Validate \ Modified: head/net/p5-Net-Amazon-MechanicalTurk/Makefile ============================================================================== --- head/net/p5-Net-Amazon-MechanicalTurk/Makefile Mon Dec 16 18:18:07 2013 (r336655) +++ head/net/p5-Net-Amazon-MechanicalTurk/Makefile Mon Dec 16 18:24:49 2013 (r336656) @@ -7,7 +7,7 @@ CATEGORIES= net perl5 MASTER_SITES= CPAN PKGNAMEPREFIX= p5- -MAINTAINER= glarkin@FreeBSD.org +MAINTAINER= ports@FreeBSD.org COMMENT= Perl interface to the Amazon Mechanical Turk RUN_DEPENDS= p5-XML-Parser>=0:${PORTSDIR}/textproc/p5-XML-Parser \ Modified: head/net/p5-Net-Amazon-Signature/Makefile ============================================================================== --- head/net/p5-Net-Amazon-Signature/Makefile Mon Dec 16 18:18:07 2013 (r336655) +++ head/net/p5-Net-Amazon-Signature/Makefile Mon Dec 16 18:24:49 2013 (r336656) @@ -7,7 +7,7 @@ CATEGORIES= net perl5 MASTER_SITES= CPAN PKGNAMEPREFIX= p5- -MAINTAINER= glarkin@FreeBSD.org +MAINTAINER= ports@FreeBSD.org COMMENT= Perl interface to create Amazon AWS signatures TEST_DEPENDS= p5-Spiffy>=0:${PORTSDIR}/devel/p5-Spiffy \ Modified: head/net/p5-Net-Amazon-Thumbnail/Makefile ============================================================================== --- head/net/p5-Net-Amazon-Thumbnail/Makefile Mon Dec 16 18:18:07 2013 (r336655) +++ head/net/p5-Net-Amazon-Thumbnail/Makefile Mon Dec 16 18:24:49 2013 (r336656) @@ -8,7 +8,7 @@ CATEGORIES= net perl5 MASTER_SITES= CPAN PKGNAMEPREFIX= p5- -MAINTAINER= glarkin@FreeBSD.org +MAINTAINER= ports@FreeBSD.org COMMENT= Perl interface to Amazon Alexa Site Thumbnail web service RUN_DEPENDS= p5-Class-Accessor>=0:${PORTSDIR}/devel/p5-Class-Accessor \ Modified: head/net/p5-Net-Mosso-CloudFiles/Makefile ============================================================================== --- head/net/p5-Net-Mosso-CloudFiles/Makefile Mon Dec 16 18:18:07 2013 (r336655) +++ head/net/p5-Net-Mosso-CloudFiles/Makefile Mon Dec 16 18:24:49 2013 (r336656) @@ -7,7 +7,7 @@ CATEGORIES= net perl5 MASTER_SITES= CPAN PKGNAMEPREFIX= p5- -MAINTAINER= glarkin@FreeBSD.org +MAINTAINER= ports@FreeBSD.org COMMENT= Perl interface to the Mosso CloudFiles service RUN_DEPENDS= p5-Digest-MD5-File>=0:${PORTSDIR}/security/p5-Digest-MD5-File \ Modified: head/net/rubygem-rightaws/Makefile ============================================================================== --- head/net/rubygem-rightaws/Makefile Mon Dec 16 18:18:07 2013 (r336655) +++ head/net/rubygem-rightaws/Makefile Mon Dec 16 18:24:49 2013 (r336656) @@ -7,7 +7,7 @@ CATEGORIES= net rubygems MASTER_SITES= RG DISTNAME= right_aws-${PORTVERSION} -MAINTAINER= glarkin@FreeBSD.org +MAINTAINER= ports@FreeBSD.org COMMENT= Provides access to Amazon EC2, S3, SQS, and SDB web services LICENSE= MIT Modified: head/net/rubygem-rightflexiscale/Makefile ============================================================================== --- head/net/rubygem-rightflexiscale/Makefile Mon Dec 16 18:18:07 2013 (r336655) +++ head/net/rubygem-rightflexiscale/Makefile Mon Dec 16 18:24:49 2013 (r336656) @@ -7,7 +7,7 @@ CATEGORIES= net rubygems MASTER_SITES= RG DISTNAME= right_flexiscale-${PORTVERSION} -MAINTAINER= glarkin@FreeBSD.org +MAINTAINER= ports@FreeBSD.org COMMENT= Provides Ruby access to the Flexiscale API RUN_DEPENDS= rubygem-righthttpconnection>=1.2.4:${PORTSDIR}/net/rubygem-righthttpconnection \ Modified: head/net/rubygem-rightgogrid/Makefile ============================================================================== --- head/net/rubygem-rightgogrid/Makefile Mon Dec 16 18:18:07 2013 (r336655) +++ head/net/rubygem-rightgogrid/Makefile Mon Dec 16 18:24:49 2013 (r336656) @@ -7,7 +7,7 @@ CATEGORIES= net rubygems MASTER_SITES= RG DISTNAME= right_gogrid-${PORTVERSION} -MAINTAINER= glarkin@FreeBSD.org +MAINTAINER= ports@FreeBSD.org COMMENT= Provides Ruby access to the GoGrid API RUN_DEPENDS= rubygem-righthttpconnection>=1.2.4:${PORTSDIR}/net/rubygem-righthttpconnection Modified: head/net/rubygem-righthttpconnection/Makefile ============================================================================== --- head/net/rubygem-righthttpconnection/Makefile Mon Dec 16 18:18:07 2013 (r336655) +++ head/net/rubygem-righthttpconnection/Makefile Mon Dec 16 18:24:49 2013 (r336656) @@ -7,7 +7,7 @@ CATEGORIES= net rubygems MASTER_SITES= RG DISTNAME= right_http_connection-${PORTVERSION} -MAINTAINER= glarkin@FreeBSD.org +MAINTAINER= ports@FreeBSD.org COMMENT= Persistent HTTP/HTTPS connections with error retries USE_RUBY= yes Modified: head/net/rubygem-rightslicehost/Makefile ============================================================================== --- head/net/rubygem-rightslicehost/Makefile Mon Dec 16 18:18:07 2013 (r336655) +++ head/net/rubygem-rightslicehost/Makefile Mon Dec 16 18:24:49 2013 (r336656) @@ -7,7 +7,7 @@ CATEGORIES= net rubygems MASTER_SITES= RG DISTNAME= right_slicehost-${PORTVERSION} -MAINTAINER= glarkin@FreeBSD.org +MAINTAINER= ports@FreeBSD.org COMMENT= Provides Ruby access to the Slicehost API RUN_DEPENDS= rubygem-righthttpconnection>=1.2.4:${PORTSDIR}/net/rubygem-righthttpconnection Modified: head/print/pdftk/Makefile ============================================================================== --- head/print/pdftk/Makefile Mon Dec 16 18:18:07 2013 (r336655) +++ head/print/pdftk/Makefile Mon Dec 16 18:24:49 2013 (r336656) @@ -7,7 +7,7 @@ CATEGORIES= print MASTER_SITES= http://www.pdflabs.com/tools/pdftk-the-pdf-toolkit/ DISTNAME= ${PORTNAME}-${PORTVERSION}-src -MAINTAINER= glarkin@FreeBSD.org +MAINTAINER= ports@FreeBSD.org COMMENT= Simple tool for doing everyday things with PDF documents LICENSE= GPLv2 Modified: head/security/libksba/Makefile ============================================================================== --- head/security/libksba/Makefile Mon Dec 16 18:18:07 2013 (r336655) +++ head/security/libksba/Makefile Mon Dec 16 18:24:49 2013 (r336656) @@ -9,7 +9,7 @@ MASTER_SITE_SUBDIR= ${PORTNAME} DISTFILES= ${DISTNAME}${EXTRACT_SUFX} ${DISTNAME}${EXTRACT_SUFX}.sig EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX} -MAINTAINER= glarkin@FreeBSD.org +MAINTAINER= ports@FreeBSD.org COMMENT= KSBA is an X.509 Library BUILD_DEPENDS+= libgpg-error>=1.10:${PORTSDIR}/security/libgpg-error Modified: head/security/logcheck/Makefile ============================================================================== --- head/security/logcheck/Makefile Mon Dec 16 18:18:07 2013 (r336655) +++ head/security/logcheck/Makefile Mon Dec 16 18:24:49 2013 (r336656) @@ -8,7 +8,7 @@ CATEGORIES= security MASTER_SITES= ${MASTER_SITE_DEBIAN_POOL} DISTNAME= ${PORTNAME}_${PORTVERSION} -MAINTAINER= glarkin@FreeBSD.org +MAINTAINER= ports@FreeBSD.org COMMENT= Auditing tool for system logs on Unix boxes RUN_DEPENDS= mime-construct:${PORTSDIR}/mail/mime-construct \ Modified: head/security/ossec-hids-server/Makefile ============================================================================== --- head/security/ossec-hids-server/Makefile Mon Dec 16 18:18:07 2013 (r336655) +++ head/security/ossec-hids-server/Makefile Mon Dec 16 18:24:49 2013 (r336656) @@ -9,7 +9,7 @@ MASTER_SITES= http://www.ossec.net/files http://www.ossec.net/files/old/ PKGNAMESUFFIX= -server -MAINTAINER= glarkin@FreeBSD.org +MAINTAINER= ports@FreeBSD.org COMMENT?= A security tool to monitor and check logs and intrusions USE_RC_SUBR= ossec-hids Modified: head/security/p5-Apache-Htpasswd/Makefile ============================================================================== --- head/security/p5-Apache-Htpasswd/Makefile Mon Dec 16 18:18:07 2013 (r336655) +++ head/security/p5-Apache-Htpasswd/Makefile Mon Dec 16 18:24:49 2013 (r336656) @@ -7,7 +7,7 @@ CATEGORIES= security perl5 www MASTER_SITES= CPAN PKGNAMEPREFIX= p5- -MAINTAINER= glarkin@FreeBSD.org +MAINTAINER= ports@FreeBSD.org COMMENT= Manage Unix crypt-style password file BUILD_DEPENDS= p5-Crypt-PasswdMD5>=0:${PORTSDIR}/security/p5-Crypt-PasswdMD5 \ Modified: head/security/phpdeadlock/Makefile ============================================================================== --- head/security/phpdeadlock/Makefile Mon Dec 16 18:18:07 2013 (r336655) +++ head/security/phpdeadlock/Makefile Mon Dec 16 18:24:49 2013 (r336656) @@ -8,7 +8,7 @@ CATEGORIES= security www MASTER_SITES= SF/${PORTNAME}/Deadlock/${PORTVERSION}%20Stable DISTNAME= Deadlock-${PORTVERSION}-Stable -MAINTAINER= glarkin@FreeBSD.org +MAINTAINER= ports@FreeBSD.org COMMENT= Web-based user authentication/password protection system WRKSRC= ${WRKDIR}/Deadlock-1.01 Modified: head/security/rubygem-gpgr/Makefile ============================================================================== --- head/security/rubygem-gpgr/Makefile Mon Dec 16 18:18:07 2013 (r336655) +++ head/security/rubygem-gpgr/Makefile Mon Dec 16 18:24:49 2013 (r336656) @@ -7,7 +7,7 @@ PORTREVISION= 1 CATEGORIES= security rubygems MASTER_SITES= RG -MAINTAINER= glarkin@FreeBSD.org +MAINTAINER= ports@FreeBSD.org COMMENT= Very light interface to the command-line GPG tool RUN_DEPENDS= gpg:${PORTSDIR}/security/gnupg Modified: head/sysutils/aimage/Makefile ============================================================================== --- head/sysutils/aimage/Makefile Mon Dec 16 18:18:07 2013 (r336655) +++ head/sysutils/aimage/Makefile Mon Dec 16 18:24:49 2013 (r336656) @@ -6,7 +6,7 @@ PORTVERSION= 3.2.5 CATEGORIES= sysutils MASTER_SITES= http://digitalcorpora.org/downloads/ -MAINTAINER= glarkin@FreeBSD.org +MAINTAINER= ports@FreeBSD.org COMMENT= Advanced Disk Imager LIB_DEPENDS= afflib:${PORTSDIR}/sysutils/afflib Modified: head/sysutils/feather/Makefile ============================================================================== --- head/sysutils/feather/Makefile Mon Dec 16 18:18:07 2013 (r336655) +++ head/sysutils/feather/Makefile Mon Dec 16 18:24:49 2013 (r336656) @@ -7,7 +7,7 @@ CATEGORIES= sysutils python MASTER_SITES= http://www.sourcehosting.net/freebsd/distfiles/ \ LOCAL/glarkin -MAINTAINER= glarkin@FreeBSD.org +MAINTAINER= ports@FreeBSD.org COMMENT= A Python script for managing tarsnap backups RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}yaml>=0:${PORTSDIR}/devel/py-yaml \ Modified: head/sysutils/pmt/Makefile ============================================================================== --- head/sysutils/pmt/Makefile Mon Dec 16 18:18:07 2013 (r336655) +++ head/sysutils/pmt/Makefile Mon Dec 16 18:24:49 2013 (r336656) @@ -7,7 +7,7 @@ CATEGORIES= sysutils MASTER_SITES= http://hansmi.ch/download/pmt/ \ LOCAL/glarkin -MAINTAINER= glarkin@FreeBSD.org +MAINTAINER= ports@FreeBSD.org COMMENT= A small collection of filters which can be added to UNIX pipes USE_BZIP2= yes Modified: head/sysutils/rubygem-hiera-json/Makefile ============================================================================== --- head/sysutils/rubygem-hiera-json/Makefile Mon Dec 16 18:18:07 2013 (r336655) +++ head/sysutils/rubygem-hiera-json/Makefile Mon Dec 16 18:24:49 2013 (r336656) @@ -6,7 +6,7 @@ PORTVERSION= 0.4.0 CATEGORIES= sysutils rubygems MASTER_SITES= RG -MAINTAINER= glarkin@FreeBSD.org +MAINTAINER= ports@FreeBSD.org COMMENT= A backend for Hiera that queries JSON data RUN_DEPENDS= puppet>=0:${PORTSDIR}/sysutils/puppet \ Modified: head/sysutils/rubygem-hiera-puppet/Makefile ============================================================================== --- head/sysutils/rubygem-hiera-puppet/Makefile Mon Dec 16 18:18:07 2013 (r336655) +++ head/sysutils/rubygem-hiera-puppet/Makefile Mon Dec 16 18:24:49 2013 (r336656) @@ -7,7 +7,7 @@ PORTREVISION= 1 CATEGORIES= sysutils rubygems MASTER_SITES= RG -MAINTAINER= glarkin@FreeBSD.org +MAINTAINER= ports@FreeBSD.org COMMENT= A data backend for Hiera that queries the Puppet scope for data RUN_DEPENDS= puppet>=0:${PORTSDIR}/sysutils/puppet27 \ Modified: head/textproc/docbook2X/Makefile ============================================================================== --- head/textproc/docbook2X/Makefile Mon Dec 16 18:18:07 2013 (r336655) +++ head/textproc/docbook2X/Makefile Mon Dec 16 18:24:49 2013 (r336656) @@ -7,7 +7,7 @@ PORTREVISION= 3 CATEGORIES= textproc MASTER_SITES= SF -MAINTAINER= glarkin@FreeBSD.org +MAINTAINER= ports@FreeBSD.org COMMENT= Convert DocBook documents into UNIX man page and GNU Texinfo formats BUILD_DEPENDS= p5-XML-NamespaceSupport>=0:${PORTSDIR}/textproc/p5-XML-NamespaceSupport \ Modified: head/textproc/p5-File-Inplace/Makefile ============================================================================== --- head/textproc/p5-File-Inplace/Makefile Mon Dec 16 18:18:07 2013 (r336655) +++ head/textproc/p5-File-Inplace/Makefile Mon Dec 16 18:24:49 2013 (r336656) @@ -7,7 +7,7 @@ CATEGORIES= textproc perl5 MASTER_SITES= CPAN PKGNAMEPREFIX= p5- -MAINTAINER= glarkin@FreeBSD.org +MAINTAINER= ports@FreeBSD.org COMMENT= Perl module for in-place editing of files USES= perl5 Modified: head/www/cakephp11/Makefile ============================================================================== --- head/www/cakephp11/Makefile Mon Dec 16 18:18:07 2013 (r336655) +++ head/www/cakephp11/Makefile Mon Dec 16 18:24:49 2013 (r336656) @@ -10,7 +10,7 @@ MASTER_SITES= http://www.sourcehosting.n PKGNAMESUFFIX= 11 DISTNAME= cake_${PORTVERSION} -MAINTAINER= glarkin@FreeBSD.org +MAINTAINER= ports@FreeBSD.org COMMENT= A framework for developing PHP web applications USE_BZIP2= yes Modified: head/www/cakephp12/Makefile ============================================================================== --- head/www/cakephp12/Makefile Mon Dec 16 18:18:07 2013 (r336655) +++ head/www/cakephp12/Makefile Mon Dec 16 18:24:49 2013 (r336656) @@ -9,7 +9,7 @@ MASTER_SITES= https://github.com/${PORTN PKGNAMESUFFIX= 12 DISTNAME= ${PORTNAME}-${PORTNAME}-${PORTVERSION}-${GITVERSION} -MAINTAINER= glarkin@FreeBSD.org +MAINTAINER= ports@FreeBSD.org COMMENT= A framework for developing PHP web applications GITVERSION= 0-ge6e50e8 Modified: head/www/codeigniter17/Makefile ============================================================================== --- head/www/codeigniter17/Makefile Mon Dec 16 18:18:07 2013 (r336655) +++ head/www/codeigniter17/Makefile Mon Dec 16 18:24:49 2013 (r336656) @@ -8,7 +8,7 @@ MASTER_SITES= http://codeigniter.com/dow LOCAL/glarkin DISTNAME= CodeIgniter_${PORTVERSION} -MAINTAINER= glarkin@FreeBSD.org +MAINTAINER= ports@FreeBSD.org COMMENT= A framework for developing PHP web applications USE_ZIP= yes Modified: head/www/dojo-shrinksafe/Makefile ============================================================================== --- head/www/dojo-shrinksafe/Makefile Mon Dec 16 18:18:07 2013 (r336655) +++ head/www/dojo-shrinksafe/Makefile Mon Dec 16 18:24:49 2013 (r336656) @@ -9,7 +9,7 @@ MASTER_SITES= http://download.dojotoolk PKGNAMEPREFIX= dojo- DISTNAME= ${PKGNAMEPREFIX}release-${PORTVERSION}-${PORTNAME} -MAINTAINER= glarkin@FreeBSD.org +MAINTAINER= ports@FreeBSD.org COMMENT= JavaScript code compressor USE_JAVA= yes Modified: head/www/p5-LWP-ConnCache-MaxKeepAliveRequests/Makefile ============================================================================== --- head/www/p5-LWP-ConnCache-MaxKeepAliveRequests/Makefile Mon Dec 16 18:18:07 2013 (r336655) +++ head/www/p5-LWP-ConnCache-MaxKeepAliveRequests/Makefile Mon Dec 16 18:24:49 2013 (r336656) @@ -7,7 +7,7 @@ CATEGORIES= www perl5 MASTER_SITES= CPAN PKGNAMEPREFIX= p5- -MAINTAINER= glarkin@FreeBSD.org +MAINTAINER= ports@FreeBSD.org COMMENT= A connection cache that enforces a max keep alive limit RUN_DEPENDS= p5-libwww>=0:${PORTSDIR}/www/p5-libwww \ Modified: head/www/p5-Template-GD/Makefile ============================================================================== --- head/www/p5-Template-GD/Makefile Mon Dec 16 18:18:07 2013 (r336655) +++ head/www/p5-Template-GD/Makefile Mon Dec 16 18:24:49 2013 (r336656) @@ -7,7 +7,7 @@ CATEGORIES= www textproc perl5 MASTER_SITES= CPAN PKGNAMEPREFIX= p5- -MAINTAINER= glarkin@FreeBSD.org +MAINTAINER= ports@FreeBSD.org COMMENT= Template Toolkit plugin to interface with GD modules BUILD_DEPENDS= p5-Template-Toolkit>=0:${PORTSDIR}/www/p5-Template-Toolkit Modified: head/www/prado/Makefile ============================================================================== --- head/www/prado/Makefile Mon Dec 16 18:18:07 2013 (r336655) +++ head/www/prado/Makefile Mon Dec 16 18:24:49 2013 (r336656) @@ -9,7 +9,7 @@ MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE} PROJECTHOST= prado3 DISTFILES= ${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX} -MAINTAINER= glarkin@FreeBSD.org +MAINTAINER= ports@FreeBSD.org COMMENT= A framework for developing PHP web applications WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} Modified: head/www/smarty2/Makefile ============================================================================== --- head/www/smarty2/Makefile Mon Dec 16 18:18:07 2013 (r336655) +++ head/www/smarty2/Makefile Mon Dec 16 18:24:49 2013 (r336656) @@ -8,7 +8,7 @@ MASTER_SITES= http://www.smarty.net/file http://www.smarty.net/files/docs/:manual DISTFILES= Smarty-${PORTVERSION}${EXTRACT_SUFX} -MAINTAINER= glarkin@FreeBSD.org +MAINTAINER= ports@FreeBSD.org COMMENT= The PHP compiling template engine USE_ZIP= yes Modified: head/www/trac-batchmodify/Makefile ============================================================================== --- head/www/trac-batchmodify/Makefile Mon Dec 16 18:18:07 2013 (r336655) +++ head/www/trac-batchmodify/Makefile Mon Dec 16 18:24:49 2013 (r336656) @@ -9,7 +9,7 @@ MASTER_SITES= http://www.sourcehosting.n PKGNAMEPREFIX= trac- DISTNAME= ${PORTNAME}plugin-${PORTVERSION} -MAINTAINER= glarkin@FreeBSD.org +MAINTAINER= ports@FreeBSD.org COMMENT= Enables users to modify several tickets together at once RUN_DEPENDS+= trac>=0.12:${PORTSDIR}/www/trac Modified: head/www/trac-calendar/Makefile ============================================================================== --- head/www/trac-calendar/Makefile Mon Dec 16 18:18:07 2013 (r336655) +++ head/www/trac-calendar/Makefile Mon Dec 16 18:24:49 2013 (r336656) @@ -9,7 +9,7 @@ MASTER_SITES= http://www.gerritbeine.de/ PKGNAMEPREFIX= trac- DISTNAME= ${PORTNAME}plugin-${PORTVERSION} -MAINTAINER= glarkin@FreeBSD.org +MAINTAINER= ports@FreeBSD.org COMMENT= Calendar plugin for trac RUN_DEPENDS+= tracd:${PORTSDIR}/www/trac Modified: head/www/trac-ccselector/Makefile ============================================================================== --- head/www/trac-ccselector/Makefile Mon Dec 16 18:18:07 2013 (r336655) +++ head/www/trac-ccselector/Makefile Mon Dec 16 18:24:49 2013 (r336656) @@ -10,7 +10,7 @@ MASTER_SITES= http://www.sourcehosting.n PKGNAMEPREFIX= trac- DISTNAME= ${PORTNAME}plugin-${PORTVERSION} -MAINTAINER= glarkin@FreeBSD.org +MAINTAINER= ports@FreeBSD.org COMMENT= Visually edit the Trac ticket CC field RUN_DEPENDS+= tracd:${PORTSDIR}/www/trac Modified: head/www/trac-codetags/Makefile ============================================================================== --- head/www/trac-codetags/Makefile Mon Dec 16 18:18:07 2013 (r336655) +++ head/www/trac-codetags/Makefile Mon Dec 16 18:24:49 2013 (r336656) @@ -9,7 +9,7 @@ MASTER_SITES= http://www.gerritbeine.de/ PKGNAMEPREFIX= trac- DISTNAME= ${PORTNAME}plugin-${PORTVERSION} -MAINTAINER= glarkin@FreeBSD.org +MAINTAINER= ports@FreeBSD.org COMMENT= Plugin for displaying code tags RUN_DEPENDS+= tracd:${PORTSDIR}/www/trac Modified: head/www/trac-customfieldadmin/Makefile ============================================================================== --- head/www/trac-customfieldadmin/Makefile Mon Dec 16 18:18:07 2013 (r336655) +++ head/www/trac-customfieldadmin/Makefile Mon Dec 16 18:24:49 2013 (r336656) @@ -11,7 +11,7 @@ MASTER_SITES= http://www.sourcehosting.n PKGNAMEPREFIX= trac- DISTNAME= ${PORTNAME}plugin-${PORTVERSION} -MAINTAINER= glarkin@FreeBSD.org +MAINTAINER= ports@FreeBSD.org COMMENT= Web interface to administer Trac ticket custom fields RUN_DEPENDS+= tracd:${PORTSDIR}/www/trac Modified: head/www/trac-estimator/Makefile ============================================================================== --- head/www/trac-estimator/Makefile Mon Dec 16 18:18:07 2013 (r336655) +++ head/www/trac-estimator/Makefile Mon Dec 16 18:24:49 2013 (r336656) @@ -9,7 +9,7 @@ MASTER_SITES= http://www.sourcehosting.n PKGNAMEPREFIX= trac- DISTNAME= ${PORTNAME}plugin-${PORTVERSION} -MAINTAINER= glarkin@FreeBSD.org +MAINTAINER= ports@FreeBSD.org COMMENT= Produce detailed range-based estimations for Trac tickets RUN_DEPENDS+= tracd:${PORTSDIR}/www/trac Modified: head/www/trac-hierwiki/Makefile ============================================================================== --- head/www/trac-hierwiki/Makefile Mon Dec 16 18:18:07 2013 (r336655) +++ head/www/trac-hierwiki/Makefile Mon Dec 16 18:24:49 2013 (r336656) @@ -9,7 +9,7 @@ MASTER_SITES= http://www.gerritbeine.de/ PKGNAMEPREFIX= trac- DISTNAME= ${PORTNAME}plugin-${PORTVERSION} -MAINTAINER= glarkin@FreeBSD.org +MAINTAINER= ports@FreeBSD.org COMMENT= Dealing with the trac wiki as a hierarchy RUN_DEPENDS+= tracd:${PORTSDIR}/www/trac Modified: head/www/trac-ldap/Makefile ============================================================================== --- head/www/trac-ldap/Makefile Mon Dec 16 18:18:07 2013 (r336655) +++ head/www/trac-ldap/Makefile Mon Dec 16 18:24:49 2013 (r336656) @@ -9,7 +9,7 @@ MASTER_SITES= http://www.gerritbeine.de/ PKGNAMEPREFIX= trac- DISTNAME= ${PORTNAME}plugin-${PORTVERSION} -MAINTAINER= glarkin@FreeBSD.org +MAINTAINER= ports@FreeBSD.org COMMENT= LDAP extensions for Trac RUN_DEPENDS+= tracd:${PORTSDIR}/www/trac \ Modified: head/www/trac-macropost/Makefile ============================================================================== --- head/www/trac-macropost/Makefile Mon Dec 16 18:18:07 2013 (r336655) +++ head/www/trac-macropost/Makefile Mon Dec 16 18:24:49 2013 (r336656) @@ -9,7 +9,7 @@ MASTER_SITES= http://www.gerritbeine.de/ PKGNAMEPREFIX= trac- DISTNAME= ${PORTNAME}plugin-${PORTVERSION} -MAINTAINER= glarkin@FreeBSD.org +MAINTAINER= ports@FreeBSD.org COMMENT= Allows Macros to use POST in forms RUN_DEPENDS+= tracd:${PORTSDIR}/www/trac Modified: head/www/trac-mastertickets/Makefile ============================================================================== --- head/www/trac-mastertickets/Makefile Mon Dec 16 18:18:07 2013 (r336655) +++ head/www/trac-mastertickets/Makefile Mon Dec 16 18:24:49 2013 (r336656) @@ -9,7 +9,7 @@ MASTER_SITES= http://mirrors.redv.com/pu PKGNAMEPREFIX= trac- DISTNAME= coderanger-trac-${PORTNAME}-43a7537 -MAINTAINER= glarkin@FreeBSD.org +MAINTAINER= ports@FreeBSD.org COMMENT= Support for ticket dependencies *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** From owner-svn-ports-head@FreeBSD.ORG Mon Dec 16 18:57:32 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id BB022FB6; Mon, 16 Dec 2013 18:57:32 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id A66DD1F99; Mon, 16 Dec 2013 18:57:32 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBGIvWZL069397; Mon, 16 Dec 2013 18:57:32 GMT (envelope-from mat@svn.freebsd.org) Received: (from mat@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBGIvWit069394; Mon, 16 Dec 2013 18:57:32 GMT (envelope-from mat@svn.freebsd.org) Message-Id: <201312161857.rBGIvWit069394@svn.freebsd.org> From: Mathieu Arnold Date: Mon, 16 Dec 2013 18:57:32 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r336657 - in head: print/pdftk sysutils/rubygem-hiera-json sysutils/rubygem-hiera-puppet X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 16 Dec 2013 18:57:32 -0000 Author: mat Date: Mon Dec 16 18:57:31 2013 New Revision: 336657 URL: http://svnweb.freebsd.org/changeset/ports/336657 Log: Take those. Modified: head/print/pdftk/Makefile head/sysutils/rubygem-hiera-json/Makefile head/sysutils/rubygem-hiera-puppet/Makefile Modified: head/print/pdftk/Makefile ============================================================================== --- head/print/pdftk/Makefile Mon Dec 16 18:24:49 2013 (r336656) +++ head/print/pdftk/Makefile Mon Dec 16 18:57:31 2013 (r336657) @@ -7,7 +7,7 @@ CATEGORIES= print MASTER_SITES= http://www.pdflabs.com/tools/pdftk-the-pdf-toolkit/ DISTNAME= ${PORTNAME}-${PORTVERSION}-src -MAINTAINER= ports@FreeBSD.org +MAINTAINER= mat@FreeBSD.org COMMENT= Simple tool for doing everyday things with PDF documents LICENSE= GPLv2 Modified: head/sysutils/rubygem-hiera-json/Makefile ============================================================================== --- head/sysutils/rubygem-hiera-json/Makefile Mon Dec 16 18:24:49 2013 (r336656) +++ head/sysutils/rubygem-hiera-json/Makefile Mon Dec 16 18:57:31 2013 (r336657) @@ -6,7 +6,7 @@ PORTVERSION= 0.4.0 CATEGORIES= sysutils rubygems MASTER_SITES= RG -MAINTAINER= ports@FreeBSD.org +MAINTAINER= mat@FreeBSD.org COMMENT= A backend for Hiera that queries JSON data RUN_DEPENDS= puppet>=0:${PORTSDIR}/sysutils/puppet \ Modified: head/sysutils/rubygem-hiera-puppet/Makefile ============================================================================== --- head/sysutils/rubygem-hiera-puppet/Makefile Mon Dec 16 18:24:49 2013 (r336656) +++ head/sysutils/rubygem-hiera-puppet/Makefile Mon Dec 16 18:57:31 2013 (r336657) @@ -7,7 +7,7 @@ PORTREVISION= 1 CATEGORIES= sysutils rubygems MASTER_SITES= RG -MAINTAINER= ports@FreeBSD.org +MAINTAINER= mat@FreeBSD.org COMMENT= A data backend for Hiera that queries the Puppet scope for data RUN_DEPENDS= puppet>=0:${PORTSDIR}/sysutils/puppet27 \ From owner-svn-ports-head@FreeBSD.ORG Mon Dec 16 19:10:23 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id AED3A51D; Mon, 16 Dec 2013 19:10:23 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 9ADE41083; Mon, 16 Dec 2013 19:10:23 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBGJANto075425; Mon, 16 Dec 2013 19:10:23 GMT (envelope-from zeising@svn.freebsd.org) Received: (from zeising@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBGJANG6075424; Mon, 16 Dec 2013 19:10:23 GMT (envelope-from zeising@svn.freebsd.org) Message-Id: <201312161910.rBGJANG6075424@svn.freebsd.org> From: Niclas Zeising Date: Mon, 16 Dec 2013 19:10:23 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r336658 - head/x11-drivers/xf86-video-ati X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 16 Dec 2013 19:10:23 -0000 Author: zeising Date: Mon Dec 16 19:10:23 2013 New Revision: 336658 URL: http://svnweb.freebsd.org/changeset/ports/336658 Log: Fix includes so that portrevision gets set properly. Noted by: Christian Weisgerber Modified: head/x11-drivers/xf86-video-ati/Makefile Modified: head/x11-drivers/xf86-video-ati/Makefile ============================================================================== --- head/x11-drivers/xf86-video-ati/Makefile Mon Dec 16 18:57:31 2013 (r336657) +++ head/x11-drivers/xf86-video-ati/Makefile Mon Dec 16 19:10:23 2013 (r336658) @@ -12,7 +12,7 @@ USE_GL= gl XORG_CAT= driver USE_XORG= xf86driproto xineramaproto xf86miscproto glproto -.include +.include .if ${OSVERSION} < 1000051 || !defined(WITH_NEW_XORG) ATI_VERSION= 6.14.6 @@ -27,4 +27,4 @@ EXTRA_PATCHES+= ${FILESDIR}/extra-src__r PLIST_SUB+= OLD="@comment " .endif -.include +.include From owner-svn-ports-head@FreeBSD.ORG Mon Dec 16 20:17:52 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id C22CA561; Mon, 16 Dec 2013 20:17:52 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id ADAE616E9; Mon, 16 Dec 2013 20:17:52 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBGKHquc099191; Mon, 16 Dec 2013 20:17:52 GMT (envelope-from demon@svn.freebsd.org) Received: (from demon@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBGKHqwI099190; Mon, 16 Dec 2013 20:17:52 GMT (envelope-from demon@svn.freebsd.org) Message-Id: <201312162017.rBGKHqwI099190@svn.freebsd.org> From: Dmitry Sivachenko Date: Mon, 16 Dec 2013 20:17:52 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r336660 - head/net-mgmt/nagios-plugins X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 16 Dec 2013 20:17:52 -0000 Author: demon Date: Mon Dec 16 20:17:52 2013 New Revision: 336660 URL: http://svnweb.freebsd.org/changeset/ports/336660 Log: More compact way to handle options. Submitted by: mat Modified: head/net-mgmt/nagios-plugins/Makefile Modified: head/net-mgmt/nagios-plugins/Makefile ============================================================================== --- head/net-mgmt/nagios-plugins/Makefile Mon Dec 16 19:13:27 2013 (r336659) +++ head/net-mgmt/nagios-plugins/Makefile Mon Dec 16 20:17:52 2013 (r336660) @@ -32,6 +32,8 @@ JAIL_DESC= Compilation within jail(8) (s DBI_DESC= Check database using DBI EXTRAOPTS_DESC= Parsing of plugins ini config files for extra options +EXTRAOPTS_CONFIGURE_ENABLE= extra-opts + GNU_CONFIGURE= yes NAGIOSUSER?= nagios @@ -49,7 +51,7 @@ NEED_ROOT= yes # check_icmp, check_dhcp .include -CONFIGURE_ARGS= --with-nagios-user=${NAGIOSUSER} \ +CONFIGURE_ARGS+=--with-nagios-user=${NAGIOSUSER} \ --with-nagios-group=${NAGIOSGROUP} \ --with-cgiurl=${NAGIOSCGIURL} \ --sbindir=${PREFIX}/${NAGIOSWWWDIR}/cgi-bin \ @@ -149,10 +151,6 @@ CONFIGURE_ARGS+= --without-dbi PLIST_SUB+= SUB_DBI="@comment " .endif -.if ${PORT_OPTIONS:MEXTRAOPTS} -CONFIGURE_ARGS+= --enable-extra-opts -.endif - .if ${OSVERSION} > 1000055 EXTRA_PATCHES+= ${FILESDIR}/extra-patch-dig-to-drill.diff CONFIGURE_ARGS+=--with-dig-command=/usr/bin/drill From owner-svn-ports-head@FreeBSD.ORG Mon Dec 16 20:29:03 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 57772A19; Mon, 16 Dec 2013 20:29:03 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 4359B18DE; Mon, 16 Dec 2013 20:29:03 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBGKT3kB002905; Mon, 16 Dec 2013 20:29:03 GMT (envelope-from bdrewery@svn.freebsd.org) Received: (from bdrewery@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBGKT3p8002904; Mon, 16 Dec 2013 20:29:03 GMT (envelope-from bdrewery@svn.freebsd.org) Message-Id: <201312162029.rBGKT3p8002904@svn.freebsd.org> From: Bryan Drewery Date: Mon, 16 Dec 2013 20:29:03 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r336661 - head/textproc/jshon X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 16 Dec 2013 20:29:03 -0000 Author: bdrewery Date: Mon Dec 16 20:29:02 2013 New Revision: 336661 URL: http://svnweb.freebsd.org/changeset/ports/336661 Log: Take maintainership Modified: head/textproc/jshon/Makefile Modified: head/textproc/jshon/Makefile ============================================================================== --- head/textproc/jshon/Makefile Mon Dec 16 20:17:52 2013 (r336660) +++ head/textproc/jshon/Makefile Mon Dec 16 20:29:02 2013 (r336661) @@ -5,7 +5,7 @@ PORTVERSION= 20121210 PORTREVISION= 1 CATEGORIES= textproc -MAINTAINER= ports@FreeBSD.org +MAINTAINER= bdrewery@FreeBSD.org COMMENT= json parser for the shell. LICENSE= MIT From owner-svn-ports-head@FreeBSD.ORG Mon Dec 16 20:30:14 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 236B1B0B for ; Mon, 16 Dec 2013 20:30:14 +0000 (UTC) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:1900:2254:206c::16:87]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 042E51921 for ; Mon, 16 Dec 2013 20:30:14 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.7/8.14.7) with ESMTP id rBGKUD0b050928 for ; Mon, 16 Dec 2013 20:30:13 GMT (envelope-from bdrewery@freefall.freebsd.org) Received: (from bdrewery@localhost) by freefall.freebsd.org (8.14.7/8.14.7/Submit) id rBGKUD76050923 for svn-ports-head@freebsd.org; Mon, 16 Dec 2013 20:30:13 GMT (envelope-from bdrewery) Received: (qmail 33176 invoked from network); 16 Dec 2013 14:30:11 -0600 Received: from unknown (HELO roundcube.xk42.net) (10.10.5.5) by sweb.xzibition.com with SMTP; 16 Dec 2013 14:30:11 -0600 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit Date: Mon, 16 Dec 2013 14:30:11 -0600 From: Bryan Drewery To: Baptiste Daroussin Subject: Re: svn commit: r336622 - in head/ports-mgmt: pkg pkg-devel pkg-devel/files pkg/files Organization: FreeBSD In-Reply-To: <201312161116.rBGBGfcC000560@svn.freebsd.org> References: <201312161116.rBGBGfcC000560@svn.freebsd.org> Message-ID: <7c20a85089a619a0422141bdca3b0be2@shatow.net> X-Sender: bdrewery@FreeBSD.org User-Agent: Roundcube Webmail/0.9.5 Cc: svn-ports-head@freebsd.org, svn-ports-all@freebsd.org, owner-ports-committers@freebsd.org, ports-committers@freebsd.org X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 16 Dec 2013 20:30:14 -0000 This one is my fault! On 2013-12-16 05:16, Baptiste Daroussin wrote: > Author: bapt > Date: Mon Dec 16 11:16:41 2013 > New Revision: 336622 > URL: http://svnweb.freebsd.org/changeset/ports/336622 > > Log: > Fix sefault while cleaning up > It only happens if one has list or key/value list in pkg.conf > a workaround to update is to comment it out the time to upgrade > > Reported by: many > Pointyhat to: bapt (again) > > Added: > head/ports-mgmt/pkg-devel/files/patch-libpkg_pkg_config (contents, > props changed) > head/ports-mgmt/pkg/files/patch-libpkg_pkg_config (contents, props > changed) > Modified: > head/ports-mgmt/pkg-devel/Makefile > head/ports-mgmt/pkg/Makefile > > Modified: head/ports-mgmt/pkg-devel/Makefile > ============================================================================== > --- head/ports-mgmt/pkg-devel/Makefile Mon Dec 16 11:11:09 > 2013 (r336621) > +++ head/ports-mgmt/pkg-devel/Makefile Mon Dec 16 11:16:41 > 2013 (r336622) > @@ -2,6 +2,7 @@ > > PORTNAME= pkg > DISTVERSION= 1.2.4 > +PORTREVISION= 1 > CATEGORIES= ports-mgmt > MASTER_SITES= http://files.etoilebsd.net/pkg/ \ > http://mirror.shatow.net/freebsd/${PORTNAME}/ \ > > Added: head/ports-mgmt/pkg-devel/files/patch-libpkg_pkg_config > ============================================================================== > --- /dev/null 00:00:00 1970 (empty, because file is newly added) > +++ head/ports-mgmt/pkg-devel/files/patch-libpkg_pkg_config Mon Dec 16 > 11:16:41 2013 (r336622) > @@ -0,0 +1,28 @@ > +--- libpkg/pkg_config.c.orig 2013-12-16 08:52:39.000000000 +0100 > ++++ libpkg/pkg_config.c 2013-12-16 12:09:13.093549000 +0100 > +@@ -293,6 +293,7 @@ > + static size_t c_size = sizeof(c) / sizeof(struct config_entry); > + > + static void pkg_config_kv_free(struct pkg_config_kv *); > ++static void pkg_config_value_free(struct pkg_config_value *); > + static void pkg_config_free(struct pkg_config *conf); > + static struct pkg_repo *pkg_repo_new(const char *name, const char > *url); > + > +@@ -440,7 +441,7 @@ > + continue; > + } > + if (!conf->fromenv) { > +- pkg_config_free(conf); > ++ HASH_FREE(conf->list, pkg_config_value, pkg_config_value_free); > + conf->list = NULL; > + obj_walk_array(cur, conf); > + } > +@@ -452,7 +453,7 @@ > + continue; > + } > + if (!conf->fromenv) { > +- pkg_config_free(conf); > ++ HASH_FREE(conf->kvlist, pkg_config_kv, pkg_config_kv_free); > + conf->kvlist = NULL; > + obj_walk_object(cur, conf); > + } > > Modified: head/ports-mgmt/pkg/Makefile > ============================================================================== > --- head/ports-mgmt/pkg/Makefile Mon Dec 16 11:11:09 2013 (r336621) > +++ head/ports-mgmt/pkg/Makefile Mon Dec 16 11:16:41 2013 (r336622) > @@ -2,6 +2,7 @@ > > PORTNAME= pkg > DISTVERSION= 1.2.4 > +PORTREVISION= 1 > CATEGORIES= ports-mgmt > MASTER_SITES= http://files.etoilebsd.net/pkg/ \ > http://mirror.shatow.net/freebsd/${PORTNAME}/ \ > > Added: head/ports-mgmt/pkg/files/patch-libpkg_pkg_config > ============================================================================== > --- /dev/null 00:00:00 1970 (empty, because file is newly added) > +++ head/ports-mgmt/pkg/files/patch-libpkg_pkg_config Mon Dec 16 > 11:16:41 2013 (r336622) > @@ -0,0 +1,28 @@ > +--- libpkg/pkg_config.c.orig 2013-12-16 08:52:39.000000000 +0100 > ++++ libpkg/pkg_config.c 2013-12-16 12:09:13.093549000 +0100 > +@@ -293,6 +293,7 @@ > + static size_t c_size = sizeof(c) / sizeof(struct config_entry); > + > + static void pkg_config_kv_free(struct pkg_config_kv *); > ++static void pkg_config_value_free(struct pkg_config_value *); > + static void pkg_config_free(struct pkg_config *conf); > + static struct pkg_repo *pkg_repo_new(const char *name, const char > *url); > + > +@@ -440,7 +441,7 @@ > + continue; > + } > + if (!conf->fromenv) { > +- pkg_config_free(conf); > ++ HASH_FREE(conf->list, pkg_config_value, pkg_config_value_free); > + conf->list = NULL; > + obj_walk_array(cur, conf); > + } > +@@ -452,7 +453,7 @@ > + continue; > + } > + if (!conf->fromenv) { > +- pkg_config_free(conf); > ++ HASH_FREE(conf->kvlist, pkg_config_kv, pkg_config_kv_free); > + conf->kvlist = NULL; > + obj_walk_object(cur, conf); > + } -- Regards, Bryan Drewery From owner-svn-ports-head@FreeBSD.ORG Mon Dec 16 20:32:13 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 621DCCDF; Mon, 16 Dec 2013 20:32:13 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 4CE9C19E9; Mon, 16 Dec 2013 20:32:13 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBGKWDPD005718; Mon, 16 Dec 2013 20:32:13 GMT (envelope-from bdrewery@svn.freebsd.org) Received: (from bdrewery@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBGKWCPL005716; Mon, 16 Dec 2013 20:32:12 GMT (envelope-from bdrewery@svn.freebsd.org) Message-Id: <201312162032.rBGKWCPL005716@svn.freebsd.org> From: Bryan Drewery Date: Mon, 16 Dec 2013 20:32:12 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r336662 - in head/devel: gearmand gearmand-devel X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 16 Dec 2013 20:32:13 -0000 Author: bdrewery Date: Mon Dec 16 20:32:12 2013 New Revision: 336662 URL: http://svnweb.freebsd.org/changeset/ports/336662 Log: Take maintainership Modified: head/devel/gearmand-devel/Makefile head/devel/gearmand/Makefile Modified: head/devel/gearmand-devel/Makefile ============================================================================== --- head/devel/gearmand-devel/Makefile Mon Dec 16 20:29:02 2013 (r336661) +++ head/devel/gearmand-devel/Makefile Mon Dec 16 20:32:12 2013 (r336662) @@ -6,7 +6,7 @@ PORTVERSION= 1.1.8 CATEGORIES= devel MASTER_SITES= http://launchpad.net/gearmand/1.2/${PORTVERSION}/+download/ -MAINTAINER= ports@FreeBSD.org +MAINTAINER= bdrewery@FreeBSD.org COMMENT= Gearman C Server and Library BUILD_DEPENDS= boost-libs>=0:${PORTSDIR}/devel/boost-libs \ Modified: head/devel/gearmand/Makefile ============================================================================== --- head/devel/gearmand/Makefile Mon Dec 16 20:29:02 2013 (r336661) +++ head/devel/gearmand/Makefile Mon Dec 16 20:32:12 2013 (r336662) @@ -6,7 +6,7 @@ PORTVERSION= 1.0.6 CATEGORIES= devel MASTER_SITES= http://launchpad.net/gearmand/1.0/${PORTVERSION}/+download/ -MAINTAINER= ports@FreeBSD.org +MAINTAINER= bdrewery@FreeBSD.org COMMENT= Gearman C Server and Library BUILD_DEPENDS= boost-libs>=0:${PORTSDIR}/devel/boost-libs \ From owner-svn-ports-head@FreeBSD.ORG Mon Dec 16 20:45:38 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 942E664B; Mon, 16 Dec 2013 20:45:38 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 7F7B51ADD; Mon, 16 Dec 2013 20:45:38 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBGKjc5K011205; Mon, 16 Dec 2013 20:45:38 GMT (envelope-from thierry@svn.freebsd.org) Received: (from thierry@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBGKjcSE011201; Mon, 16 Dec 2013 20:45:38 GMT (envelope-from thierry@svn.freebsd.org) Message-Id: <201312162045.rBGKjcSE011201@svn.freebsd.org> From: Thierry Thomas Date: Mon, 16 Dec 2013 20:45:38 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r336663 - in head/multimedia/mplayer: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 16 Dec 2013 20:45:38 -0000 Author: thierry Date: Mon Dec 16 20:45:37 2013 New Revision: 336663 URL: http://svnweb.freebsd.org/changeset/ports/336663 Log: Fix a problem with the control applet and playbar. Submitted by: bar Approved by: maintainer Added: head/multimedia/mplayer/files/patch-gui_ws_ws.c (contents, props changed) Modified: head/multimedia/mplayer/Makefile Modified: head/multimedia/mplayer/Makefile ============================================================================== --- head/multimedia/mplayer/Makefile Mon Dec 16 20:32:12 2013 (r336662) +++ head/multimedia/mplayer/Makefile Mon Dec 16 20:45:37 2013 (r336663) @@ -3,7 +3,7 @@ PORTNAME= mplayer PORTVERSION= ${MPLAYER_PORT_VERSION} -PORTREVISION= 0 +PORTREVISION= 1 COMMENT= High performance media player supporting many formats Added: head/multimedia/mplayer/files/patch-gui_ws_ws.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/multimedia/mplayer/files/patch-gui_ws_ws.c Mon Dec 16 20:45:37 2013 (r336663) @@ -0,0 +1,10 @@ +--- gui/wm/ws.c.orig 2013-08-03 00:42:05.000000000 +0200 ++++ gui/wm/ws.c 2013-12-16 10:13:26.000000000 +0100 +@@ -1322,6 +1322,7 @@ + win->xImage->data = win->Shminfo.shmaddr; + win->Shminfo.readOnly = False; + XShmAttach(wsDisplay, &win->Shminfo); ++ XSync(wsDisplay, False); + shmctl(win->Shminfo.shmid, IPC_RMID, 0); + } else + #endif From owner-svn-ports-head@FreeBSD.ORG Mon Dec 16 20:46:15 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 162C0730; Mon, 16 Dec 2013 20:46:15 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id EA2F21AE5; Mon, 16 Dec 2013 20:46:14 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBGKkEcI011455; Mon, 16 Dec 2013 20:46:14 GMT (envelope-from mandree@svn.freebsd.org) Received: (from mandree@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBGKkDcc011445; Mon, 16 Dec 2013 20:46:13 GMT (envelope-from mandree@svn.freebsd.org) Message-Id: <201312162046.rBGKkDcc011445@svn.freebsd.org> From: Matthias Andree Date: Mon, 16 Dec 2013 20:46:13 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r336664 - in head: . databases/db4 databases/db41 databases/db42 databases/db43 databases/db44 databases/db46 databases/db47 X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 16 Dec 2013 20:46:15 -0000 Author: mandree Date: Mon Dec 16 20:46:12 2013 New Revision: 336664 URL: http://svnweb.freebsd.org/changeset/ports/336664 Log: Fix/reword BerkeleyDB based UPGRADING, and change DEPRECATION text a bit so that people don't rush to upgrades yet. Modified: head/UPDATING head/databases/db4/Makefile head/databases/db41/Makefile head/databases/db42/Makefile head/databases/db43/Makefile head/databases/db44/Makefile head/databases/db46/Makefile head/databases/db47/Makefile Modified: head/UPDATING ============================================================================== --- head/UPDATING Mon Dec 16 20:45:37 2013 (r336663) +++ head/UPDATING Mon Dec 16 20:46:12 2013 (r336664) @@ -34,18 +34,21 @@ you update your ports collection, before or # portupgrade -a -20131214: +20131216: AFFECTS: users of databases/db4* AUTHOR: mandree@FreeBSD.org - Berkeley DB versions before and excluding 4.8 have been marked - deprecated. Please see https://wiki.freebsd.org/Ports/BerkeleyDBCleanup - for upgrade instructions. + Berkeley DB versions before and excluding 4.8 have been marked deprecated. + New port installations should be based on Berkeley DB 5 or 6. - You can add WITH_BDB_VERSION=5 or WITH_BDB_VERSION=6 to have all + Note that Oracle Berkeley DB 6 is under the more restrictive Affero GPL v3 + license, be sure to review if using that fits your requirements. + + You can add WITH_BDB_VER=5 or WITH_BDB_VER=6 to have all applications that get rebuilt use Oracle Berkeley DB 5 or 6, respectively. - Note that Oracle Berkeley DB 6 is under the more restrictive Affero GPL v3. + If you are interested in upgrading now already, we have instructions + at . 20131209: AFFECTS: users of dns/bind96, dns/bind98 and bind99 on FreeBSD 10.0 Modified: head/databases/db4/Makefile ============================================================================== --- head/databases/db4/Makefile Mon Dec 16 20:45:37 2013 (r336663) +++ head/databases/db4/Makefile Mon Dec 16 20:46:12 2013 (r336664) @@ -10,7 +10,7 @@ MASTER_SITES= http://download.oracle.com DISTNAME= db-${PORTVERSION} DIST_SUBDIR= bdb -DEPRECATED= Please migrate to databases/db5 +DEPRECATED= Please use databases/db5 or db6 for new installs. MAINTAINER= mandree@FreeBSD.org COMMENT= The Berkeley DB package, revision 4 Modified: head/databases/db41/Makefile ============================================================================== --- head/databases/db41/Makefile Mon Dec 16 20:45:37 2013 (r336663) +++ head/databases/db41/Makefile Mon Dec 16 20:46:12 2013 (r336664) @@ -19,7 +19,7 @@ COMMENT= The Berkeley DB package, revisi CONFLICTS?= db41-nocrypto-4* -DEPRECATED= Please migrate to databases/db5 +DEPRECATED= Please use databases/db5 or db6 for new installs. WRKSRC= ${WRKDIR}/${DISTNAME}/build_unix Modified: head/databases/db42/Makefile ============================================================================== --- head/databases/db42/Makefile Mon Dec 16 20:45:37 2013 (r336663) +++ head/databases/db42/Makefile Mon Dec 16 20:46:12 2013 (r336664) @@ -14,7 +14,7 @@ PATCHFILES= patch.${PORTVERSION}.1 patc MAINTAINER= mandree@FreeBSD.org COMMENT= The Berkeley DB package, revision 4.2 -DEPRECATED= Please migrate to databases/db5 +DEPRECATED= Please use databases/db5 or db6 for new installs. CONFLICTS?= db42-nocrypto-4* Modified: head/databases/db43/Makefile ============================================================================== --- head/databases/db43/Makefile Mon Dec 16 20:45:37 2013 (r336663) +++ head/databases/db43/Makefile Mon Dec 16 20:46:12 2013 (r336664) @@ -14,7 +14,7 @@ COMMENT= The Berkeley DB package, revisi WRKSRC= ${WRKDIR}/${DISTNAME}/build_unix -DEPRECATED= Please migrate to databases/db5 +DEPRECATED= Please use databases/db5 or db6 for new installs. USE_LDCONFIG= yes GNU_CONFIGURE= yes Modified: head/databases/db44/Makefile ============================================================================== --- head/databases/db44/Makefile Mon Dec 16 20:45:37 2013 (r336663) +++ head/databases/db44/Makefile Mon Dec 16 20:46:12 2013 (r336664) @@ -14,7 +14,7 @@ COMMENT= The Berkeley DB package, revisi WRKSRC= ${WRKDIR}/${DISTNAME}/build_unix -DEPRECATED= Please migrate to databases/db5 +DEPRECATED= Please use databases/db5 or db6 for new installs. USE_LDCONFIG= yes GNU_CONFIGURE= yes Modified: head/databases/db46/Makefile ============================================================================== --- head/databases/db46/Makefile Mon Dec 16 20:45:37 2013 (r336663) +++ head/databases/db46/Makefile Mon Dec 16 20:46:12 2013 (r336664) @@ -32,7 +32,7 @@ PATCH_DIST_STRIP= -d .. -l MAINTAINER= gslin@gslin.org COMMENT= The Berkeley DB package, revision 4.6 -DEPRECATED= Please migrate to databases/db5 +DEPRECATED= Please use databases/db5 or db6 for new installs. BDBVER= ${PORTVERSION:R:R} CONFIGURE_ARGS= --enable-compat185 --enable-dump185 --enable-cxx \ Modified: head/databases/db47/Makefile ============================================================================== --- head/databases/db47/Makefile Mon Dec 16 20:45:37 2013 (r336663) +++ head/databases/db47/Makefile Mon Dec 16 20:46:12 2013 (r336664) @@ -30,7 +30,7 @@ PATCH_DIST_STRIP= -d .. --ignore-whitesp MAINTAINER= gslin@gslin.org COMMENT= The Berkeley DB package, revision 4.7 -DEPRECATED= Please migrate to databases/db5 +DEPRECATED= Please use databases/db5 or db6 for new installs. BDBVER= ${PORTVERSION:R:R} CONFIGURE_ARGS= --enable-compat185 --enable-dump185 --enable-cxx \ From owner-svn-ports-head@FreeBSD.ORG Mon Dec 16 20:59:15 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 63AC4B32; Mon, 16 Dec 2013 20:59:15 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 4D76D1CDA; Mon, 16 Dec 2013 20:59:15 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBGKxFVY015201; Mon, 16 Dec 2013 20:59:15 GMT (envelope-from flo@svn.freebsd.org) Received: (from flo@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBGKxFiJ015200; Mon, 16 Dec 2013 20:59:15 GMT (envelope-from flo@svn.freebsd.org) Message-Id: <201312162059.rBGKxFiJ015200@svn.freebsd.org> From: Florian Smeets Date: Mon, 16 Dec 2013 20:59:15 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r336665 - head X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 16 Dec 2013 20:59:15 -0000 Author: flo Date: Mon Dec 16 20:59:14 2013 New Revision: 336665 URL: http://svnweb.freebsd.org/changeset/ports/336665 Log: Correct some instructions after recent gecko changes. Submitted by: Jan Beich Modified: head/UPDATING Modified: head/UPDATING ============================================================================== --- head/UPDATING Mon Dec 16 20:46:12 2013 (r336664) +++ head/UPDATING Mon Dec 16 20:59:14 2013 (r336665) @@ -2210,7 +2210,7 @@ you update your ports collection, before When using Firefox or SeaMonkey compiled with ALSA option ON it may crash on assert in alsa_refill_stream as described in ports/170473. - To workaround disable ARIFF_OSS in audio/alsa-plugins or use PULSEAUDIO. + To workaround enable BUFSZ_P2 in audio/alsa-plugins or use PULSEAUDIO. 20121010: AFFECTS: users of CURRENT (OSVERSION >= 1000017) From owner-svn-ports-head@FreeBSD.ORG Mon Dec 16 21:09:16 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id AC308299; Mon, 16 Dec 2013 21:09:16 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 8A8211DB0; Mon, 16 Dec 2013 21:09:16 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBGL9Gn4019244; Mon, 16 Dec 2013 21:09:16 GMT (envelope-from kwm@svn.freebsd.org) Received: (from kwm@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBGL9G9u019241; Mon, 16 Dec 2013 21:09:16 GMT (envelope-from kwm@svn.freebsd.org) Message-Id: <201312162109.rBGL9G9u019241@svn.freebsd.org> From: Koop Mast Date: Mon, 16 Dec 2013 21:09:16 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r336666 - head/devel/libvirt X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 16 Dec 2013 21:09:16 -0000 Author: kwm Date: Mon Dec 16 21:09:15 2013 New Revision: 336666 URL: http://svnweb.freebsd.org/changeset/ports/336666 Log: Fix typo. Modified: head/devel/libvirt/Makefile Modified: head/devel/libvirt/Makefile ============================================================================== --- head/devel/libvirt/Makefile Mon Dec 16 20:59:14 2013 (r336665) +++ head/devel/libvirt/Makefile Mon Dec 16 21:09:15 2013 (r336666) @@ -44,7 +44,7 @@ CONFIGURE_ARGS= --without-sasl \ # workaround to override pkg-config calls # random_data fix can be removed when 8.x is eol CONFIGURE_ENV= SSH2_LIBS="-L${LOCALBASE}/lib -lssh2 -lssl" \ - SSH2_CFLAGS="-I${LOCLABASE}/include" \ + SSH2_CFLAGS="-I${LOCALBASE}/include" \ ac_cv_type_struct_random_data="" # limit production release x.x.x From owner-svn-ports-head@FreeBSD.ORG Mon Dec 16 21:11:30 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 238CE454; Mon, 16 Dec 2013 21:11:30 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 0EDCE1E27; Mon, 16 Dec 2013 21:11:30 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBGLBTGC022089; Mon, 16 Dec 2013 21:11:29 GMT (envelope-from trociny@svn.freebsd.org) Received: (from trociny@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBGLBTkD022087; Mon, 16 Dec 2013 21:11:29 GMT (envelope-from trociny@svn.freebsd.org) Message-Id: <201312162111.rBGLBTkD022087@svn.freebsd.org> From: Mikolaj Golub Date: Mon, 16 Dec 2013 21:11:29 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r336667 - head/devel/bmkdep X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 16 Dec 2013 21:11:30 -0000 Author: trociny Date: Mon Dec 16 21:11:29 2013 New Revision: 336667 URL: http://svnweb.freebsd.org/changeset/ports/336667 Log: Update to 20131215. Approved by: bdrewery (mentor) Modified: head/devel/bmkdep/Makefile head/devel/bmkdep/distinfo Modified: head/devel/bmkdep/Makefile ============================================================================== --- head/devel/bmkdep/Makefile Mon Dec 16 21:09:15 2013 (r336666) +++ head/devel/bmkdep/Makefile Mon Dec 16 21:11:29 2013 (r336667) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= bmkdep -PORTVERSION= 20131009 +PORTVERSION= 20131215 CATEGORIES= devel MASTER_SITES= GOOGLE_CODE Modified: head/devel/bmkdep/distinfo ============================================================================== --- head/devel/bmkdep/distinfo Mon Dec 16 21:09:15 2013 (r336666) +++ head/devel/bmkdep/distinfo Mon Dec 16 21:11:29 2013 (r336667) @@ -1,2 +1,2 @@ -SHA256 (bmkdep-20131009.tar.gz) = 646d32552dc75950237ae04c172e19b3bbbaa835efec5fece27b922f387536d4 -SIZE (bmkdep-20131009.tar.gz) = 7389 +SHA256 (bmkdep-20131215.tar.gz) = 19e6f6190a624283dc756be3318662a2714b6271fd43e6e2c75136c0e0cccfaf +SIZE (bmkdep-20131215.tar.gz) = 7570 From owner-svn-ports-head@FreeBSD.ORG Mon Dec 16 21:15:17 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id E476B6EF; Mon, 16 Dec 2013 21:15:16 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id C5B681E6B; Mon, 16 Dec 2013 21:15:16 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBGLFGxK022747; Mon, 16 Dec 2013 21:15:16 GMT (envelope-from trociny@svn.freebsd.org) Received: (from trociny@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBGLFGVZ022743; Mon, 16 Dec 2013 21:15:16 GMT (envelope-from trociny@svn.freebsd.org) Message-Id: <201312162115.rBGLFGVZ022743@svn.freebsd.org> From: Mikolaj Golub Date: Mon, 16 Dec 2013 21:15:16 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r336668 - in head/sysutils: . rubygem-mogilefs-client X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 16 Dec 2013 21:15:17 -0000 Author: trociny Date: Mon Dec 16 21:15:15 2013 New Revision: 336668 URL: http://svnweb.freebsd.org/changeset/ports/336668 Log: rubygem-mogilefs-client: MogileFS client library for Ruby [NEW PORT] MogileFS is an open source distributed filesystem, see: mogilefs.org for more details. This library allows any Ruby application to read, write and delete files in a MogileFS instance. Approved by: bdrewery (mentor) Added: head/sysutils/rubygem-mogilefs-client/ head/sysutils/rubygem-mogilefs-client/Makefile (contents, props changed) head/sysutils/rubygem-mogilefs-client/distinfo (contents, props changed) head/sysutils/rubygem-mogilefs-client/pkg-descr (contents, props changed) Modified: head/sysutils/Makefile Modified: head/sysutils/Makefile ============================================================================== --- head/sysutils/Makefile Mon Dec 16 21:11:29 2013 (r336667) +++ head/sysutils/Makefile Mon Dec 16 21:15:15 2013 (r336668) @@ -816,6 +816,7 @@ SUBDIR += rubygem-hiera-json SUBDIR += rubygem-hiera-puppet SUBDIR += rubygem-log4r + SUBDIR += rubygem-mogilefs-client SUBDIR += rubygem-murder SUBDIR += rubygem-ohai SUBDIR += rubygem-parallel Added: head/sysutils/rubygem-mogilefs-client/Makefile ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/sysutils/rubygem-mogilefs-client/Makefile Mon Dec 16 21:15:15 2013 (r336668) @@ -0,0 +1,20 @@ +# Created by: Mikolaj Golub +# $FreeBSD$ + +PORTNAME= mogilefs-client +PORTVERSION= 3.7.1 +CATEGORIES= sysutils +MASTER_SITES= RG + +MAINTAINER= trociny@FreeBSD.org +COMMENT= MogileFS client library for Ruby + +LICENSE= BSD + +USE_RUBY= yes +USE_RUBYGEMS= yes +RUBYGEM_AUTOPLIST= yes + +PLIST_FILES= bin/mog + +.include Added: head/sysutils/rubygem-mogilefs-client/distinfo ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/sysutils/rubygem-mogilefs-client/distinfo Mon Dec 16 21:15:15 2013 (r336668) @@ -0,0 +1,2 @@ +SHA256 (rubygem/mogilefs-client-3.7.1.gem) = 12b4c9233a6a4f9e11f77870ac0211124bda32f66394d4879883a3fe86420656 +SIZE (rubygem/mogilefs-client-3.7.1.gem) = 121344 Added: head/sysutils/rubygem-mogilefs-client/pkg-descr ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/sysutils/rubygem-mogilefs-client/pkg-descr Mon Dec 16 21:15:15 2013 (r336668) @@ -0,0 +1,6 @@ +MogileFS is an open source distributed filesystem, see: mogilefs.org +for more details. This library allows any Ruby application to read, +write and delete files in a MogileFS instance. + +Author: Eric Wong +WWW: http://bogomips.org/mogilefs-client/ From owner-svn-ports-head@FreeBSD.ORG Mon Dec 16 21:39:52 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id C686D900; Mon, 16 Dec 2013 21:39:52 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id B20AF1041; Mon, 16 Dec 2013 21:39:52 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBGLdq5L030207; Mon, 16 Dec 2013 21:39:52 GMT (envelope-from wg@svn.freebsd.org) Received: (from wg@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBGLdqtZ030206; Mon, 16 Dec 2013 21:39:52 GMT (envelope-from wg@svn.freebsd.org) Message-Id: <201312162139.rBGLdqtZ030206@svn.freebsd.org> From: William Grzybowski Date: Mon, 16 Dec 2013 21:39:52 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r336669 - head/devel/py-cffi X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 16 Dec 2013 21:39:52 -0000 Author: wg Date: Mon Dec 16 21:39:52 2013 New Revision: 336669 URL: http://svnweb.freebsd.org/changeset/ports/336669 Log: devel/py-cffi: switch from easy_install to install Modified: head/devel/py-cffi/Makefile Modified: head/devel/py-cffi/Makefile ============================================================================== --- head/devel/py-cffi/Makefile Mon Dec 16 21:15:15 2013 (r336668) +++ head/devel/py-cffi/Makefile Mon Dec 16 21:39:52 2013 (r336669) @@ -19,8 +19,7 @@ CFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib USE_PYTHON= yes -USE_PYDISTUTILS= easy_install +USE_PYDISTUTILS= yes PYDISTUTILS_AUTOPLIST= yes -PYEASYINSTALL_ARCHDEP= yes .include From owner-svn-ports-head@FreeBSD.ORG Mon Dec 16 21:45:51 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 53DFDBF7; Mon, 16 Dec 2013 21:45:51 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 3F2A810C0; Mon, 16 Dec 2013 21:45:51 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBGLjpAc033317; Mon, 16 Dec 2013 21:45:51 GMT (envelope-from trociny@svn.freebsd.org) Received: (from trociny@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBGLjp2N033316; Mon, 16 Dec 2013 21:45:51 GMT (envelope-from trociny@svn.freebsd.org) Message-Id: <201312162145.rBGLjp2N033316@svn.freebsd.org> From: Mikolaj Golub Date: Mon, 16 Dec 2013 21:45:51 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r336670 - head/sysutils/rubygem-mogilefs-client X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 16 Dec 2013 21:45:51 -0000 Author: trociny Date: Mon Dec 16 21:45:50 2013 New Revision: 336670 URL: http://svnweb.freebsd.org/changeset/ports/336670 Log: Author should come out. Pointed by: bdrewery Approved by: bdrewery (mentor, implicitly) Modified: head/sysutils/rubygem-mogilefs-client/pkg-descr Modified: head/sysutils/rubygem-mogilefs-client/pkg-descr ============================================================================== --- head/sysutils/rubygem-mogilefs-client/pkg-descr Mon Dec 16 21:39:52 2013 (r336669) +++ head/sysutils/rubygem-mogilefs-client/pkg-descr Mon Dec 16 21:45:50 2013 (r336670) @@ -2,5 +2,4 @@ MogileFS is an open source distributed f for more details. This library allows any Ruby application to read, write and delete files in a MogileFS instance. -Author: Eric Wong WWW: http://bogomips.org/mogilefs-client/ From owner-svn-ports-head@FreeBSD.ORG Mon Dec 16 22:01:41 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 732F1357; Mon, 16 Dec 2013 22:01:41 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 5EC981224; Mon, 16 Dec 2013 22:01:41 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBGM1fMw039973; Mon, 16 Dec 2013 22:01:41 GMT (envelope-from wg@svn.freebsd.org) Received: (from wg@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBGM1fQU039972; Mon, 16 Dec 2013 22:01:41 GMT (envelope-from wg@svn.freebsd.org) Message-Id: <201312162201.rBGM1fQU039972@svn.freebsd.org> From: William Grzybowski Date: Mon, 16 Dec 2013 22:01:41 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r336671 - head/Mk X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 16 Dec 2013 22:01:41 -0000 Author: wg Date: Mon Dec 16 22:01:40 2013 New Revision: 336671 URL: http://svnweb.freebsd.org/changeset/ports/336671 Log: Mk/bsd.python.mk: fix setup call for python 3.x Reported by: antoine Modified: head/Mk/bsd.python.mk Modified: head/Mk/bsd.python.mk ============================================================================== --- head/Mk/bsd.python.mk Mon Dec 16 21:45:50 2013 (r336670) +++ head/Mk/bsd.python.mk Mon Dec 16 22:01:40 2013 (r336671) @@ -491,7 +491,7 @@ post-install: stage-python-compileall # distutils support PYSETUP?= setup.py -PYDISTUTILS_SETUP?= -c "import setuptools; __file__='${PYSETUP}'; execfile(__file__)" +PYDISTUTILS_SETUP?= -c "import setuptools; __file__='${PYSETUP}'; exec(compile(open(__file__).read().replace('\\r\\n', '\\n'), __file__, 'exec'))" PYDISTUTILS_CONFIGUREARGS?= PYDISTUTILS_BUILDARGS?= PYDISTUTILS_INSTALLARGS?= -c -O1 --prefix=${PREFIX} From owner-svn-ports-head@FreeBSD.ORG Mon Dec 16 22:02:33 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 38B31442; Mon, 16 Dec 2013 22:02:33 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 244901233; Mon, 16 Dec 2013 22:02:33 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBGM2XDa040161; Mon, 16 Dec 2013 22:02:33 GMT (envelope-from bapt@svn.freebsd.org) Received: (from bapt@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBGM2WaG040160; Mon, 16 Dec 2013 22:02:32 GMT (envelope-from bapt@svn.freebsd.org) Message-Id: <201312162202.rBGM2WaG040160@svn.freebsd.org> From: Baptiste Daroussin Date: Mon, 16 Dec 2013 22:02:32 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r336672 - head/security/tripwire X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 16 Dec 2013 22:02:33 -0000 Author: bapt Date: Mon Dec 16 22:02:32 2013 New Revision: 336672 URL: http://svnweb.freebsd.org/changeset/ports/336672 Log: Fix another useless and redundant test that is now broken Reported by: Peter Looyenga , jhellenthal@dataix.net Modified: head/security/tripwire/Makefile Modified: head/security/tripwire/Makefile ============================================================================== --- head/security/tripwire/Makefile Mon Dec 16 22:01:40 2013 (r336671) +++ head/security/tripwire/Makefile Mon Dec 16 22:02:32 2013 (r336672) @@ -119,7 +119,7 @@ install-config-files: .ifdef PACKAGE_BUILDING @ cd ${WRKSRC} && PREFIX=${PREFIX} TW_CLOBBER=${TW_CLOBBER} DO_NOT_CONFIG="yes" TW_PROMPT="false" ${GMAKE} install-data-hook .else -.if ${PORT_OPTIONS:MSW_ONLY} && ${WITH_SW_ONLY} == "true" +.if ${PORT_OPTIONS:MSW_ONLY} @ cd ${WRKSRC} && PREFIX=${PREFIX} TW_CLOBBER=${TW_CLOBBER} DO_NOT_CONFIG="yes" TW_PROMPT="false" ${GMAKE} install-data-hook .else @ cd ${WRKSRC} && PREFIX=${PREFIX} TW_CLOBBER=${TW_CLOBBER} TW_PROMPT=${TW_PROMPT} ${GMAKE} install-data-hook From owner-svn-ports-head@FreeBSD.ORG Mon Dec 16 22:07:25 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 5B6307EB; Mon, 16 Dec 2013 22:07:25 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 2D5A01262; Mon, 16 Dec 2013 22:07:25 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBGM7Pfk040992; Mon, 16 Dec 2013 22:07:25 GMT (envelope-from avilla@svn.freebsd.org) Received: (from avilla@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBGM7OuK040990; Mon, 16 Dec 2013 22:07:24 GMT (envelope-from avilla@svn.freebsd.org) Message-Id: <201312162207.rBGM7OuK040990@svn.freebsd.org> From: Alberto Villa Date: Mon, 16 Dec 2013 22:07:24 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r336673 - head/devel/edb/files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 16 Dec 2013 22:07:25 -0000 Author: avilla Date: Mon Dec 16 22:07:24 2013 New Revision: 336673 URL: http://svnweb.freebsd.org/changeset/ports/336673 Log: - Fix build with Clang. PR: 184298 Submitted by: avilla (myself) Approved by: itechbear@gmail.com (maintainer timeout) Added: head/devel/edb/files/patch-src__edisassm__Instruction32.h (contents, props changed) Modified: head/devel/edb/files/patch-src__src.pro Added: head/devel/edb/files/patch-src__edisassm__Instruction32.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/edb/files/patch-src__edisassm__Instruction32.h Mon Dec 16 22:07:24 2013 (r336673) @@ -0,0 +1,10 @@ +--- ./src/edisassm/Instruction32.h.orig 2011-12-20 22:04:57.000000000 +0100 ++++ ./src/edisassm/Instruction32.h 2013-11-20 18:01:17.389439581 +0100 +@@ -290,7 +290,6 @@ + template + void Instruction::decode_const_Iw(const uint8_t *buf) { + UNUSED(buf); +- UNUSED(size); + + operand_t &operand = next_operand(); + Modified: head/devel/edb/files/patch-src__src.pro ============================================================================== --- head/devel/edb/files/patch-src__src.pro Mon Dec 16 22:02:32 2013 (r336672) +++ head/devel/edb/files/patch-src__src.pro Mon Dec 16 22:07:24 2013 (r336673) @@ -1,5 +1,5 @@ ---- ./src/src.pro.orig 2011-12-12 21:27:25.000000000 +0000 -+++ ./src/src.pro 2012-09-13 21:26:00.215566381 +0000 +--- ./src/src.pro.orig 2011-12-12 22:27:25.000000000 +0100 ++++ ./src/src.pro 2013-11-20 18:01:37.379434373 +0100 @@ -5,7 +5,7 @@ INCLUDEPATH += ./widgets ../include RESOURCES = debugger.qrc @@ -9,3 +9,12 @@ INSTALLS += target QT += xml +@@ -241,7 +241,7 @@ + + linux-g++*: QMAKE_LFLAGS += -rdynamic + openbsd-g++*: QMAKE_LFLAGS += -lkvm -Wl,--export-dynamic +- freebsd-g++*: QMAKE_LFLAGS += -lkvm -Wl,--export-dynamic ++ freebsd-*: QMAKE_LFLAGS += -lkvm -Wl,--export-dynamic + macx-g++*: QMAKE_LFLAGS += -rdynamic + + From owner-svn-ports-head@FreeBSD.ORG Mon Dec 16 22:59:57 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 55775880; Mon, 16 Dec 2013 22:59:57 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 3D89D16F2; Mon, 16 Dec 2013 22:59:57 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBGMxv7B060076; Mon, 16 Dec 2013 22:59:57 GMT (envelope-from avilla@svn.freebsd.org) Received: (from avilla@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBGMxgM3059992; Mon, 16 Dec 2013 22:59:42 GMT (envelope-from avilla@svn.freebsd.org) Message-Id: <201312162259.rBGMxgM3059992@svn.freebsd.org> From: Alberto Villa Date: Mon, 16 Dec 2013 22:59:42 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r336675 - in head: Mk chinese/calligra-l10n-zh_CN chinese/calligra-l10n-zh_TW editors editors/calligra editors/calligra-l10n editors/calligra-l10n-bs editors/calligra-l10n-ca editors/ca... X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 16 Dec 2013 22:59:57 -0000 Author: avilla Date: Mon Dec 16 22:59:42 2013 New Revision: 336675 URL: http://svnweb.freebsd.org/changeset/ports/336675 Log: - Update Calligra Suite to 2.7.5. - Require a new compiler to build Calligra. - Make GTL really an option in Calligra. - STAGEify. - Use OPTIONS helpers. - Set NO_ARCH for translation ports. - Add translation port for Intelingua. Calligra 2.7 release notes: http://www.calligra.org/news/calligra-2-7-released Added: head/editors/calligra-l10n-ia/ head/editors/calligra-l10n-ia/Makefile (contents, props changed) head/editors/calligra-l10n-ia/distinfo (contents, props changed) head/editors/calligra-l10n-ia/pkg-descr (contents, props changed) head/editors/calligra-l10n-ia/pkg-plist (contents, props changed) head/editors/calligra/files/patch-krita__plugins__extensions__CMakeLists.txt (contents, props changed) Modified: head/Mk/bsd.kde4.mk head/chinese/calligra-l10n-zh_CN/Makefile head/chinese/calligra-l10n-zh_CN/distinfo head/chinese/calligra-l10n-zh_TW/Makefile head/chinese/calligra-l10n-zh_TW/distinfo head/editors/Makefile head/editors/calligra-l10n-bs/Makefile head/editors/calligra-l10n-bs/distinfo head/editors/calligra-l10n-bs/pkg-plist head/editors/calligra-l10n-ca/Makefile head/editors/calligra-l10n-ca/distinfo head/editors/calligra-l10n-ca/pkg-plist head/editors/calligra-l10n-ca_valencia/Makefile head/editors/calligra-l10n-ca_valencia/distinfo head/editors/calligra-l10n-ca_valencia/pkg-plist head/editors/calligra-l10n-cs/Makefile head/editors/calligra-l10n-cs/distinfo (contents, props changed) head/editors/calligra-l10n-cs/pkg-plist (contents, props changed) head/editors/calligra-l10n-da/Makefile head/editors/calligra-l10n-da/distinfo head/editors/calligra-l10n-da/pkg-plist head/editors/calligra-l10n-el/Makefile head/editors/calligra-l10n-el/distinfo head/editors/calligra-l10n-el/pkg-plist head/editors/calligra-l10n-en_GB/Makefile head/editors/calligra-l10n-en_GB/distinfo head/editors/calligra-l10n-es/Makefile head/editors/calligra-l10n-es/distinfo head/editors/calligra-l10n-es/pkg-plist head/editors/calligra-l10n-et/Makefile head/editors/calligra-l10n-et/distinfo head/editors/calligra-l10n-fi/Makefile head/editors/calligra-l10n-fi/distinfo head/editors/calligra-l10n-fi/pkg-plist head/editors/calligra-l10n-gl/Makefile head/editors/calligra-l10n-gl/distinfo head/editors/calligra-l10n-gl/pkg-plist head/editors/calligra-l10n-it/Makefile head/editors/calligra-l10n-it/distinfo head/editors/calligra-l10n-it/pkg-plist head/editors/calligra-l10n-kk/Makefile head/editors/calligra-l10n-kk/distinfo head/editors/calligra-l10n-kk/pkg-plist head/editors/calligra-l10n-nb/Makefile head/editors/calligra-l10n-nb/distinfo head/editors/calligra-l10n-nds/Makefile head/editors/calligra-l10n-nds/distinfo head/editors/calligra-l10n-nl/Makefile head/editors/calligra-l10n-nl/distinfo head/editors/calligra-l10n-nl/pkg-plist head/editors/calligra-l10n-sk/Makefile head/editors/calligra-l10n-sk/distinfo head/editors/calligra-l10n-sk/pkg-plist head/editors/calligra-l10n-sl/Makefile head/editors/calligra-l10n-sl/distinfo head/editors/calligra-l10n-sv/Makefile head/editors/calligra-l10n-sv/distinfo head/editors/calligra-l10n-sv/pkg-plist head/editors/calligra-l10n-tr/Makefile head/editors/calligra-l10n-tr/distinfo head/editors/calligra-l10n-tr/pkg-plist head/editors/calligra-l10n/Makefile head/editors/calligra-l10n/files/bsd.l10n.mk head/editors/calligra/Makefile head/editors/calligra/distinfo head/editors/calligra/pkg-plist head/french/calligra-l10n/Makefile head/french/calligra-l10n/distinfo head/french/calligra-l10n/pkg-plist head/german/calligra-l10n/Makefile head/german/calligra-l10n/distinfo head/german/calligra-l10n/pkg-plist head/hungarian/calligra-l10n/Makefile head/hungarian/calligra-l10n/distinfo head/hungarian/calligra-l10n/pkg-plist head/japanese/calligra-l10n/Makefile head/polish/calligra-l10n/Makefile head/polish/calligra-l10n/distinfo head/polish/calligra-l10n/pkg-plist head/portuguese/calligra-l10n-pt_BR/Makefile head/portuguese/calligra-l10n-pt_BR/distinfo head/portuguese/calligra-l10n-pt_BR/pkg-plist head/portuguese/calligra-l10n/Makefile head/portuguese/calligra-l10n/distinfo head/portuguese/calligra-l10n/pkg-plist head/russian/calligra-l10n/Makefile head/russian/calligra-l10n/distinfo head/ukrainian/calligra-l10n/Makefile head/ukrainian/calligra-l10n/distinfo head/ukrainian/calligra-l10n/pkg-plist Modified: head/Mk/bsd.kde4.mk ============================================================================== --- head/Mk/bsd.kde4.mk Mon Dec 16 22:13:36 2013 (r336674) +++ head/Mk/bsd.kde4.mk Mon Dec 16 22:59:42 2013 (r336675) @@ -78,7 +78,7 @@ KDE4_VERSION?= 4.10.5 KDE4_BRANCH?= stable KTP_VERSION?= 0.6.1 KTP_BRANCH?= stable -CALLIGRA_VERSION?= 2.6.2 +CALLIGRA_VERSION?= 2.7.5 CALLIGRA_BRANCH?= stable KDEVELOP_VERSION?= 4.5.2 KDEVELOP_BRANCH?= stable Modified: head/chinese/calligra-l10n-zh_CN/Makefile ============================================================================== --- head/chinese/calligra-l10n-zh_CN/Makefile Mon Dec 16 22:13:36 2013 (r336674) +++ head/chinese/calligra-l10n-zh_CN/Makefile Mon Dec 16 22:59:42 2013 (r336675) @@ -9,6 +9,5 @@ COMMENT= Simplified Chinese messages and CALLIGRA_L10N= zh_CN -NO_STAGE= yes .include "${.CURDIR}/../../editors/calligra-l10n/files/bsd.l10n.mk" .include Modified: head/chinese/calligra-l10n-zh_CN/distinfo ============================================================================== --- head/chinese/calligra-l10n-zh_CN/distinfo Mon Dec 16 22:13:36 2013 (r336674) +++ head/chinese/calligra-l10n-zh_CN/distinfo Mon Dec 16 22:59:42 2013 (r336675) @@ -1,2 +1,2 @@ -SHA256 (KDE/calligra-l10n/calligra-l10n-zh_CN-2.6.2.tar.bz2) = deafcf11e76ce1812934fa5177880b743afc03340a30c9d53b166e77bf4b974d -SIZE (KDE/calligra-l10n/calligra-l10n-zh_CN-2.6.2.tar.bz2) = 345120 +SHA256 (KDE/calligra-l10n/calligra-l10n-zh_CN-2.7.5.tar.xz) = 9075c4b2327712d8e1bd156bea54033058b6ea4c14aca4c4470ec2faf9cc5111 +SIZE (KDE/calligra-l10n/calligra-l10n-zh_CN-2.7.5.tar.xz) = 339240 Modified: head/chinese/calligra-l10n-zh_TW/Makefile ============================================================================== --- head/chinese/calligra-l10n-zh_TW/Makefile Mon Dec 16 22:13:36 2013 (r336674) +++ head/chinese/calligra-l10n-zh_TW/Makefile Mon Dec 16 22:59:42 2013 (r336675) @@ -9,6 +9,5 @@ COMMENT= Traditional Chinese messages an CALLIGRA_L10N= zh_TW -NO_STAGE= yes .include "${.CURDIR}/../../editors/calligra-l10n/files/bsd.l10n.mk" .include Modified: head/chinese/calligra-l10n-zh_TW/distinfo ============================================================================== --- head/chinese/calligra-l10n-zh_TW/distinfo Mon Dec 16 22:13:36 2013 (r336674) +++ head/chinese/calligra-l10n-zh_TW/distinfo Mon Dec 16 22:59:42 2013 (r336675) @@ -1,2 +1,2 @@ -SHA256 (KDE/calligra-l10n/calligra-l10n-zh_TW-2.6.2.tar.bz2) = 48ab372fdef7ea9b50f1f46681c735585c634a356540db2fb5e306d4bfe63e42 -SIZE (KDE/calligra-l10n/calligra-l10n-zh_TW-2.6.2.tar.bz2) = 380703 +SHA256 (KDE/calligra-l10n/calligra-l10n-zh_TW-2.7.5.tar.xz) = 7820f8d33cd4306d81d15c41189ffd493ec14b7b8d1c42c06c3df62ada9d5c32 +SIZE (KDE/calligra-l10n/calligra-l10n-zh_TW-2.7.5.tar.xz) = 376632 Modified: head/editors/Makefile ============================================================================== --- head/editors/Makefile Mon Dec 16 22:13:36 2013 (r336674) +++ head/editors/Makefile Mon Dec 16 22:59:42 2013 (r336675) @@ -33,6 +33,7 @@ SUBDIR += calligra-l10n-et SUBDIR += calligra-l10n-fi SUBDIR += calligra-l10n-gl + SUBDIR += calligra-l10n-ia SUBDIR += calligra-l10n-it SUBDIR += calligra-l10n-kk SUBDIR += calligra-l10n-nb Modified: head/editors/calligra-l10n-bs/Makefile ============================================================================== --- head/editors/calligra-l10n-bs/Makefile Mon Dec 16 22:13:36 2013 (r336674) +++ head/editors/calligra-l10n-bs/Makefile Mon Dec 16 22:59:42 2013 (r336675) @@ -9,6 +9,5 @@ COMMENT= Bosnian messages and documentat CALLIGRA_L10N= bs -NO_STAGE= yes .include "${.CURDIR}/../../editors/calligra-l10n/files/bsd.l10n.mk" .include Modified: head/editors/calligra-l10n-bs/distinfo ============================================================================== --- head/editors/calligra-l10n-bs/distinfo Mon Dec 16 22:13:36 2013 (r336674) +++ head/editors/calligra-l10n-bs/distinfo Mon Dec 16 22:59:42 2013 (r336675) @@ -1,2 +1,2 @@ -SHA256 (KDE/calligra-l10n/calligra-l10n-bs-2.6.2.tar.bz2) = 3348223feffb531137ddad4d815ff102bada721d7d7c3f9143c3a42a42b24f9e -SIZE (KDE/calligra-l10n/calligra-l10n-bs-2.6.2.tar.bz2) = 364422 +SHA256 (KDE/calligra-l10n/calligra-l10n-bs-2.7.5.tar.xz) = 46db4431af43278e31b9611e932f07f64d21a635caf0d2b23b1e650367056335 +SIZE (KDE/calligra-l10n/calligra-l10n-bs-2.7.5.tar.xz) = 354104 Modified: head/editors/calligra-l10n-bs/pkg-plist ============================================================================== --- head/editors/calligra-l10n-bs/pkg-plist Mon Dec 16 22:13:36 2013 (r336674) +++ head/editors/calligra-l10n-bs/pkg-plist Mon Dec 16 22:59:42 2013 (r336675) @@ -24,6 +24,7 @@ share/locale/bs/LC_MESSAGES/calligra-def share/locale/bs/LC_MESSAGES/calligra-dockers.mo share/locale/bs/LC_MESSAGES/calligra-opener.mo share/locale/bs/LC_MESSAGES/calligra.mo +share/locale/bs/LC_MESSAGES/calligraactive.mo share/locale/bs/LC_MESSAGES/calligrafilters.mo share/locale/bs/LC_MESSAGES/desktop_calligra.mo share/locale/bs/LC_MESSAGES/flow.mo @@ -50,6 +51,7 @@ share/locale/bs/LC_MESSAGES/planrcpsplug share/locale/bs/LC_MESSAGES/plantjplugin.mo share/locale/bs/LC_MESSAGES/planwork.mo share/locale/bs/LC_MESSAGES/sheets.mo +share/locale/bs/LC_MESSAGES/sheetspivottables_plugin.mo share/locale/bs/LC_MESSAGES/sheetssolver.mo share/locale/bs/LC_MESSAGES/stage.mo share/locale/bs/LC_MESSAGES/thesaurus_tool.mo Modified: head/editors/calligra-l10n-ca/Makefile ============================================================================== --- head/editors/calligra-l10n-ca/Makefile Mon Dec 16 22:13:36 2013 (r336674) +++ head/editors/calligra-l10n-ca/Makefile Mon Dec 16 22:59:42 2013 (r336675) @@ -9,6 +9,5 @@ COMMENT= Catalan messages and documentat CALLIGRA_L10N= ca -NO_STAGE= yes .include "${.CURDIR}/../../editors/calligra-l10n/files/bsd.l10n.mk" .include Modified: head/editors/calligra-l10n-ca/distinfo ============================================================================== --- head/editors/calligra-l10n-ca/distinfo Mon Dec 16 22:13:36 2013 (r336674) +++ head/editors/calligra-l10n-ca/distinfo Mon Dec 16 22:59:42 2013 (r336675) @@ -1,2 +1,2 @@ -SHA256 (KDE/calligra-l10n/calligra-l10n-ca-2.6.2.tar.bz2) = 87a138a8af0f0974db66c6998dee994efc2816678d73e40a5abe8878eced8420 -SIZE (KDE/calligra-l10n/calligra-l10n-ca-2.6.2.tar.bz2) = 378775 +SHA256 (KDE/calligra-l10n/calligra-l10n-ca-2.7.5.tar.xz) = 31df968406fab9a95e13c1502ed0be68e08043eba76fc47369bb1a957b7dee0e +SIZE (KDE/calligra-l10n/calligra-l10n-ca-2.7.5.tar.xz) = 356244 Modified: head/editors/calligra-l10n-ca/pkg-plist ============================================================================== --- head/editors/calligra-l10n-ca/pkg-plist Mon Dec 16 22:13:36 2013 (r336674) +++ head/editors/calligra-l10n-ca/pkg-plist Mon Dec 16 22:59:42 2013 (r336675) @@ -27,6 +27,7 @@ share/locale/ca/LC_MESSAGES/calligra-def share/locale/ca/LC_MESSAGES/calligra-dockers.mo share/locale/ca/LC_MESSAGES/calligra-opener.mo share/locale/ca/LC_MESSAGES/calligra.mo +share/locale/ca/LC_MESSAGES/calligraactive.mo share/locale/ca/LC_MESSAGES/calligrafilters.mo share/locale/ca/LC_MESSAGES/desktop_calligra.mo share/locale/ca/LC_MESSAGES/flow.mo @@ -53,6 +54,7 @@ share/locale/ca/LC_MESSAGES/planrcpsplug share/locale/ca/LC_MESSAGES/plantjplugin.mo share/locale/ca/LC_MESSAGES/planwork.mo share/locale/ca/LC_MESSAGES/sheets.mo +share/locale/ca/LC_MESSAGES/sheetspivottables_plugin.mo share/locale/ca/LC_MESSAGES/sheetssolver.mo share/locale/ca/LC_MESSAGES/stage.mo share/locale/ca/LC_MESSAGES/thesaurus_tool.mo Modified: head/editors/calligra-l10n-ca_valencia/Makefile ============================================================================== --- head/editors/calligra-l10n-ca_valencia/Makefile Mon Dec 16 22:13:36 2013 (r336674) +++ head/editors/calligra-l10n-ca_valencia/Makefile Mon Dec 16 22:59:42 2013 (r336675) @@ -9,6 +9,5 @@ COMMENT= Valencian (southern Catalan) me CALLIGRA_L10N= ca@valencia -NO_STAGE= yes .include "${.CURDIR}/../../editors/calligra-l10n/files/bsd.l10n.mk" .include Modified: head/editors/calligra-l10n-ca_valencia/distinfo ============================================================================== --- head/editors/calligra-l10n-ca_valencia/distinfo Mon Dec 16 22:13:36 2013 (r336674) +++ head/editors/calligra-l10n-ca_valencia/distinfo Mon Dec 16 22:59:42 2013 (r336675) @@ -1,2 +1,2 @@ -SHA256 (KDE/calligra-l10n/calligra-l10n-ca@valencia-2.6.2.tar.bz2) = 4133a793c2f1c16ce55fd7759cf386b02711fc70bf46c69f173afa94c2d32bc1 -SIZE (KDE/calligra-l10n/calligra-l10n-ca@valencia-2.6.2.tar.bz2) = 365593 +SHA256 (KDE/calligra-l10n/calligra-l10n-ca@valencia-2.7.5.tar.xz) = 17f8d4901beec2f6023f3c5ae47d746ed86fb64bcde080a96ad1b9363538e109 +SIZE (KDE/calligra-l10n/calligra-l10n-ca@valencia-2.7.5.tar.xz) = 245652 Modified: head/editors/calligra-l10n-ca_valencia/pkg-plist ============================================================================== --- head/editors/calligra-l10n-ca_valencia/pkg-plist Mon Dec 16 22:13:36 2013 (r336674) +++ head/editors/calligra-l10n-ca_valencia/pkg-plist Mon Dec 16 22:59:42 2013 (r336675) @@ -13,15 +13,12 @@ share/locale/ca@valencia/LC_MESSAGES/Pic share/locale/ca@valencia/LC_MESSAGES/PluginShape.mo share/locale/ca@valencia/LC_MESSAGES/SpellCheckPlugin.mo share/locale/ca@valencia/LC_MESSAGES/TableShape.mo -share/locale/ca@valencia/LC_MESSAGES/TemplateShape.mo share/locale/ca@valencia/LC_MESSAGES/TextShape.mo share/locale/ca@valencia/LC_MESSAGES/VariablesPlugin.mo share/locale/ca@valencia/LC_MESSAGES/VectorShape.mo share/locale/ca@valencia/LC_MESSAGES/VideoShape.mo -share/locale/ca@valencia/LC_MESSAGES/braindump.mo share/locale/ca@valencia/LC_MESSAGES/calligra-defaulttools.mo share/locale/ca@valencia/LC_MESSAGES/calligra-dockers.mo -share/locale/ca@valencia/LC_MESSAGES/calligra-opener.mo share/locale/ca@valencia/LC_MESSAGES/calligra.mo share/locale/ca@valencia/LC_MESSAGES/calligrafilters.mo share/locale/ca@valencia/LC_MESSAGES/desktop_calligra.mo @@ -29,27 +26,18 @@ share/locale/ca@valencia/LC_MESSAGES/flo share/locale/ca@valencia/LC_MESSAGES/googledocs_plugin.mo share/locale/ca@valencia/LC_MESSAGES/karbon.mo share/locale/ca@valencia/LC_MESSAGES/kexi.mo -share/locale/ca@valencia/LC_MESSAGES/kformdesigner_mapbrowser.mo -share/locale/ca@valencia/LC_MESSAGES/kformdesigner_webbrowser.mo share/locale/ca@valencia/LC_MESSAGES/kocolorspaces.mo share/locale/ca@valencia/LC_MESSAGES/koconverter.mo share/locale/ca@valencia/LC_MESSAGES/koproperty.mo share/locale/ca@valencia/LC_MESSAGES/koreport_barcodeplugin.mo share/locale/ca@valencia/LC_MESSAGES/koreport_chartplugin.mo -share/locale/ca@valencia/LC_MESSAGES/koreport_mapsplugin.mo -share/locale/ca@valencia/LC_MESSAGES/koreport_webplugin.mo share/locale/ca@valencia/LC_MESSAGES/krita.mo share/locale/ca@valencia/LC_MESSAGES/krossmoduleplan.mo -share/locale/ca@valencia/LC_MESSAGES/krossmodulesheets.mo share/locale/ca@valencia/LC_MESSAGES/krossmodulewords.mo -share/locale/ca@valencia/LC_MESSAGES/okularGenerator_odp.mo share/locale/ca@valencia/LC_MESSAGES/plan.mo share/locale/ca@valencia/LC_MESSAGES/planlibs.mo share/locale/ca@valencia/LC_MESSAGES/planrcpsplugin.mo -share/locale/ca@valencia/LC_MESSAGES/plantjplugin.mo share/locale/ca@valencia/LC_MESSAGES/planwork.mo -share/locale/ca@valencia/LC_MESSAGES/sheets.mo -share/locale/ca@valencia/LC_MESSAGES/sheetssolver.mo share/locale/ca@valencia/LC_MESSAGES/stage.mo share/locale/ca@valencia/LC_MESSAGES/thesaurus_tool.mo share/locale/ca@valencia/LC_MESSAGES/words.mo Modified: head/editors/calligra-l10n-cs/Makefile ============================================================================== --- head/editors/calligra-l10n-cs/Makefile Mon Dec 16 22:13:36 2013 (r336674) +++ head/editors/calligra-l10n-cs/Makefile Mon Dec 16 22:59:42 2013 (r336675) @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= calligra-l10n -PORTVERSION= 2.4.3 +PORTVERSION= ${CALLIGRA_VERSION} CATEGORIES= editors kde MAINTAINER= kde@FreeBSD.org @@ -9,6 +9,5 @@ COMMENT= Czech messages and documentatio CALLIGRA_L10N= cs -NO_STAGE= yes .include "${.CURDIR}/../../editors/calligra-l10n/files/bsd.l10n.mk" .include Modified: head/editors/calligra-l10n-cs/distinfo ============================================================================== --- head/editors/calligra-l10n-cs/distinfo Mon Dec 16 22:13:36 2013 (r336674) +++ head/editors/calligra-l10n-cs/distinfo Mon Dec 16 22:59:42 2013 (r336675) @@ -1,2 +1,2 @@ -SHA256 (KDE/calligra-l10n/calligra-l10n-cs-2.4.3.tar.bz2) = 72f20e8e00bdeb8bea77cc521bb6145213c9ef836bb5cea31c5677bb6d8d30bc -SIZE (KDE/calligra-l10n/calligra-l10n-cs-2.4.3.tar.bz2) = 348554 +SHA256 (KDE/calligra-l10n/calligra-l10n-cs-2.7.5.tar.xz) = 725be5cc171870755cb3fe5795c929c87749bad492a56f464315935fc6f2beba +SIZE (KDE/calligra-l10n/calligra-l10n-cs-2.7.5.tar.xz) = 297308 Modified: head/editors/calligra-l10n-cs/pkg-plist ============================================================================== --- head/editors/calligra-l10n-cs/pkg-plist Mon Dec 16 22:13:36 2013 (r336674) +++ head/editors/calligra-l10n-cs/pkg-plist Mon Dec 16 22:59:42 2013 (r336675) @@ -1,4 +1,3 @@ -share/apps/koffice/autocorrect/cs.xml share/locale/cs/LC_MESSAGES/ArtisticTextShape.mo share/locale/cs/LC_MESSAGES/AutocorrectPlugin.mo share/locale/cs/LC_MESSAGES/CalendarTool.mo @@ -6,19 +5,17 @@ share/locale/cs/LC_MESSAGES/ChangecasePl share/locale/cs/LC_MESSAGES/ChartShape.mo share/locale/cs/LC_MESSAGES/CommentShape.mo share/locale/cs/LC_MESSAGES/FormulaShape.mo -share/locale/cs/LC_MESSAGES/FreOffice.mo share/locale/cs/LC_MESSAGES/KarbonTools.mo share/locale/cs/LC_MESSAGES/KexiRelationDesignShapePlugin.mo -share/locale/cs/LC_MESSAGES/MapShape.mo share/locale/cs/LC_MESSAGES/MusicShape.mo -share/locale/cs/LC_MESSAGES/ParagraphTool.mo share/locale/cs/LC_MESSAGES/PathShapes.mo share/locale/cs/LC_MESSAGES/PictureShape.mo share/locale/cs/LC_MESSAGES/PluginShape.mo share/locale/cs/LC_MESSAGES/SpellCheckPlugin.mo share/locale/cs/LC_MESSAGES/TableShape.mo +share/locale/cs/LC_MESSAGES/TemplateShape.mo share/locale/cs/LC_MESSAGES/TextShape.mo -share/locale/cs/LC_MESSAGES/TreeShape.mo +share/locale/cs/LC_MESSAGES/ThreedShape.mo share/locale/cs/LC_MESSAGES/VariablesPlugin.mo share/locale/cs/LC_MESSAGES/VectorShape.mo share/locale/cs/LC_MESSAGES/VideoShape.mo @@ -27,6 +24,7 @@ share/locale/cs/LC_MESSAGES/calligra-def share/locale/cs/LC_MESSAGES/calligra-dockers.mo share/locale/cs/LC_MESSAGES/calligra-opener.mo share/locale/cs/LC_MESSAGES/calligra.mo +share/locale/cs/LC_MESSAGES/calligraactive.mo share/locale/cs/LC_MESSAGES/calligrafilters.mo share/locale/cs/LC_MESSAGES/desktop_calligra.mo share/locale/cs/LC_MESSAGES/flow.mo @@ -35,22 +33,17 @@ share/locale/cs/LC_MESSAGES/karbon.mo share/locale/cs/LC_MESSAGES/kexi.mo share/locale/cs/LC_MESSAGES/kformdesigner_mapbrowser.mo share/locale/cs/LC_MESSAGES/kformdesigner_webbrowser.mo -share/locale/cs/LC_MESSAGES/koabstraction.mo share/locale/cs/LC_MESSAGES/kocolorspaces.mo share/locale/cs/LC_MESSAGES/koconverter.mo share/locale/cs/LC_MESSAGES/koproperty.mo share/locale/cs/LC_MESSAGES/koreport_barcodeplugin.mo share/locale/cs/LC_MESSAGES/koreport_chartplugin.mo share/locale/cs/LC_MESSAGES/koreport_mapsplugin.mo -share/locale/cs/LC_MESSAGES/koreport_shapeplugin.mo share/locale/cs/LC_MESSAGES/koreport_webplugin.mo -share/locale/cs/LC_MESSAGES/kounavail.mo share/locale/cs/LC_MESSAGES/krita.mo share/locale/cs/LC_MESSAGES/krossmoduleplan.mo -share/locale/cs/LC_MESSAGES/krossmoduletables.mo +share/locale/cs/LC_MESSAGES/krossmodulesheets.mo share/locale/cs/LC_MESSAGES/krossmodulewords.mo -share/locale/cs/LC_MESSAGES/kscan_plugin.mo -share/locale/cs/LC_MESSAGES/kthesaurus.mo share/locale/cs/LC_MESSAGES/okularGenerator_odp.mo share/locale/cs/LC_MESSAGES/plan.mo share/locale/cs/LC_MESSAGES/planlibs.mo @@ -58,9 +51,8 @@ share/locale/cs/LC_MESSAGES/planrcpsplug share/locale/cs/LC_MESSAGES/plantjplugin.mo share/locale/cs/LC_MESSAGES/planwork.mo share/locale/cs/LC_MESSAGES/sheets.mo +share/locale/cs/LC_MESSAGES/sheetspivottables_plugin.mo +share/locale/cs/LC_MESSAGES/sheetssolver.mo share/locale/cs/LC_MESSAGES/stage.mo -share/locale/cs/LC_MESSAGES/tablessolver.mo share/locale/cs/LC_MESSAGES/thesaurus_tool.mo share/locale/cs/LC_MESSAGES/words.mo -@dirrmtry share/apps/koffice/autocorrect -@dirrmtry share/apps/koffice Modified: head/editors/calligra-l10n-da/Makefile ============================================================================== --- head/editors/calligra-l10n-da/Makefile Mon Dec 16 22:13:36 2013 (r336674) +++ head/editors/calligra-l10n-da/Makefile Mon Dec 16 22:59:42 2013 (r336675) @@ -9,6 +9,5 @@ COMMENT= Danish messages and documentati CALLIGRA_L10N= da -NO_STAGE= yes .include "${.CURDIR}/../../editors/calligra-l10n/files/bsd.l10n.mk" .include Modified: head/editors/calligra-l10n-da/distinfo ============================================================================== --- head/editors/calligra-l10n-da/distinfo Mon Dec 16 22:13:36 2013 (r336674) +++ head/editors/calligra-l10n-da/distinfo Mon Dec 16 22:59:42 2013 (r336675) @@ -1,2 +1,2 @@ -SHA256 (KDE/calligra-l10n/calligra-l10n-da-2.6.2.tar.bz2) = fd431c8ad80553b7e8685ed9c43e3a3f5876fc2bbc7de1ab581874d40cd4df88 -SIZE (KDE/calligra-l10n/calligra-l10n-da-2.6.2.tar.bz2) = 420249 +SHA256 (KDE/calligra-l10n/calligra-l10n-da-2.7.5.tar.xz) = ed88bc2dddeddc54a77e54b29d68cd0fdc71f6a7c563a75a54b5a8f9128d016b +SIZE (KDE/calligra-l10n/calligra-l10n-da-2.7.5.tar.xz) = 406264 Modified: head/editors/calligra-l10n-da/pkg-plist ============================================================================== --- head/editors/calligra-l10n-da/pkg-plist Mon Dec 16 22:13:36 2013 (r336674) +++ head/editors/calligra-l10n-da/pkg-plist Mon Dec 16 22:59:42 2013 (r336675) @@ -24,6 +24,7 @@ share/locale/da/LC_MESSAGES/calligra-def share/locale/da/LC_MESSAGES/calligra-dockers.mo share/locale/da/LC_MESSAGES/calligra-opener.mo share/locale/da/LC_MESSAGES/calligra.mo +share/locale/da/LC_MESSAGES/calligraactive.mo share/locale/da/LC_MESSAGES/calligrafilters.mo share/locale/da/LC_MESSAGES/desktop_calligra.mo share/locale/da/LC_MESSAGES/flow.mo @@ -50,6 +51,7 @@ share/locale/da/LC_MESSAGES/planrcpsplug share/locale/da/LC_MESSAGES/plantjplugin.mo share/locale/da/LC_MESSAGES/planwork.mo share/locale/da/LC_MESSAGES/sheets.mo +share/locale/da/LC_MESSAGES/sheetspivottables_plugin.mo share/locale/da/LC_MESSAGES/sheetssolver.mo share/locale/da/LC_MESSAGES/stage.mo share/locale/da/LC_MESSAGES/thesaurus_tool.mo Modified: head/editors/calligra-l10n-el/Makefile ============================================================================== --- head/editors/calligra-l10n-el/Makefile Mon Dec 16 22:13:36 2013 (r336674) +++ head/editors/calligra-l10n-el/Makefile Mon Dec 16 22:59:42 2013 (r336675) @@ -9,6 +9,5 @@ COMMENT= Modern Greek messages and docum CALLIGRA_L10N= el -NO_STAGE= yes .include "${.CURDIR}/../../editors/calligra-l10n/files/bsd.l10n.mk" .include Modified: head/editors/calligra-l10n-el/distinfo ============================================================================== --- head/editors/calligra-l10n-el/distinfo Mon Dec 16 22:13:36 2013 (r336674) +++ head/editors/calligra-l10n-el/distinfo Mon Dec 16 22:59:42 2013 (r336675) @@ -1,2 +1,2 @@ -SHA256 (KDE/calligra-l10n/calligra-l10n-el-2.6.2.tar.bz2) = 1fb9fbed8e1a653733b380d48e34512688235194f7a86c569b13ce357b55b75a -SIZE (KDE/calligra-l10n/calligra-l10n-el-2.6.2.tar.bz2) = 410391 +SHA256 (KDE/calligra-l10n/calligra-l10n-el-2.7.5.tar.xz) = 9067ca686066c97a4be29038c9aad10347b6f5bdeac683cd080d25db7fcbc03d +SIZE (KDE/calligra-l10n/calligra-l10n-el-2.7.5.tar.xz) = 415196 Modified: head/editors/calligra-l10n-el/pkg-plist ============================================================================== --- head/editors/calligra-l10n-el/pkg-plist Mon Dec 16 22:13:36 2013 (r336674) +++ head/editors/calligra-l10n-el/pkg-plist Mon Dec 16 22:59:42 2013 (r336675) @@ -24,6 +24,7 @@ share/locale/el/LC_MESSAGES/calligra-def share/locale/el/LC_MESSAGES/calligra-dockers.mo share/locale/el/LC_MESSAGES/calligra-opener.mo share/locale/el/LC_MESSAGES/calligra.mo +share/locale/el/LC_MESSAGES/calligraactive.mo share/locale/el/LC_MESSAGES/calligrafilters.mo share/locale/el/LC_MESSAGES/desktop_calligra.mo share/locale/el/LC_MESSAGES/flow.mo @@ -50,6 +51,7 @@ share/locale/el/LC_MESSAGES/planrcpsplug share/locale/el/LC_MESSAGES/plantjplugin.mo share/locale/el/LC_MESSAGES/planwork.mo share/locale/el/LC_MESSAGES/sheets.mo +share/locale/el/LC_MESSAGES/sheetspivottables_plugin.mo share/locale/el/LC_MESSAGES/sheetssolver.mo share/locale/el/LC_MESSAGES/stage.mo share/locale/el/LC_MESSAGES/thesaurus_tool.mo Modified: head/editors/calligra-l10n-en_GB/Makefile ============================================================================== --- head/editors/calligra-l10n-en_GB/Makefile Mon Dec 16 22:13:36 2013 (r336674) +++ head/editors/calligra-l10n-en_GB/Makefile Mon Dec 16 22:59:42 2013 (r336675) @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= calligra-l10n -PORTVERSION= ${CALLIGRA_VERSION} +PORTVERSION= 2.6.4 CATEGORIES= editors kde MAINTAINER= kde@FreeBSD.org @@ -9,6 +9,7 @@ COMMENT= British messages and documentat CALLIGRA_L10N= en_GB -NO_STAGE= yes +USE_BZIP2= yes + .include "${.CURDIR}/../../editors/calligra-l10n/files/bsd.l10n.mk" .include Modified: head/editors/calligra-l10n-en_GB/distinfo ============================================================================== --- head/editors/calligra-l10n-en_GB/distinfo Mon Dec 16 22:13:36 2013 (r336674) +++ head/editors/calligra-l10n-en_GB/distinfo Mon Dec 16 22:59:42 2013 (r336675) @@ -1,2 +1,2 @@ -SHA256 (KDE/calligra-l10n/calligra-l10n-en_GB-2.6.2.tar.bz2) = 9b5b5007ba42ec506928aff919eebdead05e09f4eeb43421f771ab907ec61f26 -SIZE (KDE/calligra-l10n/calligra-l10n-en_GB-2.6.2.tar.bz2) = 384825 +SHA256 (KDE/calligra-l10n/calligra-l10n-en_GB-2.6.4.tar.bz2) = 6a12efe96318ed1df18567b179d24167731fe0571a0ffa5f5d2b41336a82e148 +SIZE (KDE/calligra-l10n/calligra-l10n-en_GB-2.6.4.tar.bz2) = 382706 Modified: head/editors/calligra-l10n-es/Makefile ============================================================================== --- head/editors/calligra-l10n-es/Makefile Mon Dec 16 22:13:36 2013 (r336674) +++ head/editors/calligra-l10n-es/Makefile Mon Dec 16 22:59:42 2013 (r336675) @@ -9,6 +9,5 @@ COMMENT= Spanish messages and documentat CALLIGRA_L10N= es -NO_STAGE= yes .include "${.CURDIR}/../../editors/calligra-l10n/files/bsd.l10n.mk" .include Modified: head/editors/calligra-l10n-es/distinfo ============================================================================== --- head/editors/calligra-l10n-es/distinfo Mon Dec 16 22:13:36 2013 (r336674) +++ head/editors/calligra-l10n-es/distinfo Mon Dec 16 22:59:42 2013 (r336675) @@ -1,2 +1,2 @@ -SHA256 (KDE/calligra-l10n/calligra-l10n-es-2.6.2.tar.bz2) = 20c986cfbb21f2fffb9aebb24f13ac2f4b8c4e7e61a436c4a06a12ec0307775a -SIZE (KDE/calligra-l10n/calligra-l10n-es-2.6.2.tar.bz2) = 1044879 +SHA256 (KDE/calligra-l10n/calligra-l10n-es-2.7.5.tar.xz) = aff8fc514946825eb608144d91811c8a851e9f971b722cfa223ea0d03efdc889 +SIZE (KDE/calligra-l10n/calligra-l10n-es-2.7.5.tar.xz) = 1012548 Modified: head/editors/calligra-l10n-es/pkg-plist ============================================================================== --- head/editors/calligra-l10n-es/pkg-plist Mon Dec 16 22:13:36 2013 (r336674) +++ head/editors/calligra-l10n-es/pkg-plist Mon Dec 16 22:59:42 2013 (r336675) @@ -1,6 +1,14 @@ share/doc/HTML/es/calligra/common share/doc/HTML/es/calligra/index.cache.bz2 share/doc/HTML/es/calligra/index.docbook +share/doc/HTML/es/stage/common +share/doc/HTML/es/stage/great-presentations.docbook +share/doc/HTML/es/stage/guides.docbook +share/doc/HTML/es/stage/index.cache.bz2 +share/doc/HTML/es/stage/index.docbook +share/doc/HTML/es/stage/menus.docbook +share/doc/HTML/es/stage/options.docbook +share/doc/HTML/es/stage/tutorial.docbook share/locale/es/LC_MESSAGES/ArtisticTextShape.mo share/locale/es/LC_MESSAGES/AutocorrectPlugin.mo share/locale/es/LC_MESSAGES/CalendarTool.mo @@ -27,6 +35,7 @@ share/locale/es/LC_MESSAGES/calligra-def share/locale/es/LC_MESSAGES/calligra-dockers.mo share/locale/es/LC_MESSAGES/calligra-opener.mo share/locale/es/LC_MESSAGES/calligra.mo +share/locale/es/LC_MESSAGES/calligraactive.mo share/locale/es/LC_MESSAGES/calligrafilters.mo share/locale/es/LC_MESSAGES/desktop_calligra.mo share/locale/es/LC_MESSAGES/flow.mo @@ -53,8 +62,10 @@ share/locale/es/LC_MESSAGES/planrcpsplug share/locale/es/LC_MESSAGES/plantjplugin.mo share/locale/es/LC_MESSAGES/planwork.mo share/locale/es/LC_MESSAGES/sheets.mo +share/locale/es/LC_MESSAGES/sheetspivottables_plugin.mo share/locale/es/LC_MESSAGES/sheetssolver.mo share/locale/es/LC_MESSAGES/stage.mo share/locale/es/LC_MESSAGES/thesaurus_tool.mo share/locale/es/LC_MESSAGES/words.mo +@dirrm share/doc/HTML/es/stage @dirrm share/doc/HTML/es/calligra Modified: head/editors/calligra-l10n-et/Makefile ============================================================================== --- head/editors/calligra-l10n-et/Makefile Mon Dec 16 22:13:36 2013 (r336674) +++ head/editors/calligra-l10n-et/Makefile Mon Dec 16 22:59:42 2013 (r336675) @@ -9,6 +9,5 @@ COMMENT= Estonian messages and documenta CALLIGRA_L10N= et -NO_STAGE= yes .include "${.CURDIR}/../../editors/calligra-l10n/files/bsd.l10n.mk" .include Modified: head/editors/calligra-l10n-et/distinfo ============================================================================== --- head/editors/calligra-l10n-et/distinfo Mon Dec 16 22:13:36 2013 (r336674) +++ head/editors/calligra-l10n-et/distinfo Mon Dec 16 22:59:42 2013 (r336675) @@ -1,2 +1,2 @@ -SHA256 (KDE/calligra-l10n/calligra-l10n-et-2.6.2.tar.bz2) = 6cb0c7ddd97a18e2b749753a86816eadb94706de3d9641bb38d1668c69b5f279 -SIZE (KDE/calligra-l10n/calligra-l10n-et-2.6.2.tar.bz2) = 781074 +SHA256 (KDE/calligra-l10n/calligra-l10n-et-2.7.5.tar.xz) = 9eb87b61a516e09a22bffabc3bd5cbb0ba068c0d3bd6450d46e4dc69b8295106 +SIZE (KDE/calligra-l10n/calligra-l10n-et-2.7.5.tar.xz) = 730816 Modified: head/editors/calligra-l10n-fi/Makefile ============================================================================== --- head/editors/calligra-l10n-fi/Makefile Mon Dec 16 22:13:36 2013 (r336674) +++ head/editors/calligra-l10n-fi/Makefile Mon Dec 16 22:59:42 2013 (r336675) @@ -9,6 +9,5 @@ COMMENT= Finnish messages and documentat CALLIGRA_L10N= fi -NO_STAGE= yes .include "${.CURDIR}/../../editors/calligra-l10n/files/bsd.l10n.mk" .include Modified: head/editors/calligra-l10n-fi/distinfo ============================================================================== --- head/editors/calligra-l10n-fi/distinfo Mon Dec 16 22:13:36 2013 (r336674) +++ head/editors/calligra-l10n-fi/distinfo Mon Dec 16 22:59:42 2013 (r336675) @@ -1,2 +1,2 @@ -SHA256 (KDE/calligra-l10n/calligra-l10n-fi-2.6.2.tar.bz2) = 20bf37975c416002e1fe59d7de821de04286b05a01d3a896a817bcba2df979e5 -SIZE (KDE/calligra-l10n/calligra-l10n-fi-2.6.2.tar.bz2) = 397944 +SHA256 (KDE/calligra-l10n/calligra-l10n-fi-2.7.5.tar.xz) = 5cbe5dd8a20a1d887fc4eecccffa568cf9ce4032b92b58772eeaa72d552a4127 +SIZE (KDE/calligra-l10n/calligra-l10n-fi-2.7.5.tar.xz) = 386708 Modified: head/editors/calligra-l10n-fi/pkg-plist ============================================================================== --- head/editors/calligra-l10n-fi/pkg-plist Mon Dec 16 22:13:36 2013 (r336674) +++ head/editors/calligra-l10n-fi/pkg-plist Mon Dec 16 22:59:42 2013 (r336675) @@ -24,6 +24,7 @@ share/locale/fi/LC_MESSAGES/calligra-def share/locale/fi/LC_MESSAGES/calligra-dockers.mo share/locale/fi/LC_MESSAGES/calligra-opener.mo share/locale/fi/LC_MESSAGES/calligra.mo +share/locale/fi/LC_MESSAGES/calligraactive.mo share/locale/fi/LC_MESSAGES/calligrafilters.mo share/locale/fi/LC_MESSAGES/desktop_calligra.mo share/locale/fi/LC_MESSAGES/flow.mo Modified: head/editors/calligra-l10n-gl/Makefile ============================================================================== --- head/editors/calligra-l10n-gl/Makefile Mon Dec 16 22:13:36 2013 (r336674) +++ head/editors/calligra-l10n-gl/Makefile Mon Dec 16 22:59:42 2013 (r336675) @@ -9,6 +9,5 @@ COMMENT= Gallegan messages and documenta CALLIGRA_L10N= gl -NO_STAGE= yes .include "${.CURDIR}/../../editors/calligra-l10n/files/bsd.l10n.mk" .include Modified: head/editors/calligra-l10n-gl/distinfo ============================================================================== --- head/editors/calligra-l10n-gl/distinfo Mon Dec 16 22:13:36 2013 (r336674) +++ head/editors/calligra-l10n-gl/distinfo Mon Dec 16 22:59:42 2013 (r336675) @@ -1,2 +1,2 @@ -SHA256 (KDE/calligra-l10n/calligra-l10n-gl-2.6.2.tar.bz2) = 713cfb70f56e26602ec842366107486faf975624a9e50a58fd29107a8263a1bf -SIZE (KDE/calligra-l10n/calligra-l10n-gl-2.6.2.tar.bz2) = 379282 +SHA256 (KDE/calligra-l10n/calligra-l10n-gl-2.7.5.tar.xz) = 78da8b0cbf09150ec77ee58de4b32b72fda75e5ab98251451b8fc7dc320f57dd +SIZE (KDE/calligra-l10n/calligra-l10n-gl-2.7.5.tar.xz) = 368316 Modified: head/editors/calligra-l10n-gl/pkg-plist ============================================================================== --- head/editors/calligra-l10n-gl/pkg-plist Mon Dec 16 22:13:36 2013 (r336674) +++ head/editors/calligra-l10n-gl/pkg-plist Mon Dec 16 22:59:42 2013 (r336675) @@ -24,6 +24,7 @@ share/locale/gl/LC_MESSAGES/calligra-def share/locale/gl/LC_MESSAGES/calligra-dockers.mo share/locale/gl/LC_MESSAGES/calligra-opener.mo share/locale/gl/LC_MESSAGES/calligra.mo +share/locale/gl/LC_MESSAGES/calligraactive.mo share/locale/gl/LC_MESSAGES/calligrafilters.mo share/locale/gl/LC_MESSAGES/desktop_calligra.mo share/locale/gl/LC_MESSAGES/flow.mo @@ -50,6 +51,7 @@ share/locale/gl/LC_MESSAGES/planrcpsplug share/locale/gl/LC_MESSAGES/plantjplugin.mo share/locale/gl/LC_MESSAGES/planwork.mo share/locale/gl/LC_MESSAGES/sheets.mo +share/locale/gl/LC_MESSAGES/sheetspivottables_plugin.mo share/locale/gl/LC_MESSAGES/sheetssolver.mo share/locale/gl/LC_MESSAGES/stage.mo share/locale/gl/LC_MESSAGES/thesaurus_tool.mo Added: head/editors/calligra-l10n-ia/Makefile ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/editors/calligra-l10n-ia/Makefile Mon Dec 16 22:59:42 2013 (r336675) @@ -0,0 +1,13 @@ +# $FreeBSD$ + +PORTNAME= calligra-l10n +PORTVERSION= ${CALLIGRA_VERSION} +CATEGORIES= editors kde + +MAINTAINER= kde@FreeBSD.org +COMMENT= Interlingua messages and documentation for Calligra + +CALLIGRA_L10N= ia + +.include "${.CURDIR}/../../editors/calligra-l10n/files/bsd.l10n.mk" +.include Added: head/editors/calligra-l10n-ia/distinfo ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/editors/calligra-l10n-ia/distinfo Mon Dec 16 22:59:42 2013 (r336675) @@ -0,0 +1,2 @@ +SHA256 (KDE/calligra-l10n/calligra-l10n-ia-2.7.5.tar.xz) = 95b2e21c986ad243c018e6cf162cc12053e508f8e8808f412c3a009aa382e9e8 +SIZE (KDE/calligra-l10n/calligra-l10n-ia-2.7.5.tar.xz) = 251356 Added: head/editors/calligra-l10n-ia/pkg-descr ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/editors/calligra-l10n-ia/pkg-descr Mon Dec 16 22:59:42 2013 (r336675) @@ -0,0 +1,3 @@ +Localized messages and documentation for Calligra. + +WWW: http://calligra.org Added: head/editors/calligra-l10n-ia/pkg-plist ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/editors/calligra-l10n-ia/pkg-plist Mon Dec 16 22:59:42 2013 (r336675) @@ -0,0 +1,60 @@ +share/locale/ia/LC_MESSAGES/ArtisticTextShape.mo +share/locale/ia/LC_MESSAGES/AutocorrectPlugin.mo +share/locale/ia/LC_MESSAGES/CalendarTool.mo +share/locale/ia/LC_MESSAGES/ChangecasePlugin.mo +share/locale/ia/LC_MESSAGES/ChartShape.mo +share/locale/ia/LC_MESSAGES/CommentShape.mo +share/locale/ia/LC_MESSAGES/FormulaShape.mo +share/locale/ia/LC_MESSAGES/KarbonTools.mo +share/locale/ia/LC_MESSAGES/KexiRelationDesignShapePlugin.mo +share/locale/ia/LC_MESSAGES/MusicShape.mo +share/locale/ia/LC_MESSAGES/PathShapes.mo +share/locale/ia/LC_MESSAGES/PictureShape.mo +share/locale/ia/LC_MESSAGES/PluginShape.mo +share/locale/ia/LC_MESSAGES/SpellCheckPlugin.mo +share/locale/ia/LC_MESSAGES/TableShape.mo +share/locale/ia/LC_MESSAGES/TemplateShape.mo +share/locale/ia/LC_MESSAGES/TextShape.mo +share/locale/ia/LC_MESSAGES/ThreedShape.mo +share/locale/ia/LC_MESSAGES/VariablesPlugin.mo +share/locale/ia/LC_MESSAGES/VectorShape.mo +share/locale/ia/LC_MESSAGES/VideoShape.mo +share/locale/ia/LC_MESSAGES/braindump.mo +share/locale/ia/LC_MESSAGES/calligra-defaulttools.mo +share/locale/ia/LC_MESSAGES/calligra-dockers.mo +share/locale/ia/LC_MESSAGES/calligra-opener.mo +share/locale/ia/LC_MESSAGES/calligra.mo +share/locale/ia/LC_MESSAGES/calligraactive.mo +share/locale/ia/LC_MESSAGES/calligrafilters.mo +share/locale/ia/LC_MESSAGES/desktop_calligra.mo +share/locale/ia/LC_MESSAGES/flow.mo +share/locale/ia/LC_MESSAGES/googledocs_plugin.mo +share/locale/ia/LC_MESSAGES/karbon.mo +share/locale/ia/LC_MESSAGES/kexi.mo +share/locale/ia/LC_MESSAGES/kformdesigner_mapbrowser.mo +share/locale/ia/LC_MESSAGES/kformdesigner_webbrowser.mo +share/locale/ia/LC_MESSAGES/kocolorspaces.mo +share/locale/ia/LC_MESSAGES/koconverter.mo +share/locale/ia/LC_MESSAGES/koproperty.mo +share/locale/ia/LC_MESSAGES/koreport_barcodeplugin.mo +share/locale/ia/LC_MESSAGES/koreport_chartplugin.mo +share/locale/ia/LC_MESSAGES/koreport_mapsplugin.mo +share/locale/ia/LC_MESSAGES/koreport_webplugin.mo +share/locale/ia/LC_MESSAGES/krita.mo +share/locale/ia/LC_MESSAGES/krossmoduleplan.mo +share/locale/ia/LC_MESSAGES/krossmodulesheets.mo +share/locale/ia/LC_MESSAGES/krossmodulewords.mo +share/locale/ia/LC_MESSAGES/okularGenerator_odp.mo +share/locale/ia/LC_MESSAGES/plan.mo +share/locale/ia/LC_MESSAGES/planlibs.mo +share/locale/ia/LC_MESSAGES/planrcpsplugin.mo +share/locale/ia/LC_MESSAGES/plantjplugin.mo +share/locale/ia/LC_MESSAGES/planwork.mo +share/locale/ia/LC_MESSAGES/sheets.mo +share/locale/ia/LC_MESSAGES/sheetspivottables_plugin.mo +share/locale/ia/LC_MESSAGES/sheetssolver.mo +share/locale/ia/LC_MESSAGES/stage.mo +share/locale/ia/LC_MESSAGES/thesaurus_tool.mo +share/locale/ia/LC_MESSAGES/words.mo +@dirrm share/locale/ia/LC_MESSAGES +@dirrm share/locale/ia Modified: head/editors/calligra-l10n-it/Makefile ============================================================================== --- head/editors/calligra-l10n-it/Makefile Mon Dec 16 22:13:36 2013 (r336674) +++ head/editors/calligra-l10n-it/Makefile Mon Dec 16 22:59:42 2013 (r336675) @@ -9,6 +9,5 @@ COMMENT= Italian messages and documentat CALLIGRA_L10N= it -NO_STAGE= yes .include "${.CURDIR}/../../editors/calligra-l10n/files/bsd.l10n.mk" .include Modified: head/editors/calligra-l10n-it/distinfo ============================================================================== --- head/editors/calligra-l10n-it/distinfo Mon Dec 16 22:13:36 2013 (r336674) +++ head/editors/calligra-l10n-it/distinfo Mon Dec 16 22:59:42 2013 (r336675) @@ -1,2 +1,2 @@ -SHA256 (KDE/calligra-l10n/calligra-l10n-it-2.6.2.tar.bz2) = 38b784be2c2dcb144b3c7b236497511c1419f7a74551d636339158ce28128ff9 -SIZE (KDE/calligra-l10n/calligra-l10n-it-2.6.2.tar.bz2) = 744289 +SHA256 (KDE/calligra-l10n/calligra-l10n-it-2.7.5.tar.xz) = a46ebf6b0fd7af5b1f0772e7bc99fbb40d5167469bfe345a3eb64953017e264c +SIZE (KDE/calligra-l10n/calligra-l10n-it-2.7.5.tar.xz) = 700152 Modified: head/editors/calligra-l10n-it/pkg-plist ============================================================================== --- head/editors/calligra-l10n-it/pkg-plist Mon Dec 16 22:13:36 2013 (r336674) +++ head/editors/calligra-l10n-it/pkg-plist Mon Dec 16 22:59:42 2013 (r336675) @@ -48,6 +48,7 @@ share/locale/it/LC_MESSAGES/calligra-def share/locale/it/LC_MESSAGES/calligra-dockers.mo share/locale/it/LC_MESSAGES/calligra-opener.mo share/locale/it/LC_MESSAGES/calligra.mo +share/locale/it/LC_MESSAGES/calligraactive.mo share/locale/it/LC_MESSAGES/calligrafilters.mo share/locale/it/LC_MESSAGES/desktop_calligra.mo share/locale/it/LC_MESSAGES/flow.mo @@ -74,6 +75,7 @@ share/locale/it/LC_MESSAGES/planrcpsplug share/locale/it/LC_MESSAGES/plantjplugin.mo share/locale/it/LC_MESSAGES/planwork.mo share/locale/it/LC_MESSAGES/sheets.mo +share/locale/it/LC_MESSAGES/sheetspivottables_plugin.mo share/locale/it/LC_MESSAGES/sheetssolver.mo share/locale/it/LC_MESSAGES/stage.mo share/locale/it/LC_MESSAGES/thesaurus_tool.mo Modified: head/editors/calligra-l10n-kk/Makefile ============================================================================== --- head/editors/calligra-l10n-kk/Makefile Mon Dec 16 22:13:36 2013 (r336674) +++ head/editors/calligra-l10n-kk/Makefile Mon Dec 16 22:59:42 2013 (r336675) @@ -9,6 +9,5 @@ COMMENT= Kazakh messages and documentati CALLIGRA_L10N= kk -NO_STAGE= yes .include "${.CURDIR}/../../editors/calligra-l10n/files/bsd.l10n.mk" .include Modified: head/editors/calligra-l10n-kk/distinfo ============================================================================== --- head/editors/calligra-l10n-kk/distinfo Mon Dec 16 22:13:36 2013 (r336674) +++ head/editors/calligra-l10n-kk/distinfo Mon Dec 16 22:59:42 2013 (r336675) @@ -1,2 +1,2 @@ -SHA256 (KDE/calligra-l10n/calligra-l10n-kk-2.6.2.tar.bz2) = 9bb68a51f3a68ac7ff3be8a8d926838a3d7fbe3b9c7055db8a2b653eb99448e4 -SIZE (KDE/calligra-l10n/calligra-l10n-kk-2.6.2.tar.bz2) = 401789 +SHA256 (KDE/calligra-l10n/calligra-l10n-kk-2.7.5.tar.xz) = 8ea85661552566f3136491ac6c28473a3aab54930620285f49653a044d33f7f3 +SIZE (KDE/calligra-l10n/calligra-l10n-kk-2.7.5.tar.xz) = 403868 Modified: head/editors/calligra-l10n-kk/pkg-plist ============================================================================== --- head/editors/calligra-l10n-kk/pkg-plist Mon Dec 16 22:13:36 2013 (r336674) +++ head/editors/calligra-l10n-kk/pkg-plist Mon Dec 16 22:59:42 2013 (r336675) @@ -24,6 +24,7 @@ share/locale/kk/LC_MESSAGES/calligra-def share/locale/kk/LC_MESSAGES/calligra-dockers.mo share/locale/kk/LC_MESSAGES/calligra-opener.mo share/locale/kk/LC_MESSAGES/calligra.mo +share/locale/kk/LC_MESSAGES/calligraactive.mo share/locale/kk/LC_MESSAGES/calligrafilters.mo share/locale/kk/LC_MESSAGES/desktop_calligra.mo share/locale/kk/LC_MESSAGES/flow.mo @@ -50,6 +51,7 @@ share/locale/kk/LC_MESSAGES/planrcpsplug share/locale/kk/LC_MESSAGES/plantjplugin.mo share/locale/kk/LC_MESSAGES/planwork.mo share/locale/kk/LC_MESSAGES/sheets.mo +share/locale/kk/LC_MESSAGES/sheetspivottables_plugin.mo share/locale/kk/LC_MESSAGES/sheetssolver.mo share/locale/kk/LC_MESSAGES/stage.mo share/locale/kk/LC_MESSAGES/thesaurus_tool.mo Modified: head/editors/calligra-l10n-nb/Makefile ============================================================================== --- head/editors/calligra-l10n-nb/Makefile Mon Dec 16 22:13:36 2013 (r336674) +++ head/editors/calligra-l10n-nb/Makefile Mon Dec 16 22:59:42 2013 (r336675) @@ -9,6 +9,5 @@ COMMENT= Norwegian Bokmaal messages and CALLIGRA_L10N= nb -NO_STAGE= yes .include "${.CURDIR}/../../editors/calligra-l10n/files/bsd.l10n.mk" .include Modified: head/editors/calligra-l10n-nb/distinfo ============================================================================== --- head/editors/calligra-l10n-nb/distinfo Mon Dec 16 22:13:36 2013 (r336674) +++ head/editors/calligra-l10n-nb/distinfo Mon Dec 16 22:59:42 2013 (r336675) @@ -1,2 +1,2 @@ -SHA256 (KDE/calligra-l10n/calligra-l10n-nb-2.6.2.tar.bz2) = 9558a5683d90cb4fef5d74450814c94de8657f3078e3343508aaa37c31496a01 -SIZE (KDE/calligra-l10n/calligra-l10n-nb-2.6.2.tar.bz2) = 354909 +SHA256 (KDE/calligra-l10n/calligra-l10n-nb-2.7.5.tar.xz) = 44b647be6ad576baaeb93926db2475b6378f2361cabafc476717094a35a9497a +SIZE (KDE/calligra-l10n/calligra-l10n-nb-2.7.5.tar.xz) = 338092 Modified: head/editors/calligra-l10n-nds/Makefile ============================================================================== --- head/editors/calligra-l10n-nds/Makefile Mon Dec 16 22:13:36 2013 (r336674) +++ head/editors/calligra-l10n-nds/Makefile Mon Dec 16 22:59:42 2013 (r336675) @@ -9,6 +9,5 @@ COMMENT= Low German messages and documen CALLIGRA_L10N= nds -NO_STAGE= yes .include "${.CURDIR}/../../editors/calligra-l10n/files/bsd.l10n.mk" .include Modified: head/editors/calligra-l10n-nds/distinfo ============================================================================== --- head/editors/calligra-l10n-nds/distinfo Mon Dec 16 22:13:36 2013 (r336674) +++ head/editors/calligra-l10n-nds/distinfo Mon Dec 16 22:59:42 2013 (r336675) @@ -1,2 +1,2 @@ -SHA256 (KDE/calligra-l10n/calligra-l10n-nds-2.6.2.tar.bz2) = f5f9917ad9d2e2fcf1f7ae194f816138e73dd15c205c0678181e97913ee17cc1 -SIZE (KDE/calligra-l10n/calligra-l10n-nds-2.6.2.tar.bz2) = 401186 +SHA256 (KDE/calligra-l10n/calligra-l10n-nds-2.7.5.tar.xz) = b9947e65973c19e125c131c1d4c0b8952a9e5b0cd9b9e68ea6f17c4f2c55652b +SIZE (KDE/calligra-l10n/calligra-l10n-nds-2.7.5.tar.xz) = 388840 Modified: head/editors/calligra-l10n-nl/Makefile ============================================================================== --- head/editors/calligra-l10n-nl/Makefile Mon Dec 16 22:13:36 2013 (r336674) +++ head/editors/calligra-l10n-nl/Makefile Mon Dec 16 22:59:42 2013 (r336675) @@ -9,6 +9,5 @@ COMMENT= Dutch messages and documentatio CALLIGRA_L10N= nl -NO_STAGE= yes .include "${.CURDIR}/../../editors/calligra-l10n/files/bsd.l10n.mk" .include Modified: head/editors/calligra-l10n-nl/distinfo ============================================================================== --- head/editors/calligra-l10n-nl/distinfo Mon Dec 16 22:13:36 2013 (r336674) +++ head/editors/calligra-l10n-nl/distinfo Mon Dec 16 22:59:42 2013 (r336675) @@ -1,2 +1,2 @@ -SHA256 (KDE/calligra-l10n/calligra-l10n-nl-2.6.2.tar.bz2) = 10ecfd4ff3f6ae0d556fb3e890c3ec26cbf469cae79de01292003b4bb6862ed1 -SIZE (KDE/calligra-l10n/calligra-l10n-nl-2.6.2.tar.bz2) = 1628895 +SHA256 (KDE/calligra-l10n/calligra-l10n-nl-2.7.5.tar.xz) = 3598e9753787baef83698a710bdbccef60c9a18907766acc0afb041df60c2e2a +SIZE (KDE/calligra-l10n/calligra-l10n-nl-2.7.5.tar.xz) = 1535316 Modified: head/editors/calligra-l10n-nl/pkg-plist ============================================================================== --- head/editors/calligra-l10n-nl/pkg-plist Mon Dec 16 22:13:36 2013 (r336674) +++ head/editors/calligra-l10n-nl/pkg-plist Mon Dec 16 22:59:42 2013 (r336675) @@ -120,6 +120,7 @@ share/locale/nl/LC_MESSAGES/calligra-def share/locale/nl/LC_MESSAGES/calligra-dockers.mo share/locale/nl/LC_MESSAGES/calligra-opener.mo share/locale/nl/LC_MESSAGES/calligra.mo +share/locale/nl/LC_MESSAGES/calligraactive.mo share/locale/nl/LC_MESSAGES/calligrafilters.mo share/locale/nl/LC_MESSAGES/desktop_calligra.mo share/locale/nl/LC_MESSAGES/flow.mo @@ -146,6 +147,7 @@ share/locale/nl/LC_MESSAGES/planrcpsplug share/locale/nl/LC_MESSAGES/plantjplugin.mo share/locale/nl/LC_MESSAGES/planwork.mo share/locale/nl/LC_MESSAGES/sheets.mo +share/locale/nl/LC_MESSAGES/sheetspivottables_plugin.mo share/locale/nl/LC_MESSAGES/sheetssolver.mo share/locale/nl/LC_MESSAGES/stage.mo share/locale/nl/LC_MESSAGES/thesaurus_tool.mo Modified: head/editors/calligra-l10n-sk/Makefile ============================================================================== --- head/editors/calligra-l10n-sk/Makefile Mon Dec 16 22:13:36 2013 (r336674) +++ head/editors/calligra-l10n-sk/Makefile Mon Dec 16 22:59:42 2013 (r336675) @@ -9,6 +9,5 @@ COMMENT= Slovak messages and documentati CALLIGRA_L10N= sk -NO_STAGE= yes .include "${.CURDIR}/../../editors/calligra-l10n/files/bsd.l10n.mk" .include Modified: head/editors/calligra-l10n-sk/distinfo ============================================================================== --- head/editors/calligra-l10n-sk/distinfo Mon Dec 16 22:13:36 2013 (r336674) +++ head/editors/calligra-l10n-sk/distinfo Mon Dec 16 22:59:42 2013 (r336675) @@ -1,2 +1,2 @@ -SHA256 (KDE/calligra-l10n/calligra-l10n-sk-2.6.2.tar.bz2) = 7b34c54eba797c21f3055f0697ca979021742adf75621dac78a752db71858be7 -SIZE (KDE/calligra-l10n/calligra-l10n-sk-2.6.2.tar.bz2) = 355580 +SHA256 (KDE/calligra-l10n/calligra-l10n-sk-2.7.5.tar.xz) = 71b7d2f1ad2c14915ceddfad8a1527fa02787fa5272640054309b6b76f8f4395 +SIZE (KDE/calligra-l10n/calligra-l10n-sk-2.7.5.tar.xz) = 345712 Modified: head/editors/calligra-l10n-sk/pkg-plist ============================================================================== --- head/editors/calligra-l10n-sk/pkg-plist Mon Dec 16 22:13:36 2013 (r336674) +++ head/editors/calligra-l10n-sk/pkg-plist Mon Dec 16 22:59:42 2013 (r336675) @@ -24,6 +24,7 @@ share/locale/sk/LC_MESSAGES/calligra-def share/locale/sk/LC_MESSAGES/calligra-dockers.mo share/locale/sk/LC_MESSAGES/calligra-opener.mo share/locale/sk/LC_MESSAGES/calligra.mo +share/locale/sk/LC_MESSAGES/calligraactive.mo share/locale/sk/LC_MESSAGES/calligrafilters.mo share/locale/sk/LC_MESSAGES/desktop_calligra.mo share/locale/sk/LC_MESSAGES/flow.mo @@ -50,6 +51,7 @@ share/locale/sk/LC_MESSAGES/planrcpsplug share/locale/sk/LC_MESSAGES/plantjplugin.mo share/locale/sk/LC_MESSAGES/planwork.mo share/locale/sk/LC_MESSAGES/sheets.mo +share/locale/sk/LC_MESSAGES/sheetspivottables_plugin.mo share/locale/sk/LC_MESSAGES/sheetssolver.mo share/locale/sk/LC_MESSAGES/stage.mo share/locale/sk/LC_MESSAGES/thesaurus_tool.mo Modified: head/editors/calligra-l10n-sl/Makefile ============================================================================== --- head/editors/calligra-l10n-sl/Makefile Mon Dec 16 22:13:36 2013 (r336674) +++ head/editors/calligra-l10n-sl/Makefile Mon Dec 16 22:59:42 2013 (r336675) @@ -9,6 +9,5 @@ COMMENT= Slovenian messages and document CALLIGRA_L10N= sl -NO_STAGE= yes .include "${.CURDIR}/../../editors/calligra-l10n/files/bsd.l10n.mk" .include Modified: head/editors/calligra-l10n-sl/distinfo ============================================================================== --- head/editors/calligra-l10n-sl/distinfo Mon Dec 16 22:13:36 2013 (r336674) +++ head/editors/calligra-l10n-sl/distinfo Mon Dec 16 22:59:42 2013 (r336675) @@ -1,2 +1,2 @@ -SHA256 (KDE/calligra-l10n/calligra-l10n-sl-2.6.2.tar.bz2) = 0d95ee83832b181238a390c25b3f7395ee006501badc1ad34821ea2ad1c91741 -SIZE (KDE/calligra-l10n/calligra-l10n-sl-2.6.2.tar.bz2) = 422060 +SHA256 (KDE/calligra-l10n/calligra-l10n-sl-2.7.5.tar.xz) = 7b34c684efedc3078ceee9ea87e204e13a94d6c41e46ed11d6360545caeed4ec +SIZE (KDE/calligra-l10n/calligra-l10n-sl-2.7.5.tar.xz) = 407356 Modified: head/editors/calligra-l10n-sv/Makefile ============================================================================== --- head/editors/calligra-l10n-sv/Makefile Mon Dec 16 22:13:36 2013 (r336674) +++ head/editors/calligra-l10n-sv/Makefile Mon Dec 16 22:59:42 2013 (r336675) @@ -9,6 +9,5 @@ COMMENT= Swedish messages and documentat CALLIGRA_L10N= sv -NO_STAGE= yes .include "${.CURDIR}/../../editors/calligra-l10n/files/bsd.l10n.mk" .include Modified: head/editors/calligra-l10n-sv/distinfo ============================================================================== --- head/editors/calligra-l10n-sv/distinfo Mon Dec 16 22:13:36 2013 (r336674) +++ head/editors/calligra-l10n-sv/distinfo Mon Dec 16 22:59:42 2013 (r336675) @@ -1,2 +1,2 @@ -SHA256 (KDE/calligra-l10n/calligra-l10n-sv-2.6.2.tar.bz2) = fd48c40793f80628e2b4cef017067262075cb197ac711a1f918d2961e286c656 -SIZE (KDE/calligra-l10n/calligra-l10n-sv-2.6.2.tar.bz2) = 2039745 +SHA256 (KDE/calligra-l10n/calligra-l10n-sv-2.7.5.tar.xz) = 07a1cc444be7f32b2108a92e274cc78f056e966b7721a26f80fb0ca69fac964d +SIZE (KDE/calligra-l10n/calligra-l10n-sv-2.7.5.tar.xz) = 1939232 Modified: head/editors/calligra-l10n-sv/pkg-plist ============================================================================== --- head/editors/calligra-l10n-sv/pkg-plist Mon Dec 16 22:13:36 2013 (r336674) +++ head/editors/calligra-l10n-sv/pkg-plist Mon Dec 16 22:59:42 2013 (r336675) @@ -157,6 +157,7 @@ share/locale/sv/LC_MESSAGES/calligra-def share/locale/sv/LC_MESSAGES/calligra-dockers.mo share/locale/sv/LC_MESSAGES/calligra-opener.mo share/locale/sv/LC_MESSAGES/calligra.mo +share/locale/sv/LC_MESSAGES/calligraactive.mo share/locale/sv/LC_MESSAGES/calligrafilters.mo share/locale/sv/LC_MESSAGES/desktop_calligra.mo share/locale/sv/LC_MESSAGES/flow.mo @@ -183,6 +184,7 @@ share/locale/sv/LC_MESSAGES/planrcpsplug share/locale/sv/LC_MESSAGES/plantjplugin.mo share/locale/sv/LC_MESSAGES/planwork.mo share/locale/sv/LC_MESSAGES/sheets.mo +share/locale/sv/LC_MESSAGES/sheetspivottables_plugin.mo share/locale/sv/LC_MESSAGES/sheetssolver.mo share/locale/sv/LC_MESSAGES/stage.mo share/locale/sv/LC_MESSAGES/thesaurus_tool.mo Modified: head/editors/calligra-l10n-tr/Makefile ============================================================================== --- head/editors/calligra-l10n-tr/Makefile Mon Dec 16 22:13:36 2013 (r336674) +++ head/editors/calligra-l10n-tr/Makefile Mon Dec 16 22:59:42 2013 (r336675) @@ -9,6 +9,5 @@ COMMENT= Turkish Bokmaal messages and do CALLIGRA_L10N= tr -NO_STAGE= yes .include "${.CURDIR}/../../editors/calligra-l10n/files/bsd.l10n.mk" .include Modified: head/editors/calligra-l10n-tr/distinfo ============================================================================== --- head/editors/calligra-l10n-tr/distinfo Mon Dec 16 22:13:36 2013 (r336674) +++ head/editors/calligra-l10n-tr/distinfo Mon Dec 16 22:59:42 2013 (r336675) @@ -1,2 +1,2 @@ -SHA256 (KDE/calligra-l10n/calligra-l10n-tr-2.6.2.tar.bz2) = 894088a160fbe64d341368876aa30ae7ce37d6d01bd146fb657801d4331b7502 -SIZE (KDE/calligra-l10n/calligra-l10n-tr-2.6.2.tar.bz2) = 371203 +SHA256 (KDE/calligra-l10n/calligra-l10n-tr-2.7.5.tar.xz) = 0f38986cca12ba3a7571cb28b392ea6d173ade0af6f7a125b12fb062d400e68a +SIZE (KDE/calligra-l10n/calligra-l10n-tr-2.7.5.tar.xz) = 361344 Modified: head/editors/calligra-l10n-tr/pkg-plist ============================================================================== --- head/editors/calligra-l10n-tr/pkg-plist Mon Dec 16 22:13:36 2013 (r336674) +++ head/editors/calligra-l10n-tr/pkg-plist Mon Dec 16 22:59:42 2013 (r336675) @@ -24,6 +24,7 @@ share/locale/tr/LC_MESSAGES/calligra-def share/locale/tr/LC_MESSAGES/calligra-dockers.mo share/locale/tr/LC_MESSAGES/calligra-opener.mo share/locale/tr/LC_MESSAGES/calligra.mo +share/locale/tr/LC_MESSAGES/calligraactive.mo share/locale/tr/LC_MESSAGES/calligrafilters.mo share/locale/tr/LC_MESSAGES/desktop_calligra.mo share/locale/tr/LC_MESSAGES/flow.mo @@ -50,6 +51,7 @@ share/locale/tr/LC_MESSAGES/planrcpsplug share/locale/tr/LC_MESSAGES/plantjplugin.mo share/locale/tr/LC_MESSAGES/planwork.mo share/locale/tr/LC_MESSAGES/sheets.mo +share/locale/tr/LC_MESSAGES/sheetspivottables_plugin.mo share/locale/tr/LC_MESSAGES/sheetssolver.mo share/locale/tr/LC_MESSAGES/stage.mo share/locale/tr/LC_MESSAGES/thesaurus_tool.mo Modified: head/editors/calligra-l10n/Makefile ============================================================================== --- head/editors/calligra-l10n/Makefile Mon Dec 16 22:13:36 2013 (r336674) +++ head/editors/calligra-l10n/Makefile Mon Dec 16 22:59:42 2013 (r336675) @@ -10,14 +10,14 @@ EXTRACT_ONLY= # none MAINTAINER= kde@FreeBSD.org COMMENT= Localized messages and documentation for Calligra +NO_ARCH= yes NO_BUILD= yes USE_KDE4= kdeprefix CALLIGRA_LANG_ALL= bs ca ca@valencia cs da de el en_GB es et fi fr \ - gl hu it ja kk nb nds nl pl pt pt_BR ru sk sl \ + gl hu ia it ja kk nb nds nl pl pt pt_BR ru sk sl \ sv tr uk zh_CN zh_TW -ca@valencia_PORT= editors/calligra-l10n-ca_valencia de_PORT= german/calligra-l10n fr_PORT= french/calligra-l10n hu_PORT= hungarian/calligra-l10n @@ -30,36 +30,29 @@ uk_PORT= ukrainian/calligra-l10n zh_CN_PORT= chinese/calligra-l10n-zh_CN zh_TW_PORT= chinese/calligra-l10n-zh_TW -NO_STAGE= yes -.include "${.CURDIR}/../../misc/kde4-l10n/files/kde4-lang-names" +.include "${.CURDIR:H:H}/misc/kde4-l10n/files/kde4-lang-names" nb_NAME= Norwegian Bokmal OPTIONS_DEFINE= ALL ${LANG_OPT_ALL} OPTIONS_DEFAULT=ALL ALL_DESC= All localizations +ALL_RUN_DEPENDS=# empty .for lang in ${CALLIGRA_LANG_ALL} ${lang}_DETECT?= ${KDE4_PREFIX}/share/locale/${lang}/LC_MESSAGES/calligra.mo -${lang}_PORT?= editors/calligra-l10n-${lang} +${lang}_PORT?= editors/calligra-l10n-${lang:S/@/_/} ${lang}_NAME?= ${lang} ${lang}_OPT= ${lang:S/@/_/} LANG_OPT_ALL+= ${${lang}_OPT} ${${lang}_OPT}_DESC= ${${lang}_NAME} localization -${${lang}_OPT}_DEP= ${${lang}_DETECT}:${PORTSDIR}/${${lang}_PORT} -.endfor - -.include - -.for opt in ${LANG_OPT_ALL} -. if ${PORT_OPTIONS:M${opt}} || ${PORT_OPTIONS:MALL} -RUN_DEPENDS+= ${${opt}_DEP} -. endif +${${lang}_OPT}_RUN_DEPENDS=${${lang}_DETECT}:${PORTSDIR}/${${lang}_PORT} +ALL_RUN_DEPENDS+= ${${${lang}_OPT}_RUN_DEPENDS} .endfor do-install: - ${DO_NADA} + @${DO_NADA} .include Modified: head/editors/calligra-l10n/files/bsd.l10n.mk ============================================================================== --- head/editors/calligra-l10n/files/bsd.l10n.mk Mon Dec 16 22:13:36 2013 (r336674) +++ head/editors/calligra-l10n/files/bsd.l10n.mk Mon Dec 16 22:59:42 2013 (r336675) @@ -8,7 +8,8 @@ DIST_SUBDIR= KDE/calligra-l10n CONFLICTS= ${PKGNAMEPREFIX}koffice-l10n-2.* USE_KDE4= kdehier kdelibs kdeprefix automoc4 -USE_QT4= xml moc_build qmake_build rcc_build uic_build -USE_BZIP2= yes +USE_QT4= corelib xml moc_build qmake_build rcc_build uic_build USES= cmake gettext +NO_ARCH= yes +USE_XZ= yes .endif Modified: head/editors/calligra/Makefile ============================================================================== --- head/editors/calligra/Makefile Mon Dec 16 22:13:36 2013 (r336674) +++ head/editors/calligra/Makefile Mon Dec 16 22:59:42 2013 (r336675) @@ -2,7 +2,6 @@ PORTNAME= calligra PORTVERSION= ${CALLIGRA_VERSION} -PORTREVISION= 5 CATEGORIES= editors kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= ${CALLIGRA_BRANCH}/${PORTNAME}-${PORTVERSION}/ @@ -40,24 +39,42 @@ USE_GL= glew USE_GNOME= glib20 libxml2 libxslt USE_KDE4= kactivities kdehier kdelibs kdeprefix libkdcraw nepomuk-core \ okular pimlibs attica automoc4 sharedmime soprano -USE_QT4= dbus designer_build gui opengl phonon porting_build qt3support \ - qtestlib_build script sql svg webkit xml xmlpatterns \ +USE_QT4= corelib dbus designer_build gui opengl phonon porting_build \ + qt3support qtestlib_build script sql svg webkit xml xmlpatterns \ moc_build qmake_build rcc_build uic_build uic3_build USE_SQLITE= 3 -USE_BZIP2= yes -USES= cmake:outsource pkgconfig iconv perl5 +USES= cmake:outsource compiler:c++11-lang iconv perl5 pkgconfig +USE_XZ= yes CMAKE_ARGS= -DCMAKE_INCLUDE_PATH:STRING="${QT_INCDIR} ${LOCALBASE}/include" \ - -DIHAVEPATCHEDQT:BOOL=TRUE # To be removed with Qt 4.8.2. + -DPRODUCTSET:STRING="DESKTOP" USE_LDCONFIG= yes OPTIONS_DEFINE= GTL MARBLE MYSQL PGSQL SYBASE OPTIONS_DEFAULT=MARBLE MYSQL PGSQL +OPTIONS_SUB= yes GTL_DESC= Color transformations in Krita (requires LLVM) +GTL_LIB_DEPENDS=libOpenCTL.so:${PORTSDIR}/graphics/opengtl \ + libQtShiva.so:${PORTSDIR}/graphics/qtgtl +GTL_CMAKE_OFF= -DWITH_OpenShiva:BOOL=FALSE \ + -DWITH_QtShiva:BOOL=FALSE + MARBLE_DESC= World globe widget support via Marble +MARBLE_USE= KDE4=marble +MARBLE_CMAKE_OFF=-DWITH_Marble:BOOL=FALSE + MYSQL_DESC= MySQL database support in Kexi +MYSQL_USE= MYSQL=yes +MYSQL_CMAKE_OFF=-DWITH_MySQL:BOOL=FALSE + PGSQL_DESC= PostgreSQL database support in Kexi +PGSQL_LIB_DEPENDS=libpqxx-3.1.so:${PORTSDIR}/databases/postgresql-libpqxx3 +PGSQL_USE= PGSQL=yes +PGSQL_CMAKE_OFF=-DWITH_PostgreSQL:BOOL=FALSE + SYBASE_DESC= Sybase database support in Kexi +SYBASE_LIB_DEPENDS=libsybdb.so:${PORTSDIR}/databases/freetds +SYBASE_CMAKE_OFF=-DWITH_FreeTDS:BOOL=FALSE .if exists(${LOCALBASE}/lib/pstoedit/libp2edrvlplot.so) BUILD_DEPENDS+= ${LOCALBASE}/lib/pstoedit/libp2edrvlplot.so:${PORTSDIR}/graphics/pstoedit @@ -74,51 +91,6 @@ CMAKE_ARGS+= -DWITH_PACKAGERS_BUILD:BOOL CMAKE_ARGS+= -DWITH_PACKAGERS_BUILD:BOOL=FALSE .endif -NO_STAGE= yes -.include - -.if ${PORT_OPTIONS:MGTL} || exists(${LOCALBASE}/lib/libQtShiva.so) -LIB_DEPENDS+= OpenCTL:${PORTSDIR}/graphics/opengtl \ - QtShiva:${PORTSDIR}/graphics/qtgtl -PLIST_SUB+= GTL="" -.else -PLIST_SUB+= GTL="@comment " -.endif - -.if ${PORT_OPTIONS:MMARBLE} -USE_KDE4+= marble -PLIST_SUB+= MARBLE="" -.else -CMAKE_ARGS+= -DWITH_Marble:BOOL=FALSE -PLIST_SUB+= MARBLE="@comment " *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** From owner-svn-ports-head@FreeBSD.ORG Mon Dec 16 23:03:51 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 88BD9B69; Mon, 16 Dec 2013 23:03:51 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 743551773; Mon, 16 Dec 2013 23:03:51 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBGN3pCJ063205; Mon, 16 Dec 2013 23:03:51 GMT (envelope-from bapt@svn.freebsd.org) Received: (from bapt@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBGN3pkK063204; Mon, 16 Dec 2013 23:03:51 GMT (envelope-from bapt@svn.freebsd.org) Message-Id: <201312162303.rBGN3pkK063204@svn.freebsd.org> From: Baptiste Daroussin Date: Mon, 16 Dec 2013 23:03:51 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r336676 - head/Mk X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 16 Dec 2013 23:03:51 -0000 Author: bapt Date: Mon Dec 16 23:03:50 2013 New Revision: 336676 URL: http://svnweb.freebsd.org/changeset/ports/336676 Log: Use new LIB_DEPENDS format for USE_SQLITE Modified: head/Mk/bsd.database.mk Modified: head/Mk/bsd.database.mk ============================================================================== --- head/Mk/bsd.database.mk Mon Dec 16 22:59:42 2013 (r336675) +++ head/Mk/bsd.database.mk Mon Dec 16 23:03:50 2013 (r336676) @@ -504,10 +504,10 @@ _SQLITE_VER= ${USE_SQLITE} # USE_SQLITE is specified incorrectly, so mark this as IGNORE .if ${_SQLITE_VER} == "3" -LIB_DEPENDS+= sqlite3.8:${PORTSDIR}/databases/sqlite${_SQLITE_VER} +LIB_DEPENDS+= libsqlite3.so:${PORTSDIR}/databases/sqlite${_SQLITE_VER} SQLITE_VER= ${_SQLITE_VER} .elif ${_SQLITE_VER} == "2" -LIB_DEPENDS+= sqlite.2:${PORTSDIR}/databases/sqlite${_SQLITE_VER} +LIB_DEPENDS+= libsqlite.so:${PORTSDIR}/databases/sqlite${_SQLITE_VER} SQLITE_VER= ${_SQLITE_VER} .else IGNORE= cannot install: unknown SQLite version: ${_SQLITE_VER} From owner-svn-ports-head@FreeBSD.ORG Mon Dec 16 23:12:25 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 585F4F44; Mon, 16 Dec 2013 23:12:25 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 43F8E182D; Mon, 16 Dec 2013 23:12:25 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBGNCP8A066880; Mon, 16 Dec 2013 23:12:25 GMT (envelope-from bapt@svn.freebsd.org) Received: (from bapt@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBGNCPTB066879; Mon, 16 Dec 2013 23:12:25 GMT (envelope-from bapt@svn.freebsd.org) Message-Id: <201312162312.rBGNCPTB066879@svn.freebsd.org> From: Baptiste Daroussin Date: Mon, 16 Dec 2013 23:12:25 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r336677 - head/Mk X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 16 Dec 2013 23:12:25 -0000 Author: bapt Date: Mon Dec 16 23:12:24 2013 New Revision: 336677 URL: http://svnweb.freebsd.org/changeset/ports/336677 Log: Use new LIB_DEPENDS syntax for bsd.gnustep.mk Modified: head/Mk/bsd.gnustep.mk Modified: head/Mk/bsd.gnustep.mk ============================================================================== --- head/Mk/bsd.gnustep.mk Mon Dec 16 23:03:50 2013 (r336676) +++ head/Mk/bsd.gnustep.mk Mon Dec 16 23:12:24 2013 (r336677) @@ -192,7 +192,7 @@ MAKE_ENV+= "CC=${CC} CXX=${CXX}" # .if defined(USE_GNUSTEP_BASE) BUILD_DEPENDS+= ${GNUSTEP_SYSTEM_LIBRARIES}/libgnustep-base.so:${PORTSDIR}/${GNUSTEP_BASE_PORT} -LIB_DEPENDS+= objc.4:${PORTSDIR}/lang/libobjc2 +LIB_DEPENDS+= libobjc.so.4:${PORTSDIR}/lang/libobjc2 RUN_DEPENDS+= ${GNUSTEP_SYSTEM_LIBRARIES}/libgnustep-base.so:${PORTSDIR}/${GNUSTEP_BASE_PORT} .endif From owner-svn-ports-head@FreeBSD.ORG Mon Dec 16 23:37:25 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 1A2469A3; Mon, 16 Dec 2013 23:37:25 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 051BE1A4E; Mon, 16 Dec 2013 23:37:25 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBGNbOwQ074526; Mon, 16 Dec 2013 23:37:24 GMT (envelope-from flo@svn.freebsd.org) Received: (from flo@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBGNbOT9074519; Mon, 16 Dec 2013 23:37:24 GMT (envelope-from flo@svn.freebsd.org) Message-Id: <201312162337.rBGNbOT9074519@svn.freebsd.org> From: Florian Smeets Date: Mon, 16 Dec 2013 23:37:24 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r336678 - in head: security/vuxml www/phpmyfaq X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 16 Dec 2013 23:37:25 -0000 Author: flo Date: Mon Dec 16 23:37:23 2013 New Revision: 336678 URL: http://svnweb.freebsd.org/changeset/ports/336678 Log: - update to 2.8.4 - add stage support Security: 3b86583a-66a7-11e3-868f-0025905a4771 Modified: head/security/vuxml/vuln.xml head/www/phpmyfaq/Makefile head/www/phpmyfaq/distinfo head/www/phpmyfaq/pkg-plist Modified: head/security/vuxml/vuln.xml ============================================================================== --- head/security/vuxml/vuln.xml Mon Dec 16 23:12:24 2013 (r336677) +++ head/security/vuxml/vuln.xml Mon Dec 16 23:37:23 2013 (r336678) @@ -51,6 +51,36 @@ Note: Please add new entries to the beg --> + + phpmyfaq -- arbitrary PHP code execution vulnerability + + + phpmyfaq + 2.8.4 + + + + +

The phpMyFAQ team reports:

+
+

Secunia noticed while analysing the advisory that authenticated + users with "Right to add attachments" are able to exploit an already + publicly known issue in the bundled Ajax File Manager of phpMyFAQ version + 2.8.3, which leads to arbitrary PHP code execution for authenticated + users with the permission "Right to add attachments".

+
+ + + + http://www.phpmyfaq.de/advisory_2013-11-26.php + http://en.securitylab.ru/lab/PT-2013-41 + + + 2013-11-26 + 2013-12-16 + + + zabbix -- shell command injection vulnerability Modified: head/www/phpmyfaq/Makefile ============================================================================== --- head/www/phpmyfaq/Makefile Mon Dec 16 23:12:24 2013 (r336677) +++ head/www/phpmyfaq/Makefile Mon Dec 16 23:37:23 2013 (r336678) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= phpmyfaq -PORTVERSION= 2.8.2 +PORTVERSION= 2.8.4 CATEGORIES= www MASTER_SITES= http://www.phpmyfaq.de/download/ @@ -11,20 +11,20 @@ COMMENT= A multilingual, completely data WRKSRC= ${WRKDIR}/${PORTNAME} +NEED_ROOT= yes + USE_PHP= filter json mysql pcre pdf session xml xmlrpc xmlwriter zlib FAQ_DIR= attachments data images inc pdf xml NO_BUILD= YES WANT_PHP_WEB= YES +NO_ARCH= YES -NO_STAGE= yes do-install: - -${MKDIR} ${WWWDIR} - @cd ${WRKSRC} && ${COPYTREE_SHARE} \* ${WWWDIR} + @${MKDIR} ${STAGEDIR}${WWWDIR} + @cd ${WRKSRC} && ${COPYTREE_SHARE} \* ${STAGEDIR}${WWWDIR} .for i in ${FAQ_DIR} - -@${MKDIR} ${WWWDIR}/${i} - @${CHMOD} 777 ${WWWDIR}/${i} + @${MKDIR} ${STAGEDIR}${WWWDIR}/${i} + @${CHOWN} ${WWWOWN}:${WWWGRP} ${STAGEDIR}${WWWDIR}/${i} ${STAGEDIR}${WWWDIR}/config .endfor - @${CHOWN} -R ${WWWOWN}:${WWWGRP} ${WWWDIR} - @${CAT} ${PKGMESSAGE} .include Modified: head/www/phpmyfaq/distinfo ============================================================================== --- head/www/phpmyfaq/distinfo Mon Dec 16 23:12:24 2013 (r336677) +++ head/www/phpmyfaq/distinfo Mon Dec 16 23:37:23 2013 (r336678) @@ -1,2 +1,2 @@ -SHA256 (phpmyfaq-2.8.2.tar.gz) = 2ab6452da45dacd3bd771597671371881a4c9d13352b4c70d608b686779c3db6 -SIZE (phpmyfaq-2.8.2.tar.gz) = 3896352 +SHA256 (phpmyfaq-2.8.4.tar.gz) = da4762ce824a973f0303762e9028ea9c7e1b1b0bc0f7721388046bd1c35b0164 +SIZE (phpmyfaq-2.8.4.tar.gz) = 3903889 Modified: head/www/phpmyfaq/pkg-plist ============================================================================== --- head/www/phpmyfaq/pkg-plist Mon Dec 16 23:12:24 2013 (r336677) +++ head/www/phpmyfaq/pkg-plist Mon Dec 16 23:37:23 2013 (r336678) @@ -1,3 +1,16 @@ +@exec mkdir -p %D/www/phpmyfaq/attachments +@exec mkdir -p %D/www/phpmyfaq/data +@exec mkdir -p %D/www/phpmyfaq/images +@exec mkdir -p %D/www/phpmyfaq/inc +@exec mkdir -p %D/www/phpmyfaq/pdf +@exec mkdir -p %D/www/phpmyfaq/xml +@exec chown %%WWWOWN%%:%%WWWGRP%% %D/www/phpmyfaq/attachments +@exec chown %%WWWOWN%%:%%WWWGRP%% %D/www/phpmyfaq/config +@exec chown %%WWWOWN%%:%%WWWGRP%% %D/www/phpmyfaq/data +@exec chown %%WWWOWN%%:%%WWWGRP%% %D/www/phpmyfaq/images +@exec chown %%WWWOWN%%:%%WWWGRP%% %D/www/phpmyfaq/inc +@exec chown %%WWWOWN%%:%%WWWGRP%% %D/www/phpmyfaq/pdf +@exec chown %%WWWOWN%%:%%WWWGRP%% %D/www/phpmyfaq/xml %%WWWDIR%%/_.htaccess %%WWWDIR%%/_httpd.ini %%WWWDIR%%/_lighttpd.conf @@ -24,6 +37,7 @@ %%WWWDIR%%/admin/assets/font/fontawesome-webfont.svg %%WWWDIR%%/admin/assets/font/fontawesome-webfont.ttf %%WWWDIR%%/admin/assets/font/fontawesome-webfont.woff +%%WWWDIR%%/admin/assets/js/record.js %%WWWDIR%%/admin/assets/js/uploadcheck.js %%WWWDIR%%/admin/assets/js/user.js %%WWWDIR%%/admin/assets/less/style.less @@ -876,6 +890,7 @@ %%WWWDIR%%/assets/template/default/favicon.ico %%WWWDIR%%/assets/template/default/glossary.tpl %%WWWDIR%%/assets/template/default/images/arrow.gif +%%WWWDIR%%/assets/template/default/indexPassword.tpl %%WWWDIR%%/assets/template/default/index.tpl %%WWWDIR%%/assets/template/default/indexLogin.tpl %%WWWDIR%%/assets/template/default/indexMaintenance.tpl @@ -1264,7 +1279,7 @@ @dirrm %%WWWDIR%%/xml @dirrm %%WWWDIR%%/services/twitter @dirrm %%WWWDIR%%/services -@dirrmtry %%WWWDIR%%/pdf +@dirrm %%WWWDIR%%/pdf @dirrm %%WWWDIR%%/multisite @dirrm %%WWWDIR%%/lang @dirrm %%WWWDIR%%/install @@ -1357,16 +1372,16 @@ @dirrm %%WWWDIR%%/inc/PMF/Attachment @dirrm %%WWWDIR%%/inc/PMF @dirrm %%WWWDIR%%/inc -@dirrmtry %%WWWDIR%%/images +@dirrm %%WWWDIR%%/images @dirrm %%WWWDIR%%/feed/topten @dirrm %%WWWDIR%%/feed/openquestions @dirrm %%WWWDIR%%/feed/news @dirrm %%WWWDIR%%/feed/latest @dirrm %%WWWDIR%%/feed/category @dirrm %%WWWDIR%%/feed -@dirrmtry %%WWWDIR%%/data -@dirrmtry %%WWWDIR%%/config -@dirrmtry %%WWWDIR%%/attachments +@dirrm %%WWWDIR%%/data +@dirrm %%WWWDIR%%/config +@dirrm %%WWWDIR%%/attachments @dirrm %%WWWDIR%%/assets/template/default/less @dirrm %%WWWDIR%%/assets/template/default/images @dirrm %%WWWDIR%%/assets/template/default/css From owner-svn-ports-head@FreeBSD.ORG Mon Dec 16 23:47:09 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 85BD8D87; Mon, 16 Dec 2013 23:47:09 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 575691B22; Mon, 16 Dec 2013 23:47:09 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBGNl9AM077993; Mon, 16 Dec 2013 23:47:09 GMT (envelope-from mandree@svn.freebsd.org) Received: (from mandree@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBGNl8SW077990; Mon, 16 Dec 2013 23:47:08 GMT (envelope-from mandree@svn.freebsd.org) Message-Id: <201312162347.rBGNl8SW077990@svn.freebsd.org> From: Matthias Andree Date: Mon, 16 Dec 2013 23:47:08 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r336679 - head/databases/db5 X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 16 Dec 2013 23:47:09 -0000 Author: mandree Date: Mon Dec 16 23:47:08 2013 New Revision: 336679 URL: http://svnweb.freebsd.org/changeset/ports/336679 Log: Update to 5.3.28, fixing nearly two dozen bugs. While at it, re-enable the db185 compatibility interface that some ports use. Modified: head/databases/db5/Makefile head/databases/db5/distinfo (contents, props changed) head/databases/db5/pkg-plist (contents, props changed) Modified: head/databases/db5/Makefile ============================================================================== --- head/databases/db5/Makefile Mon Dec 16 23:37:23 2013 (r336678) +++ head/databases/db5/Makefile Mon Dec 16 23:47:08 2013 (r336679) @@ -2,21 +2,22 @@ # $FreeBSD$ PORTNAME= db5 -PORTVERSION= 5.3.21.0 +PORTVERSION= 5.3.28 CATEGORIES= databases java MASTER_SITES= http://download.oracle.com/berkeley-db/ PKGNAMEPREFIX?= # # the distfiles aren't named db5-* but db-*: -DISTNAME= db-${PORTVERSION:R} +DISTNAME= db-${PORTVERSION} DIST_SUBDIR= bdb MAINTAINER= mandree@FreeBSD.org COMMENT= The Oracle Berkeley DB, revision ${BDBVER} -BDBVER= ${PORTVERSION:R:R} +BDBVER= ${PORTVERSION:R} BDBMAJ= ${BDBVER:R} CONFIGURE_ARGS= --enable-cxx --enable-stl \ + --enable-compat185 --enable-dump185 \ --disable-tcl \ --includedir=${PREFIX}/include/${PORTNAME} \ --libdir=${PREFIX}/lib/${PORTNAME} \ Modified: head/databases/db5/distinfo ============================================================================== --- head/databases/db5/distinfo Mon Dec 16 23:37:23 2013 (r336678) +++ head/databases/db5/distinfo Mon Dec 16 23:47:08 2013 (r336679) @@ -1,2 +1,2 @@ -SHA256 (bdb/db-5.3.21.tar.gz) = ddd92a930317df92021054c03992392db9ea5cddba43bef8920d392a82114fb8 -SIZE (bdb/db-5.3.21.tar.gz) = 35062469 +SHA256 (bdb/db-5.3.28.tar.gz) = e0a992d740709892e81f9d93f06daf305cf73fb81b545afe72478043172c3628 +SIZE (bdb/db-5.3.28.tar.gz) = 35090431 Modified: head/databases/db5/pkg-plist ============================================================================== --- head/databases/db5/pkg-plist Mon Dec 16 23:37:23 2013 (r336678) +++ head/databases/db5/pkg-plist Mon Dec 16 23:47:08 2013 (r336679) @@ -2,6 +2,7 @@ bin/db5/db_archive bin/db5/db_checkpoint bin/db5/db_deadlock bin/db5/db_dump +bin/db5/db_dump185 bin/db5/db_hotbackup bin/db5/db_load bin/db5/db_log_verify @@ -22,6 +23,8 @@ bin/db_deadlock-%%BDBMAJ%% bin/db_deadlock-%%BDBVER%% bin/db_dump-%%BDBMAJ%% bin/db_dump-%%BDBVER%% +bin/db_dump185-%%BDBMAJ%% +bin/db_dump185-%%BDBVER%% bin/db_hotbackup-%%BDBMAJ%% bin/db_hotbackup-%%BDBVER%% bin/db_load-%%BDBMAJ%% @@ -47,6 +50,7 @@ bin/db_verify-%%BDBVER%% %%SQL%%bin/dbsql-%%BDBMAJ%% %%SQL%%bin/dbsql-%%BDBVER%% include/db5/db.h +include/db5/db_185.h include/db5/db_cxx.h %%SQL%%include/db5/dbsql.h include/db5/dbstl_base_iterator.h From owner-svn-ports-head@FreeBSD.ORG Mon Dec 16 23:49:31 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id A4AB869; Mon, 16 Dec 2013 23:49:31 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 75EB41B48; Mon, 16 Dec 2013 23:49:31 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBGNnVU1078302; Mon, 16 Dec 2013 23:49:31 GMT (envelope-from mandree@svn.freebsd.org) Received: (from mandree@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBGNnUeJ078299; Mon, 16 Dec 2013 23:49:30 GMT (envelope-from mandree@svn.freebsd.org) Message-Id: <201312162349.rBGNnUeJ078299@svn.freebsd.org> From: Matthias Andree Date: Mon, 16 Dec 2013 23:49:30 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r336680 - head/databases/db6 X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 16 Dec 2013 23:49:31 -0000 Author: mandree Date: Mon Dec 16 23:49:30 2013 New Revision: 336680 URL: http://svnweb.freebsd.org/changeset/ports/336680 Log: Update to 6.0.20, fixing a wrong LICENSE file. While at it, re-enable the db185 compatibility interface that some ports use. Modified: head/databases/db6/Makefile head/databases/db6/distinfo head/databases/db6/pkg-plist Modified: head/databases/db6/Makefile ============================================================================== --- head/databases/db6/Makefile Mon Dec 16 23:47:08 2013 (r336679) +++ head/databases/db6/Makefile Mon Dec 16 23:49:30 2013 (r336680) @@ -2,12 +2,12 @@ # $FreeBSD$ PORTNAME= db6 -PORTVERSION= 6.0.19.0 +PORTVERSION= 6.0.20 CATEGORIES= databases java MASTER_SITES= http://download.oracle.com/berkeley-db/ PKGNAMEPREFIX?= # the distfiles aren't named db6-* but db-*: -DISTNAME= db-${PORTVERSION:R} +DISTNAME= db-${PORTVERSION} DIST_SUBDIR= bdb MAINTAINER= mandree@FreeBSD.org @@ -15,9 +15,10 @@ COMMENT= The Oracle Berkeley DB, revisio LICENSE= AGPLv3 -BDBVER= ${PORTVERSION:R:R} +BDBVER= ${PORTVERSION:R} BDBMAJ= ${BDBVER:R} CONFIGURE_ARGS= --enable-cxx --enable-stl \ + --enable-compat185 --enable-dump185 \ --disable-tcl \ --includedir=${PREFIX}/include/${PORTNAME} \ --libdir=${PREFIX}/lib/${PORTNAME} \ Modified: head/databases/db6/distinfo ============================================================================== --- head/databases/db6/distinfo Mon Dec 16 23:47:08 2013 (r336679) +++ head/databases/db6/distinfo Mon Dec 16 23:49:30 2013 (r336680) @@ -1,2 +1,2 @@ -SHA256 (bdb/db-6.0.19.tar.gz) = 2917c28f60903908c2ca4587ded1363b812c4e830a5326aaa77c9879d13ae18e -SIZE (bdb/db-6.0.19.tar.gz) = 36541923 +SHA256 (bdb/db-6.0.20.tar.gz) = 806a8a443854e339f07a62d5e010baf48203bce0bbb49e32f245184c9f522203 +SIZE (bdb/db-6.0.20.tar.gz) = 36571533 Modified: head/databases/db6/pkg-plist ============================================================================== --- head/databases/db6/pkg-plist Mon Dec 16 23:47:08 2013 (r336679) +++ head/databases/db6/pkg-plist Mon Dec 16 23:49:30 2013 (r336680) @@ -2,6 +2,7 @@ bin/db%%BDBMAJ%%/db_archive bin/db%%BDBMAJ%%/db_checkpoint bin/db%%BDBMAJ%%/db_deadlock bin/db%%BDBMAJ%%/db_dump +bin/db%%BDBMAJ%%/db_dump185 bin/db%%BDBMAJ%%/db_hotbackup bin/db%%BDBMAJ%%/db_load bin/db%%BDBMAJ%%/db_log_verify @@ -18,6 +19,7 @@ bin/db_archive-%%BDBVER%% bin/db_checkpoint-%%BDBVER%% bin/db_deadlock-%%BDBVER%% bin/db_dump-%%BDBVER%% +bin/db_dump185-%%BDBVER%% bin/db_hotbackup-%%BDBVER%% bin/db_load-%%BDBVER%% bin/db_log_verify-%%BDBVER%% @@ -31,6 +33,7 @@ bin/db_upgrade-%%BDBVER%% bin/db_verify-%%BDBVER%% %%SQL%%bin/dbsql-%%BDBVER%% include/db%%BDBMAJ%%/db.h +include/db%%BDBMAJ%%/db_185.h include/db%%BDBMAJ%%/db_cxx.h %%SQL%%include/db%%BDBMAJ%%/dbsql.h include/db%%BDBMAJ%%/dbstl_base_iterator.h From owner-svn-ports-head@FreeBSD.ORG Mon Dec 16 23:50:26 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id C23721A3; Mon, 16 Dec 2013 23:50:26 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id ADECA1B60; Mon, 16 Dec 2013 23:50:26 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBGNoQgq078738; Mon, 16 Dec 2013 23:50:26 GMT (envelope-from mandree@svn.freebsd.org) Received: (from mandree@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBGNoQDj078737; Mon, 16 Dec 2013 23:50:26 GMT (envelope-from mandree@svn.freebsd.org) Message-Id: <201312162350.rBGNoQDj078737@svn.freebsd.org> From: Matthias Andree Date: Mon, 16 Dec 2013 23:50:26 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r336681 - head/ports-mgmt/pver X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 16 Dec 2013 23:50:26 -0000 Author: mandree Date: Mon Dec 16 23:50:26 2013 New Revision: 336681 URL: http://svnweb.freebsd.org/changeset/ports/336681 Log: Remove outdated INVALID_BDB_VER line, db5 and db6 have just been made to work for pver. Modified: head/ports-mgmt/pver/Makefile (contents, props changed) Modified: head/ports-mgmt/pver/Makefile ============================================================================== --- head/ports-mgmt/pver/Makefile Mon Dec 16 23:49:30 2013 (r336680) +++ head/ports-mgmt/pver/Makefile Mon Dec 16 23:50:26 2013 (r336681) @@ -37,7 +37,6 @@ MAKE_ARGS+= -DSORT MAKE_ARGS+= -DBSD_DB .else USE_BDB= 41+ -INVALID_BDB_VER=51 MAKE_ARGS+= BDB_VER=${BDB_VER} BDB_LIB_DIR=${BDB_LIB_DIR} .endif From owner-svn-ports-head@FreeBSD.ORG Mon Dec 16 23:54:57 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id E752142E; Mon, 16 Dec 2013 23:54:57 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id D343C1D09; Mon, 16 Dec 2013 23:54:57 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBGNsvF0081326; Mon, 16 Dec 2013 23:54:57 GMT (envelope-from marcel@svn.freebsd.org) Received: (from marcel@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBGNsvf1081325; Mon, 16 Dec 2013 23:54:57 GMT (envelope-from marcel@svn.freebsd.org) Message-Id: <201312162354.rBGNsvf1081325@svn.freebsd.org> From: Marcel Moolenaar Date: Mon, 16 Dec 2013 23:54:57 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r336682 - head/emulators/ski X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 16 Dec 2013 23:54:58 -0000 Author: marcel (src committer) Date: Mon Dec 16 23:54:57 2013 New Revision: 336682 URL: http://svnweb.freebsd.org/changeset/ports/336682 Log: Mark broken: the RPM package is not on HP's site anymore Mark deprecated: there has been no interest in upgrading to the version on SourceForge. Reviewed by: eadler (thanks!) Modified: head/emulators/ski/Makefile Modified: head/emulators/ski/Makefile ============================================================================== --- head/emulators/ski/Makefile Mon Dec 16 23:50:26 2013 (r336681) +++ head/emulators/ski/Makefile Mon Dec 16 23:54:57 2013 (r336682) @@ -14,6 +14,10 @@ COMMENT= HP's Ski IA-64 simulator ONLY_FOR_ARCHS= i386 +BROKEN= ${DISTNAME}${EXTRACT_SUFX} does not exist on HP's site anymore +DEPRECATED= ${BROKEN} and there's no apparent interest in the port +EXPIRATION_DATE=2014-03-24 + NOTICE= -- please manually download ${DISTNAME}${EXTRACT_SUFX} from the HP site (http://www.hpl.hp.com/research/linux/ski/download.php) and put it in ${DISTDIR} first RESTRICTED= License restrictions disallow automatic downloads and redistribution of the software. From owner-svn-ports-head@FreeBSD.ORG Tue Dec 17 00:17:46 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id C0C4698; Tue, 17 Dec 2013 00:17:46 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id AA9E81F3D; Tue, 17 Dec 2013 00:17:46 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBH0HksD090282; Tue, 17 Dec 2013 00:17:46 GMT (envelope-from kwm@svn.freebsd.org) Received: (from kwm@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBH0Hjqh090278; Tue, 17 Dec 2013 00:17:45 GMT (envelope-from kwm@svn.freebsd.org) Message-Id: <201312170017.rBH0Hjqh090278@svn.freebsd.org> From: Koop Mast Date: Tue, 17 Dec 2013 00:17:45 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r336683 - in head/lang: . spidermonkey24 spidermonkey24/files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 17 Dec 2013 00:17:46 -0000 Author: kwm Date: Tue Dec 17 00:17:45 2013 New Revision: 336683 URL: http://svnweb.freebsd.org/changeset/ports/336683 Log: Add spidermonkey 24.2.0. Stand-only javascript engine from Mozilla 24-esr series. Added: head/lang/spidermonkey24/ - copied from r336682, head/lang/spidermonkey170/ Deleted: head/lang/spidermonkey24/files/ Modified: head/lang/Makefile head/lang/spidermonkey24/Makefile head/lang/spidermonkey24/distinfo head/lang/spidermonkey24/pkg-plist Modified: head/lang/Makefile ============================================================================== --- head/lang/Makefile Mon Dec 16 23:54:57 2013 (r336682) +++ head/lang/Makefile Tue Dec 17 00:17:45 2013 (r336683) @@ -334,6 +334,7 @@ SUBDIR += spidermonkey17 SUBDIR += spidermonkey170 SUBDIR += spidermonkey185 + SUBDIR += spidermonkey24 SUBDIR += spl SUBDIR += squeak SUBDIR += squirrel Modified: head/lang/spidermonkey24/Makefile ============================================================================== --- head/lang/spidermonkey170/Makefile Mon Dec 16 23:54:57 2013 (r336682) +++ head/lang/spidermonkey24/Makefile Tue Dec 17 00:17:45 2013 (r336683) @@ -1,29 +1,30 @@ # Created by: Kubilay Kocak # $FreeBSD$ -PORTNAME= spidermonkey170 -PORTVERSION= 17.0.0 +PORTNAME= spidermonkey24 +PORTVERSION= 24.2.0 CATEGORIES= lang MASTER_SITES= ${MASTER_SITE_MOZILLA} +#http://people.mozilla.org/~sstangl/ MASTER_SITE_SUBDIR= js -DISTNAME= mozjs${PORTVERSION} +DISTNAME= mozjs-${PORTVERSION} MAINTAINER= kwm@FreeBSD.org -COMMENT= Standalone JavaScript based from Mozilla 17-esr +COMMENT= Standalone JavaScript based from Mozilla 24-esr BUILD_DEPENDS= zip:${PORTSDIR}/archivers/zip LIB_DEPENDS= libnspr4.so:${PORTSDIR}/devel/nspr CONFLICTS= njs-[0-9]* +USE_BZIP2= yes GNU_CONFIGURE= yes -USE_GMAKE= yes -USES= pathfix perl5 +USES= gmake pathfix perl5 USE_PERL5= build USE_LDCONFIG= yes -USE_PYTHON_BUILD= 2.5-2.7 +USE_PYTHON_BUILD= -2.7 -WRKSRC= ${WRKDIR}/mozjs${PORTVERSION}/js/src +WRKSRC= ${WRKDIR}/mozjs-${PORTVERSION}/js/src CONFIGURE_ARGS= --with-pthreads \ --with-system-nspr @@ -43,7 +44,6 @@ THREADSAFE_DESC= Enable multiple thread TRACEJIT_DESC= Enable tracing JIT support UTF8_DESC= Treat strings as UTF8 instead of ISO-8859-1 -NO_STAGE= yes .include .if ${PORT_OPTIONS:MDEBUG} @@ -108,14 +108,16 @@ CONFIGURE_TARGET= x86_64-portbld-freebsd regression-test: build @${ECHO_MSG} -n "===> Running jstests.py: " @cd ${WRKSRC} && ${SETENV} TZ=PST8PDT ${PYTHON_CMD} tests/jstests.py \ - --no-progress ./js17 + --no-progress ./js24 .if ${PORT_OPTIONS:MMETHODJIT} || ${PORT_OPTIONS:MTRACEJIT} @${ECHO_MSG} -n "===> Running jit_test.py: " @cd ${WRKSRC} && ${SETENV} TZ=PST8PDT ${PYTHON_CMD} jit-test/jit_test.py \ - --no-progress --jitflags=,m,j,mj,mjp,am,amj,amjp,amd ./js17 + --no-progress --jitflags=,m,j,mj,mjp,am,amj,amjp,amd ./js24 .endif post-install: - ${LN} -s libmozjs-17.0.so ${PREFIX}/lib/libmozjs-17.0.so.1 + ${LN} -s libmozjs-24.so ${STAGEDIR}${PREFIX}/lib/libmozjs-24.so.1 + @${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/js24 + @${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libmozjs-24.* .include Modified: head/lang/spidermonkey24/distinfo ============================================================================== --- head/lang/spidermonkey170/distinfo Mon Dec 16 23:54:57 2013 (r336682) +++ head/lang/spidermonkey24/distinfo Tue Dec 17 00:17:45 2013 (r336683) @@ -1,2 +1,2 @@ -SHA256 (mozjs17.0.0.tar.gz) = 321e964fe9386785d3bf80870640f2fa1c683e32fe988eeb201b04471c172fba -SIZE (mozjs17.0.0.tar.gz) = 6778934 +SHA256 (mozjs-24.2.0.tar.bz2) = e62f3f331ddd90df1e238c09d61a505c516fe9fd8c5c95336611d191d18437d8 +SIZE (mozjs-24.2.0.tar.bz2) = 15624530 Modified: head/lang/spidermonkey24/pkg-plist ============================================================================== --- head/lang/spidermonkey170/pkg-plist Mon Dec 16 23:54:57 2013 (r336682) +++ head/lang/spidermonkey24/pkg-plist Tue Dec 17 00:17:45 2013 (r336683) @@ -1,73 +1,81 @@ -bin/js17 -bin/js17-config -include/js-17.0/ds/BitArray.h -include/js-17.0/gc/Barrier.h -include/js-17.0/gc/Heap.h -include/js-17.0/gc/Root.h -include/js-17.0/gc/Statistics.h -include/js-17.0/gc/StoreBuffer.h -include/js-17.0/js-config.h -include/js-17.0/js.msg -include/js-17.0/js/HashTable.h -include/js-17.0/js/LegacyIntTypes.h -include/js-17.0/js/MemoryMetrics.h -include/js-17.0/js/RequiredDefines.h -include/js-17.0/js/TemplateLib.h -include/js-17.0/js/Utility.h -include/js-17.0/js/Vector.h -include/js-17.0/jsalloc.h -include/js-17.0/jsapi.h -include/js-17.0/jsatom.h -include/js-17.0/jsatom.tbl -include/js-17.0/jsclass.h -include/js-17.0/jsclist.h -include/js-17.0/jscpucfg.h -include/js-17.0/jsdbgapi.h -include/js-17.0/jsdhash.h -include/js-17.0/jsfriendapi.h -include/js-17.0/jsgc.h -include/js-17.0/jslock.h -include/js-17.0/json.h -include/js-17.0/jsperf.h -include/js-17.0/jsprf.h -include/js-17.0/jsproto.tbl -include/js-17.0/jsproxy.h -include/js-17.0/jsprvtd.h -include/js-17.0/jspubtd.h -include/js-17.0/jstypes.h -include/js-17.0/jsutil.h -include/js-17.0/jsval.h -include/js-17.0/jsversion.h -include/js-17.0/jswrapper.h -include/js-17.0/mozilla/Assertions.h -include/js-17.0/mozilla/Attributes.h -include/js-17.0/mozilla/BloomFilter.h -include/js-17.0/mozilla/CheckedInt.h -include/js-17.0/mozilla/Constants.h -include/js-17.0/mozilla/FloatingPoint.h -include/js-17.0/mozilla/GuardObjects.h -include/js-17.0/mozilla/HashFunctions.h -include/js-17.0/mozilla/Likely.h -include/js-17.0/mozilla/LinkedList.h -include/js-17.0/mozilla/MSStdInt.h -include/js-17.0/mozilla/MathAlgorithms.h -include/js-17.0/mozilla/NullPtr.h -include/js-17.0/mozilla/RangedPtr.h -include/js-17.0/mozilla/RefPtr.h -include/js-17.0/mozilla/SHA1.h -include/js-17.0/mozilla/Scoped.h -include/js-17.0/mozilla/StandardInteger.h -include/js-17.0/mozilla/ThreadLocal.h -include/js-17.0/mozilla/TypeTraits.h -include/js-17.0/mozilla/Types.h -include/js-17.0/mozilla/Util.h -include/js-17.0/mozilla/WeakPtr.h -lib/libmozjs-17.0.a -lib/libmozjs-17.0.so -lib/libmozjs-17.0.so.1 -libdata/pkgconfig/mozjs-17.0.pc -@dirrm include/js-17.0/mozilla -@dirrm include/js-17.0/js -@dirrm include/js-17.0/gc -@dirrm include/js-17.0/ds -@dirrm include/js-17.0 +bin/js24 +bin/js24-config +include/mozjs-24/js-config.h +include/mozjs-24/js.msg +include/mozjs-24/js/Anchor.h +include/mozjs-24/js/CallArgs.h +include/mozjs-24/js/CharacterEncoding.h +include/mozjs-24/js/Date.h +include/mozjs-24/js/GCAPI.h +include/mozjs-24/js/HashTable.h +include/mozjs-24/js/HeapAPI.h +include/mozjs-24/js/LegacyIntTypes.h +include/mozjs-24/js/MemoryMetrics.h +include/mozjs-24/js/PropertyKey.h +include/mozjs-24/js/RequiredDefines.h +include/mozjs-24/js/RootingAPI.h +include/mozjs-24/js/TemplateLib.h +include/mozjs-24/js/Utility.h +include/mozjs-24/js/Value.h +include/mozjs-24/js/Vector.h +include/mozjs-24/jsalloc.h +include/mozjs-24/jsapi.h +include/mozjs-24/jsclass.h +include/mozjs-24/jsclist.h +include/mozjs-24/jscpucfg.h +include/mozjs-24/jsdbgapi.h +include/mozjs-24/jsfriendapi.h +include/mozjs-24/jslock.h +include/mozjs-24/jsperf.h +include/mozjs-24/jsprf.h +include/mozjs-24/jsprototypes.h +include/mozjs-24/jsproxy.h +include/mozjs-24/jsprvtd.h +include/mozjs-24/jspubtd.h +include/mozjs-24/jstypes.h +include/mozjs-24/jsutil.h +include/mozjs-24/jsversion.h +include/mozjs-24/jswrapper.h +include/mozjs-24/mozilla/Assertions.h +include/mozjs-24/mozilla/Atomics.h +include/mozjs-24/mozilla/Attributes.h +include/mozjs-24/mozilla/BloomFilter.h +include/mozjs-24/mozilla/Casting.h +include/mozjs-24/mozilla/Char16.h +include/mozjs-24/mozilla/CheckedInt.h +include/mozjs-24/mozilla/Compiler.h +include/mozjs-24/mozilla/Constants.h +include/mozjs-24/mozilla/DebugOnly.h +include/mozjs-24/mozilla/Decimal.h +include/mozjs-24/mozilla/Endian.h +include/mozjs-24/mozilla/EnumSet.h +include/mozjs-24/mozilla/FloatingPoint.h +include/mozjs-24/mozilla/GuardObjects.h +include/mozjs-24/mozilla/HashFunctions.h +include/mozjs-24/mozilla/Likely.h +include/mozjs-24/mozilla/LinkedList.h +include/mozjs-24/mozilla/MSStdInt.h +include/mozjs-24/mozilla/MathAlgorithms.h +include/mozjs-24/mozilla/MemoryChecking.h +include/mozjs-24/mozilla/NullPtr.h +include/mozjs-24/mozilla/PodOperations.h +include/mozjs-24/mozilla/Poison.h +include/mozjs-24/mozilla/Range.h +include/mozjs-24/mozilla/RangedPtr.h +include/mozjs-24/mozilla/RefPtr.h +include/mozjs-24/mozilla/SHA1.h +include/mozjs-24/mozilla/Scoped.h +include/mozjs-24/mozilla/SplayTree.h +include/mozjs-24/mozilla/StandardInteger.h +include/mozjs-24/mozilla/ThreadLocal.h +include/mozjs-24/mozilla/TypeTraits.h +include/mozjs-24/mozilla/TypedEnum.h +include/mozjs-24/mozilla/Types.h +include/mozjs-24/mozilla/Util.h +include/mozjs-24/mozilla/WeakPtr.h +lib/libmozjs-24.so +lib/libmozjs-24.so.1 +libdata/pkgconfig/mozjs-24.pc +@dirrm include/mozjs-24/mozilla +@dirrm include/mozjs-24/js +@dirrm include/mozjs-24 From owner-svn-ports-head@FreeBSD.ORG Tue Dec 17 01:23:10 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 5F527AF7; Tue, 17 Dec 2013 01:23:10 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 4B2551564; Tue, 17 Dec 2013 01:23:10 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBH1NABT015081; Tue, 17 Dec 2013 01:23:10 GMT (envelope-from bdrewery@svn.freebsd.org) Received: (from bdrewery@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBH1NAbC015080; Tue, 17 Dec 2013 01:23:10 GMT (envelope-from bdrewery@svn.freebsd.org) Message-Id: <201312170123.rBH1NAbC015080@svn.freebsd.org> From: Bryan Drewery Date: Tue, 17 Dec 2013 01:23:10 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r336685 - head/security/openssh-portable-base X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 17 Dec 2013 01:23:10 -0000 Author: bdrewery Date: Tue Dec 17 01:23:09 2013 New Revision: 336685 URL: http://svnweb.freebsd.org/changeset/ports/336685 Log: This is stage safe Modified: head/security/openssh-portable-base/Makefile Modified: head/security/openssh-portable-base/Makefile ============================================================================== --- head/security/openssh-portable-base/Makefile Tue Dec 17 00:44:03 2013 (r336684) +++ head/security/openssh-portable-base/Makefile Tue Dec 17 01:23:09 2013 (r336685) @@ -6,6 +6,5 @@ PKGNAMESUFFIX= -portable-base MASTERDIR= ${.CURDIR}/../openssh-portable OPTIONS_SLAVE= OVERWRITE_BASE -NO_STAGE= yes .include "${MASTERDIR}/Makefile" From owner-svn-ports-head@FreeBSD.ORG Tue Dec 17 01:27:22 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 1ED63D4B; Tue, 17 Dec 2013 01:27:22 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 0AD6F15A0; Tue, 17 Dec 2013 01:27:22 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBH1RLoP015552; Tue, 17 Dec 2013 01:27:21 GMT (envelope-from bdrewery@svn.freebsd.org) Received: (from bdrewery@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBH1RLj2015551; Tue, 17 Dec 2013 01:27:21 GMT (envelope-from bdrewery@svn.freebsd.org) Message-Id: <201312170127.rBH1RLj2015551@svn.freebsd.org> From: Bryan Drewery Date: Tue, 17 Dec 2013 01:27:21 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r336686 - head/mail/qtools X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 17 Dec 2013 01:27:22 -0000 Author: bdrewery Date: Tue Dec 17 01:27:21 2013 New Revision: 336686 URL: http://svnweb.freebsd.org/changeset/ports/336686 Log: Mark RESTRICTED and match /usr/ports/LEGAL Modified: head/mail/qtools/Makefile Modified: head/mail/qtools/Makefile ============================================================================== --- head/mail/qtools/Makefile Tue Dec 17 01:23:09 2013 (r336685) +++ head/mail/qtools/Makefile Tue Dec 17 01:27:21 2013 (r336686) @@ -18,6 +18,8 @@ NO_STAGE= yes ALL_TARGET= it INSTALL_TARGET= setup check +RESTRICTED= Possibly restricted binary distribution of modified versions + EZMLM_DIR?= ${LOCALBASE} post-patch: From owner-svn-ports-head@FreeBSD.ORG Tue Dec 17 02:13:55 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id EC6D92EC; Tue, 17 Dec 2013 02:13:55 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id D7F8919D5; Tue, 17 Dec 2013 02:13:55 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBH2DtRt033047; Tue, 17 Dec 2013 02:13:55 GMT (envelope-from swills@svn.freebsd.org) Received: (from swills@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBH2Dt44033044; Tue, 17 Dec 2013 02:13:55 GMT (envelope-from swills@svn.freebsd.org) Message-Id: <201312170213.rBH2Dt44033044@svn.freebsd.org> From: Steve Wills Date: Tue, 17 Dec 2013 02:13:55 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r336687 - in head/net-p2p/bitcoin: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 17 Dec 2013 02:13:56 -0000 Author: swills Date: Tue Dec 17 02:13:55 2013 New Revision: 336687 URL: http://svnweb.freebsd.org/changeset/ports/336687 Log: - Update to 0.8.6 PR: ports/184655 Submitted by: Robert Backahus (maintainer) Deleted: head/net-p2p/bitcoin/files/patch-init_cpp Modified: head/net-p2p/bitcoin/Makefile head/net-p2p/bitcoin/distinfo Modified: head/net-p2p/bitcoin/Makefile ============================================================================== --- head/net-p2p/bitcoin/Makefile Tue Dec 17 01:27:21 2013 (r336686) +++ head/net-p2p/bitcoin/Makefile Tue Dec 17 02:13:55 2013 (r336687) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= bitcoin -PORTVERSION= 0.8.5 +PORTVERSION= 0.8.6 CATEGORIES= net-p2p finance MASTER_SITES= ${MASTER_SITE_LOCAL} \ http://people.freebsd.org/~swills/ \ @@ -23,7 +23,7 @@ QRCODES_DESC= Build with QR code display USE_GITHUB= yes GH_ACCOUNT= bitcoin GH_PROJECT= bitcoin -GH_COMMIT= 8090e11 +GH_COMMIT= 15e2837 GH_TAGNAME= v${PORTVERSION} USE_GMAKE= yes Modified: head/net-p2p/bitcoin/distinfo ============================================================================== --- head/net-p2p/bitcoin/distinfo Tue Dec 17 01:27:21 2013 (r336686) +++ head/net-p2p/bitcoin/distinfo Tue Dec 17 02:13:55 2013 (r336687) @@ -1,2 +1,2 @@ -SHA256 (bitcoin-0.8.5.tar.gz) = 0a60bda22fb198a2682a6a0b3c82b3da053f76efdd5930eae9af3792bdc4bffe -SIZE (bitcoin-0.8.5.tar.gz) = 3181937 +SHA256 (bitcoin-0.8.6.tar.gz) = 0703ce3fce77b63bce11388790176f5626b521b7403d72db1ed452c692fdc55d +SIZE (bitcoin-0.8.6.tar.gz) = 3194755 From owner-svn-ports-head@FreeBSD.ORG Tue Dec 17 02:42:29 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 2AB7CCF3; Tue, 17 Dec 2013 02:42:29 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 16EE51D1E; Tue, 17 Dec 2013 02:42:29 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBH2gSZe043680; Tue, 17 Dec 2013 02:42:28 GMT (envelope-from demon@svn.freebsd.org) Received: (from demon@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBH2gS3m043677; Tue, 17 Dec 2013 02:42:28 GMT (envelope-from demon@svn.freebsd.org) Message-Id: <201312170242.rBH2gS3m043677@svn.freebsd.org> From: Dmitry Sivachenko Date: Tue, 17 Dec 2013 02:42:28 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r336688 - in head/net/haproxy-devel: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 17 Dec 2013 02:42:29 -0000 Author: demon Date: Tue Dec 17 02:42:28 2013 New Revision: 336688 URL: http://svnweb.freebsd.org/changeset/ports/336688 Log: Update to -dev21. Deleted: head/net/haproxy-devel/files/patch-0001-BUG-MAJOR-patterns-fix-double-free-caused-by-loading.patch Modified: head/net/haproxy-devel/Makefile head/net/haproxy-devel/distinfo Modified: head/net/haproxy-devel/Makefile ============================================================================== --- head/net/haproxy-devel/Makefile Tue Dec 17 02:13:55 2013 (r336687) +++ head/net/haproxy-devel/Makefile Tue Dec 17 02:42:28 2013 (r336688) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= haproxy -DISTVERSION= 1.5-dev20 +DISTVERSION= 1.5-dev21 CATEGORIES= net MASTER_SITES= http://haproxy.1wt.eu/download/1.5/src/devel/ PKGNAMESUFFIX= -devel Modified: head/net/haproxy-devel/distinfo ============================================================================== --- head/net/haproxy-devel/distinfo Tue Dec 17 02:13:55 2013 (r336687) +++ head/net/haproxy-devel/distinfo Tue Dec 17 02:42:28 2013 (r336688) @@ -1,2 +1,2 @@ -SHA256 (haproxy-1.5-dev20.tar.gz) = 8cd2260f5392b8e135a838754cb08ecd2d571d83dd6a2a4589c2085c75484359 -SIZE (haproxy-1.5-dev20.tar.gz) = 1197573 +SHA256 (haproxy-1.5-dev21.tar.gz) = 08a242df5e8be21f52eb8696fcf6214993c5327bc900f3154aef2015824028ed +SIZE (haproxy-1.5-dev21.tar.gz) = 1198613 From owner-svn-ports-head@FreeBSD.ORG Tue Dec 17 03:07:01 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id C5762BEB; Tue, 17 Dec 2013 03:07:01 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id A68911F7C; Tue, 17 Dec 2013 03:07:01 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBH371MK052738; Tue, 17 Dec 2013 03:07:01 GMT (envelope-from brd@svn.freebsd.org) Received: (from brd@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBH371hZ052733; Tue, 17 Dec 2013 03:07:01 GMT (envelope-from brd@svn.freebsd.org) Message-Id: <201312170307.rBH371hZ052733@svn.freebsd.org> From: Brad Davis Date: Tue, 17 Dec 2013 03:07:01 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r336690 - in head/sysutils/rsyslog7-devel: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 17 Dec 2013 03:07:01 -0000 Author: brd (doc committer) Date: Tue Dec 17 03:07:00 2013 New Revision: 336690 URL: http://svnweb.freebsd.org/changeset/ports/336690 Log: - Update sysutils/rsyslog7-devel to 7.5.7 - Sync the Makefile with sysutils/rsyslog7 to make updates easier Reviewed by: swills@ Deleted: head/sysutils/rsyslog7-devel/files/patch-plugins--impstats--impstats.c Modified: head/sysutils/rsyslog7-devel/Makefile head/sysutils/rsyslog7-devel/distinfo Modified: head/sysutils/rsyslog7-devel/Makefile ============================================================================== --- head/sysutils/rsyslog7-devel/Makefile Tue Dec 17 02:49:20 2013 (r336689) +++ head/sysutils/rsyslog7-devel/Makefile Tue Dec 17 03:07:00 2013 (r336690) @@ -1,23 +1,22 @@ # $FreeBSD$ PORTNAME= rsyslog -PORTVERSION= 7.5.5 -PORTREVISION= 1 +PORTVERSION= 7.5.7 CATEGORIES= sysutils MASTER_SITES= http://www.rsyslog.com/files/download/rsyslog/ MAINTAINER= brd@FreeBSD.org COMMENT= Syslogd supporting SQL, TCP, and TLS -GNU_CONFIGURE= yes -USE_LDCONFIG= yes +BUILD_DEPENDS= libgcrypt-config:${PORTSDIR}/security/libgcrypt -LIB_DEPENDS= ee:${PORTSDIR}/devel/libee \ - estr:${PORTSDIR}/devel/libestr \ +LIB_DEPENDS= libee.so:${PORTSDIR}/devel/libee \ + libestr.so:${PORTSDIR}/devel/libestr \ libjson.so:${PORTSDIR}/devel/json-c \ - uuid:${PORTSDIR}/misc/e2fsprogs-libuuid + libuuid.so:${PORTSDIR}/misc/e2fsprogs-libuuid -BUILD_DEPENDS= libgcrypt-config:${PORTSDIR}/security/libgcrypt +USE_LDCONFIG= yes +USE_AUTOTOOLS= autoconf PORTSCOUT= limit:^7\.5 PORTDOCS= * @@ -37,11 +36,10 @@ SNMP_DESC= SNMP trap sender for rsyslog USES= pkgconfig -NO_STAGE= yes .include .if ${PORT_OPTIONS:MDBI} -LIB_DEPENDS+= dbi.1:${PORTSDIR}/databases/libdbi +LIB_DEPENDS+= libdbi.so:${PORTSDIR}/databases/libdbi CONFIGURE_ARGS+=--enable-libdbi PLIST_FILES+= lib/rsyslog/omlibdbi.la \ lib/rsyslog/omlibdbi.so @@ -50,8 +48,8 @@ CONFIGURE_ARGS+=--disable-libdbi .endif .if ${PORT_OPTIONS:MGNUTLS} -LIB_DEPENDS+= gnutls.26:${PORTSDIR}/security/gnutls \ - gcrypt:${PORTSDIR}/security/libgcrypt +LIB_DEPENDS+= libgnutls.so:${PORTSDIR}/security/gnutls \ + libgcrypt.so:${PORTSDIR}/security/libgcrypt CONFIGURE_ARGS+=--enable-gnutls PLIST_FILES+= lib/rsyslog/lmnsd_gtls.la \ lib/rsyslog/lmnsd_gtls.so @@ -90,7 +88,7 @@ CONFIGURE_ARGS+=--disable-pgsql .endif .if ${PORT_OPTIONS:MRELP} -LIB_DEPENDS+= relp.0:${PORTSDIR}/devel/librelp +LIB_DEPENDS+= librelp.so:${PORTSDIR}/devel/librelp CONFIGURE_ARGS+=--enable-relp PLIST_FILES+= lib/rsyslog/imrelp.la \ lib/rsyslog/imrelp.so \ @@ -101,7 +99,7 @@ CONFIGURE_ARGS+=--disable-relp .endif .if ${PORT_OPTIONS:MRFC3195} -LIB_DEPENDS+= logging.0:${PORTSDIR}/devel/liblogging +LIB_DEPENDS+= liblogging.so:${PORTSDIR}/devel/liblogging CONFIGURE_ARGS+=--enable-rfc3195 PLIST_FILES+= lib/rsyslog/im3195.la \ lib/rsyslog/im3195.so @@ -110,7 +108,7 @@ CONFIGURE_ARGS+=--disable-rfc3195 .endif .if ${PORT_OPTIONS:MSNMP} -LIB_DEPENDS+= netsnmp.30:${PORTSDIR}/net-mgmt/net-snmp +LIB_DEPENDS+= libnetsnmp.so:${PORTSDIR}/net-mgmt/net-snmp CONFIGURE_ARGS+=--enable-snmp PLIST_FILES+= lib/rsyslog/omsnmp.la \ lib/rsyslog/omsnmp.so @@ -130,6 +128,7 @@ CONFLICTS= rsyslog6-* rsyslog-[0-9].* CFLAGS+= -I${LOCALBASE}/include CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib +GNU_CONFIGURE= yes .ifdef WITH_DEBUG CONFIGURE_ARGS+=--enable-rtinst --enable-debug @@ -144,13 +143,10 @@ CPPFLAGS+=-march=i686 CONFIGURE_ENV+= LIBESTR_CFLAGS="${CFLAGS}" LIBESTR_LIBS="${LDFLAGS} -lestr" LIBEE_CFLAGS="${CFLAGS}" LIBEE_LIBS="${LDFLAGS} -lee -lkvm" CFLAGS+= ${CPPFLAGS} -MAN8= rsyslogd.8 -MAN5= rsyslog.conf.5 - USE_RC_SUBR= ${PORTNAME}d SUB_FILES= pkg-message -CONFIGURE_ARGS+= --enable-imfile --enable-mail --enable-imdiag --enable-impstats --enable-omstdout --enable-cached-man-pages +CONFIGURE_ARGS+= --enable-imfile --enable-mail --enable-imdiag --enable-impstats --enable-omstdout --enable-cached-man-pages --disable-testbench post-patch: @${REINPLACE_CMD} -e 's|/lib/rsyslog/|${PREFIX}/lib/rsyslog/|'\ @@ -161,15 +157,9 @@ post-patch: @${FIND} ${WRKSRC} -name '*.bak' -delete post-install: -.if ${PORT_OPTIONS:MDOCS} - @${INSTALL} -d ${DOCSDIR}/ - @${INSTALL_DATA} ${WRKSRC}/doc/*html ${DOCSDIR}/ - @${INSTALL_DATA} ${WRKSRC}/doc/*jpg ${DOCSDIR}/ -.endif -.if ${PORT_OPTIONS:MEXAMPLES} - @${INSTALL} -d ${EXAMPLESDIR} - @${INSTALL_DATA} ${WRKSRC}/doc/rsyslog-example.conf ${EXAMPLESDIR} -.endif - @${CAT} ${PKGMESSAGE} + @${INSTALL} -d ${STAGEDIR}${DOCSDIR}/ + @${INSTALL_DATA} ${WRKSRC}/doc/*html ${STAGEDIR}${DOCSDIR}/ + @${INSTALL} -d ${STAGEDIR}${EXAMPLESDIR} + @${INSTALL_DATA} ${WRKSRC}/doc/rsyslog-example.conf ${STAGEDIR}${EXAMPLESDIR} .include Modified: head/sysutils/rsyslog7-devel/distinfo ============================================================================== --- head/sysutils/rsyslog7-devel/distinfo Tue Dec 17 02:49:20 2013 (r336689) +++ head/sysutils/rsyslog7-devel/distinfo Tue Dec 17 03:07:00 2013 (r336690) @@ -1,2 +1,2 @@ -SHA256 (rsyslog-7.5.5.tar.gz) = 0c63fd9f963a366aa1b4003852542da1a727e82c092d1fd3a0ab3260815d07a4 -SIZE (rsyslog-7.5.5.tar.gz) = 2996834 +SHA256 (rsyslog-7.5.7.tar.gz) = 0bc21d20e5b3460554d7c60d347f3207153c52c68b6b870bfa7f27163c24682a +SIZE (rsyslog-7.5.7.tar.gz) = 2592596 From owner-svn-ports-head@FreeBSD.ORG Tue Dec 17 03:32:46 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 378F6878; Tue, 17 Dec 2013 03:32:46 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 23BB911D7; Tue, 17 Dec 2013 03:32:46 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBH3Wk2U063134; Tue, 17 Dec 2013 03:32:46 GMT (envelope-from dbn@svn.freebsd.org) Received: (from dbn@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBH3WjoE063133; Tue, 17 Dec 2013 03:32:45 GMT (envelope-from dbn@svn.freebsd.org) Message-Id: <201312170332.rBH3WjoE063133@svn.freebsd.org> From: David Naylor Date: Tue, 17 Dec 2013 03:32:45 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r336691 - head/x11-toolkits/py-kivy X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 17 Dec 2013 03:32:46 -0000 Author: dbn Date: Tue Dec 17 03:32:45 2013 New Revision: 336691 URL: http://svnweb.freebsd.org/changeset/ports/336691 Log: Fix build of x11-toolkits/py-kivy on some systems (pygame.joystick related). On some systems pygame.joystick does not import into python preventing some documentation from being built, thus some missing files on install. For documentation building prevent any attempt to import pygame.joystick as a work-around. Modified: head/x11-toolkits/py-kivy/Makefile Modified: head/x11-toolkits/py-kivy/Makefile ============================================================================== --- head/x11-toolkits/py-kivy/Makefile Tue Dec 17 03:07:00 2013 (r336690) +++ head/x11-toolkits/py-kivy/Makefile Tue Dec 17 03:32:45 2013 (r336691) @@ -122,6 +122,8 @@ post-build: do-build-docs do-build-docs: ${MKDIR} ${WRKSRC}/doc/build/doctrees ${WRKSRC}/doc/build/html \ ${WRKSRC}/doc/build/latex-a4 ${WRKSRC}/doc/build/latex-letter + ${REINPLACE_CMD} -i '' -e 's/\(import pygame\.joystick\)/#\1/' \ + ${WRKSRC}/kivy/input/providers/androidjoystick.py (cd ${WRKSRC}; \ ${SETENV} ${MAKE_ENV} ${PYTHON_CMD} doc/autobuild.py) (cd ${WRKSRC}; \ @@ -142,6 +144,8 @@ do-build-docs: ${SETENV} ${MAKE_ENV} ${GMAKE} -C ${WRKSRC}/doc/build/latex-letter \ all-pdf > /dev/null .endif + ${REINPLACE_CMD} -i '' -e 's/#\(import pygame\.joystick\)/\1/' \ + ${WRKSRC}/kivy/input/providers/androidjoystick.py post-install: do-install-docs From owner-svn-ports-head@FreeBSD.ORG Tue Dec 17 03:55:43 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 577E51D6; Tue, 17 Dec 2013 03:55:43 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 4425413B4; Tue, 17 Dec 2013 03:55:43 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBH3thCl070490; Tue, 17 Dec 2013 03:55:43 GMT (envelope-from fluffy@svn.freebsd.org) Received: (from fluffy@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBH3thuA070489; Tue, 17 Dec 2013 03:55:43 GMT (envelope-from fluffy@svn.freebsd.org) Message-Id: <201312170355.rBH3thuA070489@svn.freebsd.org> From: Dima Panov Date: Tue, 17 Dec 2013 03:55:43 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r336692 - head/palm/libmal X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 17 Dec 2013 03:55:43 -0000 Author: fluffy Date: Tue Dec 17 03:55:42 2013 New Revision: 336692 URL: http://svnweb.freebsd.org/changeset/ports/336692 Log: - Add STAGE and LICENSE support - Remove USE_GMAKE in favor of USES - Update LIB_DEPENDS to new format PR: 184781 Submitted by: Steven Kreuzer Modified: head/palm/libmal/Makefile (contents, props changed) Modified: head/palm/libmal/Makefile ============================================================================== --- head/palm/libmal/Makefile Tue Dec 17 03:32:45 2013 (r336691) +++ head/palm/libmal/Makefile Tue Dec 17 03:55:42 2013 (r336692) @@ -9,14 +9,14 @@ MASTER_SITES= http://www.jlogday.com/cod MAINTAINER= fluffy@FreeBSD.org COMMENT= A library encapsulating malsync -LIB_DEPENDS= pisock.9:${PORTSDIR}/palm/pilot-link +LICENSE= MPL -USE_GMAKE= YES +LIB_DEPENDS= libpisock.so.9:${PORTSDIR}/palm/pilot-link + +USES= gmake GNU_CONFIGURE= yes -HAS_CONFIGURE= YES CONFIGURE_ARGS= --with-pilot-prefix=${LOCALBASE} USE_LDCONFIG= YES CONFLICTS= malsync-[0-9]* -NO_STAGE= yes .include From owner-svn-ports-head@FreeBSD.ORG Tue Dec 17 04:07:42 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 2A9307F1; Tue, 17 Dec 2013 04:07:42 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id F16A01528; Tue, 17 Dec 2013 04:07:41 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBH47fBu074788; Tue, 17 Dec 2013 04:07:41 GMT (envelope-from brd@svn.freebsd.org) Received: (from brd@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBH47fPr074785; Tue, 17 Dec 2013 04:07:41 GMT (envelope-from brd@svn.freebsd.org) Message-Id: <201312170407.rBH47fPr074785@svn.freebsd.org> From: Brad Davis Date: Tue, 17 Dec 2013 04:07:41 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r336693 - in head/sysutils: . rsyslog8-devel X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 17 Dec 2013 04:07:42 -0000 Author: brd (doc committer) Date: Tue Dec 17 04:07:41 2013 New Revision: 336693 URL: http://svnweb.freebsd.org/changeset/ports/336693 Log: - Add sysutils/rsyslog8-devel at version 8.1.3 Reviewed by: swills@ Added: head/sysutils/rsyslog8-devel/ - copied from r336692, head/sysutils/rsyslog7-devel/ Modified: head/sysutils/Makefile head/sysutils/rsyslog8-devel/Makefile head/sysutils/rsyslog8-devel/distinfo Modified: head/sysutils/Makefile ============================================================================== --- head/sysutils/Makefile Tue Dec 17 03:55:42 2013 (r336692) +++ head/sysutils/Makefile Tue Dec 17 04:07:41 2013 (r336693) @@ -790,6 +790,7 @@ SUBDIR += rsyncrypto SUBDIR += rsyslog7 SUBDIR += rsyslog7-devel + SUBDIR += rsyslog8-devel SUBDIR += rtty SUBDIR += ruby-quota SUBDIR += rubygem-SyslogLogger Modified: head/sysutils/rsyslog8-devel/Makefile ============================================================================== --- head/sysutils/rsyslog7-devel/Makefile Tue Dec 17 03:55:42 2013 (r336692) +++ head/sysutils/rsyslog8-devel/Makefile Tue Dec 17 04:07:41 2013 (r336693) @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= rsyslog -PORTVERSION= 7.5.7 +PORTVERSION= 8.1.3 CATEGORIES= sysutils MASTER_SITES= http://www.rsyslog.com/files/download/rsyslog/ @@ -18,7 +18,7 @@ LIB_DEPENDS= libee.so:${PORTSDIR}/devel/ USE_LDCONFIG= yes USE_AUTOTOOLS= autoconf -PORTSCOUT= limit:^7\.5 +PORTSCOUT= limit:^8\.1 PORTDOCS= * PORTEXAMPLES= * PKGNAMESUFFIX= -devel Modified: head/sysutils/rsyslog8-devel/distinfo ============================================================================== --- head/sysutils/rsyslog7-devel/distinfo Tue Dec 17 03:55:42 2013 (r336692) +++ head/sysutils/rsyslog8-devel/distinfo Tue Dec 17 04:07:41 2013 (r336693) @@ -1,2 +1,2 @@ -SHA256 (rsyslog-7.5.7.tar.gz) = 0bc21d20e5b3460554d7c60d347f3207153c52c68b6b870bfa7f27163c24682a -SIZE (rsyslog-7.5.7.tar.gz) = 2592596 +SHA256 (rsyslog-8.1.3.tar.gz) = e2e5e12500b6d2a8be80558b2f71da6408a1fc9889eb22c74fba819aaf4bcd45 +SIZE (rsyslog-8.1.3.tar.gz) = 2608152 From owner-svn-ports-head@FreeBSD.ORG Tue Dec 17 05:35:48 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 2F7CE13E; Tue, 17 Dec 2013 05:35:48 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 1B51F1D23; Tue, 17 Dec 2013 05:35:48 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBH5Zlc2007266; Tue, 17 Dec 2013 05:35:47 GMT (envelope-from amdmi3@svn.freebsd.org) Received: (from amdmi3@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBH5Zlqs007264; Tue, 17 Dec 2013 05:35:47 GMT (envelope-from amdmi3@svn.freebsd.org) Message-Id: <201312170535.rBH5Zlqs007264@svn.freebsd.org> From: Dmitry Marakasov Date: Tue, 17 Dec 2013 05:35:47 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r336694 - in head/x11: avant-window-navigator avant-window-navigator-gnome X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 17 Dec 2013 05:35:48 -0000 Author: amdmi3 Date: Tue Dec 17 05:35:47 2013 New Revision: 336694 URL: http://svnweb.freebsd.org/changeset/ports/336694 Log: - Support staging - Whitespace fix Modified: head/x11/avant-window-navigator-gnome/Makefile head/x11/avant-window-navigator/Makefile Modified: head/x11/avant-window-navigator-gnome/Makefile ============================================================================== --- head/x11/avant-window-navigator-gnome/Makefile Tue Dec 17 04:07:41 2013 (r336693) +++ head/x11/avant-window-navigator-gnome/Makefile Tue Dec 17 05:35:47 2013 (r336694) @@ -2,8 +2,7 @@ # $FreeBSD$ PORTREVISION= 7 -AWN_DESKTOP= gnome -MASTERDIR= ${.CURDIR}/../avant-window-navigator +AWN_DESKTOP= gnome +MASTERDIR= ${.CURDIR}/../avant-window-navigator -NO_STAGE= yes .include <${MASTERDIR}/Makefile> Modified: head/x11/avant-window-navigator/Makefile ============================================================================== --- head/x11/avant-window-navigator/Makefile Tue Dec 17 04:07:41 2013 (r336693) +++ head/x11/avant-window-navigator/Makefile Tue Dec 17 05:35:47 2013 (r336694) @@ -47,7 +47,6 @@ CONFIGURE_ARGS+= --with-desktop=agnostic CONFLICTS= ${PORTNAME}-gnome-[0-9]* ${PORTNAME}-xfce4-[0-9]* .endif -NO_STAGE= yes .include .if ${PORT_OPTIONS:MGCONF} From owner-svn-ports-head@FreeBSD.ORG Tue Dec 17 06:29:37 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id D0B3C91; Tue, 17 Dec 2013 06:29:37 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id BCB8D110D; Tue, 17 Dec 2013 06:29:37 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBH6TbN6025685; Tue, 17 Dec 2013 06:29:37 GMT (envelope-from danfe@svn.freebsd.org) Received: (from danfe@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBH6TbDR025683; Tue, 17 Dec 2013 06:29:37 GMT (envelope-from danfe@svn.freebsd.org) Message-Id: <201312170629.rBH6TbDR025683@svn.freebsd.org> From: Alexey Dokuchaev Date: Tue, 17 Dec 2013 06:29:37 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r336695 - head/games/netradiant X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 17 Dec 2013 06:29:37 -0000 Author: danfe Date: Tue Dec 17 06:29:37 2013 New Revision: 336695 URL: http://svnweb.freebsd.org/changeset/ports/336695 Log: Fix packaging on !i386. Modified: head/games/netradiant/Makefile head/games/netradiant/pkg-plist Modified: head/games/netradiant/Makefile ============================================================================== --- head/games/netradiant/Makefile Tue Dec 17 05:35:47 2013 (r336694) +++ head/games/netradiant/Makefile Tue Dec 17 06:29:37 2013 (r336695) @@ -32,6 +32,7 @@ LDFLAGS+= -L${LOCALBASE}/lib SUB_FILES= ${PORTNAME} SUB_LIST= ARCH=${ARCH} +PLIST_SUB:= ${SUB_LIST} post-patch: # Add missing checks for __FreeBSD__ Modified: head/games/netradiant/pkg-plist ============================================================================== --- head/games/netradiant/pkg-plist Tue Dec 17 05:35:47 2013 (r336694) +++ head/games/netradiant/pkg-plist Tue Dec 17 06:29:37 2013 (r336695) @@ -97,7 +97,7 @@ man/man6/q3map2.6.gz %%DATADIR%%/gl/zfill_vp.glp %%DATADIR%%/gl/zfill_vp.glsl %%DATADIR%%/global.xlink -%%DATADIR%%/heretic2/h2data.i386 +%%DATADIR%%/heretic2/h2data.%%ARCH%% %%DATADIR%%/modules/archivepak.so %%DATADIR%%/modules/archivewad.so %%DATADIR%%/modules/archivezip.so @@ -157,12 +157,12 @@ man/man6/q3map2.6.gz %%DATADIR%%/plugins/ufoaiplug.so %%DATADIR%%/q1.game/default_build_menu.xml %%DATADIR%%/q1.game/id1/entities.ent -%%DATADIR%%/q2map.i386 -%%DATADIR%%/q3data.i386 +%%DATADIR%%/q2map.%%ARCH%% +%%DATADIR%%/q3data.%%ARCH%% %%DATADIR%%/q3data.qdt -%%DATADIR%%/q3map2.i386 -%%DATADIR%%/qdata3.i386 -%%DATADIR%%/radiant.i386 +%%DATADIR%%/q3map2.%%ARCH%% +%%DATADIR%%/qdata3.%%ARCH%% +%%DATADIR%%/radiant.%%ARCH%% %%DATADIR%%/warsow.game/basewsw/default_shaderlist.txt %%DATADIR%%/warsow.game/basewsw/entities.def %%DATADIR%%/warsow.game/default_build_menu.xml From owner-svn-ports-head@FreeBSD.ORG Tue Dec 17 08:02:00 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id BE21158B; Tue, 17 Dec 2013 08:02:00 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id A931817A4; Tue, 17 Dec 2013 08:02:00 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBH820af060237; Tue, 17 Dec 2013 08:02:00 GMT (envelope-from dinoex@svn.freebsd.org) Received: (from dinoex@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBH820lo060232; Tue, 17 Dec 2013 08:02:00 GMT (envelope-from dinoex@svn.freebsd.org) Message-Id: <201312170802.rBH820lo060232@svn.freebsd.org> From: Dirk Meyer Date: Tue, 17 Dec 2013 08:02:00 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r336696 - head/print/a2ps X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 17 Dec 2013 08:02:00 -0000 Author: dinoex Date: Tue Dec 17 08:01:59 2013 New Revision: 336696 URL: http://svnweb.freebsd.org/changeset/ports/336696 Log: - use STAGEDIR - use OPT_USE, OPT_USES, OPT_CONFIGURE_* - update LIB_DEPENDS Modified: head/print/a2ps/Makefile head/print/a2ps/pkg-plist Modified: head/print/a2ps/Makefile ============================================================================== --- head/print/a2ps/Makefile Tue Dec 17 06:29:37 2013 (r336695) +++ head/print/a2ps/Makefile Tue Dec 17 08:01:59 2013 (r336696) @@ -14,17 +14,14 @@ COMMENT= Formats an ASCII file for print LICENSE= GPLv2 -LIB_DEPENDS= paper:${PORTSDIR}/print/libpaper +LIB_DEPENDS= libpaper.so:${PORTSDIR}/print/libpaper PORTSCOUT= skipv:4.14 -NO_STAGE= yes USES= perl5 USE_CSTD= gnu89 GNU_CONFIGURE= yes USE_LDCONFIG= yes -MAN1= a2ps.1 ogonkify.1 card.1 psmandup.1 fixps.1 pdiff.1 psset.1 \ - texi2dvi4a2ps.1 INFO= a2ps ogonkify regex WRKSRC= ${WRKDIR}/${PORTNAME}-4.13 I18N_PACKAGE= i18n-fonts-0.1 @@ -43,31 +40,28 @@ RUN_DEPENDS+= ${LOCALBASE}/etc/papersize OPTIONS_DEFINE=NLS I18N EMACS OPTIONS_DEFAULT=NLS NO_OPTIONS_SORT=yes +OPTIONS_SUB= yes EMACS_DESC=Enable Emacs support I18N_DESC=Enable I18N support -.include +NLS_USES= gettext +NLS_CONFIGURE_ENABLE= nls +EMACS_USE= EMACS=yes +EMACS_CONFIGURE_ON= --with-lispdir=${LOCALBASE}/${EMACS_SITE_LISPDIR} -.if ${PORT_OPTIONS:MNLS} -USES+= gettext -PLIST_SUB+= NLS="" -.else -CONFIGURE_ARGS+= --disable-nls -PLIST_SUB+= NLS="@comment " -.endif +.include -.if ${PORT_OPTIONS:MEMACS} -USE_EMACS= yes -CONFIGURE_ARGS+= --with-lispdir=${LOCALBASE}/${EMACS_SITE_LISPDIR} -PLIST_SUB+= WITHEMACS="" -.else +.if ! ${PORT_OPTIONS:MEMACS} CONFIGURE_ENV+= EMACS=no -PLIST_SUB+= WITHEMACS="@comment " .endif +post-patch: + ${REINPLACE_CMD} -e 's|^DESTDIR|#DESTDIR|' \ + `${FIND} ${WRKSRC} -name "Makefile.in"` + .if ${PORT_OPTIONS:MI18N} +#DISTFILES+= ${I18N_PACKAGE}${EXTRACT_SUFX}:i18n DISTFILES= ${DISTNAME}${EXTRACT_SUFX} ${I18N_PACKAGE}${EXTRACT_SUFX}:i18n -PLIST_SUB+= WITHI18N="" pre-configure: cd ${WRKDIR}/${I18N_PACKAGE}/afm && \ @@ -83,21 +77,19 @@ post-configure: @cd ${WRKSRC}/afm && { ${ECHO} ''; \ ${ECHO} "i18n_afms =" `cat ${WRKDIR}/${I18N_PACKAGE}/afm/afms.lst`; } >> Makefile && \ ${REINPLACE_CMD} 's,^\(all_afms = .*\),\1 $$(i18n_afms),' Makefile -.else -PLIST_SUB+= WITHI18N="@comment " .endif post-install: - ${STRIP_CMD} ${PREFIX}/bin/a2ps + ${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/a2ps .if ${PORT_OPTIONS:MEMACS} - ${MKDIR} ${PREFIX}/lib/xemacs/site-lisp - ${LN} -sf ${PREFIX}/share/emacs/site-lisp/a2ps-print.el \ - ${PREFIX}/lib/xemacs/site-lisp/a2ps-print.el - ${LN} -sf ${PREFIX}/share/emacs/site-lisp/a2ps.el \ - ${PREFIX}/lib/xemacs/site-lisp/a2ps.el + ${MKDIR} ${STAGEDIR}${PREFIX}/lib/xemacs/site-lisp + ${LN} -sf ${STAGEDIR}${PREFIX}/share/emacs/site-lisp/a2ps-print.el \ + ${STAGEDIR}${PREFIX}/lib/xemacs/site-lisp/a2ps-print.el + ${LN} -sf ${STAGEDIR}${PREFIX}/share/emacs/site-lisp/a2ps.el \ + ${STAGEDIR}${PREFIX}/lib/xemacs/site-lisp/a2ps.el .endif cd ${WRKSRC}/doc && \ - ${SETENV} ${MAKE_ENV} ${MAKE} ${.MAKEFLAGS} ${INSTALL_TARGET} - ${RM} -f ${PREFIX}/lib/liba2ps.la + ${SETENV} ${MAKE_ENV} ${MAKE} ${.MAKEFLAGS} ${MAKE_ARGS} ${INSTALL_TARGET} + ${RM} -f ${STAGEDIR}${PREFIX}/lib/liba2ps.la .include Modified: head/print/a2ps/pkg-plist ============================================================================== --- head/print/a2ps/pkg-plist Tue Dec 17 06:29:37 2013 (r336695) +++ head/print/a2ps/pkg-plist Tue Dec 17 08:01:59 2013 (r336696) @@ -12,6 +12,14 @@ etc/a2ps-site.cfg etc/a2ps.cfg include/liba2ps.h lib/liba2ps.a +man/man1/a2ps.1.gz +man/man1/ogonkify.1.gz +man/man1/card.1.gz +man/man1/psmandup.1.gz +man/man1/fixps.1.gz +man/man1/pdiff.1.gz +man/man1/psset.1.gz +man/man1/texi2dvi4a2ps.1.gz %%DATADIR%%/README %%DATADIR%%/afm/fonts.map %%DATADIR%%/afm/make_fonts_map.sh @@ -47,16 +55,16 @@ lib/liba2ps.a %%DATADIR%%/afm/ptmr.afm %%DATADIR%%/afm/pzcmi.afm %%DATADIR%%/afm/pzdr.afm -%%WITHI18N%%%%DATADIR%%/afm/colle10.afm -%%WITHI18N%%%%DATADIR%%/afm/colle8.afm -%%WITHI18N%%%%DATADIR%%/afm/colle9.afm -%%WITHI18N%%%%DATADIR%%/afm/crr35__i.afm -%%WITHI18N%%%%DATADIR%%/afm/crr36__i.afm -%%WITHI18N%%%%DATADIR%%/afm/crr55__i.afm -%%WITHI18N%%%%DATADIR%%/afm/crr56__i.afm -%%WITHI18N%%%%DATADIR%%/afm/textb18.afm -%%WITHI18N%%%%DATADIR%%/afm/textb19.afm -%%WITHI18N%%%%DATADIR%%/afm/textb20.afm +%%I18N%%%%DATADIR%%/afm/colle10.afm +%%I18N%%%%DATADIR%%/afm/colle8.afm +%%I18N%%%%DATADIR%%/afm/colle9.afm +%%I18N%%%%DATADIR%%/afm/crr35__i.afm +%%I18N%%%%DATADIR%%/afm/crr36__i.afm +%%I18N%%%%DATADIR%%/afm/crr55__i.afm +%%I18N%%%%DATADIR%%/afm/crr56__i.afm +%%I18N%%%%DATADIR%%/afm/textb18.afm +%%I18N%%%%DATADIR%%/afm/textb19.afm +%%I18N%%%%DATADIR%%/afm/textb20.afm %%DATADIR%%/encoding/ascii.edf %%DATADIR%%/encoding/encoding.map %%DATADIR%%/encoding/hp.edf @@ -76,16 +84,16 @@ lib/liba2ps.a %%DATADIR%%/encoding/mac.edf %%DATADIR%%/encoding/ms-cp1250.edf %%DATADIR%%/fonts/pcfont.pfa -%%WITHI18N%%%%DATADIR%%/fonts/colle10.pfb -%%WITHI18N%%%%DATADIR%%/fonts/colle8.pfb -%%WITHI18N%%%%DATADIR%%/fonts/colle9.pfb -%%WITHI18N%%%%DATADIR%%/fonts/crr35__i.pfb -%%WITHI18N%%%%DATADIR%%/fonts/crr36__i.pfb -%%WITHI18N%%%%DATADIR%%/fonts/crr55__i.pfb -%%WITHI18N%%%%DATADIR%%/fonts/crr56__i.pfb -%%WITHI18N%%%%DATADIR%%/fonts/textb18.pfb -%%WITHI18N%%%%DATADIR%%/fonts/textb19.pfb -%%WITHI18N%%%%DATADIR%%/fonts/textb20.pfb +%%I18N%%%%DATADIR%%/fonts/colle10.pfb +%%I18N%%%%DATADIR%%/fonts/colle8.pfb +%%I18N%%%%DATADIR%%/fonts/colle9.pfb +%%I18N%%%%DATADIR%%/fonts/crr35__i.pfb +%%I18N%%%%DATADIR%%/fonts/crr36__i.pfb +%%I18N%%%%DATADIR%%/fonts/crr55__i.pfb +%%I18N%%%%DATADIR%%/fonts/crr56__i.pfb +%%I18N%%%%DATADIR%%/fonts/textb18.pfb +%%I18N%%%%DATADIR%%/fonts/textb19.pfb +%%I18N%%%%DATADIR%%/fonts/textb20.pfb %%DATADIR%%/ogonkify/README %%DATADIR%%/ogonkify/adobe.enc %%DATADIR%%/ogonkify/afm/pcrb-o.afm @@ -276,12 +284,12 @@ lib/liba2ps.a %%NLS%%share/locale/sl/LC_MESSAGES/a2ps.mo %%NLS%%share/locale/sv/LC_MESSAGES/a2ps.mo %%NLS%%share/locale/tr/LC_MESSAGES/a2ps.mo -%%WITHEMACS%%%%EMACS_SITE_LISPDIR%%/a2ps-print.el -%%WITHEMACS%%%%EMACS_SITE_LISPDIR%%/a2ps-print.elc -%%WITHEMACS%%%%EMACS_SITE_LISPDIR%%/a2ps.el -%%WITHEMACS%%%%EMACS_SITE_LISPDIR%%/a2ps.elc -%%WITHEMACS%%lib/xemacs/site-lisp/a2ps-print.el -%%WITHEMACS%%lib/xemacs/site-lisp/a2ps.el +%%EMACS%%%%EMACS_SITE_LISPDIR%%/a2ps-print.el +%%EMACS%%%%EMACS_SITE_LISPDIR%%/a2ps-print.elc +%%EMACS%%%%EMACS_SITE_LISPDIR%%/a2ps.el +%%EMACS%%%%EMACS_SITE_LISPDIR%%/a2ps.elc +%%EMACS%%lib/xemacs/site-lisp/a2ps-print.el +%%EMACS%%lib/xemacs/site-lisp/a2ps.el @dirrm %%DATADIR%%/ogonkify/fonts @dirrm %%DATADIR%%/ogonkify/afm @dirrm %%DATADIR%%/ogonkify @@ -292,5 +300,5 @@ lib/liba2ps.a @dirrm %%DATADIR%%/encoding @dirrm %%DATADIR%%/afm @dirrm %%DATADIR%% -%%WITHEMACS%%@dirrm lib/xemacs/site-lisp -%%WITHEMACS%%@dirrm lib/xemacs +%%EMACS%%@dirrm lib/xemacs/site-lisp +%%EMACS%%@dirrm lib/xemacs From owner-svn-ports-head@FreeBSD.ORG Tue Dec 17 08:08:59 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id B85186DD; Tue, 17 Dec 2013 08:08:59 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id A43CF17F0; Tue, 17 Dec 2013 08:08:59 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBH88x5C061365; Tue, 17 Dec 2013 08:08:59 GMT (envelope-from nemysis@svn.freebsd.org) Received: (from nemysis@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBH88xEv061364; Tue, 17 Dec 2013 08:08:59 GMT (envelope-from nemysis@svn.freebsd.org) Message-Id: <201312170808.rBH88xEv061364@svn.freebsd.org> From: Rusmir Dusko Date: Tue, 17 Dec 2013 08:08:59 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r336697 - head/deskutils/xwrits X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 17 Dec 2013 08:08:59 -0000 Author: nemysis Date: Tue Dec 17 08:08:59 2013 New Revision: 336697 URL: http://svnweb.freebsd.org/changeset/ports/336697 Log: - Change maintainer email to @FreeBSD.org - Add license (GPLv2) - Support STAGEDIR - Add DOCS Option Approved by: pawel / wg (mentors, implicit) Modified: head/deskutils/xwrits/Makefile Modified: head/deskutils/xwrits/Makefile ============================================================================== --- head/deskutils/xwrits/Makefile Tue Dec 17 08:01:59 2013 (r336696) +++ head/deskutils/xwrits/Makefile Tue Dec 17 08:08:59 2013 (r336697) @@ -6,26 +6,24 @@ PORTVERSION= 2.26 CATEGORIES= deskutils MASTER_SITES= http://www.lcdf.org/${PORTNAME}/ -MAINTAINER= nemysis@gmx.ch +MAINTAINER= nemysis@FreeBSD.org COMMENT= Reminds you to take wrist breaks +LICENSE= GPLv2 + GNU_CONFIGURE= yes USE_XORG= ice sm x11 xau xdmcp xext xinerama -PLIST_FILES= bin/xwrits - -MAN1= xwrits.1 +PLIST_FILES= bin/xwrits \ + man/man1/xwrits.1.gz PORTDOCS= GESTURES NEWS README TODO -NO_STAGE= yes -.include +OPTIONS_DEFINE= DOCS post-install: -.if ${PORT_OPTIONS:MDOCS} - ${MKDIR} ${DOCSDIR} - ${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${DOCSDIR} -.endif + @${MKDIR} ${STAGEDIR}${DOCSDIR} + ${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR} .include From owner-svn-ports-head@FreeBSD.ORG Tue Dec 17 08:56:07 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 6DBA51A6; Tue, 17 Dec 2013 08:56:07 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 3F60B1B5A; Tue, 17 Dec 2013 08:56:07 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBH8u7jH078881; Tue, 17 Dec 2013 08:56:07 GMT (envelope-from ale@svn.freebsd.org) Received: (from ale@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBH8u6Xx078879; Tue, 17 Dec 2013 08:56:06 GMT (envelope-from ale@svn.freebsd.org) Message-Id: <201312170856.rBH8u6Xx078879@svn.freebsd.org> From: Alex Dupre Date: Tue, 17 Dec 2013 08:56:06 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r336700 - head/devel/sbt X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 17 Dec 2013 08:56:07 -0000 Author: ale Date: Tue Dec 17 08:56:06 2013 New Revision: 336700 URL: http://svnweb.freebsd.org/changeset/ports/336700 Log: Update to 0.13.1 release and stagify. Modified: head/devel/sbt/Makefile head/devel/sbt/distinfo Modified: head/devel/sbt/Makefile ============================================================================== --- head/devel/sbt/Makefile Tue Dec 17 08:43:06 2013 (r336699) +++ head/devel/sbt/Makefile Tue Dec 17 08:56:06 2013 (r336700) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= sbt -PORTVERSION= 0.13.0 +PORTVERSION= 0.13.1 CATEGORIES= devel java MASTER_SITES= http://scalasbt.artifactoryonline.com/scalasbt/sbt-native-packages/org/scala-sbt/sbt/${PORTVERSION}/ DISTNAME= ${PORTNAME} @@ -24,7 +24,6 @@ PLIST_FILES= bin/sbt \ %%DATADIR%%/sbt-launch.jar PLIST_DIRS= %%DATADIR%% -NO_STAGE= yes .include .if ${PORT_OPTIONS:MADVANCED} @@ -41,14 +40,14 @@ post-patch: ${WRKSRC}/bin/sbt do-install: - ${MKDIR} ${DATADIR} - ${INSTALL_DATA} ${WRKSRC}/bin/sbt-launch.jar ${DATADIR} + ${MKDIR} ${STAGEDIR}${DATADIR} + ${INSTALL_DATA} ${WRKSRC}/bin/sbt-launch.jar ${STAGEDIR}${DATADIR} .if ${PORT_OPTIONS:MADVANCED} - ${INSTALL_SCRIPT} ${WRKSRC}/bin/sbt ${DATADIR} - ${INSTALL_SCRIPT} ${WRKSRC}/bin/sbt-launch-lib.bash ${DATADIR} - ${LN} -s ${DATADIR}/sbt ${PREFIX}/bin/ + ${INSTALL_SCRIPT} ${WRKSRC}/bin/sbt ${STAGEDIR}${DATADIR} + ${INSTALL_SCRIPT} ${WRKSRC}/bin/sbt-launch-lib.bash ${STAGEDIR}${DATADIR} + ${LN} -s ${DATADIR}/sbt ${STAGEDIR}${PREFIX}/bin/ .else - ${INSTALL_SCRIPT} ${WRKDIR}/sbt.sh ${PREFIX}/bin/sbt + ${INSTALL_SCRIPT} ${WRKDIR}/sbt.sh ${STAGEDIR}${PREFIX}/bin/sbt .endif .include Modified: head/devel/sbt/distinfo ============================================================================== --- head/devel/sbt/distinfo Tue Dec 17 08:43:06 2013 (r336699) +++ head/devel/sbt/distinfo Tue Dec 17 08:56:06 2013 (r336700) @@ -1,2 +1,2 @@ -SHA256 (sbt/0.13.0/sbt.tgz) = d646afe3693fcc03614ca835026a6ec789b7d09dc42c0ed7ebc9055de1023905 -SIZE (sbt/0.13.0/sbt.tgz) = 987161 +SHA256 (sbt/0.13.1/sbt.tgz) = a774e7c554cd3f6cff569354d49a13a0cb8e6ebf3353d8df55d3480be20aad4f +SIZE (sbt/0.13.1/sbt.tgz) = 994631 From owner-svn-ports-head@FreeBSD.ORG Tue Dec 17 09:05:34 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 12886488; Tue, 17 Dec 2013 09:05:34 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id F298A1D1C; Tue, 17 Dec 2013 09:05:33 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBH95Xxc082680; Tue, 17 Dec 2013 09:05:33 GMT (envelope-from mandree@svn.freebsd.org) Received: (from mandree@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBH95XTY082679; Tue, 17 Dec 2013 09:05:33 GMT (envelope-from mandree@svn.freebsd.org) Message-Id: <201312170905.rBH95XTY082679@svn.freebsd.org> From: Matthias Andree Date: Tue, 17 Dec 2013 09:05:33 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r336701 - head X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 17 Dec 2013 09:05:34 -0000 Author: mandree Date: Tue Dec 17 09:05:33 2013 New Revision: 336701 URL: http://svnweb.freebsd.org/changeset/ports/336701 Log: Warn that users should not force delete old Berkeley DB ports. Modified: head/UPDATING Modified: head/UPDATING ============================================================================== --- head/UPDATING Tue Dec 17 08:56:06 2013 (r336700) +++ head/UPDATING Tue Dec 17 09:05:33 2013 (r336701) @@ -47,6 +47,16 @@ you update your ports collection, before You can add WITH_BDB_VER=5 or WITH_BDB_VER=6 to have all applications that get rebuilt use Oracle Berkeley DB 5 or 6, respectively. + DO NOT FORCE DELETE older BerkeleyDB packages, that breaks the upgrade + tools. Instead, first rebuild the ports that depend on it, then + remove the old Berkeley DB versions. + + Berkeley DB ports should be able to build/install with an older and a + newer version version both installed if WITH_BDB_VER is set. If a + port then grabs the old Berkeley DB version, that is an issue with the + port that requires Berkeley DB, and should be reported to the + maintainer. + If you are interested in upgrading now already, we have instructions at . From owner-svn-ports-head@FreeBSD.ORG Tue Dec 17 09:28:19 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 9AD55CC7; Tue, 17 Dec 2013 09:28:19 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 85A491E98; Tue, 17 Dec 2013 09:28:19 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBH9SJv0090446; Tue, 17 Dec 2013 09:28:19 GMT (envelope-from madpilot@svn.freebsd.org) Received: (from madpilot@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBH9SJE1090445; Tue, 17 Dec 2013 09:28:19 GMT (envelope-from madpilot@svn.freebsd.org) Message-Id: <201312170928.rBH9SJE1090445@svn.freebsd.org> From: Guido Falsi Date: Tue, 17 Dec 2013 09:28:19 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r336702 - head/audio/gxmms2/files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 17 Dec 2013 09:28:19 -0000 Author: madpilot Date: Tue Dec 17 09:28:19 2013 New Revision: 336702 URL: http://svnweb.freebsd.org/changeset/ports/336702 Log: - Fix build on 10 and head due to new ld behavior Modified: head/audio/gxmms2/files/patch-Makefile (contents, props changed) Modified: head/audio/gxmms2/files/patch-Makefile ============================================================================== --- head/audio/gxmms2/files/patch-Makefile Tue Dec 17 09:05:33 2013 (r336701) +++ head/audio/gxmms2/files/patch-Makefile Tue Dec 17 09:28:19 2013 (r336702) @@ -1,5 +1,5 @@ ---- Makefile.orig Sun Mar 4 14:28:26 2007 -+++ Makefile Sun Mar 4 14:30:42 2007 +--- Makefile.orig 2009-01-04 19:30:38.000000000 +0100 ++++ Makefile 2013-12-15 22:56:10.004889065 +0100 @@ -1,8 +1,6 @@ # Makefile for gxmms2 and gkrellxmms2 @@ -9,3 +9,12 @@ ALLFILES=gkrellxmms2/*.c gkrellxmms2/*.h gkrellxmms2/*.xpm gmedialib/*.c gmedialib/*.h gmedialib/*.xpm gtrackinfo/*.c gtrackinfo/*.h gxmms2src/*.c gxmms2src/*.h gxmms2src/*.xpm sdecode/*.c sdecode/*.h xmms2ctrl/*.c xmms2ctrl/*.h Makefile README COPYING CHANGELOG +@@ -13,7 +11,7 @@ + + CFLAGS ?= -O2 + CFLAGS := -Wall -fPIC $(GTK_CFLAGS) $(XMMS2_CFLAGS) -I. $(CFLAGS) +-LIBS = $(GTK_LIB) $(XMMS2_LIB) ++LIBS = $(GTK_LIB) $(XMMS2_LIB) -lX11 + + KRELLLFLAGS=-shared + From owner-svn-ports-head@FreeBSD.ORG Tue Dec 17 09:30:06 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 984B9DC9; Tue, 17 Dec 2013 09:30:06 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 84C3B1EB1; Tue, 17 Dec 2013 09:30:06 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBH9U6Hg090783; Tue, 17 Dec 2013 09:30:06 GMT (envelope-from mandree@svn.freebsd.org) Received: (from mandree@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBH9U6hv090782; Tue, 17 Dec 2013 09:30:06 GMT (envelope-from mandree@svn.freebsd.org) Message-Id: <201312170930.rBH9U6hv090782@svn.freebsd.org> From: Matthias Andree Date: Tue, 17 Dec 2013 09:30:06 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r336703 - head X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 17 Dec 2013 09:30:06 -0000 Author: mandree Date: Tue Dec 17 09:30:06 2013 New Revision: 336703 URL: http://svnweb.freebsd.org/changeset/ports/336703 Log: Instructions to work around ruby-bdb breakage through bugfix upgrade of db[56]. Modified: head/UPDATING Modified: head/UPDATING ============================================================================== --- head/UPDATING Tue Dec 17 09:28:19 2013 (r336702) +++ head/UPDATING Tue Dec 17 09:30:06 2013 (r336703) @@ -5,6 +5,34 @@ they are unavoidable. You should get into the habit of checking this file for changes each time you update your ports collection, before attempting any port upgrades. +20131217: + AFFECTS: users of databases/ruby-bdb and databases/db5 or databases/db6 + AUTHOR: mandree@FreeBSD.org + + databases/db5 and databases/db6 have recently been updated to fix + bugs. This changed their patchlevel version. + + However, ruby-bdb breaks during the upgrade due to a bug described in + . + + THIS MEANS THAT YOU MUST NOT USE PORTUPGRADE TO UPGRADE databases/db5 + databases/db6 and databases/ruby-bdb. Doing that will break the latter and + cause corrupted dependency data. Use portmaster for the upgrade. + + If you are in a situation where portupgrade refuses to work with + errors like: + + DB needs compatible versions of libdb & db.h + you have db.h version 5.3.21 and libdb version 5.3.28 + + then you must manually upgrade the ruby-bdb port and repair dependency data: + + # make -C /usr/ports/databases/ruby-bdb all deinstall install clean + # pkgdb -fu + # portupgrade -f db5 db6 + + This should return portupgrade to normal operation. + 20131216: AFFECTS: users of x11/xorg, graphics/libGL, graphics/dri, all xorg ports AUTHOR: zeising@FreeBSD.org From owner-svn-ports-head@FreeBSD.ORG Tue Dec 17 09:34:26 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 3B397F95; Tue, 17 Dec 2013 09:34:26 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 271DD1F26; Tue, 17 Dec 2013 09:34:26 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBH9YQZl093646; Tue, 17 Dec 2013 09:34:26 GMT (envelope-from mandree@svn.freebsd.org) Received: (from mandree@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBH9YQa2093645; Tue, 17 Dec 2013 09:34:26 GMT (envelope-from mandree@svn.freebsd.org) Message-Id: <201312170934.rBH9YQa2093645@svn.freebsd.org> From: Matthias Andree Date: Tue, 17 Dec 2013 09:34:25 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r336704 - head X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 17 Dec 2013 09:34:26 -0000 Author: mandree Date: Tue Dec 17 09:34:25 2013 New Revision: 336704 URL: http://svnweb.freebsd.org/changeset/ports/336704 Log: Mention portupgrade next to ruby-bdb so people feel addressed. Modified: head/UPDATING Modified: head/UPDATING ============================================================================== --- head/UPDATING Tue Dec 17 09:30:06 2013 (r336703) +++ head/UPDATING Tue Dec 17 09:34:25 2013 (r336704) @@ -6,7 +6,7 @@ You should get into the habit of checkin you update your ports collection, before attempting any port upgrades. 20131217: - AFFECTS: users of databases/ruby-bdb and databases/db5 or databases/db6 + AFFECTS: users of databases/ruby-bdb or ports-mgmt/portupgrade and databases/db5 or databases/db6 AUTHOR: mandree@FreeBSD.org databases/db5 and databases/db6 have recently been updated to fix From owner-svn-ports-head@FreeBSD.ORG Tue Dec 17 09:41:44 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 300192E8; Tue, 17 Dec 2013 09:41:44 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 1AF3D1FC0; Tue, 17 Dec 2013 09:41:44 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBH9fhWe096854; Tue, 17 Dec 2013 09:41:43 GMT (envelope-from ashish@svn.freebsd.org) Received: (from ashish@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBH9fhJF096852; Tue, 17 Dec 2013 09:41:43 GMT (envelope-from ashish@svn.freebsd.org) Message-Id: <201312170941.rBH9fhJF096852@svn.freebsd.org> From: Ashish SHUKLA Date: Tue, 17 Dec 2013 09:41:43 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r336705 - in head/mail: opensmtpd-devel/files opensmtpd/files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 17 Dec 2013 09:41:44 -0000 Author: ashish Date: Tue Dec 17 09:41:43 2013 New Revision: 336705 URL: http://svnweb.freebsd.org/changeset/ports/336705 Log: - Fix typo in rc scripts Reported by: feld Modified: head/mail/opensmtpd-devel/files/smtpd.in head/mail/opensmtpd/files/smtpd.in Modified: head/mail/opensmtpd-devel/files/smtpd.in ============================================================================== --- head/mail/opensmtpd-devel/files/smtpd.in Tue Dec 17 09:34:25 2013 (r336704) +++ head/mail/opensmtpd-devel/files/smtpd.in Tue Dec 17 09:41:43 2013 (r336705) @@ -7,7 +7,7 @@ # KEYWORD: shutdown # # Add the following lines to /etc/rc.conf to enable smtpd: -# smtpd_enable (bool): Set it to "YES" to enable postfix. +# smtpd_enable (bool): Set it to "YES" to enable OpenSMTPD. # Default is "NO". # smtpd_config (string): Path to OpenSMTPD configuration file. # Default is "%%PREFIX%%/etc/mail/smtpd.conf" Modified: head/mail/opensmtpd/files/smtpd.in ============================================================================== --- head/mail/opensmtpd/files/smtpd.in Tue Dec 17 09:34:25 2013 (r336704) +++ head/mail/opensmtpd/files/smtpd.in Tue Dec 17 09:41:43 2013 (r336705) @@ -7,7 +7,7 @@ # KEYWORD: shutdown # # Add the following lines to /etc/rc.conf to enable smtpd: -# smtpd_enable (bool): Set it to "YES" to enable postfix. +# smtpd_enable (bool): Set it to "YES" to enable OpenSMTPD. # Default is "NO". # smtpd_config (string): Path to OpenSMTPD configuration file. # Default is "%%PREFIX%%/etc/mail/smtpd.conf" From owner-svn-ports-head@FreeBSD.ORG Tue Dec 17 10:15:59 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id A05A3B36; Tue, 17 Dec 2013 10:15:59 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 8AC0A1263; Tue, 17 Dec 2013 10:15:59 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBHAFxOW008408; Tue, 17 Dec 2013 10:15:59 GMT (envelope-from matthew@svn.freebsd.org) Received: (from matthew@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBHAFxtS008407; Tue, 17 Dec 2013 10:15:59 GMT (envelope-from matthew@svn.freebsd.org) Message-Id: <201312171015.rBHAFxtS008407@svn.freebsd.org> From: Matthew Seaman Date: Tue, 17 Dec 2013 10:15:59 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r336707 - head/net-im/jabberd X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 17 Dec 2013 10:15:59 -0000 Author: matthew Date: Tue Dec 17 10:15:59 2013 New Revision: 336707 URL: http://svnweb.freebsd.org/changeset/ports/336707 Log: Switch to MASTER_SITES LOCAL/matthew for the 8.x compatible location to get the distfiles from. Submitted by: tijl Approved by: mm (maintainer, implicit) Modified: head/net-im/jabberd/Makefile Modified: head/net-im/jabberd/Makefile ============================================================================== --- head/net-im/jabberd/Makefile Tue Dec 17 10:06:10 2013 (r336706) +++ head/net-im/jabberd/Makefile Tue Dec 17 10:15:59 2013 (r336707) @@ -5,7 +5,7 @@ PORTNAME= jabberd DISTVERSION= 2.3.1 CATEGORIES= net-im MASTER_SITES= https://github.com/jabberd2/jabberd2/releases/download/${PORTNAME}-${DISTVERSION}/ \ - http://freefall.freebsd.org/~matthew/distfiles/ + LOCAL/matthew/${PORTNAME} MAINTAINER= mm@FreeBSD.org COMMENT= Online presence and instant messaging server From owner-svn-ports-head@FreeBSD.ORG Tue Dec 17 10:18:59 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id DD778D73; Tue, 17 Dec 2013 10:18:59 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id C87C612C4; Tue, 17 Dec 2013 10:18:59 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBHAIxks008825; Tue, 17 Dec 2013 10:18:59 GMT (envelope-from ale@svn.freebsd.org) Received: (from ale@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBHAIwYp008819; Tue, 17 Dec 2013 10:18:58 GMT (envelope-from ale@svn.freebsd.org) Message-Id: <201312171018.rBHAIwYp008819@svn.freebsd.org> From: Alex Dupre Date: Tue, 17 Dec 2013 10:18:58 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r336708 - in head/databases: mysql55-client mysql55-server mysql55-server/files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 17 Dec 2013 10:18:59 -0000 Author: ale Date: Tue Dec 17 10:18:58 2013 New Revision: 336708 URL: http://svnweb.freebsd.org/changeset/ports/336708 Log: Update to 5.5.35 release and stagify. Modified: head/databases/mysql55-client/Makefile head/databases/mysql55-client/pkg-plist head/databases/mysql55-server/Makefile head/databases/mysql55-server/distinfo head/databases/mysql55-server/files/patch-libmysql_CMakeLists.txt head/databases/mysql55-server/pkg-plist Modified: head/databases/mysql55-client/Makefile ============================================================================== --- head/databases/mysql55-client/Makefile Tue Dec 17 10:15:59 2013 (r336707) +++ head/databases/mysql55-client/Makefile Tue Dec 17 10:18:58 2013 (r336708) @@ -24,5 +24,4 @@ MAN1= comp_err.1 msql2mysql.1 mysql.1 m CLIENT_ONLY= yes -NO_STAGE= yes .include "${MASTERDIR}/Makefile" Modified: head/databases/mysql55-client/pkg-plist ============================================================================== --- head/databases/mysql55-client/pkg-plist Tue Dec 17 10:15:59 2013 (r336707) +++ head/databases/mysql55-client/pkg-plist Tue Dec 17 10:18:58 2013 (r336708) @@ -68,6 +68,20 @@ lib/mysql/libmysqlclient_r.a lib/mysql/libmysqlclient_r.so lib/mysql/libmysqlclient_r.so.18 lib/mysql/libmysqlservices.a +man/man1/comp_err.1.gz +man/man1/msql2mysql.1.gz +man/man1/mysql.1.gz +man/man1/mysql_config.1.gz +man/man1/mysql_find_rows.1.gz +man/man1/mysql_waitpid.1.gz +man/man1/mysqlaccess.1.gz +man/man1/mysqladmin.1.gz +man/man1/mysqlbinlog.1.gz +man/man1/mysqlcheck.1.gz +man/man1/mysqldump.1.gz +man/man1/mysqlimport.1.gz +man/man1/mysqlshow.1.gz +man/man1/mysqlslap.1.gz share/aclocal/mysql.m4 @dirrm include/mysql/mysql/psi @dirrm include/mysql/mysql Modified: head/databases/mysql55-server/Makefile ============================================================================== --- head/databases/mysql55-server/Makefile Tue Dec 17 10:15:59 2013 (r336707) +++ head/databases/mysql55-server/Makefile Tue Dec 17 10:18:58 2013 (r336708) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME?= mysql -PORTVERSION= 5.5.34 +PORTVERSION= 5.5.35 PORTREVISION?= 0 CATEGORIES= databases ipv6 MASTER_SITES= ${MASTER_SITE_MYSQL} @@ -48,7 +48,6 @@ SHEBANG_FILES= scripts/*.pl* scripts/*.s .error You have `USE_MYSQL' variable defined either in environment or in make(1) arguments. Please undefine and try again. .endif -NO_STAGE= yes .include .if ${PORT_OPTIONS:MSSL} @@ -70,8 +69,6 @@ USE_RC_SUBR= mysql-server USERS= mysql GROUPS= mysql -INFO= mysql - MAN1= my_print_defaults.1 myisam_ftdump.1 myisamchk.1 myisamlog.1 myisampack.1 \ mysql.server.1 mysql_convert_table_format.1 mysql_fix_extensions.1 \ mysql_install_db.1 mysql_plugin.1 mysql_secure_installation.1 mysql_setpermission.1 \ @@ -79,14 +76,7 @@ MAN1= my_print_defaults.1 myisam_ftdump mysqld_multi.1 mysqld_safe.1 mysqldumpslow.1 mysqlhotcopy.1 mysqlman.1 \ mysqltest.1 perror.1 replace.1 resolve_stack_dump.1 resolveip.1 -MAN8= mysqld.8 - CMAKE_ARGS+= -DWITH_EMBEDDED_SERVER="ON" - -post-install: -.if !defined(PACKAGE_BUILDING) - @${CAT} ${PKGMESSAGE} -.endif .endif post-patch: Modified: head/databases/mysql55-server/distinfo ============================================================================== --- head/databases/mysql55-server/distinfo Tue Dec 17 10:15:59 2013 (r336707) +++ head/databases/mysql55-server/distinfo Tue Dec 17 10:18:58 2013 (r336708) @@ -1,2 +1,2 @@ -SHA256 (mysql-5.5.34.tar.gz) = b0602b492d519602b7fa8e4cc87df998d9794fbc955819beec586a268fe06485 -SIZE (mysql-5.5.34.tar.gz) = 24699724 +SHA256 (mysql-5.5.35.tar.gz) = 46f28f6907438f2abf97dfbf1124f1c0568d4c60fc370664755cf51c5dae664a +SIZE (mysql-5.5.35.tar.gz) = 21707804 Modified: head/databases/mysql55-server/files/patch-libmysql_CMakeLists.txt ============================================================================== --- head/databases/mysql55-server/files/patch-libmysql_CMakeLists.txt Tue Dec 17 10:15:59 2013 (r336707) +++ head/databases/mysql55-server/files/patch-libmysql_CMakeLists.txt Tue Dec 17 10:18:58 2013 (r336708) @@ -1,6 +1,6 @@ ---- libmysql/CMakeLists.txt.orig 2010-12-03 18:58:26.000000000 +0100 -+++ libmysql/CMakeLists.txt 2010-12-23 22:01:37.000000000 +0100 -@@ -153,13 +153,14 @@ +--- libmysql/CMakeLists.txt.orig 2013-11-05 07:19:26.000000000 +0000 ++++ libmysql/CMakeLists.txt 2013-12-16 14:27:25.505227018 +0000 +@@ -165,7 +165,7 @@ # Merge several convenience libraries into one big mysqlclient # and link them together into shared library. @@ -8,15 +8,16 @@ +MERGE_LIBRARIES(mysqlclient STATIC ${LIBS} COMPONENT Development NOINSTALL) # Visual Studio users need debug static library for debug projects - IF(MSVC) - INSTALL_DEBUG_TARGET(mysqlclient DESTINATION ${INSTALL_LIBDIR}/debug) + INSTALL_DEBUG_SYMBOLS(clientlib) +@@ -174,6 +174,7 @@ + INSTALL_DEBUG_TARGET(clientlib DESTINATION ${INSTALL_LIBDIR}/debug) ENDIF() +IF(FALSE) IF(UNIX) MACRO(GET_VERSIONED_LIBNAME LIBNAME EXTENSION VERSION OUTNAME) SET(DOT_VERSION ".${VERSION}") -@@ -174,9 +175,11 @@ +@@ -188,9 +189,11 @@ ENDMACRO() INSTALL_SYMLINK(${CMAKE_STATIC_LIBRARY_PREFIX}mysqlclient_r.a mysqlclient ${INSTALL_LIBDIR} Development) ENDIF() @@ -29,7 +30,7 @@ IF(UNIX) # libtool compatability IF(CMAKE_SYSTEM_NAME MATCHES "FreeBSD" OR APPLE) -@@ -223,3 +226,4 @@ +@@ -237,3 +240,4 @@ ENDFOREACH() ENDIF() ENDIF() Modified: head/databases/mysql55-server/pkg-plist ============================================================================== --- head/databases/mysql55-server/pkg-plist Tue Dec 17 10:15:59 2013 (r336707) +++ head/databases/mysql55-server/pkg-plist Tue Dec 17 10:18:58 2013 (r336708) @@ -41,6 +41,33 @@ lib/mysql/plugin/qa_auth_server.so lib/mysql/plugin/semisync_master.so lib/mysql/plugin/semisync_slave.so libexec/mysqld +man/man1/my_print_defaults.1.gz +man/man1/myisam_ftdump.1.gz +man/man1/myisamchk.1.gz +man/man1/myisamlog.1.gz +man/man1/myisampack.1.gz +man/man1/mysql.server.1.gz +man/man1/mysql_convert_table_format.1.gz +man/man1/mysql_fix_extensions.1.gz +man/man1/mysql_install_db.1.gz +man/man1/mysql_plugin.1.gz +man/man1/mysql_secure_installation.1.gz +man/man1/mysql_setpermission.1.gz +man/man1/mysql_tzinfo_to_sql.1.gz +man/man1/mysql_upgrade.1.gz +man/man1/mysql_zap.1.gz +man/man1/mysqlbug.1.gz +man/man1/mysqld_multi.1.gz +man/man1/mysqld_safe.1.gz +man/man1/mysqldumpslow.1.gz +man/man1/mysqlhotcopy.1.gz +man/man1/mysqlman.1.gz +man/man1/mysqltest.1.gz +man/man1/perror.1.gz +man/man1/replace.1.gz +man/man1/resolve_stack_dump.1.gz +man/man1/resolveip.1.gz +man/man8/mysqld.8.gz %%DATADIR%%/binary-configure %%DATADIR%%/charsets/Index.xml %%DATADIR%%/charsets/README From owner-svn-ports-head@FreeBSD.ORG Tue Dec 17 10:39:34 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id A7B10569; Tue, 17 Dec 2013 10:39:34 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 8818514A0; Tue, 17 Dec 2013 10:39:34 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBHAdYH4015962; Tue, 17 Dec 2013 10:39:34 GMT (envelope-from dinoex@svn.freebsd.org) Received: (from dinoex@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBHAdYB6015960; Tue, 17 Dec 2013 10:39:34 GMT (envelope-from dinoex@svn.freebsd.org) Message-Id: <201312171039.rBHAdYB6015960@svn.freebsd.org> From: Dirk Meyer Date: Tue, 17 Dec 2013 10:39:34 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r336710 - head/comms/hylafax X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 17 Dec 2013 10:39:34 -0000 Author: dinoex Date: Tue Dec 17 10:39:33 2013 New Revision: 336710 URL: http://svnweb.freebsd.org/changeset/ports/336710 Log: - use STAGEDIR - use OPTIONS_SUB - use OPT_* - remove obsolete pre-extract Modified: head/comms/hylafax/Makefile head/comms/hylafax/pkg-plist Modified: head/comms/hylafax/Makefile ============================================================================== --- head/comms/hylafax/Makefile Tue Dec 17 10:21:44 2013 (r336709) +++ head/comms/hylafax/Makefile Tue Dec 17 10:39:33 2013 (r336710) @@ -15,7 +15,8 @@ LIB_DEPENDS= libtiff.so:${PORTSDIR}/grap libjbig.so:${PORTSDIR}/graphics/jbigkit MAKE_JOBS_UNSAFE= yes -NO_STAGE= yes +#NO_STAGE= yes +NEED_ROOT= yes USE_GHOSTSCRIPT=yes HAS_CONFIGURE= yes @@ -29,36 +30,32 @@ CONFIGURE_ARGS= --with-INSTALL="" \ --with-DIR_HTML="${DOCSDIR}" CFLAGS+= -D_XOPEN_SOURCE -D_XOPEN_SOURCE_EXTENDED -Wall -L${LOCALBASE}/lib CONFIGURE_ENV= ENVOPTS="${CFLAGS}" +MAKE_ENV+= ROOT=${STAGEDIR} MAKE_ARGS+= OPTIMIZER="" -DOPTIMIZER PORTDOCS= RELEASENOTES-4.3.txt RELEASENOTES-4.4.txt RELEASENOTES-6.0.txt SUB_FILES= pkg-message USE_RC_SUBR= hylafax -MAN1= edit-faxcover.1 faxalter.1 faxcover.1 faxmail.1 faxrm.1 faxstat.1 \ - hylafax-client.1 sendfax.1 sendpage.1 sgi2fax.1 textfmt.1 - -MAN5= dialrules.5f doneq.5f hosts.hfaxd.5f \ - hylafax-config.5f hylafax-info.5f hylafax-log.5f hylafax-server.5f \ - hylafax-shutdown.5f pagermap.5f pagesizes.5f recvq.5f sendq.5f \ - status.5f tsi.5f typerules.5f xferfaxlog.5f - -MAN8= choptest.8c cqtest.8c dialtest.8c faxabort.8c faxaddmodem.8c \ - faxadduser.8c faxanswer.8c faxconfig.8c faxcron.8c faxdeluser.8c \ - faxgetty.8c faxinfo.8c faxlock.8c faxmodem.8c faxq.8c \ - faxqclean.8c faxquit.8c faxrcvd.8c faxsend.8c faxsetup.8c faxstate.8c \ - faxwatch.8c hfaxd.8c jobcontrol.8c mkcover.8c notify.8c pagesend.8c pdf2fax.8c \ - pollrcvd.8c ps2fax.8c recvstats.8c tagtest.8c tiff2fax.8c \ - tiffcheck.8c tsitest.8c wedged.8c xferfaxstats.8c - -SUID_EXES= ${PREFIX}/sbin/faxgetty ${PREFIX}/sbin/faxq \ - ${PREFIX}/bin/faxrm ${PREFIX}/bin/faxalter +SUID_EXES= ${STAGEDIR}${PREFIX}/sbin/faxgetty \ + ${STAGEDIR}${PREFIX}/sbin/faxq \ + ${STAGEDIR}${PREFIX}/bin/faxrm \ + ${STAGEDIR}${PREFIX}/bin/faxalter OPTIONS_DEFINE= PAM NLS GAWK DOCS OPTIONS_DEFAULT=PAM NLS NO_OPTIONS_SORT=yes +OPTIONS_SUB= yes GAWK_DESC= Use gawk for scripts +PAM_CONFIGURE_OFF= --disable-pam +NLS_USES= gettext +NLS_CONFIGURE_ENABLE= nls +GAWK_BUILD_DEPENDS= gawk:${PORTSDIR}/lang/gawk +GAWK_RUN_DEPENDS= gawk:${PORTSDIR}/lang/gawk +GAWK_CONFIGURE_ON= --with-AWK="${LOCALBASE}/bin/gawk" +DOCS_CONFIGURE_ON= --with-HTML=yes + .include # Defaults to "North American Letter". Use "ISO A4" for A4. @@ -66,19 +63,6 @@ GAWK_DESC= Use gawk for scripts CONFIGURE_ARGS+=--with-PAGESIZE="${PAGESIZE}" .endif -# Want PAM? -.if empty(PORT_OPTIONS:MPAM) -CONFIGURE_ARGS+=--disable-pam -.endif - -# Want HTML documentation? -.if ${PORT_OPTIONS:MDOCS} -CONFIGURE_ARGS+=--with-HTML=yes -PLIST_SUB+= PORTDOCS="" -.else -PLIST_SUB+= PORTDOCS="@comment " -.endif - # Redefine path for spool .if defined(HYLAFAX_SPOOL) CONFIGURE_ARGS+=--with-DIR_SPOOL="${HYLAFAX_SPOOL}" @@ -90,28 +74,10 @@ PLIST_SUB+= HYLAFAX_SPOOL=${HYLAFAX_SPOO CONFIGURE_ARGS+=--nointeractive .endif -.if ${PORT_OPTIONS:MGAWK} -BUILD_DEPENDS+= gawk:${PORTSDIR}/lang/gawk -RUN_DEPENDS+= gawk:${PORTSDIR}/lang/gawk -CONFIGURE_ARGS+=--with-AWK="${LOCALBASE}/bin/gawk" -.endif -.if ${PORT_OPTIONS:MNLS} -USES+= gettext -PLIST_SUB+= WITH_NLS="" -.else -CONFIGURE_ARGS+=--disable-nls -PLIST_SUB+= WITH_NLS="@comment " +.if ${OSVERSION} >= 900007 +CONFIGURE_ARGS+= --with-GETTY=SysV .endif -pre-extract: - @if [ -d /var/db/pkg/tiff-3.6.1 ]; then \ - ${ECHO_MSG} ""; \ - ${ECHO_MSG} "Hylafax does not work with libtiff-3.6.1."; \ - ${ECHO_MSG} "Please upgrade to libtiff-3.6.1_1. (/usr/ports/graphics/tiff)"; \ - ${ECHO_MSG} ""; \ - exit 1; \ - fi - post-patch: ${REINPLACE_CMD} \ -e 's,/usr/local,${LOCALBASE},g' \ @@ -123,20 +89,15 @@ post-patch: -e 's,-O pagesizes,-O pagesizes-dist -src pagesizes,' \ ${WRKSRC}/libhylafax/Makefile.in +pre-install: + ${MKDIR} ${STAGEDIR}${HYLAFAX_SPOOL} + post-install: ${CHOWN} uucp ${SUID_EXES} ${CHMOD} 4555 ${SUID_EXES} -.for f in hfaxd.conf pagesizes typerules - if [ ! -f ${PREFIX}/lib/fax/${f} ]; then ${CP} -p ${PREFIX}/lib/fax/${f}-dist ${PREFIX}/lib/fax/${f}; fi -.endfor .if ${PORT_OPTIONS:MDOCS} - ${MKDIR} ${DOCSDIR} - @cd ${WRKSRC}/doc && ${INSTALL_DATA} ${PORTDOCS} ${DOCSDIR}/ -.endif - @${CAT} ${PKGMESSAGE} - -.if ${OSVERSION} >= 900007 -CONFIGURE_ARGS+= --with-GETTY=SysV + ${MKDIR} ${STAGEDIR}${DOCSDIR} + cd ${WRKSRC}/doc && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}/ .endif .include Modified: head/comms/hylafax/pkg-plist ============================================================================== --- head/comms/hylafax/pkg-plist Tue Dec 17 10:21:44 2013 (r336709) +++ head/comms/hylafax/pkg-plist Tue Dec 17 10:39:33 2013 (r336710) @@ -18,6 +18,70 @@ lib/fax/pagesizes-dist lib/fax/typerules-dist @exec [ -f %B/typerules ] || cp %B/%f %B/typerules @dirrm lib/fax +man/man1/edit-faxcover.1.gz +man/man1/faxalter.1.gz +man/man1/faxcover.1.gz +man/man1/faxmail.1.gz +man/man1/faxrm.1.gz +man/man1/faxstat.1.gz +man/man1/hylafax-client.1.gz +man/man1/sendfax.1.gz +man/man1/sendpage.1.gz +man/man1/sgi2fax.1.gz +man/man1/textfmt.1.gz +man/man5/dialrules.5f.gz +man/man5/doneq.5f.gz +man/man5/hosts.hfaxd.5f.gz +man/man5/hylafax-config.5f.gz +man/man5/hylafax-info.5f.gz +man/man5/hylafax-log.5f.gz +man/man5/hylafax-server.5f.gz +man/man5/hylafax-shutdown.5f.gz +man/man5/pagermap.5f.gz +man/man5/pagesizes.5f.gz +man/man5/recvq.5f.gz +man/man5/sendq.5f.gz +man/man5/status.5f.gz +man/man5/tsi.5f.gz +man/man5/typerules.5f.gz +man/man5/xferfaxlog.5f.gz +man/man8/choptest.8c.gz +man/man8/cqtest.8c.gz +man/man8/dialtest.8c.gz +man/man8/faxabort.8c.gz +man/man8/faxaddmodem.8c.gz +man/man8/faxadduser.8c.gz +man/man8/faxanswer.8c.gz +man/man8/faxconfig.8c.gz +man/man8/faxcron.8c.gz +man/man8/faxdeluser.8c.gz +man/man8/faxgetty.8c.gz +man/man8/faxinfo.8c.gz +man/man8/faxlock.8c.gz +man/man8/faxmodem.8c.gz +man/man8/faxq.8c.gz +man/man8/faxqclean.8c.gz +man/man8/faxquit.8c.gz +man/man8/faxrcvd.8c.gz +man/man8/faxsend.8c.gz +man/man8/faxsetup.8c.gz +man/man8/faxstate.8c.gz +man/man8/faxwatch.8c.gz +man/man8/hfaxd.8c.gz +man/man8/jobcontrol.8c.gz +man/man8/mkcover.8c.gz +man/man8/notify.8c.gz +man/man8/pagesend.8c.gz +man/man8/pdf2fax.8c.gz +man/man8/pollrcvd.8c.gz +man/man8/ps2fax.8c.gz +man/man8/recvstats.8c.gz +man/man8/tagtest.8c.gz +man/man8/tiff2fax.8c.gz +man/man8/tiffcheck.8c.gz +man/man8/tsitest.8c.gz +man/man8/wedged.8c.gz +man/man8/xferfaxstats.8c.gz sbin/textfmt sbin/faxmsg sbin/faxadduser @@ -57,21 +121,21 @@ sbin/probemodem sbin/lockname sbin/ondelay sbin/hylafax -%%WITH_NLS%%share/locale/de/LC_MESSAGES/hylafax-client.mo -%%WITH_NLS%%share/locale/de/LC_MESSAGES/hylafax-server.mo -%%WITH_NLS%%share/locale/de/LC_MESSAGES/libhylafax.mo -%%WITH_NLS%%share/locale/es/LC_MESSAGES/hylafax-client.mo -%%WITH_NLS%%share/locale/es/LC_MESSAGES/hylafax-server.mo -%%WITH_NLS%%share/locale/es/LC_MESSAGES/libhylafax.mo -%%WITH_NLS%%share/locale/id/LC_MESSAGES/hylafax-client.mo -%%WITH_NLS%%share/locale/id/LC_MESSAGES/hylafax-server.mo -%%WITH_NLS%%share/locale/id/LC_MESSAGES/libhylafax.mo -%%WITH_NLS%%share/locale/nl/LC_MESSAGES/hylafax-client.mo -%%WITH_NLS%%share/locale/nl/LC_MESSAGES/hylafax-server.mo -%%WITH_NLS%%share/locale/nl/LC_MESSAGES/libhylafax.mo -%%WITH_NLS%%share/locale/vi/LC_MESSAGES/hylafax-client.mo -%%WITH_NLS%%share/locale/vi/LC_MESSAGES/hylafax-server.mo -%%WITH_NLS%%share/locale/vi/LC_MESSAGES/libhylafax.mo +%%NLS%%share/locale/de/LC_MESSAGES/hylafax-client.mo +%%NLS%%share/locale/de/LC_MESSAGES/hylafax-server.mo +%%NLS%%share/locale/de/LC_MESSAGES/libhylafax.mo +%%NLS%%share/locale/es/LC_MESSAGES/hylafax-client.mo +%%NLS%%share/locale/es/LC_MESSAGES/hylafax-server.mo +%%NLS%%share/locale/es/LC_MESSAGES/libhylafax.mo +%%NLS%%share/locale/id/LC_MESSAGES/hylafax-client.mo +%%NLS%%share/locale/id/LC_MESSAGES/hylafax-server.mo +%%NLS%%share/locale/id/LC_MESSAGES/libhylafax.mo +%%NLS%%share/locale/nl/LC_MESSAGES/hylafax-client.mo +%%NLS%%share/locale/nl/LC_MESSAGES/hylafax-server.mo +%%NLS%%share/locale/nl/LC_MESSAGES/libhylafax.mo +%%NLS%%share/locale/vi/LC_MESSAGES/hylafax-client.mo +%%NLS%%share/locale/vi/LC_MESSAGES/hylafax-server.mo +%%NLS%%share/locale/vi/LC_MESSAGES/libhylafax.mo @cwd %%HYLAFAX_SPOOL%% COPYRIGHT @exec mkfifo %D/FIFO From owner-svn-ports-head@FreeBSD.ORG Tue Dec 17 10:44:08 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 5A4766A7; Tue, 17 Dec 2013 10:44:08 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 46CC51533; Tue, 17 Dec 2013 10:44:08 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBHAi88d018923; Tue, 17 Dec 2013 10:44:08 GMT (envelope-from wg@svn.freebsd.org) Received: (from wg@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBHAi72Q018921; Tue, 17 Dec 2013 10:44:07 GMT (envelope-from wg@svn.freebsd.org) Message-Id: <201312171044.rBHAi72Q018921@svn.freebsd.org> From: William Grzybowski Date: Tue, 17 Dec 2013 10:44:07 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r336711 - head/net/py-kombu X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 17 Dec 2013 10:44:08 -0000 Author: wg Date: Tue Dec 17 10:44:07 2013 New Revision: 336711 URL: http://svnweb.freebsd.org/changeset/ports/336711 Log: net/py-kombu: update to 3.0.8 and switch from easy_install Modified: head/net/py-kombu/Makefile head/net/py-kombu/distinfo Modified: head/net/py-kombu/Makefile ============================================================================== --- head/net/py-kombu/Makefile Tue Dec 17 10:39:33 2013 (r336710) +++ head/net/py-kombu/Makefile Tue Dec 17 10:44:07 2013 (r336711) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= kombu -PORTVERSION= 3.0.7 +PORTVERSION= 3.0.8 CATEGORIES= net python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -35,7 +35,7 @@ ZMQ_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX} OPTIONSFILE?= ${PORT_DBDIR}/py-${PORTNAME}/options USE_PYTHON= yes -USE_PYDISTUTILS=easy_install +USE_PYDISTUTILS=yes PYDISTUTILS_AUTOPLIST= yes .include Modified: head/net/py-kombu/distinfo ============================================================================== --- head/net/py-kombu/distinfo Tue Dec 17 10:39:33 2013 (r336710) +++ head/net/py-kombu/distinfo Tue Dec 17 10:44:07 2013 (r336711) @@ -1,2 +1,2 @@ -SHA256 (kombu-3.0.7.tar.gz) = 1aed91b4e58c5114069b9432d229a6b8564f63000f50b03de1c514f2bdd42f1b -SIZE (kombu-3.0.7.tar.gz) = 330463 +SHA256 (kombu-3.0.8.tar.gz) = de8eea1b9dc83c268a135bcaa9b89aedec1b07f63ebb487f3ba09d35d37f07d2 +SIZE (kombu-3.0.8.tar.gz) = 335226 From owner-svn-ports-head@FreeBSD.ORG Tue Dec 17 10:50:03 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id BA340803; Tue, 17 Dec 2013 10:50:03 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id A70CC157B; Tue, 17 Dec 2013 10:50:03 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBHAo3Pg019656; Tue, 17 Dec 2013 10:50:03 GMT (envelope-from wg@svn.freebsd.org) Received: (from wg@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBHAo3qA019655; Tue, 17 Dec 2013 10:50:03 GMT (envelope-from wg@svn.freebsd.org) Message-Id: <201312171050.rBHAo3qA019655@svn.freebsd.org> From: William Grzybowski Date: Tue, 17 Dec 2013 10:50:03 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r336712 - head/www/py-webware X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 17 Dec 2013 10:50:03 -0000 Author: wg Date: Tue Dec 17 10:50:03 2013 New Revision: 336712 URL: http://svnweb.freebsd.org/changeset/ports/336712 Log: www/py-webware: fix usage of python Reported by: exp-run (PR/184591) Modified: head/www/py-webware/pkg-install Modified: head/www/py-webware/pkg-install ============================================================================== --- head/www/py-webware/pkg-install Tue Dec 17 10:44:07 2013 (r336711) +++ head/www/py-webware/pkg-install Tue Dec 17 10:50:03 2013 (r336712) @@ -46,7 +46,7 @@ add_webkit_account() compile_python_files() { - (cd ${WEBWARE_MASTER_DIR} && python install.py --no-password-prompt) + (cd ${WEBWARE_MASTER_DIR} && ${PYTHON} install.py --no-password-prompt) } make_webkit_home_dir() @@ -54,7 +54,7 @@ make_webkit_home_dir() # make the default webware user home directory if it doesn't exist yet if ! [ -d ${WEBKIT_HOME_DIR} ] ; then # make application workdir for webkit user - python ${WEBWARE_MASTER_DIR}/bin/MakeAppWorkDir.py \ + ${PYTHON} ${WEBWARE_MASTER_DIR}/bin/MakeAppWorkDir.py \ ${WEBKIT_HOME_DIR} chown -R root:wheel ${WEBKIT_HOME_DIR} echo chown -R ${WEBWARE_USER}:${WEBWARE_GROUP} \ From owner-svn-ports-head@FreeBSD.ORG Tue Dec 17 10:55:26 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id E3BFBA78; Tue, 17 Dec 2013 10:55:26 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id D046315F7; Tue, 17 Dec 2013 10:55:26 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBHAtQRf022714; Tue, 17 Dec 2013 10:55:26 GMT (envelope-from kwm@svn.freebsd.org) Received: (from kwm@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBHAtQVp022712; Tue, 17 Dec 2013 10:55:26 GMT (envelope-from kwm@svn.freebsd.org) Message-Id: <201312171055.rBHAtQVp022712@svn.freebsd.org> From: Koop Mast Date: Tue, 17 Dec 2013 10:55:26 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r336713 - head/graphics/libGL X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 17 Dec 2013 10:55:27 -0000 Author: kwm Date: Tue Dec 17 10:55:26 2013 New Revision: 336713 URL: http://svnweb.freebsd.org/changeset/ports/336713 Log: make, make -V MAINTAINER output the correct value again. Modified: head/graphics/libGL/bsd.mesalib.mk Modified: head/graphics/libGL/bsd.mesalib.mk ============================================================================== --- head/graphics/libGL/bsd.mesalib.mk Tue Dec 17 10:50:03 2013 (r336712) +++ head/graphics/libGL/bsd.mesalib.mk Tue Dec 17 10:55:26 2013 (r336713) @@ -29,7 +29,7 @@ PLIST_SUB+= OLD="" NEW="@comment " MASTER_SITES= ftp://ftp.freedesktop.org/pub/mesa/${MESABASEVERSION}/ DISTFILES= MesaLib-${MESADISTVERSION}${EXTRACT_SUFX} -MAINTAINER?= x11@FreeBSD.org +MAINTAINER= x11@FreeBSD.org BUILD_DEPENDS+= makedepend:${PORTSDIR}/devel/makedepend \ python2:${PORTSDIR}/lang/python2 \ From owner-svn-ports-head@FreeBSD.ORG Tue Dec 17 11:05:12 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 82925C0B; Tue, 17 Dec 2013 11:05:12 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 6F2511696; Tue, 17 Dec 2013 11:05:12 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBHB5CpP026424; Tue, 17 Dec 2013 11:05:12 GMT (envelope-from wg@svn.freebsd.org) Received: (from wg@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBHB5CiP026423; Tue, 17 Dec 2013 11:05:12 GMT (envelope-from wg@svn.freebsd.org) Message-Id: <201312171105.rBHB5CiP026423@svn.freebsd.org> From: William Grzybowski Date: Tue, 17 Dec 2013 11:05:12 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r336714 - head/www/mod_spdy X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 17 Dec 2013 11:05:12 -0000 Author: wg Date: Tue Dec 17 11:05:11 2013 New Revision: 336714 URL: http://svnweb.freebsd.org/changeset/ports/336714 Log: www/mod_spdy: depends explicitly on python Reported by: exp-run (PR/184591) Approved by: portmgr (blanket) Modified: head/www/mod_spdy/Makefile Modified: head/www/mod_spdy/Makefile ============================================================================== --- head/www/mod_spdy/Makefile Tue Dec 17 10:55:26 2013 (r336713) +++ head/www/mod_spdy/Makefile Tue Dec 17 11:05:11 2013 (r336714) @@ -16,7 +16,8 @@ COMMENT= SPDY module for the Apache HTTP LICENSE= AL2 -BUILD_DEPENDS= greadlink:${PORTSDIR}/sysutils/coreutils \ +BUILD_DEPENDS= python:${PORTSDIR}/lang/python \ + greadlink:${PORTSDIR}/sysutils/coreutils \ flock:${PORTSDIR}/sysutils/flock \ svn:${PORTSDIR}/devel/subversion \ curl:${PORTSDIR}/ftp/curl \ From owner-svn-ports-head@FreeBSD.ORG Tue Dec 17 11:07:26 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 5E82BD51; Tue, 17 Dec 2013 11:07:26 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 4B43116AE; Tue, 17 Dec 2013 11:07:26 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBHB7QFf026792; Tue, 17 Dec 2013 11:07:26 GMT (envelope-from sem@svn.freebsd.org) Received: (from sem@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBHB7QmB026791; Tue, 17 Dec 2013 11:07:26 GMT (envelope-from sem@svn.freebsd.org) Message-Id: <201312171107.rBHB7QmB026791@svn.freebsd.org> From: Sergey Matveychuk Date: Tue, 17 Dec 2013 11:07:26 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r336715 - head/databases/dbconnect X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 17 Dec 2013 11:07:26 -0000 Author: sem Date: Tue Dec 17 11:07:25 2013 New Revision: 336715 URL: http://svnweb.freebsd.org/changeset/ports/336715 Log: - Fix build on 10.x Modified: head/databases/dbconnect/Makefile Modified: head/databases/dbconnect/Makefile ============================================================================== --- head/databases/dbconnect/Makefile Tue Dec 17 11:05:11 2013 (r336714) +++ head/databases/dbconnect/Makefile Tue Dec 17 11:07:25 2013 (r336715) @@ -48,6 +48,7 @@ PLIST_SUB+= PGSQL="@comment " post-patch: @${RM} -f ${WRKSRC}/include/dbconn/README + @${REINPLACE_CMD} 's/gcc/${CC}/' ${WRKSRC}/src/dbconnect/Makefile.in @${REINPLACE_CMD} 's/gcc/${CC}/' ${WRKSRC}/src/driver_*/Makefile.in do-install: From owner-svn-ports-head@FreeBSD.ORG Tue Dec 17 11:25:13 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 5C3451B3; Tue, 17 Dec 2013 11:25:13 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 47CDF182A; Tue, 17 Dec 2013 11:25:13 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBHBPDrs033838; Tue, 17 Dec 2013 11:25:13 GMT (envelope-from ale@svn.freebsd.org) Received: (from ale@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBHBPCXY033832; Tue, 17 Dec 2013 11:25:12 GMT (envelope-from ale@svn.freebsd.org) Message-Id: <201312171125.rBHBPCXY033832@svn.freebsd.org> From: Alex Dupre Date: Tue, 17 Dec 2013 11:25:12 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r336716 - in head/databases: mysql56-client mysql56-client/files mysql56-server X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 17 Dec 2013 11:25:13 -0000 Author: ale Date: Tue Dec 17 11:25:11 2013 New Revision: 336716 URL: http://svnweb.freebsd.org/changeset/ports/336716 Log: Update to 5.6.15 release and stagify. Modified: head/databases/mysql56-client/Makefile head/databases/mysql56-client/files/patch-CMakeLists.txt head/databases/mysql56-client/pkg-plist head/databases/mysql56-server/Makefile head/databases/mysql56-server/distinfo head/databases/mysql56-server/pkg-plist Modified: head/databases/mysql56-client/Makefile ============================================================================== --- head/databases/mysql56-client/Makefile Tue Dec 17 11:07:25 2013 (r336715) +++ head/databases/mysql56-client/Makefile Tue Dec 17 11:25:11 2013 (r336716) @@ -24,5 +24,4 @@ MAN1= comp_err.1 msql2mysql.1 mysql.1 m CLIENT_ONLY= yes -NO_STAGE= yes .include "${MASTERDIR}/Makefile" Modified: head/databases/mysql56-client/files/patch-CMakeLists.txt ============================================================================== --- head/databases/mysql56-client/files/patch-CMakeLists.txt Tue Dec 17 11:07:25 2013 (r336715) +++ head/databases/mysql56-client/files/patch-CMakeLists.txt Tue Dec 17 11:25:11 2013 (r336716) @@ -1,6 +1,6 @@ ---- CMakeLists.txt.orig 2013-01-22 17:54:49.000000000 +0100 -+++ CMakeLists.txt 2013-02-13 14:18:37.000000000 +0100 -@@ -378,31 +378,11 @@ +--- CMakeLists.txt.orig 2013-11-17 18:02:53.000000000 +0000 ++++ CMakeLists.txt 2013-12-16 14:43:48.037159232 +0000 +@@ -458,33 +458,11 @@ ENDIF() ADD_SUBDIRECTORY(extra) @@ -28,6 +28,8 @@ - ADD_SUBDIRECTORY(internal) - ENDIF() - ADD_SUBDIRECTORY(packaging/rpm-uln) +- ADD_SUBDIRECTORY(packaging/rpm-oel) +- ADD_SUBDIRECTORY(packaging/rpm-fedora) -ENDIF() +ADD_SUBDIRECTORY(client) +ADD_SUBDIRECTORY(libservices) @@ -37,7 +39,7 @@ INCLUDE(cmake/abi_check.cmake) INCLUDE(cmake/tags.cmake) -@@ -439,7 +419,6 @@ +@@ -521,18 +499,17 @@ SET(CPACK_GENERATOR "TGZ") ENDIF() ADD_SUBDIRECTORY(packaging/WiX) @@ -45,9 +47,8 @@ # Create a single package with "make package" # (see http://public.kitware.com/Bug/view.php?id=11452) -@@ -447,11 +426,11 @@ + SET(CPACK_MONOLITHIC_INSTALL 1 CACHE INTERNAL "") - INCLUDE(CPack) IF(UNIX) - INSTALL(FILES Docs/mysql.info DESTINATION ${INSTALL_INFODIR} OPTIONAL COMPONENT Info) ENDIF() @@ -58,8 +59,10 @@ IF(NOT INSTALL_LAYOUT MATCHES "RPM") INSTALL(FILES COPYING LICENSE.mysql DESTINATION ${INSTALL_DOCREADMEDIR} -@@ -477,3 +456,4 @@ +@@ -558,5 +535,6 @@ PATTERN "sp-imp-spec.txt" EXCLUDE ) ENDIF() +ENDIF() + + INCLUDE(CPack) Modified: head/databases/mysql56-client/pkg-plist ============================================================================== --- head/databases/mysql56-client/pkg-plist Tue Dec 17 11:07:25 2013 (r336715) +++ head/databases/mysql56-client/pkg-plist Tue Dec 17 11:25:11 2013 (r336716) @@ -92,6 +92,21 @@ lib/mysql/libmysqlclient_r.a lib/mysql/libmysqlclient_r.so lib/mysql/libmysqlclient_r.so.18 lib/mysql/libmysqlservices.a +man/man1/comp_err.1.gz +man/man1/msql2mysql.1.gz +man/man1/mysql.1.gz +man/man1/mysql_config.1.gz +man/man1/mysql_config_editor.1.gz +man/man1/mysql_find_rows.1.gz +man/man1/mysql_waitpid.1.gz +man/man1/mysqlaccess.1.gz +man/man1/mysqladmin.1.gz +man/man1/mysqlbinlog.1.gz +man/man1/mysqlcheck.1.gz +man/man1/mysqldump.1.gz +man/man1/mysqlimport.1.gz +man/man1/mysqlshow.1.gz +man/man1/mysqlslap.1.gz share/aclocal/mysql.m4 @dirrm include/mysql/mysql/psi @dirrm include/mysql/mysql Modified: head/databases/mysql56-server/Makefile ============================================================================== --- head/databases/mysql56-server/Makefile Tue Dec 17 11:07:25 2013 (r336715) +++ head/databases/mysql56-server/Makefile Tue Dec 17 11:25:11 2013 (r336716) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME?= mysql -PORTVERSION= 5.6.14 +PORTVERSION= 5.6.15 PORTREVISION?= 0 CATEGORIES= databases ipv6 MASTER_SITES= ${MASTER_SITE_MYSQL} @@ -54,8 +54,6 @@ USE_RC_SUBR= mysql-server USERS= mysql GROUPS= mysql -INFO= mysql - MAN1= my_print_defaults.1 myisam_ftdump.1 myisamchk.1 myisamlog.1 myisampack.1 \ mysql.server.1 mysql_convert_table_format.1 mysql_fix_extensions.1 \ mysql_install_db.1 mysql_plugin.1 mysql_secure_installation.1 mysql_setpermission.1 \ @@ -63,15 +61,7 @@ MAN1= my_print_defaults.1 myisam_ftdump mysqld_multi.1 mysqld_safe.1 mysqldumpslow.1 mysqlhotcopy.1 mysqlman.1 \ mysqltest.1 perror.1 replace.1 resolve_stack_dump.1 resolveip.1 -MAN8= mysqld.8 - CMAKE_ARGS+= -DWITH_EMBEDDED_SERVER="ON" - -NO_STAGE= yes -post-install: -.if !defined(PACKAGE_BUILDING) - @${CAT} ${PKGMESSAGE} -.endif .endif post-patch: Modified: head/databases/mysql56-server/distinfo ============================================================================== --- head/databases/mysql56-server/distinfo Tue Dec 17 11:07:25 2013 (r336715) +++ head/databases/mysql56-server/distinfo Tue Dec 17 11:25:11 2013 (r336716) @@ -1,2 +1,2 @@ -SHA256 (mysql-5.6.14.tar.gz) = 7136963e07726abfb543b618cf368c8bb9480b5113327ca4a8f94c86f24b22c7 -SIZE (mysql-5.6.14.tar.gz) = 36005278 +SHA256 (mysql-5.6.15.tar.gz) = f0ed95faf51670eb9d57ae901e03b0cda79f6c5899f0494b9ec867b1686fe4c7 +SIZE (mysql-5.6.15.tar.gz) = 32794954 Modified: head/databases/mysql56-server/pkg-plist ============================================================================== --- head/databases/mysql56-server/pkg-plist Tue Dec 17 11:07:25 2013 (r336715) +++ head/databases/mysql56-server/pkg-plist Tue Dec 17 11:25:11 2013 (r336716) @@ -38,6 +38,33 @@ lib/mysql/plugin/semisync_master.so lib/mysql/plugin/semisync_slave.so lib/mysql/plugin/validate_password.so libexec/mysqld +man/man1/my_print_defaults.1.gz +man/man1/myisam_ftdump.1.gz +man/man1/myisamchk.1.gz +man/man1/myisamlog.1.gz +man/man1/myisampack.1.gz +man/man1/mysql.server.1.gz +man/man1/mysql_convert_table_format.1.gz +man/man1/mysql_fix_extensions.1.gz +man/man1/mysql_install_db.1.gz +man/man1/mysql_plugin.1.gz +man/man1/mysql_secure_installation.1.gz +man/man1/mysql_setpermission.1.gz +man/man1/mysql_tzinfo_to_sql.1.gz +man/man1/mysql_upgrade.1.gz +man/man1/mysql_zap.1.gz +man/man1/mysqlbug.1.gz +man/man1/mysqld_multi.1.gz +man/man1/mysqld_safe.1.gz +man/man1/mysqldumpslow.1.gz +man/man1/mysqlhotcopy.1.gz +man/man1/mysqlman.1.gz +man/man1/mysqltest.1.gz +man/man1/perror.1.gz +man/man1/replace.1.gz +man/man1/resolve_stack_dump.1.gz +man/man1/resolveip.1.gz +man/man8/mysqld.8.gz %%DATADIR%%/binary-configure %%DATADIR%%/bulgarian/errmsg.sys %%DATADIR%%/charsets/Index.xml From owner-svn-ports-head@FreeBSD.ORG Tue Dec 17 11:46:31 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 1B3C2454; Tue, 17 Dec 2013 11:46:31 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id EF760197D; Tue, 17 Dec 2013 11:46:30 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBHBkUTS040914; Tue, 17 Dec 2013 11:46:30 GMT (envelope-from nemysis@svn.freebsd.org) Received: (from nemysis@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBHBkUft040906; Tue, 17 Dec 2013 11:46:30 GMT (envelope-from nemysis@svn.freebsd.org) Message-Id: <201312171146.rBHBkUft040906@svn.freebsd.org> From: Rusmir Dusko Date: Tue, 17 Dec 2013 11:46:30 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r336717 - in head/textproc/unoconv: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 17 Dec 2013 11:46:31 -0000 Author: nemysis Date: Tue Dec 17 11:46:29 2013 New Revision: 336717 URL: http://svnweb.freebsd.org/changeset/ports/336717 Log: - Change Makefile header - Change master sites, icon - Change maintainer email to @FreeBSD.org - Remove PORTDATA - Support STAGEDIR - Fix the usage of 'python' to get rid of the implicit lang/python dependency - Change pkg-plist, remove DOCS Approved by: pawel / wg (mentors, implicit) Modified: head/textproc/unoconv/Makefile head/textproc/unoconv/distinfo (contents, props changed) head/textproc/unoconv/files/unoconv.in (contents, props changed) head/textproc/unoconv/pkg-plist (contents, props changed) Modified: head/textproc/unoconv/Makefile ============================================================================== --- head/textproc/unoconv/Makefile Tue Dec 17 11:25:11 2013 (r336716) +++ head/textproc/unoconv/Makefile Tue Dec 17 11:46:29 2013 (r336717) @@ -1,12 +1,17 @@ +# Created by: Rusmir Dusko # $FreeBSD$ PORTNAME= unoconv PORTVERSION= 0.6 CATEGORIES= textproc python -MASTER_SITES= http://dag.wieers.com/home-made/unoconv/ +MASTER_SITES= http://dag.wieers.com/home-made/${PORTNAME}/ \ + SF/nemysisfreebsdp/textproc/:icons +DISTFILES= ${PORTNAME}-${DISTVERSION}${EXTRACT_SUFX} \ + ${PORTNAME}.png:icons DIST_SUBDIR= python +EXTRACT_ONLY= ${PORTNAME}-${DISTVERSION}${EXTRACT_SUFX} -MAINTAINER= nemysis@gmx.ch +MAINTAINER= nemysis@FreeBSD.org COMMENT= Convert any document from and to any LibreOffice supported format LICENSE= GPLv2 @@ -16,7 +21,7 @@ RUN_DEPENDS= xsltproc:${PORTSDIR}/textpr USE_PYTHON= yes NO_BUILD= yes -PORTDATA= * +PORTDOCS= * DOCSRCDIR1= ${WRKSRC} DOC_FILES1= AUTHORS ChangeLog README.asciidoc WISHLIST @@ -26,41 +31,30 @@ DOCSDIR2= ${DOCSDIR}/doc DOC_FILES2= errcode.txt filters.txt formats.txt office-installations.txt \ selinux.txt unoconv.1.txt -MAN1= ${PORTNAME}.1 - SUB_FILES= ${PORTNAME} pkg-message -NO_STAGE= yes -.include +post-patch: + @${REINPLACE_CMD} -e 's|/usr/bin/env python|${PYTHON_CMD}|' \ + ${WRKSRC}/${PORTNAME} do-install: -# Scripts - ${INSTALL_SCRIPT} ${WRKDIR}/${PORTNAME} ${PREFIX}/bin + ${INSTALL_SCRIPT} ${WRKDIR}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin/ -# Executable - ${MKDIR} ${DATADIR}/tests - ${INSTALL_SCRIPT} ${WRKSRC}/${PORTNAME} ${DATADIR} + @${MKDIR} ${STAGEDIR}${DATADIR}/tests/ + ${INSTALL_SCRIPT} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${DATADIR} -# Data .for f in *.odt *.csv - @(cd ${WRKSRC}/tests && ${INSTALL_DATA} ${f} ${DATADIR}/tests) + @(cd ${WRKSRC}/tests && ${INSTALL_DATA} ${f} ${STAGEDIR}${DATADIR}/tests) .endfor -# Pixmaps - ${INSTALL_DATA} ${WRKSRC}/tests/dag.gif ${PREFIX}/share/pixmaps/${PORTNAME}.gif - -# Documentation -.if ${PORT_OPTIONS:MDOCS} - ${MKDIR} ${DOCSDIR} - ${INSTALL_DATA} ${DOC_FILES1:S|^|${DOCSRCDIR1}/|} ${DOCSDIR} - ${MKDIR} ${DOCSDIR2} - ${INSTALL_DATA} ${DOC_FILES2:S|^|${DOCSRCDIR2}/|} ${DOCSDIR2} - ${INSTALL_MAN} ${WRKSRC}/doc/${PORTNAME}.1 ${MAN1PREFIX}/man/man1 -.endif - -# pkg-message - @${ECHO_CMD} - @${CAT} ${PKGMESSAGE} - @${ECHO_CMD} + ${INSTALL_DATA} ${_DISTDIR}/${PORTNAME}.png \ + ${STAGEDIR}${PREFIX}/share/pixmaps/ + ${INSTALL_MAN} ${WRKSRC}/doc/${PORTNAME}.1 \ + ${STAGEDIR}${MAN1PREFIX}/man/man1/ + + @${MKDIR} ${STAGEDIR}${DOCSDIR} + ${INSTALL_DATA} ${DOC_FILES1:S|^|${DOCSRCDIR1}/|} ${STAGEDIR}${DOCSDIR} + @${MKDIR} ${STAGEDIR}${DOCSDIR2} + ${INSTALL_DATA} ${DOC_FILES2:S|^|${DOCSRCDIR2}/|} ${STAGEDIR}${DOCSDIR2} .include Modified: head/textproc/unoconv/distinfo ============================================================================== --- head/textproc/unoconv/distinfo Tue Dec 17 11:25:11 2013 (r336716) +++ head/textproc/unoconv/distinfo Tue Dec 17 11:46:29 2013 (r336717) @@ -1,2 +1,4 @@ SHA256 (python/unoconv-0.6.tar.gz) = 790e614b8615217ef4588b187f0018b526ec2bb480c6b9b2ffb9b82f48da73d4 SIZE (python/unoconv-0.6.tar.gz) = 91578 +SHA256 (python/unoconv.png) = 459f7dbc60e34ccce5c9d46a7317be02dd3c8275e7f7588b7b3885c67b6738eb +SIZE (python/unoconv.png) = 744 Modified: head/textproc/unoconv/files/unoconv.in ============================================================================== --- head/textproc/unoconv/files/unoconv.in Tue Dec 17 11:25:11 2013 (r336716) +++ head/textproc/unoconv/files/unoconv.in Tue Dec 17 11:46:29 2013 (r336717) @@ -4,4 +4,4 @@ # cd "%%DATADIR%%" -./unoconv "$@" +exec ./unoconv "$@" Modified: head/textproc/unoconv/pkg-plist ============================================================================== --- head/textproc/unoconv/pkg-plist Tue Dec 17 11:25:11 2013 (r336716) +++ head/textproc/unoconv/pkg-plist Tue Dec 17 11:46:29 2013 (r336717) @@ -1,14 +1,8 @@ bin/unoconv -%%PORTDOCS%%%%DOCSDIR%%/AUTHORS -%%PORTDOCS%%%%DOCSDIR%%/ChangeLog -%%PORTDOCS%%%%DOCSDIR%%/README.asciidoc -%%PORTDOCS%%%%DOCSDIR%%/WISHLIST -%%PORTDOCS%%%%DOCSDIR%%/doc/errcode.txt -%%PORTDOCS%%%%DOCSDIR%%/doc/filters.txt -%%PORTDOCS%%%%DOCSDIR%%/doc/formats.txt -%%PORTDOCS%%%%DOCSDIR%%/doc/office-installations.txt -%%PORTDOCS%%%%DOCSDIR%%/doc/selinux.txt -%%PORTDOCS%%%%DOCSDIR%%/doc/unoconv.1.txt -share/pixmaps/unoconv.gif -%%PORTDOCS%%@dirrm %%DOCSDIR%%/doc -%%PORTDOCS%%@dirrm %%DOCSDIR%% +man/man1/unoconv.1.gz +share/pixmaps/unoconv.png +%%DATADIR%%/tests/document-example.odt +%%DATADIR%%/tests/spreadsheet-example.csv +%%DATADIR%%/unoconv +@dirrm %%DATADIR%%/tests +@dirrm %%DATADIR%% From owner-svn-ports-head@FreeBSD.ORG Tue Dec 17 12:05:26 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 9AFB478D; Tue, 17 Dec 2013 12:05:26 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 86EE01AE0; Tue, 17 Dec 2013 12:05:26 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBHC5Qcl048021; Tue, 17 Dec 2013 12:05:26 GMT (envelope-from wg@svn.freebsd.org) Received: (from wg@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBHC5QZf048019; Tue, 17 Dec 2013 12:05:26 GMT (envelope-from wg@svn.freebsd.org) Message-Id: <201312171205.rBHC5QZf048019@svn.freebsd.org> From: William Grzybowski Date: Tue, 17 Dec 2013 12:05:26 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r336718 - head/www/py-flexget X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 17 Dec 2013 12:05:26 -0000 Author: wg Date: Tue Dec 17 12:05:25 2013 New Revision: 336718 URL: http://svnweb.freebsd.org/changeset/ports/336718 Log: www/py-flexget: update to 1.1.170 - Update to 1.1.170 - Remove duplicated setuptools build dependency Modified: head/www/py-flexget/Makefile head/www/py-flexget/distinfo Modified: head/www/py-flexget/Makefile ============================================================================== --- head/www/py-flexget/Makefile Tue Dec 17 11:46:29 2013 (r336717) +++ head/www/py-flexget/Makefile Tue Dec 17 12:05:25 2013 (r336718) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= flexget -PORTVERSION= 1.1.167 +PORTVERSION= 1.1.170 PORTEPOCH= 1 CATEGORIES= www python MASTER_SITES= CHEESESHOP @@ -14,8 +14,7 @@ COMMENT= Program to automate downloading LICENSE= MIT -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}paver>=0:${PORTSDIR}/devel/py-paver \ - ${PYTHON_PKGNAMEPREFIX}setuptools>=0:${PORTSDIR}/devel/py-setuptools +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}paver>=0:${PORTSDIR}/devel/py-paver RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}feedparser>=5.1.3:${PORTSDIR}/textproc/py-feedparser \ ${PYTHON_PKGNAMEPREFIX}sqlalchemy>=0.7:${PORTSDIR}/databases/py-sqlalchemy \ ${PYTHON_PKGNAMEPREFIX}yaml>0:${PORTSDIR}/devel/py-yaml \ Modified: head/www/py-flexget/distinfo ============================================================================== --- head/www/py-flexget/distinfo Tue Dec 17 11:46:29 2013 (r336717) +++ head/www/py-flexget/distinfo Tue Dec 17 12:05:25 2013 (r336718) @@ -1,2 +1,2 @@ -SHA256 (FlexGet-1.1.167.tar.gz) = 370ca0fe843d316ecfb654cc5d975c8175f833b90d05c91f18f4401475359634 -SIZE (FlexGet-1.1.167.tar.gz) = 903032 +SHA256 (FlexGet-1.1.170.tar.gz) = 7b94823a1145d0ff5e883bc0c7ca82610eafc1be211b2662793c3aecdfe21e8c +SIZE (FlexGet-1.1.170.tar.gz) = 903021 From owner-svn-ports-head@FreeBSD.ORG Tue Dec 17 12:26:28 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id AA996BF7; Tue, 17 Dec 2013 12:26:28 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 975631D32; Tue, 17 Dec 2013 12:26:28 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBHCQS0Y055490; Tue, 17 Dec 2013 12:26:28 GMT (envelope-from wg@svn.freebsd.org) Received: (from wg@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBHCQS3f055488; Tue, 17 Dec 2013 12:26:28 GMT (envelope-from wg@svn.freebsd.org) Message-Id: <201312171226.rBHCQS3f055488@svn.freebsd.org> From: William Grzybowski Date: Tue, 17 Dec 2013 12:26:28 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r336719 - head/devel/generate X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 17 Dec 2013 12:26:28 -0000 Author: wg Date: Tue Dec 17 12:26:27 2013 New Revision: 336719 URL: http://svnweb.freebsd.org/changeset/ports/336719 Log: devel/generate: update to 2.8 - Update to 2.8 - Allow staging - USES gmake - Drop maintainership Approved by: maintainer (via email) Modified: head/devel/generate/Makefile head/devel/generate/distinfo Modified: head/devel/generate/Makefile ============================================================================== --- head/devel/generate/Makefile Tue Dec 17 12:05:25 2013 (r336718) +++ head/devel/generate/Makefile Tue Dec 17 12:26:27 2013 (r336719) @@ -2,20 +2,21 @@ # $FreeBSD$ PORTNAME= generate -PORTVERSION= 2.6 +PORTVERSION= 2.8 CATEGORIES= devel -MASTER_SITES= ftp://ftp.druid.net/pub/distrib/ +MASTER_SITES= http://www.druid.net/darcy/ EXTRACT_SUFX= .tgz -MAINTAINER= darcy@druid.net +MAINTAINER= ports@FreeBSD.org COMMENT= Simple text pre-processor -USE_GMAKE= yes -MAN1= generate.1 +USES= gmake -PLIST_FILES= bin/generate bin/rgenerate +MAKE_ARGS= BINDIR=${STAGEDIR}${PREFIX}/bin \ + MANDIR=${STAGEDIR}${PREFIX}/man + +PLIST_FILES= bin/generate bin/rgenerate man/man1/generate.1.gz -NO_STAGE= yes post-patch: @${REINPLACE_CMD} -e 's,^CFLAGS *=,CFLAGS +=,' \ ${WRKSRC}/Makefile Modified: head/devel/generate/distinfo ============================================================================== --- head/devel/generate/distinfo Tue Dec 17 12:05:25 2013 (r336718) +++ head/devel/generate/distinfo Tue Dec 17 12:26:27 2013 (r336719) @@ -1,2 +1,2 @@ -SHA256 (generate-2.6.tgz) = 609e166f66b4bb3028fb9e5486ffddff98fc7bf4f354659516c2b86a800948bd -SIZE (generate-2.6.tgz) = 29045 +SHA256 (generate-2.8.tgz) = 03f5778f7578319ab45b11a59e302e957cb20f993da32b81876fa45148a04633 +SIZE (generate-2.8.tgz) = 31594 From owner-svn-ports-head@FreeBSD.ORG Tue Dec 17 13:01:14 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id EF5028DD; Tue, 17 Dec 2013 13:01:13 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id CEEBB1FF0; Tue, 17 Dec 2013 13:01:13 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBHD1Dhx069023; Tue, 17 Dec 2013 13:01:13 GMT (envelope-from nemysis@svn.freebsd.org) Received: (from nemysis@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBHD1CJA069016; Tue, 17 Dec 2013 13:01:12 GMT (envelope-from nemysis@svn.freebsd.org) Message-Id: <201312171301.rBHD1CJA069016@svn.freebsd.org> From: Rusmir Dusko Date: Tue, 17 Dec 2013 13:01:12 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r336720 - in head/games: . dcross dcross/files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 17 Dec 2013 13:01:14 -0000 Author: nemysis Date: Tue Dec 17 13:01:12 2013 New Revision: 336720 URL: http://svnweb.freebsd.org/changeset/ports/336720 Log: Unlike your common unilateral falling block games, 'Double Cross' implements a bidirectional paradigm expanding the genre in both dimension and difficulty. Blocks fall from the top and fly in from the side settling in a joined "play area". Deletions occur when rows of ten blocks are completed. A horizontal row of 10 will cause the blocks to fall down, and a vertical row of 10 will cause the blocks to "fall" to the right. If a vertical row is completed during a vertical drop or a horizontal row is completed during a horizontal drop the corresponding deletion will not occur until the next turn. This can and will lead to non-intuitive results. Focus on the vertical alone and you will die from horizontal negligence and vice versa. WWW: https://code.google.com/p/double-cross/ PR: ports/171603 Submitted by: nemysis (self) Approved by: pawel (mentor) Added: head/games/dcross/ head/games/dcross/Makefile (contents, props changed) head/games/dcross/distinfo (contents, props changed) head/games/dcross/files/ head/games/dcross/files/dcross.in (contents, props changed) head/games/dcross/pkg-descr (contents, props changed) head/games/dcross/pkg-plist (contents, props changed) Modified: head/games/Makefile Modified: head/games/Makefile ============================================================================== --- head/games/Makefile Tue Dec 17 12:26:27 2013 (r336719) +++ head/games/Makefile Tue Dec 17 13:01:12 2013 (r336720) @@ -183,6 +183,7 @@ SUBDIR += dangerdeep SUBDIR += dangerdeep-data SUBDIR += darkplaces + SUBDIR += dcross SUBDIR += deal SUBDIR += defendguin SUBDIR += deng Added: head/games/dcross/Makefile ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/games/dcross/Makefile Tue Dec 17 13:01:12 2013 (r336720) @@ -0,0 +1,55 @@ +# Created by: Rusmir Dusko +# $FreeBSD$ + +PORTNAME= dcross +PORTVERSION= 2.0 +CATEGORIES= games python +MASTER_SITES= GOOGLE_CODE \ + SF/nemysisfreebsdp/games/:icons +PROJECTHOST= double-cross +DISTFILES= ${PORTNAME}_${DISTVERSION}${EXTRACT_SUFX} \ + ${PORTNAME}_icons${EXTRACT_SUFX}:icons +DIST_SUBDIR= python + +MAINTAINER= nemysis@FreeBSD.org +COMMENT= Unconventional falling block game + +LICENSE= GPLv2 + +RUN_DEPENDS= ${PYGAME} + +WRKSRC= ${WRKDIR}/${PORTNAME}_${PORTVERSION}/ + +USE_ZIP= yes +USES= dos2unix +DOS2UNIX_REGEX= .*.[^p][^n][^g]$ +DOS2UNIX_FILES= *.pyw +USE_PYTHON= yes + +INSTALLS_ICONS= yes +ICON_SIZES= 32x32 48x48 64x64 72x72 96x96 + +SUB_FILES= ${PORTNAME} + +DESKTOP_ENTRIES="Double Cross" "" "${PORTNAME}" \ + "${PORTNAME}" "Game;ArcadeGame;" "" + +do-build: + @${PYTHON_CMD} -m compileall ${WRKSRC} + @${PYTHON_CMD} -O -m compileall ${WRKSRC} + +do-install: + @${REINPLACE_CMD} -e 's|%%PYTHON_CMD%%|${PYTHON_CMD}|' \ + ${WRKDIR}/${PORTNAME} + ${INSTALL_SCRIPT} ${WRKDIR}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin/ + @(cd ${WRKSRC} && ${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR}) + +.for s in ${ICON_SIZES} + @${MKDIR} ${STAGEDIR}${PREFIX}/share/icons/hicolor/${s}/apps/ + ${INSTALL_DATA} ${WRKDIR}/${PORTNAME}_${s}.png \ + ${STAGEDIR}${PREFIX}/share/icons/hicolor/${s}/apps/${PORTNAME}.png +.endfor + ${LN} -sf ${PREFIX}/share/icons/hicolor/48x48/apps/${PORTNAME}.png \ + ${STAGEDIR}${PREFIX}/share/pixmaps/ + +.include Added: head/games/dcross/distinfo ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/games/dcross/distinfo Tue Dec 17 13:01:12 2013 (r336720) @@ -0,0 +1,4 @@ +SHA256 (python/dcross_2.0.zip) = 57ce35a0b41dda365c976bf5ff671785c975ebf842a3609be3d53b74a0a6bfa8 +SIZE (python/dcross_2.0.zip) = 28543733 +SHA256 (python/dcross_icons.zip) = 8501803fedea59dc897c83a332e0c5308c8bb6db73d82d5160c994701aee9edb +SIZE (python/dcross_icons.zip) = 40422 Added: head/games/dcross/files/dcross.in ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/games/dcross/files/dcross.in Tue Dec 17 13:01:12 2013 (r336720) @@ -0,0 +1,7 @@ +#!/bin/sh +# +# $FreeBSD$ +# + +cd "%%DATADIR%%" +exec %%PYTHON_CMD%% ./double-cross.pyw "${@}" Added: head/games/dcross/pkg-descr ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/games/dcross/pkg-descr Tue Dec 17 13:01:12 2013 (r336720) @@ -0,0 +1,14 @@ +Unlike your common unilateral falling block games, 'Double Cross' implements +a bidirectional paradigm expanding the genre in both dimension and difficulty. + +Blocks fall from the top and fly in from the side settling in a joined +"play area". Deletions occur when rows of ten blocks are completed. +A horizontal row of 10 will cause the blocks to fall down, and a vertical row +of 10 will cause the blocks to "fall" to the right. +If a vertical row is completed during a vertical drop or a horizontal row is +completed during a horizontal drop the corresponding deletion will not occur +until the next turn. This can and will lead to non-intuitive results. +Focus on the vertical alone and you will die from horizontal negligence and +vice versa. + +WWW: https://code.google.com/p/double-cross/ Added: head/games/dcross/pkg-plist ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/games/dcross/pkg-plist Tue Dec 17 13:01:12 2013 (r336720) @@ -0,0 +1,85 @@ +bin/dcross +%%DATADIR%%/data/__init__.py +%%DATADIR%%/data/__init__.pyc +%%DATADIR%%/data/__init__.pyo +%%DATADIR%%/data/blocks.py +%%DATADIR%%/data/blocks.pyc +%%DATADIR%%/data/blocks.pyo +%%DATADIR%%/data/game.py +%%DATADIR%%/data/game.pyc +%%DATADIR%%/data/game.pyo +%%DATADIR%%/data/highs.dat +%%DATADIR%%/data/highscore.py +%%DATADIR%%/data/highscore.pyc +%%DATADIR%%/data/highscore.pyo +%%DATADIR%%/data/keymap.py +%%DATADIR%%/data/keymap.pyc +%%DATADIR%%/data/keymap.pyo +%%DATADIR%%/data/loser.py +%%DATADIR%%/data/loser.pyc +%%DATADIR%%/data/loser.pyo +%%DATADIR%%/data/main.py +%%DATADIR%%/data/main.pyc +%%DATADIR%%/data/main.pyo +%%DATADIR%%/data/menu.py +%%DATADIR%%/data/menu.pyc +%%DATADIR%%/data/menu.pyo +%%DATADIR%%/data/playcontrols.dat +%%DATADIR%%/data/reset.py +%%DATADIR%%/data/reset.pyc +%%DATADIR%%/data/reset.pyo +%%DATADIR%%/data/setup.py +%%DATADIR%%/data/setup.pyc +%%DATADIR%%/data/setup.pyo +%%DATADIR%%/data/title.py +%%DATADIR%%/data/title.pyc +%%DATADIR%%/data/title.pyo +%%DATADIR%%/data/tools.py +%%DATADIR%%/data/tools.pyc +%%DATADIR%%/data/tools.pyo +%%DATADIR%%/double-cross.pyw +%%DATADIR%%/fonts/arial.ttf +%%DATADIR%%/fonts/impact.ttf +%%DATADIR%%/fonts/wadim_giant.ttf +%%DATADIR%%/fonts/wadimi.ttf +%%DATADIR%%/graphics/alphagrid.png +%%DATADIR%%/graphics/base.png +%%DATADIR%%/graphics/brick.png +%%DATADIR%%/graphics/cell_deletion1.png +%%DATADIR%%/graphics/cell_deletion2.png +%%DATADIR%%/graphics/controls.png +%%DATADIR%%/graphics/curt.png +%%DATADIR%%/graphics/dc_icon.png +%%DATADIR%%/graphics/donote.png +%%DATADIR%%/graphics/flipper_h.png +%%DATADIR%%/graphics/komrade.png +%%DATADIR%%/graphics/logo.png +%%DATADIR%%/graphics/nekey.png +%%DATADIR%%/graphics/note.png +%%DATADIR%%/graphics/scorebg.png +%%DATADIR%%/graphics/shade.png +%%DATADIR%%/graphics/strip.png +%%DATADIR%%/graphics/title1.png +%%DATADIR%%/graphics/title2.png +%%DATADIR%%/sound/effects/blipshort1.wav +%%DATADIR%%/sound/effects/chimed.wav +%%DATADIR%%/sound/effects/explosion.wav +%%DATADIR%%/sound/effects/lev.wav +%%DATADIR%%/sound/effects/line.wav +%%DATADIR%%/sound/effects/thud.wav +%%DATADIR%%/sound/music/Kalinka.mp3 +%%DATADIR%%/sound/music/Katyusha.mp3 +%%DATADIR%%/sound/music/Korobelniki.mp3 +share/icons/hicolor/32x32/apps/dcross.png +share/icons/hicolor/48x48/apps/dcross.png +share/icons/hicolor/64x64/apps/dcross.png +share/icons/hicolor/72x72/apps/dcross.png +share/icons/hicolor/96x96/apps/dcross.png +share/pixmaps/dcross.png +@dirrm %%DATADIR%%/sound/music +@dirrm %%DATADIR%%/sound/effects +@dirrm %%DATADIR%%/sound +@dirrm %%DATADIR%%/graphics +@dirrm %%DATADIR%%/fonts +@dirrm %%DATADIR%%/data +@dirrm %%DATADIR%% From owner-svn-ports-head@FreeBSD.ORG Tue Dec 17 13:10:03 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 3B7FDD6E; Tue, 17 Dec 2013 13:10:03 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 2781D107D; Tue, 17 Dec 2013 13:10:03 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBHDA2gr070412; Tue, 17 Dec 2013 13:10:02 GMT (envelope-from swills@svn.freebsd.org) Received: (from swills@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBHDA290070407; Tue, 17 Dec 2013 13:10:02 GMT (envelope-from swills@svn.freebsd.org) Message-Id: <201312171310.rBHDA290070407@svn.freebsd.org> From: Steve Wills Date: Tue, 17 Dec 2013 13:10:02 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r336721 - in head/net-p2p/litecoin: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 17 Dec 2013 13:10:03 -0000 Author: swills Date: Tue Dec 17 13:10:02 2013 New Revision: 336721 URL: http://svnweb.freebsd.org/changeset/ports/336721 Log: - Update to 0.8.6.1 Added: head/net-p2p/litecoin/files/extra-patch-endian (contents, props changed) Deleted: head/net-p2p/litecoin/files/patch-src__serialize.h Modified: head/net-p2p/litecoin/Makefile head/net-p2p/litecoin/distinfo Modified: head/net-p2p/litecoin/Makefile ============================================================================== --- head/net-p2p/litecoin/Makefile Tue Dec 17 13:01:12 2013 (r336720) +++ head/net-p2p/litecoin/Makefile Tue Dec 17 13:10:02 2013 (r336721) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= litecoin -PORTVERSION= 0.8.5.1 +PORTVERSION= 0.8.6.1 CATEGORIES= net-p2p finance MASTER_SITES= LOCAL/swills \ GH @@ -14,14 +14,14 @@ LIB_DEPENDS= libboost_date_time.so:${POR USE_GITHUB= yes GH_ACCOUNT= litecoin-project -GH_COMMIT= 6cef39c +GH_COMMIT= dab8fe6 GH_TAGNAME= v${PORTVERSION} USE_OPENSSL= yes USE_BDB= yes WANT_BDB_VER= 48 -USE_GMAKE= yes +USES= gmake OPTIONS_DEFINE= GUI UPNP QRCODES DBUS OPTIONS_DEFAULT= GUI QRCODES @@ -72,6 +72,10 @@ QMAKE_USE_DBUS= 0 .include +.if ${OSVERSION} >= 1000000 +EXTRA_PATCHES+= ${FILESDIR}/extra-patch-endian +.endif + do-configure: .if ${PORT_OPTIONS:MGUI} && !defined(WITHOUT_X11) cd ${BUILD_WRKSRC} && \ Modified: head/net-p2p/litecoin/distinfo ============================================================================== --- head/net-p2p/litecoin/distinfo Tue Dec 17 13:01:12 2013 (r336720) +++ head/net-p2p/litecoin/distinfo Tue Dec 17 13:10:02 2013 (r336721) @@ -1,2 +1,2 @@ -SHA256 (litecoin-0.8.5.1.tar.gz) = 7588349de2b006153bde642468dbddd215986ca18ca7d5ef896092cab5488c49 -SIZE (litecoin-0.8.5.1.tar.gz) = 4783538 +SHA256 (litecoin-0.8.6.1.tar.gz) = ff11a4d5bd0cf9ddac0b1644d0819ec3d6827e5052addcbc871d288286188019 +SIZE (litecoin-0.8.6.1.tar.gz) = 4807148 Added: head/net-p2p/litecoin/files/extra-patch-endian ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net-p2p/litecoin/files/extra-patch-endian Tue Dec 17 13:10:02 2013 (r336721) @@ -0,0 +1,47 @@ +--- src/scrypt.cpp.orig 2013-12-09 18:10:12.046606050 +0000 ++++ src/scrypt.cpp 2013-12-09 18:10:25.898605023 +0000 +@@ -34,22 +34,6 @@ + #include + #include + +-static inline uint32_t be32dec(const void *pp) +-{ +- const uint8_t *p = (uint8_t const *)pp; +- return ((uint32_t)(p[3]) + ((uint32_t)(p[2]) << 8) + +- ((uint32_t)(p[1]) << 16) + ((uint32_t)(p[0]) << 24)); +-} +- +-static inline void be32enc(void *pp, uint32_t x) +-{ +- uint8_t *p = (uint8_t *)pp; +- p[3] = x & 0xff; +- p[2] = (x >> 8) & 0xff; +- p[1] = (x >> 16) & 0xff; +- p[0] = (x >> 24) & 0xff; +-} +- + typedef struct HMAC_SHA256Context { + SHA256_CTX ictx; + SHA256_CTX octx; +--- src/scrypt.h.orig 2013-12-09 15:26:17.343282984 +0000 ++++ src/scrypt.h 2013-12-09 15:45:11.032205545 +0000 +@@ -17,19 +17,4 @@ + PBKDF2_SHA256(const uint8_t *passwd, size_t passwdlen, const uint8_t *salt, + size_t saltlen, uint64_t c, uint8_t *buf, size_t dkLen); + +-static inline uint32_t le32dec(const void *pp) +-{ +- const uint8_t *p = (uint8_t const *)pp; +- return ((uint32_t)(p[0]) + ((uint32_t)(p[1]) << 8) + +- ((uint32_t)(p[2]) << 16) + ((uint32_t)(p[3]) << 24)); +-} +- +-static inline void le32enc(void *pp, uint32_t x) +-{ +- uint8_t *p = (uint8_t *)pp; +- p[0] = x & 0xff; +- p[1] = (x >> 8) & 0xff; +- p[2] = (x >> 16) & 0xff; +- p[3] = (x >> 24) & 0xff; +-} + #endif From owner-svn-ports-head@FreeBSD.ORG Tue Dec 17 13:20:42 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 7389D98A; Tue, 17 Dec 2013 13:20:42 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 5EF1311D6; Tue, 17 Dec 2013 13:20:42 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBHDKgng076181; Tue, 17 Dec 2013 13:20:42 GMT (envelope-from dinoex@svn.freebsd.org) Received: (from dinoex@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBHDKf9C076176; Tue, 17 Dec 2013 13:20:41 GMT (envelope-from dinoex@svn.freebsd.org) Message-Id: <201312171320.rBHDKf9C076176@svn.freebsd.org> From: Dirk Meyer Date: Tue, 17 Dec 2013 13:20:41 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r336722 - in head/net-im: licq licq-icq licq-jabber licq-msn licq-qt-gui X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 17 Dec 2013 13:20:42 -0000 Author: dinoex Date: Tue Dec 17 13:20:40 2013 New Revision: 336722 URL: http://svnweb.freebsd.org/changeset/ports/336722 Log: - use STAGEDIR - use OPTIONS_DEFINE Modified: head/net-im/licq-icq/Makefile head/net-im/licq-jabber/Makefile head/net-im/licq-msn/Makefile head/net-im/licq-qt-gui/Makefile head/net-im/licq/Makefile Modified: head/net-im/licq-icq/Makefile ============================================================================== --- head/net-im/licq-icq/Makefile Tue Dec 17 13:10:02 2013 (r336721) +++ head/net-im/licq-icq/Makefile Tue Dec 17 13:20:40 2013 (r336722) @@ -21,15 +21,14 @@ PLIST_DIRS= %%PORTDOCS%%%%DOCSDIR%% LICQ_PORT?= net-im/licq -NO_STAGE= yes -.include +.include .include "${PORTSDIR}/${LICQ_PORT}/Makefile.inc" -.if !defined(NOPORTDOCS) +.if ${PORT_OPTIONS:MDOCS} post-install: - ${MKDIR} ${DOCSDIR} - ${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR}/ + ${MKDIR} ${STAGEDIR}${DOCSDIR} + ${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR}/ .endif -.include +.include Modified: head/net-im/licq-jabber/Makefile ============================================================================== --- head/net-im/licq-jabber/Makefile Tue Dec 17 13:10:02 2013 (r336721) +++ head/net-im/licq-jabber/Makefile Tue Dec 17 13:20:40 2013 (r336722) @@ -12,8 +12,6 @@ LICENSE= GPLv2 LIB_DEPENDS= libgloox.so:${PORTSDIR}/net-im/gloox \ libboost_regex.so:${PORTSDIR}/devel/boost-libs -NO_STAGE= yes - USES= cmake DOCSDIR= ${PREFIX}/share/doc/${PKGNAMEPREFIX}${PORTNAME} @@ -24,14 +22,14 @@ PLIST_DIRS= %%PORTDOCS%%%%DOCSDIR%% LICQ_PORT?= net-im/licq -.include +.include .include "${PORTSDIR}/${LICQ_PORT}/Makefile.inc" -.if !defined(NOPORTDOCS) +.if ${PORT_OPTIONS:MDOCS} post-install: - ${MKDIR} ${DOCSDIR} - ${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR}/ + ${MKDIR} ${STAGEDIR}${DOCSDIR} + ${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR}/ .endif -.include +.include Modified: head/net-im/licq-msn/Makefile ============================================================================== --- head/net-im/licq-msn/Makefile Tue Dec 17 13:10:02 2013 (r336721) +++ head/net-im/licq-msn/Makefile Tue Dec 17 13:20:40 2013 (r336722) @@ -11,8 +11,6 @@ LICENSE= GPLv2 LIB_DEPENDS= libboost_regex.so:${PORTSDIR}/devel/boost-libs -NO_STAGE= yes - USES= cmake DOCSDIR= ${PREFIX}/share/doc/${PKGNAMEPREFIX}${PORTNAME} @@ -23,14 +21,14 @@ PLIST_DIRS= %%PORTDOCS%%%%DOCSDIR%% LICQ_PORT?= net-im/licq -.include +.include .include "${PORTSDIR}/${LICQ_PORT}/Makefile.inc" -.if !defined(NOPORTDOCS) +.if ${PORT_OPTIONS:MDOCS} post-install: - ${MKDIR} ${DOCSDIR} - ${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR}/ + ${MKDIR} ${STAGEDIR}${DOCSDIR} + ${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR}/ .endif -.include +.include Modified: head/net-im/licq-qt-gui/Makefile ============================================================================== --- head/net-im/licq-qt-gui/Makefile Tue Dec 17 13:10:02 2013 (r336721) +++ head/net-im/licq-qt-gui/Makefile Tue Dec 17 13:20:40 2013 (r336722) @@ -14,13 +14,20 @@ LICENSE= GPLv2 LIB_DEPENDS= libboost_regex.so:${PORTSDIR}/devel/boost-libs RUN_DEPENDS= ${LOCALBASE}/lib/licq/protocol_icq.so:${PORTSDIR}/${LICQ_PORT}-icq -NO_STAGE= yes - USE_XORG= x11 xext ice xscrnsaver USES= cmake USE_QT4= qmake_build moc_build rcc_build uic_build linguist_build -.if defined(WITH_KDE) +OPTIONS_DEFINE= KDE4 +OPTIONS_DEFAULT= + +LICQ_PORT?= net-im/licq + +.include + +.include "${PORTSDIR}/${LICQ_PORT}/Makefile.inc" + +.if ${PORT_OPTIONS:MKDE4} KDE_SUFFIX= -kde USE_KDE4= kdelibs automoc4 CMAKE_ARGS+= -DWITH_KDE:BOOL=ON @@ -34,21 +41,4 @@ PLIST_SUB+= WITH_KDE="@comment " PLIST_SUB+= WITH_QT="" .endif -LICQ_PORT?= net-im/licq - -pre-fetch: -.if defined(WITH_KDE) - @${ECHO_MSG} "" - @${ECHO_MSG} "Build with KDE support" - @${ECHO_MSG} "" -.else - @${ECHO_MSG} "" - @${ECHO_MSG} "You could define WITH_KDE if you want KDE support" - @${ECHO_MSG} "" -.endif - -.include - -.include "${PORTSDIR}/${LICQ_PORT}/Makefile.inc" - -.include +.include Modified: head/net-im/licq/Makefile ============================================================================== --- head/net-im/licq/Makefile Tue Dec 17 13:10:02 2013 (r336721) +++ head/net-im/licq/Makefile Tue Dec 17 13:20:40 2013 (r336722) @@ -10,12 +10,10 @@ PKGNAMESUFFIX= ${SOCKS_SUFFIX}${PKGNAMES MAINTAINER= dinoex@FreeBSD.org COMMENT= A popular ICQ-compatible plugin-based program -LIB_DEPENDS= boost_regex:${PORTSDIR}/devel/boost-libs +LIB_DEPENDS= libboost_regex.so:${PORTSDIR}/devel/boost-libs LICENSE= GPLv2 -NO_STAGE= yes - USES= cmake iconv WRKSRC= ${WRKDIR}/${DISTNAME} LICQ_PORT?= net-im/licq @@ -26,20 +24,22 @@ CPPFLAGS+= -I${LOCALBASE}/include CFLAGS+= -I${LOCALBASE}/include CXXFLAGS+= -Wl,--export-dynamic -.if !defined(WITHOUT_OPENSSL) -USE_OPENSSL= yes -CONFIGURE_ARGS+=--with-openssl-inc=${OPENSSLINC} -CONFIGURE_ARGS+=--with-openssl-lib=${OPENSSLLIB} -.endif +OPTIONS_DEFINE= OPENSSL +OPTIONS_DEFAULT=OPENSSL + +OPENSSL_USE= OPENSSL=yes +OPENSSL_CONFIGURE_ON= --with-openssl-inc=${OPENSSLINC} --with-openssl-lib=${OPENSSLLIB} .include +.include "${PORTSDIR}/${LICQ_PORT}/Makefile.inc" + .if ${PORT_OPTIONS:MNLS} -CMAKE_ARGS+= -DENABLE_NLS:BOOL=OFF -PLIST_SUB+= NLS="@comment " -.else USES+= gettext PLIST_SUB+= NLS="" +.else +CMAKE_ARGS+= -DENABLE_NLS:BOOL=OFF +PLIST_SUB+= NLS="@comment " .endif pre-configure: @@ -47,12 +47,7 @@ pre-configure: ${WRKSRC}/bin/sidclean.sh post-install: - @${MKDIR} ${PREFIX}/lib/licq - @${CAT} ${PKGMESSAGE} - ${INSTALL_SCRIPT} ${WRKSRC}/bin/sidclean.sh ${PREFIX}/bin/sidclean.bash - -.include - -.include "${PORTSDIR}/${LICQ_PORT}/Makefile.inc" + ${MKDIR} ${STAGEDIR}${PREFIX}/lib/licq + ${INSTALL_SCRIPT} ${WRKSRC}/bin/sidclean.sh ${STAGEDIR}${PREFIX}/bin/sidclean.bash -.include +.include From owner-svn-ports-head@FreeBSD.ORG Tue Dec 17 13:42:44 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 6039749A; Tue, 17 Dec 2013 13:42:44 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 4A5821358; Tue, 17 Dec 2013 13:42:44 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBHDgifv084181; Tue, 17 Dec 2013 13:42:44 GMT (envelope-from nemysis@svn.freebsd.org) Received: (from nemysis@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBHDggNP084170; Tue, 17 Dec 2013 13:42:42 GMT (envelope-from nemysis@svn.freebsd.org) Message-Id: <201312171342.rBHDggNP084170@svn.freebsd.org> From: Rusmir Dusko Date: Tue, 17 Dec 2013 13:42:42 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r336723 - in head: . games games/blobwars games/blobwars/files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 17 Dec 2013 13:42:44 -0000 Author: nemysis Date: Tue Dec 17 13:42:42 2013 New Revision: 336723 URL: http://svnweb.freebsd.org/changeset/ports/336723 Log: Blob Wars : Metal Blob Solid is a platform game, not unlike those found on the Amiga and SNES. The object of the game is to take on the role of solider Blob, Bob, and play through the various levels and attempt to rescue as many MIA (Missing In Action) Blobs as possible. This is not quite as straight forward as it sounds, since the MIAs will often be not directly reachable and will require some extra thought. Bob also has to contend with environmental hazards, alien invaders and assimilated Blobs. WWW: http://www.parallelrealities.co.uk/p/blob-wars-metal-blob-solid.html Approved by: pawel (mentor) Added: head/games/blobwars/ - copied from r218872, head/games/blobwars/ head/games/blobwars/files/patch-src__CReplayData.cpp (contents, props changed) head/games/blobwars/files/patch-src__pak.cpp (contents, props changed) Deleted: head/games/blobwars/files/patch-makefile Modified: head/MOVED head/games/Makefile head/games/blobwars/Makefile (contents, props changed) head/games/blobwars/distinfo (contents, props changed) head/games/blobwars/pkg-descr (contents, props changed) head/games/blobwars/pkg-plist (contents, props changed) Modified: head/MOVED ============================================================================== --- head/MOVED Tue Dec 17 13:20:40 2013 (r336722) +++ head/MOVED Tue Dec 17 13:42:42 2013 (r336723) @@ -229,7 +229,6 @@ x11-wm/beryl-settings-bindings||2008-08- japanese/lyx|print/lyx|2008-08-18|No longer maintained and print/lyx now supports Unicode japanese/lyx-doc||2008-08-18|Obsolete games/blobandconquer||2008-08-20|Removed due to copyright problems -games/blobwars||2008-08-20|Removed due to copyright problems games/randomshooter||2008-08-20|Removed due to copyright problems devel/autoconf261|devel/autoconf262|2008-08-20|Migration to autoconf-2.62 x11-themes/enlightenment-theme-BlueSteel||2008-08-20|Deprecated by x11-themes/e16-themes Modified: head/games/Makefile ============================================================================== --- head/games/Makefile Tue Dec 17 13:20:40 2013 (r336722) +++ head/games/Makefile Tue Dec 17 13:42:42 2013 (r336723) @@ -81,6 +81,7 @@ SUBDIR += blinkensisters SUBDIR += blobby SUBDIR += bloboats + SUBDIR += blobwars SUBDIR += block SUBDIR += blockade SUBDIR += blockout Modified: head/games/blobwars/Makefile ============================================================================== --- head/games/blobwars/Makefile Tue Aug 19 22:26:36 2008 (r218872) +++ head/games/blobwars/Makefile Tue Dec 17 13:42:42 2013 (r336723) @@ -1,37 +1,59 @@ -# New ports collection makefile for: blobwars -# Date created: 14 June 2005 -# Whom: Loren M. Lang -# +# Created by: Loren M. Lang # $FreeBSD$ -# PORTNAME= blobwars -DISTVERSION= 1.08-1 +PORTVERSION= 1.19 CATEGORIES= games -MASTER_SITES= ${MASTER_SITE_GENTOO} -MASTER_SITE_SUBDIR=distfiles +MASTER_SITES= SF/${PORTNAME}/ -MAINTAINER= lorenl@north-winds.org -COMMENT= You are the fearless Blob agent, Bob +MAINTAINER= nemysis@FreeBSD.org +COMMENT= Mission and Objective based 2D Platform Game +LICENSE= GPLv2 CCbyNCSA3 +LICENSE_COMB= dual +LICENSE_NAME_CCbyNCSA3=Attribution-NonCommercial-ShareAlike 3.0 Unported +LICENSE_FILE= ${WRKSRC}/doc/license +LICENSE_TEXT_CCbyNCSA3=CC-BY 3.0 +LICENSE_PERMS_CCbyNCSA3=dist-mirror pkg-mirror auto-accept + +USES= gmake +USE_SDL= image mixer net sdl ttf +WITH_ZLIB= yes MAKEFILE= makefile -USE_GETTEXT= yes -USE_SDL= sdl image mixer ttf -USE_GMAKE= yes -WRKSRC= ${WRKDIR}/blobwars-${DISTVERSION:C/-[0-9]$//} +INSTALLS_ICONS= yes -.if !defined(NOPORTDOCS) -PORTDOCS= * -.endif +PORTDOCS= *.gif *.png *.html changes hacking porting readme samples + +OPTIONS_DEFINE= DOCS NLS +OPTIONS_SUB= yes + +NLS_USES= gettext + +.include post-patch: - @${REINPLACE_CMD} -e 's|sdl-config|${SDL_CONFIG}|' ${WRKSRC}/makefile + @${REINPLACE_CMD} \ + -e 's|mkdir -p $$(DESTDIR)$$(DOCDIR)|| ; \ + s|cp -p $$(DOCS) $$(DESTDIR)$$(DOCDIR)|| ; \ + s|USEPAK ?= 0|USEPAK ?= 1| ; \ + s|/usr|${LOCALBASE}| ; \ + s|$$(PREFIX)/games/|$$(PREFIX)/bin/| ; \ + s|/share/games/blobwars/|/share/blobwars/| ; \ + s| -Werror||' \ + -e '/LIBS =/s/-lz/-lz -lintl/' \ + ${WRKSRC}/makefile + +.if ! ${PORT_OPTIONS:MNLS} + @${REINPLACE_CMD} -i '' -e '/LOCALE_MO =/d' \ + ${WRKSRC}/makefile +.endif -.if !defined(NOPORTDOCS) post-install: - ${MKDIR} ${DOCSDIR} - ${INSTALL_DATA} ${WRKSRC}/doc/* ${DOCSDIR} -.endif + ${LN} -sf ${PREFIX}/share/icons/hicolor/64x64/apps/${PORTNAME}.png \ + ${STAGEDIR}${PREFIX}/share/pixmaps/ + + @${MKDIR} ${STAGEDIR}${DOCSDIR} + ${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/doc/|} ${STAGEDIR}${DOCSDIR} .include Modified: head/games/blobwars/distinfo ============================================================================== --- head/games/blobwars/distinfo Tue Aug 19 22:26:36 2008 (r218872) +++ head/games/blobwars/distinfo Tue Dec 17 13:42:42 2013 (r336723) @@ -1,3 +1,2 @@ -MD5 (blobwars-1.08-1.tar.gz) = 16462e3ee394b05432fab820a7de8389 -SHA256 (blobwars-1.08-1.tar.gz) = 58b5a7ef1889385c1783b457a2d16eaf7946db9883e5c11c3564147032d2214d -SIZE (blobwars-1.08-1.tar.gz) = 7810311 +SHA256 (blobwars-1.19.tar.gz) = f9bafe59ead9e370ceaba4aae3d280241bf05fa06c8ae006eec0322c2fe9e2ed +SIZE (blobwars-1.19.tar.gz) = 67019647 Added: head/games/blobwars/files/patch-src__CReplayData.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/games/blobwars/files/patch-src__CReplayData.cpp Tue Dec 17 13:42:42 2013 (r336723) @@ -0,0 +1,12 @@ +--- ./src/CReplayData.cpp.orig 2011-04-17 16:56:56.000000000 +0200 ++++ ./src/CReplayData.cpp 2013-12-08 23:21:23.000000000 +0100 +@@ -38,7 +38,8 @@ + + void ReplayData::printReplayInformation() + { +- tm *timeinfo = localtime(&header.randomSeed); ++ time_t t = header.randomSeed; ++ tm *timeinfo = localtime(&t); + printf("Recorded on : %s", asctime(timeinfo)); + printf("Map : %s\n", header.map); + printf("Score : %d\n", header.score); Added: head/games/blobwars/files/patch-src__pak.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/games/blobwars/files/patch-src__pak.cpp Tue Dec 17 13:42:42 2013 (r336723) @@ -0,0 +1,20 @@ +--- ./src/pak.cpp.orig 2011-04-17 16:56:56.000000000 +0200 ++++ ./src/pak.cpp 2013-12-08 23:09:51.000000000 +0100 +@@ -119,7 +119,7 @@ + { + printf("Couldn't open %s for reading!\n", filename); + closedir(dirp); +- gzclose(pak); ++ gzclose((gzFile)pak); + exit(1); + } + +@@ -141,7 +141,7 @@ + { + printf("Couldn't open %s for reading!\n", filename); + closedir(dirp); +- gzclose(pak); ++ gzclose((gzFile)pak); + exit(1); + } + else Modified: head/games/blobwars/pkg-descr ============================================================================== --- head/games/blobwars/pkg-descr Tue Aug 19 22:26:36 2008 (r218872) +++ head/games/blobwars/pkg-descr Tue Dec 17 13:42:42 2013 (r336723) @@ -1,13 +1,9 @@ -Since their world was invaded by an alien race, the Blobs have faced a -lifetime of war. But now they have a chance to win the war once and for all. +Blob Wars : Metal Blob Solid is a platform game, not unlike those found on +the Amiga and SNES. The object of the game is to take on the role of +solider Blob, Bob, and play through the various levels and attempt to rescue as +many MIA (Missing In Action) Blobs as possible. This is not quite as straight +forward as it sounds, since the MIAs will often be not directly reachable and +will require some extra thought. Bob also has to contend with environmental +hazards, alien invaders and assimilated Blobs. -In Blob Wars : Metal Blob Solid, you take on the role of a fearless Blob -agent, Bob. Bob's mission is to infiltrate the various enemy bases around -the Blobs' homeworld and rescue as many MIAs as possible. But standing in his -way are many vicious aliens, other Blobs who have been assimilated and the -evil alien leader, Galdov. - -WWW: http://www.parallelrealities.co.uk/blobWars.php - -- Loren M. Lang -lorenl@alzatex.com +WWW: http://www.parallelrealities.co.uk/p/blob-wars-metal-blob-solid.html Modified: head/games/blobwars/pkg-plist ============================================================================== --- head/games/blobwars/pkg-plist Tue Aug 19 22:26:36 2008 (r218872) +++ head/games/blobwars/pkg-plist Tue Dec 17 13:42:42 2013 (r336723) @@ -1,11 +1,16 @@ bin/blobwars -%%DATADIR%%/blobwars.pak share/applications/blobwars.desktop -share/locale/ca/LC_MESSAGES/blobwars.mo -share/locale/da/LC_MESSAGES/blobwars.mo -share/locale/de/LC_MESSAGES/blobwars.mo -share/locale/es/LC_MESSAGES/blobwars.mo -share/locale/nl/LC_MESSAGES/blobwars.mo +%%DATADIR%%/blobwars.pak +share/icons/hicolor/16x16/apps/blobwars.png +share/icons/hicolor/32x32/apps/blobwars.png +share/icons/hicolor/64x64/apps/blobwars.png +%%NLS%%share/locale/ca/LC_MESSAGES/blobwars.mo +%%NLS%%share/locale/da/LC_MESSAGES/blobwars.mo +%%NLS%%share/locale/de/LC_MESSAGES/blobwars.mo +%%NLS%%share/locale/es/LC_MESSAGES/blobwars.mo +%%NLS%%share/locale/fr/LC_MESSAGES/blobwars.mo +%%NLS%%share/locale/nl/LC_MESSAGES/blobwars.mo +%%NLS%%share/locale/pl/LC_MESSAGES/blobwars.mo +%%NLS%%share/locale/sv/LC_MESSAGES/blobwars.mo share/pixmaps/blobwars.png @dirrm %%DATADIR%% -@dirrmtry share/applications From owner-svn-ports-head@FreeBSD.ORG Tue Dec 17 13:54:03 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 3082EBB9; Tue, 17 Dec 2013 13:54:03 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 1BDA31502; Tue, 17 Dec 2013 13:54:03 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBHDs2JM088001; Tue, 17 Dec 2013 13:54:02 GMT (envelope-from matthew@svn.freebsd.org) Received: (from matthew@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBHDs2EA087998; Tue, 17 Dec 2013 13:54:02 GMT (envelope-from matthew@svn.freebsd.org) Message-Id: <201312171354.rBHDs2EA087998@svn.freebsd.org> From: Matthew Seaman Date: Tue, 17 Dec 2013 13:54:02 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r336724 - in head/net/phpldapadmin: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 17 Dec 2013 13:54:03 -0000 Author: matthew Date: Tue Dec 17 13:54:02 2013 New Revision: 336724 URL: http://svnweb.freebsd.org/changeset/ports/336724 Log: Drop the SUPHP option as the www/suphp port has expired. General cleanup: pkg-install and pkg-deinstall scripts were redundant, as they replicated @exec / @unexec actions from pkg-plist. Fix DEVELOPER_MODE complaint about shebangfix: it's a Makefile, not a shell script in any case. PR: ports/184925 Submitted by: rene Added: head/net/phpldapadmin/files/patch-tools__po__Makefile (contents, props changed) Deleted: head/net/phpldapadmin/files/pkg-deinstall.in Modified: head/net/phpldapadmin/Makefile Modified: head/net/phpldapadmin/Makefile ============================================================================== --- head/net/phpldapadmin/Makefile Tue Dec 17 13:42:42 2013 (r336723) +++ head/net/phpldapadmin/Makefile Tue Dec 17 13:54:02 2013 (r336724) @@ -3,7 +3,7 @@ PORTNAME= phpldapadmin PORTVERSION= 1.2.3 -PORTREVISION= 1 +PORTREVISION= 2 PORTEPOCH= 1 CATEGORIES= net www MASTER_SITES= SF/${PORTNAME}/${PORTNAME}-php5/${PORTVERSION} @@ -19,24 +19,8 @@ NO_BUILD= yes USE_PHP= gettext ldap openssl pcre session xml iconv hash DEFAULT_PHP_VER= 5 -OPTIONS_DEFINE= SUPHP -SUPHP_DESCR= suPHP support - -.include - -.if ${PORT_OPTIONS:MSUPHP} - -PKGNAMESUFFIX+= -suphp -RUN_DEPENDS+= ${LOCALBASE}/sbin/suphp:${PORTSDIR}/www/suphp -WANT_PHP_CGI= yes - -.else - WANT_PHP_WEB= yes -.endif - -# USERS is only used when SUPHP option selected GROUPS?= ${WWWGRP} CFGDIR= config CFGFILE= config.php @@ -44,16 +28,6 @@ CFGFILE= config.php PLIST= ${WRKDIR}/plist PLIST_SUB+= PLA_GRP=${GROUPS} -.if ${PORT_OPTIONS:MSUPHP} - -USERS?= _pla - -SUB_LIST+= PLA_USR=${USERS} \ - PLA_GRP=${GROUPS} -SUB_FILES+= pkg-install pkg-deinstall - -.endif - SUB_LIST+= PKGNAME=${PKGNAME} SUB_FILES+= pkg-message @@ -62,34 +36,24 @@ SUB_FILES+= pkg-message post-patch: cd ${WRKSRC} ; \ ${FIND} . ! -type d ! -name ${CFGFILE}.example ! -name .cvsignore \ - ! -name .gitignore | ${SORT} | ${SED} -e "s!^\.!%%WWWDIR%%!" \ - >${PLIST} ; \ + ! -name .gitignore ! -name *.orig | ${SORT} | \ + ${SED} -e "s!^\.!%%WWWDIR%%!" >${PLIST} ; \ ${CAT} ${PKGDIR}/pkg-plist-chunk >>${PLIST} ; \ ${FIND} . -type d | ${SORT} -r | ${SED} \ -e 's!^\./${CFGDIR}$$!@dirrmtry %%WWWDIR%%/${CFGDIR}!' \ -e 's!^\.$$!@dirrmtry %%WWWDIR%%!' \ -e 's!^\.!@dirrm %%WWWDIR%%!' >>${PLIST} -do-install: install-app install-conf - -install-app: - cd ${WRKSRC} ; \ - for src in $$( ${FIND} . ! -name .cvsignore \ - ! -name .gitignore ) ; do \ - dst=${STAGEDIR}${WWWDIR}$${src#.} ; \ - if ${TEST} -d $$src ; then \ - ${MKDIR} $$dst ; \ - else \ - ${INSTALL_DATA} $$src $$dst ; \ - fi \ +do-install: + cd ${WRKSRC} ; \ + for src in $$( ${FIND} . ! -name .cvsignore \ + ! -name .gitignore ! -name *.orig ) ; do \ + dst=${STAGEDIR}${WWWDIR}$${src#.} ; \ + if ${TEST} -d $$src ; then \ + ${MKDIR} $$dst ; \ + else \ + ${INSTALL_DATA} $$src $$dst ; \ + fi \ done -install-conf: - cd ${STAGEDIR}${WWWDIR}/${CFGDIR} ; \ - ${CHMOD} 0640 ${CFGFILE}.example ; \ - ${CHGRP} ${GROUPS} ${CFGFILE}.example ; \ - if ${TEST} ! -f ${CFGFILE} ; then \ - ${CP} -p ${CFGFILE}.example ${CFGFILE} ; \ - fi - .include Added: head/net/phpldapadmin/files/patch-tools__po__Makefile ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net/phpldapadmin/files/patch-tools__po__Makefile Tue Dec 17 13:54:02 2013 (r336724) @@ -0,0 +1,7 @@ +--- ./tools/po/Makefile.orig 2013-12-17 10:35:33.849229663 +0000 ++++ ./tools/po/Makefile 2013-12-17 10:35:42.989230589 +0000 +@@ -1,4 +1,3 @@ +-#!/bin/bash + # + # Makefile Utility to manipulate PO and POT files + # Copyright (c) 2009 Alessandro De Zorzi - From owner-svn-ports-head@FreeBSD.ORG Tue Dec 17 13:56:08 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id E3DFFDE5; Tue, 17 Dec 2013 13:56:08 +0000 (UTC) Received: from prod2.absolight.net (mx3.absolight.net [IPv6:2a01:678:2:100::25]) (using TLSv1 with cipher ADH-CAMELLIA256-SHA (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 9565A155E; Tue, 17 Dec 2013 13:56:08 +0000 (UTC) Received: from prod2.absolight.net (localhost [127.0.0.1]) by prod2.absolight.net (Postfix) with ESMTP id 0D014BDC5C; Tue, 17 Dec 2013 14:56:07 +0100 (CET) Received: from gw.in.absolight.net (gw-ecl.in.absolight.net [79.143.241.69]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client CN "gw.in.absolight.net", Issuer "CA Cert Signing Authority" (not verified)) by prod2.absolight.net (Postfix) with ESMTPSA id 40563BDC56; Tue, 17 Dec 2013 14:56:05 +0100 (CET) Received: from ogg.in.absolight.net (ogg.in.absolight.net [79.143.241.239]) by gw.in.absolight.net (Postfix) with ESMTP id 5685A6127; Tue, 17 Dec 2013 14:56:04 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by ogg.in.absolight.net (Postfix) with ESMTP id D386A6630CA6; Tue, 17 Dec 2013 14:56:03 +0100 (CET) Date: Tue, 17 Dec 2013 14:56:03 +0100 From: Mathieu Arnold To: "Sergey A. Osokin" , ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: Re: svn commit: r336456 - in head/www: nginx nginx-devel nginx-devel/files nginx/files rubygem-passenger Message-ID: <0EB504749EEF38A4B7B3342D@ogg.in.absolight.net> In-Reply-To: <201312141559.rBEFxtWt042056@svn.freebsd.org> References: <201312141559.rBEFxtWt042056@svn.freebsd.org> X-Mailer: Mulberry/4.0.8 (Mac OS X) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Content-Disposition: inline X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 17 Dec 2013 13:56:09 -0000 +--On 14 d=C3=A9cembre 2013 15:59:55 +0000 "Sergey A. Osokin" = wrote: | Log: | Update from 4.0.27 to 4.0.29: I have passenger failing since that update : --=20 Mathieu Arnold From owner-svn-ports-head@FreeBSD.ORG Tue Dec 17 13:56:24 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id DF8CEEC2; Tue, 17 Dec 2013 13:56:24 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id B196C1567; Tue, 17 Dec 2013 13:56:24 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBHDuO7V088479; Tue, 17 Dec 2013 13:56:24 GMT (envelope-from matthew@svn.freebsd.org) Received: (from matthew@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBHDuOvw088478; Tue, 17 Dec 2013 13:56:24 GMT (envelope-from matthew@svn.freebsd.org) Message-Id: <201312171356.rBHDuOvw088478@svn.freebsd.org> From: Matthew Seaman Date: Tue, 17 Dec 2013 13:56:24 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r336725 - in head/databases/phpmyadmin: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 17 Dec 2013 13:56:25 -0000 Author: matthew Date: Tue Dec 17 13:56:24 2013 New Revision: 336725 URL: http://svnweb.freebsd.org/changeset/ports/336725 Log: Drop the SUPHP option as the www/suphp port has expired. General cleanup: pkg-install and pkg-deinstall are redundant: it's all handled by @exec and @unexec actions in pkg-plist. PR: ports/184923 Submitted by: rene Deleted: head/databases/phpmyadmin/files/pkg-deinstall.in head/databases/phpmyadmin/files/pkg-install.in Modified: head/databases/phpmyadmin/Makefile Modified: head/databases/phpmyadmin/Makefile ============================================================================== --- head/databases/phpmyadmin/Makefile Tue Dec 17 13:54:02 2013 (r336724) +++ head/databases/phpmyadmin/Makefile Tue Dec 17 13:56:24 2013 (r336725) @@ -3,6 +3,7 @@ PORTNAME= phpMyAdmin DISTVERSION= 4.1.0 +PORTREVISION= 1 CATEGORIES= databases www MASTER_SITES= SF/${PORTNAME:L}/${PORTNAME}/${DISTVERSION} DISTNAME= ${PORTNAME}-${DISTVERSION}-all-languages @@ -25,8 +26,7 @@ USE_PHP= ctype session filter mbstring j # want this, either turn off GD in the config dialog, or else turn off # FONTCONFIG in the graphics/gd port options. -PHP_MODULE_OPTIONS= APC BZ2 GD MCRYPT OPENSSL PDF XML ZIP ZLIB -OPTIONS_DEFINE= SUPHP ${PHP_MODULE_OPTIONS} +OPTIONS_DEFINE= APC BZ2 GD MCRYPT OPENSSL PDF XML ZIP ZLIB OPTIONS_DEFAULT= APC BZ2 GD MCRYPT MYSQLI OPENSSL PDF XML ZIP ZLIB OPTIONS_MULTI= DB_connect @@ -40,52 +40,30 @@ MYSQLI_DESC= PHP Improved MySQL client s MYSQL_DESC= PHP MySQL support via mysql client OPENSSL_DESC= PHP OpenSSL support PDF_DESC= PHP PDFlib support -SUPHP_DESC= suPHP support XML_DESC= PHP XML support (Export to OpenDoc) ZIP_DESC= PHP Zip compression support ZLIB_DESC= PHP ZLIB support .include -.if ${PORT_OPTIONS:MSUPHP} - -PKGNAMESUFFIX= -suphp -RUN_DEPENDS+= ${LOCALBASE}/sbin/suphp:${PORTSDIR}/www/suphp -WANT_PHP_CGI= yes - -.else - WANT_PHP_WEB= yes -.endif - -# USERS is only used with the SUPHP option GROUPS?= ${WWWGRP} CFG_FILE= config.inc.php PLIST= ${WRKDIR}/plist PLIST_SUB+= PMA_GRP=${GROUPS} -.if ${PORT_OPTIONS:MSUPHP} - -USERS?= _pma -SUPHP_ENABLED= yes - -.endif - SUB_LIST+= PKGNAME=${PKGNAME} \ - PMA_USR=${USERS} \ - PMA_GRP=${GROUPS} \ - CFG_FILE=${WWWDIR}/${CFG_FILE} \ - SUPHP_ENABLED=${SUPHP_ENABLED} -SUB_FILES+= pkg-install pkg-deinstall pkg-message + CFG_FILE=${WWWDIR}/${CFG_FILE} +SUB_FILES+= pkg-message SHEBANG_FILES= libraries/plugins/transformations/generator_main_class.sh \ libraries/plugins/transformations/generator_plugin.sh .if !defined(WITHOUT_PHP_DEPENDS) -.for opt in ${PHP_MODULE_OPTIONS} ${OPTIONS_MULTI_DB_connect} +.for opt in ${OPTIONS_DEFINE} ${OPTIONS_MULTI_DB_connect} . if ${PORT_OPTIONS:M${opt}} USE_PHP+= ${opt:L} . endif From owner-svn-ports-head@FreeBSD.ORG Tue Dec 17 14:00:31 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id CFEB512D; Tue, 17 Dec 2013 14:00:31 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id BC7231627; Tue, 17 Dec 2013 14:00:31 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBHE0VTk090897; Tue, 17 Dec 2013 14:00:31 GMT (envelope-from dhn@svn.freebsd.org) Received: (from dhn@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBHE0V0B090895; Tue, 17 Dec 2013 14:00:31 GMT (envelope-from dhn@svn.freebsd.org) Message-Id: <201312171400.rBHE0V0B090895@svn.freebsd.org> From: Dennis Herrmann Date: Tue, 17 Dec 2013 14:00:31 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r336726 - head/x11-wm/ratpoison X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 17 Dec 2013 14:00:31 -0000 Author: dhn Date: Tue Dec 17 14:00:31 2013 New Revision: 336726 URL: http://svnweb.freebsd.org/changeset/ports/336726 Log: - Update to 1.4.6 Modified: head/x11-wm/ratpoison/Makefile head/x11-wm/ratpoison/distinfo Modified: head/x11-wm/ratpoison/Makefile ============================================================================== --- head/x11-wm/ratpoison/Makefile Tue Dec 17 13:56:24 2013 (r336725) +++ head/x11-wm/ratpoison/Makefile Tue Dec 17 14:00:31 2013 (r336726) @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= ratpoison -PORTVERSION= 1.4.5 -PORTREVISION= 1 +PORTVERSION= 1.4.6 CATEGORIES= x11-wm MASTER_SITES= ${MASTER_SITE_SAVANNAH} \ http://mirror.4bit.ws/ Modified: head/x11-wm/ratpoison/distinfo ============================================================================== --- head/x11-wm/ratpoison/distinfo Tue Dec 17 13:56:24 2013 (r336725) +++ head/x11-wm/ratpoison/distinfo Tue Dec 17 14:00:31 2013 (r336726) @@ -1,2 +1,2 @@ -SHA256 (ratpoison-1.4.5.tar.gz) = 7391079db20b8613eecfd81d64d243edc9d3c586750c8f2da2bb9db14d260f03 -SIZE (ratpoison-1.4.5.tar.gz) = 427366 +SHA256 (ratpoison-1.4.6.tar.gz) = ea8396fc69e27841745b8f55846c162be45ede875a2b50bcebca8267171a2bf8 +SIZE (ratpoison-1.4.6.tar.gz) = 460169 From owner-svn-ports-head@FreeBSD.ORG Tue Dec 17 14:14:39 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 975) id 16B14378; Tue, 17 Dec 2013 14:14:39 +0000 (UTC) Date: Tue, 17 Dec 2013 14:14:39 +0000 From: "Sergey A. Osokin" To: Mathieu Arnold Subject: Re: svn commit: r336456 - in head/www: nginx nginx-devel nginx-devel/files nginx/files rubygem-passenger Message-ID: <20131217141439.GQ93494@FreeBSD.org> References: <201312141559.rBEFxtWt042056@svn.freebsd.org> <0EB504749EEF38A4B7B3342D@ogg.in.absolight.net> MIME-Version: 1.0 Content-Type: text/plain; charset=koi8-r Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <0EB504749EEF38A4B7B3342D@ogg.in.absolight.net> User-Agent: Mutt/1.5.22 (2013-10-16) Cc: svn-ports-head@freebsd.org, svn-ports-all@freebsd.org, ports-committers@freebsd.org X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 17 Dec 2013 14:14:39 -0000 On Tue, Dec 17, 2013 at 02:56:03PM +0100, Mathieu Arnold wrote: > +--On 14 décembre 2013 15:59:55 +0000 "Sergey A. Osokin" > wrote: > | Log: > | Update from 4.0.27 to 4.0.29: > > I have passenger failing since that update : > > I've asked the vendor for support, thanks for report. -- Sergey A. Osokin osa@FreeBSD.org From owner-svn-ports-head@FreeBSD.ORG Tue Dec 17 14:19:31 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 82C2B539; Tue, 17 Dec 2013 14:19:31 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 6EC9E17D1; Tue, 17 Dec 2013 14:19:31 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBHEJVsP097073; Tue, 17 Dec 2013 14:19:31 GMT (envelope-from ale@svn.freebsd.org) Received: (from ale@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBHEJVFD097068; Tue, 17 Dec 2013 14:19:31 GMT (envelope-from ale@svn.freebsd.org) Message-Id: <201312171419.rBHEJVFD097068@svn.freebsd.org> From: Alex Dupre Date: Tue, 17 Dec 2013 14:19:31 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r336727 - head/www/tomcat-native X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 17 Dec 2013 14:19:31 -0000 Author: ale Date: Tue Dec 17 14:19:30 2013 New Revision: 336727 URL: http://svnweb.freebsd.org/changeset/ports/336727 Log: Update to 1.1.29 release and stagify. Modified: head/www/tomcat-native/Makefile head/www/tomcat-native/distinfo Modified: head/www/tomcat-native/Makefile ============================================================================== --- head/www/tomcat-native/Makefile Tue Dec 17 14:00:31 2013 (r336726) +++ head/www/tomcat-native/Makefile Tue Dec 17 14:19:30 2013 (r336727) @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= tomcat-native -PORTVERSION= 1.1.27 -PORTREVISION= 1 +PORTVERSION= 1.1.29 CATEGORIES= www java MASTER_SITES= APACHE MASTER_SITE_SUBDIR= tomcat/tomcat-connectors/native/${PORTVERSION}/source @@ -14,7 +13,7 @@ COMMENT= Tomcat native library LICENSE= AL2 -LIB_DEPENDS= apr-1:${PORTSDIR}/devel/apr1 +LIB_DEPENDS= libapr-1.so.4:${PORTSDIR}/devel/apr1 WRKSRC= ${WRKDIR}/${DISTNAME}/jni/native @@ -35,7 +34,6 @@ PLIST_FILES= lib/libtcnative-1.a \ lib/libtcnative-1.so \ lib/libtcnative-1.so.1 -NO_STAGE= yes .include .if ${PORT_OPTIONS:MOCSP} Modified: head/www/tomcat-native/distinfo ============================================================================== --- head/www/tomcat-native/distinfo Tue Dec 17 14:00:31 2013 (r336726) +++ head/www/tomcat-native/distinfo Tue Dec 17 14:19:30 2013 (r336727) @@ -1,2 +1,2 @@ -SHA256 (tomcat-native-1.1.27-src.tar.gz) = 7f78e71060dc029f9005490080babc45a2b702ea54263c440c52a9a7c02609e4 -SIZE (tomcat-native-1.1.27-src.tar.gz) = 288166 +SHA256 (tomcat-native-1.1.29-src.tar.gz) = 25fc6f3d65aeb3ac93142a4b536587b1231ac925eaf32a40f55c92a0991cf232 +SIZE (tomcat-native-1.1.29-src.tar.gz) = 286622 From owner-svn-ports-head@FreeBSD.ORG Tue Dec 17 14:20:43 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id CFEB561F; Tue, 17 Dec 2013 14:20:43 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id BA19717E9; Tue, 17 Dec 2013 14:20:43 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBHEKhbK097876; Tue, 17 Dec 2013 14:20:43 GMT (envelope-from ale@svn.freebsd.org) Received: (from ale@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBHEKhYi097873; Tue, 17 Dec 2013 14:20:43 GMT (envelope-from ale@svn.freebsd.org) Message-Id: <201312171420.rBHEKhYi097873@svn.freebsd.org> From: Alex Dupre Date: Tue, 17 Dec 2013 14:20:43 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r336728 - head/www/tomcat7 X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 17 Dec 2013 14:20:43 -0000 Author: ale Date: Tue Dec 17 14:20:42 2013 New Revision: 336728 URL: http://svnweb.freebsd.org/changeset/ports/336728 Log: Update to 7.0.47 release and stagify. Modified: head/www/tomcat7/Makefile head/www/tomcat7/distinfo head/www/tomcat7/pkg-plist Modified: head/www/tomcat7/Makefile ============================================================================== --- head/www/tomcat7/Makefile Tue Dec 17 14:19:30 2013 (r336727) +++ head/www/tomcat7/Makefile Tue Dec 17 14:20:42 2013 (r336728) @@ -2,10 +2,11 @@ # $FreeBSD$ PORTNAME= tomcat -PORTVERSION= 7.0.40 +PORTVERSION= 7.0.47 CATEGORIES= www java MASTER_SITES= APACHE MASTER_SITE_SUBDIR= tomcat/tomcat-7/v${PORTVERSION}/bin +PKGNAMESUFFIX= 7 DISTNAME= apache-${PORTNAME}-${PORTVERSION} MAINTAINER= ale@FreeBSD.org @@ -19,9 +20,7 @@ USE_JAVA= yes JAVA_VERSION= 1.6+ NO_BUILD= yes -APP_SHORTNAME= tomcat7 - -USE_RC_SUBR= ${APP_SHORTNAME} +USE_RC_SUBR= ${PKGBASE} TOMCAT_SUBDIR?= ${DISTNAME:R} TOMCAT_HOME= ${PREFIX}/${TOMCAT_SUBDIR} @@ -29,13 +28,11 @@ TOMCAT_CONF_FILES= catalina.policy catal CONF_EXT= sample PLIST_SUB= T=${TOMCAT_SUBDIR} CONF_EXT=${CONF_EXT} \ WWWOWN=${WWWOWN} WWWGRP=${WWWGRP} -LATEST_LINK= ${APP_SHORTNAME} SUB_LIST= TOMCAT_HOME=${TOMCAT_HOME} \ TOMCAT_USER=${WWWOWN} \ JAVA_HOME=${JAVA_HOME} -NO_STAGE= yes .include pre-patch: @@ -52,29 +49,16 @@ post-patch: do-install: @${ECHO_MSG} -n ">> Creating destination directory..." - @${MKDIR} ${TOMCAT_HOME}/logs - @${MKDIR} ${TOMCAT_HOME}/endorsed + @${MKDIR} ${STAGEDIR}${TOMCAT_HOME}/logs + @${MKDIR} ${STAGEDIR}${TOMCAT_HOME}/endorsed @${ECHO_MSG} " [ DONE ]" @${ECHO_MSG} -n ">> Copying files to destination directory..." - @${CP} -R ${WRKSRC}/* ${TOMCAT_HOME} - @${ECHO_MSG} " [ DONE ]" - -.for f in ${TOMCAT_CONF_FILES} -. if !exists(${TOMCAT_HOME}/conf/${f}) - @${CP} ${TOMCAT_HOME}/conf/${f}.${CONF_EXT} ${TOMCAT_HOME}/conf/${f} -. else - @${ECHO_MSG} ">> Preserving local configuration file: ${f} [ DONE ]" -. endif -.endfor - - @${ECHO_MSG} -n ">> Fixing ownership settings..." - @${CHOWN} -R ${WWWOWN}:${WWWGRP} ${TOMCAT_HOME}/conf ${TOMCAT_HOME}/logs \ - ${TOMCAT_HOME}/temp ${TOMCAT_HOME}/webapps ${TOMCAT_HOME}/work + @${CP} -R ${WRKSRC}/* ${STAGEDIR}${TOMCAT_HOME} @${ECHO_MSG} " [ DONE ]" @${ECHO_MSG} -n ">> Fixing permissions..." - @${FIND} ${TOMCAT_HOME} -type d -print0 | ${XARGS} -0 ${CHMOD} 755 + @${FIND} ${STAGEDIR}${TOMCAT_HOME} -type d -print0 | ${XARGS} -0 ${CHMOD} 755 @${ECHO_MSG} " [ DONE ]" .include Modified: head/www/tomcat7/distinfo ============================================================================== --- head/www/tomcat7/distinfo Tue Dec 17 14:19:30 2013 (r336727) +++ head/www/tomcat7/distinfo Tue Dec 17 14:20:42 2013 (r336728) @@ -1,2 +1,2 @@ -SHA256 (apache-tomcat-7.0.40.tar.gz) = 430a3eec73b6994dbbd6e17728f131fa3609bdd923547445a745d4ffb6d9cf01 -SIZE (apache-tomcat-7.0.40.tar.gz) = 7843733 +SHA256 (apache-tomcat-7.0.47.tar.gz) = 46dc31b08c120ffc2e38dccc119b9df02662a9fb297fa3fc6d90902c2f86057a +SIZE (apache-tomcat-7.0.47.tar.gz) = 8234674 Modified: head/www/tomcat7/pkg-plist ============================================================================== --- head/www/tomcat7/pkg-plist Tue Dec 17 14:19:30 2013 (r336727) +++ head/www/tomcat7/pkg-plist Tue Dec 17 14:20:42 2013 (r336728) @@ -6,8 +6,8 @@ %%T%%/bin/bootstrap.jar %%T%%/bin/catalina-tasks.xml %%T%%/bin/catalina.sh -%%T%%/bin/commons-daemon.jar %%T%%/bin/commons-daemon-native.tar.gz +%%T%%/bin/commons-daemon.jar %%T%%/bin/configtest.sh %%T%%/bin/daemon.sh %%T%%/bin/digest.sh @@ -58,6 +58,8 @@ %%T%%/lib/tomcat-i18n-ja.jar %%T%%/lib/tomcat-jdbc.jar %%T%%/lib/tomcat-util.jar +%%T%%/lib/tomcat7-websocket.jar +%%T%%/lib/websocket-api.jar %%T%%/temp/safeToDelete.tmp %%T%%/webapps/ROOT/RELEASE-NOTES.txt %%T%%/webapps/ROOT/WEB-INF/web.xml @@ -163,6 +165,7 @@ %%T%%/webapps/docs/images/add.gif %%T%%/webapps/docs/images/asf-logo.gif %%T%%/webapps/docs/images/code.gif +%%T%%/webapps/docs/images/cors-flowchart.png %%T%%/webapps/docs/images/design.gif %%T%%/webapps/docs/images/docs.gif %%T%%/webapps/docs/images/fix.gif @@ -287,6 +290,7 @@ %%T%%/webapps/examples/WEB-INF/classes/jsp2/examples/ValuesBean.class %%T%%/webapps/examples/WEB-INF/classes/jsp2/examples/ValuesBean.java %%T%%/webapps/examples/WEB-INF/classes/jsp2/examples/el/Functions.class + %%T%%/webapps/examples/WEB-INF/classes/jsp2/examples/el/Functions.java %%T%%/webapps/examples/WEB-INF/classes/jsp2/examples/simpletag/EchoAttributesTag.class %%T%%/webapps/examples/WEB-INF/classes/jsp2/examples/simpletag/EchoAttributesTag.java @@ -312,17 +316,45 @@ %%T%%/webapps/examples/WEB-INF/classes/util/HTMLFilter.java %%T%%/webapps/examples/WEB-INF/classes/validators/DebugValidator.class %%T%%/webapps/examples/WEB-INF/classes/validators/DebugValidator.java -%%T%%/webapps/examples/WEB-INF/classes/websocket/chat/ChatWebSocketServlet$1.class -%%T%%/webapps/examples/WEB-INF/classes/websocket/chat/ChatWebSocketServlet$ChatMessageInbound.class -%%T%%/webapps/examples/WEB-INF/classes/websocket/chat/ChatWebSocketServlet.class -%%T%%/webapps/examples/WEB-INF/classes/websocket/chat/ChatWebSocketServlet.java -%%T%%/webapps/examples/WEB-INF/classes/websocket/echo/EchoMessage$EchoMessageInbound.class -%%T%%/webapps/examples/WEB-INF/classes/websocket/echo/EchoMessage.class -%%T%%/webapps/examples/WEB-INF/classes/websocket/echo/EchoMessage.java -%%T%%/webapps/examples/WEB-INF/classes/websocket/echo/EchoStream$1.class -%%T%%/webapps/examples/WEB-INF/classes/websocket/echo/EchoStream$EchoStreamInbound.class -%%T%%/webapps/examples/WEB-INF/classes/websocket/echo/EchoStream.class -%%T%%/webapps/examples/WEB-INF/classes/websocket/echo/EchoStream.java +%%T%%/webapps/examples/WEB-INF/classes/websocket/ExamplesConfig.class +%%T%%/webapps/examples/WEB-INF/classes/websocket/ExamplesConfig.java +%%T%%/webapps/examples/WEB-INF/classes/websocket/chat/ChatAnnotation.class +%%T%%/webapps/examples/WEB-INF/classes/websocket/chat/ChatAnnotation.java +%%T%%/webapps/examples/WEB-INF/classes/websocket/drawboard/Client$1.class +%%T%%/webapps/examples/WEB-INF/classes/websocket/drawboard/Client.class +%%T%%/webapps/examples/WEB-INF/classes/websocket/drawboard/Client.java +%%T%%/webapps/examples/WEB-INF/classes/websocket/drawboard/DrawMessage$ParseException.class +%%T%%/webapps/examples/WEB-INF/classes/websocket/drawboard/DrawMessage.class +%%T%%/webapps/examples/WEB-INF/classes/websocket/drawboard/DrawMessage.java +%%T%%/webapps/examples/WEB-INF/classes/websocket/drawboard/DrawboardContextListener.class +%%T%%/webapps/examples/WEB-INF/classes/websocket/drawboard/DrawboardContextListener.java +%%T%%/webapps/examples/WEB-INF/classes/websocket/drawboard/DrawboardEndpoint$1.class +%%T%%/webapps/examples/WEB-INF/classes/websocket/drawboard/DrawboardEndpoint$2.class +%%T%%/webapps/examples/WEB-INF/classes/websocket/drawboard/DrawboardEndpoint$3$1.class +%%T%%/webapps/examples/WEB-INF/classes/websocket/drawboard/DrawboardEndpoint$3.class +%%T%%/webapps/examples/WEB-INF/classes/websocket/drawboard/DrawboardEndpoint.class +%%T%%/webapps/examples/WEB-INF/classes/websocket/drawboard/DrawboardEndpoint.java +%%T%%/webapps/examples/WEB-INF/classes/websocket/drawboard/Room$1$1.class +%%T%%/webapps/examples/WEB-INF/classes/websocket/drawboard/Room$1.class +%%T%%/webapps/examples/WEB-INF/classes/websocket/drawboard/Room$2.class +%%T%%/webapps/examples/WEB-INF/classes/websocket/drawboard/Room$MessageType.class +%%T%%/webapps/examples/WEB-INF/classes/websocket/drawboard/Room$Player.class +%%T%%/webapps/examples/WEB-INF/classes/websocket/drawboard/Room.class +%%T%%/webapps/examples/WEB-INF/classes/websocket/drawboard/Room.java +%%T%%/webapps/examples/WEB-INF/classes/websocket/drawboard/wsmessages/AbstractWebsocketMessage.class +%%T%%/webapps/examples/WEB-INF/classes/websocket/drawboard/wsmessages/AbstractWebsocketMessage.java +%%T%%/webapps/examples/WEB-INF/classes/websocket/drawboard/wsmessages/BinaryWebsocketMessage.class +%%T%%/webapps/examples/WEB-INF/classes/websocket/drawboard/wsmessages/BinaryWebsocketMessage.java +%%T%%/webapps/examples/WEB-INF/classes/websocket/drawboard/wsmessages/CloseWebsocketMessage.class +%%T%%/webapps/examples/WEB-INF/classes/websocket/drawboard/wsmessages/CloseWebsocketMessage.java +%%T%%/webapps/examples/WEB-INF/classes/websocket/drawboard/wsmessages/StringWebsocketMessage.class +%%T%%/webapps/examples/WEB-INF/classes/websocket/drawboard/wsmessages/StringWebsocketMessage.java +%%T%%/webapps/examples/WEB-INF/classes/websocket/echo/EchoAnnotation.class +%%T%%/webapps/examples/WEB-INF/classes/websocket/echo/EchoAnnotation.java +%%T%%/webapps/examples/WEB-INF/classes/websocket/echo/EchoEndpoint$1.class +%%T%%/webapps/examples/WEB-INF/classes/websocket/echo/EchoEndpoint$EchoMessageHandler.class +%%T%%/webapps/examples/WEB-INF/classes/websocket/echo/EchoEndpoint.class +%%T%%/webapps/examples/WEB-INF/classes/websocket/echo/EchoEndpoint.java %%T%%/webapps/examples/WEB-INF/classes/websocket/snake/Direction.class %%T%%/webapps/examples/WEB-INF/classes/websocket/snake/Direction.java %%T%%/webapps/examples/WEB-INF/classes/websocket/snake/Location$1.class @@ -330,10 +362,33 @@ %%T%%/webapps/examples/WEB-INF/classes/websocket/snake/Location.java %%T%%/webapps/examples/WEB-INF/classes/websocket/snake/Snake.class %%T%%/webapps/examples/WEB-INF/classes/websocket/snake/Snake.java -%%T%%/webapps/examples/WEB-INF/classes/websocket/snake/SnakeWebSocketServlet$1.class -%%T%%/webapps/examples/WEB-INF/classes/websocket/snake/SnakeWebSocketServlet$SnakeMessageInbound.class -%%T%%/webapps/examples/WEB-INF/classes/websocket/snake/SnakeWebSocketServlet.class -%%T%%/webapps/examples/WEB-INF/classes/websocket/snake/SnakeWebSocketServlet.java +%%T%%/webapps/examples/WEB-INF/classes/websocket/snake/SnakeAnnotation.class +%%T%%/webapps/examples/WEB-INF/classes/websocket/snake/SnakeAnnotation.java +%%T%%/webapps/examples/WEB-INF/classes/websocket/snake/SnakeTimer$1.class +%%T%%/webapps/examples/WEB-INF/classes/websocket/snake/SnakeTimer.class +%%T%%/webapps/examples/WEB-INF/classes/websocket/snake/SnakeTimer.java +%%T%%/webapps/examples/WEB-INF/classes/websocket/tc7/chat/ChatWebSocketServlet$1.class +%%T%%/webapps/examples/WEB-INF/classes/websocket/tc7/chat/ChatWebSocketServlet$ChatMessageInbound.class +%%T%%/webapps/examples/WEB-INF/classes/websocket/tc7/chat/ChatWebSocketServlet.class +%%T%%/webapps/examples/WEB-INF/classes/websocket/tc7/chat/ChatWebSocketServlet.java +%%T%%/webapps/examples/WEB-INF/classes/websocket/tc7/echo/EchoMessage$EchoMessageInbound.class +%%T%%/webapps/examples/WEB-INF/classes/websocket/tc7/echo/EchoMessage.class +%%T%%/webapps/examples/WEB-INF/classes/websocket/tc7/echo/EchoMessage.java +%%T%%/webapps/examples/WEB-INF/classes/websocket/tc7/echo/EchoStream$1.class +%%T%%/webapps/examples/WEB-INF/classes/websocket/tc7/echo/EchoStream$EchoStreamInbound.class +%%T%%/webapps/examples/WEB-INF/classes/websocket/tc7/echo/EchoStream.class +%%T%%/webapps/examples/WEB-INF/classes/websocket/tc7/echo/EchoStream.java +%%T%%/webapps/examples/WEB-INF/classes/websocket/tc7/snake/Direction.class +%%T%%/webapps/examples/WEB-INF/classes/websocket/tc7/snake/Direction.java +%%T%%/webapps/examples/WEB-INF/classes/websocket/tc7/snake/Location$1.class +%%T%%/webapps/examples/WEB-INF/classes/websocket/tc7/snake/Location.class +%%T%%/webapps/examples/WEB-INF/classes/websocket/tc7/snake/Location.java +%%T%%/webapps/examples/WEB-INF/classes/websocket/tc7/snake/Snake.class +%%T%%/webapps/examples/WEB-INF/classes/websocket/tc7/snake/Snake.java +%%T%%/webapps/examples/WEB-INF/classes/websocket/tc7/snake/SnakeWebSocketServlet$1.class +%%T%%/webapps/examples/WEB-INF/classes/websocket/tc7/snake/SnakeWebSocketServlet$SnakeMessageInbound.class +%%T%%/webapps/examples/WEB-INF/classes/websocket/tc7/snake/SnakeWebSocketServlet.class +%%T%%/webapps/examples/WEB-INF/classes/websocket/tc7/snake/SnakeWebSocketServlet.java %%T%%/webapps/examples/WEB-INF/jsp/applet/Clock2.java %%T%%/webapps/examples/WEB-INF/jsp/debug-taglib.tld %%T%%/webapps/examples/WEB-INF/jsp/example-taglib.tld @@ -535,10 +590,15 @@ %%T%%/webapps/examples/servlets/reqinfo.html %%T%%/webapps/examples/servlets/reqparams.html %%T%%/webapps/examples/servlets/sessions.html -%%T%%/webapps/examples/websocket/chat.html -%%T%%/webapps/examples/websocket/echo.html -%%T%%/webapps/examples/websocket/index.html -%%T%%/webapps/examples/websocket/snake.html +%%T%%/webapps/examples/websocket/chat.xhtml +%%T%%/webapps/examples/websocket/drawboard.xhtml +%%T%%/webapps/examples/websocket/echo.xhtml +%%T%%/webapps/examples/websocket/index.xhtml +%%T%%/webapps/examples/websocket/snake.xhtml +%%T%%/webapps/examples/websocket-deprecated/chat.html +%%T%%/webapps/examples/websocket-deprecated/echo.html +%%T%%/webapps/examples/websocket-deprecated/index.html +%%T%%/webapps/examples/websocket-deprecated/snake.html %%T%%/webapps/host-manager/META-INF/context.xml %%T%%/webapps/host-manager/WEB-INF/jsp/401.jsp %%T%%/webapps/host-manager/WEB-INF/jsp/403.jsp @@ -574,113 +634,120 @@ %%T%%/webapps/manager/index.jsp %%T%%/webapps/manager/status.xsd %%T%%/webapps/manager/xform.xsl -@exec mkdir %D/%%T%%/endorsed 2>/dev/null || true +@exec mkdir %D/%%T%%/endorsed 2>/dev/null || true @exec mkdir %D/%%T%%/logs 2>/dev/null || true @exec mkdir %D/%%T%%/work 2>/dev/null || true @exec chown -R %%WWWOWN%%:%%WWWGRP%% %D/%%T%%/conf %D/%%T%%/logs %D/%%T%%/temp %D/%%T%%/webapps %D/%%T%%/work -@dirrmtry %%T%%/work -@dirrm %%T%%/webapps/manager/images -@dirrm %%T%%/webapps/manager/WEB-INF/jsp -@dirrm %%T%%/webapps/manager/WEB-INF -@dirrm %%T%%/webapps/manager/META-INF -@dirrm %%T%%/webapps/manager -@dirrm %%T%%/webapps/host-manager/images -@dirrm %%T%%/webapps/host-manager/WEB-INF/jsp -@dirrm %%T%%/webapps/host-manager/WEB-INF -@dirrm %%T%%/webapps/host-manager/META-INF -@dirrm %%T%%/webapps/host-manager -@dirrm %%T%%/webapps/examples/websocket -@dirrm %%T%%/webapps/examples/servlets/images -@dirrm %%T%%/webapps/examples/servlets -@dirrm %%T%%/webapps/examples/jsp/xml -@dirrm %%T%%/webapps/examples/jsp/tagplugin -@dirrm %%T%%/webapps/examples/jsp/snp -@dirrm %%T%%/webapps/examples/jsp/simpletag -@dirrm %%T%%/webapps/examples/jsp/sessions -@dirrm %%T%%/webapps/examples/jsp/security/protected -@dirrm %%T%%/webapps/examples/jsp/security -@dirrm %%T%%/webapps/examples/jsp/plugin/applet -@dirrm %%T%%/webapps/examples/jsp/plugin -@dirrm %%T%%/webapps/examples/jsp/num -@dirrm %%T%%/webapps/examples/jsp/jsptoserv -@dirrm %%T%%/webapps/examples/jsp/jsp2/tagfiles -@dirrm %%T%%/webapps/examples/jsp/jsp2/simpletag -@dirrm %%T%%/webapps/examples/jsp/jsp2/misc -@dirrm %%T%%/webapps/examples/jsp/jsp2/jspx -@dirrm %%T%%/webapps/examples/jsp/jsp2/jspattribute -@dirrm %%T%%/webapps/examples/jsp/jsp2/el -@dirrm %%T%%/webapps/examples/jsp/jsp2 -@dirrm %%T%%/webapps/examples/jsp/include -@dirrm %%T%%/webapps/examples/jsp/images -@dirrm %%T%%/webapps/examples/jsp/forward -@dirrm %%T%%/webapps/examples/jsp/error -@dirrm %%T%%/webapps/examples/jsp/dates -@dirrm %%T%%/webapps/examples/jsp/colors -@dirrm %%T%%/webapps/examples/jsp/checkbox -@dirrm %%T%%/webapps/examples/jsp/chat -@dirrm %%T%%/webapps/examples/jsp/cal -@dirrm %%T%%/webapps/examples/jsp/async -@dirrm %%T%%/webapps/examples/jsp -@dirrm %%T%%/webapps/examples/WEB-INF/tags -@dirrm %%T%%/webapps/examples/WEB-INF/lib -@dirrm %%T%%/webapps/examples/WEB-INF/jsp2 -@dirrm %%T%%/webapps/examples/WEB-INF/jsp/applet -@dirrm %%T%%/webapps/examples/WEB-INF/jsp -@dirrm %%T%%/webapps/examples/WEB-INF/classes/websocket/snake -@dirrm %%T%%/webapps/examples/WEB-INF/classes/websocket/echo -@dirrm %%T%%/webapps/examples/WEB-INF/classes/websocket/chat -@dirrm %%T%%/webapps/examples/WEB-INF/classes/websocket -@dirrm %%T%%/webapps/examples/WEB-INF/classes/validators -@dirrm %%T%%/webapps/examples/WEB-INF/classes/util -@dirrm %%T%%/webapps/examples/WEB-INF/classes/sessions -@dirrm %%T%%/webapps/examples/WEB-INF/classes/num -@dirrm %%T%%/webapps/examples/WEB-INF/classes/listeners -@dirrm %%T%%/webapps/examples/WEB-INF/classes/jsp2/examples/simpletag +@dirrm %%T%%/bin +@dirrmtry %%T%%/conf +@dirrmtry %%T%%/endorsed +@dirrm %%T%%/lib +@dirrmtry %%T%%/logs +@dirrm %%T%%/temp +@dirrm %%T%%/webapps/ROOT/WEB-INF +@dirrm %%T%%/webapps/ROOT +@dirrm %%T%%/webapps/docs/WEB-INF +@dirrm %%T%%/webapps/docs/api +@dirrm %%T%%/webapps/docs/appdev/sample/docs +@dirrm %%T%%/webapps/docs/appdev/sample/src/mypackage +@dirrm %%T%%/webapps/docs/appdev/sample/src +@dirrm %%T%%/webapps/docs/appdev/sample/web/WEB-INF +@dirrm %%T%%/webapps/docs/appdev/sample/web/images +@dirrm %%T%%/webapps/docs/appdev/sample/web +@dirrm %%T%%/webapps/docs/appdev/sample +@dirrm %%T%%/webapps/docs/appdev +@dirrm %%T%%/webapps/docs/architecture/requestProcess +@dirrm %%T%%/webapps/docs/architecture/startup +@dirrm %%T%%/webapps/docs/architecture +@dirrm %%T%%/webapps/docs/config +@dirrm %%T%%/webapps/docs/elapi +@dirrm %%T%%/webapps/docs/funcspecs +@dirrm %%T%%/webapps/docs/images +@dirrm %%T%%/webapps/docs/jspapi +@dirrm %%T%%/webapps/docs/servletapi +@dirrm %%T%%/webapps/docs/tribes +@dirrm %%T%%/webapps/docs +@dirrm %%T%%/webapps/examples/WEB-INF/classes/async +@dirrm %%T%%/webapps/examples/WEB-INF/classes/cal +@dirrm %%T%%/webapps/examples/WEB-INF/classes/chat +@dirrm %%T%%/webapps/examples/WEB-INF/classes/checkbox +@dirrm %%T%%/webapps/examples/WEB-INF/classes/colors +@dirrm %%T%%/webapps/examples/WEB-INF/classes/compressionFilters +@dirrm %%T%%/webapps/examples/WEB-INF/classes/dates +@dirrm %%T%%/webapps/examples/WEB-INF/classes/error +@dirrm %%T%%/webapps/examples/WEB-INF/classes/examples +@dirrm %%T%%/webapps/examples/WEB-INF/classes/filters @dirrm %%T%%/webapps/examples/WEB-INF/classes/jsp2/examples/el +@dirrm %%T%%/webapps/examples/WEB-INF/classes/jsp2/examples/simpletag @dirrm %%T%%/webapps/examples/WEB-INF/classes/jsp2/examples @dirrm %%T%%/webapps/examples/WEB-INF/classes/jsp2 -@dirrm %%T%%/webapps/examples/WEB-INF/classes/filters -@dirrm %%T%%/webapps/examples/WEB-INF/classes/examples -@dirrm %%T%%/webapps/examples/WEB-INF/classes/error -@dirrm %%T%%/webapps/examples/WEB-INF/classes/dates -@dirrm %%T%%/webapps/examples/WEB-INF/classes/compressionFilters -@dirrm %%T%%/webapps/examples/WEB-INF/classes/colors -@dirrm %%T%%/webapps/examples/WEB-INF/classes/checkbox -@dirrm %%T%%/webapps/examples/WEB-INF/classes/chat -@dirrm %%T%%/webapps/examples/WEB-INF/classes/cal -@dirrm %%T%%/webapps/examples/WEB-INF/classes/async +@dirrm %%T%%/webapps/examples/WEB-INF/classes/listeners +@dirrm %%T%%/webapps/examples/WEB-INF/classes/num +@dirrm %%T%%/webapps/examples/WEB-INF/classes/sessions +@dirrm %%T%%/webapps/examples/WEB-INF/classes/util +@dirrm %%T%%/webapps/examples/WEB-INF/classes/validators +@dirrm %%T%%/webapps/examples/WEB-INF/classes/websocket/chat +@dirrm %%T%%/webapps/examples/WEB-INF/classes/websocket/drawboard/wsmessages +@dirrm %%T%%/webapps/examples/WEB-INF/classes/websocket/drawboard +@dirrm %%T%%/webapps/examples/WEB-INF/classes/websocket/echo +@dirrm %%T%%/webapps/examples/WEB-INF/classes/websocket/snake +@dirrm %%T%%/webapps/examples/WEB-INF/classes/websocket/tc7/chat +@dirrm %%T%%/webapps/examples/WEB-INF/classes/websocket/tc7/echo +@dirrm %%T%%/webapps/examples/WEB-INF/classes/websocket/tc7/snake +@dirrm %%T%%/webapps/examples/WEB-INF/classes/websocket/tc7 +@dirrm %%T%%/webapps/examples/WEB-INF/classes/websocket @dirrm %%T%%/webapps/examples/WEB-INF/classes +@dirrm %%T%%/webapps/examples/WEB-INF/jsp/applet +@dirrm %%T%%/webapps/examples/WEB-INF/jsp +@dirrm %%T%%/webapps/examples/WEB-INF/jsp2 +@dirrm %%T%%/webapps/examples/WEB-INF/lib +@dirrm %%T%%/webapps/examples/WEB-INF/tags @dirrm %%T%%/webapps/examples/WEB-INF +@dirrm %%T%%/webapps/examples/jsp/async +@dirrm %%T%%/webapps/examples/jsp/cal +@dirrm %%T%%/webapps/examples/jsp/chat +@dirrm %%T%%/webapps/examples/jsp/checkbox +@dirrm %%T%%/webapps/examples/jsp/colors +@dirrm %%T%%/webapps/examples/jsp/dates +@dirrm %%T%%/webapps/examples/jsp/error +@dirrm %%T%%/webapps/examples/jsp/forward +@dirrm %%T%%/webapps/examples/jsp/images +@dirrm %%T%%/webapps/examples/jsp/include +@dirrm %%T%%/webapps/examples/jsp/jsp2/el +@dirrm %%T%%/webapps/examples/jsp/jsp2/jspattribute +@dirrm %%T%%/webapps/examples/jsp/jsp2/jspx +@dirrm %%T%%/webapps/examples/jsp/jsp2/misc +@dirrm %%T%%/webapps/examples/jsp/jsp2/simpletag +@dirrm %%T%%/webapps/examples/jsp/jsp2/tagfiles +@dirrm %%T%%/webapps/examples/jsp/jsp2 +@dirrm %%T%%/webapps/examples/jsp/jsptoserv +@dirrm %%T%%/webapps/examples/jsp/num +@dirrm %%T%%/webapps/examples/jsp/plugin/applet +@dirrm %%T%%/webapps/examples/jsp/plugin +@dirrm %%T%%/webapps/examples/jsp/security/protected +@dirrm %%T%%/webapps/examples/jsp/security +@dirrm %%T%%/webapps/examples/jsp/sessions +@dirrm %%T%%/webapps/examples/jsp/simpletag +@dirrm %%T%%/webapps/examples/jsp/snp +@dirrm %%T%%/webapps/examples/jsp/tagplugin +@dirrm %%T%%/webapps/examples/jsp/xml +@dirrm %%T%%/webapps/examples/jsp +@dirrm %%T%%/webapps/examples/servlets/images +@dirrm %%T%%/webapps/examples/servlets +@dirrm %%T%%/webapps/examples/websocket +@dirrm %%T%%/webapps/examples/websocket-deprecated @dirrm %%T%%/webapps/examples -@dirrm %%T%%/webapps/docs/tribes -@dirrm %%T%%/webapps/docs/servletapi -@dirrm %%T%%/webapps/docs/jspapi -@dirrm %%T%%/webapps/docs/images -@dirrm %%T%%/webapps/docs/funcspecs -@dirrm %%T%%/webapps/docs/elapi -@dirrm %%T%%/webapps/docs/config -@dirrm %%T%%/webapps/docs/architecture/startup -@dirrm %%T%%/webapps/docs/architecture/requestProcess -@dirrm %%T%%/webapps/docs/architecture -@dirrm %%T%%/webapps/docs/appdev/sample/web/images -@dirrm %%T%%/webapps/docs/appdev/sample/web/WEB-INF -@dirrm %%T%%/webapps/docs/appdev/sample/web -@dirrm %%T%%/webapps/docs/appdev/sample/src/mypackage -@dirrm %%T%%/webapps/docs/appdev/sample/src -@dirrm %%T%%/webapps/docs/appdev/sample/docs -@dirrm %%T%%/webapps/docs/appdev/sample -@dirrm %%T%%/webapps/docs/appdev -@dirrm %%T%%/webapps/docs/api -@dirrm %%T%%/webapps/docs/WEB-INF -@dirrm %%T%%/webapps/docs -@dirrm %%T%%/webapps/ROOT/WEB-INF -@dirrm %%T%%/webapps/ROOT +@dirrm %%T%%/webapps/host-manager/META-INF +@dirrm %%T%%/webapps/host-manager/WEB-INF/jsp +@dirrm %%T%%/webapps/host-manager/WEB-INF +@dirrm %%T%%/webapps/host-manager/images +@dirrm %%T%%/webapps/host-manager +@dirrm %%T%%/webapps/manager/META-INF +@dirrm %%T%%/webapps/manager/WEB-INF/jsp +@dirrm %%T%%/webapps/manager/WEB-INF +@dirrm %%T%%/webapps/manager/images +@dirrm %%T%%/webapps/manager @dirrm %%T%%/webapps -@dirrm %%T%%/temp -@dirrmtry %%T%%/logs -@dirrm %%T%%/lib -@dirrmtry %%T%%/endorsed -@dirrmtry %%T%%/conf -@dirrm %%T%%/bin +@dirrmtry %%T%%/work @dirrmtry %%T%% @unexec [ ! -d %D/%%T%% ] || echo If permanently deleting this package, %D/%%T%% must be removed manually From owner-svn-ports-head@FreeBSD.ORG Tue Dec 17 14:29:42 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 95AF77BE; Tue, 17 Dec 2013 14:29:42 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 8164718A1; Tue, 17 Dec 2013 14:29:42 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBHETgSX000770; Tue, 17 Dec 2013 14:29:42 GMT (envelope-from wg@svn.freebsd.org) Received: (from wg@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBHETg0K000768; Tue, 17 Dec 2013 14:29:42 GMT (envelope-from wg@svn.freebsd.org) Message-Id: <201312171429.rBHETg0K000768@svn.freebsd.org> From: William Grzybowski Date: Tue, 17 Dec 2013 14:29:42 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r336729 - head/devel/py-defusedxml X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 17 Dec 2013 14:29:42 -0000 Author: wg Date: Tue Dec 17 14:29:41 2013 New Revision: 336729 URL: http://svnweb.freebsd.org/changeset/ports/336729 Log: devel/py-defusedxml: use auto plist and remove py3k hack Deleted: head/devel/py-defusedxml/pkg-plist Modified: head/devel/py-defusedxml/Makefile Modified: head/devel/py-defusedxml/Makefile ============================================================================== --- head/devel/py-defusedxml/Makefile Tue Dec 17 14:20:42 2013 (r336728) +++ head/devel/py-defusedxml/Makefile Tue Dec 17 14:29:41 2013 (r336729) @@ -14,19 +14,15 @@ LICENSE= PSFL USE_PYTHON= yes USE_PYDISTUTILS= yes +PYDISTUTILS_AUTOPLIST= yes PORTDOCS= * DOCS_FILES= CHANGES.txt README.txt OPTIONS_DEFINE= DOCS -.include - post-install: -.if ${PYTHON_REL} >= 320 -.include "${PORTSDIR}/devel/py-virtualenv/files/py3k-fix-pkg-plist.inc" -.endif @${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_MAN} ${DOCS_FILES:S,^,${WRKSRC}/,} ${STAGEDIR}${DOCSDIR} -.include +.include From owner-svn-ports-head@FreeBSD.ORG Tue Dec 17 14:34:31 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 2D2E8957; Tue, 17 Dec 2013 14:34:31 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 181F2192A; Tue, 17 Dec 2013 14:34:31 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBHEYUvL003799; Tue, 17 Dec 2013 14:34:30 GMT (envelope-from wg@svn.freebsd.org) Received: (from wg@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBHEYUIe003798; Tue, 17 Dec 2013 14:34:30 GMT (envelope-from wg@svn.freebsd.org) Message-Id: <201312171434.rBHEYUIe003798@svn.freebsd.org> From: William Grzybowski Date: Tue, 17 Dec 2013 14:34:30 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r336730 - head/devel/py-biplist X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 17 Dec 2013 14:34:31 -0000 Author: wg Date: Tue Dec 17 14:34:30 2013 New Revision: 336730 URL: http://svnweb.freebsd.org/changeset/ports/336730 Log: devel/py-biplist: allow staging and minor fixes - Allow staging - Switch from easy_install to install - Use auto plist, removing py3k hack Deleted: head/devel/py-biplist/pkg-plist Modified: head/devel/py-biplist/Makefile Modified: head/devel/py-biplist/Makefile ============================================================================== --- head/devel/py-biplist/Makefile Tue Dec 17 14:29:41 2013 (r336729) +++ head/devel/py-biplist/Makefile Tue Dec 17 14:34:30 2013 (r336730) @@ -18,16 +18,11 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}six> TEST_DEPENDS:= ${RUN_DEPENDS} USE_PYTHON= yes -USE_PYDISTUTILS=easy_install +USE_PYDISTUTILS=yes +PYDISTUTILS_AUTOPLIST= yes -NO_STAGE= yes .include -post-install: -.if ${PYTHON_REL} >= 320 -.include "${PORTSDIR}/devel/py-virtualenv/files/py3k-fix-pkg-plist.inc" -.endif - regression-test: build @cd ${WRKSRC} && ${PYTHON_CMD} ${PYSETUP} test From owner-svn-ports-head@FreeBSD.ORG Tue Dec 17 14:56:57 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id C21ED33E; Tue, 17 Dec 2013 14:56:57 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id A1E5B1B39; Tue, 17 Dec 2013 14:56:57 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBHEuvxW011197; Tue, 17 Dec 2013 14:56:57 GMT (envelope-from ale@svn.freebsd.org) Received: (from ale@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBHEuvB0011192; Tue, 17 Dec 2013 14:56:57 GMT (envelope-from ale@svn.freebsd.org) Message-Id: <201312171456.rBHEuvB0011192@svn.freebsd.org> From: Alex Dupre Date: Tue, 17 Dec 2013 14:56:57 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r336731 - in head/www/xcache: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 17 Dec 2013 14:56:57 -0000 Author: ale Date: Tue Dec 17 14:56:56 2013 New Revision: 336731 URL: http://svnweb.freebsd.org/changeset/ports/336731 Log: Update to 3.1.0 release and stagify. Modified: head/www/xcache/Makefile head/www/xcache/distinfo head/www/xcache/files/patch-xcache.ini Modified: head/www/xcache/Makefile ============================================================================== --- head/www/xcache/Makefile Tue Dec 17 14:34:30 2013 (r336730) +++ head/www/xcache/Makefile Tue Dec 17 14:56:56 2013 (r336731) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= xcache -DISTVERSION= 3.0.1 +DISTVERSION= 3.1.0 CATEGORIES= www MASTER_SITES= http://xcache.lighttpd.net/pub/Releases/${DISTVERSION}/ @@ -10,7 +10,6 @@ MAINTAINER= ale@FreeBSD.org COMMENT= A fast and stable php opcode cacher LICENSE= BSD -LICENSE_FILE= ${WRKSRC}/COPYING USE_BZIP2= yes USE_PHP= yes @@ -30,7 +29,6 @@ PLIST_DIRSTRY= lib/php/%%PHP_EXT_DIR%% PORTEXAMPLES= * -NO_STAGE= yes .include .if ${PORT_OPTIONS:MCONSTANT} @@ -45,15 +43,13 @@ PLIST_SUB+= COVERAGER="@comment " .endif do-install: - @${MKDIR} ${PREFIX}/lib/php/${PHP_EXT_DIR} + @${MKDIR} ${STAGEDIR}${PREFIX}/lib/php/${PHP_EXT_DIR} ${INSTALL_DATA} ${WRKSRC}/modules/${PORTNAME}.so \ - ${PREFIX}/lib/php/${PHP_EXT_DIR} - @${MKDIR} ${EXAMPLESDIR} + ${STAGEDIR}${PREFIX}/lib/php/${PHP_EXT_DIR} + @${MKDIR} ${STAGEDIR}${EXAMPLESDIR} ${INSTALL_DATA} ${WRKSRC}/xcache.ini \ - ${EXAMPLESDIR} - @cd ${WRKSRC} && ${COPYTREE_SHARE} htdocs ${EXAMPLESDIR} - -post-install: - @${CAT} ${PKGMESSAGE} + ${STAGEDIR}${EXAMPLESDIR} + @cd ${WRKSRC} && ${COPYTREE_SHARE} htdocs \ + ${STAGEDIR}${EXAMPLESDIR} .include Modified: head/www/xcache/distinfo ============================================================================== --- head/www/xcache/distinfo Tue Dec 17 14:34:30 2013 (r336730) +++ head/www/xcache/distinfo Tue Dec 17 14:56:56 2013 (r336731) @@ -1,2 +1,2 @@ -SHA256 (xcache-3.0.1.tar.bz2) = 16a72c04e1c8737800a730bf7107a81d352c0e90bb5b2f632e929e272115c459 -SIZE (xcache-3.0.1.tar.bz2) = 142206 +SHA256 (xcache-3.1.0.tar.bz2) = 86af3e08a8983648d9755f5e1d0e32ad5b952d3e92a83fcaf3acbac9ffd65ee9 +SIZE (xcache-3.1.0.tar.bz2) = 146444 Modified: head/www/xcache/files/patch-xcache.ini ============================================================================== --- head/www/xcache/files/patch-xcache.ini Tue Dec 17 14:34:30 2013 (r336730) +++ head/www/xcache/files/patch-xcache.ini Tue Dec 17 14:56:56 2013 (r336731) @@ -1,6 +1,6 @@ ---- xcache.ini.orig 2012-10-10 14:05:11.000000000 +0200 -+++ xcache.ini 2012-11-08 12:26:54.000000000 +0100 -@@ -1,13 +1,10 @@ +--- xcache.ini.orig 2013-09-25 03:38:01.000000000 +0000 ++++ xcache.ini 2013-12-16 15:35:05.366947401 +0000 +@@ -1,15 +1,12 @@ ;; this is an example, it won't work unless properly configured into php.ini [xcache-common] -;; non-Windows example: @@ -10,8 +10,10 @@ [xcache.admin] xcache.admin.enable_auth = On + + ; use http://xcache.lighttpd.net/demo/cacher/mkpassword.php to generate your encrypted password -xcache.admin.user = "mOo" +xcache.admin.user = "admin" - ; set xcache.admin.pass = md5($your_password) - ; login use $your_password - xcache.admin.pass = "" + xcache.admin.pass = "md5 encrypted password" + + [xcache] From owner-svn-ports-head@FreeBSD.ORG Tue Dec 17 14:57:42 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 8F178429; Tue, 17 Dec 2013 14:57:42 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 7A9171B4A; Tue, 17 Dec 2013 14:57:42 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBHEvgVX011360; Tue, 17 Dec 2013 14:57:42 GMT (envelope-from marcus@svn.freebsd.org) Received: (from marcus@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBHEvgQE011357; Tue, 17 Dec 2013 14:57:42 GMT (envelope-from marcus@svn.freebsd.org) Message-Id: <201312171457.rBHEvgQE011357@svn.freebsd.org> From: Joe Marcus Clarke Date: Tue, 17 Dec 2013 14:57:42 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r336732 - in head/devel/glib20: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 17 Dec 2013 14:57:42 -0000 Author: marcus Date: Tue Dec 17 14:57:41 2013 New Revision: 336732 URL: http://svnweb.freebsd.org/changeset/ports/336732 Log: Add "nullfs" to the list of system internal file system types. This prevents gvfs-trashd from latching on to jail mounts and preventing them from being unmounted. Tested by: Beeblebrox Modified: head/devel/glib20/Makefile head/devel/glib20/files/patch-gio_gunixmounts.c Modified: head/devel/glib20/Makefile ============================================================================== --- head/devel/glib20/Makefile Tue Dec 17 14:56:56 2013 (r336731) +++ head/devel/glib20/Makefile Tue Dec 17 14:57:41 2013 (r336732) @@ -4,7 +4,7 @@ PORTNAME= glib PORTVERSION= 2.36.3 -PORTREVISION= 0 +PORTREVISION= 1 CATEGORIES= devel MASTER_SITES= GNOME DIST_SUBDIR= gnome2 Modified: head/devel/glib20/files/patch-gio_gunixmounts.c ============================================================================== --- head/devel/glib20/files/patch-gio_gunixmounts.c Tue Dec 17 14:56:56 2013 (r336731) +++ head/devel/glib20/files/patch-gio_gunixmounts.c Tue Dec 17 14:57:41 2013 (r336732) @@ -1,6 +1,6 @@ ---- gio/gunixmounts.c.orig 2012-05-02 22:02:54.000000000 -0500 -+++ gio/gunixmounts.c 2012-05-02 22:15:35.000000000 -0500 -@@ -155,6 +155,9 @@ +--- gio/gunixmounts.c.orig 2013-06-09 18:03:17.000000000 -0400 ++++ gio/gunixmounts.c 2013-12-14 11:45:36.749181267 -0500 +@@ -155,6 +155,9 @@ struct _GUnixMountMonitor { GFileMonitor *fstab_monitor; GFileMonitor *mtab_monitor; @@ -10,7 +10,7 @@ GSource *proc_mounts_watch_source; }; -@@ -167,6 +170,8 @@ +@@ -167,6 +170,8 @@ static GUnixMountMonitor *the_mount_moni static GList *_g_get_unix_mounts (void); static GList *_g_get_unix_mount_points (void); @@ -19,7 +19,7 @@ G_DEFINE_TYPE (GUnixMountMonitor, g_unix_mount_monitor, G_TYPE_OBJECT); #define MOUNT_POLL_INTERVAL 4000 -@@ -193,6 +198,7 @@ +@@ -193,6 +198,7 @@ G_DEFINE_TYPE (GUnixMountMonitor, g_unix #endif #if (defined(HAVE_GETVFSSTAT) || defined(HAVE_GETFSSTAT)) && defined(HAVE_FSTAB_H) && defined(HAVE_SYS_MOUNT_H) @@ -27,7 +27,7 @@ #include #include #include -@@ -243,22 +249,29 @@ +@@ -243,22 +249,29 @@ g_unix_is_mount_path_system_internal (co "/", /* we already have "Filesystem root" in Nautilus */ "/bin", "/boot", @@ -57,15 +57,18 @@ "/var", "/var/crash", "/var/local", -@@ -299,6 +312,7 @@ +@@ -299,8 +312,10 @@ guess_system_internal (const char *mount "devfs", "devpts", "ecryptfs", + "fdescfs", "kernfs", "linprocfs", ++ "nullfs", "proc", -@@ -1122,6 +1136,10 @@ + "procfs", + "ptyfs", +@@ -1126,6 +1141,10 @@ get_mounts_timestamp (void) if (stat (monitor_file, &buf) == 0) return (guint64)buf.st_mtime; } @@ -76,7 +79,7 @@ return 0; } -@@ -1267,6 +1285,13 @@ +@@ -1271,6 +1290,13 @@ g_unix_mount_monitor_finalize (GObject * g_object_unref (monitor->mtab_monitor); } @@ -90,7 +93,7 @@ the_mount_monitor = NULL; G_OBJECT_CLASS (g_unix_mount_monitor_parent_class)->finalize (object); -@@ -1348,6 +1373,52 @@ +@@ -1352,6 +1378,52 @@ mtab_file_changed (GFileMonitor *mo } static gboolean @@ -143,7 +146,7 @@ proc_mounts_changed (GIOChannel *channel, GIOCondition cond, gpointer user_data) -@@ -1412,6 +1483,12 @@ +@@ -1416,6 +1488,12 @@ g_unix_mount_monitor_init (GUnixMountMon g_signal_connect (monitor->mtab_monitor, "changed", (GCallback)mtab_file_changed, monitor); } } From owner-svn-ports-head@FreeBSD.ORG Tue Dec 17 15:00:19 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 019A9580; Tue, 17 Dec 2013 15:00:19 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id E0C611C7F; Tue, 17 Dec 2013 15:00:18 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBHF0IRt011938; Tue, 17 Dec 2013 15:00:18 GMT (envelope-from ale@svn.freebsd.org) Received: (from ale@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBHF0HN7011926; Tue, 17 Dec 2013 15:00:17 GMT (envelope-from ale@svn.freebsd.org) Message-Id: <201312171500.rBHF0HN7011926@svn.freebsd.org> From: Alex Dupre Date: Tue, 17 Dec 2013 15:00:17 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r336733 - in head/databases: mysql51-client mysql51-scripts mysql51-server X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 17 Dec 2013 15:00:19 -0000 Author: ale Date: Tue Dec 17 15:00:17 2013 New Revision: 336733 URL: http://svnweb.freebsd.org/changeset/ports/336733 Log: Update to 5.1.73 release and stagify. Modified: head/databases/mysql51-client/Makefile head/databases/mysql51-scripts/Makefile head/databases/mysql51-server/Makefile head/databases/mysql51-server/distinfo head/databases/mysql51-server/pkg-plist head/databases/mysql51-server/pkg-plist.client head/databases/mysql51-server/pkg-plist.scripts Modified: head/databases/mysql51-client/Makefile ============================================================================== --- head/databases/mysql51-client/Makefile Tue Dec 17 14:57:41 2013 (r336732) +++ head/databases/mysql51-client/Makefile Tue Dec 17 15:00:17 2013 (r336733) @@ -14,5 +14,4 @@ PLIST= ${PKGDIR}/pkg-plist.client CLIENT_ONLY= yes -NO_STAGE= yes .include "${MASTERDIR}/Makefile" Modified: head/databases/mysql51-scripts/Makefile ============================================================================== --- head/databases/mysql51-scripts/Makefile Tue Dec 17 14:57:41 2013 (r336732) +++ head/databases/mysql51-scripts/Makefile Tue Dec 17 15:00:17 2013 (r336733) @@ -15,5 +15,4 @@ PLIST= ${PKGDIR}/pkg-plist.scripts SCRIPTS_ONLY= yes USES= perl5 -NO_STAGE= yes .include "${MASTERDIR}/Makefile" Modified: head/databases/mysql51-server/Makefile ============================================================================== --- head/databases/mysql51-server/Makefile Tue Dec 17 14:57:41 2013 (r336732) +++ head/databases/mysql51-server/Makefile Tue Dec 17 15:00:17 2013 (r336733) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME?= mysql -PORTVERSION= 5.1.72 +PORTVERSION= 5.1.73 PORTREVISION?= 0 CATEGORIES= databases MASTER_SITES= ${MASTER_SITE_MYSQL} @@ -62,7 +62,6 @@ CONFIGURE_ARGS+=--with-plugins=max-no-nd CONFIGURE_ARGS+=--with-collation=${WITH_COLLATION} .endif -NO_STAGE= yes .include .if ${ARCH} == "arm" @@ -153,11 +152,6 @@ post-patch: @${REINPLACE_CMD} -e "s|PTHREAD_SCOPE_SYSTEM|PTHREAD_SCOPE_PROCESS|g" ${WRKSRC}/sql/mysqld.cc .endif -post-install: -.if !defined(PACKAGE_BUILDING) - @${CAT} ${PKGMESSAGE} -.endif - .else # MySQL-Client part .if defined(CLIENT_ONLY) @@ -180,7 +174,7 @@ post-patch: @${REINPLACE_CMD} -e "s|install-exec-am: install-binPROGRAMS|install-exec-am:|g" ${WRKSRC}/extra/Makefile.in post-install: - ${INSTALL_DATA} ${WRKSRC}/support-files/mysql.m4 ${PREFIX}/share/aclocal/ + ${INSTALL_DATA} ${WRKSRC}/support-files/mysql.m4 ${STAGEDIR}${PREFIX}/share/aclocal/ .else # MySQL-Scripts part Modified: head/databases/mysql51-server/distinfo ============================================================================== --- head/databases/mysql51-server/distinfo Tue Dec 17 14:57:41 2013 (r336732) +++ head/databases/mysql51-server/distinfo Tue Dec 17 15:00:17 2013 (r336733) @@ -1,2 +1,2 @@ -SHA256 (mysql-5.1.72.tar.gz) = c414a64722ffa89d315152a030661d34764894e293e33792809cea61c8a5303e -SIZE (mysql-5.1.72.tar.gz) = 24044338 +SHA256 (mysql-5.1.73.tar.gz) = 05ebe21305408b24407d14b77607a3e5ffa3c300e03f1359d3066f301989dcb5 +SIZE (mysql-5.1.73.tar.gz) = 24023347 Modified: head/databases/mysql51-server/pkg-plist ============================================================================== --- head/databases/mysql51-server/pkg-plist Tue Dec 17 14:57:41 2013 (r336732) +++ head/databases/mysql51-server/pkg-plist Tue Dec 17 15:00:17 2013 (r336733) @@ -1,4 +1,3 @@ -@stopdaemon mysql-server bin/innochecksum bin/my_print_defaults bin/myisam_ftdump @@ -95,6 +94,23 @@ libexec/mysqld %%NDB%%libexec/ndb_cpcd %%NDB%%libexec/ndb_mgmd %%NDB%%libexec/ndbd +man/man1/innochecksum.1.gz +man/man1/my_print_defaults.1.gz +man/man1/myisam_ftdump.1.gz +man/man1/myisamchk.1.gz +man/man1/myisamlog.1.gz +man/man1/myisampack.1.gz +man/man1/mysql.server.1.gz +man/man1/mysql_client_test_embedded.1.gz +man/man1/mysql_install_db.1.gz +man/man1/mysql_tzinfo_to_sql.1.gz +man/man1/mysql_waitpid.1.gz +man/man1/mysqld_safe.1.gz +man/man1/mysqltest_embedded.1.gz +man/man1/perror.1.gz +man/man1/replace.1.gz +man/man1/resolve_stack_dump.1.gz +man/man1/resolveip.1.gz %%DATADIR%%/ChangeLog %%DATADIR%%/binary-configure %%DATADIR%%/charsets/Index.xml @@ -168,7 +184,7 @@ libexec/mysqld %%NDB%%@dirrm include/mysql/storage/ndb/ndbapi %%NDB%%@dirrm include/mysql/storage/ndb %%NDB%%@dirrm include/mysql/storage -@dirrmtry include/mysql +%%NDB%%@dirrmtry include/mysql @dirrmtry lib/mysql/plugin @dirrmtry lib/mysql @dirrm %%DATADIR%%/charsets Modified: head/databases/mysql51-server/pkg-plist.client ============================================================================== --- head/databases/mysql51-server/pkg-plist.client Tue Dec 17 14:57:41 2013 (r336732) +++ head/databases/mysql51-server/pkg-plist.client Tue Dec 17 15:00:17 2013 (r336733) @@ -52,6 +52,18 @@ lib/mysql/libmysqlclient_r.a lib/mysql/libmysqlclient_r.la lib/mysql/libmysqlclient_r.so lib/mysql/libmysqlclient_r.so.16 +man/man1/mysql.1.gz +man/man1/mysql_config.1.gz +man/man1/mysql_upgrade.1.gz +man/man1/mysqladmin.1.gz +man/man1/mysqlbinlog.1.gz +man/man1/mysqlbug.1.gz +man/man1/mysqlcheck.1.gz +man/man1/mysqldump.1.gz +man/man1/mysqlimport.1.gz +man/man1/mysqlshow.1.gz +man/man1/mysqlslap.1.gz +man/man1/mysqltest.1.gz share/aclocal/mysql.m4 %%DATADIR%%/mysql_fix_privilege_tables.sql @dirrm include/mysql Modified: head/databases/mysql51-server/pkg-plist.scripts ============================================================================== --- head/databases/mysql51-server/pkg-plist.scripts Tue Dec 17 14:57:41 2013 (r336732) +++ head/databases/mysql51-server/pkg-plist.scripts Tue Dec 17 15:00:17 2013 (r336733) @@ -9,3 +9,14 @@ bin/mysqlaccess bin/mysqld_multi bin/mysqldumpslow bin/mysqlhotcopy +man/man1/msql2mysql.1.gz +man/man1/mysql_convert_table_format.1.gz +man/man1/mysql_find_rows.1.gz +man/man1/mysql_fix_extensions.1.gz +man/man1/mysql_secure_installation.1.gz +man/man1/mysql_setpermission.1.gz +man/man1/mysql_zap.1.gz +man/man1/mysqlaccess.1.gz +man/man1/mysqld_multi.1.gz +man/man1/mysqldumpslow.1.gz +man/man1/mysqlhotcopy.1.gz From owner-svn-ports-head@FreeBSD.ORG Tue Dec 17 15:06:24 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 95F646C3; Tue, 17 Dec 2013 15:06:24 +0000 (UTC) Received: from shepard.synsport.net (mail.synsport.com [208.69.230.148]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 6B2791D05; Tue, 17 Dec 2013 15:06:23 +0000 (UTC) Received: from [192.168.1.14] (ip70-178-7-237.ks.ks.cox.net [70.178.7.237]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by shepard.synsport.net (Postfix) with ESMTP id B04AB435A3; Tue, 17 Dec 2013 09:06:10 -0600 (CST) Message-ID: <52B06851.7030906@marino.st> Date: Tue, 17 Dec 2013 16:05:53 +0100 From: John Marino User-Agent: Mozilla/5.0 (Windows NT 6.1; WOW64; rv:17.0) Gecko/20130509 Thunderbird/17.0.6 MIME-Version: 1.0 To: Rusmir Dusko Subject: Re: svn commit: r336723 - in head: . games games/blobwars games/blobwars/files References: <201312171342.rBHDggNP084170@svn.freebsd.org> In-Reply-To: <201312171342.rBHDggNP084170@svn.freebsd.org> X-Enigmail-Version: 1.6 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit Cc: svn-ports-head@freebsd.org, svn-ports-all@freebsd.org, ports-committers@freebsd.org X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list Reply-To: marino@freebsd.org List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 17 Dec 2013 15:06:24 -0000 On 12/17/2013 14:42, Rusmir Dusko wrote: > Author: nemysis > Date: Tue Dec 17 13:42:42 2013 > New Revision: 336723 > URL: http://svnweb.freebsd.org/changeset/ports/336723 > > Log: > Blob Wars : Metal Blob Solid is a platform game, not unlike those found on > the Amiga and SNES. The object of the game is to take on the role of > solider Blob, Bob, and play through the various levels and attempt to rescue as > many MIA (Missing In Action) Blobs as possible. This is not quite as straight > forward as it sounds, since the MIAs will often be not directly reachable and > will require some extra thought. Bob also has to contend with environmental > hazards, alien invaders and assimilated Blobs. > > WWW: http://www.parallelrealities.co.uk/p/blob-wars-metal-blob-solid.html > > Approved by: pawel (mentor) Given that the removal of this port was requested by the owners due to copyright issues in 2008, should not the commit message have addressed why it is okay to add this port back? Has the legal situation changes? To omit this information from the commit message is very conspicious IMO. For convenience, this was the previous commit message: > - Remove all games by Parallel Realities > Those games contain resources that are non-free and, in some cases, > ripped from other games and still copyrighted. We have to remove > the ports to avoid potential legal issues, sorry. > Related discussion thread: > http://www.happypenguin.org/forums/viewtopic.php?t=4725 How does one know that the legal situation has changed to allow this port to come back? Regards, John From owner-svn-ports-head@FreeBSD.ORG Tue Dec 17 15:12:11 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 55C98971; Tue, 17 Dec 2013 15:12:11 +0000 (UTC) Received: from mail-we0-x232.google.com (mail-we0-x232.google.com [IPv6:2a00:1450:400c:c03::232]) (using TLSv1 with cipher ECDHE-RSA-RC4-SHA (128/128 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 418511DA2; Tue, 17 Dec 2013 15:12:10 +0000 (UTC) Received: by mail-we0-f178.google.com with SMTP id u57so6250467wes.9 for ; Tue, 17 Dec 2013 07:12:08 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:date:from:to:cc:subject:message-id:references:mime-version :content-type:content-disposition:in-reply-to:user-agent; bh=a7BYjRakfmELdOSlZTnwKg5HXz6tWUhDD/Cum7g7Eww=; b=fiGKbpvaziWsIRG1rIXtY/QmrmapMIpEXmC9xmdwf7ZTey6B/sZXB0XstVXbYnBkn/ x4EwQXKhra8EQFBzo/5KofKO9D/6n1djO563U6PtmQq7DbBbk2NuceAMa7KC/MzQrcE7 GDZtPlYXjbejc5YAEhBslShEJkrcfX7YViQTX9It6yxNqawdAoiVNbGfMvhewGPLV4KG l5tuhqgmZw29henfNlVcwECmo3uEflOM/PDlR7pmIz+VNWPpkOSBduGVIwjCcA/yradp h/5cAkFkB7iR7ua+/hWAhYlZ2nyZ7jKFsyCSE/0l/ulq8TTsJqc+Gnby5bgVdaRJJZVV WB0g== X-Received: by 10.180.93.8 with SMTP id cq8mr3714304wib.38.1387293128614; Tue, 17 Dec 2013 07:12:08 -0800 (PST) Received: from ithaqua.etoilebsd.net (ithaqua.etoilebsd.net. [37.59.37.188]) by mx.google.com with ESMTPSA id n6sm35520947wix.3.2013.12.17.07.12.06 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Tue, 17 Dec 2013 07:12:06 -0800 (PST) Sender: Baptiste Daroussin Date: Tue, 17 Dec 2013 16:12:04 +0100 From: Baptiste Daroussin To: marino@freebsd.org Subject: Re: svn commit: r336723 - in head: . games games/blobwars games/blobwars/files Message-ID: <20131217151203.GK99753@ithaqua.etoilebsd.net> References: <201312171342.rBHDggNP084170@svn.freebsd.org> <52B06851.7030906@marino.st> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="8kI7hWEHMS8Z+7/0" Content-Disposition: inline In-Reply-To: <52B06851.7030906@marino.st> User-Agent: Mutt/1.5.21 (2010-09-15) Cc: svn-ports-head@freebsd.org, Rusmir Dusko , svn-ports-all@freebsd.org, ports-committers@freebsd.org X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 17 Dec 2013 15:12:11 -0000 --8kI7hWEHMS8Z+7/0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Tue, Dec 17, 2013 at 04:05:53PM +0100, John Marino wrote: > On 12/17/2013 14:42, Rusmir Dusko wrote: > > Author: nemysis > > Date: Tue Dec 17 13:42:42 2013 > > New Revision: 336723 > > URL: http://svnweb.freebsd.org/changeset/ports/336723 > >=20 > > Log: > > Blob Wars : Metal Blob Solid is a platform game, not unlike those fou= nd on > > the Amiga and SNES. The object of the game is to take on the role of > > solider Blob, Bob, and play through the various levels and attempt to= rescue as > > many MIA (Missing In Action) Blobs as possible. This is not quite as = straight > > forward as it sounds, since the MIAs will often be not directly reach= able and > > will require some extra thought. Bob also has to contend with environ= mental > > hazards, alien invaders and assimilated Blobs. > > =20 > > WWW: http://www.parallelrealities.co.uk/p/blob-wars-metal-blob-solid.= html > > =20 > > Approved by: pawel (mentor) >=20 >=20 > Given that the removal of this port was requested by the owners due to > copyright issues in 2008, should not the commit message have addressed > why it is okay to add this port back? Has the legal situation changes? > To omit this information from the commit message is very conspicious IMO. >=20 > For convenience, this was the previous commit message: > > - Remove all games by Parallel Realities > > Those games contain resources that are non-free and, in some cases, > > ripped from other games and still copyrighted. We have to remove > > the ports to avoid potential legal issues, sorry. > > Related discussion thread: > > http://www.happypenguin.org/forums/viewtopic.php?t=3D4725 >=20 > How does one know that the legal situation has changed to allow this > port to come back? >=20 > Regards, > John That is exactly the question I was about to ask. regards, Bapt --8kI7hWEHMS8Z+7/0 Content-Type: application/pgp-signature -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.15 (FreeBSD) iEYEARECAAYFAlKwacMACgkQ8kTtMUmk6ExrTQCfXnKcMm5IX+MR0ya6j7pLoziP Ic4AoKKhyDmmAM3iPmZtSRTKp9SmTMrX =p2QT -----END PGP SIGNATURE----- --8kI7hWEHMS8Z+7/0-- From owner-svn-ports-head@FreeBSD.ORG Tue Dec 17 15:50:01 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 6D393BFC; Tue, 17 Dec 2013 15:50:01 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 5934310BB; Tue, 17 Dec 2013 15:50:01 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBHFo1dq029836; Tue, 17 Dec 2013 15:50:01 GMT (envelope-from swills@svn.freebsd.org) Received: (from swills@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBHFo0g3029832; Tue, 17 Dec 2013 15:50:00 GMT (envelope-from swills@svn.freebsd.org) Message-Id: <201312171550.rBHFo0g3029832@svn.freebsd.org> From: Steve Wills Date: Tue, 17 Dec 2013 15:50:00 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r336734 - in head/net: xrdp xrdp-devel X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 17 Dec 2013 15:50:01 -0000 Author: swills Date: Tue Dec 17 15:50:00 2013 New Revision: 336734 URL: http://svnweb.freebsd.org/changeset/ports/336734 Log: - Fix mistake in options: KEYMAP options are at least 0 choise, not 1 PR: ports/184055 Submitted by: Koichiro IWAO Modified: head/net/xrdp-devel/Makefile head/net/xrdp/Makefile Modified: head/net/xrdp-devel/Makefile ============================================================================== --- head/net/xrdp-devel/Makefile Tue Dec 17 15:00:17 2013 (r336733) +++ head/net/xrdp-devel/Makefile Tue Dec 17 15:50:00 2013 (r336734) @@ -39,8 +39,8 @@ LIB_DEPENDS+= jpeg:${PORTSDIR}/graphics/ OPTIONS_DEFINE= DEBUG SOUND OPTIONS_DEFAULT= TIGERVNC JP106 -OPTIONS_MULTI= KEYMAP -OPTIONS_MULTI_KEYMAP= JP106 +OPTIONS_GROUP= KEYMAP +OPTIONS_GROUP_KEYMAP= JP106 OPTIONS_RADIO= XVNC OPTIONS_RADIO_XVNC= REALVNC TIGERVNC TIGHTVNC TRIDIAVNC REALVNC_DESC= Use RealVNC Modified: head/net/xrdp/Makefile ============================================================================== --- head/net/xrdp/Makefile Tue Dec 17 15:00:17 2013 (r336733) +++ head/net/xrdp/Makefile Tue Dec 17 15:50:00 2013 (r336734) @@ -36,8 +36,8 @@ BUILD_DEPENDS+= freerdp>=1.0.2:${PORTSDI OPTIONS_DEFINE= DEBUG OPTIONS_DEFAULT= JP106 TIGERVNC -OPTIONS_MULTI= KEYMAP -OPTIONS_MULTI_KEYMAP= JP106 +OPTIONS_GROUP= KEYMAP +OPTIONS_GROUP_KEYMAP= JP106 OPTIONS_RADIO= XVNC OPTIONS_RADIO_XVNC= REALVNC TIGERVNC TIGHTVNC TRIDIAVNC REALVNC_DESC= Use RealVNC From owner-svn-ports-head@FreeBSD.ORG Tue Dec 17 15:57:48 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id BCBFF263; Tue, 17 Dec 2013 15:57:48 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id A870F116B; Tue, 17 Dec 2013 15:57:48 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBHFvmcf033055; Tue, 17 Dec 2013 15:57:48 GMT (envelope-from madpilot@svn.freebsd.org) Received: (from madpilot@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBHFvm7W033054; Tue, 17 Dec 2013 15:57:48 GMT (envelope-from madpilot@svn.freebsd.org) Message-Id: <201312171557.rBHFvm7W033054@svn.freebsd.org> From: Guido Falsi Date: Tue, 17 Dec 2013 15:57:48 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r336735 - head/security/ssh_askpass_gtk2 X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 17 Dec 2013 15:57:48 -0000 Author: madpilot Date: Tue Dec 17 15:57:48 2013 New Revision: 336735 URL: http://svnweb.freebsd.org/changeset/ports/336735 Log: - Fix build on 10 and head due to new ld behavior - Stagify PR: ports/184926 Submitted by: me Approved by: arved (maintainer, via email) Modified: head/security/ssh_askpass_gtk2/Makefile (contents, props changed) Modified: head/security/ssh_askpass_gtk2/Makefile ============================================================================== --- head/security/ssh_askpass_gtk2/Makefile Tue Dec 17 15:50:00 2013 (r336734) +++ head/security/ssh_askpass_gtk2/Makefile Tue Dec 17 15:57:48 2013 (r336735) @@ -19,12 +19,12 @@ USES= pkgconfig PLIST_FILES= bin/ssh-askpass-fullscreen -NO_STAGE= yes post-patch: - ${REINPLACE_CMD} -e "s,gcc,${CC}," ${WRKSRC}/Makefile + ${REINPLACE_CMD} -e "s,gcc,${CC}," \ + -e "/${CC}/s,$$, -lX11," ${WRKSRC}/Makefile do-install: cd ${WRKSRC};\ - ${INSTALL_PROGRAM} ssh-askpass-fullscreen ${PREFIX}/bin/ssh-askpass-fullscreen;\ + ${INSTALL_PROGRAM} ssh-askpass-fullscreen ${STAGEDIR}${PREFIX}/bin/ssh-askpass-fullscreen .include From owner-svn-ports-head@FreeBSD.ORG Tue Dec 17 16:01:40 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 0F50B4E8; Tue, 17 Dec 2013 16:01:40 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id D4CAD11EE; Tue, 17 Dec 2013 16:01:39 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBHG1daX036113; Tue, 17 Dec 2013 16:01:39 GMT (envelope-from naddy@svn.freebsd.org) Received: (from naddy@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBHG1c8l036105; Tue, 17 Dec 2013 16:01:38 GMT (envelope-from naddy@svn.freebsd.org) Message-Id: <201312171601.rBHG1c8l036105@svn.freebsd.org> From: Christian Weisgerber Date: Tue, 17 Dec 2013 16:01:38 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r336736 - in head: archivers/gcpio archivers/gtar audio/flac audio/libogg audio/libvorbis X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 17 Dec 2013 16:01:40 -0000 Author: naddy Date: Tue Dec 17 16:01:38 2013 New Revision: 336736 URL: http://svnweb.freebsd.org/changeset/ports/336736 Log: Use MAKE_CMD to run regression tests. Modified: head/archivers/gcpio/Makefile head/archivers/gtar/Makefile head/audio/flac/Makefile head/audio/libogg/Makefile head/audio/libvorbis/Makefile Modified: head/archivers/gcpio/Makefile ============================================================================== --- head/archivers/gcpio/Makefile Tue Dec 17 15:57:48 2013 (r336735) +++ head/archivers/gcpio/Makefile Tue Dec 17 16:01:38 2013 (r336736) @@ -26,6 +26,6 @@ NLS_USES= gettext NLS_CONFIGURE_ENABLE= nls regression-test: build - @cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE} check + @cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} check .include Modified: head/archivers/gtar/Makefile ============================================================================== --- head/archivers/gtar/Makefile Tue Dec 17 15:57:48 2013 (r336735) +++ head/archivers/gtar/Makefile Tue Dec 17 16:01:38 2013 (r336736) @@ -45,6 +45,6 @@ STATIC_ARGS= lib .endif regression-test: build - @cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE} check + @cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} check .include Modified: head/audio/flac/Makefile ============================================================================== --- head/audio/flac/Makefile Tue Dec 17 15:57:48 2013 (r336735) +++ head/audio/flac/Makefile Tue Dec 17 16:01:38 2013 (r336736) @@ -45,6 +45,6 @@ post-build: ${REINPLACE_CMD} 's:%%PREFIX%%:${PREFIX}:' ${WRKSRC}/man/flac.1 regression-test: build - @cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${MAKE} check + @cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${MAKE_CMD} check .include Modified: head/audio/libogg/Makefile ============================================================================== --- head/audio/libogg/Makefile Tue Dec 17 15:57:48 2013 (r336735) +++ head/audio/libogg/Makefile Tue Dec 17 16:01:38 2013 (r336736) @@ -18,6 +18,6 @@ GNU_CONFIGURE= yes OPTIONS_DEFINE= DOCS regression-test: build - @cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE} check + @cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} check .include Modified: head/audio/libvorbis/Makefile ============================================================================== --- head/audio/libvorbis/Makefile Tue Dec 17 15:57:48 2013 (r336735) +++ head/audio/libvorbis/Makefile Tue Dec 17 16:01:38 2013 (r336736) @@ -25,6 +25,6 @@ CONFIGURE_ARGS= --with-ogg=${LOCALBASE} OPTIONS_DEFINE= DOCS regression-test: build - @cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE} check + @cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} check .include From owner-svn-ports-head@FreeBSD.ORG Tue Dec 17 16:08:31 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 6AB3571D; Tue, 17 Dec 2013 16:08:31 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 564EF1242; Tue, 17 Dec 2013 16:08:31 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBHG8VQb037234; Tue, 17 Dec 2013 16:08:31 GMT (envelope-from dinoex@svn.freebsd.org) Received: (from dinoex@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBHG8UmK037232; Tue, 17 Dec 2013 16:08:30 GMT (envelope-from dinoex@svn.freebsd.org) Message-Id: <201312171608.rBHG8UmK037232@svn.freebsd.org> From: Dirk Meyer Date: Tue, 17 Dec 2013 16:08:30 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r336737 - head/news/knews X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 17 Dec 2013 16:08:31 -0000 Author: dinoex Date: Tue Dec 17 16:08:30 2013 New Revision: 336737 URL: http://svnweb.freebsd.org/changeset/ports/336737 Log: - use STAGEDIR Modified: head/news/knews/Makefile head/news/knews/pkg-plist Modified: head/news/knews/Makefile ============================================================================== --- head/news/knews/Makefile Tue Dec 17 16:01:38 2013 (r336736) +++ head/news/knews/Makefile Tue Dec 17 16:08:30 2013 (r336737) @@ -11,22 +11,20 @@ MASTER_SITE_SUBDIR=dinoex MAINTAINER= dinoex@FreeBSD.org COMMENT= Threaded nntp newsreader for X -LIB_DEPENDS= jpeg:${PORTSDIR}/graphics/jpeg \ - png15:${PORTSDIR}/graphics/png \ - compface:${PORTSDIR}/mail/faces +LIB_DEPENDS= libjpeg.so:${PORTSDIR}/graphics/jpeg \ + libpng15.so:${PORTSDIR}/graphics/png \ + libcompface.so:${PORTSDIR}/mail/faces RUN_DEPENDS= newsp:${PORTSDIR}/print/mp-letter LICENSE= GPLv2 -NO_STAGE= yes - USES= imake USE_XORG= xmu xpm xt sm ice xext x11 MAKE_FLAGS= BINDIR=${PREFIX}/bin MANDIR=${PREFIX}/man/man1 CC="${CC}" \ XAPPLOADDIR=${PREFIX}/lib/X11/app-defaults -f + .if defined(MAKE_JOBS) MAKE_ARGS+= -j${MAKE_JOBS} .endif -MAN1= knews.1 .include Modified: head/news/knews/pkg-plist ============================================================================== --- head/news/knews/pkg-plist Tue Dec 17 16:01:38 2013 (r336736) +++ head/news/knews/pkg-plist Tue Dec 17 16:08:30 2013 (r336737) @@ -1,2 +1,3 @@ bin/knews lib/X11/app-defaults/Knews +man/man1/knews.1.gz From owner-svn-ports-head@FreeBSD.ORG Tue Dec 17 16:17:02 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 5EC42D0C; Tue, 17 Dec 2013 16:17:02 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 4AA7E1322; Tue, 17 Dec 2013 16:17:02 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBHGH2Zb040946; Tue, 17 Dec 2013 16:17:02 GMT (envelope-from dinoex@svn.freebsd.org) Received: (from dinoex@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBHGH1qO040944; Tue, 17 Dec 2013 16:17:01 GMT (envelope-from dinoex@svn.freebsd.org) Message-Id: <201312171617.rBHGH1qO040944@svn.freebsd.org> From: Dirk Meyer Date: Tue, 17 Dec 2013 16:17:01 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r336738 - head/net/miniupnpc X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 17 Dec 2013 16:17:02 -0000 Author: dinoex Date: Tue Dec 17 16:17:01 2013 New Revision: 336738 URL: http://svnweb.freebsd.org/changeset/ports/336738 Log: - use STAGEDIR Modified: head/net/miniupnpc/Makefile head/net/miniupnpc/pkg-plist Modified: head/net/miniupnpc/Makefile ============================================================================== --- head/net/miniupnpc/Makefile Tue Dec 17 16:08:30 2013 (r336737) +++ head/net/miniupnpc/Makefile Tue Dec 17 16:17:01 2013 (r336738) @@ -11,14 +11,12 @@ COMMENT?= UPnP IGD client lightweight li LICENSE= BSD LICENSE_FILE= ${WRKSRC}/LICENSE -NO_STAGE= yes - +USES= gmake HAS_CONFIGURE= yes -USE_GMAKE= yes USE_LDCONFIG= yes CONFIGURE_SCRIPT= updateminiupnpcstrings.sh -MAKE_ENV+= INSTALLPREFIX=${PREFIX} +MAKE_ENV+= INSTALLPREFIX=${STAGEDIR}${PREFIX} .include @@ -27,7 +25,6 @@ CFLAGS+= -DDEBUG .endif .if ${SLAVE_PORT} == no -MAN3= miniupnpc.3 USE_RC_SUBR= miniupnpc .endif Modified: head/net/miniupnpc/pkg-plist ============================================================================== --- head/net/miniupnpc/pkg-plist Tue Dec 17 16:08:30 2013 (r336737) +++ head/net/miniupnpc/pkg-plist Tue Dec 17 16:17:01 2013 (r336738) @@ -12,4 +12,5 @@ include/miniupnpc/upnperrors.h lib/libminiupnpc.a lib/libminiupnpc.so lib/libminiupnpc.so.9 +man/man3/miniupnpc.3.gz @dirrm include/miniupnpc From owner-svn-ports-head@FreeBSD.ORG Tue Dec 17 16:25:54 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 744B319A; Tue, 17 Dec 2013 16:25:54 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 5FB3E13D1; Tue, 17 Dec 2013 16:25:54 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBHGPsGJ044341; Tue, 17 Dec 2013 16:25:54 GMT (envelope-from swills@svn.freebsd.org) Received: (from swills@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBHGPrFi044338; Tue, 17 Dec 2013 16:25:53 GMT (envelope-from swills@svn.freebsd.org) Message-Id: <201312171625.rBHGPrFi044338@svn.freebsd.org> From: Steve Wills Date: Tue, 17 Dec 2013 16:25:53 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r336739 - in head/mail/milter-greylist-devel: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 17 Dec 2013 16:25:54 -0000 Author: swills Date: Tue Dec 17 16:25:53 2013 New Revision: 336739 URL: http://svnweb.freebsd.org/changeset/ports/336739 Log: - Update to 4.5.7 PR: ports/184427 Submitted by: "Mikhail T." Modified: head/mail/milter-greylist-devel/Makefile (contents, props changed) head/mail/milter-greylist-devel/distinfo (contents, props changed) head/mail/milter-greylist-devel/files/patch-configure (contents, props changed) Modified: head/mail/milter-greylist-devel/Makefile ============================================================================== --- head/mail/milter-greylist-devel/Makefile Tue Dec 17 16:17:01 2013 (r336738) +++ head/mail/milter-greylist-devel/Makefile Tue Dec 17 16:25:53 2013 (r336739) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= milter-greylist -PORTVERSION= 4.3.9 +PORTVERSION= 4.5.7 CATEGORIES= mail MASTER_SITES= ftp://ftp.espci.fr/pub/milter-greylist/ \ http://fossies.org/unix/privat/ @@ -14,7 +14,7 @@ COMMENT= Easy-to-use greylist milter for LICENSE= BSD -CONFLICTS= milter-greylist-4.2.* +CONFLICTS= milter-greylist-4.2.* milter-greylist-4.4.* PKGMESSAGE= ${WRKDIR}/pkg-message MAKE_JOBS_UNSAFE= yes Modified: head/mail/milter-greylist-devel/distinfo ============================================================================== --- head/mail/milter-greylist-devel/distinfo Tue Dec 17 16:17:01 2013 (r336738) +++ head/mail/milter-greylist-devel/distinfo Tue Dec 17 16:25:53 2013 (r336739) @@ -1,2 +1,2 @@ -SHA256 (milter-greylist-4.3.9.tgz) = 02b712cf25e967f2b1a8984966a4d084bba89ceed26f5549ef201f7933c62d97 -SIZE (milter-greylist-4.3.9.tgz) = 222367 +SHA256 (milter-greylist-4.5.7.tgz) = b3e57d5d01f773c12081b28e671f82ed89c558ed2194de145619bc74b9420f3b +SIZE (milter-greylist-4.5.7.tgz) = 249853 Modified: head/mail/milter-greylist-devel/files/patch-configure ============================================================================== --- head/mail/milter-greylist-devel/files/patch-configure Tue Dec 17 16:17:01 2013 (r336738) +++ head/mail/milter-greylist-devel/files/patch-configure Tue Dec 17 16:25:53 2013 (r336739) @@ -1,6 +1,6 @@ ---- configure.orig 2011-04-13 05:41:45.000000000 +0400 -+++ configure 2011-09-19 22:17:17.498960457 +0400 -@@ -4982,7 +4982,7 @@ +--- configure.orig 2013-09-16 07:09:00.000000000 +0400 ++++ configure 2013-11-14 15:10:56.406013703 +0400 +@@ -6094,7 +6094,7 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pthread_pthread_create" >&5 $as_echo "$ac_cv_lib_pthread_pthread_create" >&6; } if test "x$ac_cv_lib_pthread_pthread_create" = x""yes; then : @@ -9,19 +9,3 @@ else { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pthread_create in -lc_r" >&5 $as_echo_n "checking for pthread_create in -lc_r... " >&6; } -@@ -5488,13 +5488,13 @@ - if test "${with_libdkim+set}" = set; then : - withval=$with_libdkim; LDFLAGS=$LDFLAGS" -L$withval/lib -Wl,$rpath$withval/lib" - CFLAGS=$CFLAGS" -I$withval/include" -- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dkim_init in -ldkim -lsm -lcrypto" >&5 --$as_echo_n "checking for dkim_init in -ldkim -lsm -lcrypto... " >&6; } -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dkim_init in -ldkim -lcrypto" >&5 -+$as_echo_n "checking for dkim_init in -ldkim -lcrypto... " >&6; } - if test "${ac_cv_lib_dkim__lsm__lcrypto_dkim_init+set}" = set; then : - $as_echo_n "(cached) " >&6 - else - ac_check_lib_save_LIBS=$LIBS --LIBS="-ldkim -lsm -lcrypto $LIBS" -+LIBS="-ldkim -lcrypto $LIBS" - cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ From owner-svn-ports-head@FreeBSD.ORG Tue Dec 17 16:28:39 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id DAED92C2; Tue, 17 Dec 2013 16:28:39 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id C633313E5; Tue, 17 Dec 2013 16:28:39 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBHGSdOB044674; Tue, 17 Dec 2013 16:28:39 GMT (envelope-from swills@svn.freebsd.org) Received: (from swills@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBHGSdOZ044673; Tue, 17 Dec 2013 16:28:39 GMT (envelope-from swills@svn.freebsd.org) Message-Id: <201312171628.rBHGSdOZ044673@svn.freebsd.org> From: Steve Wills Date: Tue, 17 Dec 2013 16:28:39 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r336740 - head/mail/popper X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 17 Dec 2013 16:28:39 -0000 Author: swills Date: Tue Dec 17 16:28:39 2013 New Revision: 336740 URL: http://svnweb.freebsd.org/changeset/ports/336740 Log: - Release maintainership at maintainer request PR: ports/184452 Submitted by: "Mikhail T." (maintainer) Modified: head/mail/popper/Makefile (contents, props changed) Modified: head/mail/popper/Makefile ============================================================================== --- head/mail/popper/Makefile Tue Dec 17 16:25:53 2013 (r336739) +++ head/mail/popper/Makefile Tue Dec 17 16:28:39 2013 (r336740) @@ -9,7 +9,7 @@ MASTER_SITES= ftp://ftp.qualcomm.com/eud DISTNAME= q${PORTNAME}${PORTVERSION} EXTRACT_SUFX= .tar.Z -MAINTAINER= m.tsatsenko@gmail.com +MAINTAINER= ports@FreeBSD.org COMMENT= Berkeley POP 3 server (now maintained by Qualcomm) # Set WITH_POPPER_YOUBIN_SUPPORT variable in the environment to enable From owner-svn-ports-head@FreeBSD.ORG Tue Dec 17 16:28:51 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 3FB7A39D; Tue, 17 Dec 2013 16:28:51 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 2B9481410; Tue, 17 Dec 2013 16:28:51 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBHGSpvW044751; Tue, 17 Dec 2013 16:28:51 GMT (envelope-from glarkin@svn.freebsd.org) Received: (from glarkin@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBHGSpSD044750; Tue, 17 Dec 2013 16:28:51 GMT (envelope-from glarkin@svn.freebsd.org) Message-Id: <201312171628.rBHGSpSD044750@svn.freebsd.org> From: Greg Larkin Date: Tue, 17 Dec 2013 16:28:51 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r336741 - head/sysutils/rubygem-hiera X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 17 Dec 2013 16:28:51 -0000 Author: glarkin Date: Tue Dec 17 16:28:50 2013 New Revision: 336741 URL: http://svnweb.freebsd.org/changeset/ports/336741 Log: - Updated MAINTAINER email address Submitted by: Bartek Rutkowski (via email) Modified: head/sysutils/rubygem-hiera/Makefile Modified: head/sysutils/rubygem-hiera/Makefile ============================================================================== --- head/sysutils/rubygem-hiera/Makefile Tue Dec 17 16:28:39 2013 (r336740) +++ head/sysutils/rubygem-hiera/Makefile Tue Dec 17 16:28:50 2013 (r336741) @@ -6,7 +6,7 @@ PORTVERSION= 1.3.0 CATEGORIES= sysutils rubygems MASTER_SITES= RG -MAINTAINER= r@robakdesign.com +MAINTAINER= ports@robakdesign.com COMMENT= A pluggable data store for hierarchical data RUN_DEPENDS= ${PKGNAMEPREFIX}json_pure>=0:${PORTSDIR}/devel/rubygem-json_pure From owner-svn-ports-head@FreeBSD.ORG Tue Dec 17 16:50:19 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id A3B2015C; Tue, 17 Dec 2013 16:50:19 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 8DB2B1699; Tue, 17 Dec 2013 16:50:19 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBHGoJtE052343; Tue, 17 Dec 2013 16:50:19 GMT (envelope-from dinoex@svn.freebsd.org) Received: (from dinoex@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBHGoJFQ052340; Tue, 17 Dec 2013 16:50:19 GMT (envelope-from dinoex@svn.freebsd.org) Message-Id: <201312171650.rBHGoJFQ052340@svn.freebsd.org> From: Dirk Meyer Date: Tue, 17 Dec 2013 16:50:19 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r336743 - in head/graphics/netpbm: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 17 Dec 2013 16:50:19 -0000 Author: dinoex Date: Tue Dec 17 16:50:18 2013 New Revision: 336743 URL: http://svnweb.freebsd.org/changeset/ports/336743 Log: - use STAGEDIR - update LIB_DEPENDS Modified: head/graphics/netpbm/Makefile head/graphics/netpbm/files/Makefile.config.FreeBSD head/graphics/netpbm/pkg-plist Modified: head/graphics/netpbm/Makefile ============================================================================== --- head/graphics/netpbm/Makefile Tue Dec 17 16:44:02 2013 (r336742) +++ head/graphics/netpbm/Makefile Tue Dec 17 16:50:18 2013 (r336743) @@ -12,16 +12,14 @@ EXTRACT_SUFX= .tgz MAINTAINER= dinoex@FreeBSD.org COMMENT= Toolkit for conversion of images between different formats -LIB_DEPENDS= tiff:${PORTSDIR}/graphics/tiff \ - jpeg:${PORTSDIR}/graphics/jpeg \ - png15:${PORTSDIR}/graphics/png \ - jbig:${PORTSDIR}/graphics/jbigkit \ - jasper:${PORTSDIR}/graphics/jasper \ - xml2:${PORTSDIR}/textproc/libxml2 +LIB_DEPENDS= libtiff.so:${PORTSDIR}/graphics/tiff \ + libjpeg.so:${PORTSDIR}/graphics/jpeg \ + libpng15.so:${PORTSDIR}/graphics/png \ + libjbig.so:${PORTSDIR}/graphics/jbigkit \ + libjasper.so:${PORTSDIR}/graphics/jasper \ + libxml2.so:${PORTSDIR}/textproc/libxml2 RUN_DEPENDS= bash:${PORTSDIR}/shells/bash -NO_STAGE= yes - USES= gmake perl5 CFLAGS+= -DPNG_DEPSTRUCT= -Iutil MAKE_ENV= LN="${LN}" RANLIB="${RANLIB}" @@ -30,24 +28,20 @@ MAKEFILE2= Makefile INSTALL_TARGET= install.bin install.lib install.data install-dev USE_LDCONFIG= yes -MAN1= netpbm.1 - OPTIONS_DEFINE= X11 MANPAGES +OPTIONS_SUB= yes -.include +X11_USE= xorg=x11 +X11_MAKE_ENV= WITH_X11=yes -.if ${PORT_OPTIONS:MX11} -USE_XORG= x11 -MAKE_ENV+= WITH_X11="${WITH_X11}" -PLIST_SUB+= X11='' -.else -PLIST_SUB+= X11='@comment ' -.endif +.include .include .if ${PORT_OPTIONS:MMANPAGES} || make(makesum) || defined(FETCH_ALL) +#DISTFILES+= netpbm-manpages-2013-03-09${EXTRACT_SUFX}:man DISTFILES= ${DISTNAME}${EXTRACT_SUFX} netpbm-manpages-2013-03-09${EXTRACT_SUFX}:man + # lifted from ${WRKSRC}/buildtools/Makefile.manpage HMAN1+= 411toppm.1 anytopnm.1 asciitopgm.1 atktopbm.1 bioradtopgm.1 \ bmptopnm.1 bmptoppm.1 brushtopbm.1 cmuwmtopbm.1 ddbugtopbm.1 \ @@ -108,27 +102,26 @@ HMAN1+= pamx.1 HMAN3= libnetpbm.3 libnetpbm_image.3 libnetpbm_ug.3 libpbm.3 \ libpgm.3 libpm.3 libpnm.3 libppm.3 libsystem.3 libtmpfile.3 HMAN5= extendedopacity.5 pam.5 pbm.5 pgm.5 pnm.5 ppm.5 -MAN1+= ${HMAN1} -MAN3+= ${HMAN3} -MAN5+= ${HMAN5} .endif pre-configure: - @${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g' \ + ${REINPLACE_CMD} -e 's|doc/USERDOC|${DOCSDIR}/USERDOC|g' \ + ${WRKSRC}/doc/netpbm.1 + ${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g' \ -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \ ${WRKSRC}/pm_config.in.h - @${REINPLACE_CMD} -e 's|^SCRIPTS =.*|SCRIPTS =|' ${WRKSRC}/GNUmakefile - @${REINPLACE_CMD} -e 's|||g' ${WRKSRC}/lib/pm.h - @${REINPLACE_CMD} -e 's| jpeg2000||g' \ + ${REINPLACE_CMD} -e 's|^SCRIPTS =.*|SCRIPTS =|' ${WRKSRC}/GNUmakefile + ${REINPLACE_CMD} -e 's|||g' ${WRKSRC}/lib/pm.h + ${REINPLACE_CMD} -e 's| jpeg2000||g' \ ${WRKSRC}/converter/other/Makefile - @${CP} ${PATCHDIR}/Makefile.config.FreeBSD ${WRKSRC}/Makefile.config - @${LN} -sf ${WRKSRC}/lib/util/shhopt.h ${WRKSRC}/lib/util/pm_shhopt.h - @${LN} -sf ${WRKSRC}/lib/util/nstring.h ${WRKSRC}/lib/util/pm_nstring.h + ${CP} ${PATCHDIR}/Makefile.config.FreeBSD ${WRKSRC}/Makefile.config + ${LN} -sf ${WRKSRC}/lib/util/shhopt.h ${WRKSRC}/lib/util/pm_shhopt.h + ${LN} -sf ${WRKSRC}/lib/util/nstring.h ${WRKSRC}/lib/util/pm_nstring.h cd ${WRKSRC} && buildtools/stamp-date > ${WRKSRC}/lib/compile.h # This snippet is all it takes to make the port as of 10.35.80 MAKE_JOBS_SAFE: pre-build: - @(cd ${BUILD_WRKSRC}/lib/util; if ! ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} ${MAKEFILE2} ${_MAKE_JOBS} ${MAKE_ARGS} ${ALL_TARGET}; then \ + (cd ${BUILD_WRKSRC}/lib/util; if ! ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} ${MAKEFILE2} ${_MAKE_JOBS} ${MAKE_ARGS} ${ALL_TARGET}; then \ if [ x != x${BUILD_FAIL_MESSAGE} ] ; then \ ${ECHO_MSG} "===> Compilation failed unexpectedly."; \ (${ECHO_CMD} ${BUILD_FAIL_MESSAGE}) | ${FMT} 75 79 ; \ @@ -137,19 +130,16 @@ pre-build: fi) post-install: - @${INSTALL_DATA} ${WRKSRC}/lib/util/pm_c_util.h ${PREFIX}/include/ - @${ECHO_MSG} "===> Installing man pages..." - @${REINPLACE_CMD} -e 's|doc/USERDOC|${DOCSDIR}/USERDOC|g' \ - ${WRKSRC}/doc/netpbm.1 - ${INSTALL_MAN} ${WRKSRC}/doc/netpbm.1 ${MANPREFIX}/man/man1/ + ${INSTALL_DATA} ${WRKSRC}/lib/util/pm_c_util.h ${STAGEDIR}${PREFIX}/include/ + ${INSTALL_MAN} ${WRKSRC}/doc/netpbm.1 ${STAGEDIR}${MANPREFIX}/man/man1/ .if ${PORT_OPTIONS:MMANPAGES} - (cd ${WRKDIR}/doc && ${INSTALL_MAN} ${HMAN1} ${MANPREFIX}/man/man1/) - (cd ${WRKDIR}/doc && ${INSTALL_MAN} ${HMAN3} ${MANPREFIX}/man/man3/) - (cd ${WRKDIR}/doc && ${INSTALL_MAN} ${HMAN5} ${MANPREFIX}/man/man5/) + cd ${WRKDIR}/doc && ${INSTALL_MAN} ${HMAN1} ${STAGEDIR}${MANPREFIX}/man/man1/ + cd ${WRKDIR}/doc && ${INSTALL_MAN} ${HMAN3} ${STAGEDIR}${MANPREFIX}/man/man3/ + cd ${WRKDIR}/doc && ${INSTALL_MAN} ${HMAN5} ${STAGEDIR}${MANPREFIX}/man/man5/ .endif .if ${PORT_OPTIONS:MDOCS} - ${MKDIR} ${DOCSDIR} - ${INSTALL_DATA} ${WRKSRC}/doc/USERDOC ${DOCSDIR}/ + ${MKDIR} ${STAGEDIR}${DOCSDIR} + ${INSTALL_DATA} ${WRKSRC}/doc/USERDOC ${STAGEDIR}${DOCSDIR}/ .endif .include Modified: head/graphics/netpbm/files/Makefile.config.FreeBSD ============================================================================== --- head/graphics/netpbm/files/Makefile.config.FreeBSD Tue Dec 17 16:44:02 2013 (r336742) +++ head/graphics/netpbm/files/Makefile.config.FreeBSD Tue Dec 17 16:50:18 2013 (r336743) @@ -94,7 +94,7 @@ VMS = DONT_HAVE_PROCESS_MGMT = N -PKGDIR_DEFAULT = ${PREFIX} +PKGDIR_DEFAULT = ${DESTDIR}${PREFIX} PKGMANDIR = man Modified: head/graphics/netpbm/pkg-plist ============================================================================== --- head/graphics/netpbm/pkg-plist Tue Dec 17 16:44:02 2013 (r336742) +++ head/graphics/netpbm/pkg-plist Tue Dec 17 16:50:18 2013 (r336743) @@ -339,6 +339,316 @@ include/ppmfloyd.h lib/libnetpbm.a lib/libnetpbm.so lib/libnetpbm.so.1 +%%MANPAGES%%man/man1/411toppm.1.gz +%%MANPAGES%%man/man1/anytopnm.1.gz +%%MANPAGES%%man/man1/asciitopgm.1.gz +%%MANPAGES%%man/man1/atktopbm.1.gz +%%MANPAGES%%man/man1/bioradtopgm.1.gz +%%MANPAGES%%man/man1/bmptopnm.1.gz +%%MANPAGES%%man/man1/bmptoppm.1.gz +%%MANPAGES%%man/man1/brushtopbm.1.gz +%%MANPAGES%%man/man1/cmuwmtopbm.1.gz +%%MANPAGES%%man/man1/ddbugtopbm.1.gz +%%MANPAGES%%man/man1/escp2topbm.1.gz +%%MANPAGES%%man/man1/eyuvtoppm.1.gz +%%MANPAGES%%man/man1/fiascotopnm.1.gz +%%MANPAGES%%man/man1/fitstopnm.1.gz +%%MANPAGES%%man/man1/fstopgm.1.gz +%%MANPAGES%%man/man1/g3topbm.1.gz +%%MANPAGES%%man/man1/gemtopbm.1.gz +%%MANPAGES%%man/man1/gemtopnm.1.gz +%%MANPAGES%%man/man1/giftopnm.1.gz +%%MANPAGES%%man/man1/gouldtoppm.1.gz +%%MANPAGES%%man/man1/hdifftopam.1.gz +%%MANPAGES%%man/man1/hipstopgm.1.gz +%%MANPAGES%%man/man1/hpcdtoppm.1.gz +%%MANPAGES%%man/man1/icontopbm.1.gz +%%MANPAGES%%man/man1/ilbmtoppm.1.gz +%%MANPAGES%%man/man1/imgtoppm.1.gz +%%MANPAGES%%man/man1/infotopam.1.gz +%%MANPAGES%%man/man1/jbigtopnm.1.gz +%%MANPAGES%%man/man1/jpeg2ktopam.1.gz +%%MANPAGES%%man/man1/jpegtopnm.1.gz +%%MANPAGES%%man/man1/leaftoppm.1.gz +%%MANPAGES%%man/man1/lispmtopgm.1.gz +%%MANPAGES%%man/man1/macptopbm.1.gz +%%MANPAGES%%man/man1/mdatopbm.1.gz +%%MANPAGES%%man/man1/mgrtopbm.1.gz +%%MANPAGES%%man/man1/mrf.1.gz +%%MANPAGES%%man/man1/mrftopbm.1.gz +%%MANPAGES%%man/man1/mtvtoppm.1.gz +%%MANPAGES%%man/man1/neotoppm.1.gz +man/man1/netpbm.1.gz +%%MANPAGES%%man/man1/palmtopnm.1.gz +%%MANPAGES%%man/man1/pamarith.1.gz +%%MANPAGES%%man/man1/pamchannel.1.gz +%%MANPAGES%%man/man1/pamcomp.1.gz +%%MANPAGES%%man/man1/pamcut.1.gz +%%MANPAGES%%man/man1/pamdeinterlace.1.gz +%%MANPAGES%%man/man1/pamdice.1.gz +%%MANPAGES%%man/man1/pamditherbw.1.gz +%%MANPAGES%%man/man1/pamedge.1.gz +%%MANPAGES%%man/man1/pamendian.1.gz +%%MANPAGES%%man/man1/pamfile.1.gz +%%MANPAGES%%man/man1/pamflip.1.gz +%%MANPAGES%%man/man1/pamfunc.1.gz +%%MANPAGES%%man/man1/pamgauss.1.gz +%%MANPAGES%%man/man1/pamlookup.1.gz +%%MANPAGES%%man/man1/pamoil.1.gz +%%MANPAGES%%man/man1/pamperspective.1.gz +%%MANPAGES%%man/man1/pampop9.1.gz +%%MANPAGES%%man/man1/pamscale.1.gz +%%MANPAGES%%man/man1/pamseq.1.gz +%%MANPAGES%%man/man1/pamsharpmap.1.gz +%%MANPAGES%%man/man1/pamsharpness.1.gz +%%MANPAGES%%man/man1/pamslice.1.gz +%%MANPAGES%%man/man1/pamstack.1.gz +%%MANPAGES%%man/man1/pamstereogram.1.gz +%%MANPAGES%%man/man1/pamstretch-gen.1.gz +%%MANPAGES%%man/man1/pamstretch.1.gz +%%MANPAGES%%man/man1/pamsummcol.1.gz +%%MANPAGES%%man/man1/pamsumm.1.gz +%%MANPAGES%%man/man1/pamtodjvurle.1.gz +%%MANPAGES%%man/man1/pamtohdiff.1.gz +%%MANPAGES%%man/man1/pamtohtmltbl.1.gz +%%MANPAGES%%man/man1/pamtojpeg2k.1.gz +%%MANPAGES%%man/man1/pamtopfm.1.gz +%%MANPAGES%%man/man1/pamtopnm.1.gz +%%MANPAGES%%man/man1/pamtotga.1.gz +%%MANPAGES%%man/man1/pamtouil.1.gz +%%MANPAGES%%%%X11%%man/man1/pamx.1.gz +%%MANPAGES%%man/man1/pbmclean.1.gz +%%MANPAGES%%man/man1/pbmlife.1.gz +%%MANPAGES%%man/man1/pbmmake.1.gz +%%MANPAGES%%man/man1/pbmmask.1.gz +%%MANPAGES%%man/man1/pbmpage.1.gz +%%MANPAGES%%man/man1/pbmpscale.1.gz +%%MANPAGES%%man/man1/pbmreduce.1.gz +%%MANPAGES%%man/man1/pbmtext.1.gz +%%MANPAGES%%man/man1/pbmtextps.1.gz +%%MANPAGES%%man/man1/pbmto10x.1.gz +%%MANPAGES%%man/man1/pbmto4425.1.gz +%%MANPAGES%%man/man1/pbmtoascii.1.gz +%%MANPAGES%%man/man1/pbmtoatk.1.gz +%%MANPAGES%%man/man1/pbmtobbnbg.1.gz +%%MANPAGES%%man/man1/pbmtocmuwm.1.gz +%%MANPAGES%%man/man1/pbmtodjvurle.1.gz +%%MANPAGES%%man/man1/pbmtoepsi.1.gz +%%MANPAGES%%man/man1/pbmtoepson.1.gz +%%MANPAGES%%man/man1/pbmtoescp2.1.gz +%%MANPAGES%%man/man1/pbmtog3.1.gz +%%MANPAGES%%man/man1/pbmtogem.1.gz +%%MANPAGES%%man/man1/pbmtogo.1.gz +%%MANPAGES%%man/man1/pbmtoicon.1.gz +%%MANPAGES%%man/man1/pbmtolj.1.gz +%%MANPAGES%%man/man1/pbmtoln03.1.gz +%%MANPAGES%%man/man1/pbmtolps.1.gz +%%MANPAGES%%man/man1/pbmtomacp.1.gz +%%MANPAGES%%man/man1/pbmtomda.1.gz +%%MANPAGES%%man/man1/pbmtomgr.1.gz +%%MANPAGES%%man/man1/pbmtomrf.1.gz +%%MANPAGES%%man/man1/pbmtonokia.1.gz +%%MANPAGES%%man/man1/pbmtopgm.1.gz +%%MANPAGES%%man/man1/pbmtopi3.1.gz +%%MANPAGES%%man/man1/pbmtopk.1.gz +%%MANPAGES%%man/man1/pbmtoplot.1.gz +%%MANPAGES%%man/man1/pbmtoppa.1.gz +%%MANPAGES%%man/man1/pbmtopsg3.1.gz +%%MANPAGES%%man/man1/pbmtoptx.1.gz +%%MANPAGES%%man/man1/pbmtowbmp.1.gz +%%MANPAGES%%man/man1/pbmtox10bm.1.gz +%%MANPAGES%%man/man1/pbmtoxbm.1.gz +%%MANPAGES%%man/man1/pbmtoybm.1.gz +%%MANPAGES%%man/man1/pbmtozinc.1.gz +%%MANPAGES%%man/man1/pbmupc.1.gz +%%MANPAGES%%man/man1/pc1toppm.1.gz +%%MANPAGES%%man/man1/pcdovtoppm.1.gz +%%MANPAGES%%man/man1/pcxtoppm.1.gz +%%MANPAGES%%man/man1/pfmtopam.1.gz +%%MANPAGES%%man/man1/pgmabel.1.gz +%%MANPAGES%%man/man1/pgmbentley.1.gz +%%MANPAGES%%man/man1/pgmcrater.1.gz +%%MANPAGES%%man/man1/pgmedge.1.gz +%%MANPAGES%%man/man1/pgmenhance.1.gz +%%MANPAGES%%man/man1/pgmhist.1.gz +%%MANPAGES%%man/man1/pgmkernel.1.gz +%%MANPAGES%%man/man1/pgmminkowski.1.gz +%%MANPAGES%%man/man1/pgmmorphconv.1.gz +%%MANPAGES%%man/man1/pgmnoise.1.gz +%%MANPAGES%%man/man1/pgmnorm.1.gz +%%MANPAGES%%man/man1/pgmoil.1.gz +%%MANPAGES%%man/man1/pgmramp.1.gz +%%MANPAGES%%man/man1/pgmslice.1.gz +%%MANPAGES%%man/man1/pgmtexture.1.gz +%%MANPAGES%%man/man1/pgmtofs.1.gz +%%MANPAGES%%man/man1/pgmtolispm.1.gz +%%MANPAGES%%man/man1/pgmtopbm.1.gz +%%MANPAGES%%man/man1/pgmtopgm.1.gz +%%MANPAGES%%man/man1/pgmtoppm.1.gz +%%MANPAGES%%man/man1/pi1toppm.1.gz +%%MANPAGES%%man/man1/pi3topbm.1.gz +%%MANPAGES%%man/man1/picttoppm.1.gz +%%MANPAGES%%man/man1/pjtoppm.1.gz +%%MANPAGES%%man/man1/pktopbm.1.gz +%%MANPAGES%%man/man1/pngtopnm.1.gz +%%MANPAGES%%man/man1/pnmalias.1.gz +%%MANPAGES%%man/man1/pnmarith.1.gz +%%MANPAGES%%man/man1/pnmcat.1.gz +%%MANPAGES%%man/man1/pnmcolormap.1.gz +%%MANPAGES%%man/man1/pnmcomp.1.gz +%%MANPAGES%%man/man1/pnmconvol.1.gz +%%MANPAGES%%man/man1/pnmcrop.1.gz +%%MANPAGES%%man/man1/pnmcut.1.gz +%%MANPAGES%%man/man1/pnmdepth.1.gz +%%MANPAGES%%man/man1/pnmfile.1.gz +%%MANPAGES%%man/man1/pnmgamma.1.gz +%%MANPAGES%%man/man1/pnmhisteq.1.gz +%%MANPAGES%%man/man1/pnmhistmap.1.gz +%%MANPAGES%%man/man1/pnmindex.1.gz +%%MANPAGES%%man/man1/pnminterp.1.gz +%%MANPAGES%%man/man1/pnminvert.1.gz +%%MANPAGES%%man/man1/pnmmargin.1.gz +%%MANPAGES%%man/man1/pnmmontage.1.gz +%%MANPAGES%%man/man1/pnmnlfilt.1.gz +%%MANPAGES%%man/man1/pnmnoraw.1.gz +%%MANPAGES%%man/man1/pnmnorm.1.gz +%%MANPAGES%%man/man1/pnmpad.1.gz +%%MANPAGES%%man/man1/pnmpaste.1.gz +%%MANPAGES%%man/man1/pnmpsnr.1.gz +%%MANPAGES%%man/man1/pnmquant.1.gz +%%MANPAGES%%man/man1/pnmremap.1.gz +%%MANPAGES%%man/man1/pnmrotate.1.gz +%%MANPAGES%%man/man1/pnmscalefixed.1.gz +%%MANPAGES%%man/man1/pnmscale.1.gz +%%MANPAGES%%man/man1/pnmshear.1.gz +%%MANPAGES%%man/man1/pnmsmooth.1.gz +%%MANPAGES%%man/man1/pnmsplit.1.gz +%%MANPAGES%%man/man1/pnmstitch.1.gz +%%MANPAGES%%man/man1/pnmtile.1.gz +%%MANPAGES%%man/man1/pnmtoddif.1.gz +%%MANPAGES%%man/man1/pnmtofiasco.1.gz +%%MANPAGES%%man/man1/pnmtofits.1.gz +%%MANPAGES%%man/man1/pnmtojbig.1.gz +%%MANPAGES%%man/man1/pnmtojpeg.1.gz +%%MANPAGES%%man/man1/pnmtopalm.1.gz +%%MANPAGES%%man/man1/pnmtopclxl.1.gz +%%MANPAGES%%man/man1/pnmtoplainpnm.1.gz +%%MANPAGES%%man/man1/pnmtopng.1.gz +%%MANPAGES%%man/man1/pnmtopnm.1.gz +%%MANPAGES%%man/man1/pnmtops.1.gz +%%MANPAGES%%man/man1/pnmtorast.1.gz +%%MANPAGES%%man/man1/pnmtorle.1.gz +%%MANPAGES%%man/man1/pnmtosgi.1.gz +%%MANPAGES%%man/man1/pnmtosir.1.gz +%%MANPAGES%%man/man1/pnmtotiffcmyk.1.gz +%%MANPAGES%%man/man1/pnmtotiff.1.gz +%%MANPAGES%%man/man1/pnmtoxwd.1.gz +%%MANPAGES%%man/man1/ppm3d.1.gz +%%MANPAGES%%man/man1/ppmbrighten.1.gz +%%MANPAGES%%man/man1/ppmchange.1.gz +%%MANPAGES%%man/man1/ppmcie.1.gz +%%MANPAGES%%man/man1/ppmcolormask.1.gz +%%MANPAGES%%man/man1/ppmdim.1.gz +%%MANPAGES%%man/man1/ppmdist.1.gz +%%MANPAGES%%man/man1/ppmdither.1.gz +%%MANPAGES%%man/man1/ppmfade.1.gz +%%MANPAGES%%man/man1/ppmflash.1.gz +%%MANPAGES%%man/man1/ppmforge.1.gz +%%MANPAGES%%man/man1/ppmglobe.1.gz +%%MANPAGES%%man/man1/ppmhist.1.gz +%%MANPAGES%%man/man1/ppmlabel.1.gz +%%MANPAGES%%man/man1/ppmmake.1.gz +%%MANPAGES%%man/man1/ppmmix.1.gz +%%MANPAGES%%man/man1/ppmnorm.1.gz +%%MANPAGES%%man/man1/ppmntsc.1.gz +%%MANPAGES%%man/man1/ppmpat.1.gz +%%MANPAGES%%man/man1/ppmquantall.1.gz +%%MANPAGES%%man/man1/ppmquant.1.gz +%%MANPAGES%%man/man1/ppmrainbow.1.gz +%%MANPAGES%%man/man1/ppmrelief.1.gz +%%MANPAGES%%man/man1/ppmrough.1.gz +%%MANPAGES%%man/man1/ppmshadow.1.gz +%%MANPAGES%%man/man1/ppmshift.1.gz +%%MANPAGES%%man/man1/ppmspread.1.gz +%%MANPAGES%%man/man1/ppmsvgalib.1.gz +%%MANPAGES%%man/man1/ppmtoacad.1.gz +%%MANPAGES%%man/man1/ppmtoarbtxt.1.gz +%%MANPAGES%%man/man1/ppmtobmp.1.gz +%%MANPAGES%%man/man1/ppmtoeyuv.1.gz +%%MANPAGES%%man/man1/ppmtogif.1.gz +%%MANPAGES%%man/man1/ppmtoicr.1.gz +%%MANPAGES%%man/man1/ppmtoilbm.1.gz +%%MANPAGES%%man/man1/ppmtojpeg.1.gz +%%MANPAGES%%man/man1/ppmtoleaf.1.gz +%%MANPAGES%%man/man1/ppmtolj.1.gz +%%MANPAGES%%man/man1/ppmtomitsu.1.gz +%%MANPAGES%%man/man1/ppmtompeg.1.gz +%%MANPAGES%%man/man1/ppmtoneo.1.gz +%%MANPAGES%%man/man1/ppmtopcx.1.gz +%%MANPAGES%%man/man1/ppmtopgm.1.gz +%%MANPAGES%%man/man1/ppmtopi1.1.gz +%%MANPAGES%%man/man1/ppmtopict.1.gz +%%MANPAGES%%man/man1/ppmtopj.1.gz +%%MANPAGES%%man/man1/ppmtopjxl.1.gz +%%MANPAGES%%man/man1/ppmtoppm.1.gz +%%MANPAGES%%man/man1/ppmtopuzz.1.gz +%%MANPAGES%%man/man1/ppmtorgb3.1.gz +%%MANPAGES%%man/man1/ppmtosixel.1.gz +%%MANPAGES%%man/man1/ppmtoterm.1.gz +%%MANPAGES%%man/man1/ppmtotga.1.gz +%%MANPAGES%%man/man1/ppmtouil.1.gz +%%MANPAGES%%man/man1/ppmtowinicon.1.gz +%%MANPAGES%%man/man1/ppmtoxpm.1.gz +%%MANPAGES%%man/man1/ppmtoyuv.1.gz +%%MANPAGES%%man/man1/ppmtoyuvsplit.1.gz +%%MANPAGES%%man/man1/ppmtv.1.gz +%%MANPAGES%%man/man1/ppmwheel.1.gz +%%MANPAGES%%man/man1/psidtopgm.1.gz +%%MANPAGES%%man/man1/pstopnm.1.gz +%%MANPAGES%%man/man1/qrttoppm.1.gz +%%MANPAGES%%man/man1/rasttopnm.1.gz +%%MANPAGES%%man/man1/rawtopgm.1.gz +%%MANPAGES%%man/man1/rawtoppm.1.gz +%%MANPAGES%%man/man1/rgb3toppm.1.gz +%%MANPAGES%%man/man1/rletopnm.1.gz +%%MANPAGES%%man/man1/sbigtopgm.1.gz +%%MANPAGES%%man/man1/sgitopnm.1.gz +%%MANPAGES%%man/man1/sirtopnm.1.gz +%%MANPAGES%%man/man1/sldtoppm.1.gz +%%MANPAGES%%man/man1/spctoppm.1.gz +%%MANPAGES%%man/man1/spottopgm.1.gz +%%MANPAGES%%man/man1/sputoppm.1.gz +%%MANPAGES%%man/man1/tgatoppm.1.gz +%%MANPAGES%%man/man1/thinkjettopbm.1.gz +%%MANPAGES%%man/man1/tifftopnm.1.gz +%%MANPAGES%%man/man1/vidtoppm.1.gz +%%MANPAGES%%man/man1/wbmptopbm.1.gz +%%MANPAGES%%man/man1/winicontoppm.1.gz +%%MANPAGES%%man/man1/xbmtopbm.1.gz +%%MANPAGES%%man/man1/ximtoppm.1.gz +%%MANPAGES%%man/man1/xpmtoppm.1.gz +%%MANPAGES%%man/man1/xvminitoppm.1.gz +%%MANPAGES%%man/man1/xwdtopnm.1.gz +%%MANPAGES%%man/man1/ybmtopbm.1.gz +%%MANPAGES%%man/man1/yuvsplittoppm.1.gz +%%MANPAGES%%man/man1/yuvtoppm.1.gz +%%MANPAGES%%man/man1/zeisstopnm.1.gz +%%MANPAGES%%man/man3/libnetpbm.3.gz +%%MANPAGES%%man/man3/libnetpbm_image.3.gz +%%MANPAGES%%man/man3/libnetpbm_ug.3.gz +%%MANPAGES%%man/man3/libpbm.3.gz +%%MANPAGES%%man/man3/libpgm.3.gz +%%MANPAGES%%man/man3/libpm.3.gz +%%MANPAGES%%man/man3/libpnm.3.gz +%%MANPAGES%%man/man3/libppm.3.gz +%%MANPAGES%%man/man3/libsystem.3.gz +%%MANPAGES%%man/man3/libtmpfile.3.gz +%%MANPAGES%%man/man5/extendedopacity.5.gz +%%MANPAGES%%man/man5/pam.5.gz +%%MANPAGES%%man/man5/pbm.5.gz +%%MANPAGES%%man/man5/pgm.5.gz +%%MANPAGES%%man/man5/pnm.5.gz +%%MANPAGES%%man/man5/ppm.5.gz %%DATADIR%%/palmcolor8.map %%DATADIR%%/palmgray1.map %%DATADIR%%/palmgray2.map From owner-svn-ports-head@FreeBSD.ORG Tue Dec 17 17:50:18 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 75BB471B; Tue, 17 Dec 2013 17:50:18 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 61D811AEC; Tue, 17 Dec 2013 17:50:18 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBHHoINr074134; Tue, 17 Dec 2013 17:50:18 GMT (envelope-from nemysis@svn.freebsd.org) Received: (from nemysis@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBHHoIq0074131; Tue, 17 Dec 2013 17:50:18 GMT (envelope-from nemysis@svn.freebsd.org) Message-Id: <201312171750.rBHHoIq0074131@svn.freebsd.org> From: Rusmir Dusko Date: Tue, 17 Dec 2013 17:50:18 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r336745 - in head/games/iceicepenguin: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 17 Dec 2013 17:50:18 -0000 Author: nemysis Date: Tue Dec 17 17:50:17 2013 New Revision: 336745 URL: http://svnweb.freebsd.org/changeset/ports/336745 Log: - Change desktop entry - Fix the usage of 'python' to get rid of the implicit lang/python dependency - Change iceicepenguin.in Approved by: pawel / wg (mentors, implicit) Modified: head/games/iceicepenguin/Makefile head/games/iceicepenguin/files/iceicepenguin.in Modified: head/games/iceicepenguin/Makefile ============================================================================== --- head/games/iceicepenguin/Makefile Tue Dec 17 17:42:52 2013 (r336744) +++ head/games/iceicepenguin/Makefile Tue Dec 17 17:50:17 2013 (r336745) @@ -31,10 +31,12 @@ ICON_SIZES= 32x32 48x48 64x64 72x72 96x9 SUB_FILES= ${PORTNAME} -DESKTOP_ENTRIES="Ice Ice Penguin" "${COMMENT}" "${PORTNAME}" \ - "${PORTNAME}" "Game;ArcadeGame;" false +DESKTOP_ENTRIES="Ice Ice Penguin" "" "${PORTNAME}" \ + "${PORTNAME}" "Game;ArcadeGame;" "" do-install: + @${REINPLACE_CMD} -e 's|%%PYTHON_CMD%%|${PYTHON_CMD}|' \ + ${WRKDIR}/${PORTNAME} ${INSTALL_SCRIPT} ${WRKDIR}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin/ .for d in fonts gfx lvls menu sfx Modified: head/games/iceicepenguin/files/iceicepenguin.in ============================================================================== --- head/games/iceicepenguin/files/iceicepenguin.in Tue Dec 17 17:42:52 2013 (r336744) +++ head/games/iceicepenguin/files/iceicepenguin.in Tue Dec 17 17:50:17 2013 (r336745) @@ -4,4 +4,4 @@ # cd "%%DATADIR%%" -exec /usr/bin/env python ./iceicepengui.py "${@}" +exec %%PYTHON_CMD%% ./iceicepengui.py "${@}" From owner-svn-ports-head@FreeBSD.ORG Tue Dec 17 17:51:03 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 7A688800; Tue, 17 Dec 2013 17:51:03 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 66A981B39; Tue, 17 Dec 2013 17:51:03 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBHHp3dm076286; Tue, 17 Dec 2013 17:51:03 GMT (envelope-from danilo@svn.freebsd.org) Received: (from danilo@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBHHp3GQ076282; Tue, 17 Dec 2013 17:51:03 GMT (envelope-from danilo@svn.freebsd.org) Message-Id: <201312171751.rBHHp3GQ076282@svn.freebsd.org> From: Danilo Egea Gondolfo Date: Tue, 17 Dec 2013 17:51:03 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r336746 - head/devel/tortoisehg2 X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 17 Dec 2013 17:51:03 -0000 Author: danilo Date: Tue Dec 17 17:51:02 2013 New Revision: 336746 URL: http://svnweb.freebsd.org/changeset/ports/336746 Log: - Update from 2.10 to 2.10.1 [1] - Add LICENSE PR: ports/184929 Submitted by: arrowdodger <6yearold@gmail.com> (maintainer) [1] Modified: head/devel/tortoisehg2/Makefile head/devel/tortoisehg2/distinfo Modified: head/devel/tortoisehg2/Makefile ============================================================================== --- head/devel/tortoisehg2/Makefile Tue Dec 17 17:50:17 2013 (r336745) +++ head/devel/tortoisehg2/Makefile Tue Dec 17 17:51:02 2013 (r336746) @@ -1,13 +1,15 @@ # $FreeBSD$ PORTNAME= tortoisehg -PORTVERSION= 2.10 +PORTVERSION= 2.10.1 CATEGORIES= devel MASTER_SITES= http://cdn.bitbucket.org/tortoisehg/targz/downloads/ MAINTAINER= 6yearold@gmail.com COMMENT= THg script from TortoiseHG +LICENSE= GPLv2 + BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}qt4-core>=4.10.2:${PORTSDIR}/devel/py-qt4-core \ ${PYTHON_PKGNAMEPREFIX}qt4-qscintilla2>=2.7.2:${PORTSDIR}/devel/py-qt4-qscintilla2 \ ${PYTHON_PKGNAMEPREFIX}qt4-network>=4.10.2:${PORTSDIR}/net/py-qt4-network \ Modified: head/devel/tortoisehg2/distinfo ============================================================================== --- head/devel/tortoisehg2/distinfo Tue Dec 17 17:50:17 2013 (r336745) +++ head/devel/tortoisehg2/distinfo Tue Dec 17 17:51:02 2013 (r336746) @@ -1,2 +1,2 @@ -SHA256 (tortoisehg-2.10.tar.gz) = d7023304d3a6c21e22fcc199b2b626ee11e7b7f89ec46e73e8afa24cd7fb546f -SIZE (tortoisehg-2.10.tar.gz) = 9618287 +SHA256 (tortoisehg-2.10.1.tar.gz) = 5c42af380ad1d00ce04e7b764eb1797a725451598627b3e8cc2dde9f359feb39 +SIZE (tortoisehg-2.10.1.tar.gz) = 8617287 From owner-svn-ports-head@FreeBSD.ORG Tue Dec 17 17:54:55 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id BFE4C941; Tue, 17 Dec 2013 17:54:55 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 91EB21B7C; Tue, 17 Dec 2013 17:54:55 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBHHst8t076720; Tue, 17 Dec 2013 17:54:55 GMT (envelope-from danilo@svn.freebsd.org) Received: (from danilo@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBHHstGb076718; Tue, 17 Dec 2013 17:54:55 GMT (envelope-from danilo@svn.freebsd.org) Message-Id: <201312171754.rBHHstGb076718@svn.freebsd.org> From: Danilo Egea Gondolfo Date: Tue, 17 Dec 2013 17:54:55 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r336747 - head/multimedia/gst123 X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 17 Dec 2013 17:54:55 -0000 Author: danilo Date: Tue Dec 17 17:54:54 2013 New Revision: 336747 URL: http://svnweb.freebsd.org/changeset/ports/336747 Log: - Update from 0.3.2 to 0.3.3 [1] - Remove the indefinite article from COMMENT - Add stage support PR: ports/184932 Submitted by: Herbert J. Skuhra (maintainer) [1] Modified: head/multimedia/gst123/Makefile head/multimedia/gst123/distinfo Modified: head/multimedia/gst123/Makefile ============================================================================== --- head/multimedia/gst123/Makefile Tue Dec 17 17:51:02 2013 (r336746) +++ head/multimedia/gst123/Makefile Tue Dec 17 17:54:54 2013 (r336747) @@ -2,12 +2,12 @@ # $FreeBSD$ PORTNAME= gst123 -PORTVERSION= 0.3.2 +PORTVERSION= 0.3.3 CATEGORIES= multimedia MASTER_SITES= http://space.twc.de/~stefan/gst123/ MAINTAINER= h.skuhra@gmail.com -COMMENT= A command-line tool to play audio and video files +COMMENT= Command-line tool to play audio and video files LICENSE= LGPL20 @@ -16,16 +16,14 @@ USES= gmake pkgconfig USE_BZIP2= yes USE_GNOME= gtk20 CONFIGURE_ENV= NCURSES5_CONFIG=/usr/bin/true -LDFLAGS+= -lncurses +LDFLAGS+= -lncurses -L${LOCALBASE}/lib -PLIST_FILES= bin/${PORTNAME} -MAN1= ${PORTNAME}.1 +PLIST_FILES= bin/${PORTNAME} man/man1/${PORTNAME}.1.gz OPTIONS_DEFINE= GSTREAMER1 GSTREAMER1_DESC= Multimedia support via GStreamer 1.0 (instead of 0.10) -NO_STAGE= yes .include .if ${PORT_OPTIONS:MGSTREAMER1} || exists(${LOCALBASE}/libdata/pkgconfig/gstreamer-1.0.pc) @@ -35,7 +33,7 @@ USE_GSTREAMER= good .endif do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/src/${PORTNAME} ${PREFIX}/bin - ${INSTALL_MAN} ${WRKSRC}/docs/${MAN1} ${MANPREFIX}/man/man1 + ${INSTALL_PROGRAM} ${WRKSRC}/src/${PORTNAME} ${STAGEDIR}${PREFIX}/bin + ${INSTALL_MAN} ${WRKSRC}/docs/${PORTNAME}.1 ${STAGEDIR}${MANPREFIX}/man/man1 .include Modified: head/multimedia/gst123/distinfo ============================================================================== --- head/multimedia/gst123/distinfo Tue Dec 17 17:51:02 2013 (r336746) +++ head/multimedia/gst123/distinfo Tue Dec 17 17:54:54 2013 (r336747) @@ -1,2 +1,2 @@ -SHA256 (gst123-0.3.2.tar.bz2) = 51033261967da4cf1beb512e156e9f647572689202a1c2aceb8cd2beb427f53d -SIZE (gst123-0.3.2.tar.bz2) = 112709 +SHA256 (gst123-0.3.3.tar.bz2) = 45359410c99a622790dd2b6efdc2d1a94748da3763242d95da79c633b5dfbce9 +SIZE (gst123-0.3.3.tar.bz2) = 113344 From owner-svn-ports-head@FreeBSD.ORG Tue Dec 17 17:55:44 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 55102D1C; Tue, 17 Dec 2013 17:55:44 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 423C61C96; Tue, 17 Dec 2013 17:55:44 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBHHticJ076944; Tue, 17 Dec 2013 17:55:44 GMT (envelope-from mva@svn.freebsd.org) Received: (from mva@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBHHtiFk076943; Tue, 17 Dec 2013 17:55:44 GMT (envelope-from mva@svn.freebsd.org) Message-Id: <201312171755.rBHHtiFk076943@svn.freebsd.org> From: Marcus von Appen Date: Tue, 17 Dec 2013 17:55:44 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r336748 - head/devel/coccinelle X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 17 Dec 2013 17:55:44 -0000 Author: mva Date: Tue Dec 17 17:55:43 2013 New Revision: 336748 URL: http://svnweb.freebsd.org/changeset/ports/336748 Log: - Fix the usage of 'python' to get rid of the implicit lang/python dependency - Fix the PCRE detection, while here Reported by: exp-run (PR 184591) Approved by: portmgr (blanket) Modified: head/devel/coccinelle/Makefile Modified: head/devel/coccinelle/Makefile ============================================================================== --- head/devel/coccinelle/Makefile Tue Dec 17 17:54:54 2013 (r336747) +++ head/devel/coccinelle/Makefile Tue Dec 17 17:55:43 2013 (r336748) @@ -12,7 +12,7 @@ COMMENT= Coccinelle is a program matchin LIB_DEPENDS= libpcre.so:${PORTSDIR}/devel/pcre -USES= shebangfix gmake perl5 +USES= shebangfix gmake perl5 pkgconfig:build GNU_CONFIGURE= yes USE_PERL5= build USE_PYTHON= 2.6+ @@ -20,6 +20,7 @@ USE_OCAML= 3.0+ bash_CMD= ${SH} SHEBANG_FILES= setup/echo.sh MAKE_ARGS+= PYTHON_VERSION=${PYTHON_VER} +CONFIGURE_ENV+= PYVER=${PYTHON_VER} PYTHON=${PYTHON_CMD} post-install: ${STRIP_CMD} ${STAGEDIR}${DATADIR}/dllpcre_stubs.so \ From owner-svn-ports-head@FreeBSD.ORG Tue Dec 17 18:02:28 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 1B898204 for ; Tue, 17 Dec 2013 18:02:28 +0000 (UTC) Received: from mail-qe0-x231.google.com (mail-qe0-x231.google.com [IPv6:2607:f8b0:400d:c02::231]) (using TLSv1 with cipher ECDHE-RSA-RC4-SHA (128/128 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id C18841D40 for ; Tue, 17 Dec 2013 18:02:27 +0000 (UTC) Received: by mail-qe0-f49.google.com with SMTP id w7so5452151qeb.36 for ; Tue, 17 Dec 2013 10:02:27 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=eitanadler.com; s=0xdeadbeef; h=mime-version:sender:in-reply-to:references:from:date:message-id :subject:to:cc:content-type; bh=o42i9WHaUZPxgJRFuZIVvN+KQrmDYDv54Qno9W1I//g=; b=HHf6Pvl1kfdhpjHQgZl3J5BO7HK/uho+WQnNZMLxQbUR0fspIWxuLlc5+x5xeuMIap 2Feeu2w7fkuMyUGvtDuXhSS4TUz0+8DTibbVvlmBGEAyp9YHBmMRb+QtPAAP25cNC3VN miFYPUqmpw9181KqkN014BesjLpbvrsTKb5ZQ= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:sender:in-reply-to:references:from :date:message-id:subject:to:cc:content-type; bh=o42i9WHaUZPxgJRFuZIVvN+KQrmDYDv54Qno9W1I//g=; b=U8nukMnH/EA7YrhAFzG7JLOHj3vg5jC0PbadHiKFExCQq9KTwfO6L+9e4xN7GHnqhz SX90SR8hIqdQ/Om4LO/UAo7UIvASTTq6SZIIcQe1/p2i8NF9kuUZqPMMeW4XwVTTTtg4 uLaHQaqUZNpKMeYKaL45IyJ2yK71Tkcqi4GDj4i5D9coDZbX93lMwPiOl6UuFBQg0Fg8 SaVDC5N24ggGCmfHr47MHMk33MMqS/t6i05bvhhp7y+Td3Ywes5v/sc8xcInUNr4Elvk Ooq7m/+IX8F6LrpqrzTOTBkhFNz+BJ00tK3PFzuTZHGR5sxAtmhRD9eLzFeeCrqtqWxf fzJQ== X-Gm-Message-State: ALoCoQlnFUNV8r+5zaR7WQPgtZ5UppRNSYd2hpdaIXWM6/TL7Xv+bdR1ORwXULmfjDfFfYZahxG+ X-Received: by 10.224.125.195 with SMTP id z3mr45966470qar.13.1387303346688; Tue, 17 Dec 2013 10:02:26 -0800 (PST) MIME-Version: 1.0 Sender: lists@eitanadler.com Received: by 10.96.86.42 with HTTP; Tue, 17 Dec 2013 10:01:55 -0800 (PST) In-Reply-To: <20131217151203.GK99753@ithaqua.etoilebsd.net> References: <201312171342.rBHDggNP084170@svn.freebsd.org> <52B06851.7030906@marino.st> <20131217151203.GK99753@ithaqua.etoilebsd.net> From: Eitan Adler Date: Tue, 17 Dec 2013 13:01:55 -0500 X-Google-Sender-Auth: s7RORduLNahaKBgMxU-hwBKEEuA Message-ID: Subject: Re: svn commit: r336723 - in head: . games games/blobwars games/blobwars/files To: Baptiste Daroussin Content-Type: text/plain; charset=UTF-8 Cc: "svn-ports-head@freebsd.org" , Rusmir Dusko , marino@freebsd.org, "svn-ports-all@freebsd.org" , "ports-committers@freebsd.org" X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 17 Dec 2013 18:02:28 -0000 On Tue, Dec 17, 2013 at 10:12 AM, Baptiste Daroussin wrote: > On Tue, Dec 17, 2013 at 04:05:53PM +0100, John Marino wrote: >> On 12/17/2013 14:42, Rusmir Dusko wrote: ... To join the bandwagon: +LICENSE= GPLv2 CCbyNCSA3 When I look at the license file I see only GPL, not CCbyNCSA3 Furthermore, if it is being redistributed under the CCbyNCSA3 then we also need NO_CDROM. +LICENSE_COMB= dual +LICENSE_NAME_CCbyNCSA3= Attribution-NonCommercial-ShareAlike 3.0 Unported +LICENSE_FILE= ${WRKSRC}/doc/license +LICENSE_TEXT_CCbyNCSA3=CC-BY 3.0 +LICENSE_PERMS_CCbyNCSA3=dist-mirror pkg-mirror auto-accept -- Eitan Adler Source, Ports, Doc committer Bugmeister, Ports Security teams From owner-svn-ports-head@FreeBSD.ORG Tue Dec 17 18:14:08 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 9A5EB578; Tue, 17 Dec 2013 18:14:08 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 86ADC1E2B; Tue, 17 Dec 2013 18:14:08 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBHIE8b9084331; Tue, 17 Dec 2013 18:14:08 GMT (envelope-from danilo@svn.freebsd.org) Received: (from danilo@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBHIE8Rq084330; Tue, 17 Dec 2013 18:14:08 GMT (envelope-from danilo@svn.freebsd.org) Message-Id: <201312171814.rBHIE8Rq084330@svn.freebsd.org> From: Danilo Egea Gondolfo Date: Tue, 17 Dec 2013 18:14:08 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r336749 - head/databases/py-pylibmc X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 17 Dec 2013 18:14:08 -0000 Author: danilo Date: Tue Dec 17 18:14:08 2013 New Revision: 336749 URL: http://svnweb.freebsd.org/changeset/ports/336749 Log: - Fix a typo in LIB_DEPENDS (s/libmemcached.do/libmemcached.so) [1] - Add stage support PR: ports/184914 Submitted by: Benjamin Lee [1] Modified: head/databases/py-pylibmc/Makefile Modified: head/databases/py-pylibmc/Makefile ============================================================================== --- head/databases/py-pylibmc/Makefile Tue Dec 17 17:55:43 2013 (r336748) +++ head/databases/py-pylibmc/Makefile Tue Dec 17 18:14:08 2013 (r336749) @@ -12,11 +12,10 @@ COMMENT= Python libmemcached wrapper LICENSE= BSD -LIB_DEPENDS= libmemcached.do:${PORTSDIR}/databases/libmemcached +LIB_DEPENDS= libmemcached.so:${PORTSDIR}/databases/libmemcached MAKE_ENV+= LIBMEMCACHED="${LOCALBASE}" USE_PYTHON= 2.5+ USE_PYDISTUTILS= yes -NO_STAGE= yes .include From owner-svn-ports-head@FreeBSD.ORG Tue Dec 17 18:19:47 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 350F2894; Tue, 17 Dec 2013 18:19:47 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 213951E90; Tue, 17 Dec 2013 18:19:47 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBHIJkel085046; Tue, 17 Dec 2013 18:19:46 GMT (envelope-from swills@svn.freebsd.org) Received: (from swills@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBHIJkss085044; Tue, 17 Dec 2013 18:19:46 GMT (envelope-from swills@svn.freebsd.org) Message-Id: <201312171819.rBHIJkss085044@svn.freebsd.org> From: Steve Wills Date: Tue, 17 Dec 2013 18:19:46 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r336750 - head/devel/otrs X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 17 Dec 2013 18:19:47 -0000 Author: swills Date: Tue Dec 17 18:19:46 2013 New Revision: 336750 URL: http://svnweb.freebsd.org/changeset/ports/336750 Log: - Update to 3.2.13 PR: ports/184707 Submitted by: "Mikhail T." (maintainer) Modified: head/devel/otrs/Makefile head/devel/otrs/distinfo Modified: head/devel/otrs/Makefile ============================================================================== --- head/devel/otrs/Makefile Tue Dec 17 18:14:08 2013 (r336749) +++ head/devel/otrs/Makefile Tue Dec 17 18:19:46 2013 (r336750) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= otrs -PORTVERSION= 3.2.11 +PORTVERSION= 3.2.13 CATEGORIES= devel MASTER_SITES= http://ftp.otrs.org/pub/otrs/ \ ftp://ftp.samurai.com/pub/otrs/ \ Modified: head/devel/otrs/distinfo ============================================================================== --- head/devel/otrs/distinfo Tue Dec 17 18:14:08 2013 (r336749) +++ head/devel/otrs/distinfo Tue Dec 17 18:19:46 2013 (r336750) @@ -1,2 +1,2 @@ -SHA256 (otrs-3.2.11.tar.bz2) = 40c541aec80f4ce7de656c9b7a4f7492dc6bcdbf7716cb9dd58ea913531ff543 -SIZE (otrs-3.2.11.tar.bz2) = 18777884 +SHA256 (otrs-3.2.13.tar.bz2) = ee21c82314b541f1fb31acf5517f69fb97c5cebd6a3ec53c774d56877ddaea66 +SIZE (otrs-3.2.13.tar.bz2) = 18865308 From owner-svn-ports-head@FreeBSD.ORG Tue Dec 17 18:30:48 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id D478BC66; Tue, 17 Dec 2013 18:30:48 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id B4F121FAE; Tue, 17 Dec 2013 18:30:48 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBHIUmZG090603; Tue, 17 Dec 2013 18:30:48 GMT (envelope-from dhn@svn.freebsd.org) Received: (from dhn@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBHIUmdR090597; Tue, 17 Dec 2013 18:30:48 GMT (envelope-from dhn@svn.freebsd.org) Message-Id: <201312171830.rBHIUmdR090597@svn.freebsd.org> From: Dennis Herrmann Date: Tue, 17 Dec 2013 18:30:48 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r336751 - in head/sysutils/ttyload: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 17 Dec 2013 18:30:49 -0000 Author: dhn Date: Tue Dec 17 18:30:47 2013 New Revision: 336751 URL: http://svnweb.freebsd.org/changeset/ports/336751 Log: - Update to 0.5.3 - Add manual - Add stage support of ports - Minor changes of Makefile PR: ports/184261 Submitted by: Hung-Yi Chen Added: head/sysutils/ttyload/files/patch-ttyload.h (contents, props changed) Modified: head/sysutils/ttyload/Makefile head/sysutils/ttyload/distinfo Modified: head/sysutils/ttyload/Makefile ============================================================================== --- head/sysutils/ttyload/Makefile Tue Dec 17 18:19:46 2013 (r336750) +++ head/sysutils/ttyload/Makefile Tue Dec 17 18:30:47 2013 (r336751) @@ -2,11 +2,9 @@ # $FreeBSD$ PORTNAME= ttyload -PORTVERSION= 0.5.2 -PORTREVISION= 1 +PORTVERSION= 0.5.3 CATEGORIES= sysutils -MASTER_SITES= http://www.daveltd.com/src/util/ttyload/ \ - http://mirror.mcx2.org/ +MASTER_SITES= http://www.daveltd.com/src/util/ttyload/ MAINTAINER= dhn@FreeBSD.org COMMENT= Give a color-coded graph of load averages over time @@ -15,20 +13,17 @@ ALL_TARGET= default USE_BZIP2= yes PLIST_FILES= bin/ttyload -PORTDOCS= * -SUB_FILES= pkg-message +MAN1= ttyload.1 -NO_STAGE= yes -post-install: -.if !defined(NOPORTDOCS) - @${ECHO_MSG} "Installing additional documentation to ${DOCSDIR}" - @${MKDIR} ${DOCSDIR} - ${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR}/README - ${INSTALL_DATA} ${WRKSRC}/LICENSE ${DOCSDIR}/LICENSE -.endif +.include - @${ECHO_MSG} "" - @${CAT} ${PKGMESSAGE} - @${ECHO_MSG} "" +do-install: +.if ${PORT_OPTIONS:MDOCS} + @${MKDIR} ${STAGEDIR}${DOCSDIR} + ${INSTALL_DATA} ${WRKSRC}/README.md ${STAGEDIR}${DOCSDIR}/README + ${INSTALL_DATA} ${WRKSRC}/LICENSE ${STAGEDIR}${DOCSDIR}/LICENSE +.endif + ${INSTALL_MAN} ${WRKSRC}/${MAN1} ${STAGEDIR}${MANPREFIX}/man/man1/ + ${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin/ -.include +.include Modified: head/sysutils/ttyload/distinfo ============================================================================== --- head/sysutils/ttyload/distinfo Tue Dec 17 18:19:46 2013 (r336750) +++ head/sysutils/ttyload/distinfo Tue Dec 17 18:30:47 2013 (r336751) @@ -1,2 +1,2 @@ -SHA256 (ttyload-0.5.2.tar.bz2) = 4783f6f44a59e554b0f31ab7940b9112123e8eef71b85d2cbad5d4275ba8dd44 -SIZE (ttyload-0.5.2.tar.bz2) = 14649 +SHA256 (ttyload-0.5.3.tar.bz2) = 7d3147b22530e6de865279aaad8b9e0348575379413ed1a2d410257baf92d783 +SIZE (ttyload-0.5.3.tar.bz2) = 15039 Added: head/sysutils/ttyload/files/patch-ttyload.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/sysutils/ttyload/files/patch-ttyload.h Tue Dec 17 18:30:47 2013 (r336751) @@ -0,0 +1,11 @@ +--- ttyload.h.orig 2013-11-24 00:51:20.729533285 +0800 ++++ ttyload.h 2013-11-24 00:51:29.900534853 +0800 +@@ -8,6 +8,8 @@ + * + */ + ++#include ++ + #define MIN(a,b) (((a)<(b))?(a):(b)) + #define MAX(a,b) (((a)>(b))?(a):(b)) + From owner-svn-ports-head@FreeBSD.ORG Tue Dec 17 18:37:42 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id A0D2DFB8; Tue, 17 Dec 2013 18:37:42 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 739821009; Tue, 17 Dec 2013 18:37:42 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBHIbgeJ092010; Tue, 17 Dec 2013 18:37:42 GMT (envelope-from wg@svn.freebsd.org) Received: (from wg@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBHIbf2Y092006; Tue, 17 Dec 2013 18:37:41 GMT (envelope-from wg@svn.freebsd.org) Message-Id: <201312171837.rBHIbf2Y092006@svn.freebsd.org> From: William Grzybowski Date: Tue, 17 Dec 2013 18:37:41 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r336752 - in head/devel: . py-snackwich X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 17 Dec 2013 18:37:42 -0000 Author: wg Date: Tue Dec 17 18:37:41 2013 New Revision: 336752 URL: http://svnweb.freebsd.org/changeset/ports/336752 Log: devel/py-snackwich: Configuration-based Console UI Framework WWW: https://github.com/dsoprea/Snackwich PR: ports/184927 Submitted by: Johannes Jost Meixner Added: head/devel/py-snackwich/ head/devel/py-snackwich/Makefile (contents, props changed) head/devel/py-snackwich/distinfo (contents, props changed) head/devel/py-snackwich/pkg-descr (contents, props changed) Modified: head/devel/Makefile Modified: head/devel/Makefile ============================================================================== --- head/devel/Makefile Tue Dec 17 18:30:47 2013 (r336751) +++ head/devel/Makefile Tue Dec 17 18:37:41 2013 (r336752) @@ -3782,6 +3782,7 @@ SUBDIR += py-sip SUBDIR += py-six SUBDIR += py-smmap + SUBDIR += py-snackwich SUBDIR += py-spark SUBDIR += py-speaklater SUBDIR += py-sqlcc Added: head/devel/py-snackwich/Makefile ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/py-snackwich/Makefile Tue Dec 17 18:37:41 2013 (r336752) @@ -0,0 +1,21 @@ +# Created by: Johannes Meixner +# $FreeBSD$ + +PORTNAME= snackwich +PORTVERSION= 1.3.18 +CATEGORIES= devel python +MASTER_SITES= CHEESESHOP +PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} + +MAINTAINER= xmj@chaot.net +COMMENT= Configuration-based Console UI Framework + +LICENSE= GPLv2 + +LIB_DEPENDS= libnewt.so:${PORTSDIR}/devel/newt + +USE_PYTHON= yes +USE_PYDISTUTILS= yes +PYDISTUTILS_AUTOPLIST= yes + +.include Added: head/devel/py-snackwich/distinfo ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/py-snackwich/distinfo Tue Dec 17 18:37:41 2013 (r336752) @@ -0,0 +1,2 @@ +SHA256 (snackwich-1.3.18.tar.gz) = ecee24943c09499dc74aa0c1cbf75fbcd68929648cbe696c52d097deaf1e6523 +SIZE (snackwich-1.3.18.tar.gz) = 10021 Added: head/devel/py-snackwich/pkg-descr ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/py-snackwich/pkg-descr Tue Dec 17 18:37:41 2013 (r336752) @@ -0,0 +1,4 @@ +Configuration-based Snack/Newt adaptation for easy and attractive console UI +forms. + +WWW: https://github.com/dsoprea/Snackwich From owner-svn-ports-head@FreeBSD.ORG Tue Dec 17 18:37:45 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id A09FCFBD; Tue, 17 Dec 2013 18:37:45 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 8D799100C; Tue, 17 Dec 2013 18:37:45 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBHIbjZp092071; Tue, 17 Dec 2013 18:37:45 GMT (envelope-from bapt@svn.freebsd.org) Received: (from bapt@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBHIbjUN092070; Tue, 17 Dec 2013 18:37:45 GMT (envelope-from bapt@svn.freebsd.org) Message-Id: <201312171837.rBHIbjUN092070@svn.freebsd.org> From: Baptiste Daroussin Date: Tue, 17 Dec 2013 18:37:45 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r336753 - head/editors/vim X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 17 Dec 2013 18:37:45 -0000 Author: bapt Date: Tue Dec 17 18:37:45 2013 New Revision: 336753 URL: http://svnweb.freebsd.org/changeset/ports/336753 Log: Fix build after gtk update Modified: head/editors/vim/Makefile Modified: head/editors/vim/Makefile ============================================================================== --- head/editors/vim/Makefile Tue Dec 17 18:37:41 2013 (r336752) +++ head/editors/vim/Makefile Tue Dec 17 18:37:45 2013 (r336753) @@ -12,7 +12,7 @@ PORTNAME= vim # ! PATCHLEVEL to that level. PATCHLEVEL= 110 PORTVERSION= 7.4.${PATCHLEVEL} -PORTREVISION?= 1 +PORTREVISION?= 2 CATEGORIES?= editors MASTER_SITES= VIM DISTNAME= ${PORTNAME}-${PORTVERSION:R} @@ -141,7 +141,7 @@ USE_XORG+= xaw . if ${PORT_OPTIONS:MGTK2} USE_GNOME= gtk20 CONF_OPT_GUI="--enable-gui=gtk2 --with-gtk-prefix=${LOCALBASE}" -MAKE_ARGS+= X_LIBS="$(X_LIBS) -lXt" +MAKE_ARGS+= X_LIBS="$(X_LIBS) -lX11 -lXt" USE_XORG+= xt . endif @@ -149,7 +149,7 @@ USE_XORG+= xt USE_GNOME= libgnomeui PKGNAMESUFFIX= -gnome2 CONF_OPT_GUI= "--enable-gui=gnome2" -MAKE_ARGS+= X_LIBS="$(X_LIBS) -lXt" +MAKE_ARGS+= X_LIBS="$(X_LIBS) -lX11 -lXt" USE_XORG+= xt glproto . endif From owner-svn-ports-head@FreeBSD.ORG Tue Dec 17 19:06:14 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id D6DCB778; Tue, 17 Dec 2013 19:06:14 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id C2CA111F5; Tue, 17 Dec 2013 19:06:14 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBHJ6EMi002961; Tue, 17 Dec 2013 19:06:14 GMT (envelope-from danilo@svn.freebsd.org) Received: (from danilo@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBHJ6EVj002954; Tue, 17 Dec 2013 19:06:14 GMT (envelope-from danilo@svn.freebsd.org) Message-Id: <201312171906.rBHJ6EVj002954@svn.freebsd.org> From: Danilo Egea Gondolfo Date: Tue, 17 Dec 2013 19:06:14 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r336755 - in head/graphics/apngdis: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 17 Dec 2013 19:06:15 -0000 Author: danilo Date: Tue Dec 17 19:06:13 2013 New Revision: 336755 URL: http://svnweb.freebsd.org/changeset/ports/336755 Log: - Update from 2.5 to 2.6 - Convert USE_DOS2UNIX to USES - Add stage support PR: ports/184907 Submitted by: KATO Tsuguru Added: head/graphics/apngdis/files/ head/graphics/apngdis/files/patch-Makefile (contents, props changed) Modified: head/graphics/apngdis/Makefile head/graphics/apngdis/distinfo Modified: head/graphics/apngdis/Makefile ============================================================================== --- head/graphics/apngdis/Makefile Tue Dec 17 18:52:19 2013 (r336754) +++ head/graphics/apngdis/Makefile Tue Dec 17 19:06:13 2013 (r336755) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= apngdis -PORTVERSION= 2.5 +PORTVERSION= 2.6 DISTVERSIONSUFFIX=-src CATEGORIES= graphics MASTER_SITES= SF/${PORTNAME}/${PORTVERSION} @@ -12,36 +12,30 @@ COMMENT= Deconstructs APNG files into in LICENSE= ZLIB +OPTIONS_DEFINE= DOCS STATIC + NO_WRKSUBDIR= yes -USE_DOS2UNIX= yes USE_ZIP= yes - -LDFLAGS+= -lz - -PLIST_FILES= bin/${PORTNAME} +USES= dos2unix gmake PORTDOCS= readme.txt +PLIST_FILES= bin/${PORTNAME} -OPTIONS_DEFINE= DOCS STATIC +STATIC_BUILD_DEPENDS= ${LOCALBASE}/lib/libpng.a:${PORTSDIR}/graphics/png +STATIC_MAKE_ENV= STATIC=1 -NO_STAGE= yes .include -.if ${PORT_OPTIONS:MSTATIC} -LDFLAGS+= -static +.if ! ${PORT_OPTIONS:MSTATIC} +LIB_DEPENDS+= libpng15.so:${PORTSDIR}/graphics/png .endif -do-build: - cd ${WRKSRC} && ${CC} ${CFLAGS} ${CPPFLAGS} ${PORTNAME}.c \ - -o ${PORTNAME} ${LDFLAGS} - do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${PREFIX}/bin - -.if ${PORT_OPTIONS:MDOCS} - ${MKDIR} ${DOCSDIR} - ${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${DOCSDIR} -.endif + (cd ${WRKSRC} && ${INSTALL_PROGRAM} ${PORTNAME} \ + ${STAGEDIR}${PREFIX}/bin) + @${MKDIR} ${STAGEDIR}${DOCSDIR} + (cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} \ + ${STAGEDIR}${DOCSDIR}) .include Modified: head/graphics/apngdis/distinfo ============================================================================== --- head/graphics/apngdis/distinfo Tue Dec 17 18:52:19 2013 (r336754) +++ head/graphics/apngdis/distinfo Tue Dec 17 19:06:13 2013 (r336755) @@ -1,2 +1,2 @@ -SHA256 (apngdis-2.5-src.zip) = 684ef8da1688c8fdb1a3dfe742fcf344bfff23b701fb31cea2ece7b2a272faec -SIZE (apngdis-2.5-src.zip) = 9085 +SHA256 (apngdis-2.6-src.zip) = f2bed6570bd73155f2f729920398b141028bc4bf74dc0d621feb27b810231a17 +SIZE (apngdis-2.6-src.zip) = 450493 Added: head/graphics/apngdis/files/patch-Makefile ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/graphics/apngdis/files/patch-Makefile Tue Dec 17 19:06:13 2013 (r336755) @@ -0,0 +1,24 @@ +--- Makefile.orig ++++ Makefile +@@ -1,11 +1,16 @@ + PACKAGE = apngdis +-CC = gcc +-CFLAGS = -Wall -pedantic +-CFLAGS_OPT = -O2 +-LIBS = -lstdc++ -lm -lpng -lz ++CXX ?= c++ ++CXXFLAGS += -Wall -pedantic ++CPPFLAGS += $(shell libpng-config --cflags) ++ifeq ($(strip $(STATIC)),) ++LIBS = $(shell libpng-config --ldflags) ++else ++LIBS = $(shell libpng-config --static --ldflags) ++LDFLAGS += -static ++endif + + all : +- $(CC) $(CFLAGS) $(CFLAGS_OPT) -o apngdis apngdis.cpp -s $(LIBS) ++ $(CXX) $(CXXFLAGS) $(CPPFLAGS) -o apngdis apngdis.cpp -s $(LIBS) $(LDFLAGS) + + .PHONY : clean + From owner-svn-ports-head@FreeBSD.ORG Tue Dec 17 19:12:28 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 86F84993; Tue, 17 Dec 2013 19:12:28 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 74130127C; Tue, 17 Dec 2013 19:12:28 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBHJCSfc006283; Tue, 17 Dec 2013 19:12:28 GMT (envelope-from dhn@svn.freebsd.org) Received: (from dhn@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBHJCSkp006281; Tue, 17 Dec 2013 19:12:28 GMT (envelope-from dhn@svn.freebsd.org) Message-Id: <201312171912.rBHJCSkp006281@svn.freebsd.org> From: Dennis Herrmann Date: Tue, 17 Dec 2013 19:12:28 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r336756 - head/net/rubygem-rubytter X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 17 Dec 2013 19:12:28 -0000 Author: dhn Date: Tue Dec 17 19:12:27 2013 New Revision: 336756 URL: http://svnweb.freebsd.org/changeset/ports/336756 Log: - Update to 1.5.1 PR: ports/180149 Submitted by: Steve Wills Modified: head/net/rubygem-rubytter/Makefile head/net/rubygem-rubytter/distinfo Modified: head/net/rubygem-rubytter/Makefile ============================================================================== --- head/net/rubygem-rubytter/Makefile Tue Dec 17 19:06:13 2013 (r336755) +++ head/net/rubygem-rubytter/Makefile Tue Dec 17 19:12:27 2013 (r336756) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= rubytter -PORTVERSION= 1.4.2 +PORTVERSION= 1.5.1 CATEGORIES= net rubygems MASTER_SITES= RG Modified: head/net/rubygem-rubytter/distinfo ============================================================================== --- head/net/rubygem-rubytter/distinfo Tue Dec 17 19:06:13 2013 (r336755) +++ head/net/rubygem-rubytter/distinfo Tue Dec 17 19:12:27 2013 (r336756) @@ -1,2 +1,2 @@ -SHA256 (rubygem/rubytter-1.4.2.gem) = e3355d9894700177c5375d9d284cc9ea089add6462ad6dc73e89ff2b0615915a -SIZE (rubygem/rubytter-1.4.2.gem) = 14848 +SHA256 (rubygem/rubytter-1.5.1.gem) = 4444988defc185588194096ddbe313c90937e69111cd4acf4020e4f13372247c +SIZE (rubygem/rubytter-1.5.1.gem) = 15872 From owner-svn-ports-head@FreeBSD.ORG Tue Dec 17 19:21:10 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 0EDBFC7A for ; Tue, 17 Dec 2013 19:21:10 +0000 (UTC) Received: from mail-qe0-x234.google.com (mail-qe0-x234.google.com [IPv6:2607:f8b0:400d:c02::234]) (using TLSv1 with cipher ECDHE-RSA-RC4-SHA (128/128 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id B78551307 for ; Tue, 17 Dec 2013 19:21:09 +0000 (UTC) Received: by mail-qe0-f52.google.com with SMTP id ne12so5538158qeb.25 for ; Tue, 17 Dec 2013 11:21:08 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=eitanadler.com; s=0xdeadbeef; h=mime-version:sender:in-reply-to:references:from:date:message-id :subject:to:cc:content-type; bh=schZRDzRWPIBtKl9p+DUIZ0CqLqpxbb8P3InS7IpxT8=; b=LYgXqGkdHG2B9qZiYEEAhKRpW0oYUhKKmazSCPNmtvosnzltEGI5URD/UGofM4lISq bV2QzcoJWrS05FKR2GJUzKU9bzeiIJaBVtTKVW9dgEML0/tpWf4Kfue5a5oLGGQ2eUNJ G2RFskjtP2ibdLKWHOha4NK4fb4nY5FfHSRaE= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:sender:in-reply-to:references:from :date:message-id:subject:to:cc:content-type; bh=schZRDzRWPIBtKl9p+DUIZ0CqLqpxbb8P3InS7IpxT8=; b=bC1zg/ZAD3phKeQKHX5Ujdq4KWZgFm6m+WyQ5IgGZ2hKTNK7og7LLgjIxwuur7uQN6 MMyYstjHtLFTaUMzu/S2dNuN28QybZULeqQi/suHCVMu5gUThxbRznfEFOxtlmf0NxM+ TUyQTjrC18e+mMRAv+NhuWL6kyYBKGmUKil0JxVQ39S7kO2iMfuo04zaxB/9ij856ZHC VWviY5r70CFtQXaxjQOTliSwWfN6RDYUxWckiv6eEUcgA9lODxKbo4GkFpxEIVZsOn5N TScqrEP+Y7RQE1GNY4FWj2a7RASKzTOmsHaznrX6UEtx6no9Hgyx5EygqnDDFa9vTxgz FPsQ== X-Gm-Message-State: ALoCoQkL3gVy8gRYWlBbGGpkJ4T1TjP6s229daOHGJiC3qoIpEe62A0GyhlXgAXCrteTX/Wo0j6O X-Received: by 10.49.106.37 with SMTP id gr5mr45813337qeb.75.1387308068586; Tue, 17 Dec 2013 11:21:08 -0800 (PST) MIME-Version: 1.0 Sender: lists@eitanadler.com Received: by 10.96.86.42 with HTTP; Tue, 17 Dec 2013 11:20:38 -0800 (PST) In-Reply-To: References: <201312171342.rBHDggNP084170@svn.freebsd.org> <52B06851.7030906@marino.st> <20131217151203.GK99753@ithaqua.etoilebsd.net> From: Eitan Adler Date: Tue, 17 Dec 2013 14:20:38 -0500 X-Google-Sender-Auth: PJiUCSrW5sNL55v7jzVLllnxULA Message-ID: Subject: Re: svn commit: r336723 - in head: . games games/blobwars games/blobwars/files To: Baptiste Daroussin Content-Type: text/plain; charset=UTF-8 Cc: "svn-ports-head@freebsd.org" , Rusmir Dusko , marino@freebsd.org, "svn-ports-all@freebsd.org" , "ports-committers@freebsd.org" X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 17 Dec 2013 19:21:10 -0000 On Tue, Dec 17, 2013 at 1:01 PM, Eitan Adler wrote: > On Tue, Dec 17, 2013 at 10:12 AM, Baptiste Daroussin wrote: >> On Tue, Dec 17, 2013 at 04:05:53PM +0100, John Marino wrote: >>> On 12/17/2013 14:42, Rusmir Dusko wrote: OK, I found the source of the CC license in doc/readme it lists each of works used along with their license. Assuming - the readme lists all the outside works used by the game - the listing is accurate it seems there isn't a problem here (other than needing to set NO_CDROM). In 2008 debian had a similar issue with Parallel Realities games: http://lists.debian.org/debian-devel-games/2008/08/msg00024.html. I can not find such language in the tarball now. -- Eitan Adler Source, Ports, Doc committer Bugmeister, Ports Security teams From owner-svn-ports-head@FreeBSD.ORG Tue Dec 17 19:24:13 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 08DD9DED for ; Tue, 17 Dec 2013 19:24:13 +0000 (UTC) Received: from mail-qe0-x234.google.com (mail-qe0-x234.google.com [IPv6:2607:f8b0:400d:c02::234]) (using TLSv1 with cipher ECDHE-RSA-RC4-SHA (128/128 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id B0B351339 for ; Tue, 17 Dec 2013 19:24:12 +0000 (UTC) Received: by mail-qe0-f52.google.com with SMTP id ne12so5541569qeb.25 for ; Tue, 17 Dec 2013 11:24:11 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=eitanadler.com; s=0xdeadbeef; h=mime-version:sender:in-reply-to:references:from:date:message-id :subject:to:cc:content-type; bh=E9SaVb/iN+wFkA5K4dPAwJNVWrA/rnrywMyO78Vl64w=; b=aln5XEJyQ2JRUeNMe7Hnc9YjjuqB16SzNOMfl+9ZcASy8+7upEKiqiA7wC1A72deWE GPntgIK2HT+i+BD3Psa2VfNqDsy8Ri/Ulu4PcW4GH6NXvjQYwOKVvhQ1PNzbVKKuwkqV p6fbg+ruYODubyfrxAJgyiIKQ37gpeZVq4+04= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:sender:in-reply-to:references:from :date:message-id:subject:to:cc:content-type; bh=E9SaVb/iN+wFkA5K4dPAwJNVWrA/rnrywMyO78Vl64w=; b=XdI9G2qGBFDB6scg0uIGNFTlzpUPSFd5Ge5tdeIdCEiW/9wSCFBCrqlG8AAqEDEy25 aVIbS2Izf+41EwDkCTlUZVl7IC6ZPWy0jQvf72Xqfkd0sjZWdtBPTR/qhPESMSEf7ai8 9ZXnm4KmFCQwhntuSXWD6pTa8Fv3in0p/Y3+bLLBZNR72gMdK5EYqBAwdHvliTyG4UYZ lhsEjTnmYISjF2F/mylok8oJmET8kkDUiezPL7yUdl2YFUA3LtevWZ8TfscazkSfEBKq MEdf7VzhQqW2k7DrLHC28kPYIqi0EItQ/IXzSojX6hurUdmYSJR0Ovcf0u5619dtfisy rjkg== X-Gm-Message-State: ALoCoQn3SffUQXTNAMFeOxMi2xy0yHYpOIdeF5f5ckcTpEAKk5PKgyn4SSDTgj2SRE64CL+lNMQW X-Received: by 10.224.61.198 with SMTP id u6mr45898049qah.41.1387308251790; Tue, 17 Dec 2013 11:24:11 -0800 (PST) MIME-Version: 1.0 Sender: lists@eitanadler.com Received: by 10.96.86.42 with HTTP; Tue, 17 Dec 2013 11:23:35 -0800 (PST) In-Reply-To: References: <201312171342.rBHDggNP084170@svn.freebsd.org> <52B06851.7030906@marino.st> <20131217151203.GK99753@ithaqua.etoilebsd.net> From: Eitan Adler Date: Tue, 17 Dec 2013 14:23:35 -0500 X-Google-Sender-Auth: Cw8dIItTjQ9Wl0GlcGhzVZM8C4E Message-ID: Subject: Re: svn commit: r336723 - in head: . games games/blobwars games/blobwars/files To: Baptiste Daroussin Content-Type: text/plain; charset=UTF-8 Cc: "svn-ports-head@freebsd.org" , Rusmir Dusko , marino@freebsd.org, "svn-ports-all@freebsd.org" , "ports-committers@freebsd.org" X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 17 Dec 2013 19:24:13 -0000 On Tue, Dec 17, 2013 at 2:20 PM, Eitan Adler wrote: > On Tue, Dec 17, 2013 at 1:01 PM, Eitan Adler wrote: >> On Tue, Dec 17, 2013 at 10:12 AM, Baptiste Daroussin wrote: >>> On Tue, Dec 17, 2013 at 04:05:53PM +0100, John Marino wrote: >>>> On 12/17/2013 14:42, Rusmir Dusko wrote: > > OK, I found the source of the CC license in doc/readme it lists each > of works used along with their license. > > Assuming > - the readme lists all the outside works used by the game > - the listing is accurate > it seems there isn't a problem here (other than needing to set NO_CDROM). > > In 2008 debian had a similar issue with Parallel Realities games: > http://lists.debian.org/debian-devel-games/2008/08/msg00024.html. I > can not find such language in the tarball now. And yet another follow up to myself. LICENSE_COMB should be "multi" not "dual". -- Eitan Adler Source, Ports, Doc committer Bugmeister, Ports Security teams From owner-svn-ports-head@FreeBSD.ORG Tue Dec 17 19:34:01 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 0CC3DE5; Tue, 17 Dec 2013 19:34:01 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id ED1E313E2; Tue, 17 Dec 2013 19:34:00 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBHJY0xU013529; Tue, 17 Dec 2013 19:34:00 GMT (envelope-from dhn@svn.freebsd.org) Received: (from dhn@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBHJY0s2013520; Tue, 17 Dec 2013 19:34:00 GMT (envelope-from dhn@svn.freebsd.org) Message-Id: <201312171934.rBHJY0s2013520@svn.freebsd.org> From: Dennis Herrmann Date: Tue, 17 Dec 2013 19:34:00 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r336757 - in head/net-im/rubygem-termtter: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 17 Dec 2013 19:34:01 -0000 Author: dhn Date: Tue Dec 17 19:33:59 2013 New Revision: 336757 URL: http://svnweb.freebsd.org/changeset/ports/336757 Log: - Update to 2.2.1 PR: ports/180148 Submitted by: Steve Wills Added: head/net-im/rubygem-termtter/files/ head/net-im/rubygem-termtter/files/patch-versions (contents, props changed) Modified: head/net-im/rubygem-termtter/Makefile head/net-im/rubygem-termtter/distinfo head/net-im/rubygem-termtter/pkg-descr Modified: head/net-im/rubygem-termtter/Makefile ============================================================================== --- head/net-im/rubygem-termtter/Makefile Tue Dec 17 19:12:27 2013 (r336756) +++ head/net-im/rubygem-termtter/Makefile Tue Dec 17 19:33:59 2013 (r336757) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= termtter -PORTVERSION= 1.11.0 +PORTVERSION= 2.2.1 CATEGORIES= net-im rubygems MASTER_SITES= RG @@ -11,15 +11,15 @@ COMMENT= Terminal based Twitter client RUN_DEPENDS= rubygem-json>=1.1.3:${PORTSDIR}/devel/rubygem-json \ rubygem-termcolor>=1.0.0:${PORTSDIR}/textproc/rubygem-termcolor \ - rubygem-rubytter>=1.4.0:${PORTSDIR}/net/rubygem-rubytter \ + rubygem-rubytter>=1.5.1:${PORTSDIR}/net/rubygem-rubytter \ rubygem-highline>=1.5.0:${PORTSDIR}/devel/rubygem-highline \ - rubygem-notify>=0.2.1:${PORTSDIR}/devel/rubygem-notify + rubygem-notify>=0.5.1:${PORTSDIR}/devel/rubygem-notify USE_RUBY= yes USE_RUBYGEMS= yes USE_RAKE= yes RUBYGEM_AUTOPLIST= yes -PLIST_FILES= bin/termtter +PLIST_FILES= bin/termtter bin/termtter_frame NO_STAGE= yes .include Modified: head/net-im/rubygem-termtter/distinfo ============================================================================== --- head/net-im/rubygem-termtter/distinfo Tue Dec 17 19:12:27 2013 (r336756) +++ head/net-im/rubygem-termtter/distinfo Tue Dec 17 19:33:59 2013 (r336757) @@ -1,2 +1,2 @@ -SHA256 (rubygem/termtter-1.11.0.gem) = 703c2535b59468482aed3748ba07600611d89e373ff7f3b6fa3532db3409d807 -SIZE (rubygem/termtter-1.11.0.gem) = 1504768 +SHA256 (rubygem/termtter-2.2.1.gem) = 316bac3539fa9ccc859df0ecc6fe2e09b4e373f4ac8d86384f0baacfdc37b8e2 +SIZE (rubygem/termtter-2.2.1.gem) = 1505280 Added: head/net-im/rubygem-termtter/files/patch-versions ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net-im/rubygem-termtter/files/patch-versions Tue Dec 17 19:33:59 2013 (r336757) @@ -0,0 +1,35 @@ +--- termtter-2.2.1.gemspec.orig 2013-07-01 03:35:35.630666391 +0000 ++++ termtter-2.2.1.gemspec 2013-07-01 03:35:36.659666334 +0000 +@@ -33,28 +33,28 @@ + requirements: + - - ~> + - !ruby/object:Gem::Version +- version: 1.5.0 ++ version: 1.6.0 + type: :runtime + prerelease: false + version_requirements: !ruby/object:Gem::Requirement + requirements: + - - ~> + - !ruby/object:Gem::Version +- version: 1.5.0 ++ version: 1.6.0 + - !ruby/object:Gem::Dependency + name: termcolor + requirement: !ruby/object:Gem::Requirement + requirements: + - - ~> + - !ruby/object:Gem::Version +- version: 1.0.0 ++ version: 1.2.0 + type: :runtime + prerelease: false + version_requirements: !ruby/object:Gem::Requirement + requirements: + - - ~> + - !ruby/object:Gem::Version +- version: 1.0.0 ++ version: 1.2.0 + - !ruby/object:Gem::Dependency + name: rubytter + requirement: !ruby/object:Gem::Requirement Modified: head/net-im/rubygem-termtter/pkg-descr ============================================================================== --- head/net-im/rubygem-termtter/pkg-descr Tue Dec 17 19:12:27 2013 (r336756) +++ head/net-im/rubygem-termtter/pkg-descr Tue Dec 17 19:33:59 2013 (r336757) @@ -1,3 +1,3 @@ Termtter is a Terminal based Twitter client. -WWW: http://termtter.org/ +WWW: http://termtter.github.io/ From owner-svn-ports-head@FreeBSD.ORG Tue Dec 17 19:37:21 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 8E649461; Tue, 17 Dec 2013 19:37:21 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 7A81D1462; Tue, 17 Dec 2013 19:37:21 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBHJbLlI013993; Tue, 17 Dec 2013 19:37:21 GMT (envelope-from pawel@svn.freebsd.org) Received: (from pawel@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBHJbKdB013986; Tue, 17 Dec 2013 19:37:20 GMT (envelope-from pawel@svn.freebsd.org) Message-Id: <201312171937.rBHJbKdB013986@svn.freebsd.org> From: Pawel Pekala Date: Tue, 17 Dec 2013 19:37:20 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r336758 - in head/devel/liblognorm: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 17 Dec 2013 19:37:21 -0000 Author: pawel Date: Tue Dec 17 19:37:20 2013 New Revision: 336758 URL: http://svnweb.freebsd.org/changeset/ports/336758 Log: - Update to version 1.0.0 - Add pkg-message PR: ports/184698 Submitted by: maintainer Added: head/devel/liblognorm/files/ head/devel/liblognorm/files/pkg-message.in (contents, props changed) Modified: head/devel/liblognorm/Makefile head/devel/liblognorm/distinfo head/devel/liblognorm/pkg-plist (contents, props changed) Modified: head/devel/liblognorm/Makefile ============================================================================== --- head/devel/liblognorm/Makefile Tue Dec 17 19:33:59 2013 (r336757) +++ head/devel/liblognorm/Makefile Tue Dec 17 19:37:20 2013 (r336758) @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= liblognorm -PORTVERSION= 0.3.7 +PORTVERSION= 1.0.0 CATEGORIES= devel net security MASTER_SITES= http://www.liblognorm.com/download/files/download/ @@ -10,13 +10,15 @@ COMMENT= Log normalizer LICENSE= GPLv2 -LIB_DEPENDS= libee.so:${PORTSDIR}/devel/libee \ +LIB_DEPENDS= libjson.so:${PORTSDIR}/devel/json-c \ libestr.so:${PORTSDIR}/devel/libestr USES= pathfix pkgconfig USE_LDCONFIG= yes GNU_CONFIGURE= yes +SUB_FILES= pkg-message + # Try to fix parallel (-jX) builds post-patch: @${REINPLACE_CMD} -e \ Modified: head/devel/liblognorm/distinfo ============================================================================== --- head/devel/liblognorm/distinfo Tue Dec 17 19:33:59 2013 (r336757) +++ head/devel/liblognorm/distinfo Tue Dec 17 19:37:20 2013 (r336758) @@ -1,2 +1,2 @@ -SHA256 (liblognorm-0.3.7.tar.gz) = b000ab7aab9ed3d7a2c23303463b5bcceb7bb6538714bd41248d02913a82e223 -SIZE (liblognorm-0.3.7.tar.gz) = 346903 +SHA256 (liblognorm-1.0.0.tar.gz) = 01f73c735fd7291c2f1041518f4d005a8100e6be33f07eab00d4f27d1c1934de +SIZE (liblognorm-1.0.0.tar.gz) = 356929 Added: head/devel/liblognorm/files/pkg-message.in ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/liblognorm/files/pkg-message.in Tue Dec 17 19:37:20 2013 (r336758) @@ -0,0 +1,19 @@ +*********************************************************************** + +WARNING WARNING WARNING WARNING WARNING WARNING WARNING WARNING + +The previous version of liblognorm (0.3.7) used the libee CEE support +library in its API. + +In 2013, Pavel Levshin converted liblognorm to native JSON, which helped +improve performance and simplicity for many client applications. +Unfortunately, this change broke interface compatibility (and there was +no way to avoid that, obviously...). + +The current library is the result of that effort. Application developers +are encouraged to switch to this version, as it provides the benefit of +a simpler API. PREVIOUS VERSIONS ARE INCOMPATIBLE WITH THIS ONE + +WARNING WARNING WARNING WARNING WARNING WARNING WARNING WARNING + +*********************************************************************** Modified: head/devel/liblognorm/pkg-plist ============================================================================== --- head/devel/liblognorm/pkg-plist Tue Dec 17 19:33:59 2013 (r336757) +++ head/devel/liblognorm/pkg-plist Tue Dec 17 19:37:20 2013 (r336758) @@ -1,11 +1,13 @@ bin/lognormalizer include/annot.h +include/enc.h include/liblognorm.h include/lognorm.h +include/parser.h include/ptree.h include/samp.h lib/liblognorm.a lib/liblognorm.la lib/liblognorm.so -lib/liblognorm.so.0 +lib/liblognorm.so.1 libdata/pkgconfig/lognorm.pc From owner-svn-ports-head@FreeBSD.ORG Tue Dec 17 20:01:49 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 645E7894; Tue, 17 Dec 2013 20:01:49 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 50EF9161F; Tue, 17 Dec 2013 20:01:49 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBHK1nIB023189; Tue, 17 Dec 2013 20:01:49 GMT (envelope-from dhn@svn.freebsd.org) Received: (from dhn@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBHK1mf7023187; Tue, 17 Dec 2013 20:01:48 GMT (envelope-from dhn@svn.freebsd.org) Message-Id: <201312172001.rBHK1mf7023187@svn.freebsd.org> From: Dennis Herrmann Date: Tue, 17 Dec 2013 20:01:48 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r336759 - head/sysutils/rubygem-teamocil X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 17 Dec 2013 20:01:49 -0000 Author: dhn Date: Tue Dec 17 20:01:48 2013 New Revision: 336759 URL: http://svnweb.freebsd.org/changeset/ports/336759 Log: - Update to 0.4.4 PR: ports/179908 Submitted by: Steve Wills Modified: head/sysutils/rubygem-teamocil/Makefile head/sysutils/rubygem-teamocil/distinfo Modified: head/sysutils/rubygem-teamocil/Makefile ============================================================================== --- head/sysutils/rubygem-teamocil/Makefile Tue Dec 17 19:37:20 2013 (r336758) +++ head/sysutils/rubygem-teamocil/Makefile Tue Dec 17 20:01:48 2013 (r336759) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= teamocil -PORTVERSION= 0.3.7 +PORTVERSION= 0.4.4 CATEGORIES= sysutils rubygems MASTER_SITES= RG Modified: head/sysutils/rubygem-teamocil/distinfo ============================================================================== --- head/sysutils/rubygem-teamocil/distinfo Tue Dec 17 19:37:20 2013 (r336758) +++ head/sysutils/rubygem-teamocil/distinfo Tue Dec 17 20:01:48 2013 (r336759) @@ -1,2 +1,2 @@ -SHA256 (rubygem/teamocil-0.3.7.gem) = 70015bef3473e3acedb98e4313d013425a0dc78a7f18041f2863c8e763cfb612 -SIZE (rubygem/teamocil-0.3.7.gem) = 12288 +SHA256 (rubygem/teamocil-0.4.4.gem) = 09d3287a1688a380bc2408c75f7800c6ebaadfc44fe6c650e3e3dd3a2ec9f1b9 +SIZE (rubygem/teamocil-0.4.4.gem) = 14336 From owner-svn-ports-head@FreeBSD.ORG Tue Dec 17 20:14:25 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 81795F95; Tue, 17 Dec 2013 20:14:25 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 6DFF71709; Tue, 17 Dec 2013 20:14:25 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBHKEPmM027511; Tue, 17 Dec 2013 20:14:25 GMT (envelope-from mva@svn.freebsd.org) Received: (from mva@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBHKEPqx027509; Tue, 17 Dec 2013 20:14:25 GMT (envelope-from mva@svn.freebsd.org) Message-Id: <201312172014.rBHKEPqx027509@svn.freebsd.org> From: Marcus von Appen Date: Tue, 17 Dec 2013 20:14:25 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r336760 - in head/multimedia/libav: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 17 Dec 2013 20:14:25 -0000 Author: mva Date: Tue Dec 17 20:14:24 2013 New Revision: 336760 URL: http://svnweb.freebsd.org/changeset/ports/336760 Log: - Unbreak the build for most environments after graphics/opencv changed its library flags for pkg-config Added: head/multimedia/libav/files/patch-configure (contents, props changed) Modified: head/multimedia/libav/Makefile Modified: head/multimedia/libav/Makefile ============================================================================== --- head/multimedia/libav/Makefile Tue Dec 17 20:01:48 2013 (r336759) +++ head/multimedia/libav/Makefile Tue Dec 17 20:14:24 2013 (r336760) @@ -205,7 +205,7 @@ post-patch: @${REINPLACE_CMD} -e 's|gsm/gsm.h|gsm.h|' \ ${WRKSRC}/configure \ ${WRKSRC}/libavcodec/libgsm.c - ${REINPLACE_CMD} -e 's|$$(LIBDIR)/pkgconfig|${STAGEDIR}${PREFIX}/libdata/pkgconfig|' \ + @${REINPLACE_CMD} -e 's|$$(LIBDIR)/pkgconfig|${STAGEDIR}${PREFIX}/libdata/pkgconfig|' \ ${WRKSRC}/library.mak .include Added: head/multimedia/libav/files/patch-configure ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/multimedia/libav/files/patch-configure Tue Dec 17 20:14:24 2013 (r336760) @@ -0,0 +1,13 @@ +--- configure.orig 2013-12-17 19:12:24.000000000 +0100 ++++ configure 2013-12-17 19:12:49.000000000 +0100 +@@ -730,8 +730,8 @@ + + check_ld(){ + log check_ld "$@" +- flags=$(filter_out '-l*' "$@") +- libs=$(filter '-l*' "$@") ++ flags=$(filter_out '-l*|*.so' "$@") ++ libs=$(filter '-l*|*.so' "$@") + check_cc $($cflags_filter $flags) || return + flags=$($ldflags_filter $flags) + libs=$($ldflags_filter $libs) From owner-svn-ports-head@FreeBSD.ORG Tue Dec 17 20:28:48 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id E3AD1532 for ; Tue, 17 Dec 2013 20:28:47 +0000 (UTC) Received: from mail-lb0-f181.google.com (mail-lb0-f181.google.com [209.85.217.181]) (using TLSv1 with cipher ECDHE-RSA-RC4-SHA (128/128 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 686FD182B for ; Tue, 17 Dec 2013 20:28:47 +0000 (UTC) Received: by mail-lb0-f181.google.com with SMTP id q8so1680575lbi.12 for ; Tue, 17 Dec 2013 12:28:45 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:message-id:date:from:user-agent:mime-version:to :subject:references:in-reply-to:content-type :content-transfer-encoding; bh=NaJkjZyqfxvmVdci4e7QttoPvoJO+1JuuGAqyCRBtvc=; b=ACzVbnv+nvVzqfTXoJgSAPox/TefIJ/ZmPQ4wT+hnBASIT5VaMBUCj4QBsdKCRLcYf nYpSO0A5tSHOGrRLuYVvpLpJfynIRGatNQQEyJbi/GB9dpB3XBaW17ZH2xDedV712FOW AvMS800znFwPglFdJwYzWropxD9QsQ6je1kYoXEeZ0ZRdIUen5qOD08LGrAg3FD0CjUD xx7K/x2NXd2T/kLsayQph1yxyD8osTPMAlMPvE0tuYjwEjXnij+3jBGctbJirkjwneiU nBKci2YvDxflLEPF5Xk+D67ob6Xxcw4N01FBaq9IWHyJARkzgeUkPY6+n2TPZbJ8U6+P MIlA== X-Gm-Message-State: ALoCoQkDeAbD1AWCYFrZtwVL9XKJvewYLgb+BoIY6Vumm23lmE6KyvQXomaADr66LRErQedmJzc6 X-Received: by 10.152.120.66 with SMTP id la2mr4021657lab.62.1387311677786; Tue, 17 Dec 2013 12:21:17 -0800 (PST) Received: from [192.168.1.2] ([89.169.173.68]) by mx.google.com with ESMTPSA id rb4sm2383242lbb.1.2013.12.17.12.21.16 for (version=TLSv1.2 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 17 Dec 2013 12:21:17 -0800 (PST) Message-ID: <52B0B23A.90103@freebsd.org> Date: Wed, 18 Dec 2013 00:21:14 +0400 From: Andrey Chernov User-Agent: Mozilla/5.0 (Windows NT 6.1; WOW64; rv:24.0) Gecko/20100101 Thunderbird/24.2.0 MIME-Version: 1.0 To: Steve Wills , ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: Re: svn commit: r336721 - in head/net-p2p/litecoin: . files References: <201312171310.rBHDA290070407@svn.freebsd.org> In-Reply-To: <201312171310.rBHDA290070407@svn.freebsd.org> X-Enigmail-Version: 1.6 Content-Type: text/plain; charset=KOI8-R Content-Transfer-Encoding: 7bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 17 Dec 2013 20:28:48 -0000 On 17.12.2013 17:10, Steve Wills wrote: > Author: swills > Date: Tue Dec 17 13:10:02 2013 > New Revision: 336721 > URL: http://svnweb.freebsd.org/changeset/ports/336721 > > Log: > - Update to 0.8.6.1 > > Added: > head/net-p2p/litecoin/files/extra-patch-endian (contents, props changed) Why you decide to add the same functions as in /usr/include/sys/endian.h instead of just including it? > +-static inline uint32_t be32dec(const void *pp) > +-{ > +- const uint8_t *p = (uint8_t const *)pp; > +- return ((uint32_t)(p[3]) + ((uint32_t)(p[2]) << 8) + > +- ((uint32_t)(p[1]) << 16) + ((uint32_t)(p[0]) << 24)); > +-} > +- > +-static inline void be32enc(void *pp, uint32_t x) > +-{ > +- uint8_t *p = (uint8_t *)pp; > +- p[3] = x & 0xff; > +- p[2] = (x >> 8) & 0xff; > +- p[1] = (x >> 16) & 0xff; > +- p[0] = (x >> 24) & 0xff; > +-} > +- > + typedef struct HMAC_SHA256Context { > + SHA256_CTX ictx; > + SHA256_CTX octx; > +--- src/scrypt.h.orig 2013-12-09 15:26:17.343282984 +0000 > ++++ src/scrypt.h 2013-12-09 15:45:11.032205545 +0000 > +@@ -17,19 +17,4 @@ > + PBKDF2_SHA256(const uint8_t *passwd, size_t passwdlen, const uint8_t *salt, > + size_t saltlen, uint64_t c, uint8_t *buf, size_t dkLen); > + > +-static inline uint32_t le32dec(const void *pp) > +-{ > +- const uint8_t *p = (uint8_t const *)pp; > +- return ((uint32_t)(p[0]) + ((uint32_t)(p[1]) << 8) + > +- ((uint32_t)(p[2]) << 16) + ((uint32_t)(p[3]) << 24)); > +-} > +- > +-static inline void le32enc(void *pp, uint32_t x) > +-{ > +- uint8_t *p = (uint8_t *)pp; > +- p[0] = x & 0xff; > +- p[1] = (x >> 8) & 0xff; > +- p[2] = (x >> 16) & 0xff; > +- p[3] = (x >> 24) & 0xff; > +-} > + #endif > From owner-svn-ports-head@FreeBSD.ORG Tue Dec 17 20:35:26 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 760A6834; Tue, 17 Dec 2013 20:35:26 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 6295918F4; Tue, 17 Dec 2013 20:35:26 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBHKZQsi034627; Tue, 17 Dec 2013 20:35:26 GMT (envelope-from mva@svn.freebsd.org) Received: (from mva@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBHKZQMY034626; Tue, 17 Dec 2013 20:35:26 GMT (envelope-from mva@svn.freebsd.org) Message-Id: <201312172035.rBHKZQMY034626@svn.freebsd.org> From: Marcus von Appen Date: Tue, 17 Dec 2013 20:35:26 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r336761 - head/audio/py-tagpy X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 17 Dec 2013 20:35:26 -0000 Author: mva Date: Tue Dec 17 20:35:25 2013 New Revision: 336761 URL: http://svnweb.freebsd.org/changeset/ports/336761 Log: - Unbreak build Reported by: exp-run (PR 184591) Modified: head/audio/py-tagpy/Makefile Modified: head/audio/py-tagpy/Makefile ============================================================================== --- head/audio/py-tagpy/Makefile Tue Dec 17 20:14:24 2013 (r336760) +++ head/audio/py-tagpy/Makefile Tue Dec 17 20:35:25 2013 (r336761) @@ -14,7 +14,7 @@ COMMENT= Python bindings for Scott Wheel LICENSE= MIT LIB_DEPENDS= libboost_python.so:${PORTSDIR}/devel/boost-python-libs \ - libtag;so:${PORTSDIR}/audio/taglib + libtag.so:${PORTSDIR}/audio/taglib USES= shebangfix HAS_CONFIGURE= yes From owner-svn-ports-head@FreeBSD.ORG Tue Dec 17 20:36:39 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 26C97929; Tue, 17 Dec 2013 20:36:39 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 07D901904; Tue, 17 Dec 2013 20:36:39 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBHKacUe034813; Tue, 17 Dec 2013 20:36:38 GMT (envelope-from danilo@svn.freebsd.org) Received: (from danilo@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBHKac9u034811; Tue, 17 Dec 2013 20:36:38 GMT (envelope-from danilo@svn.freebsd.org) Message-Id: <201312172036.rBHKac9u034811@svn.freebsd.org> From: Danilo Egea Gondolfo Date: Tue, 17 Dec 2013 20:36:38 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r336762 - head/science/gromacs X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 17 Dec 2013 20:36:39 -0000 Author: danilo Date: Tue Dec 17 20:36:38 2013 New Revision: 336762 URL: http://svnweb.freebsd.org/changeset/ports/336762 Log: - Update from 4.6.4 to 4.6.5 [1] - Convert some "if's" in options helpers PR: ports/184903 Submitted by: KATO Tsuguru [1] Modified: head/science/gromacs/Makefile head/science/gromacs/distinfo Modified: head/science/gromacs/Makefile ============================================================================== --- head/science/gromacs/Makefile Tue Dec 17 20:35:25 2013 (r336761) +++ head/science/gromacs/Makefile Tue Dec 17 20:36:38 2013 (r336762) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= gromacs -PORTVERSION= 4.6.4 +PORTVERSION= 4.6.5 CATEGORIES= science MASTER_SITES= ftp://ftp.gromacs.org/pub/gromacs/ @@ -16,13 +16,15 @@ OPTIONS_DEFAULT= FLOAT GSL X11 OPTIONS_RADIO= MPI OPTIONS_RADIO_MPI= MPICH OMPI +OPTIONS_SUB= yes + ATLAS_DESC= Use ATLAS for BLAS and LAPACK FLOAT_DESC= Use single instead of double precision GSL_DESC= Extra analysis using math/gsl MPICH_DESC= MPI support using net/mpich2 OMPI_DESC= MPI support using net/openmpi -USES= cmake pkgconfig shebangfix perl5 +USES= cmake perl5 pkgconfig shebangfix SHEBANG_FILES= admin/*.pl scripts/*.pl scripts/*.sh src/gmxlib/selection/*.sh bash_CMD= ${SH} USE_FORTRAN= yes @@ -30,6 +32,16 @@ CMAKE_ARGS= -DBLAS_LIBRARIES:FILEPATH="$ -DLAPACK_LIBRARIES:FILEPATH="${LAPACK_LIBS}" USE_LDCONFIG= yes +GSL_LIB_DEPENDS= libgsl.so:${PORTSDIR}/math/gsl +GSL_CMAKE_ON= -DGMX_GSL:BOOL=ON +GSL_CMAKE_OFF= -DGMX_GSL:BOOL=OFF + +SIMD_CMAKE_OFF= -DGMX_CPU_ACCELERATION:STRING="None" + +X11_USE= XORG=xext,x11 +X11_CMAKE_ON= -DGMX_X11:BOOL=ON +X11_CMAKE_OFF= -DGMX_X11:BOOL=OFF + .include .if ${PORT_OPTIONS:MATLAS} @@ -54,26 +66,6 @@ CMAKE_ARGS+= -DGMX_DOUBLE:BOOL=ON PLIST_SUB+= SUFFIX_D="_d" .endif -.if ${PORT_OPTIONS:MGSL} -LIB_DEPENDS+= libgsl.so:${PORTSDIR}/math/gsl -CMAKE_ARGS+= -DGMX_GSL:BOOL=ON -.else -CMAKE_ARGS+= -DGMX_GSL:BOOL=OFF -.endif - -.if empty(PORT_OPTIONS:MSIMD) -CMAKE_ARGS+= -DGMX_CPU_ACCELERATION:STRING="None" -.endif - -.if ${PORT_OPTIONS:MX11} -USE_XORG= xext x11 -CMAKE_ARGS+= -DGMX_X11:BOOL=ON -PLIST_SUB+= X11="" -.else -CMAKE_ARGS+= -DGMX_X11:BOOL=OFF -PLIST_SUB+= X11="@comment " -.endif - .if ${PORT_OPTIONS:MMPICH} || ${PORT_OPTIONS:MOMPI} CMAKE_ARGS+= -DGMX_MPI:BOOL=ON \ -DMPI_C_COMPILER:FILEPATH="${MPICC}" Modified: head/science/gromacs/distinfo ============================================================================== --- head/science/gromacs/distinfo Tue Dec 17 20:35:25 2013 (r336761) +++ head/science/gromacs/distinfo Tue Dec 17 20:36:38 2013 (r336762) @@ -1,2 +1,2 @@ -SHA256 (gromacs-4.6.4.tar.gz) = 4d4f15e6d10e97aff7a21d3bb5536283cf8ba669589310c456c1bb22bdfe7d8e -SIZE (gromacs-4.6.4.tar.gz) = 10990996 +SHA256 (gromacs-4.6.5.tar.gz) = a7242f315963a111e87fd28795696b1e818ac97479788356c4f73a04e9cdef09 +SIZE (gromacs-4.6.5.tar.gz) = 10991576 From owner-svn-ports-head@FreeBSD.ORG Tue Dec 17 20:41:38 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 8A6AEB30; Tue, 17 Dec 2013 20:41:38 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 5C64F197E; Tue, 17 Dec 2013 20:41:38 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBHKfcGD037856; Tue, 17 Dec 2013 20:41:38 GMT (envelope-from stephen@svn.freebsd.org) Received: (from stephen@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBHKfbn1037852; Tue, 17 Dec 2013 20:41:37 GMT (envelope-from stephen@svn.freebsd.org) Message-Id: <201312172041.rBHKfbn1037852@svn.freebsd.org> From: Stephen Montgomery-Smith Date: Tue, 17 Dec 2013 20:41:37 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r336764 - in head/math/sage: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 17 Dec 2013 20:41:38 -0000 Author: stephen Date: Tue Dec 17 20:41:37 2013 New Revision: 336764 URL: http://svnweb.freebsd.org/changeset/ports/336764 Log: - Update to 5.13. Modified: head/math/sage/Makefile head/math/sage/distinfo head/math/sage/files/spkg-patch-ncurses_-_src_configure head/math/sage/files/spkg-patch-sage_-_doc_common_builder.py Modified: head/math/sage/Makefile ============================================================================== --- head/math/sage/Makefile Tue Dec 17 20:40:24 2013 (r336763) +++ head/math/sage/Makefile Tue Dec 17 20:41:37 2013 (r336764) @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= sage -PORTVERSION= 5.12 -PORTREVISION= 1 +PORTVERSION= 5.13 CATEGORIES= math MASTER_SITES= http://boxen.math.washington.edu/home/sagemath/sage-mirror/src/ \ http://mirrors.xmission.com/sage/src/ \ Modified: head/math/sage/distinfo ============================================================================== --- head/math/sage/distinfo Tue Dec 17 20:40:24 2013 (r336763) +++ head/math/sage/distinfo Tue Dec 17 20:41:37 2013 (r336764) @@ -1,2 +1,2 @@ -SHA256 (sage-5.12.tar) = 2fa615b6d12a951ed4655231cfdec48e362d9fd26ce766415bb08c97d80b58b4 -SIZE (sage-5.12.tar) = 360069120 +SHA256 (sage-5.13.tar) = 6e62495954bdc1c397fa1b7658b2825b4e6d1c26ac12b842a15eab61a5dabc97 +SIZE (sage-5.13.tar) = 361799680 Modified: head/math/sage/files/spkg-patch-ncurses_-_src_configure ============================================================================== --- head/math/sage/files/spkg-patch-ncurses_-_src_configure Tue Dec 17 20:40:24 2013 (r336763) +++ head/math/sage/files/spkg-patch-ncurses_-_src_configure Tue Dec 17 20:41:37 2013 (r336764) @@ -1,5 +1,5 @@ --- ncurses-5.9/src/configure.orig 2013-08-21 02:51:59.000000000 +0000 -+++ ncurses-5.9/src/configure 2013-08-21 02:53:23.000000000 +0000 ++++ ncurses-5.9.p2/src/configure 2013-08-21 02:53:23.000000000 +0000 @@ -5719,7 +5719,7 @@ cf_cv_shared_soname='`basename $@`' fi Modified: head/math/sage/files/spkg-patch-sage_-_doc_common_builder.py ============================================================================== --- head/math/sage/files/spkg-patch-sage_-_doc_common_builder.py Tue Dec 17 20:40:24 2013 (r336763) +++ head/math/sage/files/spkg-patch-sage_-_doc_common_builder.py Tue Dec 17 20:41:37 2013 (r336764) @@ -1,5 +1,5 @@ --- sage-5.8.rc0/doc/common/builder.py-orig 2013-03-17 20:50:38.000000000 +0000 -+++ sage-5.12/doc/common/builder.py 2013-03-17 20:56:42.000000000 +0000 ++++ sage-5.13/doc/common/builder.py 2013-03-17 20:56:42.000000000 +0000 @@ -272,13 +272,16 @@ # build the other documents in parallel From owner-svn-ports-head@FreeBSD.ORG Tue Dec 17 20:42:27 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 4C8CEC25; Tue, 17 Dec 2013 20:42:27 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 38D1019C5; Tue, 17 Dec 2013 20:42:27 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBHKgRkx038018; Tue, 17 Dec 2013 20:42:27 GMT (envelope-from swills@svn.freebsd.org) Received: (from swills@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBHKgQje038015; Tue, 17 Dec 2013 20:42:26 GMT (envelope-from swills@svn.freebsd.org) Message-Id: <201312172042.rBHKgQje038015@svn.freebsd.org> From: Steve Wills Date: Tue, 17 Dec 2013 20:42:26 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r336765 - head/www/node-devel X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 17 Dec 2013 20:42:27 -0000 Author: swills Date: Tue Dec 17 20:42:26 2013 New Revision: 336765 URL: http://svnweb.freebsd.org/changeset/ports/336765 Log: - Update to 0.11.9 PR: ports/184621 Submitted by: Jin-Sih Lin (maintainer) Modified: head/www/node-devel/Makefile head/www/node-devel/distinfo Modified: head/www/node-devel/Makefile ============================================================================== --- head/www/node-devel/Makefile Tue Dec 17 20:41:37 2013 (r336764) +++ head/www/node-devel/Makefile Tue Dec 17 20:42:26 2013 (r336765) @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= node -PORTVERSION= 0.11.8 +PORTVERSION= 0.11.9 CATEGORIES= www MASTER_SITES= http://nodejs.org/dist/v${PORTVERSION}/ PKGNAMESUFFIX= -devel Modified: head/www/node-devel/distinfo ============================================================================== --- head/www/node-devel/distinfo Tue Dec 17 20:41:37 2013 (r336764) +++ head/www/node-devel/distinfo Tue Dec 17 20:42:26 2013 (r336765) @@ -1,2 +1,2 @@ -SHA256 (node-v0.11.8.tar.gz) = 87c809dea764d5d66f925626fba403fb2fb0c0ccfad408bf79fdb62dc246d65b -SIZE (node-v0.11.8.tar.gz) = 14937740 +SHA256 (node-v0.11.9.tar.gz) = cfcab9735a7e04a67671a96a8b0b7e71954c60c586ced5e3fe37d5c1a235b444 +SIZE (node-v0.11.9.tar.gz) = 15258471 From owner-svn-ports-head@FreeBSD.ORG Tue Dec 17 20:45:22 2013 Return-Path: Delivered-To: svn-ports-head@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id EFC83D58; Tue, 17 Dec 2013 20:45:22 +0000 (UTC) Received: from mouf.net (mouf.net [IPv6:2607:fc50:0:4400:216:3eff:fe69:33b3]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 9538819F0; Tue, 17 Dec 2013 20:45:22 +0000 (UTC) Received: from mouf.net (swills@mouf [199.48.129.64]) by mouf.net (8.14.5/8.14.5) with ESMTP id rBHKjCRT071491 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NOT); Tue, 17 Dec 2013 20:45:17 GMT (envelope-from swills@mouf.net) Received: (from swills@localhost) by mouf.net (8.14.5/8.14.5/Submit) id rBHKjCha071490; Tue, 17 Dec 2013 20:45:12 GMT (envelope-from swills) Date: Tue, 17 Dec 2013 20:45:12 +0000 From: Steve Wills To: Andrey Chernov Subject: Re: svn commit: r336721 - in head/net-p2p/litecoin: . files Message-ID: <20131217204509.GB65354@mouf.net> References: <201312171310.rBHDA290070407@svn.freebsd.org> <52B0B23A.90103@freebsd.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <52B0B23A.90103@freebsd.org> User-Agent: Mutt/1.5.21 (2010-09-15) X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.4.3 (mouf.net [199.48.129.64]); Tue, 17 Dec 2013 20:45:17 +0000 (UTC) X-Spam-Status: No, score=0.0 required=4.5 tests=none autolearn=unavailable version=3.3.2 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on mouf.net X-Virus-Scanned: clamav-milter 0.97.8 at mouf.net X-Virus-Status: Clean Cc: svn-ports-head@FreeBSD.org, svn-ports-all@FreeBSD.org, ports-committers@FreeBSD.org X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 17 Dec 2013 20:45:23 -0000 On Wed, Dec 18, 2013 at 12:21:14AM +0400, Andrey Chernov wrote: > On 17.12.2013 17:10, Steve Wills wrote: > > Author: swills > > Date: Tue Dec 17 13:10:02 2013 > > New Revision: 336721 > > URL: http://svnweb.freebsd.org/changeset/ports/336721 > > > > Log: > > - Update to 0.8.6.1 > > > > Added: > > head/net-p2p/litecoin/files/extra-patch-endian (contents, props changed) > > Why you decide to add the same functions as in > /usr/include/sys/endian.h > instead of just including it? I didn't, i added a patch which removes the redundant functions so that the compiler doesn't complain about redefinition. (But only for 10.x and newer, since it only seems necessary there.) Steve > > +-static inline uint32_t be32dec(const void *pp) > > +-{ > > +- const uint8_t *p = (uint8_t const *)pp; > > +- return ((uint32_t)(p[3]) + ((uint32_t)(p[2]) << 8) + > > +- ((uint32_t)(p[1]) << 16) + ((uint32_t)(p[0]) << 24)); > > +-} > > +- > > +-static inline void be32enc(void *pp, uint32_t x) > > +-{ > > +- uint8_t *p = (uint8_t *)pp; > > +- p[3] = x & 0xff; > > +- p[2] = (x >> 8) & 0xff; > > +- p[1] = (x >> 16) & 0xff; > > +- p[0] = (x >> 24) & 0xff; > > +-} > > +- > > + typedef struct HMAC_SHA256Context { > > + SHA256_CTX ictx; > > + SHA256_CTX octx; > > +--- src/scrypt.h.orig 2013-12-09 15:26:17.343282984 +0000 > > ++++ src/scrypt.h 2013-12-09 15:45:11.032205545 +0000 > > +@@ -17,19 +17,4 @@ > > + PBKDF2_SHA256(const uint8_t *passwd, size_t passwdlen, const uint8_t *salt, > > + size_t saltlen, uint64_t c, uint8_t *buf, size_t dkLen); > > + > > +-static inline uint32_t le32dec(const void *pp) > > +-{ > > +- const uint8_t *p = (uint8_t const *)pp; > > +- return ((uint32_t)(p[0]) + ((uint32_t)(p[1]) << 8) + > > +- ((uint32_t)(p[2]) << 16) + ((uint32_t)(p[3]) << 24)); > > +-} > > +- > > +-static inline void le32enc(void *pp, uint32_t x) > > +-{ > > +- uint8_t *p = (uint8_t *)pp; > > +- p[0] = x & 0xff; > > +- p[1] = (x >> 8) & 0xff; > > +- p[2] = (x >> 16) & 0xff; > > +- p[3] = (x >> 24) & 0xff; > > +-} > > + #endif > > From owner-svn-ports-head@FreeBSD.ORG Tue Dec 17 20:49:17 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 12C23F0B; Tue, 17 Dec 2013 20:49:17 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id D93EB1A46; Tue, 17 Dec 2013 20:49:16 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBHKnGwL038834; Tue, 17 Dec 2013 20:49:16 GMT (envelope-from dhn@svn.freebsd.org) Received: (from dhn@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBHKnG04038832; Tue, 17 Dec 2013 20:49:16 GMT (envelope-from dhn@svn.freebsd.org) Message-Id: <201312172049.rBHKnG04038832@svn.freebsd.org> From: Dennis Herrmann Date: Tue, 17 Dec 2013 20:49:16 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r336766 - head/graphics/gocr X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 17 Dec 2013 20:49:17 -0000 Author: dhn Date: Tue Dec 17 20:49:16 2013 New Revision: 336766 URL: http://svnweb.freebsd.org/changeset/ports/336766 Log: - Update to 0.50 - Shorten header - Convert to OptionsNG - Add license - Fix docs PR: ports/177345 Submitted by: nemysis Modified: head/graphics/gocr/Makefile head/graphics/gocr/distinfo Modified: head/graphics/gocr/Makefile ============================================================================== --- head/graphics/gocr/Makefile Tue Dec 17 20:42:26 2013 (r336765) +++ head/graphics/gocr/Makefile Tue Dec 17 20:49:16 2013 (r336766) @@ -2,26 +2,40 @@ # $FreeBSD$ PORTNAME= gocr -PORTVERSION= 0.49 -PORTREVISION= 1 +PORTVERSION= 0.50 CATEGORIES= graphics MASTER_SITES= http://www-e.uni-magdeburg.de/jschulen/ocr/ MAINTAINER= dhn@FreeBSD.org -COMMENT= An OCR (Optical Character Recognition) program +COMMENT= OCR (Optical Character Recognition) program + +LICENSE= GPLv2 LIB_DEPENDS= netpbm.1:${PORTSDIR}/graphics/netpbm -USE_GMAKE= yes GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-netpbm=${LOCALBASE} +USE_GMAKE= yes MAKE_ARGS= prefix=${PREFIX} exec_prefix=${PREFIX} DESTDIR=${DESTDIR} -MAN1= gocr.1 -PORTDOCS= examples.txt gocr.html unicode.txt PLIST_FILES= bin/gocr -.if !defined(WITHOUT_X11) +MAN1= gocr.1 +PORTDOCS= * + +DOCSRCDIR1= ${WRKSRC} +DOC_FILES1= AUTHORS BUGS CREDITS HISTORY README READMEde.txt TODO + +DOCSRCDIR2= ${WRKSRC}/doc +DOCSDIR2= ${DOCSDIR}/doc +DOC_FILES2= *.dtd *.xml *.html *.txt *.fig *.png + +OPTIONS_DEFINE= X11 +OPTIONS_DEFAULT= X11 + +.include + +.if ${PORT_OPTIONS:MX11} USE_TK_WRAPPER= yes PLIST_FILES+= bin/gocr.tcl .endif @@ -29,14 +43,16 @@ PLIST_FILES+= bin/gocr.tcl NO_STAGE= yes post-patch: @${REINPLACE_CMD} -e 's|@LIBS@|-L${LOCALBASE}/lib @LIBS@|g' ${WRKSRC}/src/Makefile.in -.if defined(WITHOUT_X11) +.if ! ${PORT_OPTIONS:MX11} @${REINPLACE_CMD} -e '/gocr.tcl/d' ${WRKSRC}/src/Makefile.in .endif post-install: -.if !defined(NOPORTDOCS) +.if ${PORT_OPTIONS:MDOCS} @${MKDIR} ${DOCSDIR} - @(cd ${WRKSRC}/doc && ${INSTALL_DATA} ${PORTDOCS} ${DOCSDIR}) + ${INSTALL_DATA} ${DOC_FILES1:S|^|${DOCSRCDIR1}/|} ${DOCSDIR} + @${MKDIR} ${DOCSDIR2} + ${INSTALL_DATA} ${DOC_FILES2:S|^|${DOCSRCDIR2}/|} ${DOCSDIR2} .endif .include Modified: head/graphics/gocr/distinfo ============================================================================== --- head/graphics/gocr/distinfo Tue Dec 17 20:42:26 2013 (r336765) +++ head/graphics/gocr/distinfo Tue Dec 17 20:49:16 2013 (r336766) @@ -1,2 +1,2 @@ -SHA256 (gocr-0.49.tar.gz) = cc29931d50b3be11608dc79d1c7d8a20919dbe6313b1ba5dc88ecf99cffd171a -SIZE (gocr-0.49.tar.gz) = 392386 +SHA256 (gocr-0.50.tar.gz) = bc261244f887419cba6d962ec1ad58eefd77176885093c4a43061e7fd565f5b5 +SIZE (gocr-0.50.tar.gz) = 419209 From owner-svn-ports-head@FreeBSD.ORG Tue Dec 17 20:52:00 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id C7FE6DE; Tue, 17 Dec 2013 20:52:00 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id A90F31AB0; Tue, 17 Dec 2013 20:52:00 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBHKq0xb041581; Tue, 17 Dec 2013 20:52:00 GMT (envelope-from dbn@svn.freebsd.org) Received: (from dbn@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBHKpxe5041566; Tue, 17 Dec 2013 20:51:59 GMT (envelope-from dbn@svn.freebsd.org) Message-Id: <201312172051.rBHKpxe5041566@svn.freebsd.org> From: David Naylor Date: Tue, 17 Dec 2013 20:51:59 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r336767 - in head/lang/pypy-devel: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 17 Dec 2013 20:52:00 -0000 Author: dbn Date: Tue Dec 17 20:51:59 2013 New Revision: 336767 URL: http://svnweb.freebsd.org/changeset/ports/336767 Log: Update lang/pypy-devel to development snapshot at 16-Dec-'13. Changes: 1) Fix installation with LOCALBASE!=/usr/local 2) Properly detect the number of CPUs for concurrent builds Notes: 1) The cffi based module _sqlite3.py needs to know where to find sqlite3.h, which is hard-coded into the file, however the '.so' created is based on the checksum of _sqlite3.py that changes when changing the hard-coded path. Change this by properly using the LOCALBASE environment variable. 2) This change does not modify the behaviour of the port as this port runs the compilation stage directly, and correctly, however this change will be upstreamed. Added: head/lang/pypy-devel/files/patch-rpython__config__support.py (contents, props changed) Modified: head/lang/pypy-devel/Makefile head/lang/pypy-devel/distinfo head/lang/pypy-devel/files/Makefile head/lang/pypy-devel/files/patch-lib_pypy___sqlite3.py head/lang/pypy-devel/pkg-plist Modified: head/lang/pypy-devel/Makefile ============================================================================== --- head/lang/pypy-devel/Makefile Tue Dec 17 20:49:16 2013 (r336766) +++ head/lang/pypy-devel/Makefile Tue Dec 17 20:51:59 2013 (r336767) @@ -2,11 +2,12 @@ # $FreeBSD$ PORTNAME= pypy -DISTVERSION= 2.2.1 +DISTVERSION= 2.3-alpha${DATE} CATEGORIES= lang python -MASTER_SITES= http://cdn.bitbucket.org/pypy/pypy/downloads/ https://bitbucket.org/pypy/pypy/downloads/ +MASTER_SITES= https://bitbucket.org/pypy/pypy/get/ LOCAL/dbn/${PORTNAME} PKGNAMESUFFIX= -devel -DISTNAME= ${PORTNAME}-${DISTVERSION}-src +DISTNAME= ${COMMIT} +DIST_SUBDIR= ${PORTNAME} MAINTAINER= dbn@FreeBSD.org COMMENT= Fast, compliant implementation of the Python language @@ -39,12 +40,14 @@ CONFLICTS_INSTALL= pypy-[0-9]* ALL_TARGET= ${PYPY_NAMES} BUILD_WRKSRC= ${WRKDIR} -DATE= 20130810 +COMMIT= 92ff43b19372 +DATE= 20131216 USE_BZIP2= yes USES= compiler:c11 gettext iconv MAKEFILE= ${FILESDIR}/Makefile PKGINSTALL= ${WRKDIR}/pkg-install PKGDEINSTALL= ${WRKDIR}/pkg-deinstall +WRKSRC= ${WRKDIR}/pypy-pypy-${COMMIT} PYPY_VER= ${DISTVERSION:C|([0-9])\.([0-9]).*|\1.\2|} PYTHON_IMPL_VER= 2.7 @@ -60,9 +63,6 @@ PLIST_SUB+= PYPY_LIBDIR=${PYPY_LIBDIR} \ MAKE_ENV+= DISTVERSION=${DISTVERSION} PYTHON_CMD=${PYTHON_CMD} \ WRKSRC=${WRKSRC} PYPY_LOCALBASE=${LOCALBASE} -LOCALBASE_REFIX= \ - lib_pypy/_sqlite3.py - .include .include "${MASTERDIR}/files/bsd.pypy.inst.mk" @@ -229,11 +229,6 @@ post-extract: .endfor ${LN} -s ${WRKDIR}/lib ${WRKSRC}/lib -post-patch: -.for file in ${LOCALBASE_REFIX} - ${REINPLACE_CMD} 's|/usr/local|${LOCALBASE}|g' ${WRKSRC}/${file} -.endfor - do-configure: ${SED} -e 's|%%PREFIX%%|${PREFIX}|g' \ -e 's|%%PYPY_NAMES%%|${PYPY_NAMES}|g' \ @@ -245,7 +240,7 @@ do-configure: post-build: # UPDATING: check pypy/tool/release/package.py for list of cffi modules .for mod in _sqlite3 _curses syslog - ${WRKDIR}/${PYPY_PRIMARY} -c 'import ${mod}' + ${SETENV} ${MAKE_ENV} ${WRKDIR}/${PYPY_PRIMARY} -c 'import ${mod}' .endfor ${STRIP_CMD} ${WRKDIR}/${PYPY_LIBDIR}/lib_pypy/__pycache__/_cffi__*.pypy-${PYPY_VER:C/\.//}.so .for _path in ${PYPYDIRS} Modified: head/lang/pypy-devel/distinfo ============================================================================== --- head/lang/pypy-devel/distinfo Tue Dec 17 20:49:16 2013 (r336766) +++ head/lang/pypy-devel/distinfo Tue Dec 17 20:51:59 2013 (r336767) @@ -1,2 +1,2 @@ -SHA256 (pypy-2.2.1-src.tar.bz2) = 252045187e443656a2beb412dadac9296e8fe8db0f75a66ed5265db58c35035f -SIZE (pypy-2.2.1-src.tar.bz2) = 14439822 +SHA256 (pypy/92ff43b19372.tar.bz2) = 64f4c31f9f609535fcf33fdf33c71524ef9bd0c0e1abff181cc06c0c25985563 +SIZE (pypy/92ff43b19372.tar.bz2) = 14291630 Modified: head/lang/pypy-devel/files/Makefile ============================================================================== --- head/lang/pypy-devel/files/Makefile Tue Dec 17 20:49:16 2013 (r336766) +++ head/lang/pypy-devel/files/Makefile Tue Dec 17 20:51:59 2013 (r336767) @@ -21,7 +21,7 @@ TOUCH?= touch REINPLACE_CMD?= ${SED} -i~ -BUILDDIR= usession-release-${DISTVERSION:C/.[0-9]*$//}.x-0 +BUILDDIR= usession-default-0 .for inst in ${PYPY_INST} Modified: head/lang/pypy-devel/files/patch-lib_pypy___sqlite3.py ============================================================================== --- head/lang/pypy-devel/files/patch-lib_pypy___sqlite3.py Tue Dec 17 20:49:16 2013 (r336766) +++ head/lang/pypy-devel/files/patch-lib_pypy___sqlite3.py Tue Dec 17 20:51:59 2013 (r336767) @@ -1,11 +1,19 @@ ---- lib_pypy/_sqlite3.py.orig 2013-05-18 16:20:00.000000000 +0200 -+++ lib_pypy/_sqlite3.py 2013-05-18 16:21:06.000000000 +0200 -@@ -270,7 +270,7 @@ +--- lib_pypy/_sqlite3.py.bak 2013-12-15 23:45:52.000000000 +0200 ++++ lib_pypy/_sqlite3.py 2013-12-16 12:07:57.000000000 +0200 +@@ -269,11 +269,14 @@ + _ffi.cdef("int sqlite3_enable_load_extension(sqlite3 *db, int onoff);") - _lib = _ffi.verify(""" - #include --""", libraries=['sqlite3'] -+""", libraries=['sqlite3'], include_dirs=['/usr/local/include'], library_dirs=['/usr/local/lib'] - ) - - exported_sqlite_symbols = [ + if sys.platform.startswith('freebsd'): ++ import os ++ import os.path ++ _localbase = os.environ.get('LOCALBASE', '/usr/local') + _lib = _ffi.verify(""" + #include + """, libraries=['sqlite3'], +- include_dirs=['/usr/local/include'], +- library_dirs=['/usr/local/lib'] ++ include_dirs=[os.path.join(_localbase, 'include')], ++ library_dirs=[os.path.join(_localbase, 'lib')] + ) + else: + _lib = _ffi.verify(""" Added: head/lang/pypy-devel/files/patch-rpython__config__support.py ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/lang/pypy-devel/files/patch-rpython__config__support.py Tue Dec 17 20:51:59 2013 (r336767) @@ -0,0 +1,28 @@ +--- ./rpython/config/support.py~ 2013-12-16 12:34:17.000000000 +0200 ++++ ./rpython/config/support.py 2013-12-16 12:33:52.000000000 +0200 +@@ -8,7 +8,9 @@ + if os.environ.get('MAKEFLAGS'): + return 1 # don't override MAKEFLAGS. This will call 'make' without any '-j' option + if sys.platform == 'darwin': +- return darwin_get_cpu_count() ++ return sysctl_get_cpu_count('/usr/sbin/sysctl') ++ elif sys.platform.startswith('freebsd'): ++ return sysctl_get_cpu_count('/sbin/sysctl') + elif not sys.platform.startswith('linux'): + return 1 # implement me + try: +@@ -26,11 +28,10 @@ + except: + return 1 # we really don't want to explode here, at worst we have 1 + +-def darwin_get_cpu_count(cmd = "/usr/sbin/sysctl hw.ncpu"): ++def sysctl_get_cpu_count(cmd, name='hw.ncpu'): + try: +- proc = subprocess.Popen(cmd, stdout=subprocess.PIPE, shell=True) +- # 'hw.ncpu: 20' +- count = proc.communicate()[0].rstrip()[8:] ++ proc = subprocess.Popen([cmd, '-n', name], stdout=subprocess.PIPE) ++ count = proc.communicate()[0] + return int(count) + except (OSError, ValueError): + return 1 Modified: head/lang/pypy-devel/pkg-plist ============================================================================== --- head/lang/pypy-devel/pkg-plist Tue Dec 17 20:49:16 2013 (r336766) +++ head/lang/pypy-devel/pkg-plist Tue Dec 17 20:51:59 2013 (r336767) @@ -1454,9 +1454,9 @@ %%PYPY_LIBDIR%%/lib2to3/tests/test_util.pyc %%PYPY_LIBDIR%%/lib_pypy/__init__.py %%PYPY_LIBDIR%%/lib_pypy/__init__.pyc -%%PYPY_LIBDIR%%/lib_pypy/__pycache__/_cffi__g3e8f69b6x1fd01a91.pypy-%%PYPY_VER%%.so -%%PYPY_LIBDIR%%/lib_pypy/__pycache__/_cffi__g45f34413x310af836.pypy-%%PYPY_VER%%.so -%%PYPY_LIBDIR%%/lib_pypy/__pycache__/_cffi__ga01735dbxad93c709.pypy-%%PYPY_VER%%.so +%%PYPY_LIBDIR%%/lib_pypy/__pycache__/_cffi__g16926e9ax39a3fadd.pypy-%%PYPY_VER%%.so +%%PYPY_LIBDIR%%/lib_pypy/__pycache__/_cffi__g3ed5c373x359e5476.pypy-%%PYPY_VER%%.so +%%PYPY_LIBDIR%%/lib_pypy/__pycache__/_cffi__g8b5895b6x576c1bb2.pypy-%%PYPY_VER%%.so %%PYPY_LIBDIR%%/lib_pypy/_codecs_cn.py %%PYPY_LIBDIR%%/lib_pypy/_codecs_cn.pyc %%PYPY_LIBDIR%%/lib_pypy/_codecs_hk.py From owner-svn-ports-head@FreeBSD.ORG Tue Dec 17 20:56:01 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 6E02256B; Tue, 17 Dec 2013 20:56:01 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 598E21B16; Tue, 17 Dec 2013 20:56:01 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBHKu1aD042171; Tue, 17 Dec 2013 20:56:01 GMT (envelope-from decke@svn.freebsd.org) Received: (from decke@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBHKu1np042167; Tue, 17 Dec 2013 20:56:01 GMT (envelope-from decke@svn.freebsd.org) Message-Id: <201312172056.rBHKu1np042167@svn.freebsd.org> From: Bernhard Froehlich Date: Tue, 17 Dec 2013 20:56:00 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r336768 - in head/emulators/virtualbox-ose: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 17 Dec 2013 20:56:01 -0000 Author: decke Date: Tue Dec 17 20:56:00 2013 New Revision: 336768 URL: http://svnweb.freebsd.org/changeset/ports/336768 Log: - Disable stripping away RPATH on FreeBSD for Hardened-R3 binaries. This fixes the remaining compat9x problems because the virtualbox buildsystem did remove our RPATH on some binaries if hardening is enabled. The hardening is a collection of additional safety checks for all virtualbox suid binaries and is always enabled. Reported by: many FreeBSD 10 users Modified: head/emulators/virtualbox-ose/Makefile head/emulators/virtualbox-ose/files/patch-Config.kmk Modified: head/emulators/virtualbox-ose/Makefile ============================================================================== --- head/emulators/virtualbox-ose/Makefile Tue Dec 17 20:51:59 2013 (r336767) +++ head/emulators/virtualbox-ose/Makefile Tue Dec 17 20:56:00 2013 (r336768) @@ -3,7 +3,7 @@ PORTNAME= virtualbox-ose DISTVERSION= 4.2.20 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= emulators MASTER_SITES= http://download.virtualbox.org/virtualbox/${DISTVERSION}/ \ http://tmp.chruetertee.ch/ \ Modified: head/emulators/virtualbox-ose/files/patch-Config.kmk ============================================================================== --- head/emulators/virtualbox-ose/files/patch-Config.kmk Tue Dec 17 20:51:59 2013 (r336767) +++ head/emulators/virtualbox-ose/files/patch-Config.kmk Tue Dec 17 20:56:00 2013 (r336768) @@ -1,6 +1,6 @@ ---- Config.kmk.orig 2013-10-15 13:01:31.000000000 +0200 -+++ Config.kmk 2013-10-20 14:43:19.015746151 +0200 -@@ -3387,16 +3387,16 @@ +--- Config.kmk.orig 2013-11-28 19:29:52.000000000 +0100 ++++ Config.kmk 2013-12-17 20:15:54.000000000 +0100 +@@ -3260,16 +3260,16 @@ $(VBOX_GCC_WARN) -Wpointer-arith -Winline $(VBOX_GCC_Wno-pointer-sign) $(VBOX_GCC_fdiagnostics-show-option) \ -Wstrict-prototypes -Wmissing-prototypes -Wstrict-prototypes \ -Wimplicit-function-declaration -Werror-implicit-function-declaration \ @@ -20,7 +20,7 @@ $(VBOX_GCC_fno-stack-protector) $(VBOX_GCC_R0_OPT) $(VBOX_GCC_R0_FP) \ -nostdinc TEMPLATE_VBOXR0DRV_CXXFLAGS.x86 = $(TEMPLATE_VBOXR0DRV_CFLAGS.x86) -@@ -3630,8 +3630,6 @@ +@@ -3486,8 +3486,6 @@ /usr/X11R6/include \ /usr/local/include TEMPLATE_VBOXR3EXE_LIBPATH += \ @@ -29,7 +29,16 @@ /usr/local/lib else ifeq ($(KBUILD_TARGET),solaris) TEMPLATE_VBOXR3EXE_TOOL = GXX3PLAIN -@@ -4206,8 +4204,6 @@ +@@ -3670,7 +3668,7 @@ + # not necessary except USE_LIB_PCAP is defined in SUPR3HardenedMain.cpp + # TEMPLATE_VBOXR3HARDENEDEXE_LIBS += cap + endif +-ifn1of ($(KBUILD_TARGET), win os2) ++ifn1of ($(KBUILD_TARGET), win os2 freebsd) + TEMPLATE_VBOXR3HARDENEDEXE_LDFLAGS = $(filter-out '$(VBOX_GCC_RPATH_OPT)%,$(TEMPLATE_VBOXR3EXE_LDFLAGS)) + TEMPLATE_VBOXR3HARDENEDEXE_LDFLAGS.linux = $(filter-out $(VBOX_GCC_ORIGIN_OPT),$(TEMPLATE_VBOXR3EXE_LDFLAGS.linux)) + endif +@@ -3976,8 +3974,6 @@ /usr/X11R6/include \ /usr/local/include TEMPLATE_VBOXMAINEXE_LIBPATH += \ @@ -38,7 +47,7 @@ /usr/local/lib else ifeq ($(KBUILD_TARGET),solaris) TEMPLATE_VBOXMAINEXE_TOOL = GXX3PLAIN -@@ -4673,8 +4669,6 @@ +@@ -4392,8 +4388,6 @@ /usr/X11R6/include \ /usr/local/include TEMPLATE_VBOXQT4GUIEXE_LIBPATH += \ @@ -47,7 +56,7 @@ /usr/local/lib endif ifeq ($(KBUILD_TARGET),solaris) -@@ -4869,8 +4863,6 @@ +@@ -4576,8 +4570,6 @@ /usr/X11R6/include \ /usr/local/include TEMPLATE_VBOXBLDPROG_LIBPATH += \ From owner-svn-ports-head@FreeBSD.ORG Tue Dec 17 20:56:45 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 33A81654; Tue, 17 Dec 2013 20:56:45 +0000 (UTC) Received: from mailrelay011.isp.belgacom.be (mailrelay011.isp.belgacom.be [195.238.6.178]) by mx1.freebsd.org (Postfix) with ESMTP id 769011B22; Tue, 17 Dec 2013 20:56:44 +0000 (UTC) X-Belgacom-Dynamic: yes X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: ApwGAPa5sFJR8mk//2dsb2JhbABZgwo4uUGBIBd0giUBAQEEOhwjEAsYCSUPKh4GLodtAcljF446WAeENgEDmBWBMZBkgyw7gSw Received: from 63.105-242-81.adsl-dyn.isp.belgacom.be (HELO kalimero.tijl.coosemans.org) ([81.242.105.63]) by relay.skynet.be with ESMTP; 17 Dec 2013 21:55:34 +0100 Received: from kalimero.tijl.coosemans.org (kalimero.tijl.coosemans.org [127.0.0.1]) by kalimero.tijl.coosemans.org (8.14.7/8.14.7) with ESMTP id rBHKtXK7021324; Tue, 17 Dec 2013 21:55:33 +0100 (CET) (envelope-from tijl@FreeBSD.org) Date: Tue, 17 Dec 2013 21:55:33 +0100 From: Tijl Coosemans To: Gerald Pfeifer Subject: Re: svn commit: r336343 - in head: . Mk/Uses Message-ID: <20131217215533.3c0d9fcb@kalimero.tijl.coosemans.org> In-Reply-To: References: <201312131322.rBDDMWZC038800@svn.freebsd.org> MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Cc: svn-ports-head@freebsd.org, svn-ports-all@freebsd.org, ports-committers@freebsd.org X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 17 Dec 2013 20:56:45 -0000 On Mon, 16 Dec 2013 09:54:33 +0100 (CET) Gerald Pfeifer wrote: > On Fri, 13 Dec 2013, Tijl Coosemans wrote: >> Log: >> New USES=fortran to replace USE_FORTRAN. > > I was already surprised when Bapt introduced USES=compiler and later > made changes to the default version of GCC there without ever giving > me a heads up. Now USE_FORTRAN, which I maintain, is being replaced > without you reaching out to me. > > And there is an aweful lot of redundancy and even some inconsistency now. > > Not that I oppose in principle, or would have, but a little bit more > communications and collaboration would be nice. > > Gerald (sad) > > > PS: I'm starting vacation as we speak and will have limited connectivity > the coming weeks, and likely none from the 17th to the 27th. It was discussed on current@ (libc++ vs. libstdc++ usage in the ports tree) and I CCed you when I had analysed the problem but apparently not when I submitted a patch. Sorry about that. The reason I chose to create USES=fortran is because several other languages already use the USES framework and because the solution to the Octave problem was to separate the selection of the Fortran compiler from the selection of the C/C++ compiler. To address the redundancy I think there are a number of things we can do: - I expect converting Fortran ports will be relatively straightforward so the Fortran bits in bsd.gcc.mk can eventually be removed. - Maybe the C/C++ bits in bsd.gcc.mk can be moved to compiler.mk? I like the way compiler.mk is built around features instead of versions. - Use the bsd.default-versions.mk framework to set GCC_DEFAULT. This allows users to set their preferred version of GCC in make.conf and provides a central place where both fortran.mk and compiler.mk can pick up the default GCC version instead of each having it hardcoded. From owner-svn-ports-head@FreeBSD.ORG Tue Dec 17 20:57:25 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id D5D44744; Tue, 17 Dec 2013 20:57:25 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id C28341B31; Tue, 17 Dec 2013 20:57:25 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBHKvPsq042385; Tue, 17 Dec 2013 20:57:25 GMT (envelope-from tijl@svn.freebsd.org) Received: (from tijl@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBHKvPvi042383; Tue, 17 Dec 2013 20:57:25 GMT (envelope-from tijl@svn.freebsd.org) Message-Id: <201312172057.rBHKvPvi042383@svn.freebsd.org> From: Tijl Coosemans Date: Tue, 17 Dec 2013 20:57:25 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r336769 - head/astro/nightfall X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 17 Dec 2013 20:57:25 -0000 Author: tijl Date: Tue Dec 17 20:57:25 2013 New Revision: 336769 URL: http://svnweb.freebsd.org/changeset/ports/336769 Log: USES=fortran and staging. Modified: head/astro/nightfall/Makefile head/astro/nightfall/pkg-plist Modified: head/astro/nightfall/Makefile ============================================================================== --- head/astro/nightfall/Makefile Tue Dec 17 20:56:00 2013 (r336768) +++ head/astro/nightfall/Makefile Tue Dec 17 20:57:25 2013 (r336769) @@ -14,7 +14,6 @@ OPTIONS_DEFINE= GNOME PGPLOT OPENGL OPTIONS_DEFAULT= PGPLOT OPENGL PGPLOT_DESC= Enable PGPLOT support -NO_STAGE= yes USES= gmake pathfix gettext perl5 USE_GNOME= gnomehier gtk20 GNU_CONFIGURE= yes @@ -22,8 +21,6 @@ CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib CONFIGURE_ARGS= --with-locale-prefix=${PREFIX}/share/locale -MAN1= nightfall.1 - .include .if ${PORT_OPTIONS:MGNOMEUI} @@ -38,7 +35,7 @@ PLIST_SUB+= GNOMEUI="@comment " .if ${PORT_OPTIONS:MPGPLOT} LIB_DEPENDS+= libpgplot.so:${PORTSDIR}/graphics/pgplot -USE_FORTRAN= yes +USES+= fortran CONFIGURE_ARGS+= --with-pgplot-include=${LOCALBASE}/include \ --with-pgplot-lib=${LOCALBASE}/lib .else @@ -61,6 +58,6 @@ post-patch: post-install: ${INSTALL_DATA} ${WRKSRC}/nightfall.desktop \ - ${PREFIX}/share/applications + ${STAGEDIR}${PREFIX}/share/applications .include Modified: head/astro/nightfall/pkg-plist ============================================================================== --- head/astro/nightfall/pkg-plist Tue Dec 17 20:56:00 2013 (r336768) +++ head/astro/nightfall/pkg-plist Tue Dec 17 20:57:25 2013 (r336769) @@ -1,4 +1,5 @@ bin/nightfall +man/man1/nightfall.1.gz share/applications/nightfall.desktop %%GNOMEUI%%share/gnome/help/nightfall/C/nightfall.xml %%GNOMEUI%%share/gnome/help/nightfall/de/nightfall.xml From owner-svn-ports-head@FreeBSD.ORG Tue Dec 17 21:00:54 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id C58A8889; Tue, 17 Dec 2013 21:00:54 +0000 (UTC) Received: from mail-wg0-x22e.google.com (mail-wg0-x22e.google.com [IPv6:2a00:1450:400c:c00::22e]) (using TLSv1 with cipher ECDHE-RSA-RC4-SHA (128/128 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id DF1A21CB2; Tue, 17 Dec 2013 21:00:53 +0000 (UTC) Received: by mail-wg0-f46.google.com with SMTP id m15so6506319wgh.1 for ; Tue, 17 Dec 2013 13:00:52 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:date:from:to:cc:subject:message-id:references:mime-version :content-type:content-disposition:in-reply-to:user-agent; bh=p4haZtBMcuxqnGT48mfm6BUPnJXrbJBJFWGV/49tZrE=; b=Q9pe2ALSy3WM0AekW96eWhO3EBE0t4SPvuMxi1Y47P0FC8ezlgF/fVckBjx/LNZ+M0 ZGGNwkWJRkMhyosc9Jq1siqFDmrFhRvKxaplKQ7XfLvGLnbncup8yw5kmzWs1n50poON /RIQcLrjmqZvy/oGv+a/6x3CslBgKabRt8pPoi1AK1MhEz0AL0lxSZYw/kd5xwS9VuF3 SKaUNFTBD5LpSASD9UXeeDxYj8xUK8pRAqW2OMiBJ0vVkwdhSn4LXJ8wNSuzSQ5BnCCj snd6XgGz2pfbXLdUROfr+xWS8uJU0T7RR4iOR8A/ZcBuucfwv5KU4wIwdiAClUyYKJml oksA== X-Received: by 10.180.77.49 with SMTP id p17mr4935294wiw.30.1387314051866; Tue, 17 Dec 2013 13:00:51 -0800 (PST) Received: from ithaqua.etoilebsd.net (ithaqua.etoilebsd.net. [37.59.37.188]) by mx.google.com with ESMTPSA id el8sm21276414wic.8.2013.12.17.13.00.50 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Tue, 17 Dec 2013 13:00:50 -0800 (PST) Sender: Baptiste Daroussin Date: Tue, 17 Dec 2013 22:00:48 +0100 From: Baptiste Daroussin To: Tijl Coosemans Subject: Re: svn commit: r336343 - in head: . Mk/Uses Message-ID: <20131217210048.GM99753@ithaqua.etoilebsd.net> References: <201312131322.rBDDMWZC038800@svn.freebsd.org> <20131217215533.3c0d9fcb@kalimero.tijl.coosemans.org> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="YS7t75H5cNTCpbja" Content-Disposition: inline In-Reply-To: <20131217215533.3c0d9fcb@kalimero.tijl.coosemans.org> User-Agent: Mutt/1.5.21 (2010-09-15) Cc: svn-ports-head@freebsd.org, svn-ports-all@freebsd.org, Gerald Pfeifer , ports-committers@freebsd.org X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 17 Dec 2013 21:00:54 -0000 --YS7t75H5cNTCpbja Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Tue, Dec 17, 2013 at 09:55:33PM +0100, Tijl Coosemans wrote: > On Mon, 16 Dec 2013 09:54:33 +0100 (CET) Gerald Pfeifer wrote: > > On Fri, 13 Dec 2013, Tijl Coosemans wrote: > >> Log: > >> New USES=3Dfortran to replace USE_FORTRAN. > >=20 > > I was already surprised when Bapt introduced USES=3Dcompiler and later > > made changes to the default version of GCC there without ever giving=20 > > me a heads up. Now USE_FORTRAN, which I maintain, is being replaced=20 > > without you reaching out to me. > >=20 > > And there is an aweful lot of redundancy and even some inconsistency no= w. > >=20 > > Not that I oppose in principle, or would have, but a little bit more=20 > > communications and collaboration would be nice. > >=20 > > Gerald (sad) > >=20 > >=20 > > PS: I'm starting vacation as we speak and will have limited connectivity > > the coming weeks, and likely none from the 17th to the 27th. >=20 > It was discussed on current@ (libc++ vs. libstdc++ usage in the ports > tree) and I CCed you when I had analysed the problem but apparently not > when I submitted a patch. Sorry about that. >=20 > The reason I chose to create USES=3Dfortran is because several other > languages already use the USES framework and because the solution to > the Octave problem was to separate the selection of the Fortran > compiler from the selection of the C/C++ compiler. >=20 > To address the redundancy I think there are a number of things we > can do: > - I expect converting Fortran ports will be relatively straightforward > so the Fortran bits in bsd.gcc.mk can eventually be removed. > - Maybe the C/C++ bits in bsd.gcc.mk can be moved to compiler.mk? I > like the way compiler.mk is built around features instead of versions. > - Use the bsd.default-versions.mk framework to set GCC_DEFAULT. This > allows users to set their preferred version of GCC in make.conf and > provides a central place where both fortran.mk and compiler.mk can > pick up the default GCC version instead of each having it hardcoded. I would love to see all of the above happening regards, Bapt --YS7t75H5cNTCpbja Content-Type: application/pgp-signature -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.15 (FreeBSD) iEYEARECAAYFAlKwu4AACgkQ8kTtMUmk6EwX9wCeLVL2gSKVlaqxzAxgOr0U8Ow9 DZYAnRKZWvtZcJIO8RuRKHPFfaM9KbGM =UuMT -----END PGP SIGNATURE----- --YS7t75H5cNTCpbja-- From owner-svn-ports-head@FreeBSD.ORG Tue Dec 17 21:11:22 2013 Return-Path: Delivered-To: svn-ports-head@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id F1959A79; Tue, 17 Dec 2013 21:11:21 +0000 (UTC) Received: from gw.catspoiler.org (gw.catspoiler.org [75.1.14.242]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id B71431D6F; Tue, 17 Dec 2013 21:11:21 +0000 (UTC) Received: from FreeBSD.org (mousie.catspoiler.org [192.168.101.2]) by gw.catspoiler.org (8.13.3/8.13.3) with ESMTP id rBHLB6ss076024; Tue, 17 Dec 2013 13:11:10 -0800 (PST) (envelope-from truckman@FreeBSD.org) Message-Id: <201312172111.rBHLB6ss076024@gw.catspoiler.org> Date: Tue, 17 Dec 2013 13:11:06 -0800 (PST) From: Don Lewis Subject: Re: svn commit: r336187 - in head/databases: akonadi akonadi-googledata couchdb cppdb cyrus-imspd dbtool evolution-data-server firebird20-server firebird21-server firebird25-server freetds freetds-deve... To: bapt@FreeBSD.org In-Reply-To: <201312111808.rBBI8rH4083498@svn.freebsd.org> MIME-Version: 1.0 Content-Type: TEXT/plain; charset=us-ascii Cc: svn-ports-head@FreeBSD.org, svn-ports-all@FreeBSD.org, ports-committers@FreeBSD.org X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 17 Dec 2013 21:11:22 -0000 On 11 Dec, Baptiste Daroussin wrote: > Author: bapt > Date: Wed Dec 11 18:08:52 2013 > New Revision: 336187 > URL: http://svnweb.freebsd.org/changeset/ports/336187 > > Log: > In preparation for making libtool generate libraries with a sane name, fix all > LIB_DEPENDS in databases > > Modified: head/databases/evolution-data-server/Makefile > ============================================================================== > --- head/databases/evolution-data-server/Makefile Wed Dec 11 18:05:34 2013 (r336186) > +++ head/databases/evolution-data-server/Makefile Wed Dec 11 18:08:52 2013 (r336187) > @@ -12,13 +12,13 @@ DIST_SUBDIR= gnome2 > MAINTAINER= gnome@FreeBSD.org > COMMENT= The data backends for the Evolution integrated mail/PIM suite > > -LIB_DEPENDS= soup-2.4:${PORTSDIR}/devel/libsoup \ > - gdata.7:${PORTSDIR}/devel/libgdata \ > - dbus-glib-1:${PORTSDIR}/devel/dbus-glib \ > - ical:${PORTSDIR}/devel/libical \ > - nss3:${PORTSDIR}/security/nss \ > - tasn1:${PORTSDIR}/security/libtasn1 \ > - gnome-keyring:${PORTSDIR}/security/libgnome-keyring > +LIB_DEPENDS= libsoup-2.so:${PORTSDIR}/devel/libsoup \ > + libgdata.so:${PORTSDIR}/devel/libgdata \ > + libdbus-glib-1.so:${PORTSDIR}/devel/dbus-glib \ > + libical.so:${PORTSDIR}/devel/libical \ > + libnss3.so:${PORTSDIR}/security/nss \ > + libtasn1.so:${PORTSDIR}/security/libtasn1 \ > + libgnome-keyring.so:${PORTSDIR}/security/libgnome-keyring > > USE_BZIP2= yes > USE_GMAKE= yes > @@ -52,7 +52,7 @@ KRB5_LIB= `/usr/bin/krb5-config gssapi > .endif > > .if ${PORT_OPTIONS:MWEATHER} > -LIB_DEPENDS+= gweather:${PORTSDIR}/net/libgweather > +LIB_DEPENDS+= libgweather.so:${PORTSDIR}/net/libgweather > CONFIGURE_ARGS+= --with-weather > PLIST_SUB+= WEATHER="" > .else > This broke evolution-data-server, and it is still broken as of r336693. The devel/libsoup port installs these libraries: -rw-r--r-- 1 root wheel 845900 Dec 17 02:59 /usr/local/lib/libsoup-2.4.a -rwxr-xr-x 1 root wheel 1229 Dec 17 02:59 /usr/local/lib/libsoup-2.4.la lrwxr-xr-x 1 root wheel 16 Dec 17 02:59 /usr/local/lib/libsoup-2.4.so -> libsoup-2.4.so.1 -rwxr-xr-x 1 root wheel 689498 Dec 17 02:59 /usr/local/lib/libsoup-2.4.so.1 but evolution-data-server is looking for libsoup-2.so. It doesn't find it and tries to reinstall devel/libsoup, which doesn't help. ---> Reinstalling 'evolution-data-server-2.32.1_5' (databases/evolution-data-server) ---> Building '/usr/ports/databases/evolution-data-server' ===> Cleaning for libsoup-2.40.3_2 ===> Cleaning for evolution-data-server-2.32.1_5 ===> Found saved configuration for evolution-data-server-2.32.1_1 ===> evolution-data-server-2.32.1_5 depends on file: /usr/local/sbin/pkg - found ===> Fetching all distfiles required by evolution-data-server-2.32.1_5 for building ===> Extracting for evolution-data-server-2.32.1_5 => SHA256 Checksum OK for gnome2/evolution-data-server-2.32.1.tar.bz2. ===> Patching for evolution-data-server-2.32.1_5 ===> evolution-data-server-2.32.1_5 depends on package: libtool>=2.4 - found ===> evolution-data-server-2.32.1_5 depends on package: libtool>=2.4 - found ===> Applying FreeBSD patches for evolution-data-server-2.32.1_5 ===> evolution-data-server-2.32.1_5 depends on executable: bison - found ===> evolution-data-server-2.32.1_5 depends on executable: pkgconf - found ===> evolution-data-server-2.32.1_5 depends on executable: gmake - found ===> evolution-data-server-2.32.1_5 depends on package: libtool>=2.4 - found ===> evolution-data-server-2.32.1_5 depends on file: /usr/local/bin/intltool-extract - found ===> evolution-data-server-2.32.1_5 depends on shared library: libsoup-2.so - not found ===> Verifying for libsoup-2.so in /usr/ports/devel/libsoup ===> libsoup-2.40.3_2 depends on file: /usr/local/sbin/pkg - found ===> Fetching all distfiles required by libsoup-2.40.3_2 for building ===> Extracting for libsoup-2.40.3_2 => SHA256 Checksum OK for gnome2/libsoup-2.40.3.tar.xz. ===> Patching for libsoup-2.40.3_2 ===> libsoup-2.40.3_2 depends on package: libtool>=2.4 - found ===> Applying FreeBSD patches for libsoup-2.40.3_2 [snip] ===> Installing for libsoup-2.40.3_2 ===> libsoup-2.40.3_2 depends on package: glib-networking>=2.29.18 - found ===> libsoup-2.40.3_2 depends on file: /usr/local/etc/mtree/BSD.gnome.dist - found ===> Generating temporary packing list ===> Checking if devel/libsoup already installed ===> libsoup-2.40.3_2 is already installed You may wish to ``make deinstall'' and install this port again by ``make reinstall'' to upgrade it properly. If you really wish to overwrite the old port of devel/libsoup without deleting it first, set the variable "FORCE_PKG_REGISTER" in your environment or the "make install" command line. *** Error code 1 Stop. make[2]: stopped in /usr/ports/devel/libsoup *** Error code 1 Stop. make[1]: stopped in /usr/ports/databases/evolution-data-server *** Error code 1 Stop. make: stopped in /usr/ports/databases/evolution-data-server From owner-svn-ports-head@FreeBSD.ORG Tue Dec 17 21:24:18 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 62F22EA6; Tue, 17 Dec 2013 21:24:18 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 4E9391E65; Tue, 17 Dec 2013 21:24:18 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBHLOITx053054; Tue, 17 Dec 2013 21:24:18 GMT (envelope-from tijl@svn.freebsd.org) Received: (from tijl@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBHLOIq7053053; Tue, 17 Dec 2013 21:24:18 GMT (envelope-from tijl@svn.freebsd.org) Message-Id: <201312172124.rBHLOIq7053053@svn.freebsd.org> From: Tijl Coosemans Date: Tue, 17 Dec 2013 21:24:18 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r336770 - head/biology/ortep3 X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 17 Dec 2013 21:24:18 -0000 Author: tijl Date: Tue Dec 17 21:24:17 2013 New Revision: 336770 URL: http://svnweb.freebsd.org/changeset/ports/336770 Log: USES=fortran, fix LDFLAGS, staging. Modified: head/biology/ortep3/Makefile Modified: head/biology/ortep3/Makefile ============================================================================== --- head/biology/ortep3/Makefile Tue Dec 17 20:57:25 2013 (r336769) +++ head/biology/ortep3/Makefile Tue Dec 17 21:24:17 2013 (r336770) @@ -15,11 +15,11 @@ COMMENT= Oak Ridge Thermal Ellipsoid Plo PGPLOT_LIB_DEPENDS= libpgplot.so:${PORTSDIR}/graphics/pgplot -USE_FORTRAN= yes +USES= fortran WRKSRC= ${WRKDIR}/ortep/src -MAKE_ARGS= LFLAGS="${LFLAGS}" +MAKE_ARGS= LFLAGS="${LDFLAGS}" -PGPLOT_LFLAGS= -L${LOCALBASE}/lib -lpgplot -lX11 +PGPLOT_LDFLAGS= -L${LOCALBASE}/lib -lpgplot -lX11 PLIST_FILES+= bin/ortep3 PORTDOCS= * @@ -28,7 +28,6 @@ PORTEXAMPLES= * OPTIONS_DEFINE= DOCS EXAMPLES PGPLOT PGPLOT_DESC= Fortran subroutine package for drawing graphs -NO_STAGE= yes .include .if ${PORT_OPTIONS:MPGPLOT} @@ -43,16 +42,16 @@ pre-build: ${CP} ${FILESDIR}/Makefile.ortep3 ${WRKSRC}/Makefile do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/ortep3 ${PREFIX}/bin + ${INSTALL_PROGRAM} ${WRKSRC}/ortep3 ${STAGEDIR}${PREFIX}/bin .if ${PORT_OPTIONS:MDOCS} - @${MKDIR} ${DOCSDIR}/src - ${INSTALL_DATA} ${WRKSRC}/../README.1st ${DOCSDIR} - ${INSTALL_DATA} ${WRKSRC}/../man/* ${DOCSDIR} - ${INSTALL_DATA} ${WRKSRC}/000readme.txt ${DOCSDIR}/src + ${MKDIR} ${STAGEDIR}${DOCSDIR}/src + ${INSTALL_DATA} ${WRKSRC}/../README.1st ${STAGEDIR}${DOCSDIR} + ${INSTALL_DATA} ${WRKSRC}/../man/* ${STAGEDIR}${DOCSDIR} + ${INSTALL_DATA} ${WRKSRC}/000readme.txt ${STAGEDIR}${DOCSDIR}/src .endif .if ${PORT_OPTIONS:MEXAMPLES} - @${MKDIR} ${EXAMPLESDIR} - ${INSTALL_DATA} ${WRKSRC}/../examples/* ${EXAMPLESDIR} + ${MKDIR} ${STAGEDIR}${EXAMPLESDIR} + ${INSTALL_DATA} ${WRKSRC}/../examples/* ${STAGEDIR}${EXAMPLESDIR} .endif .include From owner-svn-ports-head@FreeBSD.ORG Tue Dec 17 21:30:56 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id CE8D225C; Tue, 17 Dec 2013 21:30:56 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id BAB241F06; Tue, 17 Dec 2013 21:30:56 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBHLUuZi056164; Tue, 17 Dec 2013 21:30:56 GMT (envelope-from bapt@svn.freebsd.org) Received: (from bapt@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBHLUuuW056163; Tue, 17 Dec 2013 21:30:56 GMT (envelope-from bapt@svn.freebsd.org) Message-Id: <201312172130.rBHLUuuW056163@svn.freebsd.org> From: Baptiste Daroussin Date: Tue, 17 Dec 2013 21:30:56 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r336771 - head/databases/evolution-data-server X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 17 Dec 2013 21:30:56 -0000 Author: bapt Date: Tue Dec 17 21:30:56 2013 New Revision: 336771 URL: http://svnweb.freebsd.org/changeset/ports/336771 Log: Fix LIB_DEPENDS conversion Reported by: truckman Modified: head/databases/evolution-data-server/Makefile Modified: head/databases/evolution-data-server/Makefile ============================================================================== --- head/databases/evolution-data-server/Makefile Tue Dec 17 21:24:17 2013 (r336770) +++ head/databases/evolution-data-server/Makefile Tue Dec 17 21:30:56 2013 (r336771) @@ -12,7 +12,7 @@ DIST_SUBDIR= gnome2 MAINTAINER= gnome@FreeBSD.org COMMENT= The data backends for the Evolution integrated mail/PIM suite -LIB_DEPENDS= libsoup-2.so:${PORTSDIR}/devel/libsoup \ +LIB_DEPENDS= libsoup-2.4.so:${PORTSDIR}/devel/libsoup \ libgdata.so:${PORTSDIR}/devel/libgdata \ libdbus-glib-1.so:${PORTSDIR}/devel/dbus-glib \ libical.so:${PORTSDIR}/devel/libical \ From owner-svn-ports-head@FreeBSD.ORG Tue Dec 17 21:32:07 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 53BAB4F2; Tue, 17 Dec 2013 21:32:07 +0000 (UTC) Received: from mail-wg0-x233.google.com (mail-wg0-x233.google.com [IPv6:2a00:1450:400c:c00::233]) (using TLSv1 with cipher ECDHE-RSA-RC4-SHA (128/128 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 564021F21; Tue, 17 Dec 2013 21:32:06 +0000 (UTC) Received: by mail-wg0-f51.google.com with SMTP id b13so6555959wgh.6 for ; Tue, 17 Dec 2013 13:32:04 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:date:from:to:cc:subject:message-id:references:mime-version :content-type:content-disposition:in-reply-to:user-agent; bh=t+4KWZOKwutoa0iUyfYqNal7PuVE/zMY2GV2g9kw6jE=; b=O3eEXBE9qHs2K2mePolHxJ18AftF0Gz+vXnshTpjCD572jE4Ek7hNUR5lJQr4+Xk1s Q4ual+L9UJfLCMOUTDSZVNK1pK6f/f3cElyKUfu1pKevtGf+sGggq8iOrwjSOW0LvmJC 2BLBA7ksnXoFI0e7F/+FfcGCr7w8Vftfop681XChaax8lA5LwAiFLkB1xr+nEsDZ6Ww6 +7IhGqz3DuyJxFRSkmsE2uEAZLMhpp4o9imuusivX2kIi3sdDRI9IUlb0ol+dLt1CBBS 3sEvmnzFjmFJyY5sAnY0OzGVgpYk90HPB7mmpTfFutgEEKUlhpUbkjxrDeI/P/vSvSMd E7uA== X-Received: by 10.180.12.146 with SMTP id y18mr5079791wib.37.1387315924690; Tue, 17 Dec 2013 13:32:04 -0800 (PST) Received: from ithaqua.etoilebsd.net (ithaqua.etoilebsd.net. [37.59.37.188]) by mx.google.com with ESMTPSA id p9sm37984767wia.10.2013.12.17.13.32.03 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Tue, 17 Dec 2013 13:32:03 -0800 (PST) Sender: Baptiste Daroussin Date: Tue, 17 Dec 2013 22:32:01 +0100 From: Baptiste Daroussin To: Don Lewis Subject: Re: svn commit: r336187 - in head/databases: akonadi akonadi-googledata couchdb cppdb cyrus-imspd dbtool evolution-data-server firebird20-server firebird21-server firebird25-server freetds freetds-deve... Message-ID: <20131217213201.GO99753@ithaqua.etoilebsd.net> References: <201312111808.rBBI8rH4083498@svn.freebsd.org> <201312172111.rBHLB6ss076024@gw.catspoiler.org> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="4ickEXl+ukcSQ/3E" Content-Disposition: inline In-Reply-To: <201312172111.rBHLB6ss076024@gw.catspoiler.org> User-Agent: Mutt/1.5.21 (2010-09-15) Cc: svn-ports-head@FreeBSD.org, svn-ports-all@FreeBSD.org, ports-committers@FreeBSD.org X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 17 Dec 2013 21:32:07 -0000 --4ickEXl+ukcSQ/3E Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Tue, Dec 17, 2013 at 01:11:06PM -0800, Don Lewis wrote: > On 11 Dec, Baptiste Daroussin wrote: > > Author: bapt > > Date: Wed Dec 11 18:08:52 2013 > > New Revision: 336187 > > URL: http://svnweb.freebsd.org/changeset/ports/336187 > >=20 > > Log: > > In preparation for making libtool generate libraries with a sane name= , fix all > > LIB_DEPENDS in databases > >=20 >=20 > > Modified: head/databases/evolution-data-server/Makefile > > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D > > --- head/databases/evolution-data-server/Makefile Wed Dec 11 18:05:34 2= 013 (r336186) > > +++ head/databases/evolution-data-server/Makefile Wed Dec 11 18:08:52 2= 013 (r336187) > > @@ -12,13 +12,13 @@ DIST_SUBDIR=3D gnome2 > > MAINTAINER=3D gnome@FreeBSD.org > > COMMENT=3D The data backends for the Evolution integrated mail/PIM sui= te > > =20 > > -LIB_DEPENDS=3D soup-2.4:${PORTSDIR}/devel/libsoup \ > > - gdata.7:${PORTSDIR}/devel/libgdata \ > > - dbus-glib-1:${PORTSDIR}/devel/dbus-glib \ > > - ical:${PORTSDIR}/devel/libical \ > > - nss3:${PORTSDIR}/security/nss \ > > - tasn1:${PORTSDIR}/security/libtasn1 \ > > - gnome-keyring:${PORTSDIR}/security/libgnome-keyring > > +LIB_DEPENDS=3D libsoup-2.so:${PORTSDIR}/devel/libsoup \ > > + libgdata.so:${PORTSDIR}/devel/libgdata \ > > + libdbus-glib-1.so:${PORTSDIR}/devel/dbus-glib \ > > + libical.so:${PORTSDIR}/devel/libical \ > > + libnss3.so:${PORTSDIR}/security/nss \ > > + libtasn1.so:${PORTSDIR}/security/libtasn1 \ > > + libgnome-keyring.so:${PORTSDIR}/security/libgnome-keyring > > =20 > > USE_BZIP2=3D yes > > USE_GMAKE=3D yes > > @@ -52,7 +52,7 @@ KRB5_LIB=3D `/usr/bin/krb5-config gssapi=20 > > .endif > > =20 > > .if ${PORT_OPTIONS:MWEATHER} > > -LIB_DEPENDS+=3D gweather:${PORTSDIR}/net/libgweather > > +LIB_DEPENDS+=3D libgweather.so:${PORTSDIR}/net/libgweather > > CONFIGURE_ARGS+=3D --with-weather > > PLIST_SUB+=3D WEATHER=3D"" > > .else > >=20 >=20 > This broke evolution-data-server, and it is still broken as of r336693. > The devel/libsoup port installs these libraries: Fixed sorry about it regards, Bapt --4ickEXl+ukcSQ/3E Content-Type: application/pgp-signature -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.15 (FreeBSD) iEYEARECAAYFAlKwwtEACgkQ8kTtMUmk6EyTvgCeNlrnz3aI232DvQKS/IJW/lU8 yMIAniaI1vqoCfO2sRTNiKUW5i29qFmQ =oZB4 -----END PGP SIGNATURE----- --4ickEXl+ukcSQ/3E-- From owner-svn-ports-head@FreeBSD.ORG Tue Dec 17 21:44:59 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 526D5BDE; Tue, 17 Dec 2013 21:44:59 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 3D8351FF5; Tue, 17 Dec 2013 21:44:59 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBHLixZN060302; Tue, 17 Dec 2013 21:44:59 GMT (envelope-from decke@svn.freebsd.org) Received: (from decke@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBHLiwxF060300; Tue, 17 Dec 2013 21:44:58 GMT (envelope-from decke@svn.freebsd.org) Message-Id: <201312172144.rBHLiwxF060300@svn.freebsd.org> From: Bernhard Froehlich Date: Tue, 17 Dec 2013 21:44:58 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r336773 - in head/emulators/virtualbox-ose-legacy: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 17 Dec 2013 21:44:59 -0000 Author: decke Date: Tue Dec 17 21:44:58 2013 New Revision: 336773 URL: http://svnweb.freebsd.org/changeset/ports/336773 Log: - Disable stripping away RPATH on FreeBSD for Hardened-R3 binaries. This fixes the remaining compat9x problems because the virtualbox buildsystem did remove our RPATH on some binaries if hardening is enabled. The hardening is a collection of additional safety checks for all virtualbox suid binaries and is always enabled. Reported by: many FreeBSD 10 users Modified: head/emulators/virtualbox-ose-legacy/Makefile head/emulators/virtualbox-ose-legacy/files/patch-Config.kmk Modified: head/emulators/virtualbox-ose-legacy/Makefile ============================================================================== --- head/emulators/virtualbox-ose-legacy/Makefile Tue Dec 17 21:35:37 2013 (r336772) +++ head/emulators/virtualbox-ose-legacy/Makefile Tue Dec 17 21:44:58 2013 (r336773) @@ -3,6 +3,7 @@ PORTNAME= virtualbox-ose DISTVERSION= 4.2.20 +PORTREVISION= 1 CATEGORIES= emulators MASTER_SITES= http://download.virtualbox.org/virtualbox/${DISTVERSION}/ \ http://tmp.chruetertee.ch/ \ Modified: head/emulators/virtualbox-ose-legacy/files/patch-Config.kmk ============================================================================== --- head/emulators/virtualbox-ose-legacy/files/patch-Config.kmk Tue Dec 17 21:35:37 2013 (r336772) +++ head/emulators/virtualbox-ose-legacy/files/patch-Config.kmk Tue Dec 17 21:44:58 2013 (r336773) @@ -1,6 +1,6 @@ ---- Config.kmk.orig 2013-10-15 13:01:31.000000000 +0200 -+++ Config.kmk 2013-10-20 14:43:19.015746151 +0200 -@@ -3387,16 +3387,16 @@ +--- Config.kmk.orig 2013-11-28 19:29:52.000000000 +0100 ++++ Config.kmk 2013-12-17 20:15:54.000000000 +0100 +@@ -3260,16 +3260,16 @@ $(VBOX_GCC_WARN) -Wpointer-arith -Winline $(VBOX_GCC_Wno-pointer-sign) $(VBOX_GCC_fdiagnostics-show-option) \ -Wstrict-prototypes -Wmissing-prototypes -Wstrict-prototypes \ -Wimplicit-function-declaration -Werror-implicit-function-declaration \ @@ -20,7 +20,7 @@ $(VBOX_GCC_fno-stack-protector) $(VBOX_GCC_R0_OPT) $(VBOX_GCC_R0_FP) \ -nostdinc TEMPLATE_VBOXR0DRV_CXXFLAGS.x86 = $(TEMPLATE_VBOXR0DRV_CFLAGS.x86) -@@ -3630,8 +3630,6 @@ +@@ -3486,8 +3486,6 @@ /usr/X11R6/include \ /usr/local/include TEMPLATE_VBOXR3EXE_LIBPATH += \ @@ -29,7 +29,16 @@ /usr/local/lib else ifeq ($(KBUILD_TARGET),solaris) TEMPLATE_VBOXR3EXE_TOOL = GXX3PLAIN -@@ -4206,8 +4204,6 @@ +@@ -3670,7 +3668,7 @@ + # not necessary except USE_LIB_PCAP is defined in SUPR3HardenedMain.cpp + # TEMPLATE_VBOXR3HARDENEDEXE_LIBS += cap + endif +-ifn1of ($(KBUILD_TARGET), win os2) ++ifn1of ($(KBUILD_TARGET), win os2 freebsd) + TEMPLATE_VBOXR3HARDENEDEXE_LDFLAGS = $(filter-out '$(VBOX_GCC_RPATH_OPT)%,$(TEMPLATE_VBOXR3EXE_LDFLAGS)) + TEMPLATE_VBOXR3HARDENEDEXE_LDFLAGS.linux = $(filter-out $(VBOX_GCC_ORIGIN_OPT),$(TEMPLATE_VBOXR3EXE_LDFLAGS.linux)) + endif +@@ -3976,8 +3974,6 @@ /usr/X11R6/include \ /usr/local/include TEMPLATE_VBOXMAINEXE_LIBPATH += \ @@ -38,7 +47,7 @@ /usr/local/lib else ifeq ($(KBUILD_TARGET),solaris) TEMPLATE_VBOXMAINEXE_TOOL = GXX3PLAIN -@@ -4673,8 +4669,6 @@ +@@ -4392,8 +4388,6 @@ /usr/X11R6/include \ /usr/local/include TEMPLATE_VBOXQT4GUIEXE_LIBPATH += \ @@ -47,7 +56,7 @@ /usr/local/lib endif ifeq ($(KBUILD_TARGET),solaris) -@@ -4869,8 +4863,6 @@ +@@ -4576,8 +4570,6 @@ /usr/X11R6/include \ /usr/local/include TEMPLATE_VBOXBLDPROG_LIBPATH += \ From owner-svn-ports-head@FreeBSD.ORG Tue Dec 17 21:49:45 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 206B2D1B; Tue, 17 Dec 2013 21:49:45 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 0C2A91031; Tue, 17 Dec 2013 21:49:45 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBHLniI4060883; Tue, 17 Dec 2013 21:49:44 GMT (envelope-from dhn@svn.freebsd.org) Received: (from dhn@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBHLnikc060881; Tue, 17 Dec 2013 21:49:44 GMT (envelope-from dhn@svn.freebsd.org) Message-Id: <201312172149.rBHLnikc060881@svn.freebsd.org> From: Dennis Herrmann Date: Tue, 17 Dec 2013 21:49:44 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r336774 - head/irc/simpleirc X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 17 Dec 2013 21:49:45 -0000 Author: dhn Date: Tue Dec 17 21:49:44 2013 New Revision: 336774 URL: http://svnweb.freebsd.org/changeset/ports/336774 Log: - Update to 1.2 Modified: head/irc/simpleirc/Makefile head/irc/simpleirc/distinfo Modified: head/irc/simpleirc/Makefile ============================================================================== --- head/irc/simpleirc/Makefile Tue Dec 17 21:44:58 2013 (r336773) +++ head/irc/simpleirc/Makefile Tue Dec 17 21:49:44 2013 (r336774) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= simpleirc -PORTVERSION= 1.1 +PORTVERSION= 1.2 CATEGORIES= irc MASTER_SITES= http://dl.suckless.org/tools/ \ ${MASTER_SITE_LOCAL} Modified: head/irc/simpleirc/distinfo ============================================================================== --- head/irc/simpleirc/distinfo Tue Dec 17 21:44:58 2013 (r336773) +++ head/irc/simpleirc/distinfo Tue Dec 17 21:49:44 2013 (r336774) @@ -1,2 +1,2 @@ -SHA256 (sic-1.1.tar.gz) = f24d63c7ae5f3715f3c3885f5bd07d45ffa1b0af830a25523baec94653484dc2 -SIZE (sic-1.1.tar.gz) = 5061 +SHA256 (sic-1.2.tar.gz) = ac07f905995e13ba2c43912d7a035fbbe78a628d7ba1c256f4ca1372fb565185 +SIZE (sic-1.2.tar.gz) = 4563 From owner-svn-ports-head@FreeBSD.ORG Tue Dec 17 21:55:24 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id BE0A5FF7; Tue, 17 Dec 2013 21:55:24 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 9E34510C4; Tue, 17 Dec 2013 21:55:24 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBHLtOGA064019; Tue, 17 Dec 2013 21:55:24 GMT (envelope-from tijl@svn.freebsd.org) Received: (from tijl@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBHLtOJ3064018; Tue, 17 Dec 2013 21:55:24 GMT (envelope-from tijl@svn.freebsd.org) Message-Id: <201312172155.rBHLtOJ3064018@svn.freebsd.org> From: Tijl Coosemans Date: Tue, 17 Dec 2013 21:55:24 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r336776 - head/biology/platon X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 17 Dec 2013 21:55:24 -0000 Author: tijl Date: Tue Dec 17 21:55:24 2013 New Revision: 336776 URL: http://svnweb.freebsd.org/changeset/ports/336776 Log: Version 2013.12.12, USES=fortran, staging. Modified: head/biology/platon/Makefile Modified: head/biology/platon/Makefile ============================================================================== --- head/biology/platon/Makefile Tue Dec 17 21:55:21 2013 (r336775) +++ head/biology/platon/Makefile Tue Dec 17 21:55:24 2013 (r336776) @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= platon -PORTVERSION= 2007.01.09 -PORTREVISION= 6 +PORTVERSION= 2013.12.12 CATEGORIES= biology MASTER_SITES= http://www.cryst.chem.uu.nl/spek/xraysoft/unix/ DISTNAME= platon @@ -16,8 +15,8 @@ COMMENT= Tool for viewing molecular/crys # There is a charge of US$ 5000 for commercial users. RESTRICTED= free for academic, US$ 5000 for commercial users +USES= fortran USE_XORG= x11 -USE_FORTRAN= yes # This port only has snapshot archive IGNOREFILES= platon.tar.gz @@ -27,13 +26,8 @@ SAMPLES= azt.dat bucky.spf c476.spf c540 TESTDATADIR= ABSORB_EXAMPLE ABSTOMPA_EXAMPLE ABSTOMPA_TEST ADDSYM_EXAMPLE \ ASYM_EXAMPLE MULABS_EXAMPLE PSICOR_EXAMPLE SQUEEZE_EXAMPLE -NO_STAGE= yes .include -.if ${ARCH} == "alpha" -BROKEN= /usr/libexec/elf/ld: platon.o: .got subsegment exceeds 64K (size 88552) -.endif - pre-patch: (cd ${WRKDIR}/${DISTNAME} ; ${GUNZIP_CMD} platon.f.gz xdrvr.c.gz) @@ -41,29 +35,22 @@ post-patch: ${CP} ${FILESDIR}/Makefile ${WRKSRC}/Makefile ${REINPLACE_CMD} -e "s+%%LOCALBASE%%+${LOCALBASE}+" ${WRKSRC}/Makefile -pre-install: - ${STRIP_CMD} ${WRKDIR}/${DISTNAME}/platon - ${RM} -f ${PREFIX}/bin/pluton - ${RM} -rf ${PREFIX}/share/doc/platon - ${MKDIR} ${PREFIX}/share/doc/platon - ${RM} -rf ${PREFIX}/share/doc/platon/TEST - ${MKDIR} ${PREFIX}/share/doc/platon/TEST - do-install: - ${INSTALL_PROGRAM} ${WRKDIR}/${DISTNAME}/platon ${PREFIX}/bin - ${LN} -s ${PREFIX}/bin/platon ${PREFIX}/bin/pluton - ${INSTALL_DATA} ${WRKDIR}/${DISTNAME}/README* \ - ${PREFIX}/share/doc/platon - for file in ${SAMPLES} ; do \ - ${INSTALL_DATA} ${WRKDIR}/${DISTNAME}/$${file} \ - ${PREFIX}/share/doc/platon ; \ - done + ${INSTALL_PROGRAM} ${WRKDIR}/${DISTNAME}/platon \ + ${STAGEDIR}${PREFIX}/bin + ${LN} -s platon ${STAGEDIR}${PREFIX}/bin/pluton + ${MKDIR} ${STAGEDIR}${DOCSDIR} + ${INSTALL_DATA} ${WRKDIR}/${DISTNAME}/README* ${STAGEDIR}${DOCSDIR} +.for f in ${SAMPLES} + ${INSTALL_DATA} ${WRKDIR}/${DISTNAME}/$f ${STAGEDIR}${DOCSDIR} +.endfor ${INSTALL_DATA} ${WRKDIR}/${DISTNAME}/platon_html.tar.gz \ - ${PREFIX}/share/doc/platon - for dirs in ${TESTDATADIR} ; do \ - ${MKDIR} ${PREFIX}/share/doc/platon/TEST/$${dirs} && \ - ${INSTALL_DATA} ${WRKDIR}/${DISTNAME}/TEST/$${dirs}/* \ - ${PREFIX}/share/doc/platon/TEST/$${dirs} ; \ - done + ${STAGEDIR}${DOCSDIR} + ${MKDIR} ${STAGEDIR}${DOCSDIR}/TEST +.for d in ${TESTDATADIR} + ${MKDIR} ${STAGEDIR}${DOCSDIR}/TEST/$d + ${INSTALL_DATA} ${WRKDIR}/${DISTNAME}/TEST/$d/* \ + ${STAGEDIR}${DOCSDIR}/TEST/$d +.endfor .include From owner-svn-ports-head@FreeBSD.ORG Tue Dec 17 21:55:48 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id C559F2E6; Tue, 17 Dec 2013 21:55:48 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id B201610D5; Tue, 17 Dec 2013 21:55:48 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBHLtmMM064119; Tue, 17 Dec 2013 21:55:48 GMT (envelope-from wg@svn.freebsd.org) Received: (from wg@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBHLtmRf064118; Tue, 17 Dec 2013 21:55:48 GMT (envelope-from wg@svn.freebsd.org) Message-Id: <201312172155.rBHLtmRf064118@svn.freebsd.org> From: William Grzybowski Date: Tue, 17 Dec 2013 21:55:48 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r336777 - head/science/ncs X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 17 Dec 2013 21:55:48 -0000 Author: wg Date: Tue Dec 17 21:55:48 2013 New Revision: 336777 URL: http://svnweb.freebsd.org/changeset/ports/336777 Log: science/ncs: fix 'python' usage to remove implicity dependency of lang/python Reported by: exp-run (PR/184591) Approved by: portmgr (blanket) Modified: head/science/ncs/Makefile Modified: head/science/ncs/Makefile ============================================================================== --- head/science/ncs/Makefile Tue Dec 17 21:55:24 2013 (r336776) +++ head/science/ncs/Makefile Tue Dec 17 21:55:48 2013 (r336777) @@ -28,11 +28,11 @@ USE_GMAKE= yes USES= gettext iconv USE_GNOME= libxml2 USE_PYTHON= yes -USE_QT_VER= 4 WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} CPPFLAGS+= -I${LOCALBASE}/include/libxml2 GNU_CONFIGURE= yes -CONFIGURE_ENV= MPI_LIBS="${MPI_LIBS}" +CONFIGURE_ENV= MPI_LIBS="${MPI_LIBS}" \ + PYEXE="${PYTHON_CMD}" MAKE_ENV= NOM_ARCH=${OPSYS} CS_MPI_PATH=${MPI_HOME}/bin \ PTHREAD_LIBS=${PTHREAD_LIBS} TERM=${TERM} \ MPI_HOME=${MPI_HOME} MPI_LIBS="${MPI_LIBS}" From owner-svn-ports-head@FreeBSD.ORG Tue Dec 17 21:58:09 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 3FCA73EC; Tue, 17 Dec 2013 21:58:09 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 11BF310F0; Tue, 17 Dec 2013 21:58:09 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBHLw8Do064446; Tue, 17 Dec 2013 21:58:08 GMT (envelope-from dhn@svn.freebsd.org) Received: (from dhn@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBHLw81i064440; Tue, 17 Dec 2013 21:58:08 GMT (envelope-from dhn@svn.freebsd.org) Message-Id: <201312172158.rBHLw81i064440@svn.freebsd.org> From: Dennis Herrmann Date: Tue, 17 Dec 2013 21:58:08 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r336778 - head/net-im/mcabber X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 17 Dec 2013 21:58:09 -0000 Author: dhn Date: Tue Dec 17 21:58:08 2013 New Revision: 336778 URL: http://svnweb.freebsd.org/changeset/ports/336778 Log: - Update to 0.10.2 Modified: head/net-im/mcabber/Makefile head/net-im/mcabber/distinfo head/net-im/mcabber/pkg-plist Modified: head/net-im/mcabber/Makefile ============================================================================== --- head/net-im/mcabber/Makefile Tue Dec 17 21:55:48 2013 (r336777) +++ head/net-im/mcabber/Makefile Tue Dec 17 21:58:08 2013 (r336778) @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= mcabber -PORTVERSION= 0.10.1 -PORTREVISION= 5 +PORTVERSION= 0.10.2 CATEGORIES= net-im MASTER_SITES= http://www.lilotux.net/~mikael/mcabber/files/ CENKES Modified: head/net-im/mcabber/distinfo ============================================================================== --- head/net-im/mcabber/distinfo Tue Dec 17 21:55:48 2013 (r336777) +++ head/net-im/mcabber/distinfo Tue Dec 17 21:58:08 2013 (r336778) @@ -1,2 +1,2 @@ -SHA256 (mcabber-0.10.1.tar.bz2) = 00cb9c0b272a44559c4207fe37ecd43c5cdff88d1e3a0ed2ba5eec10d9638888 -SIZE (mcabber-0.10.1.tar.bz2) = 554682 +SHA256 (mcabber-0.10.2.tar.bz2) = e246d153f93a75b4f45879f447434db070503c9903bf3f995af396b3b94586f8 +SIZE (mcabber-0.10.2.tar.bz2) = 604378 Modified: head/net-im/mcabber/pkg-plist ============================================================================== --- head/net-im/mcabber/pkg-plist Tue Dec 17 21:55:48 2013 (r336777) +++ head/net-im/mcabber/pkg-plist Tue Dec 17 21:58:08 2013 (r336778) @@ -34,6 +34,10 @@ lib/mcabber/libbeep.la lib/mcabber/libbeep.so lib/mcabber/libxttitle.la lib/mcabber/libxttitle.so +lib/mcabber/liburlregex.la +lib/mcabber/libfifo.la +lib/mcabber/liburlregex.so +lib/mcabber/libfifo.so libdata/pkgconfig/mcabber.pc share/applications/mcabber.desktop %%EXAMPLESDIR%%/mcabberrc @@ -386,6 +390,7 @@ share/applications/mcabber.desktop %%DATADIR%%/contrib/themes/light.txt %%DATADIR%%/contrib/themes/light2.txt %%DATADIR%%/contrib/themes/oliver.txt +%%DATADIR%%/contrib/themes/mikael-256.txt %%DATADIR%%/contrib/vim/mcabber_log-ftdetect.vim %%DATADIR%%/contrib/vim/mcabber_log-syntax.vim %%DATADIR%%/contrib/cicq2mcabber.pl From owner-svn-ports-head@FreeBSD.ORG Tue Dec 17 21:59:05 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id B9F5E4DD; Tue, 17 Dec 2013 21:59:05 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id A5F6710FC; Tue, 17 Dec 2013 21:59:05 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBHLx5gL064603; Tue, 17 Dec 2013 21:59:05 GMT (envelope-from zeising@svn.freebsd.org) Received: (from zeising@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBHLx5qq064602; Tue, 17 Dec 2013 21:59:05 GMT (envelope-from zeising@svn.freebsd.org) Message-Id: <201312172159.rBHLx5qq064602@svn.freebsd.org> From: Niclas Zeising Date: Tue, 17 Dec 2013 21:59:05 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r336779 - head X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 17 Dec 2013 21:59:05 -0000 Author: zeising Date: Tue Dec 17 21:59:05 2013 New Revision: 336779 URL: http://svnweb.freebsd.org/changeset/ports/336779 Log: Expand instructions for dealing with dri/libGL somewhat. Suggested by: wblock Discussed with: wblock, kwm Modified: head/UPDATING Modified: head/UPDATING ============================================================================== --- head/UPDATING Tue Dec 17 21:58:08 2013 (r336778) +++ head/UPDATING Tue Dec 17 21:59:05 2013 (r336779) @@ -58,6 +58,10 @@ you update your ports collection, before or # pkg delete -f libGL dri followed by + # portmaster graphics/dri graphics/libGL + or + # portupgrade graphics/dri graphics/libGL + and then # portmaster -a or # portupgrade -a From owner-svn-ports-head@FreeBSD.ORG Tue Dec 17 22:01:05 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 048BD5E8; Tue, 17 Dec 2013 22:01:05 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id C93C91155; Tue, 17 Dec 2013 22:01:04 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBHM14i6067482; Tue, 17 Dec 2013 22:01:04 GMT (envelope-from zeising@svn.freebsd.org) Received: (from zeising@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBHM13Xp067474; Tue, 17 Dec 2013 22:01:03 GMT (envelope-from zeising@svn.freebsd.org) Message-Id: <201312172201.rBHM13Xp067474@svn.freebsd.org> From: Niclas Zeising Date: Tue, 17 Dec 2013 22:01:03 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r336780 - in head/x11/xscreensaver: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 17 Dec 2013 22:01:05 -0000 Author: zeising Date: Tue Dec 17 22:01:03 2013 New Revision: 336780 URL: http://svnweb.freebsd.org/changeset/ports/336780 Log: Update to 5.26 Stagify. Thanks to bapt for the help with staging! Modified: head/x11/xscreensaver/Makefile head/x11/xscreensaver/distinfo head/x11/xscreensaver/files/patch-driver_XScreenSaver.ad.in head/x11/xscreensaver/files/patch-hacks__config__sonar.xml head/x11/xscreensaver/pkg-plist Modified: head/x11/xscreensaver/Makefile ============================================================================== --- head/x11/xscreensaver/Makefile Tue Dec 17 21:59:05 2013 (r336779) +++ head/x11/xscreensaver/Makefile Tue Dec 17 22:01:03 2013 (r336780) @@ -2,23 +2,23 @@ # $FreeBSD$ PORTNAME= xscreensaver -PORTVERSION= 5.22 -PORTREVISION= 3 +PORTVERSION= 5.26 CATEGORIES= x11 MASTER_SITES= http://www.jwz.org/xscreensaver/ MAINTAINER= zeising@FreeBSD.org COMMENT= Save your screen while you entertain your cat -LIB_DEPENDS= gle.4:${PORTSDIR}/graphics/gle \ - jpeg.11:${PORTSDIR}/graphics/jpeg \ - gtk-x11-2.0:${PORTSDIR}/x11-toolkits/gtk20 \ - xml2.5:${PORTSDIR}/textproc/libxml2 \ - glade-2.0.0:${PORTSDIR}/devel/libglade2 +LIB_DEPENDS= libgle.so:${PORTSDIR}/graphics/gle \ + libjpeg.so:${PORTSDIR}/graphics/jpeg \ + libgtk-x11-2.0.so:${PORTSDIR}/x11-toolkits/gtk20 \ + libxml2.so:${PORTSDIR}/textproc/libxml2 \ + libglade-2.0.so:${PORTSDIR}/devel/libglade2 RUN_DEPENDS= p5-libwww>0:${PORTSDIR}/www/p5-libwww \ giftopnm:${PORTSDIR}/graphics/netpbm +DESTDIRNAME= install_prefix CONFLICTS= xscreensaver-gnome-[0-9]* xscreensaver-gnome-hacks-[0-9]* @@ -46,7 +46,6 @@ XMOUN_DESC= Add extra port graphics/xmou XPLAN_DESC= Add extra port astro/xplanet XSNOW_DESC= Add extra port x11/xsnow -NO_STAGE= yes .include .if ${PORT_OPTIONS:MKERBEROS} @@ -89,48 +88,6 @@ RUN_DEPENDS+= xsnow:${PORTSDIR}/x11/xsno .undef HAVE_GNOME -MAN1= xscreensaver-command.1 xscreensaver-demo.1 \ - xscreensaver-getimage-file.1 xscreensaver-getimage-video.1 \ - xscreensaver-getimage.1 xscreensaver-text.1 xscreensaver.1 - -MAN6= anemone.6 anemotaxis.6 antinspect.6 antmaze.6 antspotlight.6 \ - apollonian.6 apple2.6 atlantis.6 attraction.6 atunnel.6 barcode.6 \ - blaster.6 blinkbox.6 blitspin.6 blocktube.6 boing.6 bouboule.6 \ - bouncingcow.6 boxed.6 boxfit.6 braid.6 bsod.6 bubble3d.6 \ - bumps.6 cage.6 carousel.6 ccurve.6 celtic.6 circuit.6 cloudlife.6 \ - compass.6 coral.6 crackberg.6 crystal.6 cube21.6 \ - cubenetic.6 cubestorm.6 cynosure.6 dangerball.6 decayscreen.6 deco.6 \ - deluxe.6 demon.6 discrete.6 distort.6 drift.6 endgame.6 engine.6 \ - epicycle.6 eruption.6 euler2d.6 extrusion.6 fadeplot.6 fiberlamp.6 \ - fireworkx.6 flame.6 flipflop.6 flipscreen3d.6 fliptext.6 flow.6 \ - fluidballs.6 flurry.6 flyingtoasters.6 fontglide.6 \ - fuzzyflakes.6 galaxy.6 gears.6 gflux.6 glblur.6 gleidescope.6 \ - glhanoi.6 glknots.6 glmatrix.6 glplanet.6 glschool.6 \ - glslideshow.6 glsnake.6 gltext.6 goop.6 grav.6 greynetic.6 halftone.6 \ - halo.6 helix.6 hexadrop.6 hopalong.6 hypertorus.6 ifs.6 \ - imsmap.6 interaggregate.6 interference.6 intermomentary.6 jigglypuff.6 \ - jigsaw.6 juggler3d.6 julia.6 kaleidocycle.6 kaleidescope.6 klein.6 \ - kumppa.6 lament.6 lavalite.6 ljlatest.6 \ - loop.6 maze.6 memscroller.6 menger.6 metaballs.6 mirrorblob.6 \ - moebius.6 moire.6 moire2.6 molecule.6 morph3d.6 mountain.6 \ - munch.6 nerverot.6 noof.6 noseguy.6 pacman.6 pedal.6 penetrate.6 \ - penrose.6 petri.6 phosphor.6 piecewise.6 pinion.6 pipes.6 polyhedra.6 \ - polyominoes.6 polytopes.6 pong.6 providence.6 pulsar.6 pyro.6 qix.6 \ - quasicrystal.6 queens.6 rd-bomb.6 ripples.6 rocks.6 rorschach.6 \ - rotzoomer.6 rubik.6 sballs.6 shadebobs.6 sierpinski.6 sierpinski3d.6 \ - slidescreen.6 slip.6 sonar.6 speedmine.6 spheremonics.6 \ - spotlight.6 sproingies.6 squiral.6 stairs.6 starfish.6 \ - starwars.6 stonerview.6 strange.6 substrate.6 superquadrics.6 \ - swirl.6 tangram.6 thornbird.6 timetunnel.6 topblock.6 \ - triangle.6 truchet.6 twang.6 unknownpleasures.6 vermiculate.6 \ - vidwhacker.6 wander.6 webcollage.6 whirlwindwarp.6 wormhole.6 \ - xanalogtv.6 xflame.6 xjack.6 xlyap.6 xmatrix.6 xrayswarm.6 \ - xspirograph.6 zoom.6 cwaves.6 glcells.6 voronoi.6 \ - abstractile.6 moebiusgears.6 lockward.6 cubicgrid.6 hypnowheel.6 \ - lcdscrub.6 skytentacles.6 photopile.6 rubikblocks.6 surfaces.6 \ - companioncube.6 hilbert.6 tronbit.6 \ - xscreensaver-gl-helper.6 - SUB_FILES= xscreensaver-blank.desktop xscreensaver-lock.desktop \ xscreensaver-start.desktop xscreensaver-stop.desktop @@ -153,11 +110,11 @@ post-patch: .endif post-install: - ${INSTALL_DATA} ${FILESDIR}/x*.xml ${DATADIR}/config/ + ${INSTALL_DATA} ${FILESDIR}/x*.xml ${STAGEDIR}${DATADIR}/config/ @(if test -x ${LOCALBASE}/bin/xscreensaver-hacks/webcollage-helper; then \ ${ECHO} "bin/xscreensaver-hacks/webcollage-helper" | \ ${CAT} - ${TMPPLIST} > ${TMPPLIST}.cat && \ ${MV} ${TMPPLIST}.cat ${TMPPLIST}; fi) - ${INSTALL_DATA} ${WRKDIR}/*.desktop ${PREFIX}/share/applications/ + ${INSTALL_DATA} ${WRKDIR}/*.desktop ${STAGEDIR}${PREFIX}/share/applications/ .include Modified: head/x11/xscreensaver/distinfo ============================================================================== --- head/x11/xscreensaver/distinfo Tue Dec 17 21:59:05 2013 (r336779) +++ head/x11/xscreensaver/distinfo Tue Dec 17 22:01:03 2013 (r336780) @@ -1,2 +1,2 @@ -SHA256 (xscreensaver-5.22.tar.gz) = 47b703ed22dce46a08f11ddd7d67d52e4f7ad8df844bdf956431069a0db36797 -SIZE (xscreensaver-5.22.tar.gz) = 7411666 +SHA256 (xscreensaver-5.26.tar.gz) = 2ca4dc66e11947396124d1f87dd2787e0d8dd8dd1ada8871b3d8df40fb4f1b55 +SIZE (xscreensaver-5.26.tar.gz) = 8760550 Modified: head/x11/xscreensaver/files/patch-driver_XScreenSaver.ad.in ============================================================================== --- head/x11/xscreensaver/files/patch-driver_XScreenSaver.ad.in Tue Dec 17 21:59:05 2013 (r336779) +++ head/x11/xscreensaver/files/patch-driver_XScreenSaver.ad.in Tue Dec 17 22:01:03 2013 (r336780) @@ -1,6 +1,6 @@ ---- driver/XScreenSaver.ad.in.orig 2009-09-07 21:53:15.000000000 -0700 -+++ driver/XScreenSaver.ad.in 2009-09-15 02:10:42.000000000 -0700 -@@ -54,7 +54,7 @@ +--- driver/XScreenSaver.ad.in.orig 2013-12-09 12:01:40.000000000 +0100 ++++ driver/XScreenSaver.ad.in 2013-12-17 19:34:28.222008084 +0100 +@@ -56,7 +56,7 @@ *splashDuration: 0:00:05 *visualID: default *captureStderr: True @@ -9,7 +9,16 @@ *textMode: file *textLiteral: XScreenSaver -@@ -151,6 +151,18 @@ +@@ -122,7 +122,7 @@ + + ! The format used for printing the date and time in the password dialog box + ! (see the strftime(3) manual page for details.) +-*dateFormat: %d-%b-%y (%a); %I:%M %p ++*dateFormat: %Y-%m-%d %H:%M:%S + ! To show the time only: + ! *dateFormat: %I:%M %p + ! For 24 hour time: +@@ -156,6 +156,18 @@ ! screen savers interactively. ! *programs: \ @@ -28,7 +37,7 @@ maze -root \n\ @GL_KLUDGE@ GL: superquadrics -root \n\ attraction -root \n\ -@@ -246,7 +258,6 @@ +@@ -251,7 +263,6 @@ xspirograph -root \n\ @GL_KLUDGE@ GL: circuit -root \n\ @GL_KLUDGE@ GL: dangerball -root \n\ @@ -36,7 +45,7 @@ @GL_KLUDGE@ GL: engine -root \n\ @GL_KLUDGE@ GL: flipscreen3d -root \n\ @GL_KLUDGE@ GL: gltext -root \n\ -@@ -435,7 +446,6 @@ +@@ -449,7 +460,6 @@ *hacks.cwaves.name: CWaves *hacks.dangerball.name: DangerBall *hacks.decayscreen.name: DecayScreen Modified: head/x11/xscreensaver/files/patch-hacks__config__sonar.xml ============================================================================== --- head/x11/xscreensaver/files/patch-hacks__config__sonar.xml Tue Dec 17 21:59:05 2013 (r336779) +++ head/x11/xscreensaver/files/patch-hacks__config__sonar.xml Tue Dec 17 22:01:03 2013 (r336780) @@ -1,5 +1,5 @@ ---- hacks/config/sonar.xml.orig 2012-07-02 12:25:48.000000000 -0700 -+++ hacks/config/sonar.xml 2012-07-04 15:29:38.000000000 -0700 +--- hacks/config/sonar.xml.orig 2013-12-04 23:42:00.000000000 +0100 ++++ hacks/config/sonar.xml 2013-12-09 12:29:34.301395635 +0100 @@ -29,7 +29,7 @@