diff options
| author | miwi <miwi@FreeBSD.org> | 2010-01-22 01:24:42 +0800 |
|---|---|---|
| committer | miwi <miwi@FreeBSD.org> | 2010-01-22 01:24:42 +0800 |
| commit | 094a785bfe6ca84191e1dde93451c0a95f2236c1 (patch) | |
| tree | 4588c6005ac0397fe236aeace33ae2363aeba295 /x11 | |
| parent | 2ad76486fa537edd159c67287570186fb8ec4b96 (diff) | |
| download | freebsd-ports-gnome-094a785bfe6ca84191e1dde93451c0a95f2236c1.tar.gz freebsd-ports-gnome-094a785bfe6ca84191e1dde93451c0a95f2236c1.tar.zst freebsd-ports-gnome-094a785bfe6ca84191e1dde93451c0a95f2236c1.zip | |
- Fix build on HEAD
Submitted by: ed@
Diffstat (limited to 'x11')
6 files changed, 168 insertions, 0 deletions
diff --git a/x11/kde4-workspace/files/patch-kdm-backend-dm.h b/x11/kde4-workspace/files/patch-kdm-backend-dm.h new file mode 100644 index 000000000000..3a7191ad9469 --- /dev/null +++ b/x11/kde4-workspace/files/patch-kdm-backend-dm.h @@ -0,0 +1,30 @@ +--- kdm/backend/dm.h ++++ kdm/backend/dm.h +@@ -102,7 +102,6 @@ + # define Jmp_buf sigjmp_buf + #endif + +-#include <utmp.h> + #ifdef HAVE_UTMPX + # include <utmpx.h> + # define STRUCTUTMP struct utmpx +@@ -113,15 +112,16 @@ + # define ENDUTENT endutxent + # define ut_time ut_tv.tv_sec + #else ++# include <utmp.h> + # define STRUCTUTMP struct utmp + # define UTMPNAME utmpname + # define SETUTENT setutent + # define GETUTENT getutent + # define PUTUTLINE pututline + # define ENDUTENT endutent +-#endif +-#ifndef HAVE_STRUCT_UTMP_UT_USER +-# define ut_user ut_name ++# ifndef HAVE_STRUCT_UTMP_UT_USER ++# define ut_user ut_name ++# endif + #endif + #ifndef WTMP_FILE + # ifdef _PATH_WTMPX diff --git a/x11/kde4-workspace/files/patch-kdm-backend-sessreg.c b/x11/kde4-workspace/files/patch-kdm-backend-sessreg.c new file mode 100644 index 000000000000..5763008b2fbd --- /dev/null +++ b/x11/kde4-workspace/files/patch-kdm-backend-sessreg.c @@ -0,0 +1,24 @@ +--- kdm/backend/sessreg.c ++++ kdm/backend/sessreg.c +@@ -43,6 +43,13 @@ + # define NO_LASTLOG + #endif + ++#ifdef __FreeBSD__ ++# include <sys/param.h> ++# if __FreeBSD_version >= 900007 ++# define NO_LASTLOG ++# endif ++#endif ++ + #ifndef NO_LASTLOG + # ifdef HAVE_LASTLOG_H + # include <lastlog.h> +@@ -257,7 +264,6 @@ + close( utmp ); + } + # else +- UTMPNAME( UTMP_FILE ); + SETUTENT(); + PUTUTLINE( &ut_ent ); + ENDUTENT(); diff --git a/x11/kde4-workspace/files/patch-kdm-kfrontend-genkdmconf.c b/x11/kde4-workspace/files/patch-kdm-kfrontend-genkdmconf.c new file mode 100644 index 000000000000..c81e73a83e24 --- /dev/null +++ b/x11/kde4-workspace/files/patch-kdm-kfrontend-genkdmconf.c @@ -0,0 +1,30 @@ +--- kdm/kfrontend/genkdmconf.c ++++ kdm/kfrontend/genkdmconf.c +@@ -44,9 +44,6 @@ + #include <limits.h> + #include <sys/stat.h> + #include <sys/param.h> +-#ifdef BSD +-# include <utmp.h> +-#endif + + #define WANT_CONF_GEN + #include <config.ci> +@@ -1790,7 +1787,7 @@ + #else + # ifdef BSD + delstr( file, "\n" +-"exec sessreg -a -l $DISPLAY -x */Xservers -u " _PATH_UTMP " $USER\n" ) | ++"exec sessreg -a -l $DISPLAY -x */Xservers $USER\n" ) | + # endif + #endif /* _AIX */ + delstr( file, "\n" +@@ -1839,7 +1836,7 @@ + #else + # ifdef BSD + delstr( file, "\n" +-"exec sessreg -d -l $DISPLAY -x */Xservers -u " _PATH_UTMP " $USER\n" ) | ++"exec sessreg -d -l $DISPLAY -x */Xservers $USER\n" ) | + # endif + #endif /* _AIX */ + delstr( file, "\n" diff --git a/x11/kdebase4-workspace/files/patch-kdm-backend-dm.h b/x11/kdebase4-workspace/files/patch-kdm-backend-dm.h new file mode 100644 index 000000000000..3a7191ad9469 --- /dev/null +++ b/x11/kdebase4-workspace/files/patch-kdm-backend-dm.h @@ -0,0 +1,30 @@ +--- kdm/backend/dm.h ++++ kdm/backend/dm.h +@@ -102,7 +102,6 @@ + # define Jmp_buf sigjmp_buf + #endif + +-#include <utmp.h> + #ifdef HAVE_UTMPX + # include <utmpx.h> + # define STRUCTUTMP struct utmpx +@@ -113,15 +112,16 @@ + # define ENDUTENT endutxent + # define ut_time ut_tv.tv_sec + #else ++# include <utmp.h> + # define STRUCTUTMP struct utmp + # define UTMPNAME utmpname + # define SETUTENT setutent + # define GETUTENT getutent + # define PUTUTLINE pututline + # define ENDUTENT endutent +-#endif +-#ifndef HAVE_STRUCT_UTMP_UT_USER +-# define ut_user ut_name ++# ifndef HAVE_STRUCT_UTMP_UT_USER ++# define ut_user ut_name ++# endif + #endif + #ifndef WTMP_FILE + # ifdef _PATH_WTMPX diff --git a/x11/kdebase4-workspace/files/patch-kdm-backend-sessreg.c b/x11/kdebase4-workspace/files/patch-kdm-backend-sessreg.c new file mode 100644 index 000000000000..5763008b2fbd --- /dev/null +++ b/x11/kdebase4-workspace/files/patch-kdm-backend-sessreg.c @@ -0,0 +1,24 @@ +--- kdm/backend/sessreg.c ++++ kdm/backend/sessreg.c +@@ -43,6 +43,13 @@ + # define NO_LASTLOG + #endif + ++#ifdef __FreeBSD__ ++# include <sys/param.h> ++# if __FreeBSD_version >= 900007 ++# define NO_LASTLOG ++# endif ++#endif ++ + #ifndef NO_LASTLOG + # ifdef HAVE_LASTLOG_H + # include <lastlog.h> +@@ -257,7 +264,6 @@ + close( utmp ); + } + # else +- UTMPNAME( UTMP_FILE ); + SETUTENT(); + PUTUTLINE( &ut_ent ); + ENDUTENT(); diff --git a/x11/kdebase4-workspace/files/patch-kdm-kfrontend-genkdmconf.c b/x11/kdebase4-workspace/files/patch-kdm-kfrontend-genkdmconf.c new file mode 100644 index 000000000000..c81e73a83e24 --- /dev/null +++ b/x11/kdebase4-workspace/files/patch-kdm-kfrontend-genkdmconf.c @@ -0,0 +1,30 @@ +--- kdm/kfrontend/genkdmconf.c ++++ kdm/kfrontend/genkdmconf.c +@@ -44,9 +44,6 @@ + #include <limits.h> + #include <sys/stat.h> + #include <sys/param.h> +-#ifdef BSD +-# include <utmp.h> +-#endif + + #define WANT_CONF_GEN + #include <config.ci> +@@ -1790,7 +1787,7 @@ + #else + # ifdef BSD + delstr( file, "\n" +-"exec sessreg -a -l $DISPLAY -x */Xservers -u " _PATH_UTMP " $USER\n" ) | ++"exec sessreg -a -l $DISPLAY -x */Xservers $USER\n" ) | + # endif + #endif /* _AIX */ + delstr( file, "\n" +@@ -1839,7 +1836,7 @@ + #else + # ifdef BSD + delstr( file, "\n" +-"exec sessreg -d -l $DISPLAY -x */Xservers -u " _PATH_UTMP " $USER\n" ) | ++"exec sessreg -d -l $DISPLAY -x */Xservers $USER\n" ) | + # endif + #endif /* _AIX */ + delstr( file, "\n" |