- Unbreak builds after the lang/python27 update (r363790)

Exp-run:	192242, 192244

8 files changed, 6 insertions, 75 deletions

diff --git a/databases/postgresql84-server/files/patch-plpython-Makefile b/databases/postgresql84-server/files/patch-plpython-Makefile
deleted file mode 100644
index 3357b69..0000000
--- a/databases/postgresql84-server/files/patch-plpython-Makefile
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/pl/plpython/Makefile.orig	Fri Nov 19 20:23:01 2004
-+++ src/pl/plpython/Makefile	Tue Dec 28 23:32:16 2004
-@@ -9,7 +9,7 @@
- # shared library.  Since there is no official way to determine this
- # (at least not in pre-2.3 Python), we see if there is a file that is
- # named like a shared library.
--ifneq (,$(wildcard $(python_libdir)/libpython*$(DLSUFFIX)*))
-+ifneq (,$(wildcard $(python_libdir)/../../libpython*$(DLSUFFIX)*))
- shared_libpython = yes
- endif
- 
diff --git a/databases/postgresql90-server/files/patch-plpython-Makefile b/databases/postgresql90-server/files/patch-plpython-Makefile
deleted file mode 100644
index 3357b69..0000000
--- a/databases/postgresql90-server/files/patch-plpython-Makefile
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/pl/plpython/Makefile.orig	Fri Nov 19 20:23:01 2004
-+++ src/pl/plpython/Makefile	Tue Dec 28 23:32:16 2004
-@@ -9,7 +9,7 @@
- # shared library.  Since there is no official way to determine this
- # (at least not in pre-2.3 Python), we see if there is a file that is
- # named like a shared library.
--ifneq (,$(wildcard $(python_libdir)/libpython*$(DLSUFFIX)*))
-+ifneq (,$(wildcard $(python_libdir)/../../libpython*$(DLSUFFIX)*))
- shared_libpython = yes
- endif
- 
diff --git a/databases/postgresql91-server/files/patch-plpython-Makefile b/databases/postgresql91-server/files/patch-plpython-Makefile
deleted file mode 100644
index 3357b69..0000000
--- a/databases/postgresql91-server/files/patch-plpython-Makefile
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/pl/plpython/Makefile.orig	Fri Nov 19 20:23:01 2004
-+++ src/pl/plpython/Makefile	Tue Dec 28 23:32:16 2004
-@@ -9,7 +9,7 @@
- # shared library.  Since there is no official way to determine this
- # (at least not in pre-2.3 Python), we see if there is a file that is
- # named like a shared library.
--ifneq (,$(wildcard $(python_libdir)/libpython*$(DLSUFFIX)*))
-+ifneq (,$(wildcard $(python_libdir)/../../libpython*$(DLSUFFIX)*))
- shared_libpython = yes
- endif
- 
diff --git a/databases/postgresql92-server/files/patch-plpython-Makefile b/databases/postgresql92-server/files/patch-plpython-Makefile
deleted file mode 100644
index 3357b69..0000000
--- a/databases/postgresql92-server/files/patch-plpython-Makefile
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/pl/plpython/Makefile.orig	Fri Nov 19 20:23:01 2004
-+++ src/pl/plpython/Makefile	Tue Dec 28 23:32:16 2004
-@@ -9,7 +9,7 @@
- # shared library.  Since there is no official way to determine this
- # (at least not in pre-2.3 Python), we see if there is a file that is
- # named like a shared library.
--ifneq (,$(wildcard $(python_libdir)/libpython*$(DLSUFFIX)*))
-+ifneq (,$(wildcard $(python_libdir)/../../libpython*$(DLSUFFIX)*))
- shared_libpython = yes
- endif
- 
diff --git a/databases/postgresql93-server/files/patch-plpython-Makefile b/databases/postgresql93-server/files/patch-plpython-Makefile
deleted file mode 100644
index 75e27fa..0000000
--- a/databases/postgresql93-server/files/patch-plpython-Makefile
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/pl/plpython/Makefile.orig	2013-05-06 22:57:06.000000000 +0200
-+++ src/pl/plpython/Makefile	2013-05-10 19:50:09.000000000 +0200
-@@ -15,7 +15,7 @@
- ifeq (1,$(python_enable_shared))
- shared_libpython = yes
- else
--ifneq (,$(wildcard $(python_libdir)/libpython*$(DLSUFFIX)*))
-+ifneq (,$(wildcard $(python_libdir)/../../libpython*$(DLSUFFIX)*))
- shared_libpython = yes
- endif
- endif
diff --git a/databases/postgresql94-server/files/patch-plpython-Makefile b/databases/postgresql94-server/files/patch-plpython-Makefile
deleted file mode 100644
index 75e27fa..0000000
--- a/databases/postgresql94-server/files/patch-plpython-Makefile
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/pl/plpython/Makefile.orig	2013-05-06 22:57:06.000000000 +0200
-+++ src/pl/plpython/Makefile	2013-05-10 19:50:09.000000000 +0200
-@@ -15,7 +15,7 @@
- ifeq (1,$(python_enable_shared))
- shared_libpython = yes
- else
--ifneq (,$(wildcard $(python_libdir)/libpython*$(DLSUFFIX)*))
-+ifneq (,$(wildcard $(python_libdir)/../../libpython*$(DLSUFFIX)*))
- shared_libpython = yes
- endif
- endif
diff --git a/devel/libhid/Makefile b/devel/libhid/Makefile
index 7cba745..d31d76a 100644
--- a/devel/libhid/Makefile
+++ b/devel/libhid/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	libhid
 PORTVERSION=	0.2.16
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel
 MASTER_SITES=	http://alioth.debian.org/frs/download.php/1958/
 
diff --git a/devel/libhid/files/patch-configure b/devel/libhid/files/patch-configure
index 8188549..8ed8d25 100644
--- a/devel/libhid/files/patch-configure
+++ b/devel/libhid/files/patch-configure
@@ -1,14 +1,11 @@
---- configure.orig	2007-04-26 03:25:25.000000000 +0300
-+++ configure	2007-09-04 11:10:38.000000000 +0300
-@@ -22784,8 +22784,9 @@
- 		fi
+--- configure.orig	2014-08-01 17:07:37.000000000 +0200
++++ configure	2014-08-01 17:08:37.000000000 +0200
+@@ -22785,7 +22785,7 @@
  
  		PYTHON_LDFLAGS=`$PYTHON -c "from distutils.sysconfig import *; \
--			import os; \
+ 			import os; \
 -			print apply(os.path.join, get_config_vars('LIBPL', 'LDLIBRARY'))"`
-+				import os; import re; from string import join; \
-+				print join(get_config_vars('LDFLAGS')) + ' ' + \
-+				re.sub('\.a$', '.so', apply(os.path.join, get_config_vars('LIBPL', 'LDLIBRARY')))"`
++			print apply(os.path.join, get_config_vars('LIBDIR', 'LDLIBRARY'))"`
  	fi
  	{ echo "$as_me:$LINENO: result: $PYTHON_LDFLAGS" >&5
  echo "${ECHO_T}$PYTHON_LDFLAGS" >&6; }