--- a/open-src/lib/freeglut/Makefile Tue Aug 02 13:39:00 2011 -0700
+++ b/open-src/lib/freeglut/Makefile Wed Aug 03 12:49:34 2011 -0700
@@ -47,7 +47,7 @@
SOURCE_URL_SET = yes
# Patches to apply to source after unpacking, in order
-SOURCE_PATCHES = Makefile.in.0.patch
+SOURCE_PATCHES =
# Source tarball
SOURCE_TARBALL_NAME = freeglut-$(MODULE_VERSION).tar.gz
@@ -69,6 +69,9 @@
# FreeGLUT really wants to know that we are POSIX friendly
MODULE_CPPFLAGS = -D__posix__ -D__unix__
+# Additional targets to install
+MODULE_ADD_INSTALL_TARGETS = install_doc
+
include ../Makefile.inc
# FreeGLUT's $(VERSION_INFO) breaks delibtoolize.pl
@@ -86,3 +89,10 @@
ln -sf ../../$(SUBDIR64)/libglut.so.3.9.0 libglut.so ; \
cd - )
+FREEGLUT_DOC=$(PROTODIR)$(MODULE_DOC_DIR)/freeglut_user_interface.html
+install_doc: $(FREEGLUT_DOC)
+
+$(FREEGLUT_DOC): $(INSTALL_DEPS)
+ $(INSTALL_SCRIPT) -c -m 0444 \
+ $(SOURCE_DIR)/doc/freeglut_user_interface.html $@
+
--- a/open-src/lib/freeglut/Makefile.in.0.patch Tue Aug 02 13:39:00 2011 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,70 +0,0 @@
---- doc/Makefile.in 2009-11-25 11:14:29.000000000 -0800
-+++ doc/Makefile.in 2010-10-29 16:52:04.575893925 -0700
-@@ -42,7 +42,7 @@
- CONFIG_CLEAN_FILES =
- SOURCES =
- DIST_SOURCES =
--DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-+DISTFILES = $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
- ACLOCAL = @ACLOCAL@
- AMTAR = @AMTAR@
- AR = @AR@
-@@ -135,7 +135,7 @@
- builddir = @builddir@
- datadir = @datadir@
- datarootdir = @datarootdir@
--docdir = @docdir@
-+docdir = ${datarootdir}/doc/${LIBRARY}
- dvidir = @dvidir@
- exec_prefix = @exec_prefix@
- host = @host@
-@@ -216,31 +216,18 @@
-
-
- distdir: $(DISTFILES)
-- @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-+ srcdirstrip=`echo "$(abs_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-+ topsrcdirstrip=`echo "$(abs_top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
- list='$(DISTFILES)'; \
-- dist_files=`for file in $$list; do echo $$file; done | \
-- sed -e "s|^$$srcdirstrip/||;t" \
-- -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
-- case $$dist_files in \
-- */*) $(MKDIR_P) `echo "$$dist_files" | \
-- sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
-- sort -u` ;; \
-- esac; \
-+ dist_files=`for file in $$list; do echo $$file; done` ; \
-+ $(MKDIR_P) $(DESTDIR)/$(docdir) ; \
- for file in $$dist_files; do \
-- if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-- if test -d $$d/$$file; then \
-- dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
-- if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
-- fi; \
-- cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
-- else \
-- test -f $(distdir)/$$file \
-- || cp -p $$d/$$file $(distdir)/$$file \
-- || exit 1; \
-- fi; \
-+ cp -fpR $$file $(DESTDIR)/$(docdir)/$$file || exit 1; \
-+ chmod 0644 $(DESTDIR)/$(docdir)/$$file || exit 1; \
-+ rm -f $(DESTDIR)/$(docdir)/Makefile.am; \
-+ rm -f $(DESTDIR)/$(docdir)/Makefile.in; \
- done
-+
- check-am: all-am
- check: check-am
- all-am: Makefile
-@@ -250,7 +237,7 @@
- install-data: install-data-am
- uninstall: uninstall-am
-
--install-am: all-am
-+install-am: all-am distdir
- @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-
- installcheck: installcheck-am
--- a/pkg/manifests/x11-library-freeglut.p5m Tue Aug 02 13:39:00 2011 -0700
+++ b/pkg/manifests/x11-library-freeglut.p5m Wed Aug 03 12:49:34 2011 -0700
@@ -19,16 +19,13 @@
# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
# DEALINGS IN THE SOFTWARE.
#
-<transform file path=usr/share/doc/glut/.*\.html$ -> default facet.devel true>
-<transform file path=usr/share/doc/glut/.*\.png$ -> default facet.devel true>
-#
set name=pkg.fmri value=pkg:/x11/library/freeglut@__version:freeglut__
set name=pkg.description \
value="FreeGLUT 2.6.0 is an open-source implementation of the GLUT specification - a collection of useful API wrappers around OpenGL."
set name=pkg.summary \
value="FreeGLUT - an open-source implementation of the GLUT specification"
#
-dir path=usr/share/doc/glut
+dir path=usr/share/doc/freeglut
#
file path=usr/include/GL/freeglut.h
file path=usr/include/GL/freeglut_ext.h
@@ -48,14 +45,7 @@
link path=usr/lib/GL/$(ARCH64)/libglut.so.3 target=../../$(ARCH64)/libglut.so.3.9.0
link path=usr/lib/GL/$(ARCH64)/libglut.so target=../../$(ARCH64)/libglut.so.3.9.0
#
-file path=usr/share/doc/glut/download.html
-file path=usr/share/doc/glut/freeglut.html
-file path=usr/share/doc/glut/freeglut_logo.png
-file path=usr/share/doc/glut/freeglut_user_interface.html
-file path=usr/share/doc/glut/index.html
-file path=usr/share/doc/glut/ogl_sm.png
-file path=usr/share/doc/glut/progress.html
-file path=usr/share/doc/glut/structure.html
+file path=usr/share/doc/freeglut/freeglut_user_interface.html
#
# Autodetected for now:
# depend fmri=pkg:/service/opengl/ogl-select type=require