Attachment 29066 Details for Bug 48645 – file.diff

[patch] file.diff

file.diff (text/plain), 7.29 KB, created by Thierry Thomas on 2003-02-24 20:30:06 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Thierry Thomas

Created: 2003-02-24 20:30:06 UTC

Size: 7.29 KB

patch

obsolete

>diff -urN mail/imp3.orig/Makefile mail/imp3/Makefile
>--- mail/imp3.orig/Makefile	Mon Feb 24 03:56:33 2003
>+++ mail/imp3/Makefile	Mon Feb 24 21:12:02 2003
>@@ -6,8 +6,7 @@
> #
> 
> PORTNAME=	imp
>-PORTVERSION=	3.1
>-PORTREVISION=	3
>+PORTVERSION=	3.2
> CATEGORIES=	mail www
> MASTER_SITES=	ftp://ftp.horde.org/pub/imp/				\
> 		ftp://ftp.au.horde.org/pub/horde/imp/			\
>@@ -19,8 +18,6 @@
> MAINTAINER=	thierry@pompo.net
> COMMENT=	A webmail system which accesses mail over IMAP
> 
>-WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
>-
> #-----------------------------------------------------------------------
> # You may define these options:
> #
>@@ -128,6 +125,8 @@
> NO_BUILD=	yes
> USE_REINPLACE=	yes
> 
>+LDD=		/usr/bin/ldd
>+
> REINPLACE_ARGS=	-i.beforeIMP
> DOCS=		COPYING README docs/CHANGES docs/CREDITS docs/INSTALL
> CONFFILE=	conf.php filter.txt header.txt html.php menu.php \
>@@ -148,6 +147,7 @@
> HCONFDIR=	${HORDEDIR}/config
> 
> HORDE_INC=	${LOCALBASE}/etc/horde
>+PHPSO?=		${LOCALBASE}/libexec/apache/libphp4.so
> 
> HOSTNAME?=	`/bin/hostname`
> SERVOS?=	${OPSYS}-${OSREL}
>@@ -174,7 +174,7 @@
> 	    ${ECHO_MSG} "" ; \
> 	    ${FALSE} ; \
> 	fi
>-	@if ! ${LDCONFIG} -r | ${GREP} -q -e "c-client4.8"; then \
>+	@if ! ${LDD} ${PHPSO} | ${GREP} -q -e "libc-client4"; then \
> 	    ${ECHO_MSG} "" ; \
> 	    ${ECHO_MSG} "Please configure PHP with IMAP or IMAP-SSL support." ; \
> 	    ${ECHO_MSG} "" ; \
>@@ -192,14 +192,14 @@
> .endif
> .if !defined(WITHOUT_LDAP)
> .if defined(WITH_LDAP1)
>-	@if ! ${LDCONFIG} -r | ${GREP} -q -e "ldap.1"; then \
>+	@if ! ${LDD} ${PHPSO} | ${GREP} -q -e "libldap.so.1"; then \
> 	    ${ECHO_MSG} "" ; \
> 	    ${ECHO_MSG} "Please configure PHP with OpenLDAP support." ; \
> 	    ${ECHO_MSG} "" ; \
> 	    ${FALSE} ; \
> 	fi
> .else
>-	@if ! ${LDCONFIG} -r | ${GREP} -q -e "ldap.2"; then \
>+	@if ! ${LDD} ${PHPSO} | ${GREP} -q -e "libldap.so.2"; then \
> 	    ${ECHO_MSG} "" ; \
> 	    ${ECHO_MSG} "Please configure PHP with OpenLDAP2 support." ; \
> 	    ${ECHO_MSG} "" ; \
>@@ -208,7 +208,7 @@
> .endif
> .endif
> .if !defined(NOCRYPT)
>-	@if ! ${LDCONFIG} -r | ${GREP} -q -e "mcrypt.8"; then \
>+	@if ! ${LDD} ${PHPSO} | ${GREP} -q -e "libmcrypt.so.8"; then \
> 	    ${ECHO_MSG} "" ; \
> 	    ${ECHO_MSG} "Please configure PHP with mcrypt support." ; \
> 	    ${ECHO_MSG} "" ; \
>@@ -216,10 +216,10 @@
> 	fi
> .endif
> .if !defined(WITHOUT_SUPPORTED_DB)
>-	@if ! ${LDCONFIG} -r | ${GREP} -q -e "mysqlclient.10" ; then \
>-	 if ! ${LDCONFIG} -r | ${GREP} -q -e "pq.3" ; then \
>-	  if ! ${LDCONFIG} -r | ${GREP} -q -e "sybdb.1" ; then \
>-	   if ! ${LDCONFIG} -r | ${GREP} -q -e "ct.0" ; then \
>+	@if ! ${LDD} ${PHPSO} | ${GREP} -q -e "libmysqlclient.so.10"; then \
>+	 if ! ${LDD} ${PHPSO} | ${GREP} -q -e "libpq.so.3" ; then \
>+	  if ! ${LDD} ${PHPSO} | ${GREP} -q -e "libsybdb.so.1" ; then \
>+	   if ! ${LDD} ${PHPSO} | ${GREP} -q -e "libct.so.0" ; then \
> 	    ${ECHO_MSG} "" ; \
> 	    ${ECHO_MSG} "Please configure PHP with a database support." ; \
> 	    ${ECHO_MSG} "MySQL, PostgreSQL and Sybase (CTLIB or DBLIB)" ; \
>diff -urN mail/imp3.orig/distinfo mail/imp3/distinfo
>--- mail/imp3.orig/distinfo	Tue Jun 18 09:42:58 2002
>+++ mail/imp3/distinfo	Mon Feb 24 19:11:21 2003
>@@ -1 +1 @@
>-MD5 (imp-3.1.tar.gz) = 73ff42a32e3ee3617fd411be356cb70f
>+MD5 (imp-3.2.tar.gz) = f40c9cb7e65516837f08692803f295ea
>diff -urN mail/imp3.orig/pkg-plist mail/imp3/pkg-plist
>--- mail/imp3.orig/pkg-plist	Tue Jun 18 09:42:58 2002
>+++ mail/imp3/pkg-plist	Mon Feb 24 20:42:29 2003
>@@ -44,6 +44,7 @@
> %%IMPDIR%%/graphics/draft.gif
> %%IMPDIR%%/graphics/empty_trash.gif
> %%IMPDIR%%/graphics/expand.gif
>+%%IMPDIR%%/graphics/favicon.ico
> %%IMPDIR%%/graphics/fetchmail.gif
> %%IMPDIR%%/graphics/filters.gif
> %%IMPDIR%%/graphics/first-grey.gif
>@@ -68,6 +69,7 @@
> %%IMPDIR%%/graphics/lock.gif
> %%IMPDIR%%/graphics/manage_attachments.gif
> %%IMPDIR%%/graphics/mime/html.gif
>+%%IMPDIR%%/graphics/mime/image.gif
> %%IMPDIR%%/graphics/mime/text.gif
> %%IMPDIR%%/graphics/next-grey.gif
> %%IMPDIR%%/graphics/next.gif
>@@ -86,6 +88,7 @@
> %%IMPDIR%%/identities.php
> %%IMPDIR%%/index.php
> %%IMPDIR%%/lib/.htaccess
>+%%IMPDIR%%/lib/Browser.php
> %%IMPDIR%%/lib/Folder.php
> %%IMPDIR%%/lib/IMP.php
> %%IMPDIR%%/lib/Identity/IMP.php
>@@ -95,6 +98,7 @@
> %%IMPDIR%%/lib/Maintenance/imp.php
> %%IMPDIR%%/lib/MIME/Viewer/html.php
> %%IMPDIR%%/lib/MIME/Viewer/enriched.php
>+%%IMPDIR%%/lib/MIME/Viewer/images.php
> %%IMPDIR%%/lib/MIME/Viewer/text.php
> %%IMPDIR%%/lib/Message.php
> %%IMPDIR%%/lib/Tree.php
>@@ -103,6 +107,9 @@
> %%IMPDIR%%/lib/constants.php
> %%IMPDIR%%/lib/version.php
> %%IMPDIR%%/locale/.htaccess
>+%%IMPDIR%%/locale/bg_BG/LC_MESSAGES/imp.mo
>+%%IMPDIR%%/locale/ca_ES/LC_MESSAGES/imp.mo
>+%%IMPDIR%%/locale/ca_ES/help.xml
> %%IMPDIR%%/locale/cs_CZ/LC_MESSAGES/imp.mo
> %%IMPDIR%%/locale/cs_CZ/help.xml
> %%IMPDIR%%/locale/da_DK/LC_MESSAGES/imp.mo
>@@ -127,6 +134,8 @@
> %%IMPDIR%%/locale/ja_JP/LC_MESSAGES/imp.mo
> %%IMPDIR%%/locale/ko_KR/LC_MESSAGES/imp.mo
> %%IMPDIR%%/locale/ko_KR/help.xml
>+%%IMPDIR%%/locale/lt_LT/LC_MESSAGES/imp.mo
>+%%IMPDIR%%/locale/lv_LV/LC_MESSAGES/imp.mo
> %%IMPDIR%%/locale/nb_NO/LC_MESSAGES/imp.mo
> %%IMPDIR%%/locale/nb_NO/help.xml
> %%IMPDIR%%/locale/nl_NL/LC_MESSAGES/imp.mo
>@@ -138,6 +147,7 @@
> %%IMPDIR%%/locale/pt_BR/help.xml
> %%IMPDIR%%/locale/pt_PT/LC_MESSAGES/imp.mo
> %%IMPDIR%%/locale/pt_PT/help.xml
>+%%IMPDIR%%/locale/ro_RO/LC_MESSAGES/imp.mo
> %%IMPDIR%%/locale/ru_RU/LC_MESSAGES/imp.mo
> %%IMPDIR%%/locale/ru_RU/help.xml
> %%IMPDIR%%/locale/ru_RU.KOI8-R/LC_MESSAGES/imp.mo
>@@ -160,6 +170,8 @@
> %%IMPDIR%%/po/.htaccess
> %%IMPDIR%%/po/Makefile
> %%IMPDIR%%/po/README
>+%%IMPDIR%%/po/bg_BG.po
>+%%IMPDIR%%/po/ca_ES.po
> %%IMPDIR%%/po/cs_CZ.po
> %%IMPDIR%%/po/da_DK.po
> %%IMPDIR%%/po/de_DE.po
>@@ -170,15 +182,19 @@
> %%IMPDIR%%/po/fi_FI.po
> %%IMPDIR%%/po/fr_FR.po
> %%IMPDIR%%/po/hu_HU.po
>+%%IMPDIR%%/po/imp.pot
> %%IMPDIR%%/po/it_IT.po
> %%IMPDIR%%/po/ja_JP.po
> %%IMPDIR%%/po/ko_KR.po
>+%%IMPDIR%%/po/lt_LT.po
>+%%IMPDIR%%/po/lv_LV.po
> %%IMPDIR%%/po/nb_NO.po
> %%IMPDIR%%/po/nl_NL.po
> %%IMPDIR%%/po/nn_NO.po
> %%IMPDIR%%/po/pl_PL.po
> %%IMPDIR%%/po/pt_BR.po
> %%IMPDIR%%/po/pt_PT.po
>+%%IMPDIR%%/po/ro_RO.po
> %%IMPDIR%%/po/ru_RU.po
> %%IMPDIR%%/po/ru_RU.KOI8-R.po
> %%IMPDIR%%/po/shtool
>@@ -197,6 +213,7 @@
> %%IMPDIR%%/scripts/imp-cleanup.cron
> %%IMPDIR%%/scripts/imp2horde.pl
> %%IMPDIR%%/scripts/imp2turba.pl
>+%%IMPDIR%%/scripts/singlescript.php
> %%IMPDIR%%/search.php
> %%IMPDIR%%/spelling.php
> %%IMPDIR%%/status.php
>@@ -267,6 +284,10 @@
> @dirrm %%IMPDIR%%/lib/Maintenance/Task
> @dirrm %%IMPDIR%%/lib/Maintenance
> @dirrm %%IMPDIR%%/lib
>+@dirrm %%IMPDIR%%/locale/bg_BG/LC_MESSAGES
>+@dirrm %%IMPDIR%%/locale/bg_BG
>+@dirrm %%IMPDIR%%/locale/ca_ES/LC_MESSAGES
>+@dirrm %%IMPDIR%%/locale/ca_ES
> @dirrm %%IMPDIR%%/locale/cs_CZ/LC_MESSAGES
> @dirrm %%IMPDIR%%/locale/cs_CZ
> @dirrm %%IMPDIR%%/locale/da_DK/LC_MESSAGES
>@@ -293,6 +314,10 @@
> @dirrm %%IMPDIR%%/locale/ja_JP
> @dirrm %%IMPDIR%%/locale/ko_KR/LC_MESSAGES
> @dirrm %%IMPDIR%%/locale/ko_KR
>+@dirrm %%IMPDIR%%/locale/lt_LT/LC_MESSAGES
>+@dirrm %%IMPDIR%%/locale/lt_LT
>+@dirrm %%IMPDIR%%/locale/lv_LV/LC_MESSAGES
>+@dirrm %%IMPDIR%%/locale/lv_LV
> @dirrm %%IMPDIR%%/locale/nb_NO/LC_MESSAGES
> @dirrm %%IMPDIR%%/locale/nb_NO
> @dirrm %%IMPDIR%%/locale/nl_NL/LC_MESSAGES
>@@ -305,6 +330,8 @@
> @dirrm %%IMPDIR%%/locale/pt_BR
> @dirrm %%IMPDIR%%/locale/pt_PT/LC_MESSAGES
> @dirrm %%IMPDIR%%/locale/pt_PT
>+@dirrm %%IMPDIR%%/locale/ro_RO/LC_MESSAGES
>+@dirrm %%IMPDIR%%/locale/ro_RO
> @dirrm %%IMPDIR%%/locale/ru_RU/LC_MESSAGES
> @dirrm %%IMPDIR%%/locale/ru_RU
> @dirrm %%IMPDIR%%/locale/ru_RU.KOI8-R/LC_MESSAGES

Actions: View | Diff

Attachments on bug 48645: 29066