From owner-svn-ports-head@freebsd.org Tue Sep 1 06:58:03 2020 Return-Path: Delivered-To: svn-ports-head@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id A23CB3BA776; Tue, 1 Sep 2020 06:58:03 +0000 (UTC) (envelope-from danfe@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4BgdF73s6Hz424V; Tue, 1 Sep 2020 06:58:03 +0000 (UTC) (envelope-from danfe@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 667EF152AE; Tue, 1 Sep 2020 06:58:03 +0000 (UTC) (envelope-from danfe@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 0816w3xa084965; Tue, 1 Sep 2020 06:58:03 GMT (envelope-from danfe@FreeBSD.org) Received: (from danfe@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 0816w3oC084960; Tue, 1 Sep 2020 06:58:03 GMT (envelope-from danfe@FreeBSD.org) Message-Id: <202009010658.0816w3oC084960@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: danfe set sender to danfe@FreeBSD.org using -f From: Alexey Dokuchaev Date: Tue, 1 Sep 2020 06:58:03 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r547240 - in head/x11/wdm: . files X-SVN-Group: ports-head X-SVN-Commit-Author: danfe X-SVN-Commit-Paths: in head/x11/wdm: . files X-SVN-Commit-Revision: 547240 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 01 Sep 2020 06:58:03 -0000 Author: danfe Date: Tue Sep 1 06:58:02 2020 New Revision: 547240 URL: https://svnweb.freebsd.org/changeset/ports/547240 Log: Unbreak the build by replacing recently removed `get-wings-flags ...' program invocations with corresponding `pkg-config WINGs ...' ones. As we now non-trivially patch the configure script, merge the changes made with sed(1) into the patch file. Added: head/x11/wdm/files/patch-configure (contents, props changed) Modified: head/x11/wdm/Makefile Modified: head/x11/wdm/Makefile ============================================================================== --- head/x11/wdm/Makefile Tue Sep 1 06:57:45 2020 (r547239) +++ head/x11/wdm/Makefile Tue Sep 1 06:58:02 2020 (r547240) @@ -61,8 +61,6 @@ post-patch: 's|/usr/X11R6|${PREFIX}|g' ${WRKSRC}/configs/Xsession.in @${REINPLACE_CMD} -e \ 's|$$(DESTDIR)$$(PAMDIR)/wdm||g' ${WRKSRC}/Makefile.in - @${REINPLACE_CMD} -e 's|-ldl||g ; \ - s|/authdir||g' ${WRKSRC}/configure @${REINPLACE_CMD} -e \ 's|@FAILSAFE@|@FAILSAFE_PATH@|g' ${WRKSRC}/configs/Xsession.in @${REINPLACE_CMD} -e \ Added: head/x11/wdm/files/patch-configure ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/x11/wdm/files/patch-configure Tue Sep 1 06:58:02 2020 (r547240) @@ -0,0 +1,51 @@ +--- configure.orig 2005-03-26 13:57:04 UTC ++++ configure +@@ -4004,7 +4004,7 @@ if test "${ac_cv_lib_pam_main+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + ac_check_lib_save_LIBS=$LIBS +-LIBS="-lpam -ldl $LIBS" ++LIBS="-lpam $LIBS" + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ + _ACEOF +@@ -4059,7 +4059,7 @@ echo "${ECHO_T}$ac_cv_lib_pam_main" >&6 + if test $ac_cv_lib_pam_main = yes; then + + USE_PAM=yes +- PASSWDLIB="-lpam -ldl" ++ PASSWDLIB="-lpam" + + cat >>confdefs.h <<_ACEOF + #define HAVE_PAM_LIB 1 +@@ -6313,7 +6313,7 @@ fi + fi + + # Extract the first word of "get-wings-flags", so it can be a program name with args. +-set dummy get-wings-flags; ac_word=$2 ++set dummy pkg-config; ac_word=$2 + echo "$as_me:$LINENO: checking for $ac_word" >&5 + echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 + if test "${ac_cv_prog_GETWINGSFLAGS+set}" = set; then +@@ -6353,9 +6353,9 @@ echo "$as_me: error: 'get-wings-flags' command was not + { (exit 1); exit 1; }; } + fi + +-WCFLAGS=`get-wings-flags --cflags` +-WLDFLAGS=`get-wings-flags --ldflags` +-WLIBS=`get-wings-flags --libs` ++WCFLAGS=`pkg-config WINGs --cflags` ++WLDFLAGS= ++WLIBS=`pkg-config WINGs --libs` + + + +@@ -6506,7 +6506,7 @@ _ACEOF + + + cat >>confdefs.h <<_ACEOF +-#define DEF_AUTH_DIR "$DMDIR/authdir" ++#define DEF_AUTH_DIR "$DMDIR" + _ACEOF + +