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

some tweaks in preparation of kde 3.5.7:

Browse Source 
- the infrastructure now uses autoconf 2.60.
- don't bother to patch libtool, we have USE_LIBTOOL across the board.
- set LIBTOOL_FLAGS to ignore static libraries by default. We will no
longer bother building arts with static libs, since arts is going to
die with kde4, and nothing hardly ever uses it now (in fact, the 3.5.7
release of arts includes no new code, only infrastructure changes)
This commit is contained in:
espie 2007-05-14 14:06:43 +00:00
parent 3feb9f9054
commit 1df0dd589a
3 changed files with 28 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
x11/kde/Makefile.inc
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile.inc,v 1.36 2006/06/03 12:47:30 espie Exp $
# $OpenBSD: Makefile.inc,v 1.37 2007/05/14 14:06:43 espie Exp $
DIST_SUBDIR?= kde
HOMEPAGE?= http://www.kde.org
.if defined(VERSION) && ${VERSION} == "3.1.95"
@ -27,8 +27,13 @@ MODULES?= x11/kde
MODGNU_CONFIG_GUESS_DIRS?= ${MODKDE_CONFIG_GUESS_DIRS}
CONFIGURE_STYLE?= autoconf
.if defined(MODKDE_VERSION) && (${MODKDE_VERSION} == "3.2.3" || ${MODKDE_VERSION} == "3.3.0" || ${MODKDE_VERSION} == "3.4" || ${MODKDE_VERSION} == "3.5" || ${MODKDE_VERSION} == "3.5.2" || ${MODKDE_VERSION} == "3.5.3")
.if defined(MODKDE_VERSION)
. if (${MODKDE_VERSION} == "3.2.3" || ${MODKDE_VERSION} == "3.3.0" || ${MODKDE_VERSION} == "3.4" || ${MODKDE_VERSION} == "3.5" || ${MODKDE_VERSION} == "3.5.2" || ${MODKDE_VERSION} == "3.5.3")
AUTOCONF_VERSION?= 2.59
. endif
. if (${MODKDE_VERSION} == "3.5.7")
AUTOCONF_VERSION?= 2.60
. endif
.endif
AUTOCONF_VERSION?= 2.57
CONFIGURE_ARGS+= ${MODKDE_CONFIGURE_ARGS}

8
x11/kde/kde.port.mk
View File

@ -1,4 +1,4 @@
# $OpenBSD: kde.port.mk,v 1.24 2007/05/09 11:31:43 bernd Exp $
# $OpenBSD: kde.port.mk,v 1.25 2007/05/14 14:06:43 espie Exp $
SHARED_ONLY?= Yes
@ -81,6 +81,12 @@ LIB_DEPENDS+=lib/qt3/qt-mt.>=3.33::x11/qt3
PATCH_LIST= ${PORTSDIR}/x11/kde/patches-3.5.3/patch-* patch-* ${SUP_PATCH_LIST}
AUTOCONF?= /bin/sh ${WRKDIST}/admin/cvs.sh configure
LIB_DEPENDS+=lib/qt3/qt-mt.>=3.33::x11/qt3
.elif ${MODKDE_VERSION} == "3.5.7"
PATCH_LIST= ${PORTSDIR}/x11/kde/patches-3.5.7/patch-* patch-* ${SUP_PATCH_LIST}
AUTOCONF?= /bin/sh ${WRKDIST}/admin/cvs.sh configure
LIB_DEPENDS+=lib/qt3/qt-mt.>=3.33::x11/qt3
USE_LIBTOOL= Yes
LIBTOOL_FLAGS=--tag=disable-static
.elif ${MODKDE_VERSION} == "2.2.2"
PATCH_LIST= ${PORTSDIR}/x11/kde/patches-2.2.2/patch-* patch-* ${SUP_PATCH_LIST}
.endif

14
x11/kde/patches-3.5.7/patch-admin_cvs_sh Normal file
View File

@ -0,0 +1,14 @@
$OpenBSD: patch-admin_cvs_sh,v 1.1 2007/05/14 14:06:43 espie Exp $
--- admin/cvs.sh.orig Mon May 14 12:55:38 2007
+++ admin/cvs.sh Mon May 14 15:34:38 2007
@@ -634,6 +634,10 @@ fi
# Call script to find autoconf and friends. Uses eval since the script outputs
# sh-compatible code.
eval `$admindir/detect-autoconf.pl`
+AUTOCONF=autoconf
+AUTOHEADER=autoheader
+AUTOM4TE=autom4te-${AUTOCONF_VERSION:-2.60}
+ACLOCAL=aclocal
###
### Main