1
0
mirror of https://git.FreeBSD.org/ports.git synced 2024-12-29 05:38:00 +00:00

x11-toolkits/gtk-- -> x11-toolkits/gtkmm12

Rename this ports to use the real vendor package name. The advantage of this
is to allow our users' keyword search works and easier for users to file the
Bugzilla report when they use our name of ports. Debian, Gentoo, NetBSD and
other OSs have the correct package name, but not in our ports tree.

My team, FreeBSD GNOME Team, have agreed with it.

As for other ports, chase the rename.

PR:		ports/97985
Repocopy by:	marcus
This commit is contained in:
Jeremy Messenger 2006-05-29 05:53:26 +00:00
parent 31d019fabf
commit 290698847b
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=163796
22 changed files with 11 additions and 387 deletions

1
MOVED
View File

@ -2347,3 +2347,4 @@ x11/gnomepanel-reference|x11/gnome-panel-reference|2006-05-28|Renamed to use rea
x11/gnomesession|x11/gnome-session|2006-05-28|Renamed to use real vendor package name
x11/gnometerminal|x11/gnome-terminal|2006-05-28|Renamed to use real vendor package name
x11-fm/nautilus2|x11-fm/nautilus|2006-05-28|Use unversioned name
x11-toolkits/gtk--|x11-toolkits/gtkmm12|2006-05-29|Renamed to use real vendor package name

View File

@ -14,7 +14,7 @@ MASTER_SITES= http://www.geocities.com/harpin_floh/mysoft/
MAINTAINER= anholt@FreeBSD.org
COMMENT= A guitar (and other instruments) tuner for GTK
LIB_DEPENDS= gtkmm-1.2.2:${PORTSDIR}/x11-toolkits/gtk--
LIB_DEPENDS= gtkmm-1.2.2:${PORTSDIR}/x11-toolkits/gtkmm12
GNU_CONFIGURE= yes
USE_GETOPT_LONG=yes

View File

@ -15,7 +15,7 @@ DISTNAME= opMixer-${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= Adjusts a mixer
LIB_DEPENDS= gtkmm-1.2.2:${PORTSDIR}/x11-toolkits/gtk--
LIB_DEPENDS= gtkmm-1.2.2:${PORTSDIR}/x11-toolkits/gtkmm12
USE_BZIP2= yes
USE_X_PREFIX= yes

View File

@ -16,7 +16,7 @@ MASTER_SITE_SUBDIR= ${PORTNAME}
MAINTAINER= ports@FreeBSD.org
COMMENT= A crossword puzzle application
LIB_DEPENDS= gtkmm-1.2.2:${PORTSDIR}/x11-toolkits/gtk--
LIB_DEPENDS= gtkmm-1.2.2:${PORTSDIR}/x11-toolkits/gtkmm12
GNU_CONFIGURE= yes

View File

@ -20,7 +20,7 @@ LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg \
png.5:${PORTSDIR}/graphics/png \
tiff.4:${PORTSDIR}/graphics/tiff \
freetype.9:${PORTSDIR}/print/freetype2 \
gtkmm-1.2.2:${PORTSDIR}/x11-toolkits/gtk--
gtkmm-1.2.2:${PORTSDIR}/x11-toolkits/gtkmm12
USE_BZIP2= yes
USE_BISON= yes

View File

@ -16,7 +16,7 @@ MASTER_SITE_SUBDIR= ${PORTNAME}
MAINTAINER= ports@FreeBSD.org
COMMENT= ICQ2000 protocol implementation
LIB_DEPENDS= gtkmm-1.2.2:${PORTSDIR}/x11-toolkits/gtk-- \
LIB_DEPENDS= gtkmm-1.2.2:${PORTSDIR}/x11-toolkits/gtkmm12 \
icq2000.5:${PORTSDIR}/net-im/libicq2000
USE_X_PREFIX= yes

View File

@ -15,7 +15,7 @@ MASTER_SITE_SUBDIR=picmonger
MAINTAINER= ports@FreeBSD.org
COMMENT= An automated USENET (NNTP) picture decoding client
LIB_DEPENDS= gtkmm-1.2.2:${PORTSDIR}/x11-toolkits/gtk--
LIB_DEPENDS= gtkmm-1.2.2:${PORTSDIR}/x11-toolkits/gtkmm12
RUN_DEPENDS= mpack:${PORTSDIR}/converters/mpack
USE_X_PREFIX= yes

View File

@ -44,7 +44,6 @@
SUBDIR += gob
SUBDIR += gstreamer-plugins-pango
SUBDIR += gstreamer-plugins-pango80
SUBDIR += gtk--
SUBDIR += gtk--2
SUBDIR += gtk--2-reference
SUBDIR += gtk-sharp10
@ -65,6 +64,7 @@
SUBDIR += gtkglext
SUBDIR += gtkglextmm
SUBDIR += gtkmathview
SUBDIR += gtkmm12
SUBDIR += gtkmm24
SUBDIR += gtkmm24-reference
SUBDIR += gtkscintilla

View File

@ -1,39 +0,0 @@
# New ports collection makefile for: gtk--
# Date created: 11 May 1998
# Whom: Yukihiro Nakai <Nakai@technologist.com>
#
# $FreeBSD$
#
PORTNAME= gtkmm
PORTVERSION= 1.2.8
PORTREVISION= 5
CATEGORIES= x11-toolkits
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= sources/gtkmm/1.2
#DIST_SUBDIR= gnome
MAINTAINER= gnome@FreeBSD.org
COMMENT= C++ wrapper for gtk, a x11 graphics library
LIB_DEPENDS= sigc.1:${PORTSDIR}/devel/libsigc++
BUILD_DEPENDS= gm4:${PORTSDIR}/devel/m4
USE_BZIP2= yes
USE_X_PREFIX= yes
USE_GMAKE= yes
USE_GNOME= gtk12
GNU_CONFIGURE= yes
INSTALLS_SHLIB= yes
CONFIGURE_ARGS= --enable-static=yes \
--without-gnome \
--with-sigc-prefix=${LOCALBASE}
post-install:
.for lib in gdkmm gtkmm
@${RM} ${PREFIX}/lib/lib${lib}.so ${PREFIX}/lib/lib${lib}.la
@${MV} ${PREFIX}/lib/lib${lib}.a ${PREFIX}/lib/lib${lib}-1.2.a
.endfor
@${CAT} ${PKGMESSAGE}
.include <bsd.port.mk>

View File

@ -1,3 +0,0 @@
MD5 (gtkmm-1.2.8.tar.bz2) = 0dfcf7df4825379cb42cf6ef93c0387c
SHA256 (gtkmm-1.2.8.tar.bz2) = 173ad7759bc4b328bd0d295ed237d12b851db9ea319faab486274510ea3e5271
SIZE (gtkmm-1.2.8.tar.bz2) = 554664

View File

@ -1,11 +0,0 @@
--- gdk--/gdk--/window.cc.orig Tue Sep 28 15:05:27 1999
+++ gdk--/gdk--/window.cc Mon Oct 4 18:56:14 1999
@@ -57,7 +57,7 @@
Gdk_Window::Gdk_Window(const Gdk_WindowAttr &attributes,
gint attributes_mask):Gdk_Drawable(0)
{
- create(0,attributes,attributes_mask);
+ create((Gdk_Window &)gdk_root_parent,attributes,attributes_mask);
}
Gdk_Window::~Gdk_Window()

View File

@ -1,11 +0,0 @@
--- gtkmm-config.in.orig Tue Jul 17 20:08:35 2001
+++ gtkmm-config.in Tue Jan 24 17:35:29 2006
@@ -18,6 +18,6 @@
-gtkmm_libs="$LIBDIRS -lgtkmm -lgdkmm @GTK_LIBS@ @SIGC_LIBS@"
+gtkmm_libs="$LIBDIRS -lgtkmm-1.2 -lgdkmm-1.2 @GTK_LIBS@ @SIGC_LIBS@"
gtkmm_cflags="$CFLAGS @GTK_CFLAGS@ @SIGC_CFLAGS@"
-gthread_libs="-lgthread"
+gthread_libs="-lgthread-1.2"

View File

@ -1,26 +0,0 @@
--- src/build_sources/proxy.h.m4.orig Sun Sep 5 05:45:02 2004
+++ src/build_sources/proxy.h.m4 Sun Sep 5 05:50:18 2004
@@ -174,20 +174,20 @@
data.callback=&callback;
data.obj=this;
SigC::ScopeNode* node=tmp->receiver();
- obj->register_data(node);
+ this->obj->register_data(node);
return tmp;
}
RType emit(ARG_BOTH($1))
{
return reinterpret_cast<RType (*)(LIST(gObj*,1,ARG_TYPE($1),[$1]))>
- (emit_func) (LIST(obj->gtkobj(),1,ARG_NAME($1),[$1]));
+ (emit_func) (LIST(this->obj->gtkobj(),1,ARG_NAME($1),[$1]));
}
RType operator()(ARG_BOTH($1))
{
return reinterpret_cast<RType (*)(LIST(gObj*,1,ARG_TYPE($1),[$1]))>
- (emit_func) (LIST(obj->gtkobj(),1,ARG_NAME($1),[$1]));
+ (emit_func) (LIST(this->obj->gtkobj(),1,ARG_NAME($1),[$1]));
}
};

View File

@ -1,13 +0,0 @@
--- src/curve.gen_h.orig Sun Sep 5 05:44:36 2004
+++ src/curve.gen_h Sun Sep 5 05:51:36 2004
@@ -143,8 +143,8 @@
int i;
Iterator iter;
for (iter=b,i=0;iter!=e;++iter,i++);
- gfloat data[]=new gfloat[i];
- get_vector(n,data);
+ gfloat* data=new gfloat[i];
+ get_vector(i,data);
for (iter=b,i=0;iter!=e;++iter,i++)
(*iter)=data[i];
delete [] data;

View File

@ -1,11 +0,0 @@
--- src/editable.gen_h.orig Mon Jun 10 21:40:43 2002
+++ src/editable.gen_h Mon Jun 10 21:40:56 2002
@@ -147,7 +147,7 @@
namespace Gtk
{
- string Editable::get_chars (int start_pos = 0, int end_pos = - 1) const
+ string Editable::get_chars (int start_pos, int end_pos) const
{
gchar *chars = gtk_editable_get_chars (GTK_EDITABLE (gtkobj ()), start_pos, end_pos);
string ret_val = chars;

View File

@ -1,40 +0,0 @@
--- src/gtk--/base.h.orig Tue Nov 14 21:23:11 2000
+++ src/gtk--/base.h Wed Oct 13 05:01:59 2004
@@ -99,12 +99,10 @@
/* Translating API */
-/*
// used to give error on unwrapped types; connect Gtk-- crew
-template <class C> struct NotWrapped;
+template <class C> struct NotWrapped {typedef void Type;};
// hook for C => C++ translation
template <class C> struct Wrap {typedef typename NotWrapped<C>::Type CppType;};
-*/
class Object;
class ObjectClass;
@@ -118,19 +116,19 @@
// Request a specific wrapper for an object.
template <class Cpp>
-Cpp* wrap_new(typename Cpp::BaseObjectType* o)
+inline Cpp* wrap_new(typename Cpp::BaseObjectType* o)
{
return (typename Cpp::CppClassType::wrap_new(o));
}
// interface to gtk--
-/*
+
template <class C>
-typename Wrap<C>::CppType* wrap(C* o)
+inline typename Wrap<C>::CppType* wrap(C* o)
{
return dynamic_cast<typename Wrap<C>::CppType*>(wrap_auto((GtkObject*)(o)));
}
-*/
+
/********************************************************************/

View File

@ -1,11 +0,0 @@
--- src/gtkmmproc/stage1.m4.orig Thu Feb 15 04:42:47 2001
+++ src/gtkmmproc/stage1.m4 Wed Oct 13 02:35:02 2004
@@ -198,7 +198,7 @@
class __CPPNAME__;
class __CPPNAME__`'_Class;
}
-namespace Gtk { __NAMESPACE__::__CPPNAME__ *wrap (__CNAME__ *o); }
+namespace Gtk { template<> struct Wrap<__CNAME__> { typedef __NAMESPACE__::__CPPNAME__ CppType; }; }
dnl
dnl
GTKMM_SECTION(PRIVATE)

View File

@ -1 +0,0 @@
C++ wrapper for gtk, a x11 graphics library

View File

@ -1,10 +0,0 @@
****************************************************************
* *
* - To compile gtk-- based applications, type *
* eg++ `gtkmm-config --cflags` foo.cc `gtkmm-config --libs` *
* *
* - If you want to use autoconf with gtk--, *
* Please copy gtk--.m4 to /usr/local/share/aclocal *
* by yourself, thanks. *
* *
****************************************************************

View File

@ -1,201 +0,0 @@
bin/gtkmm-config
bin/gtkmmconvert
include/gdk--.h
include/gdk--/bitmap.h
include/gdk--/color.h
include/gdk--/colormap.h
include/gdk--/cursor.h
include/gdk--/drawable.h
include/gdk--/font.h
include/gdk--/gc.h
include/gdk--/image.h
include/gdk--/list.h
include/gdk--/main.h
include/gdk--/pixmap.h
include/gdk--/types.h
include/gdk--/visual.h
include/gdk--/window.h
include/glib--.h
include/gtk--.h
include/gtk--/accelgroup.h
include/gtk--/accellabel.h
include/gtk--/adjustment.h
include/gtk--/alignment.h
include/gtk--/arrow.h
include/gtk--/aspectframe.h
include/gtk--/base.h
include/gtk--/bin.h
include/gtk--/box.h
include/gtk--/button.h
include/gtk--/buttonbox.h
include/gtk--/calendar.h
include/gtk--/checkbutton.h
include/gtk--/checkmenuitem.h
include/gtk--/clist.h
include/gtk--/colorselection.h
include/gtk--/combo.h
include/gtk--/container.h
include/gtk--/ctree.h
include/gtk--/curve.h
include/gtk--/data.h
include/gtk--/dialog.h
include/gtk--/drawingarea.h
include/gtk--/editable.h
include/gtk--/entry.h
include/gtk--/eventbox.h
include/gtk--/fileselection.h
include/gtk--/fixed.h
include/gtk--/fontselection.h
include/gtk--/frame.h
include/gtk--/handlebox.h
include/gtk--/image.h
include/gtk--/imageloader.h
include/gtk--/inputdialog.h
include/gtk--/invisible.h
include/gtk--/item.h
include/gtk--/label.h
include/gtk--/layout.h
include/gtk--/list.h
include/gtk--/listitem.h
include/gtk--/main.h
include/gtk--/marshal.h
include/gtk--/menu.h
include/gtk--/menubar.h
include/gtk--/menuitem.h
include/gtk--/menushell.h
include/gtk--/misc.h
include/gtk--/notebook.h
include/gtk--/object.h
include/gtk--/optionmenu.h
include/gtk--/packer.h
include/gtk--/paned.h
include/gtk--/pixmap.h
include/gtk--/plug.h
include/gtk--/preview.h
include/gtk--/private/accelgroup_p.h
include/gtk--/private/accellabel_p.h
include/gtk--/private/adjustment_p.h
include/gtk--/private/alignment_p.h
include/gtk--/private/arrow_p.h
include/gtk--/private/aspectframe_p.h
include/gtk--/private/base_p.h
include/gtk--/private/bin_p.h
include/gtk--/private/box_p.h
include/gtk--/private/button_p.h
include/gtk--/private/buttonbox_p.h
include/gtk--/private/calendar_p.h
include/gtk--/private/checkbutton_p.h
include/gtk--/private/checkmenuitem_p.h
include/gtk--/private/clist_p.h
include/gtk--/private/colorselection_p.h
include/gtk--/private/combo_p.h
include/gtk--/private/container_p.h
include/gtk--/private/ctree_p.h
include/gtk--/private/curve_p.h
include/gtk--/private/data_p.h
include/gtk--/private/dialog_p.h
include/gtk--/private/drawingarea_p.h
include/gtk--/private/editable_p.h
include/gtk--/private/entry_p.h
include/gtk--/private/eventbox_p.h
include/gtk--/private/fileselection_p.h
include/gtk--/private/fixed_p.h
include/gtk--/private/fontselection_p.h
include/gtk--/private/frame_p.h
include/gtk--/private/handlebox_p.h
include/gtk--/private/image_p.h
include/gtk--/private/inputdialog_p.h
include/gtk--/private/invisible_p.h
include/gtk--/private/item_p.h
include/gtk--/private/label_p.h
include/gtk--/private/layout_p.h
include/gtk--/private/list_p.h
include/gtk--/private/listitem_p.h
include/gtk--/private/main_p.h
include/gtk--/private/menu_p.h
include/gtk--/private/menubar_p.h
include/gtk--/private/menuitem_p.h
include/gtk--/private/menushell_p.h
include/gtk--/private/misc_p.h
include/gtk--/private/notebook_p.h
include/gtk--/private/object_p.h
include/gtk--/private/optionmenu_p.h
include/gtk--/private/packer_p.h
include/gtk--/private/paned_p.h
include/gtk--/private/pixmap_p.h
include/gtk--/private/plug_p.h
include/gtk--/private/preview_p.h
include/gtk--/private/progress_p.h
include/gtk--/private/progressbar_p.h
include/gtk--/private/radiobutton_p.h
include/gtk--/private/radiomenuitem_p.h
include/gtk--/private/range_p.h
include/gtk--/private/ruler_p.h
include/gtk--/private/scale_p.h
include/gtk--/private/scrollbar_p.h
include/gtk--/private/scrolledwindow_p.h
include/gtk--/private/separator_p.h
include/gtk--/private/socket_p.h
include/gtk--/private/spinbutton_p.h
include/gtk--/private/statusbar_p.h
include/gtk--/private/style_p.h
include/gtk--/private/table_p.h
include/gtk--/private/tearoffmenuitem_p.h
include/gtk--/private/text_p.h
include/gtk--/private/tipsquery_p.h
include/gtk--/private/togglebutton_p.h
include/gtk--/private/toolbar_p.h
include/gtk--/private/tooltips_p.h
include/gtk--/private/tree_p.h
include/gtk--/private/treeitem_p.h
include/gtk--/private/viewport_p.h
include/gtk--/private/widget_p.h
include/gtk--/private/window_p.h
include/gtk--/progress.h
include/gtk--/progressbar.h
include/gtk--/proxy.h
include/gtk--/radiobutton.h
include/gtk--/radiomenuitem.h
include/gtk--/range.h
include/gtk--/ruler.h
include/gtk--/scale.h
include/gtk--/scrollbar.h
include/gtk--/scrolledwindow.h
include/gtk--/separator.h
include/gtk--/socket.h
include/gtk--/spinbutton.h
include/gtk--/statusbar.h
include/gtk--/style.h
include/gtk--/table.h
include/gtk--/tearoffmenuitem.h
include/gtk--/text.h
include/gtk--/tipsquery.h
include/gtk--/togglebutton.h
include/gtk--/toolbar.h
include/gtk--/tooltips.h
include/gtk--/tree.h
include/gtk--/treeitem.h
include/gtk--/viewport.h
include/gtk--/widget.h
include/gtk--/window.h
lib/gtkmm/include/gdk--config.h
lib/gtkmm/include/gtk--config.h
lib/gtkmm/proc/convert.m4
lib/gtkmm/proc/doc1.m4
lib/gtkmm/proc/gtkconvert.m4
lib/gtkmm/proc/gtkmmproc
lib/gtkmm/proc/list.m4
lib/gtkmm/proc/stage1.m4
lib/libgdkmm-1.2.a
lib/libgdkmm-1.2.so
lib/libgdkmm-1.2.so.2
lib/libgtkmm-1.2.a
lib/libgtkmm-1.2.so
lib/libgtkmm-1.2.so.2
share/aclocal/gtk--.m4
@dirrm include/gdk--
@dirrm include/gtk--/private
@dirrm include/gtk--
@dirrm lib/gtkmm/include
@dirrm lib/gtkmm/proc
@dirrm lib/gtkmm

View File

@ -18,7 +18,7 @@ MAINTAINER= ports@FreeBSD.org
COMMENT= GtkGLArea-- is a wrapper for the GtkGLArea widget
BUILD_DEPENDS= gm4:${PORTSDIR}/devel/m4
LIB_DEPENDS= gtkmm-1.2.2:${PORTSDIR}/x11-toolkits/gtk-- \
LIB_DEPENDS= gtkmm-1.2.2:${PORTSDIR}/x11-toolkits/gtkmm12 \
gtkgl.5:${PORTSDIR}/x11-toolkits/gtkglarea
USE_GL= yes

View File

@ -1,9 +1,9 @@
****************************************************************
* *
* - To compile gtk-- based applications, type *
* - To compile gtkmm12 based applications, type *
* eg++ `gtkmm-config --cflags` foo.cc `gtkmm-config --libs` *
* *
* - If you want to use autoconf with gtk--, *
* - If you want to use autoconf with gtkmm12, *
* Please copy gtk--.m4 to /usr/local/share/aclocal *
* by yourself, thanks. *
* *