Update to 0.95

This commit is contained in:
Patrick Li 2004-12-23 21:54:45 +00:00
parent 8c34c2a3bc
commit af6629ff14
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=125017
10 changed files with 89 additions and 205 deletions

View file

@ -6,10 +6,9 @@
#
PORTNAME= starplot
PORTVERSION= 0.92.3
PORTREVISION= 1
PORTVERSION= 0.95
CATEGORIES= astro
MASTER_SITES= http://www.princeton.edu/~kmccarty/downloads/
MASTER_SITES= http://starplot.org/downloads/
MAINTAINER= pat@FreeBSD.org
COMMENT= 3-dimensional viewer for star charts
@ -17,36 +16,21 @@ COMMENT= 3-dimensional viewer for star charts
USE_X_PREFIX= yes
USE_REINPLACE= yes
USE_GMAKE= yes
USE_GNOME= gtk12
USE_XPM= yes
MAKE_ENV= DATADIR="${DATADIR}" \
DOCSDIR="${DOCSDIR}"
GNU_CONFIGURE= yes
USE_GNOME= gtk20
USE_GETTEXT= yes
USE_ICONV= yes
MAKE_ENV= DOCSDIR=${DOCSDIR} EXAMPLESDIR=${EXAMPLESDIR}
CONFIGURE_ARGS= --with-libintl-prefix=${LOCALBASE}
MAN1= starplot.1 starconvert.1
MAN1= starconvert.1 starpkg.1 starplot.1
pre-patch:
@${REINPLACE_CMD} -e 's|DATADIR|${DATADIR}|; s|DOCDIR|${DOCSDIR}|; \
s|BINARYNAME|${PORTNAME}|; s|CONVERTNAME|starconvert|' \
${WRKSRC}/doc/man/*
@${REINPLACE_CMD} -e 's|/usr/local/share/starplot|${DATADIR}|; \
s|/usr/local/share/doc/starplot|${DOCSDIR}|' \
${WRKSRC}/gui/starplot.h
do-install:
@${INSTALL_PROGRAM} ${WRKSRC}/starplot ${PREFIX}/bin
@${INSTALL_PROGRAM} ${WRKSRC}/starconvert ${PREFIX}/bin
@${INSTALL_MAN} ${WRKSRC}/doc/man/starplot-template \
${PREFIX}/man/man1/starplot.1
@${INSTALL_MAN} ${WRKSRC}/doc/man/starconvert-template \
${PREFIX}/man/man1/starconvert.1
@${MKDIR} ${DATADIR}/examples
@${INSTALL_DATA} ${WRKSRC}/examples/*.stars ${DATADIR}/examples
.if !defined(NOPORTDOCS)
@${MKDIR} ${DOCSDIR}/examples ${DOCSDIR}/html/images
@${INSTALL_DATA} ${WRKSRC}/examples/example.spec ${DOCSDIR}/examples
@${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR}
@${INSTALL_DATA} ${WRKSRC}/doc/html/*.html ${DOCSDIR}/html
@${INSTALL_DATA} ${WRKSRC}/doc/html/images/* ${DOCSDIR}/html/images
.if defined(WITHOUT_NLS)
CONFIGURE_ARGS+= --disable-nls
PLIST_SUB+= NLS="@comment "
.else
USE_GETTEXT= yes
PLIST_SUB+= NLS=""
.endif
.include <bsd.port.mk>

View file

@ -1,2 +1,2 @@
MD5 (starplot-0.92.3.tar.gz) = e5ab10f90a49bd9d9340d6e7168c85fb
SIZE (starplot-0.92.3.tar.gz) = 140558
MD5 (starplot-0.95.tar.gz) = aa8fb7ebcba8a532f6be774176a4345f
SIZE (starplot-0.95.tar.gz) = 460120

View file

@ -1,122 +0,0 @@
--- Makefile.orig Thu Dec 6 09:12:46 2001
+++ Makefile Thu Dec 6 16:21:07 2001
@@ -1,32 +1,9 @@
-# Makefile for StarPlot
+BINARYNAME = starplot
+CONVERTNAME = starconvert
+CFLAGS += -Wall `${GTK_CONFIG} --cflags`
+LFLAGS = `${GTK_CONFIG} --libs`
-prefix = /usr/local
-DESTDIR = $(prefix)
-
-# installation locations: -----------------------------------------------
-export BINARYNAME = starplot
-export CONVERTNAME = starconvert
-export DATADIR = $(DESTDIR)/share/$(BINARYNAME)
-export DOCDIR = $(DESTDIR)/share/doc/$(BINARYNAME)
-INSTALLDIR = $(DESTDIR)/bin
-MANDIR = $(DESTDIR)/man/man1
-
-# locations of programs needed for compiling / installing:
-export CXX = g++
-export SED = sed
-INSTALL = install
-
-# compiler flags
-export CFLAGS = -Wall -pedantic -O2
-LFLAGS = `gtk-config --libs`
-
-# targets ---------------------------------------------------------------
-
-.PHONY: all object-files conv-files doc-files starplot starconvert debian \
- clean dist-clean debian-clean install install-bin install-doc \
- install-debian install-examples install-gpl install-man uninstall
-
-all: object-files conv-files doc-files
+all: object-files conv-files
object-files:
$(MAKE) -C classes
@@ -36,81 +13,3 @@
conv-files:
$(MAKE) -C convert
$(CXX) convert/*.o classes/*.o -o $(CONVERTNAME) $(CFLAGS) -lm
-
-doc-files:
- $(MAKE) -C doc
-
-# The next two targets are not used by the default build and are just for
-# convenience if you only want to build one of the two programs.
-starplot: object-files
-starconvert:
- $(MAKE) -C classes
- $(MAKE) conv-files
-
-debian:
- dpkg-buildpackage -rfakeroot
-
-clean:
- $(MAKE) -C gui clean
- $(MAKE) -C classes clean
- $(MAKE) -C convert clean
-
-dist-clean: clean
- rm -f $(BINARYNAME) $(CONVERTNAME)
- $(MAKE) -C doc clean
-
-debian-clean: dist-clean
- fakeroot debian/rules clean
-
-# install everything
-install: install-bin install-examples install-doc install-man install-gpl
-
-# install only things relevant to creating a Debian package
-install-debian: install-bin install-examples install-doc
-
-# install just the binary and create an empty data directory
-install-bin:
- $(INSTALL) -d -m 0755 $(INSTALLDIR) $(DATADIR)
- $(INSTALL) -m 0755 -s $(BINARYNAME) $(INSTALLDIR)
- $(INSTALL) -m 0755 -s $(CONVERTNAME) $(INSTALLDIR)
-
-# install example star data files as well as the binary
-install-examples:
- $(INSTALL) -d -m 0755 $(DATADIR) $(DATADIR)/examples
- $(INSTALL) -m 0644 examples/*.stars $(DATADIR)/examples
-
-# install the text and HTML documentation only
-install-doc:
- $(INSTALL) -d -m 0755 $(DOCDIR) $(DOCDIR)/examples
- $(INSTALL) -m 0644 examples/example.spec $(DOCDIR)/examples
- $(INSTALL) -m 0644 README INSTALL Makefile $(DOCDIR)
- $(INSTALL) -d -m 0755 $(DOCDIR)/html $(DOCDIR)/html/images
- $(INSTALL) -m 0644 doc/html/*.html $(DOCDIR)/html
- $(INSTALL) -m 0644 doc/html/images/* $(DOCDIR)/html/images
-
-# install man pages
-install-man:
- $(INSTALL) -d -m 0755 $(MANDIR)
- $(INSTALL) -m 0644 doc/man/starplot.1 $(MANDIR)/$(BINARYNAME).1
- $(INSTALL) -m 0644 doc/man/starconvert.1 $(MANDIR)/$(CONVERTNAME).1
-
-# install the license
-# (this is separate since most people already have more than enough copies
-# of the GPL lying around on their hard drives)
-install-gpl:
- $(INSTALL) -d -m 0755 $(DOCDIR)
- $(INSTALL) -m 0644 COPYING $(DOCDIR)
-
-# You can uninstall StarPlot even after deleting the source tree because
-# this Makefile will have been installed in $(DOCDIR).
-# NOTE: Make sure $(prefix) is set correctly.
-# DO NOT USE THIS TARGET IF YOU INSTALLED STARPLOT AS A DEBIAN PACKAGE!!!
-
-uninstall:
- -rm -f $(INSTALLDIR)/$(BINARYNAME) $(INSTALLDIR)/$(CONVERTNAME)
- -rm -rf $(DATADIR)/examples
- -rmdir $(DATADIR)
- -rm -rf $(DOCDIR)
- -rm -f $(MANDIR)/$(BINARYNAME).* $(MANDIR)/$(CONVERTNAME).*
- -rmdir $(MANDIR)
-

View file

@ -0,0 +1,17 @@
--- configure.orig Mon Aug 30 09:02:54 2004
+++ configure Thu Dec 23 16:04:03 2004
@@ -9827,11 +9827,11 @@
-docdir='${prefix}/doc'
+docdir='$(DOCSDIR)'
-pkgdocdir='$(docdir)/'${PACKAGE_NAME}
+pkgdocdir='$(DOCSDIR)'
-exampledir='$(pkgdocdir)/examples'
+exampledir='$(EXAMPLESDIR)'
htmldir='$(pkgdocdir)/html'

View file

@ -1,30 +0,0 @@
--- gui/Makefile.orig Fri Mar 2 08:39:03 2001
+++ gui/Makefile Mon Aug 20 11:16:35 2001
@@ -1,21 +1,21 @@
HEADERS = starplot.h gtkviewer.h menu.h ../classes/stararray.h \
../classes/star.h ../classes/greek.h ../classes/specclass.h \
../classes/stringops.h ../classes/mathops.h ../classes/viewer.h
-DATADEF = -DDATADIR=\"$(DATADIR)\"
-DOCDEF = -DDOCDIR=\"$(DOCDIR)\"
+DATADEF = -DDATADIR=\"${DATADIR}\"
+DOCDEF = -DDOCDIR=\"${DOCSDIR}\"
+CFLAGS += `${GTK_CONFIG} --cflags`
all: starplot.o menuops.o filedialogs.o infodialogs.o chartdialogs.o \
hrdiagram.o
%.o: %.cc $(HEADERS)
- $(CXX) -c $< `gtk-config --cflags` $(CFLAGS) $(DATADEF)
+ $(CXX) -c $< $(CFLAGS) $(DATADEF)
menuops.o: menuops.cc $(HEADERS) xpmdata.h ../version.h
- $(CXX) -c menuops.cc `gtk-config --cflags` $(CFLAGS) \
- $(DATADEF) $(DOCDEF)
+ $(CXX) -c menuops.cc $(CFLAGS) $(DATADEF) $(DOCDEF)
starplot.o: starplot.cc $(HEADERS) ../version.h
- $(CXX) -c starplot.cc `gtk-config --cflags` $(CFLAGS) $(DATADEF)
+ $(CXX) -c starplot.cc $(CFLAGS) $(DATADEF)
clean:
rm -f *.o *.cc~ *.h~

View file

@ -1,5 +1,5 @@
--- gui/filedialogs.cc.orig Mon Aug 20 13:14:42 2001
+++ gui/filedialogs.cc Mon Aug 20 13:14:52 2001
--- src/gui/filedialogs.cc.orig Mon Aug 20 13:14:42 2001
+++ src/gui/filedialogs.cc Mon Aug 20 13:14:52 2001
@@ -159,7 +159,7 @@
if (select_function == help_ok_sel || select_function == help_open_sel) {
if (!help_browser)

View file

@ -0,0 +1,11 @@
--- lib/Makefile.in.orig Wed Dec 22 21:34:18 2004
+++ lib/Makefile.in Wed Dec 22 21:35:12 2004
@@ -71,7 +71,7 @@
libcompat_a_DEPENDENCIES = $(am__DEPENDENCIES_1)
am_libcompat_a_OBJECTS = ostringstream.$(OBJEXT)
libcompat_a_OBJECTS = $(am_libcompat_a_OBJECTS)
-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
+DEFAULT_INCLUDES = -I. -I$(LOCALBASE)/include -I$(srcdir) -I$(top_builddir)
depcomp = $(SHELL) $(top_srcdir)/depcomp
am__depfiles_maybe = depfiles
@AMDEP_TRUE@DEP_FILES = $(DEPDIR)/atan2.Po $(DEPDIR)/floor.Po \

View file

@ -0,0 +1,20 @@
--- src/Makefile.in.orig Mon Aug 30 09:03:14 2004
+++ src/Makefile.in Wed Dec 22 21:51:24 2004
@@ -92,7 +92,7 @@
starplot_DEPENDENCIES = libstarplot.a ../lib/libcompat.a
binSCRIPT_INSTALL = $(INSTALL_SCRIPT)
SCRIPTS = $(bin_SCRIPTS)
-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
+DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(LOCALBASE)/include
depcomp = $(SHELL) $(top_srcdir)/depcomp
am__depfiles_maybe = depfiles
@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/mathdefs.Po \
@@ -263,7 +263,7 @@
starplot_LDFLAGS = `pkg-config --libs gtk+-2.0`
starconvert_CXXFLAGS = -Wall $(DEFINEFLAGS)
starconvert_LDADD = libstarplot.a ../lib/libcompat.a
-starconvert_LDFLAGS = -lm
+starconvert_LDFLAGS = `pkg-config --libs gtk+-2.0`
noinst_HEADERS = classes/colors.h classes/constellations.h classes/greek.h \
classes/mathdefs.h classes/specclass.h classes/star.h \
classes/stararray.h classes/strings.h classes/vector3.h \

View file

@ -1,6 +1,6 @@
StarPlot allows you to view three-dimensional perspective charts
of stars. Check the Web site to get more star data sets.
WWW: http://www.princeton.edu/~kmccarty/starplot.html
WWW: http://www.starplot.com/
- Patrick Li <pat@FreeBSD.org>

View file

@ -1,18 +1,22 @@
bin/starplot
bin/starconvert
%%PORTDOCS%%%%DOCSDIR%%/README
%%PORTDOCS%%%%DOCSDIR%%/examples/example.spec
%%PORTDOCS%%%%DOCSDIR%%/html/ch1.html
%%PORTDOCS%%%%DOCSDIR%%/html/images/bayerdes.png
%%PORTDOCS%%%%DOCSDIR%%/html/images/coords.png
%%PORTDOCS%%%%DOCSDIR%%/html/images/gcoords.png
%%PORTDOCS%%%%DOCSDIR%%/html/images/hrdiagram.png
%%PORTDOCS%%%%DOCSDIR%%/html/index.html
share/starplot/examples/sample.stars
share/starplot/examples/test.stars
@dirrm share/starplot/examples
@dirrm share/starplot/
%%PORTDOCS%%@dirrm %%DOCSDIR%%/html/images
%%PORTDOCS%%@dirrm %%DOCSDIR%%/html
%%PORTDOCS%%@dirrm %%DOCSDIR%%/examples
%%PORTDOCS%%@dirrm %%DOCSDIR%%/
bin/starpkg
bin/starplot
%%DOCSDIR%%/html/ch1.html
%%DOCSDIR%%/html/images/bayerdes.png
%%DOCSDIR%%/html/images/coords.png
%%DOCSDIR%%/html/images/gcoords.png
%%DOCSDIR%%/html/images/hrdiagram.png
%%DOCSDIR%%/html/index.html
%%DOCSDIR%%/html/starplot.css
%%EXAMPLESDIR%%/example.spec
%%NLS%%share/locale/en@boldquot/LC_MESSAGES/starplot.mo
%%NLS%%share/locale/en@quot/LC_MESSAGES/starplot.mo
%%NLS%%share/locale/es_ES/LC_MESSAGES/starplot.mo
%%NLS%%share/locale/es_ES@euro/LC_MESSAGES/starplot.mo
share/starplot/sample.stars
share/starplot/test.stars
@dirrm share/starplot
@dirrm %%EXAMPLESDIR%%
@dirrm %%DOCSDIR%%/html/images
@dirrm %%DOCSDIR%%/html
@dirrm %%DOCSDIR%%