Update to 0.95.9 and make it depend on ImageMagick7.

This commit is contained in:
Hiroki Sato 2020-08-13 15:54:34 +00:00
parent 2e3c5061d5
commit 1ac1542848
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=544815
21 changed files with 72 additions and 107 deletions

View File

@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= libwraster
PORTVERSION= 0.95.8
PORTREVISION= 1
PORTVERSION= 0.95.9
CATEGORIES= x11-wm windowmaker
MASTER_SITES= http://windowmaker.org/pub/source/release/
DISTNAME= WindowMaker-${PORTVERSION}
@ -17,7 +16,7 @@ LIB_DEPENDS= libgif.so:graphics/giflib \
libjbig.so:graphics/jbigkit \
libtiff.so:graphics/tiff \
libwebp.so:graphics/webp \
libMagickWand-6.so:graphics/ImageMagick6
libMagickWand-7.so:graphics/ImageMagick7
USES= jpeg libtool localbase pathfix pkgconfig xorg
USE_LDCONFIG= yes
@ -40,8 +39,4 @@ INSTALL_TARGET= install-strip
pre-build:
cd ${WRKSRC} && ${MAKE_CMD} config-paths.h
post-install:
cd ${WRKSRC}/doc && ${INSTALL_MAN} \
get-wraster-flags.1 ${STAGEDIR}${MANPREFIX}/man/man1
.include <bsd.port.mk>

View File

@ -1,3 +1,3 @@
TIMESTAMP = 1519792748
SHA256 (WindowMaker-0.95.8.tar.gz) = 9dbf5c5571bb79c4b1584f496c960ee2cd7379af45ef0f58b4b0f487259de88a
SIZE (WindowMaker-0.95.8.tar.gz) = 3253515
TIMESTAMP = 1597295266
SHA256 (WindowMaker-0.95.9.tar.gz) = f22358ff60301670e1e2b502faad0f2da7ff8976632d538f95fe4638e9c6b714
SIZE (WindowMaker-0.95.9.tar.gz) = 3397167

View File

@ -1,6 +1,6 @@
--- configure.orig 2015-08-11 18:52:18 UTC
--- configure.orig 2020-04-05 13:42:01 UTC
+++ configure
@@ -13782,7 +13782,7 @@ case "$host" in #(
@@ -14305,7 +14305,7 @@ case "$host" in #(
*-*-linux*|*-*-cygwin*|*-gnu*) :
WM_OSDEP="linux" ; CPPFLAGS="$CPPFLAGS -D_XOPEN_SOURCE=600" ;; #(
*-*-freebsd*|*-k*bsd-gnu*) :

View File

@ -1,8 +1,6 @@
bin/get-wraster-flags
include/wraster.h
lib/libwraster.a
lib/libwraster.so
lib/libwraster.so.6
lib/libwraster.so.6.0.0
libdata/pkgconfig/wrlib.pc
man/man1/get-wraster-flags.1.gz

View File

@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= windowmaker
PORTVERSION= 0.95.8
PORTREVISION= 2
PORTVERSION= 0.95.9
CATEGORIES= x11-wm windowmaker
MASTER_SITES= http://windowmaker.org/pub/source/release/
DISTNAME= WindowMaker-${PORTVERSION}
@ -18,14 +17,15 @@ LIB_DEPENDS= libgif.so:graphics/giflib \
libjbig.so:graphics/jbigkit \
libtiff.so:graphics/tiff \
libwebp.so:graphics/webp \
libMagickWand-6.so:graphics/ImageMagick6 \
libwraster.so.6:x11-wm/libwraster \
libMagickWand-7.so:graphics/ImageMagick7 \
libwraster.so:x11-wm/libwraster \
libfontconfig.so:x11-fonts/fontconfig \
libfreetype.so:print/freetype2 \
libexif.so:graphics/libexif
RUN_DEPENDS= ${LOCALBASE}/share/WindowMaker/Themes/LeetWM.themed/style:graphics/wmicons
USES= jpeg libtool shebangfix pathfix perl5 pkgconfig xorg
USES= gnome jpeg libtool shebangfix pathfix perl5 pkgconfig xorg
USE_GNOME= pango
USE_LDCONFIG= yes
USE_XORG= x11 xext xft xinerama xmu xpm
SHEBANG_FILES= util/wkdemenu.pl
@ -38,6 +38,7 @@ CONFIGURE_ARGS= --with-pixmapdir=${PREFIX}/include/X11/pixmaps \
--with-incs-from="-I${LOCALBASE}/include" \
--with-gnustepdir="${PREFIX}/GNUstep" \
--enable-modelock \
--enable-pango \
--enable-xinerama \
--enable-usermenu \
--enable-wmreplace \

View File

@ -1,3 +1,3 @@
TIMESTAMP = 1519793700
SHA256 (WindowMaker-0.95.8.tar.gz) = 9dbf5c5571bb79c4b1584f496c960ee2cd7379af45ef0f58b4b0f487259de88a
SIZE (WindowMaker-0.95.8.tar.gz) = 3253515
TIMESTAMP = 1597295523
SHA256 (WindowMaker-0.95.9.tar.gz) = f22358ff60301670e1e2b502faad0f2da7ff8976632d538f95fe4638e9c6b714
SIZE (WindowMaker-0.95.9.tar.gz) = 3397167

View File

@ -1,6 +1,6 @@
--- Makefile.in.orig 2015-10-06 04:12:09 UTC
--- Makefile.in.orig 2020-08-13 06:26:57 UTC
+++ Makefile.in
@@ -374,7 +374,7 @@ ACLOCAL_AMFLAGS = -I m4
@@ -389,7 +389,7 @@ ACLOCAL_AMFLAGS = -I m4
# Improve coverage in 'make distcheck' by checking that translations work
AM_DISTCHECK_CONFIGURE_FLAGS = --enable-silent-rules LINGUAS='*'

View File

@ -1,6 +1,6 @@
--- WINGs/Examples/Makefile.in.orig 2015-10-06 04:12:10 UTC
--- WINGs/Examples/Makefile.in.orig 2020-08-13 06:26:57 UTC
+++ WINGs/Examples/Makefile.in
@@ -342,14 +342,14 @@ top_srcdir = @top_srcdir@
@@ -359,14 +359,14 @@ top_srcdir = @top_srcdir@
wprefs_bindir = @wprefs_bindir@
wprefs_datadir = @wprefs_datadir@
AUTOMAKE_OPTIONS =

View File

@ -1,6 +1,6 @@
--- WINGs/Extras/Makefile.in.orig 2015-10-06 04:12:10 UTC
--- WINGs/Extras/Makefile.in.orig 2020-08-13 06:26:57 UTC
+++ WINGs/Extras/Makefile.in
@@ -145,7 +145,6 @@ PROGRAMS = $(noinst_PROGRAMS)
@@ -155,7 +155,6 @@ am__v_lt_1 =
test_SOURCES = test.c
test_OBJECTS = test.$(OBJEXT)
am__DEPENDENCIES_1 = $(top_builddir)/WINGs/libWINGs.la \
@ -8,7 +8,7 @@
$(top_builddir)/WINGs/libWUtil.la
test_DEPENDENCIES = wtableview.o wtabledelegates.o \
$(am__DEPENDENCIES_1)
@@ -386,10 +385,10 @@ libExtraWINGs_la_SOURCES = \
@@ -404,10 +403,10 @@ libExtraWINGs_la_SOURCES = \
wtableview.h \
wtabledelegates.h

View File

@ -1,8 +1,8 @@
--- WINGs/Makefile.in.orig 2015-10-06 04:12:10 UTC
--- WINGs/Makefile.in.orig 2020-08-13 06:26:57 UTC
+++ WINGs/Makefile.in
@@ -135,8 +135,7 @@ am__uninstall_files_from_dir = { \
am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(bindir)" \
"$(DESTDIR)$(pkgconfigdir)"
@@ -141,8 +141,7 @@ am__uninstall_files_from_dir = { \
}
am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(pkgconfigdir)"
LTLIBRARIES = $(lib_LTLIBRARIES)
-libWINGs_la_DEPENDENCIES = libWUtil.la \
- $(top_builddir)/wrlib/libwraster.la
@ -10,9 +10,9 @@
am_libWINGs_la_OBJECTS = configuration.lo dragcommon.lo \
dragdestination.lo dragsource.lo selection.lo wappresource.lo \
wballoon.lo wbox.lo wbrowser.lo wbutton.lo wcolor.lo \
@@ -438,8 +437,8 @@ libWINGs_la_LDFLAGS = -version-info @WIN
@@ -478,8 +477,8 @@ DIST_SUBDIRS = $(SUBDIRS) Tests Examples Extras
libWINGs_la_LDFLAGS = -version-info @WINGS_VERSION@
libWUtil_la_LDFLAGS = -version-info @WUTIL_VERSION@
dist_bin_SCRIPTS = get-wings-flags get-wutil-flags
lib_LTLIBRARIES = libWUtil.la libWINGs.la
-LDADD = libWUtil.la libWINGs.la $(top_builddir)/wrlib/libwraster.la @INTLIBS@
-libWINGs_la_LIBADD = libWUtil.la $(top_builddir)/wrlib/libwraster.la @XLIBS@ @XFTLIBS@ @FCLIBS@ @LIBM@ @PANGOLIBS@
@ -21,7 +21,7 @@
libWUtil_la_LIBADD = @LIBBSD@
EXTRA_DIST = BUGS make-rgb Examples Extras Tests
@@ -513,7 +512,8 @@ libWUtil_la_SOURCES = \
@@ -553,7 +552,8 @@ libWUtil_la_SOURCES = \
AM_CFLAGS =
AM_CPPFLAGS = -DRESOURCE_PATH=\"$(datadir)/WINGs\" \

View File

@ -1,6 +1,6 @@
--- WINGs/Tests/Makefile.in.orig 2015-10-06 04:12:10 UTC
--- WINGs/Tests/Makefile.in.orig 2020-08-13 06:26:57 UTC
+++ WINGs/Tests/Makefile.in
@@ -109,7 +109,6 @@ am_testmywidget_OBJECTS = testmywidget.$
@@ -118,7 +118,6 @@ am_testmywidget_OBJECTS = testmywidget.$(OBJEXT) mywid
testmywidget_OBJECTS = $(am_testmywidget_OBJECTS)
testmywidget_LDADD = $(LDADD)
testmywidget_DEPENDENCIES = $(top_builddir)/WINGs/libWINGs.la \
@ -8,7 +8,7 @@
$(top_builddir)/WINGs/libWUtil.la
AM_V_lt = $(am__v_lt_@AM_V@)
am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
@@ -119,13 +118,11 @@ wmfile_SOURCES = wmfile.c
@@ -128,13 +127,11 @@ wmfile_SOURCES = wmfile.c
wmfile_OBJECTS = wmfile.$(OBJEXT)
wmfile_LDADD = $(LDADD)
wmfile_DEPENDENCIES = $(top_builddir)/WINGs/libWINGs.la \
@ -22,7 +22,7 @@
$(top_builddir)/WINGs/libWUtil.la
wtest_SOURCES = wtest.c
wtest_OBJECTS = wtest.$(OBJEXT)
@@ -355,14 +352,14 @@ top_srcdir = @top_srcdir@
@@ -373,14 +370,14 @@ top_srcdir = @top_srcdir@
wprefs_bindir = @wprefs_bindir@
wprefs_datadir = @wprefs_datadir@
AUTOMAKE_OPTIONS =

View File

@ -1,4 +1,4 @@
--- WINGs/WINGs/WINGsP.h.orig 2015-08-11 18:41:14 UTC
--- WINGs/WINGs/WINGsP.h.orig 2019-02-15 23:34:25 UTC
+++ WINGs/WINGs/WINGsP.h
@@ -17,7 +17,13 @@
@ -6,10 +6,10 @@
+#ifdef _XLOCALE_H_ /* workaround for libX11<1.4 */
+#undef _XLOCALE_H_
+#include <stdlib.h>
#include <stdlib.h>
+#define _XLOCALE_H_
+#else
#include <stdlib.h>
+#include <stdlib.h>
+#endif
#include <string.h>
#include <strings.h>

View File

@ -1,6 +1,6 @@
--- WPrefs.app/Makefile.in.orig 2015-10-06 04:12:10 UTC
--- WPrefs.app/Makefile.in.orig 2020-08-13 06:26:57 UTC
+++ WPrefs.app/Makefile.in
@@ -455,13 +455,14 @@ WPrefs_SOURCES = \
@@ -481,13 +481,14 @@ WPrefs_SOURCES = \
# Themes.c
AM_CFLAGS =
AM_CPPFLAGS = -DRESOURCE_PATH=\"$(wpdatadir)\" -DWMAKER_RESOURCE_PATH=\"$(pkgdatadir)\" \

View File

@ -1,6 +1,6 @@
--- WPrefs.app/Menu.c.orig 2015-08-11 18:41:14 UTC
--- WPrefs.app/Menu.c.orig 2020-04-05 13:41:15 UTC
+++ WPrefs.app/Menu.c
@@ -517,19 +517,19 @@ static void createPanel(_Panel * p)
@@ -518,19 +518,19 @@ static void createPanel(_Panel * p)
data = putNewItem(panel, pad, DirectoryInfo, _("Themes"));
data->param.directory.command = "setstyle";
data->param.directory.directory =

View File

@ -1,13 +1,10 @@
--- WindowMaker/Defaults/Makefile.in.orig 2015-10-06 04:12:10 UTC
--- WindowMaker/Defaults/Makefile.in.orig 2020-08-13 06:26:57 UTC
+++ WindowMaker/Defaults/Makefile.in
@@ -542,7 +542,9 @@ WMWindowAttributes: $(srcdir)/WMWindowAt
chmod 644 WMWindowAttributes
@@ -562,6 +562,7 @@ WMWindowAttributes: $(srcdir)/WMWindowAttributes.in
WindowMaker: $(srcdir)/WindowMaker.in
- $(AM_V_GEN)sed -e "s:#pkgdatadir#:$(pkgdatadir):" $(srcdir)/WindowMaker.in \
+ $(AM_V_GEN)sed -e "s:#pkgdatadir#:$(pkgdatadir):" \
$(AM_V_GEN)sed -e "s:#pkgdatadir#:$(pkgdatadir):" \
+ -e "s:#prefix#:$(prefix):" \
+ $(srcdir)/WindowMaker.in \
-e "s:#pixmapdir#:$(pixmapdir):" $(srcdir)/WindowMaker.in \
> WindowMaker ; \
chmod 644 WindowMaker

View File

@ -1,28 +1,12 @@
--- WindowMaker/Defaults/WindowMaker.in.orig 2015-08-11 18:41:14 UTC
--- WindowMaker/Defaults/WindowMaker.in.orig 2020-04-05 13:41:16 UTC
+++ WindowMaker/Defaults/WindowMaker.in
@@ -13,12 +13,10 @@
"~/GNUstep/Library/Icons",
"#pkgdatadir#/Icons",
"#pkgdatadir#/Pixmaps",
- "/usr/include/X11/pixmaps",
"~/GNUstep/Library/WindowMaker/Pixmaps",
"~/GNUstep/Library/WindowMaker/CachedPixmaps",
- "/usr/share/icons",
- "/usr/local/share/pixmaps",
- "/usr/share/pixmaps"
+ "#prefix#/share/icons",
+ "#prefix#/share/pixmaps"
);
PixmapPath = (
"~/GNUstep/Library/WindowMaker/Pixmaps",
@@ -26,9 +24,7 @@
"~/GNUstep/Library/WindowMaker/CachedPixmaps",
"#pkgdatadir#/Pixmaps",
"#pkgdatadir#/Backgrounds",
- "/usr/include/X11/pixmaps",
- "/usr/local/share/pixmaps",
- "/usr/share/pixmaps"
+ "#prefix#/share/pixmaps"
);
WindowTitleBalloons = YES;
IconSize = 64;
@@ -37,7 +37,8 @@
"~/pixmaps",
"#pkgdatadir#/Icons",
"#pkgdatadir#/Pixmaps",
- "#pixmapdir#"
+ "#pixmapdir#",
+ "#prefix#/share/icons"
);
ColormapMode = auto;
AutoFocus = YES;

View File

@ -1,6 +1,6 @@
--- configure.orig 2015-08-11 18:52:18 UTC
--- configure.orig 2020-04-05 13:42:01 UTC
+++ configure
@@ -13782,7 +13782,7 @@ case "$host" in #(
@@ -14305,7 +14305,7 @@ case "$host" in #(
*-*-linux*|*-*-cygwin*|*-gnu*) :
WM_OSDEP="linux" ; CPPFLAGS="$CPPFLAGS -D_XOPEN_SOURCE=600" ;; #(
*-*-freebsd*|*-k*bsd-gnu*) :

View File

@ -1,10 +0,0 @@
--- doc/Makefile.in.orig 2015-10-06 04:12:09 UTC
+++ doc/Makefile.in
@@ -382,7 +382,6 @@ dist_man_MANS = \
geticonset.1 \
getstyle.1 \
get-wings-flags.1 \
- get-wraster-flags.1 \
get-wutil-flags.1 \
seticons.1 \
setstyle.1 \

View File

@ -1,6 +1,6 @@
--- src/Makefile.in.orig 2015-10-06 04:12:09 UTC
--- src/Makefile.in.orig 2020-08-13 06:26:57 UTC
+++ src/Makefile.in
@@ -164,8 +164,7 @@ am_wmaker_OBJECTS = actions.$(OBJEXT) ap
@@ -173,8 +173,7 @@ am_wmaker_OBJECTS = actions.$(OBJEXT) appicon.$(OBJEXT
@USE_NESTED_FUNC_FALSE@ xmodifier.hack_nf.$(OBJEXT)
wmaker_OBJECTS = $(am_wmaker_OBJECTS) $(nodist_wmaker_OBJECTS)
wmaker_DEPENDENCIES = $(top_builddir)/WINGs/libWINGs.la \
@ -10,7 +10,7 @@
AM_V_lt = $(am__v_lt_@AM_V@)
am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
am__v_lt_0 = --silent
@@ -424,13 +423,12 @@ wmaker_SOURCES = GNUstep.h WindowMaker.h
@@ -467,13 +466,12 @@ wmaker_SOURCES = GNUstep.h WindowMaker.h actions.c act
@USE_NESTED_FUNC_FALSE@CLEANFILES = $(nodist_wmaker_SOURCES)
AM_CFLAGS =
AM_CPPFLAGS = $(DFLAGS) \

View File

@ -1,6 +1,6 @@
--- util/Makefile.in.orig 2015-10-06 04:12:09 UTC
--- util/Makefile.in.orig 2020-08-13 06:26:57 UTC
+++ util/Makefile.in
@@ -145,14 +145,13 @@ wdwrite_DEPENDENCIES = $(top_builddir)/W
@@ -154,14 +154,13 @@ wdwrite_DEPENDENCIES = $(top_builddir)/WINGs/libWUtil.
wmagnify_SOURCES = wmagnify.c
wmagnify_OBJECTS = wmagnify.$(OBJEXT)
wmagnify_DEPENDENCIES = $(top_builddir)/WINGs/libWINGs.la \
@ -17,7 +17,7 @@
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1)
am_wmmenugen_OBJECTS = wmmenugen.$(OBJEXT) wmmenugen_misc.$(OBJEXT) \
@@ -163,8 +162,7 @@ wmmenugen_DEPENDENCIES = $(top_builddir)
@@ -172,8 +171,7 @@ wmmenugen_DEPENDENCIES = $(top_builddir)/WINGs/libWUti
wmsetbg_SOURCES = wmsetbg.c
wmsetbg_OBJECTS = wmsetbg.$(OBJEXT)
wmsetbg_DEPENDENCIES = $(top_builddir)/WINGs/libWINGs.la \
@ -27,7 +27,7 @@
wxcopy_SOURCES = wxcopy.c
wxcopy_OBJECTS = wxcopy.$(OBJEXT)
wxcopy_DEPENDENCIES =
@@ -477,7 +475,7 @@ AUTOMAKE_OPTIONS =
@@ -502,7 +500,7 @@ AUTOMAKE_OPTIONS =
bin_SCRIPTS = wmaker.inst wm-oldmenu2new wkdemenu.pl
EXTRA_DIST = wmaker.inst.in bughint wm-oldmenu2new wkdemenu.pl
AM_CPPFLAGS = \
@ -36,7 +36,7 @@
@HEADER_SEARCH_PATH@ \
-DETCDIR=\"sysconfdir\" -DDATADIR=\"pkgdatadir\"
@@ -500,13 +498,13 @@ geticonset_LDADD = $(top_builddir)/WINGs
@@ -525,13 +523,13 @@ geticonset_LDADD = $(top_builddir)/WINGs/libWUtil.la $
wmagnify_LDADD = \
$(top_builddir)/WINGs/libWINGs.la \
$(top_builddir)/WINGs/libWUtil.la \
@ -52,7 +52,7 @@
@XLFLAGS@ @LIBXINERAMA@ @XLIBS@ @INTLIBS@
wmgenmenu_LDADD = \
@@ -523,7 +521,7 @@ wmmenugen_SOURCES = wmmenugen.c wmmenuge
@@ -548,7 +546,7 @@ wmmenugen_SOURCES = wmmenugen.c wmmenugen.h wmmenugen_
wmmenugen_parse_xdg.c
wmiv_LDADD = \

View File

@ -74,8 +74,6 @@ GNUstep/Applications/WPrefs.app/tiff/workspace.tiff
GNUstep/Applications/WPrefs.app/tiff/workspacename.tiff
GNUstep/Applications/WPrefs.app/tiff/xis.tiff
bin/convertfonts
bin/get-wings-flags
bin/get-wutil-flags
bin/geticonset
bin/getstyle
bin/seticons
@ -199,6 +197,7 @@ share/WindowMaker/Pixmaps/tile.tiff
share/WindowMaker/Pixmaps/tile.xpm
share/WindowMaker/README
share/WindowMaker/README.themes
share/WindowMaker/Styles/Adwaita.style
share/WindowMaker/Styles/Autumn.style
share/WindowMaker/Styles/Black.style
share/WindowMaker/Styles/BlackTexture.style
@ -240,8 +239,12 @@ share/WindowMaker/Themes/OpenStep.style
share/WindowMaker/Themes/Pastel.style
share/WindowMaker/Themes/SteelBlueSilk.style
share/WindowMaker/appearance.menu
share/WindowMaker/appearance.menu.fy
share/WindowMaker/appearance.menu.nl
share/WindowMaker/autostart.sh
share/WindowMaker/background.menu
share/WindowMaker/background.menu.fy
share/WindowMaker/background.menu.nl
share/WindowMaker/exitscript.sh
share/WindowMaker/menu
share/WindowMaker/menu.bg
@ -372,8 +375,6 @@ share/WindowMaker/wmmacros
%%NLS%%man/cs/man1/wxpaste.1.gz
man/man1/WPrefs.1.gz
man/man1/WindowMaker.1.gz
man/man1/get-wings-flags.1.gz
man/man1/get-wutil-flags.1.gz
man/man1/geticonset.1.gz
man/man1/getstyle.1.gz
man/man1/seticons.1.gz
@ -388,7 +389,6 @@ man/man1/wmmenugen.1.gz
man/man1/wmsetbg.1.gz
man/man1/wxcopy.1.gz
man/man1/wxpaste.1.gz
man/man8/upgrade-windowmaker-defaults.8.gz
%%NLS%%man/ru/man1/geticonset.1.gz
%%NLS%%man/ru/man1/getstyle.1.gz
%%NLS%%man/ru/man1/seticons.1.gz