Date: Thu, 17 Mar 2016 09:09:06 +0000 (UTC) From: Tijl Coosemans <tijl@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r411263 - in head: mail/anubis/files security/gpgme security/pecl-gnupg security/py-pyme sysutils/pacman Message-ID: <201603170909.u2H996q1038651@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: tijl Date: Thu Mar 17 09:09:06 2016 New Revision: 411263 URL: https://svnweb.freebsd.org/changeset/ports/411263 Log: 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) Deleted: head/mail/anubis/files/patch-src__gpg.c Modified: head/mail/anubis/files/patch-configure.ac head/security/gpgme/Makefile head/security/gpgme/pkg-plist head/security/pecl-gnupg/Makefile head/security/py-pyme/Makefile head/sysutils/pacman/Makefile Modified: head/mail/anubis/files/patch-configure.ac ============================================================================== --- head/mail/anubis/files/patch-configure.ac Thu Mar 17 08:56:48 2016 (r411262) +++ head/mail/anubis/files/patch-configure.ac Thu Mar 17 09:09:06 2016 (r411263) @@ -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" Modified: head/security/gpgme/Makefile ============================================================================== --- head/security/gpgme/Makefile Thu Mar 17 08:56:48 2016 (r411262) +++ head/security/gpgme/Makefile Thu Mar 17 09:09:06 2016 (r411263) @@ -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 Modified: head/security/gpgme/pkg-plist ============================================================================== --- head/security/gpgme/pkg-plist Thu Mar 17 08:56:48 2016 (r411262) +++ head/security/gpgme/pkg-plist Thu Mar 17 09:09:06 2016 (r411263) @@ -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 Modified: head/security/pecl-gnupg/Makefile ============================================================================== --- head/security/pecl-gnupg/Makefile Thu Mar 17 08:56:48 2016 (r411262) +++ head/security/pecl-gnupg/Makefile Thu Mar 17 09:09:06 2016 (r411263) @@ -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 Modified: head/security/py-pyme/Makefile ============================================================================== --- head/security/py-pyme/Makefile Thu Mar 17 08:56:48 2016 (r411262) +++ head/security/py-pyme/Makefile Thu Mar 17 09:09:06 2016 (r411263) @@ -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> Modified: head/sysutils/pacman/Makefile ============================================================================== --- head/sysutils/pacman/Makefile Thu Mar 17 08:56:48 2016 (r411262) +++ head/sysutils/pacman/Makefile Thu Mar 17 09:09:06 2016 (r411263) @@ -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}
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201603170909.u2H996q1038651>