diff options
| author | ade <ade@FreeBSD.org> | 2000-06-01 16:10:38 +0000 |
|---|---|---|
| committer | ade <ade@FreeBSD.org> | 2000-06-01 16:10:38 +0000 |
| commit | c80474a686b27c75ee1f2c966739964a2785fe64 (patch) | |
| tree | d578597dbfbb7fffe625b67026a2b9b9df052556 | |
| parent | 753ae011bb2fbb67800578e67e72ad9f35385219 (diff) | |
| download | FreeBSD-ports-c80474a686b27c75ee1f2c966739964a2785fe64.zip FreeBSD-ports-c80474a686b27c75ee1f2c966739964a2785fe64.tar.gz | |
Say hello to GNOME 1.2
audio/gnomemedia 1.2.0
deskutils/gnomepim 1.2.0
devel/bugbuddy 1.0
devel/glade 0.5.9
devel/libgtop 1.0.9
games/gnomegames 1.2.0
graphics/imlib 1.9.8.1
misc/gnomeusersguide 1.2
misc/gnomeutils 1.2.0
sysutils/gnomecontrolcenter 1.2.0
sysutils/gtop 1.0.8
x11-fm/gmomemc 4.5.50
x11/gnomecore 1.2.0
x11/gnomelibs 1.2.1
Along with cosmetic changes to other parts of the metaport
for the new shared library version numbers.
Plus. The metaport has been reworked to bring in a few more
often-requested items.
Please note that you absolutely need GTK/GLIB 1.2.8 or higher
for this release.
166 files changed, 3610 insertions, 2955 deletions
diff --git a/audio/gnome-media/Makefile b/audio/gnome-media/Makefile index 927b46d..ef180ff 100644 --- a/audio/gnome-media/Makefile +++ b/audio/gnome-media/Makefile @@ -6,7 +6,7 @@ # PORTNAME= gnomemedia -PORTVERSION= 1.0.51 +PORTVERSION= 1.2.0 CATEGORIES= audio gnome MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= stable/sources/gnome-media @@ -22,8 +22,7 @@ USE_GMAKE= yes USE_LIBTOOL= yes CONFIGURE_ARGS= --without-ncurses \ --localstatedir=${PREFIX}/share/gnome \ - --datadir=${PREFIX}/share/gnome \ - --with-gnome=${PREFIX} + --datadir=${PREFIX}/share/gnome CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LIBS="-L${LOCALBASE}/lib" diff --git a/audio/gnome-media/distinfo b/audio/gnome-media/distinfo index dd5df81..311191f 100644 --- a/audio/gnome-media/distinfo +++ b/audio/gnome-media/distinfo @@ -1 +1 @@ -MD5 (gnome-media-1.0.51.tar.gz) = d52772de47b214d9fc48aea75108cce7 +MD5 (gnome-media-1.2.0.tar.gz) = c7cda6054b47f71aa46aaabe9db6fb4c diff --git a/audio/gnome-media/files/patch-ac b/audio/gnome-media/files/patch-ac index d8c3aeb..d234ced 100644 --- a/audio/gnome-media/files/patch-ac +++ b/audio/gnome-media/files/patch-ac @@ -1,76 +1,67 @@ ---- vu-meter/Makefile.in.orig Wed Mar 3 12:35:57 1999 -+++ vu-meter/Makefile.in Wed Mar 3 12:36:25 1999 -@@ -116,9 +116,9 @@ - ZVT_LIBS = @ZVT_LIBS@ - l = @l@ +--- cddbslave/Makefile.in.orig Wed May 24 14:53:10 2000 ++++ cddbslave/Makefile.in Tue May 30 15:13:02 2000 +@@ -125,3 +125,3 @@ --Audiodir = $(datadir)/gnome/apps/Multimedia -+Audiodir = $(datadir)/apps/Multimedia +-INCLUDES = -I$(includedir) $(GNOME_INCLUDEDIR) -DGNOMELOCALEDIR=\""$(datadir)/locale"\" ++INCLUDES = -I$(includedir) $(GNOME_INCLUDEDIR) -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" --INCLUDES = -DGNOMELOCALEDIR=\""$(datadir)/locale"\" $(GNOME_INCLUDEDIR) -+INCLUDES = -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" $(GNOME_INCLUDEDIR) +@@ -139,3 +139,3 @@ +-gnomedatadir = $(datadir)/gnome ++gnomedatadir = $(datadir) - bin_PROGRAMS = vumeter ---- gmix/Makefile.in.orig Wed Sep 22 03:11:25 1999 -+++ gmix/Makefile.in Fri Sep 24 11:55:02 1999 -@@ -123,12 +123,12 @@ - cxxflags_set = @cxxflags_set@ - l = @l@ +--- gmix/Makefile.in.orig Wed May 24 14:53:13 2000 ++++ gmix/Makefile.in Tue May 30 15:11:42 2000 +@@ -125,3 +125,3 @@ -Audiodir = $(datadir)/gnome/apps/Multimedia +Audiodir = $(datadir)/apps/Multimedia pixmapdir = $(datadir)/pixmaps +@@ -131,3 +131,3 @@ - EXTRA_DIST = README TODO NEWS gmix.desktop gnome-mixer.png +-INCLUDES = -DGNOMELOCALEDIR=\""$(datadir)/locale"\" $(GNOME_INCLUDEDIR) -DGNOME_ICONDIR=\""$(pixmapdir)"\" ++INCLUDES = -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" $(GNOME_INCLUDEDIR) -DGNOME_ICONDIR=\""$(pixmapdir)"\" + +--- grecord/Makefile.in.orig Wed May 24 14:53:19 2000 ++++ grecord/Makefile.in Tue May 30 15:39:21 2000 +@@ -130,3 +130,3 @@ --INCLUDES = -DGNOMELOCALEDIR=\""$(datadir)/locale"\" $(GNOME_INCLUDEDIR) -+INCLUDES = -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" $(GNOME_INCLUDEDIR) +-Applicationsdir = $(datadir)/gnome/apps/Multimedia ++Applicationsdir = $(datadir)/apps/Multimedia + Applications_DATA = Soundrecorder.desktop +--- grecord/src/Makefile.in.orig Wed May 24 14:53:21 2000 ++++ grecord/src/Makefile.in Tue May 30 15:39:42 2000 +@@ -125,3 +125,3 @@ +-INCLUDES = -DGNOMELOCALEDIR=\""$(datadir)/locale"\" -I$(top_srcdir)/intl $(GNOME_INCLUDEDIR) -DGNOME_ICONDIR=\""$(datadir)/pixmaps"\" ++INCLUDES = -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" -I$(top_srcdir)/intl $(GNOME_INCLUDEDIR) -DGNOME_ICONDIR=\""$(datadir)/pixmaps"\" - bin_PROGRAMS = gmix ---- tcd/Makefile.in.orig Tue Oct 5 12:29:27 1999 -+++ tcd/Makefile.in Sun Jan 30 23:10:53 2000 -@@ -123,7 +123,7 @@ - cxxflags_set = @cxxflags_set@ - l = @l@ +--- tcd/Makefile.in.orig Wed May 24 14:53:16 2000 ++++ tcd/Makefile.in Tue May 30 15:12:38 2000 +@@ -125,3 +125,3 @@ -Audiodir = $(datadir)/gnome/apps/Multimedia +Audiodir = $(datadir)/apps/Multimedia - - EXTRA_DIST = README TODO NEWS gtcd.desktop - -@@ -144,11 +144,11 @@ - gtcd_LDADD = $(GNOME_LIBDIR) $(GNOMEUI_LIBS) $(INTLLIBS) - + Pixmapdir = $(datadir)/pixmaps +@@ -147,3 +147,3 @@ -tcd_LDADD = $(GNOME_LIBDIR) -lglib -lm $(CURSES_LIBS) $(INTLLIBS) -+tcd_LDADD = `${GLIB_CONFIG} --libs` -lm $(CURSES_LIBS) $(INTLLIBS) - - CLEANFILES = *~ ++tcd_LDADD = `$(GLIB_CONFIG) --libs` -lm $(CURSES_LIBS) $(INTLLIBS) --INCLUDES = -I$(includedir) $(GNOME_INCLUDEDIR) $(CURSES_INCLUDEDIR) -DGNOMELOCALEDIR=\""$(datadir)/locale"\" $(USE_CD_CHANGER) -g -+INCLUDES = -I$(includedir) $(GNOME_INCLUDEDIR) $(CURSES_INCLUDEDIR) -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" $(USE_CD_CHANGER) -g +@@ -151,3 +151,3 @@ +-INCLUDES = -I$(includedir) $(GNOME_INCLUDEDIR) $(CURSES_INCLUDEDIR) -DGNOMELOCALEDIR=\""$(datadir)/locale"\" $(USE_CD_CHANGER) -DGNOME_ICONDIR=\""$(Pixmapdir)"\" ++INCLUDES = -I$(includedir) $(GNOME_INCLUDEDIR) $(CURSES_INCLUDEDIR) -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" $(USE_CD_CHANGER) -DGNOME_ICONDIR=\""$(Pixmapdir)"\" - Audio_DATA = gtcd.desktop ---- cddbslave/Makefile.in.orig Thu Jul 15 07:55:51 1999 -+++ cddbslave/Makefile.in Fri Jul 16 00:02:50 1999 -@@ -123,7 +123,7 @@ - cxxflags_set = @cxxflags_set@ - l = @l@ - --INCLUDES = -I$(includedir) $(GNOME_INCLUDEDIR) -DGNOMELOCALEDIR=\""$(datadir)/locale"\" -+INCLUDES = -I$(includedir) $(GNOME_INCLUDEDIR) -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" - - - bin_PROGRAMS = cddbslave cddbsubmit -@@ -137,7 +137,7 @@ - cddbsubmit_LDADD = $(GNOME_LIBDIR) $(GNOME_LIBS) $(GHTTP_LIB) $(INTLLIBS) +--- vu-meter/Makefile.in.orig Wed May 24 14:53:11 2000 ++++ vu-meter/Makefile.in Tue May 30 15:11:23 2000 +@@ -125,3 +125,3 @@ +-Audiodir = $(datadir)/gnome/apps/Multimedia ++Audiodir = $(datadir)/apps/Multimedia --gnomedatadir = $(datadir)/gnome -+gnomedatadir = $(datadir) +@@ -129,3 +129,3 @@ - gnomedata_DATA = cddb-submit-methods +-INCLUDES = -DGNOMELOCALEDIR=\""$(datadir)/locale"\" $(GNOME_INCLUDEDIR) -DGNOME_ICONDIR=\""$(pixmapdir)"\" ++INCLUDES = -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" $(GNOME_INCLUDEDIR) -DGNOME_ICONDIR=\""$(pixmapdir)"\" diff --git a/audio/gnome-media/files/patch-ae b/audio/gnome-media/files/patch-ae index 71b230c..b2878eb 100644 --- a/audio/gnome-media/files/patch-ae +++ b/audio/gnome-media/files/patch-ae @@ -1,28 +1,18 @@ ---- tcd/callbacks.c.orig Tue Oct 5 12:27:47 1999 -+++ tcd/callbacks.c Sat Feb 19 15:34:13 2000 -@@ -10,7 +10,7 @@ - - void play_cb(GtkWidget *widget, gpointer data) +--- tcd/callbacks.c.orig Thu Jan 13 22:27:52 2000 ++++ tcd/callbacks.c Tue May 30 15:17:17 2000 +@@ -12,3 +12,3 @@ { - if(cd.sc.cdsc_audiostatus==CDROM_AUDIO_PAUSED) + if(SC_AUDIOSTATUS(cd.sc)==CDROM_AUDIO_PAUSED) tcd_pausecd(&cd); - else - tcd_playtracks(&cd, cd.first_t, cd.last_t, prefs->only_use_trkind); -@@ -42,7 +42,7 @@ - cd.play_method = NORMAL; - cd.repeat_track = -1; +@@ -44,3 +44,3 @@ /* SDH: Make sure play/pause state change is noticed */ - cd.sc.cdsc_audiostatus = -1; + SC_AUDIOSTATUS(cd.sc) = -1; if(cd.isplayable) - { - make_goto_menu(); ---- tcd/cddb.c.orig Tue Oct 5 12:27:47 1999 -+++ tcd/cddb.c Sat Feb 19 15:34:13 2000 -@@ -199,16 +199,16 @@ - { - int min, sec; +--- tcd/cddb.c.orig Thu Jan 13 22:27:52 2000 ++++ tcd/cddb.c Tue May 30 15:17:17 2000 +@@ -201,7 +201,7 @@ - min = cd->trk[trk].toc.cdte_addr.msf.minute; - sec = cd->trk[trk].toc.cdte_addr.msf.second; @@ -33,18 +23,14 @@ - fprintf( fp, "# %u\n", (n*75)+cd->trk[trk].toc.cdte_addr.msf.frame ); + fprintf( fp, "# %u\n", (n*75)+TOC_FRAME(cd->trk[trk]) ); } - /* Print the number of seconds */ +@@ -209,4 +209,4 @@ fprintf( fp, "#\n# Disc length: %i seconds\n", - (cd->trk[cd->last_t+1].toc.cdte_addr.msf.minute*60) - +(cd->trk[cd->last_t+1].toc.cdte_addr.msf.second) ); + (TOC_MINUTE(cd->trk[cd->last_t+1])*60) + +(TOC_SECOND(cd->trk[cd->last_t+1])) ); - fprintf( fp, "#\n# Revision: %lu\n", cd->cddb_rev ); - fprintf( fp, "# Submitted via: tcd 2.0b\n" ); -@@ -245,10 +245,10 @@ - { - int min, sec; +@@ -247,6 +247,6 @@ - min = cd->trk[i].toc.cdte_addr.msf.minute; - sec = cd->trk[i].toc.cdte_addr.msf.second; @@ -54,22 +40,14 @@ - l=sprintf( tmp, "%u ", calc_offset(min,sec,cd->trk[i].toc.cdte_addr.msf.frame)); + l=sprintf( tmp, "%u ", calc_offset(min,sec,TOC_FRAME(cd->trk[i]))); - if(blen>l) - { -@@ -257,8 +257,8 @@ - } - } +@@ -259,4 +259,4 @@ l=sprintf( tmp, "%i\n", - (cd->trk[cd->last_t+1].toc.cdte_addr.msf.minute*60) - +(cd->trk[cd->last_t+1].toc.cdte_addr.msf.second) ); + (TOC_MINUTE(cd->trk[cd->last_t+1])*60) + +(TOC_SECOND(cd->trk[cd->last_t+1])) ); if(blen>l) - strcat( buf,tmp ); - -@@ -298,9 +298,9 @@ - - for( i=0; i <= cd->last_t+1; i++ ) +@@ -300,5 +300,5 @@ { - cdtoc[i].frame = cd->trk[i+1].toc.cdte_addr.msf.frame; - cdtoc[i].min = cd->trk[i+1].toc.cdte_addr.msf.minute; @@ -78,13 +56,9 @@ + cdtoc[i].min = TOC_MINUTE(cd->trk[i+1]); + cdtoc[i].sec = TOC_SECOND(cd->trk[i+1]); } - - ---- tcd/gtcd.c.orig Tue Oct 5 12:27:47 1999 -+++ tcd/gtcd.c Sat Feb 19 15:34:13 2000 -@@ -155,7 +155,11 @@ - gint release_timer(gpointer *data) - { +--- tcd/gtcd.c.orig Sun May 21 15:13:04 2000 ++++ tcd/gtcd.c Tue May 30 15:17:17 2000 +@@ -157,3 +157,7 @@ cd.time_lock = TRUE; +#ifdef TCD_BSD + ioctl(cd.cd_dev, CDIOCPAUSE); @@ -92,83 +66,52 @@ ioctl(cd.cd_dev, CDROMPAUSE); +#endif - roll_t = gtk_timeout_add(40, (GtkFunction)roll_timer, data); - release_t = 0; -@@ -430,8 +434,8 @@ - break; - case DISC_R: +@@ -421,4 +425,4 @@ cur = cd.cur_pos_abs; - end = (cd.trk[cd.last_t+1].toc.cdte_addr.msf.minute - *60)+cd.trk[cd.last_t+1].toc.cdte_addr.msf.second; + end = (TOC_MINUTE(cd.trk[cd.last_t+1])*60 + +TOC_SECOND(cd.trk[cd.last_t+1])); pos = end-cur; - min = pos/60; - sec = pos-(pos/60)*60; -@@ -532,7 +536,7 @@ - - if( !cd.err ) +@@ -524,3 +528,3 @@ { - switch( cd.sc.cdsc_audiostatus ) + switch( SC_AUDIOSTATUS(cd.sc) ) { - case CDROM_AUDIO_INVALID: - strcpy(tmp, _("No Disc")); -@@ -628,8 +632,8 @@ - } - +@@ -620,4 +624,4 @@ /* see if we need to repeat */ - if( cd.sc.cdsc_audiostatus != CDROM_AUDIO_PLAY && - cd.sc.cdsc_audiostatus != CDROM_AUDIO_PAUSED ) + if( SC_AUDIOSTATUS(cd.sc) != CDROM_AUDIO_PLAY && + SC_AUDIOSTATUS(cd.sc) != CDROM_AUDIO_PAUSED ) { - if( cd.play_method == REPEAT_CD ) - tcd_playtracks( &cd, cd.first_t, cd.last_t, prefs->only_use_trkind); -@@ -646,14 +650,14 @@ - - void status_changed(void) +@@ -638,3 +642,3 @@ { - if(old_status != cd.sc.cdsc_audiostatus) + if(old_status != SC_AUDIOSTATUS(cd.sc)) { - GtkWidget *pixmap; - GtkSignalFunc func; - char tmp[256]; - char *name; +@@ -645,3 +649,3 @@ - old_status = cd.sc.cdsc_audiostatus; + old_status = SC_AUDIOSTATUS(cd.sc); g_snprintf(tmp, 255, "tcd/%s.xpm", - (old_status==CDROM_AUDIO_PLAY)?"pause":"play"); - ---- tcd/gtracked.c.orig Tue Oct 5 12:27:47 1999 -+++ tcd/gtracked.c Sat Feb 19 15:34:13 2000 -@@ -207,8 +207,8 @@ - - /* Disc area */ +--- tcd/gtracked.c.orig Sun May 21 15:13:05 2000 ++++ tcd/gtracked.c Tue May 30 15:17:17 2000 +@@ -211,4 +211,4 @@ g_snprintf(tmp, 63, _("Disc Information (%02u:%02u minutes)"), - cd.trk[cd.last_t+1].toc.cdte_addr.msf.minute, - cd.trk[cd.last_t+1].toc.cdte_addr.msf.second); + TOC_MINUTE(cd.trk[cd.last_t+1]), + TOC_SECOND(cd.trk[cd.last_t+1])); - disc_frame = gtk_frame_new(tmp); - disc_vbox = gtk_vbox_new(FALSE, GNOME_PAD_SMALL); ---- tcd/linux-cdrom.c.orig Sat Feb 19 15:34:34 2000 -+++ tcd/linux-cdrom.c Sat Feb 19 15:35:36 2000 -@@ -71,7 +71,7 @@ - debug("cdrom.c: tcd_init_disc(%p) top\n", cd ); - tcd_opencddev( cd, msg_cb ); +--- tcd/linux-cdrom.c.orig Thu Jan 13 22:27:52 2000 ++++ tcd/linux-cdrom.c Tue May 30 15:29:32 2000 +@@ -73,3 +73,3 @@ -#if defined(TCD_CHANGER_ENABLED) +#if defined(TCD_CHANGER_ENABLED) && !defined(TCD_BSD) cd->nslots = ioctl( cd->cd_dev, CDROM_CHANGER_NSLOTS ); - #else - cd->nslots = 0; -@@ -114,8 +114,11 @@ - - int tcd_readtoc( cd_struct *cd ) +@@ -116,4 +116,7 @@ { - int tmp,i; + int i; @@ -177,11 +120,7 @@ + struct ioc_read_toc_single_entry tocentry; +#endif - if(cd->time_lock) - return; -@@ -125,26 +128,47 @@ - cd->isplayable=FALSE; - +@@ -127,3 +130,7 @@ /* read the TOC header */ +#ifdef TCD_BSD + if((ioctl( cd->cd_dev, CDIOREADTOCHEADER, &cd->tochdr))==-1) @@ -189,17 +128,13 @@ if(ioctl( cd->cd_dev, CDROMREADTOCHDR, &cd->tochdr)) +#endif { - strcpy( cd->errmsg, "Can't read disc." ); - cd->err = TRUE; - debug("cdrom.c: tcd_readtoc exiting prematurly. CDROMREADTOCHDR ioctl error.\n" ); - cd->cur_t = 0; +@@ -134,2 +141,5 @@ cd->cddb_id = 0; +#ifdef TCD_BSD + ioctl( cd->cd_dev, CDIOCALLOW); +#endif return(-1); - } - +@@ -138,11 +148,25 @@ /* grab first & last tracks */ +#ifdef TCD_BSD + cd->first_t = cd->tochdr.starting_track; @@ -225,11 +160,7 @@ if(ioctl(cd->cd_dev, CDROMREADTOCENTRY, &cd->trk[C(cd->last_t+1)].toc)) +#endif { - strcpy(cd->errmsg, "Can't read disc."); - cd->err = TRUE; -@@ -152,40 +176,65 @@ - debug("cdrom.c: tcd_readtoc exiting prematurly. CDROMREADTOCENTRY ioctl error.\n" ); - cd->cur_t = 0; +@@ -154,4 +178,15 @@ cd->cddb_id = 0; +#ifdef TCD_BSD + ioctl( cd->cd_dev, CDIOCALLOW); @@ -246,8 +177,7 @@ + cd->trk[C(cd->last_t+1)].start = cd->trk[C(cd->last_t+1)].length * 75 + + TOC_FRAME(cd->trk[C(cd->last_t+1)]); - /* read the rest of the tocs */ - for( i = cd->first_t; i <= cd->last_t; i++ ) +@@ -160,6 +195,15 @@ { +#ifdef TCD_BSD + tocentry.track = i; @@ -263,16 +193,13 @@ if(ioctl(cd->cd_dev, CDROMREADTOCENTRY, &cd->trk[C(i)].toc)) +#endif { - strcpy( cd->errmsg, "Can't read disc." ); - cd->err = TRUE; - debug("cdrom.c: tcd_readtoc exiting prematurly. CDROMREADTOCENTRY ioctl error.\n" ); - cd->cur_t = 0; +@@ -170,2 +214,5 @@ cd->cddb_id = 0; +#ifdef TCD_BSD + ioctl( cd->cd_dev, CDIOCALLOW); +#endif return(-1); - } +@@ -173,7 +220,12 @@ +#ifdef TCD_BSD + cd->trk[C(i)].toc = tocentry.entry; @@ -288,10 +215,7 @@ - cd->trk[C(i)].toc.cdte_addr.msf.frame; + TOC_FRAME(cd->trk[C(i)]); } - - /* calculate track times */ - for(i = cd->first_t; i <= cd->last_t; i ++) - { +@@ -184,6 +236,3 @@ /* Taken from cdtool...Thanks Thomas I.! */ - delsecs = cd->trk[C(i+1)].toc.cdte_addr.msf.minute * 60 - + cd->trk[C(i+1)].toc.cdte_addr.msf.second @@ -299,20 +223,12 @@ - - cd->trk[C(i)].toc.cdte_addr.msf.second; + delsecs = cd->trk[C(i+1)].length - cd->trk[C(i)].length; - cd->trk[C(i)].tot_min = delsecs / 60; - cd->trk[C(i)].tot_sec = delsecs - (delsecs/60)*60; -@@ -204,7 +253,7 @@ - - cd->isplayable=TRUE; +@@ -206,3 +255,3 @@ debug("cdrom.c: tcd_readtoc exiting normally\n" ); - return tmp; + return 0; } - - void tcd_recalculate(cd_struct *cd) -@@ -214,9 +263,8 @@ - return; - +@@ -216,5 +265,4 @@ /* calculate various timing values */ - cd->cur_pos_abs = cd->sc.cdsc_absaddr.msf.minute * 60 + - cd->sc.cdsc_absaddr.msf.second; @@ -320,22 +236,14 @@ + cd->cur_pos_abs = SC_MINUTE(cd->sc) * 60 + SC_SECOND(cd->sc); + cd->cur_frame = cd->cur_pos_abs * 75 + SC_FRAME(cd->sc); - cd->cur_pos_rel = (cd->cur_frame - cd->trk[C(cd->cur_t)].start) / 75; - -@@ -235,8 +283,10 @@ - cd->cd_min = cd->cur_pos_abs / 60; - +@@ -237,4 +285,6 @@ #ifdef TCD_CHANGER_ENABLED +#ifndef TCD_BSD cd->cur_disc = ioctl( cd->cd_dev, CDROM_SELECT_DISC, CDSL_CURRENT ); #endif +#endif } - - void tcd_recalculate_fake(cd_struct *cd, gint abs_pos, gint track) -@@ -282,35 +332,77 @@ - - void tcd_gettime( cd_struct *cd ) +@@ -284,4 +334,16 @@ { +#ifdef TCD_BSD + struct ioc_read_subchannel subch; @@ -352,7 +260,7 @@ cd->sc.cdsc_format = CDROM_MSF; +#endif - if(cd->isplayable) +@@ -289,3 +351,7 @@ { +#ifdef TCD_BSD + if((ioctl( cd->cd_dev, CDIOCREADSUBCHANNEL, &subch)) == -1) @@ -360,9 +268,7 @@ if(ioctl( cd->cd_dev, CDROMSUBCHNL, &cd->sc)) +#endif { - strcpy( cd->errmsg, "Can't read disc." ); - cd->err = TRUE; - debug("cdrom.c: tcd_gettime exiting early. CDROMSUBCHNL ioctl error.\n" ); +@@ -295,8 +361,21 @@ cd->cur_t = 0; +#ifdef TCD_BSD + ioctl( cd->cd_dev, CDIOCALLOW); @@ -386,10 +292,7 @@ cd->cur_t = 0; + } tcd_recalculate(cd); - } - } - - int tcd_set_volume(cd_struct *cd, int volume) +@@ -307,8 +386,21 @@ { +#ifdef TCD_BSD + struct ioc_vol vol; @@ -412,11 +315,7 @@ if(ioctl(cd->cd_dev, CDROMVOLCTRL, &vol) < 0) +#endif return FALSE; - - return TRUE; -@@ -318,6 +410,14 @@ - - int tcd_get_volume(cd_struct *cd) +@@ -320,2 +412,10 @@ { +#ifdef TCD_BSD + struct ioc_vol vol; @@ -427,16 +326,11 @@ + return vol.vol[0]; +#else #ifdef CDROMVOLREAD - struct cdrom_volctrl vol; - -@@ -328,12 +428,39 @@ - #else - return 0; +@@ -330,2 +430,3 @@ #endif +#endif } - - int tcd_playtracks(cd_struct *cd, int start_t, int end_t, int only_use_trkind) +@@ -334,4 +435,30 @@ { +#ifdef TCD_BSD + struct ioc_play_msf msf; @@ -467,30 +361,21 @@ +#endif + int tmp; - debug("cdrom.c: tcd_playtracks( %p, %d, %d )\n", cd, start_t, end_t ); - cd->err = FALSE; -@@ -342,7 +469,7 @@ - tcd_gettime(cd); - if(cd->err) +@@ -344,3 +471,3 @@ { - /* try and inject cd */ + /* try and eject cd */ tcd_ejectcd(cd); - - if(cd->err) -@@ -352,64 +479,88 @@ - } - } +@@ -354,2 +481,5 @@ +#ifdef TCD_BSD + ioctl(cd->cd_dev, CDIOCCLOSE); +#else #if defined(CDROMCLOSETRAY) - ioctl(cd->cd_dev, CDROMCLOSETRAY); --#endif +@@ -358,9 +488,15 @@ + #endif - +#endif -+#endif + + /* bad hack. most data tracks are the first track... */ +#ifdef TCD_BSD @@ -499,7 +384,7 @@ if(cd->trk[start_t].toc.cdte_ctrl == CDROM_DATA_TRACK) - start_t++; /* bad hack. most data tracks are the first track... */ +#endif -+ start_t++; ++ start_t++; - msf.cdmsf_min0 = cd->trk[start_t].toc.cdte_addr.msf.minute; - msf.cdmsf_sec0 = cd->trk[start_t].toc.cdte_addr.msf.second; @@ -508,7 +393,7 @@ + MSF_START_SEC = TOC_SECOND(cd->trk[start_t]); + MSF_START_FRM = TOC_FRAME(cd->trk[start_t]); - if( end_t < 0 ) +@@ -368,5 +504,5 @@ { - msf.cdmsf_min1 = cd->trk[start_t].tot_min+msf.cdmsf_min0; - msf.cdmsf_sec1 = cd->trk[start_t].tot_sec+msf.cdmsf_sec0; @@ -517,7 +402,7 @@ + MSF_END_SEC = cd->trk[start_t].tot_sec+MSF_START_SEC; + MSF_END_FRM = 0; } - else +@@ -374,20 +510,20 @@ { - msf.cdmsf_min1 = cd->trk[end_t+1].toc.cdte_addr.msf.minute; - msf.cdmsf_sec1 = cd->trk[end_t+1].toc.cdte_addr.msf.second; @@ -549,34 +434,30 @@ - msf.cdmsf_min1 = 0; + MSF_END_MIN = 0; } - #endif +@@ -395,6 +531,11 @@ } - msf.cdmsf_min1 += (msf.cdmsf_sec1 / 60); - msf.cdmsf_sec1 %= 60; + MSF_END_MIN += (MSF_END_SEC / 60); + MSF_END_SEC %= 60; -+ -+#ifdef TCD_BSD -+ ioctl( cd->cd_dev, CDIOCPREVENT); -+#endif +#ifdef TCD_BSD ++ ioctl( cd->cd_dev, CDIOCPREVENT); + if(only_use_trkind || ioctl( cd->cd_dev, CDIOCPLAYMSF, &msf)) +#else if(ioctl( cd->cd_dev, CDROMPLAYMSF, &msf) || only_use_trkind) +#endif { - debug("cdrom.c: tcd_playtracks error. CDROMPLAYMSF ioctl error (or user override). Trying PLAYTRKIND\n" ); - +@@ -403,8 +544,12 @@ /* Try alternate method of playing */ - trkind.cdti_trk0 = start_t; /* start track */ - trkind.cdti_ind0 = 0; /* start index */ - trkind.cdti_trk1 = end_t; /* end track */ - trkind.cdti_ind1 = 0; /* end index */ -+ TI_START_TRK = start_t; /* start track */ -+ TI_START_IND = 0; /* start index */ -+ TI_END_TRK = end_t; /* end track */ -+ TI_END_IND = 0; /* end index */ ++ TI_START_TRK = start_t; /* start track */ ++ TI_START_IND = 0; /* start index */ ++ TI_END_TRK = end_t; /* end track */ ++ TI_END_IND = 0; /* end index */ +#ifdef TCD_BSD + if(ioctl(cd->cd_dev, CDIOCPLAYTRACKS, &trkind)) @@ -584,18 +465,13 @@ if(ioctl(cd->cd_dev, CDROMPLAYTRKIND, &trkind)) +#endif { - strcpy( cd->errmsg, "Error playing disc" ); - cd->err = TRUE; +@@ -413,2 +558,5 @@ debug("cdrom.c: tcd_playtracks error. CDROMPLAYTRKIND ioctl error.\n"); +#ifdef TCD_BSD + ioctl( cd->cd_dev, CDIOCALLOW); +#endif return -1; - } - } -@@ -419,75 +570,68 @@ - return tmp; - } +@@ -422,21 +570,10 @@ -static int msf_2_frame( cd_min_sec_frame *msf ) -{ @@ -622,10 +498,7 @@ +#endif + int tmp; - debug("cdrom.c: tcd_play_seconds( %p, %ld )\n", cd, offset ); - - cd->err = FALSE; - cd->isplayable=FALSE; +@@ -447,41 +584,42 @@ - /* converting msf to frames makes life much easier */ - start_frame = msf_2_frame( &cd->trk[C(cd->first_t)].toc.cdte_addr.msf ); @@ -696,19 +569,13 @@ if(ioctl(cd->cd_dev, CDROMPLAYMSF, &msf)) +#endif { - strcpy( cd->errmsg, "Error playing disc." ); - cd->err = TRUE; - +@@ -491,2 +629,5 @@ debug("cdrom.c: tcd_play_seconds error. CDROMPLAYMSF ioctl error.\n" ); +#ifdef TCD_BSD + ioctl( cd->cd_dev, CDIOCALLOW ); +#endif return(-1); - } - cd->isplayable=TRUE; -@@ -504,7 +648,15 @@ - if(cd->isplayable) tcd_stopcd(cd); - cd->err = FALSE; +@@ -507,3 +648,11 @@ +#ifdef TCD_BSD + ioctl( cd->cd_dev, CDIOCALLOW); @@ -720,17 +587,13 @@ if(!ioctl(cd->cd_dev, CDROMEJECT)) +#endif { - cd->isplayable = FALSE; - strcpy(cd->errmsg, "No disc in drive "); -@@ -512,9 +664,17 @@ - } - else +@@ -515,2 +664,5 @@ { +#ifdef TCD_BSD + tmp = ioctl( cd->cd_dev, CDIOCCLOSE ); +#else #ifdef CDROMCLOSETRAY - tmp = ioctl( cd->cd_dev, CDROMCLOSETRAY ); +@@ -518,2 +670,7 @@ #endif +#endif + @@ -738,21 +601,13 @@ + ioctl( cd->cd_dev, CDIOCPREVENT); +#endif - if(tcd_post_init(cd)) - { -@@ -524,6 +684,9 @@ - debug("cdrom.c: tcd_eject - disc init error. %s\n", - strerror(errno) ); +@@ -527,2 +684,5 @@ +#ifdef TCD_BSD + ioctl( cd->cd_dev, CDIOCALLOW); +#endif return(-1); - } - cd->isplayable = TRUE; -@@ -541,11 +704,19 @@ - debug("cdrom.c: tcd_stopcd(%p)\n", cd ); - +@@ -544,7 +704,15 @@ /* SDH: Makes things cleaner on eject */ - if( cd->sc.cdsc_audiostatus==CDROM_AUDIO_PAUSED ) + if( SC_AUDIOSTATUS(cd->sc)==CDROM_AUDIO_PAUSED ) @@ -769,11 +624,7 @@ if(ioctl(cd->cd_dev, CDROMSTOP)) +#endif { - strcpy( cd->errmsg, "Can't stop disc." ); - cd->err = TRUE; -@@ -563,24 +734,44 @@ - int tmp; - cd->err = FALSE; +@@ -566,5 +734,9 @@ - if(cd->sc.cdsc_audiostatus==CDROM_AUDIO_PAUSED) - { @@ -785,7 +636,7 @@ if((tmp=ioctl(cd->cd_dev, CDROMRESUME))) +#endif { - strcpy(cd->errmsg, strerror(errno)); +@@ -572,4 +744,10 @@ cd->err = TRUE; +#ifdef TCD_BSD + ioctl( cd->cd_dev, CDIOCALLOW); @@ -796,8 +647,7 @@ + ioctl( cd->cd_dev, CDIOCPREVENT); +#endif return tmp; - } - else +@@ -578,3 +756,7 @@ { +#ifdef TCD_BSD + if((tmp=ioctl(cd->cd_dev, CDIOCPAUSE))) @@ -805,7 +655,7 @@ if((tmp=ioctl(cd->cd_dev, CDROMPAUSE))) +#endif { - strcpy( cd->errmsg, strerror( errno ) ); +@@ -582,4 +764,10 @@ cd->err = TRUE; +#ifdef TCD_BSD + ioctl( cd->cd_dev, CDIOCALLOW); @@ -816,19 +666,11 @@ + ioctl( cd->cd_dev, CDIOCPREVENT); +#endif return tmp; - } - } -@@ -588,6 +779,7 @@ - int tcd_change_disc( cd_struct *cd, int disc ) - { +@@ -591,2 +779,3 @@ #ifdef TCD_CHANGER_ENABLED +#ifndef TCD_BSD int tmp; - cd->err = FALSE; - -@@ -596,10 +788,10 @@ - fprintf( stdout, "ioctl: %s\n", strerror(errno) ); - +@@ -599,6 +788,6 @@ return tmp; -#else +#endif @@ -837,53 +679,28 @@ return 0; -#endif } - - void tcd_opencddev( cd_struct *cd, WarnFunc msg_cb ) ---- tcd/linux-cdrom.h.orig Tue Oct 5 12:27:47 1999 -+++ tcd/linux-cdrom.h Sat Feb 19 15:34:13 2000 -@@ -27,11 +27,27 @@ - - #include <sys/types.h> +--- tcd/linux-cdrom.h.orig Thu Jan 13 22:27:52 2000 ++++ tcd/linux-cdrom.h Tue May 30 15:34:32 2000 +@@ -29,4 +29,16 @@ #include <glib.h> -#if !defined(linux) && !defined(sun) && !defined(__sun__) --#error TCD only builds on linux and Solaris/SunOs --#endif - --#ifdef linux -+#if defined(__FreeBSD__) +-# error TCD only builds on linux and Solaris/SunOs ++#if !defined(linux) && !defined(sun) && !defined(__sun__) && !defined(__FreeBSD__) ++# error TCD only builds on Linux, Solaris, SunOS, and FreeBSD ++#endif + ++#ifdef __FreeBSD__ +#define TCD_BSD -+ +#include <sys/cdio.h> -+ +#define CDROM_AUDIO_INVALID CD_AS_AUDIO_INVALID +#define CDROM_AUDIO_PLAY CD_AS_PLAY_IN_PROGRESS -+#define CDROM_AUDIO_PAUSED CD_AS_PLAY_PAUSED -+#define CDROM_AUDIO_COMPLETED CD_AS_PLAY_COMPLETED -+#define CDROM_AUDIO_ERROR CD_AS_PLAY_ERROR -+#define CDROM_AUDIO_NO_STATUS CD_AS_NO_STATUS -+ ++#define CDROM_AUDIO_PAUSED CD_AS_PLAY_PAUSED ++#define CDROM_AUDIO_COMPLETED CD_AS_PLAY_COMPLETED ++#define CDROM_AUDIO_ERROR CD_AS_PLAY_ERROR ++#define CDROM_AUDIO_NO_STATUS CD_AS_NO_STATUS +#define CDROM -+ -+#else -+ -+#define TCD_LINUX -+ -+#if defined(linux) - #include <linux/cdrom.h> - - typedef struct cdrom_msf0 cd_min_sec_frame; -@@ -110,6 +126,7 @@ - } cd_min_sec_frame; - - #endif /* sun __sun__ */ -+#endif /* __FreeBSD__ */ - - #define TRK_NAME_LEN 512 - #define DISC_INFO_LEN 512 -@@ -125,7 +142,17 @@ - { - char name[TRK_NAME_LEN+1]; + #endif +@@ -128,3 +140,13 @@ char extd[EXT_DATA_LEN+1]; /* extra information for this track */ +#ifdef TCD_BSD + struct cd_toc_entry toc; @@ -897,11 +714,7 @@ +#define TOC_FRAME(trk) (trk.toc.cdte_addr.msf.frame) +#endif int titled; - int start, length; - int tot_min, tot_sec; -@@ -151,10 +178,28 @@ - char album[DISC_INFO_LEN+1], artist[DISC_INFO_LEN+1]; - char extd[EXT_DATA_LEN+1]; /* extra information for this disc */ +@@ -154,2 +176,14 @@ +#ifdef TCD_BSD + /* See /usr/include/sys/cdio.h */ @@ -916,8 +729,7 @@ +#else + /* See /usr/src/linux/include/linux/cdrom.h */ - struct cdrom_ti ti; /* Track info */ - struct cdrom_tochdr tochdr; /* TOC header */ +@@ -158,2 +192,8 @@ struct cdrom_subchnl sc; /* Subchannel, for time */ +#define SC_AUDIOSTATUS(sc) (sc.cdsc_audiostatus) +#define SC_TRACK(sc) (sc.cdsc_trk) @@ -926,49 +738,33 @@ +#define SC_FRAME(sc) (sc.cdsc_absaddr.msf.frame) +#endif int volume; /* Must range 0-100 */ - - int cd_min, cd_sec; /* Total CD time */ ---- tcd/tcd.c.orig Tue Oct 5 12:27:47 1999 -+++ tcd/tcd.c Sat Feb 19 15:34:13 2000 -@@ -139,8 +139,8 @@ - - /* if the user hasn't stopped the cd, but it is +--- tcd/tcd.c.orig Thu Jan 13 22:27:52 2000 ++++ tcd/tcd.c Tue May 30 15:17:17 2000 +@@ -141,4 +141,4 @@ stopped anyway, fix it. */ - if( cd->sc.cdsc_audiostatus != CDROM_AUDIO_PLAY && - cd->sc.cdsc_audiostatus != CDROM_AUDIO_PAUSED ) + if( SC_AUDIOSTATUS(cd->sc) != CDROM_AUDIO_PLAY && + SC_AUDIOSTATUS(cd->sc) != CDROM_AUDIO_PAUSED ) { - if( cd->play_method == REPEAT_CD ) - tcd_playtracks(cd, cd->first_t, cd->last_t, 0); -@@ -170,7 +170,7 @@ - case 'p': - case 'P': +@@ -172,3 +172,3 @@ if(cd->isplayable) { - if( cd->sc.cdsc_audiostatus == CDROM_AUDIO_PAUSED ) + if( SC_AUDIOSTATUS(cd->sc) == CDROM_AUDIO_PAUSED ) tcd_pausecd(cd); - else - tcd_playtracks(cd,cd->first_t,cd->last_t, 0); -@@ -440,8 +440,8 @@ - mvwprintw(win,maxy-2,30,"Track:" ); - attron( C_RED+A_BOLD ); +@@ -442,4 +442,4 @@ mvwprintw(win,maxy-4,38,"%02u:%02u", - cd->trk[C(cd->last_t+1)].toc.cdte_addr.msf.minute, - cd->trk[C(cd->last_t+1)].toc.cdte_addr.msf.second ); + TOC_MINUTE(cd->trk[C(cd->last_t+1)]), + TOC_SECOND(cd->trk[C(cd->last_t+1)]) ); mvwprintw(win,maxy-3,38,cd->dtitle ); - attroff( C_RED+A_BOLD ); - } -@@ -478,11 +478,15 @@ - j=height; - for(i=cd->first_t; i <= cd->last_t; i++) +@@ -480,3 +480,3 @@ { - if(cd->cur_t == i && cd->sc.cdsc_audiostatus == CDROM_AUDIO_PLAY) + if(cd->cur_t == i && SC_AUDIOSTATUS(cd->sc) == CDROM_AUDIO_PLAY) stat = 'P'; - else if(cd->repeat_track == i) +@@ -484,3 +484,7 @@ stat = 'R'; +#if defined(TCD_BSD) + else if(cd->trk[i].toc.control == 0x04) @@ -976,31 +772,18 @@ else if(cd->trk[i].toc.cdte_ctrl == CDROM_DATA_TRACK) +#endif stat = 'd'; - else - stat = 'a'; -@@ -498,14 +502,14 @@ - x = 2; - } +@@ -500,3 +504,3 @@ - if( cd->sc.cdsc_audiostatus == CDROM_AUDIO_PLAY && cd->cur_t == i ) + if( SC_AUDIOSTATUS(cd->sc) == CDROM_AUDIO_PLAY && cd->cur_t == i ) attron( A_BOLD ); - - mvwprintw(win,y,x,"%02u%c - %02u:%02u", - i, stat,cd->trk[C(i)].tot_min, - cd->trk[C(i)].tot_sec ); +@@ -507,3 +511,3 @@ - if(cd->sc.cdsc_audiostatus == CDROM_AUDIO_PLAY && cd->cur_t == i) + if(SC_AUDIOSTATUS(cd->sc) == CDROM_AUDIO_PLAY && cd->cur_t == i) attroff( A_BOLD ); - } - } -@@ -516,7 +520,7 @@ - - if( !cd->err ) +@@ -518,3 +522,3 @@ { - switch( cd->sc.cdsc_audiostatus ) + switch( SC_AUDIOSTATUS(cd->sc) ) { - case CDROM_AUDIO_INVALID: - strcpy( tmp,"No Audio " ); diff --git a/audio/gnome-media/pkg-plist b/audio/gnome-media/pkg-plist index 7b61361..9519b4d 100644 --- a/audio/gnome-media/pkg-plist +++ b/audio/gnome-media/pkg-plist @@ -1,14 +1,19 @@ bin/cddbslave bin/cddbsubmit bin/gmix +bin/grecord bin/gtcd bin/vumeter +share/gnome/apps/Multimedia/Soundrecorder.desktop share/gnome/apps/Multimedia/gmix.desktop share/gnome/apps/Multimedia/gtcd.desktop share/gnome/apps/Multimedia/vumeter.desktop share/gnome/cddb-submit-methods +share/gnome/mime-info/grecord.keys +share/gnome/mime-info/grecord.mime share/gnome/pixmaps/gnome-mixer.png share/gnome/pixmaps/gnome-vumeter.png +share/gnome/pixmaps/gtcd.png share/gnome/pixmaps/tcd/cdrom.xpm share/gnome/pixmaps/tcd/eject.xpm share/gnome/pixmaps/tcd/ff.xpm @@ -19,25 +24,33 @@ share/gnome/pixmaps/tcd/play.xpm share/gnome/pixmaps/tcd/prev_t.xpm share/gnome/pixmaps/tcd/rw.xpm share/gnome/pixmaps/tcd/stop.xpm +share/locale/ca/LC_MESSAGES/gnome-media.mo share/locale/cs/LC_MESSAGES/gnome-media.mo share/locale/da/LC_MESSAGES/gnome-media.mo share/locale/de/LC_MESSAGES/gnome-media.mo +share/locale/el/LC_MESSAGES/gnome-media.mo share/locale/en_GB/LC_MESSAGES/gnome-media.mo share/locale/es/LC_MESSAGES/gnome-media.mo share/locale/et/LC_MESSAGES/gnome-media.mo share/locale/fi/LC_MESSAGES/gnome-media.mo share/locale/fr/LC_MESSAGES/gnome-media.mo share/locale/ga/LC_MESSAGES/gnome-media.mo +share/locale/gl/LC_MESSAGES/gnome-media.mo share/locale/hu/LC_MESSAGES/gnome-media.mo share/locale/it/LC_MESSAGES/gnome-media.mo share/locale/ja/LC_MESSAGES/gnome-media.mo share/locale/ko/LC_MESSAGES/gnome-media.mo +share/locale/lt/LC_MESSAGES/gnome-media.mo share/locale/nl/LC_MESSAGES/gnome-media.mo share/locale/no/LC_MESSAGES/gnome-media.mo share/locale/pl/LC_MESSAGES/gnome-media.mo share/locale/pt/LC_MESSAGES/gnome-media.mo share/locale/pt_BR/LC_MESSAGES/gnome-media.mo +share/locale/ro/LC_MESSAGES/gnome-media.mo share/locale/ru/LC_MESSAGES/gnome-media.mo share/locale/sv/LC_MESSAGES/gnome-media.mo +share/locale/tr/LC_MESSAGES/gnome-media.mo +share/locale/uk/LC_MESSAGES/gnome-media.mo +share/locale/zh_CN.GB2312/LC_MESSAGES/gnome-media.mo share/locale/zh_TW.Big5/LC_MESSAGES/gnome-media.mo @dirrm share/gnome/pixmaps/tcd/ diff --git a/audio/gnomemedia/Makefile b/audio/gnomemedia/Makefile index 927b46d..ef180ff 100644 --- a/audio/gnomemedia/Makefile +++ b/audio/gnomemedia/Makefile @@ -6,7 +6,7 @@ # PORTNAME= gnomemedia -PORTVERSION= 1.0.51 +PORTVERSION= 1.2.0 CATEGORIES= audio gnome MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= stable/sources/gnome-media @@ -22,8 +22,7 @@ USE_GMAKE= yes USE_LIBTOOL= yes CONFIGURE_ARGS= --without-ncurses \ --localstatedir=${PREFIX}/share/gnome \ - --datadir=${PREFIX}/share/gnome \ - --with-gnome=${PREFIX} + --datadir=${PREFIX}/share/gnome CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LIBS="-L${LOCALBASE}/lib" diff --git a/audio/gnomemedia/distinfo b/audio/gnomemedia/distinfo index dd5df81..311191f 100644 --- a/audio/gnomemedia/distinfo +++ b/audio/gnomemedia/distinfo @@ -1 +1 @@ -MD5 (gnome-media-1.0.51.tar.gz) = d52772de47b214d9fc48aea75108cce7 +MD5 (gnome-media-1.2.0.tar.gz) = c7cda6054b47f71aa46aaabe9db6fb4c diff --git a/audio/gnomemedia/files/patch-ac b/audio/gnomemedia/files/patch-ac index d8c3aeb..d234ced 100644 --- a/audio/gnomemedia/files/patch-ac +++ b/audio/gnomemedia/files/patch-ac @@ -1,76 +1,67 @@ ---- vu-meter/Makefile.in.orig Wed Mar 3 12:35:57 1999 -+++ vu-meter/Makefile.in Wed Mar 3 12:36:25 1999 -@@ -116,9 +116,9 @@ - ZVT_LIBS = @ZVT_LIBS@ - l = @l@ +--- cddbslave/Makefile.in.orig Wed May 24 14:53:10 2000 ++++ cddbslave/Makefile.in Tue May 30 15:13:02 2000 +@@ -125,3 +125,3 @@ --Audiodir = $(datadir)/gnome/apps/Multimedia -+Audiodir = $(datadir)/apps/Multimedia +-INCLUDES = -I$(includedir) $(GNOME_INCLUDEDIR) -DGNOMELOCALEDIR=\""$(datadir)/locale"\" ++INCLUDES = -I$(includedir) $(GNOME_INCLUDEDIR) -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" --INCLUDES = -DGNOMELOCALEDIR=\""$(datadir)/locale"\" $(GNOME_INCLUDEDIR) -+INCLUDES = -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" $(GNOME_INCLUDEDIR) +@@ -139,3 +139,3 @@ +-gnomedatadir = $(datadir)/gnome ++gnomedatadir = $(datadir) - bin_PROGRAMS = vumeter ---- gmix/Makefile.in.orig Wed Sep 22 03:11:25 1999 -+++ gmix/Makefile.in Fri Sep 24 11:55:02 1999 -@@ -123,12 +123,12 @@ - cxxflags_set = @cxxflags_set@ - l = @l@ +--- gmix/Makefile.in.orig Wed May 24 14:53:13 2000 ++++ gmix/Makefile.in Tue May 30 15:11:42 2000 +@@ -125,3 +125,3 @@ -Audiodir = $(datadir)/gnome/apps/Multimedia +Audiodir = $(datadir)/apps/Multimedia pixmapdir = $(datadir)/pixmaps +@@ -131,3 +131,3 @@ - EXTRA_DIST = README TODO NEWS gmix.desktop gnome-mixer.png +-INCLUDES = -DGNOMELOCALEDIR=\""$(datadir)/locale"\" $(GNOME_INCLUDEDIR) -DGNOME_ICONDIR=\""$(pixmapdir)"\" ++INCLUDES = -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" $(GNOME_INCLUDEDIR) -DGNOME_ICONDIR=\""$(pixmapdir)"\" + +--- grecord/Makefile.in.orig Wed May 24 14:53:19 2000 ++++ grecord/Makefile.in Tue May 30 15:39:21 2000 +@@ -130,3 +130,3 @@ --INCLUDES = -DGNOMELOCALEDIR=\""$(datadir)/locale"\" $(GNOME_INCLUDEDIR) -+INCLUDES = -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" $(GNOME_INCLUDEDIR) +-Applicationsdir = $(datadir)/gnome/apps/Multimedia ++Applicationsdir = $(datadir)/apps/Multimedia + Applications_DATA = Soundrecorder.desktop +--- grecord/src/Makefile.in.orig Wed May 24 14:53:21 2000 ++++ grecord/src/Makefile.in Tue May 30 15:39:42 2000 +@@ -125,3 +125,3 @@ +-INCLUDES = -DGNOMELOCALEDIR=\""$(datadir)/locale"\" -I$(top_srcdir)/intl $(GNOME_INCLUDEDIR) -DGNOME_ICONDIR=\""$(datadir)/pixmaps"\" ++INCLUDES = -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" -I$(top_srcdir)/intl $(GNOME_INCLUDEDIR) -DGNOME_ICONDIR=\""$(datadir)/pixmaps"\" - bin_PROGRAMS = gmix ---- tcd/Makefile.in.orig Tue Oct 5 12:29:27 1999 -+++ tcd/Makefile.in Sun Jan 30 23:10:53 2000 -@@ -123,7 +123,7 @@ - cxxflags_set = @cxxflags_set@ - l = @l@ +--- tcd/Makefile.in.orig Wed May 24 14:53:16 2000 ++++ tcd/Makefile.in Tue May 30 15:12:38 2000 +@@ -125,3 +125,3 @@ -Audiodir = $(datadir)/gnome/apps/Multimedia +Audiodir = $(datadir)/apps/Multimedia - - EXTRA_DIST = README TODO NEWS gtcd.desktop - -@@ -144,11 +144,11 @@ - gtcd_LDADD = $(GNOME_LIBDIR) $(GNOMEUI_LIBS) $(INTLLIBS) - + Pixmapdir = $(datadir)/pixmaps +@@ -147,3 +147,3 @@ -tcd_LDADD = $(GNOME_LIBDIR) -lglib -lm $(CURSES_LIBS) $(INTLLIBS) -+tcd_LDADD = `${GLIB_CONFIG} --libs` -lm $(CURSES_LIBS) $(INTLLIBS) - - CLEANFILES = *~ ++tcd_LDADD = `$(GLIB_CONFIG) --libs` -lm $(CURSES_LIBS) $(INTLLIBS) --INCLUDES = -I$(includedir) $(GNOME_INCLUDEDIR) $(CURSES_INCLUDEDIR) -DGNOMELOCALEDIR=\""$(datadir)/locale"\" $(USE_CD_CHANGER) -g -+INCLUDES = -I$(includedir) $(GNOME_INCLUDEDIR) $(CURSES_INCLUDEDIR) -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" $(USE_CD_CHANGER) -g +@@ -151,3 +151,3 @@ +-INCLUDES = -I$(includedir) $(GNOME_INCLUDEDIR) $(CURSES_INCLUDEDIR) -DGNOMELOCALEDIR=\""$(datadir)/locale"\" $(USE_CD_CHANGER) -DGNOME_ICONDIR=\""$(Pixmapdir)"\" ++INCLUDES = -I$(includedir) $(GNOME_INCLUDEDIR) $(CURSES_INCLUDEDIR) -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" $(USE_CD_CHANGER) -DGNOME_ICONDIR=\""$(Pixmapdir)"\" - Audio_DATA = gtcd.desktop ---- cddbslave/Makefile.in.orig Thu Jul 15 07:55:51 1999 -+++ cddbslave/Makefile.in Fri Jul 16 00:02:50 1999 -@@ -123,7 +123,7 @@ - cxxflags_set = @cxxflags_set@ - l = @l@ - --INCLUDES = -I$(includedir) $(GNOME_INCLUDEDIR) -DGNOMELOCALEDIR=\""$(datadir)/locale"\" -+INCLUDES = -I$(includedir) $(GNOME_INCLUDEDIR) -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" - - - bin_PROGRAMS = cddbslave cddbsubmit -@@ -137,7 +137,7 @@ - cddbsubmit_LDADD = $(GNOME_LIBDIR) $(GNOME_LIBS) $(GHTTP_LIB) $(INTLLIBS) +--- vu-meter/Makefile.in.orig Wed May 24 14:53:11 2000 ++++ vu-meter/Makefile.in Tue May 30 15:11:23 2000 +@@ -125,3 +125,3 @@ +-Audiodir = $(datadir)/gnome/apps/Multimedia ++Audiodir = $(datadir)/apps/Multimedia --gnomedatadir = $(datadir)/gnome -+gnomedatadir = $(datadir) +@@ -129,3 +129,3 @@ - gnomedata_DATA = cddb-submit-methods +-INCLUDES = -DGNOMELOCALEDIR=\""$(datadir)/locale"\" $(GNOME_INCLUDEDIR) -DGNOME_ICONDIR=\""$(pixmapdir)"\" ++INCLUDES = -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" $(GNOME_INCLUDEDIR) -DGNOME_ICONDIR=\""$(pixmapdir)"\" diff --git a/audio/gnomemedia/files/patch-ae b/audio/gnomemedia/files/patch-ae index 71b230c..b2878eb 100644 --- a/audio/gnomemedia/files/patch-ae +++ b/audio/gnomemedia/files/patch-ae @@ -1,28 +1,18 @@ ---- tcd/callbacks.c.orig Tue Oct 5 12:27:47 1999 -+++ tcd/callbacks.c Sat Feb 19 15:34:13 2000 -@@ -10,7 +10,7 @@ - - void play_cb(GtkWidget *widget, gpointer data) +--- tcd/callbacks.c.orig Thu Jan 13 22:27:52 2000 ++++ tcd/callbacks.c Tue May 30 15:17:17 2000 +@@ -12,3 +12,3 @@ { - if(cd.sc.cdsc_audiostatus==CDROM_AUDIO_PAUSED) + if(SC_AUDIOSTATUS(cd.sc)==CDROM_AUDIO_PAUSED) tcd_pausecd(&cd); - else - tcd_playtracks(&cd, cd.first_t, cd.last_t, prefs->only_use_trkind); -@@ -42,7 +42,7 @@ - cd.play_method = NORMAL; - cd.repeat_track = -1; +@@ -44,3 +44,3 @@ /* SDH: Make sure play/pause state change is noticed */ - cd.sc.cdsc_audiostatus = -1; + SC_AUDIOSTATUS(cd.sc) = -1; if(cd.isplayable) - { - make_goto_menu(); ---- tcd/cddb.c.orig Tue Oct 5 12:27:47 1999 -+++ tcd/cddb.c Sat Feb 19 15:34:13 2000 -@@ -199,16 +199,16 @@ - { - int min, sec; +--- tcd/cddb.c.orig Thu Jan 13 22:27:52 2000 ++++ tcd/cddb.c Tue May 30 15:17:17 2000 +@@ -201,7 +201,7 @@ - min = cd->trk[trk].toc.cdte_addr.msf.minute; - sec = cd->trk[trk].toc.cdte_addr.msf.second; @@ -33,18 +23,14 @@ - fprintf( fp, "# %u\n", (n*75)+cd->trk[trk].toc.cdte_addr.msf.frame ); + fprintf( fp, "# %u\n", (n*75)+TOC_FRAME(cd->trk[trk]) ); } - /* Print the number of seconds */ +@@ -209,4 +209,4 @@ fprintf( fp, "#\n# Disc length: %i seconds\n", - (cd->trk[cd->last_t+1].toc.cdte_addr.msf.minute*60) - +(cd->trk[cd->last_t+1].toc.cdte_addr.msf.second) ); + (TOC_MINUTE(cd->trk[cd->last_t+1])*60) + +(TOC_SECOND(cd->trk[cd->last_t+1])) ); - fprintf( fp, "#\n# Revision: %lu\n", cd->cddb_rev ); - fprintf( fp, "# Submitted via: tcd 2.0b\n" ); -@@ -245,10 +245,10 @@ - { - int min, sec; +@@ -247,6 +247,6 @@ - min = cd->trk[i].toc.cdte_addr.msf.minute; - sec = cd->trk[i].toc.cdte_addr.msf.second; @@ -54,22 +40,14 @@ - l=sprintf( tmp, "%u ", calc_offset(min,sec,cd->trk[i].toc.cdte_addr.msf.frame)); + l=sprintf( tmp, "%u ", calc_offset(min,sec,TOC_FRAME(cd->trk[i]))); - if(blen>l) - { -@@ -257,8 +257,8 @@ - } - } +@@ -259,4 +259,4 @@ l=sprintf( tmp, "%i\n", - (cd->trk[cd->last_t+1].toc.cdte_addr.msf.minute*60) - +(cd->trk[cd->last_t+1].toc.cdte_addr.msf.second) ); + (TOC_MINUTE(cd->trk[cd->last_t+1])*60) + +(TOC_SECOND(cd->trk[cd->last_t+1])) ); if(blen>l) - strcat( buf,tmp ); - -@@ -298,9 +298,9 @@ - - for( i=0; i <= cd->last_t+1; i++ ) +@@ -300,5 +300,5 @@ { - cdtoc[i].frame = cd->trk[i+1].toc.cdte_addr.msf.frame; - cdtoc[i].min = cd->trk[i+1].toc.cdte_addr.msf.minute; @@ -78,13 +56,9 @@ + cdtoc[i].min = TOC_MINUTE(cd->trk[i+1]); + cdtoc[i].sec = TOC_SECOND(cd->trk[i+1]); } - - ---- tcd/gtcd.c.orig Tue Oct 5 12:27:47 1999 -+++ tcd/gtcd.c Sat Feb 19 15:34:13 2000 -@@ -155,7 +155,11 @@ - gint release_timer(gpointer *data) - { +--- tcd/gtcd.c.orig Sun May 21 15:13:04 2000 ++++ tcd/gtcd.c Tue May 30 15:17:17 2000 +@@ -157,3 +157,7 @@ cd.time_lock = TRUE; +#ifdef TCD_BSD + ioctl(cd.cd_dev, CDIOCPAUSE); @@ -92,83 +66,52 @@ ioctl(cd.cd_dev, CDROMPAUSE); +#endif - roll_t = gtk_timeout_add(40, (GtkFunction)roll_timer, data); - release_t = 0; -@@ -430,8 +434,8 @@ - break; - case DISC_R: +@@ -421,4 +425,4 @@ cur = cd.cur_pos_abs; - end = (cd.trk[cd.last_t+1].toc.cdte_addr.msf.minute - *60)+cd.trk[cd.last_t+1].toc.cdte_addr.msf.second; + end = (TOC_MINUTE(cd.trk[cd.last_t+1])*60 + +TOC_SECOND(cd.trk[cd.last_t+1])); pos = end-cur; - min = pos/60; - sec = pos-(pos/60)*60; -@@ -532,7 +536,7 @@ - - if( !cd.err ) +@@ -524,3 +528,3 @@ { - switch( cd.sc.cdsc_audiostatus ) + switch( SC_AUDIOSTATUS(cd.sc) ) { - case CDROM_AUDIO_INVALID: - strcpy(tmp, _("No Disc")); -@@ -628,8 +632,8 @@ - } - +@@ -620,4 +624,4 @@ /* see if we need to repeat */ - if( cd.sc.cdsc_audiostatus != CDROM_AUDIO_PLAY && - cd.sc.cdsc_audiostatus != CDROM_AUDIO_PAUSED ) + if( SC_AUDIOSTATUS(cd.sc) != CDROM_AUDIO_PLAY && + SC_AUDIOSTATUS(cd.sc) != CDROM_AUDIO_PAUSED ) { - if( cd.play_method == REPEAT_CD ) - tcd_playtracks( &cd, cd.first_t, cd.last_t, prefs->only_use_trkind); -@@ -646,14 +650,14 @@ - - void status_changed(void) +@@ -638,3 +642,3 @@ { - if(old_status != cd.sc.cdsc_audiostatus) + if(old_status != SC_AUDIOSTATUS(cd.sc)) { - GtkWidget *pixmap; - GtkSignalFunc func; - char tmp[256]; - char *name; +@@ -645,3 +649,3 @@ - old_status = cd.sc.cdsc_audiostatus; + old_status = SC_AUDIOSTATUS(cd.sc); g_snprintf(tmp, 255, "tcd/%s.xpm", - (old_status==CDROM_AUDIO_PLAY)?"pause":"play"); - ---- tcd/gtracked.c.orig Tue Oct 5 12:27:47 1999 -+++ tcd/gtracked.c Sat Feb 19 15:34:13 2000 -@@ -207,8 +207,8 @@ - - /* Disc area */ +--- tcd/gtracked.c.orig Sun May 21 15:13:05 2000 ++++ tcd/gtracked.c Tue May 30 15:17:17 2000 +@@ -211,4 +211,4 @@ g_snprintf(tmp, 63, _("Disc Information (%02u:%02u minutes)"), - cd.trk[cd.last_t+1].toc.cdte_addr.msf.minute, - cd.trk[cd.last_t+1].toc.cdte_addr.msf.second); + TOC_MINUTE(cd.trk[cd.last_t+1]), + TOC_SECOND(cd.trk[cd.last_t+1])); - disc_frame = gtk_frame_new(tmp); - disc_vbox = gtk_vbox_new(FALSE, GNOME_PAD_SMALL); ---- tcd/linux-cdrom.c.orig Sat Feb 19 15:34:34 2000 -+++ tcd/linux-cdrom.c Sat Feb 19 15:35:36 2000 -@@ -71,7 +71,7 @@ - debug("cdrom.c: tcd_init_disc(%p) top\n", cd ); - tcd_opencddev( cd, msg_cb ); +--- tcd/linux-cdrom.c.orig Thu Jan 13 22:27:52 2000 ++++ tcd/linux-cdrom.c Tue May 30 15:29:32 2000 +@@ -73,3 +73,3 @@ -#if defined(TCD_CHANGER_ENABLED) +#if defined(TCD_CHANGER_ENABLED) && !defined(TCD_BSD) cd->nslots = ioctl( cd->cd_dev, CDROM_CHANGER_NSLOTS ); - #else - cd->nslots = 0; -@@ -114,8 +114,11 @@ - - int tcd_readtoc( cd_struct *cd ) +@@ -116,4 +116,7 @@ { - int tmp,i; + int i; @@ -177,11 +120,7 @@ + struct ioc_read_toc_single_entry tocentry; +#endif - if(cd->time_lock) - return; -@@ -125,26 +128,47 @@ - cd->isplayable=FALSE; - +@@ -127,3 +130,7 @@ /* read the TOC header */ +#ifdef TCD_BSD + if((ioctl( cd->cd_dev, CDIOREADTOCHEADER, &cd->tochdr))==-1) @@ -189,17 +128,13 @@ if(ioctl( cd->cd_dev, CDROMREADTOCHDR, &cd->tochdr)) +#endif { - strcpy( cd->errmsg, "Can't read disc." ); - cd->err = TRUE; - debug("cdrom.c: tcd_readtoc exiting prematurly. CDROMREADTOCHDR ioctl error.\n" ); - cd->cur_t = 0; +@@ -134,2 +141,5 @@ cd->cddb_id = 0; +#ifdef TCD_BSD + ioctl( cd->cd_dev, CDIOCALLOW); +#endif return(-1); - } - +@@ -138,11 +148,25 @@ /* grab first & last tracks */ +#ifdef TCD_BSD + cd->first_t = cd->tochdr.starting_track; @@ -225,11 +160,7 @@ if(ioctl(cd->cd_dev, CDROMREADTOCENTRY, &cd->trk[C(cd->last_t+1)].toc)) +#endif { - strcpy(cd->errmsg, "Can't read disc."); - cd->err = TRUE; -@@ -152,40 +176,65 @@ - debug("cdrom.c: tcd_readtoc exiting prematurly. CDROMREADTOCENTRY ioctl error.\n" ); - cd->cur_t = 0; +@@ -154,4 +178,15 @@ cd->cddb_id = 0; +#ifdef TCD_BSD + ioctl( cd->cd_dev, CDIOCALLOW); @@ -246,8 +177,7 @@ + cd->trk[C(cd->last_t+1)].start = cd->trk[C(cd->last_t+1)].length * 75 + + TOC_FRAME(cd->trk[C(cd->last_t+1)]); - /* read the rest of the tocs */ - for( i = cd->first_t; i <= cd->last_t; i++ ) +@@ -160,6 +195,15 @@ { +#ifdef TCD_BSD + tocentry.track = i; @@ -263,16 +193,13 @@ if(ioctl(cd->cd_dev, CDROMREADTOCENTRY, &cd->trk[C(i)].toc)) +#endif { - strcpy( cd->errmsg, "Can't read disc." ); - cd->err = TRUE; - debug("cdrom.c: tcd_readtoc exiting prematurly. CDROMREADTOCENTRY ioctl error.\n" ); - cd->cur_t = 0; +@@ -170,2 +214,5 @@ cd->cddb_id = 0; +#ifdef TCD_BSD + ioctl( cd->cd_dev, CDIOCALLOW); +#endif return(-1); - } +@@ -173,7 +220,12 @@ +#ifdef TCD_BSD + cd->trk[C(i)].toc = tocentry.entry; @@ -288,10 +215,7 @@ - cd->trk[C(i)].toc.cdte_addr.msf.frame; + TOC_FRAME(cd->trk[C(i)]); } - - /* calculate track times */ - for(i = cd->first_t; i <= cd->last_t; i ++) - { +@@ -184,6 +236,3 @@ /* Taken from cdtool...Thanks Thomas I.! */ - delsecs = cd->trk[C(i+1)].toc.cdte_addr.msf.minute * 60 - + cd->trk[C(i+1)].toc.cdte_addr.msf.second @@ -299,20 +223,12 @@ - - cd->trk[C(i)].toc.cdte_addr.msf.second; + delsecs = cd->trk[C(i+1)].length - cd->trk[C(i)].length; - cd->trk[C(i)].tot_min = delsecs / 60; - cd->trk[C(i)].tot_sec = delsecs - (delsecs/60)*60; -@@ -204,7 +253,7 @@ - - cd->isplayable=TRUE; +@@ -206,3 +255,3 @@ debug("cdrom.c: tcd_readtoc exiting normally\n" ); - return tmp; + return 0; } - - void tcd_recalculate(cd_struct *cd) -@@ -214,9 +263,8 @@ - return; - +@@ -216,5 +265,4 @@ /* calculate various timing values */ - cd->cur_pos_abs = cd->sc.cdsc_absaddr.msf.minute * 60 + - cd->sc.cdsc_absaddr.msf.second; @@ -320,22 +236,14 @@ + cd->cur_pos_abs = SC_MINUTE(cd->sc) * 60 + SC_SECOND(cd->sc); + cd->cur_frame = cd->cur_pos_abs * 75 + SC_FRAME(cd->sc); - cd->cur_pos_rel = (cd->cur_frame - cd->trk[C(cd->cur_t)].start) / 75; - -@@ -235,8 +283,10 @@ - cd->cd_min = cd->cur_pos_abs / 60; - +@@ -237,4 +285,6 @@ #ifdef TCD_CHANGER_ENABLED +#ifndef TCD_BSD cd->cur_disc = ioctl( cd->cd_dev, CDROM_SELECT_DISC, CDSL_CURRENT ); #endif +#endif } - - void tcd_recalculate_fake(cd_struct *cd, gint abs_pos, gint track) -@@ -282,35 +332,77 @@ - - void tcd_gettime( cd_struct *cd ) +@@ -284,4 +334,16 @@ { +#ifdef TCD_BSD + struct ioc_read_subchannel subch; @@ -352,7 +260,7 @@ cd->sc.cdsc_format = CDROM_MSF; +#endif - if(cd->isplayable) +@@ -289,3 +351,7 @@ { +#ifdef TCD_BSD + if((ioctl( cd->cd_dev, CDIOCREADSUBCHANNEL, &subch)) == -1) @@ -360,9 +268,7 @@ if(ioctl( cd->cd_dev, CDROMSUBCHNL, &cd->sc)) +#endif { - strcpy( cd->errmsg, "Can't read disc." ); - cd->err = TRUE; - debug("cdrom.c: tcd_gettime exiting early. CDROMSUBCHNL ioctl error.\n" ); +@@ -295,8 +361,21 @@ cd->cur_t = 0; +#ifdef TCD_BSD + ioctl( cd->cd_dev, CDIOCALLOW); @@ -386,10 +292,7 @@ cd->cur_t = 0; + } tcd_recalculate(cd); - } - } - - int tcd_set_volume(cd_struct *cd, int volume) +@@ -307,8 +386,21 @@ { +#ifdef TCD_BSD + struct ioc_vol vol; @@ -412,11 +315,7 @@ if(ioctl(cd->cd_dev, CDROMVOLCTRL, &vol) < 0) +#endif return FALSE; - - return TRUE; -@@ -318,6 +410,14 @@ - - int tcd_get_volume(cd_struct *cd) +@@ -320,2 +412,10 @@ { +#ifdef TCD_BSD + struct ioc_vol vol; @@ -427,16 +326,11 @@ + return vol.vol[0]; +#else #ifdef CDROMVOLREAD - struct cdrom_volctrl vol; - -@@ -328,12 +428,39 @@ - #else - return 0; +@@ -330,2 +430,3 @@ #endif +#endif } - - int tcd_playtracks(cd_struct *cd, int start_t, int end_t, int only_use_trkind) +@@ -334,4 +435,30 @@ { +#ifdef TCD_BSD + struct ioc_play_msf msf; @@ -467,30 +361,21 @@ +#endif + int tmp; - debug("cdrom.c: tcd_playtracks( %p, %d, %d )\n", cd, start_t, end_t ); - cd->err = FALSE; -@@ -342,7 +469,7 @@ - tcd_gettime(cd); - if(cd->err) +@@ -344,3 +471,3 @@ { - /* try and inject cd */ + /* try and eject cd */ tcd_ejectcd(cd); - - if(cd->err) -@@ -352,64 +479,88 @@ - } - } +@@ -354,2 +481,5 @@ +#ifdef TCD_BSD + ioctl(cd->cd_dev, CDIOCCLOSE); +#else #if defined(CDROMCLOSETRAY) - ioctl(cd->cd_dev, CDROMCLOSETRAY); --#endif +@@ -358,9 +488,15 @@ + #endif - +#endif -+#endif + + /* bad hack. most data tracks are the first track... */ +#ifdef TCD_BSD @@ -499,7 +384,7 @@ if(cd->trk[start_t].toc.cdte_ctrl == CDROM_DATA_TRACK) - start_t++; /* bad hack. most data tracks are the first track... */ +#endif -+ start_t++; ++ start_t++; - msf.cdmsf_min0 = cd->trk[start_t].toc.cdte_addr.msf.minute; - msf.cdmsf_sec0 = cd->trk[start_t].toc.cdte_addr.msf.second; @@ -508,7 +393,7 @@ + MSF_START_SEC = TOC_SECOND(cd->trk[start_t]); + MSF_START_FRM = TOC_FRAME(cd->trk[start_t]); - if( end_t < 0 ) +@@ -368,5 +504,5 @@ { - msf.cdmsf_min1 = cd->trk[start_t].tot_min+msf.cdmsf_min0; - msf.cdmsf_sec1 = cd->trk[start_t].tot_sec+msf.cdmsf_sec0; @@ -517,7 +402,7 @@ + MSF_END_SEC = cd->trk[start_t].tot_sec+MSF_START_SEC; + MSF_END_FRM = 0; } - else +@@ -374,20 +510,20 @@ { - msf.cdmsf_min1 = cd->trk[end_t+1].toc.cdte_addr.msf.minute; - msf.cdmsf_sec1 = cd->trk[end_t+1].toc.cdte_addr.msf.second; @@ -549,34 +434,30 @@ - msf.cdmsf_min1 = 0; + MSF_END_MIN = 0; } - #endif +@@ -395,6 +531,11 @@ } - msf.cdmsf_min1 += (msf.cdmsf_sec1 / 60); - msf.cdmsf_sec1 %= 60; + MSF_END_MIN += (MSF_END_SEC / 60); + MSF_END_SEC %= 60; -+ -+#ifdef TCD_BSD -+ ioctl( cd->cd_dev, CDIOCPREVENT); -+#endif +#ifdef TCD_BSD ++ ioctl( cd->cd_dev, CDIOCPREVENT); + if(only_use_trkind || ioctl( cd->cd_dev, CDIOCPLAYMSF, &msf)) +#else if(ioctl( cd->cd_dev, CDROMPLAYMSF, &msf) || only_use_trkind) +#endif { - debug("cdrom.c: tcd_playtracks error. CDROMPLAYMSF ioctl error (or user override). Trying PLAYTRKIND\n" ); - +@@ -403,8 +544,12 @@ /* Try alternate method of playing */ - trkind.cdti_trk0 = start_t; /* start track */ - trkind.cdti_ind0 = 0; /* start index */ - trkind.cdti_trk1 = end_t; /* end track */ - trkind.cdti_ind1 = 0; /* end index */ -+ TI_START_TRK = start_t; /* start track */ -+ TI_START_IND = 0; /* start index */ -+ TI_END_TRK = end_t; /* end track */ -+ TI_END_IND = 0; /* end index */ ++ TI_START_TRK = start_t; /* start track */ ++ TI_START_IND = 0; /* start index */ ++ TI_END_TRK = end_t; /* end track */ ++ TI_END_IND = 0; /* end index */ +#ifdef TCD_BSD + if(ioctl(cd->cd_dev, CDIOCPLAYTRACKS, &trkind)) @@ -584,18 +465,13 @@ if(ioctl(cd->cd_dev, CDROMPLAYTRKIND, &trkind)) +#endif { - strcpy( cd->errmsg, "Error playing disc" ); - cd->err = TRUE; +@@ -413,2 +558,5 @@ debug("cdrom.c: tcd_playtracks error. CDROMPLAYTRKIND ioctl error.\n"); +#ifdef TCD_BSD + ioctl( cd->cd_dev, CDIOCALLOW); +#endif return -1; - } - } -@@ -419,75 +570,68 @@ - return tmp; - } +@@ -422,21 +570,10 @@ -static int msf_2_frame( cd_min_sec_frame *msf ) -{ @@ -622,10 +498,7 @@ +#endif + int tmp; - debug("cdrom.c: tcd_play_seconds( %p, %ld )\n", cd, offset ); - - cd->err = FALSE; - cd->isplayable=FALSE; +@@ -447,41 +584,42 @@ - /* converting msf to frames makes life much easier */ - start_frame = msf_2_frame( &cd->trk[C(cd->first_t)].toc.cdte_addr.msf ); @@ -696,19 +569,13 @@ if(ioctl(cd->cd_dev, CDROMPLAYMSF, &msf)) +#endif { - strcpy( cd->errmsg, "Error playing disc." ); - cd->err = TRUE; - +@@ -491,2 +629,5 @@ debug("cdrom.c: tcd_play_seconds error. CDROMPLAYMSF ioctl error.\n" ); +#ifdef TCD_BSD + ioctl( cd->cd_dev, CDIOCALLOW ); +#endif return(-1); - } - cd->isplayable=TRUE; -@@ -504,7 +648,15 @@ - if(cd->isplayable) tcd_stopcd(cd); - cd->err = FALSE; +@@ -507,3 +648,11 @@ +#ifdef TCD_BSD + ioctl( cd->cd_dev, CDIOCALLOW); @@ -720,17 +587,13 @@ if(!ioctl(cd->cd_dev, CDROMEJECT)) +#endif { - cd->isplayable = FALSE; - strcpy(cd->errmsg, "No disc in drive "); -@@ -512,9 +664,17 @@ - } - else +@@ -515,2 +664,5 @@ { +#ifdef TCD_BSD + tmp = ioctl( cd->cd_dev, CDIOCCLOSE ); +#else #ifdef CDROMCLOSETRAY - tmp = ioctl( cd->cd_dev, CDROMCLOSETRAY ); +@@ -518,2 +670,7 @@ #endif +#endif + @@ -738,21 +601,13 @@ + ioctl( cd->cd_dev, CDIOCPREVENT); +#endif - if(tcd_post_init(cd)) - { -@@ -524,6 +684,9 @@ - debug("cdrom.c: tcd_eject - disc init error. %s\n", - strerror(errno) ); +@@ -527,2 +684,5 @@ +#ifdef TCD_BSD + ioctl( cd->cd_dev, CDIOCALLOW); +#endif return(-1); - } - cd->isplayable = TRUE; -@@ -541,11 +704,19 @@ - debug("cdrom.c: tcd_stopcd(%p)\n", cd ); - +@@ -544,7 +704,15 @@ /* SDH: Makes things cleaner on eject */ - if( cd->sc.cdsc_audiostatus==CDROM_AUDIO_PAUSED ) + if( SC_AUDIOSTATUS(cd->sc)==CDROM_AUDIO_PAUSED ) @@ -769,11 +624,7 @@ if(ioctl(cd->cd_dev, CDROMSTOP)) +#endif { - strcpy( cd->errmsg, "Can't stop disc." ); - cd->err = TRUE; -@@ -563,24 +734,44 @@ - int tmp; - cd->err = FALSE; +@@ -566,5 +734,9 @@ - if(cd->sc.cdsc_audiostatus==CDROM_AUDIO_PAUSED) - { @@ -785,7 +636,7 @@ if((tmp=ioctl(cd->cd_dev, CDROMRESUME))) +#endif { - strcpy(cd->errmsg, strerror(errno)); +@@ -572,4 +744,10 @@ cd->err = TRUE; +#ifdef TCD_BSD + ioctl( cd->cd_dev, CDIOCALLOW); @@ -796,8 +647,7 @@ + ioctl( cd->cd_dev, CDIOCPREVENT); +#endif return tmp; - } - else +@@ -578,3 +756,7 @@ { +#ifdef TCD_BSD + if((tmp=ioctl(cd->cd_dev, CDIOCPAUSE))) @@ -805,7 +655,7 @@ if((tmp=ioctl(cd->cd_dev, CDROMPAUSE))) +#endif { - strcpy( cd->errmsg, strerror( errno ) ); +@@ -582,4 +764,10 @@ cd->err = TRUE; +#ifdef TCD_BSD + ioctl( cd->cd_dev, CDIOCALLOW); @@ -816,19 +666,11 @@ + ioctl( cd->cd_dev, CDIOCPREVENT); +#endif return tmp; - } - } -@@ -588,6 +779,7 @@ - int tcd_change_disc( cd_struct *cd, int disc ) - { +@@ -591,2 +779,3 @@ #ifdef TCD_CHANGER_ENABLED +#ifndef TCD_BSD int tmp; - cd->err = FALSE; - -@@ -596,10 +788,10 @@ - fprintf( stdout, "ioctl: %s\n", strerror(errno) ); - +@@ -599,6 +788,6 @@ return tmp; -#else +#endif @@ -837,53 +679,28 @@ return 0; -#endif } - - void tcd_opencddev( cd_struct *cd, WarnFunc msg_cb ) ---- tcd/linux-cdrom.h.orig Tue Oct 5 12:27:47 1999 -+++ tcd/linux-cdrom.h Sat Feb 19 15:34:13 2000 -@@ -27,11 +27,27 @@ - - #include <sys/types.h> +--- tcd/linux-cdrom.h.orig Thu Jan 13 22:27:52 2000 ++++ tcd/linux-cdrom.h Tue May 30 15:34:32 2000 +@@ -29,4 +29,16 @@ #include <glib.h> -#if !defined(linux) && !defined(sun) && !defined(__sun__) --#error TCD only builds on linux and Solaris/SunOs --#endif - --#ifdef linux -+#if defined(__FreeBSD__) +-# error TCD only builds on linux and Solaris/SunOs ++#if !defined(linux) && !defined(sun) && !defined(__sun__) && !defined(__FreeBSD__) ++# error TCD only builds on Linux, Solaris, SunOS, and FreeBSD ++#endif + ++#ifdef __FreeBSD__ +#define TCD_BSD -+ +#include <sys/cdio.h> -+ +#define CDROM_AUDIO_INVALID CD_AS_AUDIO_INVALID +#define CDROM_AUDIO_PLAY CD_AS_PLAY_IN_PROGRESS -+#define CDROM_AUDIO_PAUSED CD_AS_PLAY_PAUSED -+#define CDROM_AUDIO_COMPLETED CD_AS_PLAY_COMPLETED -+#define CDROM_AUDIO_ERROR CD_AS_PLAY_ERROR -+#define CDROM_AUDIO_NO_STATUS CD_AS_NO_STATUS -+ ++#define CDROM_AUDIO_PAUSED CD_AS_PLAY_PAUSED ++#define CDROM_AUDIO_COMPLETED CD_AS_PLAY_COMPLETED ++#define CDROM_AUDIO_ERROR CD_AS_PLAY_ERROR ++#define CDROM_AUDIO_NO_STATUS CD_AS_NO_STATUS +#define CDROM -+ -+#else -+ -+#define TCD_LINUX -+ -+#if defined(linux) - #include <linux/cdrom.h> - - typedef struct cdrom_msf0 cd_min_sec_frame; -@@ -110,6 +126,7 @@ - } cd_min_sec_frame; - - #endif /* sun __sun__ */ -+#endif /* __FreeBSD__ */ - - #define TRK_NAME_LEN 512 - #define DISC_INFO_LEN 512 -@@ -125,7 +142,17 @@ - { - char name[TRK_NAME_LEN+1]; + #endif +@@ -128,3 +140,13 @@ char extd[EXT_DATA_LEN+1]; /* extra information for this track */ +#ifdef TCD_BSD + struct cd_toc_entry toc; @@ -897,11 +714,7 @@ +#define TOC_FRAME(trk) (trk.toc.cdte_addr.msf.frame) +#endif int titled; - int start, length; - int tot_min, tot_sec; -@@ -151,10 +178,28 @@ - char album[DISC_INFO_LEN+1], artist[DISC_INFO_LEN+1]; - char extd[EXT_DATA_LEN+1]; /* extra information for this disc */ +@@ -154,2 +176,14 @@ +#ifdef TCD_BSD + /* See /usr/include/sys/cdio.h */ @@ -916,8 +729,7 @@ +#else + /* See /usr/src/linux/include/linux/cdrom.h */ - struct cdrom_ti ti; /* Track info */ - struct cdrom_tochdr tochdr; /* TOC header */ +@@ -158,2 +192,8 @@ struct cdrom_subchnl sc; /* Subchannel, for time */ +#define SC_AUDIOSTATUS(sc) (sc.cdsc_audiostatus) +#define SC_TRACK(sc) (sc.cdsc_trk) @@ -926,49 +738,33 @@ +#define SC_FRAME(sc) (sc.cdsc_absaddr.msf.frame) +#endif int volume; /* Must range 0-100 */ - - int cd_min, cd_sec; /* Total CD time */ ---- tcd/tcd.c.orig Tue Oct 5 12:27:47 1999 -+++ tcd/tcd.c Sat Feb 19 15:34:13 2000 -@@ -139,8 +139,8 @@ - - /* if the user hasn't stopped the cd, but it is +--- tcd/tcd.c.orig Thu Jan 13 22:27:52 2000 ++++ tcd/tcd.c Tue May 30 15:17:17 2000 +@@ -141,4 +141,4 @@ stopped anyway, fix it. */ - if( cd->sc.cdsc_audiostatus != CDROM_AUDIO_PLAY && - cd->sc.cdsc_audiostatus != CDROM_AUDIO_PAUSED ) + if( SC_AUDIOSTATUS(cd->sc) != CDROM_AUDIO_PLAY && + SC_AUDIOSTATUS(cd->sc) != CDROM_AUDIO_PAUSED ) { - if( cd->play_method == REPEAT_CD ) - tcd_playtracks(cd, cd->first_t, cd->last_t, 0); -@@ -170,7 +170,7 @@ - case 'p': - case 'P': +@@ -172,3 +172,3 @@ if(cd->isplayable) { - if( cd->sc.cdsc_audiostatus == CDROM_AUDIO_PAUSED ) + if( SC_AUDIOSTATUS(cd->sc) == CDROM_AUDIO_PAUSED ) tcd_pausecd(cd); - else - tcd_playtracks(cd,cd->first_t,cd->last_t, 0); -@@ -440,8 +440,8 @@ - mvwprintw(win,maxy-2,30,"Track:" ); - attron( C_RED+A_BOLD ); +@@ -442,4 +442,4 @@ mvwprintw(win,maxy-4,38,"%02u:%02u", - cd->trk[C(cd->last_t+1)].toc.cdte_addr.msf.minute, - cd->trk[C(cd->last_t+1)].toc.cdte_addr.msf.second ); + TOC_MINUTE(cd->trk[C(cd->last_t+1)]), + TOC_SECOND(cd->trk[C(cd->last_t+1)]) ); mvwprintw(win,maxy-3,38,cd->dtitle ); - attroff( C_RED+A_BOLD ); - } -@@ -478,11 +478,15 @@ - j=height; - for(i=cd->first_t; i <= cd->last_t; i++) +@@ -480,3 +480,3 @@ { - if(cd->cur_t == i && cd->sc.cdsc_audiostatus == CDROM_AUDIO_PLAY) + if(cd->cur_t == i && SC_AUDIOSTATUS(cd->sc) == CDROM_AUDIO_PLAY) stat = 'P'; - else if(cd->repeat_track == i) +@@ -484,3 +484,7 @@ stat = 'R'; +#if defined(TCD_BSD) + else if(cd->trk[i].toc.control == 0x04) @@ -976,31 +772,18 @@ else if(cd->trk[i].toc.cdte_ctrl == CDROM_DATA_TRACK) +#endif stat = 'd'; - else - stat = 'a'; -@@ -498,14 +502,14 @@ - x = 2; - } +@@ -500,3 +504,3 @@ - if( cd->sc.cdsc_audiostatus == CDROM_AUDIO_PLAY && cd->cur_t == i ) + if( SC_AUDIOSTATUS(cd->sc) == CDROM_AUDIO_PLAY && cd->cur_t == i ) attron( A_BOLD ); - - mvwprintw(win,y,x,"%02u%c - %02u:%02u", - i, stat,cd->trk[C(i)].tot_min, - cd->trk[C(i)].tot_sec ); +@@ -507,3 +511,3 @@ - if(cd->sc.cdsc_audiostatus == CDROM_AUDIO_PLAY && cd->cur_t == i) + if(SC_AUDIOSTATUS(cd->sc) == CDROM_AUDIO_PLAY && cd->cur_t == i) attroff( A_BOLD ); - } - } -@@ -516,7 +520,7 @@ - - if( !cd->err ) +@@ -518,3 +522,3 @@ { - switch( cd->sc.cdsc_audiostatus ) + switch( SC_AUDIOSTATUS(cd->sc) ) { - case CDROM_AUDIO_INVALID: - strcpy( tmp,"No Audio " ); diff --git a/audio/gnomemedia/pkg-plist b/audio/gnomemedia/pkg-plist index 7b61361..9519b4d 100644 --- a/audio/gnomemedia/pkg-plist +++ b/audio/gnomemedia/pkg-plist @@ -1,14 +1,19 @@ bin/cddbslave bin/cddbsubmit bin/gmix +bin/grecord bin/gtcd bin/vumeter +share/gnome/apps/Multimedia/Soundrecorder.desktop share/gnome/apps/Multimedia/gmix.desktop share/gnome/apps/Multimedia/gtcd.desktop share/gnome/apps/Multimedia/vumeter.desktop share/gnome/cddb-submit-methods +share/gnome/mime-info/grecord.keys +share/gnome/mime-info/grecord.mime share/gnome/pixmaps/gnome-mixer.png share/gnome/pixmaps/gnome-vumeter.png +share/gnome/pixmaps/gtcd.png share/gnome/pixmaps/tcd/cdrom.xpm share/gnome/pixmaps/tcd/eject.xpm share/gnome/pixmaps/tcd/ff.xpm @@ -19,25 +24,33 @@ share/gnome/pixmaps/tcd/play.xpm share/gnome/pixmaps/tcd/prev_t.xpm share/gnome/pixmaps/tcd/rw.xpm share/gnome/pixmaps/tcd/stop.xpm +share/locale/ca/LC_MESSAGES/gnome-media.mo share/locale/cs/LC_MESSAGES/gnome-media.mo share/locale/da/LC_MESSAGES/gnome-media.mo share/locale/de/LC_MESSAGES/gnome-media.mo +share/locale/el/LC_MESSAGES/gnome-media.mo share/locale/en_GB/LC_MESSAGES/gnome-media.mo share/locale/es/LC_MESSAGES/gnome-media.mo share/locale/et/LC_MESSAGES/gnome-media.mo share/locale/fi/LC_MESSAGES/gnome-media.mo share/locale/fr/LC_MESSAGES/gnome-media.mo share/locale/ga/LC_MESSAGES/gnome-media.mo +share/locale/gl/LC_MESSAGES/gnome-media.mo share/locale/hu/LC_MESSAGES/gnome-media.mo share/locale/it/LC_MESSAGES/gnome-media.mo share/locale/ja/LC_MESSAGES/gnome-media.mo share/locale/ko/LC_MESSAGES/gnome-media.mo +share/locale/lt/LC_MESSAGES/gnome-media.mo share/locale/nl/LC_MESSAGES/gnome-media.mo share/locale/no/LC_MESSAGES/gnome-media.mo share/locale/pl/LC_MESSAGES/gnome-media.mo share/locale/pt/LC_MESSAGES/gnome-media.mo share/locale/pt_BR/LC_MESSAGES/gnome-media.mo +share/locale/ro/LC_MESSAGES/gnome-media.mo share/locale/ru/LC_MESSAGES/gnome-media.mo share/locale/sv/LC_MESSAGES/gnome-media.mo +share/locale/tr/LC_MESSAGES/gnome-media.mo +share/locale/uk/LC_MESSAGES/gnome-media.mo +share/locale/zh_CN.GB2312/LC_MESSAGES/gnome-media.mo share/locale/zh_TW.Big5/LC_MESSAGES/gnome-media.mo @dirrm share/gnome/pixmaps/tcd/ diff --git a/audio/gnomemedia2/Makefile b/audio/gnomemedia2/Makefile index 927b46d..ef180ff 100644 --- a/audio/gnomemedia2/Makefile +++ b/audio/gnomemedia2/Makefile @@ -6,7 +6,7 @@ # PORTNAME= gnomemedia -PORTVERSION= 1.0.51 +PORTVERSION= 1.2.0 CATEGORIES= audio gnome MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= stable/sources/gnome-media @@ -22,8 +22,7 @@ USE_GMAKE= yes USE_LIBTOOL= yes CONFIGURE_ARGS= --without-ncurses \ --localstatedir=${PREFIX}/share/gnome \ - --datadir=${PREFIX}/share/gnome \ - --with-gnome=${PREFIX} + --datadir=${PREFIX}/share/gnome CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LIBS="-L${LOCALBASE}/lib" diff --git a/audio/gnomemedia2/distinfo b/audio/gnomemedia2/distinfo index dd5df81..311191f 100644 --- a/audio/gnomemedia2/distinfo +++ b/audio/gnomemedia2/distinfo @@ -1 +1 @@ -MD5 (gnome-media-1.0.51.tar.gz) = d52772de47b214d9fc48aea75108cce7 +MD5 (gnome-media-1.2.0.tar.gz) = c7cda6054b47f71aa46aaabe9db6fb4c diff --git a/audio/gnomemedia2/files/patch-ac b/audio/gnomemedia2/files/patch-ac index d8c3aeb..d234ced 100644 --- a/audio/gnomemedia2/files/patch-ac +++ b/audio/gnomemedia2/files/patch-ac @@ -1,76 +1,67 @@ ---- vu-meter/Makefile.in.orig Wed Mar 3 12:35:57 1999 -+++ vu-meter/Makefile.in Wed Mar 3 12:36:25 1999 -@@ -116,9 +116,9 @@ - ZVT_LIBS = @ZVT_LIBS@ - l = @l@ +--- cddbslave/Makefile.in.orig Wed May 24 14:53:10 2000 ++++ cddbslave/Makefile.in Tue May 30 15:13:02 2000 +@@ -125,3 +125,3 @@ --Audiodir = $(datadir)/gnome/apps/Multimedia -+Audiodir = $(datadir)/apps/Multimedia +-INCLUDES = -I$(includedir) $(GNOME_INCLUDEDIR) -DGNOMELOCALEDIR=\""$(datadir)/locale"\" ++INCLUDES = -I$(includedir) $(GNOME_INCLUDEDIR) -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" --INCLUDES = -DGNOMELOCALEDIR=\""$(datadir)/locale"\" $(GNOME_INCLUDEDIR) -+INCLUDES = -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" $(GNOME_INCLUDEDIR) +@@ -139,3 +139,3 @@ +-gnomedatadir = $(datadir)/gnome ++gnomedatadir = $(datadir) - bin_PROGRAMS = vumeter ---- gmix/Makefile.in.orig Wed Sep 22 03:11:25 1999 -+++ gmix/Makefile.in Fri Sep 24 11:55:02 1999 -@@ -123,12 +123,12 @@ - cxxflags_set = @cxxflags_set@ - l = @l@ +--- gmix/Makefile.in.orig Wed May 24 14:53:13 2000 ++++ gmix/Makefile.in Tue May 30 15:11:42 2000 +@@ -125,3 +125,3 @@ -Audiodir = $(datadir)/gnome/apps/Multimedia +Audiodir = $(datadir)/apps/Multimedia pixmapdir = $(datadir)/pixmaps +@@ -131,3 +131,3 @@ - EXTRA_DIST = README TODO NEWS gmix.desktop gnome-mixer.png +-INCLUDES = -DGNOMELOCALEDIR=\""$(datadir)/locale"\" $(GNOME_INCLUDEDIR) -DGNOME_ICONDIR=\""$(pixmapdir)"\" ++INCLUDES = -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" $(GNOME_INCLUDEDIR) -DGNOME_ICONDIR=\""$(pixmapdir)"\" + +--- grecord/Makefile.in.orig Wed May 24 14:53:19 2000 ++++ grecord/Makefile.in Tue May 30 15:39:21 2000 +@@ -130,3 +130,3 @@ --INCLUDES = -DGNOMELOCALEDIR=\""$(datadir)/locale"\" $(GNOME_INCLUDEDIR) -+INCLUDES = -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" $(GNOME_INCLUDEDIR) +-Applicationsdir = $(datadir)/gnome/apps/Multimedia ++Applicationsdir = $(datadir)/apps/Multimedia + Applications_DATA = Soundrecorder.desktop +--- grecord/src/Makefile.in.orig Wed May 24 14:53:21 2000 ++++ grecord/src/Makefile.in Tue May 30 15:39:42 2000 +@@ -125,3 +125,3 @@ +-INCLUDES = -DGNOMELOCALEDIR=\""$(datadir)/locale"\" -I$(top_srcdir)/intl $(GNOME_INCLUDEDIR) -DGNOME_ICONDIR=\""$(datadir)/pixmaps"\" ++INCLUDES = -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" -I$(top_srcdir)/intl $(GNOME_INCLUDEDIR) -DGNOME_ICONDIR=\""$(datadir)/pixmaps"\" - bin_PROGRAMS = gmix ---- tcd/Makefile.in.orig Tue Oct 5 12:29:27 1999 -+++ tcd/Makefile.in Sun Jan 30 23:10:53 2000 -@@ -123,7 +123,7 @@ - cxxflags_set = @cxxflags_set@ - l = @l@ +--- tcd/Makefile.in.orig Wed May 24 14:53:16 2000 ++++ tcd/Makefile.in Tue May 30 15:12:38 2000 +@@ -125,3 +125,3 @@ -Audiodir = $(datadir)/gnome/apps/Multimedia +Audiodir = $(datadir)/apps/Multimedia - - EXTRA_DIST = README TODO NEWS gtcd.desktop - -@@ -144,11 +144,11 @@ - gtcd_LDADD = $(GNOME_LIBDIR) $(GNOMEUI_LIBS) $(INTLLIBS) - + Pixmapdir = $(datadir)/pixmaps +@@ -147,3 +147,3 @@ -tcd_LDADD = $(GNOME_LIBDIR) -lglib -lm $(CURSES_LIBS) $(INTLLIBS) -+tcd_LDADD = `${GLIB_CONFIG} --libs` -lm $(CURSES_LIBS) $(INTLLIBS) - - CLEANFILES = *~ ++tcd_LDADD = `$(GLIB_CONFIG) --libs` -lm $(CURSES_LIBS) $(INTLLIBS) --INCLUDES = -I$(includedir) $(GNOME_INCLUDEDIR) $(CURSES_INCLUDEDIR) -DGNOMELOCALEDIR=\""$(datadir)/locale"\" $(USE_CD_CHANGER) -g -+INCLUDES = -I$(includedir) $(GNOME_INCLUDEDIR) $(CURSES_INCLUDEDIR) -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" $(USE_CD_CHANGER) -g +@@ -151,3 +151,3 @@ +-INCLUDES = -I$(includedir) $(GNOME_INCLUDEDIR) $(CURSES_INCLUDEDIR) -DGNOMELOCALEDIR=\""$(datadir)/locale"\" $(USE_CD_CHANGER) -DGNOME_ICONDIR=\""$(Pixmapdir)"\" ++INCLUDES = -I$(includedir) $(GNOME_INCLUDEDIR) $(CURSES_INCLUDEDIR) -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" $(USE_CD_CHANGER) -DGNOME_ICONDIR=\""$(Pixmapdir)"\" - Audio_DATA = gtcd.desktop ---- cddbslave/Makefile.in.orig Thu Jul 15 07:55:51 1999 -+++ cddbslave/Makefile.in Fri Jul 16 00:02:50 1999 -@@ -123,7 +123,7 @@ - cxxflags_set = @cxxflags_set@ - l = @l@ - --INCLUDES = -I$(includedir) $(GNOME_INCLUDEDIR) -DGNOMELOCALEDIR=\""$(datadir)/locale"\" -+INCLUDES = -I$(includedir) $(GNOME_INCLUDEDIR) -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" - - - bin_PROGRAMS = cddbslave cddbsubmit -@@ -137,7 +137,7 @@ - cddbsubmit_LDADD = $(GNOME_LIBDIR) $(GNOME_LIBS) $(GHTTP_LIB) $(INTLLIBS) +--- vu-meter/Makefile.in.orig Wed May 24 14:53:11 2000 ++++ vu-meter/Makefile.in Tue May 30 15:11:23 2000 +@@ -125,3 +125,3 @@ +-Audiodir = $(datadir)/gnome/apps/Multimedia ++Audiodir = $(datadir)/apps/Multimedia --gnomedatadir = $(datadir)/gnome -+gnomedatadir = $(datadir) +@@ -129,3 +129,3 @@ - gnomedata_DATA = cddb-submit-methods +-INCLUDES = -DGNOMELOCALEDIR=\""$(datadir)/locale"\" $(GNOME_INCLUDEDIR) -DGNOME_ICONDIR=\""$(pixmapdir)"\" ++INCLUDES = -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" $(GNOME_INCLUDEDIR) -DGNOME_ICONDIR=\""$(pixmapdir)"\" diff --git a/audio/gnomemedia2/files/patch-ae b/audio/gnomemedia2/files/patch-ae index 71b230c..b2878eb 100644 --- a/audio/gnomemedia2/files/patch-ae +++ b/audio/gnomemedia2/files/patch-ae @@ -1,28 +1,18 @@ ---- tcd/callbacks.c.orig Tue Oct 5 12:27:47 1999 -+++ tcd/callbacks.c Sat Feb 19 15:34:13 2000 -@@ -10,7 +10,7 @@ - - void play_cb(GtkWidget *widget, gpointer data) +--- tcd/callbacks.c.orig Thu Jan 13 22:27:52 2000 ++++ tcd/callbacks.c Tue May 30 15:17:17 2000 +@@ -12,3 +12,3 @@ { - if(cd.sc.cdsc_audiostatus==CDROM_AUDIO_PAUSED) + if(SC_AUDIOSTATUS(cd.sc)==CDROM_AUDIO_PAUSED) tcd_pausecd(&cd); - else - tcd_playtracks(&cd, cd.first_t, cd.last_t, prefs->only_use_trkind); -@@ -42,7 +42,7 @@ - cd.play_method = NORMAL; - cd.repeat_track = -1; +@@ -44,3 +44,3 @@ /* SDH: Make sure play/pause state change is noticed */ - cd.sc.cdsc_audiostatus = -1; + SC_AUDIOSTATUS(cd.sc) = -1; if(cd.isplayable) - { - make_goto_menu(); ---- tcd/cddb.c.orig Tue Oct 5 12:27:47 1999 -+++ tcd/cddb.c Sat Feb 19 15:34:13 2000 -@@ -199,16 +199,16 @@ - { - int min, sec; +--- tcd/cddb.c.orig Thu Jan 13 22:27:52 2000 ++++ tcd/cddb.c Tue May 30 15:17:17 2000 +@@ -201,7 +201,7 @@ - min = cd->trk[trk].toc.cdte_addr.msf.minute; - sec = cd->trk[trk].toc.cdte_addr.msf.second; @@ -33,18 +23,14 @@ - fprintf( fp, "# %u\n", (n*75)+cd->trk[trk].toc.cdte_addr.msf.frame ); + fprintf( fp, "# %u\n", (n*75)+TOC_FRAME(cd->trk[trk]) ); } - /* Print the number of seconds */ +@@ -209,4 +209,4 @@ fprintf( fp, "#\n# Disc length: %i seconds\n", - (cd->trk[cd->last_t+1].toc.cdte_addr.msf.minute*60) - +(cd->trk[cd->last_t+1].toc.cdte_addr.msf.second) ); + (TOC_MINUTE(cd->trk[cd->last_t+1])*60) + +(TOC_SECOND(cd->trk[cd->last_t+1])) ); - fprintf( fp, "#\n# Revision: %lu\n", cd->cddb_rev ); - fprintf( fp, "# Submitted via: tcd 2.0b\n" ); -@@ -245,10 +245,10 @@ - { - int min, sec; +@@ -247,6 +247,6 @@ - min = cd->trk[i].toc.cdte_addr.msf.minute; - sec = cd->trk[i].toc.cdte_addr.msf.second; @@ -54,22 +40,14 @@ - l=sprintf( tmp, "%u ", calc_offset(min,sec,cd->trk[i].toc.cdte_addr.msf.frame)); + l=sprintf( tmp, "%u ", calc_offset(min,sec,TOC_FRAME(cd->trk[i]))); - if(blen>l) - { -@@ -257,8 +257,8 @@ - } - } +@@ -259,4 +259,4 @@ l=sprintf( tmp, "%i\n", - (cd->trk[cd->last_t+1].toc.cdte_addr.msf.minute*60) - +(cd->trk[cd->last_t+1].toc.cdte_addr.msf.second) ); + (TOC_MINUTE(cd->trk[cd->last_t+1])*60) + +(TOC_SECOND(cd->trk[cd->last_t+1])) ); if(blen>l) - strcat( buf,tmp ); - -@@ -298,9 +298,9 @@ - - for( i=0; i <= cd->last_t+1; i++ ) +@@ -300,5 +300,5 @@ { - cdtoc[i].frame = cd->trk[i+1].toc.cdte_addr.msf.frame; - cdtoc[i].min = cd->trk[i+1].toc.cdte_addr.msf.minute; @@ -78,13 +56,9 @@ + cdtoc[i].min = TOC_MINUTE(cd->trk[i+1]); + cdtoc[i].sec = TOC_SECOND(cd->trk[i+1]); } - - ---- tcd/gtcd.c.orig Tue Oct 5 12:27:47 1999 -+++ tcd/gtcd.c Sat Feb 19 15:34:13 2000 -@@ -155,7 +155,11 @@ - gint release_timer(gpointer *data) - { +--- tcd/gtcd.c.orig Sun May 21 15:13:04 2000 ++++ tcd/gtcd.c Tue May 30 15:17:17 2000 +@@ -157,3 +157,7 @@ cd.time_lock = TRUE; +#ifdef TCD_BSD + ioctl(cd.cd_dev, CDIOCPAUSE); @@ -92,83 +66,52 @@ ioctl(cd.cd_dev, CDROMPAUSE); +#endif - roll_t = gtk_timeout_add(40, (GtkFunction)roll_timer, data); - release_t = 0; -@@ -430,8 +434,8 @@ - break; - case DISC_R: +@@ -421,4 +425,4 @@ cur = cd.cur_pos_abs; - end = (cd.trk[cd.last_t+1].toc.cdte_addr.msf.minute - *60)+cd.trk[cd.last_t+1].toc.cdte_addr.msf.second; + end = (TOC_MINUTE(cd.trk[cd.last_t+1])*60 + +TOC_SECOND(cd.trk[cd.last_t+1])); pos = end-cur; - min = pos/60; - sec = pos-(pos/60)*60; -@@ -532,7 +536,7 @@ - - if( !cd.err ) +@@ -524,3 +528,3 @@ { - switch( cd.sc.cdsc_audiostatus ) + switch( SC_AUDIOSTATUS(cd.sc) ) { - case CDROM_AUDIO_INVALID: - strcpy(tmp, _("No Disc")); -@@ -628,8 +632,8 @@ - } - +@@ -620,4 +624,4 @@ /* see if we need to repeat */ - if( cd.sc.cdsc_audiostatus != CDROM_AUDIO_PLAY && - cd.sc.cdsc_audiostatus != CDROM_AUDIO_PAUSED ) + if( SC_AUDIOSTATUS(cd.sc) != CDROM_AUDIO_PLAY && + SC_AUDIOSTATUS(cd.sc) != CDROM_AUDIO_PAUSED ) { - if( cd.play_method == REPEAT_CD ) - tcd_playtracks( &cd, cd.first_t, cd.last_t, prefs->only_use_trkind); -@@ -646,14 +650,14 @@ - - void status_changed(void) +@@ -638,3 +642,3 @@ { - if(old_status != cd.sc.cdsc_audiostatus) + if(old_status != SC_AUDIOSTATUS(cd.sc)) { - GtkWidget *pixmap; - GtkSignalFunc func; - char tmp[256]; - char *name; +@@ -645,3 +649,3 @@ - old_status = cd.sc.cdsc_audiostatus; + old_status = SC_AUDIOSTATUS(cd.sc); g_snprintf(tmp, 255, "tcd/%s.xpm", - (old_status==CDROM_AUDIO_PLAY)?"pause":"play"); - ---- tcd/gtracked.c.orig Tue Oct 5 12:27:47 1999 -+++ tcd/gtracked.c Sat Feb 19 15:34:13 2000 -@@ -207,8 +207,8 @@ - - /* Disc area */ +--- tcd/gtracked.c.orig Sun May 21 15:13:05 2000 ++++ tcd/gtracked.c Tue May 30 15:17:17 2000 +@@ -211,4 +211,4 @@ g_snprintf(tmp, 63, _("Disc Information (%02u:%02u minutes)"), - cd.trk[cd.last_t+1].toc.cdte_addr.msf.minute, - cd.trk[cd.last_t+1].toc.cdte_addr.msf.second); + TOC_MINUTE(cd.trk[cd.last_t+1]), + TOC_SECOND(cd.trk[cd.last_t+1])); - disc_frame = gtk_frame_new(tmp); - disc_vbox = gtk_vbox_new(FALSE, GNOME_PAD_SMALL); ---- tcd/linux-cdrom.c.orig Sat Feb 19 15:34:34 2000 -+++ tcd/linux-cdrom.c Sat Feb 19 15:35:36 2000 -@@ -71,7 +71,7 @@ - debug("cdrom.c: tcd_init_disc(%p) top\n", cd ); - tcd_opencddev( cd, msg_cb ); +--- tcd/linux-cdrom.c.orig Thu Jan 13 22:27:52 2000 ++++ tcd/linux-cdrom.c Tue May 30 15:29:32 2000 +@@ -73,3 +73,3 @@ -#if defined(TCD_CHANGER_ENABLED) +#if defined(TCD_CHANGER_ENABLED) && !defined(TCD_BSD) cd->nslots = ioctl( cd->cd_dev, CDROM_CHANGER_NSLOTS ); - #else - cd->nslots = 0; -@@ -114,8 +114,11 @@ - - int tcd_readtoc( cd_struct *cd ) +@@ -116,4 +116,7 @@ { - int tmp,i; + int i; @@ -177,11 +120,7 @@ + struct ioc_read_toc_single_entry tocentry; +#endif - if(cd->time_lock) - return; -@@ -125,26 +128,47 @@ - cd->isplayable=FALSE; - +@@ -127,3 +130,7 @@ /* read the TOC header */ +#ifdef TCD_BSD + if((ioctl( cd->cd_dev, CDIOREADTOCHEADER, &cd->tochdr))==-1) @@ -189,17 +128,13 @@ if(ioctl( cd->cd_dev, CDROMREADTOCHDR, &cd->tochdr)) +#endif { - strcpy( cd->errmsg, "Can't read disc." ); - cd->err = TRUE; - debug("cdrom.c: tcd_readtoc exiting prematurly. CDROMREADTOCHDR ioctl error.\n" ); - cd->cur_t = 0; +@@ -134,2 +141,5 @@ cd->cddb_id = 0; +#ifdef TCD_BSD + ioctl( cd->cd_dev, CDIOCALLOW); +#endif return(-1); - } - +@@ -138,11 +148,25 @@ /* grab first & last tracks */ +#ifdef TCD_BSD + cd->first_t = cd->tochdr.starting_track; @@ -225,11 +160,7 @@ if(ioctl(cd->cd_dev, CDROMREADTOCENTRY, &cd->trk[C(cd->last_t+1)].toc)) +#endif { - strcpy(cd->errmsg, "Can't read disc."); - cd->err = TRUE; -@@ -152,40 +176,65 @@ - debug("cdrom.c: tcd_readtoc exiting prematurly. CDROMREADTOCENTRY ioctl error.\n" ); - cd->cur_t = 0; +@@ -154,4 +178,15 @@ cd->cddb_id = 0; +#ifdef TCD_BSD + ioctl( cd->cd_dev, CDIOCALLOW); @@ -246,8 +177,7 @@ + cd->trk[C(cd->last_t+1)].start = cd->trk[C(cd->last_t+1)].length * 75 + + TOC_FRAME(cd->trk[C(cd->last_t+1)]); - /* read the rest of the tocs */ - for( i = cd->first_t; i <= cd->last_t; i++ ) +@@ -160,6 +195,15 @@ { +#ifdef TCD_BSD + tocentry.track = i; @@ -263,16 +193,13 @@ if(ioctl(cd->cd_dev, CDROMREADTOCENTRY, &cd->trk[C(i)].toc)) +#endif { - strcpy( cd->errmsg, "Can't read disc." ); - cd->err = TRUE; - debug("cdrom.c: tcd_readtoc exiting prematurly. CDROMREADTOCENTRY ioctl error.\n" ); - cd->cur_t = 0; +@@ -170,2 +214,5 @@ cd->cddb_id = 0; +#ifdef TCD_BSD + ioctl( cd->cd_dev, CDIOCALLOW); +#endif return(-1); - } +@@ -173,7 +220,12 @@ +#ifdef TCD_BSD + cd->trk[C(i)].toc = tocentry.entry; @@ -288,10 +215,7 @@ - cd->trk[C(i)].toc.cdte_addr.msf.frame; + TOC_FRAME(cd->trk[C(i)]); } - - /* calculate track times */ - for(i = cd->first_t; i <= cd->last_t; i ++) - { +@@ -184,6 +236,3 @@ /* Taken from cdtool...Thanks Thomas I.! */ - delsecs = cd->trk[C(i+1)].toc.cdte_addr.msf.minute * 60 - + cd->trk[C(i+1)].toc.cdte_addr.msf.second @@ -299,20 +223,12 @@ - - cd->trk[C(i)].toc.cdte_addr.msf.second; + delsecs = cd->trk[C(i+1)].length - cd->trk[C(i)].length; - cd->trk[C(i)].tot_min = delsecs / 60; - cd->trk[C(i)].tot_sec = delsecs - (delsecs/60)*60; -@@ -204,7 +253,7 @@ - - cd->isplayable=TRUE; +@@ -206,3 +255,3 @@ debug("cdrom.c: tcd_readtoc exiting normally\n" ); - return tmp; + return 0; } - - void tcd_recalculate(cd_struct *cd) -@@ -214,9 +263,8 @@ - return; - +@@ -216,5 +265,4 @@ /* calculate various timing values */ - cd->cur_pos_abs = cd->sc.cdsc_absaddr.msf.minute * 60 + - cd->sc.cdsc_absaddr.msf.second; @@ -320,22 +236,14 @@ + cd->cur_pos_abs = SC_MINUTE(cd->sc) * 60 + SC_SECOND(cd->sc); + cd->cur_frame = cd->cur_pos_abs * 75 + SC_FRAME(cd->sc); - cd->cur_pos_rel = (cd->cur_frame - cd->trk[C(cd->cur_t)].start) / 75; - -@@ -235,8 +283,10 @@ - cd->cd_min = cd->cur_pos_abs / 60; - +@@ -237,4 +285,6 @@ #ifdef TCD_CHANGER_ENABLED +#ifndef TCD_BSD cd->cur_disc = ioctl( cd->cd_dev, CDROM_SELECT_DISC, CDSL_CURRENT ); #endif +#endif } - - void tcd_recalculate_fake(cd_struct *cd, gint abs_pos, gint track) -@@ -282,35 +332,77 @@ - - void tcd_gettime( cd_struct *cd ) +@@ -284,4 +334,16 @@ { +#ifdef TCD_BSD + struct ioc_read_subchannel subch; @@ -352,7 +260,7 @@ cd->sc.cdsc_format = CDROM_MSF; +#endif - if(cd->isplayable) +@@ -289,3 +351,7 @@ { +#ifdef TCD_BSD + if((ioctl( cd->cd_dev, CDIOCREADSUBCHANNEL, &subch)) == -1) @@ -360,9 +268,7 @@ if(ioctl( cd->cd_dev, CDROMSUBCHNL, &cd->sc)) +#endif { - strcpy( cd->errmsg, "Can't read disc." ); - cd->err = TRUE; - debug("cdrom.c: tcd_gettime exiting early. CDROMSUBCHNL ioctl error.\n" ); +@@ -295,8 +361,21 @@ cd->cur_t = 0; +#ifdef TCD_BSD + ioctl( cd->cd_dev, CDIOCALLOW); @@ -386,10 +292,7 @@ cd->cur_t = 0; + } tcd_recalculate(cd); - } - } - - int tcd_set_volume(cd_struct *cd, int volume) +@@ -307,8 +386,21 @@ { +#ifdef TCD_BSD + struct ioc_vol vol; @@ -412,11 +315,7 @@ if(ioctl(cd->cd_dev, CDROMVOLCTRL, &vol) < 0) +#endif return FALSE; - - return TRUE; -@@ -318,6 +410,14 @@ - - int tcd_get_volume(cd_struct *cd) +@@ -320,2 +412,10 @@ { +#ifdef TCD_BSD + struct ioc_vol vol; @@ -427,16 +326,11 @@ + return vol.vol[0]; +#else #ifdef CDROMVOLREAD - struct cdrom_volctrl vol; - -@@ -328,12 +428,39 @@ - #else - return 0; +@@ -330,2 +430,3 @@ #endif +#endif } - - int tcd_playtracks(cd_struct *cd, int start_t, int end_t, int only_use_trkind) +@@ -334,4 +435,30 @@ { +#ifdef TCD_BSD + struct ioc_play_msf msf; @@ -467,30 +361,21 @@ +#endif + int tmp; - debug("cdrom.c: tcd_playtracks( %p, %d, %d )\n", cd, start_t, end_t ); - cd->err = FALSE; -@@ -342,7 +469,7 @@ - tcd_gettime(cd); - if(cd->err) +@@ -344,3 +471,3 @@ { - /* try and inject cd */ + /* try and eject cd */ tcd_ejectcd(cd); - - if(cd->err) -@@ -352,64 +479,88 @@ - } - } +@@ -354,2 +481,5 @@ +#ifdef TCD_BSD + ioctl(cd->cd_dev, CDIOCCLOSE); +#else #if defined(CDROMCLOSETRAY) - ioctl(cd->cd_dev, CDROMCLOSETRAY); --#endif +@@ -358,9 +488,15 @@ + #endif - +#endif -+#endif + + /* bad hack. most data tracks are the first track... */ +#ifdef TCD_BSD @@ -499,7 +384,7 @@ if(cd->trk[start_t].toc.cdte_ctrl == CDROM_DATA_TRACK) - start_t++; /* bad hack. most data tracks are the first track... */ +#endif -+ start_t++; ++ start_t++; - msf.cdmsf_min0 = cd->trk[start_t].toc.cdte_addr.msf.minute; - msf.cdmsf_sec0 = cd->trk[start_t].toc.cdte_addr.msf.second; @@ -508,7 +393,7 @@ + MSF_START_SEC = TOC_SECOND(cd->trk[start_t]); + MSF_START_FRM = TOC_FRAME(cd->trk[start_t]); - if( end_t < 0 ) +@@ -368,5 +504,5 @@ { - msf.cdmsf_min1 = cd->trk[start_t].tot_min+msf.cdmsf_min0; - msf.cdmsf_sec1 = cd->trk[start_t].tot_sec+msf.cdmsf_sec0; @@ -517,7 +402,7 @@ + MSF_END_SEC = cd->trk[start_t].tot_sec+MSF_START_SEC; + MSF_END_FRM = 0; } - else +@@ -374,20 +510,20 @@ { - msf.cdmsf_min1 = cd->trk[end_t+1].toc.cdte_addr.msf.minute; - msf.cdmsf_sec1 = cd->trk[end_t+1].toc.cdte_addr.msf.second; @@ -549,34 +434,30 @@ - msf.cdmsf_min1 = 0; + MSF_END_MIN = 0; } - #endif +@@ -395,6 +531,11 @@ } - msf.cdmsf_min1 += (msf.cdmsf_sec1 / 60); - msf.cdmsf_sec1 %= 60; + MSF_END_MIN += (MSF_END_SEC / 60); + MSF_END_SEC %= 60; -+ -+#ifdef TCD_BSD -+ ioctl( cd->cd_dev, CDIOCPREVENT); -+#endif +#ifdef TCD_BSD ++ ioctl( cd->cd_dev, CDIOCPREVENT); + if(only_use_trkind || ioctl( cd->cd_dev, CDIOCPLAYMSF, &msf)) +#else if(ioctl( cd->cd_dev, CDROMPLAYMSF, &msf) || only_use_trkind) +#endif { - debug("cdrom.c: tcd_playtracks error. CDROMPLAYMSF ioctl error (or user override). Trying PLAYTRKIND\n" ); - +@@ -403,8 +544,12 @@ /* Try alternate method of playing */ - trkind.cdti_trk0 = start_t; /* start track */ - trkind.cdti_ind0 = 0; /* start index */ - trkind.cdti_trk1 = end_t; /* end track */ - trkind.cdti_ind1 = 0; /* end index */ -+ TI_START_TRK = start_t; /* start track */ -+ TI_START_IND = 0; /* start index */ -+ TI_END_TRK = end_t; /* end track */ -+ TI_END_IND = 0; /* end index */ ++ TI_START_TRK = start_t; /* start track */ ++ TI_START_IND = 0; /* start index */ ++ TI_END_TRK = end_t; /* end track */ ++ TI_END_IND = 0; /* end index */ +#ifdef TCD_BSD + if(ioctl(cd->cd_dev, CDIOCPLAYTRACKS, &trkind)) @@ -584,18 +465,13 @@ if(ioctl(cd->cd_dev, CDROMPLAYTRKIND, &trkind)) +#endif { - strcpy( cd->errmsg, "Error playing disc" ); - cd->err = TRUE; +@@ -413,2 +558,5 @@ debug("cdrom.c: tcd_playtracks error. CDROMPLAYTRKIND ioctl error.\n"); +#ifdef TCD_BSD + ioctl( cd->cd_dev, CDIOCALLOW); +#endif return -1; - } - } -@@ -419,75 +570,68 @@ - return tmp; - } +@@ -422,21 +570,10 @@ -static int msf_2_frame( cd_min_sec_frame *msf ) -{ @@ -622,10 +498,7 @@ +#endif + int tmp; - debug("cdrom.c: tcd_play_seconds( %p, %ld )\n", cd, offset ); - - cd->err = FALSE; - cd->isplayable=FALSE; +@@ -447,41 +584,42 @@ - /* converting msf to frames makes life much easier */ - start_frame = msf_2_frame( &cd->trk[C(cd->first_t)].toc.cdte_addr.msf ); @@ -696,19 +569,13 @@ if(ioctl(cd->cd_dev, CDROMPLAYMSF, &msf)) +#endif { - strcpy( cd->errmsg, "Error playing disc." ); - cd->err = TRUE; - +@@ -491,2 +629,5 @@ debug("cdrom.c: tcd_play_seconds error. CDROMPLAYMSF ioctl error.\n" ); +#ifdef TCD_BSD + ioctl( cd->cd_dev, CDIOCALLOW ); +#endif return(-1); - } - cd->isplayable=TRUE; -@@ -504,7 +648,15 @@ - if(cd->isplayable) tcd_stopcd(cd); - cd->err = FALSE; +@@ -507,3 +648,11 @@ +#ifdef TCD_BSD + ioctl( cd->cd_dev, CDIOCALLOW); @@ -720,17 +587,13 @@ if(!ioctl(cd->cd_dev, CDROMEJECT)) +#endif { - cd->isplayable = FALSE; - strcpy(cd->errmsg, "No disc in drive "); -@@ -512,9 +664,17 @@ - } - else +@@ -515,2 +664,5 @@ { +#ifdef TCD_BSD + tmp = ioctl( cd->cd_dev, CDIOCCLOSE ); +#else #ifdef CDROMCLOSETRAY - tmp = ioctl( cd->cd_dev, CDROMCLOSETRAY ); +@@ -518,2 +670,7 @@ #endif +#endif + @@ -738,21 +601,13 @@ + ioctl( cd->cd_dev, CDIOCPREVENT); +#endif - if(tcd_post_init(cd)) - { -@@ -524,6 +684,9 @@ - debug("cdrom.c: tcd_eject - disc init error. %s\n", - strerror(errno) ); +@@ -527,2 +684,5 @@ +#ifdef TCD_BSD + ioctl( cd->cd_dev, CDIOCALLOW); +#endif return(-1); - } - cd->isplayable = TRUE; -@@ -541,11 +704,19 @@ - debug("cdrom.c: tcd_stopcd(%p)\n", cd ); - +@@ -544,7 +704,15 @@ /* SDH: Makes things cleaner on eject */ - if( cd->sc.cdsc_audiostatus==CDROM_AUDIO_PAUSED ) + if( SC_AUDIOSTATUS(cd->sc)==CDROM_AUDIO_PAUSED ) @@ -769,11 +624,7 @@ if(ioctl(cd->cd_dev, CDROMSTOP)) +#endif { - strcpy( cd->errmsg, "Can't stop disc." ); - cd->err = TRUE; -@@ -563,24 +734,44 @@ - int tmp; - cd->err = FALSE; +@@ -566,5 +734,9 @@ - if(cd->sc.cdsc_audiostatus==CDROM_AUDIO_PAUSED) - { @@ -785,7 +636,7 @@ if((tmp=ioctl(cd->cd_dev, CDROMRESUME))) +#endif { - strcpy(cd->errmsg, strerror(errno)); +@@ -572,4 +744,10 @@ cd->err = TRUE; +#ifdef TCD_BSD + ioctl( cd->cd_dev, CDIOCALLOW); @@ -796,8 +647,7 @@ + ioctl( cd->cd_dev, CDIOCPREVENT); +#endif return tmp; - } - else +@@ -578,3 +756,7 @@ { +#ifdef TCD_BSD + if((tmp=ioctl(cd->cd_dev, CDIOCPAUSE))) @@ -805,7 +655,7 @@ if((tmp=ioctl(cd->cd_dev, CDROMPAUSE))) +#endif { - strcpy( cd->errmsg, strerror( errno ) ); +@@ -582,4 +764,10 @@ cd->err = TRUE; +#ifdef TCD_BSD + ioctl( cd->cd_dev, CDIOCALLOW); @@ -816,19 +666,11 @@ + ioctl( cd->cd_dev, CDIOCPREVENT); +#endif return tmp; - } - } -@@ -588,6 +779,7 @@ - int tcd_change_disc( cd_struct *cd, int disc ) - { +@@ -591,2 +779,3 @@ #ifdef TCD_CHANGER_ENABLED +#ifndef TCD_BSD int tmp; - cd->err = FALSE; - -@@ -596,10 +788,10 @@ - fprintf( stdout, "ioctl: %s\n", strerror(errno) ); - +@@ -599,6 +788,6 @@ return tmp; -#else +#endif @@ -837,53 +679,28 @@ return 0; -#endif } - - void tcd_opencddev( cd_struct *cd, WarnFunc msg_cb ) ---- tcd/linux-cdrom.h.orig Tue Oct 5 12:27:47 1999 -+++ tcd/linux-cdrom.h Sat Feb 19 15:34:13 2000 -@@ -27,11 +27,27 @@ - - #include <sys/types.h> +--- tcd/linux-cdrom.h.orig Thu Jan 13 22:27:52 2000 ++++ tcd/linux-cdrom.h Tue May 30 15:34:32 2000 +@@ -29,4 +29,16 @@ #include <glib.h> -#if !defined(linux) && !defined(sun) && !defined(__sun__) --#error TCD only builds on linux and Solaris/SunOs --#endif - --#ifdef linux -+#if defined(__FreeBSD__) +-# error TCD only builds on linux and Solaris/SunOs ++#if !defined(linux) && !defined(sun) && !defined(__sun__) && !defined(__FreeBSD__) ++# error TCD only builds on Linux, Solaris, SunOS, and FreeBSD ++#endif + ++#ifdef __FreeBSD__ +#define TCD_BSD -+ +#include <sys/cdio.h> -+ +#define CDROM_AUDIO_INVALID CD_AS_AUDIO_INVALID +#define CDROM_AUDIO_PLAY CD_AS_PLAY_IN_PROGRESS -+#define CDROM_AUDIO_PAUSED CD_AS_PLAY_PAUSED -+#define CDROM_AUDIO_COMPLETED CD_AS_PLAY_COMPLETED -+#define CDROM_AUDIO_ERROR CD_AS_PLAY_ERROR -+#define CDROM_AUDIO_NO_STATUS CD_AS_NO_STATUS -+ ++#define CDROM_AUDIO_PAUSED CD_AS_PLAY_PAUSED ++#define CDROM_AUDIO_COMPLETED CD_AS_PLAY_COMPLETED ++#define CDROM_AUDIO_ERROR CD_AS_PLAY_ERROR ++#define CDROM_AUDIO_NO_STATUS CD_AS_NO_STATUS +#define CDROM -+ -+#else -+ -+#define TCD_LINUX -+ -+#if defined(linux) - #include <linux/cdrom.h> - - typedef struct cdrom_msf0 cd_min_sec_frame; -@@ -110,6 +126,7 @@ - } cd_min_sec_frame; - - #endif /* sun __sun__ */ -+#endif /* __FreeBSD__ */ - - #define TRK_NAME_LEN 512 - #define DISC_INFO_LEN 512 -@@ -125,7 +142,17 @@ - { - char name[TRK_NAME_LEN+1]; + #endif +@@ -128,3 +140,13 @@ char extd[EXT_DATA_LEN+1]; /* extra information for this track */ +#ifdef TCD_BSD + struct cd_toc_entry toc; @@ -897,11 +714,7 @@ +#define TOC_FRAME(trk) (trk.toc.cdte_addr.msf.frame) +#endif int titled; - int start, length; - int tot_min, tot_sec; -@@ -151,10 +178,28 @@ - char album[DISC_INFO_LEN+1], artist[DISC_INFO_LEN+1]; - char extd[EXT_DATA_LEN+1]; /* extra information for this disc */ +@@ -154,2 +176,14 @@ +#ifdef TCD_BSD + /* See /usr/include/sys/cdio.h */ @@ -916,8 +729,7 @@ +#else + /* See /usr/src/linux/include/linux/cdrom.h */ - struct cdrom_ti ti; /* Track info */ - struct cdrom_tochdr tochdr; /* TOC header */ +@@ -158,2 +192,8 @@ struct cdrom_subchnl sc; /* Subchannel, for time */ +#define SC_AUDIOSTATUS(sc) (sc.cdsc_audiostatus) +#define SC_TRACK(sc) (sc.cdsc_trk) @@ -926,49 +738,33 @@ +#define SC_FRAME(sc) (sc.cdsc_absaddr.msf.frame) +#endif int volume; /* Must range 0-100 */ - - int cd_min, cd_sec; /* Total CD time */ ---- tcd/tcd.c.orig Tue Oct 5 12:27:47 1999 -+++ tcd/tcd.c Sat Feb 19 15:34:13 2000 -@@ -139,8 +139,8 @@ - - /* if the user hasn't stopped the cd, but it is +--- tcd/tcd.c.orig Thu Jan 13 22:27:52 2000 ++++ tcd/tcd.c Tue May 30 15:17:17 2000 +@@ -141,4 +141,4 @@ stopped anyway, fix it. */ - if( cd->sc.cdsc_audiostatus != CDROM_AUDIO_PLAY && - cd->sc.cdsc_audiostatus != CDROM_AUDIO_PAUSED ) + if( SC_AUDIOSTATUS(cd->sc) != CDROM_AUDIO_PLAY && + SC_AUDIOSTATUS(cd->sc) != CDROM_AUDIO_PAUSED ) { - if( cd->play_method == REPEAT_CD ) - tcd_playtracks(cd, cd->first_t, cd->last_t, 0); -@@ -170,7 +170,7 @@ - case 'p': - case 'P': +@@ -172,3 +172,3 @@ if(cd->isplayable) { - if( cd->sc.cdsc_audiostatus == CDROM_AUDIO_PAUSED ) + if( SC_AUDIOSTATUS(cd->sc) == CDROM_AUDIO_PAUSED ) tcd_pausecd(cd); - else - tcd_playtracks(cd,cd->first_t,cd->last_t, 0); -@@ -440,8 +440,8 @@ - mvwprintw(win,maxy-2,30,"Track:" ); - attron( C_RED+A_BOLD ); +@@ -442,4 +442,4 @@ mvwprintw(win,maxy-4,38,"%02u:%02u", - cd->trk[C(cd->last_t+1)].toc.cdte_addr.msf.minute, - cd->trk[C(cd->last_t+1)].toc.cdte_addr.msf.second ); + TOC_MINUTE(cd->trk[C(cd->last_t+1)]), + TOC_SECOND(cd->trk[C(cd->last_t+1)]) ); mvwprintw(win,maxy-3,38,cd->dtitle ); - attroff( C_RED+A_BOLD ); - } -@@ -478,11 +478,15 @@ - j=height; - for(i=cd->first_t; i <= cd->last_t; i++) +@@ -480,3 +480,3 @@ { - if(cd->cur_t == i && cd->sc.cdsc_audiostatus == CDROM_AUDIO_PLAY) + if(cd->cur_t == i && SC_AUDIOSTATUS(cd->sc) == CDROM_AUDIO_PLAY) stat = 'P'; - else if(cd->repeat_track == i) +@@ -484,3 +484,7 @@ stat = 'R'; +#if defined(TCD_BSD) + else if(cd->trk[i].toc.control == 0x04) @@ -976,31 +772,18 @@ else if(cd->trk[i].toc.cdte_ctrl == CDROM_DATA_TRACK) +#endif stat = 'd'; - else - stat = 'a'; -@@ -498,14 +502,14 @@ - x = 2; - } +@@ -500,3 +504,3 @@ - if( cd->sc.cdsc_audiostatus == CDROM_AUDIO_PLAY && cd->cur_t == i ) + if( SC_AUDIOSTATUS(cd->sc) == CDROM_AUDIO_PLAY && cd->cur_t == i ) attron( A_BOLD ); - - mvwprintw(win,y,x,"%02u%c - %02u:%02u", - i, stat,cd->trk[C(i)].tot_min, - cd->trk[C(i)].tot_sec ); +@@ -507,3 +511,3 @@ - if(cd->sc.cdsc_audiostatus == CDROM_AUDIO_PLAY && cd->cur_t == i) + if(SC_AUDIOSTATUS(cd->sc) == CDROM_AUDIO_PLAY && cd->cur_t == i) attroff( A_BOLD ); - } - } -@@ -516,7 +520,7 @@ - - if( !cd->err ) +@@ -518,3 +522,3 @@ { - switch( cd->sc.cdsc_audiostatus ) + switch( SC_AUDIOSTATUS(cd->sc) ) { - case CDROM_AUDIO_INVALID: - strcpy( tmp,"No Audio " ); diff --git a/audio/gnomemedia2/pkg-plist b/audio/gnomemedia2/pkg-plist index 7b61361..9519b4d 100644 --- a/audio/gnomemedia2/pkg-plist +++ b/audio/gnomemedia2/pkg-plist @@ -1,14 +1,19 @@ bin/cddbslave bin/cddbsubmit bin/gmix +bin/grecord bin/gtcd bin/vumeter +share/gnome/apps/Multimedia/Soundrecorder.desktop share/gnome/apps/Multimedia/gmix.desktop share/gnome/apps/Multimedia/gtcd.desktop share/gnome/apps/Multimedia/vumeter.desktop share/gnome/cddb-submit-methods +share/gnome/mime-info/grecord.keys +share/gnome/mime-info/grecord.mime share/gnome/pixmaps/gnome-mixer.png share/gnome/pixmaps/gnome-vumeter.png +share/gnome/pixmaps/gtcd.png share/gnome/pixmaps/tcd/cdrom.xpm share/gnome/pixmaps/tcd/eject.xpm share/gnome/pixmaps/tcd/ff.xpm @@ -19,25 +24,33 @@ share/gnome/pixmaps/tcd/play.xpm share/gnome/pixmaps/tcd/prev_t.xpm share/gnome/pixmaps/tcd/rw.xpm share/gnome/pixmaps/tcd/stop.xpm +share/locale/ca/LC_MESSAGES/gnome-media.mo share/locale/cs/LC_MESSAGES/gnome-media.mo share/locale/da/LC_MESSAGES/gnome-media.mo share/locale/de/LC_MESSAGES/gnome-media.mo +share/locale/el/LC_MESSAGES/gnome-media.mo share/locale/en_GB/LC_MESSAGES/gnome-media.mo share/locale/es/LC_MESSAGES/gnome-media.mo share/locale/et/LC_MESSAGES/gnome-media.mo share/locale/fi/LC_MESSAGES/gnome-media.mo share/locale/fr/LC_MESSAGES/gnome-media.mo share/locale/ga/LC_MESSAGES/gnome-media.mo +share/locale/gl/LC_MESSAGES/gnome-media.mo share/locale/hu/LC_MESSAGES/gnome-media.mo share/locale/it/LC_MESSAGES/gnome-media.mo share/locale/ja/LC_MESSAGES/gnome-media.mo share/locale/ko/LC_MESSAGES/gnome-media.mo +share/locale/lt/LC_MESSAGES/gnome-media.mo share/locale/nl/LC_MESSAGES/gnome-media.mo share/locale/no/LC_MESSAGES/gnome-media.mo share/locale/pl/LC_MESSAGES/gnome-media.mo share/locale/pt/LC_MESSAGES/gnome-media.mo share/locale/pt_BR/LC_MESSAGES/gnome-media.mo +share/locale/ro/LC_MESSAGES/gnome-media.mo share/locale/ru/LC_MESSAGES/gnome-media.mo share/locale/sv/LC_MESSAGES/gnome-media.mo +share/locale/tr/LC_MESSAGES/gnome-media.mo +share/locale/uk/LC_MESSAGES/gnome-media.mo +share/locale/zh_CN.GB2312/LC_MESSAGES/gnome-media.mo share/locale/zh_TW.Big5/LC_MESSAGES/gnome-media.mo @dirrm share/gnome/pixmaps/tcd/ diff --git a/deskutils/gnome-pim/Makefile b/deskutils/gnome-pim/Makefile index 5a714e4..abd9757 100644 --- a/deskutils/gnome-pim/Makefile +++ b/deskutils/gnome-pim/Makefile @@ -6,7 +6,7 @@ # PORTNAME= gnomepim -PORTVERSION= 1.0.55 +PORTVERSION= 1.2.0 CATEGORIES= deskutils gnome MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= stable/sources/gnome-pim @@ -14,8 +14,7 @@ DISTNAME= gnome-pim-${PORTVERSION} MAINTAINER= ade@FreeBSD.org -BUILD_DEPENDS= panel:${PORTSDIR}/x11/gnomecore -RUN_DEPENDS= panel:${PORTSDIR}/x11/gnomecore +LIB_DEPENDS= panel_applet.4:${PORTSDIR}/x11/gnomecore GTK_CONFIG?= ${X11BASE}/bin/gtk12-config @@ -23,8 +22,7 @@ USE_X_PREFIX= yes USE_GMAKE= yes GNU_CONFIGURE= yes CONFIGURE_ARGS= --localstatedir=${PREFIX}/share/gnome \ - --datadir=${PREFIX}/share/gnome \ - --with-gnome=${PREFIX} + --datadir=${PREFIX}/share/gnome CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ GTK_CONFIG="${GTK_CONFIG}" \ LIBS="-L${LOCALBASE}/lib" diff --git a/deskutils/gnome-pim/distinfo b/deskutils/gnome-pim/distinfo index 8f840a7..277f4e6 100644 --- a/deskutils/gnome-pim/distinfo +++ b/deskutils/gnome-pim/distinfo @@ -1 +1 @@ -MD5 (gnome-pim-1.0.55.tar.gz) = 9894e09c9d6d41dab2e9e946bc45fe88 +MD5 (gnome-pim-1.2.0.tar.gz) = d0af4da54851fa996b59d4f738ff2920 diff --git a/deskutils/gnome-pim/files/patch-ab b/deskutils/gnome-pim/files/patch-ab index e7abc1a..285308e 100644 --- a/deskutils/gnome-pim/files/patch-ab +++ b/deskutils/gnome-pim/files/patch-ab @@ -1,66 +1,42 @@ ---- gncal/Makefile.in.orig Mon Sep 27 16:05:44 1999 -+++ gncal/Makefile.in Mon Oct 4 14:13:16 1999 -@@ -118,9 +118,9 @@ - - SUBDIRS = doc +--- gncal/Makefile.in.orig Sat May 20 20:52:50 2000 ++++ gncal/Makefile.in Tue May 30 14:34:37 2000 +@@ -143,3 +143,3 @@ -help_base = $(datadir)/gnome/help/cal -+help_base = $(datadir)/help/cal ++help_base = $(datadir)/help/gnomecal --INCLUDES = -I$(includedir) $(GNOME_INCLUDEDIR) -DGNOMELOCALEDIR=\""$(datadir)/locale"\" -+INCLUDES = -I$(includedir) $(GNOME_INCLUDEDIR) -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" +@@ -148,3 +148,3 @@ +-INCLUDES = -I$(includedir) $(GNOME_INCLUDEDIR) $(GNOME_CONDUIT_INCLUDEDIR) $(PISOCK_INCLUDEDIR) -DGNOMELOCALEDIR=\""$(datadir)/locale"\" ++INCLUDES = -I$(includedir) $(GNOME_INCLUDEDIR) $(GNOME_CONDUIT_INCLUDEDIR) $(PISOCK_INCLUDEDIR) -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" - bin_PROGRAMS = gnomecal -@@ -138,7 +138,7 @@ - EXTRA_DIST = gncal.desktop bell.xpm recur.xpm +@@ -223,3 +223,3 @@ +-@HAVE_GNOME_PILOT_TRUE@panelConduitsdir = $(datadir)/gnome/apps/Settings/Peripherals/Conduits ++@HAVE_GNOME_PILOT_TRUE@panelConduitsdir = $(datadir)/apps/Settings/Peripherals/Conduits + @HAVE_GNOME_PILOT_TRUE@panelConduits_DATA = $(ccenterConduits_DATA) +@@ -235,3 +235,3 @@ -Productivitydir = $(datadir)/gnome/apps/Applications +Productivitydir = $(datadir)/apps/Applications - Productivity_DATA = gncal.desktop - mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -@@ -518,7 +518,7 @@ - - - install-data-local: -- $(mkinstalldirs) $(DESTDIR)$(help_base)/C -+# $(mkinstalldirs) $(DESTDIR)$(help_base)/C - - # 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. ---- gnomecard/Makefile.in.orig Fri Sep 17 14:40:25 1999 -+++ gnomecard/Makefile.in Fri Sep 24 13:54:54 1999 -@@ -118,9 +118,9 @@ - - nSUBDIRS = help +--- gnomecard/Makefile.in.orig Sat May 20 20:52:58 2000 ++++ gnomecard/Makefile.in Tue May 30 14:35:44 2000 +@@ -137,5 +137,5 @@ -xpmhelp_base = $(datadir)/gnome/help/cal -+xpmhelp_base = $(datadir)/help/gnomecal ++xpmhelp_base = $(datadir)/help/cal --INCLUDES = -I$(includedir) $(GNOME_INCLUDEDIR) -DGNOMELOCALEDIR=\""$(datadir)/locale"\" -I../../gcalendar -+INCLUDES = -I$(includedir) $(GNOME_INCLUDEDIR) -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" -I../../gcalendar +-INCLUDES = -I$(includedir) $(GNOME_INCLUDEDIR) -DGNOMELOCALEDIR=\""$(datadir)/locale"\" $(PISOCK_INCLUDEDIR) -I../../gcalendar ++INCLUDES = -I$(includedir) $(GNOME_INCLUDEDIR) -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" $(PISOCK_INCLUDEDIR) -I../../gcalendar +@@ -185,3 +185,3 @@ - bin_PROGRAMS = gnomecard -@@ -145,7 +145,7 @@ - EXTRA_DIST = addr.xpm addrtool.xpm cardedit.xpm cardnew.xpm cardfind.xpm email.xpm expl.xpm first.xpm geo.xpm ident.xpm last.xpm org.xpm sec.xpm tel.xpm teltool.xpm phone.xpm world.xpm gnome-card.xpm gnomecard.desktop gnomecard.gnorba - +-@HAVE_GNOME_PILOT_TRUE@panelConduitsdir = $(datadir)/gnome/apps/Settings/Peripherals/Conduits ++@HAVE_GNOME_PILOT_TRUE@panelConduitsdir = $(datadir)/apps/Settings/Peripherals/Conduits + @HAVE_GNOME_PILOT_TRUE@panelConduits_DATA = $(ccenterConduits_DATA) +@@ -194,3 +194,3 @@ -Productivitydir = $(datadir)/gnome/apps/Applications +Productivitydir = $(datadir)/apps/Applications - Productivity_DATA = gnomecard.desktop - ---- gnomecard/help/C/Makefile.in.orig Mon Sep 27 16:05:53 1999 -+++ gnomecard/help/C/Makefile.in Mon Oct 4 14:18:45 1999 -@@ -116,7 +116,7 @@ - cxxflags_set = @cxxflags_set@ - l = @l@ - --gnomecard_helpdir = $(datadir)/gnome/help/gnomecard/C -+gnomecard_helpdir = $(datadir)/help/gnomecard/C - - gnomecard_help_DATA = index.html topic.dat - diff --git a/deskutils/gnome-pim/pkg-plist b/deskutils/gnome-pim/pkg-plist index 4ec3896..19195c2 100644 --- a/deskutils/gnome-pim/pkg-plist +++ b/deskutils/gnome-pim/pkg-plist @@ -1,7 +1,7 @@ bin/gnomecal bin/gnomecard +etc/CORBA/servers/gnomecal.gnorba etc/CORBA/servers/gnomecard.gnorba -lib/libversit.a share/gnome/apps/Applications/gncal.desktop share/gnome/apps/Applications/gnomecard.desktop share/gnome/help/gnomecal/C/gnomecal.html @@ -19,43 +19,43 @@ share/gnome/help/gnomecal/C/gcal.html share/gnome/help/gnomecal/C/ln20.html share/gnome/help/gnomecal/C/tech.html.html share/gnome/help/gnomecal/C/docbook.css -share/gnome/help/gnomecard/C/description.html -share/gnome/help/gnomecard/C/dialogs.html -share/gnome/help/gnomecard/C/display.html -share/gnome/help/gnomecard/C/docbook.css -share/gnome/help/gnomecard/C/index.html -share/gnome/help/gnomecard/C/ln9.html -share/gnome/help/gnomecard/C/menubar.html -share/gnome/help/gnomecard/C/recordview.html -share/gnome/help/gnomecard/C/toolbar.html -share/gnome/help/gnomecard/C/topic.dat +share/gnome/idl/GnomeCal.idl share/gnome/idl/gnome-pim.idl share/gnome/mime-info/gnome-pim.keys -share/gnome/pixmaps/gnome-card.xpm +share/gnome/pixmaps/gnome-calendar-conduit.png +share/gnome/pixmaps/gnome-gnomecard.png +share/locale/ca/LC_MESSAGES/gnome-pim.mo share/locale/cs/LC_MESSAGES/gnome-pim.mo +share/locale/cy/LC_MESSAGES/gnome-pim.mo share/locale/da/LC_MESSAGES/gnome-pim.mo share/locale/de/LC_MESSAGES/gnome-pim.mo share/locale/el/LC_MESSAGES/gnome-pim.mo share/locale/en_GB/LC_MESSAGES/gnome-pim.mo share/locale/es/LC_MESSAGES/gnome-pim.mo +share/locale/et/LC_MESSAGES/gnome-pim.mo share/locale/fi/LC_MESSAGES/gnome-pim.mo share/locale/fr/LC_MESSAGES/gnome-pim.mo share/locale/ga/LC_MESSAGES/gnome-pim.mo +share/locale/gd/LC_MESSAGES/gnome-pim.mo +share/locale/gl/LC_MESSAGES/gnome-pim.mo +share/locale/gv/LC_MESSAGES/gnome-pim.mo share/locale/hu/LC_MESSAGES/gnome-pim.mo share/locale/it/LC_MESSAGES/gnome-pim.mo share/locale/ja/LC_MESSAGES/gnome-pim.mo share/locale/ko/LC_MESSAGES/gnome-pim.mo +share/locale/kw/LC_MESSAGES/gnome-pim.mo +share/locale/lt/LC_MESSAGES/gnome-pim.mo share/locale/nl/LC_MESSAGES/gnome-pim.mo share/locale/no/LC_MESSAGES/gnome-pim.mo share/locale/pl/LC_MESSAGES/gnome-pim.mo share/locale/pt/LC_MESSAGES/gnome-pim.mo +share/locale/pt_BR/LC_MESSAGES/gnome-pim.mo share/locale/sv/LC_MESSAGES/gnome-pim.mo share/locale/ru/LC_MESSAGES/gnome-pim.mo share/locale/uk/LC_MESSAGES/gnome-pim.mo share/locale/wa/LC_MESSAGES/gnome-pim.mo +share/locale/zh_CN.GB2312/LC_MESSAGES/gnome-pim.mo share/locale/zh_TW.Big5/LC_MESSAGES/gnome-pim.mo -@dirrm share/gnome/help/gnomecard/C -@dirrm share/gnome/help/gnomecard @dirrm share/gnome/help/gnomecal/C/images @dirrm share/gnome/help/gnomecal/C @dirrm share/gnome/help/gnomecal diff --git a/deskutils/gnome-utils/Makefile b/deskutils/gnome-utils/Makefile index 2480f0f..5e7764e 100644 --- a/deskutils/gnome-utils/Makefile +++ b/deskutils/gnome-utils/Makefile @@ -6,7 +6,7 @@ # PORTNAME= gnomeutils -PORTVERSION= 1.0.51 +PORTVERSION= 1.2.0 CATEGORIES= misc gnome MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= stable/sources/gnome-utils @@ -14,9 +14,7 @@ DISTNAME= gnome-utils-${PORTVERSION} MAINTAINER= ade@FreeBSD.org -BUILD_DEPENDS= panel:${PORTSDIR}/x11/gnomecore -RUN_DEPENDS= panel:${PORTSDIR}/x11/gnomecore -LIB_DEPENDS= obgnome.1:${PORTSDIR}/lang/gnomeobjc +LIB_DEPENDS= panel_applet.4:${PORTSDIR}/x11/gnomecore GTK_CONFIG?= ${X11BASE}/bin/gtk12-config @@ -24,12 +22,9 @@ USE_X_PREFIX= yes USE_GMAKE= yes USE_LIBTOOL= yes CONFIGURE_ARGS= --localstatedir=${PREFIX}/share/gnome \ - --datadir=${PREFIX}/share/gnome \ - --with-gnome=${PREFIX} + --datadir=${PREFIX}/share/gnome CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ GTK_CONFIG="${GTK_CONFIG}" \ LIBS="-L${LOCALBASE}/lib" -MAN1= gtt.1 - .include <bsd.port.mk> diff --git a/deskutils/gnome-utils/distinfo b/deskutils/gnome-utils/distinfo index a37fd50..698b6b5 100644 --- a/deskutils/gnome-utils/distinfo +++ b/deskutils/gnome-utils/distinfo @@ -1 +1 @@ -MD5 (gnome-utils-1.0.51.tar.gz) = 0de69cb5eaaf81bea3a98cc48e0266c6 +MD5 (gnome-utils-1.2.0.tar.gz) = ffee2281337d29b149612dc186299773 diff --git a/deskutils/gnome-utils/files/patch-aa b/deskutils/gnome-utils/files/patch-aa index a8dc692..149087c 100644 --- a/deskutils/gnome-utils/files/patch-aa +++ b/deskutils/gnome-utils/files/patch-aa @@ -1,24 +1,6 @@ ---- configure.orig Wed Mar 8 09:07:49 2000 -+++ configure Sat Mar 11 15:35:52 2000 -@@ -2480,7 +2480,7 @@ - fi - if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 -- PTHREAD_LIB="-lc_r" -+ PTHREAD_LIB="" - else - echo "$ac_t""no" 1>&6 - echo $ac_n "checking for pthread_create""... $ac_c" 1>&6 -@@ -3277,7 +3277,7 @@ - - echo $ac_n "checking for an obGnomeConf.sh""... $ac_c" 1>&6 - echo "configure:3280: checking for an obGnomeConf.sh" >&5 -- my_gnome_libdir=`$GNOME_CONFIG --libdir` -+ my_gnome_libdir=`$GNOME_CONFIG --sysconfdir` - if test -f $my_gnome_libdir/obGnomeConf.sh; then - . $my_gnome_libdir/obGnomeConf.sh - echo "$ac_t""found $my_gnome_libdir" 1>&6 -@@ -5531,7 +5531,7 @@ +--- configure.orig Fri May 19 14:49:06 2000 ++++ configure Tue May 30 13:31:24 2000 +@@ -5101,7 +5101,7 @@ cat conftest.$ac_ext >&5 rm -rf conftest* CATOBJEXT=.mo @@ -27,3 +9,32 @@ fi rm -f conftest* INSTOBJEXT=.mo +@@ -6350,17 +6350,13 @@ + if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then + echo "$ac_t""yes" 1>&6 + build_gfloppy=true ++ subdirs="gfloppy" + else ++ build_gfloppy=false + echo "$ac_t""no" 1>&6 + echo "configure: warning: *** gfloppy will not be built." 1>&2 + fi + +-if $build_gfloppy; then +- subdirs="gfloppy" +- +-fi +- +- + if test "$build_gfloppy" = true; then + BUILD_GFLOPPY_TRUE= + BUILD_GFLOPPY_FALSE='#' +@@ -8453,7 +8449,7 @@ + esac + done + +- for ac_config_dir in gfloppy; do ++ for ac_config_dir in $subdirs ; do + + # Do not complain, so a configure script can configure whichever + # parts of a large source tree are present. diff --git a/deskutils/gnome-utils/files/patch-ah b/deskutils/gnome-utils/files/patch-ah new file mode 100644 index 0000000..ba467be --- /dev/null +++ b/deskutils/gnome-utils/files/patch-ah @@ -0,0 +1,48 @@ +--- logview/actions.c.orig Wed Apr 26 22:32:02 2000 ++++ logview/actions.c Tue May 30 13:34:05 2000 +@@ -1,6 +1,7 @@ + #include "logview.h" + #include <string.h> + #include <stdlib.h> ++#include <sys/types.h> + #include <regex.h> + #include <config.h> + #include <gnome.h> +--- logview/desc_db.c.orig Wed Apr 26 22:32:02 2000 ++++ logview/desc_db.c Tue May 30 13:34:36 2000 +@@ -1,5 +1,6 @@ + #include "logview.h" + #include <string.h> ++#include <sys/types.h> + #include <regex.h> + #include <stdlib.h> + +--- logview/logrtns.c.orig Tue May 30 13:35:22 2000 ++++ logview/logrtns.c Tue May 30 13:37:45 2000 +@@ -679,7 +679,7 @@ + if (IsLeapYear (curmark->year - lastyear + thisyear)) + curmark->time += 24 * 60 * 60; /* Add one day */ + +-#ifdef __NetBSD__ ++#if defined(__NetBSD__) || defined(__FreeBSD__) + curmark->time += correction - tmptm->tm_gmtoff; + #else + curmark->time += correction - timezone; +@@ -705,7 +705,7 @@ + if (IsLeapYear (thisyear)) + log->lstats.enddate += 24 * 60 * 60; /* Add one day */ + +-#ifdef __NetBSD__ ++#if defined(__NetBSD__) || defined(__FreeBSD__) + log->lstats.enddate += correction - tmptm->tm_gmtoff; + #else + log->lstats.enddate += correction - timezone; +@@ -716,7 +716,7 @@ + if (IsLeapYear (thisyear - lastyear)) + log->lstats.startdate += 24 * 60 * 60; /* Add one day */ + +-#ifdef __NetBSD__ ++#if defined(__NetBSD__) || defined(__FreeBSD__) + log->lstats.startdate += correction - tmptm->tm_gmtoff; + #else + log->lstats.startdate += correction - timezone; diff --git a/deskutils/gnome-utils/pkg-plist b/deskutils/gnome-utils/pkg-plist index 2b731a2..7781bd5 100644 --- a/deskutils/gnome-utils/pkg-plist +++ b/deskutils/gnome-utils/pkg-plist @@ -1,49 +1,122 @@ bin/gcalc +bin/gcharmap bin/gcolorsel bin/gdialog +bin/gdict bin/gdiskfree bin/gfontsel bin/gless -bin/gnome-run -bin/grun bin/gsearchtool bin/gshutdown bin/gstripchart bin/gstripchart_applet bin/gtt +bin/guname bin/gw +bin/logview bin/splac bin/splash +etc/CORBA/servers/gdict.gnorba etc/CORBA/servers/gstripchart_applet.gnorba share/gnome/applets/Monitors/gstripchart_applet.desktop +share/gnome/applets/Utility/gdict.desktop share/gnome/apps/Applications/gtt.desktop +share/gnome/apps/System/gdiskfree.desktop share/gnome/apps/System/gshutdown.desktop +share/gnome/apps/System/guname.desktop +share/gnome/apps/System/gw.desktop +share/gnome/apps/System/logview.desktop +share/gnome/apps/Utilities/GDict.desktop share/gnome/apps/Utilities/gcalc.desktop +share/gnome/apps/Utilities/gcharmap.desktop share/gnome/apps/Utilities/gcolorsel.desktop -share/gnome/apps/Utilities/gdiskfree.desktop share/gnome/apps/Utilities/gfontsel.desktop share/gnome/apps/Utilities/gless.desktop share/gnome/apps/Utilities/gsearchtool.desktop share/gnome/apps/Utilities/gstripchart.desktop -share/gnome/apps/Utilities/gw.desktop -share/gnome/apps/gnome-run.desktop +share/gnome/gcolorsel/glade/dialog-new-doc.glade +share/gnome/gcolorsel/glade/dialog-new-doc.glade.h +share/gnome/gcolorsel/glade/dialog-new-view.glade +share/gnome/gcolorsel/glade/dialog-new-view.glade.h +share/gnome/gcolorsel/glade/dialog-prefs.glade +share/gnome/gcolorsel/glade/dialog-prefs.glade.h +share/gnome/gcolorsel/glade/mdi-color-file-properties.glade +share/gnome/gcolorsel/glade/mdi-color-file-properties.glade.h +share/gnome/gcolorsel/glade/mdi-color-generic-properties.glade +share/gnome/gcolorsel/glade/mdi-color-generic-properties.glade.h +share/gnome/gcolorsel/glade/view-color-edit.glade +share/gnome/gcolorsel/glade/view-color-edit.glade.h +share/gnome/gcolorsel/glade/view-color-generic-properties.glade +share/gnome/gcolorsel/glade/view-color-generic-properties.glade.h +share/gnome/gcolorsel/glade/view-color-grid-properties.glade +share/gnome/gcolorsel/glade/view-color-grid-properties.glade.h +share/gnome/gcolorsel/glade/view-color-list-properties.glade +share/gnome/gcolorsel/glade/view-color-list-properties.glade.h share/gnome/gstripchart/gstripchart.conf +share/gnome/help/gcharmap/C/authors.html +share/gnome/help/gcharmap/C/bugs.html +share/gnome/help/gcharmap/C/docbook.css +share/gnome/help/gcharmap/C/images/gcharmap.png +share/gnome/help/gcharmap/C/images/gcharmap_insertascii.png +share/gnome/help/gcharmap/C/index.html +share/gnome/help/gcharmap/C/license.html +share/gnome/help/gcharmap/C/ln7.html +share/gnome/help/gcharmap/C/topic.dat +share/gnome/help/gcharmap/C/usage.html +share/gnome/help/gcolorsel/C/authors.html +share/gnome/help/gcolorsel/C/bugs.html +share/gnome/help/gcolorsel/C/docbook.css +share/gnome/help/gcolorsel/C/favorites.png +share/gnome/help/gcolorsel/C/index.html +share/gnome/help/gcolorsel/C/license.html +share/gnome/help/gcolorsel/C/ln7.html +share/gnome/help/gcolorsel/C/menus.html +share/gnome/help/gcolorsel/C/properties.html +share/gnome/help/gcolorsel/C/search.html +share/gnome/help/gcolorsel/C/search.png +share/gnome/help/gcolorsel/C/simple.html +share/gnome/help/gcolorsel/C/simple.png +share/gnome/help/gcolorsel/C/topic.dat +share/gnome/help/gcolorsel/C/usage.html +share/gnome/help/gcolorsel/C/xcolors.html +share/gnome/help/gdict/C/authors.html +share/gnome/help/gdict/C/docbook.css +share/gnome/help/gdict/C/gdict-prefs.png +share/gnome/help/gdict/C/gdict-spell.png +share/gnome/help/gdict/C/gdictmain.png +share/gnome/help/gdict/C/index.html +share/gnome/help/gdict/C/license.html +share/gnome/help/gdict/C/ln7.html +share/gnome/help/gdict/C/prefs.html +share/gnome/help/gdict/C/topic.dat +share/gnome/help/gdict/C/usage.html share/gnome/help/gdiskfree/C/authors.html share/gnome/help/gdiskfree/C/docbook.css share/gnome/help/gdiskfree/C/images/gdiskfree.png +share/gnome/help/gdiskfree/C/images/gdiskfree-prefs.png share/gnome/help/gdiskfree/C/index.html +share/gnome/help/gdiskfree/C/ln7.html +share/gnome/help/gdiskfree/C/prefs.html share/gnome/help/gdiskfree/C/topic.dat share/gnome/help/gdiskfree/C/usage.html share/gnome/help/gfontsel/C/authors.html share/gnome/help/gfontsel/C/filter.html +share/gnome/help/gfontsel/C/filterwin.png share/gnome/help/gfontsel/C/fontinfo.html share/gnome/help/gfontsel/C/index.html +share/gnome/help/gfontsel/C/license.html share/gnome/help/gfontsel/C/ln7.html share/gnome/help/gfontsel/C/mainshot.png share/gnome/help/gfontsel/C/mainwin.html share/gnome/help/gfontsel/C/stylesheet-images/warning.gif share/gnome/help/gfontsel/C/topic.dat share/gnome/help/gfontsel/C/xlfd.html +share/gnome/help/gless/C/authors.html +share/gnome/help/gless/C/docbook.css +share/gnome/help/gless/C/gless-main.png +share/gnome/help/gless/C/index.html +share/gnome/help/gless/C/topic.dat +share/gnome/help/gless/C/usage.html share/gnome/help/gsearchtool/C/authors.html share/gnome/help/gsearchtool/C/criteria.html share/gnome/help/gsearchtool/C/gsearch.png @@ -55,26 +128,67 @@ share/gnome/help/gsearchtool/C/mainwin.png share/gnome/help/gsearchtool/C/results.png share/gnome/help/gsearchtool/C/topic.dat share/gnome/help/gsearchtool/C/usage.html +share/gnome/help/gshutdown/C/authors.html +share/gnome/help/gshutdown/C/docbook.css +share/gnome/help/gshutdown/C/gshutdown-advanced.png +share/gnome/help/gshutdown/C/gshutdown-preferences.png +share/gnome/help/gshutdown/C/gshutdown.png share/gnome/help/gshutdown/C/index.html share/gnome/help/gshutdown/C/topic.dat -share/gnome/help/gshutdown/es/index.html -share/gnome/help/gshutdown/es/topic.dat -share/gnome/help/gshutdown/no/index.html -share/gnome/help/gshutdown/no/topic.dat +share/gnome/help/gshutdown/C/usage.html +share/gnome/help/gstripchart/C/authors.html +share/gnome/help/gstripchart/C/bugs.html +share/gnome/help/gstripchart/C/docbook.css share/gnome/help/gstripchart/C/index.html +share/gnome/help/gstripchart/C/license.html +share/gnome/help/gstripchart/C/ln7.html +share/gnome/help/gstripchart/C/prefs.html share/gnome/help/gstripchart/C/topic.dat +share/gnome/help/gstripchart/C/usage.html +share/gnome/help/gtt/C/authors.html +share/gnome/help/gtt/C/bugs.html +share/gnome/help/gtt/C/dialogs.html +share/gnome/help/gtt/C/docbook.css +share/gnome/help/gtt/C/gtt_mainwin.png +share/gnome/help/gtt/C/gtt_prefswin.png share/gnome/help/gtt/C/index.html +share/gnome/help/gtt/C/license.html +share/gnome/help/gtt/C/ln10.html +share/gnome/help/gtt/C/preferences.html share/gnome/help/gtt/C/topic.dat -share/gnome/help/gtt/de/index.html -share/gnome/help/gtt/de/topic.dat -share/gnome/help/gtt/es/index.html -share/gnome/help/gtt/es/topic.dat +share/gnome/help/gtt/C/usage.html +share/gnome/help/guname/C/authors.html +share/gnome/help/guname/C/docbook.css +share/gnome/help/guname/C/guname-cpuinfo.png +share/gnome/help/guname/C/guname-diskinfo.png +share/gnome/help/guname/C/guname-main.png +share/gnome/help/guname/C/guname-memoryinfo.png +share/gnome/help/guname/C/index.html +share/gnome/help/guname/C/license.html +share/gnome/help/guname/C/topic.dat +share/gnome/help/guname/C/usage.html +share/gnome/help/gw/C/authors.html +share/gnome/help/gw/C/bugs.html +share/gnome/help/gw/C/docbook.css +share/gnome/help/gw/C/gw-main.png +share/gnome/help/gw/C/gw-menuitems.png +share/gnome/help/gw/C/index.html +share/gnome/help/gw/C/license.html +share/gnome/help/gw/C/ln7.html +share/gnome/help/gw/C/prefs.html +share/gnome/help/gw/C/topic.dat +share/gnome/help/gw/C/usage.html share/gnome/idl/gsu.idl +share/gnome/logview/logview-actions.db +share/gnome/logview/logview-descript.db +share/gnome/logview/logview-regexp.db +share/gnome/pixmaps/gdict.png share/gnome/pixmaps/gnome-fontsel.png share/gnome/pixmaps/gnome-searchtool.png share/gnome/pixmaps/gnome-shutdown.png share/gnome/pixmaps/gnome-stripchart.png share/gnome/pixmaps/gnome-who.png +share/gnome/pixmaps/logview/logview.xpm share/locale/ca/LC_MESSAGES/gnome-utils.mo share/locale/cs/LC_MESSAGES/gnome-utils.mo share/locale/da/LC_MESSAGES/gnome-utils.mo @@ -86,36 +200,66 @@ share/locale/et/LC_MESSAGES/gnome-utils.mo share/locale/fi/LC_MESSAGES/gnome-utils.mo share/locale/fr/LC_MESSAGES/gnome-utils.mo share/locale/ga/LC_MESSAGES/gnome-utils.mo +share/locale/gl/LC_MESSAGES/gnome-utils.mo share/locale/hu/LC_MESSAGES/gnome-utils.mo share/locale/it/LC_MESSAGES/gnome-utils.mo share/locale/ja/LC_MESSAGES/gnome-utils.mo share/locale/ko/LC_MESSAGES/gnome-utils.mo +share/locale/lt/LC_MESSAGES/gnome-utils.mo +share/locale/nl/LC_MESSAGES/gnome-utils.mo share/locale/no/LC_MESSAGES/gnome-utils.mo share/locale/pl/LC_MESSAGES/gnome-utils.mo share/locale/pt/LC_MESSAGES/gnome-utils.mo share/locale/pt_BR/LC_MESSAGES/gnome-utils.mo +share/locale/ro/LC_MESSAGES/gnome-utils.mo share/locale/ru/LC_MESSAGES/gnome-utils.mo share/locale/sv/LC_MESSAGES/gnome-utils.mo +share/locale/tr/LC_MESSAGES/gnome-utils.mo share/locale/uk/LC_MESSAGES/gnome-utils.mo share/locale/wa/LC_MESSAGES/gnome-utils.mo share/locale/zh_CN.GB2312/LC_MESSAGES/gnome-utils.mo share/locale/zh_TW.Big5/LC_MESSAGES/gnome-utils.mo -@dirrm share/gnome/help/gtt/es -@dirrm share/gnome/help/gtt/de +@dirrm share/gnome/pixmaps/logview +@dirrm share/gnome/logview +@dirrm share/gnome/help/gw/C/images +@dirrm share/gnome/help/gw/C +@dirrm share/gnome/help/gw +@dirrm share/gnome/help/guname/C/images +@dirrm share/gnome/help/guname/C +@dirrm share/gnome/help/guname +@dirrm share/gnome/help/gtt/C/stylesheet-images +@dirrm share/gnome/help/gtt/C/images @dirrm share/gnome/help/gtt/C @dirrm share/gnome/help/gtt +@dirrm share/gnome/help/gstripchart/C/stylesheet-images +@dirrm share/gnome/help/gstripchart/C/images @dirrm share/gnome/help/gstripchart/C @dirrm share/gnome/help/gstripchart -@dirrm share/gnome/help/gshutdown/no -@dirrm share/gnome/help/gshutdown/es +@dirrm share/gnome/help/gshutdown/C/images @dirrm share/gnome/help/gshutdown/C @dirrm share/gnome/help/gshutdown @dirrm share/gnome/help/gsearchtool/C @dirrm share/gnome/help/gsearchtool +@dirrm share/gnome/help/gless/C/images +@dirrm share/gnome/help/gless/C +@dirrm share/gnome/help/gless @dirrm share/gnome/help/gfontsel/C/stylesheet-images @dirrm share/gnome/help/gfontsel/C @dirrm share/gnome/help/gfontsel +@dirrm share/gnome/help/gdiskfree/C/stylesheet-images @dirrm share/gnome/help/gdiskfree/C/images @dirrm share/gnome/help/gdiskfree/C @dirrm share/gnome/help/gdiskfree +@dirrm share/gnome/help/gdict/C/images +@dirrm share/gnome/help/gdict/C +@dirrm share/gnome/help/gdict +@dirrm share/gnome/help/gcolorsel/C/stylesheet-images +@dirrm share/gnome/help/gcolorsel/C +@dirrm share/gnome/help/gcolorsel +@dirrm share/gnome/help/gcharmap/C/stylesheet-images +@dirrm share/gnome/help/gcharmap/C/images +@dirrm share/gnome/help/gcharmap/C +@dirrm share/gnome/help/gcharmap @dirrm share/gnome/gstripchart +@dirrm share/gnome/gcolorsel/glade +@dirrm share/gnome/gcolorsel diff --git a/deskutils/gnomepim/Makefile b/deskutils/gnomepim/Makefile index 5a714e4..abd9757 100644 --- a/deskutils/gnomepim/Makefile +++ b/deskutils/gnomepim/Makefile @@ -6,7 +6,7 @@ # PORTNAME= gnomepim -PORTVERSION= 1.0.55 +PORTVERSION= 1.2.0 CATEGORIES= deskutils gnome MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= stable/sources/gnome-pim @@ -14,8 +14,7 @@ DISTNAME= gnome-pim-${PORTVERSION} MAINTAINER= ade@FreeBSD.org -BUILD_DEPENDS= panel:${PORTSDIR}/x11/gnomecore -RUN_DEPENDS= panel:${PORTSDIR}/x11/gnomecore +LIB_DEPENDS= panel_applet.4:${PORTSDIR}/x11/gnomecore GTK_CONFIG?= ${X11BASE}/bin/gtk12-config @@ -23,8 +22,7 @@ USE_X_PREFIX= yes USE_GMAKE= yes GNU_CONFIGURE= yes CONFIGURE_ARGS= --localstatedir=${PREFIX}/share/gnome \ - --datadir=${PREFIX}/share/gnome \ - --with-gnome=${PREFIX} + --datadir=${PREFIX}/share/gnome CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ GTK_CONFIG="${GTK_CONFIG}" \ LIBS="-L${LOCALBASE}/lib" diff --git a/deskutils/gnomepim/distinfo b/deskutils/gnomepim/distinfo index 8f840a7..277f4e6 100644 --- a/deskutils/gnomepim/distinfo +++ b/deskutils/gnomepim/distinfo @@ -1 +1 @@ -MD5 (gnome-pim-1.0.55.tar.gz) = 9894e09c9d6d41dab2e9e946bc45fe88 +MD5 (gnome-pim-1.2.0.tar.gz) = d0af4da54851fa996b59d4f738ff2920 diff --git a/deskutils/gnomepim/files/patch-ab b/deskutils/gnomepim/files/patch-ab index e7abc1a..285308e 100644 --- a/deskutils/gnomepim/files/patch-ab +++ b/deskutils/gnomepim/files/patch-ab @@ -1,66 +1,42 @@ ---- gncal/Makefile.in.orig Mon Sep 27 16:05:44 1999 -+++ gncal/Makefile.in Mon Oct 4 14:13:16 1999 -@@ -118,9 +118,9 @@ - - SUBDIRS = doc +--- gncal/Makefile.in.orig Sat May 20 20:52:50 2000 ++++ gncal/Makefile.in Tue May 30 14:34:37 2000 +@@ -143,3 +143,3 @@ -help_base = $(datadir)/gnome/help/cal -+help_base = $(datadir)/help/cal ++help_base = $(datadir)/help/gnomecal --INCLUDES = -I$(includedir) $(GNOME_INCLUDEDIR) -DGNOMELOCALEDIR=\""$(datadir)/locale"\" -+INCLUDES = -I$(includedir) $(GNOME_INCLUDEDIR) -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" +@@ -148,3 +148,3 @@ +-INCLUDES = -I$(includedir) $(GNOME_INCLUDEDIR) $(GNOME_CONDUIT_INCLUDEDIR) $(PISOCK_INCLUDEDIR) -DGNOMELOCALEDIR=\""$(datadir)/locale"\" ++INCLUDES = -I$(includedir) $(GNOME_INCLUDEDIR) $(GNOME_CONDUIT_INCLUDEDIR) $(PISOCK_INCLUDEDIR) -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" - bin_PROGRAMS = gnomecal -@@ -138,7 +138,7 @@ - EXTRA_DIST = gncal.desktop bell.xpm recur.xpm +@@ -223,3 +223,3 @@ +-@HAVE_GNOME_PILOT_TRUE@panelConduitsdir = $(datadir)/gnome/apps/Settings/Peripherals/Conduits ++@HAVE_GNOME_PILOT_TRUE@panelConduitsdir = $(datadir)/apps/Settings/Peripherals/Conduits + @HAVE_GNOME_PILOT_TRUE@panelConduits_DATA = $(ccenterConduits_DATA) +@@ -235,3 +235,3 @@ -Productivitydir = $(datadir)/gnome/apps/Applications +Productivitydir = $(datadir)/apps/Applications - Productivity_DATA = gncal.desktop - mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -@@ -518,7 +518,7 @@ - - - install-data-local: -- $(mkinstalldirs) $(DESTDIR)$(help_base)/C -+# $(mkinstalldirs) $(DESTDIR)$(help_base)/C - - # 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. ---- gnomecard/Makefile.in.orig Fri Sep 17 14:40:25 1999 -+++ gnomecard/Makefile.in Fri Sep 24 13:54:54 1999 -@@ -118,9 +118,9 @@ - - nSUBDIRS = help +--- gnomecard/Makefile.in.orig Sat May 20 20:52:58 2000 ++++ gnomecard/Makefile.in Tue May 30 14:35:44 2000 +@@ -137,5 +137,5 @@ -xpmhelp_base = $(datadir)/gnome/help/cal -+xpmhelp_base = $(datadir)/help/gnomecal ++xpmhelp_base = $(datadir)/help/cal --INCLUDES = -I$(includedir) $(GNOME_INCLUDEDIR) -DGNOMELOCALEDIR=\""$(datadir)/locale"\" -I../../gcalendar -+INCLUDES = -I$(includedir) $(GNOME_INCLUDEDIR) -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" -I../../gcalendar +-INCLUDES = -I$(includedir) $(GNOME_INCLUDEDIR) -DGNOMELOCALEDIR=\""$(datadir)/locale"\" $(PISOCK_INCLUDEDIR) -I../../gcalendar ++INCLUDES = -I$(includedir) $(GNOME_INCLUDEDIR) -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" $(PISOCK_INCLUDEDIR) -I../../gcalendar +@@ -185,3 +185,3 @@ - bin_PROGRAMS = gnomecard -@@ -145,7 +145,7 @@ - EXTRA_DIST = addr.xpm addrtool.xpm cardedit.xpm cardnew.xpm cardfind.xpm email.xpm expl.xpm first.xpm geo.xpm ident.xpm last.xpm org.xpm sec.xpm tel.xpm teltool.xpm phone.xpm world.xpm gnome-card.xpm gnomecard.desktop gnomecard.gnorba - +-@HAVE_GNOME_PILOT_TRUE@panelConduitsdir = $(datadir)/gnome/apps/Settings/Peripherals/Conduits ++@HAVE_GNOME_PILOT_TRUE@panelConduitsdir = $(datadir)/apps/Settings/Peripherals/Conduits + @HAVE_GNOME_PILOT_TRUE@panelConduits_DATA = $(ccenterConduits_DATA) +@@ -194,3 +194,3 @@ -Productivitydir = $(datadir)/gnome/apps/Applications +Productivitydir = $(datadir)/apps/Applications - Productivity_DATA = gnomecard.desktop - ---- gnomecard/help/C/Makefile.in.orig Mon Sep 27 16:05:53 1999 -+++ gnomecard/help/C/Makefile.in Mon Oct 4 14:18:45 1999 -@@ -116,7 +116,7 @@ - cxxflags_set = @cxxflags_set@ - l = @l@ - --gnomecard_helpdir = $(datadir)/gnome/help/gnomecard/C -+gnomecard_helpdir = $(datadir)/help/gnomecard/C - - gnomecard_help_DATA = index.html topic.dat - diff --git a/deskutils/gnomepim/pkg-plist b/deskutils/gnomepim/pkg-plist index 4ec3896..19195c2 100644 --- a/deskutils/gnomepim/pkg-plist +++ b/deskutils/gnomepim/pkg-plist @@ -1,7 +1,7 @@ bin/gnomecal bin/gnomecard +etc/CORBA/servers/gnomecal.gnorba etc/CORBA/servers/gnomecard.gnorba -lib/libversit.a share/gnome/apps/Applications/gncal.desktop share/gnome/apps/Applications/gnomecard.desktop share/gnome/help/gnomecal/C/gnomecal.html @@ -19,43 +19,43 @@ share/gnome/help/gnomecal/C/gcal.html share/gnome/help/gnomecal/C/ln20.html share/gnome/help/gnomecal/C/tech.html.html share/gnome/help/gnomecal/C/docbook.css -share/gnome/help/gnomecard/C/description.html -share/gnome/help/gnomecard/C/dialogs.html -share/gnome/help/gnomecard/C/display.html -share/gnome/help/gnomecard/C/docbook.css -share/gnome/help/gnomecard/C/index.html -share/gnome/help/gnomecard/C/ln9.html -share/gnome/help/gnomecard/C/menubar.html -share/gnome/help/gnomecard/C/recordview.html -share/gnome/help/gnomecard/C/toolbar.html -share/gnome/help/gnomecard/C/topic.dat +share/gnome/idl/GnomeCal.idl share/gnome/idl/gnome-pim.idl share/gnome/mime-info/gnome-pim.keys -share/gnome/pixmaps/gnome-card.xpm +share/gnome/pixmaps/gnome-calendar-conduit.png +share/gnome/pixmaps/gnome-gnomecard.png +share/locale/ca/LC_MESSAGES/gnome-pim.mo share/locale/cs/LC_MESSAGES/gnome-pim.mo +share/locale/cy/LC_MESSAGES/gnome-pim.mo share/locale/da/LC_MESSAGES/gnome-pim.mo share/locale/de/LC_MESSAGES/gnome-pim.mo share/locale/el/LC_MESSAGES/gnome-pim.mo share/locale/en_GB/LC_MESSAGES/gnome-pim.mo share/locale/es/LC_MESSAGES/gnome-pim.mo +share/locale/et/LC_MESSAGES/gnome-pim.mo share/locale/fi/LC_MESSAGES/gnome-pim.mo share/locale/fr/LC_MESSAGES/gnome-pim.mo share/locale/ga/LC_MESSAGES/gnome-pim.mo +share/locale/gd/LC_MESSAGES/gnome-pim.mo +share/locale/gl/LC_MESSAGES/gnome-pim.mo +share/locale/gv/LC_MESSAGES/gnome-pim.mo share/locale/hu/LC_MESSAGES/gnome-pim.mo share/locale/it/LC_MESSAGES/gnome-pim.mo share/locale/ja/LC_MESSAGES/gnome-pim.mo share/locale/ko/LC_MESSAGES/gnome-pim.mo +share/locale/kw/LC_MESSAGES/gnome-pim.mo +share/locale/lt/LC_MESSAGES/gnome-pim.mo share/locale/nl/LC_MESSAGES/gnome-pim.mo share/locale/no/LC_MESSAGES/gnome-pim.mo share/locale/pl/LC_MESSAGES/gnome-pim.mo share/locale/pt/LC_MESSAGES/gnome-pim.mo +share/locale/pt_BR/LC_MESSAGES/gnome-pim.mo share/locale/sv/LC_MESSAGES/gnome-pim.mo share/locale/ru/LC_MESSAGES/gnome-pim.mo share/locale/uk/LC_MESSAGES/gnome-pim.mo share/locale/wa/LC_MESSAGES/gnome-pim.mo +share/locale/zh_CN.GB2312/LC_MESSAGES/gnome-pim.mo share/locale/zh_TW.Big5/LC_MESSAGES/gnome-pim.mo -@dirrm share/gnome/help/gnomecard/C -@dirrm share/gnome/help/gnomecard @dirrm share/gnome/help/gnomecal/C/images @dirrm share/gnome/help/gnomecal/C @dirrm share/gnome/help/gnomecal diff --git a/deskutils/gnomeutils2/Makefile b/deskutils/gnomeutils2/Makefile index 2480f0f..5e7764e 100644 --- a/deskutils/gnomeutils2/Makefile +++ b/deskutils/gnomeutils2/Makefile @@ -6,7 +6,7 @@ # PORTNAME= gnomeutils -PORTVERSION= 1.0.51 +PORTVERSION= 1.2.0 CATEGORIES= misc gnome MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= stable/sources/gnome-utils @@ -14,9 +14,7 @@ DISTNAME= gnome-utils-${PORTVERSION} MAINTAINER= ade@FreeBSD.org -BUILD_DEPENDS= panel:${PORTSDIR}/x11/gnomecore -RUN_DEPENDS= panel:${PORTSDIR}/x11/gnomecore -LIB_DEPENDS= obgnome.1:${PORTSDIR}/lang/gnomeobjc +LIB_DEPENDS= panel_applet.4:${PORTSDIR}/x11/gnomecore GTK_CONFIG?= ${X11BASE}/bin/gtk12-config @@ -24,12 +22,9 @@ USE_X_PREFIX= yes USE_GMAKE= yes USE_LIBTOOL= yes CONFIGURE_ARGS= --localstatedir=${PREFIX}/share/gnome \ - --datadir=${PREFIX}/share/gnome \ - --with-gnome=${PREFIX} + --datadir=${PREFIX}/share/gnome CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ GTK_CONFIG="${GTK_CONFIG}" \ LIBS="-L${LOCALBASE}/lib" -MAN1= gtt.1 - .include <bsd.port.mk> diff --git a/deskutils/gnomeutils2/distinfo b/deskutils/gnomeutils2/distinfo index a37fd50..698b6b5 100644 --- a/deskutils/gnomeutils2/distinfo +++ b/deskutils/gnomeutils2/distinfo @@ -1 +1 @@ -MD5 (gnome-utils-1.0.51.tar.gz) = 0de69cb5eaaf81bea3a98cc48e0266c6 +MD5 (gnome-utils-1.2.0.tar.gz) = ffee2281337d29b149612dc186299773 diff --git a/deskutils/gnomeutils2/files/patch-aa b/deskutils/gnomeutils2/files/patch-aa index a8dc692..149087c 100644 --- a/deskutils/gnomeutils2/files/patch-aa +++ b/deskutils/gnomeutils2/files/patch-aa @@ -1,24 +1,6 @@ ---- configure.orig Wed Mar 8 09:07:49 2000 -+++ configure Sat Mar 11 15:35:52 2000 -@@ -2480,7 +2480,7 @@ - fi - if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 -- PTHREAD_LIB="-lc_r" -+ PTHREAD_LIB="" - else - echo "$ac_t""no" 1>&6 - echo $ac_n "checking for pthread_create""... $ac_c" 1>&6 -@@ -3277,7 +3277,7 @@ - - echo $ac_n "checking for an obGnomeConf.sh""... $ac_c" 1>&6 - echo "configure:3280: checking for an obGnomeConf.sh" >&5 -- my_gnome_libdir=`$GNOME_CONFIG --libdir` -+ my_gnome_libdir=`$GNOME_CONFIG --sysconfdir` - if test -f $my_gnome_libdir/obGnomeConf.sh; then - . $my_gnome_libdir/obGnomeConf.sh - echo "$ac_t""found $my_gnome_libdir" 1>&6 -@@ -5531,7 +5531,7 @@ +--- configure.orig Fri May 19 14:49:06 2000 ++++ configure Tue May 30 13:31:24 2000 +@@ -5101,7 +5101,7 @@ cat conftest.$ac_ext >&5 rm -rf conftest* CATOBJEXT=.mo @@ -27,3 +9,32 @@ fi rm -f conftest* INSTOBJEXT=.mo +@@ -6350,17 +6350,13 @@ + if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then + echo "$ac_t""yes" 1>&6 + build_gfloppy=true ++ subdirs="gfloppy" + else ++ build_gfloppy=false + echo "$ac_t""no" 1>&6 + echo "configure: warning: *** gfloppy will not be built." 1>&2 + fi + +-if $build_gfloppy; then +- subdirs="gfloppy" +- +-fi +- +- + if test "$build_gfloppy" = true; then + BUILD_GFLOPPY_TRUE= + BUILD_GFLOPPY_FALSE='#' +@@ -8453,7 +8449,7 @@ + esac + done + +- for ac_config_dir in gfloppy; do ++ for ac_config_dir in $subdirs ; do + + # Do not complain, so a configure script can configure whichever + # parts of a large source tree are present. diff --git a/deskutils/gnomeutils2/files/patch-ah b/deskutils/gnomeutils2/files/patch-ah new file mode 100644 index 0000000..ba467be --- /dev/null +++ b/deskutils/gnomeutils2/files/patch-ah @@ -0,0 +1,48 @@ +--- logview/actions.c.orig Wed Apr 26 22:32:02 2000 ++++ logview/actions.c Tue May 30 13:34:05 2000 +@@ -1,6 +1,7 @@ + #include "logview.h" + #include <string.h> + #include <stdlib.h> ++#include <sys/types.h> + #include <regex.h> + #include <config.h> + #include <gnome.h> +--- logview/desc_db.c.orig Wed Apr 26 22:32:02 2000 ++++ logview/desc_db.c Tue May 30 13:34:36 2000 +@@ -1,5 +1,6 @@ + #include "logview.h" + #include <string.h> ++#include <sys/types.h> + #include <regex.h> + #include <stdlib.h> + +--- logview/logrtns.c.orig Tue May 30 13:35:22 2000 ++++ logview/logrtns.c Tue May 30 13:37:45 2000 +@@ -679,7 +679,7 @@ + if (IsLeapYear (curmark->year - lastyear + thisyear)) + curmark->time += 24 * 60 * 60; /* Add one day */ + +-#ifdef __NetBSD__ ++#if defined(__NetBSD__) || defined(__FreeBSD__) + curmark->time += correction - tmptm->tm_gmtoff; + #else + curmark->time += correction - timezone; +@@ -705,7 +705,7 @@ + if (IsLeapYear (thisyear)) + log->lstats.enddate += 24 * 60 * 60; /* Add one day */ + +-#ifdef __NetBSD__ ++#if defined(__NetBSD__) || defined(__FreeBSD__) + log->lstats.enddate += correction - tmptm->tm_gmtoff; + #else + log->lstats.enddate += correction - timezone; +@@ -716,7 +716,7 @@ + if (IsLeapYear (thisyear - lastyear)) + log->lstats.startdate += 24 * 60 * 60; /* Add one day */ + +-#ifdef __NetBSD__ ++#if defined(__NetBSD__) || defined(__FreeBSD__) + log->lstats.startdate += correction - tmptm->tm_gmtoff; + #else + log->lstats.startdate += correction - timezone; diff --git a/deskutils/gnomeutils2/pkg-plist b/deskutils/gnomeutils2/pkg-plist index 2b731a2..7781bd5 100644 --- a/deskutils/gnomeutils2/pkg-plist +++ b/deskutils/gnomeutils2/pkg-plist @@ -1,49 +1,122 @@ bin/gcalc +bin/gcharmap bin/gcolorsel bin/gdialog +bin/gdict bin/gdiskfree bin/gfontsel bin/gless -bin/gnome-run -bin/grun bin/gsearchtool bin/gshutdown bin/gstripchart bin/gstripchart_applet bin/gtt +bin/guname bin/gw +bin/logview bin/splac bin/splash +etc/CORBA/servers/gdict.gnorba etc/CORBA/servers/gstripchart_applet.gnorba share/gnome/applets/Monitors/gstripchart_applet.desktop +share/gnome/applets/Utility/gdict.desktop share/gnome/apps/Applications/gtt.desktop +share/gnome/apps/System/gdiskfree.desktop share/gnome/apps/System/gshutdown.desktop +share/gnome/apps/System/guname.desktop +share/gnome/apps/System/gw.desktop +share/gnome/apps/System/logview.desktop +share/gnome/apps/Utilities/GDict.desktop share/gnome/apps/Utilities/gcalc.desktop +share/gnome/apps/Utilities/gcharmap.desktop share/gnome/apps/Utilities/gcolorsel.desktop -share/gnome/apps/Utilities/gdiskfree.desktop share/gnome/apps/Utilities/gfontsel.desktop share/gnome/apps/Utilities/gless.desktop share/gnome/apps/Utilities/gsearchtool.desktop share/gnome/apps/Utilities/gstripchart.desktop -share/gnome/apps/Utilities/gw.desktop -share/gnome/apps/gnome-run.desktop +share/gnome/gcolorsel/glade/dialog-new-doc.glade +share/gnome/gcolorsel/glade/dialog-new-doc.glade.h +share/gnome/gcolorsel/glade/dialog-new-view.glade +share/gnome/gcolorsel/glade/dialog-new-view.glade.h +share/gnome/gcolorsel/glade/dialog-prefs.glade +share/gnome/gcolorsel/glade/dialog-prefs.glade.h +share/gnome/gcolorsel/glade/mdi-color-file-properties.glade +share/gnome/gcolorsel/glade/mdi-color-file-properties.glade.h +share/gnome/gcolorsel/glade/mdi-color-generic-properties.glade +share/gnome/gcolorsel/glade/mdi-color-generic-properties.glade.h +share/gnome/gcolorsel/glade/view-color-edit.glade +share/gnome/gcolorsel/glade/view-color-edit.glade.h +share/gnome/gcolorsel/glade/view-color-generic-properties.glade +share/gnome/gcolorsel/glade/view-color-generic-properties.glade.h +share/gnome/gcolorsel/glade/view-color-grid-properties.glade +share/gnome/gcolorsel/glade/view-color-grid-properties.glade.h +share/gnome/gcolorsel/glade/view-color-list-properties.glade +share/gnome/gcolorsel/glade/view-color-list-properties.glade.h share/gnome/gstripchart/gstripchart.conf +share/gnome/help/gcharmap/C/authors.html +share/gnome/help/gcharmap/C/bugs.html +share/gnome/help/gcharmap/C/docbook.css +share/gnome/help/gcharmap/C/images/gcharmap.png +share/gnome/help/gcharmap/C/images/gcharmap_insertascii.png +share/gnome/help/gcharmap/C/index.html +share/gnome/help/gcharmap/C/license.html +share/gnome/help/gcharmap/C/ln7.html +share/gnome/help/gcharmap/C/topic.dat +share/gnome/help/gcharmap/C/usage.html +share/gnome/help/gcolorsel/C/authors.html +share/gnome/help/gcolorsel/C/bugs.html +share/gnome/help/gcolorsel/C/docbook.css +share/gnome/help/gcolorsel/C/favorites.png +share/gnome/help/gcolorsel/C/index.html +share/gnome/help/gcolorsel/C/license.html +share/gnome/help/gcolorsel/C/ln7.html +share/gnome/help/gcolorsel/C/menus.html +share/gnome/help/gcolorsel/C/properties.html +share/gnome/help/gcolorsel/C/search.html +share/gnome/help/gcolorsel/C/search.png +share/gnome/help/gcolorsel/C/simple.html +share/gnome/help/gcolorsel/C/simple.png +share/gnome/help/gcolorsel/C/topic.dat +share/gnome/help/gcolorsel/C/usage.html +share/gnome/help/gcolorsel/C/xcolors.html +share/gnome/help/gdict/C/authors.html +share/gnome/help/gdict/C/docbook.css +share/gnome/help/gdict/C/gdict-prefs.png +share/gnome/help/gdict/C/gdict-spell.png +share/gnome/help/gdict/C/gdictmain.png +share/gnome/help/gdict/C/index.html +share/gnome/help/gdict/C/license.html +share/gnome/help/gdict/C/ln7.html +share/gnome/help/gdict/C/prefs.html +share/gnome/help/gdict/C/topic.dat +share/gnome/help/gdict/C/usage.html share/gnome/help/gdiskfree/C/authors.html share/gnome/help/gdiskfree/C/docbook.css share/gnome/help/gdiskfree/C/images/gdiskfree.png +share/gnome/help/gdiskfree/C/images/gdiskfree-prefs.png share/gnome/help/gdiskfree/C/index.html +share/gnome/help/gdiskfree/C/ln7.html +share/gnome/help/gdiskfree/C/prefs.html share/gnome/help/gdiskfree/C/topic.dat share/gnome/help/gdiskfree/C/usage.html share/gnome/help/gfontsel/C/authors.html share/gnome/help/gfontsel/C/filter.html +share/gnome/help/gfontsel/C/filterwin.png share/gnome/help/gfontsel/C/fontinfo.html share/gnome/help/gfontsel/C/index.html +share/gnome/help/gfontsel/C/license.html share/gnome/help/gfontsel/C/ln7.html share/gnome/help/gfontsel/C/mainshot.png share/gnome/help/gfontsel/C/mainwin.html share/gnome/help/gfontsel/C/stylesheet-images/warning.gif share/gnome/help/gfontsel/C/topic.dat share/gnome/help/gfontsel/C/xlfd.html +share/gnome/help/gless/C/authors.html +share/gnome/help/gless/C/docbook.css +share/gnome/help/gless/C/gless-main.png +share/gnome/help/gless/C/index.html +share/gnome/help/gless/C/topic.dat +share/gnome/help/gless/C/usage.html share/gnome/help/gsearchtool/C/authors.html share/gnome/help/gsearchtool/C/criteria.html share/gnome/help/gsearchtool/C/gsearch.png @@ -55,26 +128,67 @@ share/gnome/help/gsearchtool/C/mainwin.png share/gnome/help/gsearchtool/C/results.png share/gnome/help/gsearchtool/C/topic.dat share/gnome/help/gsearchtool/C/usage.html +share/gnome/help/gshutdown/C/authors.html +share/gnome/help/gshutdown/C/docbook.css +share/gnome/help/gshutdown/C/gshutdown-advanced.png +share/gnome/help/gshutdown/C/gshutdown-preferences.png +share/gnome/help/gshutdown/C/gshutdown.png share/gnome/help/gshutdown/C/index.html share/gnome/help/gshutdown/C/topic.dat -share/gnome/help/gshutdown/es/index.html -share/gnome/help/gshutdown/es/topic.dat -share/gnome/help/gshutdown/no/index.html -share/gnome/help/gshutdown/no/topic.dat +share/gnome/help/gshutdown/C/usage.html +share/gnome/help/gstripchart/C/authors.html +share/gnome/help/gstripchart/C/bugs.html +share/gnome/help/gstripchart/C/docbook.css share/gnome/help/gstripchart/C/index.html +share/gnome/help/gstripchart/C/license.html +share/gnome/help/gstripchart/C/ln7.html +share/gnome/help/gstripchart/C/prefs.html share/gnome/help/gstripchart/C/topic.dat +share/gnome/help/gstripchart/C/usage.html +share/gnome/help/gtt/C/authors.html +share/gnome/help/gtt/C/bugs.html +share/gnome/help/gtt/C/dialogs.html +share/gnome/help/gtt/C/docbook.css +share/gnome/help/gtt/C/gtt_mainwin.png +share/gnome/help/gtt/C/gtt_prefswin.png share/gnome/help/gtt/C/index.html +share/gnome/help/gtt/C/license.html +share/gnome/help/gtt/C/ln10.html +share/gnome/help/gtt/C/preferences.html share/gnome/help/gtt/C/topic.dat -share/gnome/help/gtt/de/index.html -share/gnome/help/gtt/de/topic.dat -share/gnome/help/gtt/es/index.html -share/gnome/help/gtt/es/topic.dat +share/gnome/help/gtt/C/usage.html +share/gnome/help/guname/C/authors.html +share/gnome/help/guname/C/docbook.css +share/gnome/help/guname/C/guname-cpuinfo.png +share/gnome/help/guname/C/guname-diskinfo.png +share/gnome/help/guname/C/guname-main.png +share/gnome/help/guname/C/guname-memoryinfo.png +share/gnome/help/guname/C/index.html +share/gnome/help/guname/C/license.html +share/gnome/help/guname/C/topic.dat +share/gnome/help/guname/C/usage.html +share/gnome/help/gw/C/authors.html +share/gnome/help/gw/C/bugs.html +share/gnome/help/gw/C/docbook.css +share/gnome/help/gw/C/gw-main.png +share/gnome/help/gw/C/gw-menuitems.png +share/gnome/help/gw/C/index.html +share/gnome/help/gw/C/license.html +share/gnome/help/gw/C/ln7.html +share/gnome/help/gw/C/prefs.html +share/gnome/help/gw/C/topic.dat +share/gnome/help/gw/C/usage.html share/gnome/idl/gsu.idl +share/gnome/logview/logview-actions.db +share/gnome/logview/logview-descript.db +share/gnome/logview/logview-regexp.db +share/gnome/pixmaps/gdict.png share/gnome/pixmaps/gnome-fontsel.png share/gnome/pixmaps/gnome-searchtool.png share/gnome/pixmaps/gnome-shutdown.png share/gnome/pixmaps/gnome-stripchart.png share/gnome/pixmaps/gnome-who.png +share/gnome/pixmaps/logview/logview.xpm share/locale/ca/LC_MESSAGES/gnome-utils.mo share/locale/cs/LC_MESSAGES/gnome-utils.mo share/locale/da/LC_MESSAGES/gnome-utils.mo @@ -86,36 +200,66 @@ share/locale/et/LC_MESSAGES/gnome-utils.mo share/locale/fi/LC_MESSAGES/gnome-utils.mo share/locale/fr/LC_MESSAGES/gnome-utils.mo share/locale/ga/LC_MESSAGES/gnome-utils.mo +share/locale/gl/LC_MESSAGES/gnome-utils.mo share/locale/hu/LC_MESSAGES/gnome-utils.mo share/locale/it/LC_MESSAGES/gnome-utils.mo share/locale/ja/LC_MESSAGES/gnome-utils.mo share/locale/ko/LC_MESSAGES/gnome-utils.mo +share/locale/lt/LC_MESSAGES/gnome-utils.mo +share/locale/nl/LC_MESSAGES/gnome-utils.mo share/locale/no/LC_MESSAGES/gnome-utils.mo share/locale/pl/LC_MESSAGES/gnome-utils.mo share/locale/pt/LC_MESSAGES/gnome-utils.mo share/locale/pt_BR/LC_MESSAGES/gnome-utils.mo +share/locale/ro/LC_MESSAGES/gnome-utils.mo share/locale/ru/LC_MESSAGES/gnome-utils.mo share/locale/sv/LC_MESSAGES/gnome-utils.mo +share/locale/tr/LC_MESSAGES/gnome-utils.mo share/locale/uk/LC_MESSAGES/gnome-utils.mo share/locale/wa/LC_MESSAGES/gnome-utils.mo share/locale/zh_CN.GB2312/LC_MESSAGES/gnome-utils.mo share/locale/zh_TW.Big5/LC_MESSAGES/gnome-utils.mo -@dirrm share/gnome/help/gtt/es -@dirrm share/gnome/help/gtt/de +@dirrm share/gnome/pixmaps/logview +@dirrm share/gnome/logview +@dirrm share/gnome/help/gw/C/images +@dirrm share/gnome/help/gw/C +@dirrm share/gnome/help/gw +@dirrm share/gnome/help/guname/C/images +@dirrm share/gnome/help/guname/C +@dirrm share/gnome/help/guname +@dirrm share/gnome/help/gtt/C/stylesheet-images +@dirrm share/gnome/help/gtt/C/images @dirrm share/gnome/help/gtt/C @dirrm share/gnome/help/gtt +@dirrm share/gnome/help/gstripchart/C/stylesheet-images +@dirrm share/gnome/help/gstripchart/C/images @dirrm share/gnome/help/gstripchart/C @dirrm share/gnome/help/gstripchart -@dirrm share/gnome/help/gshutdown/no -@dirrm share/gnome/help/gshutdown/es +@dirrm share/gnome/help/gshutdown/C/images @dirrm share/gnome/help/gshutdown/C @dirrm share/gnome/help/gshutdown @dirrm share/gnome/help/gsearchtool/C @dirrm share/gnome/help/gsearchtool +@dirrm share/gnome/help/gless/C/images +@dirrm share/gnome/help/gless/C +@dirrm share/gnome/help/gless @dirrm share/gnome/help/gfontsel/C/stylesheet-images @dirrm share/gnome/help/gfontsel/C @dirrm share/gnome/help/gfontsel +@dirrm share/gnome/help/gdiskfree/C/stylesheet-images @dirrm share/gnome/help/gdiskfree/C/images @dirrm share/gnome/help/gdiskfree/C @dirrm share/gnome/help/gdiskfree +@dirrm share/gnome/help/gdict/C/images +@dirrm share/gnome/help/gdict/C +@dirrm share/gnome/help/gdict +@dirrm share/gnome/help/gcolorsel/C/stylesheet-images +@dirrm share/gnome/help/gcolorsel/C +@dirrm share/gnome/help/gcolorsel +@dirrm share/gnome/help/gcharmap/C/stylesheet-images +@dirrm share/gnome/help/gcharmap/C/images +@dirrm share/gnome/help/gcharmap/C +@dirrm share/gnome/help/gcharmap @dirrm share/gnome/gstripchart +@dirrm share/gnome/gcolorsel/glade +@dirrm share/gnome/gcolorsel diff --git a/devel/bug-buddy/Makefile b/devel/bug-buddy/Makefile index d2d4ce5..f4488fb 100644 --- a/devel/bug-buddy/Makefile +++ b/devel/bug-buddy/Makefile @@ -6,7 +6,7 @@ # PORTNAME= bugbuddy -PORTVERSION= 0.90 +PORTVERSION= 1.0 CATEGORIES= devel gnome MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= stable/sources/bug-buddy @@ -14,8 +14,7 @@ DISTNAME= bug-buddy-${PORTVERSION} MAINTAINER= nakai@FreeBSD.org -LIB_DEPENDS= gnome.3:${PORTSDIR}/x11/gnomelibs \ - glade.3:${PORTSDIR}/devel/libglade +LIB_DEPENDS= panel_applet.4:${PORTSDIR}/x11/gnomecore USE_X_PREFIX= yes USE_GMAKE= yes diff --git a/devel/bug-buddy/distinfo b/devel/bug-buddy/distinfo index ba78978..eaeb61f 100644 --- a/devel/bug-buddy/distinfo +++ b/devel/bug-buddy/distinfo @@ -1 +1 @@ -MD5 (bug-buddy-0.90.tar.gz) = 7ff1a83f3d1f2ed9107b32bf553e3e47 +MD5 (bug-buddy-1.0.tar.gz) = 69f6bea3a2acf5bf4557a06a62bf0fea diff --git a/devel/bugbuddy/Makefile b/devel/bugbuddy/Makefile index d2d4ce5..f4488fb 100644 --- a/devel/bugbuddy/Makefile +++ b/devel/bugbuddy/Makefile @@ -6,7 +6,7 @@ # PORTNAME= bugbuddy -PORTVERSION= 0.90 +PORTVERSION= 1.0 CATEGORIES= devel gnome MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= stable/sources/bug-buddy @@ -14,8 +14,7 @@ DISTNAME= bug-buddy-${PORTVERSION} MAINTAINER= nakai@FreeBSD.org -LIB_DEPENDS= gnome.3:${PORTSDIR}/x11/gnomelibs \ - glade.3:${PORTSDIR}/devel/libglade +LIB_DEPENDS= panel_applet.4:${PORTSDIR}/x11/gnomecore USE_X_PREFIX= yes USE_GMAKE= yes diff --git a/devel/bugbuddy/distinfo b/devel/bugbuddy/distinfo index ba78978..eaeb61f 100644 --- a/devel/bugbuddy/distinfo +++ b/devel/bugbuddy/distinfo @@ -1 +1 @@ -MD5 (bug-buddy-0.90.tar.gz) = 7ff1a83f3d1f2ed9107b32bf553e3e47 +MD5 (bug-buddy-1.0.tar.gz) = 69f6bea3a2acf5bf4557a06a62bf0fea diff --git a/devel/bugbuddy2/Makefile b/devel/bugbuddy2/Makefile index d2d4ce5..f4488fb 100644 --- a/devel/bugbuddy2/Makefile +++ b/devel/bugbuddy2/Makefile @@ -6,7 +6,7 @@ # PORTNAME= bugbuddy -PORTVERSION= 0.90 +PORTVERSION= 1.0 CATEGORIES= devel gnome MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= stable/sources/bug-buddy @@ -14,8 +14,7 @@ DISTNAME= bug-buddy-${PORTVERSION} MAINTAINER= nakai@FreeBSD.org -LIB_DEPENDS= gnome.3:${PORTSDIR}/x11/gnomelibs \ - glade.3:${PORTSDIR}/devel/libglade +LIB_DEPENDS= panel_applet.4:${PORTSDIR}/x11/gnomecore USE_X_PREFIX= yes USE_GMAKE= yes diff --git a/devel/bugbuddy2/distinfo b/devel/bugbuddy2/distinfo index ba78978..eaeb61f 100644 --- a/devel/bugbuddy2/distinfo +++ b/devel/bugbuddy2/distinfo @@ -1 +1 @@ -MD5 (bug-buddy-0.90.tar.gz) = 7ff1a83f3d1f2ed9107b32bf553e3e47 +MD5 (bug-buddy-1.0.tar.gz) = 69f6bea3a2acf5bf4557a06a62bf0fea diff --git a/devel/glade/Makefile b/devel/glade/Makefile index 66dcb08..a805cd9 100644 --- a/devel/glade/Makefile +++ b/devel/glade/Makefile @@ -6,13 +6,14 @@ # PORTNAME= glade -PORTVERSION= 0.5.8 +PORTVERSION= 0.5.9 CATEGORIES= devel gnome -MASTER_SITES= http://glade.pn.org/ +MASTER_SITES= ${MASTER_SITE_GNOME} +MASTER_SITE_SUBDIR= stable/sources/glade MAINTAINER= ade@FreeBSD.org -LIB_DEPENDS= gnome.3:${PORTSDIR}/x11/gnomelibs +LIB_DEPENDS= gnome.4:${PORTSDIR}/x11/gnomelibs GTK_CONFIG?= ${X11BASE}/bin/gtk12-config diff --git a/devel/glade/distinfo b/devel/glade/distinfo index 9406a6a..6cf6182 100644 --- a/devel/glade/distinfo +++ b/devel/glade/distinfo @@ -1 +1 @@ -MD5 (glade-0.5.8.tar.gz) = 17843aa65191fe78d5f64710a2c68701 +MD5 (glade-0.5.9.tar.gz) = 198531c9895a4edb94020ea7b6799c8a diff --git a/devel/glade/pkg-plist b/devel/glade/pkg-plist index 910994c..0b3b4f6 100644 --- a/devel/glade/pkg-plist +++ b/devel/glade/pkg-plist @@ -42,6 +42,21 @@ share/gnome/help/glade/C/faq/stylesheet-images/toc-plus.gif share/gnome/help/glade/C/faq/stylesheet-images/up.gif share/gnome/help/glade/C/faq/stylesheet-images/warning.gif share/gnome/help/glade/C/topic.dat +share/gnome/help/glade/C/turbo-start/docbook.css +share/gnome/help/glade/C/turbo-start/index.html +share/gnome/help/glade/C/turbo-start/ln7.html +share/gnome/help/glade/C/turbo-start/stylesheet-images/caution.gif +share/gnome/help/glade/C/turbo-start/stylesheet-images/home.gif +share/gnome/help/glade/C/turbo-start/stylesheet-images/important.gif +share/gnome/help/glade/C/turbo-start/stylesheet-images/next.gif +share/gnome/help/glade/C/turbo-start/stylesheet-images/note.gif +share/gnome/help/glade/C/turbo-start/stylesheet-images/prev.gif +share/gnome/help/glade/C/turbo-start/stylesheet-images/tip.gif +share/gnome/help/glade/C/turbo-start/stylesheet-images/toc-blank.gif +share/gnome/help/glade/C/turbo-start/stylesheet-images/toc-minus.gif +share/gnome/help/glade/C/turbo-start/stylesheet-images/toc-plus.gif +share/gnome/help/glade/C/turbo-start/stylesheet-images/up.gif +share/gnome/help/glade/C/turbo-start/stylesheet-images/warning.gif share/gnome/help/glade/C/user-guide/authors.html share/gnome/help/glade/C/user-guide/docbook.css share/gnome/help/glade/C/user-guide/edit-menu.html @@ -95,6 +110,7 @@ share/gnome/help/glade/C/user-guide/windows.html share/gnome/help/glade/C/user-guide/x230.html share/gnome/help/glade/C/user-guide/x329.html share/gnome/pixmaps/glade.png +share/gnome/pixmaps/glade/glade_logo.png share/locale/ca/LC_MESSAGES/glade.mo share/locale/cs/LC_MESSAGES/glade.mo share/locale/da/LC_MESSAGES/glade.mo @@ -113,9 +129,12 @@ share/locale/pt_BR/LC_MESSAGES/glade.mo share/locale/ru/LC_MESSAGES/glade.mo share/locale/sv/LC_MESSAGES/glade.mo share/locale/uk/LC_MESSAGES/glade.mo +@dirrm share/gnome/pixmaps/glade @dirrm share/gnome/help/glade/C/user-guide/user-guide-images @dirrm share/gnome/help/glade/C/user-guide/stylesheet-images @dirrm share/gnome/help/glade/C/user-guide +@dirrm share/gnome/help/glade/C/turbo-start/stylesheet-images +@dirrm share/gnome/help/glade/C/turbo-start @dirrm share/gnome/help/glade/C/faq/stylesheet-images @dirrm share/gnome/help/glade/C/faq @dirrm share/gnome/help/glade/C diff --git a/devel/glade2/Makefile b/devel/glade2/Makefile index 66dcb08..a805cd9 100644 --- a/devel/glade2/Makefile +++ b/devel/glade2/Makefile @@ -6,13 +6,14 @@ # PORTNAME= glade -PORTVERSION= 0.5.8 +PORTVERSION= 0.5.9 CATEGORIES= devel gnome -MASTER_SITES= http://glade.pn.org/ +MASTER_SITES= ${MASTER_SITE_GNOME} +MASTER_SITE_SUBDIR= stable/sources/glade MAINTAINER= ade@FreeBSD.org -LIB_DEPENDS= gnome.3:${PORTSDIR}/x11/gnomelibs +LIB_DEPENDS= gnome.4:${PORTSDIR}/x11/gnomelibs GTK_CONFIG?= ${X11BASE}/bin/gtk12-config diff --git a/devel/glade2/distinfo b/devel/glade2/distinfo index 9406a6a..6cf6182 100644 --- a/devel/glade2/distinfo +++ b/devel/glade2/distinfo @@ -1 +1 @@ -MD5 (glade-0.5.8.tar.gz) = 17843aa65191fe78d5f64710a2c68701 +MD5 (glade-0.5.9.tar.gz) = 198531c9895a4edb94020ea7b6799c8a diff --git a/devel/glade2/pkg-plist b/devel/glade2/pkg-plist index 910994c..0b3b4f6 100644 --- a/devel/glade2/pkg-plist +++ b/devel/glade2/pkg-plist @@ -42,6 +42,21 @@ share/gnome/help/glade/C/faq/stylesheet-images/toc-plus.gif share/gnome/help/glade/C/faq/stylesheet-images/up.gif share/gnome/help/glade/C/faq/stylesheet-images/warning.gif share/gnome/help/glade/C/topic.dat +share/gnome/help/glade/C/turbo-start/docbook.css +share/gnome/help/glade/C/turbo-start/index.html +share/gnome/help/glade/C/turbo-start/ln7.html +share/gnome/help/glade/C/turbo-start/stylesheet-images/caution.gif +share/gnome/help/glade/C/turbo-start/stylesheet-images/home.gif +share/gnome/help/glade/C/turbo-start/stylesheet-images/important.gif +share/gnome/help/glade/C/turbo-start/stylesheet-images/next.gif +share/gnome/help/glade/C/turbo-start/stylesheet-images/note.gif +share/gnome/help/glade/C/turbo-start/stylesheet-images/prev.gif +share/gnome/help/glade/C/turbo-start/stylesheet-images/tip.gif +share/gnome/help/glade/C/turbo-start/stylesheet-images/toc-blank.gif +share/gnome/help/glade/C/turbo-start/stylesheet-images/toc-minus.gif +share/gnome/help/glade/C/turbo-start/stylesheet-images/toc-plus.gif +share/gnome/help/glade/C/turbo-start/stylesheet-images/up.gif +share/gnome/help/glade/C/turbo-start/stylesheet-images/warning.gif share/gnome/help/glade/C/user-guide/authors.html share/gnome/help/glade/C/user-guide/docbook.css share/gnome/help/glade/C/user-guide/edit-menu.html @@ -95,6 +110,7 @@ share/gnome/help/glade/C/user-guide/windows.html share/gnome/help/glade/C/user-guide/x230.html share/gnome/help/glade/C/user-guide/x329.html share/gnome/pixmaps/glade.png +share/gnome/pixmaps/glade/glade_logo.png share/locale/ca/LC_MESSAGES/glade.mo share/locale/cs/LC_MESSAGES/glade.mo share/locale/da/LC_MESSAGES/glade.mo @@ -113,9 +129,12 @@ share/locale/pt_BR/LC_MESSAGES/glade.mo share/locale/ru/LC_MESSAGES/glade.mo share/locale/sv/LC_MESSAGES/glade.mo share/locale/uk/LC_MESSAGES/glade.mo +@dirrm share/gnome/pixmaps/glade @dirrm share/gnome/help/glade/C/user-guide/user-guide-images @dirrm share/gnome/help/glade/C/user-guide/stylesheet-images @dirrm share/gnome/help/glade/C/user-guide +@dirrm share/gnome/help/glade/C/turbo-start/stylesheet-images +@dirrm share/gnome/help/glade/C/turbo-start @dirrm share/gnome/help/glade/C/faq/stylesheet-images @dirrm share/gnome/help/glade/C/faq @dirrm share/gnome/help/glade/C diff --git a/devel/libglade/Makefile b/devel/libglade/Makefile index 8192261..fd22a2a 100644 --- a/devel/libglade/Makefile +++ b/devel/libglade/Makefile @@ -13,7 +13,7 @@ MASTER_SITE_SUBDIR= stable/sources/libglade MAINTAINER= ade@FreeBSD.org -LIB_DEPENDS= gnome.3:${PORTSDIR}/x11/gnomelibs \ +LIB_DEPENDS= gnome.4:${PORTSDIR}/x11/gnomelibs \ xml.5:${PORTSDIR}/textproc/libxml GTK_CONFIG?= ${X11BASE}/bin/gtk12-config diff --git a/devel/libglade2/Makefile b/devel/libglade2/Makefile index 8192261..fd22a2a 100644 --- a/devel/libglade2/Makefile +++ b/devel/libglade2/Makefile @@ -13,7 +13,7 @@ MASTER_SITE_SUBDIR= stable/sources/libglade MAINTAINER= ade@FreeBSD.org -LIB_DEPENDS= gnome.3:${PORTSDIR}/x11/gnomelibs \ +LIB_DEPENDS= gnome.4:${PORTSDIR}/x11/gnomelibs \ xml.5:${PORTSDIR}/textproc/libxml GTK_CONFIG?= ${X11BASE}/bin/gtk12-config diff --git a/devel/libgtop/Makefile b/devel/libgtop/Makefile index 4fb7f22..c1fb363 100644 --- a/devel/libgtop/Makefile +++ b/devel/libgtop/Makefile @@ -6,14 +6,14 @@ # PORTNAME= libgtop -PORTVERSION= 1.0.7 +PORTVERSION= 1.0.9 CATEGORIES= devel gnome MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= stable/sources/libgtop MAINTAINER= ade@FreeBSD.org -LIB_DEPENDS= gnome.3:${PORTSDIR}/x11/gnomelibs \ +LIB_DEPENDS= gnome.4:${PORTSDIR}/x11/gnomelibs \ guile.6:${PORTSDIR}/lang/guile GLIB_CONFIG?= ${LOCALBASE}/bin/glib12-config @@ -25,4 +25,12 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ GLIB_CONFIG="${GLIB_CONFIG}" \ LIBS="-L${LOCALBASE}/lib" +post-install: + if [ ! -f ${PREFIX}/info/dir ]; then \ + ${SED} -ne '1,/Menu:/p' /usr/share/info/dir > ${PREFIX}/info/dir; \ + fi + install-info --section="Programming \& development tools" \ + --entry="* libgtop: (libgtop). libgtop programming manual" \ + ${PREFIX}/info/libgtop.info ${PREFIX}/info/dir + .include <bsd.port.mk> diff --git a/devel/libgtop/distinfo b/devel/libgtop/distinfo index ef3c8ba..6aa41c1 100644 --- a/devel/libgtop/distinfo +++ b/devel/libgtop/distinfo @@ -1 +1 @@ -MD5 (libgtop-1.0.7.tar.gz) = 5853822967955a172978142156dbc010 +MD5 (libgtop-1.0.9.tar.gz) = 714ace1260fba2a6fe198c4a7672bb9e diff --git a/devel/libgtop/files/patch-ai b/devel/libgtop/files/patch-ai index ff5209b..bf211b5 100644 --- a/devel/libgtop/files/patch-ai +++ b/devel/libgtop/files/patch-ai @@ -1,11 +1,11 @@ ---- sysdeps/freebsd/msg_limits.c.orig Sat May 27 14:19:11 2000 -+++ sysdeps/freebsd/msg_limits.c Sat May 27 14:21:05 2000 +--- sysdeps/freebsd/msg_limits.c.orig Sun Feb 13 09:47:58 2000 ++++ sysdeps/freebsd/msg_limits.c Fri May 26 13:36:23 2000 @@ -46,7 +46,7 @@ /* #define KERNEL to get declaration of `struct msginfo'. */ -#if (defined __FreeBSD__) || (defined __bsdi__) -+#if (defined(__FreeBSD__) && __FreeBSD__ < 5) || (defined __bsdi__) ++#if ((defined __FreeBSD__) && (__FreeBSD_version < 500000)) || (defined __bsdi__) #define KERNEL 1 #else #define _KERNEL 1 diff --git a/devel/libgtop/pkg-plist b/devel/libgtop/pkg-plist index 7e55aba..09ca13e 100644 --- a/devel/libgtop/pkg-plist +++ b/devel/libgtop/pkg-plist @@ -49,7 +49,7 @@ include/glibtop_server.h include/glibtop_suid.h @unexec install-info --delete %D/info/libgtop.info %D/info/dir info/libgtop.info -@exec install-info %D/info/libgtop.info %D/info/dir +@exec install-info --section="Programming \& development tools" --entry="* libgtop: (libgtop). libgtop programming manual" %D/info/libgtop.info %D/info/dir lib/libgtop.a lib/libgtop.so lib/libgtop.so.1 diff --git a/devel/libgtop2/Makefile b/devel/libgtop2/Makefile index 4fb7f22..c1fb363 100644 --- a/devel/libgtop2/Makefile +++ b/devel/libgtop2/Makefile @@ -6,14 +6,14 @@ # PORTNAME= libgtop -PORTVERSION= 1.0.7 +PORTVERSION= 1.0.9 CATEGORIES= devel gnome MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= stable/sources/libgtop MAINTAINER= ade@FreeBSD.org -LIB_DEPENDS= gnome.3:${PORTSDIR}/x11/gnomelibs \ +LIB_DEPENDS= gnome.4:${PORTSDIR}/x11/gnomelibs \ guile.6:${PORTSDIR}/lang/guile GLIB_CONFIG?= ${LOCALBASE}/bin/glib12-config @@ -25,4 +25,12 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ GLIB_CONFIG="${GLIB_CONFIG}" \ LIBS="-L${LOCALBASE}/lib" +post-install: + if [ ! -f ${PREFIX}/info/dir ]; then \ + ${SED} -ne '1,/Menu:/p' /usr/share/info/dir > ${PREFIX}/info/dir; \ + fi + install-info --section="Programming \& development tools" \ + --entry="* libgtop: (libgtop). libgtop programming manual" \ + ${PREFIX}/info/libgtop.info ${PREFIX}/info/dir + .include <bsd.port.mk> diff --git a/devel/libgtop2/distinfo b/devel/libgtop2/distinfo index ef3c8ba..6aa41c1 100644 --- a/devel/libgtop2/distinfo +++ b/devel/libgtop2/distinfo @@ -1 +1 @@ -MD5 (libgtop-1.0.7.tar.gz) = 5853822967955a172978142156dbc010 +MD5 (libgtop-1.0.9.tar.gz) = 714ace1260fba2a6fe198c4a7672bb9e diff --git a/devel/libgtop2/files/patch-ai b/devel/libgtop2/files/patch-ai index ff5209b..bf211b5 100644 --- a/devel/libgtop2/files/patch-ai +++ b/devel/libgtop2/files/patch-ai @@ -1,11 +1,11 @@ ---- sysdeps/freebsd/msg_limits.c.orig Sat May 27 14:19:11 2000 -+++ sysdeps/freebsd/msg_limits.c Sat May 27 14:21:05 2000 +--- sysdeps/freebsd/msg_limits.c.orig Sun Feb 13 09:47:58 2000 ++++ sysdeps/freebsd/msg_limits.c Fri May 26 13:36:23 2000 @@ -46,7 +46,7 @@ /* #define KERNEL to get declaration of `struct msginfo'. */ -#if (defined __FreeBSD__) || (defined __bsdi__) -+#if (defined(__FreeBSD__) && __FreeBSD__ < 5) || (defined __bsdi__) ++#if ((defined __FreeBSD__) && (__FreeBSD_version < 500000)) || (defined __bsdi__) #define KERNEL 1 #else #define _KERNEL 1 diff --git a/devel/libgtop2/pkg-plist b/devel/libgtop2/pkg-plist index 7e55aba..09ca13e 100644 --- a/devel/libgtop2/pkg-plist +++ b/devel/libgtop2/pkg-plist @@ -49,7 +49,7 @@ include/glibtop_server.h include/glibtop_suid.h @unexec install-info --delete %D/info/libgtop.info %D/info/dir info/libgtop.info -@exec install-info %D/info/libgtop.info %D/info/dir +@exec install-info --section="Programming \& development tools" --entry="* libgtop: (libgtop). libgtop programming manual" %D/info/libgtop.info %D/info/dir lib/libgtop.a lib/libgtop.so lib/libgtop.so.1 diff --git a/games/gnome-games/Makefile b/games/gnome-games/Makefile index d90a50c..73d2d6c 100644 --- a/games/gnome-games/Makefile +++ b/games/gnome-games/Makefile @@ -6,7 +6,7 @@ # PORTNAME= gnomegames -PORTVERSION= 1.0.51 +PORTVERSION= 1.2.0 CATEGORIES= games gnome MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= stable/sources/gnome-games @@ -14,8 +14,7 @@ DISTNAME= gnome-games-${PORTVERSION} MAINTAINER= ade@FreeBSD.org -BUILD_DEPENDS= panel:${PORTSDIR}/x11/gnomecore -RUN_DEPENDS= panel:${PORTSDIR}/x11/gnomecore +LIB_DEPENDS= panel_applet.4:${PORTSDIR}/x11/gnomecore GTK_CONFIG?= ${X11BASE}/bin/gtk12-config @@ -23,8 +22,7 @@ USE_X_PREFIX= yes USE_GMAKE= yes USE_LIBTOOL= yes CONFIGURE_ARGS= --localstatedir=${PREFIX}/share/gnome \ - --datadir=${PREFIX}/share/gnome \ - --with-gnome=${PREFIX} + --datadir=${PREFIX}/share/gnome CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ GTK_CONFIG="${GTK_CONFIG}" \ LIBS="-L${LOCALBASE}/lib" diff --git a/games/gnome-games/distinfo b/games/gnome-games/distinfo index f7a4a06..7c72f30 100644 --- a/games/gnome-games/distinfo +++ b/games/gnome-games/distinfo @@ -1 +1 @@ -MD5 (gnome-games-1.0.51.tar.gz) = 81c3a9c749d8574e3fbc6cc8e3c195f9 +MD5 (gnome-games-1.2.0.tar.gz) = 681f8c880daa8e4e4a264039e6e8cb3c diff --git a/games/gnome-games/files/patch-ab b/games/gnome-games/files/patch-ab index b36831e..9b356b0 100644 --- a/games/gnome-games/files/patch-ab +++ b/games/gnome-games/files/patch-ab @@ -123,6 +123,13 @@ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = ../../../config.h CONFIG_CLEAN_FILES = +--- gnobots2/help/da/Makefile.in.orig Sun May 21 23:51:03 2000 ++++ gnobots2/help/da/Makefile.in Tue May 30 17:11:59 2000 +@@ -131,3 +131,3 @@ + +-gnobots2_helpdir = $(datadir)/gnome/help/gnobots2/da ++gnobots2_helpdir = $(datadir)/help/gnobots2/da + mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs --- gnobots2/help/es/Makefile.in.orig Sun Sep 26 13:29:04 1999 +++ gnobots2/help/es/Makefile.in Mon Sep 27 09:34:44 1999 @@ -128,7 +128,7 @@ @@ -198,15 +205,16 @@ libgnomekoban_la_LIBADD = libgnomekoban_la_OBJECTS = gnomekoban.lo COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) ---- gnometris/Makefile.in.orig Sun Sep 26 13:29:31 1999 -+++ gnometris/Makefile.in Mon Sep 27 09:36:59 1999 -@@ -127,9 +127,9 @@ +--- gnometris/Makefile.in.orig Sun May 21 23:51:13 2000 ++++ gnometris/Makefile.in Tue May 30 16:14:41 2000 +@@ -127,10 +127,10 @@ SUBDIRS = pix scoredir = $(localstatedir)/games -Gamesdir = $(datadir)/gnome/apps/Games +Gamesdir = $(datadir)/apps/Games + CPPFLAGS = -pedantic -Wall -INCLUDES = -DGNOMELOCALEDIR=\""$(datadir)/locale"\" $(GNOME_INCLUDEDIR) +INCLUDES = -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" $(GNOME_INCLUDEDIR) @@ -222,7 +230,7 @@ +Gamesdir = $(datadir)/apps/Games -INCLUDES = -DGNOMELOCALEDIR=\""$(datadir)/locale"\" -I$(includedir) $(GNOME_INCLUDEDIR) -+INCLUDES = -DGNOMELOCALEDIR=\""$(prefix)/locale"\" -I$(includedir) $(GNOME_INCLUDEDIR) ++INCLUDES = -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" -I$(includedir) $(GNOME_INCLUDEDIR) bin_PROGRAMS = gnomine @@ -240,6 +248,20 @@ bin_PROGRAMS = gnotravex +--- gnotski/Makefile.in.orig Sun May 21 23:51:10 2000 ++++ gnotski/Makefile.in Tue May 30 16:46:09 2000 +@@ -128,9 +128,9 @@ + + scoredir = $(localstatedir)/games + pixmapdir = $(datadir)/pixmaps/gnotski +-Gamesdir = $(datadir)/gnome/apps/Games ++Gamesdir = $(datadir)/apps/Games + +-INCLUDES = -DGNOMELOCALEDIR=\""$(datadir)/locale"\" -I$(includedir) $(GNOME_INCLUDEDIR) ++INCLUDES = -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" -I$(includedir) $(GNOME_INCLUDEDIR) + + + bin_PROGRAMS = gnotski --- gtali/Makefile.in.orig Sun Sep 26 13:28:57 1999 +++ gtali/Makefile.in Mon Sep 27 09:44:54 1999 @@ -125,12 +125,12 @@ @@ -268,6 +290,13 @@ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = ../../../config.h CONFIG_CLEAN_FILES = +--- gtali/help/da/Makefile.in.orig Sun May 21 23:50:59 2000 ++++ gtali/help/da/Makefile.in Tue May 30 17:12:32 2000 +@@ -131,3 +131,3 @@ + +-gtali_helpdir = $(datadir)/gnome/help/gtali/da ++gtali_helpdir = $(datadir)/help/gtali/da + mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs --- gturing/Makefile.in.orig Sun Sep 26 13:28:54 1999 +++ gturing/Makefile.in Mon Sep 27 09:37:08 1999 @@ -125,12 +125,12 @@ @@ -312,6 +341,13 @@ bin_PROGRAMS = iagno +--- iagno/help/C/Makefile.in.orig Sun May 21 23:51:06 2000 ++++ iagno/help/C/Makefile.in Tue May 30 17:13:41 2000 +@@ -128,3 +128,3 @@ + +-iagno_helpdir = $(datadir)/gnome/help/iagno/C ++iagno_helpdir = $(datadir)/help/iagno/C + --- mahjongg/Makefile.in.orig Sun Sep 26 13:28:53 1999 +++ mahjongg/Makefile.in Mon Sep 27 09:46:10 1999 @@ -128,10 +128,10 @@ @@ -353,6 +389,13 @@ +same_gnome_helpdir = $(datadir)/help/samegnome/C same_gnome_help_DATA = index.html topic.dat + +--- same-gnome/help/ru/Makefile.in.orig Sun May 21 23:50:51 2000 ++++ same-gnome/help/ru/Makefile.in Tue May 30 17:13:02 2000 +@@ -128,3 +128,3 @@ + +-same_gnome_helpdir = $(datadir)/gnome/help/samegnome/ru ++same_gnome_helpdir = $(datadir)/help/samegnome/ru --- scottfree/Makefile.in.orig Sun Sep 26 13:28:52 1999 +++ scottfree/Makefile.in Mon Sep 27 09:52:29 1999 @@ -365,9 +408,18 @@ bin_PROGRAMS = GnomeScott ---- xbill/Makefile.in.orig Sun Sep 26 13:29:33 1999 -+++ xbill/Makefile.in Mon Sep 27 09:53:11 1999 -@@ -143,7 +143,7 @@ +--- xbill/Makefile.in.orig Sun May 21 23:51:14 2000 ++++ xbill/Makefile.in Tue May 30 16:30:13 2000 +@@ -131,7 +131,7 @@ + # This is where the high score file goes ... + scoredir = $(localstatedir)/games + +-INCLUDES = $(GNOME_INCLUDEDIR) -DGNOMELOCALDIR=\""$(datadir)/local"\" ++INCLUDES = $(GNOME_INCLUDEDIR) -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" + bin_PROGRAMS = gnome-xbill + + gnome_xbill_SOURCES = Bucket.cc Bucket.h Cable.cc Cable.h Computer.cc Computer.h Game.cc Game.h Horde.cc Horde.h Library.cc Library.h MCursor.cc MCursor.h Monster.cc Monster.h Network.cc Network.h Picture.cc Picture.h Spark.cc Spark.h Strings.h UI.cc UI.h objects.h x11-gtk.cc x11.h +@@ -144,7 +144,7 @@ pixmapdir = $(datadir)/pixmaps pixmap_DATA = xbill.png diff --git a/games/gnome-games/pkg-plist b/games/gnome-games/pkg-plist index 4af7937..90ffe83 100644 --- a/games/gnome-games/pkg-plist +++ b/games/gnome-games/pkg-plist @@ -10,6 +10,7 @@ bin/gnome-xbill bin/gnometris bin/gnomine bin/gnotravex +bin/gnotski bin/gtali bin/gturing bin/iagno @@ -35,6 +36,7 @@ share/gnome/apps/Games/gnome-stones.desktop share/gnome/apps/Games/gnometris.desktop share/gnome/apps/Games/gnomine.desktop share/gnome/apps/Games/gnotravex.desktop +share/gnome/apps/Games/gnotski.desktop share/gnome/apps/Games/gtali.desktop share/gnome/apps/Games/gturing.desktop share/gnome/apps/Games/iagno.desktop @@ -73,6 +75,26 @@ share/gnome/games/gnotravex.3x3.scores share/gnome/games/gnotravex.4x4.scores share/gnome/games/gnotravex.5x5.scores share/gnome/games/gnotravex.6x6.scores +share/gnome/games/gnotski.1.scores +share/gnome/games/gnotski.11.scores +share/gnome/games/gnotski.12.scores +share/gnome/games/gnotski.13.scores +share/gnome/games/gnotski.14.scores +share/gnome/games/gnotski.15.scores +share/gnome/games/gnotski.16.scores +share/gnome/games/gnotski.17.scores +share/gnome/games/gnotski.2.scores +share/gnome/games/gnotski.21.scores +share/gnome/games/gnotski.22.scores +share/gnome/games/gnotski.23.scores +share/gnome/games/gnotski.24.scores +share/gnome/games/gnotski.25.scores +share/gnome/games/gnotski.26.scores +share/gnome/games/gnotski.3.scores +share/gnome/games/gnotski.4.scores +share/gnome/games/gnotski.5.scores +share/gnome/games/gnotski.6.scores +share/gnome/games/gnotski.7.scores share/gnome/games/gtali.scores share/gnome/games/iagno.b1.scores share/gnome/games/iagno.b2.scores @@ -132,12 +154,36 @@ share/gnome/gturing/examples/dec2bin.tur share/gnome/gturing/examples/subst.tur share/gnome/help/gnobots2/C/index.html share/gnome/help/gnobots2/C/topic.dat +share/gnome/help/gnobots2/da/index.html +share/gnome/help/gnobots2/da/topic.dat share/gnome/help/gnobots2/es/index.html share/gnome/help/gnobots2/es/topic.dat share/gnome/help/gnobots2/it/index.html share/gnome/help/gnobots2/it/topic.dat share/gnome/help/gtali/C/index.html share/gnome/help/gtali/C/topic.dat +share/gnome/help/gtali/da/index.html +share/gnome/help/gtali/da/topic.dat +share/gnome/help/iagno/C/ANIMATION.png +share/gnome/help/iagno/C/BLOCK.png +share/gnome/help/iagno/C/FIRST.png +share/gnome/help/iagno/C/PLAYER.png +share/gnome/help/iagno/C/START.png +share/gnome/help/iagno/C/animations.html +share/gnome/help/iagno/C/bugs.html +share/gnome/help/iagno/C/credits.html +share/gnome/help/iagno/C/docbook.css +share/gnome/help/iagno/C/index.html +share/gnome/help/iagno/C/license.html +share/gnome/help/iagno/C/ln7.html +share/gnome/help/iagno/C/playing.html +share/gnome/help/iagno/C/settings.html +share/gnome/help/iagno/C/stylesheet-images/caution.png +share/gnome/help/iagno/C/stylesheet-images/important.png +share/gnome/help/iagno/C/stylesheet-images/note.png +share/gnome/help/iagno/C/stylesheet-images/tip.png +share/gnome/help/iagno/C/stylesheet-images/warning.png +share/gnome/help/iagno/C/topic.dat share/gnome/help/samegnome/C/authors.html share/gnome/help/samegnome/C/book1.html share/gnome/help/samegnome/C/bugs.html @@ -147,6 +193,15 @@ share/gnome/help/samegnome/C/index.html share/gnome/help/samegnome/C/ln9.html share/gnome/help/samegnome/C/newthemes.html share/gnome/help/samegnome/C/topic.dat +share/gnome/help/samegnome/ru/authors.html +share/gnome/help/samegnome/ru/book1.html +share/gnome/help/samegnome/ru/bugs.html +share/gnome/help/samegnome/ru/c11.html +share/gnome/help/samegnome/ru/docbook.css +share/gnome/help/samegnome/ru/index.html +share/gnome/help/samegnome/ru/ln9.html +share/gnome/help/samegnome/ru/newthemes.html +share/gnome/help/samegnome/ru/topic.dat share/gnome/mime-info/gnome-stones.keys share/gnome/mime-info/gnome-stones.mime share/gnome/pixmaps/cards/backs/beige.png @@ -240,6 +295,7 @@ share/gnome/pixmaps/gnometris/bg/vortex-bg.png share/gnome/pixmaps/gnometris/bg/weirdo-bg.png share/gnome/pixmaps/gnotravex/gnotravex.png share/gnome/pixmaps/gnotravex/gnome-gnotravex.png +share/gnome/pixmaps/gnotski/gnotski.png share/gnome/pixmaps/iagno.png share/gnome/pixmaps/iagno/blend.png share/gnome/pixmaps/iagno/classic.png @@ -277,6 +333,7 @@ share/gnome/sol-games/hopscotch.scm share/gnome/sol-games/kansas.scm share/gnome/sol-games/klondike.scm share/gnome/sol-games/lady_jane.scm +share/gnome/sol-games/maze.scm share/gnome/sol-games/neighbor.scm share/gnome/sol-games/odessa.scm share/gnome/sol-games/osmosis.scm @@ -313,21 +370,28 @@ share/gnome/sounds/gnobots2/yahoo.wav share/gnome/sounds/iagno/flip-piece.wav share/gnome/sounds/iagno/gameover.wav share/gnome/xbill/cursors/apple.xpm +share/gnome/xbill/cursors/beos.xpm share/gnome/xbill/cursors/bsd.xpm share/gnome/xbill/cursors/bucket.xpm +share/gnome/xbill/cursors/caldera.xpm +share/gnome/xbill/cursors/debian.xpm share/gnome/xbill/cursors/hand_down.xpm share/gnome/xbill/cursors/hand_down_mask.xpm share/gnome/xbill/cursors/hand_up.xpm share/gnome/xbill/cursors/hand_up_mask.xpm share/gnome/xbill/cursors/hurd.xpm share/gnome/xbill/cursors/linux.xpm +share/gnome/xbill/cursors/mandrake.xpm share/gnome/xbill/cursors/next.xpm share/gnome/xbill/cursors/os2.xpm share/gnome/xbill/cursors/redhat.xpm share/gnome/xbill/cursors/sgi.xpm share/gnome/xbill/cursors/sun.xpm +share/gnome/xbill/cursors/suse.xpm +share/gnome/xbill/cursors/turbolinux.xpm share/gnome/xbill/pixmaps/about.xpm share/gnome/xbill/pixmaps/apple.xpm +share/gnome/xbill/pixmaps/beos.xpm share/gnome/xbill/pixmaps/billA_0.xpm share/gnome/xbill/pixmaps/billA_1.xpm share/gnome/xbill/pixmaps/billA_10.xpm @@ -355,11 +419,14 @@ share/gnome/xbill/pixmaps/billR_2.xpm share/gnome/xbill/pixmaps/bsd.xpm share/gnome/xbill/pixmaps/bsdcpu.xpm share/gnome/xbill/pixmaps/bucket.xpm +share/gnome/xbill/pixmaps/caldera.xpm +share/gnome/xbill/pixmaps/debian.xpm share/gnome/xbill/pixmaps/hurd.xpm share/gnome/xbill/pixmaps/icon.xpm share/gnome/xbill/pixmaps/linux.xpm share/gnome/xbill/pixmaps/logo.xpm share/gnome/xbill/pixmaps/maccpu.xpm +share/gnome/xbill/pixmaps/mandrake.xpm share/gnome/xbill/pixmaps/next.xpm share/gnome/xbill/pixmaps/nextcpu.xpm share/gnome/xbill/pixmaps/os2.xpm @@ -371,21 +438,26 @@ share/gnome/xbill/pixmaps/spark_0.xpm share/gnome/xbill/pixmaps/spark_1.xpm share/gnome/xbill/pixmaps/sun.xpm share/gnome/xbill/pixmaps/suncpu.xpm +share/gnome/xbill/pixmaps/suse.xpm share/gnome/xbill/pixmaps/toaster.xpm +share/gnome/xbill/pixmaps/turbolinux.xpm share/gnome/xbill/pixmaps/wingdows.xpm share/locale/cs/LC_MESSAGES/gnome-games.mo share/locale/da/LC_MESSAGES/gnome-games.mo share/locale/de/LC_MESSAGES/gnome-games.mo +share/locale/el/LC_MESSAGES/gnome-games.mo share/locale/en_GB/LC_MESSAGES/gnome-games.mo share/locale/es/LC_MESSAGES/gnome-games.mo share/locale/et/LC_MESSAGES/gnome-games.mo share/locale/fi/LC_MESSAGES/gnome-games.mo share/locale/fr/LC_MESSAGES/gnome-games.mo share/locale/ga/LC_MESSAGES/gnome-games.mo +share/locale/gl/LC_MESSAGES/gnome-games.mo share/locale/hu/LC_MESSAGES/gnome-games.mo share/locale/it/LC_MESSAGES/gnome-games.mo share/locale/ja/LC_MESSAGES/gnome-games.mo share/locale/ko/LC_MESSAGES/gnome-games.mo +share/locale/lt/LC_MESSAGES/gnome-games.mo share/locale/nl/LC_MESSAGES/gnome-games.mo share/locale/no/LC_MESSAGES/gnome-games.mo share/locale/pl/LC_MESSAGES/gnome-games.mo @@ -393,7 +465,9 @@ share/locale/pt/LC_MESSAGES/gnome-games.mo share/locale/pt_BR/LC_MESSAGES/gnome-games.mo share/locale/ru/LC_MESSAGES/gnome-games.mo share/locale/sv/LC_MESSAGES/gnome-games.mo +share/locale/uk/LC_MESSAGES/gnome-games.mo share/locale/wa/LC_MESSAGES/gnome-games.mo +share/locale/zh_CN.GB2312/LC_MESSAGES/gnome-games.mo share/locale/zh_TW.Big5/LC_MESSAGES/gnome-games.mo @dirrm share/gnome/xbill/pixmaps @dirrm share/gnome/xbill/cursors @@ -407,6 +481,7 @@ share/locale/zh_TW.Big5/LC_MESSAGES/gnome-games.mo @dirrm share/gnome/pixmaps/mahjongg/bg @dirrm share/gnome/pixmaps/mahjongg @dirrm share/gnome/pixmaps/iagno +@dirrm share/gnome/pixmaps/gnotski @dirrm share/gnome/pixmaps/gnotravex @dirrm share/gnome/pixmaps/gnometris/bg @dirrm share/gnome/pixmaps/gnometris @@ -424,12 +499,18 @@ share/locale/zh_TW.Big5/LC_MESSAGES/gnome-games.mo @dirrm share/gnome/pixmaps/cards/honors @dirrm share/gnome/pixmaps/cards/backs @dirrm share/gnome/pixmaps/cards +@dirrm share/gnome/help/samegnome/ru @dirrm share/gnome/help/samegnome/C @dirrm share/gnome/help/samegnome +@dirrm share/gnome/help/iagno/C/stylesheet-images +@dirrm share/gnome/help/iagno/C +@dirrm share/gnome/help/iagno +@dirrm share/gnome/help/gtali/da @dirrm share/gnome/help/gtali/C @dirrm share/gnome/help/gtali @dirrm share/gnome/help/gnobots2/it @dirrm share/gnome/help/gnobots2/es +@dirrm share/gnome/help/gnobots2/da @dirrm share/gnome/help/gnobots2/C @dirrm share/gnome/help/gnobots2 @dirrm share/gnome/gturing/examples diff --git a/games/gnomegames/Makefile b/games/gnomegames/Makefile index d90a50c..73d2d6c 100644 --- a/games/gnomegames/Makefile +++ b/games/gnomegames/Makefile @@ -6,7 +6,7 @@ # PORTNAME= gnomegames -PORTVERSION= 1.0.51 +PORTVERSION= 1.2.0 CATEGORIES= games gnome MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= stable/sources/gnome-games @@ -14,8 +14,7 @@ DISTNAME= gnome-games-${PORTVERSION} MAINTAINER= ade@FreeBSD.org -BUILD_DEPENDS= panel:${PORTSDIR}/x11/gnomecore -RUN_DEPENDS= panel:${PORTSDIR}/x11/gnomecore +LIB_DEPENDS= panel_applet.4:${PORTSDIR}/x11/gnomecore GTK_CONFIG?= ${X11BASE}/bin/gtk12-config @@ -23,8 +22,7 @@ USE_X_PREFIX= yes USE_GMAKE= yes USE_LIBTOOL= yes CONFIGURE_ARGS= --localstatedir=${PREFIX}/share/gnome \ - --datadir=${PREFIX}/share/gnome \ - --with-gnome=${PREFIX} + --datadir=${PREFIX}/share/gnome CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ GTK_CONFIG="${GTK_CONFIG}" \ LIBS="-L${LOCALBASE}/lib" diff --git a/games/gnomegames/distinfo b/games/gnomegames/distinfo index f7a4a06..7c72f30 100644 --- a/games/gnomegames/distinfo +++ b/games/gnomegames/distinfo @@ -1 +1 @@ -MD5 (gnome-games-1.0.51.tar.gz) = 81c3a9c749d8574e3fbc6cc8e3c195f9 +MD5 (gnome-games-1.2.0.tar.gz) = 681f8c880daa8e4e4a264039e6e8cb3c diff --git a/games/gnomegames/files/patch-ab b/games/gnomegames/files/patch-ab index b36831e..9b356b0 100644 --- a/games/gnomegames/files/patch-ab +++ b/games/gnomegames/files/patch-ab @@ -123,6 +123,13 @@ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = ../../../config.h CONFIG_CLEAN_FILES = +--- gnobots2/help/da/Makefile.in.orig Sun May 21 23:51:03 2000 ++++ gnobots2/help/da/Makefile.in Tue May 30 17:11:59 2000 +@@ -131,3 +131,3 @@ + +-gnobots2_helpdir = $(datadir)/gnome/help/gnobots2/da ++gnobots2_helpdir = $(datadir)/help/gnobots2/da + mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs --- gnobots2/help/es/Makefile.in.orig Sun Sep 26 13:29:04 1999 +++ gnobots2/help/es/Makefile.in Mon Sep 27 09:34:44 1999 @@ -128,7 +128,7 @@ @@ -198,15 +205,16 @@ libgnomekoban_la_LIBADD = libgnomekoban_la_OBJECTS = gnomekoban.lo COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) ---- gnometris/Makefile.in.orig Sun Sep 26 13:29:31 1999 -+++ gnometris/Makefile.in Mon Sep 27 09:36:59 1999 -@@ -127,9 +127,9 @@ +--- gnometris/Makefile.in.orig Sun May 21 23:51:13 2000 ++++ gnometris/Makefile.in Tue May 30 16:14:41 2000 +@@ -127,10 +127,10 @@ SUBDIRS = pix scoredir = $(localstatedir)/games -Gamesdir = $(datadir)/gnome/apps/Games +Gamesdir = $(datadir)/apps/Games + CPPFLAGS = -pedantic -Wall -INCLUDES = -DGNOMELOCALEDIR=\""$(datadir)/locale"\" $(GNOME_INCLUDEDIR) +INCLUDES = -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" $(GNOME_INCLUDEDIR) @@ -222,7 +230,7 @@ +Gamesdir = $(datadir)/apps/Games -INCLUDES = -DGNOMELOCALEDIR=\""$(datadir)/locale"\" -I$(includedir) $(GNOME_INCLUDEDIR) -+INCLUDES = -DGNOMELOCALEDIR=\""$(prefix)/locale"\" -I$(includedir) $(GNOME_INCLUDEDIR) ++INCLUDES = -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" -I$(includedir) $(GNOME_INCLUDEDIR) bin_PROGRAMS = gnomine @@ -240,6 +248,20 @@ bin_PROGRAMS = gnotravex +--- gnotski/Makefile.in.orig Sun May 21 23:51:10 2000 ++++ gnotski/Makefile.in Tue May 30 16:46:09 2000 +@@ -128,9 +128,9 @@ + + scoredir = $(localstatedir)/games + pixmapdir = $(datadir)/pixmaps/gnotski +-Gamesdir = $(datadir)/gnome/apps/Games ++Gamesdir = $(datadir)/apps/Games + +-INCLUDES = -DGNOMELOCALEDIR=\""$(datadir)/locale"\" -I$(includedir) $(GNOME_INCLUDEDIR) ++INCLUDES = -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" -I$(includedir) $(GNOME_INCLUDEDIR) + + + bin_PROGRAMS = gnotski --- gtali/Makefile.in.orig Sun Sep 26 13:28:57 1999 +++ gtali/Makefile.in Mon Sep 27 09:44:54 1999 @@ -125,12 +125,12 @@ @@ -268,6 +290,13 @@ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = ../../../config.h CONFIG_CLEAN_FILES = +--- gtali/help/da/Makefile.in.orig Sun May 21 23:50:59 2000 ++++ gtali/help/da/Makefile.in Tue May 30 17:12:32 2000 +@@ -131,3 +131,3 @@ + +-gtali_helpdir = $(datadir)/gnome/help/gtali/da ++gtali_helpdir = $(datadir)/help/gtali/da + mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs --- gturing/Makefile.in.orig Sun Sep 26 13:28:54 1999 +++ gturing/Makefile.in Mon Sep 27 09:37:08 1999 @@ -125,12 +125,12 @@ @@ -312,6 +341,13 @@ bin_PROGRAMS = iagno +--- iagno/help/C/Makefile.in.orig Sun May 21 23:51:06 2000 ++++ iagno/help/C/Makefile.in Tue May 30 17:13:41 2000 +@@ -128,3 +128,3 @@ + +-iagno_helpdir = $(datadir)/gnome/help/iagno/C ++iagno_helpdir = $(datadir)/help/iagno/C + --- mahjongg/Makefile.in.orig Sun Sep 26 13:28:53 1999 +++ mahjongg/Makefile.in Mon Sep 27 09:46:10 1999 @@ -128,10 +128,10 @@ @@ -353,6 +389,13 @@ +same_gnome_helpdir = $(datadir)/help/samegnome/C same_gnome_help_DATA = index.html topic.dat + +--- same-gnome/help/ru/Makefile.in.orig Sun May 21 23:50:51 2000 ++++ same-gnome/help/ru/Makefile.in Tue May 30 17:13:02 2000 +@@ -128,3 +128,3 @@ + +-same_gnome_helpdir = $(datadir)/gnome/help/samegnome/ru ++same_gnome_helpdir = $(datadir)/help/samegnome/ru --- scottfree/Makefile.in.orig Sun Sep 26 13:28:52 1999 +++ scottfree/Makefile.in Mon Sep 27 09:52:29 1999 @@ -365,9 +408,18 @@ bin_PROGRAMS = GnomeScott ---- xbill/Makefile.in.orig Sun Sep 26 13:29:33 1999 -+++ xbill/Makefile.in Mon Sep 27 09:53:11 1999 -@@ -143,7 +143,7 @@ +--- xbill/Makefile.in.orig Sun May 21 23:51:14 2000 ++++ xbill/Makefile.in Tue May 30 16:30:13 2000 +@@ -131,7 +131,7 @@ + # This is where the high score file goes ... + scoredir = $(localstatedir)/games + +-INCLUDES = $(GNOME_INCLUDEDIR) -DGNOMELOCALDIR=\""$(datadir)/local"\" ++INCLUDES = $(GNOME_INCLUDEDIR) -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" + bin_PROGRAMS = gnome-xbill + + gnome_xbill_SOURCES = Bucket.cc Bucket.h Cable.cc Cable.h Computer.cc Computer.h Game.cc Game.h Horde.cc Horde.h Library.cc Library.h MCursor.cc MCursor.h Monster.cc Monster.h Network.cc Network.h Picture.cc Picture.h Spark.cc Spark.h Strings.h UI.cc UI.h objects.h x11-gtk.cc x11.h +@@ -144,7 +144,7 @@ pixmapdir = $(datadir)/pixmaps pixmap_DATA = xbill.png diff --git a/games/gnomegames/pkg-plist b/games/gnomegames/pkg-plist index 4af7937..90ffe83 100644 --- a/games/gnomegames/pkg-plist +++ b/games/gnomegames/pkg-plist @@ -10,6 +10,7 @@ bin/gnome-xbill bin/gnometris bin/gnomine bin/gnotravex +bin/gnotski bin/gtali bin/gturing bin/iagno @@ -35,6 +36,7 @@ share/gnome/apps/Games/gnome-stones.desktop share/gnome/apps/Games/gnometris.desktop share/gnome/apps/Games/gnomine.desktop share/gnome/apps/Games/gnotravex.desktop +share/gnome/apps/Games/gnotski.desktop share/gnome/apps/Games/gtali.desktop share/gnome/apps/Games/gturing.desktop share/gnome/apps/Games/iagno.desktop @@ -73,6 +75,26 @@ share/gnome/games/gnotravex.3x3.scores share/gnome/games/gnotravex.4x4.scores share/gnome/games/gnotravex.5x5.scores share/gnome/games/gnotravex.6x6.scores +share/gnome/games/gnotski.1.scores +share/gnome/games/gnotski.11.scores +share/gnome/games/gnotski.12.scores +share/gnome/games/gnotski.13.scores +share/gnome/games/gnotski.14.scores +share/gnome/games/gnotski.15.scores +share/gnome/games/gnotski.16.scores +share/gnome/games/gnotski.17.scores +share/gnome/games/gnotski.2.scores +share/gnome/games/gnotski.21.scores +share/gnome/games/gnotski.22.scores +share/gnome/games/gnotski.23.scores +share/gnome/games/gnotski.24.scores +share/gnome/games/gnotski.25.scores +share/gnome/games/gnotski.26.scores +share/gnome/games/gnotski.3.scores +share/gnome/games/gnotski.4.scores +share/gnome/games/gnotski.5.scores +share/gnome/games/gnotski.6.scores +share/gnome/games/gnotski.7.scores share/gnome/games/gtali.scores share/gnome/games/iagno.b1.scores share/gnome/games/iagno.b2.scores @@ -132,12 +154,36 @@ share/gnome/gturing/examples/dec2bin.tur share/gnome/gturing/examples/subst.tur share/gnome/help/gnobots2/C/index.html share/gnome/help/gnobots2/C/topic.dat +share/gnome/help/gnobots2/da/index.html +share/gnome/help/gnobots2/da/topic.dat share/gnome/help/gnobots2/es/index.html share/gnome/help/gnobots2/es/topic.dat share/gnome/help/gnobots2/it/index.html share/gnome/help/gnobots2/it/topic.dat share/gnome/help/gtali/C/index.html share/gnome/help/gtali/C/topic.dat +share/gnome/help/gtali/da/index.html +share/gnome/help/gtali/da/topic.dat +share/gnome/help/iagno/C/ANIMATION.png +share/gnome/help/iagno/C/BLOCK.png +share/gnome/help/iagno/C/FIRST.png +share/gnome/help/iagno/C/PLAYER.png +share/gnome/help/iagno/C/START.png +share/gnome/help/iagno/C/animations.html +share/gnome/help/iagno/C/bugs.html +share/gnome/help/iagno/C/credits.html +share/gnome/help/iagno/C/docbook.css +share/gnome/help/iagno/C/index.html +share/gnome/help/iagno/C/license.html +share/gnome/help/iagno/C/ln7.html +share/gnome/help/iagno/C/playing.html +share/gnome/help/iagno/C/settings.html +share/gnome/help/iagno/C/stylesheet-images/caution.png +share/gnome/help/iagno/C/stylesheet-images/important.png +share/gnome/help/iagno/C/stylesheet-images/note.png +share/gnome/help/iagno/C/stylesheet-images/tip.png +share/gnome/help/iagno/C/stylesheet-images/warning.png +share/gnome/help/iagno/C/topic.dat share/gnome/help/samegnome/C/authors.html share/gnome/help/samegnome/C/book1.html share/gnome/help/samegnome/C/bugs.html @@ -147,6 +193,15 @@ share/gnome/help/samegnome/C/index.html share/gnome/help/samegnome/C/ln9.html share/gnome/help/samegnome/C/newthemes.html share/gnome/help/samegnome/C/topic.dat +share/gnome/help/samegnome/ru/authors.html +share/gnome/help/samegnome/ru/book1.html +share/gnome/help/samegnome/ru/bugs.html +share/gnome/help/samegnome/ru/c11.html +share/gnome/help/samegnome/ru/docbook.css +share/gnome/help/samegnome/ru/index.html +share/gnome/help/samegnome/ru/ln9.html +share/gnome/help/samegnome/ru/newthemes.html +share/gnome/help/samegnome/ru/topic.dat share/gnome/mime-info/gnome-stones.keys share/gnome/mime-info/gnome-stones.mime share/gnome/pixmaps/cards/backs/beige.png @@ -240,6 +295,7 @@ share/gnome/pixmaps/gnometris/bg/vortex-bg.png share/gnome/pixmaps/gnometris/bg/weirdo-bg.png share/gnome/pixmaps/gnotravex/gnotravex.png share/gnome/pixmaps/gnotravex/gnome-gnotravex.png +share/gnome/pixmaps/gnotski/gnotski.png share/gnome/pixmaps/iagno.png share/gnome/pixmaps/iagno/blend.png share/gnome/pixmaps/iagno/classic.png @@ -277,6 +333,7 @@ share/gnome/sol-games/hopscotch.scm share/gnome/sol-games/kansas.scm share/gnome/sol-games/klondike.scm share/gnome/sol-games/lady_jane.scm +share/gnome/sol-games/maze.scm share/gnome/sol-games/neighbor.scm share/gnome/sol-games/odessa.scm share/gnome/sol-games/osmosis.scm @@ -313,21 +370,28 @@ share/gnome/sounds/gnobots2/yahoo.wav share/gnome/sounds/iagno/flip-piece.wav share/gnome/sounds/iagno/gameover.wav share/gnome/xbill/cursors/apple.xpm +share/gnome/xbill/cursors/beos.xpm share/gnome/xbill/cursors/bsd.xpm share/gnome/xbill/cursors/bucket.xpm +share/gnome/xbill/cursors/caldera.xpm +share/gnome/xbill/cursors/debian.xpm share/gnome/xbill/cursors/hand_down.xpm share/gnome/xbill/cursors/hand_down_mask.xpm share/gnome/xbill/cursors/hand_up.xpm share/gnome/xbill/cursors/hand_up_mask.xpm share/gnome/xbill/cursors/hurd.xpm share/gnome/xbill/cursors/linux.xpm +share/gnome/xbill/cursors/mandrake.xpm share/gnome/xbill/cursors/next.xpm share/gnome/xbill/cursors/os2.xpm share/gnome/xbill/cursors/redhat.xpm share/gnome/xbill/cursors/sgi.xpm share/gnome/xbill/cursors/sun.xpm +share/gnome/xbill/cursors/suse.xpm +share/gnome/xbill/cursors/turbolinux.xpm share/gnome/xbill/pixmaps/about.xpm share/gnome/xbill/pixmaps/apple.xpm +share/gnome/xbill/pixmaps/beos.xpm share/gnome/xbill/pixmaps/billA_0.xpm share/gnome/xbill/pixmaps/billA_1.xpm share/gnome/xbill/pixmaps/billA_10.xpm @@ -355,11 +419,14 @@ share/gnome/xbill/pixmaps/billR_2.xpm share/gnome/xbill/pixmaps/bsd.xpm share/gnome/xbill/pixmaps/bsdcpu.xpm share/gnome/xbill/pixmaps/bucket.xpm +share/gnome/xbill/pixmaps/caldera.xpm +share/gnome/xbill/pixmaps/debian.xpm share/gnome/xbill/pixmaps/hurd.xpm share/gnome/xbill/pixmaps/icon.xpm share/gnome/xbill/pixmaps/linux.xpm share/gnome/xbill/pixmaps/logo.xpm share/gnome/xbill/pixmaps/maccpu.xpm +share/gnome/xbill/pixmaps/mandrake.xpm share/gnome/xbill/pixmaps/next.xpm share/gnome/xbill/pixmaps/nextcpu.xpm share/gnome/xbill/pixmaps/os2.xpm @@ -371,21 +438,26 @@ share/gnome/xbill/pixmaps/spark_0.xpm share/gnome/xbill/pixmaps/spark_1.xpm share/gnome/xbill/pixmaps/sun.xpm share/gnome/xbill/pixmaps/suncpu.xpm +share/gnome/xbill/pixmaps/suse.xpm share/gnome/xbill/pixmaps/toaster.xpm +share/gnome/xbill/pixmaps/turbolinux.xpm share/gnome/xbill/pixmaps/wingdows.xpm share/locale/cs/LC_MESSAGES/gnome-games.mo share/locale/da/LC_MESSAGES/gnome-games.mo share/locale/de/LC_MESSAGES/gnome-games.mo +share/locale/el/LC_MESSAGES/gnome-games.mo share/locale/en_GB/LC_MESSAGES/gnome-games.mo share/locale/es/LC_MESSAGES/gnome-games.mo share/locale/et/LC_MESSAGES/gnome-games.mo share/locale/fi/LC_MESSAGES/gnome-games.mo share/locale/fr/LC_MESSAGES/gnome-games.mo share/locale/ga/LC_MESSAGES/gnome-games.mo +share/locale/gl/LC_MESSAGES/gnome-games.mo share/locale/hu/LC_MESSAGES/gnome-games.mo share/locale/it/LC_MESSAGES/gnome-games.mo share/locale/ja/LC_MESSAGES/gnome-games.mo share/locale/ko/LC_MESSAGES/gnome-games.mo +share/locale/lt/LC_MESSAGES/gnome-games.mo share/locale/nl/LC_MESSAGES/gnome-games.mo share/locale/no/LC_MESSAGES/gnome-games.mo share/locale/pl/LC_MESSAGES/gnome-games.mo @@ -393,7 +465,9 @@ share/locale/pt/LC_MESSAGES/gnome-games.mo share/locale/pt_BR/LC_MESSAGES/gnome-games.mo share/locale/ru/LC_MESSAGES/gnome-games.mo share/locale/sv/LC_MESSAGES/gnome-games.mo +share/locale/uk/LC_MESSAGES/gnome-games.mo share/locale/wa/LC_MESSAGES/gnome-games.mo +share/locale/zh_CN.GB2312/LC_MESSAGES/gnome-games.mo share/locale/zh_TW.Big5/LC_MESSAGES/gnome-games.mo @dirrm share/gnome/xbill/pixmaps @dirrm share/gnome/xbill/cursors @@ -407,6 +481,7 @@ share/locale/zh_TW.Big5/LC_MESSAGES/gnome-games.mo @dirrm share/gnome/pixmaps/mahjongg/bg @dirrm share/gnome/pixmaps/mahjongg @dirrm share/gnome/pixmaps/iagno +@dirrm share/gnome/pixmaps/gnotski @dirrm share/gnome/pixmaps/gnotravex @dirrm share/gnome/pixmaps/gnometris/bg @dirrm share/gnome/pixmaps/gnometris @@ -424,12 +499,18 @@ share/locale/zh_TW.Big5/LC_MESSAGES/gnome-games.mo @dirrm share/gnome/pixmaps/cards/honors @dirrm share/gnome/pixmaps/cards/backs @dirrm share/gnome/pixmaps/cards +@dirrm share/gnome/help/samegnome/ru @dirrm share/gnome/help/samegnome/C @dirrm share/gnome/help/samegnome +@dirrm share/gnome/help/iagno/C/stylesheet-images +@dirrm share/gnome/help/iagno/C +@dirrm share/gnome/help/iagno +@dirrm share/gnome/help/gtali/da @dirrm share/gnome/help/gtali/C @dirrm share/gnome/help/gtali @dirrm share/gnome/help/gnobots2/it @dirrm share/gnome/help/gnobots2/es +@dirrm share/gnome/help/gnobots2/da @dirrm share/gnome/help/gnobots2/C @dirrm share/gnome/help/gnobots2 @dirrm share/gnome/gturing/examples diff --git a/games/gnomegames2/Makefile b/games/gnomegames2/Makefile index d90a50c..73d2d6c 100644 --- a/games/gnomegames2/Makefile +++ b/games/gnomegames2/Makefile @@ -6,7 +6,7 @@ # PORTNAME= gnomegames -PORTVERSION= 1.0.51 +PORTVERSION= 1.2.0 CATEGORIES= games gnome MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= stable/sources/gnome-games @@ -14,8 +14,7 @@ DISTNAME= gnome-games-${PORTVERSION} MAINTAINER= ade@FreeBSD.org -BUILD_DEPENDS= panel:${PORTSDIR}/x11/gnomecore -RUN_DEPENDS= panel:${PORTSDIR}/x11/gnomecore +LIB_DEPENDS= panel_applet.4:${PORTSDIR}/x11/gnomecore GTK_CONFIG?= ${X11BASE}/bin/gtk12-config @@ -23,8 +22,7 @@ USE_X_PREFIX= yes USE_GMAKE= yes USE_LIBTOOL= yes CONFIGURE_ARGS= --localstatedir=${PREFIX}/share/gnome \ - --datadir=${PREFIX}/share/gnome \ - --with-gnome=${PREFIX} + --datadir=${PREFIX}/share/gnome CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ GTK_CONFIG="${GTK_CONFIG}" \ LIBS="-L${LOCALBASE}/lib" diff --git a/games/gnomegames2/distinfo b/games/gnomegames2/distinfo index f7a4a06..7c72f30 100644 --- a/games/gnomegames2/distinfo +++ b/games/gnomegames2/distinfo @@ -1 +1 @@ -MD5 (gnome-games-1.0.51.tar.gz) = 81c3a9c749d8574e3fbc6cc8e3c195f9 +MD5 (gnome-games-1.2.0.tar.gz) = 681f8c880daa8e4e4a264039e6e8cb3c diff --git a/games/gnomegames2/files/patch-ab b/games/gnomegames2/files/patch-ab index b36831e..9b356b0 100644 --- a/games/gnomegames2/files/patch-ab +++ b/games/gnomegames2/files/patch-ab @@ -123,6 +123,13 @@ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = ../../../config.h CONFIG_CLEAN_FILES = +--- gnobots2/help/da/Makefile.in.orig Sun May 21 23:51:03 2000 ++++ gnobots2/help/da/Makefile.in Tue May 30 17:11:59 2000 +@@ -131,3 +131,3 @@ + +-gnobots2_helpdir = $(datadir)/gnome/help/gnobots2/da ++gnobots2_helpdir = $(datadir)/help/gnobots2/da + mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs --- gnobots2/help/es/Makefile.in.orig Sun Sep 26 13:29:04 1999 +++ gnobots2/help/es/Makefile.in Mon Sep 27 09:34:44 1999 @@ -128,7 +128,7 @@ @@ -198,15 +205,16 @@ libgnomekoban_la_LIBADD = libgnomekoban_la_OBJECTS = gnomekoban.lo COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) ---- gnometris/Makefile.in.orig Sun Sep 26 13:29:31 1999 -+++ gnometris/Makefile.in Mon Sep 27 09:36:59 1999 -@@ -127,9 +127,9 @@ +--- gnometris/Makefile.in.orig Sun May 21 23:51:13 2000 ++++ gnometris/Makefile.in Tue May 30 16:14:41 2000 +@@ -127,10 +127,10 @@ SUBDIRS = pix scoredir = $(localstatedir)/games -Gamesdir = $(datadir)/gnome/apps/Games +Gamesdir = $(datadir)/apps/Games + CPPFLAGS = -pedantic -Wall -INCLUDES = -DGNOMELOCALEDIR=\""$(datadir)/locale"\" $(GNOME_INCLUDEDIR) +INCLUDES = -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" $(GNOME_INCLUDEDIR) @@ -222,7 +230,7 @@ +Gamesdir = $(datadir)/apps/Games -INCLUDES = -DGNOMELOCALEDIR=\""$(datadir)/locale"\" -I$(includedir) $(GNOME_INCLUDEDIR) -+INCLUDES = -DGNOMELOCALEDIR=\""$(prefix)/locale"\" -I$(includedir) $(GNOME_INCLUDEDIR) ++INCLUDES = -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" -I$(includedir) $(GNOME_INCLUDEDIR) bin_PROGRAMS = gnomine @@ -240,6 +248,20 @@ bin_PROGRAMS = gnotravex +--- gnotski/Makefile.in.orig Sun May 21 23:51:10 2000 ++++ gnotski/Makefile.in Tue May 30 16:46:09 2000 +@@ -128,9 +128,9 @@ + + scoredir = $(localstatedir)/games + pixmapdir = $(datadir)/pixmaps/gnotski +-Gamesdir = $(datadir)/gnome/apps/Games ++Gamesdir = $(datadir)/apps/Games + +-INCLUDES = -DGNOMELOCALEDIR=\""$(datadir)/locale"\" -I$(includedir) $(GNOME_INCLUDEDIR) ++INCLUDES = -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" -I$(includedir) $(GNOME_INCLUDEDIR) + + + bin_PROGRAMS = gnotski --- gtali/Makefile.in.orig Sun Sep 26 13:28:57 1999 +++ gtali/Makefile.in Mon Sep 27 09:44:54 1999 @@ -125,12 +125,12 @@ @@ -268,6 +290,13 @@ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = ../../../config.h CONFIG_CLEAN_FILES = +--- gtali/help/da/Makefile.in.orig Sun May 21 23:50:59 2000 ++++ gtali/help/da/Makefile.in Tue May 30 17:12:32 2000 +@@ -131,3 +131,3 @@ + +-gtali_helpdir = $(datadir)/gnome/help/gtali/da ++gtali_helpdir = $(datadir)/help/gtali/da + mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs --- gturing/Makefile.in.orig Sun Sep 26 13:28:54 1999 +++ gturing/Makefile.in Mon Sep 27 09:37:08 1999 @@ -125,12 +125,12 @@ @@ -312,6 +341,13 @@ bin_PROGRAMS = iagno +--- iagno/help/C/Makefile.in.orig Sun May 21 23:51:06 2000 ++++ iagno/help/C/Makefile.in Tue May 30 17:13:41 2000 +@@ -128,3 +128,3 @@ + +-iagno_helpdir = $(datadir)/gnome/help/iagno/C ++iagno_helpdir = $(datadir)/help/iagno/C + --- mahjongg/Makefile.in.orig Sun Sep 26 13:28:53 1999 +++ mahjongg/Makefile.in Mon Sep 27 09:46:10 1999 @@ -128,10 +128,10 @@ @@ -353,6 +389,13 @@ +same_gnome_helpdir = $(datadir)/help/samegnome/C same_gnome_help_DATA = index.html topic.dat + +--- same-gnome/help/ru/Makefile.in.orig Sun May 21 23:50:51 2000 ++++ same-gnome/help/ru/Makefile.in Tue May 30 17:13:02 2000 +@@ -128,3 +128,3 @@ + +-same_gnome_helpdir = $(datadir)/gnome/help/samegnome/ru ++same_gnome_helpdir = $(datadir)/help/samegnome/ru --- scottfree/Makefile.in.orig Sun Sep 26 13:28:52 1999 +++ scottfree/Makefile.in Mon Sep 27 09:52:29 1999 @@ -365,9 +408,18 @@ bin_PROGRAMS = GnomeScott ---- xbill/Makefile.in.orig Sun Sep 26 13:29:33 1999 -+++ xbill/Makefile.in Mon Sep 27 09:53:11 1999 -@@ -143,7 +143,7 @@ +--- xbill/Makefile.in.orig Sun May 21 23:51:14 2000 ++++ xbill/Makefile.in Tue May 30 16:30:13 2000 +@@ -131,7 +131,7 @@ + # This is where the high score file goes ... + scoredir = $(localstatedir)/games + +-INCLUDES = $(GNOME_INCLUDEDIR) -DGNOMELOCALDIR=\""$(datadir)/local"\" ++INCLUDES = $(GNOME_INCLUDEDIR) -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" + bin_PROGRAMS = gnome-xbill + + gnome_xbill_SOURCES = Bucket.cc Bucket.h Cable.cc Cable.h Computer.cc Computer.h Game.cc Game.h Horde.cc Horde.h Library.cc Library.h MCursor.cc MCursor.h Monster.cc Monster.h Network.cc Network.h Picture.cc Picture.h Spark.cc Spark.h Strings.h UI.cc UI.h objects.h x11-gtk.cc x11.h +@@ -144,7 +144,7 @@ pixmapdir = $(datadir)/pixmaps pixmap_DATA = xbill.png diff --git a/games/gnomegames2/pkg-plist b/games/gnomegames2/pkg-plist index 4af7937..90ffe83 100644 --- a/games/gnomegames2/pkg-plist +++ b/games/gnomegames2/pkg-plist @@ -10,6 +10,7 @@ bin/gnome-xbill bin/gnometris bin/gnomine bin/gnotravex +bin/gnotski bin/gtali bin/gturing bin/iagno @@ -35,6 +36,7 @@ share/gnome/apps/Games/gnome-stones.desktop share/gnome/apps/Games/gnometris.desktop share/gnome/apps/Games/gnomine.desktop share/gnome/apps/Games/gnotravex.desktop +share/gnome/apps/Games/gnotski.desktop share/gnome/apps/Games/gtali.desktop share/gnome/apps/Games/gturing.desktop share/gnome/apps/Games/iagno.desktop @@ -73,6 +75,26 @@ share/gnome/games/gnotravex.3x3.scores share/gnome/games/gnotravex.4x4.scores share/gnome/games/gnotravex.5x5.scores share/gnome/games/gnotravex.6x6.scores +share/gnome/games/gnotski.1.scores +share/gnome/games/gnotski.11.scores +share/gnome/games/gnotski.12.scores +share/gnome/games/gnotski.13.scores +share/gnome/games/gnotski.14.scores +share/gnome/games/gnotski.15.scores +share/gnome/games/gnotski.16.scores +share/gnome/games/gnotski.17.scores +share/gnome/games/gnotski.2.scores +share/gnome/games/gnotski.21.scores +share/gnome/games/gnotski.22.scores +share/gnome/games/gnotski.23.scores +share/gnome/games/gnotski.24.scores +share/gnome/games/gnotski.25.scores +share/gnome/games/gnotski.26.scores +share/gnome/games/gnotski.3.scores +share/gnome/games/gnotski.4.scores +share/gnome/games/gnotski.5.scores +share/gnome/games/gnotski.6.scores +share/gnome/games/gnotski.7.scores share/gnome/games/gtali.scores share/gnome/games/iagno.b1.scores share/gnome/games/iagno.b2.scores @@ -132,12 +154,36 @@ share/gnome/gturing/examples/dec2bin.tur share/gnome/gturing/examples/subst.tur share/gnome/help/gnobots2/C/index.html share/gnome/help/gnobots2/C/topic.dat +share/gnome/help/gnobots2/da/index.html +share/gnome/help/gnobots2/da/topic.dat share/gnome/help/gnobots2/es/index.html share/gnome/help/gnobots2/es/topic.dat share/gnome/help/gnobots2/it/index.html share/gnome/help/gnobots2/it/topic.dat share/gnome/help/gtali/C/index.html share/gnome/help/gtali/C/topic.dat +share/gnome/help/gtali/da/index.html +share/gnome/help/gtali/da/topic.dat +share/gnome/help/iagno/C/ANIMATION.png +share/gnome/help/iagno/C/BLOCK.png +share/gnome/help/iagno/C/FIRST.png +share/gnome/help/iagno/C/PLAYER.png +share/gnome/help/iagno/C/START.png +share/gnome/help/iagno/C/animations.html +share/gnome/help/iagno/C/bugs.html +share/gnome/help/iagno/C/credits.html +share/gnome/help/iagno/C/docbook.css +share/gnome/help/iagno/C/index.html +share/gnome/help/iagno/C/license.html +share/gnome/help/iagno/C/ln7.html +share/gnome/help/iagno/C/playing.html +share/gnome/help/iagno/C/settings.html +share/gnome/help/iagno/C/stylesheet-images/caution.png +share/gnome/help/iagno/C/stylesheet-images/important.png +share/gnome/help/iagno/C/stylesheet-images/note.png +share/gnome/help/iagno/C/stylesheet-images/tip.png +share/gnome/help/iagno/C/stylesheet-images/warning.png +share/gnome/help/iagno/C/topic.dat share/gnome/help/samegnome/C/authors.html share/gnome/help/samegnome/C/book1.html share/gnome/help/samegnome/C/bugs.html @@ -147,6 +193,15 @@ share/gnome/help/samegnome/C/index.html share/gnome/help/samegnome/C/ln9.html share/gnome/help/samegnome/C/newthemes.html share/gnome/help/samegnome/C/topic.dat +share/gnome/help/samegnome/ru/authors.html +share/gnome/help/samegnome/ru/book1.html +share/gnome/help/samegnome/ru/bugs.html +share/gnome/help/samegnome/ru/c11.html +share/gnome/help/samegnome/ru/docbook.css +share/gnome/help/samegnome/ru/index.html +share/gnome/help/samegnome/ru/ln9.html +share/gnome/help/samegnome/ru/newthemes.html +share/gnome/help/samegnome/ru/topic.dat share/gnome/mime-info/gnome-stones.keys share/gnome/mime-info/gnome-stones.mime share/gnome/pixmaps/cards/backs/beige.png @@ -240,6 +295,7 @@ share/gnome/pixmaps/gnometris/bg/vortex-bg.png share/gnome/pixmaps/gnometris/bg/weirdo-bg.png share/gnome/pixmaps/gnotravex/gnotravex.png share/gnome/pixmaps/gnotravex/gnome-gnotravex.png +share/gnome/pixmaps/gnotski/gnotski.png share/gnome/pixmaps/iagno.png share/gnome/pixmaps/iagno/blend.png share/gnome/pixmaps/iagno/classic.png @@ -277,6 +333,7 @@ share/gnome/sol-games/hopscotch.scm share/gnome/sol-games/kansas.scm share/gnome/sol-games/klondike.scm share/gnome/sol-games/lady_jane.scm +share/gnome/sol-games/maze.scm share/gnome/sol-games/neighbor.scm share/gnome/sol-games/odessa.scm share/gnome/sol-games/osmosis.scm @@ -313,21 +370,28 @@ share/gnome/sounds/gnobots2/yahoo.wav share/gnome/sounds/iagno/flip-piece.wav share/gnome/sounds/iagno/gameover.wav share/gnome/xbill/cursors/apple.xpm +share/gnome/xbill/cursors/beos.xpm share/gnome/xbill/cursors/bsd.xpm share/gnome/xbill/cursors/bucket.xpm +share/gnome/xbill/cursors/caldera.xpm +share/gnome/xbill/cursors/debian.xpm share/gnome/xbill/cursors/hand_down.xpm share/gnome/xbill/cursors/hand_down_mask.xpm share/gnome/xbill/cursors/hand_up.xpm share/gnome/xbill/cursors/hand_up_mask.xpm share/gnome/xbill/cursors/hurd.xpm share/gnome/xbill/cursors/linux.xpm +share/gnome/xbill/cursors/mandrake.xpm share/gnome/xbill/cursors/next.xpm share/gnome/xbill/cursors/os2.xpm share/gnome/xbill/cursors/redhat.xpm share/gnome/xbill/cursors/sgi.xpm share/gnome/xbill/cursors/sun.xpm +share/gnome/xbill/cursors/suse.xpm +share/gnome/xbill/cursors/turbolinux.xpm share/gnome/xbill/pixmaps/about.xpm share/gnome/xbill/pixmaps/apple.xpm +share/gnome/xbill/pixmaps/beos.xpm share/gnome/xbill/pixmaps/billA_0.xpm share/gnome/xbill/pixmaps/billA_1.xpm share/gnome/xbill/pixmaps/billA_10.xpm @@ -355,11 +419,14 @@ share/gnome/xbill/pixmaps/billR_2.xpm share/gnome/xbill/pixmaps/bsd.xpm share/gnome/xbill/pixmaps/bsdcpu.xpm share/gnome/xbill/pixmaps/bucket.xpm +share/gnome/xbill/pixmaps/caldera.xpm +share/gnome/xbill/pixmaps/debian.xpm share/gnome/xbill/pixmaps/hurd.xpm share/gnome/xbill/pixmaps/icon.xpm share/gnome/xbill/pixmaps/linux.xpm share/gnome/xbill/pixmaps/logo.xpm share/gnome/xbill/pixmaps/maccpu.xpm +share/gnome/xbill/pixmaps/mandrake.xpm share/gnome/xbill/pixmaps/next.xpm share/gnome/xbill/pixmaps/nextcpu.xpm share/gnome/xbill/pixmaps/os2.xpm @@ -371,21 +438,26 @@ share/gnome/xbill/pixmaps/spark_0.xpm share/gnome/xbill/pixmaps/spark_1.xpm share/gnome/xbill/pixmaps/sun.xpm share/gnome/xbill/pixmaps/suncpu.xpm +share/gnome/xbill/pixmaps/suse.xpm share/gnome/xbill/pixmaps/toaster.xpm +share/gnome/xbill/pixmaps/turbolinux.xpm share/gnome/xbill/pixmaps/wingdows.xpm share/locale/cs/LC_MESSAGES/gnome-games.mo share/locale/da/LC_MESSAGES/gnome-games.mo share/locale/de/LC_MESSAGES/gnome-games.mo +share/locale/el/LC_MESSAGES/gnome-games.mo share/locale/en_GB/LC_MESSAGES/gnome-games.mo share/locale/es/LC_MESSAGES/gnome-games.mo share/locale/et/LC_MESSAGES/gnome-games.mo share/locale/fi/LC_MESSAGES/gnome-games.mo share/locale/fr/LC_MESSAGES/gnome-games.mo share/locale/ga/LC_MESSAGES/gnome-games.mo +share/locale/gl/LC_MESSAGES/gnome-games.mo share/locale/hu/LC_MESSAGES/gnome-games.mo share/locale/it/LC_MESSAGES/gnome-games.mo share/locale/ja/LC_MESSAGES/gnome-games.mo share/locale/ko/LC_MESSAGES/gnome-games.mo +share/locale/lt/LC_MESSAGES/gnome-games.mo share/locale/nl/LC_MESSAGES/gnome-games.mo share/locale/no/LC_MESSAGES/gnome-games.mo share/locale/pl/LC_MESSAGES/gnome-games.mo @@ -393,7 +465,9 @@ share/locale/pt/LC_MESSAGES/gnome-games.mo share/locale/pt_BR/LC_MESSAGES/gnome-games.mo share/locale/ru/LC_MESSAGES/gnome-games.mo share/locale/sv/LC_MESSAGES/gnome-games.mo +share/locale/uk/LC_MESSAGES/gnome-games.mo share/locale/wa/LC_MESSAGES/gnome-games.mo +share/locale/zh_CN.GB2312/LC_MESSAGES/gnome-games.mo share/locale/zh_TW.Big5/LC_MESSAGES/gnome-games.mo @dirrm share/gnome/xbill/pixmaps @dirrm share/gnome/xbill/cursors @@ -407,6 +481,7 @@ share/locale/zh_TW.Big5/LC_MESSAGES/gnome-games.mo @dirrm share/gnome/pixmaps/mahjongg/bg @dirrm share/gnome/pixmaps/mahjongg @dirrm share/gnome/pixmaps/iagno +@dirrm share/gnome/pixmaps/gnotski @dirrm share/gnome/pixmaps/gnotravex @dirrm share/gnome/pixmaps/gnometris/bg @dirrm share/gnome/pixmaps/gnometris @@ -424,12 +499,18 @@ share/locale/zh_TW.Big5/LC_MESSAGES/gnome-games.mo @dirrm share/gnome/pixmaps/cards/honors @dirrm share/gnome/pixmaps/cards/backs @dirrm share/gnome/pixmaps/cards +@dirrm share/gnome/help/samegnome/ru @dirrm share/gnome/help/samegnome/C @dirrm share/gnome/help/samegnome +@dirrm share/gnome/help/iagno/C/stylesheet-images +@dirrm share/gnome/help/iagno/C +@dirrm share/gnome/help/iagno +@dirrm share/gnome/help/gtali/da @dirrm share/gnome/help/gtali/C @dirrm share/gnome/help/gtali @dirrm share/gnome/help/gnobots2/it @dirrm share/gnome/help/gnobots2/es +@dirrm share/gnome/help/gnobots2/da @dirrm share/gnome/help/gnobots2/C @dirrm share/gnome/help/gnobots2 @dirrm share/gnome/gturing/examples diff --git a/graphics/electriceyes/Makefile b/graphics/electriceyes/Makefile index 9c49f8b..467267f 100644 --- a/graphics/electriceyes/Makefile +++ b/graphics/electriceyes/Makefile @@ -14,8 +14,7 @@ DISTNAME= ee-${PORTVERSION} MAINTAINER= ade@FreeBSD.org -BUILD_DEPENDS= panel:${PORTSDIR}/x11/gnomecore -RUN_DEPENDS= panel:${PORTSDIR}/x11/gnomecore +LIB_DEPENDS= panel_applet.4:${PORTSDIR}/x11/gnomecore GTK_CONFIG?= ${X11BASE}/bin/gtk12-config @@ -23,8 +22,7 @@ USE_X_PREFIX= yes GNU_CONFIGURE= yes USE_GMAKE= yes CONFIGURE_ARGS= --localstatedir=${PREFIX}/share/gnome \ - --datadir=${PREFIX}/share/gnome \ - --with-gnome=${PREFIX} + --datadir=${PREFIX}/share/gnome CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ GTK_CONFIG="${GTK_CONFIG}" \ LIBS="-L${LOCALBASE}/lib" diff --git a/graphics/gdk-pixbuf/Makefile b/graphics/gdk-pixbuf/Makefile index 67ff6aa..273579a 100644 --- a/graphics/gdk-pixbuf/Makefile +++ b/graphics/gdk-pixbuf/Makefile @@ -13,7 +13,7 @@ MASTER_SITE_SUBDIR= unstable/sources/gdk-pixbuf MAINTAINER= ade@FreeBSD.org -LIB_DEPENDS= gnome.3:${PORTSDIR}/x11/gnomelibs +LIB_DEPENDS= gnome.4:${PORTSDIR}/x11/gnomelibs GLIB_CONFIG?= ${LOCALBASE}/bin/glib12-config GTK_CONFIG?= ${X11BASE}/bin/gtk12-config diff --git a/graphics/gdk-pixbuf/pkg-plist b/graphics/gdk-pixbuf/pkg-plist index fced2cb..58c9c8f 100644 --- a/graphics/gdk-pixbuf/pkg-plist +++ b/graphics/gdk-pixbuf/pkg-plist @@ -38,6 +38,8 @@ lib/libgdk_pixbuf.so.2 lib/libgnomecanvaspixbuf.a lib/libgnomecanvaspixbuf.so lib/libgnomecanvaspixbuf.so.1 +@unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R +@exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %B share/aclocal/gdk-pixbuf.m4 share/gnome/html/gdk-pixbuf-decl.txt share/gnome/html/gdk-pixbuf-sections.txt @@ -60,8 +62,6 @@ share/gnome/html/gdk-pixbuf/gdkpixbufloader.html share/gnome/html/gdk-pixbuf/gnomecanvaspixbuf.html share/gnome/html/gdk-pixbuf/r14.html share/gnome/html/gdk-pixbuf/r15.html -@unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R -@exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %B @dirrm share/gnome/html/gdk-pixbuf @dirrm share/gnome/html @dirrm include/gdk-pixbuf diff --git a/graphics/imlib/Makefile b/graphics/imlib/Makefile index f385ee0..61b842e 100644 --- a/graphics/imlib/Makefile +++ b/graphics/imlib/Makefile @@ -6,9 +6,10 @@ # PORTNAME= imlib -PORTVERSION= 1.9.8 +PORTVERSION= 1.9.8.1 CATEGORIES= graphics -MASTER_SITES= ftp://ftp.enlightenment.org/enlightenment/enlightenment/libs/ +MASTER_SITES= ${MASTER_SITE_GNOME} +MASTER_SITE_SUBDIR= stable/sources/imlib MAINTAINER= vanilla@FreeBSD.org @@ -16,6 +17,7 @@ LIB_DEPENDS= png.3:${PORTSDIR}/graphics/png \ tiff.4:${PORTSDIR}/graphics/tiff \ ungif.5:${PORTSDIR}/graphics/libungif \ gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 +BUILD_DEPENDS= convert:${PORTSDIR}/graphics/ImageMagick GLIB_CONFIG?= ${LOCALBASE}/bin/glib12-config GTK_CONFIG?= ${X11BASE}/bin/gtk12-config diff --git a/graphics/imlib/distinfo b/graphics/imlib/distinfo index 3cf753b..9f05597 100644 --- a/graphics/imlib/distinfo +++ b/graphics/imlib/distinfo @@ -1 +1 @@ -MD5 (imlib-1.9.8.tar.gz) = b6a8034777554bc5287b367301c25635 +MD5 (imlib-1.9.8.1.tar.gz) = 224948ee96653990cd96daec090a5599 diff --git a/graphics/imlib2-tmp/Makefile b/graphics/imlib2-tmp/Makefile index f385ee0..61b842e 100644 --- a/graphics/imlib2-tmp/Makefile +++ b/graphics/imlib2-tmp/Makefile @@ -6,9 +6,10 @@ # PORTNAME= imlib -PORTVERSION= 1.9.8 +PORTVERSION= 1.9.8.1 CATEGORIES= graphics -MASTER_SITES= ftp://ftp.enlightenment.org/enlightenment/enlightenment/libs/ +MASTER_SITES= ${MASTER_SITE_GNOME} +MASTER_SITE_SUBDIR= stable/sources/imlib MAINTAINER= vanilla@FreeBSD.org @@ -16,6 +17,7 @@ LIB_DEPENDS= png.3:${PORTSDIR}/graphics/png \ tiff.4:${PORTSDIR}/graphics/tiff \ ungif.5:${PORTSDIR}/graphics/libungif \ gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 +BUILD_DEPENDS= convert:${PORTSDIR}/graphics/ImageMagick GLIB_CONFIG?= ${LOCALBASE}/bin/glib12-config GTK_CONFIG?= ${X11BASE}/bin/gtk12-config diff --git a/graphics/imlib2-tmp/distinfo b/graphics/imlib2-tmp/distinfo index 3cf753b..9f05597 100644 --- a/graphics/imlib2-tmp/distinfo +++ b/graphics/imlib2-tmp/distinfo @@ -1 +1 @@ -MD5 (imlib-1.9.8.tar.gz) = b6a8034777554bc5287b367301c25635 +MD5 (imlib-1.9.8.1.tar.gz) = 224948ee96653990cd96daec090a5599 diff --git a/graphics/imlib2/Makefile b/graphics/imlib2/Makefile index f385ee0..61b842e 100644 --- a/graphics/imlib2/Makefile +++ b/graphics/imlib2/Makefile @@ -6,9 +6,10 @@ # PORTNAME= imlib -PORTVERSION= 1.9.8 +PORTVERSION= 1.9.8.1 CATEGORIES= graphics -MASTER_SITES= ftp://ftp.enlightenment.org/enlightenment/enlightenment/libs/ +MASTER_SITES= ${MASTER_SITE_GNOME} +MASTER_SITE_SUBDIR= stable/sources/imlib MAINTAINER= vanilla@FreeBSD.org @@ -16,6 +17,7 @@ LIB_DEPENDS= png.3:${PORTSDIR}/graphics/png \ tiff.4:${PORTSDIR}/graphics/tiff \ ungif.5:${PORTSDIR}/graphics/libungif \ gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 +BUILD_DEPENDS= convert:${PORTSDIR}/graphics/ImageMagick GLIB_CONFIG?= ${LOCALBASE}/bin/glib12-config GTK_CONFIG?= ${X11BASE}/bin/gtk12-config diff --git a/graphics/imlib2/distinfo b/graphics/imlib2/distinfo index 3cf753b..9f05597 100644 --- a/graphics/imlib2/distinfo +++ b/graphics/imlib2/distinfo @@ -1 +1 @@ -MD5 (imlib-1.9.8.tar.gz) = b6a8034777554bc5287b367301c25635 +MD5 (imlib-1.9.8.1.tar.gz) = 224948ee96653990cd96daec090a5599 diff --git a/misc/gnomeusersguide/Makefile b/misc/gnomeusersguide/Makefile index 0f044ba..797b105 100644 --- a/misc/gnomeusersguide/Makefile +++ b/misc/gnomeusersguide/Makefile @@ -6,11 +6,11 @@ # PORTNAME= gnomeusersguide -PORTVERSION= 1.1.9 +PORTVERSION= 1.2 CATEGORIES= misc gnome MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= stable/sources/users-guide -DISTNAME= users-guide-1.1-9 +DISTNAME= users-guide-${PORTVERSION} MAINTAINER= ade@FreeBSD.org diff --git a/misc/gnomeusersguide/distinfo b/misc/gnomeusersguide/distinfo index 5d63505..116d5a7 100644 --- a/misc/gnomeusersguide/distinfo +++ b/misc/gnomeusersguide/distinfo @@ -1 +1 @@ -MD5 (users-guide-1.1-9.tar.gz) = 1dddc33bb4618f4e13c3c49e2842fc23 +MD5 (users-guide-1.2.tar.gz) = 824cdcdbdf1f1647f942ae648b60d1f3 diff --git a/misc/gnomeutils/Makefile b/misc/gnomeutils/Makefile index 2480f0f..5e7764e 100644 --- a/misc/gnomeutils/Makefile +++ b/misc/gnomeutils/Makefile @@ -6,7 +6,7 @@ # PORTNAME= gnomeutils -PORTVERSION= 1.0.51 +PORTVERSION= 1.2.0 CATEGORIES= misc gnome MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= stable/sources/gnome-utils @@ -14,9 +14,7 @@ DISTNAME= gnome-utils-${PORTVERSION} MAINTAINER= ade@FreeBSD.org -BUILD_DEPENDS= panel:${PORTSDIR}/x11/gnomecore -RUN_DEPENDS= panel:${PORTSDIR}/x11/gnomecore -LIB_DEPENDS= obgnome.1:${PORTSDIR}/lang/gnomeobjc +LIB_DEPENDS= panel_applet.4:${PORTSDIR}/x11/gnomecore GTK_CONFIG?= ${X11BASE}/bin/gtk12-config @@ -24,12 +22,9 @@ USE_X_PREFIX= yes USE_GMAKE= yes USE_LIBTOOL= yes CONFIGURE_ARGS= --localstatedir=${PREFIX}/share/gnome \ - --datadir=${PREFIX}/share/gnome \ - --with-gnome=${PREFIX} + --datadir=${PREFIX}/share/gnome CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ GTK_CONFIG="${GTK_CONFIG}" \ LIBS="-L${LOCALBASE}/lib" -MAN1= gtt.1 - .include <bsd.port.mk> diff --git a/misc/gnomeutils/distinfo b/misc/gnomeutils/distinfo index a37fd50..698b6b5 100644 --- a/misc/gnomeutils/distinfo +++ b/misc/gnomeutils/distinfo @@ -1 +1 @@ -MD5 (gnome-utils-1.0.51.tar.gz) = 0de69cb5eaaf81bea3a98cc48e0266c6 +MD5 (gnome-utils-1.2.0.tar.gz) = ffee2281337d29b149612dc186299773 diff --git a/misc/gnomeutils/files/patch-aa b/misc/gnomeutils/files/patch-aa index a8dc692..149087c 100644 --- a/misc/gnomeutils/files/patch-aa +++ b/misc/gnomeutils/files/patch-aa @@ -1,24 +1,6 @@ ---- configure.orig Wed Mar 8 09:07:49 2000 -+++ configure Sat Mar 11 15:35:52 2000 -@@ -2480,7 +2480,7 @@ - fi - if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 -- PTHREAD_LIB="-lc_r" -+ PTHREAD_LIB="" - else - echo "$ac_t""no" 1>&6 - echo $ac_n "checking for pthread_create""... $ac_c" 1>&6 -@@ -3277,7 +3277,7 @@ - - echo $ac_n "checking for an obGnomeConf.sh""... $ac_c" 1>&6 - echo "configure:3280: checking for an obGnomeConf.sh" >&5 -- my_gnome_libdir=`$GNOME_CONFIG --libdir` -+ my_gnome_libdir=`$GNOME_CONFIG --sysconfdir` - if test -f $my_gnome_libdir/obGnomeConf.sh; then - . $my_gnome_libdir/obGnomeConf.sh - echo "$ac_t""found $my_gnome_libdir" 1>&6 -@@ -5531,7 +5531,7 @@ +--- configure.orig Fri May 19 14:49:06 2000 ++++ configure Tue May 30 13:31:24 2000 +@@ -5101,7 +5101,7 @@ cat conftest.$ac_ext >&5 rm -rf conftest* CATOBJEXT=.mo @@ -27,3 +9,32 @@ fi rm -f conftest* INSTOBJEXT=.mo +@@ -6350,17 +6350,13 @@ + if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then + echo "$ac_t""yes" 1>&6 + build_gfloppy=true ++ subdirs="gfloppy" + else ++ build_gfloppy=false + echo "$ac_t""no" 1>&6 + echo "configure: warning: *** gfloppy will not be built." 1>&2 + fi + +-if $build_gfloppy; then +- subdirs="gfloppy" +- +-fi +- +- + if test "$build_gfloppy" = true; then + BUILD_GFLOPPY_TRUE= + BUILD_GFLOPPY_FALSE='#' +@@ -8453,7 +8449,7 @@ + esac + done + +- for ac_config_dir in gfloppy; do ++ for ac_config_dir in $subdirs ; do + + # Do not complain, so a configure script can configure whichever + # parts of a large source tree are present. diff --git a/misc/gnomeutils/files/patch-ah b/misc/gnomeutils/files/patch-ah new file mode 100644 index 0000000..ba467be --- /dev/null +++ b/misc/gnomeutils/files/patch-ah @@ -0,0 +1,48 @@ +--- logview/actions.c.orig Wed Apr 26 22:32:02 2000 ++++ logview/actions.c Tue May 30 13:34:05 2000 +@@ -1,6 +1,7 @@ + #include "logview.h" + #include <string.h> + #include <stdlib.h> ++#include <sys/types.h> + #include <regex.h> + #include <config.h> + #include <gnome.h> +--- logview/desc_db.c.orig Wed Apr 26 22:32:02 2000 ++++ logview/desc_db.c Tue May 30 13:34:36 2000 +@@ -1,5 +1,6 @@ + #include "logview.h" + #include <string.h> ++#include <sys/types.h> + #include <regex.h> + #include <stdlib.h> + +--- logview/logrtns.c.orig Tue May 30 13:35:22 2000 ++++ logview/logrtns.c Tue May 30 13:37:45 2000 +@@ -679,7 +679,7 @@ + if (IsLeapYear (curmark->year - lastyear + thisyear)) + curmark->time += 24 * 60 * 60; /* Add one day */ + +-#ifdef __NetBSD__ ++#if defined(__NetBSD__) || defined(__FreeBSD__) + curmark->time += correction - tmptm->tm_gmtoff; + #else + curmark->time += correction - timezone; +@@ -705,7 +705,7 @@ + if (IsLeapYear (thisyear)) + log->lstats.enddate += 24 * 60 * 60; /* Add one day */ + +-#ifdef __NetBSD__ ++#if defined(__NetBSD__) || defined(__FreeBSD__) + log->lstats.enddate += correction - tmptm->tm_gmtoff; + #else + log->lstats.enddate += correction - timezone; +@@ -716,7 +716,7 @@ + if (IsLeapYear (thisyear - lastyear)) + log->lstats.startdate += 24 * 60 * 60; /* Add one day */ + +-#ifdef __NetBSD__ ++#if defined(__NetBSD__) || defined(__FreeBSD__) + log->lstats.startdate += correction - tmptm->tm_gmtoff; + #else + log->lstats.startdate += correction - timezone; diff --git a/misc/gnomeutils/pkg-plist b/misc/gnomeutils/pkg-plist index 2b731a2..7781bd5 100644 --- a/misc/gnomeutils/pkg-plist +++ b/misc/gnomeutils/pkg-plist @@ -1,49 +1,122 @@ bin/gcalc +bin/gcharmap bin/gcolorsel bin/gdialog +bin/gdict bin/gdiskfree bin/gfontsel bin/gless -bin/gnome-run -bin/grun bin/gsearchtool bin/gshutdown bin/gstripchart bin/gstripchart_applet bin/gtt +bin/guname bin/gw +bin/logview bin/splac bin/splash +etc/CORBA/servers/gdict.gnorba etc/CORBA/servers/gstripchart_applet.gnorba share/gnome/applets/Monitors/gstripchart_applet.desktop +share/gnome/applets/Utility/gdict.desktop share/gnome/apps/Applications/gtt.desktop +share/gnome/apps/System/gdiskfree.desktop share/gnome/apps/System/gshutdown.desktop +share/gnome/apps/System/guname.desktop +share/gnome/apps/System/gw.desktop +share/gnome/apps/System/logview.desktop +share/gnome/apps/Utilities/GDict.desktop share/gnome/apps/Utilities/gcalc.desktop +share/gnome/apps/Utilities/gcharmap.desktop share/gnome/apps/Utilities/gcolorsel.desktop -share/gnome/apps/Utilities/gdiskfree.desktop share/gnome/apps/Utilities/gfontsel.desktop share/gnome/apps/Utilities/gless.desktop share/gnome/apps/Utilities/gsearchtool.desktop share/gnome/apps/Utilities/gstripchart.desktop -share/gnome/apps/Utilities/gw.desktop -share/gnome/apps/gnome-run.desktop +share/gnome/gcolorsel/glade/dialog-new-doc.glade +share/gnome/gcolorsel/glade/dialog-new-doc.glade.h +share/gnome/gcolorsel/glade/dialog-new-view.glade +share/gnome/gcolorsel/glade/dialog-new-view.glade.h +share/gnome/gcolorsel/glade/dialog-prefs.glade +share/gnome/gcolorsel/glade/dialog-prefs.glade.h +share/gnome/gcolorsel/glade/mdi-color-file-properties.glade +share/gnome/gcolorsel/glade/mdi-color-file-properties.glade.h +share/gnome/gcolorsel/glade/mdi-color-generic-properties.glade +share/gnome/gcolorsel/glade/mdi-color-generic-properties.glade.h +share/gnome/gcolorsel/glade/view-color-edit.glade +share/gnome/gcolorsel/glade/view-color-edit.glade.h +share/gnome/gcolorsel/glade/view-color-generic-properties.glade +share/gnome/gcolorsel/glade/view-color-generic-properties.glade.h +share/gnome/gcolorsel/glade/view-color-grid-properties.glade +share/gnome/gcolorsel/glade/view-color-grid-properties.glade.h +share/gnome/gcolorsel/glade/view-color-list-properties.glade +share/gnome/gcolorsel/glade/view-color-list-properties.glade.h share/gnome/gstripchart/gstripchart.conf +share/gnome/help/gcharmap/C/authors.html +share/gnome/help/gcharmap/C/bugs.html +share/gnome/help/gcharmap/C/docbook.css +share/gnome/help/gcharmap/C/images/gcharmap.png +share/gnome/help/gcharmap/C/images/gcharmap_insertascii.png +share/gnome/help/gcharmap/C/index.html +share/gnome/help/gcharmap/C/license.html +share/gnome/help/gcharmap/C/ln7.html +share/gnome/help/gcharmap/C/topic.dat +share/gnome/help/gcharmap/C/usage.html +share/gnome/help/gcolorsel/C/authors.html +share/gnome/help/gcolorsel/C/bugs.html +share/gnome/help/gcolorsel/C/docbook.css +share/gnome/help/gcolorsel/C/favorites.png +share/gnome/help/gcolorsel/C/index.html +share/gnome/help/gcolorsel/C/license.html +share/gnome/help/gcolorsel/C/ln7.html +share/gnome/help/gcolorsel/C/menus.html +share/gnome/help/gcolorsel/C/properties.html +share/gnome/help/gcolorsel/C/search.html +share/gnome/help/gcolorsel/C/search.png +share/gnome/help/gcolorsel/C/simple.html +share/gnome/help/gcolorsel/C/simple.png +share/gnome/help/gcolorsel/C/topic.dat +share/gnome/help/gcolorsel/C/usage.html +share/gnome/help/gcolorsel/C/xcolors.html +share/gnome/help/gdict/C/authors.html +share/gnome/help/gdict/C/docbook.css +share/gnome/help/gdict/C/gdict-prefs.png +share/gnome/help/gdict/C/gdict-spell.png +share/gnome/help/gdict/C/gdictmain.png +share/gnome/help/gdict/C/index.html +share/gnome/help/gdict/C/license.html +share/gnome/help/gdict/C/ln7.html +share/gnome/help/gdict/C/prefs.html +share/gnome/help/gdict/C/topic.dat +share/gnome/help/gdict/C/usage.html share/gnome/help/gdiskfree/C/authors.html share/gnome/help/gdiskfree/C/docbook.css share/gnome/help/gdiskfree/C/images/gdiskfree.png +share/gnome/help/gdiskfree/C/images/gdiskfree-prefs.png share/gnome/help/gdiskfree/C/index.html +share/gnome/help/gdiskfree/C/ln7.html +share/gnome/help/gdiskfree/C/prefs.html share/gnome/help/gdiskfree/C/topic.dat share/gnome/help/gdiskfree/C/usage.html share/gnome/help/gfontsel/C/authors.html share/gnome/help/gfontsel/C/filter.html +share/gnome/help/gfontsel/C/filterwin.png share/gnome/help/gfontsel/C/fontinfo.html share/gnome/help/gfontsel/C/index.html +share/gnome/help/gfontsel/C/license.html share/gnome/help/gfontsel/C/ln7.html share/gnome/help/gfontsel/C/mainshot.png share/gnome/help/gfontsel/C/mainwin.html share/gnome/help/gfontsel/C/stylesheet-images/warning.gif share/gnome/help/gfontsel/C/topic.dat share/gnome/help/gfontsel/C/xlfd.html +share/gnome/help/gless/C/authors.html +share/gnome/help/gless/C/docbook.css +share/gnome/help/gless/C/gless-main.png +share/gnome/help/gless/C/index.html +share/gnome/help/gless/C/topic.dat +share/gnome/help/gless/C/usage.html share/gnome/help/gsearchtool/C/authors.html share/gnome/help/gsearchtool/C/criteria.html share/gnome/help/gsearchtool/C/gsearch.png @@ -55,26 +128,67 @@ share/gnome/help/gsearchtool/C/mainwin.png share/gnome/help/gsearchtool/C/results.png share/gnome/help/gsearchtool/C/topic.dat share/gnome/help/gsearchtool/C/usage.html +share/gnome/help/gshutdown/C/authors.html +share/gnome/help/gshutdown/C/docbook.css +share/gnome/help/gshutdown/C/gshutdown-advanced.png +share/gnome/help/gshutdown/C/gshutdown-preferences.png +share/gnome/help/gshutdown/C/gshutdown.png share/gnome/help/gshutdown/C/index.html share/gnome/help/gshutdown/C/topic.dat -share/gnome/help/gshutdown/es/index.html -share/gnome/help/gshutdown/es/topic.dat -share/gnome/help/gshutdown/no/index.html -share/gnome/help/gshutdown/no/topic.dat +share/gnome/help/gshutdown/C/usage.html +share/gnome/help/gstripchart/C/authors.html +share/gnome/help/gstripchart/C/bugs.html +share/gnome/help/gstripchart/C/docbook.css share/gnome/help/gstripchart/C/index.html +share/gnome/help/gstripchart/C/license.html +share/gnome/help/gstripchart/C/ln7.html +share/gnome/help/gstripchart/C/prefs.html share/gnome/help/gstripchart/C/topic.dat +share/gnome/help/gstripchart/C/usage.html +share/gnome/help/gtt/C/authors.html +share/gnome/help/gtt/C/bugs.html +share/gnome/help/gtt/C/dialogs.html +share/gnome/help/gtt/C/docbook.css +share/gnome/help/gtt/C/gtt_mainwin.png +share/gnome/help/gtt/C/gtt_prefswin.png share/gnome/help/gtt/C/index.html +share/gnome/help/gtt/C/license.html +share/gnome/help/gtt/C/ln10.html +share/gnome/help/gtt/C/preferences.html share/gnome/help/gtt/C/topic.dat -share/gnome/help/gtt/de/index.html -share/gnome/help/gtt/de/topic.dat -share/gnome/help/gtt/es/index.html -share/gnome/help/gtt/es/topic.dat +share/gnome/help/gtt/C/usage.html +share/gnome/help/guname/C/authors.html +share/gnome/help/guname/C/docbook.css +share/gnome/help/guname/C/guname-cpuinfo.png +share/gnome/help/guname/C/guname-diskinfo.png +share/gnome/help/guname/C/guname-main.png +share/gnome/help/guname/C/guname-memoryinfo.png +share/gnome/help/guname/C/index.html +share/gnome/help/guname/C/license.html +share/gnome/help/guname/C/topic.dat +share/gnome/help/guname/C/usage.html +share/gnome/help/gw/C/authors.html +share/gnome/help/gw/C/bugs.html +share/gnome/help/gw/C/docbook.css +share/gnome/help/gw/C/gw-main.png +share/gnome/help/gw/C/gw-menuitems.png +share/gnome/help/gw/C/index.html +share/gnome/help/gw/C/license.html +share/gnome/help/gw/C/ln7.html +share/gnome/help/gw/C/prefs.html +share/gnome/help/gw/C/topic.dat +share/gnome/help/gw/C/usage.html share/gnome/idl/gsu.idl +share/gnome/logview/logview-actions.db +share/gnome/logview/logview-descript.db +share/gnome/logview/logview-regexp.db +share/gnome/pixmaps/gdict.png share/gnome/pixmaps/gnome-fontsel.png share/gnome/pixmaps/gnome-searchtool.png share/gnome/pixmaps/gnome-shutdown.png share/gnome/pixmaps/gnome-stripchart.png share/gnome/pixmaps/gnome-who.png +share/gnome/pixmaps/logview/logview.xpm share/locale/ca/LC_MESSAGES/gnome-utils.mo share/locale/cs/LC_MESSAGES/gnome-utils.mo share/locale/da/LC_MESSAGES/gnome-utils.mo @@ -86,36 +200,66 @@ share/locale/et/LC_MESSAGES/gnome-utils.mo share/locale/fi/LC_MESSAGES/gnome-utils.mo share/locale/fr/LC_MESSAGES/gnome-utils.mo share/locale/ga/LC_MESSAGES/gnome-utils.mo +share/locale/gl/LC_MESSAGES/gnome-utils.mo share/locale/hu/LC_MESSAGES/gnome-utils.mo share/locale/it/LC_MESSAGES/gnome-utils.mo share/locale/ja/LC_MESSAGES/gnome-utils.mo share/locale/ko/LC_MESSAGES/gnome-utils.mo +share/locale/lt/LC_MESSAGES/gnome-utils.mo +share/locale/nl/LC_MESSAGES/gnome-utils.mo share/locale/no/LC_MESSAGES/gnome-utils.mo share/locale/pl/LC_MESSAGES/gnome-utils.mo share/locale/pt/LC_MESSAGES/gnome-utils.mo share/locale/pt_BR/LC_MESSAGES/gnome-utils.mo +share/locale/ro/LC_MESSAGES/gnome-utils.mo share/locale/ru/LC_MESSAGES/gnome-utils.mo share/locale/sv/LC_MESSAGES/gnome-utils.mo +share/locale/tr/LC_MESSAGES/gnome-utils.mo share/locale/uk/LC_MESSAGES/gnome-utils.mo share/locale/wa/LC_MESSAGES/gnome-utils.mo share/locale/zh_CN.GB2312/LC_MESSAGES/gnome-utils.mo share/locale/zh_TW.Big5/LC_MESSAGES/gnome-utils.mo -@dirrm share/gnome/help/gtt/es -@dirrm share/gnome/help/gtt/de +@dirrm share/gnome/pixmaps/logview +@dirrm share/gnome/logview +@dirrm share/gnome/help/gw/C/images +@dirrm share/gnome/help/gw/C +@dirrm share/gnome/help/gw +@dirrm share/gnome/help/guname/C/images +@dirrm share/gnome/help/guname/C +@dirrm share/gnome/help/guname +@dirrm share/gnome/help/gtt/C/stylesheet-images +@dirrm share/gnome/help/gtt/C/images @dirrm share/gnome/help/gtt/C @dirrm share/gnome/help/gtt +@dirrm share/gnome/help/gstripchart/C/stylesheet-images +@dirrm share/gnome/help/gstripchart/C/images @dirrm share/gnome/help/gstripchart/C @dirrm share/gnome/help/gstripchart -@dirrm share/gnome/help/gshutdown/no -@dirrm share/gnome/help/gshutdown/es +@dirrm share/gnome/help/gshutdown/C/images @dirrm share/gnome/help/gshutdown/C @dirrm share/gnome/help/gshutdown @dirrm share/gnome/help/gsearchtool/C @dirrm share/gnome/help/gsearchtool +@dirrm share/gnome/help/gless/C/images +@dirrm share/gnome/help/gless/C +@dirrm share/gnome/help/gless @dirrm share/gnome/help/gfontsel/C/stylesheet-images @dirrm share/gnome/help/gfontsel/C @dirrm share/gnome/help/gfontsel +@dirrm share/gnome/help/gdiskfree/C/stylesheet-images @dirrm share/gnome/help/gdiskfree/C/images @dirrm share/gnome/help/gdiskfree/C @dirrm share/gnome/help/gdiskfree +@dirrm share/gnome/help/gdict/C/images +@dirrm share/gnome/help/gdict/C +@dirrm share/gnome/help/gdict +@dirrm share/gnome/help/gcolorsel/C/stylesheet-images +@dirrm share/gnome/help/gcolorsel/C +@dirrm share/gnome/help/gcolorsel +@dirrm share/gnome/help/gcharmap/C/stylesheet-images +@dirrm share/gnome/help/gcharmap/C/images +@dirrm share/gnome/help/gcharmap/C +@dirrm share/gnome/help/gcharmap @dirrm share/gnome/gstripchart +@dirrm share/gnome/gcolorsel/glade +@dirrm share/gnome/gcolorsel diff --git a/misc/gnomeutils2/Makefile b/misc/gnomeutils2/Makefile index 2480f0f..5e7764e 100644 --- a/misc/gnomeutils2/Makefile +++ b/misc/gnomeutils2/Makefile @@ -6,7 +6,7 @@ # PORTNAME= gnomeutils -PORTVERSION= 1.0.51 +PORTVERSION= 1.2.0 CATEGORIES= misc gnome MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= stable/sources/gnome-utils @@ -14,9 +14,7 @@ DISTNAME= gnome-utils-${PORTVERSION} MAINTAINER= ade@FreeBSD.org -BUILD_DEPENDS= panel:${PORTSDIR}/x11/gnomecore -RUN_DEPENDS= panel:${PORTSDIR}/x11/gnomecore -LIB_DEPENDS= obgnome.1:${PORTSDIR}/lang/gnomeobjc +LIB_DEPENDS= panel_applet.4:${PORTSDIR}/x11/gnomecore GTK_CONFIG?= ${X11BASE}/bin/gtk12-config @@ -24,12 +22,9 @@ USE_X_PREFIX= yes USE_GMAKE= yes USE_LIBTOOL= yes CONFIGURE_ARGS= --localstatedir=${PREFIX}/share/gnome \ - --datadir=${PREFIX}/share/gnome \ - --with-gnome=${PREFIX} + --datadir=${PREFIX}/share/gnome CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ GTK_CONFIG="${GTK_CONFIG}" \ LIBS="-L${LOCALBASE}/lib" -MAN1= gtt.1 - .include <bsd.port.mk> diff --git a/misc/gnomeutils2/distinfo b/misc/gnomeutils2/distinfo index a37fd50..698b6b5 100644 --- a/misc/gnomeutils2/distinfo +++ b/misc/gnomeutils2/distinfo @@ -1 +1 @@ -MD5 (gnome-utils-1.0.51.tar.gz) = 0de69cb5eaaf81bea3a98cc48e0266c6 +MD5 (gnome-utils-1.2.0.tar.gz) = ffee2281337d29b149612dc186299773 diff --git a/misc/gnomeutils2/files/patch-aa b/misc/gnomeutils2/files/patch-aa index a8dc692..149087c 100644 --- a/misc/gnomeutils2/files/patch-aa +++ b/misc/gnomeutils2/files/patch-aa @@ -1,24 +1,6 @@ ---- configure.orig Wed Mar 8 09:07:49 2000 -+++ configure Sat Mar 11 15:35:52 2000 -@@ -2480,7 +2480,7 @@ - fi - if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 -- PTHREAD_LIB="-lc_r" -+ PTHREAD_LIB="" - else - echo "$ac_t""no" 1>&6 - echo $ac_n "checking for pthread_create""... $ac_c" 1>&6 -@@ -3277,7 +3277,7 @@ - - echo $ac_n "checking for an obGnomeConf.sh""... $ac_c" 1>&6 - echo "configure:3280: checking for an obGnomeConf.sh" >&5 -- my_gnome_libdir=`$GNOME_CONFIG --libdir` -+ my_gnome_libdir=`$GNOME_CONFIG --sysconfdir` - if test -f $my_gnome_libdir/obGnomeConf.sh; then - . $my_gnome_libdir/obGnomeConf.sh - echo "$ac_t""found $my_gnome_libdir" 1>&6 -@@ -5531,7 +5531,7 @@ +--- configure.orig Fri May 19 14:49:06 2000 ++++ configure Tue May 30 13:31:24 2000 +@@ -5101,7 +5101,7 @@ cat conftest.$ac_ext >&5 rm -rf conftest* CATOBJEXT=.mo @@ -27,3 +9,32 @@ fi rm -f conftest* INSTOBJEXT=.mo +@@ -6350,17 +6350,13 @@ + if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then + echo "$ac_t""yes" 1>&6 + build_gfloppy=true ++ subdirs="gfloppy" + else ++ build_gfloppy=false + echo "$ac_t""no" 1>&6 + echo "configure: warning: *** gfloppy will not be built." 1>&2 + fi + +-if $build_gfloppy; then +- subdirs="gfloppy" +- +-fi +- +- + if test "$build_gfloppy" = true; then + BUILD_GFLOPPY_TRUE= + BUILD_GFLOPPY_FALSE='#' +@@ -8453,7 +8449,7 @@ + esac + done + +- for ac_config_dir in gfloppy; do ++ for ac_config_dir in $subdirs ; do + + # Do not complain, so a configure script can configure whichever + # parts of a large source tree are present. diff --git a/misc/gnomeutils2/files/patch-ah b/misc/gnomeutils2/files/patch-ah new file mode 100644 index 0000000..ba467be --- /dev/null +++ b/misc/gnomeutils2/files/patch-ah @@ -0,0 +1,48 @@ +--- logview/actions.c.orig Wed Apr 26 22:32:02 2000 ++++ logview/actions.c Tue May 30 13:34:05 2000 +@@ -1,6 +1,7 @@ + #include "logview.h" + #include <string.h> + #include <stdlib.h> ++#include <sys/types.h> + #include <regex.h> + #include <config.h> + #include <gnome.h> +--- logview/desc_db.c.orig Wed Apr 26 22:32:02 2000 ++++ logview/desc_db.c Tue May 30 13:34:36 2000 +@@ -1,5 +1,6 @@ + #include "logview.h" + #include <string.h> ++#include <sys/types.h> + #include <regex.h> + #include <stdlib.h> + +--- logview/logrtns.c.orig Tue May 30 13:35:22 2000 ++++ logview/logrtns.c Tue May 30 13:37:45 2000 +@@ -679,7 +679,7 @@ + if (IsLeapYear (curmark->year - lastyear + thisyear)) + curmark->time += 24 * 60 * 60; /* Add one day */ + +-#ifdef __NetBSD__ ++#if defined(__NetBSD__) || defined(__FreeBSD__) + curmark->time += correction - tmptm->tm_gmtoff; + #else + curmark->time += correction - timezone; +@@ -705,7 +705,7 @@ + if (IsLeapYear (thisyear)) + log->lstats.enddate += 24 * 60 * 60; /* Add one day */ + +-#ifdef __NetBSD__ ++#if defined(__NetBSD__) || defined(__FreeBSD__) + log->lstats.enddate += correction - tmptm->tm_gmtoff; + #else + log->lstats.enddate += correction - timezone; +@@ -716,7 +716,7 @@ + if (IsLeapYear (thisyear - lastyear)) + log->lstats.startdate += 24 * 60 * 60; /* Add one day */ + +-#ifdef __NetBSD__ ++#if defined(__NetBSD__) || defined(__FreeBSD__) + log->lstats.startdate += correction - tmptm->tm_gmtoff; + #else + log->lstats.startdate += correction - timezone; diff --git a/misc/gnomeutils2/pkg-plist b/misc/gnomeutils2/pkg-plist index 2b731a2..7781bd5 100644 --- a/misc/gnomeutils2/pkg-plist +++ b/misc/gnomeutils2/pkg-plist @@ -1,49 +1,122 @@ bin/gcalc +bin/gcharmap bin/gcolorsel bin/gdialog +bin/gdict bin/gdiskfree bin/gfontsel bin/gless -bin/gnome-run -bin/grun bin/gsearchtool bin/gshutdown bin/gstripchart bin/gstripchart_applet bin/gtt +bin/guname bin/gw +bin/logview bin/splac bin/splash +etc/CORBA/servers/gdict.gnorba etc/CORBA/servers/gstripchart_applet.gnorba share/gnome/applets/Monitors/gstripchart_applet.desktop +share/gnome/applets/Utility/gdict.desktop share/gnome/apps/Applications/gtt.desktop +share/gnome/apps/System/gdiskfree.desktop share/gnome/apps/System/gshutdown.desktop +share/gnome/apps/System/guname.desktop +share/gnome/apps/System/gw.desktop +share/gnome/apps/System/logview.desktop +share/gnome/apps/Utilities/GDict.desktop share/gnome/apps/Utilities/gcalc.desktop +share/gnome/apps/Utilities/gcharmap.desktop share/gnome/apps/Utilities/gcolorsel.desktop -share/gnome/apps/Utilities/gdiskfree.desktop share/gnome/apps/Utilities/gfontsel.desktop share/gnome/apps/Utilities/gless.desktop share/gnome/apps/Utilities/gsearchtool.desktop share/gnome/apps/Utilities/gstripchart.desktop -share/gnome/apps/Utilities/gw.desktop -share/gnome/apps/gnome-run.desktop +share/gnome/gcolorsel/glade/dialog-new-doc.glade +share/gnome/gcolorsel/glade/dialog-new-doc.glade.h +share/gnome/gcolorsel/glade/dialog-new-view.glade +share/gnome/gcolorsel/glade/dialog-new-view.glade.h +share/gnome/gcolorsel/glade/dialog-prefs.glade +share/gnome/gcolorsel/glade/dialog-prefs.glade.h +share/gnome/gcolorsel/glade/mdi-color-file-properties.glade +share/gnome/gcolorsel/glade/mdi-color-file-properties.glade.h +share/gnome/gcolorsel/glade/mdi-color-generic-properties.glade +share/gnome/gcolorsel/glade/mdi-color-generic-properties.glade.h +share/gnome/gcolorsel/glade/view-color-edit.glade +share/gnome/gcolorsel/glade/view-color-edit.glade.h +share/gnome/gcolorsel/glade/view-color-generic-properties.glade +share/gnome/gcolorsel/glade/view-color-generic-properties.glade.h +share/gnome/gcolorsel/glade/view-color-grid-properties.glade +share/gnome/gcolorsel/glade/view-color-grid-properties.glade.h +share/gnome/gcolorsel/glade/view-color-list-properties.glade +share/gnome/gcolorsel/glade/view-color-list-properties.glade.h share/gnome/gstripchart/gstripchart.conf +share/gnome/help/gcharmap/C/authors.html +share/gnome/help/gcharmap/C/bugs.html +share/gnome/help/gcharmap/C/docbook.css +share/gnome/help/gcharmap/C/images/gcharmap.png +share/gnome/help/gcharmap/C/images/gcharmap_insertascii.png +share/gnome/help/gcharmap/C/index.html +share/gnome/help/gcharmap/C/license.html +share/gnome/help/gcharmap/C/ln7.html +share/gnome/help/gcharmap/C/topic.dat +share/gnome/help/gcharmap/C/usage.html +share/gnome/help/gcolorsel/C/authors.html +share/gnome/help/gcolorsel/C/bugs.html +share/gnome/help/gcolorsel/C/docbook.css +share/gnome/help/gcolorsel/C/favorites.png +share/gnome/help/gcolorsel/C/index.html +share/gnome/help/gcolorsel/C/license.html +share/gnome/help/gcolorsel/C/ln7.html +share/gnome/help/gcolorsel/C/menus.html +share/gnome/help/gcolorsel/C/properties.html +share/gnome/help/gcolorsel/C/search.html +share/gnome/help/gcolorsel/C/search.png +share/gnome/help/gcolorsel/C/simple.html +share/gnome/help/gcolorsel/C/simple.png +share/gnome/help/gcolorsel/C/topic.dat +share/gnome/help/gcolorsel/C/usage.html +share/gnome/help/gcolorsel/C/xcolors.html +share/gnome/help/gdict/C/authors.html +share/gnome/help/gdict/C/docbook.css +share/gnome/help/gdict/C/gdict-prefs.png +share/gnome/help/gdict/C/gdict-spell.png +share/gnome/help/gdict/C/gdictmain.png +share/gnome/help/gdict/C/index.html +share/gnome/help/gdict/C/license.html +share/gnome/help/gdict/C/ln7.html +share/gnome/help/gdict/C/prefs.html +share/gnome/help/gdict/C/topic.dat +share/gnome/help/gdict/C/usage.html share/gnome/help/gdiskfree/C/authors.html share/gnome/help/gdiskfree/C/docbook.css share/gnome/help/gdiskfree/C/images/gdiskfree.png +share/gnome/help/gdiskfree/C/images/gdiskfree-prefs.png share/gnome/help/gdiskfree/C/index.html +share/gnome/help/gdiskfree/C/ln7.html +share/gnome/help/gdiskfree/C/prefs.html share/gnome/help/gdiskfree/C/topic.dat share/gnome/help/gdiskfree/C/usage.html share/gnome/help/gfontsel/C/authors.html share/gnome/help/gfontsel/C/filter.html +share/gnome/help/gfontsel/C/filterwin.png share/gnome/help/gfontsel/C/fontinfo.html share/gnome/help/gfontsel/C/index.html +share/gnome/help/gfontsel/C/license.html share/gnome/help/gfontsel/C/ln7.html share/gnome/help/gfontsel/C/mainshot.png share/gnome/help/gfontsel/C/mainwin.html share/gnome/help/gfontsel/C/stylesheet-images/warning.gif share/gnome/help/gfontsel/C/topic.dat share/gnome/help/gfontsel/C/xlfd.html +share/gnome/help/gless/C/authors.html +share/gnome/help/gless/C/docbook.css +share/gnome/help/gless/C/gless-main.png +share/gnome/help/gless/C/index.html +share/gnome/help/gless/C/topic.dat +share/gnome/help/gless/C/usage.html share/gnome/help/gsearchtool/C/authors.html share/gnome/help/gsearchtool/C/criteria.html share/gnome/help/gsearchtool/C/gsearch.png @@ -55,26 +128,67 @@ share/gnome/help/gsearchtool/C/mainwin.png share/gnome/help/gsearchtool/C/results.png share/gnome/help/gsearchtool/C/topic.dat share/gnome/help/gsearchtool/C/usage.html +share/gnome/help/gshutdown/C/authors.html +share/gnome/help/gshutdown/C/docbook.css +share/gnome/help/gshutdown/C/gshutdown-advanced.png +share/gnome/help/gshutdown/C/gshutdown-preferences.png +share/gnome/help/gshutdown/C/gshutdown.png share/gnome/help/gshutdown/C/index.html share/gnome/help/gshutdown/C/topic.dat -share/gnome/help/gshutdown/es/index.html -share/gnome/help/gshutdown/es/topic.dat -share/gnome/help/gshutdown/no/index.html -share/gnome/help/gshutdown/no/topic.dat +share/gnome/help/gshutdown/C/usage.html +share/gnome/help/gstripchart/C/authors.html +share/gnome/help/gstripchart/C/bugs.html +share/gnome/help/gstripchart/C/docbook.css share/gnome/help/gstripchart/C/index.html +share/gnome/help/gstripchart/C/license.html +share/gnome/help/gstripchart/C/ln7.html +share/gnome/help/gstripchart/C/prefs.html share/gnome/help/gstripchart/C/topic.dat +share/gnome/help/gstripchart/C/usage.html +share/gnome/help/gtt/C/authors.html +share/gnome/help/gtt/C/bugs.html +share/gnome/help/gtt/C/dialogs.html +share/gnome/help/gtt/C/docbook.css +share/gnome/help/gtt/C/gtt_mainwin.png +share/gnome/help/gtt/C/gtt_prefswin.png share/gnome/help/gtt/C/index.html +share/gnome/help/gtt/C/license.html +share/gnome/help/gtt/C/ln10.html +share/gnome/help/gtt/C/preferences.html share/gnome/help/gtt/C/topic.dat -share/gnome/help/gtt/de/index.html -share/gnome/help/gtt/de/topic.dat -share/gnome/help/gtt/es/index.html -share/gnome/help/gtt/es/topic.dat +share/gnome/help/gtt/C/usage.html +share/gnome/help/guname/C/authors.html +share/gnome/help/guname/C/docbook.css +share/gnome/help/guname/C/guname-cpuinfo.png +share/gnome/help/guname/C/guname-diskinfo.png +share/gnome/help/guname/C/guname-main.png +share/gnome/help/guname/C/guname-memoryinfo.png +share/gnome/help/guname/C/index.html +share/gnome/help/guname/C/license.html +share/gnome/help/guname/C/topic.dat +share/gnome/help/guname/C/usage.html +share/gnome/help/gw/C/authors.html +share/gnome/help/gw/C/bugs.html +share/gnome/help/gw/C/docbook.css +share/gnome/help/gw/C/gw-main.png +share/gnome/help/gw/C/gw-menuitems.png +share/gnome/help/gw/C/index.html +share/gnome/help/gw/C/license.html +share/gnome/help/gw/C/ln7.html +share/gnome/help/gw/C/prefs.html +share/gnome/help/gw/C/topic.dat +share/gnome/help/gw/C/usage.html share/gnome/idl/gsu.idl +share/gnome/logview/logview-actions.db +share/gnome/logview/logview-descript.db +share/gnome/logview/logview-regexp.db +share/gnome/pixmaps/gdict.png share/gnome/pixmaps/gnome-fontsel.png share/gnome/pixmaps/gnome-searchtool.png share/gnome/pixmaps/gnome-shutdown.png share/gnome/pixmaps/gnome-stripchart.png share/gnome/pixmaps/gnome-who.png +share/gnome/pixmaps/logview/logview.xpm share/locale/ca/LC_MESSAGES/gnome-utils.mo share/locale/cs/LC_MESSAGES/gnome-utils.mo share/locale/da/LC_MESSAGES/gnome-utils.mo @@ -86,36 +200,66 @@ share/locale/et/LC_MESSAGES/gnome-utils.mo share/locale/fi/LC_MESSAGES/gnome-utils.mo share/locale/fr/LC_MESSAGES/gnome-utils.mo share/locale/ga/LC_MESSAGES/gnome-utils.mo +share/locale/gl/LC_MESSAGES/gnome-utils.mo share/locale/hu/LC_MESSAGES/gnome-utils.mo share/locale/it/LC_MESSAGES/gnome-utils.mo share/locale/ja/LC_MESSAGES/gnome-utils.mo share/locale/ko/LC_MESSAGES/gnome-utils.mo +share/locale/lt/LC_MESSAGES/gnome-utils.mo +share/locale/nl/LC_MESSAGES/gnome-utils.mo share/locale/no/LC_MESSAGES/gnome-utils.mo share/locale/pl/LC_MESSAGES/gnome-utils.mo share/locale/pt/LC_MESSAGES/gnome-utils.mo share/locale/pt_BR/LC_MESSAGES/gnome-utils.mo +share/locale/ro/LC_MESSAGES/gnome-utils.mo share/locale/ru/LC_MESSAGES/gnome-utils.mo share/locale/sv/LC_MESSAGES/gnome-utils.mo +share/locale/tr/LC_MESSAGES/gnome-utils.mo share/locale/uk/LC_MESSAGES/gnome-utils.mo share/locale/wa/LC_MESSAGES/gnome-utils.mo share/locale/zh_CN.GB2312/LC_MESSAGES/gnome-utils.mo share/locale/zh_TW.Big5/LC_MESSAGES/gnome-utils.mo -@dirrm share/gnome/help/gtt/es -@dirrm share/gnome/help/gtt/de +@dirrm share/gnome/pixmaps/logview +@dirrm share/gnome/logview +@dirrm share/gnome/help/gw/C/images +@dirrm share/gnome/help/gw/C +@dirrm share/gnome/help/gw +@dirrm share/gnome/help/guname/C/images +@dirrm share/gnome/help/guname/C +@dirrm share/gnome/help/guname +@dirrm share/gnome/help/gtt/C/stylesheet-images +@dirrm share/gnome/help/gtt/C/images @dirrm share/gnome/help/gtt/C @dirrm share/gnome/help/gtt +@dirrm share/gnome/help/gstripchart/C/stylesheet-images +@dirrm share/gnome/help/gstripchart/C/images @dirrm share/gnome/help/gstripchart/C @dirrm share/gnome/help/gstripchart -@dirrm share/gnome/help/gshutdown/no -@dirrm share/gnome/help/gshutdown/es +@dirrm share/gnome/help/gshutdown/C/images @dirrm share/gnome/help/gshutdown/C @dirrm share/gnome/help/gshutdown @dirrm share/gnome/help/gsearchtool/C @dirrm share/gnome/help/gsearchtool +@dirrm share/gnome/help/gless/C/images +@dirrm share/gnome/help/gless/C +@dirrm share/gnome/help/gless @dirrm share/gnome/help/gfontsel/C/stylesheet-images @dirrm share/gnome/help/gfontsel/C @dirrm share/gnome/help/gfontsel +@dirrm share/gnome/help/gdiskfree/C/stylesheet-images @dirrm share/gnome/help/gdiskfree/C/images @dirrm share/gnome/help/gdiskfree/C @dirrm share/gnome/help/gdiskfree +@dirrm share/gnome/help/gdict/C/images +@dirrm share/gnome/help/gdict/C +@dirrm share/gnome/help/gdict +@dirrm share/gnome/help/gcolorsel/C/stylesheet-images +@dirrm share/gnome/help/gcolorsel/C +@dirrm share/gnome/help/gcolorsel +@dirrm share/gnome/help/gcharmap/C/stylesheet-images +@dirrm share/gnome/help/gcharmap/C/images +@dirrm share/gnome/help/gcharmap/C +@dirrm share/gnome/help/gcharmap @dirrm share/gnome/gstripchart +@dirrm share/gnome/gcolorsel/glade +@dirrm share/gnome/gcolorsel diff --git a/print/ggv/Makefile b/print/ggv/Makefile index 1387035..a220cfc 100644 --- a/print/ggv/Makefile +++ b/print/ggv/Makefile @@ -13,16 +13,14 @@ MASTER_SITE_SUBDIR= stable/sources/ggv MAINTAINER= ade@FreeBSD.org -BUILD_DEPENDS= panel:${PORTSDIR}/x11/gnomecore -RUN_DEPENDS= panel:${PORTSDIR}/x11/gnomecore +LIB_DEPENDS= panel_applet.4:${PORTSDIR}/x11/gnomecore GTK_CONFIG?= ${X11BASE}/bin/gtk12-config USE_X_PREFIX= yes USE_LIBTOOL= yes CONFIGURE_ARGS= --localstatedir=${PREFIX}/share/gnome \ - --datadir=${PREFIX}/share/gnome \ - --with-gnome=${PREFIX} + --datadir=${PREFIX}/share/gnome CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ GTK_CONFIG="${GTK_CONFIG}" \ LIBS="-L${LOCALBASE}/lib" diff --git a/print/ggv2/Makefile b/print/ggv2/Makefile index 1387035..a220cfc 100644 --- a/print/ggv2/Makefile +++ b/print/ggv2/Makefile @@ -13,16 +13,14 @@ MASTER_SITE_SUBDIR= stable/sources/ggv MAINTAINER= ade@FreeBSD.org -BUILD_DEPENDS= panel:${PORTSDIR}/x11/gnomecore -RUN_DEPENDS= panel:${PORTSDIR}/x11/gnomecore +LIB_DEPENDS= panel_applet.4:${PORTSDIR}/x11/gnomecore GTK_CONFIG?= ${X11BASE}/bin/gtk12-config USE_X_PREFIX= yes USE_LIBTOOL= yes CONFIGURE_ARGS= --localstatedir=${PREFIX}/share/gnome \ - --datadir=${PREFIX}/share/gnome \ - --with-gnome=${PREFIX} + --datadir=${PREFIX}/share/gnome CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ GTK_CONFIG="${GTK_CONFIG}" \ LIBS="-L${LOCALBASE}/lib" diff --git a/print/gnome-print/Makefile b/print/gnome-print/Makefile index ef75328..dca3d67 100644 --- a/print/gnome-print/Makefile +++ b/print/gnome-print/Makefile @@ -15,7 +15,7 @@ DISTNAME= gnome-print-${PORTVERSION} MAINTAINER= ade@FreeBSD.org BUILD_DEPENDS= gs:${PORTSDIR}/print/ghostscript5 -LIB_DEPENDS= gnome.3:${PORTSDIR}/x11/gnomelibs \ +LIB_DEPENDS= gnome.4:${PORTSDIR}/x11/gnomelibs \ xml.5:${PORTSDIR}/textproc/libxml GTK_CONFIG?= ${X11BASE}/bin/gtk12-config diff --git a/print/gnomeprint/Makefile b/print/gnomeprint/Makefile index ef75328..dca3d67 100644 --- a/print/gnomeprint/Makefile +++ b/print/gnomeprint/Makefile @@ -15,7 +15,7 @@ DISTNAME= gnome-print-${PORTVERSION} MAINTAINER= ade@FreeBSD.org BUILD_DEPENDS= gs:${PORTSDIR}/print/ghostscript5 -LIB_DEPENDS= gnome.3:${PORTSDIR}/x11/gnomelibs \ +LIB_DEPENDS= gnome.4:${PORTSDIR}/x11/gnomelibs \ xml.5:${PORTSDIR}/textproc/libxml GTK_CONFIG?= ${X11BASE}/bin/gtk12-config diff --git a/print/libgnomeprint/Makefile b/print/libgnomeprint/Makefile index ef75328..dca3d67 100644 --- a/print/libgnomeprint/Makefile +++ b/print/libgnomeprint/Makefile @@ -15,7 +15,7 @@ DISTNAME= gnome-print-${PORTVERSION} MAINTAINER= ade@FreeBSD.org BUILD_DEPENDS= gs:${PORTSDIR}/print/ghostscript5 -LIB_DEPENDS= gnome.3:${PORTSDIR}/x11/gnomelibs \ +LIB_DEPENDS= gnome.4:${PORTSDIR}/x11/gnomelibs \ xml.5:${PORTSDIR}/textproc/libxml GTK_CONFIG?= ${X11BASE}/bin/gtk12-config diff --git a/sysutils/gnome-control-center/Makefile b/sysutils/gnome-control-center/Makefile index 59d72d7..1498851 100644 --- a/sysutils/gnome-control-center/Makefile +++ b/sysutils/gnome-control-center/Makefile @@ -6,7 +6,7 @@ # PORTNAME= gnomecontrolcenter -PORTVERSION= 1.0.53 +PORTVERSION= 1.2.0 CATEGORIES= sysutils gnome MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= stable/sources/control-center @@ -14,8 +14,7 @@ DISTNAME= control-center-${PORTVERSION} MAINTAINER= vanilla@FreeBSD.org -BUILD_DEPENDS= panel:${PORTSDIR}/x11/gnomecore -RUN_DEPENDS= panel:${PORTSDIR}/x11/gnomecore +LIB_DEPENDS= gnome.4:${PORTSDIR}/x11/gnomelibs GTK_CONFIG?= ${X11BASE}/bin/gtk12-config diff --git a/sysutils/gnome-control-center/distinfo b/sysutils/gnome-control-center/distinfo index 0524ffc..986850c 100644 --- a/sysutils/gnome-control-center/distinfo +++ b/sysutils/gnome-control-center/distinfo @@ -1 +1 @@ -MD5 (control-center-1.0.53.tar.gz) = 6a50eecaf59d6ec2ce06bd6bdcee60a8 +MD5 (control-center-1.2.0.tar.gz) = c846abe32f63f409fb803b2960b7ba2e diff --git a/sysutils/gnome-control-center/files/patch-bn b/sysutils/gnome-control-center/files/patch-bn index e7543a0..da5233b 100644 --- a/sysutils/gnome-control-center/files/patch-bn +++ b/sysutils/gnome-control-center/files/patch-bn @@ -25,7 +25,7 @@ -libcapplet_la_LDFLAGS = -version-info 0:0:0 -rpath $(libdir) -+libcapplet_la_LDFLAGS = -version-info 1:0:0 ++libcapplet_la_LDFLAGS = -version-info 4:0:0 libcapplet_la_LIBADD = $(ORB_LIBS) -lm $(DL_LIB) $(GNORBA_LIBS) include_HEADERS = capplet-widget.h diff --git a/sysutils/gnome-control-center/pkg-plist b/sysutils/gnome-control-center/pkg-plist index ff9d67b..984a3c4 100644 --- a/sysutils/gnome-control-center/pkg-plist +++ b/sysutils/gnome-control-center/pkg-plist @@ -16,7 +16,7 @@ etc/cappletConf.sh include/capplet-widget.h lib/libcapplet.a lib/libcapplet.so -lib/libcapplet.so.1 +lib/libcapplet.so.4 @unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R @exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %B share/gnome/apps/Settings/Desktop/.directory @@ -24,6 +24,10 @@ share/gnome/apps/Settings/Desktop/background-properties.desktop share/gnome/apps/Settings/Desktop/screensaver-properties.desktop share/gnome/apps/Settings/Desktop/theme-selector.desktop share/gnome/apps/Settings/Desktop/wm-properties.desktop +share/gnome/apps/Settings/Documents/.directory +share/gnome/apps/Settings/Documents/gnome-edit-properties.desktop +share/gnome/apps/Settings/Documents/mime-type.desktop +share/gnome/apps/Settings/Documents/url-properties.desktop share/gnome/apps/Settings/Multimedia/.directory share/gnome/apps/Settings/Multimedia/sound-properties.desktop share/gnome/apps/Settings/Peripherals/.directory @@ -35,10 +39,7 @@ share/gnome/apps/Settings/UIOptions/.directory share/gnome/apps/Settings/UIOptions/application.desktop share/gnome/apps/Settings/UIOptions/dialogs.desktop share/gnome/apps/Settings/UIOptions/mdi.desktop -share/gnome/apps/Settings/gnome-edit-properties.desktop share/gnome/apps/Settings/gnomecc.desktop -share/gnome/apps/Settings/mime-type.desktop -share/gnome/apps/Settings/url-properties.desktop share/gnome/control-center/.data/3d.desktop share/gnome/control-center/.data/3d.png share/gnome/control-center/.data/Ant.desktop @@ -174,6 +175,10 @@ share/gnome/control-center/Desktop/background-properties.desktop share/gnome/control-center/Desktop/screensaver-properties.desktop share/gnome/control-center/Desktop/theme-selector.desktop share/gnome/control-center/Desktop/wm-properties.desktop +share/gnome/control-center/Documents/.directory +share/gnome/control-center/Documents/gnome-edit-properties.desktop +share/gnome/control-center/Documents/mime-type.desktop +share/gnome/control-center/Documents/url-properties.desktop share/gnome/control-center/Multimedia/.directory share/gnome/control-center/Multimedia/sound-properties.desktop share/gnome/control-center/Peripherals/.directory @@ -185,29 +190,52 @@ share/gnome/control-center/UIOptions/.directory share/gnome/control-center/UIOptions/application.desktop share/gnome/control-center/UIOptions/dialogs.desktop share/gnome/control-center/UIOptions/mdi.desktop -share/gnome/control-center/gnome-edit-properties.desktop -share/gnome/control-center/mime-type.desktop -share/gnome/control-center/url-properties.desktop +share/gnome/help/control-center/C/figs/bg-capplet.png +share/gnome/help/control-center/C/figs/gccappdef.png +share/gnome/help/control-center/C/figs/gccdialog.png +share/gnome/help/control-center/C/figs/gccedit.png +share/gnome/help/control-center/C/figs/gcchints.png +share/gnome/help/control-center/C/figs/gccmdi.png +share/gnome/help/control-center/C/figs/gccmime.png +share/gnome/help/control-center/C/figs/gccsession-props.png +share/gnome/help/control-center/C/figs/gccsound1.png +share/gnome/help/control-center/C/figs/gccsound2.png +share/gnome/help/control-center/C/figs/gccstartup.png +share/gnome/help/control-center/C/figs/gccurl.png +share/gnome/help/control-center/C/figs/glob_pref_anim.png +share/gnome/help/control-center/C/figs/keyboard-capplet.png +share/gnome/help/control-center/C/figs/mouse-capplet.png +share/gnome/help/control-center/C/figs/screensave-capplet.png +share/gnome/help/control-center/C/figs/theme-select.png +share/gnome/help/control-center/C/figs/wm-main.png +share/gnome/help/control-center/C/index.html +share/gnome/help/control-center/C/topic.dat share/gnome/idl/control-center.idl +share/gnome/pixmaps/ccsplash.png share/gnome/pixmaps/control-center.png share/gnome/wm-properties/Enlightenment.desktop share/gnome/wm-properties/IceWM.desktop share/gnome/wm-properties/WindowMaker.desktop share/gnome/wm-properties/Scwm.desktop share/gnome/wm-properties/twm.desktop +share/locale/ca/LC_MESSAGES/control-center.mo share/locale/cs/LC_MESSAGES/control-center.mo share/locale/da/LC_MESSAGES/control-center.mo share/locale/de/LC_MESSAGES/control-center.mo +share/locale/el/LC_MESSAGES/control-center.mo share/locale/en_GB/LC_MESSAGES/control-center.mo share/locale/es/LC_MESSAGES/control-center.mo share/locale/et/LC_MESSAGES/control-center.mo share/locale/fi/LC_MESSAGES/control-center.mo share/locale/fr/LC_MESSAGES/control-center.mo share/locale/ga/LC_MESSAGES/control-center.mo +share/locale/gl/LC_MESSAGES/control-center.mo +share/locale/hr/LC_MESSAGES/control-center.mo share/locale/hu/LC_MESSAGES/control-center.mo share/locale/it/LC_MESSAGES/control-center.mo share/locale/ja/LC_MESSAGES/control-center.mo share/locale/ko/LC_MESSAGES/control-center.mo +share/locale/lt/LC_MESSAGES/control-center.mo share/locale/nl/LC_MESSAGES/control-center.mo share/locale/no/LC_MESSAGES/control-center.mo share/locale/pl/LC_MESSAGES/control-center.mo @@ -216,11 +244,21 @@ share/locale/pt_BR/LC_MESSAGES/control-center.mo share/locale/ro/LC_MESSAGES/control-center.mo share/locale/ru/LC_MESSAGES/control-center.mo share/locale/sv/LC_MESSAGES/control-center.mo +share/locale/tr/LC_MESSAGES/control-center.mo +share/locale/uk/LC_MESSAGES/control-center.mo +share/locale/zh_CN.GB2312/LC_MESSAGES/control-center.mo +share/locale/zh_TW.Big5/LC_MESSAGES/control-center.mo @dirrm share/gnome/wm-properties +@dirrm share/gnome/help/control-center/C/stylesheet-images +@dirrm share/gnome/help/control-center/C/figs +@dirrm share/gnome/help/control-center/C +@dirrm share/gnome/help/control-center +@dirrm share/gnome/help @dirrm share/gnome/control-center/UIOptions @dirrm share/gnome/control-center/Session @dirrm share/gnome/control-center/Peripherals @dirrm share/gnome/control-center/Multimedia +@dirrm share/gnome/control-center/Documents @dirrm share/gnome/control-center/Desktop @dirrm share/gnome/control-center/.data @dirrm share/gnome/control-center @@ -228,4 +266,9 @@ share/locale/sv/LC_MESSAGES/control-center.mo @dirrm share/gnome/apps/Settings/Session @dirrm share/gnome/apps/Settings/Peripherals @dirrm share/gnome/apps/Settings/Multimedia +@dirrm share/gnome/apps/Settings/Documents @dirrm share/gnome/apps/Settings/Desktop +@dirrm share/gnome/apps/Settings +@dirrm share/gnome/apps +@dirrm etc/CORBA/servers +@dirrm etc/CORBA diff --git a/sysutils/gnome-control-center1/Makefile b/sysutils/gnome-control-center1/Makefile index 59d72d7..1498851 100644 --- a/sysutils/gnome-control-center1/Makefile +++ b/sysutils/gnome-control-center1/Makefile @@ -6,7 +6,7 @@ # PORTNAME= gnomecontrolcenter -PORTVERSION= 1.0.53 +PORTVERSION= 1.2.0 CATEGORIES= sysutils gnome MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= stable/sources/control-center @@ -14,8 +14,7 @@ DISTNAME= control-center-${PORTVERSION} MAINTAINER= vanilla@FreeBSD.org -BUILD_DEPENDS= panel:${PORTSDIR}/x11/gnomecore -RUN_DEPENDS= panel:${PORTSDIR}/x11/gnomecore +LIB_DEPENDS= gnome.4:${PORTSDIR}/x11/gnomelibs GTK_CONFIG?= ${X11BASE}/bin/gtk12-config diff --git a/sysutils/gnome-control-center1/distinfo b/sysutils/gnome-control-center1/distinfo index 0524ffc..986850c 100644 --- a/sysutils/gnome-control-center1/distinfo +++ b/sysutils/gnome-control-center1/distinfo @@ -1 +1 @@ -MD5 (control-center-1.0.53.tar.gz) = 6a50eecaf59d6ec2ce06bd6bdcee60a8 +MD5 (control-center-1.2.0.tar.gz) = c846abe32f63f409fb803b2960b7ba2e diff --git a/sysutils/gnome-control-center1/files/patch-bn b/sysutils/gnome-control-center1/files/patch-bn index e7543a0..da5233b 100644 --- a/sysutils/gnome-control-center1/files/patch-bn +++ b/sysutils/gnome-control-center1/files/patch-bn @@ -25,7 +25,7 @@ -libcapplet_la_LDFLAGS = -version-info 0:0:0 -rpath $(libdir) -+libcapplet_la_LDFLAGS = -version-info 1:0:0 ++libcapplet_la_LDFLAGS = -version-info 4:0:0 libcapplet_la_LIBADD = $(ORB_LIBS) -lm $(DL_LIB) $(GNORBA_LIBS) include_HEADERS = capplet-widget.h diff --git a/sysutils/gnome-control-center1/pkg-plist b/sysutils/gnome-control-center1/pkg-plist index ff9d67b..984a3c4 100644 --- a/sysutils/gnome-control-center1/pkg-plist +++ b/sysutils/gnome-control-center1/pkg-plist @@ -16,7 +16,7 @@ etc/cappletConf.sh include/capplet-widget.h lib/libcapplet.a lib/libcapplet.so -lib/libcapplet.so.1 +lib/libcapplet.so.4 @unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R @exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %B share/gnome/apps/Settings/Desktop/.directory @@ -24,6 +24,10 @@ share/gnome/apps/Settings/Desktop/background-properties.desktop share/gnome/apps/Settings/Desktop/screensaver-properties.desktop share/gnome/apps/Settings/Desktop/theme-selector.desktop share/gnome/apps/Settings/Desktop/wm-properties.desktop +share/gnome/apps/Settings/Documents/.directory +share/gnome/apps/Settings/Documents/gnome-edit-properties.desktop +share/gnome/apps/Settings/Documents/mime-type.desktop +share/gnome/apps/Settings/Documents/url-properties.desktop share/gnome/apps/Settings/Multimedia/.directory share/gnome/apps/Settings/Multimedia/sound-properties.desktop share/gnome/apps/Settings/Peripherals/.directory @@ -35,10 +39,7 @@ share/gnome/apps/Settings/UIOptions/.directory share/gnome/apps/Settings/UIOptions/application.desktop share/gnome/apps/Settings/UIOptions/dialogs.desktop share/gnome/apps/Settings/UIOptions/mdi.desktop -share/gnome/apps/Settings/gnome-edit-properties.desktop share/gnome/apps/Settings/gnomecc.desktop -share/gnome/apps/Settings/mime-type.desktop -share/gnome/apps/Settings/url-properties.desktop share/gnome/control-center/.data/3d.desktop share/gnome/control-center/.data/3d.png share/gnome/control-center/.data/Ant.desktop @@ -174,6 +175,10 @@ share/gnome/control-center/Desktop/background-properties.desktop share/gnome/control-center/Desktop/screensaver-properties.desktop share/gnome/control-center/Desktop/theme-selector.desktop share/gnome/control-center/Desktop/wm-properties.desktop +share/gnome/control-center/Documents/.directory +share/gnome/control-center/Documents/gnome-edit-properties.desktop +share/gnome/control-center/Documents/mime-type.desktop +share/gnome/control-center/Documents/url-properties.desktop share/gnome/control-center/Multimedia/.directory share/gnome/control-center/Multimedia/sound-properties.desktop share/gnome/control-center/Peripherals/.directory @@ -185,29 +190,52 @@ share/gnome/control-center/UIOptions/.directory share/gnome/control-center/UIOptions/application.desktop share/gnome/control-center/UIOptions/dialogs.desktop share/gnome/control-center/UIOptions/mdi.desktop -share/gnome/control-center/gnome-edit-properties.desktop -share/gnome/control-center/mime-type.desktop -share/gnome/control-center/url-properties.desktop +share/gnome/help/control-center/C/figs/bg-capplet.png +share/gnome/help/control-center/C/figs/gccappdef.png +share/gnome/help/control-center/C/figs/gccdialog.png +share/gnome/help/control-center/C/figs/gccedit.png +share/gnome/help/control-center/C/figs/gcchints.png +share/gnome/help/control-center/C/figs/gccmdi.png +share/gnome/help/control-center/C/figs/gccmime.png +share/gnome/help/control-center/C/figs/gccsession-props.png +share/gnome/help/control-center/C/figs/gccsound1.png +share/gnome/help/control-center/C/figs/gccsound2.png +share/gnome/help/control-center/C/figs/gccstartup.png +share/gnome/help/control-center/C/figs/gccurl.png +share/gnome/help/control-center/C/figs/glob_pref_anim.png +share/gnome/help/control-center/C/figs/keyboard-capplet.png +share/gnome/help/control-center/C/figs/mouse-capplet.png +share/gnome/help/control-center/C/figs/screensave-capplet.png +share/gnome/help/control-center/C/figs/theme-select.png +share/gnome/help/control-center/C/figs/wm-main.png +share/gnome/help/control-center/C/index.html +share/gnome/help/control-center/C/topic.dat share/gnome/idl/control-center.idl +share/gnome/pixmaps/ccsplash.png share/gnome/pixmaps/control-center.png share/gnome/wm-properties/Enlightenment.desktop share/gnome/wm-properties/IceWM.desktop share/gnome/wm-properties/WindowMaker.desktop share/gnome/wm-properties/Scwm.desktop share/gnome/wm-properties/twm.desktop +share/locale/ca/LC_MESSAGES/control-center.mo share/locale/cs/LC_MESSAGES/control-center.mo share/locale/da/LC_MESSAGES/control-center.mo share/locale/de/LC_MESSAGES/control-center.mo +share/locale/el/LC_MESSAGES/control-center.mo share/locale/en_GB/LC_MESSAGES/control-center.mo share/locale/es/LC_MESSAGES/control-center.mo share/locale/et/LC_MESSAGES/control-center.mo share/locale/fi/LC_MESSAGES/control-center.mo share/locale/fr/LC_MESSAGES/control-center.mo share/locale/ga/LC_MESSAGES/control-center.mo +share/locale/gl/LC_MESSAGES/control-center.mo +share/locale/hr/LC_MESSAGES/control-center.mo share/locale/hu/LC_MESSAGES/control-center.mo share/locale/it/LC_MESSAGES/control-center.mo share/locale/ja/LC_MESSAGES/control-center.mo share/locale/ko/LC_MESSAGES/control-center.mo +share/locale/lt/LC_MESSAGES/control-center.mo share/locale/nl/LC_MESSAGES/control-center.mo share/locale/no/LC_MESSAGES/control-center.mo share/locale/pl/LC_MESSAGES/control-center.mo @@ -216,11 +244,21 @@ share/locale/pt_BR/LC_MESSAGES/control-center.mo share/locale/ro/LC_MESSAGES/control-center.mo share/locale/ru/LC_MESSAGES/control-center.mo share/locale/sv/LC_MESSAGES/control-center.mo +share/locale/tr/LC_MESSAGES/control-center.mo +share/locale/uk/LC_MESSAGES/control-center.mo +share/locale/zh_CN.GB2312/LC_MESSAGES/control-center.mo +share/locale/zh_TW.Big5/LC_MESSAGES/control-center.mo @dirrm share/gnome/wm-properties +@dirrm share/gnome/help/control-center/C/stylesheet-images +@dirrm share/gnome/help/control-center/C/figs +@dirrm share/gnome/help/control-center/C +@dirrm share/gnome/help/control-center +@dirrm share/gnome/help @dirrm share/gnome/control-center/UIOptions @dirrm share/gnome/control-center/Session @dirrm share/gnome/control-center/Peripherals @dirrm share/gnome/control-center/Multimedia +@dirrm share/gnome/control-center/Documents @dirrm share/gnome/control-center/Desktop @dirrm share/gnome/control-center/.data @dirrm share/gnome/control-center @@ -228,4 +266,9 @@ share/locale/sv/LC_MESSAGES/control-center.mo @dirrm share/gnome/apps/Settings/Session @dirrm share/gnome/apps/Settings/Peripherals @dirrm share/gnome/apps/Settings/Multimedia +@dirrm share/gnome/apps/Settings/Documents @dirrm share/gnome/apps/Settings/Desktop +@dirrm share/gnome/apps/Settings +@dirrm share/gnome/apps +@dirrm etc/CORBA/servers +@dirrm etc/CORBA diff --git a/sysutils/gnome-system-monitor/Makefile b/sysutils/gnome-system-monitor/Makefile index 98adf74..b288cc0 100644 --- a/sysutils/gnome-system-monitor/Makefile +++ b/sysutils/gnome-system-monitor/Makefile @@ -6,23 +6,21 @@ # PORTNAME= gtop -PORTVERSION= 1.0.7 +PORTVERSION= 1.0.8 CATEGORIES= sysutils gnome MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= stable/sources/gtop MAINTAINER= ade@FreeBSD.org -RUN_DEPENDS= panel:${PORTSDIR}/x11/gnomecore -LIB_DEPENDS= gtop.1:${PORTSDIR}/devel/libgtop +LIB_DEPENDS= panel_applet.4:${PORTSDIR}/x11/gnomecore GTK_CONFIG?= ${X11BASE}/bin/gtk12-config USE_X_PREFIX= yes USE_LIBTOOL= yes CONFIGURE_ARGS= --localstatedir=${PREFIX}/share/gnome \ - --datadir=${PREFIX}/share/gnome \ - --with-gnome=${PREFIX} + --datadir=${PREFIX}/share/gnome CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ GTK_CONFIG="${GTK_CONFIG}" \ LIBS="-L${LOCALBASE}/lib" diff --git a/sysutils/gnome-system-monitor/distinfo b/sysutils/gnome-system-monitor/distinfo index 879de51..6cd6b1f 100644 --- a/sysutils/gnome-system-monitor/distinfo +++ b/sysutils/gnome-system-monitor/distinfo @@ -1 +1 @@ -MD5 (gtop-1.0.7.tar.gz) = aa1f621dbe6461c5d6edd8d952c02d25 +MD5 (gtop-1.0.8.tar.gz) = f5749f352281c0e68d1d585207b9bec0 diff --git a/sysutils/gnome-system-monitor/pkg-plist b/sysutils/gnome-system-monitor/pkg-plist index a1d9220..8035098 100644 --- a/sysutils/gnome-system-monitor/pkg-plist +++ b/sysutils/gnome-system-monitor/pkg-plist @@ -1,7 +1,8 @@ bin/gtop -share/gnome/apps/Utilities/gtop.desktop +share/gnome/apps/System/gtop.desktop share/gnome/gtoprc -share/gnome/help/gtop/C/c12.html +share/gnome/help/gtop/C/credits.html +share/gnome/help/gtop/C/errata.html share/gnome/help/gtop/C/figs/gtop-fs-1.png share/gnome/help/gtop/C/figs/gtop-fs-2.png share/gnome/help/gtop/C/figs/gtop-mem.png @@ -11,25 +12,28 @@ share/gnome/help/gtop/C/figs/gtop-pic-middle.png share/gnome/help/gtop/C/figs/gtop-pic-top.png share/gnome/help/gtop/C/figs/gtop-prefs.png share/gnome/help/gtop/C/figs/gtop-proc.png +share/gnome/help/gtop/C/filesystems.html +share/gnome/help/gtop/C/gtop.html share/gnome/help/gtop/C/index.html +share/gnome/help/gtop/C/memory.html +share/gnome/help/gtop/C/more-info.html +share/gnome/help/gtop/C/preferences.html +share/gnome/help/gtop/C/processes.html share/gnome/help/gtop/C/topic.dat -share/gnome/help/gtop/C/x365.html -share/gnome/help/gtop/C/x436.html -share/gnome/help/gtop/C/x45.html -share/gnome/help/gtop/C/x511.html -share/gnome/help/gtop/C/x619.html -share/gnome/help/gtop/C/x627.html -share/gnome/help/gtop/C/x656.html share/gnome/pixmaps/gnome-gtop.png +share/locale/ca/LC_MESSAGES/gtop.mo share/locale/cs/LC_MESSAGES/gtop.mo share/locale/da/LC_MESSAGES/gtop.mo share/locale/de/LC_MESSAGES/gtop.mo +share/locale/el/LC_MESSAGES/gtop.mo share/locale/es/LC_MESSAGES/gtop.mo share/locale/fr/LC_MESSAGES/gtop.mo share/locale/ga/LC_MESSAGES/gtop.mo +share/locale/gl/LC_MESSAGES/gtop.mo share/locale/it/LC_MESSAGES/gtop.mo share/locale/ja/LC_MESSAGES/gtop.mo share/locale/ko/LC_MESSAGES/gtop.mo +share/locale/lt/LC_MESSAGES/gtop.mo share/locale/no/LC_MESSAGES/gtop.mo share/locale/pl/LC_MESSAGES/gtop.mo share/locale/pt/LC_MESSAGES/gtop.mo diff --git a/sysutils/gnomecontrolcenter/Makefile b/sysutils/gnomecontrolcenter/Makefile index 59d72d7..1498851 100644 --- a/sysutils/gnomecontrolcenter/Makefile +++ b/sysutils/gnomecontrolcenter/Makefile @@ -6,7 +6,7 @@ # PORTNAME= gnomecontrolcenter -PORTVERSION= 1.0.53 +PORTVERSION= 1.2.0 CATEGORIES= sysutils gnome MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= stable/sources/control-center @@ -14,8 +14,7 @@ DISTNAME= control-center-${PORTVERSION} MAINTAINER= vanilla@FreeBSD.org -BUILD_DEPENDS= panel:${PORTSDIR}/x11/gnomecore -RUN_DEPENDS= panel:${PORTSDIR}/x11/gnomecore +LIB_DEPENDS= gnome.4:${PORTSDIR}/x11/gnomelibs GTK_CONFIG?= ${X11BASE}/bin/gtk12-config diff --git a/sysutils/gnomecontrolcenter/distinfo b/sysutils/gnomecontrolcenter/distinfo index 0524ffc..986850c 100644 --- a/sysutils/gnomecontrolcenter/distinfo +++ b/sysutils/gnomecontrolcenter/distinfo @@ -1 +1 @@ -MD5 (control-center-1.0.53.tar.gz) = 6a50eecaf59d6ec2ce06bd6bdcee60a8 +MD5 (control-center-1.2.0.tar.gz) = c846abe32f63f409fb803b2960b7ba2e diff --git a/sysutils/gnomecontrolcenter/files/patch-bn b/sysutils/gnomecontrolcenter/files/patch-bn index e7543a0..da5233b 100644 --- a/sysutils/gnomecontrolcenter/files/patch-bn +++ b/sysutils/gnomecontrolcenter/files/patch-bn @@ -25,7 +25,7 @@ -libcapplet_la_LDFLAGS = -version-info 0:0:0 -rpath $(libdir) -+libcapplet_la_LDFLAGS = -version-info 1:0:0 ++libcapplet_la_LDFLAGS = -version-info 4:0:0 libcapplet_la_LIBADD = $(ORB_LIBS) -lm $(DL_LIB) $(GNORBA_LIBS) include_HEADERS = capplet-widget.h diff --git a/sysutils/gnomecontrolcenter/pkg-plist b/sysutils/gnomecontrolcenter/pkg-plist index ff9d67b..984a3c4 100644 --- a/sysutils/gnomecontrolcenter/pkg-plist +++ b/sysutils/gnomecontrolcenter/pkg-plist @@ -16,7 +16,7 @@ etc/cappletConf.sh include/capplet-widget.h lib/libcapplet.a lib/libcapplet.so -lib/libcapplet.so.1 +lib/libcapplet.so.4 @unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R @exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %B share/gnome/apps/Settings/Desktop/.directory @@ -24,6 +24,10 @@ share/gnome/apps/Settings/Desktop/background-properties.desktop share/gnome/apps/Settings/Desktop/screensaver-properties.desktop share/gnome/apps/Settings/Desktop/theme-selector.desktop share/gnome/apps/Settings/Desktop/wm-properties.desktop +share/gnome/apps/Settings/Documents/.directory +share/gnome/apps/Settings/Documents/gnome-edit-properties.desktop +share/gnome/apps/Settings/Documents/mime-type.desktop +share/gnome/apps/Settings/Documents/url-properties.desktop share/gnome/apps/Settings/Multimedia/.directory share/gnome/apps/Settings/Multimedia/sound-properties.desktop share/gnome/apps/Settings/Peripherals/.directory @@ -35,10 +39,7 @@ share/gnome/apps/Settings/UIOptions/.directory share/gnome/apps/Settings/UIOptions/application.desktop share/gnome/apps/Settings/UIOptions/dialogs.desktop share/gnome/apps/Settings/UIOptions/mdi.desktop -share/gnome/apps/Settings/gnome-edit-properties.desktop share/gnome/apps/Settings/gnomecc.desktop -share/gnome/apps/Settings/mime-type.desktop -share/gnome/apps/Settings/url-properties.desktop share/gnome/control-center/.data/3d.desktop share/gnome/control-center/.data/3d.png share/gnome/control-center/.data/Ant.desktop @@ -174,6 +175,10 @@ share/gnome/control-center/Desktop/background-properties.desktop share/gnome/control-center/Desktop/screensaver-properties.desktop share/gnome/control-center/Desktop/theme-selector.desktop share/gnome/control-center/Desktop/wm-properties.desktop +share/gnome/control-center/Documents/.directory +share/gnome/control-center/Documents/gnome-edit-properties.desktop +share/gnome/control-center/Documents/mime-type.desktop +share/gnome/control-center/Documents/url-properties.desktop share/gnome/control-center/Multimedia/.directory share/gnome/control-center/Multimedia/sound-properties.desktop share/gnome/control-center/Peripherals/.directory @@ -185,29 +190,52 @@ share/gnome/control-center/UIOptions/.directory share/gnome/control-center/UIOptions/application.desktop share/gnome/control-center/UIOptions/dialogs.desktop share/gnome/control-center/UIOptions/mdi.desktop -share/gnome/control-center/gnome-edit-properties.desktop -share/gnome/control-center/mime-type.desktop -share/gnome/control-center/url-properties.desktop +share/gnome/help/control-center/C/figs/bg-capplet.png +share/gnome/help/control-center/C/figs/gccappdef.png +share/gnome/help/control-center/C/figs/gccdialog.png +share/gnome/help/control-center/C/figs/gccedit.png +share/gnome/help/control-center/C/figs/gcchints.png +share/gnome/help/control-center/C/figs/gccmdi.png +share/gnome/help/control-center/C/figs/gccmime.png +share/gnome/help/control-center/C/figs/gccsession-props.png +share/gnome/help/control-center/C/figs/gccsound1.png +share/gnome/help/control-center/C/figs/gccsound2.png +share/gnome/help/control-center/C/figs/gccstartup.png +share/gnome/help/control-center/C/figs/gccurl.png +share/gnome/help/control-center/C/figs/glob_pref_anim.png +share/gnome/help/control-center/C/figs/keyboard-capplet.png +share/gnome/help/control-center/C/figs/mouse-capplet.png +share/gnome/help/control-center/C/figs/screensave-capplet.png +share/gnome/help/control-center/C/figs/theme-select.png +share/gnome/help/control-center/C/figs/wm-main.png +share/gnome/help/control-center/C/index.html +share/gnome/help/control-center/C/topic.dat share/gnome/idl/control-center.idl +share/gnome/pixmaps/ccsplash.png share/gnome/pixmaps/control-center.png share/gnome/wm-properties/Enlightenment.desktop share/gnome/wm-properties/IceWM.desktop share/gnome/wm-properties/WindowMaker.desktop share/gnome/wm-properties/Scwm.desktop share/gnome/wm-properties/twm.desktop +share/locale/ca/LC_MESSAGES/control-center.mo share/locale/cs/LC_MESSAGES/control-center.mo share/locale/da/LC_MESSAGES/control-center.mo share/locale/de/LC_MESSAGES/control-center.mo +share/locale/el/LC_MESSAGES/control-center.mo share/locale/en_GB/LC_MESSAGES/control-center.mo share/locale/es/LC_MESSAGES/control-center.mo share/locale/et/LC_MESSAGES/control-center.mo share/locale/fi/LC_MESSAGES/control-center.mo share/locale/fr/LC_MESSAGES/control-center.mo share/locale/ga/LC_MESSAGES/control-center.mo +share/locale/gl/LC_MESSAGES/control-center.mo +share/locale/hr/LC_MESSAGES/control-center.mo share/locale/hu/LC_MESSAGES/control-center.mo share/locale/it/LC_MESSAGES/control-center.mo share/locale/ja/LC_MESSAGES/control-center.mo share/locale/ko/LC_MESSAGES/control-center.mo +share/locale/lt/LC_MESSAGES/control-center.mo share/locale/nl/LC_MESSAGES/control-center.mo share/locale/no/LC_MESSAGES/control-center.mo share/locale/pl/LC_MESSAGES/control-center.mo @@ -216,11 +244,21 @@ share/locale/pt_BR/LC_MESSAGES/control-center.mo share/locale/ro/LC_MESSAGES/control-center.mo share/locale/ru/LC_MESSAGES/control-center.mo share/locale/sv/LC_MESSAGES/control-center.mo +share/locale/tr/LC_MESSAGES/control-center.mo +share/locale/uk/LC_MESSAGES/control-center.mo +share/locale/zh_CN.GB2312/LC_MESSAGES/control-center.mo +share/locale/zh_TW.Big5/LC_MESSAGES/control-center.mo @dirrm share/gnome/wm-properties +@dirrm share/gnome/help/control-center/C/stylesheet-images +@dirrm share/gnome/help/control-center/C/figs +@dirrm share/gnome/help/control-center/C +@dirrm share/gnome/help/control-center +@dirrm share/gnome/help @dirrm share/gnome/control-center/UIOptions @dirrm share/gnome/control-center/Session @dirrm share/gnome/control-center/Peripherals @dirrm share/gnome/control-center/Multimedia +@dirrm share/gnome/control-center/Documents @dirrm share/gnome/control-center/Desktop @dirrm share/gnome/control-center/.data @dirrm share/gnome/control-center @@ -228,4 +266,9 @@ share/locale/sv/LC_MESSAGES/control-center.mo @dirrm share/gnome/apps/Settings/Session @dirrm share/gnome/apps/Settings/Peripherals @dirrm share/gnome/apps/Settings/Multimedia +@dirrm share/gnome/apps/Settings/Documents @dirrm share/gnome/apps/Settings/Desktop +@dirrm share/gnome/apps/Settings +@dirrm share/gnome/apps +@dirrm etc/CORBA/servers +@dirrm etc/CORBA diff --git a/sysutils/gnomecontrolcenter2/Makefile b/sysutils/gnomecontrolcenter2/Makefile index 59d72d7..1498851 100644 --- a/sysutils/gnomecontrolcenter2/Makefile +++ b/sysutils/gnomecontrolcenter2/Makefile @@ -6,7 +6,7 @@ # PORTNAME= gnomecontrolcenter -PORTVERSION= 1.0.53 +PORTVERSION= 1.2.0 CATEGORIES= sysutils gnome MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= stable/sources/control-center @@ -14,8 +14,7 @@ DISTNAME= control-center-${PORTVERSION} MAINTAINER= vanilla@FreeBSD.org -BUILD_DEPENDS= panel:${PORTSDIR}/x11/gnomecore -RUN_DEPENDS= panel:${PORTSDIR}/x11/gnomecore +LIB_DEPENDS= gnome.4:${PORTSDIR}/x11/gnomelibs GTK_CONFIG?= ${X11BASE}/bin/gtk12-config diff --git a/sysutils/gnomecontrolcenter2/distinfo b/sysutils/gnomecontrolcenter2/distinfo index 0524ffc..986850c 100644 --- a/sysutils/gnomecontrolcenter2/distinfo +++ b/sysutils/gnomecontrolcenter2/distinfo @@ -1 +1 @@ -MD5 (control-center-1.0.53.tar.gz) = 6a50eecaf59d6ec2ce06bd6bdcee60a8 +MD5 (control-center-1.2.0.tar.gz) = c846abe32f63f409fb803b2960b7ba2e diff --git a/sysutils/gnomecontrolcenter2/files/patch-bn b/sysutils/gnomecontrolcenter2/files/patch-bn index e7543a0..da5233b 100644 --- a/sysutils/gnomecontrolcenter2/files/patch-bn +++ b/sysutils/gnomecontrolcenter2/files/patch-bn @@ -25,7 +25,7 @@ -libcapplet_la_LDFLAGS = -version-info 0:0:0 -rpath $(libdir) -+libcapplet_la_LDFLAGS = -version-info 1:0:0 ++libcapplet_la_LDFLAGS = -version-info 4:0:0 libcapplet_la_LIBADD = $(ORB_LIBS) -lm $(DL_LIB) $(GNORBA_LIBS) include_HEADERS = capplet-widget.h diff --git a/sysutils/gnomecontrolcenter2/pkg-plist b/sysutils/gnomecontrolcenter2/pkg-plist index ff9d67b..984a3c4 100644 --- a/sysutils/gnomecontrolcenter2/pkg-plist +++ b/sysutils/gnomecontrolcenter2/pkg-plist @@ -16,7 +16,7 @@ etc/cappletConf.sh include/capplet-widget.h lib/libcapplet.a lib/libcapplet.so -lib/libcapplet.so.1 +lib/libcapplet.so.4 @unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R @exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %B share/gnome/apps/Settings/Desktop/.directory @@ -24,6 +24,10 @@ share/gnome/apps/Settings/Desktop/background-properties.desktop share/gnome/apps/Settings/Desktop/screensaver-properties.desktop share/gnome/apps/Settings/Desktop/theme-selector.desktop share/gnome/apps/Settings/Desktop/wm-properties.desktop +share/gnome/apps/Settings/Documents/.directory +share/gnome/apps/Settings/Documents/gnome-edit-properties.desktop +share/gnome/apps/Settings/Documents/mime-type.desktop +share/gnome/apps/Settings/Documents/url-properties.desktop share/gnome/apps/Settings/Multimedia/.directory share/gnome/apps/Settings/Multimedia/sound-properties.desktop share/gnome/apps/Settings/Peripherals/.directory @@ -35,10 +39,7 @@ share/gnome/apps/Settings/UIOptions/.directory share/gnome/apps/Settings/UIOptions/application.desktop share/gnome/apps/Settings/UIOptions/dialogs.desktop share/gnome/apps/Settings/UIOptions/mdi.desktop -share/gnome/apps/Settings/gnome-edit-properties.desktop share/gnome/apps/Settings/gnomecc.desktop -share/gnome/apps/Settings/mime-type.desktop -share/gnome/apps/Settings/url-properties.desktop share/gnome/control-center/.data/3d.desktop share/gnome/control-center/.data/3d.png share/gnome/control-center/.data/Ant.desktop @@ -174,6 +175,10 @@ share/gnome/control-center/Desktop/background-properties.desktop share/gnome/control-center/Desktop/screensaver-properties.desktop share/gnome/control-center/Desktop/theme-selector.desktop share/gnome/control-center/Desktop/wm-properties.desktop +share/gnome/control-center/Documents/.directory +share/gnome/control-center/Documents/gnome-edit-properties.desktop +share/gnome/control-center/Documents/mime-type.desktop +share/gnome/control-center/Documents/url-properties.desktop share/gnome/control-center/Multimedia/.directory share/gnome/control-center/Multimedia/sound-properties.desktop share/gnome/control-center/Peripherals/.directory @@ -185,29 +190,52 @@ share/gnome/control-center/UIOptions/.directory share/gnome/control-center/UIOptions/application.desktop share/gnome/control-center/UIOptions/dialogs.desktop share/gnome/control-center/UIOptions/mdi.desktop -share/gnome/control-center/gnome-edit-properties.desktop -share/gnome/control-center/mime-type.desktop -share/gnome/control-center/url-properties.desktop +share/gnome/help/control-center/C/figs/bg-capplet.png +share/gnome/help/control-center/C/figs/gccappdef.png +share/gnome/help/control-center/C/figs/gccdialog.png +share/gnome/help/control-center/C/figs/gccedit.png +share/gnome/help/control-center/C/figs/gcchints.png +share/gnome/help/control-center/C/figs/gccmdi.png +share/gnome/help/control-center/C/figs/gccmime.png +share/gnome/help/control-center/C/figs/gccsession-props.png +share/gnome/help/control-center/C/figs/gccsound1.png +share/gnome/help/control-center/C/figs/gccsound2.png +share/gnome/help/control-center/C/figs/gccstartup.png +share/gnome/help/control-center/C/figs/gccurl.png +share/gnome/help/control-center/C/figs/glob_pref_anim.png +share/gnome/help/control-center/C/figs/keyboard-capplet.png +share/gnome/help/control-center/C/figs/mouse-capplet.png +share/gnome/help/control-center/C/figs/screensave-capplet.png +share/gnome/help/control-center/C/figs/theme-select.png +share/gnome/help/control-center/C/figs/wm-main.png +share/gnome/help/control-center/C/index.html +share/gnome/help/control-center/C/topic.dat share/gnome/idl/control-center.idl +share/gnome/pixmaps/ccsplash.png share/gnome/pixmaps/control-center.png share/gnome/wm-properties/Enlightenment.desktop share/gnome/wm-properties/IceWM.desktop share/gnome/wm-properties/WindowMaker.desktop share/gnome/wm-properties/Scwm.desktop share/gnome/wm-properties/twm.desktop +share/locale/ca/LC_MESSAGES/control-center.mo share/locale/cs/LC_MESSAGES/control-center.mo share/locale/da/LC_MESSAGES/control-center.mo share/locale/de/LC_MESSAGES/control-center.mo +share/locale/el/LC_MESSAGES/control-center.mo share/locale/en_GB/LC_MESSAGES/control-center.mo share/locale/es/LC_MESSAGES/control-center.mo share/locale/et/LC_MESSAGES/control-center.mo share/locale/fi/LC_MESSAGES/control-center.mo share/locale/fr/LC_MESSAGES/control-center.mo share/locale/ga/LC_MESSAGES/control-center.mo +share/locale/gl/LC_MESSAGES/control-center.mo +share/locale/hr/LC_MESSAGES/control-center.mo share/locale/hu/LC_MESSAGES/control-center.mo share/locale/it/LC_MESSAGES/control-center.mo share/locale/ja/LC_MESSAGES/control-center.mo share/locale/ko/LC_MESSAGES/control-center.mo +share/locale/lt/LC_MESSAGES/control-center.mo share/locale/nl/LC_MESSAGES/control-center.mo share/locale/no/LC_MESSAGES/control-center.mo share/locale/pl/LC_MESSAGES/control-center.mo @@ -216,11 +244,21 @@ share/locale/pt_BR/LC_MESSAGES/control-center.mo share/locale/ro/LC_MESSAGES/control-center.mo share/locale/ru/LC_MESSAGES/control-center.mo share/locale/sv/LC_MESSAGES/control-center.mo +share/locale/tr/LC_MESSAGES/control-center.mo +share/locale/uk/LC_MESSAGES/control-center.mo +share/locale/zh_CN.GB2312/LC_MESSAGES/control-center.mo +share/locale/zh_TW.Big5/LC_MESSAGES/control-center.mo @dirrm share/gnome/wm-properties +@dirrm share/gnome/help/control-center/C/stylesheet-images +@dirrm share/gnome/help/control-center/C/figs +@dirrm share/gnome/help/control-center/C +@dirrm share/gnome/help/control-center +@dirrm share/gnome/help @dirrm share/gnome/control-center/UIOptions @dirrm share/gnome/control-center/Session @dirrm share/gnome/control-center/Peripherals @dirrm share/gnome/control-center/Multimedia +@dirrm share/gnome/control-center/Documents @dirrm share/gnome/control-center/Desktop @dirrm share/gnome/control-center/.data @dirrm share/gnome/control-center @@ -228,4 +266,9 @@ share/locale/sv/LC_MESSAGES/control-center.mo @dirrm share/gnome/apps/Settings/Session @dirrm share/gnome/apps/Settings/Peripherals @dirrm share/gnome/apps/Settings/Multimedia +@dirrm share/gnome/apps/Settings/Documents @dirrm share/gnome/apps/Settings/Desktop +@dirrm share/gnome/apps/Settings +@dirrm share/gnome/apps +@dirrm etc/CORBA/servers +@dirrm etc/CORBA diff --git a/sysutils/gnomesystemmonitor/Makefile b/sysutils/gnomesystemmonitor/Makefile index 98adf74..b288cc0 100644 --- a/sysutils/gnomesystemmonitor/Makefile +++ b/sysutils/gnomesystemmonitor/Makefile @@ -6,23 +6,21 @@ # PORTNAME= gtop -PORTVERSION= 1.0.7 +PORTVERSION= 1.0.8 CATEGORIES= sysutils gnome MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= stable/sources/gtop MAINTAINER= ade@FreeBSD.org -RUN_DEPENDS= panel:${PORTSDIR}/x11/gnomecore -LIB_DEPENDS= gtop.1:${PORTSDIR}/devel/libgtop +LIB_DEPENDS= panel_applet.4:${PORTSDIR}/x11/gnomecore GTK_CONFIG?= ${X11BASE}/bin/gtk12-config USE_X_PREFIX= yes USE_LIBTOOL= yes CONFIGURE_ARGS= --localstatedir=${PREFIX}/share/gnome \ - --datadir=${PREFIX}/share/gnome \ - --with-gnome=${PREFIX} + --datadir=${PREFIX}/share/gnome CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ GTK_CONFIG="${GTK_CONFIG}" \ LIBS="-L${LOCALBASE}/lib" diff --git a/sysutils/gnomesystemmonitor/distinfo b/sysutils/gnomesystemmonitor/distinfo index 879de51..6cd6b1f 100644 --- a/sysutils/gnomesystemmonitor/distinfo +++ b/sysutils/gnomesystemmonitor/distinfo @@ -1 +1 @@ -MD5 (gtop-1.0.7.tar.gz) = aa1f621dbe6461c5d6edd8d952c02d25 +MD5 (gtop-1.0.8.tar.gz) = f5749f352281c0e68d1d585207b9bec0 diff --git a/sysutils/gnomesystemmonitor/pkg-plist b/sysutils/gnomesystemmonitor/pkg-plist index a1d9220..8035098 100644 --- a/sysutils/gnomesystemmonitor/pkg-plist +++ b/sysutils/gnomesystemmonitor/pkg-plist @@ -1,7 +1,8 @@ bin/gtop -share/gnome/apps/Utilities/gtop.desktop +share/gnome/apps/System/gtop.desktop share/gnome/gtoprc -share/gnome/help/gtop/C/c12.html +share/gnome/help/gtop/C/credits.html +share/gnome/help/gtop/C/errata.html share/gnome/help/gtop/C/figs/gtop-fs-1.png share/gnome/help/gtop/C/figs/gtop-fs-2.png share/gnome/help/gtop/C/figs/gtop-mem.png @@ -11,25 +12,28 @@ share/gnome/help/gtop/C/figs/gtop-pic-middle.png share/gnome/help/gtop/C/figs/gtop-pic-top.png share/gnome/help/gtop/C/figs/gtop-prefs.png share/gnome/help/gtop/C/figs/gtop-proc.png +share/gnome/help/gtop/C/filesystems.html +share/gnome/help/gtop/C/gtop.html share/gnome/help/gtop/C/index.html +share/gnome/help/gtop/C/memory.html +share/gnome/help/gtop/C/more-info.html +share/gnome/help/gtop/C/preferences.html +share/gnome/help/gtop/C/processes.html share/gnome/help/gtop/C/topic.dat -share/gnome/help/gtop/C/x365.html -share/gnome/help/gtop/C/x436.html -share/gnome/help/gtop/C/x45.html -share/gnome/help/gtop/C/x511.html -share/gnome/help/gtop/C/x619.html -share/gnome/help/gtop/C/x627.html -share/gnome/help/gtop/C/x656.html share/gnome/pixmaps/gnome-gtop.png +share/locale/ca/LC_MESSAGES/gtop.mo share/locale/cs/LC_MESSAGES/gtop.mo share/locale/da/LC_MESSAGES/gtop.mo share/locale/de/LC_MESSAGES/gtop.mo +share/locale/el/LC_MESSAGES/gtop.mo share/locale/es/LC_MESSAGES/gtop.mo share/locale/fr/LC_MESSAGES/gtop.mo share/locale/ga/LC_MESSAGES/gtop.mo +share/locale/gl/LC_MESSAGES/gtop.mo share/locale/it/LC_MESSAGES/gtop.mo share/locale/ja/LC_MESSAGES/gtop.mo share/locale/ko/LC_MESSAGES/gtop.mo +share/locale/lt/LC_MESSAGES/gtop.mo share/locale/no/LC_MESSAGES/gtop.mo share/locale/pl/LC_MESSAGES/gtop.mo share/locale/pt/LC_MESSAGES/gtop.mo diff --git a/sysutils/gtop/Makefile b/sysutils/gtop/Makefile index 98adf74..b288cc0 100644 --- a/sysutils/gtop/Makefile +++ b/sysutils/gtop/Makefile @@ -6,23 +6,21 @@ # PORTNAME= gtop -PORTVERSION= 1.0.7 +PORTVERSION= 1.0.8 CATEGORIES= sysutils gnome MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= stable/sources/gtop MAINTAINER= ade@FreeBSD.org -RUN_DEPENDS= panel:${PORTSDIR}/x11/gnomecore -LIB_DEPENDS= gtop.1:${PORTSDIR}/devel/libgtop +LIB_DEPENDS= panel_applet.4:${PORTSDIR}/x11/gnomecore GTK_CONFIG?= ${X11BASE}/bin/gtk12-config USE_X_PREFIX= yes USE_LIBTOOL= yes CONFIGURE_ARGS= --localstatedir=${PREFIX}/share/gnome \ - --datadir=${PREFIX}/share/gnome \ - --with-gnome=${PREFIX} + --datadir=${PREFIX}/share/gnome CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ GTK_CONFIG="${GTK_CONFIG}" \ LIBS="-L${LOCALBASE}/lib" diff --git a/sysutils/gtop/distinfo b/sysutils/gtop/distinfo index 879de51..6cd6b1f 100644 --- a/sysutils/gtop/distinfo +++ b/sysutils/gtop/distinfo @@ -1 +1 @@ -MD5 (gtop-1.0.7.tar.gz) = aa1f621dbe6461c5d6edd8d952c02d25 +MD5 (gtop-1.0.8.tar.gz) = f5749f352281c0e68d1d585207b9bec0 diff --git a/sysutils/gtop/pkg-plist b/sysutils/gtop/pkg-plist index a1d9220..8035098 100644 --- a/sysutils/gtop/pkg-plist +++ b/sysutils/gtop/pkg-plist @@ -1,7 +1,8 @@ bin/gtop -share/gnome/apps/Utilities/gtop.desktop +share/gnome/apps/System/gtop.desktop share/gnome/gtoprc -share/gnome/help/gtop/C/c12.html +share/gnome/help/gtop/C/credits.html +share/gnome/help/gtop/C/errata.html share/gnome/help/gtop/C/figs/gtop-fs-1.png share/gnome/help/gtop/C/figs/gtop-fs-2.png share/gnome/help/gtop/C/figs/gtop-mem.png @@ -11,25 +12,28 @@ share/gnome/help/gtop/C/figs/gtop-pic-middle.png share/gnome/help/gtop/C/figs/gtop-pic-top.png share/gnome/help/gtop/C/figs/gtop-prefs.png share/gnome/help/gtop/C/figs/gtop-proc.png +share/gnome/help/gtop/C/filesystems.html +share/gnome/help/gtop/C/gtop.html share/gnome/help/gtop/C/index.html +share/gnome/help/gtop/C/memory.html +share/gnome/help/gtop/C/more-info.html +share/gnome/help/gtop/C/preferences.html +share/gnome/help/gtop/C/processes.html share/gnome/help/gtop/C/topic.dat -share/gnome/help/gtop/C/x365.html -share/gnome/help/gtop/C/x436.html -share/gnome/help/gtop/C/x45.html -share/gnome/help/gtop/C/x511.html -share/gnome/help/gtop/C/x619.html -share/gnome/help/gtop/C/x627.html -share/gnome/help/gtop/C/x656.html share/gnome/pixmaps/gnome-gtop.png +share/locale/ca/LC_MESSAGES/gtop.mo share/locale/cs/LC_MESSAGES/gtop.mo share/locale/da/LC_MESSAGES/gtop.mo share/locale/de/LC_MESSAGES/gtop.mo +share/locale/el/LC_MESSAGES/gtop.mo share/locale/es/LC_MESSAGES/gtop.mo share/locale/fr/LC_MESSAGES/gtop.mo share/locale/ga/LC_MESSAGES/gtop.mo +share/locale/gl/LC_MESSAGES/gtop.mo share/locale/it/LC_MESSAGES/gtop.mo share/locale/ja/LC_MESSAGES/gtop.mo share/locale/ko/LC_MESSAGES/gtop.mo +share/locale/lt/LC_MESSAGES/gtop.mo share/locale/no/LC_MESSAGES/gtop.mo share/locale/pl/LC_MESSAGES/gtop.mo share/locale/pt/LC_MESSAGES/gtop.mo diff --git a/x11-fm/gnomemc/Makefile b/x11-fm/gnomemc/Makefile index 26b15a3..c8754f1 100644 --- a/x11-fm/gnomemc/Makefile +++ b/x11-fm/gnomemc/Makefile @@ -6,7 +6,7 @@ # PORTNAME= gnomemc -PORTVERSION= 4.5.48 +PORTVERSION= 4.5.50 CATEGORIES= x11-fm gnome MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= stable/sources/mc @@ -14,8 +14,7 @@ DISTNAME= mc-${PORTVERSION} MAINTAINER= reg@FreeBSD.org -BUILD_DEPENDS= panel:${PORTSDIR}/x11/gnomecore -RUN_DEPENDS= panel:${PORTSDIR}/x11/gnomecore +LIB_DEPENDS= panel_applet.4:${PORTSDIR}/x11/gnomecore GLIB_CONFIG?= ${LOCALBASE}/bin/glib12-config diff --git a/x11-fm/gnomemc/distinfo b/x11-fm/gnomemc/distinfo index d2b3039..b45ad77 100644 --- a/x11-fm/gnomemc/distinfo +++ b/x11-fm/gnomemc/distinfo @@ -1 +1 @@ -MD5 (mc-4.5.48.tar.gz) = 0ed6f7cda24307c13afb0c1d1a9fb7a0 +MD5 (mc-4.5.50.tar.gz) = a9808074a863e564264719632ecc1c97 diff --git a/x11-fm/gnomemc/files/patch-aj b/x11-fm/gnomemc/files/patch-aj new file mode 100644 index 0000000..cd20a6e --- /dev/null +++ b/x11-fm/gnomemc/files/patch-aj @@ -0,0 +1,11 @@ +--- gnome/gnome-open-dialog.c.orig Mon May 29 16:56:28 2000 ++++ gnome/gnome-open-dialog.c Wed May 31 12:30:36 2000 +@@ -359,7 +359,7 @@ + gtk_clist_set_column_auto_resize (GTK_CLIST (retval), 0, TRUE); + + /* set up the apps */ +- prefix = gnome_unconditional_datadir_file ("gnome/apps"); ++ prefix = gnome_unconditional_datadir_file ("apps"); + node = read_directory (prefix); + gnome_open_dialog_generate_tree_helper (GTK_CTREE (retval), NULL, node); + gtk_ctree_expand_recursive (GTK_CTREE (retval), NULL); diff --git a/x11-fm/gnomemc/pkg-plist b/x11-fm/gnomemc/pkg-plist index 381b33d..311cb52 100644 --- a/x11-fm/gnomemc/pkg-plist +++ b/x11-fm/gnomemc/pkg-plist @@ -6,7 +6,6 @@ etc/mc.global share/gnome/idl/FileManager.idl share/gnome/idl/Makefile.in share/gnome/mc/FAQ -share/gnome/mc/cedit.menu share/gnome/mc/desktop-scripts/README.desktop share/gnome/mc/desktop-scripts/startup.links share/gnome/mc/edit.indent.rc diff --git a/x11-toolkits/py-gnome/Makefile b/x11-toolkits/py-gnome/Makefile index c17d9fe..b380c0d 100644 --- a/x11-toolkits/py-gnome/Makefile +++ b/x11-toolkits/py-gnome/Makefile @@ -19,13 +19,17 @@ MAINTAINER= nectar@FreeBSD.org BUILD_DEPENDS= python1.5:${PORTSDIR}/lang/python ${PYGTK_DEP} LIB_DEPENDS= gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 \ - capplet.1:${PORTSDIR}/sysutils/gnomecontrolcenter + capplet.4:${PORTSDIR}/sysutils/gnomecontrolcenter RUN_DEPENDS= python1.5:${PORTSDIR}/lang/python ${PYGTK_DEP} -GTK_CONFIG= ${X11BASE}/bin/gtk12-config -GNU_CONFIGURE= yes +GLIB_CONFIG?= ${LOCALBASE}/bin/glib12-config +GTK_CONFIG?= ${X11BASE}/bin/gtk12-config + USE_GMAKE= yes -CONFIGURE_ENV= GTK_CONFIG=${GTK_CONFIG} +USE_LIBTOOL= yes +LIBTOOLFILES= configure pygnome/configure pygtk/configure +CONFIGURE_ENV= GLIB_CONFIG="${GLIB_CONFIG}" \ + GTK_CONFIG="${GTK_CONFIG}" CONFIGURE_ARGS= --with-python=python1.5 \ --with-gnome-config=${X11BASE}/bin/gnome-config diff --git a/x11-toolkits/py-gnome2/Makefile b/x11-toolkits/py-gnome2/Makefile index c17d9fe..b380c0d 100644 --- a/x11-toolkits/py-gnome2/Makefile +++ b/x11-toolkits/py-gnome2/Makefile @@ -19,13 +19,17 @@ MAINTAINER= nectar@FreeBSD.org BUILD_DEPENDS= python1.5:${PORTSDIR}/lang/python ${PYGTK_DEP} LIB_DEPENDS= gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 \ - capplet.1:${PORTSDIR}/sysutils/gnomecontrolcenter + capplet.4:${PORTSDIR}/sysutils/gnomecontrolcenter RUN_DEPENDS= python1.5:${PORTSDIR}/lang/python ${PYGTK_DEP} -GTK_CONFIG= ${X11BASE}/bin/gtk12-config -GNU_CONFIGURE= yes +GLIB_CONFIG?= ${LOCALBASE}/bin/glib12-config +GTK_CONFIG?= ${X11BASE}/bin/gtk12-config + USE_GMAKE= yes -CONFIGURE_ENV= GTK_CONFIG=${GTK_CONFIG} +USE_LIBTOOL= yes +LIBTOOLFILES= configure pygnome/configure pygtk/configure +CONFIGURE_ENV= GLIB_CONFIG="${GLIB_CONFIG}" \ + GTK_CONFIG="${GTK_CONFIG}" CONFIGURE_ARGS= --with-python=python1.5 \ --with-gnome-config=${X11BASE}/bin/gnome-config diff --git a/x11/gnome-libs/Makefile b/x11/gnome-libs/Makefile index 3d9d925..e337e40 100644 --- a/x11/gnome-libs/Makefile +++ b/x11/gnome-libs/Makefile @@ -6,7 +6,7 @@ # PORTNAME= gnomelibs -PORTVERSION= 1.0.62 +PORTVERSION= 1.2.1 CATEGORIES= x11 gnome MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= stable/sources/gnome-libs diff --git a/x11/gnome-libs/distinfo b/x11/gnome-libs/distinfo index ddcba63..00f11e8 100644 --- a/x11/gnome-libs/distinfo +++ b/x11/gnome-libs/distinfo @@ -1 +1 @@ -MD5 (gnome-libs-1.0.62.tar.gz) = 61be1867df2e0a922480901b56ed57e7 +MD5 (gnome-libs-1.2.1.tar.gz) = 1e43e482069c79058ab6842d5294fe15 diff --git a/x11/gnome-libs/files/patch-bb b/x11/gnome-libs/files/patch-bb index 2ec913f..fed78b9 100644 --- a/x11/gnome-libs/files/patch-bb +++ b/x11/gnome-libs/files/patch-bb @@ -14,7 +14,7 @@ -libgtkxmhtml_la_LDFLAGS = -version-info 1:1:0 -rpath $(libdir) -+libgtkxmhtml_la_LDFLAGS = -version-info 3:0:0 -rpath $(libdir) ++libgtkxmhtml_la_LDFLAGS = -version-info 4:0:0 -rpath $(libdir) libgtkxmhtml_la_LIBADD = $(LIBGTKXMHTML_LIBS) noinst_PROGRAMS = htmltest diff --git a/x11/gnome-libs/files/patch-bc b/x11/gnome-libs/files/patch-bc index c4a4408..6487060 100644 --- a/x11/gnome-libs/files/patch-bc +++ b/x11/gnome-libs/files/patch-bc @@ -5,7 +5,7 @@ EXTRA_DIST = parse-path.cP -libgnome_la_LDFLAGS = -version-info 35:11:3 #-rpath $(libdir) -+libgnome_la_LDFLAGS = -version-info 3:0:0 #-rpath $(libdir) ++libgnome_la_LDFLAGS = -version-info 4:0:0 #-rpath $(libdir) libgnome_la_LIBADD = $(GLIB_LIBS) -lm $(DL_LIB) bin_PROGRAMS = dns-helper gnome-dump-metadata gnome-moz-remote gconfigger gnome-gen-mimedb diff --git a/x11/gnome-libs/files/patch-bd b/x11/gnome-libs/files/patch-bd index 3daa6e3..abd17fa 100644 --- a/x11/gnome-libs/files/patch-bd +++ b/x11/gnome-libs/files/patch-bd @@ -5,7 +5,7 @@ -libgnomeui_la_LDFLAGS = -version-info 43:2:11 -rpath $(libdir) -+libgnomeui_la_LDFLAGS = -version-info 3:0:0 -rpath $(libdir) ++libgnomeui_la_LDFLAGS = -version-info 4:0:0 -rpath $(libdir) libgnomeui_la_LIBADD = $(LIBGNOMEUI_LIBS) gnome_segv_LDADD = libgnomeui.la $(top_builddir)/libgnome/libgnome.la $(top_builddir)/libart_lgpl/libart_lgpl.la @LIBSUPPORT@ $(LIBGNOMEUI_LIBS) $(INTLLIBS) diff --git a/x11/gnome-libs/files/patch-be b/x11/gnome-libs/files/patch-be index 324e501..aa26991 100644 --- a/x11/gnome-libs/files/patch-be +++ b/x11/gnome-libs/files/patch-be @@ -5,7 +5,7 @@ -libgnorba_la_LDFLAGS = -version-info 28:8:1 -rpath $(libdir) -+libgnorba_la_LDFLAGS = -version-info 3:0:0 -rpath $(libdir) ++libgnorba_la_LDFLAGS = -version-info 4:0:0 -rpath $(libdir) libgnorba_la_LIBADD = $(ORBIT_LIBS) $(GLIB_LIBS) -lm loadshlib_SOURCES = loadshlib.c @@ -14,7 +14,7 @@ gnome-unknown-skels.lo gnome-unknown-stubs.lo gnome-unknown-common.lo \ goad.lo orbitgtk.lo orbitgnome.lo orbitns.lo -libgnorbagtk_la_LDFLAGS = -+libgnorbagtk_la_LDFLAGS = -version-info 3:0:0 -rpath $(libdir) ++libgnorbagtk_la_LDFLAGS = -version-info 4:0:0 -rpath $(libdir) libgnorbagtk_la_LIBADD = libgnorbagtk_la_OBJECTS = gnome-factory-skels.lo gnome-factory-stubs.lo \ gnome-factory-common.lo Table-skels.lo Table-stubs.lo Table-common.lo \ diff --git a/x11/gnome-libs/files/patch-bf b/x11/gnome-libs/files/patch-bf index 7bc59af..44e1d7a 100644 --- a/x11/gnome-libs/files/patch-bf +++ b/x11/gnome-libs/files/patch-bf @@ -14,7 +14,7 @@ libgnomesupport_la_SOURCES = gnomesupport.h $(popt_sources) gnome-argp.c libgnomesupport_la_LIBADD = @LTLIBOBJS@ -libgnomesupport_la_LDFLAGS = -version-info 0:0:0 -+libgnomesupport_la_LDFLAGS = -version-info 3:0:0 ++libgnomesupport_la_LDFLAGS = -version-info 4:0:0 BUILT_SOURCES = gnomesupport.h diff --git a/x11/gnome-libs/files/patch-bg b/x11/gnome-libs/files/patch-bg index be3ca87..5405ccd 100644 --- a/x11/gnome-libs/files/patch-bg +++ b/x11/gnome-libs/files/patch-bg @@ -14,7 +14,7 @@ -libzvt_la_LDFLAGS = -version-info 4:7:2 -rpath $(libdir) -+libzvt_la_LDFLAGS = -version-info 3:0:0 -rpath $(libdir) ++libzvt_la_LDFLAGS = -version-info 4:0:0 -rpath $(libdir) libzvtinclude_HEADERS = lists.h vt.h vtx.h zvtterm.h diff --git a/x11/gnome-libs/files/patch-bi b/x11/gnome-libs/files/patch-bi index 8aeb458..32e3836 100644 --- a/x11/gnome-libs/files/patch-bi +++ b/x11/gnome-libs/files/patch-bi @@ -5,7 +5,7 @@ -libart_lgpl_la_LDFLAGS = -version-info @LIBART_VERSION_INFO@ -+libart_lgpl_la_LDFLAGS = -version-info 3:0:0 ++libart_lgpl_la_LDFLAGS = -version-info 4:0:0 libart_lgplincdir = $(includedir)/libart_lgpl libart_lgplinc_HEADERS = art_affine.h art_alphagamma.h art_bpath.h art_filterlevel.h art_gray_svp.h art_misc.h art_pathcode.h art_pixbuf.h art_point.h art_rect.h art_rect_svp.h art_rect_uta.h art_rgb.h art_rgb_affine.h art_rgb_bitmap_affine.h art_rgb_pixbuf_affine.h art_rgb_rgba_affine.h art_rgb_svp.h art_svp.h art_svp_ops.h art_svp_render_aa.h art_svp_vpath.h art_svp_vpath_stroke.h art_uta.h art_uta_ops.h art_uta_rect.h art_uta_vpath.h art_uta_svp.h art_vpath.h art_vpath_bpath.h art_vpath_svp.h diff --git a/x11/gnome-libs/pkg-plist b/x11/gnome-libs/pkg-plist index 3e7d6f9..87db948 100644 --- a/x11/gnome-libs/pkg-plist +++ b/x11/gnome-libs/pkg-plist @@ -63,6 +63,8 @@ include/libart_lgpl/art_vpath.h include/libart_lgpl/art_vpath_bpath.h include/libart_lgpl/art_vpath_dash.h include/libart_lgpl/art_vpath_svp.h +include/libart_lgpl/libart-features.h +include/libart_lgpl/libart.h include/libgnome/gnome-config.h include/libgnome/gnome-defs.h include/libgnome/gnome-dentry.h @@ -175,28 +177,28 @@ include/zvt/vtx.h include/zvt/zvtterm.h lib/libart_lgpl.a lib/libart_lgpl.so -lib/libart_lgpl.so.3 +lib/libart_lgpl.so.4 lib/libgnome.a lib/libgnome.so -lib/libgnome.so.3 +lib/libgnome.so.4 lib/libgnomesupport.a lib/libgnomesupport.so -lib/libgnomesupport.so.3 +lib/libgnomesupport.so.4 lib/libgnomeui.a lib/libgnomeui.so -lib/libgnomeui.so.3 +lib/libgnomeui.so.4 lib/libgnorba.a lib/libgnorba.so -lib/libgnorba.so.3 +lib/libgnorba.so.4 lib/libgnorbagtk.a lib/libgnorbagtk.so -lib/libgnorbagtk.so.3 +lib/libgnorbagtk.so.4 lib/libgtkxmhtml.a lib/libgtkxmhtml.so -lib/libgtkxmhtml.so.3 +lib/libgtkxmhtml.so.4 lib/libzvt.a lib/libzvt.so -lib/libzvt.so.3 +lib/libzvt.so.4 @unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R @exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %B share/aclocal/libart.m4 diff --git a/x11/gnome/Makefile b/x11/gnome/Makefile index 4df4095..ece23af 100644 --- a/x11/gnome/Makefile +++ b/x11/gnome/Makefile @@ -6,7 +6,7 @@ # PORTNAME= gnome -PORTVERSION= 1.0.53 +PORTVERSION= 1.2 CATEGORIES= x11 gnome MASTER_SITES= # empty DISTFILES= # empty @@ -16,31 +16,34 @@ MAINTAINER= ade@FreeBSD.org LIB_DEPENDS= glib12.3:${PORTSDIR}/devel/glib12 \ gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 \ - ORBit.2:${PORTSDIR}/devel/ORBit \ - Imlib.5:${PORTSDIR}/graphics/imlib \ audiofile.0:${PORTSDIR}/audio/libaudiofile \ esd.2:${PORTSDIR}/audio/esound \ - gnome.3:${PORTSDIR}/x11/gnomelibs \ + Imlib.5:${PORTSDIR}/graphics/imlib \ + ORBit.2:${PORTSDIR}/devel/ORBit \ + gnome.4:${PORTSDIR}/x11/gnomelibs \ gtop.1:${PORTSDIR}/devel/libgtop \ xml.5:${PORTSDIR}/textproc/libxml \ - gnomeprint.9:${PORTSDIR}/print/gnomeprint \ ghttp.1:${PORTSDIR}/www/libghttp \ - obgnome.1:${PORTSDIR}/lang/gnomeobjc \ - glade.3:${PORTSDIR}/devel/libglade -RUN_DEPENDS= ${X11BASE}/share/gnome/sounds/startup.wav:${PORTSDIR}/audio/gnomeaudio \ - panel:${PORTSDIR}/x11/gnomecore \ - gtcd:${PORTSDIR}/audio/gnomemedia \ + glade.3:${PORTSDIR}/devel/libglade \ + gdk_pixbuf.2:${PORTSDIR}/graphics/gdk-pixbuf \ + gnomeprint.9:${PORTSDIR}/print/gnomeprint + +RUN_DEPENDS= ${X11BASE}/share/themes/Metal/ICON.png:${PORTSDIR}/x11-toolkits/gtk-engines \ + another_clock_applet:${PORTSDIR}/x11/gnomeapplets \ + gmc:${PORTSDIR}/x11-fm/gnomemc \ + bug-buddy:${PORTSDIR}/devel/bugbuddy \ + glade:${PORTSDIR}/devel/glade \ + ${LOCALBASE}/lib/python1.5/site-packages/_appletmodule.so:${PORTSDIR}/x11-toolkits/py-gnome \ + ${X11BASE}/share/gnome/help/users-guide/aboutug.html:${PORTSDIR}/misc/gnomeusersguide \ + gcalc:${PORTSDIR}/misc/gnomeutils \ gnomecard:${PORTSDIR}/deskutils/gnomepim \ + ${X11BASE}/share/gnome/sounds/startup.wav:${PORTSDIR}/audio/gnomeaudio \ + gtcd:${PORTSDIR}/audio/gnomemedia \ gnomine:${PORTSDIR}/games/gnomegames \ ElectricEyes:${PORTSDIR}/graphics/electriceyes \ - gcalc:${PORTSDIR}/misc/gnomeutils \ - gtalk:${PORTSDIR}/net/gnomenetwork \ - ggv:${PORTSDIR}/print/ggv \ - gulp:${PORTSDIR}/sysutils/gnomeadmin \ - gnomecc:${PORTSDIR}/sysutils/gnomecontrolcenter \ + gnumeric:${PORTSDIR}/math/gnumeric \ gtop:${PORTSDIR}/sysutils/gtop \ - gmc:${PORTSDIR}/x11-fm/gnomemc \ - gnumeric:${PORTSDIR}/math/gnumeric + ggv:${PORTSDIR}/print/ggv NO_BUILD= yes diff --git a/x11/gnome2/Makefile b/x11/gnome2/Makefile index 4df4095..ece23af 100644 --- a/x11/gnome2/Makefile +++ b/x11/gnome2/Makefile @@ -6,7 +6,7 @@ # PORTNAME= gnome -PORTVERSION= 1.0.53 +PORTVERSION= 1.2 CATEGORIES= x11 gnome MASTER_SITES= # empty DISTFILES= # empty @@ -16,31 +16,34 @@ MAINTAINER= ade@FreeBSD.org LIB_DEPENDS= glib12.3:${PORTSDIR}/devel/glib12 \ gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 \ - ORBit.2:${PORTSDIR}/devel/ORBit \ - Imlib.5:${PORTSDIR}/graphics/imlib \ audiofile.0:${PORTSDIR}/audio/libaudiofile \ esd.2:${PORTSDIR}/audio/esound \ - gnome.3:${PORTSDIR}/x11/gnomelibs \ + Imlib.5:${PORTSDIR}/graphics/imlib \ + ORBit.2:${PORTSDIR}/devel/ORBit \ + gnome.4:${PORTSDIR}/x11/gnomelibs \ gtop.1:${PORTSDIR}/devel/libgtop \ xml.5:${PORTSDIR}/textproc/libxml \ - gnomeprint.9:${PORTSDIR}/print/gnomeprint \ ghttp.1:${PORTSDIR}/www/libghttp \ - obgnome.1:${PORTSDIR}/lang/gnomeobjc \ - glade.3:${PORTSDIR}/devel/libglade -RUN_DEPENDS= ${X11BASE}/share/gnome/sounds/startup.wav:${PORTSDIR}/audio/gnomeaudio \ - panel:${PORTSDIR}/x11/gnomecore \ - gtcd:${PORTSDIR}/audio/gnomemedia \ + glade.3:${PORTSDIR}/devel/libglade \ + gdk_pixbuf.2:${PORTSDIR}/graphics/gdk-pixbuf \ + gnomeprint.9:${PORTSDIR}/print/gnomeprint + +RUN_DEPENDS= ${X11BASE}/share/themes/Metal/ICON.png:${PORTSDIR}/x11-toolkits/gtk-engines \ + another_clock_applet:${PORTSDIR}/x11/gnomeapplets \ + gmc:${PORTSDIR}/x11-fm/gnomemc \ + bug-buddy:${PORTSDIR}/devel/bugbuddy \ + glade:${PORTSDIR}/devel/glade \ + ${LOCALBASE}/lib/python1.5/site-packages/_appletmodule.so:${PORTSDIR}/x11-toolkits/py-gnome \ + ${X11BASE}/share/gnome/help/users-guide/aboutug.html:${PORTSDIR}/misc/gnomeusersguide \ + gcalc:${PORTSDIR}/misc/gnomeutils \ gnomecard:${PORTSDIR}/deskutils/gnomepim \ + ${X11BASE}/share/gnome/sounds/startup.wav:${PORTSDIR}/audio/gnomeaudio \ + gtcd:${PORTSDIR}/audio/gnomemedia \ gnomine:${PORTSDIR}/games/gnomegames \ ElectricEyes:${PORTSDIR}/graphics/electriceyes \ - gcalc:${PORTSDIR}/misc/gnomeutils \ - gtalk:${PORTSDIR}/net/gnomenetwork \ - ggv:${PORTSDIR}/print/ggv \ - gulp:${PORTSDIR}/sysutils/gnomeadmin \ - gnomecc:${PORTSDIR}/sysutils/gnomecontrolcenter \ + gnumeric:${PORTSDIR}/math/gnumeric \ gtop:${PORTSDIR}/sysutils/gtop \ - gmc:${PORTSDIR}/x11-fm/gnomemc \ - gnumeric:${PORTSDIR}/math/gnumeric + ggv:${PORTSDIR}/print/ggv NO_BUILD= yes diff --git a/x11/gnomecore/Makefile b/x11/gnomecore/Makefile index f9c4255..865b75f 100644 --- a/x11/gnomecore/Makefile +++ b/x11/gnomecore/Makefile @@ -6,7 +6,7 @@ # PORTNAME= gnomecore -PORTVERSION= 1.0.55 +PORTVERSION= 1.2.0 CATEGORIES= x11 gnome MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= stable/sources/gnome-core @@ -14,10 +14,8 @@ DISTNAME= gnome-core-${PORTVERSION} MAINTAINER= ade@FreeBSD.org -RUN_DEPENDS= ${X11BASE}/share/gnome/sounds/startup.wav:${PORTSDIR}/audio/gnomeaudio -LIB_DEPENDS= gtop.1:${PORTSDIR}/devel/libgtop \ - gnomeprint.9:${PORTSDIR}/print/gnomeprint \ - ghttp.1:${PORTSDIR}/www/libghttp +LIB_DEPENDS= capplet.4:${PORTSDIR}/sysutils/gnomecontrolcenter \ + gdk_pixbuf.2:${PORTSDIR}/graphics/gdk-pixbuf GTK_CONFIG?= ${X11BASE}/bin/gtk12-config @@ -26,10 +24,12 @@ USE_GMAKE= yes USE_LIBTOOL= yes CONFIGURE_ARGS= --localstatedir=${PREFIX}/share/gnome \ --datadir=${PREFIX}/share/gnome \ - --with-gnome=${PREFIX} \ --with-kde-datadir=${LOCALBASE}/share CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ GTK_CONFIG="${GTK_CONFIG}" \ LIBS="-L${LOCALBASE}/lib" +MAN1= gnome-session.1 gnome-wm.1 save-session.1 +MAN5= default.session.5 + .include <bsd.port.mk> diff --git a/x11/gnomecore/distinfo b/x11/gnomecore/distinfo index 8986f90..4056cf2 100644 --- a/x11/gnomecore/distinfo +++ b/x11/gnomecore/distinfo @@ -1 +1 @@ -MD5 (gnome-core-1.0.55.tar.gz) = 62d51688e02b1b5f7b765891e4f80089 +MD5 (gnome-core-1.2.0.tar.gz) = dc43e5e45df7d7c10e4f9ad52a8ef823 diff --git a/x11/gnomecore/files/patch-aa b/x11/gnomecore/files/patch-aa index 6fc92a3..f4586c1 100644 --- a/x11/gnomecore/files/patch-aa +++ b/x11/gnomecore/files/patch-aa @@ -1,15 +1,6 @@ ---- configure.orig Fri Apr 9 18:03:33 1999 -+++ configure Sat May 22 21:21:21 1999 -@@ -3122,7 +3122,7 @@ - fi - if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 -- PTHREAD_LIB="-lc_r" -+ PTHREAD_LIB="" - else - echo "$ac_t""no" 1>&6 - echo $ac_n "checking for pthread_create""... $ac_c" 1>&6 -@@ -5098,7 +5098,7 @@ +--- configure.orig Tue May 23 00:35:01 2000 ++++ configure Fri May 26 14:29:09 2000 +@@ -4885,7 +4885,7 @@ cat conftest.$ac_ext >&5 rm -rf conftest* CATOBJEXT=.mo @@ -18,11 +9,22 @@ fi rm -f conftest* INSTOBJEXT=.mo -@@ -6269,6 +6269,7 @@ - case "$host" in - *linux*) CDROM_HOST=linux;; - *solaris*) CDROM_HOST=solaris;; -+*freebsd*) CDROM_HOST=freebsd;; - esac - +--- app-docs.make.orig Thu Apr 20 02:25:57 2000 ++++ app-docs.make Fri May 26 16:31:01 2000 +@@ -1,4 +1,4 @@ +-helpdir = $(datadir)/gnome/help/$(app)/$(lang) ++helpdir = $(datadir)/help/$(app)/$(lang) + help_DATA = \ + index.html \ + topic.dat \ +--- applet-docs.make.orig Thu Apr 20 02:25:57 2000 ++++ applet-docs.make Fri May 26 16:31:10 2000 +@@ -9,7 +9,7 @@ + # figs = modemlights-advpref.png modemlights-prefs.png modemlights.png + # include $(top_srcdir)/applet-docs.make +-docdir = $(datadir)/gnome/help/$(applet)_applet/$(lang) ++docdir = $(datadir)/help/$(applet)_applet/$(lang) + doc_DATA = \ + index.html \ + topic.dat \ diff --git a/x11/gnomecore/files/patch-ab b/x11/gnomecore/files/patch-ab index abaa03c..72fcc09 100644 --- a/x11/gnomecore/files/patch-ab +++ b/x11/gnomecore/files/patch-ab @@ -1,25 +1,26 @@ ---- help-browser/gnome-help-browser.c.orig Tue Dec 29 05:19:41 1998 -+++ help-browser/gnome-help-browser.c Tue Dec 29 05:20:50 1998 -@@ -72,13 +72,10 @@ +--- help-browser/gnome-help-browser.c.orig Sat May 13 12:16:14 2000 ++++ help-browser/gnome-help-browser.c Fri May 26 14:31:15 2000 +@@ -81,14 +81,10 @@ void destroy_server(HelpWindow win); /* MANPATH should probably come from somewhere */ --#define DEFAULT_MANPATH "/usr/man:/usr/local/man:/usr/X11R6/man" --#define DEFAULT_INFOPATH "/usr/info:/usr/local/info" -+#define DEFAULT_MANPATH "/usr/share/man:/usr/local/man:/usr/X11R6/man" -+#define DEFAULT_INFOPATH "/usr/share/info:/usr/local/info:/usr/X11R6/info" +-#define DEFAULT_MANPATH GNOME_PREFIX "/man:/usr/man:/usr/share/man:/usr/local/man:/usr/X11R6/man" +-#define DEFAULT_INFOPATH GNOME_PREFIX "/info:/usr/info:/usr/share/info:/usr/local/info" ++#define DEFAULT_MANPATH "/usr/share/man:/usr/local/man:/usr/X11R6/man" ++#define DEFAULT_INFOPATH "/usr/share/info:/usr/local/info:/usr/X11R6/info" /* GHELPPATH probably needs some automatic additions inside toc */ --#define DEFAULT_GHELPPATH GNOMEHELPPATH ":/opt/gnome/share/gnome/help:" \ +-#define DEFAULT_GHELPPATH GNOME_PREFIX "/share/gnome/help:" \ +- "/opt/gnome/share/gnome/help:" \ - "/usr/local/share/gnome/help:" \ - "/usr/local/gnome/share/gnome/help:" \ -- "/usr/share/gnome/help:" -+#define DEFAULT_GHELPPATH GNOMEHELPPATH +- "/usr/share/gnome/help" ++#define DEFAULT_GHELPPATH GNOME_PREFIX "/share/gnome/help" #define DEFAULT_MEMCACHESIZE "1000000" #define DEFAULT_HISTORYLENGTH "1000" #define HELP_BROWSER_RC_DIR ".gnome-help-browser" ---- help-browser/toc.c.orig Tue Dec 29 05:20:55 1998 -+++ help-browser/toc.c Tue Dec 29 05:21:48 1998 -@@ -19,14 +19,13 @@ +--- help-browser/toc.c.orig Thu May 4 06:54:33 2000 ++++ help-browser/toc.c Fri May 26 14:32:55 2000 +@@ -20,14 +20,13 @@ static int hideTocInt(GtkWidget *window); struct _toc_config toc_config[] = { @@ -33,9 +34,225 @@ - { "/usr/local/gnome/share/gnome/help", TOC_GHELP_TYPE }, - { "/usr/share/gnome/help", TOC_GHELP_TYPE }, + { "/usr/share/info", TOC_INFO_TYPE }, -+ { "/usr/local/info", TOC_INFO_TYPE }, -+ { "/usr/X11R6/info", TOC_INFO_TYPE }, -+ { "/usr/X11R6/share/gnome/help", TOC_GHELP_TYPE }, ++ { "/usr/local/info", TOC_INFO_TYPE }, ++ { "/usr/X11R6/info", TOC_INFO_TYPE }, ++ { "/usr/X11R6/share/gnome/help", TOC_GHELP_TYPE }, { NULL, 0 } }; +--- help-browser/Makefile.in.orig Tue May 23 04:25:07 2000 ++++ help-browser/Makefile.in Fri May 26 16:15:53 2000 +@@ -143,7 +143,7 @@ + + @HELP_USE_GTKHTML_TRUE@htmlcflags = -DHELP_USE_GTKHTML + +-INCLUDES = -I$(includedir) -I$(top_srcdir)/intl -I$(top_builddir)/intl $(GNOME_INCLUDEDIR) -DGNOME_PREFIX=\""$(prefix)\"" -DGNOMELOCALEDIR=\""$(datadir)/locale\"" $(htmlcflags) ++INCLUDES = -I$(includedir) -I$(top_srcdir)/intl -I$(top_builddir)/intl $(GNOME_INCLUDEDIR) -DGNOME_PREFIX=\""$(prefix)\"" -DGNOMELOCALEDIR=\""$(prefix)/share/locale\"" $(htmlcflags) + + @HELP_USE_GTKHTML_TRUE@htmllibs = $(GNOME_XML_LIB) @PIXBUF_LIBS@ $(GTK_HTML_PREFIX)/lib/libgtkhtml.a $(GNOME_PRINT_PREFIX)/lib/libgnomeprint.a + @HELP_USE_GTKHTML_FALSE@htmllibs = $(GTKXMHTML_LIBS) +@@ -186,7 +186,7 @@ + gnorbadir = $(sysconfdir)/CORBA/servers + gnorba_DATA = help-browser.gnorba + +-sysdir = $(datadir)/gnome/apps ++sysdir = $(datadir)/apps + sys_DATA = gnome-help.desktop + mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs + CONFIG_HEADER = ../config.h +@@ -558,7 +558,7 @@ + help-caller.o gnome-help-browser.o: help-browser.h + + install-exec-local: +- $(INSTALL_PROGRAM) $(top_srcdir)/help-browser/gnome-download \ ++ $(INSTALL_SCRIPT) $(top_srcdir)/help-browser/gnome-download \ + $(top_srcdir)/help-browser/gnome-convert $(DESTDIR)$(bindir)/ + + # Tell versions [3.59,3.63) of GNU make to not export all variables. +--- help-browser/help/C/Makefile.in.orig Tue May 23 04:25:10 2000 ++++ help-browser/help/C/Makefile.in Fri May 26 15:36:46 2000 +@@ -142,7 +142,7 @@ + EXTRA_DIST = gnome-help-browser-help.html gnome-help-browser-topic.dat default-page.html gnome-logo-large.png sample-help.html sample-topic.dat + + +-help_browser_helpdir = $(datadir)/gnome/help/help-browser/C ++help_browser_helpdir = $(datadir)/help/help-browser/C + mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs + CONFIG_HEADER = ../../../config.h + CONFIG_CLEAN_FILES = +--- help-browser/help/ca/Makefile.in.orig Tue May 23 04:25:11 2000 ++++ help-browser/help/ca/Makefile.in Fri May 26 15:36:57 2000 +@@ -143,7 +143,7 @@ + + EXTRA_DIST = default-page.html + +-help_browser_helpdir = $(datadir)/gnome/help/help-browser/ca ++help_browser_helpdir = $(datadir)/help/help-browser/ca + mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs + CONFIG_HEADER = ../../../config.h + CONFIG_CLEAN_FILES = +--- help-browser/help/da/Makefile.in.orig Tue May 23 04:25:12 2000 ++++ help-browser/help/da/Makefile.in Fri May 26 15:37:09 2000 +@@ -142,7 +142,7 @@ + EXTRA_DIST = gnome-help-browser-help.html gnome-help-browser-topic.dat default-page.html + + +-help_browser_helpdir = $(datadir)/gnome/help/help-browser/da ++help_browser_helpdir = $(datadir)/help/help-browser/da + mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs + CONFIG_HEADER = ../../../config.h + CONFIG_CLEAN_FILES = +--- help-browser/help/el/Makefile.in.orig Tue May 23 04:25:13 2000 ++++ help-browser/help/el/Makefile.in Fri May 26 15:37:16 2000 +@@ -143,7 +143,7 @@ + + EXTRA_DIST = default-page.html + +-help_browser_helpdir = $(datadir)/gnome/help/help-browser/el ++help_browser_helpdir = $(datadir)/help/help-browser/el + mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs + CONFIG_HEADER = ../../../config.h + CONFIG_CLEAN_FILES = +--- help-browser/help/es/Makefile.in.orig Tue May 23 04:25:14 2000 ++++ help-browser/help/es/Makefile.in Fri May 26 15:37:46 2000 +@@ -142,7 +142,7 @@ + EXTRA_DIST = gnome-help-browser-help.html gnome-help-browser-topic.dat default-page.html + + +-help_browser_helpdir = $(datadir)/gnome/help/help-browser/es ++help_browser_helpdir = $(datadir)/help/help-browser/es + mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs + CONFIG_HEADER = ../../../config.h + CONFIG_CLEAN_FILES = +--- help-browser/help/et/Makefile.in.orig Tue May 23 04:25:15 2000 ++++ help-browser/help/et/Makefile.in Fri May 26 15:37:53 2000 +@@ -143,7 +143,7 @@ + + EXTRA_DIST = default-page.html + +-help_browser_helpdir = $(datadir)/gnome/help/help-browser/et ++help_browser_helpdir = $(datadir)/help/help-browser/et + mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs + CONFIG_HEADER = ../../../config.h + CONFIG_CLEAN_FILES = +--- help-browser/help/eu/Makefile.in.orig Tue May 23 04:25:16 2000 ++++ help-browser/help/eu/Makefile.in Fri May 26 15:38:00 2000 +@@ -143,7 +143,7 @@ + + EXTRA_DIST = default-page.html + +-help_browser_helpdir = $(datadir)/gnome/help/help-browser/eu ++help_browser_helpdir = $(datadir)/help/help-browser/eu + mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs + CONFIG_HEADER = ../../../config.h + CONFIG_CLEAN_FILES = +--- help-browser/help/fr/Makefile.in.orig Tue May 23 04:25:17 2000 ++++ help-browser/help/fr/Makefile.in Fri May 26 15:38:09 2000 +@@ -142,7 +142,7 @@ + EXTRA_DIST = gnome-help-browser-help.html gnome-help-browser-topic.dat default-page.html + + +-help_browser_helpdir = $(datadir)/gnome/help/help-browser/fr ++help_browser_helpdir = $(datadir)/help/help-browser/fr + mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs + CONFIG_HEADER = ../../../config.h + CONFIG_CLEAN_FILES = +--- help-browser/help/gl/Makefile.in.orig Tue May 23 04:25:18 2000 ++++ help-browser/help/gl/Makefile.in Fri May 26 15:38:16 2000 +@@ -142,7 +142,7 @@ + EXTRA_DIST = gnome-help-browser-help.html gnome-help-browser-topic.dat default-page.html + + +-help_browser_helpdir = $(datadir)/gnome/help/help-browser/gl ++help_browser_helpdir = $(datadir)/help/help-browser/gl + mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs + CONFIG_HEADER = ../../../config.h + CONFIG_CLEAN_FILES = +--- help-browser/help/hu/Makefile.in.orig Tue May 23 04:25:18 2000 ++++ help-browser/help/hu/Makefile.in Fri May 26 15:38:25 2000 +@@ -142,7 +142,7 @@ + EXTRA_DIST = gnome-help-browser-help.html gnome-help-browser-topic.dat default-page.html sample-help.html sample-topic.dat + + +-help_browser_helpdir = $(datadir)/gnome/help/help-browser/hu ++help_browser_helpdir = $(datadir)/help/help-browser/hu + mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs + CONFIG_HEADER = ../../../config.h + CONFIG_CLEAN_FILES = +--- help-browser/help/it/Makefile.in.orig Tue May 23 04:25:19 2000 ++++ help-browser/help/it/Makefile.in Fri May 26 15:38:37 2000 +@@ -142,7 +142,7 @@ + EXTRA_DIST = gnome-help-browser-help.html gnome-help-browser-topic.dat default-page.html + + +-help_browser_helpdir = $(datadir)/gnome/help/help-browser/it ++help_browser_helpdir = $(datadir)/help/help-browser/it + mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs + CONFIG_HEADER = ../../../config.h + CONFIG_CLEAN_FILES = +--- help-browser/help/ja/Makefile.in.orig Tue May 23 04:25:20 2000 ++++ help-browser/help/ja/Makefile.in Fri May 26 15:38:47 2000 +@@ -142,7 +142,7 @@ + EXTRA_DIST = gnome-help-browser-help.html gnome-help-browser-topic.dat default-page.html sample-help.html sample-topic.dat + + +-help_browser_helpdir = $(datadir)/gnome/help/help-browser/ja ++help_browser_helpdir = $(datadir)/help/help-browser/ja + mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs + CONFIG_HEADER = ../../../config.h + CONFIG_CLEAN_FILES = +--- help-browser/help/ko/Makefile.in.orig Tue May 23 04:25:21 2000 ++++ help-browser/help/ko/Makefile.in Fri May 26 15:38:54 2000 +@@ -142,7 +142,7 @@ + EXTRA_DIST = gnome-help-browser-help.html gnome-help-browser-topic.dat default-page.html + + +-help_browser_helpdir = $(datadir)/gnome/help/help-browser/ko ++help_browser_helpdir = $(datadir)/help/help-browser/ko + mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs + CONFIG_HEADER = ../../../config.h + CONFIG_CLEAN_FILES = +--- help-browser/help/lt/Makefile.in.orig Tue May 23 04:25:22 2000 ++++ help-browser/help/lt/Makefile.in Fri May 26 15:39:03 2000 +@@ -142,7 +142,7 @@ + EXTRA_DIST = gnome-help-browser-help.html gnome-help-browser-topic.dat default-page.html + + +-help_browser_helpdir = $(datadir)/gnome/help/help-browser/lt ++help_browser_helpdir = $(datadir)/help/help-browser/lt + mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs + CONFIG_HEADER = ../../../config.h + CONFIG_CLEAN_FILES = +--- help-browser/help/no/Makefile.in.orig Tue May 23 04:25:24 2000 ++++ help-browser/help/no/Makefile.in Fri May 26 15:39:12 2000 +@@ -142,7 +142,7 @@ + EXTRA_DIST = gnome-help-browser-help.html gnome-help-browser-topic.dat default-page.html + + +-help_browser_helpdir = $(datadir)/gnome/help/help-browser/no ++help_browser_helpdir = $(datadir)/help/help-browser/no + mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs + CONFIG_HEADER = ../../../config.h + CONFIG_CLEAN_FILES = +--- help-browser/help/uk/Makefile.in.orig Tue May 23 04:25:25 2000 ++++ help-browser/help/uk/Makefile.in Fri May 26 15:39:19 2000 +@@ -142,7 +142,7 @@ + EXTRA_DIST = gnome-help-browser-help.html gnome-help-browser-topic.dat default-page.html + + +-help_browser_helpdir = $(datadir)/gnome/help/help-browser/uk ++help_browser_helpdir = $(datadir)/help/help-browser/uk + mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs + CONFIG_HEADER = ../../../config.h + CONFIG_CLEAN_FILES = +--- help-browser/help/wa/Makefile.in.orig Tue May 23 04:25:26 2000 ++++ help-browser/help/wa/Makefile.in Fri May 26 15:39:27 2000 +@@ -142,7 +142,7 @@ + EXTRA_DIST = gnome-help-browser-help.html gnome-help-browser-topic.dat default-page.html + + +-help_browser_helpdir = $(datadir)/gnome/help/help-browser/wa ++help_browser_helpdir = $(datadir)/help/help-browser/wa + mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs + CONFIG_HEADER = ../../../config.h + CONFIG_CLEAN_FILES = diff --git a/x11/gnomecore/files/patch-ae b/x11/gnomecore/files/patch-ae index 1ea686c..797996b 100644 --- a/x11/gnomecore/files/patch-ae +++ b/x11/gnomecore/files/patch-ae @@ -1,713 +1,73 @@ ---- applets/Makefile.in.orig Thu Sep 23 03:52:47 1999 -+++ applets/Makefile.in Fri Sep 24 10:59:30 1999 -@@ -153,7 +153,7 @@ - cxxflags_set = @cxxflags_set@ - l = @l@ - --always_built_SUBDIRS = applet-dirs gen_util asclock fish dialer webcontrol drivemount clockmail fifteen life battery charpick gnome-pager mini-commander gkb jbc another_clock desk-guide tasklist -+always_built_SUBDIRS = applet-dirs gen_util asclock fish dialer webcontrol clockmail fifteen life battery charpick gnome-pager mini-commander gkb jbc another_clock desk-guide tasklist - - @FALSE_TRUE@esdmanager = esd-manager - @FALSE_FALSE@esdmanager = ---- applets/asclock/Makefile.in.orig Sat Apr 10 01:11:04 1999 -+++ applets/asclock/Makefile.in Thu May 6 07:47:12 1999 -@@ -156,7 +156,7 @@ - - SUBDIRS = themes default_theme - --INCLUDES = -I. -I$(srcdir) -I$(top_srcdir)/intl -I$(top_builddir)/intl -I$(srcdir)/../../panel -I$(top_builddir)/panel -DASCLOCK_THEMES_DIR=\""$(datadir)/asclock/"\" -DGNOMELOCALEDIR=\""$(datadir)/locale"\" -I$(includedir) $(GNOME_INCLUDEDIR) -DASCLOCK_GNOME -DVERSION=\""$(VERSION)"\" -+INCLUDES = -I. -I$(srcdir) -I$(top_srcdir)/intl -I$(top_builddir)/intl -I$(srcdir)/../../panel -I$(top_builddir)/panel -DASCLOCK_THEMES_DIR=\""$(datadir)/asclock/"\" -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" -I$(includedir) $(GNOME_INCLUDEDIR) -DASCLOCK_GNOME -DVERSION=\""$(VERSION)"\" - - - bin_PROGRAMS = asclock_applet ---- applets/battery/Makefile.in.orig Tue Mar 2 01:54:01 1999 -+++ applets/battery/Makefile.in Sat Mar 6 17:59:42 1999 -@@ -154,7 +154,7 @@ - cxxflags_set = @cxxflags_set@ - l = @l@ - --INCLUDES = -I. -I$(srcdir) -I$(top_srcdir)/intl -I$(top_builddir)/intl -I$(top_builddir)/panel -I$(srcdir)/../../panel -DGNOMELOCALEDIR=\""$(datadir)/locale"\" -I$(includedir) $(GNOME_INCLUDEDIR) -+INCLUDES = -I. -I$(srcdir) -I$(top_srcdir)/intl -I$(top_builddir)/intl -I$(top_builddir)/panel -I$(srcdir)/../../panel -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" -I$(includedir) $(GNOME_INCLUDEDIR) - - - bin_PROGRAMS = battery_applet ---- applets/cdplayer/Makefile.in.orig Tue Mar 2 01:54:53 1999 -+++ applets/cdplayer/Makefile.in Sat Mar 6 17:59:42 1999 -@@ -154,7 +154,7 @@ - cxxflags_set = @cxxflags_set@ - l = @l@ - --INCLUDES = -I. -I$(srcdir) -I$(top_srcdir)/intl -I$(top_builddir)/intl -I$(top_builddir)/panel -I$(srcdir)/../../panel -DGNOMELOCALEDIR=\""$(datadir)/locale"\" -I$(includedir) $(GNOME_INCLUDEDIR) -+INCLUDES = -I. -I$(srcdir) -I$(top_srcdir)/intl -I$(top_builddir)/intl -I$(top_builddir)/panel -I$(srcdir)/../../panel -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" -I$(includedir) $(GNOME_INCLUDEDIR) - - - bin_PROGRAMS = cdplayer_applet ---- applets/charpick/Makefile.in.orig Tue Mar 2 01:54:05 1999 -+++ applets/charpick/Makefile.in Sat Mar 6 17:59:42 1999 -@@ -154,7 +154,7 @@ - cxxflags_set = @cxxflags_set@ - l = @l@ - --INCLUDES = -I. -I$(srcdir) -I$(top_srcdir)/intl -I$(top_builddir)/intl -I$(top_builddir)/panel -I$(srcdir)/../../panel -DGNOMELOCALEDIR=\""$(datadir)/locale"\" -I$(includedir) $(GNOME_INCLUDEDIR) -+INCLUDES = -I. -I$(srcdir) -I$(top_srcdir)/intl -I$(top_builddir)/intl -I$(top_builddir)/panel -I$(srcdir)/../../panel -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" -I$(includedir) $(GNOME_INCLUDEDIR) - - - bin_PROGRAMS = charpick_applet ---- applets/clockmail/Makefile.in.orig Tue Mar 2 01:53:53 1999 -+++ applets/clockmail/Makefile.in Sat Mar 6 17:59:42 1999 -@@ -154,7 +154,7 @@ - cxxflags_set = @cxxflags_set@ - l = @l@ - --INCLUDES = -I. -I$(srcdir) -I$(top_srcdir)/intl -I$(top_builddir)/intl -I$(srcdir)/../../panel -I$(top_builddir)/panel -DGNOMELOCALEDIR=\""$(datadir)/locale"\" -I$(includedir) $(GNOME_INCLUDEDIR) -+INCLUDES = -I. -I$(srcdir) -I$(top_srcdir)/intl -I$(top_builddir)/intl -I$(srcdir)/../../panel -I$(top_builddir)/panel -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" -I$(includedir) $(GNOME_INCLUDEDIR) - - - bin_PROGRAMS = clockmail_applet ---- applets/cpumemusage/Makefile.in.orig Thu Sep 23 03:54:10 1999 -+++ applets/cpumemusage/Makefile.in Fri Sep 24 11:01:36 1999 -@@ -153,7 +153,7 @@ - cxxflags_set = @cxxflags_set@ - l = @l@ - --INCLUDES = -I. -I$(srcdir) -I$(top_srcdir)/intl -I$(top_builddir)/intl -I$(srcdir)/../../panel -I$(top_builddir)/panel -DGNOMELOCALEDIR=\""$(datadir)/locale"\" -I$(includedir) $(GNOME_INCLUDEDIR) $(LIBGTOP_INCS) -+INCLUDES = -I. -I$(srcdir) -I$(top_srcdir)/intl -I$(top_builddir)/intl -I$(srcdir)/../../panel -I$(top_builddir)/panel -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" -I$(includedir) $(GNOME_INCLUDEDIR) $(LIBGTOP_INCS) - - - bin_PROGRAMS = cpumemusage_applet ---- applets/desk-guide/Makefile.in.orig Thu Sep 23 03:54:03 1999 -+++ applets/desk-guide/Makefile.in Fri Sep 24 11:03:26 1999 -@@ -153,7 +153,7 @@ - cxxflags_set = @cxxflags_set@ - l = @l@ +--- applets/gen_util/mailcheck.c.orig Thu May 18 03:16:03 2000 ++++ applets/gen_util/mailcheck.c Fri May 26 15:08:01 2000 +@@ -1296,7 +1296,7 @@ + if (!user) + return NULL; + +- mc->mail_file = g_strdup_printf ("/var/spool/mail/%s", ++ mc->mail_file = g_strdup_printf ("/var/mail/%s", + user); + } else + mc->mail_file = g_strdup (mc->mail_file); +--- applets/desk-guide/Makefile.in.orig Tue May 23 04:25:59 2000 ++++ applets/desk-guide/Makefile.in Fri May 26 15:21:53 2000 +@@ -141,7 +141,7 @@ + + SUBDIRS = help -INCLUDES = -I. -I$(srcdir) -I$(top_srcdir)/intl -I$(top_builddir)/intl -I$(srcdir)/../../panel -I$(top_builddir)/panel -DGNOMELOCALEDIR=\""$(datadir)/locale"\" -I$(includedir) $(GNOME_INCLUDEDIR) -DVERSION=\""$(VERSION)"\" +INCLUDES = -I. -I$(srcdir) -I$(top_srcdir)/intl -I$(top_builddir)/intl -I$(srcdir)/../../panel -I$(top_builddir)/panel -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" -I$(includedir) $(GNOME_INCLUDEDIR) -DVERSION=\""$(VERSION)"\" bin_PROGRAMS = deskguide_applet ---- applets/dialer/Makefile.in.orig Tue Mar 2 01:53:41 1999 -+++ applets/dialer/Makefile.in Sat Mar 6 17:59:42 1999 -@@ -154,7 +154,7 @@ - cxxflags_set = @cxxflags_set@ - l = @l@ - --INCLUDES = -I. -I$(srcdir) -I$(top_srcdir)/intl -I$(top_builddir)/intl -I$(srcdir)/../../panel -I$(top_builddir)/panel -DGNOMELOCALEDIR=\""$(datadir)/locale"\" -I$(includedir) $(GNOME_INCLUDEDIR) -DVERSION=\""$(VERSION)"\" -+INCLUDES = -I. -I$(srcdir) -I$(top_srcdir)/intl -I$(top_builddir)/intl -I$(srcdir)/../../panel -I$(top_builddir)/panel -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" -I$(includedir) $(GNOME_INCLUDEDIR) -DVERSION=\""$(VERSION)"\" - - - bin_PROGRAMS = dialer_applet ---- applets/diskusage/Makefile.in.orig Tue Mar 2 01:54:40 1999 -+++ applets/diskusage/Makefile.in Sat Mar 6 17:59:42 1999 -@@ -154,7 +154,7 @@ - cxxflags_set = @cxxflags_set@ - l = @l@ - --INCLUDES = -I. -I$(srcdir) -I$(top_srcdir)/intl -I$(top_builddir)/intl -I$(srcdir)/../../panel -I$(top_builddir)/panel -DGNOMELOCALEDIR=\""$(datadir)/locale"\" -I$(includedir) $(GNOME_INCLUDEDIR) $(LIBGTOP_INCS) -+INCLUDES = -I. -I$(srcdir) -I$(top_srcdir)/intl -I$(top_builddir)/intl -I$(srcdir)/../../panel -I$(top_builddir)/panel -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" -I$(includedir) $(GNOME_INCLUDEDIR) $(LIBGTOP_INCS) - - - bin_PROGRAMS = diskusage_applet ---- applets/drivemount/Makefile.in.orig Tue Mar 2 01:53:49 1999 -+++ applets/drivemount/Makefile.in Sat Mar 6 17:59:42 1999 -@@ -154,7 +154,7 @@ - cxxflags_set = @cxxflags_set@ - l = @l@ - --INCLUDES = -I. -I$(srcdir) -I$(top_srcdir)/intl -I$(top_builddir)/intl -I$(srcdir)/../../panel -I$(top_builddir)/panel -DGNOMELOCALEDIR=\""$(datadir)/locale"\" -I$(includedir) $(GNOME_INCLUDEDIR) -+INCLUDES = -I. -I$(srcdir) -I$(top_srcdir)/intl -I$(top_builddir)/intl -I$(srcdir)/../../panel -I$(top_builddir)/panel -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" -I$(includedir) $(GNOME_INCLUDEDIR) - - - bin_PROGRAMS = drivemount_applet ---- applets/esd-manager/Makefile.in.orig Tue Mar 2 01:54:35 1999 -+++ applets/esd-manager/Makefile.in Sat Mar 6 17:59:42 1999 -@@ -154,7 +154,7 @@ - cxxflags_set = @cxxflags_set@ +--- applets/fish/Makefile.in.orig Tue May 23 04:26:04 2000 ++++ applets/fish/Makefile.in Fri May 26 16:23:15 2000 +@@ -139,7 +139,7 @@ + gnomelocaledir = @gnomelocaledir@ l = @l@ --INCLUDES = -I. -I$(srcdir) -I$(top_srcdir)/intl -I$(top_builddir)/intl -I$(srcdir)/../../panel -I$(top_builddir)/panel -DGNOMELOCALEDIR=\""$(datadir)/locale"\" -I$(includedir) $(GNOME_INCLUDEDIR) $(shell esd-config --cflags) -+INCLUDES = -I. -I$(srcdir) -I$(top_srcdir)/intl -I$(top_builddir)/intl -I$(srcdir)/../../panel -I$(top_builddir)/panel -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" -I$(includedir) $(GNOME_INCLUDEDIR) $(shell esd-config --cflags) +-INCLUDES = -I. -I$(srcdir) -I$(top_srcdir)/intl -I$(top_builddir)/intl -I$(srcdir)/../../panel -I$(top_builddir)/panel -DGNOMELOCALEDIR=\""$(datadir)/locale"\" -I$(includedir) $(GNOME_INCLUDEDIR) @PIXBUF_CFLAGS@ ++INCLUDES = -I. -I$(srcdir) -I$(top_srcdir)/intl -I$(top_builddir)/intl -I$(srcdir)/../../panel -I$(top_builddir)/panel -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" -I$(includedir) $(GNOME_INCLUDEDIR) @PIXBUF_CFLAGS@ - bin_PROGRAMS = esdmanager_applet ---- applets/fifteen/Makefile.in.orig Tue Mar 2 01:53:57 1999 -+++ applets/fifteen/Makefile.in Sat Mar 6 17:59:42 1999 -@@ -154,7 +154,7 @@ - cxxflags_set = @cxxflags_set@ - l = @l@ - --INCLUDES = -I. -I$(srcdir) -I$(top_srcdir)/intl -I$(top_builddir)/intl -I$(srcdir)/../../panel -I$(top_builddir)/panel -DGNOMELOCALEDIR=\""$(datadir)/locale"\" -I$(includedir) $(GNOME_INCLUDEDIR) -+INCLUDES = -I. -I$(srcdir) -I$(top_srcdir)/intl -I$(top_builddir)/intl -I$(srcdir)/../../panel -I$(top_builddir)/panel -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" -I$(includedir) $(GNOME_INCLUDEDIR) - - - bin_PROGRAMS = fifteen_applet ---- applets/fish/Makefile.in.orig Tue Mar 2 01:53:38 1999 -+++ applets/fish/Makefile.in Sat Mar 6 17:59:42 1999 -@@ -154,7 +154,7 @@ - cxxflags_set = @cxxflags_set@ - l = @l@ + SUBDIRS = help +@@ -187,7 +187,7 @@ --INCLUDES = -I. -I$(srcdir) -I$(top_srcdir)/intl -I$(top_builddir)/intl -I$(srcdir)/../../panel -I$(top_builddir)/panel -DGNOMELOCALEDIR=\""$(datadir)/locale"\" -I$(includedir) $(GNOME_INCLUDEDIR) -+INCLUDES = -I. -I$(srcdir) -I$(top_srcdir)/intl -I$(top_builddir)/intl -I$(srcdir)/../../panel -I$(top_builddir)/panel -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" -I$(includedir) $(GNOME_INCLUDEDIR) + DEFS = @DEFS@ -I. -I$(srcdir) -I../.. + LIBS = @LIBS@ +-libfish_applet_la_LDFLAGS = ++libfish_applet_la_LDFLAGS = -version-info 4:0:0 + libfish_applet_la_LIBADD = + libfish_applet_la_OBJECTS = fish.lo + COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +--- applets/gen_util/Makefile.in.orig Tue May 23 04:26:11 2000 ++++ applets/gen_util/Makefile.in Fri May 26 16:23:39 2000 +@@ -141,7 +141,7 @@ - - #if DO_EXE ---- applets/fvwm-pager/Makefile.in.orig Tue Mar 2 01:55:08 1999 -+++ applets/fvwm-pager/Makefile.in Sat Mar 6 17:59:42 1999 -@@ -153,9 +153,9 @@ - cxxflags_set = @cxxflags_set@ - l = @l@ - --Utilitiesdir = $(datadir)/gnome/apps/Utilities -+Utilitiesdir = $(datadir)/apps/Utilities - --INCLUDES = -Dsafemalloc=g_malloc -I. -I$(srcdir) -I$(top_srcdir)/intl -I$(top_builddir)/intl -I$(srcdir)/../../../panel -I$(top_builddir)/panel -DGNOMELOCALEDIR=\""$(datadir)/locale"\" -I$(includedir) $(GNOME_INCLUDEDIR) -+INCLUDES = -Dsafemalloc=g_malloc -I. -I$(srcdir) -I$(top_srcdir)/intl -I$(top_builddir)/intl -I$(srcdir)/../../../panel -I$(top_builddir)/panel -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" -I$(includedir) $(GNOME_INCLUDEDIR) - - - bin_PROGRAMS = fvwm-pager ---- applets/gen_util/Makefile.in.orig Tue Mar 2 01:53:32 1999 -+++ applets/gen_util/Makefile.in Sat Mar 6 17:59:42 1999 -@@ -154,7 +154,7 @@ - cxxflags_set = @cxxflags_set@ - l = @l@ + SUBDIRS = help -INCLUDES = -I. -I$(srcdir) -I$(top_srcdir)/intl -I$(top_builddir)/intl -I$(srcdir)/../../panel -I$(top_builddir)/panel -DGNOMELOCALEDIR=\""$(datadir)/locale"\" -I$(includedir) $(GNOME_INCLUDEDIR) +INCLUDES = -I. -I$(srcdir) -I$(top_srcdir)/intl -I$(top_builddir)/intl -I$(srcdir)/../../panel -I$(top_builddir)/panel -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" -I$(includedir) $(GNOME_INCLUDEDIR) - bin_PROGRAMS = gen_util_applet ---- applets/gkb/Makefile.in.orig Tue Mar 2 01:54:21 1999 -+++ applets/gkb/Makefile.in Sat Mar 6 17:59:42 1999 -@@ -154,7 +154,7 @@ - cxxflags_set = @cxxflags_set@ - l = @l@ - --INCLUDES = -I. -I$(srcdir) -I$(top_srcdir)/intl -I$(top_builddir)/intl -I$(srcdir)/../../panel -I$(top_builddir)/panel -DGNOMELOCALEDIR=\""$(datadir)/locale"\" -I$(includedir) $(GNOME_INCLUDEDIR) -+INCLUDES = -I. -I$(srcdir) -I$(top_srcdir)/intl -I$(top_builddir)/intl -I$(srcdir)/../../panel -I$(top_builddir)/panel -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" -I$(includedir) $(GNOME_INCLUDEDIR) - - - #if DO_EXE ---- applets/gnome-pager/Makefile.in.orig Tue Mar 2 01:54:08 1999 -+++ applets/gnome-pager/Makefile.in Sat Mar 6 17:59:42 1999 -@@ -154,7 +154,7 @@ - cxxflags_set = @cxxflags_set@ - l = @l@ - --INCLUDES = -I. -I$(srcdir) -I$(top_srcdir)/intl -I$(top_builddir)/intl -I$(srcdir)/../../panel -I$(top_builddir)/panel -DGNOMELOCALEDIR=\""$(datadir)/locale"\" -I$(includedir) $(GNOME_INCLUDEDIR) -DVERSION=\""$(VERSION)"\" -+INCLUDES = -I. -I$(srcdir) -I$(top_srcdir)/intl -I$(top_builddir)/intl -I$(srcdir)/../../panel -I$(top_builddir)/panel -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" -I$(includedir) $(GNOME_INCLUDEDIR) -DVERSION=\""$(VERSION)"\" - - - bin_PROGRAMS = gnomepager_applet ---- applets/mini-commander/docs/Makefile.in.orig Sun Oct 3 16:35:27 1999 -+++ applets/mini-commander/docs/Makefile.in Mon Oct 4 13:24:50 1999 -@@ -153,7 +153,7 @@ - cxxflags_set = @cxxflags_set@ - l = @l@ - --docdir = $(datadir)/gnome/help/mini-commander_applet/C -+docdir = $(datadir)/help/mini-commander_applet/C - doc_DATA = index.html topic.dat - - -@@ -238,7 +238,7 @@ - install: install-am - uninstall-am: uninstall-docDATA - uninstall: uninstall-am --all-am: Makefile $(DATA) -+all-am: Makefile - all-redirect: all-am - install-strip: - $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install ---- applets/mini-commander/src/Makefile.in.orig Tue Mar 2 01:54:14 1999 -+++ applets/mini-commander/src/Makefile.in Sat Mar 6 17:59:42 1999 -@@ -154,7 +154,7 @@ - cxxflags_set = @cxxflags_set@ - l = @l@ - --INCLUDES = -I. -I$(srcdir) -I$(top_srcdir)/intl -I$(top_builddir)/intl -I$(top_builddir)/panel -I$(top_srcdir)/panel -DGNOMELOCALEDIR=\""$(datadir)/locale"\" -I$(includedir) $(GNOME_INCLUDEDIR) -+INCLUDES = -I. -I$(srcdir) -I$(top_srcdir)/intl -I$(top_builddir)/intl -I$(top_builddir)/panel -I$(top_srcdir)/panel -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" -I$(includedir) $(GNOME_INCLUDEDIR) - - - bin_PROGRAMS = mini_commander_applet ---- applets/mixer/Makefile.in.orig Tue Mar 2 01:54:57 1999 -+++ applets/mixer/Makefile.in Sat Mar 6 17:59:42 1999 -@@ -154,7 +154,7 @@ - cxxflags_set = @cxxflags_set@ - l = @l@ - --INCLUDES = -I. -I$(srcdir) -I$(top_srcdir)/intl -I$(top_builddir)/intl -I$(srcdir)/../../panel -I$(top_builddir)/panel -DGNOMELOCALEDIR=\""$(datadir)/locale"\" -I$(includedir) $(GNOME_INCLUDEDIR) -+INCLUDES = -I. -I$(srcdir) -I$(top_srcdir)/intl -I$(top_builddir)/intl -I$(srcdir)/../../panel -I$(top_builddir)/panel -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" -I$(includedir) $(GNOME_INCLUDEDIR) - - - bin_PROGRAMS = mixer_applet ---- applets/modemlights/Makefile.in.orig Tue Mar 2 01:55:01 1999 -+++ applets/modemlights/Makefile.in Sat Mar 6 17:59:42 1999 -@@ -154,7 +154,7 @@ - cxxflags_set = @cxxflags_set@ - l = @l@ - --INCLUDES = -I. -I$(srcdir) -I$(top_srcdir)/intl -I$(top_builddir)/intl -I$(srcdir)/../../panel -I$(top_builddir)/panel -DGNOMELOCALEDIR=\""$(datadir)/locale"\" -I$(includedir) $(GNOME_INCLUDEDIR) -DVERSION=\""$(VERSION)"\" -+INCLUDES = -I. -I$(srcdir) -I$(top_srcdir)/intl -I$(top_builddir)/intl -I$(srcdir)/../../panel -I$(top_builddir)/panel -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" -I$(includedir) $(GNOME_INCLUDEDIR) -DVERSION=\""$(VERSION)"\" - - - bin_PROGRAMS = modemlights_applet ---- applets/multiload/Makefile.in.orig Tue Mar 2 01:54:44 1999 -+++ applets/multiload/Makefile.in Sat Mar 6 17:59:42 1999 -@@ -154,7 +154,7 @@ - cxxflags_set = @cxxflags_set@ - l = @l@ - --INCLUDES = -I. -I$(srcdir) -DGNOMELOCALEDIR=\""$(datadir)/locale"\" -I$(top_builddir)/panel -I$(srcdir)/../../panel -I$(includedir) $(GNOME_INCLUDEDIR) $(LIBGTOP_INCS) -+INCLUDES = -I. -I$(srcdir) -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" -I$(top_builddir)/panel -I$(srcdir)/../../panel -I$(includedir) $(GNOME_INCLUDEDIR) $(LIBGTOP_INCS) - - - bin_PROGRAMS = multiload_applet ---- applets/netload/Makefile.in.orig Tue Mar 2 01:54:46 1999 -+++ applets/netload/Makefile.in Sat Mar 6 17:59:42 1999 -@@ -154,7 +154,7 @@ - cxxflags_set = @cxxflags_set@ - l = @l@ - --INCLUDES = -I. -I$(srcdir) -I$(top_srcdir)/intl -I$(top_builddir)/intl -I$(srcdir)/../../panel -I$(top_builddir)/panel -DGNOMELOCALEDIR=\""$(datadir)/locale"\" -I$(includedir) $(GNOME_INCLUDEDIR) $(LIBGTOP_INCS) -+INCLUDES = -I. -I$(srcdir) -I$(top_srcdir)/intl -I$(top_builddir)/intl -I$(srcdir)/../../panel -I$(top_builddir)/panel -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" -I$(includedir) $(GNOME_INCLUDEDIR) $(LIBGTOP_INCS) - - - bin_PROGRAMS = netload_applet ---- applets/slashapp/Makefile.in.orig Tue Mar 2 01:54:49 1999 -+++ applets/slashapp/Makefile.in Sat Mar 6 17:59:42 1999 -@@ -154,7 +154,7 @@ - cxxflags_set = @cxxflags_set@ - l = @l@ - --INCLUDES = -I. -I$(srcdir) -I$(srcdir)/../../panel -I$(top_builddir)/panel -DGNOMELOCALEDIR=\""$(datadir)/locale"\" -I$(includedir) $(GNOME_INCLUDEDIR) -+INCLUDES = -I. -I$(srcdir) -I$(srcdir)/../../panel -I$(top_builddir)/panel -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" -I$(includedir) $(GNOME_INCLUDEDIR) - - - bin_PROGRAMS = slash_applet ---- applets/tasklist/Makefile.in.orig Thu Sep 23 03:54:05 1999 -+++ applets/tasklist/Makefile.in Fri Sep 24 11:04:32 1999 -@@ -153,7 +153,7 @@ - cxxflags_set = @cxxflags_set@ - l = @l@ - --INCLUDES = -I. -I$(srcdir) -I$(top_srcdir)/intl -I$(top_builddir)/intl -I$(srcdir)/../../panel -I$(srcdir)/../desk-guide -I$(top_builddir)/panel -DGNOMELOCALEDIR=\""$(datadir)/locale"\" -I$(includedir) $(GNOME_INCLUDEDIR) -DVERSION=\""$(VERSION)"\" -+INCLUDES = -I. -I$(srcdir) -I$(top_srcdir)/intl -I$(top_builddir)/intl -I$(srcdir)/../../panel -I$(srcdir)/../desk-guide -I$(top_builddir)/panel -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" -I$(includedir) $(GNOME_INCLUDEDIR) -DVERSION=\""$(VERSION)"\" - - - bin_PROGRAMS = tasklist_applet ---- applets/webcontrol/Makefile.in.orig Tue Mar 2 01:53:45 1999 -+++ applets/webcontrol/Makefile.in Sat Mar 6 17:59:42 1999 -@@ -154,7 +154,7 @@ - cxxflags_set = @cxxflags_set@ - l = @l@ - --INCLUDES = -I. -I$(srcdir) -I$(top_srcdir)/intl -I$(top_builddir)/intl -I$(top_builddir)/panel -I$(srcdir)/../../panel -DGNOMELOCALEDIR=\""$(datadir)/locale"\" -I$(includedir) $(GNOME_INCLUDEDIR) -+INCLUDES = -I. -I$(srcdir) -I$(top_srcdir)/intl -I$(top_builddir)/intl -I$(top_builddir)/panel -I$(srcdir)/../../panel -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" -I$(includedir) $(GNOME_INCLUDEDIR) - - - bin_PROGRAMS = webcontrol_applet ---- applets/winlist/Makefile.in.orig Tue Mar 2 01:55:05 1999 -+++ applets/winlist/Makefile.in Sat Mar 6 17:59:42 1999 -@@ -154,7 +154,7 @@ - cxxflags_set = @cxxflags_set@ - l = @l@ - --INCLUDES = -I. -I$(srcdir) -I$(top_srcdir)/intl -I$(top_builddir)/intl -I$(top_builddir)/panel -I$(srcdir)/../../panel -DGNOMELOCALEDIR=\""$(datadir)/locale"\" -I$(includedir) $(GNOME_INCLUDEDIR) -+INCLUDES = -I. -I$(srcdir) -I$(top_srcdir)/intl -I$(top_builddir)/intl -I$(top_builddir)/panel -I$(srcdir)/../../panel -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" -I$(includedir) $(GNOME_INCLUDEDIR) - - - bin_PROGRAMS = winlist_applet ---- core-docs/Makefile.in.orig Tue Mar 2 01:52:59 1999 -+++ core-docs/Makefile.in Sat Mar 6 17:59:43 1999 -@@ -162,7 +162,7 @@ - cxxflags_set = @cxxflags_set@ - l = @l@ - --gnome_intro_helpdir = $(datadir)/gnome/help/gnome-intro/C -+gnome_intro_helpdir = $(datadir)/help/gnome-intro/C - - GNOME_INTRO_HTML_FILES = gnome-intro/c93191.html gnome-intro/f13.html gnome-intro/a-sample-session.html gnome-intro/c93230.html gnome-intro/f1346.html gnome-intro/a-sample-session75.html gnome-intro/c93302.html gnome-intro/gnome-intro.html gnome-intro/c93.html gnome-intro/c93372.html gnome-intro/c93127.html gnome-intro/c93412.html gnome-intro/c93175.html gnome-intro/docbook.css - ---- desktop-links/Makefile.in.orig Tue Mar 2 01:52:28 1999 -+++ desktop-links/Makefile.in Sat Mar 6 17:59:43 1999 -@@ -154,7 +154,7 @@ - cxxflags_set = @cxxflags_set@ - l = @l@ - --appsdir = $(datadir)/gnome/apps -+appsdir = $(datadir)/apps - - Rootdir = $(appsdir) - Applicationsdir = $(appsdir)/Applications ---- gmenu/Makefile.in.orig Tue Mar 2 01:53:06 1999 -+++ gmenu/Makefile.in Sat Mar 6 17:59:42 1999 -@@ -154,7 +154,7 @@ - cxxflags_set = @cxxflags_set@ - l = @l@ - --INCLUDES = -DGNOMELOCALEDIR=\""$(datadir)/locale"\" -I$(top_srcdir)/intl -I$(top_builddir)/intl -I$(includedir) $(GNOME_INCLUDEDIR) -+INCLUDES = -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" -I$(top_srcdir)/intl -I$(top_builddir)/intl -I$(includedir) $(GNOME_INCLUDEDIR) - - - bin_PROGRAMS = gmenu -@@ -167,7 +167,7 @@ - - EXTRA_DIST = gmenu.desktop top.xpm folder.xpm unknown.xpm - --sysdir = $(datadir)/gnome/apps/Settings -+sysdir = $(datadir)/apps/Settings - sys_DATA = gmenu.desktop - mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs - CONFIG_HEADER = ../config.h ---- gnome-terminal/C/Makefile.in.orig Tue Mar 2 01:52:56 1999 -+++ gnome-terminal/C/Makefile.in Sat Mar 6 17:59:43 1999 -@@ -154,7 +154,7 @@ - cxxflags_set = @cxxflags_set@ - l = @l@ - --gnome_terminal_helpdir = $(datadir)/gnome/help/gnome-terminal/C -+gnome_terminal_helpdir = $(datadir)/help/gnome-terminal/C - - gnome_terminal_help_DATA = index.html topic.dat - ---- gnome-terminal/da/Makefile.in.orig Fri Dec 17 16:27:57 1999 -+++ gnome-terminal/da/Makefile.in Mon Dec 27 13:30:32 1999 -@@ -154,7 +154,7 @@ - cxxflags_set = @cxxflags_set@ - l = @l@ - --gnome_terminal_helpdir = $(datadir)/gnome/help/gnome-terminal/da -+gnome_terminal_helpdir = $(datadir)/help/gnome-terminal/da - - gnome_terminal_help_DATA = index.html topic.dat - ---- gnome-terminal/es/Makefile.in.orig Fri Dec 17 16:28:04 1999 -+++ gnome-terminal/es/Makefile.in Mon Dec 27 13:30:53 1999 -@@ -154,7 +154,7 @@ - cxxflags_set = @cxxflags_set@ - l = @l@ - --gnome_terminal_helpdir = $(datadir)/gnome/help/gnome-terminal/es -+gnome_terminal_helpdir = $(datadir)/help/gnome-terminal/es - - gnome_terminal_help_DATA = index.html topic.dat - ---- gnome-terminal/no/Makefile.in.orig Fri Dec 17 16:28:12 1999 -+++ gnome-terminal/no/Makefile.in Mon Dec 27 13:31:07 1999 -@@ -154,7 +154,7 @@ - cxxflags_set = @cxxflags_set@ - l = @l@ - --gnome_terminal_helpdir = $(datadir)/gnome/help/gnome-terminal/no -+gnome_terminal_helpdir = $(datadir)/help/gnome-terminal/no - - gnome_terminal_help_DATA = index.html topic.dat - ---- gnome-terminal/Makefile.in.orig Tue Mar 2 01:52:55 1999 -+++ gnome-terminal/Makefile.in Sat Mar 6 18:05:08 1999 -@@ -155,9 +155,9 @@ - cxxflags_set = @cxxflags_set@ - l = @l@ - - SUBDIRS = C da es no - --INCLUDES = -I$(includedir) -I$(top_srcdir)/intl -I$(top_builddir)/intl $(GNOME_INCLUDEDIR) -DGNOMELOCALEDIR=\""$(datadir)/locale\"" -+INCLUDES = -I$(includedir) -I$(top_srcdir)/intl -I$(top_builddir)/intl $(GNOME_INCLUDEDIR) -DGNOMELOCALEDIR=\""$(prefix)/share/locale\"" - - - LDADD = $(GNOME_LIBDIR) $(GNOMEUI_LIBS) $(ZVT_LIBS) $(INTLLIBS) -@@ -174,7 +174,7 @@ - - CFLAGS = @CFLAGS@ -Wall - --utildir = $(datadir)/gnome/apps/Utilities -+utildir = $(datadir)/apps/Utilities - util_DATA = gnome-terminal.desktop - mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs - CONFIG_HEADER = ../config.h ---- gsm/Makefile.in.orig Thu Sep 23 03:51:28 1999 -+++ gsm/Makefile.in Fri Sep 24 11:33:32 1999 -@@ -153,9 +153,9 @@ - cxxflags_set = @cxxflags_set@ - l = @l@ - --defaultdir = $(datadir)/gnome -+defaultdir = $(datadir) - --INCLUDES = -I$(includedir) $(GNOME_INCLUDEDIR) -I$(top_srcdir)/intl -I$(top_builddir)/intl -DGNOMELOCALEDIR=\""$(datadir)/locale\"" -DDEFAULTDIR="\"$(defaultdir)\"" -+INCLUDES = -I$(includedir) $(GNOME_INCLUDEDIR) -I$(top_srcdir)/intl -I$(top_builddir)/intl -DGNOMELOCALEDIR=\""$(prefix)/share/locale\"" -DDEFAULTDIR="\"$(datadir)\"" - - - LDADD = $(GNOME_LIBDIR) $(GNOMEUI_LIBS) $(INTLLIBS) -@@ -178,7 +178,7 @@ - - default_DATA = default.session default.wm - --desktopdir = $(datadir)/gnome/apps/Settings -+desktopdir = $(datadir)/apps/Settings - desktop_DATA = save-session.desktop session.desktop - - EXTRA_DIST = default.in default.wm.in gnome-wm save-session.desktop session.desktop ---- help-browser/Makefile.in.orig Tue Mar 2 01:52:32 1999 -+++ help-browser/Makefile.in Sat Mar 6 17:59:43 1999 -@@ -156,7 +156,7 @@ - - SUBDIRS = help gnome-man2html gnome-info2html - --INCLUDES = -I$(includedir) -I$(top_srcdir)/intl -I$(top_builddir)/intl $(GNOME_INCLUDEDIR) -DGNOMEHELPPATH=\""$(datadir)/gnome/help\"" -DGNOMELOCALEDIR=\""$(datadir)/locale\"" -DVERSION=\""$(VERSION)"\" -+INCLUDES = -I$(includedir) -I$(top_srcdir)/intl -I$(top_builddir)/intl $(GNOME_INCLUDEDIR) -DGNOMEHELPPATH=\""$(datadir)/help\"" -DGNOMELOCALEDIR=\""$(prefix)/share/locale\"" -DVERSION=\""$(VERSION)"\" - - - LDADD = -lgnorba $(GNOMEUI_LIBS) $(GNOME_LIBDIR) $(ORBIT_LIBS) $(INTLLIBS) -@@ -197,7 +197,7 @@ - gnorbadir = $(sysconfdir)/CORBA/servers - gnorba_DATA = help-browser.gnorba - --sysdir = $(datadir)/gnome/apps -+sysdir = $(datadir)/apps - sys_DATA = gnome-help.desktop - mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs - CONFIG_HEADER = ../config.h ---- help-browser/help/C/Makefile.in.orig Tue Mar 2 01:52:38 1999 -+++ help-browser/help/C/Makefile.in Sat Mar 6 17:59:42 1999 -@@ -157,7 +157,7 @@ - EXTRA_DIST = gnome-help-browser-help.html gnome-help-browser-topic.dat default-page.html gnome-logo-large.png sample-help.html sample-topic.dat - - --help_browser_helpdir = $(datadir)/gnome/help/help-browser/C -+help_browser_helpdir = $(datadir)/help/help-browser/C - mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs - CONFIG_HEADER = ../../../config.h - CONFIG_CLEAN_FILES = ---- help-browser/help/ca/Makefile.in.orig Thu Sep 23 03:52:01 1999 -+++ help-browser/help/ca/Makefile.in Fri Sep 24 11:29:22 1999 -@@ -157,7 +157,7 @@ - - EXTRA_DIST = default-page.html - --help_browser_helpdir = $(datadir)/gnome/help/help-browser/ca -+help_browser_helpdir = $(datadir)/help/help-browser/ca - mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs - CONFIG_HEADER = ../../../config.h - CONFIG_CLEAN_FILES = ---- help-browser/help/da/Makefile.in.orig Fri Dec 17 16:26:15 1999 -+++ help-browser/help/da/Makefile.in Mon Dec 27 13:50:51 1999 -@@ -157,7 +157,7 @@ - EXTRA_DIST = gnome-help-browser-help.html gnome-help-browser-topic.dat default-page.html - - --help_browser_helpdir = $(datadir)/gnome/help/help-browser/da -+help_browser_helpdir = $(datadir)/help/help-browser/da - mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs - CONFIG_HEADER = ../../../config.h - CONFIG_CLEAN_FILES = ---- help-browser/help/el/Makefile.in.orig Fri Dec 17 16:26:21 1999 -+++ help-browser/help/el/Makefile.in Mon Dec 27 13:51:00 1999 -@@ -158,7 +158,7 @@ - - EXTRA_DIST = default-page.html - --help_browser_helpdir = $(datadir)/gnome/help/help-browser/el -+help_browser_helpdir = $(datadir)/help/help-browser/el - mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs - CONFIG_HEADER = ../../../config.h - CONFIG_CLEAN_FILES = ---- help-browser/help/es/Makefile.in.orig Tue Mar 2 01:52:41 1999 -+++ help-browser/help/es/Makefile.in Sat Mar 6 17:59:42 1999 -@@ -157,7 +157,7 @@ - EXTRA_DIST = gnome-help-browser-help.html gnome-help-browser-topic.dat default-page.html - - --help_browser_helpdir = $(datadir)/gnome/help/help-browser/es -+help_browser_helpdir = $(datadir)/help/help-browser/es - mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs - CONFIG_HEADER = ../../../config.h - CONFIG_CLEAN_FILES = ---- help-browser/help/et/Makefile.in.orig Thu Sep 23 03:52:05 1999 -+++ help-browser/help/et/Makefile.in Fri Sep 24 11:29:43 1999 -@@ -157,7 +157,7 @@ - - EXTRA_DIST = default-page.html - --help_browser_helpdir = $(datadir)/gnome/help/help-browser/et -+help_browser_helpdir = $(datadir)/help/help-browser/et - mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs - CONFIG_HEADER = ../../../config.h - CONFIG_CLEAN_FILES = ---- help-browser/help/eu/Makefile.in.orig Thu Sep 23 03:52:06 1999 -+++ help-browser/help/eu/Makefile.in Fri Sep 24 11:29:56 1999 -@@ -157,7 +157,7 @@ - - EXTRA_DIST = default-page.html - --help_browser_helpdir = $(datadir)/gnome/help/help-browser/eu -+help_browser_helpdir = $(datadir)/help/help-browser/eu - mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs - CONFIG_HEADER = ../../../config.h - CONFIG_CLEAN_FILES = ---- help-browser/help/fr/Makefile.in.orig Tue Mar 2 01:52:43 1999 -+++ help-browser/help/fr/Makefile.in Sat Mar 6 17:59:42 1999 -@@ -157,7 +157,7 @@ - EXTRA_DIST = gnome-help-browser-help.html gnome-help-browser-topic.dat default-page.html - - --help_browser_helpdir = $(datadir)/gnome/help/help-browser/fr -+help_browser_helpdir = $(datadir)/help/help-browser/fr - mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs - CONFIG_HEADER = ../../../config.h - CONFIG_CLEAN_FILES = ---- help-browser/help/hu/Makefile.in.orig Tue Mar 2 01:52:44 1999 -+++ help-browser/help/hu/Makefile.in Sat Mar 6 17:59:42 1999 -@@ -157,7 +157,7 @@ - EXTRA_DIST = gnome-help-browser-help.html gnome-help-browser-topic.dat default-page.html gnome-logo-large.png sample-help.html sample-topic.dat - - --help_browser_helpdir = $(datadir)/gnome/help/help-browser/hu -+help_browser_helpdir = $(datadir)/help/help-browser/hu - mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs - CONFIG_HEADER = ../../../config.h - CONFIG_CLEAN_FILES = ---- help-browser/help/it/Makefile.in.orig Tue Mar 2 01:52:46 1999 -+++ help-browser/help/it/Makefile.in Sat Mar 6 17:59:42 1999 -@@ -157,7 +157,7 @@ - EXTRA_DIST = gnome-help-browser-help.html gnome-help-browser-topic.dat default-page.html - - --help_browser_helpdir = $(datadir)/gnome/help/help-browser/it -+help_browser_helpdir = $(datadir)/help/help-browser/it - mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs - CONFIG_HEADER = ../../../config.h - CONFIG_CLEAN_FILES = ---- help-browser/help/ja/Makefile.in.orig Thu Sep 23 03:52:14 1999 -+++ help-browser/help/ja/Makefile.in Fri Sep 24 11:30:09 1999 -@@ -156,7 +156,7 @@ - EXTRA_DIST = gnome-help-browser-help.html gnome-help-browser-topic.dat default-page.html sample-help.html sample-topic.dat - - --help_browser_helpdir = $(datadir)/gnome/help/help-browser/ja -+help_browser_helpdir = $(datadir)/help/help-browser/ja - mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs - CONFIG_HEADER = ../../../config.h - CONFIG_CLEAN_FILES = ---- help-browser/help/ko/Makefile.in.orig Tue Mar 2 01:52:46 1999 -+++ help-browser/help/ko/Makefile.in Sat Mar 6 17:59:42 1999 -@@ -157,7 +157,7 @@ - EXTRA_DIST = gnome-help-browser-help.html gnome-help-browser-topic.dat default-page.html - - --help_browser_helpdir = $(datadir)/gnome/help/help-browser/ko -+help_browser_helpdir = $(datadir)/help/help-browser/ko - mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs - CONFIG_HEADER = ../../../config.h - CONFIG_CLEAN_FILES = ---- help-browser/help/no/Makefile.in.orig Tue Mar 2 01:52:47 1999 -+++ help-browser/help/no/Makefile.in Sat Mar 6 17:59:42 1999 -@@ -157,7 +157,7 @@ - EXTRA_DIST = gnome-help-browser-help.html gnome-help-browser-topic.dat default-page.html - - --help_browser_helpdir = $(datadir)/gnome/help/help-browser/no -+help_browser_helpdir = $(datadir)/help/help-browser/no - mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs - CONFIG_HEADER = ../../../config.h - CONFIG_CLEAN_FILES = ---- help-browser/help/wa/Makefile.in.orig Wed Jun 23 17:38:49 1999 -+++ help-browser/help/wa/Makefile.in Mon Jul 12 14:34:30 1999 -@@ -159,7 +159,7 @@ - EXTRA_DIST = gnome-help-browser-help.html gnome-help-browser-topic.dat default-page.html - - --help_browser_helpdir = $(datadir)/gnome/help/help-browser/wa -+help_browser_helpdir = $(datadir)/help/help-browser/wa - mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs - CONFIG_HEADER = ../../../config.h - CONFIG_CLEAN_FILES = ---- panel/Makefile.in.orig Fri Dec 17 16:28:45 1999 -+++ panel/Makefile.in Wed Feb 23 13:50:04 2000 -@@ -160,7 +160,7 @@ - - AUTOMAKE_OPTIONS = 1.3 - --INCLUDES = -I. -I$(srcdir) -I$(top_srcdir)/intl -I$(top_builddir)/intl -I$(top_builddir)/panel -DGNOMELOCALEDIR=\""$(datadir)/locale"\" -I$(includedir) $(GNOME_INCLUDEDIR) $(ORB_CFLAGS) -+INCLUDES = -I. -I$(srcdir) -I$(top_srcdir)/intl -I$(top_builddir)/intl -I$(top_builddir)/panel -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" -I$(includedir) $(GNOME_INCLUDEDIR) $(ORB_CFLAGS) - - - bin_PROGRAMS = panel + lib_LTLIBRARIES = libgen_util_applet.la @@ -181,7 +181,7 @@ - libpanel_appletinclude_HEADERS = applet-widget.h gnome-panel.h - - --libpanel_applet_la_LDFLAGS = -version-info 0:0:0 -rpath $(libdir) -+libpanel_applet_la_LDFLAGS = -version-info 2:0:0 - libpanel_applet_la_LIBADD = $(ORB_LIBS) -lm $(DL_LIB) - - BUILT_SOURCES = $(CORBA_SRCLIST) -@@ -213,7 +213,7 @@ - EXTRA_DIST = panelrc.in panel.in appletsConf.sh.in panel.gnorba panel.soundlist APPLET_WRITING bad-applet.desktop bad-applet.goad - - --confexecdir = $(libdir) -+confexecdir = $(sysconfdir) - confexec_DATA = appletsConf.sh - - panelgnorbadir = $(sysconfdir)/CORBA/servers -@@ -670,6 +670,7 @@ - sed -e 's?\@GNOME_LIBDIR\@?$(GNOME_LIBDIR)?g' \ - -e 's?\@GNOME_INCLUDEDIR\@?$(GNOME_INCLUDEDIR)?g' \ - -e 's?\@GNOMEGNORBA_LIBS\@?$(GNOMEGNORBA_LIBS)?g' \ -+ -e 's?\@VERSION\@?$(VERSION)?g' \ - < $(srcdir)/appletsConf.sh.in > appletsConf.tmp \ - && mv appletsConf.tmp appletsConf.sh - ---- panel/appletsConf.sh.in.orig Mon Feb 8 11:13:15 1999 -+++ panel/appletsConf.sh.in Wed Feb 23 13:52:32 2000 -@@ -4,3 +4,4 @@ - APPLETS_LIBDIR="@GNOME_LIBDIR@" - APPLETS_LIBS="-lpanel_applet @GNOMEGNORBA_LIBS@" - APPLETS_INCLUDEDIR="@GNOME_INCLUDEDIR@" -+MODULE_VERSION="applets-@VERSION@" ---- applets/another_clock/Makefile.in.orig Sat Oct 16 13:03:28 1999 -+++ applets/another_clock/Makefile.in Sat Oct 16 13:03:38 1999 -@@ -153,7 +153,7 @@ - cxxflags_set = @cxxflags_set@ - l = @l@ --INCLUDES = -I. -I$(srcdir) -I$(top_srcdir)/intl -I$(top_builddir)/intl -I$(srcdir)/../../panel -I$(top_builddir)/panel -DGNOMELOCALEDIR=\""$(datadir)/locale"\" -I$(includedir) $(GNOME_INCLUDEDIR) -DVERSION=\""$(VERSION)"\" -+INCLUDES = -I. -I$(srcdir) -I$(top_srcdir)/intl -I$(top_builddir)/intl -I$(srcdir)/../../panel -I$(top_builddir)/panel -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" -I$(includedir) $(GNOME_INCLUDEDIR) -DVERSION=\""$(VERSION)"\" + DEFS = @DEFS@ -I. -I$(srcdir) -I../.. + LIBS = @LIBS@ +-libgen_util_applet_la_LDFLAGS = ++libgen_util_applet_la_LDFLAGS = -version-info 4:0:0 + libgen_util_applet_la_LIBADD = + libgen_util_applet_la_OBJECTS = main.lo mailcheck.lo popcheck.lo \ + printer.lo clock.lo +--- applets/tasklist/Makefile.in.orig Tue May 23 04:26:26 2000 ++++ applets/tasklist/Makefile.in Fri May 26 15:24:07 2000 +@@ -141,7 +141,7 @@ + SUBDIRS = help - bin_PROGRAMS = another_clock_applet ---- applets/icewm-pager/Makefile.in.orig Sat Oct 16 13:05:16 1999 -+++ applets/icewm-pager/Makefile.in Sat Oct 16 13:05:53 1999 -@@ -153,7 +153,7 @@ - cxxflags_set = @cxxflags_set@ - l = @l@ - --INCLUDES = -I. -I$(srcdir) -I$(top_srcdir)/intl -I$(top_builddir)/intl -I$(srcdir)/../../panel -I$(top_builddir)/panel -DGNOMELOCALEDIR=\""$(datadir)/locale"\" -I$(includedir) $(GNOME_INCLUDEDIR) -DVERSION=\""$(VERSION)"\" -+INCLUDES = -I. -I$(srcdir) -I$(top_srcdir)/intl -I$(top_builddir)/intl -I$(srcdir)/../../panel -I$(top_builddir)/panel -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" -I$(includedir) $(GNOME_INCLUDEDIR) -DVERSION=\""$(VERSION)"\" - - - bin_PROGRAMS = wmpager_applet ---- applets/life/Makefile.in.orig Sat Oct 16 13:06:24 1999 -+++ applets/life/Makefile.in Sat Oct 16 13:06:34 1999 -@@ -153,7 +153,7 @@ - cxxflags_set = @cxxflags_set@ - l = @l@ +-INCLUDES = -I. -I$(srcdir) -I$(top_srcdir)/intl -I$(top_builddir)/intl -I$(srcdir)/../../panel -I$(srcdir)/../desk-guide -I$(top_builddir)/panel -DGNOMELOCALEDIR=\""$(datadir)/locale"\" -I$(includedir) $(GNOME_INCLUDEDIR) -DVERSION=\""$(VERSION)"\" @PIXBUF_CFLAGS@ ++INCLUDES = -I. -I$(srcdir) -I$(top_srcdir)/intl -I$(top_builddir)/intl -I$(srcdir)/../../panel -I$(srcdir)/../desk-guide -I$(top_builddir)/panel -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" -I$(includedir) $(GNOME_INCLUDEDIR) -DVERSION=\""$(VERSION)"\" @PIXBUF_CFLAGS@ --INCLUDES = -I. -I$(srcdir) -I$(top_srcdir)/intl -I$(top_builddir)/intl -I$(srcdir)/../../panel -I$(top_builddir)/panel -DGNOMELOCALEDIR=\""$(datadir)/locale"\" -I$(includedir) $(GNOME_INCLUDEDIR) -+INCLUDES = -I. -I$(srcdir) -I$(top_srcdir)/intl -I$(top_builddir)/intl -I$(srcdir)/../../panel -I$(top_builddir)/panel -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" -I$(includedir) $(GNOME_INCLUDEDIR) - - bin_PROGRAMS = life_applet ---- applets/jbc/Makefile.in.orig Sat Oct 16 13:12:59 1999 -+++ applets/jbc/Makefile.in Sat Oct 16 13:13:12 1999 -@@ -153,7 +153,7 @@ - cxxflags_set = @cxxflags_set@ - l = @l@ - --INCLUDES = -I. -I$(srcdir) -I$(top_srcdir)/intl -I$(top_builddir)/intl -I$(srcdir)/../../panel -I$(top_builddir)/panel -DGNOMELOCALEDIR=\""$(datadir)/locale"\" -I$(includedir) $(GNOME_INCLUDEDIR) -+INCLUDES = -I. -I$(srcdir) -I$(top_srcdir)/intl -I$(top_builddir)/intl -I$(srcdir)/../../panel -I$(top_builddir)/panel -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" -I$(includedir) $(GNOME_INCLUDEDIR) - - - bin_PROGRAMS = jbc_applet + bin_PROGRAMS = tasklist_applet diff --git a/x11/gnomecore/files/patch-ah b/x11/gnomecore/files/patch-ah index 1b86dd1..afe5c26 100644 --- a/x11/gnomecore/files/patch-ah +++ b/x11/gnomecore/files/patch-ah @@ -1,17 +1,72 @@ ---- gmenu/main.c.orig Thu May 6 11:44:25 1999 -+++ gmenu/main.c Thu May 6 11:44:43 1999 -@@ -271,7 +271,7 @@ - - gnome_init ("GNOME menu editor", VERSION, argc, argv); - -- system_apps_dir = gnome_unconditional_datadir_file("gnome/apps"); -+ system_apps_dir = gnome_unconditional_datadir_file("apps"); - system_pixmap_dir = gnome_unconditional_datadir_file("pixmaps"); - if (!g_file_exists(system_apps_dir) || !g_file_exists(system_pixmap_dir)) - { ---- panel/menu.c.orig Mon Sep 20 18:49:14 1999 -+++ panel/menu.c Fri Sep 24 10:55:55 1999 -@@ -504,7 +504,7 @@ +--- panel/Makefile.in.orig Tue May 23 04:25:47 2000 ++++ panel/Makefile.in Fri May 26 15:30:48 2000 +@@ -147,7 +147,7 @@ + + SUBDIRS = doc help + +-INCLUDES = -I. -I$(srcdir) -I$(top_srcdir)/intl -I$(top_builddir)/intl -I$(top_builddir)/panel -DGNOMELOCALEDIR=\""$(datadir)/locale"\" -I$(includedir) $(GNOME_INCLUDEDIR) $(ORB_CFLAGS) @PIXBUF_CFLAGS@ ++INCLUDES = -I. -I$(srcdir) -I$(top_srcdir)/intl -I$(top_builddir)/intl -I$(top_builddir)/panel -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" -I$(includedir) $(GNOME_INCLUDEDIR) $(ORB_CFLAGS) @PIXBUF_CFLAGS@ + + + bin_PROGRAMS = panel gnome-panel-properties-capplet +@@ -169,7 +169,7 @@ + libpanel_appletinclude_HEADERS = applet-widget.h gnome-panel.h + + +-libpanel_applet_la_LDFLAGS = -version-info 0:1:0 -rpath $(libdir) ++libpanel_applet_la_LDFLAGS = -version-info 4:0:0 -rpath $(libdir) + libpanel_applet_la_LIBADD = $(ORB_LIBS) -lm $(DL_LIB) + + libpanel_status_la_SOURCES = status-docklet.c $(CORBA_SRCLIST) +@@ -178,7 +178,7 @@ + libpanel_statusinclude_HEADERS = status-docklet.h + + +-libpanel_status_la_LDFLAGS = -version-info 0:0:0 -rpath $(libdir) ++libpanel_status_la_LDFLAGS = -version-info 4:0:0 -rpath $(libdir) + libpanel_status_la_LIBADD = $(ORB_LIBS) -lm $(DL_LIB) + + BUILT_SOURCES = $(CORBA_SRCLIST) +@@ -210,7 +210,7 @@ + EXTRA_DIST = panelrc.in panel.in appletsConf.sh.in dockletsConf.sh.in panel.gnorba panel.soundlist APPLET_WRITING panel.hints gnome-panel-properties.desktop nothing.cP title-item.gob + + +-confexecdir = $(libdir) ++confexecdir = $(sysconfdir) + confexec_DATA = appletsConf.sh dockletsConf.sh + + panelgnorbadir = $(sysconfdir)/CORBA/servers +@@ -219,13 +219,13 @@ + soundlistdir = $(sysconfdir)/sound/events + soundlist_DATA = panel.soundlist + +-hintsdir = $(datadir)/gnome/hints ++hintsdir = $(datadir)/hints + hints_DATA = panel.hints + + sysdir = $(datadir)/control-center/Desktop/ + sys_DATA = gnome-panel-properties.desktop + +-deskdir = $(datadir)/gnome/apps/Settings/Desktop/ ++deskdir = $(datadir)/apps/Settings/Desktop/ + desk_DATA = gnome-panel-properties.desktop + mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs + CONFIG_HEADER = ../config.h + +--- panel/foobar-widget.c.orig Sat May 6 20:48:27 2000 ++++ panel/foobar-widget.c Wed May 31 12:51:56 2000 +@@ -557,7 +557,7 @@ + + append_folder_menu (menu_bar, _("Favorites"), NULL, FALSE, "apps/."); + append_folder_menu (menu_bar, _("Settings"), NULL, TRUE, +- "gnome/apps/Settings/."); ++ "apps/Settings/."); + append_desktop_menu (menu_bar); + + gtk_box_pack_start (GTK_BOX (foo->hbox), menu_bar, FALSE, FALSE, 0); +--- panel/menu.c.orig Tue May 23 01:00:43 2000 ++++ panel/menu.c Fri May 26 15:10:21 2000 +@@ -82,7 +82,7 @@ /*just load the menus from disk, don't make the widgets this just reads the .desktops of the top most directory and a level down*/ @@ -20,39 +75,62 @@ if(menu) fr_read_dir(NULL,menu,NULL,2); g_free(menu); -@@ -2078,7 +2078,7 @@ - static GtkWidget * - create_system_menu(GtkWidget *menu, int fake_submenus, int fake) +@@ -2709,7 +2709,7 @@ + create_system_menu(GtkWidget *menu, gboolean fake_submenus, gboolean fake, + gboolean title) + { +- char *menudir = gnome_datadir_file ("gnome/apps"); ++ char *menudir = gnome_datadir_file ("apps"); + + if (menudir && + g_file_test (menudir, G_FILE_TEST_ISDIR)) { +@@ -3598,8 +3598,8 @@ + gtk_menu_append (GTK_MENU (submenu), submenuitem); + gtk_signal_connect(GTK_OBJECT(submenuitem), "activate", + GTK_SIGNAL_FUNC(add_menu_to_panel), +- "gnome/apps/"); +- setup_internal_applet_drag(submenuitem, "MENU:gnome/apps/"); ++ "apps/"); ++ setup_internal_applet_drag(submenuitem, "MENU:apps/"); + + submenuitem = gtk_menu_item_new (); + gtk_widget_lock_accelerators (menuitem); +--- panel/menu-properties.c.orig Mon Apr 3 18:03:29 2000 ++++ panel/menu-properties.c Wed May 31 12:50:41 2000 +@@ -40,7 +40,7 @@ + arguments = "."; + + if(strcmp(arguments,".")==0) +- this_menu = gnome_unconditional_datadir_file ("gnome/apps"); ++ this_menu = gnome_unconditional_datadir_file ("apps"); + else if (*arguments == '/') + this_menu = g_strdup (arguments); + else if (*arguments == '~') +--- panel/session.c.orig Fri May 19 00:29:47 2000 ++++ panel/session.c Wed May 31 12:49:09 2000 +@@ -777,10 +777,10 @@ + load_default_applets1(PanelWidget *panel) { -- char *menu_base = gnome_unconditional_datadir_file ("gnome/apps"); -+ char *menu_base = gnome_unconditional_datadir_file ("apps"); - char *menudir, *pixmap; - - menudir = g_concat_dir_and_file (menu_base, "."); -@@ -3111,7 +3111,7 @@ - current_panel = PANEL_WIDGET(menu->button->parent); - - if(!menu->menu) { -- char *menu_base = gnome_unconditional_datadir_file ("gnome/apps"); -+ char *menu_base = gnome_unconditional_datadir_file ("apps"); - char *this_menu = get_real_menu_path(menu->path,menu_base); - GSList *list = g_slist_append(NULL,this_menu); - -@@ -3220,7 +3220,7 @@ - Menu *menu; - int main_menu; - -- char *menu_base = gnome_unconditional_datadir_file ("gnome/apps"); -+ char *menu_base = gnome_unconditional_datadir_file ("apps"); - char *this_menu = get_real_menu_path(arguments,menu_base); - - if (!this_menu) { -@@ -3340,7 +3340,7 @@ - menu->menu = NULL; - - { -- char *menu_base = gnome_unconditional_datadir_file ("gnome/apps"); -+ char *menu_base = gnome_unconditional_datadir_file ("apps"); - char *this_menu = get_real_menu_path(menu->path,menu_base); - GSList *list = g_slist_append(NULL,this_menu); - char *pixmap_name = get_pixmap(this_menu, + char *def_launchers[] = +- { "gnome/apps/gnome-help.desktop", +- "gnome/apps/System/gnome-terminal.desktop", +- "gnome/apps/Settings/gnomecc.desktop", +- "gnome/apps/Internet/Netscape.desktop", ++ { "apps/gnome-help.desktop", ++ "apps/System/gnome-terminal.desktop", ++ "apps/Settings/gnomecc.desktop", ++ "apps/Internet/Netscape.desktop", + NULL }; + int i; + char *p; +--- panel/doc/Makefile.in.orig Tue May 23 04:25:49 2000 ++++ panel/doc/Makefile.in Fri May 26 16:45:35 2000 +@@ -150,7 +150,7 @@ + CFLAGS = "`gnome-config --cflags gnomeui applets docklets`" + LDFLAGS = "`gnome-config --libs gnomeui applets docklets`" + +-HTML_DIR = $(datadir)/gnome/html ++HTML_DIR = $(datadir)/html + + TARGET_DIR = $(HTML_DIR)/$(DOC_MODULE) + diff --git a/x11/gnomecore/files/patch-am b/x11/gnomecore/files/patch-am index 5519ed4..6341029 100644 --- a/x11/gnomecore/files/patch-am +++ b/x11/gnomecore/files/patch-am @@ -1,86 +1,69 @@ ---- gnome-terminal/gnome-terminal.c.orig Thu Nov 11 18:05:12 1999 -+++ gnome-terminal/gnome-terminal.c Thu Jan 20 17:00:49 2000 -@@ -480,6 +480,7 @@ - cfg->color_type = PALETTE_CUSTOM; +--- gnome-terminal/gnome-terminal.c.orig Fri May 19 23:38:07 2000 ++++ gnome-terminal/gnome-terminal.c Fri May 26 15:15:38 2000 +@@ -507,7 +507,7 @@ else cfg->color_type = PALETTE_LINUX; -+ cfg->keyboard_secured = gnome_config_get_bool ("keyboard_secured=0"); - cfg->bell = gnome_config_get_bool ("bell_silenced=0"); - cfg->blink = gnome_config_get_bool ("blinking=0"); - cfg->swap_keys = gnome_config_get_bool ("swap_del_and_backspace=0"); -@@ -507,7 +508,8 @@ - cfg->termname = NULL; - cfg->terminal_id = 0; - -- cfg->update_records = ZVT_TERM_DO_UTMP_LOG|ZVT_TERM_DO_WTMP_LOG; -+ cfg->update_records = ZVT_TERM_DO_UTMP_LOG | ZVT_TERM_DO_WTMP_LOG -+ | ZVT_TERM_DO_LASTLOG; - - if (strcasecmp (fore_color, back_color) == 0) - /* don't let them set identical foreground and background colors */ -@@ -994,6 +996,7 @@ - gnome_config_set_string ("scrollpos", + +- cfg->keyboard_secured = FALSE; ++ cfg->keyboard_secured = gnome_config_get_bool ("keyboard_secured=0"); + + cfg->bell = gnome_config_get_bool ("bell_silenced=0"); + cfg->blink = gnome_config_get_bool ("blinking=0"); +@@ -1028,6 +1028,7 @@ cfg->scrollbar_position == SCROLLBAR_LEFT ? "left" : cfg->scrollbar_position == SCROLLBAR_RIGHT ? "right" : "hidden"); + + gnome_config_set_bool ("keyboard_secured", cfg->keyboard_secured); gnome_config_set_bool ("bell_silenced", cfg->bell); gnome_config_set_bool ("blinking", cfg->blink); gnome_config_set_bool ("swap_del_and_backspace", cfg->swap_keys); -@@ -2260,6 +2263,8 @@ - cfg->update_records |= ZVT_TERM_DO_UTMP_LOG; - if (gnome_config_get_bool ("do_wtmp=true")) - cfg->update_records |= ZVT_TERM_DO_WTMP_LOG; -+ if (gnome_config_get_bool ("do_lastlog=true")) -+ cfg->update_records |= ZVT_TERM_DO_LASTLOG; - - termid = gnome_config_get_int("terminal_id=-1"); - if (termid!=-1) -@@ -2367,6 +2372,7 @@ - gnome_config_set_string("window_title", cfg->window_title?cfg->window_title:"Terminal"); - gnome_config_set_bool("do_utmp", (cfg->update_records & ZVT_TERM_DO_UTMP_LOG) != 0); - gnome_config_set_bool("do_wtmp", (cfg->update_records & ZVT_TERM_DO_WTMP_LOG) != 0); -+ gnome_config_set_bool("do_lastlog", (cfg->update_records & ZVT_TERM_DO_LASTLOG) != 0); - - gnome_config_pop_prefix (); - g_free (prefix); -@@ -2417,8 +2423,10 @@ +@@ -2544,12 +2545,12 @@ DONOUTMP_KEY = -10, DOWTMP_KEY = -11, DONOWTMP_KEY = -12, - TITLE_KEY = -13, -- TERM_KEY = -14 -+ DOLASTLOG_KEY = -13, -+ DONOLASTLOG_KEY = -14, -+ TITLE_KEY = -15, -+ TERM_KEY = -16 +- TERM_KEY = -14, +- START_FACTORY_KEY= -15, +- USE_FACTORY_KEY = -16, +- DOLASTLOG_KEY = -17, +- DONOLASTLOG_KEY = -18, ++ DOLASTLOG_KEY = -13, ++ DONOLASTLOG_KEY = -14, ++ TITLE_KEY = -15, ++ TERM_KEY = -16, ++ START_FACTORY_KEY= -17, ++ USE_FACTORY_KEY = -18 }; static struct poptOption cb_options [] = { -@@ -2462,6 +2470,12 @@ +--- gnome-terminal/Makefile.in.orig Tue May 23 04:25:29 2000 ++++ gnome-terminal/Makefile.in Fri May 26 15:46:43 2000 +@@ -143,7 +143,7 @@ + + SUBDIRS = C de da es it no + +-INCLUDES = -I$(includedir) -I$(top_srcdir)/intl -I$(top_builddir)/intl $(GNOME_INCLUDEDIR) -DGNOMELOCALEDIR=\""$(datadir)/locale\"" ++INCLUDES = -I$(includedir) -I$(top_srcdir)/intl -I$(top_builddir)/intl $(GNOME_INCLUDEDIR) -DGNOMELOCALEDIR=\""$(prefix)/share/locale\"" + + + LDADD = $(GNOME_LIBDIR) $(GNORBA_LIBS) $(ORB_LIBS) $(GNOMEUI_LIBS) $(ZVT_LIBS) $(INTLLIBS) +@@ -167,7 +167,7 @@ + gnorbadir = $(sysconfdir)/CORBA/servers + gnorba_DATA = gnome-terminal.gnorba + +-utildir = $(datadir)/gnome/apps/System ++utildir = $(datadir)/apps/System + util_DATA = gnome-terminal.desktop + mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs + CONFIG_HEADER = ../config.h +--- gnome-terminal/de/Makefile.in.orig Tue May 23 04:25:31 2000 ++++ gnome-terminal/de/Makefile.in Fri May 26 15:53:04 2000 +@@ -139,7 +139,7 @@ + gnomelocaledir = @gnomelocaledir@ + l = @l@ + +-gnome_terminal_helpdir = $(datadir)/gnome/help/gnome-terminal/de ++gnome_terminal_helpdir = $(datadir)/help/gnome-terminal/de + + gnome_terminal_help_DATA = index.html topic.dat - { "nowtmp", '\0', POPT_ARG_NONE, NULL, DONOWTMP_KEY, - N_("Do not update wtmp entry"), N_("NOWTMP") }, -+ -+ { "lastlog", '\0', POPT_ARG_NONE, NULL, DOLASTLOG_KEY, -+ N_("Update lastlog entry"), N_("LASTLOG") }, -+ -+ { "nolastlog", '\0', POPT_ARG_NONE, NULL, DONOLASTLOG_KEY, -+ N_("Do not update lastlog entry"), N_("NOLASTLOG") }, - - { "title", 't', POPT_ARG_STRING, NULL, TITLE_KEY, - N_("Set the window title"), N_("TITLE") }, -@@ -2538,6 +2552,14 @@ - case DONOWTMP_KEY: - cfg->update_records_and &= ~ZVT_TERM_DO_WTMP_LOG; - cfg->update_records_xor &= ~ZVT_TERM_DO_WTMP_LOG; -+ break; -+ case DOLASTLOG_KEY: -+ cfg->update_records_and &= ~ZVT_TERM_DO_LASTLOG; -+ cfg->update_records_xor |= ZVT_TERM_DO_LASTLOG; -+ break; -+ case DONOLASTLOG_KEY: -+ cfg->update_records_and &= ~ZVT_TERM_DO_LASTLOG; -+ cfg->update_records_xor &= ~ZVT_TERM_DO_LASTLOG; - break; - case TITLE_KEY: - cfg->window_title = g_strdup(arg); diff --git a/x11/gnomecore/files/patch-an b/x11/gnomecore/files/patch-an new file mode 100644 index 0000000..79a9c69 --- /dev/null +++ b/x11/gnomecore/files/patch-an @@ -0,0 +1,31 @@ +--- gmenu/Makefile.in.orig Tue May 23 04:25:39 2000 ++++ gmenu/Makefile.in Fri May 26 15:25:26 2000 +@@ -139,7 +139,7 @@ + gnomelocaledir = @gnomelocaledir@ + l = @l@ + +-INCLUDES = -DGNOMELOCALEDIR=\""$(datadir)/locale"\" -I$(top_srcdir)/intl -I$(top_builddir)/intl -I$(includedir) $(GNOME_INCLUDEDIR) ++INCLUDES = -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" -I$(top_srcdir)/intl -I$(top_builddir)/intl -I$(includedir) $(GNOME_INCLUDEDIR) + + + bin_PROGRAMS = gmenu +@@ -152,7 +152,7 @@ + + EXTRA_DIST = gmenu.desktop top.xpm unknown.xpm + +-sysdir = $(datadir)/gnome/apps/Settings ++sysdir = $(datadir)/apps/Settings + sys_DATA = gmenu.desktop + mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs + CONFIG_HEADER = ../config.h +--- gmenu/main.c.orig Wed May 10 01:36:16 2000 ++++ gmenu/main.c Fri May 26 15:09:49 2000 +@@ -276,7 +276,7 @@ + gnome_init ("GNOME menu editor", VERSION, argc, argv); + gnome_window_icon_set_default_from_file (GNOME_ICONDIR"/gnome-gmenu.png"); + +- system_apps_dir = gnome_datadir_file("gnome/apps"); ++ system_apps_dir = gnome_datadir_file("apps"); + system_applets_dir = gnome_datadir_file("applets"); + system_pixmap_dir = gnome_datadir_file("pixmaps"); + if (!system_apps_dir || !system_pixmap_dir || !system_applets_dir) diff --git a/x11/gnomecore/files/patch-ap b/x11/gnomecore/files/patch-ap new file mode 100644 index 0000000..a1e81ad --- /dev/null +++ b/x11/gnomecore/files/patch-ap @@ -0,0 +1,23 @@ +--- gsm/Makefile.in.orig Tue May 23 04:24:59 2000 ++++ gsm/Makefile.in Fri May 26 15:28:56 2000 +@@ -141,9 +141,9 @@ + + SUBDIRS = help + +-defaultdir = $(datadir)/gnome ++defaultdir = $(datadir) + +-INCLUDES = -I$(includedir) $(GNOME_INCLUDEDIR) -I$(top_srcdir)/intl -I$(top_builddir)/intl -DGNOMELOCALEDIR=\""$(datadir)/locale\"" -DDEFAULTDIR="\"$(defaultdir)\"" ++INCLUDES = -I$(includedir) $(GNOME_INCLUDEDIR) -I$(top_srcdir)/intl -I$(top_builddir)/intl -DGNOMELOCALEDIR=\""$(prefix)/share/locale\"" -DDEFAULTDIR="\"$(defaultdir)\"" + + + LDADD = $(GNOME_LIBDIR) $(GNOMEUI_LIBS) $(INTLLIBS) +@@ -169,7 +169,7 @@ + + default_DATA = default.session default.wm + +-desktopdir = $(datadir)/gnome/apps/Settings/Session/ ++desktopdir = $(datadir)/apps/Settings/Session/ + desktop_DATA = save-session.desktop session.desktop + + man_MANS = gnome-wm.1 save-session.1 default.session.5 gnome-session.1 diff --git a/x11/gnomecore/pkg-plist b/x11/gnomecore/pkg-plist index 67a6d9b..a101326 100644 --- a/x11/gnomecore/pkg-plist +++ b/x11/gnomecore/pkg-plist @@ -1,273 +1,218 @@ -bin/another_clock_applet -bin/asclock_applet -bin/battery_applet -bin/cdplayer_applet -bin/charpick_applet -bin/clockmail_applet -bin/cpumemusage_applet bin/deskguide_applet -bin/dialer_applet -bin/diskusage_applet -bin/fifteen_applet -bin/gen_util_applet bin/gmenu +bin/gnome-about +bin/gnome-convert +bin/gnome-download bin/gnome-edit bin/gnome-help-browser bin/gnome-help-caller +bin/gnome-hint +bin/gnome-hint-properties-capplet bin/gnome-info2html bin/gnome-login-check bin/gnome-man2html +bin/gnome-panel-properties-capplet bin/gnome-session bin/gnome-smproxy bin/gnome-terminal bin/gnome-wm -bin/gnomepager_applet -bin/jbc_applet -bin/life_applet -bin/mini_commander_applet -bin/mixer_applet -bin/modemlights_applet -bin/multiload_applet bin/panel bin/save-session bin/session-properties bin/tasklist_applet -bin/webcontrol_applet -etc/CORBA/servers/another_clock_applet.gnorba -etc/CORBA/servers/asclock_applet.gnorba -etc/CORBA/servers/bad-applet.goad -etc/CORBA/servers/battery_applet.gnorba -etc/CORBA/servers/cdplayer_applet.gnorba -etc/CORBA/servers/charpick_applet.gnorba -etc/CORBA/servers/clockmail_applet.gnorba -etc/CORBA/servers/cpumemusage_applet.gnorba etc/CORBA/servers/deskguide_applet.gnorba -etc/CORBA/servers/dialer_applet.gnorba -etc/CORBA/servers/diskusage_applet.gnorba -etc/CORBA/servers/fifteen_applet.gnorba etc/CORBA/servers/fish_applet.gnorba etc/CORBA/servers/gen_util.gnorba -etc/CORBA/servers/gkb_applet.gnorba -etc/CORBA/servers/gnomepager_applet.gnorba +etc/CORBA/servers/gnome-terminal.gnorba etc/CORBA/servers/help-browser.gnorba -etc/CORBA/servers/jbc_applet.gnorba -etc/CORBA/servers/life_applet.gnorba -etc/CORBA/servers/mini-commander_applet.gnorba -etc/CORBA/servers/mixer_applet.gnorba -etc/CORBA/servers/modemlights_applet.gnorba -etc/CORBA/servers/multiload_applet.gnorba etc/CORBA/servers/panel.gnorba etc/CORBA/servers/tasklist_applet.gnorba -etc/CORBA/servers/webcontrol_applet.gnorba etc/appletsConf.sh +etc/dockletsConf.sh +etc/sound/events/mailcheck.soundlist etc/sound/events/panel.soundlist include/applet-widget.h include/gnome-panel.h +include/status-docklet.h lib/libfish_applet.a lib/libfish_applet.so -lib/libfish_applet.so.0 -lib/libgkb_applet.a -lib/libgkb_applet.so -lib/libgkb_applet.so.0 +lib/libfish_applet.so.4 +lib/libgen_util_applet.a +lib/libgen_util_applet.so +lib/libgen_util_applet.so.4 lib/libpanel_applet.a lib/libpanel_applet.so -lib/libpanel_applet.so.2 -@unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R -@exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %B +lib/libpanel_applet.so.4 +lib/libpanel_status.a +lib/libpanel_status.so +lib/libpanel_status.so.4 share/gnome/applets/Amusements/.directory -share/gnome/applets/Amusements/fifteen_applet.desktop share/gnome/applets/Amusements/fish_applet.desktop -share/gnome/applets/Amusements/life_applet.desktop share/gnome/applets/Clocks/.directory -share/gnome/applets/Clocks/another_clock_applet.desktop -share/gnome/applets/Clocks/asclock_applet.desktop share/gnome/applets/Clocks/clock_applet.desktop -share/gnome/applets/Clocks/clockmail_applet.desktop -share/gnome/applets/Clocks/jbc_applet.desktop share/gnome/applets/Monitors/.directory -share/gnome/applets/Monitors/battery_applet.desktop -share/gnome/applets/Monitors/cpuload_applet.desktop -share/gnome/applets/Monitors/cpumemusage_applet.desktop -share/gnome/applets/Monitors/diskusage_applet.desktop -share/gnome/applets/Monitors/memload_applet.desktop -share/gnome/applets/Monitors/swapload_applet.desktop share/gnome/applets/Multimedia/.directory -share/gnome/applets/Multimedia/cdplayer_applet.desktop -share/gnome/applets/Multimedia/mixer_applet.desktop share/gnome/applets/Network/.directory -share/gnome/applets/Network/clockmail_applet.desktop -share/gnome/applets/Network/dialer_applet.desktop share/gnome/applets/Network/mailcheck_applet.desktop -share/gnome/applets/Network/modemlights_applet.desktop -share/gnome/applets/Network/webcontrol_applet.desktop share/gnome/applets/Utility/.directory -share/gnome/applets/Utility/charpick_applet.desktop share/gnome/applets/Utility/deskguide_applet.desktop -share/gnome/applets/Utility/gkb_applet.desktop -share/gnome/applets/Utility/gnomepager_applet.desktop -share/gnome/applets/Utility/mini-commander_applet.desktop share/gnome/applets/Utility/printer.desktop share/gnome/applets/Utility/tasklist_applet.desktop +share/gnome/apps/.directory share/gnome/apps/.order share/gnome/apps/Applications/.directory share/gnome/apps/Applications/Emacs.desktop -share/gnome/apps/Applications/Netscape.desktop +share/gnome/apps/Applications/Vim.desktop +share/gnome/apps/Applications/WordPerfect.desktop +share/gnome/apps/Applications/XEphem.desktop +share/gnome/apps/Applications/Xemacs.desktop +share/gnome/apps/Applications/gaspell.desktop +share/gnome/apps/Development/.directory share/gnome/apps/Games/.directory share/gnome/apps/Gmc.desktop share/gnome/apps/Graphics/.directory share/gnome/apps/Graphics/GIMP.desktop +share/gnome/apps/Graphics/xbmbrowser.desktop +share/gnome/apps/Graphics/xv.desktop share/gnome/apps/Internet/.directory -share/gnome/apps/Internet/Balsa.desktop +share/gnome/apps/Internet/Netscape.desktop +share/gnome/apps/Internet/TkSETI.desktop share/gnome/apps/Internet/Tkrat.desktop +share/gnome/apps/Internet/lynx.desktop share/gnome/apps/Multimedia/.directory share/gnome/apps/Settings/.directory share/gnome/apps/Settings/.order +share/gnome/apps/Settings/Desktop/gnome-panel-properties.desktop share/gnome/apps/Settings/Imlib_config.desktop +share/gnome/apps/Settings/Session/gnome-hint-properties.desktop +share/gnome/apps/Settings/Session/save-session.desktop +share/gnome/apps/Settings/Session/session.desktop share/gnome/apps/Settings/gmenu.desktop -share/gnome/apps/Settings/save-session.desktop -share/gnome/apps/Settings/session.desktop share/gnome/apps/System/.directory +share/gnome/apps/System/Eterm.desktop +share/gnome/apps/System/Kterm.desktop +share/gnome/apps/System/UNIX-regular.desktop +share/gnome/apps/System/UNIX.desktop +share/gnome/apps/System/Vnterm.desktop +share/gnome/apps/System/gnome-terminal.desktop share/gnome/apps/Utilities/.directory -share/gnome/apps/Utilities/Eterm.desktop -share/gnome/apps/Utilities/Kterm.desktop -share/gnome/apps/Utilities/UNIX-regular.desktop -share/gnome/apps/Utilities/UNIX.desktop -share/gnome/apps/Utilities/Vnterm.desktop -share/gnome/apps/Utilities/gnome-terminal.desktop +share/gnome/apps/Utilities/gnome-hint.desktop share/gnome/apps/gnome-help.desktop -share/gnome/asclock/Freeamp/beats.xpm -share/gnome/asclock/Freeamp/clock.xpm -share/gnome/asclock/Freeamp/config -share/gnome/asclock/Freeamp/date.xpm -share/gnome/asclock/Freeamp/hour.xpm -share/gnome/asclock/Freeamp/led.xpm -share/gnome/asclock/Freeamp/minute.xpm -share/gnome/asclock/Freeamp/month.xpm -share/gnome/asclock/Freeamp/second.xpm -share/gnome/asclock/Freeamp/weekday.xpm -share/gnome/asclock/Newstone/beats.xpm -share/gnome/asclock/Newstone/clock.xpm -share/gnome/asclock/Newstone/config -share/gnome/asclock/Newstone/date.xpm -share/gnome/asclock/Newstone/hour.xpm -share/gnome/asclock/Newstone/led.xpm -share/gnome/asclock/Newstone/minute.xpm -share/gnome/asclock/Newstone/month.xpm -share/gnome/asclock/Newstone/second.xpm -share/gnome/asclock/Newstone/weekday.xpm -share/gnome/asclock/Orb/beats.xpm -share/gnome/asclock/Orb/clock.xpm -share/gnome/asclock/Orb/config -share/gnome/asclock/Orb/date.xpm -share/gnome/asclock/Orb/hour.xpm -share/gnome/asclock/Orb/led.xpm -share/gnome/asclock/Orb/minute.xpm -share/gnome/asclock/Orb/month.xpm -share/gnome/asclock/Orb/second.xpm -share/gnome/asclock/Orb/weekday.xpm -share/gnome/asclock/Stone/beats.xpm -share/gnome/asclock/Stone/clock.xpm -share/gnome/asclock/Stone/config -share/gnome/asclock/Stone/date.xpm -share/gnome/asclock/Stone/hour.xpm -share/gnome/asclock/Stone/led.xpm -share/gnome/asclock/Stone/minute.xpm -share/gnome/asclock/Stone/month.xpm -share/gnome/asclock/Stone/second.xpm -share/gnome/asclock/Stone/weekday.xpm -share/gnome/asclock/beats/beats.xpm -share/gnome/asclock/beats/clock.xpm -share/gnome/asclock/beats/config -share/gnome/asclock/beats/date.xpm -share/gnome/asclock/beats/hour.xpm -share/gnome/asclock/beats/led.xpm -share/gnome/asclock/beats/minute.xpm -share/gnome/asclock/beats/month.xpm -share/gnome/asclock/beats/second.xpm -share/gnome/asclock/beats/weekday.xpm -share/gnome/asclock/classic/beats.xpm -share/gnome/asclock/classic/clock.xpm -share/gnome/asclock/classic/config -share/gnome/asclock/classic/date.xpm -share/gnome/asclock/classic/hour.xpm -share/gnome/asclock/classic/led.xpm -share/gnome/asclock/classic/minute.xpm -share/gnome/asclock/classic/month.xpm -share/gnome/asclock/classic/second.xpm -share/gnome/asclock/classic/weekday.xpm -share/gnome/asclock/shaped/beats.xpm -share/gnome/asclock/shaped/clock.xpm -share/gnome/asclock/shaped/config -share/gnome/asclock/shaped/date.xpm -share/gnome/asclock/shaped/hour.xpm -share/gnome/asclock/shaped/led.xpm -share/gnome/asclock/shaped/minute.xpm -share/gnome/asclock/shaped/month.xpm -share/gnome/asclock/shaped/second.xpm -share/gnome/asclock/shaped/weekday.xpm +share/gnome/control-center/Desktop/gnome-panel-properties.desktop +share/gnome/control-center/Session/gnome-hint-properties.desktop share/gnome/default.session share/gnome/default.wm -share/gnome/help/gnome-intro/C/a-sample-session.html -share/gnome/help/gnome-intro/C/a-sample-session75.html -share/gnome/help/gnome-intro/C/c93.html -share/gnome/help/gnome-intro/C/c93127.html -share/gnome/help/gnome-intro/C/c93175.html -share/gnome/help/gnome-intro/C/c93191.html -share/gnome/help/gnome-intro/C/c93230.html -share/gnome/help/gnome-intro/C/c93302.html -share/gnome/help/gnome-intro/C/c93372.html -share/gnome/help/gnome-intro/C/c93412.html -share/gnome/help/gnome-intro/C/docbook.css -share/gnome/help/gnome-intro/C/f13.html -share/gnome/help/gnome-intro/C/f1346.html -share/gnome/help/gnome-intro/C/gnome-intro.html -share/gnome/help/gnome-intro/C/index.html -share/gnome/help/gnome-intro/C/pix/background-properties.gif -share/gnome/help/gnome-intro/C/pix/calendar.gif -share/gnome/help/gnome-intro/C/pix/ee-menu.gif -share/gnome/help/gnome-intro/C/pix/freecell.gif -share/gnome/help/gnome-intro/C/pix/gcalc.gif -share/gnome/help/gnome-intro/C/pix/gedit-2files.gif -share/gnome/help/gnome-intro/C/pix/ghex-2files.gif -share/gnome/help/gnome-intro/C/pix/ghex-basic.gif -share/gnome/help/gnome-intro/C/pix/gmc-basic.gif -share/gnome/help/gnome-intro/C/pix/gmix.gif -share/gnome/help/gnome-intro/C/pix/gnomine.gif -share/gnome/help/gnome-intro/C/pix/gtcd-cddb.gif -share/gnome/help/gnome-intro/C/pix/gtcd-track-list.gif -share/gnome/help/gnome-intro/C/pix/gtcd.gif -share/gnome/help/gnome-intro/C/pix/gtop-kill.gif -share/gnome/help/gnome-intro/C/pix/gtop-mem.gif -share/gnome/help/gnome-intro/C/pix/gtop-procs.gif -share/gnome/help/gnome-intro/C/pix/gtt-2proj.gif -share/gnome/help/gnome-intro/C/pix/gtt-basic.gif -share/gnome/help/gnome-intro/C/pix/gtt-new.gif -share/gnome/help/gnome-intro/C/pix/gulp.gif -share/gnome/help/gnome-intro/C/pix/help-browser-initial.gif -share/gnome/help/gnome-intro/C/pix/help-browser-sample.gif -share/gnome/help/gnome-intro/C/pix/help-icon.gif -share/gnome/help/gnome-intro/C/pix/mahjongg.gif -share/gnome/help/gnome-intro/C/pix/panel-add-icon.gif -share/gnome/help/gnome-intro/C/pix/panel-basic.gif -share/gnome/help/gnome-intro/C/pix/panel-icons.gif -share/gnome/help/gnome-intro/C/pix/panel-menu-select.gif -share/gnome/help/gnome-intro/C/pix/panel-menu.gif -share/gnome/help/gnome-intro/C/pix/same-gnome.gif -share/gnome/help/gnome-intro/C/pix/terminal.gif -share/gnome/help/gnome-intro/C/topic.dat +share/gnome/gnome-about/contributors.dat +share/gnome/help/clock_applet/C/clock_applet.png +share/gnome/help/clock_applet/C/clock_settings.png +share/gnome/help/clock_applet/C/docbook.css +share/gnome/help/clock_applet/C/index.html +share/gnome/help/clock_applet/C/ln7.html +share/gnome/help/clock_applet/C/stylesheet-images/caution.png +share/gnome/help/clock_applet/C/stylesheet-images/important.png +share/gnome/help/clock_applet/C/stylesheet-images/note.png +share/gnome/help/clock_applet/C/stylesheet-images/tip.png +share/gnome/help/clock_applet/C/stylesheet-images/warning.png +share/gnome/help/clock_applet/da/clock_applet.png +share/gnome/help/clock_applet/da/clock_settings.png +share/gnome/help/clock_applet/da/docbook.css +share/gnome/help/clock_applet/da/index.html +share/gnome/help/clock_applet/da/ln10.html +share/gnome/help/clock_applet/da/stylesheet-images/caution.png +share/gnome/help/clock_applet/da/stylesheet-images/important.png +share/gnome/help/clock_applet/da/stylesheet-images/note.png +share/gnome/help/clock_applet/da/stylesheet-images/tip.png +share/gnome/help/clock_applet/da/stylesheet-images/warning.png +share/gnome/help/desk-guide_applet/C/deskguide-fig.png +share/gnome/help/desk-guide_applet/C/deskguide-properties-advanced-fig.png +share/gnome/help/desk-guide_applet/C/deskguide-properties-geometry-fig.png +share/gnome/help/desk-guide_applet/C/deskguide-properties-tasks-fig.png +share/gnome/help/desk-guide_applet/C/deskguide-properties.png +share/gnome/help/desk-guide_applet/C/deskguide-tasklist-fig.png +share/gnome/help/desk-guide_applet/C/docbook.css +share/gnome/help/desk-guide_applet/C/index.html +share/gnome/help/desk-guide_applet/C/ln7.html +share/gnome/help/desk-guide_applet/C/stylesheet-images/caution.png +share/gnome/help/desk-guide_applet/C/stylesheet-images/important.png +share/gnome/help/desk-guide_applet/C/stylesheet-images/note.png +share/gnome/help/desk-guide_applet/C/stylesheet-images/tip.png +share/gnome/help/desk-guide_applet/C/stylesheet-images/warning.png +share/gnome/help/desk-guide_applet/de/deskguide-fig.png +share/gnome/help/desk-guide_applet/de/deskguide-properties-advanced-fig.png +share/gnome/help/desk-guide_applet/de/deskguide-properties-geometry-fig.png +share/gnome/help/desk-guide_applet/de/deskguide-properties-tasks-fig.png +share/gnome/help/desk-guide_applet/de/deskguide-properties.png +share/gnome/help/desk-guide_applet/de/deskguide-tasklist-fig.png +share/gnome/help/desk-guide_applet/de/docbook.css +share/gnome/help/desk-guide_applet/de/index.html +share/gnome/help/desk-guide_applet/de/ln11.html +share/gnome/help/desk-guide_applet/de/stylesheet-images/caution.png +share/gnome/help/desk-guide_applet/de/stylesheet-images/important.png +share/gnome/help/desk-guide_applet/de/stylesheet-images/note.png +share/gnome/help/desk-guide_applet/de/stylesheet-images/tip.png +share/gnome/help/desk-guide_applet/de/stylesheet-images/warning.png +share/gnome/help/fish_applet/C/docbook.css +share/gnome/help/fish_applet/C/fish_applet.png +share/gnome/help/fish_applet/C/fish_settings.png +share/gnome/help/fish_applet/C/index.html +share/gnome/help/fish_applet/C/ln7.html +share/gnome/help/fish_applet/C/stylesheet-images/caution.png +share/gnome/help/fish_applet/C/stylesheet-images/important.png +share/gnome/help/fish_applet/C/stylesheet-images/note.png +share/gnome/help/fish_applet/C/stylesheet-images/tip.png +share/gnome/help/fish_applet/C/stylesheet-images/warning.png +share/gnome/help/fish_applet/da/docbook.css +share/gnome/help/fish_applet/da/fish_applet.png +share/gnome/help/fish_applet/da/fish_settings.png +share/gnome/help/fish_applet/da/index.html +share/gnome/help/fish_applet/da/ln10.html +share/gnome/help/fish_applet/da/stylesheet-images/caution.png +share/gnome/help/fish_applet/da/stylesheet-images/important.png +share/gnome/help/fish_applet/da/stylesheet-images/note.png +share/gnome/help/fish_applet/da/stylesheet-images/tip.png +share/gnome/help/fish_applet/da/stylesheet-images/warning.png +share/gnome/help/fish_applet/no/docbook.css +share/gnome/help/fish_applet/no/index.html +share/gnome/help/fish_applet/no/ln7.html +share/gnome/help/fish_applet/no/stylesheet-images/caution.png +share/gnome/help/fish_applet/no/stylesheet-images/important.png +share/gnome/help/fish_applet/no/stylesheet-images/note.png +share/gnome/help/fish_applet/no/stylesheet-images/tip.png +share/gnome/help/fish_applet/no/stylesheet-images/warning.png +share/gnome/help/gen_util_applet/de/docbook.css +share/gnome/help/gen_util_applet/de/index.html +share/gnome/help/gen_util_applet/de/ln7.html +share/gnome/help/gen_util_applet/de/stylesheet-images/caution.png +share/gnome/help/gen_util_applet/de/stylesheet-images/important.png +share/gnome/help/gen_util_applet/de/stylesheet-images/note.png +share/gnome/help/gen_util_applet/de/stylesheet-images/tip.png +share/gnome/help/gen_util_applet/de/stylesheet-images/warning.png +share/gnome/help/gen_util_applet/no/docbook.css +share/gnome/help/gen_util_applet/no/index.html +share/gnome/help/gen_util_applet/no/ln7.html +share/gnome/help/gen_util_applet/no/stylesheet-images/caution.png +share/gnome/help/gen_util_applet/no/stylesheet-images/important.png +share/gnome/help/gen_util_applet/no/stylesheet-images/note.png +share/gnome/help/gen_util_applet/no/stylesheet-images/tip.png +share/gnome/help/gen_util_applet/no/stylesheet-images/warning.png share/gnome/help/gnome-terminal/C/authors.html share/gnome/help/gnome-terminal/C/classes.html share/gnome/help/gnome-terminal/C/config.html share/gnome/help/gnome-terminal/C/docbook.css -share/gnome/help/gnome-terminal/C/emulation.html share/gnome/help/gnome-terminal/C/environment.html share/gnome/help/gnome-terminal/C/index.html -share/gnome/help/gnome-terminal/C/ln12.html +share/gnome/help/gnome-terminal/C/license.html +share/gnome/help/gnome-terminal/C/ln11.html share/gnome/help/gnome-terminal/C/menus.html share/gnome/help/gnome-terminal/C/options.html share/gnome/help/gnome-terminal/C/pointerusage.html -share/gnome/help/gnome-terminal/C/terminal.html +share/gnome/help/gnome-terminal/C/stylesheet-images/caution.png +share/gnome/help/gnome-terminal/C/stylesheet-images/important.png +share/gnome/help/gnome-terminal/C/stylesheet-images/note.png +share/gnome/help/gnome-terminal/C/stylesheet-images/tip.png +share/gnome/help/gnome-terminal/C/stylesheet-images/warning.png share/gnome/help/gnome-terminal/C/topic.dat +share/gnome/help/gnome-terminal/C/usage.html share/gnome/help/gnome-terminal/da/authors.html share/gnome/help/gnome-terminal/da/classes.html share/gnome/help/gnome-terminal/da/config.html @@ -279,22 +224,61 @@ share/gnome/help/gnome-terminal/da/ln9.html share/gnome/help/gnome-terminal/da/menus.html share/gnome/help/gnome-terminal/da/options.html share/gnome/help/gnome-terminal/da/pointerusage.html +share/gnome/help/gnome-terminal/da/stylesheet-images/caution.png +share/gnome/help/gnome-terminal/da/stylesheet-images/important.png +share/gnome/help/gnome-terminal/da/stylesheet-images/note.png +share/gnome/help/gnome-terminal/da/stylesheet-images/tip.png +share/gnome/help/gnome-terminal/da/stylesheet-images/warning.png share/gnome/help/gnome-terminal/da/terminal.html share/gnome/help/gnome-terminal/da/termtech.html share/gnome/help/gnome-terminal/da/topic.dat +share/gnome/help/gnome-terminal/de/authors.html +share/gnome/help/gnome-terminal/de/classes.html +share/gnome/help/gnome-terminal/de/config.html +share/gnome/help/gnome-terminal/de/docbook.css +share/gnome/help/gnome-terminal/de/environment.html +share/gnome/help/gnome-terminal/de/index.html +share/gnome/help/gnome-terminal/de/ln11.html +share/gnome/help/gnome-terminal/de/menus.html +share/gnome/help/gnome-terminal/de/options.html +share/gnome/help/gnome-terminal/de/pointerusage.html +share/gnome/help/gnome-terminal/de/topic.dat +share/gnome/help/gnome-terminal/de/usage.html share/gnome/help/gnome-terminal/es/authors.html share/gnome/help/gnome-terminal/es/classes.html share/gnome/help/gnome-terminal/es/config.html share/gnome/help/gnome-terminal/es/docbook.css -share/gnome/help/gnome-terminal/es/emulation.html share/gnome/help/gnome-terminal/es/environment.html share/gnome/help/gnome-terminal/es/index.html -share/gnome/help/gnome-terminal/es/ln15.html +share/gnome/help/gnome-terminal/es/ln17.html share/gnome/help/gnome-terminal/es/menus.html share/gnome/help/gnome-terminal/es/options.html share/gnome/help/gnome-terminal/es/pointerusage.html -share/gnome/help/gnome-terminal/es/terminal.html +share/gnome/help/gnome-terminal/es/stylesheet-images/caution.png +share/gnome/help/gnome-terminal/es/stylesheet-images/important.png +share/gnome/help/gnome-terminal/es/stylesheet-images/note.png +share/gnome/help/gnome-terminal/es/stylesheet-images/tip.png +share/gnome/help/gnome-terminal/es/stylesheet-images/warning.png share/gnome/help/gnome-terminal/es/topic.dat +share/gnome/help/gnome-terminal/es/usage.html +share/gnome/help/gnome-terminal/it/authors.html +share/gnome/help/gnome-terminal/it/classes.html +share/gnome/help/gnome-terminal/it/config.html +share/gnome/help/gnome-terminal/it/docbook.css +share/gnome/help/gnome-terminal/it/emulation.html +share/gnome/help/gnome-terminal/it/environment.html +share/gnome/help/gnome-terminal/it/index.html +share/gnome/help/gnome-terminal/it/ln12.html +share/gnome/help/gnome-terminal/it/menus.html +share/gnome/help/gnome-terminal/it/options.html +share/gnome/help/gnome-terminal/it/pointerusage.html +share/gnome/help/gnome-terminal/it/stylesheet-images/caution.png +share/gnome/help/gnome-terminal/it/stylesheet-images/important.png +share/gnome/help/gnome-terminal/it/stylesheet-images/note.png +share/gnome/help/gnome-terminal/it/stylesheet-images/tip.png +share/gnome/help/gnome-terminal/it/stylesheet-images/warning.png +share/gnome/help/gnome-terminal/it/terminal.html +share/gnome/help/gnome-terminal/it/topic.dat share/gnome/help/gnome-terminal/no/authors.html share/gnome/help/gnome-terminal/no/classes.html share/gnome/help/gnome-terminal/no/config.html @@ -306,6 +290,11 @@ share/gnome/help/gnome-terminal/no/ln9.html share/gnome/help/gnome-terminal/no/menus.html share/gnome/help/gnome-terminal/no/options.html share/gnome/help/gnome-terminal/no/pointerusage.html +share/gnome/help/gnome-terminal/no/stylesheet-images/caution.png +share/gnome/help/gnome-terminal/no/stylesheet-images/important.png +share/gnome/help/gnome-terminal/no/stylesheet-images/note.png +share/gnome/help/gnome-terminal/no/stylesheet-images/tip.png +share/gnome/help/gnome-terminal/no/stylesheet-images/warning.png share/gnome/help/gnome-terminal/no/terminal.html share/gnome/help/gnome-terminal/no/termtech.html share/gnome/help/gnome-terminal/no/topic.dat @@ -330,8 +319,11 @@ share/gnome/help/help-browser/fr/default-page.html share/gnome/help/help-browser/fr/help-browser.html share/gnome/help/help-browser/fr/index.html share/gnome/help/help-browser/fr/topic.dat +share/gnome/help/help-browser/gl/default-page.html +share/gnome/help/help-browser/gl/help-browser.html +share/gnome/help/help-browser/gl/index.html +share/gnome/help/help-browser/gl/topic.dat share/gnome/help/help-browser/hu/default-page.html -share/gnome/help/help-browser/hu/gnome-logo-large.png share/gnome/help/help-browser/hu/help-browser.html share/gnome/help/help-browser/hu/index.html share/gnome/help/help-browser/hu/topic.dat @@ -347,81 +339,275 @@ share/gnome/help/help-browser/ko/default-page.html share/gnome/help/help-browser/ko/help-browser.html share/gnome/help/help-browser/ko/index.html share/gnome/help/help-browser/ko/topic.dat +share/gnome/help/help-browser/lt/default-page.html +share/gnome/help/help-browser/lt/help-browser.html +share/gnome/help/help-browser/lt/index.html +share/gnome/help/help-browser/lt/topic.dat share/gnome/help/help-browser/no/default-page.html share/gnome/help/help-browser/no/help-browser.html share/gnome/help/help-browser/no/index.html share/gnome/help/help-browser/no/topic.dat +share/gnome/help/help-browser/uk/default-page.html +share/gnome/help/help-browser/uk/help-browser.html +share/gnome/help/help-browser/uk/index.html +share/gnome/help/help-browser/uk/topic.dat share/gnome/help/help-browser/wa/default-page.html share/gnome/help/help-browser/wa/help-browser.html share/gnome/help/help-browser/wa/index.html share/gnome/help/help-browser/wa/topic.dat -share/gnome/help/mini-commander_applet/C/change-log.html -share/gnome/help/mini-commander_applet/C/clock.html -share/gnome/help/mini-commander_applet/C/command-completion.html -share/gnome/help/mini-commander_applet/C/command-history.html -share/gnome/help/mini-commander_applet/C/download.html -share/gnome/help/mini-commander_applet/C/faq.html -share/gnome/help/mini-commander_applet/C/features.html -share/gnome/help/mini-commander_applet/C/feedback.html -share/gnome/help/mini-commander_applet/C/gpl2.html -share/gnome/help/mini-commander_applet/C/history.html -share/gnome/help/mini-commander_applet/C/index.html -share/gnome/help/mini-commander_applet/C/introduction.html -share/gnome/help/mini-commander_applet/C/legal-notice.html -share/gnome/help/mini-commander_applet/C/macros.html -share/gnome/help/mini-commander_applet/C/properties-0.html -share/gnome/help/mini-commander_applet/C/screenshots.html -share/gnome/help/mini-commander_applet/C/topic.dat -share/gnome/help/mini-commander_applet/C/todo.html +share/gnome/help/mailcheck_applet/C/docbook.css +share/gnome/help/mailcheck_applet/C/index.html +share/gnome/help/mailcheck_applet/C/ln7.html +share/gnome/help/mailcheck_applet/C/mailcheck-properties-mailbox.png +share/gnome/help/mailcheck_applet/C/mailcheck-properties-mailcheck.png +share/gnome/help/mailcheck_applet/C/stylesheet-images/caution.png +share/gnome/help/mailcheck_applet/C/stylesheet-images/important.png +share/gnome/help/mailcheck_applet/C/stylesheet-images/note.png +share/gnome/help/mailcheck_applet/C/stylesheet-images/tip.png +share/gnome/help/mailcheck_applet/C/stylesheet-images/warning.png +share/gnome/help/mailcheck_applet/da/docbook.css +share/gnome/help/mailcheck_applet/da/index.html +share/gnome/help/mailcheck_applet/da/ln7.html +share/gnome/help/mailcheck_applet/da/mailcheck-properties-mailbox.png +share/gnome/help/mailcheck_applet/da/mailcheck-properties-mailcheck.png +share/gnome/help/mailcheck_applet/da/stylesheet-images/caution.png +share/gnome/help/mailcheck_applet/da/stylesheet-images/important.png +share/gnome/help/mailcheck_applet/da/stylesheet-images/note.png +share/gnome/help/mailcheck_applet/da/stylesheet-images/tip.png +share/gnome/help/mailcheck_applet/da/stylesheet-images/warning.png +share/gnome/help/panel/C/appletadd.html +share/gnome/help/panel/C/applets.html +share/gnome/help/panel/C/authors.html +share/gnome/help/panel/C/docbook.css +share/gnome/help/panel/C/drawers.html +share/gnome/help/panel/C/figures/create_launcher.png +share/gnome/help/panel/C/figures/drawer_open.png +share/gnome/help/panel/C/figures/drawer_properties.png +share/gnome/help/panel/C/figures/example_menu.png +share/gnome/help/panel/C/figures/example_panel.png +share/gnome/help/panel/C/figures/glob_pref_anim.png +share/gnome/help/panel/C/figures/hide-button.png +share/gnome/help/panel/C/figures/launcher_advprops.png +share/gnome/help/panel/C/figures/launcher_properties_advanced.png +share/gnome/help/panel/C/figures/launcher_properties_basic.png +share/gnome/help/panel/C/figures/launcher_props.png +share/gnome/help/panel/C/figures/logout-screen.png +share/gnome/help/panel/C/figures/mainmenu_properties.png +share/gnome/help/panel/C/figures/menu_properties.png +share/gnome/help/panel/C/figures/mm-button.png +share/gnome/help/panel/C/figures/panel_applets.png +share/gnome/help/panel/C/figures/panel_lockbut.png +share/gnome/help/panel/C/figures/panel_logoutbut.png +share/gnome/help/panel/C/figures/panel_props_back.png +share/gnome/help/panel/C/figures/panel_props_edge.png +share/gnome/help/panel/C/figures/panel_runbutton.png +share/gnome/help/panel/C/figures/panel_runprogram.png +share/gnome/help/panel/C/figures/panel_swallow.png +share/gnome/help/panel/C/figures/status_dock.png +share/gnome/help/panel/C/globalpanelprefs.html +share/gnome/help/panel/C/index.html +share/gnome/help/panel/C/launchers.html +share/gnome/help/panel/C/license.html +share/gnome/help/panel/C/ln7.html +share/gnome/help/panel/C/mainmenu.html +share/gnome/help/panel/C/menus.html +share/gnome/help/panel/C/panelbasics.html +share/gnome/help/panel/C/panelbugs.html +share/gnome/help/panel/C/panelmove.html +share/gnome/help/panel/C/panelproperties.html +share/gnome/help/panel/C/specialobjects.html +share/gnome/help/panel/C/stylesheet-images/caution.png +share/gnome/help/panel/C/stylesheet-images/important.png +share/gnome/help/panel/C/stylesheet-images/note.png +share/gnome/help/panel/C/stylesheet-images/tip.png +share/gnome/help/panel/C/stylesheet-images/warning.png +share/gnome/help/panel/C/topic.dat +share/gnome/help/panel/de/appletadd.html +share/gnome/help/panel/de/applets.html +share/gnome/help/panel/de/authors.html +share/gnome/help/panel/de/docbook.css +share/gnome/help/panel/de/drawers.html +share/gnome/help/panel/de/figures/create_launcher.png +share/gnome/help/panel/de/figures/drawer_open.png +share/gnome/help/panel/de/figures/drawer_properties.png +share/gnome/help/panel/de/figures/example_menu.png +share/gnome/help/panel/de/figures/example_panel.png +share/gnome/help/panel/de/figures/glob_pref_anim.png +share/gnome/help/panel/de/figures/hide-button.png +share/gnome/help/panel/de/figures/launcher_advprops.png +share/gnome/help/panel/de/figures/launcher_properties_advanced.png +share/gnome/help/panel/de/figures/launcher_properties_basic.png +share/gnome/help/panel/de/figures/launcher_props.png +share/gnome/help/panel/de/figures/logout-screen.png +share/gnome/help/panel/de/figures/mainmenu_properties.png +share/gnome/help/panel/de/figures/menu_properties.png +share/gnome/help/panel/de/figures/mm-button.png +share/gnome/help/panel/de/figures/panel_applets.png +share/gnome/help/panel/de/figures/panel_lockbut.png +share/gnome/help/panel/de/figures/panel_logoutbut.png +share/gnome/help/panel/de/figures/panel_props_back.png +share/gnome/help/panel/de/figures/panel_props_edge.png +share/gnome/help/panel/de/figures/panel_swallow.png +share/gnome/help/panel/de/figures/status_dock.png +share/gnome/help/panel/de/globalpanelprefs.html +share/gnome/help/panel/de/index.html +share/gnome/help/panel/de/launchers.html +share/gnome/help/panel/de/ln7.html +share/gnome/help/panel/de/mainmenu.html +share/gnome/help/panel/de/menus.html +share/gnome/help/panel/de/panelbasics.html +share/gnome/help/panel/de/panelbugs.html +share/gnome/help/panel/de/panelmove.html +share/gnome/help/panel/de/panelproperties.html +share/gnome/help/panel/de/specialobjects.html +share/gnome/help/panel/de/stylesheet-images/caution.png +share/gnome/help/panel/de/stylesheet-images/important.png +share/gnome/help/panel/de/stylesheet-images/note.png +share/gnome/help/panel/de/stylesheet-images/tip.png +share/gnome/help/panel/de/stylesheet-images/warning.png +share/gnome/help/panel/de/topic.dat +share/gnome/help/panel/it/appletadd.html +share/gnome/help/panel/it/applets.html +share/gnome/help/panel/it/authors.html +share/gnome/help/panel/it/docbook.css +share/gnome/help/panel/it/drawers.html +share/gnome/help/panel/it/figures/create_launcher.png +share/gnome/help/panel/it/figures/drawer_open.png +share/gnome/help/panel/it/figures/drawer_properties.png +share/gnome/help/panel/it/figures/example_menu.png +share/gnome/help/panel/it/figures/example_panel.png +share/gnome/help/panel/it/figures/glob_pref_anim.png +share/gnome/help/panel/it/figures/hide-button.png +share/gnome/help/panel/it/figures/launcher_advprops.png +share/gnome/help/panel/it/figures/launcher_properties_advanced.png +share/gnome/help/panel/it/figures/launcher_properties_basic.png +share/gnome/help/panel/it/figures/launcher_props.png +share/gnome/help/panel/it/figures/mainmenu_properties.png +share/gnome/help/panel/it/figures/menu_properties.png +share/gnome/help/panel/it/figures/mm-button.png +share/gnome/help/panel/it/figures/panel_applets.png +share/gnome/help/panel/it/figures/panel_lockbut.png +share/gnome/help/panel/it/figures/panel_logoutbut.png +share/gnome/help/panel/it/figures/panel_props_back.png +share/gnome/help/panel/it/figures/panel_props_edge.png +share/gnome/help/panel/it/figures/panel_runbutton.png +share/gnome/help/panel/it/figures/panel_runprogram.png +share/gnome/help/panel/it/figures/panel_swallow.png +share/gnome/help/panel/it/figures/status_dock.png +share/gnome/help/panel/it/globalpanelprefs.html +share/gnome/help/panel/it/index.html +share/gnome/help/panel/it/launchers.html +share/gnome/help/panel/it/ln7.html +share/gnome/help/panel/it/mainmenu.html +share/gnome/help/panel/it/menus.html +share/gnome/help/panel/it/panelbasics.html +share/gnome/help/panel/it/panelbugs.html +share/gnome/help/panel/it/panelmove.html +share/gnome/help/panel/it/panelproperties.html +share/gnome/help/panel/it/specialobjects.html +share/gnome/help/panel/it/stylesheet-images/caution.png +share/gnome/help/panel/it/stylesheet-images/important.png +share/gnome/help/panel/it/stylesheet-images/note.png +share/gnome/help/panel/it/stylesheet-images/tip.png +share/gnome/help/panel/it/stylesheet-images/warning.png +share/gnome/help/panel/it/topic.dat +share/gnome/help/printer_applet/C/docbook.css +share/gnome/help/printer_applet/C/index.html +share/gnome/help/printer_applet/C/ln7.html +share/gnome/help/printer_applet/C/printer-fig.png +share/gnome/help/printer_applet/C/printer-properties.png +share/gnome/help/printer_applet/C/stylesheet-images/caution.png +share/gnome/help/printer_applet/C/stylesheet-images/important.png +share/gnome/help/printer_applet/C/stylesheet-images/note.png +share/gnome/help/printer_applet/C/stylesheet-images/tip.png +share/gnome/help/printer_applet/C/stylesheet-images/warning.png +share/gnome/help/printer_applet/da/docbook.css +share/gnome/help/printer_applet/da/index.html +share/gnome/help/printer_applet/da/ln10.html +share/gnome/help/printer_applet/da/printer-fig.png +share/gnome/help/printer_applet/da/printer-properties.png +share/gnome/help/printer_applet/da/stylesheet-images/caution.png +share/gnome/help/printer_applet/da/stylesheet-images/important.png +share/gnome/help/printer_applet/da/stylesheet-images/note.png +share/gnome/help/printer_applet/da/stylesheet-images/tip.png +share/gnome/help/printer_applet/da/stylesheet-images/warning.png +share/gnome/help/session/C/authors.html +share/gnome/help/session/C/bugs.html +share/gnome/help/session/C/button_remove.png +share/gnome/help/session/C/docbook.css +share/gnome/help/session/C/index.html +share/gnome/help/session/C/license.html +share/gnome/help/session/C/ln7.html +share/gnome/help/session/C/session-properties.png +share/gnome/help/session/C/stock_exec.png +share/gnome/help/session/C/stock_help.png +share/gnome/help/session/C/stock_preferences.png +share/gnome/help/session/C/stock_refresh.png +share/gnome/help/session/C/stock_save.png +share/gnome/help/session/C/stock_timer.png +share/gnome/help/session/C/stock_trash.png +share/gnome/help/session/C/stylesheet-images/caution.png +share/gnome/help/session/C/stylesheet-images/important.png +share/gnome/help/session/C/stylesheet-images/note.png +share/gnome/help/session/C/stylesheet-images/tip.png +share/gnome/help/session/C/stylesheet-images/warning.png +share/gnome/help/tasklist_applet/C/docbook.css +share/gnome/help/tasklist_applet/C/index.html +share/gnome/help/tasklist_applet/C/ln7.html +share/gnome/help/tasklist_applet/C/stylesheet-images/caution.png +share/gnome/help/tasklist_applet/C/stylesheet-images/important.png +share/gnome/help/tasklist_applet/C/stylesheet-images/note.png +share/gnome/help/tasklist_applet/C/stylesheet-images/tip.png +share/gnome/help/tasklist_applet/C/stylesheet-images/warning.png +share/gnome/help/tasklist_applet/C/tasklist-fig.png +share/gnome/help/tasklist_applet/C/tasklist-properties-size.png +share/gnome/help/tasklist_applet/C/tasklist-properties.png +share/gnome/help/tasklist_applet/C/tasklist-rightclick-fig.png +share/gnome/hints/panel.hints +share/gnome/html/panel-decl.txt +share/gnome/html/panel-sections.txt +share/gnome/html/panel.hierarchy +share/gnome/html/panel.html +share/gnome/html/panel.sgml +share/gnome/html/panel.signals +share/gnome/html/panel.types +share/gnome/html/panel/appletwidget.html +share/gnome/html/panel/book1.html +share/gnome/html/panel/c26.html +share/gnome/html/panel/panel-context-menu.html +share/gnome/html/panel/panel-miscellaneous.html +share/gnome/html/panel/panel-panel-interaction.html +share/gnome/html/panel/r1373.html +share/gnome/html/panel/r160.html +share/gnome/html/panel/statusdocklet.html +share/gnome/html/panel/x101.html +share/gnome/html/panel/x126.html +share/gnome/html/panel/x134.html +share/gnome/html/panel/x149.html +share/gnome/html/panel/x156.html +share/gnome/html/panel/x31.html +share/gnome/html/panel/x38.html +share/gnome/html/panel/x49.html +share/gnome/html/panel/x57.html +share/gnome/html/panel/x76.html +share/gnome/html/panel/x95.html +share/gnome/idl/Terminal.idl share/gnome/idl/gnome-panel.idl share/gnome/idl/help-browser.idl share/gnome/mc/templates/GIMP.desktop share/gnome/panelrc -share/gnome/pixmaps/another_clock.xpm share/gnome/pixmaps/apple-green.png share/gnome/pixmaps/apple-red.png -share/gnome/pixmaps/charpick.png -share/gnome/pixmaps/emacs.png share/gnome/pixmaps/fish/fishanim.png +share/gnome/pixmaps/fish/footguy.png +share/gnome/pixmaps/fish/monkey.png share/gnome/pixmaps/fish/oldwanda.png -share/gnome/pixmaps/gkb.xpm -share/gnome/pixmaps/gkb/at.xpm -share/gnome/pixmaps/gkb/be.xpm -share/gnome/pixmaps/gkb/bg.xpm -share/gnome/pixmaps/gkb/ca.xpm -share/gnome/pixmaps/gkb/ch.xpm -share/gnome/pixmaps/gkb/cz.xpm -share/gnome/pixmaps/gkb/de.xpm -share/gnome/pixmaps/gkb/dk.xpm -share/gnome/pixmaps/gkb/ee.xpm -share/gnome/pixmaps/gkb/es.xpm -share/gnome/pixmaps/gkb/fi.xpm -share/gnome/pixmaps/gkb/fr.xpm -share/gnome/pixmaps/gkb/gb.xpm -share/gnome/pixmaps/gkb/gr.xpm -share/gnome/pixmaps/gkb/hu.xpm -share/gnome/pixmaps/gkb/il.xpm -share/gnome/pixmaps/gkb/is.xpm -share/gnome/pixmaps/gkb/it.xpm -share/gnome/pixmaps/gkb/jp.xpm -share/gnome/pixmaps/gkb/nl.xpm -share/gnome/pixmaps/gkb/no.xpm -share/gnome/pixmaps/gkb/pl.xpm -share/gnome/pixmaps/gkb/pt.xpm -share/gnome/pixmaps/gkb/qc.xpm -share/gnome/pixmaps/gkb/ru.xpm -share/gnome/pixmaps/gkb/se.xpm -share/gnome/pixmaps/gkb/si.xpm -share/gnome/pixmaps/gkb/sk.xpm -share/gnome/pixmaps/gkb/th.xpm -share/gnome/pixmaps/gkb/tr.xpm -share/gnome/pixmaps/gkb/us.xpm -share/gnome/pixmaps/gkb/yu.xpm +share/gnome/pixmaps/gnome-amusements.png share/gnome/pixmaps/gnome-aorta.png +share/gnome/pixmaps/gnome-applets.png +share/gnome/pixmaps/gnome-applications.png share/gnome/pixmaps/gnome-audio2.png share/gnome/pixmaps/gnome-background.png -share/gnome/pixmaps/gnome-balsa2.png -share/gnome/pixmaps/gnome-battery.png share/gnome/pixmaps/gnome-calc2.png share/gnome/pixmaps/gnome-calendar.png share/gnome/pixmaps/gnome-cardgame.png @@ -438,27 +624,29 @@ share/gnome/pixmaps/gnome-ccwindowmanager.png share/gnome/pixmaps/gnome-clock.png share/gnome/pixmaps/gnome-color-browser.png share/gnome/pixmaps/gnome-color-xterm.png -share/gnome/pixmaps/gnome-cpu-mem.png -share/gnome/pixmaps/gnome-cpu.png +share/gnome/pixmaps/gnome-computer.png share/gnome/pixmaps/gnome-cromagnon.png -share/gnome/pixmaps/gnome-default.png +share/gnome/pixmaps/gnome-debian.png share/gnome/pixmaps/gnome-deskguide-splash.png share/gnome/pixmaps/gnome-deskguide.png +share/gnome/pixmaps/gnome-devel.png share/gnome/pixmaps/gnome-die1.png share/gnome/pixmaps/gnome-die2.png share/gnome/pixmaps/gnome-die3.png share/gnome/pixmaps/gnome-die4.png share/gnome/pixmaps/gnome-die5.png share/gnome/pixmaps/gnome-die6.png -share/gnome/pixmaps/gnome-ee.png +share/gnome/pixmaps/gnome-diskfree.png +share/gnome/pixmaps/gnome-emacs.png share/gnome/pixmaps/gnome-eterm.png share/gnome/pixmaps/gnome-favorites.png -share/gnome/pixmaps/gnome-fifteen.png share/gnome/pixmaps/gnome-file-c.png share/gnome/pixmaps/gnome-file-h.png share/gnome/pixmaps/gnome-fish.png share/gnome/pixmaps/gnome-folder.png share/gnome/pixmaps/gnome-gegl.png +share/gnome/pixmaps/gnome-gegl2-2.png +share/gnome/pixmaps/gnome-gegl2.png share/gnome/pixmaps/gnome-gemvt.png share/gnome/pixmaps/gnome-gimp.png share/gnome/pixmaps/gnome-globe.png @@ -468,27 +656,37 @@ share/gnome/pixmaps/gnome-gnomine.png share/gnome/pixmaps/gnome-graphics.png share/gnome/pixmaps/gnome-gsame.png share/gnome/pixmaps/gnome-help.png +share/gnome/pixmaps/gnome-hint.png share/gnome/pixmaps/gnome-html.png share/gnome/pixmaps/gnome-image-gif.png share/gnome/pixmaps/gnome-image-jpeg.png share/gnome/pixmaps/gnome-irc.png share/gnome/pixmaps/gnome-joystick.png share/gnome/pixmaps/gnome-laptop.png -share/gnome/pixmaps/gnome-life.png share/gnome/pixmaps/gnome-lockscreen.png share/gnome/pixmaps/gnome-log.png share/gnome/pixmaps/gnome-logo-icon-transparent.png share/gnome/pixmaps/gnome-logo-icon.png share/gnome/pixmaps/gnome-logo-large.png -share/gnome/pixmaps/gnome-mem.png +share/gnome/pixmaps/gnome-mailcheck.png +share/gnome/pixmaps/gnome-mdi.png share/gnome/pixmaps/gnome-mnemonic.png share/gnome/pixmaps/gnome-modem.png share/gnome/pixmaps/gnome-money.png +share/gnome/pixmaps/gnome-monitor.png share/gnome/pixmaps/gnome-mouse.png +share/gnome/pixmaps/gnome-multimedia.png share/gnome/pixmaps/gnome-networktool.png +share/gnome/pixmaps/gnome-news.png share/gnome/pixmaps/gnome-note.png share/gnome/pixmaps/gnome-panel.png share/gnome/pixmaps/gnome-qeye.png +share/gnome/pixmaps/gnome-run.png +share/gnome/pixmaps/gnome-session.png +share/gnome/pixmaps/gnome-settings.png +share/gnome/pixmaps/gnome-spider.png +share/gnome/pixmaps/gnome-squeak.png +share/gnome/pixmaps/gnome-suse.png share/gnome/pixmaps/gnome-talk.png share/gnome/pixmaps/gnome-tasklist.png share/gnome/pixmaps/gnome-term-linux.png @@ -498,18 +696,20 @@ share/gnome/pixmaps/gnome-term-tiger.png share/gnome/pixmaps/gnome-term.png share/gnome/pixmaps/gnome-terminal.png share/gnome/pixmaps/gnome-tigert.png +share/gnome/pixmaps/gnome-touristinfo.png share/gnome/pixmaps/gnome-unknown.png +share/gnome/pixmaps/gnome-user-interface.png share/gnome/pixmaps/gnome-util.png share/gnome/pixmaps/gnome-word.png share/gnome/pixmaps/gnome-xterm.png +share/gnome/pixmaps/gtkvim.png share/gnome/pixmaps/kterm.xpm share/gnome/pixmaps/launcher-program.png -share/gnome/pixmaps/mailcheck/email-eclouds.png share/gnome/pixmaps/mailcheck/email-e.png +share/gnome/pixmaps/mailcheck/email-eclouds.png +share/gnome/pixmaps/mailcheck/email-tiny.png share/gnome/pixmaps/mailcheck/email.png share/gnome/pixmaps/mailcheck/tux-anim.png -share/gnome/pixmaps/mini-commander/browser-mini.xpm -share/gnome/pixmaps/mini-commander/history-mini.xpm share/gnome/pixmaps/monitor.png share/gnome/pixmaps/netscape.png share/gnome/pixmaps/panel-arrow-down.png @@ -520,6 +720,7 @@ share/gnome/pixmaps/panel-drawer.png share/gnome/pixmaps/panel-folder.png share/gnome/pixmaps/panel-knob.png share/gnome/pixmaps/panel-menu-main.png +share/gnome/pixmaps/splash/gnome-splash.png share/gnome/pixmaps/tiles/tile-blue-down.png share/gnome/pixmaps/tiles/tile-blue-up.png share/gnome/pixmaps/tiles/tile-coral-down.png @@ -541,45 +742,7 @@ share/gnome/pixmaps/tiles/tile-purple-up.png share/gnome/pixmaps/tiles/tile-sand-down.png share/gnome/pixmaps/tiles/tile-sand-up.png share/gnome/pixmaps/vnterm.xpm -share/gnome/xmodmap/xmodmap.be -share/gnome/xmodmap/xmodmap.bg -share/gnome/xmodmap/xmodmap.ch -share/gnome/xmodmap/xmodmap.cz -share/gnome/xmodmap/xmodmap.de -share/gnome/xmodmap/xmodmap.dk -share/gnome/xmodmap/xmodmap.dvorak -share/gnome/xmodmap/xmodmap.ee -share/gnome/xmodmap/xmodmap.es -share/gnome/xmodmap/xmodmap.fi -share/gnome/xmodmap/xmodmap.fr -share/gnome/xmodmap/xmodmap.fr-2 -share/gnome/xmodmap/xmodmap.gr -share/gnome/xmodmap/xmodmap.hu -share/gnome/xmodmap/xmodmap.hu.old -share/gnome/xmodmap/xmodmap.il -share/gnome/xmodmap/xmodmap.is -share/gnome/xmodmap/xmodmap.it -share/gnome/xmodmap/xmodmap.la -share/gnome/xmodmap/xmodmap.nl -share/gnome/xmodmap/xmodmap.no -share/gnome/xmodmap/xmodmap.pl -share/gnome/xmodmap/xmodmap.pt -share/gnome/xmodmap/xmodmap.pt-dead -share/gnome/xmodmap/xmodmap.qc -share/gnome/xmodmap/xmodmap.ru -share/gnome/xmodmap/xmodmap.ru_koi8 -share/gnome/xmodmap/xmodmap.se -share/gnome/xmodmap/xmodmap.sf -share/gnome/xmodmap/xmodmap.sg -share/gnome/xmodmap/xmodmap.si -share/gnome/xmodmap/xmodmap.sk -share/gnome/xmodmap/xmodmap.th -share/gnome/xmodmap/xmodmap.tr_f -share/gnome/xmodmap/xmodmap.tr_q -share/gnome/xmodmap/xmodmap.uk -share/gnome/xmodmap/xmodmap.us -share/gnome/xmodmap/xmodmap.us.old -share/gnome/xmodmap/xmodmap.yu +share/locale/bg_BG.cp1251/LC_MESSAGES/gnome-core.mo share/locale/ca/LC_MESSAGES/gnome-core.mo share/locale/cs/LC_MESSAGES/gnome-core.mo share/locale/da/LC_MESSAGES/gnome-core.mo @@ -597,74 +760,125 @@ share/locale/hu/LC_MESSAGES/gnome-core.mo share/locale/it/LC_MESSAGES/gnome-core.mo share/locale/ja/LC_MESSAGES/gnome-core.mo share/locale/ko/LC_MESSAGES/gnome-core.mo +share/locale/lt/LC_MESSAGES/gnome-core.mo share/locale/nl/LC_MESSAGES/gnome-core.mo share/locale/no/LC_MESSAGES/gnome-core.mo share/locale/pl/LC_MESSAGES/gnome-core.mo share/locale/pt/LC_MESSAGES/gnome-core.mo share/locale/pt_BR/LC_MESSAGES/gnome-core.mo -share/locale/ro/LC_MESSAGES/gnome-core.mo share/locale/ru/LC_MESSAGES/gnome-core.mo share/locale/sk/LC_MESSAGES/gnome-core.mo share/locale/sv/LC_MESSAGES/gnome-core.mo +share/locale/tr/LC_MESSAGES/gnome-core.mo +share/locale/uk/LC_MESSAGES/gnome-core.mo share/locale/wa/LC_MESSAGES/gnome-core.mo +share/locale/zh_CN.GB2312/LC_MESSAGES/gnome-core.mo share/locale/zh_TW.Big5/LC_MESSAGES/gnome-core.mo -@dirrm etc/CORBA/servers -@dirrm etc/CORBA -@dirrm share/gnome/applets/Amusements -@dirrm share/gnome/applets/Clocks -@dirrm share/gnome/applets/Monitors -@dirrm share/gnome/applets/Multimedia -@dirrm share/gnome/applets/Network -@dirrm share/gnome/applets/Utility -@dirrm share/gnome/applets -@dirrm share/gnome/apps/Applications -@dirrm share/gnome/apps/Games -@dirrm share/gnome/apps/Graphics -@dirrm share/gnome/apps/Internet -@dirrm share/gnome/apps/Multimedia -@dirrm share/gnome/apps/Settings -@dirrm share/gnome/apps/System -@dirrm share/gnome/apps/Utilities -@dirrm share/gnome/apps -@dirrm share/gnome/asclock/Freeamp -@dirrm share/gnome/asclock/Newstone -@dirrm share/gnome/asclock/Orb -@dirrm share/gnome/asclock/Stone -@dirrm share/gnome/asclock/beats -@dirrm share/gnome/asclock/classic -@dirrm share/gnome/asclock/shaped -@dirrm share/gnome/asclock -@dirrm share/gnome/help/gnome-terminal/C -@dirrm share/gnome/help/gnome-terminal/da -@dirrm share/gnome/help/gnome-terminal/es -@dirrm share/gnome/help/gnome-terminal/no -@dirrm share/gnome/help/gnome-terminal -@dirrm share/gnome/help/gnome-intro/C/pix -@dirrm share/gnome/help/gnome-intro/C -@dirrm share/gnome/help/gnome-intro -@dirrm share/gnome/help/help-browser/C -@dirrm share/gnome/help/help-browser/ca -@dirrm share/gnome/help/help-browser/da -@dirrm share/gnome/help/help-browser/el -@dirrm share/gnome/help/help-browser/es -@dirrm share/gnome/help/help-browser/et -@dirrm share/gnome/help/help-browser/eu -@dirrm share/gnome/help/help-browser/fr -@dirrm share/gnome/help/help-browser/hu -@dirrm share/gnome/help/help-browser/it -@dirrm share/gnome/help/help-browser/ja -@dirrm share/gnome/help/help-browser/ko -@dirrm share/gnome/help/help-browser/no -@dirrm share/gnome/help/help-browser/wa -@dirrm share/gnome/help/help-browser -@dirrm share/gnome/help/mini-commander_applet/C -@dirrm share/gnome/help/mini-commander_applet -@dirrm share/gnome/help +@dirrm share/gnome/pixmaps/tiles +@dirrm share/gnome/pixmaps/splash +@dirrm share/gnome/pixmaps/mailcheck +@dirrm share/gnome/pixmaps/fish @dirrm share/gnome/mc/templates @dirrm share/gnome/mc -@dirrm share/gnome/pixmaps/fish -@dirrm share/gnome/pixmaps/gkb -@dirrm share/gnome/pixmaps/mailcheck -@dirrm share/gnome/pixmaps/mini-commander -@dirrm share/gnome/pixmaps/tiles -@dirrm share/gnome/xmodmap +@dirrm share/gnome/html/panel +@dirrm share/gnome/hints +@dirrm share/gnome/help/tasklist_applet/C/stylesheet-images +@dirrm share/gnome/help/tasklist_applet/C +@dirrm share/gnome/help/tasklist_applet +@dirrm share/gnome/help/session/C/stylesheet-images +@dirrm share/gnome/help/session/C/figures +@dirrm share/gnome/help/session/C +@dirrm share/gnome/help/session +@dirrm share/gnome/help/printer_applet/da/stylesheet-images +@dirrm share/gnome/help/printer_applet/da +@dirrm share/gnome/help/printer_applet/C/stylesheet-images +@dirrm share/gnome/help/printer_applet/C +@dirrm share/gnome/help/printer_applet +@dirrm share/gnome/help/panel/it/stylesheet-images +@dirrm share/gnome/help/panel/it/figures +@dirrm share/gnome/help/panel/it +@dirrm share/gnome/help/panel/de/stylesheet-images +@dirrm share/gnome/help/panel/de/figures +@dirrm share/gnome/help/panel/de +@dirrm share/gnome/help/panel/C/stylesheet-images +@dirrm share/gnome/help/panel/C/figures +@dirrm share/gnome/help/panel/C +@dirrm share/gnome/help/panel +@dirrm share/gnome/help/mailcheck_applet/da/stylesheet-images +@dirrm share/gnome/help/mailcheck_applet/da +@dirrm share/gnome/help/mailcheck_applet/C/stylesheet-images +@dirrm share/gnome/help/mailcheck_applet/C +@dirrm share/gnome/help/mailcheck_applet +@dirrm share/gnome/help/help-browser/wa +@dirrm share/gnome/help/help-browser/uk +@dirrm share/gnome/help/help-browser/no +@dirrm share/gnome/help/help-browser/lt +@dirrm share/gnome/help/help-browser/ko +@dirrm share/gnome/help/help-browser/ja +@dirrm share/gnome/help/help-browser/it +@dirrm share/gnome/help/help-browser/hu +@dirrm share/gnome/help/help-browser/gl +@dirrm share/gnome/help/help-browser/fr +@dirrm share/gnome/help/help-browser/eu +@dirrm share/gnome/help/help-browser/et +@dirrm share/gnome/help/help-browser/es +@dirrm share/gnome/help/help-browser/el +@dirrm share/gnome/help/help-browser/da +@dirrm share/gnome/help/help-browser/ca +@dirrm share/gnome/help/help-browser/C +@dirrm share/gnome/help/help-browser +@dirrm share/gnome/help/gnome-terminal/no/stylesheet-images +@dirrm share/gnome/help/gnome-terminal/no/figures +@dirrm share/gnome/help/gnome-terminal/no +@dirrm share/gnome/help/gnome-terminal/it/stylesheet-images +@dirrm share/gnome/help/gnome-terminal/it/figures +@dirrm share/gnome/help/gnome-terminal/it +@dirrm share/gnome/help/gnome-terminal/es/stylesheet-images +@dirrm share/gnome/help/gnome-terminal/es/figures +@dirrm share/gnome/help/gnome-terminal/es +@dirrm share/gnome/help/gnome-terminal/de +@dirrm share/gnome/help/gnome-terminal/da/stylesheet-images +@dirrm share/gnome/help/gnome-terminal/da/figures +@dirrm share/gnome/help/gnome-terminal/da +@dirrm share/gnome/help/gnome-terminal/C/stylesheet-images +@dirrm share/gnome/help/gnome-terminal/C/figures +@dirrm share/gnome/help/gnome-terminal/C +@dirrm share/gnome/help/gnome-terminal +@dirrm share/gnome/help/gen_util_applet/no/stylesheet-images +@dirrm share/gnome/help/gen_util_applet/no +@dirrm share/gnome/help/gen_util_applet/de/stylesheet-images +@dirrm share/gnome/help/gen_util_applet/de +@dirrm share/gnome/help/gen_util_applet +@dirrm share/gnome/help/fish_applet/no/stylesheet-images +@dirrm share/gnome/help/fish_applet/no +@dirrm share/gnome/help/fish_applet/da/stylesheet-images +@dirrm share/gnome/help/fish_applet/da +@dirrm share/gnome/help/fish_applet/C/stylesheet-images +@dirrm share/gnome/help/fish_applet/C +@dirrm share/gnome/help/fish_applet +@dirrm share/gnome/help/desk-guide_applet/de/stylesheet-images +@dirrm share/gnome/help/desk-guide_applet/de +@dirrm share/gnome/help/desk-guide_applet/C/stylesheet-images +@dirrm share/gnome/help/desk-guide_applet/C +@dirrm share/gnome/help/desk-guide_applet +@dirrm share/gnome/help/clock_applet/da/stylesheet-images +@dirrm share/gnome/help/clock_applet/da +@dirrm share/gnome/help/clock_applet/C/stylesheet-images +@dirrm share/gnome/help/clock_applet/C +@dirrm share/gnome/help/clock_applet +@dirrm share/gnome/gnome-about +@dirrm share/gnome/apps/Utilities +@dirrm share/gnome/apps/System +@dirrm share/gnome/apps/Multimedia +@dirrm share/gnome/apps/Internet +@dirrm share/gnome/apps/Graphics +@dirrm share/gnome/apps/Games +@dirrm share/gnome/apps/Development +@dirrm share/gnome/apps/Applications +@dirrm share/gnome/applets/Utility +@dirrm share/gnome/applets/Network +@dirrm share/gnome/applets/Multimedia +@dirrm share/gnome/applets/Monitors +@dirrm share/gnome/applets/Clocks +@dirrm share/gnome/applets/Amusements +@dirrm share/gnome/applets diff --git a/x11/gnomelibs/Makefile b/x11/gnomelibs/Makefile index 3d9d925..e337e40 100644 --- a/x11/gnomelibs/Makefile +++ b/x11/gnomelibs/Makefile @@ -6,7 +6,7 @@ # PORTNAME= gnomelibs -PORTVERSION= 1.0.62 +PORTVERSION= 1.2.1 CATEGORIES= x11 gnome MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= stable/sources/gnome-libs diff --git a/x11/gnomelibs/distinfo b/x11/gnomelibs/distinfo index ddcba63..00f11e8 100644 --- a/x11/gnomelibs/distinfo +++ b/x11/gnomelibs/distinfo @@ -1 +1 @@ -MD5 (gnome-libs-1.0.62.tar.gz) = 61be1867df2e0a922480901b56ed57e7 +MD5 (gnome-libs-1.2.1.tar.gz) = 1e43e482069c79058ab6842d5294fe15 diff --git a/x11/gnomelibs/files/patch-bb b/x11/gnomelibs/files/patch-bb index 2ec913f..fed78b9 100644 --- a/x11/gnomelibs/files/patch-bb +++ b/x11/gnomelibs/files/patch-bb @@ -14,7 +14,7 @@ -libgtkxmhtml_la_LDFLAGS = -version-info 1:1:0 -rpath $(libdir) -+libgtkxmhtml_la_LDFLAGS = -version-info 3:0:0 -rpath $(libdir) ++libgtkxmhtml_la_LDFLAGS = -version-info 4:0:0 -rpath $(libdir) libgtkxmhtml_la_LIBADD = $(LIBGTKXMHTML_LIBS) noinst_PROGRAMS = htmltest diff --git a/x11/gnomelibs/files/patch-bc b/x11/gnomelibs/files/patch-bc index c4a4408..6487060 100644 --- a/x11/gnomelibs/files/patch-bc +++ b/x11/gnomelibs/files/patch-bc @@ -5,7 +5,7 @@ EXTRA_DIST = parse-path.cP -libgnome_la_LDFLAGS = -version-info 35:11:3 #-rpath $(libdir) -+libgnome_la_LDFLAGS = -version-info 3:0:0 #-rpath $(libdir) ++libgnome_la_LDFLAGS = -version-info 4:0:0 #-rpath $(libdir) libgnome_la_LIBADD = $(GLIB_LIBS) -lm $(DL_LIB) bin_PROGRAMS = dns-helper gnome-dump-metadata gnome-moz-remote gconfigger gnome-gen-mimedb diff --git a/x11/gnomelibs/files/patch-bd b/x11/gnomelibs/files/patch-bd index 3daa6e3..abd17fa 100644 --- a/x11/gnomelibs/files/patch-bd +++ b/x11/gnomelibs/files/patch-bd @@ -5,7 +5,7 @@ -libgnomeui_la_LDFLAGS = -version-info 43:2:11 -rpath $(libdir) -+libgnomeui_la_LDFLAGS = -version-info 3:0:0 -rpath $(libdir) ++libgnomeui_la_LDFLAGS = -version-info 4:0:0 -rpath $(libdir) libgnomeui_la_LIBADD = $(LIBGNOMEUI_LIBS) gnome_segv_LDADD = libgnomeui.la $(top_builddir)/libgnome/libgnome.la $(top_builddir)/libart_lgpl/libart_lgpl.la @LIBSUPPORT@ $(LIBGNOMEUI_LIBS) $(INTLLIBS) diff --git a/x11/gnomelibs/files/patch-be b/x11/gnomelibs/files/patch-be index 324e501..aa26991 100644 --- a/x11/gnomelibs/files/patch-be +++ b/x11/gnomelibs/files/patch-be @@ -5,7 +5,7 @@ -libgnorba_la_LDFLAGS = -version-info 28:8:1 -rpath $(libdir) -+libgnorba_la_LDFLAGS = -version-info 3:0:0 -rpath $(libdir) ++libgnorba_la_LDFLAGS = -version-info 4:0:0 -rpath $(libdir) libgnorba_la_LIBADD = $(ORBIT_LIBS) $(GLIB_LIBS) -lm loadshlib_SOURCES = loadshlib.c @@ -14,7 +14,7 @@ gnome-unknown-skels.lo gnome-unknown-stubs.lo gnome-unknown-common.lo \ goad.lo orbitgtk.lo orbitgnome.lo orbitns.lo -libgnorbagtk_la_LDFLAGS = -+libgnorbagtk_la_LDFLAGS = -version-info 3:0:0 -rpath $(libdir) ++libgnorbagtk_la_LDFLAGS = -version-info 4:0:0 -rpath $(libdir) libgnorbagtk_la_LIBADD = libgnorbagtk_la_OBJECTS = gnome-factory-skels.lo gnome-factory-stubs.lo \ gnome-factory-common.lo Table-skels.lo Table-stubs.lo Table-common.lo \ diff --git a/x11/gnomelibs/files/patch-bf b/x11/gnomelibs/files/patch-bf index 7bc59af..44e1d7a 100644 --- a/x11/gnomelibs/files/patch-bf +++ b/x11/gnomelibs/files/patch-bf @@ -14,7 +14,7 @@ libgnomesupport_la_SOURCES = gnomesupport.h $(popt_sources) gnome-argp.c libgnomesupport_la_LIBADD = @LTLIBOBJS@ -libgnomesupport_la_LDFLAGS = -version-info 0:0:0 -+libgnomesupport_la_LDFLAGS = -version-info 3:0:0 ++libgnomesupport_la_LDFLAGS = -version-info 4:0:0 BUILT_SOURCES = gnomesupport.h diff --git a/x11/gnomelibs/files/patch-bg b/x11/gnomelibs/files/patch-bg index be3ca87..5405ccd 100644 --- a/x11/gnomelibs/files/patch-bg +++ b/x11/gnomelibs/files/patch-bg @@ -14,7 +14,7 @@ -libzvt_la_LDFLAGS = -version-info 4:7:2 -rpath $(libdir) -+libzvt_la_LDFLAGS = -version-info 3:0:0 -rpath $(libdir) ++libzvt_la_LDFLAGS = -version-info 4:0:0 -rpath $(libdir) libzvtinclude_HEADERS = lists.h vt.h vtx.h zvtterm.h diff --git a/x11/gnomelibs/files/patch-bi b/x11/gnomelibs/files/patch-bi index 8aeb458..32e3836 100644 --- a/x11/gnomelibs/files/patch-bi +++ b/x11/gnomelibs/files/patch-bi @@ -5,7 +5,7 @@ -libart_lgpl_la_LDFLAGS = -version-info @LIBART_VERSION_INFO@ -+libart_lgpl_la_LDFLAGS = -version-info 3:0:0 ++libart_lgpl_la_LDFLAGS = -version-info 4:0:0 libart_lgplincdir = $(includedir)/libart_lgpl libart_lgplinc_HEADERS = art_affine.h art_alphagamma.h art_bpath.h art_filterlevel.h art_gray_svp.h art_misc.h art_pathcode.h art_pixbuf.h art_point.h art_rect.h art_rect_svp.h art_rect_uta.h art_rgb.h art_rgb_affine.h art_rgb_bitmap_affine.h art_rgb_pixbuf_affine.h art_rgb_rgba_affine.h art_rgb_svp.h art_svp.h art_svp_ops.h art_svp_render_aa.h art_svp_vpath.h art_svp_vpath_stroke.h art_uta.h art_uta_ops.h art_uta_rect.h art_uta_vpath.h art_uta_svp.h art_vpath.h art_vpath_bpath.h art_vpath_svp.h diff --git a/x11/gnomelibs/pkg-plist b/x11/gnomelibs/pkg-plist index 3e7d6f9..87db948 100644 --- a/x11/gnomelibs/pkg-plist +++ b/x11/gnomelibs/pkg-plist @@ -63,6 +63,8 @@ include/libart_lgpl/art_vpath.h include/libart_lgpl/art_vpath_bpath.h include/libart_lgpl/art_vpath_dash.h include/libart_lgpl/art_vpath_svp.h +include/libart_lgpl/libart-features.h +include/libart_lgpl/libart.h include/libgnome/gnome-config.h include/libgnome/gnome-defs.h include/libgnome/gnome-dentry.h @@ -175,28 +177,28 @@ include/zvt/vtx.h include/zvt/zvtterm.h lib/libart_lgpl.a lib/libart_lgpl.so -lib/libart_lgpl.so.3 +lib/libart_lgpl.so.4 lib/libgnome.a lib/libgnome.so -lib/libgnome.so.3 +lib/libgnome.so.4 lib/libgnomesupport.a lib/libgnomesupport.so -lib/libgnomesupport.so.3 +lib/libgnomesupport.so.4 lib/libgnomeui.a lib/libgnomeui.so -lib/libgnomeui.so.3 +lib/libgnomeui.so.4 lib/libgnorba.a lib/libgnorba.so -lib/libgnorba.so.3 +lib/libgnorba.so.4 lib/libgnorbagtk.a lib/libgnorbagtk.so -lib/libgnorbagtk.so.3 +lib/libgnorbagtk.so.4 lib/libgtkxmhtml.a lib/libgtkxmhtml.so -lib/libgtkxmhtml.so.3 +lib/libgtkxmhtml.so.4 lib/libzvt.a lib/libzvt.so -lib/libzvt.so.3 +lib/libzvt.so.4 @unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R @exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %B share/aclocal/libart.m4 diff --git a/x11/libgnome/Makefile b/x11/libgnome/Makefile index 3d9d925..e337e40 100644 --- a/x11/libgnome/Makefile +++ b/x11/libgnome/Makefile @@ -6,7 +6,7 @@ # PORTNAME= gnomelibs -PORTVERSION= 1.0.62 +PORTVERSION= 1.2.1 CATEGORIES= x11 gnome MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= stable/sources/gnome-libs diff --git a/x11/libgnome/distinfo b/x11/libgnome/distinfo index ddcba63..00f11e8 100644 --- a/x11/libgnome/distinfo +++ b/x11/libgnome/distinfo @@ -1 +1 @@ -MD5 (gnome-libs-1.0.62.tar.gz) = 61be1867df2e0a922480901b56ed57e7 +MD5 (gnome-libs-1.2.1.tar.gz) = 1e43e482069c79058ab6842d5294fe15 diff --git a/x11/libgnome/files/patch-bb b/x11/libgnome/files/patch-bb index 2ec913f..fed78b9 100644 --- a/x11/libgnome/files/patch-bb +++ b/x11/libgnome/files/patch-bb @@ -14,7 +14,7 @@ -libgtkxmhtml_la_LDFLAGS = -version-info 1:1:0 -rpath $(libdir) -+libgtkxmhtml_la_LDFLAGS = -version-info 3:0:0 -rpath $(libdir) ++libgtkxmhtml_la_LDFLAGS = -version-info 4:0:0 -rpath $(libdir) libgtkxmhtml_la_LIBADD = $(LIBGTKXMHTML_LIBS) noinst_PROGRAMS = htmltest diff --git a/x11/libgnome/files/patch-bc b/x11/libgnome/files/patch-bc index c4a4408..6487060 100644 --- a/x11/libgnome/files/patch-bc +++ b/x11/libgnome/files/patch-bc @@ -5,7 +5,7 @@ EXTRA_DIST = parse-path.cP -libgnome_la_LDFLAGS = -version-info 35:11:3 #-rpath $(libdir) -+libgnome_la_LDFLAGS = -version-info 3:0:0 #-rpath $(libdir) ++libgnome_la_LDFLAGS = -version-info 4:0:0 #-rpath $(libdir) libgnome_la_LIBADD = $(GLIB_LIBS) -lm $(DL_LIB) bin_PROGRAMS = dns-helper gnome-dump-metadata gnome-moz-remote gconfigger gnome-gen-mimedb diff --git a/x11/libgnome/files/patch-bd b/x11/libgnome/files/patch-bd index 3daa6e3..abd17fa 100644 --- a/x11/libgnome/files/patch-bd +++ b/x11/libgnome/files/patch-bd @@ -5,7 +5,7 @@ -libgnomeui_la_LDFLAGS = -version-info 43:2:11 -rpath $(libdir) -+libgnomeui_la_LDFLAGS = -version-info 3:0:0 -rpath $(libdir) ++libgnomeui_la_LDFLAGS = -version-info 4:0:0 -rpath $(libdir) libgnomeui_la_LIBADD = $(LIBGNOMEUI_LIBS) gnome_segv_LDADD = libgnomeui.la $(top_builddir)/libgnome/libgnome.la $(top_builddir)/libart_lgpl/libart_lgpl.la @LIBSUPPORT@ $(LIBGNOMEUI_LIBS) $(INTLLIBS) diff --git a/x11/libgnome/files/patch-be b/x11/libgnome/files/patch-be index 324e501..aa26991 100644 --- a/x11/libgnome/files/patch-be +++ b/x11/libgnome/files/patch-be @@ -5,7 +5,7 @@ -libgnorba_la_LDFLAGS = -version-info 28:8:1 -rpath $(libdir) -+libgnorba_la_LDFLAGS = -version-info 3:0:0 -rpath $(libdir) ++libgnorba_la_LDFLAGS = -version-info 4:0:0 -rpath $(libdir) libgnorba_la_LIBADD = $(ORBIT_LIBS) $(GLIB_LIBS) -lm loadshlib_SOURCES = loadshlib.c @@ -14,7 +14,7 @@ gnome-unknown-skels.lo gnome-unknown-stubs.lo gnome-unknown-common.lo \ goad.lo orbitgtk.lo orbitgnome.lo orbitns.lo -libgnorbagtk_la_LDFLAGS = -+libgnorbagtk_la_LDFLAGS = -version-info 3:0:0 -rpath $(libdir) ++libgnorbagtk_la_LDFLAGS = -version-info 4:0:0 -rpath $(libdir) libgnorbagtk_la_LIBADD = libgnorbagtk_la_OBJECTS = gnome-factory-skels.lo gnome-factory-stubs.lo \ gnome-factory-common.lo Table-skels.lo Table-stubs.lo Table-common.lo \ diff --git a/x11/libgnome/files/patch-bf b/x11/libgnome/files/patch-bf index 7bc59af..44e1d7a 100644 --- a/x11/libgnome/files/patch-bf +++ b/x11/libgnome/files/patch-bf @@ -14,7 +14,7 @@ libgnomesupport_la_SOURCES = gnomesupport.h $(popt_sources) gnome-argp.c libgnomesupport_la_LIBADD = @LTLIBOBJS@ -libgnomesupport_la_LDFLAGS = -version-info 0:0:0 -+libgnomesupport_la_LDFLAGS = -version-info 3:0:0 ++libgnomesupport_la_LDFLAGS = -version-info 4:0:0 BUILT_SOURCES = gnomesupport.h diff --git a/x11/libgnome/files/patch-bg b/x11/libgnome/files/patch-bg index be3ca87..5405ccd 100644 --- a/x11/libgnome/files/patch-bg +++ b/x11/libgnome/files/patch-bg @@ -14,7 +14,7 @@ -libzvt_la_LDFLAGS = -version-info 4:7:2 -rpath $(libdir) -+libzvt_la_LDFLAGS = -version-info 3:0:0 -rpath $(libdir) ++libzvt_la_LDFLAGS = -version-info 4:0:0 -rpath $(libdir) libzvtinclude_HEADERS = lists.h vt.h vtx.h zvtterm.h diff --git a/x11/libgnome/files/patch-bi b/x11/libgnome/files/patch-bi index 8aeb458..32e3836 100644 --- a/x11/libgnome/files/patch-bi +++ b/x11/libgnome/files/patch-bi @@ -5,7 +5,7 @@ -libart_lgpl_la_LDFLAGS = -version-info @LIBART_VERSION_INFO@ -+libart_lgpl_la_LDFLAGS = -version-info 3:0:0 ++libart_lgpl_la_LDFLAGS = -version-info 4:0:0 libart_lgplincdir = $(includedir)/libart_lgpl libart_lgplinc_HEADERS = art_affine.h art_alphagamma.h art_bpath.h art_filterlevel.h art_gray_svp.h art_misc.h art_pathcode.h art_pixbuf.h art_point.h art_rect.h art_rect_svp.h art_rect_uta.h art_rgb.h art_rgb_affine.h art_rgb_bitmap_affine.h art_rgb_pixbuf_affine.h art_rgb_rgba_affine.h art_rgb_svp.h art_svp.h art_svp_ops.h art_svp_render_aa.h art_svp_vpath.h art_svp_vpath_stroke.h art_uta.h art_uta_ops.h art_uta_rect.h art_uta_vpath.h art_uta_svp.h art_vpath.h art_vpath_bpath.h art_vpath_svp.h diff --git a/x11/libgnome/pkg-plist b/x11/libgnome/pkg-plist index 3e7d6f9..87db948 100644 --- a/x11/libgnome/pkg-plist +++ b/x11/libgnome/pkg-plist @@ -63,6 +63,8 @@ include/libart_lgpl/art_vpath.h include/libart_lgpl/art_vpath_bpath.h include/libart_lgpl/art_vpath_dash.h include/libart_lgpl/art_vpath_svp.h +include/libart_lgpl/libart-features.h +include/libart_lgpl/libart.h include/libgnome/gnome-config.h include/libgnome/gnome-defs.h include/libgnome/gnome-dentry.h @@ -175,28 +177,28 @@ include/zvt/vtx.h include/zvt/zvtterm.h lib/libart_lgpl.a lib/libart_lgpl.so -lib/libart_lgpl.so.3 +lib/libart_lgpl.so.4 lib/libgnome.a lib/libgnome.so -lib/libgnome.so.3 +lib/libgnome.so.4 lib/libgnomesupport.a lib/libgnomesupport.so -lib/libgnomesupport.so.3 +lib/libgnomesupport.so.4 lib/libgnomeui.a lib/libgnomeui.so -lib/libgnomeui.so.3 +lib/libgnomeui.so.4 lib/libgnorba.a lib/libgnorba.so -lib/libgnorba.so.3 +lib/libgnorba.so.4 lib/libgnorbagtk.a lib/libgnorbagtk.so -lib/libgnorbagtk.so.3 +lib/libgnorbagtk.so.4 lib/libgtkxmhtml.a lib/libgtkxmhtml.so -lib/libgtkxmhtml.so.3 +lib/libgtkxmhtml.so.4 lib/libzvt.a lib/libzvt.so -lib/libzvt.so.3 +lib/libzvt.so.4 @unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R @exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %B share/aclocal/libart.m4 |
