diff options
| author | leot <leot@pkgsrc.org> | 2015-08-26 11:31:02 +0000 |
|---|---|---|
| committer | leot <leot@pkgsrc.org> | 2015-08-26 11:31:02 +0000 |
| commit | 73a818eb2e92adf9c71e4c6bf69fa58c4bd9d2ae (patch) | |
| tree | d0ee8d6b6bc1eea650045a2cab94badafc5b4488 | |
| parent | 5168ab391089e7d431db854b88192fd45b977571 (diff) | |
| download | pkgsrc-73a818eb2e92adf9c71e4c6bf69fa58c4bd9d2ae.tar.gz | |
Fix a configure problem with older freetype2 versions (and while here add
LICENSE and fix a warning reported by pkglint(1)).
Reported by Paul ONeill in PR pkg/49878. This closes PR pkg/49878.
| -rw-r--r-- | sysutils/xfe/Makefile | 6 | ||||
| -rw-r--r-- | sysutils/xfe/distinfo | 4 | ||||
| -rw-r--r-- | sysutils/xfe/patches/patch-configure | 20 |
3 files changed, 24 insertions, 6 deletions
diff --git a/sysutils/xfe/Makefile b/sysutils/xfe/Makefile index 4e6bfb9b379..d40ce3d90a1 100644 --- a/sysutils/xfe/Makefile +++ b/sysutils/xfe/Makefile @@ -1,13 +1,14 @@ -# $NetBSD: Makefile,v 1.48 2015/04/25 14:24:56 tnn Exp $ +# $NetBSD: Makefile,v 1.49 2015/08/26 11:31:02 leot Exp $ DISTNAME= xfe-1.40 -PKGREVISION= 1 +PKGREVISION= 2 CATEGORIES= sysutils MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=xfe/} MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= http://roland65.free.fr/xfe/ COMMENT= Fast MS-Explorer like filemanager for X +LICENSE= gnu-gpl-v2 USE_LANGUAGES= c c++ USE_PKGLOCALEDIR= yes @@ -25,6 +26,7 @@ SUBST_MESSAGE.conf= Fixing hardcoded path. .include "../../converters/libiconv/buildlink3.mk" .include "../../devel/gettext-lib/buildlink3.mk" +.include "../../sysutils/desktop-file-utils/desktopdb.mk" .include "../../x11/fox/buildlink3.mk" .include "../../mk/pthread.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/sysutils/xfe/distinfo b/sysutils/xfe/distinfo index 75ae4be3d99..2a07234e874 100644 --- a/sysutils/xfe/distinfo +++ b/sysutils/xfe/distinfo @@ -1,8 +1,8 @@ -$NetBSD: distinfo,v 1.12 2015/02/15 14:09:38 ryoon Exp $ +$NetBSD: distinfo,v 1.13 2015/08/26 11:31:02 leot Exp $ SHA1 (xfe-1.40.tar.gz) = 95c8ee8e853136d58d126ec559828c43000c19c3 RMD160 (xfe-1.40.tar.gz) = a2add3bdac71706da9ea791d88bc96cbcdc3afb3 Size (xfe-1.40.tar.gz) = 2574477 bytes SHA1 (patch-ac) = 001140df584ef01d52e0737a57e0babbc574a0b4 -SHA1 (patch-configure) = 1eb11db5286e4cf3b3829a5a2370c9d4acb2d1a5 +SHA1 (patch-configure) = 406757b915cbd266bc9e4dfd2402f6676c976ee6 SHA1 (patch-src_main.cpp) = 2e875f4235b7e4c22ad5a0c236144bdd549fb8a1 diff --git a/sysutils/xfe/patches/patch-configure b/sysutils/xfe/patches/patch-configure index cba4e233068..a6688e1ef92 100644 --- a/sysutils/xfe/patches/patch-configure +++ b/sysutils/xfe/patches/patch-configure @@ -1,8 +1,24 @@ -$NetBSD: patch-configure,v 1.1 2015/02/15 14:09:38 ryoon Exp $ +$NetBSD: patch-configure,v 1.2 2015/08/26 11:31:02 leot Exp $ + +o Older freetype2 versions have a different path for ftheader.h, also check for + it in order to avoid forcing dependency to the pkgsrc version of + graphics/freetype2. For more information please give a look to pkg/49878. +o test(1) does not support the "==" operator. Use the "=" operator to compare if + two strings are identical. --- configure.orig 2014-12-05 14:51:58.000000000 +0000 +++ configure -@@ -16194,7 +16194,7 @@ echo "================================== +@@ -14233,7 +14233,9 @@ done + CPPFLAGS="$freetype_cflags $CPPFLAGS" + fi + ac_fn_cxx_check_header_mongrel "$LINENO" "config/ftheader.h" "ac_cv_header_config_ftheader_h" "$ac_includes_default" ++ ac_fn_cxx_check_header_mongrel "$LINENO" "freetype/config/ftheader.h" "ac_cv_header_freetype_config_ftheader_h" "$ac_includes_default" + if test "x$ac_cv_header_config_ftheader_h" = xyes; then : ++elif test "x$ac_cv_header_freetype_config_ftheader_h" = xyes; then : + + else + as_fn_error $? "\"ftheader.h not found\"" "$LINENO" 5 +@@ -16194,7 +16196,7 @@ echo "================================== # Warning message about Xft support |