Date: Wed, 9 May 2001 15:56:57 +0400 From: "Sergey A. Osokin" <osa@freebsd.org.ru> To: Alexander Langer <alex@big.endian.de> Cc: ports@FreeBSD.org Subject: Re: ports/27085: mail/stuphead update to 0.5.2 Message-ID: <20010509155657.A7517@freebsd.org.ru> In-Reply-To: <20010509124158.A69654@zerogravity.kawo2.rwth-aachen.d>; from alex@big.endian.de on Wed, May 09, 2001 at 12:41:58PM %2B0200 References: <200105091000.f49A0aB50873@freefall.freebsd.org> <20010509141247.B91187@freebsd.org.ru> <20010509122656.A14460@zerogravity.kawo2.rwth-aachen.d> <20010509143637.A98086@freebsd.org.ru> <20010509124158.A69654@zerogravity.kawo2.rwth-aachen.d>
next in thread | previous in thread | raw e-mail | index | archive | help
--nFreZHaLTZJo0R7j Content-Type: text/plain; charset=us-ascii Content-Disposition: inline On Wed, May 09, 2001 at 12:41:58PM +0200, Alexander Langer wrote: > Thus spake Sergey A. Osokin (osa@freebsd.org.ru): > > > If you find some incompatibilities - please tell me and then i try to > > make a new port/patch/send-pr. > > Can you maybe run your patch against the current port's directory and > check, if it still builds fine? > > I can then test/commit it. OK. New patch attached. Sorry, at first time i can't understand what may wrong.. -- Rgdz, /"\ Sergey Osokin aka oZZ, \ / ASCII RIBBON CAMPAIGN osa@freebsd.org.ru X AGAINST HTML MAIL http://freebsd.org.ru/~osa/ / \ --nFreZHaLTZJo0R7j Content-Type: text/plain; charset=us-ascii Content-Disposition: attachment; filename=patch-stuphead diff -ruN stuphead.old/Makefile stuphead/Makefile --- stuphead.old/Makefile Wed May 9 15:43:23 2001 +++ stuphead/Makefile Wed May 9 15:51:34 2001 @@ -6,21 +6,54 @@ # PORTNAME= stuphead -PORTVERSION= 0.4.9 -PORTREVISION= 1 +PORTVERSION= 0.5.2 CATEGORIES= mail gnome MASTER_SITES= http://stuphead.antex.ru/ +PATCH_SITES= ${MASTER_SITES} +PATCHFILES= ${PORTNAME}-${PORTVERSION}.patch + MAINTAINER= ozz@FreeBSD.org.ru +LIB_DEPENDS= iconv.2:${PORTSDIR}/converters/iconv + USE_BZIP2= yes USE_X_PREFIX= yes USE_GMAKE= yes -USE_GNOME= yes +USE_GTK= yes USE_LIBTOOL= yes +CONFIGURE_ARGS= --enable-threads \ + --prefix=${PREFIX} + +.if defined (WITH_PIXBUF) +LIB_DEPENDS+= gdk_pixbuf.2:${PORTSDIR}/graphics/gdk-pixbuf +.else +CONFIGURE_ARGS+= --disable-gdk-pixbuf \ + --disable-gdk_pixbuftest +.endif + +.if defined (WITH_GNOME) +USE_GNOME= yes +CONFIGURE_ARGS+= --enable-gnome +.else +CONFIGURE_ARGS+= --disable-imlib \ + --disable-imlibtest +.endif + +.if defined (WITH_MOZILLA) +CONFIGURE_ARGS+= --enable-mozilla +BUILD_DEPENDS+= ${PREFIX}/include/mozilla/gtkmozembed.h:${PORTSDIR}/www/mozilla-headers +RUN_DEPENDS+= ${PREFIX}/bin/mozilla:${PORTSDIR}/www/mozilla +.endif + +.if defined (WITH_ISPELL) +RUN_DEPENDS+= ${LOCALBASE}/bin/ispell-ru:${PORTSDIR}/russian/rus-ispell +.endif pre-patch: @${PERL} -pi -e 's#DATADIRNAME=lib#DATADIRNAME=share#g' \ + ${WRKSRC}/configure + @${PERL} -pi -e 's#/usr/bin/gnome-config#$(PREFIX)/bin/gnome-config#g' \ ${WRKSRC}/configure .include <bsd.port.mk> diff -ruN stuphead.old/distinfo stuphead/distinfo --- stuphead.old/distinfo Wed May 9 15:43:23 2001 +++ stuphead/distinfo Fri May 4 19:37:22 2001 @@ -1 +1,2 @@ -MD5 (stuphead-0.4.9.tar.bz2) = e219e37acf90c462e3f1a0c63a1546f3 +MD5 (stuphead-0.5.2.tar.bz2) = 1e4024b142f10a73a08da0035867c03a +MD5 (stuphead-0.5.2.patch) = aeb8d2ea39e7c00910ecdcb8fbc622b2 diff -ruN stuphead.old/files/patch-Makefile.in stuphead/files/patch-Makefile.in --- stuphead.old/files/patch-Makefile.in Thu Jan 1 03:00:00 1970 +++ stuphead/files/patch-Makefile.in Fri May 4 19:57:29 2001 @@ -0,0 +1,17 @@ +--- Makefile.in.orig Fri May 4 19:56:35 2001 ++++ Makefile.in Fri May 4 19:57:01 2001 +@@ -424,11 +424,11 @@ + -rm -rf $(distdir) + + install-data-local: +- @INSTALL@ -d -m755 $(GNOME_DATADIR)/gnome/apps/Internet +- @INSTALL@ -m644 stuphead.desktop $(GNOME_DATADIR)/gnome/apps/Internet ++ @INSTALL@ -d -m755 $(GNOME_DATADIR)/apps/Internet ++ @INSTALL@ -m644 stuphead.desktop $(GNOME_DATADIR)/apps/Internet + + uninstall-local: +- rm -f $(GNOME_DATADIR)/gnome/apps/Internet/stuphead.desktop ++ rm -f $(GNOME_DATADIR)/apps/Internet/stuphead.desktop + + # Tell versions [3.59,3.63) of GNU make to not export all variables. + # Otherwise a system limit (for SysV at least) may be exceeded. diff -ruN stuphead.old/files/patch-src::main.h stuphead/files/patch-src::main.h --- stuphead.old/files/patch-src::main.h Thu Jan 1 03:00:00 1970 +++ stuphead/files/patch-src::main.h Fri May 4 21:06:53 2001 @@ -0,0 +1,14 @@ +--- src/main.h.orig Fri May 4 20:46:11 2001 ++++ src/main.h Fri May 4 20:46:57 2001 +@@ -71,9 +71,9 @@ + #define DEFAULT_INC_PROGRAM "inc" + /* #define DEFAULT_INC_PATH "/usr/bin/imget" */ + /* #define DEFAULT_INC_PROGRAM "imget" */ +-#define DEFAULT_SPOOL_PATH "/var/spool/mail" ++#define DEFAULT_SPOOL_PATH "/var/mail" + +-#define DEFAULT_ISPELL_COMMAND "ispell -d russian -a" ++#define DEFAULT_ISPELL_COMMAND "ispell-ru -a" + + #define BUFFSIZE 8192 + #define MAXPATHLEN 4095 diff -ruN stuphead.old/files/patch-src::stuphead stuphead/files/patch-src::stuphead --- stuphead.old/files/patch-src::stuphead Thu Jan 1 03:00:00 1970 +++ stuphead/files/patch-src::stuphead Fri May 4 19:14:52 2001 @@ -0,0 +1,11 @@ +--- src/stuphead.orig Fri May 4 19:12:38 2001 ++++ src/stuphead Fri May 4 19:13:57 2001 +@@ -15,6 +15,8 @@ + MOZILLA_HOME=/usr/local/lib/mozilla + elif [ -f ~/mozilla/libgtkembedmoz.so ]; then + MOZILLA_HOME=~/mozilla ++elif [ -f /usr/X11R6/lib/mozilla/libgtkembedmoz.so ]; then ++ MOZILLA_HOME=/usr/X11R6/lib/mozilla + fi + + LD_LIBRARY_PATH=$MOZILLA_HOME:$LD_LIBRARY_PATH diff -ruN stuphead.old/pkg-descr stuphead/pkg-descr --- stuphead.old/pkg-descr Wed May 9 15:43:23 2001 +++ stuphead/pkg-descr Fri May 4 19:39:15 2001 @@ -1,4 +1,4 @@ -Russian mailer stuphead 0.4.9. -Based on Sylpheed 0.4.1 Copyright(C) 1999,2000 Hiroyuki Yamamoto <hiro-y@kcn.ne.jp> +Russian mailer stuphead based on Sylpheed 0.4.1 +Copyright(C) 1999,2000 Hiroyuki Yamamoto <hiro-y@kcn.ne.jp> WWW: http://stuphead.antex.ru/ diff -ruN stuphead.old/pkg-plist stuphead/pkg-plist --- stuphead.old/pkg-plist Wed May 9 15:43:23 2001 +++ stuphead/pkg-plist Fri May 4 17:08:26 2001 @@ -1,3 +1,6 @@ bin/stuphead +bin/stupheadbin share/locale/fr/LC_MESSAGES/stuphead.mo share/locale/ru/LC_MESSAGES/stuphead.mo +share/pixmaps/stuphead.xpm +share/gnome/apps/Internet/stuphead.desktop --nFreZHaLTZJo0R7j-- To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20010509155657.A7517>