diff options
| author | Adam Weinberger <adamw@FreeBSD.org> | 2005-04-02 08:50:51 +0000 |
|---|---|---|
| committer | Adam Weinberger <adamw@FreeBSD.org> | 2005-04-02 08:50:51 +0000 |
| commit | 5208a4f71fd9e73f99e08ab0c3ff54c23b8831dc (patch) | |
| tree | 029d9a671bcddce71a8393970e290d69965531ab /mail | |
| parent | Fix the build on 4.X. (diff) | |
Determine where thunderbird is installed automatically,
rather than having to code it in in numerous places every
time thunderbird gets upgraded.
Diffstat (limited to 'mail')
| -rw-r--r-- | mail/moztraybiff/Makefile | 15 | ||||
| -rw-r--r-- | mail/moztraybiff/files/patch-components_Makefile | 2 |
2 files changed, 11 insertions, 6 deletions
diff --git a/mail/moztraybiff/Makefile b/mail/moztraybiff/Makefile index 7289151932bb..22fb26e3bd03 100644 --- a/mail/moztraybiff/Makefile +++ b/mail/moztraybiff/Makefile @@ -15,9 +15,11 @@ DISTNAME= mozTrayBiff-${PORTVERSION} MAINTAINER= adamw@FreeBSD.org COMMENT= New mail tray icon for Thunderbird -BUILD_DEPENDS= ${X11BASE}/lib/thunderbird/lib/thunderbird-1.0.2/components/libwidget_gtk2.so:${PORTSDIR}/mail/thunderbird \ +BUILD_DEPENDS= ${X11BASE}/lib/thunderbird/lib/thunderbird-${TBVER}/components/libwidget_gtk2.so:${PORTSDIR}/mail/thunderbird \ zip:${PORTSDIR}/archivers/zip -RUN_DEPENDS= ${X11BASE}/lib/thunderbird/lib/thunderbird-1.0.2/components/libwidget_gtk2.so:${PORTSDIR}/mail/thunderbird +RUN_DEPENDS= ${X11BASE}/lib/thunderbird/lib/thunderbird-${TBVER}/components/libwidget_gtk2.so:${PORTSDIR}/mail/thunderbird + +TBVER!= cd ../thunderbird && ${MAKE} -V PORTVERSION USE_X_PREFIX= yes USE_GMAKE= yes @@ -25,17 +27,20 @@ USE_GNOME= libgnome USE_REINPLACE= yes MAKE_ARGS+= MOZILLA_PLATFORM=tbird -FILENAME= mozTrayBiff-${PORTVERSION}-FreeBSD-tb1.0.2.xpi +FILENAME= mozTrayBiff-${PORTVERSION}-FreeBSD-tb${TBVER}.xpi PLIST_FILES= ${DATADIR}/${FILENAME} PLIST_DIRS= ${DATADIR} PKGMESSAGE= ${WRKDIR}/pkg-message .include <bsd.port.pre.mk> -.if ${OSVERSION} < 500000 post-patch: - ${REINPLACE_CMD} -e "s|-fshort-wchar||" ${WRKSRC}/components/Makefile +.if ${OSVERSION} < 500000 + @${REINPLACE_CMD} -e "s|-fshort-wchar||" \ + ${WRKSRC}/components/Makefile .endif + @${REINPLACE_CMD} -e "s|%%TBVER%%|${TBVER}|" \ + ${WRKSRC}/components/Makefile post-build: ${SED} 's|%%DATADIR%%|${DATADIR}|' ${PKGDIR}/pkg-message > ${PKGMESSAGE} diff --git a/mail/moztraybiff/files/patch-components_Makefile b/mail/moztraybiff/files/patch-components_Makefile index 9d11441e4d9c..082c0512f21c 100644 --- a/mail/moztraybiff/files/patch-components_Makefile +++ b/mail/moztraybiff/files/patch-components_Makefile @@ -7,7 +7,7 @@ - $(shell $(MOZILLA_CONFIG) --cflags) + $(shell $(MOZILLA_CONFIG) --cflags) \ + $(shell for i in \ -+ `find $${X11BASE}/lib/thunderbird/include/thunderbird-1.0 -type d`; \ ++ `find $${X11BASE}/lib/thunderbird/include/thunderbird-%%TBVER%% -type d`; \ + do echo -n "-I$$i "; done) CXXFLAGS += \ |