From owner-svn-ports-all@FreeBSD.ORG Wed Jul 16 22:21:56 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 8B795855; Wed, 16 Jul 2014 22:21:56 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 5EB912A87; Wed, 16 Jul 2014 22:21:56 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s6GMLuZI047200; Wed, 16 Jul 2014 22:21:56 GMT (envelope-from marino@svn.freebsd.org) Received: (from marino@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s6GMLul7047199; Wed, 16 Jul 2014 22:21:56 GMT (envelope-from marino@svn.freebsd.org) Message-Id: <201407162221.s6GMLul7047199@svn.freebsd.org> From: John Marino Date: Wed, 16 Jul 2014 22:21:56 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r362115 - head/archivers/liborange X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 16 Jul 2014 22:21:56 -0000 Author: marino Date: Wed Jul 16 22:21:55 2014 New Revision: 362115 URL: http://svnweb.freebsd.org/changeset/ports/362115 QAT: https://qat.redports.org/buildarchive/r362115/ Log: archivers/liborange: Unbreak port by working around configure flaw The configure error "Not configured with libgsf or libole2 but that's needed for MSI support" is caused by using the wrong configure option of MSI that was introduced in last commit. Changing to MSI_CONFIGURE_ENABLE=libgsf to MSI_CONFIGURE_WITH=libgsf should have solved the problem, but unfortunately there is a logic flaw in the configure script. If --without-libgsf is passed to it, it mistakenly tries to find it anyway with pkgconfig and then fails. The way to fix this properly is to patch the configure script, but I am going to cheat by making libgsf an unconditional requirement as it was before adamw fixed the options reversal. Modified: head/archivers/liborange/Makefile Modified: head/archivers/liborange/Makefile ============================================================================== --- head/archivers/liborange/Makefile Wed Jul 16 22:06:04 2014 (r362114) +++ head/archivers/liborange/Makefile Wed Jul 16 22:21:55 2014 (r362115) @@ -3,13 +3,14 @@ PORTNAME= liborange PORTVERSION= 0.4 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= archivers MASTER_SITES= SF/synce/Orange/${PORTVERSION} MAINTAINER= ports@FreeBSD.org COMMENT= Library to extract CAB files from self-extracting installers +LIB_DEPENDS= libgsf-1.so:${PORTSDIR}/devel/libgsf RUN_DEPENDS= cabextract:${PORTSDIR}/archivers/cabextract \ unzip:${PORTSDIR}/archivers/unzip @@ -25,9 +26,11 @@ MSI_DESC= Build with expermential MSI s GNU_CONFIGURE= yes USES= iconv libtool pathfix pkgconfig CFLAGS+= -I${LOCALBASE}/include -LDFLAGS+= -L${LOCALBASE}/lib +LDFLAGS+= -L${LOCALBASE}/lib -lgsf-1 USE_LDCONFIG= yes +CONFIGURE_ARGS+= --with-libgsf + LIBSYNCE_LIB_DEPENDS= libsynce.so:${PORTSDIR}/palm/synce-libsynce LIBSYNCE_CONFIGURE_WITH= libsynce @@ -41,8 +44,7 @@ INNO_CONFIGURE_ENABLE= inno VISE_CONFIGURE_ENABLE= vise -MSI_LIB_DEPENDS= libgsf-1.so.114:${PORTSDIR}/devel/libgsf -MSI_CONFIGURE_ENABLE= msi libgsf +MSI_CONFIGURE_ENABLE= msi .include