diff options
| author | Will Andrews <will@FreeBSD.org> | 2003-10-03 22:34:44 +0000 |
|---|---|---|
| committer | Will Andrews <will@FreeBSD.org> | 2003-10-03 22:34:44 +0000 |
| commit | d075bf0f8668353d166ce921b27af99b645d652c (patch) | |
| tree | 345dd3d2608a097c43d147cb2254e11aebc56937 /net | |
| parent | Add cxmon 3.0, interactive file manipulation tool and disassembler. (diff) | |
Fix the -pthread problem in case the option gets removed again. This
patch involved patching the core auto* routines in KDE to accept the
PTHREAD_* variables in the environment, with fallbacks. We decided the
easiest way to implement this in ports was to generate configure instead
of risking incorrect generation at port configure time.
Said patch has already been committed to HEAD in KDE and as such will be
removed with the 3.2 upgrade once it is released.
Ports using Makefile.kde that shouldn't be using them (i.e. non-KDE
modules) have this support commented out due to lack of patch.
Helped out: Adriaan de Groot <adridg@cs.kun.nl>
Lauri Watts <lauri@kde.org>
Andy Fawcett <andy@athame.co.uk>
Notes
Notes:
svn path=/head/; revision=90174
Diffstat (limited to 'net')
| -rw-r--r-- | net/kdenetwork3/Makefile | 5 | ||||
| -rw-r--r-- | net/kdenetwork3/distinfo | 2 | ||||
| -rw-r--r-- | net/kdenetwork4/Makefile | 5 | ||||
| -rw-r--r-- | net/kdenetwork4/distinfo | 2 | ||||
| -rw-r--r-- | net/kmerlin/Makefile | 1 | ||||
| -rw-r--r-- | net/kmess/Makefile | 1 | ||||
| -rw-r--r-- | net/kopete/Makefile | 3 |
7 files changed, 10 insertions, 9 deletions
diff --git a/net/kdenetwork3/Makefile b/net/kdenetwork3/Makefile index 1529b7a734ea..1c851b1ab554 100644 --- a/net/kdenetwork3/Makefile +++ b/net/kdenetwork3/Makefile @@ -33,16 +33,13 @@ LDCONFIG_DIRS+= %%PREFIX%%/lib %%PREFIX%%/lib/kde3 .include "${.CURDIR}/../../x11/kde3/Makefile.kde" .include <bsd.port.pre.mk> -pre-configure:: - ${REINPLACE_CMD} -e 's@-pedantic @@g' ${WRKSRC}/configure - .if !defined(WITHOUT_KTALKD) UTMP?= /var/run/utmp .if exists(${UTMP}) PLIST_APPEND+= plist.ktalkd .else DO_NOT_COMPILE+= ktalkd -pre-configure:: +pre-everything:: @${ECHO_MSG} "===> \"${UTMP}\" was not found." @${ECHO_MSG} "===> The talk daemon (ktalkd) will not be built." .endif # exists(${UTMP}) diff --git a/net/kdenetwork3/distinfo b/net/kdenetwork3/distinfo index 9de420817351..53f739310b0c 100644 --- a/net/kdenetwork3/distinfo +++ b/net/kdenetwork3/distinfo @@ -1 +1,3 @@ MD5 (KDE/kdenetwork-3.1.4.tar.bz2) = 83d69ab3be7b4b10b898b250eb2d9046 +MD5 (KDE/kdenetwork-2003092201-configure.tar.bz2) = d5493de3232d664fd77797242891ecc1 +MD5 (KDE/patch-ltmain.sh) = 44696638ed79bdd194c6f72442509fe1 diff --git a/net/kdenetwork4/Makefile b/net/kdenetwork4/Makefile index 1529b7a734ea..1c851b1ab554 100644 --- a/net/kdenetwork4/Makefile +++ b/net/kdenetwork4/Makefile @@ -33,16 +33,13 @@ LDCONFIG_DIRS+= %%PREFIX%%/lib %%PREFIX%%/lib/kde3 .include "${.CURDIR}/../../x11/kde3/Makefile.kde" .include <bsd.port.pre.mk> -pre-configure:: - ${REINPLACE_CMD} -e 's@-pedantic @@g' ${WRKSRC}/configure - .if !defined(WITHOUT_KTALKD) UTMP?= /var/run/utmp .if exists(${UTMP}) PLIST_APPEND+= plist.ktalkd .else DO_NOT_COMPILE+= ktalkd -pre-configure:: +pre-everything:: @${ECHO_MSG} "===> \"${UTMP}\" was not found." @${ECHO_MSG} "===> The talk daemon (ktalkd) will not be built." .endif # exists(${UTMP}) diff --git a/net/kdenetwork4/distinfo b/net/kdenetwork4/distinfo index 9de420817351..53f739310b0c 100644 --- a/net/kdenetwork4/distinfo +++ b/net/kdenetwork4/distinfo @@ -1 +1,3 @@ MD5 (KDE/kdenetwork-3.1.4.tar.bz2) = 83d69ab3be7b4b10b898b250eb2d9046 +MD5 (KDE/kdenetwork-2003092201-configure.tar.bz2) = d5493de3232d664fd77797242891ecc1 +MD5 (KDE/patch-ltmain.sh) = 44696638ed79bdd194c6f72442509fe1 diff --git a/net/kmerlin/Makefile b/net/kmerlin/Makefile index 6e864f3b254f..d373f446d043 100644 --- a/net/kmerlin/Makefile +++ b/net/kmerlin/Makefile @@ -19,6 +19,7 @@ USE_KDELIBS_VER=3 GNU_CONFIGURE= yes USE_GMAKE= yes CONFIGURE_ARGS+= --prefix=${LOCALBASE} +_NO_KDE_FIXPTHREAD= yes .include <bsd.port.pre.mk> .include "${PORTSDIR}/x11/kde3/Makefile.kde" diff --git a/net/kmess/Makefile b/net/kmess/Makefile index 5ea878a59b83..e4f43afa7790 100644 --- a/net/kmess/Makefile +++ b/net/kmess/Makefile @@ -20,6 +20,7 @@ USE_KDELIBS_VER=3 GNU_CONFIGURE= yes USE_REINPLACE= yes USE_GMAKE= yes +_NO_KDE_FIXPTHREAD= yes .include <bsd.port.pre.mk> pre-patch: diff --git a/net/kopete/Makefile b/net/kopete/Makefile index ca93bd3ac547..5f01df265548 100644 --- a/net/kopete/Makefile +++ b/net/kopete/Makefile @@ -22,10 +22,11 @@ USE_REINPLACE= yes INSTALLS_SHLIB= yes CONFIGURE_ENV= LDFLAGS="-lcrypto" +_NO_KDE_FIXPTHREAD= yes pre-configure: ${REINPLACE_CMD} -e 's|-pedantic ||g' ${WRKSRC}/configure - + post-install: ${RM} ${PREFIX}/share/locale/xx/LC_MESSAGES/kopete.mo -${RMDIR} ${PREFIX}/share/locale/xx/LC_MESSAGES/ |