diff options
Diffstat (limited to 'x11/wdm')
| -rw-r--r-- | x11/wdm/Makefile | 27 | ||||
| -rw-r--r-- | x11/wdm/distinfo | 2 | ||||
| -rw-r--r-- | x11/wdm/files/patch-ag | 29 | ||||
| -rw-r--r-- | x11/wdm/files/patch-am | 12 |
4 files changed, 35 insertions, 35 deletions
diff --git a/x11/wdm/Makefile b/x11/wdm/Makefile index 0ae23e6f9f54..73ccfb056562 100644 --- a/x11/wdm/Makefile +++ b/x11/wdm/Makefile @@ -1,11 +1,11 @@ # New ports collection makefile for: wdm -# Version required: 1.19 +# Version required: 1.20 # Date created: August 31, 1998 # Whom: Thomas Gellekum <tg@FreeBSD.org> # # $FreeBSD$ -DISTNAME= wdm-1.19 +DISTNAME= wdm-1.20 CATEGORIES= x11 windowmaker MASTER_SITES= http://cortex.unice.fr/~jerome/WindowMaker/wdm/ \ http://www.de.freebsd.org/de/gif/bsd/ @@ -20,9 +20,9 @@ EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX} DIST_SUBDIR= wdm USE_X_PREFIX= yes USE_AUTOCONF= yes -CONFIGURE_ENV= CPPFLAGS='-I${LOCALBASE}/include \ - -DCSRG_BASED -DHAS_SETUSERCONTEXT' \ - LIBS='-L${LOCALBASE}/lib' +CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include \ + -DCSRG_BASED -DHAS_SETUSERCONTEXT" \ + LIBS="-L${LOCALBASE}/lib ${LIBPAM}" CONFIGURE_ARGS= --with-logdir=/var/log \ --with-runlockdir=/var/run \ --with-wdmdir=${PREFIX}/lib/X11/wdm \ @@ -30,15 +30,26 @@ CONFIGURE_ARGS= --with-logdir=/var/log \ --with-defuserpath=/bin:/usr/bin:/sbin:/usr/sbin:${X11BASE}/bin:${LOCALBASE}/bin \ --with-defsystempath=/bin:/usr/bin:/sbin:/usr/sbin:${X11BASE}/bin \ --with-wmlist=wmaker:afterstep:blackbox:ctwm:enlightenment:fvwm:fvwm2:fvwm95:olvwm:qvwm:tvtwm -CONFIGURE_ARGS+=--enable-pam MAN1= wdm.1 wdmLogin.1 DAEMONPIC= daemon1-HQ-1280x960.jpg +.if defined(USE_PAM) +CONFIGURE_ARGS+= --enable-pam +LIBPAM= -lpam +.endif + +pre-fetch: +.if !defined(USE_PAM) + @${ECHO_MSG} "To build this port with PAM support, define \"USE_PAM\"." +.endif + +post-extract: + @${CP} ${FILESDIR}/*.patch ${WRKSRC}/patches + post-patch: - @${PERL} -pi -e 's|%%PREFIX%%|${PREFIX}|g' ${WRKSRC}/doc/*.man - cp ${FILESDIR}/xdm-3.3.2-pamwdm[23].patch ${WRKSRC}/patches + @${PERL} -pi -e "s|%%PREFIX%%|${PREFIX}|g" ${WRKSRC}/doc/*.man pre-configure: @(cd ${WRKSRC}; automake -a --include-deps) diff --git a/x11/wdm/distinfo b/x11/wdm/distinfo index 2da2d6816c91..de213652cf9a 100644 --- a/x11/wdm/distinfo +++ b/x11/wdm/distinfo @@ -1,2 +1,2 @@ -MD5 (wdm/wdm-1.19.tar.gz) = eacbfec965f2ccf1840ad457cb04a67e +MD5 (wdm/wdm-1.20.tar.gz) = ad6e284113f72dcfce92cf6b1cba54fb MD5 (wdm/daemon1-HQ-1280x960.jpg) = b38f175cf6b7167484afac423837ed1a diff --git a/x11/wdm/files/patch-ag b/x11/wdm/files/patch-ag index 5ee2c69b08c0..4727ee5f7e1f 100644 --- a/x11/wdm/files/patch-ag +++ b/x11/wdm/files/patch-ag @@ -1,29 +1,6 @@ --- configure.in.orig Tue Sep 21 23:16:21 1999 -+++ configure.in Wed Feb 23 21:26:13 2000 -@@ -50,9 +50,9 @@ - AM_CONDITIONAL(INSTALLPAM, test x$enable_pam = xyes) - - if test "$enable_pam" = yes; then -- AC_CHECK_LIB(pam, main, [PASSWDLIB="-lpam -ldl" -+ AC_CHECK_LIB(pam, main, [PASSWDLIB="-lpam" - AC_DEFINE_UNQUOTED(HAVE_PAM_LIB)], -- [],-ldl) -+ [],) - fi - - AC_ARG_WITH(pamdir, -@@ -66,6 +66,10 @@ - AC_MSG_CHECKING(for pam directory $PAM_DIR_PATH) - if test -d "$PAM_DIR_PATH"; then - AC_MSG_RESULT(exists) -+ elif test -f "/etc/pam.conf"; then -+ AC_MSG_RESULT(using /etc/pam.conf) -+ PAMDIR=none -+ PAM_DIR_PATH=none - else - AC_MSG_RESULT(does not exist) - AC_MSG_WARN([this may not be a pam system <<--------------]) -@@ -183,7 +187,7 @@ ++++ configure.in Mon Nov 1 05:26:32 1999 +@@ -183,7 +183,7 @@ XLFLAGS="$X_LIBS" @@ -32,7 +9,7 @@ XDM_EXTRA_LIBS="-lXmu -lXau -lXdmcp" -@@ -504,7 +508,7 @@ +@@ -504,7 +504,7 @@ AC_DEFINE_UNQUOTED(WDMDIR,"$DMDIR") AC_DEFINE_UNQUOTED(DEF_XDM_CONFIG,"$DMDIR/wdm-config") AC_DEFINE_UNQUOTED(DEF_CHOOSER,"$DMDIR/chooser") diff --git a/x11/wdm/files/patch-am b/x11/wdm/files/patch-am new file mode 100644 index 000000000000..d3ed2e424271 --- /dev/null +++ b/x11/wdm/files/patch-am @@ -0,0 +1,12 @@ +--- src/TestLogin.c.orig Thu Jul 1 21:51:28 1999 ++++ src/TestLogin.c Tue Mar 7 22:05:04 2000 +@@ -67,7 +67,9 @@ + #include <stdlib.h> + #include <string.h> + #include <signal.h> ++#ifndef __STDC__ + #include <malloc.h> ++#endif + + + #define forever 1 |