Date: Mon, 25 Mar 2002 03:00:24 -0800 (PST) From: KATO Tsuguru <tkato@prontomail.com> To: freebsd-gnats-submit@FreeBSD.org Subject: ports/36297: Update port: x11-wm/icewm Message-ID: <200203251100.g2PB0On17131@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 36297
>Category: ports
>Synopsis: Update port: x11-wm/icewm
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Mon Mar 25 03:10:02 PST 2002
>Closed-Date:
>Last-Modified:
>Originator: KATO Tsuguru
>Release: 4.4-RELEASE i386
>Organization:
>Environment:
>Description:
- Append distfile's revision number to PORTVERSION
- Unbreak
- Fix remaining places where giconv used instead of iconv
ports/36221 should be superseded by this PR.
>How-To-Repeat:
>Fix:
diff -urN /usr/ports/x11-wm/icewm/Makefile x11-wm/icewm/Makefile
--- /usr/ports/x11-wm/icewm/Makefile Mon Mar 18 22:29:39 2002
+++ x11-wm/icewm/Makefile Sat Mar 23 15:46:53 2002
@@ -6,12 +6,11 @@
#
PORTNAME= icewm
-PORTVERSION= 1.0.9
-PORTREVISION= 3
+PORTVERSION= 1.0.9.2
CATEGORIES= x11-wm
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
-DISTNAME= ${PORTNAME}-${PORTVERSION}-2
+DISTNAME= ${PORTNAME}-${PORTVERSION:R}-${PORTVERSION:E}
MAINTAINER= nakai@FreeBSD.org
@@ -19,18 +18,17 @@
LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext-old \
iconv.3:${PORTSDIR}/converters/libiconv
-WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
+WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION:R}
WANT_GNOME= yes
WANT_ESOUND= yes
USE_BZIP2= yes
USE_X_PREFIX= yes
USE_GMAKE= yes
-#USE_AUTOCONF_VER=213
-USE_AUTOCONF_VER=252
-AUTOCONF= autoconf
-AUTOCONF_DIR= ${LOCALBASE}/share/autoconf
+#USE_AUTOCONF_VER=253
+GNU_CONFIGURE= yes
+CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL}
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LIBS="-L${LOCALBASE}/lib"
+ LDFLAGS="-L${LOCALBASE}/lib"
CONFIGURE_ARGS= --enable-i18n --enable-nls \
--with-cfgdir=${PREFIX}/share/icewm \
--with-libdir=${PREFIX}/share/icewm \
@@ -57,10 +55,13 @@
PLIST_SUB+= ESOUND="@comment "
.endif
+pre-configure:
+ @cd ${WRKSRC} && autoconf ${AUTOCONF_ARGS}
+
post-install:
${INSTALL_DATA} ${FILESDIR}/bsd-daemon.xpm ${DATADIR}/taskbar
.if !defined(NOPORTDOCS)
- @${MKDIR} ${PREFIX}/share/doc/icewm
+ @${MKDIR} ${DOCSDIR}
.for file in CHANGES FAQ INSTALL README TODO
${INSTALL_DATA} ${WRKSRC}/${file} ${DOCSDIR}
.endfor
diff -urN /usr/ports/x11-wm/icewm/files/patch-ap x11-wm/icewm/files/patch-ap
--- /usr/ports/x11-wm/icewm/files/patch-ap Wed Feb 20 18:45:10 2002
+++ x11-wm/icewm/files/patch-ap Sat Mar 23 13:46:13 2002
@@ -1,13 +1,12 @@
--- aclocal.m4.orig Tue Oct 9 23:54:02 2001
-+++ aclocal.m4 Wed Feb 20 14:18:56 2002
++++ aclocal.m4 Sat Mar 23 13:46:01 2002
@@ -103,11 +103,15 @@
dnl
AC_DEFUN(ICE_CHECK_CONVERSION, [
AC_MSG_CHECKING([whether iconv converts from $1 to $2])
-+ LIBS="-lgiconv $LIBS"
++ LIBS="-liconv $LIBS"
AC_TRY_RUN([
-- #include <iconv.h>
-+ #include <giconv.h>
+ #include <iconv.h>
+ #include <locale.h>
int main() {
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 Fri Feb 22 23:13:42 2002
+++ x11-wm/icewm/files/patch-configure.in Sat Mar 23 13:51:44 2002
@@ -1,5 +1,5 @@
--- configure.in.orig Tue Oct 9 23:54:02 2001
-+++ configure.in Tue Feb 19 16:22:42 2002
++++ configure.in Sat Mar 23 13:51:21 2002
@@ -83,7 +83,7 @@
AC_FUNC_SELECT_ARGTYPES
@@ -52,45 +52,7 @@
fi
ice_nl_codesets="${ice_nl_codesets} 0"
-@@ -136,20 +137,20 @@
-
- ice_iconv_cxxflags="${CXXFLAGS}"
-
-- AC_CHECK_HEADERS(iconv.h,,
-- [ AC_MSG_ERROR([I18N support has been requested but iconv.h wasnt found.
-+ AC_CHECK_HEADERS(giconv.h,,
-+ [ AC_MSG_ERROR([I18N support has been requested but giconv.h wasnt found.
- *** Check your installation. Upgrade your C library or install GNU libiconv
- *** available at ftp://ftp.gnu.org/pub/gnu/libiconv/.])])
-
- AC_CHECK_DECL(_libiconv_version,
-- [ AC_MSG_RESULT(assuming iconv.h belongs to GNU libiconv)
-- AC_CHECK_LIB(iconv, iconv,
-- AC_CHECK_LIB(iconv, iconv_open,
-- AC_CHECK_LIB(iconv, iconv_close,
-- CXXFLAGS="${CXXFLAGS} -liconv"
-- CORE_LIBS="${CORE_LIBS} -liconv"
-- AC_DEFINE(CONFIG_LIBICONV, 1, Define when using libiconv),
-- AC_MSG_ERROR([iconv.h appears to be part of libiconv but linking failed.
-+ [ AC_MSG_RESULT(assuming giconv.h belongs to GNU libiconv)
-+ AC_CHECK_LIB(giconv, iconv,
-+ AC_CHECK_LIB(giconv, iconv_open,
-+ AC_CHECK_LIB(giconv, iconv_close,
-+ CXXFLAGS="${CXXFLAGS} -lgiconv"
-+ CORE_LIBS="${CORE_LIBS} -lgiconv"
-+ AC_DEFINE(CONFIG_LIBICONV, 1, Define when using libgiconv),
-+ AC_MSG_ERROR([giconv.h appears to be part of libiconv but linking failed.
- *** Check your installation. Upgrade your C library (glibc 2.2) or install
- *** GNU libiconv available at ftp://ftp.gnu.org/pub/gnu/libiconv/.]))))],
-
-@@ -158,13 +159,13 @@
- AC_MSG_ERROR([iconv.h appears to be part of libc but linking failed.
- *** Check your installation. Upgrade your C library (glibc 2.2) or install
- *** GNU libiconv available at ftp://ftp.gnu.org/pub/gnu/libiconv/.]))],
-- [#include <iconv.h>])
-+ [#include <giconv.h>])
-
- AC_ARG_WITH(unicode-set,
+@@ -164,7 +165,7 @@
[ --unicode-set=CODESET your iconv's unicode set in machine endian encoding
(e.g. WCHAR_T, UCS-4-INTERNAL, UCS-4LE, UCS-4BE)],
AC_DEFINE_UNQUOTED(CONFIG_UNICODE_SET, "$with_unicode_set"),
diff -urN /usr/ports/x11-wm/icewm/files/patch-sysdep.in x11-wm/icewm/files/patch-sysdep.in
--- /usr/ports/x11-wm/icewm/files/patch-sysdep.in Tue Mar 27 08:26:59 2001
+++ x11-wm/icewm/files/patch-sysdep.in Sat Mar 23 15:48:57 2002
@@ -1,11 +1,13 @@
---- sysdep.in.orig Sat Mar 17 06:17:36 2001
-+++ sysdep.in Mon Mar 26 20:56:29 2001
-@@ -2,7 +2,7 @@
- LD = @CXX_LINK@
-
+--- sysdep.in.orig Tue Oct 9 23:54:02 2001
++++ sysdep.in Sat Mar 23 15:48:48 2002
+@@ -4,8 +4,8 @@
SYS_CFLAGS = \
-- @DEBUG@ @CXXFLAGS@ @DEFS@ \
-+ @DEBUG@ @CXXFLAGS@ @CPPFLAGS@ @DEFS@ \
+ @DEBUG@ @CXXFLAGS@ @DEFS@ \
@CORE_CFLAGS@ @IMAGE_CFLAGS@ @AUDIO_CFLAGS@ @GNOME_CFLAGS@
- SYS_INCDIRS =
- SYS_LIBDIRS =
+-SYS_INCDIRS =
+-SYS_LIBDIRS =
++SYS_INCDIRS = @CPPFLAGS@
++SYS_LIBDIRS = @LDFLAGS@
+ SYS_LIBS = @LIBS@
+
+ CORE_LIBS = @CORE_LIBS@
>Release-Note:
>Audit-Trail:
>Unformatted:
To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-ports" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200203251100.g2PB0On17131>