4 files changed, 50 insertions, 25 deletions

diff --git a/x11-wm/ude/Makefile b/x11-wm/ude/Makefile
index 050c52eff1d9..3e923ba72fab 100644
--- a/x11-wm/ude/Makefile
+++ b/x11-wm/ude/Makefile
@@ -6,34 +6,29 @@
 #
 
 PORTNAME=	ude
-PORTVERSION=	0.2.7b.1
-PORTREVISION=	1
+PORTVERSION=	0.2.8
 CATEGORIES=	x11-wm
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE} \
-		ftp://ude.the-coffeeshop.dk/pub/UDE/
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	udeproject
-DISTNAME=	${PORTNAME}-0.2.7b-BETA
 
 MAINTAINER=	ports@FreeBSD.org
 
-LIB_DEPENDS=	intl.2:${PORTSDIR}/devel/gettext
+LIB_DEPENDS=	intl.2:${PORTSDIR}/devel/gettext \
+		jpeg.9:${PORTSDIR}/graphics/jpeg
 
 USE_X_PREFIX=	yes
 USE_XPM=	yes
 GNU_CONFIGURE=	yes
+CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LIBS="-L${LOCALBASE}/lib -lintl"
+		LDFLAGS="-L${LOCALBASE}/lib"
 
 post-install:
 .if !defined(NOPORTDOCS)
-	@${MKDIR} ${PREFIX}/share/doc/ude
-	${INSTALL_DATA} ${WRKSRC}/doc/*.lyx ${PREFIX}/share/doc/ude
-	${INSTALL_DATA} ${WRKSRC}/doc/*.tex ${PREFIX}/share/doc/ude
-	${INSTALL_DATA} ${WRKSRC}/doc/*.txt ${PREFIX}/share/doc/ude
-	@${MKDIR} ${PREFIX}/share/doc/ude/html
-	${INSTALL_DATA} ${WRKSRC}/doc/html/*.html ${PREFIX}/share/doc/ude/html
-	@${MKDIR} ${PREFIX}/share/doc/ude/html/uwm
-	${INSTALL_DATA} ${WRKSRC}/doc/html/uwm/*.html ${PREFIX}/share/doc/ude/html/uwm
+	@${MKDIR} ${DOCSDIR}/html
+	${INSTALL_DATA} ${WRKSRC}/doc/html/*.css ${DOCSDIR}/html
+	${INSTALL_DATA} ${WRKSRC}/doc/html/*.gif ${DOCSDIR}/html
+	${INSTALL_DATA} ${WRKSRC}/doc/html/*.html ${DOCSDIR}/html
 .endif
 
 .include <bsd.port.mk>
diff --git a/x11-wm/ude/distinfo b/x11-wm/ude/distinfo
index 328810070b32..af6146833aba 100644
--- a/x11-wm/ude/distinfo
+++ b/x11-wm/ude/distinfo
@@ -1 +1 @@
-MD5 (ude-0.2.7b-BETA.tar.gz) = 6a8ad0db658fe0403d7b7b3a85836bcb
+MD5 (ude-0.2.8.tar.gz) = f5725eaab463764295b27e6dca1bd565
diff --git a/x11-wm/ude/files/patch-ae b/x11-wm/ude/files/patch-ae
new file mode 100644
index 000000000000..148a19e12e2a
--- /dev/null
+++ b/x11-wm/ude/files/patch-ae
@@ -0,0 +1,11 @@
+--- uwm/Makefile.in.orig	Tue Feb 12 07:17:11 2002
++++ uwm/Makefile.in	Tue Jul  2 21:47:02 2002
+@@ -90,7 +90,7 @@
+ bin_PROGRAMS = uwm
+ # When the library be ready
+ # uwm_LDADD= ../lib/libude.la
+-uwm_LDFLAGS = ${X_LIBS} ${X_EXTRA_LIBS} ${X_PRE_LIBS}
++uwm_LDFLAGS = ${X_LIBS} ${X_EXTRA_LIBS} ${X_PRE_LIBS} ${INTLLIBS}
+ # I think this should be diferent from the ude version.
+ INCLUDES = ${X_CFLAGS} -I../lib -DUWMVERSION=\"@VERSION@\" 	-DLOCALEDIR=\"${datadir}/locale\" -DUDE_DIR=\"${pkgdatadir}\"
+ 
diff --git a/x11-wm/ude/pkg-plist b/x11-wm/ude/pkg-plist
index ea72a089f7ba..0c84b969a351 100644
--- a/x11-wm/ude/pkg-plist
+++ b/x11-wm/ude/pkg-plist
@@ -14,18 +14,36 @@ include/ude/ude-types.h
 include/ude/ude-vector.h
 include/ude/ude-wraparounds.h
 include/ude/ude.h
+%%PORTDOCS%%share/doc/ude/html/contents.gif
+%%PORTDOCS%%share/doc/ude/html/crossref.gif
 %%PORTDOCS%%share/doc/ude/html/index.html
-%%PORTDOCS%%share/doc/ude/html/scratch.html
-%%PORTDOCS%%share/doc/ude/html/uwm/index.html
-%%PORTDOCS%%share/doc/ude/html/uwm/uwm_manual.html
-%%PORTDOCS%%share/doc/ude/manual.tex
-%%PORTDOCS%%share/doc/ude/scratch.lyx
-%%PORTDOCS%%share/doc/ude/scratch.txt
-%%PORTDOCS%%share/doc/ude/uwm_manual.lyx
-%%PORTDOCS%%share/doc/ude/uwm_manual.txt
+%%PORTDOCS%%share/doc/ude/html/manual.css
+%%PORTDOCS%%share/doc/ude/html/manual.html
+%%PORTDOCS%%share/doc/ude/html/next.gif
+%%PORTDOCS%%share/doc/ude/html/next_g.gif
+%%PORTDOCS%%share/doc/ude/html/node1.html
+%%PORTDOCS%%share/doc/ude/html/node10.html
+%%PORTDOCS%%share/doc/ude/html/node11.html
+%%PORTDOCS%%share/doc/ude/html/node12.html
+%%PORTDOCS%%share/doc/ude/html/node13.html
+%%PORTDOCS%%share/doc/ude/html/node14.html
+%%PORTDOCS%%share/doc/ude/html/node15.html
+%%PORTDOCS%%share/doc/ude/html/node2.html
+%%PORTDOCS%%share/doc/ude/html/node3.html
+%%PORTDOCS%%share/doc/ude/html/node4.html
+%%PORTDOCS%%share/doc/ude/html/node5.html
+%%PORTDOCS%%share/doc/ude/html/node6.html
+%%PORTDOCS%%share/doc/ude/html/node7.html
+%%PORTDOCS%%share/doc/ude/html/node8.html
+%%PORTDOCS%%share/doc/ude/html/node9.html
+%%PORTDOCS%%share/doc/ude/html/prev.gif
+%%PORTDOCS%%share/doc/ude/html/prev_g.gif
+%%PORTDOCS%%share/doc/ude/html/up.gif
+%%PORTDOCS%%share/doc/ude/html/up_g.gif
 share/locale/de/LC_MESSAGES/ude.mo
 share/locale/es/LC_MESSAGES/ude.mo
 share/locale/pt_BR/LC_MESSAGES/ude.mo
+share/locale/sk/LC_MESSAGES/ude.mo
 share/locale/tr/LC_MESSAGES/ude.mo
 share/ude/config/StartScript
 share/ude/config/StopScript
@@ -33,6 +51,8 @@ share/ude/config/appmenu
 share/ude/config/mountmenu
 share/ude/config/urdb
 share/ude/config/uwmrc
+share/ude/config/uwmrc-behaviour.hook
+share/ude/config/uwmrc-layout.hook
 share/ude/config/uwmrc-ws.hook
 share/ude/extras/tools/dirtomenu
 share/ude/extras/tools/dirtomenu-recursive
@@ -57,7 +77,6 @@ share/ude/gfx/shape.xpm
 @dirrm share/ude/extras
 @dirrm share/ude/config
 @dirrm share/ude
-%%PORTDOCS%%@dirrm share/doc/ude/html/uwm
 %%PORTDOCS%%@dirrm share/doc/ude/html
 %%PORTDOCS%%@dirrm share/doc/ude
 @dirrm include/ude