summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormarkus <markus@FreeBSD.org>2004-06-05 22:50:07 +0000
committermarkus <markus@FreeBSD.org>2004-06-05 22:50:07 +0000
commitd0b89b1b15337754273a04ae1104bdb04062e32b (patch)
treeead7ae97739340c9ce4f5af009493aabbd4ada54
parent5902f9fe53bdd91f0caa1573d487a1a09118c3ba (diff)
downloadFreeBSD-ports-d0b89b1b15337754273a04ae1104bdb04062e32b.zip
FreeBSD-ports-d0b89b1b15337754273a04ae1104bdb04062e32b.tar.gz
Don't use Makefile.kde anymore
-rw-r--r--audio/amarok-kde4/Makefile4
-rw-r--r--audio/amarok/Makefile4
-rw-r--r--deskutils/basket/Makefile7
-rw-r--r--deskutils/dragstack/Makefile9
-rw-r--r--misc/bookcase/Makefile1
-rw-r--r--misc/tellico-kde4/Makefile1
-rw-r--r--misc/tellico/Makefile1
-rw-r--r--sysutils/filelight-kde4/Makefile7
-rw-r--r--sysutils/filelight/Makefile7
9 files changed, 14 insertions, 27 deletions
diff --git a/audio/amarok-kde4/Makefile b/audio/amarok-kde4/Makefile
index 89105ce..50de245 100644
--- a/audio/amarok-kde4/Makefile
+++ b/audio/amarok-kde4/Makefile
@@ -45,6 +45,4 @@ pre-everything::
post-patch:
@${REINPLACE_CMD} -e 's|-O2||g' ${WRKSRC}/${CONFIGURE_SCRIPT}
-.include <bsd.port.pre.mk>
-.include "${PORTSDIR}/x11/kde3/Makefile.kde"
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/audio/amarok/Makefile b/audio/amarok/Makefile
index 89105ce..50de245 100644
--- a/audio/amarok/Makefile
+++ b/audio/amarok/Makefile
@@ -45,6 +45,4 @@ pre-everything::
post-patch:
@${REINPLACE_CMD} -e 's|-O2||g' ${WRKSRC}/${CONFIGURE_SCRIPT}
-.include <bsd.port.pre.mk>
-.include "${PORTSDIR}/x11/kde3/Makefile.kde"
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/deskutils/basket/Makefile b/deskutils/basket/Makefile
index 19ec248..eecbcbe 100644
--- a/deskutils/basket/Makefile
+++ b/deskutils/basket/Makefile
@@ -19,8 +19,7 @@ GNU_CONFIGURE= yes
USE_REINPLACE= yes
post-patch:
- @${REINPLACE_CMD} -e 's/-O2//g' ${WRKSRC}/${CONFIGURE_SCRIPT}
+ @${REINPLACE_CMD} -e 's/-O2//g; s/-lpthread/${PTHREAD_LIBS}/g' \
+ ${WRKSRC}/${CONFIGURE_SCRIPT}
-.include <bsd.port.pre.mk>
-.include "${PORTSDIR}/x11/kde3/Makefile.kde"
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/deskutils/dragstack/Makefile b/deskutils/dragstack/Makefile
index b867210..18d2fc9 100644
--- a/deskutils/dragstack/Makefile
+++ b/deskutils/dragstack/Makefile
@@ -19,14 +19,11 @@ GNU_CONFIGURE= yes
USE_REINPLACE= yes
INSTALLS_SHLIB= yes
-CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL}
-
post-extract:
@${TOUCH} ${WRKSRC}/config.h.in
post-patch:
- @${REINPLACE_CMD} -e 's|-O2||g' ${WRKSRC}/${CONFIGURE_SCRIPT}
+ @${REINPLACE_CMD} -e 's|-O2||g; s|-lpthread|${PTHREAD_LIBS}|g' \
+ ${WRKSRC}/${CONFIGURE_SCRIPT}
-.include <bsd.port.pre.mk>
-.include "${PORTSDIR}/x11/kde3/Makefile.kde"
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/misc/bookcase/Makefile b/misc/bookcase/Makefile
index 4436bf2..42aea6c 100644
--- a/misc/bookcase/Makefile
+++ b/misc/bookcase/Makefile
@@ -29,5 +29,4 @@ post-patch:
CFLAGS+= -D__LIBSTDCPP_PARTIAL_SUPPORT__
.endif
-.include "${PORTSDIR}/x11/kde3/Makefile.kde"
.include <bsd.port.post.mk>
diff --git a/misc/tellico-kde4/Makefile b/misc/tellico-kde4/Makefile
index 4436bf2..42aea6c 100644
--- a/misc/tellico-kde4/Makefile
+++ b/misc/tellico-kde4/Makefile
@@ -29,5 +29,4 @@ post-patch:
CFLAGS+= -D__LIBSTDCPP_PARTIAL_SUPPORT__
.endif
-.include "${PORTSDIR}/x11/kde3/Makefile.kde"
.include <bsd.port.post.mk>
diff --git a/misc/tellico/Makefile b/misc/tellico/Makefile
index 4436bf2..42aea6c 100644
--- a/misc/tellico/Makefile
+++ b/misc/tellico/Makefile
@@ -29,5 +29,4 @@ post-patch:
CFLAGS+= -D__LIBSTDCPP_PARTIAL_SUPPORT__
.endif
-.include "${PORTSDIR}/x11/kde3/Makefile.kde"
.include <bsd.port.post.mk>
diff --git a/sysutils/filelight-kde4/Makefile b/sysutils/filelight-kde4/Makefile
index a098f20..1a8063f 100644
--- a/sysutils/filelight-kde4/Makefile
+++ b/sysutils/filelight-kde4/Makefile
@@ -21,9 +21,8 @@ USE_REINPLACE= yes
post-patch:
@${CP} ${FILESDIR}/mntent* ${WRKSRC}/src
- @${REINPLACE_CMD} -e 's/-O2//g' ${WRKSRC}/${CONFIGURE_SCRIPT}
+ @${REINPLACE_CMD} -e 's/-O2//g; s/-lpthread/${PTHREAD_LIBS}/g' \
+ ${WRKSRC}/${CONFIGURE_SCRIPT}
@${RM} ${WRKSRC}/src/settingsdialog.h ${WRKSRC}/src/settingsdialog.cpp
-.include <bsd.port.pre.mk>
-.include "${PORTSDIR}/x11/kde3/Makefile.kde"
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/sysutils/filelight/Makefile b/sysutils/filelight/Makefile
index a098f20..1a8063f 100644
--- a/sysutils/filelight/Makefile
+++ b/sysutils/filelight/Makefile
@@ -21,9 +21,8 @@ USE_REINPLACE= yes
post-patch:
@${CP} ${FILESDIR}/mntent* ${WRKSRC}/src
- @${REINPLACE_CMD} -e 's/-O2//g' ${WRKSRC}/${CONFIGURE_SCRIPT}
+ @${REINPLACE_CMD} -e 's/-O2//g; s/-lpthread/${PTHREAD_LIBS}/g' \
+ ${WRKSRC}/${CONFIGURE_SCRIPT}
@${RM} ${WRKSRC}/src/settingsdialog.h ${WRKSRC}/src/settingsdialog.cpp
-.include <bsd.port.pre.mk>
-.include "${PORTSDIR}/x11/kde3/Makefile.kde"
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
OpenPOWER on IntegriCloud