diff options
| author | markus <markus@FreeBSD.org> | 2004-06-06 21:26:34 +0800 |
|---|---|---|
| committer | markus <markus@FreeBSD.org> | 2004-06-06 21:26:34 +0800 |
| commit | 70cd72932149a09a379e2357bd1381169e263bc0 (patch) | |
| tree | 5b074b4455273849b133d939a0c82e2c4e8df6ec | |
| parent | 6bcc293162ec080760681a0efb1fa6746cf6fc0b (diff) | |
| download | freebsd-ports-gnome-70cd72932149a09a379e2357bd1381169e263bc0.tar.gz freebsd-ports-gnome-70cd72932149a09a379e2357bd1381169e263bc0.tar.zst freebsd-ports-gnome-70cd72932149a09a379e2357bd1381169e263bc0.zip | |
Don't use Makefile.kde anymore
| -rw-r--r-- | converters/ktextdecode/Makefile | 7 | ||||
| -rw-r--r-- | deskutils/ktagebuch/Makefile | 9 | ||||
| -rw-r--r-- | deskutils/kuake/Makefile | 9 | ||||
| -rw-r--r-- | deskutils/superkaramba/Makefile | 9 | ||||
| -rw-r--r-- | irc/kwirc/Makefile | 4 | ||||
| -rw-r--r-- | mail/kshowmail/Makefile | 7 | ||||
| -rw-r--r-- | misc/kwordquiz/Makefile | 4 | ||||
| -rw-r--r-- | science/kst/Makefile | 4 | ||||
| -rw-r--r-- | science/kst2/Makefile | 4 |
9 files changed, 22 insertions, 35 deletions
diff --git a/converters/ktextdecode/Makefile b/converters/ktextdecode/Makefile index b36214eb61f0..736b5561f2bb 100644 --- a/converters/ktextdecode/Makefile +++ b/converters/ktextdecode/Makefile @@ -21,8 +21,7 @@ USE_GMAKE= 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/ktagebuch/Makefile b/deskutils/ktagebuch/Makefile index d19e730bea81..69b216a8ef20 100644 --- a/deskutils/ktagebuch/Makefile +++ b/deskutils/ktagebuch/Makefile @@ -20,13 +20,12 @@ GNU_CONFIGURE= yes INSTALLS_SHLIB= yes USE_REINPLACE= yes -CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} +CONFIGURE_ENV= LDFLAGS="${PTHREAD_LIBS}" 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} @${RM} ${WRKSRC}/ktagebuch/library/ui/inserthtmldialog.cpp \ ${WRKSRC}/ktagebuch/library/ui/inserthtmldialog.h -.include <bsd.port.pre.mk> -.include "${PORTSDIR}/x11/kde3/Makefile.kde" -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/deskutils/kuake/Makefile b/deskutils/kuake/Makefile index 5a5ae26781da..220bca5d5320 100644 --- a/deskutils/kuake/Makefile +++ b/deskutils/kuake/Makefile @@ -18,9 +18,10 @@ USE_GMAKE= yes GNU_CONFIGURE= yes USE_REINPLACE= yes +CONFIGURE_ENV= LDFLAGS="${PTHREAD_LIBS}" + 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/superkaramba/Makefile b/deskutils/superkaramba/Makefile index 8be624431fa9..aacbbb448f19 100644 --- a/deskutils/superkaramba/Makefile +++ b/deskutils/superkaramba/Makefile @@ -33,8 +33,6 @@ USE_REINPLACE= yes CONFIGURE_ARGS+= --with-pythondir=${PYTHON_INCLUDEDIR} -CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL} - pre-everything:: .if !defined(WITH_XMMS) @${ECHO_MSG} "You can enable XMMS support by defining WITH_XMMS." @@ -44,8 +42,7 @@ pre-everything:: .endif 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/irc/kwirc/Makefile b/irc/kwirc/Makefile index 72cca107a414..27c28e6b83b0 100644 --- a/irc/kwirc/Makefile +++ b/irc/kwirc/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/mail/kshowmail/Makefile b/mail/kshowmail/Makefile index 56300b21a26c..fea34a76ee10 100644 --- a/mail/kshowmail/Makefile +++ b/mail/kshowmail/Makefile @@ -22,9 +22,8 @@ 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} @${RM} ${WRKSRC}/kshowmail/OptionDlg.h ${WRKSRC}/kshowmail/OptionDlg.cpp -.include <bsd.port.pre.mk> -.include "${PORTSDIR}/x11/kde3/Makefile.kde" -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/misc/kwordquiz/Makefile b/misc/kwordquiz/Makefile index 1912960c42d7..53833b7c18ba 100644 --- a/misc/kwordquiz/Makefile +++ b/misc/kwordquiz/Makefile @@ -21,6 +21,4 @@ USE_REINPLACE= 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/science/kst/Makefile b/science/kst/Makefile index 844a3f052030..686f8a3ded94 100644 --- a/science/kst/Makefile +++ b/science/kst/Makefile @@ -26,6 +26,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/science/kst2/Makefile b/science/kst2/Makefile index 844a3f052030..686f8a3ded94 100644 --- a/science/kst2/Makefile +++ b/science/kst2/Makefile @@ -26,6 +26,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> |