diff options
author | SADA Kenji <sada@FreeBSD.org> | 2002-05-22 01:35:16 +0000 |
---|---|---|
committer | SADA Kenji <sada@FreeBSD.org> | 2002-05-22 01:35:16 +0000 |
commit | d015a5333584a9d941a05c2f16e73777cbb4c99e (patch) | |
tree | b08041c5d3c629577fd66371c5d6a66073cfcdfc /x11-wm/icewm | |
parent | Disable APM support on all platforms but i386. (diff) |
Upgrade to version 1.0.9.2 .
- Append distfile's revision number to PORTVERSION
- Unbreak
- Fix remaining places where giconv used instead of iconv
PR: ports/38049
Submitted by: KATO Tsuguru <tkato@prontomail.com>
Approved by: maintainer in silence
Notes
Notes:
svn path=/head/; revision=59664
Diffstat (limited to 'x11-wm/icewm')
-rw-r--r-- | x11-wm/icewm/Makefile | 20 | ||||
-rw-r--r-- | x11-wm/icewm/files/patch-ap | 7 | ||||
-rw-r--r-- | x11-wm/icewm/files/patch-configure.in | 67 | ||||
-rw-r--r-- | x11-wm/icewm/files/patch-sysdep.in | 20 |
4 files changed, 38 insertions, 76 deletions
diff --git a/x11-wm/icewm/Makefile b/x11-wm/icewm/Makefile index c9a8ba350d4f..eaf2a0085870 100644 --- a/x11-wm/icewm/Makefile +++ b/x11-wm/icewm/Makefile @@ -6,30 +6,27 @@ # PORTNAME= icewm -PORTVERSION= 1.0.9 -PORTREVISION= 5 +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 BUILD_DEPENDS= autoconf:${PORTSDIR}/devel/autoconf LIB_DEPENDS= intl.2:${PORTSDIR}/devel/gettext -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 +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 \ @@ -56,10 +53,13 @@ PLIST_SUB+= ESOUND="" PLIST_SUB+= ESOUND="@comment " .endif +post-patch: + @cd ${CONFIGURE_WRKSRC} && ${LOCALBASE}/bin/autoconf + 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 --git a/x11-wm/icewm/files/patch-ap b/x11-wm/icewm/files/patch-ap index 5b72d10b0f6e..043e5d06096d 100644 --- a/x11-wm/icewm/files/patch-ap +++ b/x11-wm/icewm/files/patch-ap @@ -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 --git a/x11-wm/icewm/files/patch-configure.in b/x11-wm/icewm/files/patch-configure.in index 433bd0cf0eef..bf1bbc667816 100644 --- a/x11-wm/icewm/files/patch-configure.in +++ b/x11-wm/icewm/files/patch-configure.in @@ -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 Tue May 14 09:49:31 2002 @@ -83,7 +83,7 @@ AC_FUNC_SELECT_ARGTYPES @@ -9,7 +9,7 @@ APPLICATIONS='genpref icewm icesh icewmhint icewmbg' dnl Checking for X11 -@@ -108,27 +108,28 @@ +@@ -108,27 +108,27 @@ AC_ARG_ENABLE(i18n, [ --enable-i18n Enable internationalization], [ if test "$enable_i18n" != "no"; then @@ -22,15 +22,15 @@ - - ice_nl_codesets="" - -+dnl AC_CHECK_HEADERS(langinfo.h,, -+dnl [ AC_MSG_ERROR([I18N support has been requested but langinfo.h wasn´t found. ++dnl AC_CHECK_HEADERS(langinfo.h,, ++dnl [ AC_MSG_ERROR([I18N support has been requested but langinfo.h wasn´t found. +dnl *** Check your installation.])]) -+dnl AC_CHECK_FUNC(nl_langinfo,, -+dnl [ AC_MSG_ERROR([I18N support has been requested but nl_langinfo wasn´t found. ++dnl AC_CHECK_FUNC(nl_langinfo,, ++dnl [ AC_MSG_ERROR([I18N support has been requested but nl_langinfo wasn´t found. +dnl *** Check your installation.])]) -+dnl -+dnl ice_nl_codesets="" -+dnl ++dnl ++dnl ice_nl_codesets="" ++dnl ICE_CHECK_NL_ITEM(_NL_MESSAGES_CODESET, [ ice_nl_codesets="${ice_nl_codesets} _NL_MESSAGES_CODESET," ]) ICE_CHECK_NL_ITEM(_NL_CTYPE_CODESET_NAME, @@ -38,59 +38,20 @@ ICE_CHECK_NL_ITEM(CODESET, [ ice_nl_codesets="${ice_nl_codesets} CODESET," ]) - -+dnl ++dnl if test "${ice_nl_codesets}" = ""; then - AC_MSG_ERROR([I18N support has been requested but nl_langinfo doesn't -*** return any information about the locale's codeset. Check your manuals. -*** Ask your vendor. Contact icewm-devel@lists.sourceforge.net when you know -*** the name of the locale-dependent parameter for your platform.]) -+dnl AC_MSG_ERROR([I18N support has been requested but nl_langinfo doesn't ++dnl AC_MSG_ERROR([I18N support has been requested but nl_langinfo doesn't +dnl *** return any information about the locale's codeset. Check your manuals. +dnl *** Ask your vendor. Contact icewm-devel@lists.sourceforge.net when you know +dnl *** the name of the locale-dependent parameter for your platform.]) -+ ice_nl_codesets="CODESET" 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 wasn´t found. -+ AC_CHECK_HEADERS(giconv.h,, -+ [ AC_MSG_ERROR([I18N support has been requested but giconv.h wasn´t 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 +164,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"), @@ -99,7 +60,7 @@ ice_sufficent_iconv=no ICE_CHECK_CONVERSION(ISO-8859-1,$with_unicode_set,no,$ice_libiconv, -@@ -203,7 +204,7 @@ +@@ -203,7 +203,7 @@ features="${features} nls" TARGETS=$TARGETS' nls' @@ -108,7 +69,7 @@ fi dnl ======================================================= /proc/wm-session === -@@ -464,7 +465,7 @@ +@@ -464,7 +464,7 @@ AC_DEFINE(CONFIG_GNOME_MENUS, 1, [Define to make IceWM more GNOME-friendly]) else diff --git a/x11-wm/icewm/files/patch-sysdep.in b/x11-wm/icewm/files/patch-sysdep.in index fec4db616b7f..39ada837e28e 100644 --- a/x11-wm/icewm/files/patch-sysdep.in +++ b/x11-wm/icewm/files/patch-sysdep.in @@ -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@ |