Date: Wed, 30 Jun 2004 16:49:03 +0400 From: Roman Bogorodskiy <bogorodskiy@inbox.ru> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/68512: [ patch ] x11-wm/fluxbox-devel: remove unneeded run deps and docs fix Message-ID: <E1BfeWM-0000IP-00.bogorodskiy-inbox-ru@mx1.mail.ru> Resent-Message-ID: <200406301250.i5UCoPT9026157@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 68512
>Category: ports
>Synopsis: [ patch ] x11-wm/fluxbox-devel: remove unneeded run deps and docs fix
>Confidential: no
>Severity: serious
>Priority: medium
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Wed Jun 30 12:50:25 GMT 2004
>Closed-Date:
>Last-Modified:
>Originator: Roman Bogorodskiy
>Release: FreeBSD 5.2.1-RELEASE-p8 i386
>Organization:
>Environment:
System: FreeBSD lame.novel.ru 5.2.1-RELEASE-p8 FreeBSD 5.2.1-RELEASE-p8 #5: Sat Jun 19 22:04:33 MSD 2004 root@lame.novel.ru:/usr/obj/usr/src/sys/NOV i386
>Description:
- Remove run depends on boxtools and xterm for the following reasons:
1. bsetbg is not needed becouse there is fbsetbg in the fluxbox
distro and most their options are common. As for style
portability, many styles use Esetroot as well as bsetbg, so
that's not the reason to make fluxbox depend on Eterm, is
it? (BTW, no one of "boxes" in ports tree doesn't have run
depend on boxtools as I can see)
2. IMHO, fluxbox should not have a run depend on xterm,
USE_X_PREFIX is enougth.
- A few words about docs: if fluxbox-devel configured without html and
pdf docs support, the docs dir will not be created, but there is an
entry for it in pkg-plist: @dirrm %%DOCSDIR%%. It'll couse warning on
deinstall. IMHO, it's better to install the standart docs (NEWS,
AUTHORS, etc) when NOPORTDOCS is not defined. If NOPORTDOCS is defined,
we dissallow for user to install html or pdf docs (maybe even some
warrning message should be displayed when WITH_DOC(PDF|HTML) and
NOPORTDOCS displayed together?).
>How-To-Repeat:
>Fix:
diff -ruN fluxbox-devel.orig/Makefile fluxbox-devel/Makefile
--- fluxbox-devel.orig/Makefile Wed Jun 30 14:38:41 2004
+++ fluxbox-devel/Makefile Wed Jun 30 15:53:23 2004
@@ -22,8 +22,6 @@
BUILD_DEPENDS= xterm:${PORTSDIR}/x11/XFree86-4-clients
LIB_DEPENDS= Xft.2:${PORTSDIR}/x11-fonts/libXft
-RUN_DEPENDS= bsetbg:${PORTSDIR}/x11-wm/boxtools \
- xterm:${PORTSDIR}/x11/XFree86-4-clients
CONFLICTS= fluxbox-0.1.*
@@ -38,6 +36,8 @@
nls/fr_FR nls/it_IT nls/ja_JP nls/lv_LV nls/nl_NL nls/pl_PL \
nls/pt_BR nls/pt_PT nls/ru_RU nls/sl_SI nls/sv_SE nls/tr_TR
+DOCS= AUTHORS ChangeLog NEWS TODO
+
.if defined(WITH_DEBUG)
CONFIGURE_ARGS+= --enable-debug
.endif
@@ -52,7 +52,7 @@
CONFIGURE_ARGS+= --disable-kde
.endif
-.if defined(WITH_DOCPDF)
+.if defined(WITH_DOCPDF) && !defined(NOPORTDOCS)
MASTER_SITES+= http://fluxbox.org/docbook/en/pdf/:pdf
DISTFILES+= fluxbook.pdf:pdf
PLIST_SUB+= DOCPDF:=""
@@ -60,7 +60,7 @@
PLIST_SUB+= DOCPDF:="@comment "
.endif
-.if defined(WITH_DOCHTML)
+.if defined(WITH_DOCHTML) && !defined(NOPORTDOCS)
MASTER_SITES+= http://fluxbox.org/docbook/en/tarballs/:html
DISTFILES+= fb-doc-mfhtml.tgz:html
EXTRACT_ONLY+= fb-doc-mfhtml.tgz
@@ -122,6 +122,7 @@
.endif
post-install:
+.if !defined(NOPORTDOCS)
.if defined(WITH_DOCPDF)
@${MKDIR} ${DOCSDIR}/pdf
@${INSTALL_DATA} ${DISTDIR}/fluxbook.pdf ${DOCSDIR}/pdf/
@@ -130,6 +131,9 @@
@${MKDIR} ${DOCSDIR}/html
@${INSTALL_DATA} ${WRKDIR}/html/*.css ${DOCSDIR}/html/
@${INSTALL_DATA} ${WRKDIR}/html/*.html ${DOCSDIR}/html/
+.endif
+ @${MKDIR} ${DOCSDIR}
+ cd ${WRKSRC} && ${INSTALL_DATA} ${DOCS} ${DOCSDIR}
.endif
@${CAT} ${PKGMESSAGE}
diff -ruN fluxbox-devel.orig/files/patch-util::Makefile.in fluxbox-devel/files/patch-util::Makefile.in
--- fluxbox-devel.orig/files/patch-util::Makefile.in Wed Jun 30 14:38:41 2004
+++ fluxbox-devel/files/patch-util::Makefile.in Thu Jan 1 03:00:00 1970
@@ -1,20 +0,0 @@
---- util/Makefile.in.orig Fri Apr 30 01:35:18 2004
-+++ util/Makefile.in Fri Apr 30 01:36:19 2004
-@@ -94,7 +94,7 @@
- SUBDIRS = fbrun
- INCLUDES = -I$(top_srcdir)/src -I$(top_srcdir)/src/FbTk
- bin_SCRIPTS = fbsetbg fluxbox-generate_menu startfluxbox
--bin_PROGRAMS = bsetroot
-+bin_PROGRAMS =
- bsetroot_SOURCES = bsetroot.cc bsetroot.hh
- bsetroot_LDADD = ../src/FbRootWindow.o ../src/I18n.o \
- ../src/FbAtoms.o ../src/FbTk/libFbTk.a
-@@ -108,7 +108,7 @@
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
- CONFIG_HEADER = $(top_builddir)/config.h
- CONFIG_CLEAN_FILES =
--bin_PROGRAMS = bsetroot$(EXEEXT)
-+bin_PROGRAMS =
- PROGRAMS = $(bin_PROGRAMS)
-
- am_bsetroot_OBJECTS = bsetroot.$(OBJEXT)
diff -ruN fluxbox-devel.orig/pkg-plist fluxbox-devel/pkg-plist
--- fluxbox-devel.orig/pkg-plist Wed Jun 30 14:38:41 2004
+++ fluxbox-devel/pkg-plist Wed Jun 30 15:40:36 2004
@@ -1,8 +1,13 @@
+bin/bsetroot
bin/fbrun
bin/fbsetbg
bin/fluxbox
bin/fluxbox-generate_menu
bin/startfluxbox
+%%PORTDOCS%%%%DOCSDIR%%/AUTHORS
+%%PORTDOCS%%%%DOCSDIR%%/NEWS
+%%PORTDOCS%%%%DOCSDIR%%/ChangeLog
+%%PORTDOCS%%%%DOCSDIR%%/TODO
%%DOCHTML:%%%%DOCSDIR%%/html/app-artwiz.html
%%DOCHTML:%%%%DOCSDIR%%/html/app-debugging.html
%%DOCHTML:%%%%DOCSDIR%%/html/app-setup.html
@@ -164,4 +169,4 @@
@dirrm share/fluxbox
%%DOCPDF:%%@dirrm %%DOCSDIR%%/pdf
%%DOCHTML:%%@dirrm %%DOCSDIR%%/html
-@dirrm %%DOCSDIR%%
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?E1BfeWM-0000IP-00.bogorodskiy-inbox-ru>