Re: update: p5-LaTeX-Driver to 0.12

2013-04-23 Thread Stuart Henderson
On 2013/04/22 18:00, Chris Bennett wrote:
> Newer version of p5-LaTeX-Driver. Version 0.12.
> 
> Upstream notes on changes:
> * add missing dependency on Readonly (RT79330)

This dependency will need adding to the port. Otherwise looks good to me.



Re: new: devel/p5-autobox

2013-04-23 Thread Stuart Henderson
On 2013/04/19 11:10, Chris Bennett wrote:
> OK?
> 
> Chris Bennett

If all PERMIT* are "yes", just set PERMIT_PACKAGE_CDROM=Yes,
the others are implicit. Otherwise OK with me if someone would
like to import.



tor & libevent

2013-04-23 Thread John Tate
I built Tor from the latest stable ports tree and it starts with a warning
about libevent, runs for a while, and crashes.

Apr 23 04:03:33.925 [notice] Tor v0.2.2.39 (git-bec76476efb71549). This is
experimental software. Do not rely on it for strong anonymity. (Running on
OpenBSD amd64)
Apr 23 04:03:33.970 [warn] It's a little hard to tell, but you seem to have
Libevent 1.4.0-beta header files, whereas you have linked against Libevent
1.4.14b-stable.  This will probably make Tor crash.
Apr 23 04:03:33.973 [notice] Initialized libevent version 1.4.14b-stable
using method kqueue. Good.
Apr 23 04:03:33.975 [notice] Opening Socks listener on 127.0.0.1:9050

As far as I know it should have built properly, there might be a problem
with libevent. I can only seem to find a port for libevent2 though, so
maybe there is a problem with my base system.

-- 
www.johntate.org


UPDATE: libev-4.15

2013-04-23 Thread David Coppa
Hi all,

The diff below updates devel/libev to the latest version.

While here, I've merged PFRAG.shared into PLIST.

Ok?

Index: Makefile
===
RCS file: /cvs/ports/devel/libev/Makefile,v
retrieving revision 1.12
diff -u -p -u -p -r1.12 Makefile
--- Makefile21 Mar 2013 08:45:15 -  1.12
+++ Makefile23 Apr 2013 11:15:37 -
@@ -2,13 +2,12 @@
 
 COMMENT =  high-performance event loop library
 
-DISTNAME = libev-4.11
-REVISION = 0
+DISTNAME = libev-4.15
 CATEGORIES =   devel
 
 MAINTAINER =   David Coppa 
 
-SHARED_LIBS=   ev 3.0 # 4.0
+SHARED_LIBS=   ev 3.1 # 4.0
 
 HOMEPAGE = http://software.schmorp.de/pkg/libev.html
 MASTER_SITES = http://dist.schmorp.de/libev/ \
Index: distinfo
===
RCS file: /cvs/ports/devel/libev/distinfo,v
retrieving revision 1.6
diff -u -p -u -p -r1.6 distinfo
--- distinfo21 Aug 2012 13:22:50 -  1.6
+++ distinfo23 Apr 2013 11:15:37 -
@@ -1,2 +1,2 @@
-SHA256 (libev-4.11.tar.gz) = n1Xxb/bk1gobH6f0lir2l2hGjw18NiqrY4f1ICCTjN8=
-SIZE (libev-4.11.tar.gz) = 484766
+SHA256 (libev-4.15.tar.gz) = st1DoHNVb1NQy+0Ftu9ETcxLVj9OCxAJ179EgmFgb+s=
+SIZE (libev-4.15.tar.gz) = 513919
Index: patches/patch-Makefile_in
===
RCS file: /cvs/ports/devel/libev/patches/patch-Makefile_in,v
retrieving revision 1.3
diff -u -p -u -p -r1.3 patch-Makefile_in
--- patches/patch-Makefile_in   22 Feb 2012 10:50:47 -  1.3
+++ patches/patch-Makefile_in   23 Apr 2013 11:15:37 -
@@ -1,7 +1,7 @@
 $OpenBSD: patch-Makefile_in,v 1.3 2012/02/22 10:50:47 dcoppa Exp $
 Makefile.in.orig   Sat Feb  4 20:09:41 2012
-+++ Makefile.inWed Feb 22 10:49:15 2012
-@@ -233,9 +233,9 @@ EXTRA_DIST = LICENSE Changes libev.m4 autogen.sh \
+--- Makefile.in.orig   Fri Mar  1 12:10:35 2013
 Makefile.inTue Apr 23 08:54:04 2013
+@@ -267,9 +267,9 @@ EXTRA_DIST = LICENSE Changes libev.m4 autogen.sh \
 ev.3 ev.pod Symbols.ev Symbols.event
  
  man_MANS = ev.3
Index: patches/patch-configure
===
RCS file: /cvs/ports/devel/libev/patches/patch-configure,v
retrieving revision 1.3
diff -u -p -u -p -r1.3 patch-configure
--- patches/patch-configure 22 Feb 2012 10:50:47 -  1.3
+++ patches/patch-configure 23 Apr 2013 11:15:37 -
@@ -1,7 +1,7 @@
 $OpenBSD: patch-configure,v 1.3 2012/02/22 10:50:47 dcoppa Exp $
 configure.orig Wed Feb 22 10:49:46 2012
-+++ configure  Wed Feb 22 10:50:17 2012
-@@ -3811,11 +3811,6 @@ fi
+--- configure.orig Fri Mar  1 12:10:34 2013
 configure  Tue Apr 23 08:54:04 2013
+@@ -3708,11 +3708,6 @@ fi
  
  
  
Index: patches/patch-ev_c
===
RCS file: patches/patch-ev_c
diff -N patches/patch-ev_c
--- patches/patch-ev_c  28 Dec 2012 18:27:23 -  1.4
+++ /dev/null   1 Jan 1970 00:00:00 -
@@ -1,41 +0,0 @@
-$OpenBSD: patch-ev_c,v 1.4 2012/12/28 18:27:23 dcoppa Exp $
-
-Add support for OpenBSD/alpha and OpenBSD/mips64 (latter from ev.c -r1.412).
-
-Add support for OpenBSD/hppa
-
 ev.c.orig  Sat Feb  4 20:09:52 2012
-+++ ev.c   Fri Dec 28 19:16:35 2012
-@@ -559,12 +559,12 @@ struct signalfd_siginfo
-   #if ECB_GCC_VERSION(2,5) || defined(__INTEL_COMPILER) || (__llvm__ && 
__GNUC__) || __SUNPRO_C >= 0x5110 || __SUNPRO_CC >= 0x5110
- #if __i386 || __i386__
-   #define ECB_MEMORY_FENCE __asm__ __volatile__ ("lock; orb $0, 
-1(%%esp)" : : : "memory")
--  #define ECB_MEMORY_FENCE_ACQUIRE ECB_MEMORY_FENCE /* non-lock xchg 
might be enough */
--  #define ECB_MEMORY_FENCE_RELEASE do { } while (0) /* unlikely to change 
in future cpus */
-+  #define ECB_MEMORY_FENCE_ACQUIRE __asm__ __volatile__ ("" : : : 
"memory")
-+  #define ECB_MEMORY_FENCE_RELEASE __asm__ __volatile__ ("")
- #elif __amd64 || __amd64__ || __x86_64 || __x86_64__
-   #define ECB_MEMORY_FENCE __asm__ __volatile__ ("mfence" : : : 
"memory")
--  #define ECB_MEMORY_FENCE_ACQUIRE __asm__ __volatile__ ("lfence" : : : 
"memory")
--  #define ECB_MEMORY_FENCE_RELEASE __asm__ __volatile__ ("sfence") /* 
play safe - not needed in any current cpu */
-+  #define ECB_MEMORY_FENCE_ACQUIRE __asm__ __volatile__ ("" : : : 
"memory")
-+  #define ECB_MEMORY_FENCE_RELEASE __asm__ __volatile__ ("")
- #elif __powerpc__ || __ppc__ || __powerpc64__ || __ppc64__
-   #define ECB_MEMORY_FENCE __asm__ __volatile__ ("sync" : : : 
"memory")
- #elif defined(__ARM_ARCH_6__ ) || defined(__ARM_ARCH_6J__ ) \
-@@ -579,6 +579,15 @@ struct signalfd_siginfo
-   #define ECB_MEMORY_FENCE_RELEASE __asm__ __volatile__ ("membar 
#LoadStore | #StoreStore")
- #elif defined(__s390__) || defined(__s390x__)
-   #define ECB_MEMORY_FENCE __asm__ __volatile__ ("bc

UPDATE: Jailkit-2.16

2013-04-23 Thread Gonzalo L. R.
Hi,

Update for Jailkit to 2.16, bugfix release.

* fixes the environment cleaning function
* the defaults for jk_init.ini are improved for 64bit systems

And various error messages are improved.

Comments? Ok?

Cheers.-

-- 
Sending from my iFart...



Re: UPDATE: msmtp-1.4.31

2013-04-23 Thread David Coppa
On Mon, Apr 22, 2013 at 10:10 PM, Gleydson Soares  wrote:
>
> A new version of msmtp has been released today; version 1.4.31
>
> upstream notes:
> - Updated the msmtpq script.
> - Fixed building of the documentation with texinfo >= 5.0.
>
> more tests, comments, OKs are welcome.
> diff attached.

Works for me on amd64.

ok dcoppa@

ciao,
David

>
> Index: Makefile
> ===
> RCS file: /cvs/ports/mail/msmtp/Makefile,v
> retrieving revision 1.36
> diff -u -p -r1.36 Makefile
> --- Makefile11 Mar 2013 11:23:51 -  1.36
> +++ Makefile22 Apr 2013 19:53:08 -
> @@ -2,7 +2,7 @@
>
>  COMMENT =  SMTP plugin for MUAs
>
> -DISTNAME = msmtp-1.4.30
> +DISTNAME = msmtp-1.4.31
>  CATEGORIES =   mail
>
>  HOMEPAGE = http://msmtp.sourceforge.net/
> Index: distinfo
> ===
> RCS file: /cvs/ports/mail/msmtp/distinfo,v
> retrieving revision 1.23
> diff -u -p -r1.23 distinfo
> --- distinfo29 Oct 2012 13:41:06 -  1.23
> +++ distinfo22 Apr 2013 19:53:08 -
> @@ -1,2 +1,2 @@
> -SHA256 (msmtp-1.4.30.tar.bz2) = 8VK5KW4240DrBJx+5NaYD82ynZSOZUvcdL6n7pdAmIY=
> -SIZE (msmtp-1.4.30.tar.bz2) = 303226
> +SHA256 (msmtp-1.4.31.tar.bz2) = JHr5qV+iL1BuhRCfxCaKXZHKA6+bF+68weRrfNZMIl8=
> +SIZE (msmtp-1.4.31.tar.bz2) = 305770
> Index: patches/patch-scripts_msmtpq_msmtpq
> ===
> RCS file: /cvs/ports/mail/msmtp/patches/patch-scripts_msmtpq_msmtpq,v
> retrieving revision 1.1
> diff -u -p -r1.1 patch-scripts_msmtpq_msmtpq
> --- patches/patch-scripts_msmtpq_msmtpq 19 Oct 2008 20:35:01 -  1.1
> +++ patches/patch-scripts_msmtpq_msmtpq 22 Apr 2013 19:53:08 -
> @@ -1,9 +1,9 @@
>  $OpenBSD: patch-scripts_msmtpq_msmtpq,v 1.1 2008/10/19 20:35:01 jasper Exp $
>  scripts/msmtpq/msmtpq.orig Mon Jul 28 00:20:41 2008
> -+++ scripts/msmtpq/msmtpq  Tue Oct 14 14:18:13 2008
> +--- scripts/msmtpq/msmtpq.orig Thu Feb 14 16:33:59 2013
>  scripts/msmtpq/msmtpq  Thu Mar 21 21:12:19 2013
>  @@ -1,4 +1,4 @@
>  -#!/usr/bin/env bash
>  +#!/bin/sh
>
> - #--
> - #
> + ##--
> + ##
>



Re: UPDATE: Jailkit-2.16

2013-04-23 Thread Gonzalo L. R.
Now with a very important part... the diff :)

(thanks benoit@)

On Tue, Apr 23, 2013 at 09:45:58AM -0300, Gonzalo L. R. wrote:
; Hi,
; 
; Update for Jailkit to 2.16, bugfix release.
; 
; * fixes the environment cleaning function
; * the defaults for jk_init.ini are improved for 64bit systems
; 
; And various error messages are improved.
; 
; Comments? Ok?
; 
; Cheers.-
; 
; -- 
; Sending from my iFart...
; 

-- 
Sending from my iFart...
Index: Makefile
===
RCS file: /cvs/ports/security/jailkit/Makefile,v
retrieving revision 1.10
diff -u -p -r1.10 Makefile
--- Makefile11 Mar 2013 11:41:25 -  1.10
+++ Makefile23 Apr 2013 12:43:28 -
@@ -2,7 +2,7 @@
 
 COMMENT=   utilities for jailing a user or process
 
-DISTNAME=  jailkit-2.15
+DISTNAME=  jailkit-2.16
 CATEGORIES=security sysutils
 
 HOMEPAGE=  http://olivier.sessink.nl/jailkit/
Index: distinfo
===
RCS file: /cvs/ports/security/jailkit/distinfo,v
retrieving revision 1.4
diff -u -p -r1.4 distinfo
--- distinfo15 Jun 2012 13:50:58 -  1.4
+++ distinfo23 Apr 2013 12:43:28 -
@@ -1,5 +1,2 @@
-MD5 (jailkit-2.15.tar.gz) = yQBTbD2nVm/i//AAHhhx5g==
-RMD160 (jailkit-2.15.tar.gz) = 1U/GMhRivGaIH8iIf2LG+7S1jfU=
-SHA1 (jailkit-2.15.tar.gz) = ZVUvSbw2cGm/XMDaMxIZeZpZ2As=
-SHA256 (jailkit-2.15.tar.gz) = +PoaoQo3x5enKD3LyQ/6XnUkVLX4/Qg6XHnl0+JpzPc=
-SIZE (jailkit-2.15.tar.gz) = 137372
+SHA256 (jailkit-2.16.tar.gz) = CyV8VcPT8fxL9Oy79ar8MdKVTrQ+NmvYwA6FpAGeZlg=
+SIZE (jailkit-2.16.tar.gz) = 139407
Index: patches/patch-ini_jk_init_ini
===
RCS file: /cvs/ports/security/jailkit/patches/patch-ini_jk_init_ini,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 patch-ini_jk_init_ini
--- patches/patch-ini_jk_init_ini   20 Sep 2010 07:15:30 -  1.1.1.1
+++ patches/patch-ini_jk_init_ini   23 Apr 2013 12:43:28 -
@@ -2,8 +2,8 @@ $OpenBSD: patch-ini_jk_init_ini,v 1.1.1.
 
 fix some default paths in the jail creation configuration file
 
 ini/jk_init.ini.orig   Sat Sep 11 15:58:41 2010
-+++ ini/jk_init.iniSat Sep 18 11:40:01 2010
+--- ini/jk_init.ini.orig   Fri Aug 10 14:16:47 2012
 ini/jk_init.iniTue Apr 23 06:35:22 2013
 @@ -21,7 +21,7 @@ need_logsocket = 1
  
  [jk_lsh]
@@ -49,7 +49,7 @@ fix some default paths in the jail creat
  
  [xclients]
  comment = minimal files for X clients
-@@ -145,5 +145,5 @@ includesections = xclients
+@@ -149,5 +149,5 @@ paths_w_setuid = /bin/ping
  
  #[xterm]
  #comment = xterm
Index: patches/patch-py_jk_lib_py
===
RCS file: /cvs/ports/security/jailkit/patches/patch-py_jk_lib_py,v
retrieving revision 1.2
diff -u -p -r1.2 patch-py_jk_lib_py
--- patches/patch-py_jk_lib_py  15 Jun 2012 13:50:58 -  1.2
+++ patches/patch-py_jk_lib_py  23 Apr 2013 12:43:28 -
@@ -2,9 +2,9 @@ $OpenBSD: patch-py_jk_lib_py,v 1.2 2012/
 
 Fix running jk_init trying to create a jail the first time
 
 py/jk_lib.py.orig  Thu Jun  7 18:19:27 2012
-+++ py/jk_lib.py   Thu Jun 14 11:51:39 2012
-@@ -459,7 +459,10 @@ def create_parent_path(chroot,path,be_verbose=0, copy_
+--- py/jk_lib.py.orig  Thu Aug  2 14:55:28 2012
 py/jk_lib.py   Tue Apr 23 06:35:23 2013
+@@ -461,7 +461,10 @@ def create_parent_path(chroot,path,be_verbose=0, copy_
if (stat.S_ISDIR(sb.st_mode)):
if (be_verbose):
print 'Create directory '+jailpath


PATCH devel/libplist. Wrong order of include dirs.

2013-04-23 Thread Juan Francisco Cantero Hurtado
The file plist.c requires the header "plist/plist.h" from
WRKSRC/include. The port has "LOCALBASE/include" in CFLAGS, so gcc picks
"plist/plist.h" from /usr/local.

The patch bellow fixes the order of the include dirs.


[ 18%] Building C object src/CMakeFiles/plist.dir/plist.c.o
cd /usr/ports/pobj/libplist-1.10/build-amd64/src && /usr/bin/cc
-Dplist_EXPORTS -O2 -pipe -g -I/usr/local/include -pthread
-DPLIST_BYTE_ORDER=0 -fPIC
-I/usr/ports/pobj/libplist-1.10/libplist-1.10/include
-I/usr/local/include/libxml2
-I/usr/ports/pobj/libplist-1.10/libplist-1.10/libcnary/include-o
CMakeFiles/plist.dir/plist.c.o   -c
/usr/ports/pobj/libplist-1.10/libplist-1.10/src/plist.c
/usr/ports/pobj/libplist-1.10/libplist-1.10/src/plist.c: In function
'plist_new_uid':
/usr/ports/pobj/libplist-1.10/libplist-1.10/src/plist.c:144: error:
'PLIST_UID' undeclared (first use in this function)
/usr/ports/pobj/libplist-1.10/libplist-1.10/src/plist.c:144: error:
(Each undeclared identifier is reported only once
/usr/ports/pobj/libplist-1.10/libplist-1.10/src/plist.c:144: error: for
each function it appears in.)
/usr/ports/pobj/libplist-1.10/libplist-1.10/src/plist.c: In function
'plist_get_type_and_value':
/usr/ports/pobj/libplist-1.10/libplist-1.10/src/plist.c:502: error:
'PLIST_UID' undeclared (first use in this function)
/usr/ports/pobj/libplist-1.10/libplist-1.10/src/plist.c: In function
'plist_get_uid_val':
/usr/ports/pobj/libplist-1.10/libplist-1.10/src/plist.c:584: error:
'PLIST_UID' undeclared (first use in this function)
/usr/ports/pobj/libplist-1.10/libplist-1.10/src/plist.c: In function
'plist_data_compare':
/usr/ports/pobj/libplist-1.10/libplist-1.10/src/plist.c:639: error:
'PLIST_UID' undeclared (first use in this function)
/usr/ports/pobj/libplist-1.10/libplist-1.10/src/plist.c: In function
'plist_set_element_val':
/usr/ports/pobj/libplist-1.10/libplist-1.10/src/plist.c:715: error:
'PLIST_UID' undeclared (first use in this function)
/usr/ports/pobj/libplist-1.10/libplist-1.10/src/plist.c: In function
'plist_set_type':
/usr/ports/pobj/libplist-1.10/libplist-1.10/src/plist.c:754: error:
'PLIST_UID' undeclared (first use in this function)
/usr/ports/pobj/libplist-1.10/libplist-1.10/src/plist.c: In function
'plist_set_uid_val':
/usr/ports/pobj/libplist-1.10/libplist-1.10/src/plist.c:792: error:
'PLIST_UID' undeclared (first use in this function)
*** Error 1 in . (src/CMakeFiles/plist.dir/build.make:59
'src/CMakeFiles/plist.dir/plist.c.o')
*** Error 1 in . (CMakeFiles/Makefile2:163
'src/CMakeFiles/plist.dir/all')
*** Error 1 in /usr/ports/pobj/libplist-1.10/build-amd64 (Makefile:147
'all')
*** Error 1 in . (/usr/ports/infrastructure/mk/bsd.port.mk:2670
'/usr/ports/pobj/libplist-1.10/build-amd64/.build_done')
*** Error 1 in . (/usr/ports/infrastructure/mk/bsd.port.mk:1863
'/usr/ports/packages/amd64/all/libplist-1.10.tgz')
*** Error 1 in . (/usr/ports/infrastructure/mk/bsd.port.mk:2409
'_internal-package')
*** Error 1 in /usr/ports/devel/libplist
(/usr/ports/infrastructure/mk/bsd.port.mk:2389 'package')


Index: Makefile
===
RCS file: /cvs/ports/devel/libplist/Makefile,v
retrieving revision 1.6
diff -u -p -r1.6 Makefile
--- Makefile12 Apr 2013 17:12:55 -  1.6
+++ Makefile23 Apr 2013 16:14:21 -
@@ -8,6 +8,7 @@ SHARED_ONLY =   Yes
 VERSION =  1.10
 SUBST_VARS +=  VERSION
 DISTNAME = libplist-${VERSION}
+REVISION = 0
 PKGNAME-main = ${DISTNAME}
 PKGNAME-python =   py-plist-${VERSION}
 
@@ -39,6 +40,6 @@ WANTLIB +=glib-2.0 m stdc++ xml2
 WANTLIB-main +=${WANTLIB} c pthread
 WANTLIB-python +=  ${WANTLIB} plist plist++ python${MODPY_VERSION}
 
-CONFIGURE_ARGS =   -DCMAKE_C_FLAGS="${CFLAGS} -I${LOCALBASE}/include 
-pthread"
+CONFIGURE_ARGS =   -DCMAKE_C_FLAGS="${CFLAGS} -pthread"
 
 .include 
Index: patches/patch-CMakeLists_txt
===
RCS file: patches/patch-CMakeLists_txt
diff -N patches/patch-CMakeLists_txt
--- /dev/null   1 Jan 1970 00:00:00 -
+++ patches/patch-CMakeLists_txt23 Apr 2013 16:14:21 -
@@ -0,0 +1,13 @@
+$OpenBSD$
+--- CMakeLists.txt.origTue Apr 23 17:41:59 2013
 CMakeLists.txt Tue Apr 23 17:42:40 2013
+@@ -34,7 +34,8 @@ IF(ENABLE_SWIG OR ENABLE_CYTHON)
+ ENDIF(ENABLE_SWIG OR ENABLE_CYTHON)
+ 
+ INCLUDE_DIRECTORIES( ${CMAKE_CURRENT_SOURCE_DIR}/include
+-   ${CMAKE_INCLUDE_PATH})
++   ${CMAKE_INCLUDE_PATH}
++   /usr/local/include)
+ 
+ ENABLE_TESTING()
+ 



Re: PATCH devel/libplist. Wrong order of include dirs.

2013-04-23 Thread Stuart Henderson
On 2013/04/23 18:23, Juan Francisco Cantero Hurtado wrote:
> The file plist.c requires the header "plist/plist.h" from
> WRKSRC/include. The port has "LOCALBASE/include" in CFLAGS, so gcc picks
> "plist/plist.h" from /usr/local.
> 
> The patch bellow fixes the order of the include dirs.

Don't hardcode /usr/local, use ${LOCALBASE} or ${PREFIX} as appropriate
(in this case, localbase, because it refers to "already installed packages"
rather than "where this package will be installed")

>  DISTNAME =   libplist-${VERSION}
> +REVISION =   0

probably not strictly necessary, but doesn't hurt.

> -CONFIGURE_ARGS = -DCMAKE_C_FLAGS="${CFLAGS} -I${LOCALBASE}/include 
> -pthread"
> +CONFIGURE_ARGS = -DCMAKE_C_FLAGS="${CFLAGS} -pthread"

mid update so can't check now, but can you just use this instead?

CONFIGURE_ARGS =-DCMAKE_C_FLAGS="${CFLAGS} -I. -I${LOCALBASE}/include 
-pthread"



Collision in man files between ap2-mod_perl and p5-Apache-Reload

2013-04-23 Thread Chris Bennett
OK, these are little nothing things, a spelling error and a date.

Apache::Reload version 0.12 has these things fixed, but it requires
Apache::Test at 1.34, so that bump is more difficult just for that.

So how does something like this get resolved?

Chris Bennett

--- 
/usr/ports/pobj/p5-Apache-Reload-0.11/fake-amd64/usr/local/man/man3p/Apache2::Reload.3p
 Tue Apr 23 11:13:03 2013
+++ 
/usr/ports/pobj/ap2-mod_perl-2.0.7/fake-amd64/usr/local/man/man3p/Apache2::Reload.3p
Tue Apr 23 11:11:09 2013
@@ -124,7 +124,7 @@
 .\" 
 .\"
 .IX Title "Apache2::Reload 3"
-.TH Apache2::Reload 3 "2010-08-21" "perl v5.16.3" "User Contributed Perl 
Documentation"
+.TH Apache2::Reload 3 "2012-04-05" "perl v5.16.3" "User Contributed Perl 
Documentation"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
@@ -317,7 +317,7 @@
 mode described before.
 .SS "Unregistering a module"
 .IX Subsection "Unregistering a module"
-In some cases, it might be necessary to explicitely stop reloading
+In some cases, it might be necessary to explicitly stop reloading
 a module.
 .PP
 .Vb 1
--- 
/usr/ports/pobj/p5-Apache-Reload-0.11/fake-amd64/usr/local/man/man3p/Apache::Reload.3p
  Tue Apr 23 11:13:03 2013
+++ 
/usr/ports/pobj/ap2-mod_perl-2.0.7/fake-amd64/usr/local/man/man3p/Apache::Reload.3p
 Tue Apr 23 11:11:09 2013
@@ -124,7 +124,7 @@
 .\" 
 .\"
 .IX Title "Apache::Reload 3"
-.TH Apache::Reload 3 "2010-08-21" "perl v5.16.3" "User Contributed Perl 
Documentation"
+.TH Apache::Reload 3 "2012-04-05" "perl v5.16.3" "User Contributed Perl 
Documentation"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l


Re: Collision in man files between ap2-mod_perl and p5-Apache-Reload

2013-04-23 Thread Stuart Henderson
On 2013/04/23 11:43, Chris Bennett wrote:
> OK, these are little nothing things, a spelling error and a date.
> 
> Apache::Reload version 0.12 has these things fixed, but it requires
> Apache::Test at 1.34, so that bump is more difficult just for that.

Fixed, thanks.

> So how does something like this get resolved?

see my commit ;)



Re: update: p5-LaTeX-Driver to 0.12

2013-04-23 Thread Chris Bennett
On Tue, Apr 23, 2013 at 08:07:37AM +0100, Stuart Henderson wrote:
> On 2013/04/22 18:00, Chris Bennett wrote:
> > Newer version of p5-LaTeX-Driver. Version 0.12.
> > 
> > Upstream notes on changes:
> > * add missing dependency on Readonly (RT79330)
> 
> This dependency will need adding to the port. Otherwise looks good to me.

OK, fixed my diff.
Also tested on i386 and amd64.

? p5-LaTeX-Driver-0.12.diff
Index: Makefile
===
RCS file: /cvs/ports/textproc/p5-LaTeX-Driver/Makefile,v
retrieving revision 1.2
diff -u -r1.2 Makefile
--- Makefile11 Mar 2013 11:42:43 -  1.2
+++ Makefile23 Apr 2013 17:00:06 -
@@ -2,22 +2,23 @@
 
 COMMENT=   driver to format LaTeX documents
 
-DISTNAME=  LaTeX-Driver-0.10
+DISTNAME=  LaTeX-Driver-0.12
 CATEGORIES=textproc
 
 MODULES=   cpan
 
-# MIT
+# Perl
 PERMIT_PACKAGE_CDROM=  Yes
 
-CONFIGURE_ENV+= PREFIX=${PREFIX}
+CONFIGURE_ENV+=PREFIX=${PREFIX}
 
-RUN_DEPENDS=   print/texlive/base \
-devel/p5-Class-Accessor \
-devel/p5-Exception-Class \
-   devel/p5-File-Slurp
+RUN_DEPENDS=   print/texlive/base \
+   devel/p5-Class-Accessor \
+   devel/p5-Exception-Class \
+   devel/p5-File-Slurp \
+   devel/p5-Readonly
 
-TEST_DEPENDS= print/texlive/texmf,-full \
-   devel/p5-Test-Exception
+TEST_DEPENDS=  print/texlive/texmf,-full \
+   devel/p5-Test-Exception
 
 .include 
Index: distinfo
===
RCS file: /cvs/ports/textproc/p5-LaTeX-Driver/distinfo,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 distinfo
--- distinfo27 Jun 2012 08:54:27 -  1.1.1.1
+++ distinfo23 Apr 2013 17:00:06 -
@@ -1,5 +1,2 @@
-MD5 (LaTeX-Driver-0.10.tar.gz) = 4o4zG/T30XPzlSoo0NjQLA==
-RMD160 (LaTeX-Driver-0.10.tar.gz) = B8B/Y0ygYnZR9NqXGwV2lPHjw2o=
-SHA1 (LaTeX-Driver-0.10.tar.gz) = ocYEm+/aVJWzCW6iYDxtwKqx+i8=
-SHA256 (LaTeX-Driver-0.10.tar.gz) = 
bBDQaEB2BPQtX3LQ1AE5psIFm7dOmPcGid/qfTUv0r8=
-SIZE (LaTeX-Driver-0.10.tar.gz) = 30666
+SHA256 (LaTeX-Driver-0.12.tar.gz) = 
ggCgsAkXjZj8pxUMCFSR9P9gUoQQfQMhgZBcMuoVxa8=
+SIZE (LaTeX-Driver-0.12.tar.gz) = 34850
Index: pkg/PLIST
===
RCS file: /cvs/ports/textproc/p5-LaTeX-Driver/pkg/PLIST,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 PLIST
--- pkg/PLIST   27 Jun 2012 08:54:27 -  1.1.1.1
+++ pkg/PLIST   23 Apr 2013 17:00:06 -
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.1.1.1 2012/06/27 08:54:27 sthen Exp $
+@comment $OpenBSD$
 bin/latex2dvi
 bin/latex2pdf
 bin/latex2ps


Re: PATCH devel/libplist. Wrong order of include dirs.

2013-04-23 Thread Juan Francisco Cantero Hurtado
On Tue, Apr 23, 2013 at 05:32:55PM +0100, Stuart Henderson wrote:
> On 2013/04/23 18:23, Juan Francisco Cantero Hurtado wrote:
> > The file plist.c requires the header "plist/plist.h" from
> > WRKSRC/include. The port has "LOCALBASE/include" in CFLAGS, so gcc picks
> > "plist/plist.h" from /usr/local.
> > 
> > The patch bellow fixes the order of the include dirs.
> 
> Don't hardcode /usr/local, use ${LOCALBASE} or ${PREFIX} as appropriate
> (in this case, localbase, because it refers to "already installed packages"
> rather than "where this package will be installed")

I know. It didn't work. I only see the new flag "-I/include" in the
output of the compilation.

> 
> >  DISTNAME = libplist-${VERSION}
> > +REVISION = 0
> 
> probably not strictly necessary, but doesn't hurt.
> 
> > -CONFIGURE_ARGS =   -DCMAKE_C_FLAGS="${CFLAGS} -I${LOCALBASE}/include 
> > -pthread"
> > +CONFIGURE_ARGS =   -DCMAKE_C_FLAGS="${CFLAGS} -pthread"
> 
> mid update so can't check now, but can you just use this instead?
> 
> CONFIGURE_ARGS =  -DCMAKE_C_FLAGS="${CFLAGS} -I. -I${LOCALBASE}/include 
> -pthread"
> 

Yep. New patch.

Index: Makefile
===
RCS file: /cvs/ports/devel/libplist/Makefile,v
retrieving revision 1.6
diff -u -p -r1.6 Makefile
--- Makefile12 Apr 2013 17:12:55 -  1.6
+++ Makefile23 Apr 2013 17:22:58 -
@@ -39,6 +39,6 @@ WANTLIB +=glib-2.0 m stdc++ xml2
 WANTLIB-main +=${WANTLIB} c pthread
 WANTLIB-python +=  ${WANTLIB} plist plist++ python${MODPY_VERSION}
 
-CONFIGURE_ARGS =   -DCMAKE_C_FLAGS="${CFLAGS} -I${LOCALBASE}/include 
-pthread"
+CONFIGURE_ARGS =   -DCMAKE_C_FLAGS="${CFLAGS} -I. -I${LOCALBASE}/include 
-pthread"
 
 .include 

-- 
Juan Francisco Cantero Hurtado http://juanfra.info



UPDATE: www/sope www/sogo

2013-04-23 Thread Sebastian Reitenbach
Hi,

attached patches update www/sope, www/sogo to the last release: 2.0.5a.

Patches should come after the GNUstep updates I just sent in a different mail,
but its supposed to work with the current version too. So, when this may
enter the ports tree before, would need a bump.

OK?

SebastianIndex: www/sogo/Makefile
===
RCS file: /cvs/ports/www/sogo/Makefile,v
retrieving revision 1.29
diff -u -p -u -r1.29 Makefile
--- www/sogo/Makefile	11 Mar 2013 11:44:49 -	1.29
+++ www/sogo/Makefile	23 Apr 2013 17:11:06 -
@@ -2,9 +2,9 @@
 
 COMMENT = 	web based groupware server
 
-VERSION =	2.0.4
-DISTNAME =	SOGo-${VERSION}b
-PKGNAME =	sogo-${VERSION}.1
+VERSION =	2.0.5
+DISTNAME =	SOGo-${VERSION}a
+PKGNAME =	sogo-${VERSION}.0
 
 SHARED_LIBS +=	GDLContentStore 2.0
 SHARED_LIBS +=	NGCards		2.0
Index: www/sogo/distinfo
===
RCS file: /cvs/ports/www/sogo/distinfo,v
retrieving revision 1.16
diff -u -p -u -r1.16 distinfo
--- www/sogo/distinfo	6 Feb 2013 17:36:11 -	1.16
+++ www/sogo/distinfo	23 Apr 2013 17:11:06 -
@@ -1,2 +1,2 @@
-SHA256 (SOGo-2.0.4b.tar.gz) = 79bcerjwSPX/bIeVeKdIe0YKz20vIo9adOoWhmku1/8=
-SIZE (SOGo-2.0.4b.tar.gz) = 6276765
+SHA256 (SOGo-2.0.5a.tar.gz) = q8s7Qm6prfPZzAyxFrQMtd6b3lTzGTJnJc4l89PCW3g=
+SIZE (SOGo-2.0.5a.tar.gz) = 5640595
Index: www/sope//Makefile
===
RCS file: /cvs/ports/www/sope/Makefile,v
retrieving revision 1.30
diff -u -p -u -r1.30 Makefile
--- www/sope//Makefile	11 Mar 2013 11:44:49 -	1.30
+++ www/sope//Makefile	23 Apr 2013 17:10:40 -
@@ -4,11 +4,11 @@ COMMENT-main=		Skyrix Object Publishing 
 COMMENT-mysql=		SOPE MySQL adaptor
 COMMENT-postgres=	SOPE PostgreSQL adaptor
 
-VERSION =		2.0.4
-DISTNAME =		SOPE-${VERSION}b
-PKGNAME-main =		sope-${VERSION}.1
-PKGNAME-mysql =		sope-mysql-${VERSION}.1
-PKGNAME-postgres =	sope-postgres-${VERSION}.1
+VERSION =		2.0.5
+DISTNAME =		SOPE-${VERSION}a
+PKGNAME-main =		sope-${VERSION}.0
+PKGNAME-mysql =		sope-mysql-${VERSION}.0
+PKGNAME-postgres =	sope-postgres-${VERSION}.0
 
 SO_MAJOR=	2
 SO_MINOR=	0
@@ -42,9 +42,9 @@ LIB_DEPENDS-main=	x11/gnustep/base \
 			databases/openldap \
 			x11/gnustep/libobjc2 \
 			${MODLIBICONV_LIB_DEPENDS}
-LIB_DEPENDS-mysql =	${BASE_PKGPATH}=${VERSION}.1 \
+LIB_DEPENDS-mysql =	${BASE_PKGPATH}=${VERSION}.0 \
 			databases/mysql,-main
-LIB_DEPENDS-postgres =	${BASE_PKGPATH}=${VERSION}.1 \
+LIB_DEPENDS-postgres =	${BASE_PKGPATH}=${VERSION}.0 \
 			databases/postgresql,-main
 
 CONFIGURE_STYLE=simple dest
Index: www/sope//distinfo
===
RCS file: /cvs/ports/www/sope/distinfo,v
retrieving revision 1.18
diff -u -p -u -r1.18 distinfo
--- www/sope//distinfo	6 Feb 2013 17:35:51 -	1.18
+++ www/sope//distinfo	23 Apr 2013 17:10:40 -
@@ -1,2 +1,2 @@
-SHA256 (SOPE-2.0.4b.tar.gz) = 2M5PaTJrB4ljLz9vVVB++FB9EPwlvZSSrjYnN4qLOuw=
-SIZE (SOPE-2.0.4b.tar.gz) = 2248548
+SHA256 (SOPE-2.0.5a.tar.gz) = av0r1EL4QMEYRvtLNdsBHeNSP9TlIwWjmJb5ran9iJw=
+SIZE (SOPE-2.0.5a.tar.gz) = 2249592


update: p5-LaTeX-Encode -> version 0.08

2013-04-23 Thread Chris Bennett
Has added dependencies of p5-Readonly and p5-HTML-Parser.

p5-LaTeX-Encode-0.03 -> p5-LaTeX-Encode-0.08

Tested on amd64.
Comments, OK's fine.

Attached diff


? p5-LaTeX-Encode-0.08.diff
Index: Makefile
===
RCS file: /cvs/ports/textproc/p5-LaTeX-Encode/Makefile,v
retrieving revision 1.2
diff -u -r1.2 Makefile
--- Makefile11 Mar 2013 11:42:43 -  1.2
+++ Makefile23 Apr 2013 18:12:31 -
@@ -2,14 +2,17 @@
 
 COMMENT=   encode characters for LaTeX formatting
 
-DISTNAME=  LaTeX-Encode-0.03
+DISTNAME=  LaTeX-Encode-0.08
 CATEGORIES=textproc
 
 MODULES=   cpan
 
-# MIT
+# Perl
 PERMIT_PACKAGE_CDROM=  Yes
 
-TEST_DEPENDS=  devel/p5-Test-Pod-Coverage>=1.08p1
+BUILD_DEPENDS= ${RUN_DEPENDS}
+
+RUN_DEPENDS=   devel/p5-Readonly \
+   www/p5-HTML-Parser
 
 .include 
Index: distinfo
===
RCS file: /cvs/ports/textproc/p5-LaTeX-Encode/distinfo,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 distinfo
--- distinfo27 Jun 2012 10:57:54 -  1.1.1.1
+++ distinfo23 Apr 2013 18:12:31 -
@@ -1,5 +1,2 @@
-MD5 (LaTeX-Encode-0.03.tar.gz) = o928fLb4RtfhTm+lMyxwaw==
-RMD160 (LaTeX-Encode-0.03.tar.gz) = 4d12bm4q35VrnJwOq+ZZwtyrBnE=
-SHA1 (LaTeX-Encode-0.03.tar.gz) = A9CVsSvEJSmPy1bO9fCiAHz8UVs=
-SHA256 (LaTeX-Encode-0.03.tar.gz) = 
jbvFjR13GJA304upQsxpkwKYA1bk8qP9kBy/Eg+W7K4=
-SIZE (LaTeX-Encode-0.03.tar.gz) = 22547
+SHA256 (LaTeX-Encode-0.08.tar.gz) = 
N8cLKNsXWQd6FROJazW+KrckdqswOBRNooRBu1Xow64=
+SIZE (LaTeX-Encode-0.08.tar.gz) = 46672
Index: pkg/DESCR
===
RCS file: /cvs/ports/textproc/p5-LaTeX-Encode/pkg/DESCR,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 DESCR
--- pkg/DESCR   27 Jun 2012 10:57:54 -  1.1.1.1
+++ pkg/DESCR   23 Apr 2013 18:12:31 -
@@ -1,18 +1,16 @@
-TeX::Encode exports the function 'latex_encode' which encodes
-characters in a string, that would be incorrectly interpreted by
-LaTeX.
+LaTeX::Encode exports the function 'latex_encode()' which encodes
+characters in a string, that would be incorrectly interpreted by LaTeX.
 
-The latex_encode function takes a text string and an optional
-reference to a hash of options.  The options currently supported
-are "exclude" to specify a list of characters that should not be
-encoded (often this is "\\{}" to allow LaTeX commands to be used
-in the text string), and "iquotes" to enable "intelligent quotes",
-that is double quotes around a phrase will be converted to "``" and
-"''" and single quotes to "`" and "'".
+Additional mappings can be added to the standard encoding table with the
+'add_latex_encodings()' function, while encodings can be removed with
+the 'remove_latex_encodings()' function.  Additions and deletions can
+also be specified on the 'use' statement (e.g.: "use LaTeX::Encode add
+=> { '@' => 'AT' };".
 
-The scripts directory contains scripts to help build the character
-encoding tables used by the module and to create and format a
-document listing the characters that the module encodes with their
-Unicode character value, HTML entity representation, LaTeX encoding
-and visual representation.  These scripts are not installed by "make
-install".
+The 'latex_encode()' function takes a text string and an optional
+reference to a hash of options.  The options currently supported are
+"exclude" to specify a list of characters that should not be encoded
+(often this is "\\{}" to allow LaTeX commands to be used in the text
+string), and "iquotes" to enable "intelligent quotes", that is double
+quotes around a phrase will be converted to "``" and "''" and single
+quotes to "`" and "'".
Index: pkg/PLIST
===
RCS file: /cvs/ports/textproc/p5-LaTeX-Encode/pkg/PLIST,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 PLIST
--- pkg/PLIST   27 Jun 2012 10:57:54 -  1.1.1.1
+++ pkg/PLIST   23 Apr 2013 18:12:31 -
@@ -1,6 +1,9 @@
-@comment $OpenBSD: PLIST,v 1.1.1.1 2012/06/27 10:57:54 sthen Exp $
+@comment $OpenBSD$
+bin/latex-encode
 ${P5SITE}/LaTeX/
 ${P5SITE}/LaTeX/Encode/
 ${P5SITE}/LaTeX/Encode.pm
 ${P5SITE}/LaTeX/Encode/EncodingTable.pm
+@man man/man1/latex-encode.1
 @man man/man3p/LaTeX::Encode.3p
+@man man/man3p/LaTeX::Encode::EncodingTable.3p


Re: major GNUstep update

2013-04-23 Thread Landry Breuil
On Tue, Apr 23, 2013 at 07:24:01PM +0200, Sebastian Reitenbach wrote:
> Hi,
> 
> working on this since some months. When the release of the GNUstep core 
> libraries was announce, I figured that
> again the API change broke many apps :( Therefore so many updates also to 
> other non-core apps and libraries.
> I lost a bit track over time, which updates are due to API changes, which 
> were just made in the meantime.
> 
> gnustep-base changes required a major bump, also the -gui needed a library 
> crank.
> Other major changes: 
>  * getting rid of -pthread related patches
>  * for gnustep-base, drop patch to handle temporary files in the homedirectory
>use the GNUstep.conf stuffed into the x11/gnustep directory

I like that part - less stuff in ~.

You have a commented out line in dbuskit, dunno if this is intended. For
all the ports where you just bump REVISION, you could take the
opportunity to regen distinfo, and eventually fix WANTLIB / update
PLIST. Other than that, the update reads ok, and i trust you for having
tested sogo/sope, so go ahead with it too.

Landry



Re: new: devel/p5-autobox

2013-04-23 Thread Chris Bennett
On Tue, Apr 23, 2013 at 08:11:18AM +0100, Stuart Henderson wrote:
> On 2013/04/19 11:10, Chris Bennett wrote:
> > OK?
> > 
> > Chris Bennett
> 
> If all PERMIT* are "yes", just set PERMIT_PACKAGE_CDROM=Yes,
> the others are implicit. Otherwise OK with me if someone would
> like to import.

Fixed Makefile.

Tested on i386 and amd64.

Makefile diff from my original attached.
OK? Any comments?

--- Makefile.orig   Tue Apr 23 13:42:00 2013
+++ MakefileTue Apr 23 06:42:40 2013
@@ -1,6 +1,6 @@
 # $OpenBSD: Makefile.template,v 1.65 2013/03/21 08:46:31 ajacoutot Exp $
 
-SHARED_ONLY =Yes
+SHARED_ONLY =  Yes
 
 COMMENT =  pragma to call methods on native types
 
@@ -10,8 +10,6 @@
 
 # Perl
 PERMIT_PACKAGE_CDROM = Yes
-PERMIT_PACKAGE_FTP =   Yes
-PERMIT_DISTFILES_FTP = Yes
 
 WANTLIB += c
 MODULES =  cpan


Re: new: net/bitcoin

2013-04-23 Thread Aaron
On Wed, Mar 20, 2013 at 4:33 PM, Pascal Stumpf  wrote:
> On Tue, 19 Mar 2013 14:53:59 +0100, Pascal Stumpf wrote:
>> Version 0.8.1 of the bitcoin port.  Needs the leveldb fix I sent
>> earlier.
>>
>> Bitcoin is an experimental new digital currency that enables instant
>> payments to anyone, anywhere in the world. Bitcoin uses peer-to-peer
>> technology to operate with no central authority: managing transactions
>> and issuing money are carried out collectively by the network.
>> Bitcoin is also the name of the open source software which enables
>> the use of this currency.
>>
>> ok?
>>
>
> Grr, now a version that actually builds (forgotten patch).

Tested on amd64 - OK from me.



Re: new: net/bitcoin

2013-04-23 Thread Robert Connolly

On 03/19/13 06:53, Pascal Stumpf wrote:

Version 0.8.1 of the bitcoin port.  Needs the leveldb fix I sent
earlier.

Bitcoin is an experimental new digital currency that enables instant
payments to anyone, anywhere in the world. Bitcoin uses peer-to-peer
technology to operate with no central authority: managing transactions
and issuing money are carried out collectively by the network.
Bitcoin is also the name of the open source software which enables
the use of this currency.

ok?
I would like to see this in ports. I'm using another system for Bitcoin 
because I didn't get around porting it to my OBSD laptop.


Thanks



Re: Do you plan update version of net/psi to 0.15?

2013-04-23 Thread dmitry.sensei
Thanks. May PsiMedia works on OpenBSD?


On Sat, Apr 20, 2013 at 8:15 PM, Alexandr Shadchin <
alexandr.shadc...@gmail.com> wrote:

> On Thu, Apr 11, 2013 at 12:34:49AM +0600, Alexandr Shadchin wrote:
> > On Wed, Apr 10, 2013 at 10:57:31AM +0500, dmitry.sensei wrote:
> > > Hi!
> > >
> > > Do you plan update version of net/psi to 0.15?
> > > Some suggestion was be made in
> > > http://comments.gmane.org/gmane.os.openbsd.ports/58536
> >
> > sync with last changes in ports.
> >
> > Someone has any objections ? Comment ? OK ?
> >
>
> If there is no objection, I would like to make commit tomorrow.
>
> > --
> > Alexandr Shadchin
> >
> > Index: Makefile
> > ===
> > RCS file: /cvs/ports/net/psi/Makefile,v
> > retrieving revision 1.17
> > diff -u -p -r1.17 Makefile
> > --- Makefile  11 Mar 2013 11:35:55 -  1.17
> > +++ Makefile  10 Apr 2013 18:28:08 -
> > @@ -2,8 +2,7 @@
> >
> >  COMMENT= multiplatform Jabber client
> >
> > -DISTNAME=psi-0.10
> > -REVISION=1
> > +DISTNAME=psi-0.15
> >  CATEGORIES=  net
> >
> >  HOMEPAGE=http://psi-im.org/
> > @@ -11,73 +10,66 @@ HOMEPAGE= http://psi-im.org/
> >  MASTER_SITES=${MASTER_SITE_SOURCEFORGE:=psi/}
> >  EXTRACT_SUFX=.tar.bz2
> >
> > -# GPL
> > +# GPLv2
> >  PERMIT_PACKAGE_CDROM=Yes
> >
> > -WANTLIB= X11 Xext Xss m c pthread pthread-stubs stdc++ xcb
> z \
> > - qca>=1
> > +WANTLIB += ICE QtDBus QtGui QtNetwork QtXml SM X11 Xext Xi Xinerama
> > +WANTLIB += Xrender Xss c enchant fontconfig freetype glib-2.0
> > +WANTLIB += gmodule-2.0 intl m pthread qca2 stdc++ z
> >
> > -MODULES= x11/qt3
> > -
> > -MODQT_OVERRIDE_UIC=  No
> > +MODULES= x11/qt4
> >
> >  USE_GMAKE=   Yes
> >
> > -LIB_DEPENDS= security/qca
> > -RUN_DEPENDS= security/qca-tls
> > +LIB_DEPENDS= security/qca2 \
> > + textproc/enchant
> > +RUN_DEPENDS= devel/desktop-file-utils \
> > + security/qca-gnupg \
> > + security/qca-ossl \
> > + x11/gtk+2,-guic
> >
> >  CONFIGURE_STYLE= simple
> >
> > -CONFIGURE_ARGS+= --qtdir=${MODQT_QTDIR} \
> > - --with-qca-inc=${LOCALBASE}/include \
> > - --with-qca-lib=${LOCALBASE}/lib \
> > - --disable-growl \
> > - --disable-dnotify \
> > - --disable-ghbnr
> > -
> > -CONFIGURE_ENV+=  LOCALBASE=${LOCALBASE} \
> > - KDEDIR=${LOCALBASE}
> > +CONFIGURE_ARGS+= --prefix=${LOCALBASE} \
> > + --qtdir=${MODQT4_QTDIR} \
> > + --with-qca-inc=${LOCALBASE}/include/QtCrypto \
> > + --disable-growl
> >
> >  # For QSettings to write its setup
> > -PORTHOME=  ${WRKDIST}
> > +PORTHOME=${WRKDIST}
> >
> >  NO_TEST= Yes
> >
> > -pre-configure:
> > - @perl -pi -e "s@%%X11BASE%%@${X11BASE}@" ${WRKSRC}/configure
> > -
> > -# compilation breaks if /usr/local/include/socks.h (from
> security/dante) is
> > -# found before psi's own socks.h, so add a workaround.
> > -pre-build:
> > - @perl -pi -e 's,INCLUDEPATH.*,,' ${WRKSRC}/conf.pri
> > -
> >  do-install:
> > - ${INSTALL_PROGRAM} ${WRKSRC}/src/psi ${PREFIX}/bin
> > + ${INSTALL_PROGRAM} ${WRKSRC}/psi ${PREFIX}/bin
> >   ${INSTALL_DATA_DIR} ${PREFIX}/share/psi
> >   ${INSTALL_DATA} ${WRKSRC}/COPYING ${PREFIX}/share/psi
> >   ${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/psi
> >   cp -R ${WRKSRC}/iconsets ${PREFIX}/share/psi
> >   cp -R ${WRKSRC}/sound ${PREFIX}/share/psi
> >   cp -R ${WRKSRC}/certs ${PREFIX}/share/psi
> > - cp -R ${WRKSRC}/certs ${PREFIX}/share/psi
> > - ${INSTALL_DATA} ${WRKSRC}/libpsi/psiwidgets/libpsiwidgets.so \
> > - ${PREFIX}/share/psi
> >
> > - # Icons for KDE
> > - ${INSTALL_DATA_DIR} ${PREFIX}/share/applnk/Internet
> > - ${INSTALL_DATA} ${WRKSRC}/psi.desktop \
> > - ${PREFIX}/share/applnk/Internet/
> > + ${INSTALL_DATA_DIR} ${PREFIX}/share/applications
> > + ${INSTALL_DATA} ${WRKSRC}/psi.desktop ${PREFIX}/share/applications/
> >
> >   ${INSTALL_DATA_DIR} ${PREFIX}/share/icons/hicolor/16x16/apps
> > - ${INSTALL_DATA} ${WRKSRC}/iconsets/system/default/icon_16.png \
> > + ${INSTALL_DATA} ${WRKSRC}/iconsets/system/default/logo_16.png \
> >   ${PREFIX}/share/icons/hicolor/16x16/apps/psi.png
> >
> >   ${INSTALL_DATA_DIR} ${PREFIX}/share/icons/hicolor/32x32/apps
> > - ${INSTALL_DATA} ${WRKSRC}/iconsets/system/default/icon_32.png \
> > + ${INSTALL_DATA} ${WRKSRC}/iconsets/system/default/logo_32.png \
> >   ${PREFIX}/share/icons/hicolor/32x32/apps/psi.png
> >
> >   ${INSTALL_DATA_DIR} ${PREFIX}/share/icons/hicolor/48x48/apps
> > - ${INSTALL_DATA} ${WRKSRC}/iconsets/system/