Date: Tue, 15 Feb 2000 17:19:31 +0200 (EET) From: sobomax@altavista.net To: FreeBSD-gnats-submit@freebsd.org Subject: ports/16727: [PATCH] merge of libwmfun (x11-wm/libwmfun) with the WMaker port and other general fixes to the WM port Message-ID: <200002151519.RAA27600@vega.vega.com>
next in thread | raw e-mail | index | archive | help
>Number: 16727
>Category: ports
>Synopsis: [PATCH] merge of libwmfun (x11-wm/libwmfun) with the WMaker port and other general fixes to the WM port
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Tue Feb 15 07:30:01 PST 2000
>Closed-Date:
>Last-Modified:
>Originator: Maxim Sobolev
>Release: FreeBSD 3.4-STABLE i386
>Organization:
Vega International Capital
>Environment:
>Description:
As long as libwmfun is distributed inside of WMaker's distfile and doesn't have
its own distribution it is logical to merge these ports and delete
x11-wm/libwmfun.
Also in this patch unrelated to wmfun fixes provided to the WMaker's PLIST and
Makefile to add missed pieces (wmsetbg.1x man page and libWUtil.a library).
NOTE: if this patch will be commited and libwmfun port deleted then
LIB_DEPENDS for wmakerconf port (x11-wm/wmakerconf) should be updated to reflect
disappearing of the separate libwmfun port.
>How-To-Repeat:
>Fix:
diff -ruN /usr/ports/x11-wm/windowmaker/Makefile windowmaker/Makefile
--- /usr/ports/x11-wm/windowmaker/Makefile Wed Oct 6 11:09:52 1999
+++ windowmaker/Makefile Tue Feb 15 17:04:47 2000
@@ -35,7 +35,7 @@
--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 @@
${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 @@
@cd ${WRKDIR}/WindowMaker-extra-0.1; \
${MAKE} ${MAKE_ARGS} install
${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/lib
+ ${MKDIR} ${PREFIX}/share/WindowMaker/Sounds
.include <bsd.port.mk>
diff -ruN /usr/ports/x11-wm/windowmaker/patches/patch-bc windowmaker/patches/patch-bc
--- /usr/ports/x11-wm/windowmaker/patches/patch-bc Thu Jan 1 03:00:00 1970
+++ windowmaker/patches/patch-bc Tue Feb 15 16:12:29 2000
@@ -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 <<EOF
+
+@@ -5531,7 +5532,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 "}
++ WPrefs.app/po/Makefile \
++ libwmfun-0.0.2/libwmfun/Makefile "}
+ EOF
+ cat >> $CONFIG_STATUS <<\EOF
+ for ac_file in .. $CONFIG_FILES; do if test "x$ac_file" != x..; then
diff -ruN /usr/ports/x11-wm/windowmaker/patches/patch-bd windowmaker/patches/patch-bd
--- /usr/ports/x11-wm/windowmaker/patches/patch-bd Thu Jan 1 03:00:00 1970
+++ windowmaker/patches/patch-bd Tue Feb 15 16:05:45 2000
@@ -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 -ruN /usr/ports/x11-wm/windowmaker/patches/patch-be windowmaker/patches/patch-be
--- /usr/ports/x11-wm/windowmaker/patches/patch-be Thu Jan 1 03:00:00 1970
+++ windowmaker/patches/patch-be Tue Feb 15 16:05:45 2000
@@ -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 -ruN /usr/ports/x11-wm/windowmaker/pkg/PLIST windowmaker/pkg/PLIST
--- /usr/ports/x11-wm/windowmaker/pkg/PLIST Wed Oct 6 11:09:52 1999
+++ windowmaker/pkg/PLIST Tue Feb 15 16:46:13 2000
@@ -159,9 +159,13 @@
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
>Release-Note:
>Audit-Trail:
>Unformatted:
To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-ports" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200002151519.RAA27600>