Date: Fri, 18 Nov 2011 15:37:14 +0800 (CST) From: Sunpoet Po-Chuan Hsieh <sunpoet@FreeBSD.org> To: FreeBSD-gnats-submit@FreeBSD.org Cc: donnex@donnex.net Subject: ports/162649: [PATCH] sysutils/pwsafe: fix X11 libraries dependency handling Message-ID: <20111118073714.F3EB434E2@sunpoet.net> Resent-Message-ID: <201111180740.pAI7e80t042219@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 162649 >Category: ports >Synopsis: [PATCH] sysutils/pwsafe: fix X11 libraries dependency handling >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Fri Nov 18 07:40:08 UTC 2011 >Closed-Date: >Last-Modified: >Originator: Sunpoet Po-Chuan Hsieh >Release: FreeBSD 9.0-RC1 amd64 >Organization: The FreeBSD Project >Environment: System: FreeBSD bonjour.sunpoet.net 9.0-RC1 FreeBSD 9.0-RC1 #0: Sun Nov 6 07:24:13 CST >Description: - Fix X11 libraries dependency handling - Add OPTIONS X11: build pwsafe with X11 libraries (default off) - Bump PORTREVISION for dependency change - Cosmetic change This PR is a better fix to ports/153198. Thank Jeremie Le Hen <jeremie@le-hen.org> for reporting this issue. Port maintainer (donnex@donnex.net) is cc'd. Generated with FreeBSD Port Tools 0.99 >How-To-Repeat: >Fix: --- pwsafe-0.2.0_2.patch begins here --- Index: Makefile =================================================================== RCS file: /home/ncvs/ports/sysutils/pwsafe/Makefile,v retrieving revision 1.5 diff -u -u -r1.5 Makefile --- Makefile 21 Oct 2011 02:28:23 -0000 1.5 +++ Makefile 18 Nov 2011 01:10:36 -0000 @@ -7,30 +7,39 @@ PORTNAME= pwsafe PORTVERSION= 0.2.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= sysutils MASTER_SITES= http://nsd.dyndns.org/pwsafe/releases/ MAINTAINER= donnex@donnex.net COMMENT= Cmdline program that manages encrypted password databases -OPTIONS= SETUID "Install setuid pwsafe binary" off +OPTIONS= SETUID "Install setuid pwsafe binary" off \ + X11 "Build with X11 libraries" off GNU_CONFIGURE= yes USE_GMAKE= yes -USE_XORG= ice sm x11 xmu MAN1= pwsafe.1 PLIST_FILES= bin/pwsafe -.include <bsd.port.pre.mk> +.include <bsd.port.options.mk> + +.if defined(WITH_X11) +CONFIGURE_ARGS= --with-x +USE_XORG= ice sm x11 xmu +.else +CONFIGURE_ARGS= ac_cv_have_x="have_x=no" \ + ac_cv_lib_ICE_IceConnectionNumber=no \ + ac_cv_lib_X11_XOpenDisplay=no \ + ac_cv_lib_Xmu_XmuInternAtom=no +.endif do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/pwsafe ${PREFIX}/bin - ${INSTALL_MAN} ${WRKSRC}/pwsafe.1 ${PREFIX}/man/man1 + ${INSTALL_PROGRAM} ${WRKSRC}/pwsafe ${PREFIX}/bin/ + ${INSTALL_MAN} ${WRKSRC}/pwsafe.1 ${PREFIX}/man/man1/ .if defined(WITH_SETUID) ${CHMOD} u+s ${PREFIX}/bin/pwsafe .endif -.include <bsd.port.post.mk> - +.include <bsd.port.mk> --- pwsafe-0.2.0_2.patch ends here --- >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20111118073714.F3EB434E2>