cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update to 1.3.6

Browse Source 
Tested on armv7 by Scarlett <scarlett AT xavin DOT net> - Thanks!
ok dcoppa@ aja@
This commit is contained in:
bcallah 2015-01-11 15:59:19 +00:00
parent 251fb9d3a0
commit 976b17322c
5 changed files with 49 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
x11/fluxbox/Makefile
View File

@ -1,37 +1,32 @@
# $OpenBSD: Makefile,v 1.76 2014/05/24 14:55:16 bcallah Exp $
# $OpenBSD: Makefile,v 1.77 2015/01/11 15:59:19 bcallah Exp $
COMMENT= window manager based on the original Blackbox code
COMMENT = window manager based on the original Blackbox code
DISTNAME = fluxbox-1.3.6
CATEGORIES = x11
DISTNAME= fluxbox-1.3.5
REVISION= 1
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=fluxbox/}
HOMEPAGE= http://fluxbox.org/
MAINTAINER= Brian Callahan <bcallah@openbsd.org>
HOMEPAGE = http://fluxbox.org/
MAINTAINER = Brian Callahan <bcallah@openbsd.org>
# X11
PERMIT_PACKAGE_CDROM= Yes
PERMIT_PACKAGE_CDROM = Yes
MODULES= converters/libiconv
WANTLIB += Imlib2 X11 Xext Xft Xinerama Xpm Xrandr Xrender c fontconfig
WANTLIB += freetype fribidi m stdc++ z
WANTLIB= ICE Imlib2 SM X11 Xext Xft Xinerama \
Xpm Xrandr Xrender c fontconfig \
freetype fribidi m stdc++ z
MASTER_SITES = ${MASTER_SITE_SOURCEFORGE:=fluxbox/}
CONFIGURE_STYLE= gnu
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
MODULES = converters/libiconv
LIB_DEPENDS= devel/fribidi \
graphics/imlib2
CONFIGURE_STYLE = gnu
CONFIGURE_ENV = CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
USE_GMAKE= Yes
USE_GROFF = Yes
USE_GMAKE = Yes
USE_GROFF = Yes
NO_TEST= Yes
LIB_DEPENDS= devel/fribidi>=0.19.2 \
graphics/imlib2
NO_TEST = Yes
.include <bsd.port.mk>

4
x11/fluxbox/distinfo
View File

@ -1,2 +1,2 @@
SHA256 (fluxbox-1.3.5.tar.gz) = mdaID4VS/SqP9M38eqev9Y8K4EqWLMrEEt0mzYhFW5c=
SIZE (fluxbox-1.3.5.tar.gz) = 1125565
SHA256 (fluxbox-1.3.6.tar.gz) = y1TrYtPbovKCpQ+90HfSaiyfVVwStb9mSxGS7OdmlSc=
SIZE (fluxbox-1.3.6.tar.gz) = 1312141

24
x11/fluxbox/patches/patch-Makefile_in Normal file
View File

@ -0,0 +1,24 @@
$OpenBSD: patch-Makefile_in,v 1.3 2015/01/11 15:59:19 bcallah Exp $
--- Makefile.in.orig Wed Jan 7 13:16:02 2015
+++ Makefile.in Wed Jan 7 13:16:25 2015
@@ -5234,7 +5234,6 @@ src/defaults.hh:
src/defaults.cc: force
@( \
- GITDIR=$(top_srcdir)/.git; \
echo '// This file is generated from Makefile. Do not edit!'; \
echo '#include "defaults.hh"'; \
echo ''; \
@@ -5243,11 +5242,7 @@ src/defaults.cc: force
echo '}'; \
echo ''; \
echo 'const char* gitrevision() {'; \
- if test -r $$GITDIR/HEAD; then \
- echo ' return "'`cd $$GITDIR && git rev-parse HEAD`'";'; \
- else \
- echo ' return "unknown";'; \
- fi; \
+ echo ' return "unknown";'; \
echo '}' ) > $(top_builddir)/src/defaults_tmp.cc
@if ! cmp $(top_builddir)/src/defaults_tmp.cc $(top_builddir)/src/defaults.cc ; then cp $(top_builddir)/src/defaults_tmp.cc $(top_builddir)/src/defaults.cc; fi
@rm $(top_builddir)/src/defaults_tmp.cc

27
x11/fluxbox/patches/patch-src_Makefile_in
View File

@ -1,27 +0,0 @@
$OpenBSD: patch-src_Makefile_in,v 1.4 2013/04/16 15:27:03 bcallah Exp $
Don't check for git revision, this is a stable release
--- src/Makefile.in.orig Sun Apr 7 18:10:55 2013
+++ src/Makefile.in Sun Apr 7 18:12:55 2013
@@ -933,7 +933,6 @@ defaults.hh: Makefile
defaults.cc: force
@( \
- GITDIR=$(top_srcdir)/.git; \
echo '// This file is generated from Makefile. Do not edit!'; \
echo '#include "defaults.hh"'; \
echo ''; \
@@ -942,11 +941,7 @@ defaults.cc: force
echo '}'; \
echo ''; \
echo 'const char* gitrevision() {'; \
- if test -r $$GITDIR/HEAD; then \
- echo ' return "'`cat $$GITDIR/$$(cat $$GITDIR/HEAD | cut -f 2 -d ' ')`'";'; \
- else \
- echo ' return "this_is_tar_ball_build";'; \
- fi; \
+ echo ' return "this_is_tar_ball_build";'; \
echo '}' ) > defaults_tmp.cc
@if ! cmp defaults_tmp.cc defaults.cc ; then cp defaults_tmp.cc defaults.cc; fi
@rm defaults_tmp.cc

6
x11/fluxbox/pkg/PLIST
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.18 2013/04/16 15:27:03 bcallah Exp $
@comment $OpenBSD: PLIST,v 1.19 2015/01/11 15:59:19 bcallah Exp $
@bin bin/fbrun
bin/fbsetbg
@bin bin/fbsetroot
@ -29,8 +29,8 @@ share/fluxbox/nls/be_BY.CP1251/
share/fluxbox/nls/be_BY.CP1251/fluxbox.cat
share/fluxbox/nls/be_BY.UTF-8/
share/fluxbox/nls/be_BY.UTF-8/fluxbox.cat
share/fluxbox/nls/bg_BG.ISO-8859-1/
share/fluxbox/nls/bg_BG.ISO-8859-1/fluxbox.cat
share/fluxbox/nls/bg_BG.CP1251/
share/fluxbox/nls/bg_BG.CP1251/fluxbox.cat
share/fluxbox/nls/bg_BG.UTF-8/
share/fluxbox/nls/bg_BG.UTF-8/fluxbox.cat
share/fluxbox/nls/cs_CZ.ISO-8859-2/