5 files changed, 89 insertions, 2 deletions

diff --git a/x11/libSM/Makefile b/x11/libSM/Makefile
index 9a2d8965412c..ff2f27fdbd81 100644
--- a/x11/libSM/Makefile
+++ b/x11/libSM/Makefile
@@ -7,15 +7,18 @@
 
 PORTNAME=	libSM
 PORTVERSION=	1.1.0
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	x11
 
 MAINTAINER=	x11@FreeBSD.org
 COMMENT=	Session Management library for X11
 
-BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/uuid.pc:${PORTSDIR}/misc/e2fsprogs-libuuid
-RUN_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/uuid.pc:${PORTSDIR}/misc/e2fsprogs-libuuid
+BUILD_DEPENDS=	${LOCALBASE}/share/aclocal/xorg-macros.m4:${PORTSDIR}/devel/xorg-macros
 
+USE_AUTOTOOLS=	aclocal:110 autoheader:262 automake:110 autoconf:262 libtool:15
+ACLOCAL_ARGS=	-I . -I ${LOCALBASE}/share/aclocal
+AUTOMAKE_ARGS=	--add-missing
 XORG_CAT=	lib
 USE_XORG=	ice xproto:both xtrans
 
diff --git a/x11/libSM/files/patch-Makefile.am b/x11/libSM/files/patch-Makefile.am
new file mode 100644
index 000000000000..696cf1d60832
--- /dev/null
+++ b/x11/libSM/files/patch-Makefile.am
@@ -0,0 +1,10 @@
+--- ./Makefile.am.orig	2009-02-23 19:42:34.000000000 +0300
++++ ./Makefile.am	2009-02-23 19:43:19.000000000 +0300
+@@ -1,6 +1,6 @@
+ SUBDIRS=src
+ 
+-pkgconfigdir = $(libdir)/pkgconfig
++pkgconfigdir = $(prefix)/libdata/pkgconfig
+ pkgconfig_DATA = sm.pc
+ 
+ EXTRA_DIST=sm.pc.in
diff --git a/x11/libSM/files/patch-configure.ac b/x11/libSM/files/patch-configure.ac
new file mode 100644
index 000000000000..2fe7d332d26a
--- /dev/null
+++ b/x11/libSM/files/patch-configure.ac
@@ -0,0 +1,18 @@
+--- configure.ac.orig	2008-07-02 21:58:05.000000000 +0400
++++ configure.ac	2009-02-23 18:50:18.000000000 +0300
+@@ -35,10 +35,13 @@
+ # Needed to check for TCP & IPv6 support and set flags appropriately
+ XTRANS_CONNECTION_FLAGS
+ 
++AC_ARG_WITH(stduuid, AC_HELP_STRING([--with-stduuid], [Build with DCE 1.1 uuid support for client IDs]))
++AM_CONDITIONAL(WITH_STDUUID, test x"$with_stduuid" != "xno")
++
+ AC_ARG_WITH(libuuid, AC_HELP_STRING([--with-libuuid], [Build with libuuid support for client IDs]))
+-AM_CONDITIONAL(WITH_LIBUUID, test x"$with_libuuid" != xno)
++AM_CONDITIONAL(WITH_LIBUUID, test x"$with_libuuid" = "xyes" -a x"$with_stduuid" = "xno")
+ 
+-if test x"$with_libuuid" != xno; then
++if test x"$with_libuuid" = "xyes" -a x"$with_stduuid" = "xno"; then
+ 	PKG_CHECK_MODULES(LIBUUID, uuid)
+ fi
+ 
diff --git a/x11/libSM/files/patch-src_Makefile.am b/x11/libSM/files/patch-src_Makefile.am
new file mode 100644
index 000000000000..7a855fab2e0d
--- /dev/null
+++ b/x11/libSM/files/patch-src_Makefile.am
@@ -0,0 +1,13 @@
+--- src/Makefile.am.orig	2008-06-24 21:09:29.000000000 +0400
++++ src/Makefile.am	2009-02-23 18:48:20.000000000 +0300
+@@ -2,6 +2,10 @@
+ 
+ AM_CFLAGS= -I${top_srcdir}/include $(SM_CFLAGS) $(XTRANS_CFLAGS)
+ 
++if WITH_STDUUID
++AM_CFLAGS += -DHAVE_STDUUID
++endif
++
+ if WITH_LIBUUID
+ AM_CFLAGS += $(LIBUUID_CFLAGS) -DHAVE_LIBUUID
+ endif
diff --git a/x11/libSM/files/patch-src_sm_genid.c b/x11/libSM/files/patch-src_sm_genid.c
new file mode 100644
index 000000000000..2d685115acdb
--- /dev/null
+++ b/x11/libSM/files/patch-src_sm_genid.c
@@ -0,0 +1,43 @@
+--- src/sm_genid.c.orig	2008-06-24 21:11:27.000000000 +0400
++++ src/sm_genid.c	2009-02-23 18:51:22.000000000 +0300
+@@ -76,7 +76,9 @@
+ #define TCPCONN
+ #endif
+ 
+-#if defined(HAVE_LIBUUID)
++#if defined(HAVE_STDUUID)
++#include <uuid.h>
++#elif defined(HAVE_LIBUUID)
+ #include <uuid/uuid.h>
+ #endif
+ 
+@@ -85,7 +87,28 @@
+ SmsGenerateClientID (smsConn)
+     SmsConn smsConn;
+ {
+-#if defined(HAVE_LIBUUID)
++#if defined(HAVE_STDUUID)
++    char *id;
++    char *str;
++    uuid_t uuid;
++    uint32_t status;
++
++    uuid_create(&uuid, &status);
++    if (status != uuid_s_ok)
++	return NULL;
++
++    uuid_to_string(&uuid, &str, &status);
++    if (status != uuid_s_ok)
++	return NULL;
++
++    if ((id = malloc (strlen (str) + 2)) != NULL) {
++	id[0] = '2';
++	strcpy(&id[1], str);
++    }
++    free(str);
++
++    return id;
++#elif defined(HAVE_LIBUUID)
+     char *id;
+     char temp[256];
+     uuid_t uuid;