mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2024-11-23 00:43:28 +00:00
Code Issues Releases Activity

- Add patch that prevents OpenOffice from crashing

Browse Source 
- Move Xft patch out of files/ and relocate reminder patch
- Add xterm as BUILD/RUN dependency to fix build [1]
- bump PORTREVISION

PR:		ports/45706
Submitted by:	maintainer
Reivewed by:	kris [1]
This commit is contained in:
Patrick Li 2002-11-26 00:03:20 +00:00
parent ad1c0c6b5b
commit 40c508a3ee
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=71097
8 changed files with 24 additions and 74 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
x11-wm/fluxbox-devel/Makefile
View File

@ -7,22 +7,25 @@
PORTNAME= fluxbox
PORTVERSION= 0.1.13
PORTREVISION= 1
PORTREVISION= 2
CATEGORIES= x11-wm
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
.if defined(WITH_REMEMBER)
PATCH_SITES= http://www.raisdorf.net/files/FreeBSD/
PATCHFILES= remember-patch-0.1.13.gz
PATCH_SITES= http://www.cse.unsw.edu.au/~simonb/
PATCH_DIST_STRIP= -p1
PATCHFILES= fluxbox.openoffice.patch fluxbox-0.1.13.aa2.patch
.if defined(WITH_REMEMBER)
PATCHFILES+= fluxbox-remember-patch-0.1.13.gz
.endif
MAINTAINER= hendrik@scholz.net
RUN_DEPENDS= bsetbg:${PORTSDIR}/x11-wm/boxtools
RUN_DEPENDS= bsetbg:${PORTSDIR}/x11-wm/boxtools \
xterm:${PORTSDIR}/x11/XFree86-4-clients
BUILD_DEPENDS= xterm:${PORTSDIR}/x11/XFree86-4-clients
.if defined(WITH_REMEMBER)
BUILD_DEPENDS= automake14:${PORTSDIR}/devel/automake14
BUILD_DEPENDS+= automake14:${PORTSDIR}/devel/automake14
.endif
USE_X_PREFIX= yes

4
x11-wm/fluxbox-devel/distinfo
View File

@ -1,2 +1,4 @@
MD5 (fluxbox-0.1.13.tar.gz) = 1b6eec68ae437f3f7084cc19ed7e1083
MD5 (remember-patch-0.1.13.gz) = 40ac61743c6535488e3526247b66af63
MD5 (fluxbox.openoffice.patch) = 5f1cedd6893799695fbbc3a19f5c5cff
MD5 (fluxbox-0.1.13.aa2.patch) = a983e268749bf143cd500690878def80
MD5 (fluxbox-remember-patch-0.1.13.gz) = 40ac61743c6535488e3526247b66af63

11
x11-wm/fluxbox-devel/files/patch-src::Font.cc
View File

@ -1,11 +0,0 @@
--- src/Font.cc.orig Fri Oct 25 23:07:07 2002
+++ src/Font.cc Sun Nov 24 18:23:28 2002
@@ -140,7 +140,7 @@
if (name == 0)
return false;
bool ret_val = m_fontimp->load(name);
- if (ret_val && name == 0) { //prevent from having a bad fontimp
+ if (ret_val && name != 0) { //prevent from having a bad fontimp
m_fontstr = name; // if the load really succeded then set font string
} else {
m_fontstr = "";

19
x11-wm/fluxbox-devel/files/patch-src::Screen.cc
View File

@ -1,19 +0,0 @@
--- src/Screen.cc.orig Sun Nov 17 12:27:50 2002
+++ src/Screen.cc Sun Nov 24 18:23:28 2002
@@ -284,7 +284,7 @@
image_control->setDither(*resource.image_dither);
theme = new Theme(getBaseDisplay()->getXDisplay(), getRootWindow(), colormap(), getScreenNumber(),
image_control, fluxbox->getStyleFilename(), getRootCommand().c_str());
-
+ theme->reconfigure(*resource.antialias);
const char *s = i18n->getMessage(
FBNLS::ScreenSet, FBNLS::ScreenPositionLength,
@@ -447,7 +447,6 @@
XFree(children);
XFlush(getBaseDisplay()->getXDisplay());
- theme->reconfigure(*resource.antialias);
}
namespace {

15
x11-wm/fluxbox/Makefile
View File

@ -7,22 +7,25 @@
PORTNAME= fluxbox
PORTVERSION= 0.1.13
PORTREVISION= 1
PORTREVISION= 2
CATEGORIES= x11-wm
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
.if defined(WITH_REMEMBER)
PATCH_SITES= http://www.raisdorf.net/files/FreeBSD/
PATCHFILES= remember-patch-0.1.13.gz
PATCH_SITES= http://www.cse.unsw.edu.au/~simonb/
PATCH_DIST_STRIP= -p1
PATCHFILES= fluxbox.openoffice.patch fluxbox-0.1.13.aa2.patch
.if defined(WITH_REMEMBER)
PATCHFILES+= fluxbox-remember-patch-0.1.13.gz
.endif
MAINTAINER= hendrik@scholz.net
RUN_DEPENDS= bsetbg:${PORTSDIR}/x11-wm/boxtools
RUN_DEPENDS= bsetbg:${PORTSDIR}/x11-wm/boxtools \
xterm:${PORTSDIR}/x11/XFree86-4-clients
BUILD_DEPENDS= xterm:${PORTSDIR}/x11/XFree86-4-clients
.if defined(WITH_REMEMBER)
BUILD_DEPENDS= automake14:${PORTSDIR}/devel/automake14
BUILD_DEPENDS+= automake14:${PORTSDIR}/devel/automake14
.endif
USE_X_PREFIX= yes

4
x11-wm/fluxbox/distinfo
View File

@ -1,2 +1,4 @@
MD5 (fluxbox-0.1.13.tar.gz) = 1b6eec68ae437f3f7084cc19ed7e1083
MD5 (remember-patch-0.1.13.gz) = 40ac61743c6535488e3526247b66af63
MD5 (fluxbox.openoffice.patch) = 5f1cedd6893799695fbbc3a19f5c5cff
MD5 (fluxbox-0.1.13.aa2.patch) = a983e268749bf143cd500690878def80
MD5 (fluxbox-remember-patch-0.1.13.gz) = 40ac61743c6535488e3526247b66af63

11
x11-wm/fluxbox/files/patch-src::Font.cc
View File

@ -1,11 +0,0 @@
--- src/Font.cc.orig Fri Oct 25 23:07:07 2002
+++ src/Font.cc Sun Nov 24 18:23:28 2002
@@ -140,7 +140,7 @@
if (name == 0)
return false;
bool ret_val = m_fontimp->load(name);
- if (ret_val && name == 0) { //prevent from having a bad fontimp
+ if (ret_val && name != 0) { //prevent from having a bad fontimp
m_fontstr = name; // if the load really succeded then set font string
} else {
m_fontstr = "";

19
x11-wm/fluxbox/files/patch-src::Screen.cc
View File

@ -1,19 +0,0 @@
--- src/Screen.cc.orig Sun Nov 17 12:27:50 2002
+++ src/Screen.cc Sun Nov 24 18:23:28 2002
@@ -284,7 +284,7 @@
image_control->setDither(*resource.image_dither);
theme = new Theme(getBaseDisplay()->getXDisplay(), getRootWindow(), colormap(), getScreenNumber(),
image_control, fluxbox->getStyleFilename(), getRootCommand().c_str());
-
+ theme->reconfigure(*resource.antialias);
const char *s = i18n->getMessage(
FBNLS::ScreenSet, FBNLS::ScreenPositionLength,
@@ -447,7 +447,6 @@
XFree(children);
XFlush(getBaseDisplay()->getXDisplay());
- theme->reconfigure(*resource.antialias);
}
namespace {