Kris Kennaway reports that the databases/mysql-jdbc-mm port is broken on 5.1. This is because of an incorrect USE_JAVA specification. How-To-Repeat: Try to build the MySQL JDBC interface with a JDK/SDK earlier or later than 1.3
Additional changes: - Fix dependencies - Supoort CFLAGS properly - Support USE_LIBTOOL properly - Do not install arch-dependent object into PREFIX/share - Fix COMMENT format - Remove useless pre-patch target - Utilize NOPORTDOCS diff -urN /usr/ports/graphics/giram/Makefile graphics/giram/Makefile --- /usr/ports/graphics/giram/Makefile Sun May 18 22:35:13 2003 +++ graphics/giram/Makefile Mon May 26 11:59:44 2003 @@ -6,49 +6,39 @@ # PORTNAME= giram -PORTVERSION= 0.1.7 +PORTVERSION= 0.3.5 CATEGORIES= graphics -MASTER_SITES= ftp://ftp.giram.org/pub/ -DISTNAME= Giram-${PORTVERSION} +MASTER_SITES= http://www.giram.org/downloads/ MAINTAINER= ports@FreeBSD.org -COMMENT= Giram is Really A Modeller +COMMENT= A POV-Ray oriented modeller -RUN_DEPENDS= povray:${PORTSDIR}/graphics/povray31 - -BROKEN= "Fails to patch" - -USE_BZIP2= yes USE_X_PREFIX= yes -USE_REINPLACE= yes -USE_MESA= yes +USE_PERL5_BUUID= yes +USE_GNOME= gtk20 USE_GMAKE= yes -USE_GNOME= gtk12 -WANT_GNOME= yes -GNU_CONFIGURE= yes -CONFIGURE_ARGS= --with-gl=${X11BASE} +USE_LIBTOOL= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ - LIBS="-L${LOCALBASE}/lib" + LDFLAGS="-L${LOCALBASE}/lib" \ + INTLTOOL_PERL="${PERL}" +CONFIGURE_ARGS= --datadir="${PREFIX}/lib" \ + --with-tutorial-path="${DOCSDIR}" \ + --with-lib3ds-prefix="${LOCALBASE}" -.include <bsd.port.pre.mk> +MAN1= giram.1 -.if ${HAVE_GNOME:Mlibcapplet}!="" -USE_GNOME+= libcapplet -PKGNAMESUFFIX= -gnome +.if defined(WITH_POVRAY31) +BUILD_DEPENDS= povray:${PORTSDIR}/graphics/povray31 +RUN_DEPENDS= povray:${PORTSDIR}/graphics/povray31 .else -CONFIGURE_ARGS+=--disable-gnome +BUILD_DEPENDS= povray:${PORTSDIR}/graphics/povray +RUN_DEPENDS= povray:${PORTSDIR}/graphics/povray .endif -pre-patch: - @${REINPLACE_CMD} -e \ - 's|-lpthread|${PTHREAD_LIBS:S/"//g}|g ; \ - s|DATADIRNAME=lib|DATADIRNAME=share|g ; \ - s|USE_INCLUDED_LIBINTL=yes|#USE_INCLUDED_LIBINTL=yes|g ; \ - s|\$$(top_builddir)/intl/libintl.a|-lintl|g' \ - ${WRKSRC}/configure - post-install: - @${MKDIR} ${PREFIX}/share/doc/giram/SampleScenes - ${INSTALL_DATA} ${WRKSRC}/SampleScenes/* ${PREFIX}/share/doc/giram/SampleScenes/ +.if !defined(NOPORTDOCS) + @${MKDIR} ${EXAMPLESDIR} + ${INSTALL_DATA} ${WRKSRC}/samples/*.pov ${EXAMPLESDIR} +.endif -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff -urN /usr/ports/graphics/giram/distinfo graphics/giram/distinfo --- /usr/ports/graphics/giram/distinfo Wed Dec 6 16:43:26 2000 +++ graphics/giram/distinfo Sun May 25 20:33:23 2003 @@ -1 +1 @@ -MD5 (Giram-0.1.7.tar.bz2) = 040f278a1466953d0031e3f970ebed52 +MD5 (giram-0.3.5.tar.gz) = 1197134bd838669f202fc2f2f1b5da9b diff -urN /usr/ports/graphics/giram/files/patch-aa graphics/giram/files/patch-aa --- /usr/ports/graphics/giram/files/patch-aa Tue Jul 11 22:14:06 2000 +++ graphics/giram/files/patch-aa Thu Jan 1 09:00:00 1970 @@ -1,19 +0,0 @@ ---- src/view.c.orig Tue Jul 11 20:34:10 2000 -+++ src/view.c Tue Jul 11 20:52:40 2000 -@@ -223,6 +223,7 @@ - { - ViewUserDataStruct *UserData; - FrameStruct *LocalFrame; -+ int fd; - char *TmpFileName; - gchar *CommandLine; - -@@ -230,7 +231,7 @@ - strcpy(TmpFileName, "/tmp/GiramXXXXXX"); - UserData = get_view_user_data(); - LocalFrame = UserData->FrameView; -- mktemp(TmpFileName); -+ fd = mkstemp(TmpFileName); - SavePovByName(LocalFrame, TmpFileName); - CommandLine = g_strdup_printf("povfront -p -s %s &", TmpFileName); - system(CommandLine); diff -urN /usr/ports/graphics/giram/files/patch-ac graphics/giram/files/patch-ac --- /usr/ports/graphics/giram/files/patch-ac Thu Oct 5 16:22:39 2000 +++ graphics/giram/files/patch-ac Thu Jan 1 09:00:00 1970 @@ -1,11 +0,0 @@ ---- docs/Makefile.in.orig Mon Mar 6 00:33:01 2000 -+++ docs/Makefile.in Mon Mar 6 00:35:17 2000 -@@ -88,7 +88,7 @@ - helpfilepath = @helpfilepath@ - l = @l@ - --docsdir = @helpfilepath@ -+docsdir = @prefix@/share/doc/giram - - docs_DATA = Tutorial - mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs diff -urN /usr/ports/graphics/giram/files/patch-configure graphics/giram/files/patch-configure --- /usr/ports/graphics/giram/files/patch-configure Thu Jan 17 15:22:50 2002 +++ graphics/giram/files/patch-configure Sun May 25 21:42:19 2003 @@ -1,31 +1,19 @@ ---- configure.orig Thu Jan 17 01:15:12 2002 -+++ configure Thu Jan 17 01:17:15 2002 -@@ -4152,7 +4152,6 @@ - # - have_pthread=no - mesa_requires_pthread=no -- if test "$ac_have_mesa_gl" = yes; then - echo $ac_n "checking for pthread_create in -pthread""... $ac_c" 1>&6 - echo "configure:4158: checking for pthread_create in -pthread" >&5 - ac_lib_var=`echo pthread'_'pthread_create | sed 'y%./+-%__p_%'` -@@ -4240,12 +4239,7 @@ - LIBS="$ac_save_LIBS" +--- configure.orig Sat Mar 8 21:30:47 2003 ++++ configure Sun May 25 21:41:54 2003 +@@ -5432,6 +5432,7 @@ + # This can be used to rebuild libtool when needed + LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh" ++$ac_aux_dir/ltconfig $LIBTOOL_DEPS + + # Always use our own libtool. + LIBTOOL='$(SHELL) $(top_builddir)/libtool' +@@ -5843,7 +5844,7 @@ fi --if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then -- echo "$ac_t""yes" 1>&6 - mesa_requires_pthread=yes --else -- echo "$ac_t""no" 1>&6 --fi - CPPFLAGS="$ac_save_CPPFLAGS" - LDFLAGS="$ac_save_LDFLAGS" -@@ -4253,7 +4247,6 @@ - if test "$mesa_requires_pthread" = yes; then - GL_LIBS="$GL_LIBS -pthread" - fi -- fi - # Check for OpenGL 1.1 features. - # - + +-CFLAGS="-g -Wall -DGTK_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED -DG_DISABLE_DEPRECATED $CFLAGS" ++CFLAGS="-DGTK_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED -DG_DISABLE_DEPRECATED $CFLAGS" + + if test -n "$DEBUGFLAG"; then + CFLAGS="$DEBUGFLAG $CFLAGS" diff -urN /usr/ports/graphics/giram/pkg-plist graphics/giram/pkg-plist --- /usr/ports/graphics/giram/pkg-plist Sun Jul 16 01:14:46 2000 +++ graphics/giram/pkg-plist Sun May 25 21:40:12 2003 @@ -1,34 +1,92 @@ bin/giram bin/povfront +etc/giram/0.3/giramrc +etc/giram/0.3/giramrc_user +etc/giram/0.3/gtkrc +etc/giram/0.3/gtkrc_user +etc/giram/0.3/ps-menurc +lib/giram/0.3/color/color1.gcf +lib/giram/0.3/finish/finish1 +lib/giram/0.3/giram_logo.ppm +lib/giram/0.3/giram_splash.ppm +lib/giram/0.3/modules/librender_flat.so +lib/giram/0.3/modules/librender_gouraud.so +lib/giram/0.3/modules/librender_hiddenfaces.so +lib/giram/0.3/modules/librender_raytracing.so +lib/giram/0.3/modules/librender_wireframe.so +lib/giram/0.3/normal/normal1 +lib/giram/0.3/pigment/pigment1 +lib/giram/0.3/shape/shape1 +lib/giram/0.3/texture/texture1 +lib/giram/0.3/tips/giram_conseils.fr.txt +lib/giram/0.3/tips/giram_tips.txt +lib/giram/0.3/user_install libexec/giram/plug-ins/Box libexec/giram/plug-ins/Rotate libexec/giram/plug-ins/Spheres -share/doc/giram/SampleScenes/Cone.pov -share/doc/giram/SampleScenes/Disc.pov -share/doc/giram/SampleScenes/Giram.gsf -share/doc/giram/SampleScenes/Giram.pov -share/doc/giram/SampleScenes/IntSphereBox1.pov -share/doc/giram/SampleScenes/IntSphereBox2.pov -share/doc/giram/SampleScenes/IntSphereBox3.pov -share/doc/giram/SampleScenes/IntSpherePlane1.pov -share/doc/giram/SampleScenes/IntSpherePlane2.pov -share/doc/giram/SampleScenes/IntSpherePlane3.pov -share/doc/giram/SampleScenes/Triangle.pov -share/doc/giram/SampleScenes/basicvue.pov -share/doc/giram/SampleScenes/basicvue2.pov -share/doc/giram/SampleScenes/basicvue3.pov -share/doc/giram/SampleScenes/basicvue4.pov -share/doc/giram/SampleScenes/box.pov -share/doc/giram/SampleScenes/lollipop.pov -share/doc/giram/SampleScenes/superel1.pov -share/doc/giram/SampleScenes/superel2.pov -share/doc/giram/SampleScenes/superel3.pov -share/doc/giram/SampleScenes/test.pov -share/doc/giram/SampleScenes/torus.pov -share/doc/giram/Tutorial -share/locale/es/LC_MESSAGES/Giram.mo -share/locale/fr/LC_MESSAGES/Giram.mo -@dirrm share/doc/giram/SampleScenes -@dirrm share/doc/giram +%%DOCSDIR%%/Tutorial +%%PORTDOCS%%%%EXAMPLESDIR%%/Cone.pov +%%PORTDOCS%%%%EXAMPLESDIR%%/Disc.pov +%%PORTDOCS%%%%EXAMPLESDIR%%/Giram.pov +%%PORTDOCS%%%%EXAMPLESDIR%%/IntSphereBox1.pov +%%PORTDOCS%%%%EXAMPLESDIR%%/IntSphereBox2.pov +%%PORTDOCS%%%%EXAMPLESDIR%%/IntSphereBox3.pov +%%PORTDOCS%%%%EXAMPLESDIR%%/IntSpherePlane1.pov +%%PORTDOCS%%%%EXAMPLESDIR%%/IntSpherePlane2.pov +%%PORTDOCS%%%%EXAMPLESDIR%%/IntSpherePlane3.pov +%%PORTDOCS%%%%EXAMPLESDIR%%/Triangle.pov +%%PORTDOCS%%%%EXAMPLESDIR%%/basicvue.pov +%%PORTDOCS%%%%EXAMPLESDIR%%/basicvue2.pov +%%PORTDOCS%%%%EXAMPLESDIR%%/basicvue3.pov +%%PORTDOCS%%%%EXAMPLESDIR%%/basicvue4.pov +%%PORTDOCS%%%%EXAMPLESDIR%%/box.pov +%%PORTDOCS%%%%EXAMPLESDIR%%/checker.pov +%%PORTDOCS%%%%EXAMPLESDIR%%/lollipop.pov +%%PORTDOCS%%%%EXAMPLESDIR%%/superel1.pov +%%PORTDOCS%%%%EXAMPLESDIR%%/superel2.pov +%%PORTDOCS%%%%EXAMPLESDIR%%/superel3.pov +%%PORTDOCS%%%%EXAMPLESDIR%%/test.pov +%%PORTDOCS%%%%EXAMPLESDIR%%/torus.pov +share/locale/ca/LC_MESSAGES/giram.mo +share/locale/cs/LC_MESSAGES/giram.mo +share/locale/da/LC_MESSAGES/giram.mo +share/locale/de/LC_MESSAGES/giram.mo +share/locale/el/LC_MESSAGES/giram.mo +share/locale/en_GB/LC_MESSAGES/giram.mo +share/locale/es/LC_MESSAGES/giram.mo +share/locale/fi/LC_MESSAGES/giram.mo +share/locale/fr/LC_MESSAGES/giram.mo +share/locale/ga/LC_MESSAGES/giram.mo +share/locale/gl/LC_MESSAGES/giram.mo +share/locale/hr/LC_MESSAGES/giram.mo +share/locale/hu/LC_MESSAGES/giram.mo +share/locale/it/LC_MESSAGES/giram.mo +share/locale/ja/LC_MESSAGES/giram.mo +share/locale/ko/LC_MESSAGES/giram.mo +share/locale/nl/LC_MESSAGES/giram.mo +share/locale/no/LC_MESSAGES/giram.mo +share/locale/pl/LC_MESSAGES/giram.mo +share/locale/pt_BR/LC_MESSAGES/giram.mo +share/locale/ro/LC_MESSAGES/giram.mo +share/locale/ru/LC_MESSAGES/giram.mo +share/locale/sk/LC_MESSAGES/giram.mo +share/locale/sv/LC_MESSAGES/giram.mo +share/locale/tr/LC_MESSAGES/giram.mo +share/locale/uk/LC_MESSAGES/giram.mo +share/locale/zh_CN/LC_MESSAGES/giram.mo +share/locale/zh_TW/LC_MESSAGES/giram.mo +%%PORTDOCS%%@dirrm %%EXAMPLESDIR%% +@dirrm %%DOCSDIR%% @dirrm libexec/giram/plug-ins @dirrm libexec/giram +@dirrm lib/giram/0.3/tips +@dirrm lib/giram/0.3/texture +@dirrm lib/giram/0.3/shape +@dirrm lib/giram/0.3/pigment +@dirrm lib/giram/0.3/normal +@dirrm lib/giram/0.3/modules +@dirrm lib/giram/0.3/finish +@dirrm lib/giram/0.3/color_map +@dirrm lib/giram/0.3/color +@dirrm lib/giram/0.3 +@dirrm lib/giram
State Changed From-To: open->closed Committed. Thanks!