Date: Fri, 9 May 2003 08:48:03 +0900 From: KATO Tsuguru <tkato@prontomail.com> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/51990: Update port: misc/terraform Message-ID: <20030509084803.77cf41c8.tkato@prontomail.com> Resent-Message-ID: <200305082350.h48NoEOn062600@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 51990
>Category: ports
>Synopsis: Update port: misc/terraform
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Thu May 08 16:50:13 PDT 2003
>Closed-Date:
>Last-Modified:
>Originator: KATO Tsuguru
>Release: FreeBSD 4.8-RELEASE i386
>Organization:
>Environment:
>Description:
- Fix dependency
- Support GNOME directory hier properly
- Utilize NOPORTDOCS
New file:
files/patch-desktop-links::Makefile.in
files/patch-docs::Makefile.in
Remove file:
files/patch-Makefile.in
Following PR(s) should be superseded by this one:
[2003/05/06] ports/51866 ports-bugs Update port: misc/terraform
>How-To-Repeat:
>Fix:
diff -urN /usr/ports/misc/terraform/Makefile misc/terraform/Makefile
--- /usr/ports/misc/terraform/Makefile Thu May 8 19:27:45 2003
+++ misc/terraform/Makefile Fri May 9 05:33:41 2003
@@ -8,7 +8,8 @@
PORTNAME= terraform
PORTVERSION= 0.9.0
-CATEGORIES= misc
+PORTREVISION= 1
+CATEGORIES= misc gnome
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
@@ -16,24 +17,31 @@
COMMENT= Interactive height field generation and manipulation program
BUILD_DEPENDS= ${LOCALBASE}/lib/libtrio.a:${PORTSDIR}/devel/trio
-LIB_DEPENDS= iconv.3:${PORTSDIR}/converters/libiconv \
- intl.4:${PORTSDIR}/devel/gettext \
- png.5:${PORTSDIR}/graphics/png \
- gnugetopt.1:${PORTSDIR}/devel/libgnugetopt \
- xml.5:${PORTSDIR}/textproc/libxml
USE_X_PREFIX= yes
-USE_REINPLACE= yes
USE_BISON= yes
-USE_GNOME= gtk12 gdkpixbuf orbit gnomelibs gnomeprint
+USE_REINPLACE= yes
+USE_GNOME= gnomeprefix gnomehack gnomeprint
+USE_GMAKE= yes
GNU_CONFIGURE= yes
-CONFIGURE_ENV= CPPFLAGS="${CXXFLAGS} -I${LOCALBASE}/include" \
+CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
-USE_GMAKE= yes
post-patch:
- @${REINPLACE_CMD} -e "s|Bison |Bison|; \
- s|-ltrio $$LIBS|-ltrio -lm $$LIBS|" ${WRKSRC}/configure
- @${REINPLACE_CMD} -e "s|malloc\.h|stdlib.h|" ${WRKSRC}/src/xmlsupport.c
+ @${REINPLACE_CMD} -e "s|Bison |Bison|g ; \
+ s|-ltrio $$LIBS|-ltrio -lm $$LIBS|g ; \
+ s|#define 1|#define HAVE_LIB_TRIO 1|g ; \
+ s|(HAVE_LIB_TRIO)||g" ${WRKSRC}/configure
+ @${REINPLACE_CMD} -e "s|malloc\.h|stdlib.h|g" ${WRKSRC}/src/xmlsupport.c
+ @${FIND} ${WRKSRC} -name "Makefile.in" | ${XARGS} ${REINPLACE_CMD} -e \
+ 's|@datadir@/gnome/|@datadir@/|g'
+
+post-install:
+.if !defined(NOPORTDOCS)
+ @${MKDIR} ${DOCSDIR}
+.for file in FAQ.sgml README.sgml UsersGuide.sgml i18n.txt
+ ${INSTALL_DATA} ${WRKSRC}/docs/${file} ${DOCSDIR}
+.endfor
+.endif
.include <bsd.port.mk>
diff -urN /usr/ports/misc/terraform/files/patch-Makefile.in misc/terraform/files/patch-Makefile.in
--- /usr/ports/misc/terraform/files/patch-Makefile.in Sat Feb 8 20:47:58 2003
+++ misc/terraform/files/patch-Makefile.in Thu Jan 1 09:00:00 1970
@@ -1,11 +0,0 @@
---- docs/Makefile.in.orig Sat Feb 8 19:21:28 2003
-+++ docs/Makefile.in Sat Feb 8 19:22:56 2003
-@@ -123,7 +123,7 @@
- cflags_set = @cflags_set@
- cxxflags_set = @cxxflags_set@
-
--datadir = @prefix@/doc/terraform
-+datadir = @datadir@/doc/terraform
-
- EXTRA_DIST = FAQ.sgml i18n.txt README.sgml UsersGuide.sgml
-
diff -urN /usr/ports/misc/terraform/files/patch-desktop-links::Makefile.in misc/terraform/files/patch-desktop-links::Makefile.in
--- /usr/ports/misc/terraform/files/patch-desktop-links::Makefile.in Thu Jan 1 09:00:00 1970
+++ misc/terraform/files/patch-desktop-links::Makefile.in Tue May 6 00:23:48 2003
@@ -0,0 +1,15 @@
+--- desktop-links/Makefile.in.orig Thu Apr 25 01:16:49 2002
++++ desktop-links/Makefile.in Tue May 6 00:23:34 2003
+@@ -232,10 +232,8 @@
+ install-data-local:
+ @$(NORMAL_INSTALL)
+ if test -n "@datadir@"; then \
+- $(mkinstalldirs) $(GNOME_DATADIR)/gnome/apps/Graphics; \
+- $(INSTALL_DATA) Terraform.desktop $(GNOME_DATADIR)/gnome/apps/Graphics; \
+- $(mkinstalldirs) $(GNOME_DATADIR)/gnome/ximian/Programs/Graphics; \
+- $(INSTALL_DATA) Terraform.desktop $(GNOME_DATADIR)/gnome/ximian/Programs/Graphics; \
++ $(mkinstalldirs) $(GNOME_DATADIR)/apps/Graphics; \
++ $(INSTALL_DATA) Terraform.desktop $(GNOME_DATADIR)/apps/Graphics; \
+ $(mkinstalldirs) $(GNOME_DATADIR)/pixmaps; \
+ $(INSTALL_DATA) terraform.png $(GNOME_DATADIR)/pixmaps; \
+ fi
diff -urN /usr/ports/misc/terraform/files/patch-docs::Makefile.in misc/terraform/files/patch-docs::Makefile.in
--- /usr/ports/misc/terraform/files/patch-docs::Makefile.in Thu Jan 1 09:00:00 1970
+++ misc/terraform/files/patch-docs::Makefile.in Tue May 6 00:06:27 2003
@@ -0,0 +1,11 @@
+--- docs/Makefile.in.orig Thu Apr 25 01:16:48 2002
++++ docs/Makefile.in Tue May 6 00:06:13 2003
+@@ -205,7 +205,7 @@
+ install-exec-am:
+ install-exec: install-exec-am
+
+-install-data-am: install-dataDATA
++install-data-am:
+ install-data: install-data-am
+
+ install-am: all-am
diff -urN /usr/ports/misc/terraform/pkg-plist misc/terraform/pkg-plist
--- /usr/ports/misc/terraform/pkg-plist Sat Feb 8 20:47:57 2003
+++ misc/terraform/pkg-plist Tue May 6 00:51:19 2003
@@ -1,8 +1,9 @@
bin/terraform
-%%DOCSDIR%%/FAQ.sgml
-%%DOCSDIR%%/README.sgml
-%%DOCSDIR%%/UsersGuide.sgml
-%%DOCSDIR%%/i18n.txt
+%%PORTDOCS%%%%DOCSDIR%%/FAQ.sgml
+%%PORTDOCS%%%%DOCSDIR%%/README.sgml
+%%PORTDOCS%%%%DOCSDIR%%/UsersGuide.sgml
+%%PORTDOCS%%%%DOCSDIR%%/i18n.txt
+share/gnome/apps/Graphics/Terraform.desktop
share/gnome/help/terraform/C/faq.html
share/gnome/help/terraform/C/hacking.html
share/gnome/help/terraform/C/index.html
@@ -19,65 +20,79 @@
share/gnome/help/terraform/fr/templates.html
share/gnome/help/terraform/fr/topic.dat
share/gnome/help/terraform/fr/tutorial.html
+share/gnome/pixmaps/terraform.png
+share/gnome/pixmaps/terraform/add.xpm
+share/gnome/pixmaps/terraform/arrow.xpm
+share/gnome/pixmaps/terraform/circle.xpm
+share/gnome/pixmaps/terraform/crop.xpm
+share/gnome/pixmaps/terraform/die.xpm
+share/gnome/pixmaps/terraform/gnome-question.png
+share/gnome/pixmaps/terraform/rectangle.xpm
+share/gnome/pixmaps/terraform/replace.xpm
+share/gnome/pixmaps/terraform/seed.xpm
+share/gnome/pixmaps/terraform/subtract.xpm
+share/gnome/pixmaps/terraform/terraform_logo.xpm
+share/gnome/pixmaps/terraform/zoom.xpm
+share/gnome/terraform/image_maps/moon_moon.png
+share/gnome/terraform/image_maps/sky_test_320x180.tga
+share/gnome/terraform/include/atmospheres/earth_fog.inc
+share/gnome/terraform/include/atmospheres/earth_haze_fast.inc
+share/gnome/terraform/include/atmospheres/earth_haze_slow.inc
+share/gnome/terraform/include/atmospheres/fog_ground.inc
+share/gnome/terraform/include/atmospheres/rainbow.inc
+share/gnome/terraform/include/defaults.inc
+share/gnome/terraform/include/earth_textures/earth_canyon_landscape.inc
+share/gnome/terraform/include/earth_textures/earth_desert_landscape.inc
+share/gnome/terraform/include/earth_textures/earth_green_landscape.inc
+share/gnome/terraform/include/earth_textures/earth_mountain_landscape.inc
+share/gnome/terraform/include/generic_land.inc
+share/gnome/terraform/include/generic_river.inc
+share/gnome/terraform/include/river_texture.inc
+share/gnome/terraform/include/skies/earth_regular_sky.inc
+share/gnome/terraform/include/skies/earth_static_sky.inc
+share/gnome/terraform/include/skies/include/clouds_01.inc
+share/gnome/terraform/include/skies/include/clouds_02.inc
+share/gnome/terraform/include/skies/include/clouds_03.inc
+share/gnome/terraform/include/skies/include/clouds_04.inc
+share/gnome/terraform/include/skies/include/clouds_05.inc
+share/gnome/terraform/include/skies/include/clouds_06.inc
+share/gnome/terraform/include/skies/include/clouds_07.inc
+share/gnome/terraform/include/skies/include/lights_standard.inc
+share/gnome/terraform/include/skies/include/lights_toymodel.inc
+share/gnome/terraform/include/skies/include/skycolor_earth.inc
+share/gnome/terraform/include/skies/include/stars_01.inc
+share/gnome/terraform/include/skies/include/stars_02.inc
+share/gnome/terraform/include/skies/include/stars_03.inc
+share/gnome/terraform/include/skies/include/stars_04.inc
+share/gnome/terraform/include/skies/include/stars_05.inc
+share/gnome/terraform/include/skies/include/stars_06.inc
+share/gnome/terraform/include/skies/mapped_sky.inc
+share/gnome/terraform/include/water/earth_water.inc
+share/gnome/terraform/objects/fern.gif
+share/gnome/terraform/objects/fern.inc
+share/gnome/terraform/objects/monolith.inc
+share/gnome/terraform/objects/tree_1.inc
+share/gnome/terraform/objects/tree_2.inc
+share/gnome/terraform/objects/tree_3.inc
+share/gnome/terraform/objects/tree_4.gif
+share/gnome/terraform/objects/tree_4.inc
+share/gnome/terraform/objects/tree_5.gif
+share/gnome/terraform/objects/tree_5.inc
+share/gnome/terraform/objects/tree_6.gif
+share/gnome/terraform/objects/tree_6.inc
share/locale/fr/LC_MESSAGES/terraform.mo
share/locale/nl/LC_MESSAGES/terraform.mo
-%%DATADIR%%/image_maps/moon_moon.png
-%%DATADIR%%/image_maps/sky_test_320x180.tga
-%%DATADIR%%/include/atmospheres/earth_fog.inc
-%%DATADIR%%/include/atmospheres/earth_haze_fast.inc
-%%DATADIR%%/include/atmospheres/earth_haze_slow.inc
-%%DATADIR%%/include/atmospheres/fog_ground.inc
-%%DATADIR%%/include/atmospheres/rainbow.inc
-%%DATADIR%%/include/defaults.inc
-%%DATADIR%%/include/earth_textures/earth_canyon_landscape.inc
-%%DATADIR%%/include/earth_textures/earth_desert_landscape.inc
-%%DATADIR%%/include/earth_textures/earth_green_landscape.inc
-%%DATADIR%%/include/earth_textures/earth_mountain_landscape.inc
-%%DATADIR%%/include/generic_land.inc
-%%DATADIR%%/include/generic_river.inc
-%%DATADIR%%/include/river_texture.inc
-%%DATADIR%%/include/skies/earth_regular_sky.inc
-%%DATADIR%%/include/skies/earth_static_sky.inc
-%%DATADIR%%/include/skies/include/clouds_01.inc
-%%DATADIR%%/include/skies/include/clouds_02.inc
-%%DATADIR%%/include/skies/include/clouds_03.inc
-%%DATADIR%%/include/skies/include/clouds_04.inc
-%%DATADIR%%/include/skies/include/clouds_05.inc
-%%DATADIR%%/include/skies/include/clouds_06.inc
-%%DATADIR%%/include/skies/include/clouds_07.inc
-%%DATADIR%%/include/skies/include/lights_standard.inc
-%%DATADIR%%/include/skies/include/lights_toymodel.inc
-%%DATADIR%%/include/skies/include/skycolor_earth.inc
-%%DATADIR%%/include/skies/include/stars_01.inc
-%%DATADIR%%/include/skies/include/stars_02.inc
-%%DATADIR%%/include/skies/include/stars_03.inc
-%%DATADIR%%/include/skies/include/stars_04.inc
-%%DATADIR%%/include/skies/include/stars_05.inc
-%%DATADIR%%/include/skies/include/stars_06.inc
-%%DATADIR%%/include/skies/mapped_sky.inc
-%%DATADIR%%/include/water/earth_water.inc
-%%DATADIR%%/objects/fern.gif
-%%DATADIR%%/objects/fern.inc
-%%DATADIR%%/objects/monolith.inc
-%%DATADIR%%/objects/tree_1.inc
-%%DATADIR%%/objects/tree_2.inc
-%%DATADIR%%/objects/tree_3.inc
-%%DATADIR%%/objects/tree_4.gif
-%%DATADIR%%/objects/tree_4.inc
-%%DATADIR%%/objects/tree_5.gif
-%%DATADIR%%/objects/tree_5.inc
-%%DATADIR%%/objects/tree_6.gif
-%%DATADIR%%/objects/tree_6.inc
-@dirrm %%DOCSDIR%%
-@dirrm share/gnome/help/terraform/C
+@dirrm share/gnome/terraform/objects
+@dirrm share/gnome/terraform/include/water
+@dirrm share/gnome/terraform/include/skies/include
+@dirrm share/gnome/terraform/include/skies
+@dirrm share/gnome/terraform/include/earth_textures
+@dirrm share/gnome/terraform/include/atmospheres
+@dirrm share/gnome/terraform/include
+@dirrm share/gnome/terraform/image_maps
+@dirrm share/gnome/terraform
+@dirrm share/gnome/pixmaps/terraform
@dirrm share/gnome/help/terraform/fr
+@dirrm share/gnome/help/terraform/C
@dirrm share/gnome/help/terraform
-@dirrm %%DATADIR%%/image_maps
-@dirrm %%DATADIR%%/include/atmospheres
-@dirrm %%DATADIR%%/include/earth_textures
-@dirrm %%DATADIR%%/include/skies/include
-@dirrm %%DATADIR%%/include/skies
-@dirrm %%DATADIR%%/include/water
-@dirrm %%DATADIR%%/include
-@dirrm %%DATADIR%%/objects
-@dirrm %%DATADIR%%
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20030509084803.77cf41c8.tkato>