Upgrade to 0.7.5

misc/gacc/Makefile

@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.2 2000/10/09 07:43:57 kevlo Exp $
+# $OpenBSD: Makefile,v 1.3 2001/01/19 02:52:00 kevlo Exp $
 
-DISTNAME=	gAcc-0.7.2
+VERSION=	0.7.5
+DISTNAME=	gacc_${VERSION}.orig
+PKGNAME=	gacc-${VERSION}
 CATEGORIES=	misc
-NEED_VERSION=	1.319
-
-MASTER_SITES=	http://gacc.sourceforge.net/programmes/
+NEED_VERSION=	1.351
 
 HOMEPAGE=	http://gacc.sourceforge.net/
 
@@ -15,12 +15,15 @@ PERMIT_PACKAGE_FTP=     Yes
 PERMIT_DISTFILES_CDROM= Yes
 PERMIT_DISTFILES_FTP=   Yes
 
+MASTER_SITES=	${HOMEPAGE}/programmes/
+
 LIB_DEPENDS=	gtk.1.2::x11/gtk+
 
-USE_X11=	Yes
+USE_GMAKE=	Yes
 
-CONFIGURE_STYLE=	gnu
-CONFIGURE_ARGS+=	--with-configfile=.gaccrc \
-			--datadir=${PREFIX}/share/examples/gAcc
+CONFIGURE_STYLE= gnu
+CONFIGURE_ARGS=	--datadir=${PREFIX}/share/examples/gacc
+
+WRKDIST=        ${WRKDIR}/gacc-${VERSION}.orig
 
 .include <bsd.port.mk>

misc/gacc/files/md5

@@ -1,3 +1,3 @@
-MD5 (gAcc-0.7.2.tar.gz) = 1a1e79ce8727a45c762dc60fd2911111
-RMD160 (gAcc-0.7.2.tar.gz) = f89eb4200c92ae51a3b358d78caa8ae1ad21bcec
-SHA1 (gAcc-0.7.2.tar.gz) = 4c168f22047ef3adaab95e0c8fe7ad6b1feb7622
+MD5 (gacc_0.7.5.orig.tar.gz) = 014114ff318ec9b374163900c2d77428
+RMD160 (gacc_0.7.5.orig.tar.gz) = 3ac41d206833ac2bcaf98e3572e8330dd23a4a78
+SHA1 (gacc_0.7.5.orig.tar.gz) = cefe63d2bc1a813434cbd1c25a8268979359ec30

misc/gacc/patches/patch-aa

@@ -1,14 +0,0 @@
---- configure.orig	Tue Aug 29 03:34:49 2000
-+++ configure	Tue Aug 29 04:00:46 2000
-@@ -1524,9 +1524,9 @@
- fi
- 
- if test "x$prefix" != xNONE; then
--	DATADIR="$prefix/share"
-+	DATADIR="$prefix/share/doc/gAcc"
- else
--	DATADIR="$ac_default_prefix/share"
-+	DATADIR="$ac_default_prefix/share/doc/gAcc"
- fi
- cat >> confdefs.h <<EOF
- #define DATADIR "$DATADIR"

misc/gacc/patches/patch-ab

@@ -1,11 +0,0 @@
---- docs/Makefile.in.orig	Tue Aug 29 04:05:18 2000
-+++ docs/Makefile.in	Tue Aug 29 04:06:10 2000
-@@ -22,7 +22,7 @@
- bindir = @bindir@
- sbindir = @sbindir@
- libexecdir = @libexecdir@
--datadir = @datadir@
-+datadir = @prefix@/share/doc/gAcc
- sysconfdir = @sysconfdir@
- sharedstatedir = @sharedstatedir@
- localstatedir = @localstatedir@

misc/gacc/patches/patch-etc_Makefile_in

@@ -0,0 +1,44 @@
+--- etc/Makefile.in.orig	Thu Jan 18 10:02:38 2001
++++ etc/Makefile.in	Thu Jan 18 10:04:30 2001
+@@ -104,14 +104,13 @@
+ VERSION = @VERSION@
+ l = @l@
+ 
+-data_DATA = categories.def.fr categories.def.en essai.wallet
+-sysconf_DATA = gaccrc
++data_DATA = categories.def.fr categories.def.en essai.wallet gaccrc
+ EXTRA_DIST = categories.def.fr.in categories.def.en.in essai.wallet.in gaccrc.in
+ CLEANFILES = categories.def.fr categories.def.en essai.wallet gaccrc
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+ CONFIG_HEADER = ../src/config.h
+ CONFIG_CLEAN_FILES = 
+-DATA =  $(data_DATA) $(sysconf_DATA)
++DATA =  $(data_DATA)
+ 
+ DIST_COMMON =  Makefile.am Makefile.in
+ 
+@@ -149,24 +148,6 @@
+ 	  rm -f $(DESTDIR)$(datadir)/$$p; \
+ 	done
+ 
+-install-sysconfDATA: $(sysconf_DATA)
+-	@$(NORMAL_INSTALL)
+-	$(mkinstalldirs) $(DESTDIR)$(sysconfdir)
+-	@list='$(sysconf_DATA)'; for p in $$list; do \
+-	  if test -f $(srcdir)/$$p; then \
+-	    echo " $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(sysconfdir)/$$p"; \
+-	    $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(sysconfdir)/$$p; \
+-	  else if test -f $$p; then \
+-	    echo " $(INSTALL_DATA) $$p $(DESTDIR)$(sysconfdir)/$$p"; \
+-	    $(INSTALL_DATA) $$p $(DESTDIR)$(sysconfdir)/$$p; \
+-	  fi; fi; \
+-	done
+-
+-uninstall-sysconfDATA:
+-	@$(NORMAL_UNINSTALL)
+-	list='$(sysconf_DATA)'; for p in $$list; do \
+-	  rm -f $(DESTDIR)$(sysconfdir)/$$p; \
+-	done
+ tags: TAGS
+ TAGS:
+ 

misc/gacc/patches/patch-po_Makefile_in_in

@@ -0,0 +1,66 @@
+--- po/Makefile.in.in.orig	Thu Jan 18 10:10:46 2001
++++ po/Makefile.in.in	Thu Jan 18 10:20:20 2001
+@@ -69,7 +69,7 @@
+ 	$(MSGFMT) -o $@ $<
+ 
+ .po.gmo:
+-	file=$(srcdir)/`echo $* | sed 's,.*/,,'`.gmo \
++	file=`echo $* | sed 's,.*/,,'`.gmo \
+ 	  && rm -f $$file && $(GMSGFMT) -o $$file $<
+ 
+ .po.cat:
+@@ -111,9 +111,9 @@
+ install-data-no: all
+ install-data-yes: all
+ 	if test -r "$(MKINSTALLDIRS)"; then \
+-	  $(MKINSTALLDIRS) $(datadir); \
++	  $(MKINSTALLDIRS) $(DESTDIR)$(datadir); \
+ 	else \
+-	  $(SHELL) $(top_srcdir)/mkinstalldirs $(datadir); \
++	  $(SHELL) $(top_srcdir)/mkinstalldirs $(DESTDIR)$(datadir); \
+ 	fi
+ 	@catalogs='$(CATALOGS)'; \
+ 	for cat in $$catalogs; do \
+@@ -123,7 +123,7 @@
+ 	    *)     destdir=$(localedir);; \
+ 	  esac; \
+ 	  lang=`echo $$cat | sed 's/\$(CATOBJEXT)$$//'`; \
+-	  dir=$$destdir/$$lang/LC_MESSAGES; \
++	  dir=$(DESTDIR)$$destdir/$$lang/LC_MESSAGES; \
+ 	  if test -r "$(MKINSTALLDIRS)"; then \
+ 	    $(MKINSTALLDIRS) $$dir; \
+ 	  else \
+@@ -153,12 +153,12 @@
+ 	done
+ 	if test "$(PACKAGE)" = "gettext"; then \
+ 	  if test -r "$(MKINSTALLDIRS)"; then \
+-	    $(MKINSTALLDIRS) $(gettextsrcdir); \
++	    $(MKINSTALLDIRS) $(DESTDIR)$(gettextsrcdir); \
+ 	  else \
+-	    $(SHELL) $(top_srcdir)/mkinstalldirs $(gettextsrcdir); \
++	    $(SHELL) $(top_srcdir)/mkinstalldirs $(DESTDIR)$(gettextsrcdir); \
+ 	  fi; \
+ 	  $(INSTALL_DATA) $(srcdir)/Makefile.in.in \
+-			  $(gettextsrcdir)/Makefile.in.in; \
++			  $(DESTDIR)$(gettextsrcdir)/Makefile.in.in; \
+ 	else \
+ 	  : ; \
+ 	fi
+@@ -171,12 +171,12 @@
+ 	for cat in $$catalogs; do \
+ 	  cat=`basename $$cat`; \
+ 	  lang=`echo $$cat | sed 's/\$(CATOBJEXT)$$//'`; \
+-	  rm -f $(localedir)/$$lang/LC_MESSAGES/$(PACKAGE)$(INSTOBJEXT); \
+-	  rm -f $(localedir)/$$lang/LC_MESSAGES/$(PACKAGE)$(INSTOBJEXT).m; \
+-	  rm -f $(gnulocaledir)/$$lang/LC_MESSAGES/$(PACKAGE)$(INSTOBJEXT); \
+-	  rm -f $(gnulocaledir)/$$lang/LC_MESSAGES/$(PACKAGE)$(INSTOBJEXT).m; \
++	  rm -f $(DESTDIR)$(localedir)/$$lang/LC_MESSAGES/$(PACKAGE)$(INSTOBJEXT); \
++	  rm -f $(DESTDIR)$(localedir)/$$lang/LC_MESSAGES/$(PACKAGE)$(INSTOBJEXT).m; \
++	  rm -f $(DESTDIR)$(gnulocaledir)/$$lang/LC_MESSAGES/$(PACKAGE)$(INSTOBJEXT); \
++	  rm -f $(DESTDIR)$(gnulocaledir)/$$lang/LC_MESSAGES/$(PACKAGE)$(INSTOBJEXT).m; \
+ 	done
+-	rm -f $(gettextsrcdir)/po-Makefile.in.in
++	rm -f $(DESTDIR)$(gettextsrcdir)/po-Makefile.in.in
+ 
+ check: all
+