Index: head/editors/Makefile =================================================================== --- head/editors/Makefile (revision 59143) +++ head/editors/Makefile (revision 59144) @@ -1,162 +1,163 @@ # $FreeBSD$ # SUBDIR += AbiWord SUBDIR += aee SUBDIR += apel SUBDIR += apel-emacs19 SUBDIR += apel-emacs20 SUBDIR += apel-mule SUBDIR += apel-xemacs21-mule SUBDIR += asedit SUBDIR += axe SUBDIR += beav SUBDIR += biew SUBDIR += bitmap SUBDIR += bitmap-emacs20 SUBDIR += bitmap-mule SUBDIR += boiling-egg SUBDIR += bpatch SUBDIR += bvi SUBDIR += chexedit SUBDIR += color-mate SUBDIR += cooledit SUBDIR += custom-emacs SUBDIR += custom-mule SUBDIR += dedit SUBDIR += dte SUBDIR += e3 SUBDIR += e93 SUBDIR += edith SUBDIR += elvis SUBDIR += em SUBDIR += emacs SUBDIR += emacs20 SUBDIR += emacs20-dl SUBDIR += emacs20-mule-devel SUBDIR += emacs21 SUBDIR += eshell-emacs20 SUBDIR += fb SUBDIR += fine SUBDIR += flim SUBDIR += flim-emacs20 SUBDIR += flim-xemacs21-mule SUBDIR += flim113 SUBDIR += flim113-emacs19 SUBDIR += flim113-emacs20 SUBDIR += flim113-mule SUBDIR += flim113-xemacs21-mule SUBDIR += fte SUBDIR += gate SUBDIR += gedit + SUBDIR += gedit2 SUBDIR += ghex SUBDIR += glimmer SUBDIR += gmanedit SUBDIR += gnotepad+ SUBDIR += gnuserv-emacs20 SUBDIR += gxedit SUBDIR += hexcurse SUBDIR += hexedit SUBDIR += hexpert SUBDIR += hnb SUBDIR += hte SUBDIR += iiimecf SUBDIR += impress SUBDIR += jed SUBDIR += jedit SUBDIR += jext SUBDIR += joe SUBDIR += joe-devel SUBDIR += jove SUBDIR += koffice SUBDIR += koffice-kde3 SUBDIR += kxmleditor SUBDIR += le SUBDIR += led SUBDIR += leim20 SUBDIR += leim21 SUBDIR += lfhex SUBDIR += lpe SUBDIR += manedit SUBDIR += mg SUBDIR += moleskine SUBDIR += mp SUBDIR += muggy SUBDIR += mule SUBDIR += mule-common SUBDIR += nano SUBDIR += nedit SUBDIR += nvi-devel SUBDIR += nvi-m17n SUBDIR += nvi-perl SUBDIR += offix-editor SUBDIR += openoffice SUBDIR += openoffice-devel SUBDIR += pico SUBDIR += poedit SUBDIR += psgml SUBDIR += psgml-emacs19 SUBDIR += psgml-emacs20 SUBDIR += psgml-mule SUBDIR += psgml-xemacs21-mule SUBDIR += sam SUBDIR += scite SUBDIR += semi SUBDIR += semi-emacs20 SUBDIR += semi-xemacs21-mule SUBDIR += semi113 SUBDIR += semi113-emacs19 SUBDIR += semi113-emacs20 SUBDIR += semi113-mule SUBDIR += semi113-xemacs21-mule SUBDIR += speedbar SUBDIR += speedbar-emacs20 SUBDIR += staroffice5 SUBDIR += staroffice52 SUBDIR += staroffice52-pt SUBDIR += staroffice60 SUBDIR += sted SUBDIR += tamago SUBDIR += tamago-emacs20 SUBDIR += ted SUBDIR += texmacs SUBDIR += textedit SUBDIR += the SUBDIR += thoteditor SUBDIR += uemacs SUBDIR += uzap SUBDIR += ved SUBDIR += vigor SUBDIR += vile SUBDIR += vilearn SUBDIR += vim SUBDIR += vim-lite SUBDIR += vim5 SUBDIR += vim6+ruby SUBDIR += wily SUBDIR += wordperfect SUBDIR += xcoral SUBDIR += xed SUBDIR += xemacs-additional-packages SUBDIR += xemacs-basic-mule-packages SUBDIR += xemacs-comm-packages SUBDIR += xemacs-devel SUBDIR += xemacs-devel-mule SUBDIR += xemacs-games-packages SUBDIR += xemacs-libs-packages SUBDIR += xemacs-mule-packages SUBDIR += xemacs-oa-packages SUBDIR += xemacs-packages SUBDIR += xemacs-prog-packages SUBDIR += xemacs-wp-packages SUBDIR += xemacs21 SUBDIR += xemacs21-mule SUBDIR += xemacs21-mule-common SUBDIR += xemacs21-mule-sumo SUBDIR += xemacs21-sumo SUBDIR += xenon SUBDIR += xvile SUBDIR += yudit SUBDIR += zile .include Property changes on: head/editors/Makefile ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.190 \ No newline at end of property +1.191 \ No newline at end of property Index: head/editors/gedit2/Makefile =================================================================== --- head/editors/gedit2/Makefile (revision 59143) +++ head/editors/gedit2/Makefile (revision 59144) @@ -1,37 +1,38 @@ -# New ports collection makefile for: gedit -# Date created: 4 May 1999 -# Whom: Andrey Zakhvatov +# New ports collection makefile for: gedit2 +# Date created: 14 May 2002 +# Whom: Joe Marcus Clarke # # $FreeBSD$ # -PORTNAME= gedit -PORTVERSION= 0.9.7 -PORTREVISION= 1 +PORTNAME= gedit2 +PORTVERSION= 1.118.0 CATEGORIES= editors gnome MASTER_SITES= ${MASTER_SITE_GNOME} -MASTER_SITE_SUBDIR= stable/sources/gedit +MASTER_SITE_SUBDIR= pre-gnome2/releases/gnome-2.0-desktop-20020509 +DIST_SUBDIR= gnome2 MAINTAINER= gnome@FreeBSD.org -BUILD_DEPENDS= msgfmt-old:${PORTSDIR}/devel/gettext-old +LIB_DEPENDS= gnomeprintui-2.0:${PORTSDIR}/x11-toolkits/libgnomeprintui +WRKSRC= ${WRKDIR}/gedit-${PORTVERSION} + +USE_BZIP2= yes USE_X_PREFIX= yes USE_GMAKE= yes -USE_GNOME= yes -GNU_CONFIGURE= yes +USE_LIBTOOL= yes +CONFIGURE_ARGS= --localstatedir=${PREFIX}/share/gnome \ + --datadir=${PREFIX}/share/gnome CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ - LIBS="-L${LOCALBASE}/lib" \ - MSGFMT="${LOCALBASE}/bin/msgfmt-old" \ - XGETTEXT="${LOCALBASE}/bin/xgettext-old" - -MAN1= gedit.1 + LIBS="-L${LOCALBASE}/lib" +CONFIGURE_TARGET= --target=${MACHINE_ARCH}-unknown-freebsd${OSREL} pre-patch: @${PERL} -pi -e 's|-lpthread|${PTHREAD_LIBS}|g ; \ s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure @find ${WRKSRC} -name "Makefile.in" | xargs ${PERL} -pi -e \ 's|\$\(datadir\)/gnome/|\$\(datadir\)/|g ; \ s|\$\(datadir\)/locale|\$\(prefix\)/share/locale|g' .include Property changes on: head/editors/gedit2/Makefile ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.37 \ No newline at end of property +1.38 \ No newline at end of property Index: head/editors/gedit2/distinfo =================================================================== --- head/editors/gedit2/distinfo (revision 59143) +++ head/editors/gedit2/distinfo (revision 59144) @@ -1 +1 @@ -MD5 (gedit-0.9.7.tar.gz) = a02667dd67e46efdbdb6f875442506b1 +MD5 (gnome2/gedit2-1.118.0.tar.bz2) = 28ad57362d6c562962a7312b8a185644 Property changes on: head/editors/gedit2/distinfo ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.14 \ No newline at end of property +1.15 \ No newline at end of property Index: head/editors/gedit2/files/patch-ai =================================================================== --- head/editors/gedit2/files/patch-ai (revision 59143) +++ head/editors/gedit2/files/patch-ai (nonexistent) @@ -1,11 +0,0 @@ ---- po/Makefile.in.in.orig Tue Apr 18 14:25:43 2000 -+++ po/Makefile.in.in Wed Apr 19 19:06:53 2000 -@@ -19,7 +19,7 @@ - prefix = @prefix@ - exec_prefix = @exec_prefix@ - datadir = $(prefix)/@DATADIRNAME@ --localedir = $(datadir)/locale -+localedir = $(prefix)/share/locale - gnulocaledir = $(prefix)/share/locale - gettextsrcdir = $(prefix)/share/gettext/po - subdir = po Property changes on: head/editors/gedit2/files/patch-ai ___________________________________________________________________ Deleted: cvs2svn:cvs-rev ## -1 +0,0 ## -1.1 \ No newline at end of property Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Index: head/editors/gedit2/files/patch-an =================================================================== --- head/editors/gedit2/files/patch-an (revision 59143) +++ head/editors/gedit2/files/patch-an (nonexistent) @@ -1,8 +0,0 @@ ---- app-docs.make.orig Fri May 5 14:35:51 2000 -+++ app-docs.make Sun Jun 11 11:11:24 2000 -@@ -1,4 +1,4 @@ --helpdir = $(datadir)/gnome/help/$(app)/$(lang) -+helpdir = $(datadir)/help/$(app)/$(lang) - help_DATA = \ - index.html \ - topic.dat \ Property changes on: head/editors/gedit2/files/patch-an ___________________________________________________________________ Deleted: cvs2svn:cvs-rev ## -1 +0,0 ## -1.1 \ No newline at end of property Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Index: head/editors/gedit2/files/patch-ltmain.sh =================================================================== --- head/editors/gedit2/files/patch-ltmain.sh (revision 59143) +++ head/editors/gedit2/files/patch-ltmain.sh (nonexistent) @@ -1,28 +0,0 @@ - -$FreeBSD$ - ---- ltmain.sh 2001/08/27 09:51:26 1.1 -+++ ltmain.sh 2001/08/27 09:51:42 -@@ -2408,6 +2408,9 @@ - *-*-netbsd*) - # Don't link with libc until the a.out ld.so is fixed. - ;; -+ *-*-freebsd*) -+ # FreeBSD doesn't need this... -+ ;; - *) - # Add libc to deplibs on all other systems if necessary. - if test "$build_libtool_need_lc" = "yes"; then -@@ -4175,10 +4178,12 @@ - fi - - # Install the pseudo-library for information purposes. -+ if /usr/bin/false; then - name=`$echo "X$file" | $Xsed -e 's%^.*/%%'` - instname="$dir/$name"i - $show "$install_prog $instname $destdir/$name" - $run eval "$install_prog $instname $destdir/$name" || exit $? -+ fi - - # Maybe install the static library, too. - test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library" Property changes on: head/editors/gedit2/files/patch-ltmain.sh ___________________________________________________________________ Deleted: cvs2svn:cvs-rev ## -1 +0,0 ## -1.4 \ No newline at end of property Deleted: svn:keywords ## -1 +0,0 ## -FreeBSD=%H \ No newline at end of property Index: head/editors/gedit2/files/patch-ao =================================================================== --- head/editors/gedit2/files/patch-ao (revision 59143) +++ head/editors/gedit2/files/patch-ao (revision 59144) @@ -1,56 +1,88 @@ ---- plugins/browse/Makefile.in.orig Sun Jun 11 03:00:15 2000 -+++ plugins/browse/Makefile.in Sun Jun 11 11:15:17 2000 -@@ -138,3 +138,3 @@ +--- plugins/cvschangelog/Makefile.in.orig Wed May 15 00:20:07 2002 ++++ plugins/cvschangelog/Makefile.in Wed May 15 00:20:22 2002 +@@ -138,7 +138,7 @@ + CPPFLAGS = @CPPFLAGS@ + LDFLAGS = @LDFLAGS@ LIBS = @LIBS@ --libbrowse_la_LDFLAGS = -+libbrowse_la_LDFLAGS = -avoid-version - libbrowse_la_LIBADD = ---- plugins/convert/Makefile.in.orig Sun Jun 11 03:00:17 2000 -+++ plugins/convert/Makefile.in Sun Jun 11 11:15:25 2000 -@@ -147,3 +147,3 @@ +-libcvschangelog_la_LDFLAGS = ++libcvschangelog_la_LDFLAGS = -avoid-version + libcvschangelog_la_LIBADD = + libcvschangelog_la_OBJECTS = cvschangelog.lo + CFLAGS = @CFLAGS@ +--- plugins/ASCII/Makefile.in.orig Wed May 15 00:20:47 2002 ++++ plugins/ASCII/Makefile.in Wed May 15 00:20:55 2002 +@@ -143,7 +143,7 @@ + CPPFLAGS = @CPPFLAGS@ + LDFLAGS = @LDFLAGS@ LIBS = @LIBS@ --libconvert_la_LDFLAGS = -+libconvert_la_LDFLAGS = -avoid-version - libconvert_la_LIBADD = ---- plugins/diff/Makefile.in.orig Sun Jul 9 17:12:13 2000 -+++ plugins/diff/Makefile.in Mon Jul 10 09:32:42 2000 -@@ -144,3 +144,3 @@ +-libasciitable_la_LDFLAGS = ++libasciitable_la_LDFLAGS = -avoid-version + libasciitable_la_LIBADD = + libasciitable_la_OBJECTS = ascii.lo + CFLAGS = @CFLAGS@ +--- plugins/diff/Makefile.in.orig Wed May 15 00:21:11 2002 ++++ plugins/diff/Makefile.in Wed May 15 00:21:20 2002 +@@ -143,7 +143,7 @@ + CPPFLAGS = @CPPFLAGS@ + LDFLAGS = @LDFLAGS@ LIBS = @LIBS@ -libdiff_la_LDFLAGS = +libdiff_la_LDFLAGS = -avoid-version libdiff_la_LIBADD = ---- plugins/email/Makefile.in.orig Sun Jun 11 03:00:16 2000 -+++ plugins/email/Makefile.in Sun Jun 11 11:15:33 2000 -@@ -147,3 +147,3 @@ + libdiff_la_OBJECTS = diff.lo + CFLAGS = @CFLAGS@ +--- plugins/docinfo/Makefile.in.orig Wed May 15 00:21:29 2002 ++++ plugins/docinfo/Makefile.in Wed May 15 00:21:36 2002 +@@ -143,7 +143,7 @@ + CPPFLAGS = @CPPFLAGS@ + LDFLAGS = @LDFLAGS@ LIBS = @LIBS@ --libemail_la_LDFLAGS = -+libemail_la_LDFLAGS = -avoid-version - libemail_la_LIBADD = ---- plugins/reverse/Makefile.in.orig Sun Jun 11 03:00:18 2000 -+++ plugins/reverse/Makefile.in Sun Jun 11 11:15:40 2000 -@@ -140,3 +140,3 @@ +-libdocinfo_la_LDFLAGS = ++libdocinfo_la_LDFLAGS = -avoid-version + libdocinfo_la_LIBADD = + libdocinfo_la_OBJECTS = docinfo.lo + CFLAGS = @CFLAGS@ +--- plugins/sample/Makefile.in.orig Wed May 15 00:21:44 2002 ++++ plugins/sample/Makefile.in Wed May 15 00:21:51 2002 +@@ -138,7 +138,7 @@ + CPPFLAGS = @CPPFLAGS@ + LDFLAGS = @LDFLAGS@ LIBS = @LIBS@ --libreverse_la_LDFLAGS = -+libreverse_la_LDFLAGS = -avoid-version - libreverse_la_LIBADD = ---- plugins/sample/Makefile.in.orig Sun Jul 9 17:12:15 2000 -+++ plugins/sample/Makefile.in Mon Jul 10 09:33:18 2000 -@@ -140,3 +140,3 @@ - LIBS = @LIBS@ -libsample_la_LDFLAGS = +libsample_la_LDFLAGS = -avoid-version libsample_la_LIBADD = ---- plugins/shell_output/Makefile.in.orig Sun Jul 9 17:12:19 2000 -+++ plugins/shell_output/Makefile.in Mon Jul 10 09:38:40 2000 -@@ -147,3 +147,3 @@ + libsample_la_OBJECTS = sample.lo + CFLAGS = @CFLAGS@ +--- plugins/shell_output/Makefile.in.orig Wed May 15 00:21:58 2002 ++++ plugins/shell_output/Makefile.in Wed May 15 00:22:05 2002 +@@ -143,7 +143,7 @@ + CPPFLAGS = @CPPFLAGS@ + LDFLAGS = @LDFLAGS@ LIBS = @LIBS@ -libshell_output_la_LDFLAGS = +libshell_output_la_LDFLAGS = -avoid-version libshell_output_la_LIBADD = ---- plugins/time/Makefile.in.orig Sun Jul 9 17:12:16 2000 -+++ plugins/time/Makefile.in Mon Jul 10 09:33:38 2000 -@@ -140,3 +140,3 @@ + libshell_output_la_OBJECTS = shell_output.lo + CFLAGS = @CFLAGS@ +--- plugins/taglist/Makefile.in.orig Wed May 15 00:22:12 2002 ++++ plugins/taglist/Makefile.in Wed May 15 00:22:18 2002 +@@ -145,7 +145,7 @@ + CPPFLAGS = @CPPFLAGS@ + LDFLAGS = @LDFLAGS@ LIBS = @LIBS@ +-libtaglist_la_LDFLAGS = ++libtaglist_la_LDFLAGS = -avoid-version + libtaglist_la_LIBADD = + libtaglist_la_OBJECTS = gedit-taglist-plugin-parser.lo \ + gedit-taglist-plugin-window.lo gedit-taglist-plugin.lo +--- plugins/time/Makefile.in.orig Wed May 15 00:22:24 2002 ++++ plugins/time/Makefile.in Wed May 15 00:22:30 2002 +@@ -143,7 +143,7 @@ + CPPFLAGS = @CPPFLAGS@ + LDFLAGS = @LDFLAGS@ + LIBS = @LIBS@ -libtime_la_LDFLAGS = +libtime_la_LDFLAGS = -avoid-version libtime_la_LIBADD = + libtime_la_OBJECTS = time.lo + CFLAGS = @CFLAGS@ Property changes on: head/editors/gedit2/files/patch-ao ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.3 \ No newline at end of property +1.4 \ No newline at end of property Index: head/editors/gedit2/files/patch-configure =================================================================== --- head/editors/gedit2/files/patch-configure (nonexistent) +++ head/editors/gedit2/files/patch-configure (revision 59144) @@ -0,0 +1,23 @@ +--- configure.orig Wed May 15 00:43:11 2002 ++++ configure Wed May 15 00:45:35 2002 +@@ -6547,6 +6547,7 @@ + + # This can be used to rebuild libtool when needed + LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh" ++$ac_aux_dir/ltconfig $LIBTOOL_DEPS + + # Always use our own libtool. + LIBTOOL='$(SHELL) $(top_builddir)/libtool' +@@ -9358,10 +9359,10 @@ + pixmapsdir="${ac_default_prefix}/${DATADIRNAME}/${PACKAGE}/pixmaps" + else + cat >>confdefs.h <