Date: Tue, 1 Sep 2020 06:58:03 +0000 (UTC) From: Alexey Dokuchaev <danfe@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r547240 - in head/x11/wdm: . files Message-ID: <202009010658.0816w3oC084960@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
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 + +
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202009010658.0816w3oC084960>