diff options
author | pat <pat@FreeBSD.org> | 2002-11-23 09:36:07 +0800 |
---|---|---|
committer | pat <pat@FreeBSD.org> | 2002-11-23 09:36:07 +0800 |
commit | 321544c261d9eee126b41bdbc4a1059ab829499f (patch) | |
tree | d5cfd503130deda6c5bcac197fd2c6b3741ab1b1 /x11-wm | |
parent | 85dcfcb447d91178d2a851895d3bea4fe7091950 (diff) | |
download | freebsd-ports-gnome-321544c261d9eee126b41bdbc4a1059ab829499f.tar.gz freebsd-ports-gnome-321544c261d9eee126b41bdbc4a1059ab829499f.tar.zst freebsd-ports-gnome-321544c261d9eee126b41bdbc4a1059ab829499f.zip |
Update to 0.1.13
PR: ports/45492
Submitted by: maintainer et al.
Diffstat (limited to 'x11-wm')
-rw-r--r-- | x11-wm/fluxbox-devel/Makefile | 18 | ||||
-rw-r--r-- | x11-wm/fluxbox-devel/distinfo | 3 | ||||
-rw-r--r-- | x11-wm/fluxbox-devel/files/patch-Makefile.in | 11 | ||||
-rw-r--r-- | x11-wm/fluxbox-devel/files/patch-configure | 37 | ||||
-rw-r--r-- | x11-wm/fluxbox-devel/files/patch-util::Makefile.in | 27 | ||||
-rw-r--r-- | x11-wm/fluxbox-devel/pkg-plist | 8 | ||||
-rw-r--r-- | x11-wm/fluxbox/Makefile | 18 | ||||
-rw-r--r-- | x11-wm/fluxbox/distinfo | 3 | ||||
-rw-r--r-- | x11-wm/fluxbox/files/patch-Makefile.in | 11 | ||||
-rw-r--r-- | x11-wm/fluxbox/files/patch-configure | 37 | ||||
-rw-r--r-- | x11-wm/fluxbox/files/patch-util::Makefile.in | 27 | ||||
-rw-r--r-- | x11-wm/fluxbox/pkg-plist | 8 |
12 files changed, 146 insertions, 62 deletions
diff --git a/x11-wm/fluxbox-devel/Makefile b/x11-wm/fluxbox-devel/Makefile index 8601fd0fce2c..388669a17a49 100644 --- a/x11-wm/fluxbox-devel/Makefile +++ b/x11-wm/fluxbox-devel/Makefile @@ -6,31 +6,20 @@ # PORTNAME= fluxbox -PORTVERSION= 0.1.12 -PORTREVISION= 2 +PORTVERSION= 0.1.13 CATEGORIES= x11-wm MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= ${PORTNAME} -.if defined(WITH_REMEMBER) -PATCH_SITES= http://fluxbox.sourceforge.net/download/patches/ -PATCHFILES= unofficial-fluxbox-0.1.12-remember-patch.bz2 -PATCH_DIST_STRIP= -p1 -.endif - MAINTAINER= hendrik@scholz.net -BUILD_DEPENDS= automake14:${PORTSDIR}/devel/automake14 RUN_DEPENDS= bsetbg:${PORTSDIR}/x11-wm/boxtools USE_X_PREFIX= yes GNU_CONFIGURE= yes USE_GNOMENG= yes WANT_GNOME= yes -CONFIGURE_ENV= AUTOMAKE="${AUTOMAKE}" -.if defined(WITH_REMEMBER) -USE_GMAKE= yes -.endif +CONFIGURE_ARGS= --disable-newwmspec .if defined(WITH_KDE) || defined(PACKAGE_BUILDING) CONFIGURE_ARGS+= --enable-kde .endif @@ -53,9 +42,6 @@ pre-everything:: .if !defined(WITH_XINERAMA) @${ECHO_CMD} "WITH_XINERAMA - Enable Xinerama support" .endif -.if !defined(WITH_REMEMBER) - @${ECHO_CMD} "WITH_REMEMBER - Enable the unofficial remember patch" -.endif .if !defined(WITH_KDE) @${ECHO_CMD} "WITH_KDE - Enable KDE slit support" .endif diff --git a/x11-wm/fluxbox-devel/distinfo b/x11-wm/fluxbox-devel/distinfo index 1c320796cc96..001d0b366ba3 100644 --- a/x11-wm/fluxbox-devel/distinfo +++ b/x11-wm/fluxbox-devel/distinfo @@ -1,2 +1 @@ -MD5 (fluxbox-0.1.12.tar.gz) = f90b191af969b49be3dcf901c36d5e13 -MD5 (unofficial-fluxbox-0.1.12-remember-patch.bz2) = cec040561aba84c1ca18fcfcaba17661 +MD5 (fluxbox-0.1.13.tar.gz) = 1b6eec68ae437f3f7084cc19ed7e1083 diff --git a/x11-wm/fluxbox-devel/files/patch-Makefile.in b/x11-wm/fluxbox-devel/files/patch-Makefile.in deleted file mode 100644 index 7de0322bc6d0..000000000000 --- a/x11-wm/fluxbox-devel/files/patch-Makefile.in +++ /dev/null @@ -1,11 +0,0 @@ ---- Makefile.in.orig Tue Oct 8 23:12:58 2002 -+++ Makefile.in Tue Oct 8 23:13:06 2002 -@@ -95,7 +95,7 @@ - install_sh = @install_sh@ - regex_cmd = @regex_cmd@ - --SUBDIRS = data doc nls src util -+SUBDIRS = data doc nls src util/fbrun - MAINTAINERCLEANFILES = aclocal.m4 config.h.in configure Makefile.in stamp-h.in - subdir = . - ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 diff --git a/x11-wm/fluxbox-devel/files/patch-configure b/x11-wm/fluxbox-devel/files/patch-configure new file mode 100644 index 000000000000..3ff4889a952e --- /dev/null +++ b/x11-wm/fluxbox-devel/files/patch-configure @@ -0,0 +1,37 @@ +--- configure.orig Mon Nov 18 06:03:16 2002 ++++ configure Thu Nov 21 22:33:40 2002 +@@ -5515,11 +5515,10 @@ + if test x$enableval = "xyes"; then + echo "$as_me:$LINENO: result: yes" >&5 + echo "${ECHO_T}yes" >&6 +- ++ NLS="-DNLS" + cat >>confdefs.h <<\_ACEOF + #define NLS 1 + _ACEOF +- + else + echo "$as_me:$LINENO: result: no" >&5 + echo "${ECHO_T}no" >&6 +@@ -5527,12 +5526,10 @@ + else + echo "$as_me:$LINENO: result: yes" >&5 + echo "${ECHO_T}yes" >&6 +- ++ NLS="-DNLS" + cat >>confdefs.h <<\_ACEOF + #define NLS 1 + _ACEOF +- +- + fi; + + echo "$as_me:$LINENO: checking for setlocale in -lxpg4" >&5 +@@ -6901,6 +6898,7 @@ + s,@MULTIBYTE_TRUE@,$MULTIBYTE_TRUE,;t t + s,@MULTIBYTE_FALSE@,$MULTIBYTE_FALSE,;t t + s,@XINERAMA@,$XINERAMA,;t t ++s,@NLS@,$NLS,;t t + CEOF + + _ACEOF diff --git a/x11-wm/fluxbox-devel/files/patch-util::Makefile.in b/x11-wm/fluxbox-devel/files/patch-util::Makefile.in new file mode 100644 index 000000000000..6c345e4ced0d --- /dev/null +++ b/x11-wm/fluxbox-devel/files/patch-util::Makefile.in @@ -0,0 +1,27 @@ +--- util/Makefile.in.orig Mon Nov 18 06:03:43 2002 ++++ util/Makefile.in Thu Nov 21 23:05:33 2002 +@@ -81,20 +81,20 @@ + regex_cmd = @regex_cmd@ + + SUBDIRS = fbrun +-bin_SCRIPTS = bsetbg fluxbox-generate_menu +-bin_PROGRAMS = bsetroot ++bin_SCRIPTS = fluxbox-generate_menu ++bin_PROGRAMS = + bsetroot_SOURCES = bsetroot.cc bsetroot.hh + bsetroot_LDADD = ../src/BaseDisplay.o ../src/Timer.o ../src/Image.o ../src/i18n.o ../src/FbAtoms.o \ + ../src/Color.o ../src/Texture.o ../src/StringUtil.o + + + MAINTAINERCLEANFILES = Makefile.in +-EXTRA_DIST = bsetbg fluxbox-generate_menu ++EXTRA_DIST = fluxbox-generate_menu + subdir = util + 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 --git a/x11-wm/fluxbox-devel/pkg-plist b/x11-wm/fluxbox-devel/pkg-plist index d61cbb533ec1..d8df8902b82d 100644 --- a/x11-wm/fluxbox-devel/pkg-plist +++ b/x11-wm/fluxbox-devel/pkg-plist @@ -12,6 +12,7 @@ share/fluxbox/nls/et_EE/blackbox.cat share/fluxbox/nls/fr_FR/blackbox.cat share/fluxbox/nls/it_IT/blackbox.cat share/fluxbox/nls/ja_JP/blackbox.cat +share/fluxbox/nls/lv_LV/blackbox.cat share/fluxbox/nls/pt_BR/blackbox.cat share/fluxbox/nls/pt_PT/blackbox.cat share/fluxbox/nls/ru_RU/blackbox.cat @@ -39,12 +40,14 @@ share/fluxbox/styles/Shade share/fluxbox/styles/Spiff share/fluxbox/styles/Twice share/fluxbox/styles/qnx-photon +@unexec rm %D/share/fluxbox/nls/lv @unexec rm %D/share/fluxbox/nls/fr @unexec rm %D/share/fluxbox/nls/es @unexec rm %D/share/fluxbox/nls/en_US @unexec rm %D/share/fluxbox/nls/en @unexec rm %D/share/fluxbox/nls/US_ASCII @unexec rm %D/share/fluxbox/nls/POSIX +@exec ln -s lv_LV %D/share/fluxbox/nls/lv @exec ln -s fr_FR %D/share/fluxbox/nls/fr @exec ln -s es_ES %D/share/fluxbox/nls/es @exec ln -s C %D/share/fluxbox/nls/en_US @@ -54,11 +57,12 @@ share/fluxbox/styles/qnx-photon @dirrm share/fluxbox/styles @dirrm share/fluxbox/nls/tr_TR @dirrm share/fluxbox/nls/sv_SE -@dirrm share/fluxbox/nls/pt_PT @dirrm share/fluxbox/nls/ru_RU +@dirrm share/fluxbox/nls/pt_PT @dirrm share/fluxbox/nls/pt_BR -@dirrm share/fluxbox/nls/it_IT +@dirrm share/fluxbox/nls/lv_LV @dirrm share/fluxbox/nls/ja_JP +@dirrm share/fluxbox/nls/it_IT @dirrm share/fluxbox/nls/fr_FR @dirrm share/fluxbox/nls/et_EE @dirrm share/fluxbox/nls/es_ES diff --git a/x11-wm/fluxbox/Makefile b/x11-wm/fluxbox/Makefile index 8601fd0fce2c..388669a17a49 100644 --- a/x11-wm/fluxbox/Makefile +++ b/x11-wm/fluxbox/Makefile @@ -6,31 +6,20 @@ # PORTNAME= fluxbox -PORTVERSION= 0.1.12 -PORTREVISION= 2 +PORTVERSION= 0.1.13 CATEGORIES= x11-wm MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= ${PORTNAME} -.if defined(WITH_REMEMBER) -PATCH_SITES= http://fluxbox.sourceforge.net/download/patches/ -PATCHFILES= unofficial-fluxbox-0.1.12-remember-patch.bz2 -PATCH_DIST_STRIP= -p1 -.endif - MAINTAINER= hendrik@scholz.net -BUILD_DEPENDS= automake14:${PORTSDIR}/devel/automake14 RUN_DEPENDS= bsetbg:${PORTSDIR}/x11-wm/boxtools USE_X_PREFIX= yes GNU_CONFIGURE= yes USE_GNOMENG= yes WANT_GNOME= yes -CONFIGURE_ENV= AUTOMAKE="${AUTOMAKE}" -.if defined(WITH_REMEMBER) -USE_GMAKE= yes -.endif +CONFIGURE_ARGS= --disable-newwmspec .if defined(WITH_KDE) || defined(PACKAGE_BUILDING) CONFIGURE_ARGS+= --enable-kde .endif @@ -53,9 +42,6 @@ pre-everything:: .if !defined(WITH_XINERAMA) @${ECHO_CMD} "WITH_XINERAMA - Enable Xinerama support" .endif -.if !defined(WITH_REMEMBER) - @${ECHO_CMD} "WITH_REMEMBER - Enable the unofficial remember patch" -.endif .if !defined(WITH_KDE) @${ECHO_CMD} "WITH_KDE - Enable KDE slit support" .endif diff --git a/x11-wm/fluxbox/distinfo b/x11-wm/fluxbox/distinfo index 1c320796cc96..001d0b366ba3 100644 --- a/x11-wm/fluxbox/distinfo +++ b/x11-wm/fluxbox/distinfo @@ -1,2 +1 @@ -MD5 (fluxbox-0.1.12.tar.gz) = f90b191af969b49be3dcf901c36d5e13 -MD5 (unofficial-fluxbox-0.1.12-remember-patch.bz2) = cec040561aba84c1ca18fcfcaba17661 +MD5 (fluxbox-0.1.13.tar.gz) = 1b6eec68ae437f3f7084cc19ed7e1083 diff --git a/x11-wm/fluxbox/files/patch-Makefile.in b/x11-wm/fluxbox/files/patch-Makefile.in deleted file mode 100644 index 7de0322bc6d0..000000000000 --- a/x11-wm/fluxbox/files/patch-Makefile.in +++ /dev/null @@ -1,11 +0,0 @@ ---- Makefile.in.orig Tue Oct 8 23:12:58 2002 -+++ Makefile.in Tue Oct 8 23:13:06 2002 -@@ -95,7 +95,7 @@ - install_sh = @install_sh@ - regex_cmd = @regex_cmd@ - --SUBDIRS = data doc nls src util -+SUBDIRS = data doc nls src util/fbrun - MAINTAINERCLEANFILES = aclocal.m4 config.h.in configure Makefile.in stamp-h.in - subdir = . - ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 diff --git a/x11-wm/fluxbox/files/patch-configure b/x11-wm/fluxbox/files/patch-configure new file mode 100644 index 000000000000..3ff4889a952e --- /dev/null +++ b/x11-wm/fluxbox/files/patch-configure @@ -0,0 +1,37 @@ +--- configure.orig Mon Nov 18 06:03:16 2002 ++++ configure Thu Nov 21 22:33:40 2002 +@@ -5515,11 +5515,10 @@ + if test x$enableval = "xyes"; then + echo "$as_me:$LINENO: result: yes" >&5 + echo "${ECHO_T}yes" >&6 +- ++ NLS="-DNLS" + cat >>confdefs.h <<\_ACEOF + #define NLS 1 + _ACEOF +- + else + echo "$as_me:$LINENO: result: no" >&5 + echo "${ECHO_T}no" >&6 +@@ -5527,12 +5526,10 @@ + else + echo "$as_me:$LINENO: result: yes" >&5 + echo "${ECHO_T}yes" >&6 +- ++ NLS="-DNLS" + cat >>confdefs.h <<\_ACEOF + #define NLS 1 + _ACEOF +- +- + fi; + + echo "$as_me:$LINENO: checking for setlocale in -lxpg4" >&5 +@@ -6901,6 +6898,7 @@ + s,@MULTIBYTE_TRUE@,$MULTIBYTE_TRUE,;t t + s,@MULTIBYTE_FALSE@,$MULTIBYTE_FALSE,;t t + s,@XINERAMA@,$XINERAMA,;t t ++s,@NLS@,$NLS,;t t + CEOF + + _ACEOF diff --git a/x11-wm/fluxbox/files/patch-util::Makefile.in b/x11-wm/fluxbox/files/patch-util::Makefile.in new file mode 100644 index 000000000000..6c345e4ced0d --- /dev/null +++ b/x11-wm/fluxbox/files/patch-util::Makefile.in @@ -0,0 +1,27 @@ +--- util/Makefile.in.orig Mon Nov 18 06:03:43 2002 ++++ util/Makefile.in Thu Nov 21 23:05:33 2002 +@@ -81,20 +81,20 @@ + regex_cmd = @regex_cmd@ + + SUBDIRS = fbrun +-bin_SCRIPTS = bsetbg fluxbox-generate_menu +-bin_PROGRAMS = bsetroot ++bin_SCRIPTS = fluxbox-generate_menu ++bin_PROGRAMS = + bsetroot_SOURCES = bsetroot.cc bsetroot.hh + bsetroot_LDADD = ../src/BaseDisplay.o ../src/Timer.o ../src/Image.o ../src/i18n.o ../src/FbAtoms.o \ + ../src/Color.o ../src/Texture.o ../src/StringUtil.o + + + MAINTAINERCLEANFILES = Makefile.in +-EXTRA_DIST = bsetbg fluxbox-generate_menu ++EXTRA_DIST = fluxbox-generate_menu + subdir = util + 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 --git a/x11-wm/fluxbox/pkg-plist b/x11-wm/fluxbox/pkg-plist index d61cbb533ec1..d8df8902b82d 100644 --- a/x11-wm/fluxbox/pkg-plist +++ b/x11-wm/fluxbox/pkg-plist @@ -12,6 +12,7 @@ share/fluxbox/nls/et_EE/blackbox.cat share/fluxbox/nls/fr_FR/blackbox.cat share/fluxbox/nls/it_IT/blackbox.cat share/fluxbox/nls/ja_JP/blackbox.cat +share/fluxbox/nls/lv_LV/blackbox.cat share/fluxbox/nls/pt_BR/blackbox.cat share/fluxbox/nls/pt_PT/blackbox.cat share/fluxbox/nls/ru_RU/blackbox.cat @@ -39,12 +40,14 @@ share/fluxbox/styles/Shade share/fluxbox/styles/Spiff share/fluxbox/styles/Twice share/fluxbox/styles/qnx-photon +@unexec rm %D/share/fluxbox/nls/lv @unexec rm %D/share/fluxbox/nls/fr @unexec rm %D/share/fluxbox/nls/es @unexec rm %D/share/fluxbox/nls/en_US @unexec rm %D/share/fluxbox/nls/en @unexec rm %D/share/fluxbox/nls/US_ASCII @unexec rm %D/share/fluxbox/nls/POSIX +@exec ln -s lv_LV %D/share/fluxbox/nls/lv @exec ln -s fr_FR %D/share/fluxbox/nls/fr @exec ln -s es_ES %D/share/fluxbox/nls/es @exec ln -s C %D/share/fluxbox/nls/en_US @@ -54,11 +57,12 @@ share/fluxbox/styles/qnx-photon @dirrm share/fluxbox/styles @dirrm share/fluxbox/nls/tr_TR @dirrm share/fluxbox/nls/sv_SE -@dirrm share/fluxbox/nls/pt_PT @dirrm share/fluxbox/nls/ru_RU +@dirrm share/fluxbox/nls/pt_PT @dirrm share/fluxbox/nls/pt_BR -@dirrm share/fluxbox/nls/it_IT +@dirrm share/fluxbox/nls/lv_LV @dirrm share/fluxbox/nls/ja_JP +@dirrm share/fluxbox/nls/it_IT @dirrm share/fluxbox/nls/fr_FR @dirrm share/fluxbox/nls/et_EE @dirrm share/fluxbox/nls/es_ES |