diff --git a/x11-wm/windowmaker/Makefile b/x11-wm/windowmaker/Makefile index 4533e27aa38a..fc25d94dc5f8 100644 --- a/x11-wm/windowmaker/Makefile +++ b/x11-wm/windowmaker/Makefile @@ -6,7 +6,7 @@ # PORTNAME= windowmaker -PORTVERSION= 0.64.0 +PORTVERSION= 0.65.0 CATEGORIES= x11-wm windowmaker MASTER_SITES= ${MASTER_SITE_WINDOWMAKER} \ http://jgo.local.net/cool_downloads/wm/ \ @@ -14,7 +14,6 @@ MASTER_SITES= ${MASTER_SITE_WINDOWMAKER} \ MASTER_SITE_SUBDIR= beta/srcs DISTNAME= WindowMaker-${PORTVERSION} DISTFILES= ${DISTNAME}${EXTRACT_SUFX} \ - libwmfun-${PORTVERSION}${EXTRACT_SUFX} \ ${DATAFILES} MAINTAINER= sobomax@FreeBSD.org @@ -24,7 +23,8 @@ LIB_DEPENDS= ungif.5:${PORTSDIR}/graphics/libungif \ png.4:${PORTSDIR}/graphics/png \ tiff.4:${PORTSDIR}/graphics/tiff \ PropList.2:${PORTSDIR}/devel/libPropList \ - intl.1:${PORTSDIR}/devel/gettext + intl.1:${PORTSDIR}/devel/gettext \ + Hermes.1:${PORTSDIR}/graphics/Hermes USE_BZIP2= yes USE_PERL5= yes @@ -42,6 +42,7 @@ CONFIGURE_ARGS= --with-pixmapdir=${PREFIX}/include/X11/pixmaps \ --with-libs-from="-L${LOCALBASE}/lib" \ --with-incs-from="-I${LOCALBASE}/include" \ --with-appspath="${PREFIX}/GNUstep/Apps" \ + --enable-hermes \ --disable-debug MAN1= geticonset.1x getstyle.1x seticons.1x setstyle.1x wdwrite.1x \ @@ -65,10 +66,6 @@ pre-extract: @${ECHO} "You can add hooks for KDE by defining WITH_KDE" .endif -.if defined(WITH_SINGLE_ICON) -CONFIGURE_ARGS+= --enable-single-icon -.endif - post-patch: @perl -pi -e "s|%%PREFIX%%|${PREFIX}|g" ${WRKSRC}/WPrefs.app/Paths.c \ ${WRKSRC}/WindowMaker/Defaults/* diff --git a/x11-wm/windowmaker/distinfo b/x11-wm/windowmaker/distinfo index 0d17a5511ef7..7fef8f59f134 100644 --- a/x11-wm/windowmaker/distinfo +++ b/x11-wm/windowmaker/distinfo @@ -1,3 +1,2 @@ -MD5 (WindowMaker-0.64.0.tar.bz2) = f03a6e99eb62c6edc2b452b7d6c54edb -MD5 (libwmfun-0.64.0.tar.bz2) = b0066a2444c413567c9185adf37fd05b +MD5 (WindowMaker-0.65.0.tar.bz2) = d17f6b206db4c4157248e36422fc9cbb MD5 (WindowMaker-extra-0.1.tar.bz2) = e6fb381da0d207c320f58e7a1fea2a2b diff --git a/x11-wm/windowmaker/files/LINGUAS b/x11-wm/windowmaker/files/LINGUAS index 87924f639a3b..4354c8c3642e 100644 --- a/x11-wm/windowmaker/files/LINGUAS +++ b/x11-wm/windowmaker/files/LINGUAS @@ -1 +1 @@ -bg cs da de el es fi fr gl hr hu it ja ko nl no pl pt ro ru sk sv tr zh_CN zh_TW.Big5 +bg cs da de el es et fi fr gl hr hu it ja ko nl no pl pt ro ru sk sv tr zh_CN zh_TW.Big5 diff --git a/x11-wm/windowmaker/files/patch-bc b/x11-wm/windowmaker/files/patch-bc deleted file mode 100644 index 5c6d36923fc8..000000000000 --- a/x11-wm/windowmaker/files/patch-bc +++ /dev/null @@ -1,23 +0,0 @@ - -$FreeBSD$ - ---- configure.orig Sat Feb 10 21:46:34 2001 -+++ configure Mon Feb 19 21:14:48 2001 -@@ -5897,7 +5897,7 @@ - WindowMaker/Icons/Makefile WindowMaker/Pixmaps/Makefile \ - WindowMaker/Styles/Makefile WindowMaker/Themes/Makefile \ - WPrefs.app/Makefile WPrefs.app/tiff/Makefile WPrefs.app/xpm/Makefile \ -- WPrefs.app/po/Makefile \ -+ WPrefs.app/po/Makefile plugins/libwmfun/Makefile \ - contrib/Makefile contrib/WindowMaker.spec src/config.h" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15 - EOF - cat >> $CONFIG_STATUS <> $CONFIG_STATUS <<\EOF diff --git a/x11-wm/windowmaker/files/patch-bd b/x11-wm/windowmaker/files/patch-bd deleted file mode 100644 index b475c82ba387..000000000000 --- a/x11-wm/windowmaker/files/patch-bd +++ /dev/null @@ -1,12 +0,0 @@ ---- Makefile.in 2001/01/04 10:32:11 1.1 -+++ Makefile.in 2001/01/04 10:32:58 -@@ -91,7 +91,8 @@ - supported_locales = @supported_locales@ - wprefsdir = @wprefsdir@ - --SUBDIRS = wrlib WINGs src util po WindowMaker wmlib test WPrefs.app doc contrib -+SUBDIRS = wrlib WINGs src util po WindowMaker wmlib test WPrefs.app doc contrib \ -+ plugins/libwmfun - - - EXTRA_DIST = TODO BUGS BUGFORM FAQ FAQ.I18N MIRRORS COPYING.WTFPL Install acconfig.h INSTALL.pt README.pt mkpatch README.KDE README.GNOME WindowMaker.lsm.in README.definable-cursor libwmfun-0.0.3.tar.gz diff --git a/x11-wm/windowmaker/files/patch-be b/x11-wm/windowmaker/files/patch-be deleted file mode 100644 index e80e196e5a63..000000000000 --- a/x11-wm/windowmaker/files/patch-be +++ /dev/null @@ -1,60 +0,0 @@ - -$FreeBSD$ - ---- plugins/libwmfun/Makefile.in.orig Mon Feb 19 21:10:18 2001 -+++ plugins/libwmfun/Makefile.in Mon Feb 19 21:20:52 2001 -@@ -38,7 +38,7 @@ - pkglibdir = $(libdir)/@PACKAGE@ - pkgincludedir = $(includedir)/@PACKAGE@ - --top_builddir = .. -+top_builddir = ../.. - - ACLOCAL = @ACLOCAL@ - AUTOCONF = @AUTOCONF@ -@@ -70,6 +70,8 @@ - RANLIB = @RANLIB@ - VERSION = @VERSION@ - -+INCLUDES = -I$(top_srcdir)/wrlib -I$(top_srcdir)/src -I$(top_srcdir)/WINGs @HEADER_SEARCH_PATH@ -+ - lib_LTLIBRARIES = libwmfun.la - - libwmfun_la_LDFLAGS = -version-info 1:0:1 -@@ -86,7 +88,7 @@ - CPPFLAGS = @CPPFLAGS@ - LDFLAGS = @LDFLAGS@ - LIBS = @LIBS@ --libwmfun_la_LIBADD = -+libwmfun_la_LIBADD = - libwmfun_la_OBJECTS = bilinear.lo fade.lo generic.lo getopt.lo \ - getopt1.lo wave.lo - CFLAGS = @CFLAGS@ -@@ -107,12 +109,12 @@ - all: all-redirect - .SUFFIXES: - .SUFFIXES: .S .c .lo .o .s --$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) -- cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps libwmfun/Makefile -- --Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status -- cd $(top_builddir) \ -- && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status -+#$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) -+# cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps libwmfun/Makefile -+# -+#Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status -+# cd $(top_builddir) \ -+# && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status - - - config.h: stamp-h -@@ -275,7 +277,7 @@ - install: install-am - uninstall-am: uninstall-libLTLIBRARIES - uninstall: uninstall-am --all-am: Makefile $(LTLIBRARIES) config.h -+all-am: Makefile $(LTLIBRARIES) - all-redirect: all-am - install-strip: - $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install diff --git a/x11-wm/windowmaker/files/patch-bf b/x11-wm/windowmaker/files/patch-bf deleted file mode 100644 index 7d0f58251b09..000000000000 --- a/x11-wm/windowmaker/files/patch-bf +++ /dev/null @@ -1,11 +0,0 @@ ---- wrlib/Makefile.in.orig Sun Jan 7 01:22:01 2001 -+++ wrlib/Makefile.in Mon Jan 8 01:20:22 2001 -@@ -97,7 +97,7 @@ - - lib_LTLIBRARIES = libwraster.la - --libwraster_la_LDFLAGS = -version-info 2:1:0 -+libwraster_la_LDFLAGS = -version-info 3:0:0 - - bin_SCRIPTS = get-wraster-flags - diff --git a/x11-wm/windowmaker/files/patch-src_config.h.in b/x11-wm/windowmaker/files/patch-src_config.h.in deleted file mode 100644 index 95f2aee6d0a0..000000000000 --- a/x11-wm/windowmaker/files/patch-src_config.h.in +++ /dev/null @@ -1,7 +0,0 @@ ---- src/config.h.in 2001/01/05 10:30:03 1.1 -+++ src/config.h.in 2001/01/05 10:30:18 -@@ -206,3 +206,4 @@ - /* Version number of package */ - #undef VERSION - -+#define USE_FREETYPE diff --git a/x11-wm/windowmaker/pkg-plist b/x11-wm/windowmaker/pkg-plist index 494101fe4491..8672b3e2f97a 100644 --- a/x11-wm/windowmaker/pkg-plist +++ b/x11-wm/windowmaker/pkg-plist @@ -101,12 +101,9 @@ lib/libExtraWINGs.a lib/libWINGs.a lib/libWMaker.a lib/libWUtil.a -lib/libwmfun.a -lib/libwmfun.so -lib/libwmfun.so.1 lib/libwraster.a lib/libwraster.so -lib/libwraster.so.3 +lib/libwraster.so.4 share/WINGs/Images.tiff share/WINGs/Images.xpm share/WINGs/defaultIcon.tiff @@ -351,6 +348,7 @@ share/locale/de/LC_MESSAGES/WindowMaker.mo share/locale/el/LC_MESSAGES/WindowMaker.mo share/locale/es/LC_MESSAGES/WPrefs.mo share/locale/es/LC_MESSAGES/WindowMaker.mo +share/locale/et/LC_MESSAGES/WindowMaker.mo share/locale/fi/LC_MESSAGES/WPrefs.mo share/locale/fi/LC_MESSAGES/WindowMaker.mo share/locale/fr/LC_MESSAGES/WPrefs.mo