Update to version 0.7.

This commit is contained in:
Jim Mock 2001-04-22 00:31:50 +00:00
parent f79a90563e
commit 6d6a18ddea
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=41780
5 changed files with 56 additions and 25 deletions

View file

@ -6,11 +6,10 @@
#
PORTNAME= wmtz
PORTVERSION= 0.5
PORTVERSION= 0.7
CATEGORIES= x11-clocks windowmaker afterstep
MASTER_SITES= http://www.algonet.se/~jlin/wmtz/ \
${MASTER_SITE_LOCAL}
MASTER_SITE_SUBDIR= jim
MASTER_SITES= http://www.geocities.com/jl1n/wmtz/ \
http://soupnazi.org/FreeBSD/ports/distfiles/
MAINTAINER= jim@FreeBSD.org
@ -20,10 +19,9 @@ USE_X_PREFIX= yes
USE_XPM= yes
post-install:
@${ECHO} "===> Installing wmtzrc in ${PREFIX}/share/examples/wmtz"
@${ECHO} "===> Modify to your config and copy to ~/.wmtzrc"
@${MKDIR} ${PREFIX}/share/examples/wmtz && ${CHMOD} a+rx ${PREFIX}/share/examples/wmtz
@${INSTALL_DATA} ${WRKSRC}/wmtzrc ${PREFIX}/share/examples/wmtz
@${ECHO} "===> Installing wmtzrc.default in ${PREFIX}/etc."
@${ECHO} "===> Copy it to ~/.wmtzrc or ${PREFIX}/etc/wmtzrc and modify it."
@${INSTALL_DATA} ${WRKSRC}/wmtzrc ${PREFIX}/etc/wmtzrc.default
@${ECHO} "===> Run wmtz --help for usage instructions"
.include <bsd.port.mk>

View file

@ -1 +1 @@
MD5 (wmtz-0.5.tar.gz) = c33b4d664b1c3e46f5ce9d8debb04c0d
MD5 (wmtz-0.7.tar.gz) = 5e374e8bfcfc4fbf1b5f1cedf701e521

View file

@ -1,21 +1,21 @@
--- Makefile.orig Thu Apr 22 12:27:46 1999
+++ Makefile Tue Dec 28 17:28:17 1999
--- Makefile.orig Sat Apr 21 20:12:15 2001
+++ Makefile Sat Apr 21 20:15:23 2001
@@ -1,7 +1,7 @@
-CC = gcc
-LIBDIR = -L/usr/X11R6/lib
+CC ?= gcc
+LIBDIR = -L${X11BASE}/lib
LIBS = -lXpm -lXext -lX11 -lm
-FLAGS = -O2
+CFLAGS ?= -Wall -O2
-FLAGS = -O2
+CFLAGS ?= -Wall -O2
DESTDIR = /usr/local
OBJS = wmtz.o \
../wmgeneral/wmgeneral.o \
../wmgeneral/misc.o \
@@ -9,10 +9,10 @@
@@ -10,10 +10,10 @@
.c.o:
- $(CC) -I/usr/X11R6/share/include $(FLAGS) -c -Wall $< -o $*.o
- $(CC) -I/usr/X11R6/include $(FLAGS) -c -Wall $< -o $*.o
+ $(CC) -I${X11BASE}/include $(CFLAGS) -c $< -o $*.o
wmtz: $(OBJS)
@ -24,17 +24,21 @@
all:: wmtz
@@ -24,18 +24,4 @@
@@ -25,22 +25,4 @@
rm -f *~
install:: wmtz
- cp -f wmtz /usr/local/bin/
- chmod 755 /usr/local/bin/wmtz
- chown root:root /usr/local/bin/wmtz
- cp wmtzrc $(HOME)/.wmtzrc
- cp -f wmtz $(DESTDIR)/bin/
- chmod 755 $(DESTDIR)/bin/wmtz
- chown root:root $(DESTDIR)/bin/wmtz
- cp -f wmtz.1 $(DESTDIR)/man/man1
- chmod 644 $(DESTDIR)/man/man1/wmtz.1
- chown root:root $(DESTDIR)/man/man1/wmtz.1
- cp -f wmtzrc $(HOME)/.wmtzrc
- chmod 600 $(HOME)/.wmtzrc
- cp wmtzrc /etc/wmtzrc
- cp -f wmtzrc /etc/wmtzrc
- chmod 644 /etc/wmtzrc
- chown root:root /etc/wmtzrc
- @echo "wmtz: Installation finished..."
-
-uninstall::

View file

@ -0,0 +1,31 @@
--- wmtz.c.orig Sat Apr 21 20:18:05 2001
+++ wmtz.c Sat Apr 21 20:19:47 2001
@@ -275,15 +275,15 @@
if (!Read_Config_File(config_file))
{
- /* Fall back to /etc/wmtzrc */
+ /* Fall back to ${PREFIX}/etc/wmtzrc */
free(config_file);
config_file = malloc( 12 );
if (config_file == NULL)
errH(1, 1, "malloc");
- sprintf(config_file, "/etc/wmtzrc");
+ sprintf(config_file, "${PREFIX}/etc/wmtzrc ");
- fprintf(stderr, "Using /etc/wmtzrc as config file.\n");
+ fprintf(stderr, "Using ${PREFIX}/etc/wmtzrc as config file.\n");
Read_Config_File(config_file);
}
@@ -729,7 +729,8 @@
void usage(void)
{
fprintf(stderr, "\nwmtz - shows local time around the world and more.\n");
- fprintf(stderr, "See ~/.wmtzrc or /etc/wmtzrc for configuration.\n\n");
+ fprintf(stderr, "See ~/.wmtzrc or ${PREFIX}/etc/wmtzrc.default for\n");
+ fprintf(stderr, "configuration.\n\n");
fprintf(stderr, "Usage:\n");
fprintf(stderr, " -display <display name>\n");
fprintf(stderr, " -e <editor> use specified editor\n");

View file

@ -1,4 +1,2 @@
bin/wmtz
share/examples/wmtz/wmtzrc
@dirrm share/examples/wmtz
etc/wmtzrc.default