Permalink
Browse files

Merge branch 'master' of github.com:pcbsd/pcbsd

Conflicts:
	build-files/conf/port-make.conf
  • Loading branch information...
Ken Moore
Ken Moore committed Oct 18, 2013
2 parents 71c5890 + 8a6f762 commit 04421bd4e62153aa2843626ed255ffebdf6078dc
Showing 876 changed files with 71,054 additions and 23,002 deletions.
@@ -59,9 +59,6 @@ w3m_SET=M17N
# OptionsNG
gpgme_SET=GPGSM
-# Enable GVIM and other options
-WITH_VIM_OPTIONS=YES
-
# OptionsNG
hplip_SET=SNMP SCAN XSANE FAX
@@ -130,3 +127,6 @@ postfix_SET=MYSQL TLS
#Set some rxvt-unicode options
rxvt-unicode_SET= 256_COLOR
+
+# Enable GUI for VIM
+vim_SET=WITH_OPTIONS WITH_VIM_OPTIONS
@@ -2,7 +2,7 @@
# $FreeBSD: databases/postgresql-libpqxx3/Makefile 327717 2013-09-20 16:13:47Z bapt $
PORTNAME= libpqxx
-PORTVERSION= 3.1
+PORTVERSION= 3.1.1
CATEGORIES= databases
MASTER_SITES= http://pqxx.org/download/software/${PORTNAME}/
PKGNAMEPREFIX= postgresql-
@@ -21,10 +21,11 @@ GNU_CONFIGURE= yes
USE_LDCONFIG= yes
USE_GCC= yes
PLIST_SUB= PORTVERSION=${PORTVERSION}
+USE_PYTHON_BUILD= yes
+USES=shebangfix
+SHEBANG_FILES= tools/splitconfig
-CONFIGURE_ARGS= --with-postgres=${LOCALBASE} \
- --enable-shared \
- --with-postgres-include=${LOCALBASE}/include/postgresql
+CONFIGURE_ARGS= --enable-shared
NO_STAGE= yes
.include <bsd.port.mk>
@@ -1,2 +1,2 @@
-SHA256 (postgresql/libpqxx-3.1.tar.gz) = 8950433f193e118cfd36ab91391eb174ef48897bacc26197da596988e66796a0
-SIZE (postgresql/libpqxx-3.1.tar.gz) = 1771846
+SHA256 (postgresql/libpqxx-3.1.1.tar.gz) = ce443c7c515623b4a68de5f0657460344b6b6320982d8f8efc657c3746e1ee90
+SIZE (postgresql/libpqxx-3.1.1.tar.gz) = 1563338
@@ -1,22 +0,0 @@
-Index: /trunk/include/pqxx/util.hxx
-===================================================================
---- ./include/pqxx/util.hxx (revision 1638)
-+++ ./include/pqxx/util.hxx (revision 1665)
-@@ -33,4 +33,6 @@
- #include <memory>
- #endif
-+
-+#include "pqxx/strconv"
-
-
-Index: /trunk/include/pqxx/cursor.hxx
-===================================================================
---- ./include/pqxx/cursor.hxx (revision 1559)
-+++ ./include/pqxx/cursor.hxx (revision 1665)
-@@ -308,5 +308,5 @@
- transaction_base &trans,
- const PGSTD::string adopted_cursor) :
-- m_cur(trans, adopted_cursor, up, op)
-+ m_cur(trans, adopted_cursor, op)
- {
- // Put cursor in known position
@@ -0,0 +1,42 @@
+--- include/pqxx/largeobject.hxx (revision 1706)
++++ include/pqxx/largeobject.hxx (revision 1833)
+@@ -397,5 +397,5 @@
+ size_type BufSize=512) : //[t48]
+ m_BufSize(BufSize),
+- m_Obj(T, O),
++ m_Obj(T, O, mode),
+ m_G(0),
+ m_P(0)
+@@ -407,5 +407,5 @@
+ size_type BufSize=512) : //[t48]
+ m_BufSize(BufSize),
+- m_Obj(T, O),
++ m_Obj(T, O, mode),
+ m_G(0),
+ m_P(0)
+--- ChangeLog (revision 1825)
++++ ChangeLog (revision 1833)
+@@ -1,2 +1,7 @@
++2012-08-03 Jeroen T. Vermeulen <jtv@xs4all.nl>
++ include/pqxx/largeobject.hxx:
++ - Backported fix for #252: clang++ 3.2 compile error. Thanks Amy Troschinetz.
++ src/strconv.cxx:
++ - Backported fix for #253: clang++ 3.2 compile error. Thanks Amy Troschinetz.
+ 2012-03-25 Jeroen T. Vermeulen <jtv@xs4all.nl>
+ test/test002.cxx, test/test007.cxx, test/test011.cxx, test/test012.cxx,
+--- src/strconv.cxx (revision 1724)
++++ src/strconv.cxx (revision 1833)
+@@ -7,5 +7,5 @@
+ * implementation of string conversions
+ *
+- * Copyright (c) 2008, Jeroen T. Vermeulen <jtv@xs4all.nl>
++ * Copyright (c) 2008-2012, Jeroen T. Vermeulen <jtv@xs4all.nl>
+ *
+ * See COPYING for copyright license. If you did not receive a file called
+@@ -193,5 +193,5 @@
+ S.imbue(locale("C"));
+ #endif
+- ok = (S >> result);
++ ok = static_cast<bool>(S >> result);
+ }
+ break;
@@ -81,7 +81,7 @@ include/pqxx/util
include/pqxx/util.hxx
include/pqxx/version
include/pqxx/version.hxx
-lib/libpqxx-%%PORTVERSION%%.so
+lib/libpqxx-3.1.so
lib/libpqxx.a
lib/libpqxx.la
lib/libpqxx.so
Oops, something went wrong.

0 comments on commit 04421bd

Please sign in to comment.