Date: Sun, 7 Sep 2003 04:13:16 +0200 (CEST) From: Simon Barner <barner@in.tum.de> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/56548: [patch] graphics/osgedit 0.3.0 -> 0.4.1 (supersedes ports/56471) Message-ID: <20030907021316.A15A938CBF@zi025.glhnet.mhn.de> Resent-Message-ID: <200309070220.h872KD25056906@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 56548
>Category: ports
>Synopsis: [patch] graphics/osgedit 0.3.0 -> 0.4.1 (supersedes ports/56471)
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: update
>Submitter-Id: current-users
>Arrival-Date: Sat Sep 06 19:20:13 PDT 2003
>Closed-Date:
>Last-Modified:
>Originator: Simon Barner
>Release: FreeBSD 4.9-PRERELEASE i386
>Organization:
>Environment:
System: FreeBSD zi025.glhnet.mhn.de 4.9-PRERELEASE FreeBSD 4.9-PRERELEASE #1: Thu Sep 4 20:49:53 CEST 2003 simon@zi025.glhnet.mhn.de:/usr/src/sys/compile/KISTE i386
>Description:
This port is broken on stable as mentioned in the named PR. This patch
fixes this problem by updating the port to the latest version.
[ tested with gcc 2.95.4 and 90% with gcc 3.3.1, but dependency
devel/osg is broken with gcc 3.3.1, so I cannot finish that compilation
(a header file of osg contains `long long') ]
>How-To-Repeat:
>Fix:
--- Makefile.orig Sun Sep 7 03:33:42 2003
+++ Makefile Sun Sep 7 02:59:38 2003
@@ -7,8 +7,7 @@
#
PORTNAME= osgedit
-PORTVERSION= 0.3.0
-PORTREVISION= 2
+PORTVERSION= 0.4.1
CATEGORIES= graphics
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
@@ -29,12 +28,5 @@
CONFIGURE_ENV= CPPFLAGS="${CXXFLAGS} -I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
USE_GMAKE= yes
-
-post-extract:
-# This port has bogus config.{sub,guess} symlinks that point to where these
-# files presumably live on the author's machine. It causes the automatic
-# replacement code to fail unless we replace them with files.
- @${RM} ${WRKSRC}/config.guess ${WRKSRC}/config.sub; \
- ${TOUCH} ${WRKSRC}/config.guess ${WRKSRC}/config.sub
.include <bsd.port.mk>
--- distinfo.orig Sun Sep 7 03:33:42 2003
+++ distinfo Sat Sep 6 13:51:44 2003
@@ -1 +1 @@
-MD5 (osgedit-0.3.0.tar.gz) = 4a6a6fe64e80db1d4e0e3f7aaf935997
+MD5 (osgedit-0.4.1.tar.gz) = aa9fce7244beb5d3652aa5c4d0ff9544
--- pkg-plist.orig Sun Sep 7 03:33:42 2003
+++ pkg-plist Sun Sep 7 03:35:57 2003
@@ -1,6 +1,8 @@
bin/osgedit
share/locale/es/LC_MESSAGES/osgedit.mo
share/locale/gl/LC_MESSAGES/osgedit.mo
+share/gnome/applications/osgedit.desktop
+share/gnome/pixmaps/osgedit.png
share/gnome/pixmaps/osgedit/billboard.png
share/gnome/pixmaps/osgedit/box.png
share/gnome/pixmaps/osgedit/center.png
@@ -15,9 +17,11 @@
share/gnome/pixmaps/osgedit/move.png
share/gnome/pixmaps/osgedit/node.png
share/gnome/pixmaps/osgedit/orbit.png
+share/gnome/pixmaps/osgedit/projection.png
share/gnome/pixmaps/osgedit/rotate.png
share/gnome/pixmaps/osgedit/scale.png
share/gnome/pixmaps/osgedit/select.png
+share/gnome/pixmaps/osgedit/sequence.png
share/gnome/pixmaps/osgedit/sphere.png
share/gnome/pixmaps/osgedit/switch.png
share/gnome/pixmaps/osgedit/transform.png
--- files/patch-Makefile.in.orig Sun Sep 7 03:33:42 2003
+++ files/patch-Makefile.in Sun Sep 7 03:04:29 2003
@@ -1,6 +1,19 @@
---- Makefile.in.orig Fri Jan 24 13:35:24 2003
-+++ Makefile.in Fri Jan 24 13:35:53 2003
-@@ -380,10 +380,10 @@
+--- Makefile.in.orig Wed Jul 16 02:27:40 2003
++++ Makefile.in Sun Sep 7 03:04:13 2003
+@@ -88,10 +88,10 @@
+
+
+ icon_DATA = osgedit.png
+-icondir = $(DESTDIR)$(datadir)/pixmaps
++icondir = $(DESTDIR)$(datadir)/gnome/pixmaps
+
+ util_DATA = osgedit.desktop
+-utildir = $(DESTDIR)$(datadir)/applications
++utildir = $(DESTDIR)$(datadir)/gnome/applications
+ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+ CONFIG_HEADER = config.h
+@@ -425,10 +425,10 @@
install-data-local:
@$(NORMAL_INSTALL)
if test -d $(srcdir)/pixmaps; then \
--- /dev/null Sun Sep 7 03:26:09 2003
+++ files/patch-po::Makefile.in.in Sat Sep 6 17:12:37 2003
@@ -0,0 +1,11 @@
+--- po/Makefile.in.in.orig Sat Sep 6 17:12:03 2003
++++ po/Makefile.in.in Sat Sep 6 17:12:18 2003
+@@ -27,7 +27,7 @@
+ exec_prefix = @exec_prefix@
+ datadir = @datadir@
+ libdir = @libdir@
+-localedir = $(libdir)/locale
++localedir = $(datadir)/locale
+ gnulocaledir = $(datadir)/locale
+ gettextsrcdir = $(datadir)/glib-2.0/gettext/po
+ subdir = po
--- /dev/null Sun Sep 7 03:26:09 2003
+++ files/patch-src::editable::entities::edstateset.cc Sat Sep 6 14:15:54 2003
@@ -0,0 +1,8 @@
+--- src/editable/entities/edstateset.cc.orig Sat Sep 6 14:05:01 2003
++++ src/editable/entities/edstateset.cc Sat Sep 6 14:05:19 2003
+@@ -1,3 +1,5 @@
++#include <stdio.h>
++
+ #include <osg/Texture2D>
+ #include <osg/TextureCubeMap>
+ #include <editable/entityfactory.h>
--- /dev/null Sun Sep 7 03:26:09 2003
+++ files/patch-src::editable::view::gtkedmatrix.cc Sat Sep 6 14:15:54 2003
@@ -0,0 +1,7 @@
+--- src/editable/view/gtkedmatrix.cc.orig Sat Sep 6 14:09:46 2003
++++ src/editable/view/gtkedmatrix.cc Sat Sep 6 14:10:06 2003
+@@ -1,3 +1,4 @@
++#include <stdio.h>
+ #include <iostream>
+ #include <gtk/gtkframe.h>
+ #include <gtk/gtktable.h>
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20030907021316.A15A938CBF>