summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoe Marcus Clarke <marcus@FreeBSD.org>2005-07-25 03:45:48 +0000
committerJoe Marcus Clarke <marcus@FreeBSD.org>2005-07-25 03:45:48 +0000
commit7820af850dd29f864c21f50e563593a3703ddea3 (patch)
treefc48b2dbe50ce7a87d304b9e78f965d7d819f4ea
parentYet another inplace release. 230K diff incl.: (diff)
* Fix some plist problems with leftover files [1]
* Remove an improper use of INSTALLS_OMF Reported by: pointyhat via kris [1]
Notes
Notes: svn path=/head/; revision=140047
-rw-r--r--mail/balsa/Makefile10
-rw-r--r--mail/balsa/pkg-plist4
2 files changed, 9 insertions, 5 deletions
diff --git a/mail/balsa/Makefile b/mail/balsa/Makefile
index 75eb8bcef5d8..3929247d29d7 100644
--- a/mail/balsa/Makefile
+++ b/mail/balsa/Makefile
@@ -7,7 +7,7 @@
PORTNAME= balsa
PORTVERSION= 2.3.4
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= mail gnome
MASTER_SITES= http://www.theochem.kth.se/~pawsa/balsa/
DISTNAME= balsa-${PORTVERSION}
@@ -40,8 +40,6 @@ CONFIGURE_ARGS= --enable-threads \
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \
LIBS="-L${LOCALBASE}/lib -liconv"
-INSTALLS_OMF= balsa-C.omf
-
MAN1= balsa.1
OPTIONS= LDAP "Enable LDAP support" on \
@@ -59,6 +57,12 @@ USE_OPENLDAP= yes
CONFIGURE_ARGS+= --with-ldap
.endif
+.if ${PREFIX}==${X11BASE}
+PLIST_SUB+= GTKICON="@comment "
+.else
+PLIST_SUB+= GTKICON=""
+.endif
+
post-patch:
@${REINPLACE_CMD} -e 's|stdint.h|inttypes.h|g' \
${WRKSRC}/libbalsa/mailbox_imap.c
diff --git a/mail/balsa/pkg-plist b/mail/balsa/pkg-plist
index cc578ba96f7b..fdb4f4d7b88a 100644
--- a/mail/balsa/pkg-plist
+++ b/mail/balsa/pkg-plist
@@ -137,7 +137,7 @@ share/locale/zh_TW/LC_MESSAGES/balsa.mo
@unexec rmdir %D/share/locale/rw 2>/dev/null || true
@dirrm share/gnome/sounds/balsa
@dirrm share/gnome/omf/balsa
-@unexec rmdir %D/share/icons/hicolor/48x48/mimetypes 2>/dev/null || true
+%%GTKICON%%@unexec rmdir %D/share/icons/hicolor/48x48/mimetypes 2>/dev/null || true
@dirrm share/gnome/help/balsa/C/figures
@dirrm share/gnome/help/balsa/C
@dirrm share/gnome/help/balsa
@@ -149,4 +149,4 @@ share/locale/zh_TW/LC_MESSAGES/balsa.mo
@dirrm share/gnome/balsa/hicolor
@dirrm share/gnome/balsa
@unexec rm -f %D/share/icons/hicolor/icon-theme.cache 2>/dev/null || true
-@unexec gtk-update-icon-cache %D/share/icons/hicolor 2>/dev/null || true
+%%GTKICON%%@unexec gtk-update-icon-cache %D/share/icons/hicolor 2>/dev/null || true