diff options
Diffstat (limited to 'x11')
-rw-r--r-- | x11/wdm/Makefile | 112 | ||||
-rw-r--r-- | x11/wdm/distinfo | 2 | ||||
-rw-r--r-- | x11/wdm/files/patch-Login.c | 54 | ||||
-rw-r--r-- | x11/wdm/files/patch-ab | 25 | ||||
-rw-r--r-- | x11/wdm/files/patch-ad | 11 | ||||
-rw-r--r-- | x11/wdm/files/patch-ag | 44 | ||||
-rw-r--r-- | x11/wdm/files/patch-ai | 20 | ||||
-rw-r--r-- | x11/wdm/files/patch-al | 13 | ||||
-rw-r--r-- | x11/wdm/files/patch-am | 12 | ||||
-rw-r--r-- | x11/wdm/files/patch-an | 21 | ||||
-rw-r--r-- | x11/wdm/files/patch-configs::wdm-config.in | 25 | ||||
-rw-r--r-- | x11/wdm/files/patch-src::wdm::loghelpers.c | 24 | ||||
-rw-r--r-- | x11/wdm/pkg-plist | 6 |
13 files changed, 116 insertions, 253 deletions
diff --git a/x11/wdm/Makefile b/x11/wdm/Makefile index 67060ba..9d69417 100644 --- a/x11/wdm/Makefile +++ b/x11/wdm/Makefile @@ -6,8 +6,7 @@ # PORTNAME= wdm -PORTVERSION= 1.20 -PORTREVISION= 3 +PORTVERSION= 1.25 CATEGORIES= x11 windowmaker MASTER_SITES= http://voins.program.ru/wdm/ \ http://www.de.freebsd.org/de/gif/bsd/ \ @@ -15,93 +14,106 @@ MASTER_SITES= http://voins.program.ru/wdm/ \ MASTER_SITE_SUBDIR= tg DISTFILES= ${DISTNAME}${EXTRACT_SUFX} ${DAEMONPICS} EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX} +DIST_SUBDIR= wdm MAINTAINER= kris@FreeBSD.org COMMENT= WINGs Display Manager; an xdm replacement -LIB_DEPENDS= wraster.4:${PORTSDIR}/x11-wm/windowmaker \ - PropList.2:${PORTSDIR}/devel/libPropList +LIB_DEPENDS= wraster.4:${PORTSDIR}/x11-wm/windowmaker -DIST_SUBDIR= wdm -USE_REINPLACE= yes +USE_BZIP2= yes USE_X_PREFIX= yes -USE_AUTOMAKE_VER=14 -AUTOMAKE_ARGS= --include-deps -DEF_SERVER?= ${X11BASE}/bin/X -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include \ - -DCSRG_BASED -DHAS_SETUSERCONTEXT" \ - LIBS="-L${LOCALBASE}/lib ${LIBPAM}" \ +USE_REINPLACE= yes +GNU_CONFIGURE= yes +CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} +CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" \ DEF_SERVER="${DEF_SERVER}" CONFIGURE_ARGS= --with-logdir=/var/log \ --with-runlockdir=/var/run \ - --with-wdmdir=${PREFIX}/lib/X11/wdm \ + --with-wdmdir=${WDMDIR} \ + --with-gfxdir=${WDMDIR}/pixmaps \ + --with-nlsdir=${PREFIX}/share/locale \ --with-Logo=beastie.xpm \ - --with-gfx-incs=${X11BASE}/include/WINGs \ - --with-gfx-libs=${X11BASE}/lib \ + --with-gfx-incs=${LOCALBASE}/include \ + --with-gfx-libs=${LOCALBASE}/lib \ --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 -.include <bsd.port.pre.mk> +MAN1= wdm.1 wdmLogin.1 -.if ${XFREE86_VERSION} == 4 -CFLAGS+= -DHAVE_XINERAMA -CONFIGURE_ENV+= LIBS="-Wl,-export-dynamic ${X11BASE}/lib/libXinerama.a" -.endif +CPPFLAGS= -I${LOCALBASE}/include -DCSRG_BASED -DHAS_SETUSERCONTEXT +LDFLAGS= -L${LOCALBASE}/lib -MAN1= wdm.1 wdmLogin.1 +DEF_SERVER?= ${X11BASE}/bin/X + +WDMDIR= ${PREFIX}/lib/X11/wdm DAEMONPICS= beastie.xpm daemon1-HQ-1280x960.jpg +.include <bsd.port.pre.mk> + .if ( ${OSVERSION} >= 500028 ) && !defined(WITHOUT_PAM) WITH_PAM= yes -.endif - -.if defined(WITH_PAM) -CONFIGURE_ARGS+= --enable-pam --with-pamdir=${LOCALBASE}/etc/pam.d/ -LIBPAM= -lpam +CONFIGURE_ARGS+= --with-pamdir=${LOCALBASE}/etc/pam.d/ PLIST_SUB+= PAM="" .else PLIST_SUB+= PAM="@comment " +.endif + +.if !defined(WITH_PAM) +CONFIGURE_ARGS+= --disable-pam +.endif pre-everything:: - @${ECHO_MSG} "To build this port with PAM support, define \"WITH_PAM\"." +.if !defined(WITH_PAM) + @${ECHO_MSG} + @${ECHO_MSG} "If you want to compile with PAM support," + @${ECHO_MSG} "hit Ctrl-C right now and use \"make WITH_PAM=yes\"" + @${ECHO_MSG} .endif post-patch: - @${REINPLACE_CMD} -e "s|%%PREFIX%%|${PREFIX}|g" ${WRKSRC}/doc/*.man + @${REINPLACE_CMD} -e 's|$$(DESTDIR)$$(PAMDIR)/wdm||g ; \ + s| -D | |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 \ + 's|#configdir#|${WDMDIR}|g' ${WRKSRC}/doc/wdm.man.in + @${REINPLACE_CMD} -e \ + 's|/etc/X11/wdm|${WDMDIR}|g' ${WRKSRC}/doc/wdmLogin.man + @${REINPLACE_CMD} -e \ + 's|<malloc\.h>|<stdlib.h>|g' ${WRKSRC}/src/TestLogin/TestLogin.c pre-install: - @if [ -e ${PREFIX}/lib/X11/wdm/wdm-config ]; then \ - ${MV} ${PREFIX}/lib/X11/wdm/wdm-config \ - ${PREFIX}/lib/X11/wdm/wdm-config.preserve; \ - fi - @if [ -e ${PREFIX}/lib/X11/wdm/Xsetup_0 ]; then \ - ${MV} ${PREFIX}/lib/X11/wdm/Xsetup_0 \ - ${PREFIX}/lib/X11/wdm/Xsetup_0.preserve; \ - fi + @${MKDIR} ${WDMDIR}/pixmaps +.if exists(${WDMDIR}/wdm-config) + ${MV} ${WDMDIR}/wdm-config ${WDMDIR}/wdm-config.preserve +.endif +.if exists(${WDMDIR}/Xsetup_0) + ${MV} ${WDMDIR}/Xsetup_0 ${WDMDIR}/Xsetup_0.preserve +.endif post-install: - @${CP} ${PREFIX}/lib/X11/wdm/wdm-config \ - ${PREFIX}/lib/X11/wdm/wdm-config.dist - @if [ -e ${PREFIX}/lib/X11/wdm/wdm-config.preserve ]; then \ - ${MV} ${PREFIX}/lib/X11/wdm/wdm-config.preserve \ - ${PREFIX}/lib/X11/wdm/wdm-config; \ - fi - @${CP} ${PREFIX}/lib/X11/wdm/Xsetup_0 \ - ${PREFIX}/lib/X11/wdm/Xsetup_0.dist - @if [ -e ${PREFIX}/lib/X11/wdm/Xsetup_0.preserve ]; then \ - ${MV} ${PREFIX}/lib/X11/wdm/Xsetup_0.preserve \ - ${PREFIX}/lib/X11/wdm/Xsetup_0; \ - fi + @${CP} ${WDMDIR}/wdm-config ${WDMDIR}/wdm-config.dist +.if exists(${WDMDIR}/wdm-config.preserve) + ${MV} ${WDMDIR}/wdm-config.preserve ${WDMDIR}/wdm-config +.endif + @${CP} ${WDMDIR}/Xsetup_0 ${WDMDIR}/Xsetup_0.dist +.if exists(${WDMDIR}/Xsetup_0.preserve) + ${MV} ${WDMDIR}/Xsetup_0.preserve ${WDMDIR}/Xsetup_0 +.endif .for file in ${DAEMONPICS} - @${INSTALL_DATA} ${_DISTDIR}/${file} ${PREFIX}/lib/X11/wdm/pixmaps + @${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/${file} ${WDMDIR}/pixmaps .endfor .if defined(WITH_PAM) .if ( ${OSVERSION} >= 500028 ) ${INSTALL_DATA} ${FILESDIR}/wdm.pam ${LOCALBASE}/etc/pam.d/wdm .else - @${ECHO_CMD} "To finish installing this port, append the contents of ${FILESDIR}/wdm.pam to your /etc/pam.conf file" + @${ECHO_MSG} "To finish installing this port, append the contents of" + @${ECHO_MSG} "${FILESDIR}/wdm.pam to your /etc/pam.conf file" .endif .endif diff --git a/x11/wdm/distinfo b/x11/wdm/distinfo index 7ccfa55..4ed9302 100644 --- a/x11/wdm/distinfo +++ b/x11/wdm/distinfo @@ -1,3 +1,3 @@ -MD5 (wdm/wdm-1.20.tar.gz) = 7d3a5debe5005ee481e821951d4c9194 +MD5 (wdm/wdm-1.25.tar.bz2) = 7e9c6f1a9755529d4336b9212fb1b7de MD5 (wdm/beastie.xpm) = 0891d7d8ac81514f10aafeb8f8a89ca2 MD5 (wdm/daemon1-HQ-1280x960.jpg) = b38f175cf6b7167484afac423837ed1a diff --git a/x11/wdm/files/patch-Login.c b/x11/wdm/files/patch-Login.c deleted file mode 100644 index c4b1368..0000000 --- a/x11/wdm/files/patch-Login.c +++ /dev/null @@ -1,54 +0,0 @@ ---- src/Login.c Tue Feb 29 06:17:01 2000 -+++ src/Login.c.new Wed Apr 3 22:36:34 2002 -@@ -24,6 +24,9 @@ - #include <X11/xpm.h> - #include <X11/keysym.h> - #include <X11/cursorfont.h> -+#ifdef HAVE_XINERAMA -+#include <X11/extensions/Xinerama.h> -+#endif - #ifdef HAVE_X11_WINGS_H - #include <X11/WINGs.h> - #else -@@ -1195,6 +1198,10 @@ - int main(int argc, char **argv) - { - WMScreen *scr; -+ int xine_count; int c; -+#ifdef HAVE_XINERAMA -+ XineramaScreenInfo *xine; -+#endif - - ProgName = argv[0]; - -@@ -1210,8 +1217,28 @@ - } - - screen_number = DefaultScreen(dpy); -- screen_width = DisplayWidth(dpy,screen_number); -- screen_heigth = DisplayHeight(dpy,screen_number); -+#ifdef HAVE_XINERAMA -+ if (XineramaIsActive(dpy)) { -+ xine = XineramaQueryScreens(dpy, &xine_count); -+ -+ if (xine != NULL) { -+ for (c = 0;c < xine_count;c++) { -+ if (xine[c].screen_number == 0) { -+ screen_width = xine[c].width; -+ screen_heigth = xine[c].height; -+ } -+ } -+ } else { -+ screen_width = DisplayWidth(dpy, screen_number); -+ screen_heigth = DisplayHeight(dpy, screen_number); -+ } -+ } else { -+#endif -+ screen_width = DisplayWidth(dpy,screen_number); -+ screen_heigth = DisplayHeight(dpy,screen_number); -+#ifdef HAVE_XINERAMA -+ } -+#endif - panel_X = (screen_width - panel_width)/2; - panel_Y = (screen_heigth - panel_heigth)/2; - diff --git a/x11/wdm/files/patch-ab b/x11/wdm/files/patch-ab deleted file mode 100644 index 6d853c9..0000000 --- a/x11/wdm/files/patch-ab +++ /dev/null @@ -1,25 +0,0 @@ ---- src/config/wdm-config.in.orig Thu Sep 16 09:27:58 1999 -+++ src/config/wdm-config.in Mon Dec 20 16:29:51 1999 -@@ -3,7 +3,7 @@ - ! wdm configuration file input (sed in Makefile) - ! - DisplayManager.errorLogFile: #logdir#/xdm-errors.log --DisplayManager.pidFile: #rundir#/xdm-pid -+DisplayManager.pidFile: #rundir#/xdm.pid - DisplayManager.keyFile: #configdir#/xdm-keys - DisplayManager.servers: #configdir#/Xservers - DisplayManager.accessFile: #configdir#/Xaccess -@@ -25,11 +25,11 @@ - ! display screen background--if not set or set to none, then the - ! background is not set by wdm. - ! DisplayManager*wdmBg: none --DisplayManager*wdmBg: solid:RoyalBlue -+! DisplayManager*wdmBg: solid:RoyalBlue - ! DisplayManager*wdmBg: dgradient:RoyalBlue,FireBrick,Black - ! DisplayManager*wdmBg: hgradient:RoyalBlue,FireBrick,Black - ! DisplayManager*wdmBg: vgradient:RoyalBlue,FireBrick,Black --! DisplayManager*wdmBg: pixmap:#configdir#/pixmaps/Stars.jpg -+DisplayManager*wdmBg: pixmap:#configdir#/pixmaps/daemon1-HQ-1280x960.jpg - ! - ! optional pixmap for logo - #pixmapcomment#DisplayManager*wdmLogo: #configdir#/pixmaps/#pixmapfile# diff --git a/x11/wdm/files/patch-ad b/x11/wdm/files/patch-ad deleted file mode 100644 index b760346..0000000 --- a/x11/wdm/files/patch-ad +++ /dev/null @@ -1,11 +0,0 @@ ---- doc/wdmLogin.man.orig Fri May 21 20:49:56 1999 -+++ doc/wdmLogin.man Sat Jan 8 03:33:27 2000 -@@ -49,7 +49,7 @@ - to an image file (tiff, png, jpeg and xpm allowed) and it will be - scaled to use the full screen. - .SH FILES --\fBwdmLogin\fP can be customized by modifying \fI/etc/X11/wdm/wdm-config\fP. -+\fBwdmLogin\fP can be customized by modifying \fI%%PREFIX%%/lib/X11/wdm/wdm-config\fP. - .SH SEE ALSO - .BR wdm (1x) - .SH AUTHOR diff --git a/x11/wdm/files/patch-ag b/x11/wdm/files/patch-ag deleted file mode 100644 index 12f7deb..0000000 --- a/x11/wdm/files/patch-ag +++ /dev/null @@ -1,44 +0,0 @@ ---- configure.in.orig Tue Feb 29 18:40:50 2000 -+++ configure.in Thu Apr 11 03:33:45 2002 -@@ -50,9 +50,10 @@ - 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) -+ [AC_CHECK_LIB(pam, main, [PASSWDLIB="-lpam -ldl" -+ AC_DEFINE_UNQUOTED(HAVE_PAM_LIB)],[],-ldl)]) - fi - - AC_ARG_WITH(pamdir, -@@ -66,6 +67,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 +188,7 @@ - - XLFLAGS="$X_LIBS" - --XLIBS="$X_EXTRA_LIBS -lXext -lXt -lX11 -lm" -+XLIBS="$X_PRE_LIBS $X_EXTRA_LIBS -lXext -lXt -lX11 -lm" - - XDM_EXTRA_LIBS="-lXmu -lXau -lXdmcp" - -@@ -504,7 +509,7 @@ - AC_DEFINE_UNQUOTED(WDMDIR,"$DMDIR") - AC_DEFINE_UNQUOTED(DEF_XDM_CONFIG,"$DMDIR/wdm-config") - AC_DEFINE_UNQUOTED(DEF_CHOOSER,"$DMDIR/chooser") --AC_DEFINE_UNQUOTED(DEF_AUTH_DIR,"$DMDIR/authdir") -+AC_DEFINE_UNQUOTED(DEF_AUTH_DIR,"$DMDIR") - - AC_SUBST(DMDIR) - diff --git a/x11/wdm/files/patch-ai b/x11/wdm/files/patch-ai deleted file mode 100644 index a353114..0000000 --- a/x11/wdm/files/patch-ai +++ /dev/null @@ -1,20 +0,0 @@ ---- src/Greet.c.orig Tue Sep 21 23:16:21 1999 -+++ src/Greet.c Wed Nov 3 08:03:00 1999 -@@ -260,7 +260,7 @@ - } - - execle(wdmLogin, tmp, DisplayName, -- Wm, Logo, HelpFile, DefaultUser, Bg, Animate, -+ Wm, Logo, Bg, Animate, HelpFile, DefaultUser, - NULL, env); - - LogError ("Greet cannot exec %s\n", wdmLogin); -@@ -405,7 +405,7 @@ - "%s exit(%s) by %s\n", - PACKAGE, exitArg, name); - #endif --#if 0 -+#if 1 - SessionExit (d, UNMANAGE_DISPLAY, FALSE); - #else - Debug ("Killing parent process %d\n", getppid()); diff --git a/x11/wdm/files/patch-al b/x11/wdm/files/patch-al deleted file mode 100644 index 2e53dca..0000000 --- a/x11/wdm/files/patch-al +++ /dev/null @@ -1,13 +0,0 @@ ---- src/config/Makefile.am.orig Tue Sep 21 23:16:21 1999 -+++ src/config/Makefile.am Thu Feb 24 01:44:12 2000 -@@ -118,8 +118,8 @@ - - install-data-local: - if INSTALLPAM -- $(INSTALL) -d $(DESTDIR)$(PAMDIR) -- $(INSTALL) -m 644 $(srcdir)/wdm.pamd $(DESTDIR)$(PAMDIR)/wdm -+ [ x$(PAMDIR) = xnone ] || $(INSTALL) -d $(DESTDIR)$(PAMDIR) -+ [ x$(PAMDIR) = xnone ] || $(INSTALL) -m 644 $(srcdir)/wdm.pamd $(DESTDIR)$(PAMDIR)/wdm - else - - endif diff --git a/x11/wdm/files/patch-am b/x11/wdm/files/patch-am deleted file mode 100644 index d3ed2e4..0000000 --- a/x11/wdm/files/patch-am +++ /dev/null @@ -1,12 +0,0 @@ ---- 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 diff --git a/x11/wdm/files/patch-an b/x11/wdm/files/patch-an deleted file mode 100644 index 571985e..0000000 --- a/x11/wdm/files/patch-an +++ /dev/null @@ -1,21 +0,0 @@ ---- ./src/config/Makefile.in.orig Sun Oct 6 00:26:45 2002 -+++ ./src/config/Makefile.in Sun Oct 6 00:25:36 2002 -@@ -138,7 +138,6 @@ - CLEANFILES = wdm-config Xsetup_0 Xservers Xservers.ws Xsession Xclients - - EXTRA_DIST = \ -- wdm.pamd \ - $(configfiles_DATA) \ - $(bin_SCRIPTS) - -@@ -382,10 +381,6 @@ - $(INSTALL) -m 600 $(srcdir)/wdm-config $(DESTDIR)$(configfilesdir) - $(INSTALL) -m 644 $(srcdir)/Xsession.in $(DESTDIR)$(configfilesdir) - $(INSTALL) -m 644 $(srcdir)/Xclients.in $(DESTDIR)$(configfilesdir) -- --install-data-local: --@INSTALLPAM_TRUE@ $(INSTALL) -d $(DESTDIR)$(PAMDIR) --@INSTALLPAM_TRUE@ $(INSTALL) -m 644 $(srcdir)/wdm.pamd $(DESTDIR)$(PAMDIR)/wdm - - uninstall-hook: - rm -fr $(DESTDIR)$(configfilesdir)/authdir diff --git a/x11/wdm/files/patch-configs::wdm-config.in b/x11/wdm/files/patch-configs::wdm-config.in new file mode 100644 index 0000000..b42e5a5 --- /dev/null +++ b/x11/wdm/files/patch-configs::wdm-config.in @@ -0,0 +1,25 @@ +--- configs/wdm-config.in.orig Sun Jun 1 17:00:09 2003 ++++ configs/wdm-config.in Sun Jun 1 22:45:23 2003 +@@ -3,7 +3,7 @@ + ! wdm configuration file input (sed in Makefile) + ! + DisplayManager.errorLogFile: @LOGDIR@/xdm-errors.log +-DisplayManager.pidFile: @RUNDIR@/xdm-pid ++DisplayManager.pidFile: @RUNDIR@/xdm.pid + DisplayManager.keyFile: @DMDIR@/xdm-keys + DisplayManager.servers: @DMDIR@/Xservers + DisplayManager.accessFile: @DMDIR@/Xaccess +@@ -25,11 +25,11 @@ + ! display screen background--if not set or set to none, then the + ! background is not set by wdm. + ! DisplayManager*wdmBg: none +-DisplayManager*wdmBg: solid:RoyalBlue ++! DisplayManager*wdmBg: solid:RoyalBlue + ! DisplayManager*wdmBg: dgradient:RoyalBlue,FireBrick,Black + ! DisplayManager*wdmBg: hgradient:RoyalBlue,FireBrick,Black + ! DisplayManager*wdmBg: vgradient:RoyalBlue,FireBrick,Black +-! DisplayManager*wdmBg: pixmap:@GFXDIR@/Stars.jpg ++DisplayManager*wdmBg: pixmap:@GFXDIR@/daemon1-HQ-1280x960.jpg + ! + ! optional pixmap for logo + @PIXMAPCOMMENT@DisplayManager*wdmLogo: @GFXDIR@/@PIXMAPFILE@ diff --git a/x11/wdm/files/patch-src::wdm::loghelpers.c b/x11/wdm/files/patch-src::wdm::loghelpers.c new file mode 100644 index 0000000..ddaa408 --- /dev/null +++ b/x11/wdm/files/patch-src::wdm::loghelpers.c @@ -0,0 +1,24 @@ +--- src/wdm/loghelpers.c.orig Sun Jun 1 17:00:09 2003 ++++ src/wdm/loghelpers.c Sun Jun 1 23:30:40 2003 +@@ -26,6 +26,21 @@ + #include <sys/wait.h> + #include <unistd.h> + ++#ifdef __FreeBSD__ ++static char * ++wstrndup(const char *src, size_t size) ++{ ++ char *dst; ++ ++ dst = malloc(size + 1); ++ if (dst == NULL) ++ return (NULL); ++ dst[size] = '\0'; ++ strncpy(dst, src, size); ++ return (dst); ++} ++#endif ++ + /* + * Function that treats buffer as set of lines separated with '\n' + * These lines will be directed to WDMLogMessage function with diff --git a/x11/wdm/pkg-plist b/x11/wdm/pkg-plist index 36f99a72d8..54a7fd1 100644 --- a/x11/wdm/pkg-plist +++ b/x11/wdm/pkg-plist @@ -11,7 +11,7 @@ lib/X11/wdm/Xservers.fs lib/X11/wdm/Xservers.ws lib/X11/wdm/Xsession lib/X11/wdm/Xsession.XFree86 -lib/X11/wdm/Xsession.in +lib/X11/wdm/Xsession.orig @unexec if cmp -s %D/lib/X11/wdm/Xsetup_0.dist %D/lib/X11/wdm/Xsetup_0; then rm -f %D/lib/X11/wdm/Xsetup_0; fi lib/X11/wdm/Xsetup_0.dist @exec [ -f %D/lib/X11/wdm/Xsetup_0 ] || (cp %D/lib/X11/wdm/Xsetup_0.dist %D/lib/X11/wdm/Xsetup_0) @@ -19,7 +19,6 @@ lib/X11/wdm/pixmaps/Eagle.xpm lib/X11/wdm/pixmaps/Earth.jpg lib/X11/wdm/pixmaps/Earth200x130.xpm lib/X11/wdm/pixmaps/GnuLinux-logo.jpg -lib/X11/wdm/pixmaps/README lib/X11/wdm/pixmaps/Stars.jpg lib/X11/wdm/pixmaps/StarsLogo.jpg lib/X11/wdm/pixmaps/beastie.xpm @@ -30,6 +29,9 @@ lib/X11/wdm/wdm-config.dist @exec [ -f %D/lib/X11/wdm/wdm-config ] || (cp %D/lib/X11/wdm/wdm-config.dist %D/lib/X11/wdm/wdm-config) lib/X11/wdm/wdm-config.in lib/X11/wdm/wdmReconfig +share/locale/de/LC_MESSAGES/wdm.mo +share/locale/ja/LC_MESSAGES/wdm.mo +share/locale/ru/LC_MESSAGES/wdm.mo @unexec rmdir %D/lib/X11/wdm/pixmaps 2>/dev/null || true @exec mkdir -p %D/lib/X11/wdm/authdir @unexec rmdir %D/lib/X11/wdm/authdir/authfiles 2>/dev/null || true |