diff options
| author | mikeh <mikeh@FreeBSD.org> | 2004-05-21 11:22:42 +0800 |
|---|---|---|
| committer | mikeh <mikeh@FreeBSD.org> | 2004-05-21 11:22:42 +0800 |
| commit | 79365646e5509e8d119ed57fa6052c4529fdc22e (patch) | |
| tree | c382ff92edfdbfdf03fdef1e7713caee801bf8c3 | |
| parent | d18205fe9b98a80a3851786582f743edab6d83d1 (diff) | |
| download | freebsd-ports-gnome-79365646e5509e8d119ed57fa6052c4529fdc22e.tar.gz freebsd-ports-gnome-79365646e5509e8d119ed57fa6052c4529fdc22e.tar.zst freebsd-ports-gnome-79365646e5509e8d119ed57fa6052c4529fdc22e.zip | |
Remove conflict with qt3 by back-porting a patch from the next
release.
Repeatedly reminded by: Conrad Sabatier <conrads@cox.net> ;-)
| -rw-r--r-- | mail/xfmail/Makefile | 4 | ||||
| -rw-r--r-- | mail/xfmail/files/patch-ab | 49 | ||||
| -rw-r--r-- | mail/xfmail/pkg-plist | 6 |
3 files changed, 53 insertions, 6 deletions
diff --git a/mail/xfmail/Makefile b/mail/xfmail/Makefile index 8a827a33a020..e8a75bd9b9e8 100644 --- a/mail/xfmail/Makefile +++ b/mail/xfmail/Makefile @@ -7,7 +7,7 @@ PORTNAME= xfmail PORTVERSION= 1.5.5 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= mail MASTER_SITES= ftp://xfmail.cfreeze.com/pub/xfmail/release/%SUBDIR%/ \ ftp://ftp.welcomes-you.com/pub/xfmail/release/%SUBDIR%/ \ @@ -20,8 +20,6 @@ COMMENT= An X Window System application for receiving electronic mail LIB_DEPENDS= forms.1:${PORTSDIR}/x11-toolkits/xforms \ gdbm.3:${PORTSDIR}/databases/gdbm -CONFLICTS= qt-3.* - USE_BZIP2= yes USE_GNOME= glib12 USE_GMAKE= yes diff --git a/mail/xfmail/files/patch-ab b/mail/xfmail/files/patch-ab new file mode 100644 index 000000000000..158be4ec13a7 --- /dev/null +++ b/mail/xfmail/files/patch-ab @@ -0,0 +1,49 @@ +Index: src/editor/.cvsignore +=================================================================== +RCS file: /cvsroot/archimedes/xfmail/src/editor/.cvsignore,v +retrieving revision 1.1 +diff -u -r1.1 .cvsignore +--- src/editor/.cvsignore 21 Jun 2003 05:15:34 -0000 1.1 ++++ src/editor/.cvsignore 21 May 2004 03:04:43 -0000 +@@ -1,6 +1,6 @@ + .deps + .libs + *.lo +-libeditor.la ++libxfeditor.la + Makefile + Makefile.in +Index: src/editor/Makefile.am +=================================================================== +RCS file: /cvsroot/archimedes/xfmail/src/editor/Makefile.am,v +retrieving revision 1.7 +diff -u -r1.7 Makefile.am +--- src/editor/Makefile.am 11 Nov 2003 05:12:08 -0000 1.7 ++++ src/editor/Makefile.am 21 May 2004 03:04:43 -0000 +@@ -1,8 +1,8 @@ + # $Id: Makefile.am,v 1.7 2003/11/11 05:12:08 fesnel Exp $ + +-lib_LTLIBRARIES = libeditor.la ++lib_LTLIBRARIES = libxfeditor.la + +-libeditor_la_SOURCES = \ ++libxfeditor_la_SOURCES = \ + fl_edit.cpp \ + textbuf.cpp + +Index: src/ui/Makefile.am +=================================================================== +RCS file: /cvsroot/archimedes/xfmail/src/ui/Makefile.am,v +retrieving revision 1.18 +diff -u -r1.18 Makefile.am +--- src/ui/Makefile.am 11 Nov 2003 05:12:09 -0000 1.18 ++++ src/ui/Makefile.am 21 May 2004 03:04:43 -0000 +@@ -43,7 +43,7 @@ + @LDAP_LIBS@ \ + @SOUND_LIBS@ \ + ../mail/libmail.la \ +- ../editor/libeditor.la ++ ../editor/libxfeditor.la + + INCLUDES = -I$(top_srcdir)/data -I$(top_srcdir)/src/editor -I$(top_srcdir)/src/mail + diff --git a/mail/xfmail/pkg-plist b/mail/xfmail/pkg-plist index 1469a2ca43ad..aa4510cc0989 100644 --- a/mail/xfmail/pkg-plist +++ b/mail/xfmail/pkg-plist @@ -1,7 +1,7 @@ bin/xfmail -lib/libeditor.a -lib/libeditor.so -lib/libeditor.so.0 +lib/libxfeditor.a +lib/libxfeditor.so +lib/libxfeditor.so.0 lib/libmail.a lib/libmail.so lib/libmail.so.0 |