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

Update to version 3.8.18

Browse Source 
From MAINTAINER: Jim Geovedi <jim@corebsd.or.id>

brad@ ok
This commit is contained in:
margarida 2002-11-28 20:35:43 +00:00
parent b866080233
commit 943b81fa52
12 changed files with 85 additions and 141 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
x11/xfce/Makefile
View File

@ -1,8 +1,8 @@
# $OpenBSD: Makefile,v 1.18 2002/08/26 02:30:24 pvalchev Exp $
# $OpenBSD: Makefile,v 1.19 2002/11/28 20:35:43 margarida Exp $
COMMENT= "CDE like desktop with Gtk"
DISTNAME= xfce-3.8.16
DISTNAME= xfce-3.8.18
CATEGORIES= x11
MAINTAINER= Jim Geovedi <jim@corebsd.or.id>
HOMEPAGE= http://www.xfce.org/
@ -23,6 +23,7 @@ RUN_DEPENDS= ::audio/sox
USE_X11= Yes
CONFIGURE_STYLE= autoconf
AUTOCONF_NEW= Yes
CONFIGURE_ARGS= --disable-arts \
--enable-audiofile="${LOCALBASE}" \
--enable-gdk-pixbuf="${LOCALBASE}" \
@ -33,6 +34,9 @@ CONFIGURE_ARGS= --disable-arts \
--with-libiconv-prefix="${LOCALBASE}" \
--with-locale-dir="${PREFIX}/share/locale" \
--with-xpm="${X11BASE}" \
--enable-xft=yes
--enable-xft=yes \
--enable-taskbar
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
.include <bsd.port.mk>

6
x11/xfce/distinfo
View File

@ -1,3 +1,3 @@
MD5 (xfce-3.8.16.tar.gz) = e73dba58bb04eb1facc682b308a422b3
RMD160 (xfce-3.8.16.tar.gz) = 76c4c9bc1085b5cc8985ee52f90190b5da61b409
SHA1 (xfce-3.8.16.tar.gz) = 48bc15d64754ea7fb8664731b38d1ff06c971def
MD5 (xfce-3.8.18.tar.gz) = 04c197eee32d712a49170539d50279ea
RMD160 (xfce-3.8.18.tar.gz) = 5060b285e6f9bc1bfdda54d314d0c92832264268
SHA1 (xfce-3.8.18.tar.gz) = d4ab39c4ddeb68d2cc1ceb03af14b0e95b8f5c61

91
x11/xfce/patches/patch-aclocal_m4
View File

@ -1,81 +1,16 @@
$OpenBSD: patch-aclocal_m4,v 1.2 2002/03/30 01:27:41 brad Exp $
--- aclocal.m4.orig Sun Jan 20 14:16:51 2002
+++ aclocal.m4 Fri Mar 29 19:39:46 2002
@@ -971,7 +971,14 @@ old_postuninstall_cmds=
$OpenBSD: patch-aclocal_m4,v 1.3 2002/11/28 20:35:43 margarida Exp $
XXX: A dirty hack of AUTOCONF_NEW, should not be needed when espie@
upgrading autoconf-new to 2.54 in the ports tree. -- jim
--- aclocal.m4.orig Sun Nov 24 21:36:45 2002
+++ aclocal.m4 Sun Nov 24 21:36:53 2002
@@ -70,7 +70,7 @@ AU_DEFUN([AM_CONFIG_HEADER], [AC_CONFIG_
# CC etc. in the Makefile, will ask for an AC_PROG_CC use...
if test -n "$RANLIB"; then
old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"
- old_postinstall_cmds="\$RANLIB \$oldlib~$old_postinstall_cmds"
+ case "$host_os" in
+ openbsd*)
+ old_postinstall_cmds="\$RANLIB -t \$oldlib~$old_postinstall_cmds"
+ ;;
+ *)
+ old_postinstall_cmds="\$RANLIB \$oldlib~$old_postinstall_cmds"
+ ;;
+ esac
fi
# Allow CC to be a program name with arguments.
@@ -1374,7 +1381,9 @@ cygwin* | mingw* | pw32* )
with_gnu_ld=no
fi
;;
-
+openbsd*)
+ with_gnu_ld=no
+ ;;
esac
-AC_PREREQ([2.54])
+AC_PREREQ([2.52])
ld_shlibs=yes
@@ -1778,10 +1787,21 @@ else
;;
openbsd*)
- archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
- hardcode_libdir_flag_spec='-R$libdir'
hardcode_direct=yes
hardcode_shlibpath_var=no
+ case "$host_os" in
+ openbsd[[01]].* | openbsd2.[[0-7]] | openbsd2.[[0-7]].*)
+ archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
+ hardcode_libdir_flag_spec='-R$libdir'
+ ;;
+ *)
+ archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+ hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
+ if test "`echo __ELF__ | $CC -E - | grep __ELF__`" = "" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+ export_dynamic_flag_spec='${wl}-E'
+ fi
+ ;;
+ esac
;;
os2*)
@@ -2255,9 +2275,23 @@ newsos6)
openbsd*)
version_type=sunos
- if test "$with_gnu_ld" = yes; then
- need_lib_prefix=no
- need_version=no
+ need_lib_prefix=no
+ need_version=no
+ file_magic_cmd=/usr/bin/file
+ file_magic_test_file=`echo /usr/lib/libc.so.*`
+ if test "`echo __ELF__ | $CC -E - | grep __ELF__`" = "" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+ deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [LM]SB shared object'
+ case "$host_os" in
+ openbsd2.[89] | openbsd2.[89].*)
+ shlibpath_overrides_runpath=no
+ ;;
+ *)
+ shlibpath_overrides_runpath=yes
+ ;;
+ esac
+ else
+ deplibs_check_method='file_magic OpenBSD.* shared library'
+ shlibpath_overrides_runpath=yes
fi
library_names_spec='${libname}${release}.so$versuffix ${libname}.so$versuffix'
finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
# Autoconf 2.50 wants to disallow AM_ names. We explicitly allow
# the ones we care about.

6
x11/xfce/patches/patch-configure_in
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-configure_in,v 1.2 2002/08/26 02:30:24 pvalchev Exp $
--- configure.in.orig Tue Apr 16 03:48:18 2002
+++ configure.in Thu Aug 22 02:16:05 2002
$OpenBSD: patch-configure_in,v 1.3 2002/11/28 20:35:43 margarida Exp $
--- configure.in.orig Sat Jul 6 03:40:52 2002
+++ configure.in Tue Nov 12 15:39:46 2002
@@ -71,7 +71,7 @@ AC_LINK_FILES($nls_cv_header_libgt, $nls
AC_CHECK_HEADERS(ctype.h)
AC_CHECK_HEADERS(unistd.h string.h getopt.h)

18
x11/xfce/patches/patch-ltmain_sh
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-ltmain_sh,v 1.1 2002/03/24 01:20:39 brad Exp $
--- ltmain.sh.orig Sun Dec 9 17:51:24 2001
+++ ltmain.sh Sat Mar 23 20:11:55 2002
@@ -1021,15 +1021,18 @@ compiler."
$OpenBSD: patch-ltmain_sh,v 1.2 2002/11/28 20:35:43 margarida Exp $
--- ltmain.sh.orig Mon Jun 10 03:25:37 2002
+++ ltmain.sh Tue Nov 12 15:39:53 2002
@@ -1044,15 +1044,18 @@ compiler."
;;
-l*)
@ -25,9 +25,9 @@ $OpenBSD: patch-ltmain_sh,v 1.1 2002/03/24 01:20:39 brad Exp $
+ # Do not include libc_r directly, use -pthread flag.
+ continue
;;
esac
fi
@@ -1037,6 +1040,17 @@ compiler."
*-*-openbsd*)
# Do not include libc due to us having libc/libc_r.
@@ -1071,6 +1074,17 @@ compiler."
continue
;;
@ -45,7 +45,7 @@ $OpenBSD: patch-ltmain_sh,v 1.1 2002/03/24 01:20:39 brad Exp $
-module)
module=yes
continue
@@ -2405,6 +2419,9 @@ compiler."
@@ -2468,6 +2482,9 @@ compiler."
# Rhapsody C library is in the System framework
deplibs="$deplibs -framework System"
;;
@ -55,7 +55,7 @@ $OpenBSD: patch-ltmain_sh,v 1.1 2002/03/24 01:20:39 brad Exp $
*-*-netbsd*)
# Don't link with libc until the a.out ld.so is fixed.
;;
@@ -4412,40 +4429,6 @@ relink_command=\"$relink_command\""
@@ -4498,40 +4515,6 @@ relink_command=\"$relink_command\""
# Exit here if they wanted silent mode.
test "$show" = ":" && exit 0

10
x11/xfce/patches/patch-other_xinitrc_in
View File

@ -1,12 +1,12 @@
$OpenBSD: patch-other_xinitrc_in,v 1.2 2002/08/26 02:30:24 pvalchev Exp $
--- other/xinitrc.in.orig Wed Mar 20 16:26:18 2002
+++ other/xinitrc.in Thu Aug 22 02:16:38 2002
$OpenBSD: patch-other_xinitrc_in,v 1.3 2002/11/28 20:35:43 margarida Exp $
--- other/xinitrc.in.orig Mon Nov 25 00:14:37 2002
+++ other/xinitrc.in Mon Nov 25 00:15:01 2002
@@ -41,7 +41,7 @@ fi
# fi
# Launch xscreensaver (if available)
-xscreensaver -no-splash -lock-mode &
+# xscreensaver -no-splash -lock-mode &
-xscreensaver -no-splash &
+#xscreensaver -no-splash &
# Finally, launch XFce window manager
exec xfwm

6
x11/xfce/patches/patch-scripts_xflock
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-scripts_xflock,v 1.1 2002/03/24 01:20:39 brad Exp $
--- scripts/xflock.orig Thu Jul 12 17:45:22 2001
+++ scripts/xflock Sat Mar 23 20:11:56 2002
$OpenBSD: patch-scripts_xflock,v 1.2 2002/11/28 20:35:43 margarida Exp $
--- scripts/xflock.orig Fri Jul 13 04:45:22 2001
+++ scripts/xflock Tue Nov 12 15:40:13 2002
@@ -19,5 +19,5 @@
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#

10
x11/xfce/patches/patch-xfce_theme_Makefile_in
View File

@ -1,12 +1,12 @@
$OpenBSD: patch-xfce_theme_Makefile_in,v 1.1 2002/03/30 01:27:41 brad Exp $
--- xfce_theme/Makefile.in.orig Thu Mar 28 13:55:37 2002
+++ xfce_theme/Makefile.in Thu Mar 28 13:55:45 2002
@@ -141,7 +141,7 @@ libxfce_la_SOURCES = \
$OpenBSD: patch-xfce_theme_Makefile_in,v 1.2 2002/11/28 20:35:43 margarida Exp $
--- xfce_theme/Makefile.in.orig Sun Nov 10 20:51:45 2002
+++ xfce_theme/Makefile.in Tue Nov 12 15:40:23 2002
@@ -187,7 +187,7 @@ libxfce_la_SOURCES = \
xfce_theme_main.c
-libxfce_la_LDFLAGS = -module -avoid-version
+libxfce_la_LDFLAGS = -avoid-version
libxfce_la_LIBADD = $(GTK_LIBS)
subdir = xfce_theme
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
CONFIG_HEADER = ../config.h

8
x11/xfce/patches/patch-xfsound_Makefile_in
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-xfsound_Makefile_in,v 1.2 2002/03/24 01:20:39 brad Exp $
--- xfsound/Makefile.in.orig Sun Jan 20 14:16:57 2002
+++ xfsound/Makefile.in Sat Mar 23 20:11:56 2002
@@ -152,7 +152,7 @@ xfsound_SOURCES = \
$OpenBSD: patch-xfsound_Makefile_in,v 1.3 2002/11/28 20:35:43 margarida Exp $
--- xfsound/Makefile.in.orig Sun Nov 10 20:51:49 2002
+++ xfsound/Makefile.in Tue Nov 12 15:40:33 2002
@@ -200,7 +200,7 @@ xfsound_SOURCES = \
xfsound_LDADD = ../libs/libxfcecore.la ../libs/libxfwmcore.la \
@DMALLOC_LIB@ @GTK_LIBS@ @GDK_IMLIB_LIBS@ @GDK_PIXBUF_LIBS@ \
@AUDIOFILE_LIBS@ @ARTS_LIBS@ @INTLLIBS@ @LIBS@ ../libs/libxfwmcore.la \

6
x11/xfce/patches/patch-xfsound_xfdsp_c
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-xfsound_xfdsp_c,v 1.2 2002/03/24 01:20:39 brad Exp $
--- xfsound/xfdsp.c.orig Wed Nov 21 01:36:39 2001
+++ xfsound/xfdsp.c Sat Mar 23 20:11:56 2002
$OpenBSD: patch-xfsound_xfdsp_c,v 1.3 2002/11/28 20:35:43 margarida Exp $
--- xfsound/xfdsp.c.orig Wed Nov 21 13:36:39 2001
+++ xfsound/xfdsp.c Tue Nov 12 15:40:40 2002
@@ -66,6 +66,9 @@
#if defined(HAVE_ARTS)
#include <artsc.h>

4
x11/xfce/patches/patch-xfsound_xfdsp_h
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-xfsound_xfdsp_h,v 1.2 2002/08/26 02:30:24 pvalchev Exp $
$OpenBSD: patch-xfsound_xfdsp_h,v 1.3 2002/11/28 20:35:43 margarida Exp $
--- xfsound/xfdsp.h.orig Mon Mar 25 15:59:16 2002
+++ xfsound/xfdsp.h Thu Aug 22 02:20:53 2002
+++ xfsound/xfdsp.h Tue Nov 12 15:40:48 2002
@@ -22,7 +22,13 @@
#define XF_IND 1

51
x11/xfce/pkg/PLIST
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.8 2002/08/26 02:30:24 pvalchev Exp $
@comment $OpenBSD: PLIST,v 1.9 2002/11/28 20:35:43 margarida Exp $
bin/CDE2Xfcepal
bin/glob
bin/startxfce
@ -35,6 +35,7 @@ lib/gtk/themes/engines/libxfce.la
lib/xfce/Xclients
lib/xfce/fvwm2rc
lib/xfce/fvwmrc
lib/xfce/taskbarrc
lib/xfce/xfbdrc
lib/xfce/xfce3rc
lib/xfce/xfce3rc.cs
@ -87,6 +88,7 @@ share/locale/et/LC_MESSAGES/xfce.mo
share/locale/fi/LC_MESSAGES/xfce.mo
share/locale/fr/LC_MESSAGES/xfce.mo
share/locale/gl/LC_MESSAGES/xfce.mo
share/locale/he/LC_MESSAGES/xfce.mo
share/locale/hu/LC_MESSAGES/xfce.mo
share/locale/it/LC_MESSAGES/xfce.mo
share/locale/ja/LC_MESSAGES/xfce.mo
@ -287,27 +289,6 @@ share/xfce/help/html/copyright.html
share/xfce/help/html/fileman.html
share/xfce/help/html/gpl.html
share/xfce/help/html/help.html
share/xfce/help/html/images/buttons.jpg
share/xfce/help/html/images/xfbd.jpg
share/xfce/help/html/images/xfbdmgr.jpg
share/xfce/help/html/images/xfce_panel.jpg
share/xfce/help/html/images/xfce_popup.jpg
share/xfce/help/html/images/xfce_setup1.jpg
share/xfce/help/html/images/xfce_setup2.jpg
share/xfce/help/html/images/xfce_setup3.jpg
share/xfce/help/html/images/xfce_setup4.jpg
share/xfce/help/html/images/xfce_slogan.jpg
share/xfce/help/html/images/xfce_snap.jpg
share/xfce/help/html/images/xfclock.jpg
share/xfce/help/html/images/xfdiff.jpg
share/xfce/help/html/images/xfglob.jpg
share/xfce/help/html/images/xfmouse.jpg
share/xfce/help/html/images/xfpager.jpg
share/xfce/help/html/images/xfrun.jpg
share/xfce/help/html/images/xfsamba.jpg
share/xfce/help/html/images/xfsound.jpg
share/xfce/help/html/images/xftree.jpg
share/xfce/help/html/images/xfumed.jpg
share/xfce/help/html/install.html
share/xfce/help/html/intro.html
share/xfce/help/html/license.html
@ -347,6 +328,27 @@ share/xfce/help/html/utils-xfsound.html
share/xfce/help/html/utils-xfumed.html
share/xfce/help/html/wm-examples-2.html
share/xfce/help/html/wm.html
share/xfce/help/images/buttons.jpg
share/xfce/help/images/xfbd.jpg
share/xfce/help/images/xfbdmgr.jpg
share/xfce/help/images/xfce_panel.jpg
share/xfce/help/images/xfce_popup.jpg
share/xfce/help/images/xfce_setup1.jpg
share/xfce/help/images/xfce_setup2.jpg
share/xfce/help/images/xfce_setup3.jpg
share/xfce/help/images/xfce_setup4.jpg
share/xfce/help/images/xfce_slogan.jpg
share/xfce/help/images/xfce_snap.jpg
share/xfce/help/images/xfclock.jpg
share/xfce/help/images/xfdiff.jpg
share/xfce/help/images/xfglob.jpg
share/xfce/help/images/xfmouse.jpg
share/xfce/help/images/xfpager.jpg
share/xfce/help/images/xfrun.jpg
share/xfce/help/images/xfsamba.jpg
share/xfce/help/images/xfsound.jpg
share/xfce/help/images/xftree.jpg
share/xfce/help/images/xfumed.jpg
share/xfce/icons/3dpaint.xpm
share/xfce/icons/ABC.xpm
share/xfce/icons/AZ.xpm
@ -513,6 +515,7 @@ share/xfce/palettes/KDE
share/xfce/palettes/KStyle2
share/xfce/palettes/KXfce
share/xfce/palettes/Kdetheme
share/xfce/palettes/Kindaker
share/xfce/palettes/LightBulb
share/xfce/palettes/LightBulb2
share/xfce/palettes/LightBulb3
@ -545,6 +548,7 @@ share/xfce/palettes/Prune
share/xfce/palettes/PruneDark
share/xfce/palettes/Quartz
share/xfce/palettes/Reader
share/xfce/palettes/Redmond
share/xfce/palettes/Salmon
share/xfce/palettes/Salmon2
share/xfce/palettes/SaltLake
@ -582,6 +586,7 @@ share/xfce/palettes/Win3
share/xfce/palettes/XLight
share/xfce/palettes/Xfce-1
share/xfce/palettes/Xfce-2
share/xfce/palettes/Xfce-light
share/xfce/sounds/alert01.wav
share/xfce/sounds/beep01.wav
share/xfce/sounds/beep02.wav
@ -668,8 +673,8 @@ share/xfce/textures/stripe.xpm
@dirrm share/xfce/sounds
@dirrm share/xfce/palettes
@dirrm share/xfce/icons
@dirrm share/xfce/help/images
@dirrm share/xfce/help/html/stylesheet-images
@dirrm share/xfce/help/html/images
@dirrm share/xfce/help/html
@dirrm share/xfce/help
@dirrm share/xfce/fonts