From 1210188ed1df1656b0d43d10651951ef4b2dab88 Mon Sep 17 00:00:00 2001 From: Thomas Gellekum Date: Wed, 16 Feb 2000 13:05:08 +0000 Subject: Merge libwmfun port with WindowMaker. Fix PLIST. PR: 16727 Submitted by: Maxim Sobolev Reviewed by: Will Andrews Use libungif instead of giflib. --- x11-wm/windowmaker/Makefile | 9 +++++++-- x11-wm/windowmaker/files/patch-bc | 22 ++++++++++++++++++++++ x11-wm/windowmaker/files/patch-bd | 12 ++++++++++++ x11-wm/windowmaker/files/patch-be | 39 +++++++++++++++++++++++++++++++++++++++ x11-wm/windowmaker/pkg-plist | 4 ++++ 5 files changed, 84 insertions(+), 2 deletions(-) create mode 100644 x11-wm/windowmaker/files/patch-bc create mode 100644 x11-wm/windowmaker/files/patch-bd create mode 100644 x11-wm/windowmaker/files/patch-be diff --git a/x11-wm/windowmaker/Makefile b/x11-wm/windowmaker/Makefile index e82bfbce8e92..b219a10a6093 100644 --- a/x11-wm/windowmaker/Makefile +++ b/x11-wm/windowmaker/Makefile @@ -16,7 +16,7 @@ DISTFILES= ${DISTNAME}${EXTRACT_SUFX} ${DATAFILES} MAINTAINER= handy@physics.montana.edu LIB_DEPENDS= Xpm.4:${PORTSDIR}/graphics/xpm \ - gif.5:${PORTSDIR}/graphics/giflib \ + ungif.5:${PORTSDIR}/graphics/libungif \ jpeg.9:${PORTSDIR}/graphics/jpeg \ png.3:${PORTSDIR}/graphics/png \ tiff.4:${PORTSDIR}/graphics/tiff \ @@ -35,7 +35,7 @@ CONFIGURE_ARGS= --with-pixmapdir=${PREFIX}/include/X11/pixmaps \ --disable-debug MAN1= geticonset.1x getstyle.1x seticons.1x setstyle.1x \ - wdwrite.1x wmaker.1x wmsetbg.1x wxcopy.1x wxpaste.1x + wdwrite.1x wmaker.1x wmsetbg.1x wsetfont.1x wxcopy.1x wxpaste.1x DATAFILES= WindowMaker-extra-0.1.tar.bz2 @@ -58,6 +58,10 @@ pre-extract: ${ECHO} "You can add hooks for Gnome and KDE by defining USE_GNOME and/or USE_KDE" .endif +post-extract: + @cd ${WRKSRC} && \ + ${TAR} xfz libwmfun-0.0.2.tar.gz + post-patch: @perl -pi -e "s|%%PREFIX%%|${PREFIX}|g" ${WRKSRC}/WPrefs.app/Paths.c \ ${WRKSRC}/WindowMaker/Defaults/* @@ -70,5 +74,6 @@ post-install: @cd ${WRKDIR}/WindowMaker-extra-0.1; \ ${MAKE} ${MAKE_ARGS} install ${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/lib + ${MKDIR} ${PREFIX}/share/WindowMaker/Sounds .include diff --git a/x11-wm/windowmaker/files/patch-bc b/x11-wm/windowmaker/files/patch-bc new file mode 100644 index 000000000000..51cc67d12743 --- /dev/null +++ b/x11-wm/windowmaker/files/patch-bc @@ -0,0 +1,22 @@ +--- configure.orig Tue Feb 15 16:00:11 2000 ++++ configure Tue Feb 15 16:02:20 2000 +@@ -5398,7 +5398,8 @@ + WindowMaker/Pixmaps/Makefile WindowMaker/Styles/Makefile \ + WindowMaker/Themes/Makefile \ + WPrefs.app/Makefile WPrefs.app/tiff/Makefile WPrefs.app/xpm/Makefile \ +- WPrefs.app/po/Makefile src/config.h" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15 ++ WPrefs.app/po/Makefile \ ++ libwmfun-0.0.2/libwmfun/Makefile src/config.h" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15 + EOF + cat >> $CONFIG_STATUS <> $CONFIG_STATUS <<\EOF + for ac_file in .. $CONFIG_FILES; do if test "x$ac_file" != x..; then diff --git a/x11-wm/windowmaker/files/patch-bd b/x11-wm/windowmaker/files/patch-bd new file mode 100644 index 000000000000..bc74ed728fc6 --- /dev/null +++ b/x11-wm/windowmaker/files/patch-bd @@ -0,0 +1,12 @@ +--- Makefile.in.orig Tue Feb 15 16:03:27 2000 ++++ Makefile.in Tue Feb 15 15:22:24 2000 +@@ -92,7 +92,8 @@ + X_LIBRARY_PATH = @X_LIBRARY_PATH@ + 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 \ ++ libwmfun-0.0.2/libwmfun + + + EXTRA_DIST = TODO BUGS BUGFORM FAQ FAQ.I18N MIRRORS COPYING.OPL Install acconfig.h INSTALL.pt mkpatch README.KDE README.GNOME WindowMaker.lsm.in docklib-0.2.tar.gz libwmfun-0.0.2.tar.gz diff --git a/x11-wm/windowmaker/files/patch-be b/x11-wm/windowmaker/files/patch-be new file mode 100644 index 000000000000..164addce0050 --- /dev/null +++ b/x11-wm/windowmaker/files/patch-be @@ -0,0 +1,39 @@ +--- libwmfun-0.0.2/libwmfun/Makefile.in.orig Tue Feb 15 16:04:35 2000 ++++ libwmfun-0.0.2/libwmfun/Makefile.in Tue Feb 15 15:44:31 2000 +@@ -38,7 +38,7 @@ + pkglibdir = $(libdir)/@PACKAGE@ + pkgincludedir = $(includedir)/@PACKAGE@ + +-top_builddir = .. ++top_builddir = ../.. + + ACLOCAL = @ACLOCAL@ + AUTOCONF = @AUTOCONF@ +@@ -69,6 +69,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_SOURCES = bilinear.c fade.c generic.c generic.h getopt.c getopt.h getopt1.c wave.c +@@ -104,12 +106,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 + + + mostlyclean-libLTLIBRARIES: diff --git a/x11-wm/windowmaker/pkg-plist b/x11-wm/windowmaker/pkg-plist index 86c2d49e2b06..5f18d1c37a26 100644 --- a/x11-wm/windowmaker/pkg-plist +++ b/x11-wm/windowmaker/pkg-plist @@ -159,9 +159,13 @@ include/WUtil.h include/wraster.h lib/libWINGs.a lib/libWMaker.a +lib/libWUtil.a lib/libwraster.a lib/libwraster.so lib/libwraster.so.3 +lib/libwmfun.a +lib/libwmfun.so +lib/libwmfun.so.0 @exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %B @unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R share/WINGs/Images.tiff -- cgit v1.2.3