ports/50517: update: anjuta update and fix omf stuff
Koop Mast
einekoai at chello.nl
Tue Apr 1 10:20:03 UTC 2003
>Number: 50517
>Category: ports
>Synopsis: update: anjuta update and fix omf stuff
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: update
>Submitter-Id: current-users
>Arrival-Date: Tue Apr 01 02:20:01 PST 2003
>Closed-Date:
>Last-Modified:
>Originator: Koop Mast
>Release: FreeBSD 5.0-CURRENT i386
>Organization:
>Environment:
System: FreeBSD prisma.quccc.org 5.0-CURRENT FreeBSD 5.0-CURRENT #1: Tue Mar 4 16:00:21 CET 2003 root at prisma.quccc.org:/usr/obj/usr/src/sys/RAINBOW i386
>Description:
Update to 1.0.2.
Add omf registering/unregistering.
>How-To-Repeat:
>Fix:
--- anjuta.diff begins here ---
diff -ruN anjuta.orig/Makefile anjuta/Makefile
--- anjuta.orig/Makefile Mon Mar 3 21:06:40 2003
+++ anjuta/Makefile Tue Apr 1 11:54:13 2003
@@ -6,8 +6,7 @@
#
PORTNAME= anjuta
-PORTVERSION= 1.0.1
-PORTREVISION= 1
+PORTVERSION= 1.0.2
CATEGORIES= devel gnome
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= anjuta
@@ -15,7 +14,8 @@
MAINTAINER= gnome at FreeBSD.org
COMMENT= Integrated Development Environment for C and C++
-LIB_DEPENDS= scintilla.1:${PORTSDIR}/x11-toolkits/scintilla
+LIB_DEPENDS= scintilla.1:${PORTSDIR}/x11-toolkits/scintilla \
+ pcre.0:${PORTSDIR}/devel/pcre
USE_X_PREFIX= yes
USE_GMAKE= yes
diff -ruN anjuta.orig/distinfo anjuta/distinfo
--- anjuta.orig/distinfo Thu Feb 27 16:12:54 2003
+++ anjuta/distinfo Fri Mar 28 15:11:12 2003
@@ -1 +1 @@
-MD5 (anjuta-1.0.1.tar.gz) = 2666a6b6a70918ec178ab6e3dee89fe3
+MD5 (anjuta-1.0.2.tar.gz) = e7dc6520265fd8099d22927a6763a26b
diff -ruN anjuta.orig/files/patch-Makefile.in anjuta/files/patch-Makefile.in
--- anjuta.orig/files/patch-Makefile.in Thu Feb 27 16:12:54 2003
+++ anjuta/files/patch-Makefile.in Fri Mar 28 09:17:47 2003
@@ -1,6 +1,6 @@
---- Makefile.in.orig Thu Feb 20 08:41:48 2003
-+++ Makefile.in Thu Feb 20 08:43:33 2003
-@@ -172,9 +172,9 @@
+--- Makefile.in.orig Fri Mar 28 09:16:24 2003
++++ Makefile.in Fri Mar 28 09:17:36 2003
+@@ -176,9 +176,9 @@
am__quote = @am__quote@
install_sh = @install_sh@
@@ -12,7 +12,7 @@
anjutadocdir = ${prefix}/@NO_PREFIX_PACKAGE_DOC_DIR@
-@@ -589,7 +589,7 @@
+@@ -592,7 +592,7 @@
info-am:
diff -ruN anjuta.orig/files/patch-configure anjuta/files/patch-configure
--- anjuta.orig/files/patch-configure Wed Nov 6 02:38:52 2002
+++ anjuta/files/patch-configure Sat Mar 29 09:27:48 2003
@@ -1,6 +1,6 @@
---- configure.orig Mon Nov 4 03:12:17 2002
-+++ configure Tue Nov 5 15:17:37 2002
-@@ -16186,6 +16186,7 @@
+--- configure.orig Tue Mar 25 09:35:14 2003
++++ configure Sat Mar 29 09:27:42 2003
+@@ -16315,6 +16315,7 @@
packagesrcdir=`cd $srcdir && pwd`
@@ -8,7 +8,7 @@
if test "x${prefix}" = "xNONE"; then
packageprefix=${ac_default_prefix}
-@@ -16193,11 +16194,11 @@
+@@ -16322,11 +16323,11 @@
packageprefix=${prefix}
fi
@@ -22,16 +22,16 @@
packagehelpdir=share/gnome/help/${PACKAGE}
packagemenudir=share/gnome/apps
packageplugindir=lib/${PACKAGE}
-@@ -16261,7 +16262,7 @@
+@@ -16390,7 +16391,7 @@
_ACEOF
--ac_config_files="$ac_config_files Makefile intl/Makefile po/Makefile.in macros/Makefile macros2/Makefile tagmanager/Makefile tagmanager/include/Makefile global-tags/Makefile scintilla/Makefile widgets/Makefile printing/Makefile manuals/Makefile omf-install/Makefile scintilla/include/Makefile manuals/C/Makefile manuals/C/anjuta-tutorial/Makefile manuals/C/anjuta-manual/Makefile manuals/C/anjuta-faqs/Makefile manuals/ja/Makefile manuals/ja/anjuta-manual/Makefile manuals/ja/anjuta-faqs/Makefile anjuta.spec src/Makefile pixmaps/Makefile data/Makefile data/welcome.txt data/properties/Makefile doc/anjuta.1 doc/anjuta_launcher.1 doc/Makefile scripts/Makefile scripts/anjuta_import.sh launcher/Makefile plugins/Makefile plugins/sample1/Makefile plugins/class-gen/Makefile plugins/patch/Makefile anjuta.desktop.in"
-+ac_config_files="$ac_config_files Makefile intl/Makefile po/Makefile.in macros/Makefile macros2/Makefile tagmanager/Makefile tagmanager/include/Makefile global-tags/Makefile widgets/Makefile printing/Makefile manuals/Makefile omf-install/Makefile manuals/C/Makefile manuals/C/anjuta-tutorial/Makefile manuals/C/anjuta-manual/Makefile manuals/C/anjuta-faqs/Makefile manuals/ja/Makefile manuals/ja/anjuta-manual/Makefile manuals/ja/anjuta-faqs/Makefile anjuta.spec src/Makefile pixmaps/Makefile data/Makefile data/welcome.txt data/properties/Makefile doc/anjuta.1 doc/anjuta_launcher.1 doc/Makefile scripts/Makefile scripts/anjuta_import.sh launcher/Makefile plugins/Makefile plugins/sample1/Makefile plugins/class-gen/Makefile plugins/patch/Makefile anjuta.desktop.in"
+-ac_config_files="$ac_config_files Makefile intl/Makefile po/Makefile.in macros/Makefile macros2/Makefile tagmanager/Makefile tagmanager/include/Makefile global-tags/Makefile scintilla/Makefile widgets/Makefile printing/Makefile manuals/Makefile omf-install/Makefile scintilla/include/Makefile manuals/C/Makefile manuals/C/anjuta-tutorial/Makefile manuals/C/anjuta-manual/Makefile manuals/C/anjuta-faqs/Makefile manuals/ja/Makefile manuals/ja/anjuta-manual/Makefile manuals/ja/anjuta-faqs/Makefile anjuta.spec src/Makefile pixmaps/Makefile data/Makefile data/welcome.txt data/properties/Makefile doc/anjuta.1 doc/anjuta_launcher.1 doc/Makefile scripts/Makefile scripts/anjuta_import.sh scripts/anjuta_first_run.sh launcher/Makefile plugins/Makefile plugins/sample1/Makefile plugins/class-gen/Makefile plugins/patch/Makefile anjuta.desktop.in"
++ac_config_files="$ac_config_files Makefile intl/Makefile po/Makefile.in macros/Makefile macros2/Makefile tagmanager/Makefile tagmanager/include/Makefile global-tags/Makefile widgets/Makefile printing/Makefile manuals/Makefile omf-install/Makefile manuals/C/Makefile manuals/C/anjuta-tutorial/Makefile manuals/C/anjuta-manual/Makefile manuals/C/anjuta-faqs/Makefile manuals/ja/Makefile manuals/ja/anjuta-manual/Makefile manuals/ja/anjuta-faqs/Makefile anjuta.spec src/Makefile pixmaps/Makefile data/Makefile data/welcome.txt data/properties/Makefile doc/anjuta.1 doc/anjuta_launcher.1 doc/Makefile scripts/Makefile scripts/anjuta_import.sh scripts/anjuta_first_run.sh launcher/Makefile plugins/Makefile plugins/sample1/Makefile plugins/class-gen/Makefile plugins/patch/Makefile anjuta.desktop.in"
cat >confcache <<\_ACEOF
# This file is a shell script that caches the results of configure
# tests run on this system so they can be shared between configure
-@@ -16801,12 +16802,10 @@
+@@ -16930,12 +16931,10 @@
"tagmanager/Makefile" ) CONFIG_FILES="$CONFIG_FILES tagmanager/Makefile" ;;
"tagmanager/include/Makefile" ) CONFIG_FILES="$CONFIG_FILES tagmanager/include/Makefile" ;;
"global-tags/Makefile" ) CONFIG_FILES="$CONFIG_FILES global-tags/Makefile" ;;
@@ -44,7 +44,7 @@
"manuals/C/Makefile" ) CONFIG_FILES="$CONFIG_FILES manuals/C/Makefile" ;;
"manuals/C/anjuta-tutorial/Makefile" ) CONFIG_FILES="$CONFIG_FILES manuals/C/anjuta-tutorial/Makefile" ;;
"manuals/C/anjuta-manual/Makefile" ) CONFIG_FILES="$CONFIG_FILES manuals/C/anjuta-manual/Makefile" ;;
-@@ -17002,6 +17001,7 @@
+@@ -17132,6 +17131,7 @@
s, at GNOME_APPLETS_LIBS@,$GNOME_APPLETS_LIBS,;t t
s, at GNOME_DOCKLETS_LIBS@,$GNOME_DOCKLETS_LIBS,;t t
s, at GNOME_CAPPLET_LIBS@,$GNOME_CAPPLET_LIBS,;t t
diff -ruN anjuta.orig/files/patch-data::Makefile.in anjuta/files/patch-data::Makefile.in
--- anjuta.orig/files/patch-data::Makefile.in Wed Nov 6 02:38:52 2002
+++ anjuta/files/patch-data::Makefile.in Fri Mar 28 09:20:08 2003
@@ -1,6 +1,6 @@
---- data/Makefile.in.orig Tue Nov 5 16:39:59 2002
-+++ data/Makefile.in Tue Nov 5 17:01:01 2002
-@@ -190,10 +190,10 @@
+--- data/Makefile.in.orig Fri Mar 28 09:18:26 2003
++++ data/Makefile.in Fri Mar 28 09:19:51 2003
+@@ -196,10 +196,10 @@
autogen.sh.wxwin
@@ -13,14 +13,3 @@
anjuta_mimelnk_DATA = x-anjuta-project.desktop
MACROS = \
-@@ -555,8 +555,8 @@
- @rm -f system.tags
-
- system.tags:
-- cd $(top_builddir)/tagmanager && make libctags.a
-- cd $(top_builddir)/global-tags && make system.tags
-+ cd $(top_builddir)/tagmanager && $(MAKE) libctags.a
-+ cd $(top_builddir)/global-tags && $(MAKE) system.tags
- mv $(top_builddir)/global-tags/system.tags .
- # 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 anjuta.orig/files/patch-src-Makefile.in anjuta/files/patch-src-Makefile.in
--- anjuta.orig/files/patch-src-Makefile.in Thu Feb 27 16:12:54 2003
+++ anjuta/files/patch-src-Makefile.in Fri Mar 28 09:23:45 2003
@@ -1,15 +1,15 @@
---- src/Makefile.in.orig Thu Feb 20 09:05:39 2003
-+++ src/Makefile.in Thu Feb 20 09:12:13 2003
-@@ -177,7 +177,7 @@
- $(GNOME_INCLUDEDIR)\
- $(EXTRA_GNOME_CFLAGS)\
+--- src/Makefile.in.orig Fri Mar 28 09:20:58 2003
++++ src/Makefile.in Fri Mar 28 09:23:15 2003
+@@ -183,7 +183,7 @@
$(EXTRA_ORBIT_CFLAGS)\
+ $(PCRE_CFLAGS)\
+ $(FREEBSD_BUILD)\
- -I$(srcdir)/../scintilla/include \
+ -I$(prefix)/include/scintilla \
-I$(srcdir)/../tagmanager/include \
-I$(srcdir)/../widgets \
-I$(srcdir)/../pixmaps \
-@@ -185,31 +185,8 @@
+@@ -191,31 +191,8 @@
-I.. -I. -DPACKAGE_BIN_DIR=\"$(bindir)\"
@@ -43,10 +43,10 @@
bin_PROGRAMS = anjuta
-@@ -413,10 +390,10 @@
- $(GNOMEUI_LIBS)\
+@@ -423,10 +400,10 @@
$(EXTRA_GNOME_LIBS)\
$(EXTRA_ORBIT_LIBS)\
+ $(PCRE_LIBS)\
- $(top_builddir)/scintilla/libscintilla.a\
$(top_builddir)/tagmanager/libctags.a\
$(top_builddir)/widgets/libwidgets.a\
@@ -55,9 +55,9 @@
$(SCILEXERS)
-@@ -489,22 +466,7 @@
- defaults.$(OBJEXT) resources.$(OBJEXT) session.$(OBJEXT) \
- widget-registry.$(OBJEXT)
+@@ -500,22 +477,7 @@
+ compatibility_0.$(OBJEXT) defaults.$(OBJEXT) \
+ resources.$(OBJEXT) session.$(OBJEXT) widget-registry.$(OBJEXT)
anjuta_OBJECTS = $(am_anjuta_OBJECTS)
-anjuta_DEPENDENCIES = $(top_builddir)/scintilla/libscintilla.a \
- $(top_builddir)/tagmanager/libctags.a \
@@ -75,7 +75,7 @@
- ../scintilla/LexBaan.o ../scintilla/LexMatlab.o \
- ../scintilla/LexAsm.o ../scintilla/LexFortran.o \
- ../scintilla/LexCSS.o
-+anjuta_DEPENDENCIES =
++anjuta_DEPENDENCIES =
anjuta_LDFLAGS =
DEFS = @DEFS@
diff -ruN anjuta.orig/pkg-plist anjuta/pkg-plist
--- anjuta.orig/pkg-plist Thu Feb 27 16:12:54 2003
+++ anjuta/pkg-plist Tue Apr 1 11:47:40 2003
@@ -1,4 +1,5 @@
bin/anjuta
+bin/anjuta_first_run.sh
bin/anjuta_import.sh
bin/anjuta_launcher
lib/anjuta/libanjuta_clsGen.so
@@ -58,6 +59,7 @@
share/gnome/anjuta/gnome2/gnome-x-checks.m4
share/gnome/anjuta/gnome2/linger.m4
share/gnome/anjuta/header.c
+share/gnome/anjuta/licence.txt
share/gnome/anjuta/properties/ada.properties
share/gnome/anjuta/properties/anjuta.properties
share/gnome/anjuta/properties/asm.properties
@@ -81,6 +83,7 @@
share/gnome/anjuta/properties/others.properties
share/gnome/anjuta/properties/pascal.properties
share/gnome/anjuta/properties/perl.properties
+share/gnome/anjuta/properties/php.properties
share/gnome/anjuta/properties/props.properties
share/gnome/anjuta/properties/python.properties
share/gnome/anjuta/properties/rc.properties
@@ -246,10 +249,15 @@
share/gnome/mime-info/anjuta.mime
share/gnome/mimelnk/application/x-anjuta-project.desktop
share/gnome/omf/anjuta/anjuta-faqs-C.omf
+ at exec scrollkeeper-install -q %D/share/gnome/omf/anjuta/anjuta-faqs-C.omf 2>/dev/null || /usr/bin/true
share/gnome/omf/anjuta/anjuta-faqs-ja_JP.eucJP.omf
+ at exec scrollkeeper-install -q %D/share/gnome/omf/anjuta/anjuta-faqs-ja_JP.eucJP.omf 2>/dev/null || /usr/bin/true
share/gnome/omf/anjuta/anjuta-manual-C.omf
+ at exec scrollkeeper-install -q %D/share/gnome/omf/anjuta/anjuta-manual-C.omf 2>/dev/null || /usr/bin/true
share/gnome/omf/anjuta/anjuta-manual-ja_JP.eucJP.omf
+ at exec scrollkeeper-install -q %D/share/gnome/omf/anjuta/anjuta-manual-ja_JP.eucJP.omf 2>/dev/null || /usr/bin/true
share/gnome/omf/anjuta/anjuta-tutorial-C.omf
+ at exec scrollkeeper-install -q %D/share/gnome/omf/anjuta/anjuta-tutorial-C.omf 2>/dev/null || /usr/bin/true
share/gnome/pixmaps/anjuta/add.xpm
share/gnome/pixmaps/anjuta/an_tag.xpm
share/gnome/pixmaps/anjuta/anjuta_icon.png
@@ -455,3 +463,8 @@
@dirrm share/gnome/anjuta/gnome
@dirrm share/gnome/anjuta
@dirrm lib/anjuta
+ at unexec scrollkeeper-uninstall -q %D/share/gnome/omf/anjuta/anjuta-faqs-C.omf 2>/dev/null || /usr/bin/true
+ at unexec scrollkeeper-uninstall -q %D/share/gnome/omf/anjuta/anjuta-faqs-ja_JP.eucJP.omf 2>/dev/null || /usr/bin/true
+ at unexec scrollkeeper-uninstall -q %D/share/gnome/omf/anjuta/anjuta-manual-C.omf 2>/dev/null || /usr/bin/true
+ at unexec scrollkeeper-uninstall -q %D/share/gnome/omf/anjuta/anjuta-manual-ja_JP.eucJP.omf 2>/dev/null || /usr/bin/true
+ at unexec scrollkeeper-uninstall -q %D/share/gnome/omf/anjuta/anjuta-tutorial-C.omf 2>/dev/null || /usr/bin/true
--- anjuta.diff ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
More information about the freebsd-ports-bugs
mailing list