mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2025-01-21 08:42:23 +00:00
Code Issues Releases Activity

Update 2.5.21 --> 2.5.23

Browse Source
This commit is contained in:
Cy Schubert 2007-09-07 16:55:11 +00:00
parent 4736f2ef44
commit 4fb6ed8692
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=199039
5 changed files with 12 additions and 273 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
x11-wm/fvwm2-devel/Makefile
View File

@ -6,8 +6,7 @@
#
PORTNAME= fvwm
PORTVERSION= 2.5.21
PORTREVISION= 1
PORTVERSION= 2.5.23
CATEGORIES= x11-wm
MASTER_SITES= ftp://ftp.fvwm.org/pub/fvwm/version-2/ \
http://www.fvwm.org/generated/icon_download/
@ -53,7 +52,8 @@ CONFIGURE_ARGS+= --disable-iconv
.else
USE_ICONV= yes
CONFIGURE_ARGS+= --with-iconv-library=${LOCALBASE}/lib \
--with-iconv-includes=${LOCALBASE}/include
--with-iconv-includes=${LOCALBASE}/include \
--mandir=${LOCALBASE}/man
.endif
.if defined(WITH_STROKE)

6
x11-wm/fvwm2-devel/distinfo
View File

@ -1,6 +1,6 @@
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-2.5.23.tar.bz2) = c301f9aad1203c26818a6651e3d1afc8
SHA256 (fvwm-2.5.23.tar.bz2) = db2cbb97df9191faf4cedb49e0845bb69782e2291e090331d58aa5268b1f3f3e
SIZE (fvwm-2.5.23.tar.bz2) = 2513623
MD5 (fvwm_icons.tgz) = de6c2822f1f6d43a0e1daddd0c7a8665
SHA256 (fvwm_icons.tgz) = 728eb0c837c58439b86a33e8dd4b3edb385372bc83972a2568e6f9d7ef3442a1
SIZE (fvwm_icons.tgz) = 363406

233
x11-wm/fvwm2-devel/files/patch-configure
View File

@ -1,233 +0,0 @@
--- 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 or --without-pkgconfig-prefix was given.
if test "${with_pkgconfig_prefix+set}" = set; then
@@ -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
- FC_CONFIG=$fc_config_exec_prefix/bin/fontconfig-config
+ FC_CONFIG=$fc_config_exec_prefix/bin/pkg-config
fi
fi
if test x$fc_config_prefix != x ; then
fc_config_args="$fc_config_args --prefix=$fc_config_prefix"
if test x${FC_CONFIG+set} != xset ; then
- FC_CONFIG=$fc_config_prefix/bin/fontconfig-config
+ FC_CONFIG=$fc_config_prefix/bin/pkg-config
fi
fi
-# Extract the first word of "fontconfig-config", so it can be a program name with args.
-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
if test "${ac_cv_path_FC_CONFIG+set}" = set; then
@@ -9888,13 +9888,13 @@
no_fc=yes
fi
else
- FC_CFLAGS=`$FC_CONFIG $fc_config_args --cflags`
- FC_LIBS=`$FC_CONFIG $fc_config_args --libs`
- fc_config_major_version=`$FC_CONFIG $fc_config_args --version | \
+ FC_CFLAGS=`$FC_CONFIG fontconfig $fc_config_args --cflags`
+ FC_LIBS=`$FC_CONFIG fontconfig $fc_config_args --libs`
+ fc_config_major_version=`$FC_CONFIG fontconfig $fc_config_args --modversion |
sed 's/^[^0-9.]*\([0-9]*\)\.\([0-9]*\)\.\([0-9]*\).*$/\1/'`
- fc_config_minor_version=`$FC_CONFIG $fc_config_args --version | \
+ fc_config_minor_version=`$FC_CONFIG fontconfig $fc_config_args --modversion |
sed 's/^[^0-9.]*\([0-9]*\)\.\([0-9]*\)\.\([0-9]*\).*$/\2/'`
- fc_config_micro_version=`$FC_CONFIG $fc_config_args --version | \
+ fc_config_micro_version=`$FC_CONFIG fontconfig $fc_config_args --modversion |
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/'`
@@ -10962,7 +10962,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
ac_check_lib_save_LIBS=$LIBS
-LIBS="-lpng ${png_LIBS} -lz -lm $LIBS"
+LIBS="-L%%LOCALBASE%%/lib -lpng ${png_LIBS} -lz -lm $LIBS"
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
@@ -14349,150 +14349,6 @@
found_gettext=yes
- $UNSET ac_cv_header_intl_h
- $UNSET ac_cv_func_gettext
- $UNSET ac_cv_func_bindtextdomain
- $UNSET ac_cv_func_textdomain
- $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
-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
-else
- # Is the header compilable?
-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
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-$ac_includes_default
-#include <libintl.h>
-_ACEOF
-rm -f conftest.$ac_objext
-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); } &&
- { 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
-fi
-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
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-#include <libintl.h>
-_ACEOF
-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; 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
-sed 's/^/| /' conftest.$ac_ext >&5
-
- 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
-
-# So? What about this header?
-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
- yes:no: )
- { echo "$as_me:$LINENO: WARNING: libintl.h: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: libintl.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
- { echo "$as_me:$LINENO: WARNING: libintl.h: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: libintl.h: proceeding with the compiler's result" >&2;}
- ac_header_preproc=yes
- ;;
- no:yes:* )
- { echo "$as_me:$LINENO: WARNING: libintl.h: present but cannot be compiled" >&5
-echo "$as_me: WARNING: libintl.h: present but cannot be compiled" >&2;}
- { echo "$as_me:$LINENO: WARNING: libintl.h: check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: libintl.h: check for missing prerequisite headers?" >&2;}
- { echo "$as_me:$LINENO: WARNING: libintl.h: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: libintl.h: see the Autoconf documentation" >&2;}
- { echo "$as_me:$LINENO: WARNING: libintl.h: section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: libintl.h: section \"Present But Cannot Be Compiled\"" >&2;}
- { echo "$as_me:$LINENO: WARNING: libintl.h: proceeding with the preprocessor's result" >&5
-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
-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
-
-fi
-if test $ac_cv_header_libintl_h = yes; then
@@ -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
@@ -15210,10 +15066,8 @@
else
with_gettext="no"
problem_gettext=": Failed to detected GNU gettext"
+ USE_NLS=no
fi
-else
- USE_NLS=no
-fi
# libs and buil

15
x11-wm/fvwm2-devel/files/patch-fvwm::Makefile.in
View File

@ -1,15 +0,0 @@
--- fvwm/Makefile.in.orig Mon Dec 2 05:08:41 2002
+++ fvwm/Makefile.in Tue Dec 17 11:31:56 2002
@@ -645,9 +645,9 @@
echo "Minor warning: $(bindir)/fvwm2 symlink was not created"
install-data-local:
- @rm -f $(DESTDIR)$(mandir)/man1/fvwm2.1
- @$(LN_S) fvwm.1 $(DESTDIR)$(mandir)/man1/fvwm2.1 || \
- echo "Minor warning: $(mandir)/man1/fvwm2.1 symlink was not created"
+ @rm -f $(DESTDIR)$(mandir)/man1/fvwm2.1.gz
+ @$(LN_S) fvwm.1.gz $(DESTDIR)$(mandir)/man1/fvwm2.1.gz || \
+ echo "Minor warning: $(mandir)/man1/fvwm2.1.gz symlink was not created"
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:

25
x11-wm/fvwm2-devel/pkg-plist
View File

@ -56,7 +56,6 @@ libexec/fvwm/%%FVWM_VERSION%%/FvwmWharf
libexec/fvwm/%%FVWM_VERSION%%/FvwmWinList
libexec/fvwm/%%FVWM_VERSION%%/FvwmWindowMenu
@comment The following are here because they are symlinks
man/man1/fvwm2.1.gz
man/man1/xpmroot.1.gz
@comment End of symlink list
%%ICONS%%%%DATADIR%%/pixmaps/Jlock.xpm
@ -381,7 +380,6 @@ man/man1/xpmroot.1.gz
%%DATADIR%%/ConfigFvwmIconBox
%%DATADIR%%/ConfigFvwmIconMan
%%DATADIR%%/ConfigFvwmIdent
%%DATADIR%%/ConfigFvwmMenuDefaults
%%DATADIR%%/ConfigFvwmPager
%%DATADIR%%/ConfigFvwmProxyDefaults
%%DATADIR%%/ConfigFvwmTabs
@ -435,23 +433,6 @@ man/man1/xpmroot.1.gz
%%DATADIR%%/perllib/FVWM/Tracker/WindowList.pm
%%DATADIR%%/perllib/General/FileSystem.pm
%%DATADIR%%/perllib/General/Parse.pm
%%NLS%%share/locale/ar/LC_MESSAGES/fvwm.mo
%%NLS%%share/locale/ar/LC_MESSAGES/FvwmTaskBar.mo
%%NLS%%share/locale/ar/LC_MESSAGES/FvwmScript.mo
%%NLS%%share/locale/de/LC_MESSAGES/fvwm.mo
%%NLS%%share/locale/de/LC_MESSAGES/FvwmTaskBar.mo
%%NLS%%share/locale/de/LC_MESSAGES/FvwmScript.mo
%%NLS%%share/locale/fr/LC_MESSAGES/fvwm.mo
%%NLS%%share/locale/fr/LC_MESSAGES/FvwmTaskBar.mo
%%NLS%%share/locale/fr/LC_MESSAGES/FvwmScript.mo
%%NLS%%share/locale/zh_CN/LC_MESSAGES/fvwm.mo
%%NLS%%share/locale/zh_CN/LC_MESSAGES/FvwmTaskBar.mo
%%NLS%%share/locale/zh_CN/LC_MESSAGES/FvwmScript.mo
%%NLS%%share/locale/sv_SE/LC_MESSAGES/fvwm.mo
%%NLS%%share/locale/sv_SE/LC_MESSAGES/FvwmTaskBar.mo
%%NLS%%share/locale/sv_SE/LC_MESSAGES/FvwmScript.mo
@dirrmtry %%NLS%%share/locale/sv_SE/LC_MESSAGES
@dirrmtry %%NLS%%share/locale/sv_SE
@dirrm %%DATADIR%%/perllib/General
@dirrm %%DATADIR%%/perllib/FVWM/Tracker
@dirrm %%DATADIR%%/perllib/FVWM/Module
@ -459,5 +440,11 @@ man/man1/xpmroot.1.gz
@dirrm %%DATADIR%%/perllib
%%ICONS%%@dirrm %%DATADIR%%/pixmaps
@dirrm %%DATADIR%%
@dirrm %%DOCSDIR%%/commands
@dirrm %%DOCSDIR%%/fvwm
@dirrm %%DOCSDIR%%/images/svg_rendering
@dirrm %%DOCSDIR%%/images
@dirrm %%DOCSDIR%%/modules
@dirrm %%DOCSDIR%%
@dirrm libexec/fvwm/%%FVWM_VERSION%%
@dirrm libexec/fvwm