start moving to a proper kde module. Don't put too many things in there yet.
This commit is contained in:
espie
parent
f51fde9628
commit
e712271fff
37
x11/kde/kde.port.mk
Normal file
37
x11/kde/kde.port.mk
Normal file
@ -0,0 +1,37 @@
|
|||||||
|
# $OpenBSD: kde.port.mk,v 1.1 2003/02/08 12:37:50 espie Exp $
|
||||||
|
MODULES+= qt3
|
||||||
|
MODQT_OVERRIDE_UIC?=No
|
||||||
|
MODQT_MT?=Yes
|
||||||
|
|
||||||
|
.if !defined(MODKDENO_DEBUG)
|
||||||
|
FLAVORS+= debug
|
||||||
|
.endif
|
||||||
|
FLAVOR?=
|
||||||
|
|
||||||
|
MODKDE_CONFIGURE_ARGS=${MODQT_CONFIGURE_ARGS}
|
||||||
|
MODKDE_CONFIGURE_ARGS+= --with-extra-libs="${LOCALBASE}/lib"
|
||||||
|
MODKDE_CONFIGURE_ARGS+= --with-extra-includes="${LOCALBASE}/include/libpng:${LOCALBASE}/include"
|
||||||
|
MODKDE_CONFIGURE_ARGS+= --with-xdmdir=/var/X11/kdm
|
||||||
|
MODKDE_CONFIGURE_ARGS+= --enable-mitshm
|
||||||
|
MODKDE_CONFIGURE_ARGS+= --with-xinerama
|
||||||
|
.if ${FLAVOR:L:Mdebug}
|
||||||
|
MODKDE_CONFIGURE_ARGS+= --enable-debug=yes
|
||||||
|
.else
|
||||||
|
MODKDE_CONFIGURE_ARGS+= --disable-debug
|
||||||
|
MODKDE_CONFIGURE_ARGS+= --disable-dependency-tracking
|
||||||
|
.endif
|
||||||
|
MODKDE_CONFIGURE_ARGS+= --enable-final
|
||||||
|
|
||||||
|
MODKE_CONFIG_GUESS_DIRS= ${WRKSRC} ${WRKSRC}/admin
|
||||||
|
|
||||||
|
MODKDE_CONFIGURE_ENV= UIC_PATH="${MODQT_UIC}" UIC="${MODQT_UIC}"
|
||||||
|
MODKDE_CONFIGURE_ENV+= RUN_KAPPFINDER=no KDEDIR=${LOCALBASE}
|
||||||
|
MODKDE_MAKE_FLAGS= CXXLD='--tag CXX ${CXX} -L${MODQT_LIBDIR}'
|
||||||
|
|
||||||
|
KDE=lib/kde3
|
||||||
|
SUBST_VARS+= KDE
|
||||||
|
|
||||||
|
MODKDE_VERSION?=
|
||||||
|
.if ${MODKDE_VERSION} == "3.1"
|
||||||
|
PATCH_LIST= ${PORTSDIR}/x11/kde/patches-3.1/patch-* patch-*
|
||||||
|
.endif
|
||||||
100
x11/kde/patches-3.1/patch-aclocal_m4
Normal file
100
x11/kde/patches-3.1/patch-aclocal_m4
Normal file
@ -0,0 +1,100 @@
|
|||||||
|
$OpenBSD: patch-aclocal_m4,v 1.1 2003/02/08 12:37:50 espie Exp $
|
||||||
|
--- aclocal.m4.orig Thu Jan 16 20:42:23 2003
|
||||||
|
+++ aclocal.m4 Tue Jan 28 14:57:46 2003
|
||||||
|
@@ -6695,8 +6695,8 @@ nto-qnx)
|
||||||
|
|
||||||
|
openbsd*)
|
||||||
|
version_type=sunos
|
||||||
|
- need_lib_prefix=no
|
||||||
|
- need_version=no
|
||||||
|
+ need_lib_prefix=yes
|
||||||
|
+ need_version=yes
|
||||||
|
library_names_spec='${libname}${release}.so$versuffix ${libname}.so$versuffix'
|
||||||
|
finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
|
||||||
|
shlibpath_var=LD_LIBRARY_PATH
|
||||||
|
@@ -7369,6 +7369,7 @@ openbsd*)
|
||||||
|
else
|
||||||
|
lt_cv_deplibs_check_method='file_magic OpenBSD.* shared library'
|
||||||
|
fi
|
||||||
|
+ lt_cv_deplibs_check_method=pass_all
|
||||||
|
;;
|
||||||
|
|
||||||
|
osf3* | osf4* | osf5*)
|
||||||
|
@@ -8122,6 +8123,16 @@ case $host_os in
|
||||||
|
netbsd*)
|
||||||
|
# NetBSD uses g++ - do we need to do anything?
|
||||||
|
;;
|
||||||
|
+ openbsd*)
|
||||||
|
+ _LT_AC_TAGVAR(hardcode_direct, $1)=yes
|
||||||
|
+ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
|
||||||
|
+
|
||||||
|
+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
|
||||||
|
+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
|
||||||
|
+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R$libdir'
|
||||||
|
+ _LT_AC_TAGVAR(remove_libsearchpath, $1)='yes'
|
||||||
|
+ _LT_AC_TAGVAR(remove_lgcc, $1)='yes'
|
||||||
|
+ ;;
|
||||||
|
osf3*)
|
||||||
|
case $cc_basename in
|
||||||
|
KCC)
|
||||||
|
@@ -8436,15 +8447,24 @@ if AC_TRY_EVAL(ac_compile); then
|
||||||
|
else
|
||||||
|
_LT_AC_TAGVAR(compiler_lib_search_path, $1)="${_LT_AC_TAGVAR(compiler_lib_search_path, $1)} ${prev}${p}"
|
||||||
|
fi
|
||||||
|
+ if test "x$_LT_AC_TAGVAR(remove_libsearchpath, $1)" = "xyes"; then
|
||||||
|
+ _LT_AC_TAGVAR(compiler_lib_search_path, $1)=""
|
||||||
|
+ fi
|
||||||
|
;;
|
||||||
|
# The "-l" case would never come before the object being
|
||||||
|
# linked, so don't bother handling this case.
|
||||||
|
esac
|
||||||
|
else
|
||||||
|
+ add="${prev}$p"
|
||||||
|
+ if test "x$_LT_AC_TAGVAR(remove_lgcc, $1)" = "xyes"; then
|
||||||
|
+ case "$add" in
|
||||||
|
+ -lgcc ) add="" ;;
|
||||||
|
+ esac
|
||||||
|
+ fi
|
||||||
|
if test -z "$_LT_AC_TAGVAR(postdeps, $1)"; then
|
||||||
|
- _LT_AC_TAGVAR(postdeps, $1)="${prev}${p}"
|
||||||
|
+ _LT_AC_TAGVAR(postdeps, $1)="$add"
|
||||||
|
else
|
||||||
|
- _LT_AC_TAGVAR(postdeps, $1)="${_LT_AC_TAGVAR(postdeps, $1)} ${prev}${p}"
|
||||||
|
+ _LT_AC_TAGVAR(postdeps, $1)="${_LT_AC_TAGVAR(postdeps, $1)} ${add}"
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
;;
|
||||||
|
@@ -10234,22 +10254,9 @@ EOF
|
||||||
|
_LT_AC_TAGVAR(hardcode_direct, $1)=yes
|
||||||
|
_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
|
||||||
|
|
||||||
|
- if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
|
||||||
|
- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $linker_flags'
|
||||||
|
- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
|
||||||
|
- _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
|
||||||
|
- else
|
||||||
|
- case $host_os in
|
||||||
|
- openbsd[[01]].* | openbsd2.[[0-7]] | openbsd2.[[0-7]].*)
|
||||||
|
- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
|
||||||
|
- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
|
||||||
|
- ;;
|
||||||
|
- *)
|
||||||
|
- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $linker_flags'
|
||||||
|
- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
|
||||||
|
- ;;
|
||||||
|
- esac
|
||||||
|
- fi
|
||||||
|
+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $linker_flags'
|
||||||
|
+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
|
||||||
|
+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R$libdir'
|
||||||
|
;;
|
||||||
|
|
||||||
|
os2*)
|
||||||
|
@@ -10258,6 +10265,7 @@ EOF
|
||||||
|
_LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
|
||||||
|
_LT_AC_TAGVAR(archive_cmds, $1)='$echo "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$echo "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~$echo DATA >> $output_objdir/$libname.def~$echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~$echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def'
|
||||||
|
_LT_AC_TAGVAR(old_archive_From_new_cmds, $1)='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def'
|
||||||
|
+ _LT_AC_TAGVAR(remove_lgcc, $1)='yes'
|
||||||
|
;;
|
||||||
|
|
||||||
|
osf3*)
|
||||||
42
x11/kde/patches-3.1/patch-admin_ltmain_sh
Normal file
42
x11/kde/patches-3.1/patch-admin_ltmain_sh
Normal file
@ -0,0 +1,42 @@
|
|||||||
|
$OpenBSD: patch-admin_ltmain_sh,v 1.1 2003/02/08 12:37:50 espie Exp $
|
||||||
|
--- admin/ltmain.sh.orig Sun Jan 5 16:49:09 2003
|
||||||
|
+++ admin/ltmain.sh Sun Jan 5 17:04:25 2003
|
||||||
|
@@ -1249,6 +1249,17 @@ EOF
|
||||||
|
continue
|
||||||
|
;;
|
||||||
|
|
||||||
|
+ -pthread)
|
||||||
|
+ case $host in
|
||||||
|
+ *-*-openbsd*)
|
||||||
|
+ deplibs="$deplibs $arg"
|
||||||
|
+ ;;
|
||||||
|
+ *)
|
||||||
|
+ continue
|
||||||
|
+ ;;
|
||||||
|
+ esac
|
||||||
|
+ ;;
|
||||||
|
+
|
||||||
|
-module)
|
||||||
|
module=yes
|
||||||
|
continue
|
||||||
|
@@ -1841,6 +1852,20 @@ EOF
|
||||||
|
fi
|
||||||
|
continue
|
||||||
|
;;
|
||||||
|
+ -pthread)
|
||||||
|
+ case $linkmode in
|
||||||
|
+ lib)
|
||||||
|
+ deplibs="$deplib $deplibs"
|
||||||
|
+ newdependency_libs="$deplib $newdependency_libs"
|
||||||
|
+ ;;
|
||||||
|
+ prog)
|
||||||
|
+ compile_deplibs="$deplib $compile_deplibs"
|
||||||
|
+ finalize_deplibs="$deplib $finalize_deplibs"
|
||||||
|
+ ;;
|
||||||
|
+ esac
|
||||||
|
+ continue
|
||||||
|
+ ;;
|
||||||
|
+
|
||||||
|
%DEPLIBS%)
|
||||||
|
alldeplibs=yes
|
||||||
|
continue
|
||||||
Loading…
Reference in New Issue
Block a user