diff options
| author | Adam Weinberger <adamw@FreeBSD.org> | 2005-04-26 19:45:26 +0000 |
|---|---|---|
| committer | Adam Weinberger <adamw@FreeBSD.org> | 2005-04-26 19:45:26 +0000 |
| commit | 9dee8314d0d9893b1c2d69126747e1c72f32b29f (patch) | |
| tree | cbe76265c06f24a14d14e6ab03b28838ea261df1 /mail/moztraybiff | |
| parent | - Install .desktop file in share/applications instead of (diff) | |
Apply a couple clean-ups.
- Ditch pkg-message/%%DATADIR%% substitutions in favour
of SUB_FILES and files/pkg-message.in.
- Remove a rather horrific shell command used to generate
a list of include dirs for c++(1). I'm not sure why it
works without the shell command... or more specifically,
I'm not sure what caused me to write it in the first place.
In any event, it builds cleanly here as-is. I'm sure Kris
will happily inform me of the inevitable breakages.
- Space the Makefile a bit better.
Notes
Notes:
svn path=/head/; revision=134224
Diffstat (limited to 'mail/moztraybiff')
| -rw-r--r-- | mail/moztraybiff/Makefile | 9 | ||||
| -rw-r--r-- | mail/moztraybiff/files/patch-components_Makefile | 14 | ||||
| -rw-r--r-- | mail/moztraybiff/files/pkg-message.in (renamed from mail/moztraybiff/pkg-message) | 0 |
3 files changed, 4 insertions, 19 deletions
diff --git a/mail/moztraybiff/Makefile b/mail/moztraybiff/Makefile index 6c01549273d1..3241032fa480 100644 --- a/mail/moztraybiff/Makefile +++ b/mail/moztraybiff/Makefile @@ -34,6 +34,8 @@ MAKE_ARGS+= MOZILLA_PLATFORM=tbird FILENAME= mozTrayBiff-${PORTVERSION}-FreeBSD-tb${TBVER}.xpi PLIST_FILES= share/${PORTNAME}/${FILENAME} PLIST_DIRS= share/${PORTNAME} + +SUB_FILES= pkg-message PKGMESSAGE= ${WRKDIR}/pkg-message .include <bsd.port.pre.mk> @@ -43,17 +45,14 @@ post-patch: @${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} do-install: @${MKDIR} ${DATADIR} @${INSTALL} -m 644 ${WRKSRC}/${FILENAME} ${DATADIR} post-install: + @${ECHO_MSG} @${CAT} ${PKGMESSAGE} + @${ECHO_MSG} .include <bsd.port.post.mk> diff --git a/mail/moztraybiff/files/patch-components_Makefile b/mail/moztraybiff/files/patch-components_Makefile deleted file mode 100644 index 082c0512f21c..000000000000 --- a/mail/moztraybiff/files/patch-components_Makefile +++ /dev/null @@ -1,14 +0,0 @@ ---- components/Makefile.orig Sat Mar 19 22:30:21 2005 -+++ components/Makefile Sat Mar 19 22:32:11 2005 -@@ -17,7 +17,10 @@ - $(shell pkg-config --libs $(GTK_PACKAGE)) - - MOZ_INCLUDES := \ -- $(shell $(MOZILLA_CONFIG) --cflags) -+ $(shell $(MOZILLA_CONFIG) --cflags) \ -+ $(shell for i in \ -+ `find $${X11BASE}/lib/thunderbird/include/thunderbird-%%TBVER%% -type d`; \ -+ do echo -n "-I$$i "; done) - - CXXFLAGS += \ - -fno-rtti \ diff --git a/mail/moztraybiff/pkg-message b/mail/moztraybiff/files/pkg-message.in index 04150cf34f58..04150cf34f58 100644 --- a/mail/moztraybiff/pkg-message +++ b/mail/moztraybiff/files/pkg-message.in |