diff options
author | cy <cy@FreeBSD.org> | 2007-01-22 01:04:18 +0800 |
---|---|---|
committer | cy <cy@FreeBSD.org> | 2007-01-22 01:04:18 +0800 |
commit | 036b0e03b0de76d11727455cc19451c7814c6d11 (patch) | |
tree | eb55f76b77c87cabe1e412a5363bbc921a075270 /x11-wm/fvwm2-devel | |
parent | 817caf8c6092268bb75a384ebff7d8a276b31c6d (diff) | |
download | freebsd-ports-gnome-036b0e03b0de76d11727455cc19451c7814c6d11.tar.gz freebsd-ports-gnome-036b0e03b0de76d11727455cc19451c7814c6d11.tar.zst freebsd-ports-gnome-036b0e03b0de76d11727455cc19451c7814c6d11.zip |
Update 2.5.20 --> 2.5.21
* New features:
- The command Scroll can now be used for interactive scrolling.
* Bug Fixes:
- Fixed Tile...Placement styles (SmartPlacement) that were
broken in 2.5.20.
Diffstat (limited to 'x11-wm/fvwm2-devel')
-rw-r--r-- | x11-wm/fvwm2-devel/Makefile | 5 | ||||
-rw-r--r-- | x11-wm/fvwm2-devel/distinfo | 6 | ||||
-rw-r--r-- | x11-wm/fvwm2-devel/files/patch-configure | 135 | ||||
-rw-r--r-- | x11-wm/fvwm2-devel/pkg-plist | 1 |
4 files changed, 76 insertions, 71 deletions
diff --git a/x11-wm/fvwm2-devel/Makefile b/x11-wm/fvwm2-devel/Makefile index 29e07a4f4c8c..19a1242c06d5 100644 --- a/x11-wm/fvwm2-devel/Makefile +++ b/x11-wm/fvwm2-devel/Makefile @@ -6,7 +6,7 @@ # PORTNAME= fvwm -PORTVERSION= 2.5.20 +PORTVERSION= 2.5.21 CATEGORIES= x11-wm MASTER_SITES= ftp://ftp.fvwm.org/pub/fvwm/version-2/ \ http://www.fvwm.org/generated/icon_download/ @@ -24,7 +24,8 @@ CONFLICTS?= fvwm-1.* fvwm-2.4.* NO_LATEST_LINK= yes GNU_CONFIGURE= yes CONFIGURE_ENV= X_CFLAGS=-I${LOCALBASE}/include -CONFIGURE_ARGS= --mandir=${PREFIX}/man +CONFIGURE_ARGS= --mandir=${PREFIX}/man \ + --with-png-library=${LOCALBASE}/lib USE_GMAKE= yes USE_XPM= yes USE_BZIP2= yes diff --git a/x11-wm/fvwm2-devel/distinfo b/x11-wm/fvwm2-devel/distinfo index 8716a0786324..69f7e24884f3 100644 --- a/x11-wm/fvwm2-devel/distinfo +++ b/x11-wm/fvwm2-devel/distinfo @@ -1,6 +1,6 @@ -MD5 (fvwm-2.5.20.tar.bz2) = 29da5b8de71ec8748dbdc4b70fd47e7f -SHA256 (fvwm-2.5.20.tar.bz2) = 94c96b3f5fb061243f8f415a2111c5893e3fa49db27f0bdb90ab0584e0725e4a -SIZE (fvwm-2.5.20.tar.bz2) = 1995268 +MD5 (fvwm-2.5.21.tar.bz2) = c11efef91420e686d54f772e7162e879 +SHA256 (fvwm-2.5.21.tar.bz2) = 5549a3ad693f9ab523653738e493e95418626a6d2fd52465ce200ae4116b8800 +SIZE (fvwm-2.5.21.tar.bz2) = 2062532 MD5 (fvwm_icons.tgz) = de6c2822f1f6d43a0e1daddd0c7a8665 SHA256 (fvwm_icons.tgz) = 728eb0c837c58439b86a33e8dd4b3edb385372bc83972a2568e6f9d7ef3442a1 SIZE (fvwm_icons.tgz) = 363406 diff --git a/x11-wm/fvwm2-devel/files/patch-configure b/x11-wm/fvwm2-devel/files/patch-configure index 1caf878a9305..bc265a99fe24 100644 --- a/x11-wm/fvwm2-devel/files/patch-configure +++ b/x11-wm/fvwm2-devel/files/patch-configure @@ -1,15 +1,15 @@ ---- configure.orig Mon Jan 15 07:18:42 2007 -+++ configure Wed Jan 17 00:15:36 2007 -@@ -9212,7 +9212,7 @@ +--- configure.orig Sat Jan 20 03:37:24 2007 ++++ configure Sun Jan 21 08:41:20 2007 +@@ -8702,7 +8702,7 @@ # *** pkg-config # unfortunately, we need pkg-config for the detection of certain libs: -# - certain version of fontconfig (without fontconfig-config +# - certain version of fontconfig (without pkg-config - # Check whether --with-pkgconfig-prefix was given. + # Check whether --with-pkgconfig-prefix or --without-pkgconfig-prefix was given. if test "${with_pkgconfig_prefix+set}" = set; then -@@ -10309,17 +10309,17 @@ +@@ -9814,17 +9814,17 @@ if test x$fc_config_exec_prefix != x ; then fc_config_args="$fc_config_args --exec-prefix=$fc_config_exec_prefix" if test x${FC_CONFIG+set} != xset ; then @@ -28,10 +28,10 @@ -set dummy fontconfig-config; ac_word=$2 +# Extract the first word of "pkg-config", so it can be a program name with args. +set dummy pkg-config; ac_word=$2 - { echo "$as_me:$LINENO: checking for $ac_word" >&5 - echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } + echo "$as_me:$LINENO: checking for $ac_word" >&5 + echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 if test "${ac_cv_path_FC_CONFIG+set}" = set; then -@@ -10384,13 +10384,13 @@ +@@ -9888,13 +9888,13 @@ no_fc=yes fi else @@ -50,7 +50,7 @@ sed 's/^[^0-9.]*\([0-9]*\)\.\([0-9]*\)\.\([0-9]*\).*$/\3/'` fc_min_major_version=`echo $min_fc_version | \ sed 's/^[^0-9.]*\([0-9]*\)\.\([0-9]*\)\.\([0-9]*\).*$/\1/'` -@@ -11470,7 +11470,7 @@ +@@ -10962,7 +10962,7 @@ echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_check_lib_save_LIBS=$LIBS @@ -59,16 +59,7 @@ cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF -@@ -11794,7 +11794,7 @@ - #define HAVE_PNG 1 - _ACEOF - -- png_LIBS="-lpng -lz" -+ png_LIBS="-L%%LOCALBASE%%/lib -lpng -lz" - problem_png="" - else - with_png=no -@@ -14803,138 +14803,6 @@ +@@ -14349,150 +14349,6 @@ found_gettext=yes @@ -79,17 +70,17 @@ - $UNSET ac_cv_func_dgettext - #bind_textdomain_codeset - if test "${ac_cv_header_libintl_h+set}" = set; then -- { echo "$as_me:$LINENO: checking for libintl.h" >&5 --echo $ECHO_N "checking for libintl.h... $ECHO_C" >&6; } +- echo "$as_me:$LINENO: checking for libintl.h" >&5 +-echo $ECHO_N "checking for libintl.h... $ECHO_C" >&6 -if test "${ac_cv_header_libintl_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -fi --{ echo "$as_me:$LINENO: result: $ac_cv_header_libintl_h" >&5 --echo "${ECHO_T}$ac_cv_header_libintl_h" >&6; } +-echo "$as_me:$LINENO: result: $ac_cv_header_libintl_h" >&5 +-echo "${ECHO_T}$ac_cv_header_libintl_h" >&6 -else - # Is the header compilable? --{ echo "$as_me:$LINENO: checking libintl.h usability" >&5 --echo $ECHO_N "checking libintl.h usability... $ECHO_C" >&6; } +-echo "$as_me:$LINENO: checking libintl.h usability" >&5 +-echo $ECHO_N "checking libintl.h usability... $ECHO_C" >&6 -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF @@ -100,37 +91,41 @@ -#include <libintl.h> -_ACEOF -rm -f conftest.$ac_objext --if { (ac_try="$ac_compile" --case "(($ac_try" in -- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -- *) ac_try_echo=$ac_try;; --esac --eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -- (eval "$ac_compile") 2>conftest.er1 +-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +- (eval $ac_compile) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && { -- test -z "$ac_c_werror_flag" || -- test ! -s conftest.err -- } && test -s conftest.$ac_objext; then +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then - ac_header_compiler=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -- ac_header_compiler=no +-ac_header_compiler=no -fi -- --rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext --{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 --echo "${ECHO_T}$ac_header_compiler" >&6; } +-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext +-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +-echo "${ECHO_T}$ac_header_compiler" >&6 - -# Is the header present? --{ echo "$as_me:$LINENO: checking libintl.h presence" >&5 --echo $ECHO_N "checking libintl.h presence... $ECHO_C" >&6; } +-echo "$as_me:$LINENO: checking libintl.h presence" >&5 +-echo $ECHO_N "checking libintl.h presence... $ECHO_C" >&6 -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF @@ -139,22 +134,24 @@ -/* end confdefs.h. */ -#include <libintl.h> -_ACEOF --if { (ac_try="$ac_cpp conftest.$ac_ext" --case "(($ac_try" in -- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -- *) ac_try_echo=$ac_try;; --esac --eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 -- (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1 +-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 +- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } >/dev/null && { -- test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || -- test ! -s conftest.err -- }; then +- (exit $ac_status); } >/dev/null; then +- if test -s conftest.err; then +- ac_cpp_err=$ac_c_preproc_warn_flag +- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag +- else +- ac_cpp_err= +- fi +-else +- ac_cpp_err=yes +-fi +-if test -z "$ac_cpp_err"; then - ac_header_preproc=yes -else - echo "$as_me: failed program was:" >&5 @@ -162,10 +159,9 @@ - - ac_header_preproc=no -fi -- -rm -f conftest.err conftest.$ac_ext --{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 --echo "${ECHO_T}$ac_header_preproc" >&6; } +-echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +-echo "${ECHO_T}$ac_header_preproc" >&6 - -# So? What about this header? -case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in @@ -189,34 +185,41 @@ -echo "$as_me: WARNING: libintl.h: proceeding with the preprocessor's result" >&2;} - { echo "$as_me:$LINENO: WARNING: libintl.h: in the future, the compiler will take precedence" >&5 -echo "$as_me: WARNING: libintl.h: in the future, the compiler will take precedence" >&2;} -- +- ( +- cat <<\_ASBOX +-## ------------------------------------------ ## +-## Report this to the AC_PACKAGE_NAME lists. ## +-## ------------------------------------------ ## +-_ASBOX +- ) | +- sed "s/^/$as_me: WARNING: /" >&2 - ;; -esac --{ echo "$as_me:$LINENO: checking for libintl.h" >&5 --echo $ECHO_N "checking for libintl.h... $ECHO_C" >&6; } +-echo "$as_me:$LINENO: checking for libintl.h" >&5 +-echo $ECHO_N "checking for libintl.h... $ECHO_C" >&6 -if test "${ac_cv_header_libintl_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_cv_header_libintl_h=$ac_header_preproc -fi --{ echo "$as_me:$LINENO: result: $ac_cv_header_libintl_h" >&5 --echo "${ECHO_T}$ac_cv_header_libintl_h" >&6; } +-echo "$as_me:$LINENO: result: $ac_cv_header_libintl_h" >&5 +-echo "${ECHO_T}$ac_cv_header_libintl_h" >&6 - -fi -if test $ac_cv_header_libintl_h = yes; then -@@ -15544,7 +15412,7 @@ +@@ -15132,7 +14988,7 @@ fi if test "$no_dgettext" != "yes"; then - CFLAGS="$CFLAGS $intl_LIBS $iconv_LIBS" + CFLAGS="$CFLAGS $intl_CFLAGS $iconv_CFLAGS" LIBS="$LIBS $intl_LIBS $iconv_LIBS" - { echo "$as_me:$LINENO: checking if a simple gettext program link" >&5 - echo $ECHO_N "checking if a simple gettext program link... $ECHO_C" >&6; } -@@ -15619,10 +15487,8 @@ + echo "$as_me:$LINENO: checking if a simple gettext program link" >&5 + echo $ECHO_N "checking if a simple gettext program link... $ECHO_C" >&6 +@@ -15210,10 +15066,8 @@ else with_gettext="no" problem_gettext=": Failed to detected GNU gettext" diff --git a/x11-wm/fvwm2-devel/pkg-plist b/x11-wm/fvwm2-devel/pkg-plist index 8debdd852e28..b6a3c3c6cb90 100644 --- a/x11-wm/fvwm2-devel/pkg-plist +++ b/x11-wm/fvwm2-devel/pkg-plist @@ -381,6 +381,7 @@ man/man1/xpmroot.1.gz %%DATADIR%%/ConfigFvwmIconBox %%DATADIR%%/ConfigFvwmIconMan %%DATADIR%%/ConfigFvwmIdent +%%DATADIR%%/ConfigFvwmMenuDefaults %%DATADIR%%/ConfigFvwmPager %%DATADIR%%/ConfigFvwmProxyDefaults %%DATADIR%%/ConfigFvwmTabs |