4 files changed, 22 insertions, 43 deletions

diff --git a/x11-wm/icewm/Makefile b/x11-wm/icewm/Makefile
index 8c8b448a1a8d..aefe3cd849db 100644
--- a/x11-wm/icewm/Makefile
+++ b/x11-wm/icewm/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	icewm
-PORTVERSION=	1.2.8
+PORTVERSION=	1.2.9
 CATEGORIES=	x11-wm
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -19,8 +19,9 @@ LIB_DEPENDS=	intl.4:${PORTSDIR}/devel/gettext
 USE_X_PREFIX=	yes
 WANT_GNOME=	yes
 USE_GNOME=	gnometarget
+USE_REINPLACE=	yes
 USE_GMAKE=	yes
-USE_AUTOCONF_VER=	253
+GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib"
 CONFIGURE_ARGS=	--disable-xfreetype \
@@ -32,13 +33,12 @@ CONFIGURE_ARGS=	--disable-xfreetype \
 
 .include <bsd.port.pre.mk>
 
-.if ${HAVE_GNOME:Mgnomelibs}!=""
-.undef HAVE_ESOUND
-USE_GNOME+=	gnomelibs
-CONFIGURE_ARGS+=	--with-imlib --without-xpm --enable-menus-gnome1 \
+.if ${HAVE_GNOME:Mgnomedesktop}!=""
+USE_GNOME+=	gnomedesktop
+CONFIGURE_ARGS+=	--with-imlib --without-xpm --enable-menus-gnome \
 			--enable-guievents --with-icesound=esound
 INSTALL_TARGET=		install install-gnome
-PLIST_SUB+=	ESOUND=""
+PLIST_SUB+=	ESOUND="" GNOMEDESKTOP=""
 PKGNAMESUFFIX=	-gnome
 .else
 USE_XPM=	yes
@@ -46,17 +46,25 @@ CONFIGURE_ARGS+=	--without-imlib --with-xpm
 .if ${HAVE_GNOME:Mesound}!=""
 USE_GNOME+=	esound
 CONFIGURE_ARGS+=	--enable-guievents --with-icesound=esound
-PLIST_SUB+=	ESOUND=""
+PLIST_SUB+=	ESOUND="" GNOMEDESKTOP="@comment "
 .else
-PLIST_SUB+=	ESOUND="@comment "
+PLIST_SUB+=	ESOUND="@comment " GNOMEDESKTOP="@comment " 
 .endif
 .endif
 
+post-patch:
+.for file in src/gnome2.cc
+	@${REINPLACE_CMD} -e \
+		's|/usr/share/control|${X11BASE}/share/gnome/control|g ; \
+		 s|/usr/share/app|${X11BASE}/share/gnome/app|g ; \
+		 s|/usr/share/gnome|${X11BASE}/share/gnome|g' ${WRKSRC}/${file}
+.endfor
+
 post-install:
 	${INSTALL_DATA} ${FILESDIR}/bsd-daemon.xpm ${DATADIR}/taskbar
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
-.for file in CHANGES FAQ INSTALL README TODO
+.for file in CHANGES INSTALL README TODO
 	${INSTALL_DATA} ${WRKSRC}/${file} ${DOCSDIR}
 .endfor
 	${INSTALL_DATA} ${WRKSRC}/doc/*.html ${DOCSDIR}
diff --git a/x11-wm/icewm/distinfo b/x11-wm/icewm/distinfo
index b45a81c9a3df..0ba030aed313 100644
--- a/x11-wm/icewm/distinfo
+++ b/x11-wm/icewm/distinfo
@@ -1 +1 @@
-MD5 (icewm-1.2.8.tar.gz) = 8f4e57c875cfe3d612e4ee068a1c2d83
+MD5 (icewm-1.2.9.tar.gz) = fe8ff73efc80a6c9eea34c26c66e0c53
diff --git a/x11-wm/icewm/files/patch-configure.in b/x11-wm/icewm/files/patch-configure.in
index 6af641b046f8..e69de29bb2d1 100644
--- a/x11-wm/icewm/files/patch-configure.in
+++ b/x11-wm/icewm/files/patch-configure.in
@@ -1,29 +0,0 @@
---- configure.in.orig	Mon May 19 03:28:57 2003
-+++ configure.in	Fri May 23 00:59:03 2003
-@@ -276,7 +276,7 @@
-   AC_SUBST(NLS_POXFILES)
-   AC_SUBST(NLS_MOFILES)
- 
--  localedir='${datadir}/locale'
-+  localedir='${prefix}/share/locale'
- fi
- 
- dnl ================================================ Features of the XServer ===
-@@ -712,7 +712,7 @@
- 	AC_DEFINE(CONFIG_GNOME_MENUS, 1, [Define to make IceWM more GNOME-friendly])
- 
- 	APPLICATIONS="${APPLICATIONS} icewm-menu-gnome1"
--	GWMDIR="`${GNOME_CONFIG} --datadir`/gnome/wm-properties/"
-+	GWMDIR="`${GNOME_CONFIG} --datadir`/wm-properties/"
- 	CONFIG_GNOME_MENU_DIR="`${GNOME_CONFIG} --prefix`/share/gnome/apps/"
-       else
- 	AC_PATH_PROG(PKG_CONFIG, pkg-config)
-@@ -724,7 +724,7 @@
- 	APPLICATIONS="${APPLICATIONS} icewm-menu-gnome1"
- 	GNOME_PREFIX=`pkg-config --variable=prefix gnome-desktop-2.0`
- 	GWMDIR="${GNOME_PREFIX}/share/gnome/wm-properties/"
--	CONFIG_GNOME_MENU_DIR="${GNOME_PREFIX}/share/applications/"
-+	CONFIG_GNOME_MENU_DIR="${GNOME_PREFIX}/share/gnome/applications/"
-       fi
- 
-       if test "${GNOME_CFLAGS}" = ""; then
diff --git a/x11-wm/icewm/pkg-plist b/x11-wm/icewm/pkg-plist
index 91b3292ff92f..bbb0d4f246dc 100644
--- a/x11-wm/icewm/pkg-plist
+++ b/x11-wm/icewm/pkg-plist
@@ -1,13 +1,13 @@
+@comment $FreeBSD$
 bin/icehelp
 bin/icesh
 %%ESOUND%%bin/icesound
 bin/icewm
-%%GNOME:%%bin/icewm-menu-gnome1
+%%GNOMEDESKTOP%%bin/icewm-menu-gnome2
 bin/icewmbg
 bin/icewmhint
 bin/icewmtray
 %%PORTDOCS%%share/doc/icewm/CHANGES
-%%PORTDOCS%%share/doc/icewm/FAQ
 %%PORTDOCS%%share/doc/icewm/INSTALL
 %%PORTDOCS%%share/doc/icewm/README
 %%PORTDOCS%%share/doc/icewm/TODO
@@ -30,7 +30,7 @@ bin/icewmtray
 %%PORTDOCS%%share/doc/icewm/icewm-8.html
 %%PORTDOCS%%share/doc/icewm/icewm-9.html
 %%PORTDOCS%%share/doc/icewm/icewm.html
-%%GNOME:%%share/gnome/wm-properties/IceWM.desktop
+%%GNOMEDESKTOP%%share/gnome/wm-properties/IceWM.desktop
 share/icewm/icons/app_16x16.xpm
 share/icewm/icons/app_32x32.xpm
 share/icewm/icons/bomb_16x16.xpm