diff options
| -rw-r--r-- | deskutils/krefty/Makefile | 8 | ||||
| -rw-r--r-- | graphics/kimagemapeditor/Makefile | 9 | ||||
| -rw-r--r-- | graphics/kimdaba/Makefile | 4 | ||||
| -rw-r--r-- | graphics/kolourpaint/Makefile | 4 | ||||
| -rw-r--r-- | graphics/kphotoalbum-kde4/Makefile | 4 | ||||
| -rw-r--r-- | graphics/kphotoalbum/Makefile | 4 | ||||
| -rw-r--r-- | irc/konversation-kde4/Makefile | 4 | ||||
| -rw-r--r-- | irc/konversation/Makefile | 4 | ||||
| -rw-r--r-- | lang/klogoturtle/Makefile | 8 | ||||
| -rw-r--r-- | sysutils/kkeyled/Makefile | 7 |
10 files changed, 21 insertions, 35 deletions
diff --git a/deskutils/krefty/Makefile b/deskutils/krefty/Makefile index e44e0d04099a..bd11536f7544 100644 --- a/deskutils/krefty/Makefile +++ b/deskutils/krefty/Makefile @@ -16,16 +16,16 @@ COMMENT= Quick Reference sheets for KDE USE_KDELIBS_VER=3 GNU_CONFIGURE= yes USE_REINPLACE= yes +CONFIGURE_ENV= LDFLAGS="${PTHREAD_LIBS}" 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} post-install: @${CAT} ${PKGMESSAGE} -.include <bsd.port.pre.mk> -.include "${PORTSDIR}/x11/kde3/Makefile.kde" -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/graphics/kimagemapeditor/Makefile b/graphics/kimagemapeditor/Makefile index ca6260b4569c..1317a33833d1 100644 --- a/graphics/kimagemapeditor/Makefile +++ b/graphics/kimagemapeditor/Makefile @@ -20,11 +20,10 @@ USE_LIBTOOL_VER=13 USE_REINPLACE= yes INSTALLS_SHLIB= yes GNU_CONFIGURE= yes -CONFIGURE_ENV+= LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib" +CONFIGURE_ENV+= LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib ${PTHREAD_LIBS}" pre-configure: - ${REINPLACE_CMD} -e 's|-O2||g' ${WRKSRC}/configure + ${REINPLACE_CMD} -e 's|-O2||g; s|-lpthread|${PTHREAD_LIBS}|g' \ + ${WRKSRC}/configure -.include <bsd.port.pre.mk> -.include "${PORTSDIR}/x11/kde3/Makefile.kde" -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/graphics/kimdaba/Makefile b/graphics/kimdaba/Makefile index ae2eb36d1cf1..6d2d679e1769 100644 --- a/graphics/kimdaba/Makefile +++ b/graphics/kimdaba/Makefile @@ -27,6 +27,4 @@ post-install: @${RMDIR} ${PREFIX}/share/locale/xx/LC_MESSAGES/ @${RMDIR} ${PREFIX}/share/locale/xx/ -.include <bsd.port.pre.mk> -.include "${PORTSDIR}/x11/kde3/Makefile.kde" -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/graphics/kolourpaint/Makefile b/graphics/kolourpaint/Makefile index 41bddfa296f9..2bebabd7bbd1 100644 --- a/graphics/kolourpaint/Makefile +++ b/graphics/kolourpaint/Makefile @@ -28,6 +28,4 @@ post-patch: @${REINPLACE_CMD} -e 's|-O2||g; s|^tagnames=|#tagnames=|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/graphics/kphotoalbum-kde4/Makefile b/graphics/kphotoalbum-kde4/Makefile index ae2eb36d1cf1..6d2d679e1769 100644 --- a/graphics/kphotoalbum-kde4/Makefile +++ b/graphics/kphotoalbum-kde4/Makefile @@ -27,6 +27,4 @@ post-install: @${RMDIR} ${PREFIX}/share/locale/xx/LC_MESSAGES/ @${RMDIR} ${PREFIX}/share/locale/xx/ -.include <bsd.port.pre.mk> -.include "${PORTSDIR}/x11/kde3/Makefile.kde" -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/graphics/kphotoalbum/Makefile b/graphics/kphotoalbum/Makefile index ae2eb36d1cf1..6d2d679e1769 100644 --- a/graphics/kphotoalbum/Makefile +++ b/graphics/kphotoalbum/Makefile @@ -27,6 +27,4 @@ post-install: @${RMDIR} ${PREFIX}/share/locale/xx/LC_MESSAGES/ @${RMDIR} ${PREFIX}/share/locale/xx/ -.include <bsd.port.pre.mk> -.include "${PORTSDIR}/x11/kde3/Makefile.kde" -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/irc/konversation-kde4/Makefile b/irc/konversation-kde4/Makefile index 6ed42fd88cad..4643fa6450fe 100644 --- a/irc/konversation-kde4/Makefile +++ b/irc/konversation-kde4/Makefile @@ -24,6 +24,4 @@ USE_GMAKE= yes 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/irc/konversation/Makefile b/irc/konversation/Makefile index 6ed42fd88cad..4643fa6450fe 100644 --- a/irc/konversation/Makefile +++ b/irc/konversation/Makefile @@ -24,6 +24,4 @@ USE_GMAKE= yes 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/lang/klogoturtle/Makefile b/lang/klogoturtle/Makefile index 40ab87e8467a..99b2426c3d0e 100644 --- a/lang/klogoturtle/Makefile +++ b/lang/klogoturtle/Makefile @@ -16,10 +16,10 @@ COMMENT= LOGO Interpreter for the KDE Desktop USE_KDELIBS_VER= 3 GNU_CONFIGURE= yes USE_REINPLACE= yes +CONFIGURE_ENV= LDFLAGS="${PTHREAD_LIBS}" post-patch: - @${REINPLACE_CMD} -e 's/-O2//g' ${WRKSRC}/configure + @${REINPLACE_CMD} -e 's/-O2//g; s/-lpthread/${PTHREAD_LIBS}/g' \ + ${WRKSRC}/configure -.include <bsd.port.pre.mk> -.include "${PORTSDIR}/x11/kde3/Makefile.kde" -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/sysutils/kkeyled/Makefile b/sysutils/kkeyled/Makefile index 227b0818657d..478315fecb47 100644 --- a/sysutils/kkeyled/Makefile +++ b/sysutils/kkeyled/Makefile @@ -19,10 +19,9 @@ 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} @${REINPLACE_CMD} -e 's|/opt/kde3|${PREFIX}|g' \ ${WRKSRC}/kkeyled/Themicons/kkeyledrc -.include <bsd.port.pre.mk> -.include "${PORTSDIR}/x11/kde3/Makefile.kde" -.include <bsd.port.post.mk> +.include <bsd.port.mk> |