From d39b9c8f62df2448be70478957c401b476df3eae Mon Sep 17 00:00:00 2001 From: ijliao Date: Wed, 28 Nov 2001 20:55:42 +0000 Subject: upgrade to 1.1.5 handle gnome correctly --- editors/poedit/Makefile | 17 ++++++++++++----- editors/poedit/distinfo | 3 ++- editors/poedit/files/patch-install::Makefile.in | 22 ++++++++++++++-------- editors/poedit/pkg-plist | 5 +++-- 4 files changed, 31 insertions(+), 16 deletions(-) diff --git a/editors/poedit/Makefile b/editors/poedit/Makefile index 3a48068..d50cc5e 100644 --- a/editors/poedit/Makefile +++ b/editors/poedit/Makefile @@ -7,22 +7,29 @@ # PORTNAME= poedit -PORTVERSION= 1.0.3 +PORTVERSION= 1.1.5 CATEGORIES= editors MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= ${PORTNAME} +PATCH_SITES= ${MASTER_SITES} +PATCHFILES= poedit-1.1.5-wxwin-2.3.1.patch MAINTAINER= ijliao@FreeBSD.org BUILD_DEPENDS= zip:${PORTSDIR}/archivers/zip LIB_DEPENDS= intl.1:${PORTSDIR}/devel/gettext \ - wx_gtk.2:${PORTSDIR}/x11-toolkits/wxgtk + wx_gtk.2:${PORTSDIR}/x11-toolkits/wxgtk \ + db3:${PORTSDIR}/databases/db3 +PATCH_DIST_ARGS= -d ${PATCH_WRKSRC} -E ${PATCH_DIST_STRIP} -p1 USE_X_PREFIX= yes +WANT_GNOME= yes GNU_CONFIGURE= yes - +CONFIGURE_ENV= CPPFLAGS="${CXXFLAGS} -I${LOCALBASE}/include" \ + LIBS="-L${LOCALBASE}/lib -liconv" USE_GMAKE= yes -WANT_GNOME= yes + +.include .if defined(HAVE_GNOME) USE_GNOME= yes @@ -30,4 +37,4 @@ USE_GNOME= yes CONFIGURE_ARGS= --without-gnome .endif -.include +.include diff --git a/editors/poedit/distinfo b/editors/poedit/distinfo index 87f7aa0..bc6771d 100644 --- a/editors/poedit/distinfo +++ b/editors/poedit/distinfo @@ -1 +1,2 @@ -MD5 (poedit-1.0.3.tar.gz) = 87cea627b2644ada54a328449938eb05 +MD5 (poedit-1.1.5.tar.gz) = b0fea841ee24f9f4cdcc3673138a6a05 +MD5 (poedit-1.1.5-wxwin-2.3.1.patch) = 840912cd70e8182adab34d8cdbaa1e60 diff --git a/editors/poedit/files/patch-install::Makefile.in b/editors/poedit/files/patch-install::Makefile.in index 3e10001..70dc029 100644 --- a/editors/poedit/files/patch-install::Makefile.in +++ b/editors/poedit/files/patch-install::Makefile.in @@ -1,13 +1,19 @@ ---- install/Makefile.in.orig Tue Mar 27 13:41:45 2001 -+++ install/Makefile.in Tue Mar 27 13:42:15 2001 -@@ -197,8 +197,8 @@ +--- install/Makefile.in.orig Sun Nov 25 01:15:33 2001 ++++ install/Makefile.in Sun Nov 25 01:16:56 2001 +@@ -206,13 +206,13 @@ + @USE_GNOME_TRUE@install-gnome: @USE_GNOME_TRUE@ mkdir -p $(GNOME_DATA_DIR)/pixmaps - @USE_GNOME_TRUE@ install -m 644 $(top_srcdir)/src/bitmaps/appicon.xpm $(GNOME_DATA_DIR)/pixmaps/poedit.xpm -@USE_GNOME_TRUE@ mkdir -p $(GNOME_DATA_DIR)/gnome/apps/Development --@USE_GNOME_TRUE@ install -m 644 $(srcdir)/poedit.desktop $(GNOME_DATA_DIR)/gnome/apps/Development +@USE_GNOME_TRUE@ mkdir -p $(GNOME_DATA_DIR)/apps/Development -+@USE_GNOME_TRUE@ install -m 644 $(srcdir)/poedit.desktop $(GNOME_DATA_DIR)/apps/Development @USE_GNOME_TRUE@ mkdir -p $(GNOME_DATA_DIR)/mime-info - @USE_GNOME_TRUE@ install -m 644 $(srcdir)/poedit.mime $(GNOME_DATA_DIR)/mime-info - @USE_GNOME_TRUE@ install -m 644 poedit.keys $(GNOME_DATA_DIR)/mime-info + @USE_GNOME_TRUE@ if test -w $(GNOME_DATA_DIR)/pixmaps ; then \ + @USE_GNOME_TRUE@ install -m 644 $(top_srcdir)/src/appicon.xpm $(GNOME_DATA_DIR)/pixmaps/poedit.xpm; \ + @USE_GNOME_TRUE@ fi +-@USE_GNOME_TRUE@ if test -w $(GNOME_DATA_DIR)/gnome/apps/Development ; then \ +-@USE_GNOME_TRUE@ install -m 644 $(srcdir)/poedit.desktop $(GNOME_DATA_DIR)/gnome/apps/Development; \ ++@USE_GNOME_TRUE@ if test -w $(GNOME_DATA_DIR)/apps/Development ; then \ ++@USE_GNOME_TRUE@ install -m 644 $(srcdir)/poedit.desktop $(GNOME_DATA_DIR)/apps/Development; \ + @USE_GNOME_TRUE@ fi + @USE_GNOME_TRUE@ if test -w $(GNOME_DATA_DIR)/mime-info ; then \ + @USE_GNOME_TRUE@ install -m 644 $(srcdir)/poedit.mime $(GNOME_DATA_DIR)/mime-info; \ diff --git a/editors/poedit/pkg-plist b/editors/poedit/pkg-plist index 9618131..e54e216 100644 --- a/editors/poedit/pkg-plist +++ b/editors/poedit/pkg-plist @@ -3,5 +3,6 @@ bin/poedit %%GNOME:%%share/gnome/mime-info/poedit.keys %%GNOME:%%share/gnome/mime-info/poedit.mime %%GNOME:%%share/gnome/pixmaps/poedit.xpm -share/poedit/poedit_help.htb -@dirrm share/poedit +%%GNOME:%%share/gnome/poedit/help.zip +%%GNOME:%%share/gnome/poedit/resources.zip +@dirrm share/gnome/poedit -- cgit v1.1