security/gpgme: put header back in normal location.

This used to cause a conflict with security/gpgme03 but this port has been
removed many years ago now.

Approved by:	jhale (maintainer)

7 files changed, 5 insertions, 29 deletions

diff --git a/mail/anubis/files/patch-configure.ac b/mail/anubis/files/patch-configure.ac
index 8e3b651..848946f 100644
--- a/mail/anubis/files/patch-configure.ac
+++ b/mail/anubis/files/patch-configure.ac
@@ -8,15 +8,6 @@
  
  AC_SUBST(ADD_INCLUDES)
  case $build in
-@@ -137,7 +136,7 @@
-  if test $gpgmedir; then
-   AC_DEFINE(HAVE_GPGME_H, 1, [Define to 1 if HAVE_GPGME_H is requested.])
-  else
--  AC_CHECK_HEADERS(gpgme.h)
-+  AC_CHECK_HEADERS(gpgme/gpgme.h)
-  fi
-  ANUBIS_GPGFILES='$(GPGFILES)'
-  M4_DEFS="$M4_DEFS -DWITH_GPG"
 @@ -179,11 +178,21 @@
      ANUBIS_BIN_ADM='$(adm_bin_programs)'
      M4_DEFS="$M4_DEFS -DWITH_GSASL"
diff --git a/mail/anubis/files/patch-src__gpg.c b/mail/anubis/files/patch-src__gpg.c
deleted file mode 100644
index 0e8cfd7..0000000
--- a/mail/anubis/files/patch-src__gpg.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./src/gpg.c.orig	2008-12-16 11:21:54.000000000 -0500
-+++ ./src/gpg.c	2011-02-09 20:52:34.000000000 -0500
-@@ -23,7 +23,7 @@
- #include "rcfile.h"
- 
- #ifdef HAVE_GPG
--#include <gpgme.h>
-+#include <gpgme/gpgme.h>
- #define obstack_chunk_alloc malloc
- #define obstack_chunk_free free
- #include <obstack.h>
diff --git a/security/gpgme/Makefile b/security/gpgme/Makefile
index 6ffe40e..1e0765d 100644
--- a/security/gpgme/Makefile
+++ b/security/gpgme/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	gpgme
 PORTVERSION=	1.6.0
+PORTREVISION=	1
 CATEGORIES=	security
 MASTER_SITES=	GNUPG/gpgme
 
@@ -18,7 +19,6 @@ GNU_CONFIGURE=	yes
 USES=		cpe gmake libtool tar:bzip2
 USE_LDCONFIG=	yes
 
-CONFIGURE_ARGS=	--includedir=${PREFIX}/include/gpgme
 INSTALL_TARGET=	install-strip
 
 CPE_VENDOR=	gnu
diff --git a/security/gpgme/pkg-plist b/security/gpgme/pkg-plist
index 42fd992..08161c2 100644
--- a/security/gpgme/pkg-plist
+++ b/security/gpgme/pkg-plist
@@ -1,6 +1,6 @@
 bin/gpgme-config
 bin/gpgme-tool
-include/gpgme/gpgme.h
+include/gpgme.h
 lib/common-lisp/gpgme/gpgme-package.lisp
 lib/common-lisp/gpgme/gpgme.asd
 lib/common-lisp/gpgme/gpgme.lisp
diff --git a/security/pecl-gnupg/Makefile b/security/pecl-gnupg/Makefile
index d4c77b3..8418623 100644
--- a/security/pecl-gnupg/Makefile
+++ b/security/pecl-gnupg/Makefile
@@ -16,7 +16,7 @@ LICENSE_FILE=	${WRKSRC}/LICENSE
 
 LIB_DEPENDS=	libgpgme.so:${PORTSDIR}/security/gpgme
 
-CONFIGURE_ARGS=	--with-gnupg=${LOCALBASE}/include/gpgme
+CONFIGURE_ARGS=	--with-gnupg=${LOCALBASE}/include
 IGNORE_WITH_PHP=70
 USE_PHP=	yes
 USE_PHPEXT=	yes
diff --git a/security/py-pyme/Makefile b/security/py-pyme/Makefile
index b4f5b8d..d88ccdf 100644
--- a/security/py-pyme/Makefile
+++ b/security/py-pyme/Makefile
@@ -23,14 +23,11 @@ PYDISTUTILS_PKGNAME=pygpgme
 
 MAKE_ARGS=	PYTHON=${PYTHON_CMD}
 
-.include <bsd.port.pre.mk>
-
 post-patch:
-	@${REINPLACE_CMD} -e 's,gpgme-config,${PREFIX}/bin/&,' \
+	@${REINPLACE_CMD} 's,gpgme-config,${LOCALBASE}/bin/&,' \
 		${WRKSRC}/Makefile ${WRKSRC}/setup.py
-	@${REINPLACE_CMD} -e 's,include/,&gpgme/,' ${WRKSRC}/Makefile
 
 pre-build:
 	cd ${BUILD_WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} build
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/sysutils/pacman/Makefile b/sysutils/pacman/Makefile
index e9fe82b..b21e8cc 100644
--- a/sysutils/pacman/Makefile
+++ b/sysutils/pacman/Makefile
@@ -54,7 +54,6 @@ CONFIGURE_ARGS+=--without-libcurl
 .if ${PORT_OPTIONS:MGPGME}
 CONFIGURE_ARGS+=--with-gpgme
 LIB_DEPENDS+=	libgpgme.so:${PORTSDIR}/security/gpgme
-CFLAGS+=	-I${LOCALBASE}/include/gpgme
 .endif
 
 .if ${PORT_OPTIONS:MNLS}