Date: Wed, 16 Jul 2003 20:14:30 +0900 From: KATO Tsuguru <tkato@prontomail.com> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/54544: Update port: x11-wm/icewm to 1.2.9 Message-ID: <20030716201430.18d30527.tkato@prontomail.com> Resent-Message-ID: <200307161120.h6GBK4ng098264@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 54544
>Category: ports
>Synopsis: Update port: x11-wm/icewm to 1.2.9
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Wed Jul 16 04:20:04 PDT 2003
>Closed-Date:
>Last-Modified:
>Originator: KATO Tsuguru
>Release: FreeBSD 4.8-RELEASE i386
>Organization:
>Environment:
>Description:
- Update to version 1.2.9
Remove file:
files/patch-configure.in
>How-To-Repeat:
>Fix:
diff -urN /usr/ports/x11-wm/icewm/Makefile x11-wm/icewm/Makefile
--- /usr/ports/x11-wm/icewm/Makefile Sat Jul 12 12:29:06 2003
+++ x11-wm/icewm/Makefile Sat Jul 12 20:53:04 2003
@@ -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 @@
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,10 +33,9 @@
.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=""
@@ -52,11 +52,19 @@
.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 -urN /usr/ports/x11-wm/icewm/distinfo x11-wm/icewm/distinfo
--- /usr/ports/x11-wm/icewm/distinfo Sat Jul 12 12:29:06 2003
+++ x11-wm/icewm/distinfo Sat Jul 12 12:19:39 2003
@@ -1 +1 @@
-MD5 (icewm-1.2.8.tar.gz) = 8f4e57c875cfe3d612e4ee068a1c2d83
+MD5 (icewm-1.2.9.tar.gz) = fe8ff73efc80a6c9eea34c26c66e0c53
diff -urN /usr/ports/x11-wm/icewm/files/patch-configure.in x11-wm/icewm/files/patch-configure.in
--- /usr/ports/x11-wm/icewm/files/patch-configure.in Sat Jul 12 12:29:06 2003
+++ x11-wm/icewm/files/patch-configure.in Thu Jan 1 09:00:00 1970
@@ -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 -urN /usr/ports/x11-wm/icewm/pkg-plist x11-wm/icewm/pkg-plist
--- /usr/ports/x11-wm/icewm/pkg-plist Sat Jul 12 12:29:06 2003
+++ x11-wm/icewm/pkg-plist Sat Jul 12 15:16:06 2003
@@ -2,12 +2,11 @@
bin/icesh
%%ESOUND%%bin/icesound
bin/icewm
-%%GNOME:%%bin/icewm-menu-gnome1
+%%GNOME:%%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
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20030716201430.18d30527.tkato>