ports/100874: [MAINTAINER] astro/sunclock: update to 3.55
Stanislav Sedov
ssedov at mbsd.msk.ru
Wed Jul 26 11:12:06 UTC 2006
>Number: 100874
>Category: ports
>Synopsis: [MAINTAINER] astro/sunclock: update to 3.55
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: maintainer-update
>Submitter-Id: current-users
>Arrival-Date: Wed Jul 26 11:10:22 GMT 2006
>Closed-Date:
>Last-Modified:
>Originator: Stanislav Sedov
>Release: FreeBSD 7.0-CURRENT i386
>Organization:
MBSD labs, Inc.
>Environment:
System: FreeBSD fonon.realnet 7.0-CURRENT FreeBSD 7.0-CURRENT #7: Sun Jun 18 20:51:36 MSD 2006
>Description:
- Update to 3.55
Added file(s):
- files/patch-Imakefile
- files/patch-editkit_Imakefile
Removed file(s):
- files/patch-aa
- files/patch-editkit__Imakefile
Generated with FreeBSD Port Tools 0.77
>How-To-Repeat:
>Fix:
--- sunclock-3.55.patch begins here ---
diff -ruN --exclude=CVS /usr/ports/astro/sunclock/Makefile /var/tmp/sunclock/Makefile
--- /usr/ports/astro/sunclock/Makefile Sat Jul 22 23:19:37 2006
+++ /var/tmp/sunclock/Makefile Wed Jul 26 14:25:16 2006
@@ -7,9 +7,10 @@
#
PORTNAME= sunclock
-PORTVERSION= 3.54.1
+PORTVERSION= 3.55
CATEGORIES= astro x11-clocks
-MASTER_SITES= http://mbsd.msk.ru/dist/
+MASTER_SITES= ftp://ftp.ac-grenoble.fr/ge/geosciences/sunclock/ \
+ http://mbsd.msk.ru/dist/
MAINTAINER= ssedov at mbsd.msk.ru
COMMENT= Shows which portion of the Earth's surface is illuminated by the Sun
@@ -22,6 +23,6 @@
USE_IMAKE= yes
CFLAGS+= -I${LOCALBASE}/include
-MAN1= sunclock.1 emx.1
+MAN1= sunclock.1
.include <bsd.port.mk>
diff -ruN --exclude=CVS /usr/ports/astro/sunclock/distinfo /var/tmp/sunclock/distinfo
--- /usr/ports/astro/sunclock/distinfo Thu Jan 5 03:38:16 2006
+++ /var/tmp/sunclock/distinfo Wed Jul 26 14:11:49 2006
@@ -1,3 +1,3 @@
-MD5 (sunclock-3.54.1.tar.bz2) = 2ac6e715a048d848ff67baf2af1cd9d0
-SHA256 (sunclock-3.54.1.tar.bz2) = 5267312cd146e9aeeada81866f0584511b893e1697154a9296834e7b9a5af4eb
-SIZE (sunclock-3.54.1.tar.bz2) = 602245
+MD5 (sunclock-3.55.tar.bz2) = a6433a4d0103ade513cc1ea5ff9332e7
+SHA256 (sunclock-3.55.tar.bz2) = f2ed08f7f9e693c7639d001154e72523e840a2d56c96974cec77bbd3130f415d
+SIZE (sunclock-3.55.tar.bz2) = 1313010
diff -ruN --exclude=CVS /usr/ports/astro/sunclock/files/patch-Imakefile /var/tmp/sunclock/files/patch-Imakefile
--- /usr/ports/astro/sunclock/files/patch-Imakefile Thu Jan 1 03:00:00 1970
+++ /var/tmp/sunclock/files/patch-Imakefile Wed Jul 26 14:47:08 2006
@@ -0,0 +1,74 @@
+--- Imakefile.orig Sun Jun 18 23:58:50 2006
++++ Imakefile Wed Jul 26 14:47:03 2006
+@@ -1,18 +1,18 @@
+ XCOMM Should install to /usr or /usr/local ??
+-DESTDIR=/usr
++DESTDIR=${PREFIX}
+
+ XCOMM Name of man subdirectory of DESTDIR:
+-MANDIR=/X11R6/man/man1
++MANDIR=/man/man1
+
+ XCOMM Name of bin subdirectory of DESTDIR: /X11R6/bin or maybe just /bin
+-BINDIR=/X11R6/bin
++BINDIR=/bin
+
+ XCOMM Name of share subdirectory of DESTDIR:
+ SHAREDIR=/share/sunclock
+
+ XCOMM Name of DOCDIR's subdirectories of DESTDIR:
+ DOCDIR=/X11R6/lib/X11/doc
+-DOCHTMLDIR=/X11R6/lib/X11/doc/html
++DOCHTMLDIR=/lib/X11/doc/html
+
+ XCOMM
+ XCOMM Compile options:
+@@ -42,13 +42,13 @@
+ #CCOPTIONS=-O -DZLIB -DNEW_CTIME -DSHAREDIR=\"$(DESTDIR)$(SHAREDIR)\"
+
+ # Solaris, Linux
+-#XPMLIBDIR=-L/usr/X11R6/lib
+-#XPMINC=-I/usr/X11R6/include/X11
+-#JLIBDIR=-L/usr/lib
+-#ZLIBDIR=-L/usr/lib
+-#JINC=-I/usr/include
+-
+-CCOPTIONS=-O -DZLIB -DSHAREDIR=\"$(DESTDIR)$(SHAREDIR)\"
++XPMLIBDIR=-L${X11BASE}/lib
++XPMINC=-I${X11BASE}/include/X11
++JLIBDIR=-L${LOCALBASE}/lib
++ZLIBDIR=-L${LOCALBASE}/lib
++JINC=-I${LOCALBASE}/include
++CCOPTIONS=-O -DZLIB -DSHAREDIR=\"$(DESTDIR)$(SHAREDIR)\" -DNEW_CTIME -I${LOCALBASE}/include
++INCLUDES+= -I${LOCALBASE}/include
+ #endif
+
+ SRCS=sunclock.c astro.c widgets.c tildepath.c dirlist.c \
+@@ -56,7 +56,7 @@
+ OBJS=sunclock.o astro.o widgets.o tildepath.o dirlist.o \
+ readvmf.o readxpm.o readgif.o readjpeg.o readpng.o
+ LOCAL_LIBRARIES=$(XLIB) $(XPMLIBDIR) -lXpm $(ZLIBDIR) -lz \
+- $(JLIBDIR) -ljpeg -lpng -lm
++ $(JLIBDIR) -ljpeg -lpng -lm -lcompat
+ DEPLIBS= # I don't know what I'm doing, and I hate imake!
+
+ ComplexProgramTarget(sunclock)
+@@ -64,7 +64,7 @@
+ all::
+ cd editkit ; xmkmf ; make emx \
+ DESTDIR=$(DESTDIR) \
+- BINDIR=$(SHAREDIR)/bin \
++ BINDIR=/bin \
+ MANDIR=$(SHAREDIR)/editkit \
+ SHAREDIR=$(DESTDIR)$(SHAREDIR)/editkit
+
+@@ -78,8 +78,7 @@
+ cd i18n ; rm -f *~ ; cp -f Sunclock.* $(DESTDIR)$(SHAREDIR)/i18n
+ $(MKDIRHIER) $(DESTDIR)$(SHAREDIR)/earthmaps/vmf
+ cd vmf ; rm -f *~ ; cp -f * $(DESTDIR)$(SHAREDIR)/earthmaps/vmf
+- $(MKDIRHIER) $(DESTDIR)$(SHAREDIR)/bin
+- install -c -s editkit/emx $(DESTDIR)$(SHAREDIR)/bin
++ install -c -s editkit/emx $(DESTDIR)/bin
+ $(MKDIRHIER) $(DESTDIR)$(SHAREDIR)/editkit
+ cd editkit ; install -c -m 444 rc.example README MANUAL.emacs \
+ $(DESTDIR)$(SHAREDIR)/editkit
diff -ruN --exclude=CVS /usr/ports/astro/sunclock/files/patch-aa /var/tmp/sunclock/files/patch-aa
--- /usr/ports/astro/sunclock/files/patch-aa Thu Jan 5 03:38:16 2006
+++ /var/tmp/sunclock/files/patch-aa Thu Jan 1 03:00:00 1970
@@ -1,55 +0,0 @@
---- Imakefile.orig Tue Aug 2 00:13:59 2005
-+++ Imakefile Fri Nov 25 18:21:34 2005
-@@ -1,18 +1,18 @@
- XCOMM Should install to /usr or /usr/local ??
--DESTDIR=/usr
-+DESTDIR=${PREFIX}
-
- XCOMM Name of man subdirectory of DESTDIR:
--MANDIR=/X11R6/man/man1
-+MANDIR=/man/man1
-
- XCOMM Name of bin subdirectory of DESTDIR: /X11R6/bin or maybe just /bin
--BINDIR=/X11R6/bin
-+BINDIR=/bin
-
- XCOMM Name of share subdirectory of DESTDIR:
- SHAREDIR=/share/sunclock
-
- XCOMM Name of DOCDIR's subdirectories of DESTDIR:
- DOCDIR=/X11R6/lib/X11/doc
--DOCHTMLDIR=/X11R6/lib/X11/doc/html
-+DOCHTMLDIR=/lib/X11/doc/html
-
- XCOMM
- XCOMM Compile options:
-@@ -42,13 +42,13 @@
- #CCOPTIONS=-O -DZLIB -DNEW_CTIME -DSHAREDIR=\"$(DESTDIR)$(SHAREDIR)\"
-
- # Solaris, Linux
--#XPMLIBDIR=-L/usr/X11R6/lib
--#XPMINC=-I/usr/X11R6/include/X11
--#JLIBDIR=-L/usr/lib
--#ZLIBDIR=-L/usr/lib
--#JINC=-I/usr/include
--
--CCOPTIONS=-O -DZLIB -DSHAREDIR=\"$(DESTDIR)$(SHAREDIR)\"
-+XPMLIBDIR=-L${X11BASE}/lib
-+XPMINC=-I${X11BASE}/include/X11
-+JLIBDIR=-L${LOCALBASE}/lib
-+ZLIBDIR=-L${LOCALBASE}/lib
-+JINC=-I${LOCALBASE}/include
-+CCOPTIONS=-O -DZLIB -DSHAREDIR=\"$(DESTDIR)$(SHAREDIR)\" -DNEW_CTIME -I${LOCALBASE}/include
-+INCLUDES+= -I${LOCALBASE}/include
- #endif
-
- SRCS=sunclock.c astro.c widgets.c tildepath.c dirlist.c \
-@@ -56,7 +56,7 @@
- OBJS=sunclock.o astro.o widgets.o tildepath.o dirlist.o \
- readvmf.o readxpm.o readgif.o readjpeg.o readpng.o
- LOCAL_LIBRARIES=$(XLIB) $(XPMLIBDIR) -lXpm $(ZLIBDIR) -lz \
-- $(JLIBDIR) -ljpeg -lpng -lm
-+ $(JLIBDIR) -ljpeg -lpng -lm -lcompat
- DEPLIBS= # I don't know what I'm doing, and I hate imake!
-
- ComplexProgramTarget(sunclock)
diff -ruN --exclude=CVS /usr/ports/astro/sunclock/files/patch-editkit_Imakefile /var/tmp/sunclock/files/patch-editkit_Imakefile
--- /usr/ports/astro/sunclock/files/patch-editkit_Imakefile Thu Jan 1 03:00:00 1970
+++ /var/tmp/sunclock/files/patch-editkit_Imakefile Wed Jul 26 14:15:07 2006
@@ -0,0 +1,53 @@
+--- editkit/Imakefile.orig Sat Mar 11 00:11:23 2006
++++ editkit/Imakefile Wed Jul 26 14:14:30 2006
+@@ -1,16 +1,16 @@
+ XCOMM Should install to /usr or /usr/local ??
+ #ifndef DESTDIR
+- DESTDIR=/usr
++ DESTDIR=${PREFIX}
+ #endif
+
+ XCOMM Name of man subdirectory of DESTDIR:
+ #ifndef MANDIR
+- MANDIR=/X11R6/man/man1
++ MANDIR=/man/man1
+ #endif
+
+ XCOMM Name of bin subdirectory of DESTDIR: /X11R6/bin or maybe just /bin
+ #ifndef BINDIR
+- BINDIR=/X11R6/bin
++ BINDIR=/bin
+ #endif
+
+ XCOMM Name of share subdirectory of DESTDIR_XRMAP:
+@@ -20,10 +20,10 @@
+
+ XCOMM Name of DOCDIR's subdirectories of DESTDIR:
+ #ifndef DOCDIR
+- DOCDIR=/X11R6/lib/X11/doc
++ DOCDIR=/lib/X11/doc
+ #endif
+ #ifndef DOCHTMLDIR
+- DOCHTMLDIR=/X11R6/lib/X11/doc/html
++ DOCHTMLDIR=/lib/X11/doc/html
+ #endif
+
+ XCOMM
+@@ -33,7 +33,7 @@
+ XCOMM Compile options:
+ XCOMM
+
+-CFLAGS = -O2 -fomit-frame-pointer -pipe -Wall -DTHREED -DGREEK -DJUSTIFY -DSHAREDIR="\"$(SHAREDIR)\""
++CFLAGS += -O2 -fomit-frame-pointer -pipe -Wall -DTHREED -DGREEK -DJUSTIFY -DSHAREDIR="\"$(SHAREDIR)\""
+
+ LOCAL_LIBRARIES=$(XLIB)
+ DEPLIBS= # I don't know what I'm doing, and I hate imake!
+@@ -48,8 +48,6 @@
+ $(CC) $(CFLAGS) -DEMACS -o x11.o -c x11.c
+
+ install.man::
+- if [ -r $(DESTDIR)$(MANDIR)/emx.1.gz ] ; \
+- then gzip -f $(DESTDIR)$(MANDIR)/emx.1 ; fi
+ if [ -r $(DESTDIR)$(MANDIR)/emx.1x.gz ] ; \
+ then gzip -f $(DESTDIR)$(MANDIR)/emx.1x ; fi
+
diff -ruN --exclude=CVS /usr/ports/astro/sunclock/files/patch-editkit__Imakefile /var/tmp/sunclock/files/patch-editkit__Imakefile
--- /usr/ports/astro/sunclock/files/patch-editkit__Imakefile Thu Jan 5 03:38:16 2006
+++ /var/tmp/sunclock/files/patch-editkit__Imakefile Thu Jan 1 03:00:00 1970
@@ -1,45 +0,0 @@
---- editkit/Imakefile.orig Tue Aug 2 00:14:15 2005
-+++ editkit/Imakefile Fri Nov 25 22:47:48 2005
-@@ -1,20 +1,20 @@
- XCOMM Should install to /usr or /usr/local ??
- #ifndef DESTDIR
--DESTDIR=/usr
-+DESTDIR=${PREFIX}
- #endif
-
- XCOMM Name of man subdirectory of DESTDIR:
--MANDIR=/X11R6/man/man1
-+MANDIR=/man/man1
-
- XCOMM Name of bin subdirectory of DESTDIR: /X11R6/bin or maybe just /bin
--BINDIR=/X11R6/bin
-+BINDIR=/bin
-
- XCOMM Name of share subdirectory of DESTDIR_XRMAP:
- SHAREDIR=$(DESTDIR)/share/editkit
-
- XCOMM Name of DOCDIR's subdirectories of DESTDIR:
- DOCDIR=/X11R6/lib/X11/doc
--DOCHTMLDIR=/X11R6/lib/X11/doc/html
-+DOCHTMLDIR=/lib/X11/doc/html
-
- XCOMM
- XCOMM Normally -- except for new architectures -- you should be done there.
-@@ -23,7 +23,7 @@
- XCOMM Compile options:
- XCOMM
-
--CFLAGS = -O2 -fomit-frame-pointer -pipe -Wall -DTHREED -DGREEK -DJUSTIFY -DSHAREDIR="\"$(SHAREDIR)\""
-+CFLAGS += -O2 -fomit-frame-pointer -pipe -Wall -DTHREED -DGREEK -DJUSTIFY -DSHAREDIR="\"$(SHAREDIR)\""
-
- LOCAL_LIBRARIES=$(XLIB)
- DEPLIBS= # I don't know what I'm doing, and I hate imake!
-@@ -38,8 +38,6 @@
- $(CC) $(CFLAGS) -DEMACS -o x11.o -c x11.c
-
- install.man::
-- if [ -r $(DESTDIR)$(MANDIR)/emx.1.gz ] ; \
-- then gzip -f $(DESTDIR)$(MANDIR)/emx.1 ; fi
- if [ -r $(DESTDIR)$(MANDIR)/emx.1x.gz ] ; \
- then gzip -f $(DESTDIR)$(MANDIR)/emx.1x ; fi
-
diff -ruN --exclude=CVS /usr/ports/astro/sunclock/pkg-plist /var/tmp/sunclock/pkg-plist
--- /usr/ports/astro/sunclock/pkg-plist Sat Jul 22 23:19:37 2006
+++ /var/tmp/sunclock/pkg-plist Wed Jul 26 14:47:29 2006
@@ -1,8 +1,12 @@
-bin/sunclock
bin/emx
+bin/sunclock
%%DATADIR%%/Sunclockrc
+%%DATADIR%%/earthmaps/vmf/countries.vmf
%%DATADIR%%/earthmaps/vmf/landwater.vmf
%%DATADIR%%/earthmaps/vmf/timezones.vmf
+%%DATADIR%%/editkit/MANUAL.emacs
+%%DATADIR%%/editkit/README
+%%DATADIR%%/editkit/emxrc
%%DATADIR%%/i18n/Sunclock.de
%%DATADIR%%/i18n/Sunclock.en
%%DATADIR%%/i18n/Sunclock.es
@@ -12,11 +16,8 @@
%%DATADIR%%/i18n/Sunclock.no
%%DATADIR%%/i18n/Sunclock.pl
%%DATADIR%%/i18n/Sunclock.se
-share/editkit/rc.common
-share/editkit/emxrc
-share/editkit/README
- at dirrm %%DATADIR%%/i18n
- at dirrm %%DATADIR%%/earthmaps/vmf
- at dirrm %%DATADIR%%/earthmaps
- at dirrm %%DATADIR%%
- at dirrm share/editkit
+ at dirrmtry %%DATADIR%%/i18n
+ at dirrmtry %%DATADIR%%/editkit
+ at dirrmtry %%DATADIR%%/earthmaps/vmf
+ at dirrmtry %%DATADIR%%/earthmaps
+ at dirrmtry %%DATADIR%%
--- sunclock-3.55.patch ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
More information about the freebsd-ports-bugs
mailing list