Upgrade to 1.0.7.

7 files changed, 80 insertions, 53 deletions

diff --git a/x11-wm/icewm/Makefile b/x11-wm/icewm/Makefile
index d38005ef98f..689bac62988 100644
--- a/x11-wm/icewm/Makefile
+++ b/x11-wm/icewm/Makefile
@@ -6,11 +6,11 @@
 #
 
 PORTNAME=	icewm
-PORTVERSION=	1.0.6
+PORTVERSION=	1.0.7
 CATEGORIES=	x11-wm
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
-DISTNAME=	${PORTNAME}-${PORTVERSION}-4
+DISTNAME=	${PORTNAME}-${PORTVERSION}-7
 
 MAINTAINER=	nakai@FreeBSD.org
 
@@ -26,7 +26,9 @@ CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LIBS="-L${LOCALBASE}/lib"
 CONFIGURE_ARGS=	--enable-i18n --enable-nls \
 		--with-cfgdir=${PREFIX}/share/icewm \
-		--with-libdir=${PREFIX}/share/icewm
+		--with-libdir=${PREFIX}/share/icewm \
+		--with-kdedatadir=${LOCALBASE}/share \
+		--with-docdir=${PREFIX}/share/doc
 
 .include <bsd.port.pre.mk>
 
diff --git a/x11-wm/icewm/distinfo b/x11-wm/icewm/distinfo
index 98a33b7ebbf..719a70d121c 100644
--- a/x11-wm/icewm/distinfo
+++ b/x11-wm/icewm/distinfo
@@ -1 +1 @@
-MD5 (icewm-1.0.6-4.tar.bz2) = 9231eca07f8aa39b06f3a94e400676e4
+MD5 (icewm-1.0.7-7.tar.bz2) = 9818345ffc5f7cf7ba2a8ba1d979bb2a
diff --git a/x11-wm/icewm/files/patch-al b/x11-wm/icewm/files/patch-al
deleted file mode 100644
index 31f06683479..00000000000
--- a/x11-wm/icewm/files/patch-al
+++ /dev/null
@@ -1,12 +0,0 @@
---- sysdep.in.orig	Mon Jan 15 06:49:39 2001
-+++ sysdep.in	Mon Jan 15 22:18:06 2001
-@@ -1,7 +1,7 @@
- CXX = @CXX@
- LD = @CXX_LINK@
- DEBUG = @debug_flags@
--SYS_CFLAGS = @CXXFLAGS@ @DEFS@
-+SYS_CFLAGS = @CXXFLAGS@ @CPPFLAGS@ @DEFS@
- SYS_INCDIRS =
- SYS_LIBDIRS =
--SYS_LIBS = @LIBS@
-+SYS_LIBS = @LIBS@ -lxpg4
diff --git a/x11-wm/icewm/files/patch-configure.in b/x11-wm/icewm/files/patch-configure.in
index cb61dc1e930..6b868e9f5d7 100644
--- a/x11-wm/icewm/files/patch-configure.in
+++ b/x11-wm/icewm/files/patch-configure.in
@@ -1,5 +1,5 @@
---- configure.in.orig	Mon Jan 15 06:49:39 2001
-+++ configure.in	Mon Jan 15 22:18:06 2001
+--- configure.in.orig	Sat Mar 17 05:17:36 2001
++++ configure.in	Sat Mar 17 09:52:27 2001
 @@ -66,7 +66,7 @@
  AC_FUNC_SELECT_ARGTYPES
  
@@ -9,16 +9,16 @@
  
  dnl Checking for X11
  AC_PATH_XTRA
-@@ -94,7 +94,7 @@
-   [  --enable-nls            Enable internationalized message],
-   [ if test "$enable_nls" != "no"; then
-       AC_CHECK_LIB(intl, gettext)
--      localedir='${datadir}/locale'
-+      localedir='${prefix}/share/locale'
-       AC_DEFINE(ENABLE_NLS, 1,
-         [Define to enable internationalized message])
-       TARGETS=$TARGETS' nls'
-@@ -190,7 +190,7 @@
+@@ -103,7 +103,7 @@
+   AC_DEFINE(ENABLE_NLS, 1, [Define to enable internationalized message])
+   TARGETS=$TARGETS' nls'
+ 
+-  localedir='${datadir}/locale'
++  localedir='${prefix}/share/locale'
+ fi
+ 
+ dnl ============================================================= GUI Events ===
+@@ -245,7 +245,7 @@
  
  	AC_DEFINE(GNOME, 1, [Define to make IceWM more GNOME-friendly])
        else
@@ -26,3 +26,4 @@
 +	AC_MSG_WARN([gnome-config can not be found])
        fi
      fi ])
+ 
diff --git a/x11-wm/icewm/files/patch-po_Makefile b/x11-wm/icewm/files/patch-po_Makefile
deleted file mode 100644
index eb6c3a685e3..00000000000
--- a/x11-wm/icewm/files/patch-po_Makefile
+++ /dev/null
@@ -1,11 +0,0 @@
---- po/Makefile.orig	Mon Jan 15 06:49:39 2001
-+++ po/Makefile	Mon Jan 15 22:18:06 2001
-@@ -24,7 +24,7 @@
- 	  MSGDIR="$(LOCDIR)/$$LANG/LC_MESSAGES"; \
- 	  echo Installing language: $$LANG ; \
- 	  $(INSTALLDIR) $$MSGDIR; \
--	  $(INSTALLBIN) $$c $$MSGDIR/$(PACKAGE).mo; \
-+	  $(INSTALLLIB) $$c $$MSGDIR/$(PACKAGE).mo; \
- 	done
- 
- clean:
diff --git a/x11-wm/icewm/files/patch-src_Makefile b/x11-wm/icewm/files/patch-src_Makefile
index 59135681d21..1ee796389e5 100644
--- a/x11-wm/icewm/files/patch-src_Makefile
+++ b/x11-wm/icewm/files/patch-src_Makefile
@@ -1,20 +1,15 @@
---- src/Makefile.orig	Mon Jan 15 06:49:39 2001
-+++ src/Makefile	Mon Jan 15 22:40:24 2001
-@@ -14,7 +14,7 @@
+--- src/Makefile.orig	Sat Mar 17 05:17:37 2001
++++ src/Makefile	Sat Mar 17 19:09:15 2001
+@@ -14,9 +14,9 @@
  	-DPACKAGE='"icewm"' \
  	-DVERSION='"$(VERSION)"' \
  	-DEXEEXT='"$(EXEEXT)"' \
 -	-DICEWMEXE='"icewm"EXEEXT' \
+-	-DICEHELPEXE='"icehelp"EXEEXT' \
+-	-DICEHELPIDX='"$(DOCDIR)/icewm-$(VERSION)/doc/icewm.html"' \
 +	-DICEWMEXE='"icewm$(EXEEXT)"' \
++	-DICEHELPEXE='"icehelp$(EXEEXT)"' \
++	-DICEHELPIDX='"$(DOCDIR)/icewm/icewm.html"' \
          $(SYS_CFLAGS) $(SYS_INCDIRS)
- LFLAGS      = 
- LIBS        = $(SYS_LIBDIRS) $(SYS_LIBS)
-@@ -97,7 +97,7 @@
- 
- genpref$(EXEEXT): $(GENPREFOBJS)
- 	-@rm -f $@
--	$(LD) -o $@ $(LFLAGS) $(GENPREFOBJS)
-+	$(LD) -o $@ $(LFLAGS) $(GENPREFOBJS) $(LIBS)
- 
- icewmhint$(EXEEXT): $(ICEWMHINTOBJS)
- 	-@rm -f $@
+ LFLAGS = $(SYS_LIBDIRS) 
+ LIBS = $(SYS_LIBS)
diff --git a/x11-wm/icewm/pkg-plist b/x11-wm/icewm/pkg-plist
index 051fa6a89d4..b841c9bf003 100644
--- a/x11-wm/icewm/pkg-plist
+++ b/x11-wm/icewm/pkg-plist
@@ -1,3 +1,4 @@
+bin/icehelp
 bin/icewm
 bin/icewmbg
 bin/icewmhint
@@ -13,6 +14,7 @@ bin/icewmhint
 %%NODOCS:%%share/doc/icewm/icewm-13.html
 %%NODOCS:%%share/doc/icewm/icewm-14.html
 %%NODOCS:%%share/doc/icewm/icewm-15.html
+%%NODOCS:%%share/doc/icewm/icewm-16.html
 %%NODOCS:%%share/doc/icewm/icewm-2.html
 %%NODOCS:%%share/doc/icewm/icewm-3.html
 %%NODOCS:%%share/doc/icewm/icewm-4.html
@@ -103,6 +105,52 @@ share/icewm/taskbar/linux20.xpm
 share/icewm/taskbar/start.xpm
 share/icewm/taskbar/windows.xpm
 share/icewm/taskbar/xfreeos2.xpm
+share/icewm/themes/Infadel2/Ergonomic.theme
+share/icewm/themes/Infadel2/closeA.xpm
+share/icewm/themes/Infadel2/closeI.xpm
+share/icewm/themes/Infadel2/default.theme
+share/icewm/themes/Infadel2/depthA.xpm
+share/icewm/themes/Infadel2/depthI.xpm
+share/icewm/themes/Infadel2/hideA.xpm
+share/icewm/themes/Infadel2/hideI.xpm
+share/icewm/themes/Infadel2/maximizeA.xpm
+share/icewm/themes/Infadel2/maximizeI.xpm
+share/icewm/themes/Infadel2/menuButtonA.xpm
+share/icewm/themes/Infadel2/menuButtonI.xpm
+share/icewm/themes/Infadel2/minimizeA.xpm
+share/icewm/themes/Infadel2/minimizeI.xpm
+share/icewm/themes/Infadel2/restoreA.xpm
+share/icewm/themes/Infadel2/restoreI.xpm
+share/icewm/themes/Infadel2/rolldownA.xpm
+share/icewm/themes/Infadel2/rolldownI.xpm
+share/icewm/themes/Infadel2/rollupA.xpm
+share/icewm/themes/Infadel2/rollupI.xpm
+share/icewm/themes/Infadel2/titleAB.xpm
+share/icewm/themes/Infadel2/titleAJ.xpm
+share/icewm/themes/Infadel2/titleAM.xpm
+share/icewm/themes/Infadel2/titleAP.xpm
+share/icewm/themes/Infadel2/titleAQ.xpm
+share/icewm/themes/Infadel2/titleAR.xpm
+share/icewm/themes/Infadel2/titleAS.xpm
+share/icewm/themes/Infadel2/titleAT.xpm
+share/icewm/themes/Infadel2/titleIB.xpm
+share/icewm/themes/Infadel2/titleIJ.xpm
+share/icewm/themes/Infadel2/titleIM.xpm
+share/icewm/themes/Infadel2/titleIP.xpm
+share/icewm/themes/Infadel2/titleIQ.xpm
+share/icewm/themes/Infadel2/titleIR.xpm
+share/icewm/themes/Infadel2/titleIS.xpm
+share/icewm/themes/Infadel2/titleIT.xpm
+share/icewm/themes/Infadel2/icons/app_16x16.xpm
+share/icewm/themes/Infadel2/icons/folder_16x16.xpm
+share/icewm/themes/Infadel2/icons/folder_32x32.xpm
+share/icewm/themes/Infadel2/mailbox/errmail.xpm
+share/icewm/themes/Infadel2/mailbox/mail.xpm
+share/icewm/themes/Infadel2/mailbox/newmail.xpm
+share/icewm/themes/Infadel2/mailbox/nomail.xpm
+share/icewm/themes/Infadel2/mailbox/unreadmail.xpm
+share/icewm/themes/Infadel2/taskbar/linux.xpm
+share/icewm/themes/Infadel2/taskbar/windows.xpm
 share/icewm/themes/gtk2/closeA.xpm
 share/icewm/themes/gtk2/closeI.xpm
 share/icewm/themes/gtk2/default.theme
@@ -231,6 +279,10 @@ share/locale/zh_TW.Big5/LC_MESSAGES/icewm.mo
 @dirrm share/icewm/themes/motif
 @dirrm share/icewm/themes/metal2
 @dirrm share/icewm/themes/gtk2
+@dirrm share/icewm/themes/Infadel2/taskbar
+@dirrm share/icewm/themes/Infadel2/mailbox
+@dirrm share/icewm/themes/Infadel2/icons
+@dirrm share/icewm/themes/Infadel2
 @dirrm share/icewm/themes
 @dirrm share/icewm/taskbar
 @dirrm share/icewm/mailbox