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

Move KDE 3 headers from ${PREFIX}/include to ${PREFIX}/include/kde.

Browse Source 
This just unbreaks build of the port, no need to bump REVISION.

Tested in a bulk, input and okay by landry@
Reviewed by ajacoutot@ too
This commit is contained in:
zhuk 2013-01-23 21:16:30 +00:00
parent 9935071d66
commit cb49dfd663
5 changed files with 38 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
cad/klogic/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.23 2011/11/01 19:00:25 jasper Exp $
# $OpenBSD: Makefile,v 1.24 2013/01/23 21:16:30 zhuk Exp $
SHARED_ONLY= Yes
COMMENT= logic circuit simulator for KDE
@ -24,6 +24,7 @@ WANTLIB += stdc++ util xcb z
LIB_DEPENDS= x11/kde/libs3
MODULES= x11/kde devel/gettext
MODKDE_VERSION= 3.1
PORTHOME= ${WRKDIR}
@ -32,9 +33,10 @@ MAKE_FLAGS= ${MODKDE_MAKE_FLAGS}
USE_GMAKE= Yes
USE_LIBTOOL= Yes
CONFIGURE_STYLE= gnu
CONFIGURE_STYLE= gnu autoconf
MODGNU_CONFIG_GUESS_DIRS= ${MODKDE_CONFIG_GUESS_DIRS}
CONFIGURE_ARGS= ${MODKDE_CONFIGURE_ARGS}
CONFIGURE_ENV= ${MODKDE_CONFIGURE_ENV}
AUTOCONF_VERSION= 2.57
.include <bsd.port.mk>

3
devel/kdbg/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.29 2011/09/16 09:24:51 espie Exp $
# $OpenBSD: Makefile,v 1.30 2013/01/23 21:17:30 zhuk Exp $
SHARED_ONLY= Yes
COMMENT= graphical debugger for KDE
@ -29,5 +29,6 @@ USE_LIBTOOL= Yes
CONFIGURE_STYLE= autoconf autoheader
CONFIGURE_ARGS+= ${MODKDE_CONFIGURE_ARGS}
CONFIGURE_ARGS+= --with-kde-version=3
CONFIGURE_ENV= KDEDIR=${LOCALBASE}
.include <bsd.port.mk>

15
devel/kdbg/patches/patch-aclocal_m4
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-aclocal_m4,v 1.1 2003/03/01 07:08:34 pvalchev Exp $
--- aclocal.m4.orig Wed Mar 20 14:23:10 2002
+++ aclocal.m4 Fri Feb 28 22:50:06 2003
$OpenBSD: patch-aclocal_m4,v 1.2 2013/01/23 21:17:30 zhuk Exp $
--- aclocal.m4.orig Thu Mar 21 00:23:10 2002
+++ aclocal.m4 Wed Nov 21 22:20:46 2012
@@ -606,7 +606,7 @@ ac_libs_safe="$LIBS"
CXXFLAGS="$CXXFLAGS -I$qt_includes"
@ -28,3 +28,12 @@ $OpenBSD: patch-aclocal_m4,v 1.1 2003/03/01 07:08:34 pvalchev Exp $
AC_SUBST(LIB_QT)
])
@@ -841,7 +841,7 @@ AC_CACHE_VAL(ac_cv_have_kde,
if test -z "$1"; then
kde_incdirs="/usr/lib/kde/include /usr/local/kde/include /usr/kde/include /usr/include/kde /usr/include /opt/kde/include $x_includes $qt_includes"
-test -n "$KDEDIR" && kde_incdirs="$KDEDIR/include $KDEDIR $kde_incdirs"
+test -n "$KDEDIR" && kde_incdirs="$KDEDIR/include $KDEDIR/include/kde $KDEDIR $kde_incdirs"
kde_incdirs="$ac_kde_includes $kde_incdirs"
AC_FIND_FILE(ksock.h, $kde_incdirs, kde_incdir)
ac_kde_includes="$kde_incdir"

3
editors/libreoffice/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.79 2013/01/03 21:03:14 robert Exp $
# $OpenBSD: Makefile,v 1.80 2013/01/23 21:21:45 zhuk Exp $
ONLY_FOR_ARCHS= amd64 i386
@ -219,6 +219,7 @@ AUTOMAKE_VERSION= 1.12
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib" \
QTINC="${MODQT_INCDIR}" QTDIR="${MODQT_LIBDIR}" \
KDEDIR="${LOCALBASE}"
AUTOCONF_VERSION=${AUTOCONF_VERSION} \
AUTOMAKE_VERSION=${AUTOMAKE_VERSION}

18
editors/libreoffice/patches/patch-configure_in Normal file
View File

@ -0,0 +1,18 @@
$OpenBSD: patch-configure_in,v 1.4 2013/01/23 21:21:45 zhuk Exp $
--- configure.in.orig.port Wed Nov 28 12:29:53 2012
+++ configure.in Sun Jan 20 23:38:24 2013
@@ -9641,11 +9641,11 @@ if test "$test_kde" = "yes" -a "$ENABLE_KDE" = "TRUE";
kde_libdirs="/usr/lib64/kde/lib64 /usr/local/kde/lib64 /usr/kde/lib64 /usr/lib64/kde /usr/lib64/kde3 /usr/X11R6/lib64 /usr/local/lib64 /opt/kde3/lib64 /opt/kde/lib64 /usr/X11R6/kde/lib64 /usr/lib/kde/lib /usr/local/kde/lib /usr/kde/lib /usr/lib/kde /usr/lib/kde3 /usr/lib /usr/X11R6/lib /usr/local/lib /opt/kde3/lib /opt/kde/lib /usr/X11R6/kde/lib /usr/lib64 $x_libraries"
fi
if test -n "$KDEDIR"; then
- kde_incdirs="$KDEDIR/include $kde_incdirs"
+ kde_incdirs="$KDEDIR/include/kde $KDEDIR/include $kde_incdirs"
if test -z "$supports_multilib"; then
- kde_libdirs="$KDEDIR/lib $kde_libdirs"
+ kde_libdirs="$KDEDIR/lib/kde3 $KDEDIR/lib $kde_libdirs"
else
- kde_libdirs="$KDEDIR/lib64 $KDEDIR/lib $kde_libdirs"
+ kde_libdirs="$KDEDIR/lib64 $KDEDIR/lib/kde3 $KDEDIR/lib $kde_libdirs"
fi
fi