diff options
| author | Florian Smeets <flo@FreeBSD.org> | 2011-08-16 18:36:10 +0000 |
|---|---|---|
| committer | Florian Smeets <flo@FreeBSD.org> | 2011-08-16 18:36:10 +0000 |
| commit | 8173943d73eab09d3c9ba4649d627173e9bc55b0 (patch) | |
| tree | 3ce610d0fe6f85da207f911f1eefe1366b796eec /deskutils | |
| parent | 8f71e18f51f19fc09cc0deb4e8af9ac960749331 (diff) | |
Notes
Diffstat (limited to 'deskutils')
| -rw-r--r-- | deskutils/lightning-thunderbird/Makefile | 4 | ||||
| -rw-r--r-- | deskutils/lightning/Makefile | 4 |
2 files changed, 2 insertions, 6 deletions
diff --git a/deskutils/lightning-thunderbird/Makefile b/deskutils/lightning-thunderbird/Makefile index 9a82418d78e1..d6c275e41786 100644 --- a/deskutils/lightning-thunderbird/Makefile +++ b/deskutils/lightning-thunderbird/Makefile @@ -61,8 +61,6 @@ EXTRA_PATCHES= ${FILESDIR}/releng6_pulseaudio EXTRA_PATCHES= ${FILESDIR}/liboggplay_oss .endif -GECKO_PTHREAD_LIBS!=${CC} -dumpspecs | ${GREP} -m 1 '%{\!pg: %{pthread:' | ${SED} -e 's|^.*%{\!pg: %{pthread:|| ; s|}.*$$||' || ${TRUE} - .if defined(WITHOUT_DBUS) MOZ_OPTIONS+= --disable-dbus --disable-libnotify .else @@ -71,7 +69,7 @@ LIB_DEPENDS+= dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib \ .endif post-patch: - ${REINPLACE_CMD} -e 's|%%PTHREAD_LIBS%%|${PTHREAD_LIBS:C/-pthread/${GECKO_PTHREAD_LIBS}/}|' \ + ${REINPLACE_CMD} -e 's|%%PTHREAD_LIBS%%|${PTHREAD_LIBS}|' \ ${MOZSRC}/storage/build/Makefile.in \ ${MOZSRC}/db/sqlite3/src/Makefile.in @${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|' \ diff --git a/deskutils/lightning/Makefile b/deskutils/lightning/Makefile index c40081afd4c9..aeb3180d7eb7 100644 --- a/deskutils/lightning/Makefile +++ b/deskutils/lightning/Makefile @@ -61,8 +61,6 @@ EXTRA_PATCHES= ${FILESDIR}/releng6_pulseaudio EXTRA_PATCHES= ${FILESDIR}/liboggplay_oss .endif -GECKO_PTHREAD_LIBS!=${CC} -dumpspecs | ${GREP} -m 1 '%{\!pg: %{pthread:' | ${SED} -e 's|^.*%{\!pg: %{pthread:|| ; s|}.*$$||' || ${TRUE} - .if defined(WITHOUT_DBUS) MOZ_OPTIONS+= --disable-dbus .else @@ -70,7 +68,7 @@ LIB_DEPENDS+= dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib .endif post-patch: - ${REINPLACE_CMD} -e 's|%%PTHREAD_LIBS%%|${PTHREAD_LIBS:C/-pthread/${GECKO_PTHREAD_LIBS}/}|' \ + ${REINPLACE_CMD} -e 's|%%PTHREAD_LIBS%%|${PTHREAD_LIBS}|' \ ${MOZSRC}/storage/build/Makefile.in \ ${MOZSRC}/db/sqlite3/src/Makefile.in @${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|' \ |