diff options
| -rw-r--r-- | audio/amarok-kde4/Makefile | 4 | ||||
| -rw-r--r-- | audio/amarok/Makefile | 4 | ||||
| -rw-r--r-- | deskutils/basket/Makefile | 7 | ||||
| -rw-r--r-- | deskutils/dragstack/Makefile | 9 | ||||
| -rw-r--r-- | misc/bookcase/Makefile | 1 | ||||
| -rw-r--r-- | misc/tellico-kde4/Makefile | 1 | ||||
| -rw-r--r-- | misc/tellico/Makefile | 1 | ||||
| -rw-r--r-- | sysutils/filelight-kde4/Makefile | 7 | ||||
| -rw-r--r-- | sysutils/filelight/Makefile | 7 |
9 files changed, 14 insertions, 27 deletions
diff --git a/audio/amarok-kde4/Makefile b/audio/amarok-kde4/Makefile index 89105ce3b957..50de245ea76e 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 89105ce3b957..50de245ea76e 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 19ec248d3abd..eecbcbe6f71a 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 b867210161b2..18d2fc961925 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 4436bf2e2781..42aea6c3689a 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 4436bf2e2781..42aea6c3689a 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 4436bf2e2781..42aea6c3689a 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 a098f2036068..1a8063fcc579 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 a098f2036068..1a8063fcc579 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> |