Update to version 0.7.

PR:		28053
Submitted by:	KATO Tsuguru <tkato@prontomail.com>
This commit is contained in:
Steve Price 2001-06-17 18:21:28 +00:00
parent 380620cd4b
commit 837e7f9d89
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=44127
6 changed files with 72 additions and 88 deletions

View File

@ -6,22 +6,23 @@
#
PORTNAME= xzgv
PORTVERSION= 0.6
PORTVERSION= 0.7
CATEGORIES= graphics
MASTER_SITES= http://xzgv.browser.org/ \
${MASTER_SITE_SUNSITE}
${MASTER_SITE_SUNSITE}
MASTER_SITE_SUBDIR= apps/graphics/viewers/X
MAINTAINER= nosuzuki@e-mail.ne.jp
USE_GMAKE= yes
USE_IMLIB= yes
USE_X_PREFIX= yes
USE_IMLIB= yes
USE_GMAKE= yes
MAN1= xzgv.1
post-patch:
@${PERL} -pi -e "s:/usr/local:${PREFIX}:g" ${WRKSRC}/config.mk
@${PERL} -pi -e 's|^CC|#CC|g ; \
s|^CFLAGS|#CFLAGS|g ; \
s|^PREFIX|#PREFIX|g' ${WRKSRC}/config.mk
.include <bsd.port.mk>

View File

@ -1 +1 @@
MD5 (xzgv-0.6.tar.gz) = 10e084593c2e8e4f9d92eefb35a02162
MD5 (xzgv-0.7.tar.gz) = 37b5bd8286de9f1047f603879460b364

View File

@ -1,6 +1,5 @@
diff -urN ../../xzgv-0.6.orig/Makefile ./Makefile
--- ../../xzgv-0.6.orig/Makefile Wed Nov 8 21:52:49 2000
+++ ./Makefile Sat Nov 11 14:28:52 2000
--- Makefile.orig Fri Nov 17 13:28:43 2000
+++ Makefile Sat Jun 9 17:03:04 2001
@@ -24,9 +24,9 @@
@ -18,10 +17,10 @@ diff -urN ../../xzgv-0.6.orig/Makefile ./Makefile
# So the `infowarn' below is mainly to warn me if the info gets
# out of date. :-)
-info: doc/xzgv.gz
+info: doc/xzgv
+info: doc/xzgv.info
-doc/xzgv.gz: doc/xzgv.texi
+doc/xzgv: doc/xzgv.texi
+doc/xzgv.info: doc/xzgv.texi
cd doc && $(MAKE) info
# Warn if the info is out of date. This *is* automatically done.

View File

@ -1,83 +1,74 @@
diff -urN ../../xzgv-0.6.orig/doc/Makefile ./doc/Makefile
--- ../../xzgv-0.6.orig/doc/Makefile Wed Nov 8 21:52:49 2000
+++ ./doc/Makefile Sat Nov 11 14:30:57 2000
--- doc/Makefile.orig Thu Dec 21 12:45:20 2000
+++ doc/Makefile Sat Jun 9 17:08:11 2001
@@ -10,12 +10,11 @@
all: info man
-info: xzgv.gz
+info: xzgv
+info: xzgv.info
dvi: xzgv.dvi
-xzgv.gz: xzgv.texi
- makeinfo xzgv.texi
- gzip -f xzgv xzgv-?
+xzgv: xzgv.texi
+ makeinfo --no-split xzgv.texi
+xzgv.info: xzgv.texi
+ makeinfo --no-split xzgv.texi -o xzgv.info
# `-c' removes the huge number of associated files created by TeX.
# This saves doing a `make clean' from hell. :-)
@@ -31,7 +30,7 @@
man: xzgv.1
xzgv.1: xzgv.texi makeman.awk
@echo 'Making man page from xzgv.texi...'
- gawk -f makeman.awk <xzgv.texi >xzgv.1
+ $(AWK) -f makeman.awk <xzgv.texi >xzgv.1
@@ -36,36 +35,36 @@
installdirs:
/bin/sh ../mkinstalldirs $(INFODIR) $(MANDIR)
@@ -40,25 +39,26 @@
ifeq ($(INFO_DIR_UPDATE),no)
install: installdirs
else
-install: ../src/install-info installdirs
- install xzgv.1 $(MANDIR)
- install xzgv.gz xzgv-?.gz $(INFODIR)
- chmod 644 $(MANDIR)/xzgv.1 $(INFODIR)/xzgv*
+install:
endif
install -m 444 xzgv.1 $(MANDIR)
- install -m 444 xzgv.gz xzgv-?.gz $(INFODIR)
+ install -m 444 xzgv $(INFODIR)
+ install-info $(INFODIR)/xzgv $(INFODIR)/dir
+ ${BSD_INSTALL_MAN} xzgv.1 $(MANDIR)
+ ${BSD_INSTALL_DATA} xzgv.info $(INFODIR)
+ install-info $(INFODIR)/xzgv.info $(INFODIR)/dir
# Update info `dir' file.
# Info always uses a dir file in preference to a dir.gz, so we don't use
# dir.gz unless it's the only game in town.
-ifneq ($(INFO_DIR_UPDATE),no)
- gzip -d xzgv.gz
- if [ -f $(INFODIR)/dir.gz -a ! -f $(INFODIR)/dir ]; then \
- gzip -d $(INFODIR)/dir.gz; \
- ../src/install-info xzgv $(INFODIR)/dir; \
- gzip $(INFODIR)/dir; \
- else \
- ../src/install-info xzgv $(INFODIR)/dir; \
- if [ "$(INFO_DIR_UPDATE)" != no ]; then \
- gzip -d xzgv.gz; \
- if [ -f $(INFODIR)/dir.gz -a ! -f $(INFODIR)/dir ]; then \
- gzip -d $(INFODIR)/dir.gz; \
- ../src/install-info xzgv $(INFODIR)/dir; \
- gzip $(INFODIR)/dir; \
- else \
- ../src/install-info xzgv $(INFODIR)/dir; \
- fi; \
- chmod a+r $(INFODIR)/dir; \
- gzip xzgv; \
- fi
- chmod a+r $(INFODIR)/dir
- gzip xzgv
-endif
+#ifneq ($(INFO_DIR_UPDATE),no)
+# gzip -d xzgv.gz
+# if [ -f $(INFODIR)/dir.gz -a ! -f $(INFODIR)/dir ]; then \
+# gzip -d $(INFODIR)/dir.gz; \
+# ../src/install-info xzgv $(INFODIR)/dir; \
+# gzip $(INFODIR)/dir; \
+# else \
+# ../src/install-info xzgv $(INFODIR)/dir; \
+# if [ "$(INFO_DIR_UPDATE)" != no ]; then \
+# gzip -d xzgv.gz; \
+# if [ -f $(INFODIR)/dir.gz -a ! -f $(INFODIR)/dir ]; then \
+# gzip -d $(INFODIR)/dir.gz; \
+# ../src/install-info xzgv $(INFODIR)/dir; \
+# gzip $(INFODIR)/dir; \
+# else \
+# ../src/install-info xzgv $(INFODIR)/dir; \
+# fi; \
+# chmod a+r $(INFODIR)/dir; \
+# gzip xzgv; \
+# fi
+# chmod a+r $(INFODIR)/dir
+# gzip xzgv
+#endif
../src/install-info: ../src/install-info.c
cd ../src && $(MAKE) install-info
@@ -66,10 +66,11 @@
# can't easily fix dir :-/, but do remove the files.
uninstall:
$(RM) $(MANDIR)/xzgv.1
- $(RM) $(MANDIR)/xzgv.1
- $(RM) $(INFODIR)/{xzgv.gz,xzgv-?.gz}
+ install-info --delete $(INFODIR)/xzgv $(INFODIR)/dir
+ $(RM) $(INFODIR)/xzgv
+ install-info --delete $(INFODIR)/xzgv.info $(INFODIR)/dir
+ $(RM) $(INFODIR)/xzgv.info
# This *doesn't* remove the Info files, which should stick around to
# be included in the distribution. Ditto for the man page, since
# building it requires gawk.
clean:
- $(RM) *~ xzgv.dvi
+ $(RM) *~ xzgv.dvi xzgv
+ $(RM) *~ xzgv.dvi xzgv.info

View File

@ -1,7 +1,15 @@
diff -urN ../../xzgv-0.6.orig/src/Makefile ./src/Makefile
--- ../../xzgv-0.6.orig/src/Makefile Wed Nov 8 21:52:49 2000
+++ ./src/Makefile Sat Nov 11 14:32:17 2000
@@ -19,7 +19,7 @@
--- src/Makefile.orig Tue Apr 10 21:37:01 2001
+++ src/Makefile Sat Jun 9 17:09:29 2001
@@ -9,7 +9,7 @@
# This gets definitions for CC, CFLAGS, BINDIR etc.
include ../config.mk
-CFLAGS+=-DBACKEND_$(BACKEND) `gtk-config --cflags`
+CFLAGS+=-DBACKEND_$(BACKEND) `${GTK_CONFIG} --cflags`
# I could do this less horribly if I made it GNU-make-specific,
# but I decided not to. And here we are. :-(
@@ -30,7 +30,7 @@
# compile when you do `make install'. :-)
# (It would also be weird to have it made by the `doc' Makefile, IMHO.)
@ -9,31 +17,16 @@ diff -urN ../../xzgv-0.6.orig/src/Makefile ./src/Makefile
+all: xzgv #install-info
OBJS= main.o \
filedetails.o gotodir.o updatetn.o confirm.o \
@@ -43,14 +43,14 @@
filedetails.o gotodir.o updatetn.o confirm.o help.o \
@@ -57,9 +57,8 @@
installdirs:
/bin/sh ../mkinstalldirs $(BINDIR)
-install: xzgv installdirs
- install -m 511 xzgv $(BINDIR)
- install xzgv $(BINDIR)
- chmod 755 $(BINDIR)/xzgv
+install: xzgv #installdirs
+ install -s -m 511 xzgv $(BINDIR)
+ ${BSD_INSTALL_PROGRAM} xzgv $(BINDIR)
uninstall:
$(RM) $(BINDIR)/xzgv
clean:
- $(RM) *~ *.o xzgv install-info
+ $(RM) *~ *.o xzgv
$(RM) rcfile_opt.h rcfile_var.h rcfile_short.h
$(RM) logodata.h logoconv
@@ -63,7 +63,7 @@
getopt.o: getopt.c
getopt1.o: getopt1.c getopt.h
gotodir.o: gotodir.c main.h gotodir.h
-install-info.o: install-info.c getopt.h
+#install-info.o: install-info.c getopt.h
logo.o: logo.c logodata.h
logoconv.o: logoconv.c
main.o: main.c readmrf.h readgif.h readpng.h readjpegtn.h resizepic.h \

View File

@ -1,4 +1,4 @@
bin/xzgv
@unexec install-info --delete %D/info/xzgv %D/info/dir
info/xzgv
@exec install-info %D/info/xzgv %D/info/dir
@unexec install-info --delete %D/info/xzgv.info %D/info/dir
info/xzgv.info
@exec install-info %D/info/xzgv.info %D/info/dir