summaryrefslogtreecommitdiff
path: root/deskutils
diff options
context:
space:
mode:
authorWill Andrews <will@FreeBSD.org>2002-03-30 09:07:53 +0000
committerWill Andrews <will@FreeBSD.org>2002-03-30 09:07:53 +0000
commit97e6d164088095904ab49eafe23f9e1c67c494de (patch)
tree2a01fc85decccff8ce009661334e22692c899251 /deskutils
parentUpdate to 0.5.0. (diff)
Fix the KDE ports to not use objprelink, if OSVERSION >= 500029. This is
not tested other than for syntax, but should DTRT from what I understand of the problem. Submitted by: bento
Notes
Notes: svn path=/head/; revision=56912
Diffstat (limited to 'deskutils')
-rw-r--r--deskutils/kcharselect/Makefile8
-rw-r--r--deskutils/kdepim/Makefile7
-rw-r--r--deskutils/kdepim3/Makefile7
-rw-r--r--deskutils/kdepim4/Makefile7
-rw-r--r--deskutils/kdepim44/Makefile7
5 files changed, 31 insertions, 5 deletions
diff --git a/deskutils/kcharselect/Makefile b/deskutils/kcharselect/Makefile
index 858ca8e566a6..fd18c7ac3fb0 100644
--- a/deskutils/kcharselect/Makefile
+++ b/deskutils/kcharselect/Makefile
@@ -24,6 +24,12 @@ GNU_CONFIGURE= yes
USE_GMAKE= yes
MAN1= efax.1 efix.1 fax.1
+.include <bsd.port.pre.mk>
+
+.if ${OSVERSION} >= 500029
+_NO_KDE_OBJPRELINK=yes
+.endif
+
.include "${.CURDIR}/../../x11/kde2/Makefile.kde"
pre-configure:
@@ -37,4 +43,4 @@ pre-configure:
cd ${WRKSRC} && env PATH=${WRKSRC}/auto-bin:$$PATH \
${GMAKE} -f Makefile.cvs
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/deskutils/kdepim/Makefile b/deskutils/kdepim/Makefile
index 4185e7a41cd3..7d9c3d4d4f47 100644
--- a/deskutils/kdepim/Makefile
+++ b/deskutils/kdepim/Makefile
@@ -24,6 +24,11 @@ USE_BZIP2= yes
INSTALLS_SHLIB= yes
GNU_CONFIGURE= yes
+.include <bsd.port.pre.mk>
+.if ${OSVERSION} >= 500029
+_NO_KDE_OBJPRELINK=yes
+.endif
+
.include "${.CURDIR}/../../x11/kde2/Makefile.kde"
QTCPPFLAGS= -I${LOCALBASE}/include -L${LOCALBASE}/lib
@@ -55,4 +60,4 @@ pre-configure:
find ${WRKSRC}/libical -name Makefile.in | xargs ${PERL} -pi -e \
"s|INSTALL = \@INSTALL\@|INSTALL=${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP}|g"
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/deskutils/kdepim3/Makefile b/deskutils/kdepim3/Makefile
index 4185e7a41cd3..7d9c3d4d4f47 100644
--- a/deskutils/kdepim3/Makefile
+++ b/deskutils/kdepim3/Makefile
@@ -24,6 +24,11 @@ USE_BZIP2= yes
INSTALLS_SHLIB= yes
GNU_CONFIGURE= yes
+.include <bsd.port.pre.mk>
+.if ${OSVERSION} >= 500029
+_NO_KDE_OBJPRELINK=yes
+.endif
+
.include "${.CURDIR}/../../x11/kde2/Makefile.kde"
QTCPPFLAGS= -I${LOCALBASE}/include -L${LOCALBASE}/lib
@@ -55,4 +60,4 @@ pre-configure:
find ${WRKSRC}/libical -name Makefile.in | xargs ${PERL} -pi -e \
"s|INSTALL = \@INSTALL\@|INSTALL=${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP}|g"
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/deskutils/kdepim4/Makefile b/deskutils/kdepim4/Makefile
index 4185e7a41cd3..7d9c3d4d4f47 100644
--- a/deskutils/kdepim4/Makefile
+++ b/deskutils/kdepim4/Makefile
@@ -24,6 +24,11 @@ USE_BZIP2= yes
INSTALLS_SHLIB= yes
GNU_CONFIGURE= yes
+.include <bsd.port.pre.mk>
+.if ${OSVERSION} >= 500029
+_NO_KDE_OBJPRELINK=yes
+.endif
+
.include "${.CURDIR}/../../x11/kde2/Makefile.kde"
QTCPPFLAGS= -I${LOCALBASE}/include -L${LOCALBASE}/lib
@@ -55,4 +60,4 @@ pre-configure:
find ${WRKSRC}/libical -name Makefile.in | xargs ${PERL} -pi -e \
"s|INSTALL = \@INSTALL\@|INSTALL=${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP}|g"
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/deskutils/kdepim44/Makefile b/deskutils/kdepim44/Makefile
index 4185e7a41cd3..7d9c3d4d4f47 100644
--- a/deskutils/kdepim44/Makefile
+++ b/deskutils/kdepim44/Makefile
@@ -24,6 +24,11 @@ USE_BZIP2= yes
INSTALLS_SHLIB= yes
GNU_CONFIGURE= yes
+.include <bsd.port.pre.mk>
+.if ${OSVERSION} >= 500029
+_NO_KDE_OBJPRELINK=yes
+.endif
+
.include "${.CURDIR}/../../x11/kde2/Makefile.kde"
QTCPPFLAGS= -I${LOCALBASE}/include -L${LOCALBASE}/lib
@@ -55,4 +60,4 @@ pre-configure:
find ${WRKSRC}/libical -name Makefile.in | xargs ${PERL} -pi -e \
"s|INSTALL = \@INSTALL\@|INSTALL=${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP}|g"
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>