Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 31 Jan 2014 00:03:40 +0000 (UTC)
From:      Rene Ladan <rene@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r341901 - in head: . math math/hexcalc math/hexcalc/files
Message-ID:  <201401310003.s0V03evl004558@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: rene
Date: Fri Jan 31 00:03:39 2014
New Revision: 341901
URL: http://svnweb.freebsd.org/changeset/ports/341901
QAT: https://qat.redports.org/buildarchive/r341901/

Log:
  Restore math/hexcalc and modernize it.
  
  Pass maintainership to Julian Stacey.

Added:
  head/math/hexcalc/
     - copied from r278682, head/math/hexcalc/
  head/math/hexcalc/files/patch-a   (contents, props changed)
Deleted:
  head/math/hexcalc/files/patch-hexcalc.c
Modified:
  head/MOVED
  head/math/Makefile
  head/math/hexcalc/Makefile   (contents, props changed)
  head/math/hexcalc/distinfo   (contents, props changed)

Modified: head/MOVED
==============================================================================
--- head/MOVED	Thu Jan 30 23:26:26 2014	(r341900)
+++ head/MOVED	Fri Jan 31 00:03:39 2014	(r341901)
@@ -2354,7 +2354,6 @@ korean/nh2ps||2011-08-01|Has expired: Lo
 korean/pinetreefonts||2011-08-01|Has expired: No more public distfile
 mail/bincimap||2011-08-01|Has expired: No more public distfile
 mail/cmail||2011-08-01|Has expired: No more public distfile
-math/hexcalc||2011-08-01|Has expired: Looks like abandonware, no more public distfiles
 math/qgfe||2011-08-01|Has expired: Looks like abandonware, no more public distfiles
 misc/ewipe||2011-08-01|Has expired: Looks like abandonware, no more public distfiles
 misc/gkrellmfmonitor2||2011-08-01|Has expired: Looks like abandonware, no more public distfiles

Modified: head/math/Makefile
==============================================================================
--- head/math/Makefile	Thu Jan 30 23:26:26 2014	(r341900)
+++ head/math/Makefile	Fri Jan 31 00:03:39 2014	(r341901)
@@ -163,6 +163,7 @@
     SUBDIR += gringo
     SUBDIR += grpn
     SUBDIR += gsl
+    SUBDIR += hexcalc
     SUBDIR += hs-Agda
     SUBDIR += hs-NumInstances
     SUBDIR += hs-categories

Modified: head/math/hexcalc/Makefile
==============================================================================
--- head/math/hexcalc/Makefile	Mon Aug  1 05:21:10 2011	(r278682)
+++ head/math/hexcalc/Makefile	Fri Jan 31 00:03:39 2014	(r341901)
@@ -1,27 +1,37 @@
-# New ports collection makefile for:	hexcalc
-# Date created:		5 December 1994
-# Whom:			asami
-#
+# Created by: jhs@berklix.com / asami (original)
 # $FreeBSD$
-#
 
 PORTNAME=	hexcalc
 PORTVERSION=	1.11
-PORTREVISION=	3
+PORTREVISION=	2
 CATEGORIES=	math
-MASTER_SITES=	ftp://aixpdslib.seas.ucla.edu/pub/hexcalc/RISC/3.2/src/
+MASTER_SITES=	http://www.berklix.com/~jhs/ftp/FreeBSD/ports/distfiles/
 DISTNAME=	${PORTNAME}
-EXTRACT_SUFX=	..tar.Z
+EXTRACT_SUFX=	.tar.Z
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	jhs@berklix.com
 COMMENT=	A multi-radix calculator for x11
 
-DEPRECATED=	Look like an abandonware, no more public distifles
-EXPIRATION_DATE=	2011-08-01
+# XORG_CAT=	app
+# USE_IMAKE=	yes
+#	Maybe later.
+#	It would move from distfiles/hexcalc..tar.Z
+#	to distfiles/xorg/app/hexcalc..tar.Z & require change in distinfo
+
+#	Old distfile name in 8.2 was hexcalc..tar.Z & EXTRACT_SUFX was ..tar.Z
+#	presumably a mistake, now shortened to normality.
 
-USE_IMAKE=	yes
 USE_XORG=	ice sm x11 xaw xext xmu xt
-MAN1=		hexcalc.1
-PLIST_FILES=	bin/hexcalc
+
+PLIST_FILES=	bin/hexcalc man/man1/hexcalc.1.gz
+
+do-install:
+	${INSTALL_PROGRAM} ${WRKSRC}/hexcalc ${STAGEDIR}${PREFIX}/bin
+	${INSTALL_MAN} ${WRKSRC}/hexcalc.man \
+		${STAGEDIR}${MANPREFIX}/man/man1/hexcalc.1
+	@# The manual installed OK on 9.1-RELEASE without do-install,
+	@# but manual install failed on 9.2-RELEASE & 10.0-RELEASE,
+	@# so I added do-install, which does no harm on 9.1 & 9.2.
+	@# Maybe do-install can be discarded if MAN variables are set right ?
 
 .include <bsd.port.mk>

Modified: head/math/hexcalc/distinfo
==============================================================================
--- head/math/hexcalc/distinfo	Mon Aug  1 05:21:10 2011	(r278682)
+++ head/math/hexcalc/distinfo	Fri Jan 31 00:03:39 2014	(r341901)
@@ -1,2 +1,2 @@
-SHA256 (hexcalc..tar.Z) = cd9aed4c21b1dc4ea217fa78ec8558320ae93e944179055e5d184050b189631f
-SIZE (hexcalc..tar.Z) = 25129
+SHA256 (hexcalc.tar.Z) = cd9aed4c21b1dc4ea217fa78ec8558320ae93e944179055e5d184050b189631f
+SIZE (hexcalc.tar.Z) = 25129

Added: head/math/hexcalc/files/patch-a
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/math/hexcalc/files/patch-a	Fri Jan 31 00:03:39 2014	(r341901)
@@ -0,0 +1,109 @@
+http://www.berklix.com/~jhs/src/bsd/fixes/FreeBSD/ports/gen/math/hexcalc/files/patch-a
+
+30 Jan 2014 by "Julian H. Stacey" <jhs@berklix.com> 
+to convert FreeBSD 8.2-RELEASE/ports/math/hexcalc/
+to run on 9.1-RELEASE, 9.2-RELEASE, & 10.0-RELEASE.
+
+I found I had an original local off line hexcalc..tar.Z,
+linked it to new shorter name hexcalc.tar.Z, & published here:
+  http://www.berklix.com/~jhs/ftp/FreeBSD/ports/distfiles/hexcalc.tar.Z
+which solved:
+  grep hexcalc /usr/ports/MOVED
+    math/hexcalc||2011-08-01|Has expired: Looks like abandonware, no more public distfiles
+
+I suggest a copy of distfile be made to
+  ftp://ftp.freebsd.org/pub/FreeBSD/distfiles/hexcalc.tar.Z
+
+*** Makefile.orig	Thu Jan 30 03:29:09 2014
+--- Makefile	Thu Jan 30 03:31:57 2014
+***************
+*** 53,59 ****
+           COMPRESS = compress
+                CPP = /usr/lpp/X11/Xamples/util/cpp/cpp $(STD_CPP_DEFINES)
+      PREPROCESSCMD = cc -E $(STD_CPP_DEFINES)
+!           INSTALL = /usr/ucb/install
+                 LD = ld
+               LINT = lint
+        LINTLIBFLAG = -o
+--- 53,59 ----
+           COMPRESS = compress
+                CPP = /usr/lpp/X11/Xamples/util/cpp/cpp $(STD_CPP_DEFINES)
+      PREPROCESSCMD = cc -E $(STD_CPP_DEFINES)
+!           INSTALL = install
+                 LD = ld
+               LINT = lint
+        LINTLIBFLAG = -o
+***************
+*** 71,77 ****
+       STD_INCLUDES =
+    STD_CPP_DEFINES = -DAIXV3 -D_NO_PROTO
+        STD_DEFINES = -DAIXV3 -D_NO_PROTO
+!  EXTRA_LOAD_FLAGS = -bnodelcsect
+  
+     EXTRA_INCLUDES =
+  
+--- 71,77 ----
+       STD_INCLUDES =
+    STD_CPP_DEFINES = -DAIXV3 -D_NO_PROTO
+        STD_DEFINES = -DAIXV3 -D_NO_PROTO
+!  EXTRA_LOAD_FLAGS =
+  
+     EXTRA_INCLUDES =
+  
+***************
+*** 94,100 ****
+       INSTDATFLAGS = -m 0444
+      INSTKMEMFLAGS = -m 4755
+  
+!       PROJECTROOT = /usr/local/X11R5
+  
+       TOP_INCLUDES = -I$(INCROOT)
+  
+--- 94,100 ----
+       INSTDATFLAGS = -m 0444
+      INSTKMEMFLAGS = -m 4755
+  
+!       PROJECTROOT = /usr/local
+  
+       TOP_INCLUDES = -I$(INCROOT)
+  
+***************
+*** 133,142 ****
+  # X Window System make variables; this need to be coordinated with rules
+  
+            PATHSEP = /
+!         USRLIBDIR = /usr/local/X11R5/lib
+  
+             BINDIR = /usr/local/bin
+!           INCROOT = /usr/local/X11R5/include
+       BUILDINCROOT = $(TOP)
+        BUILDINCDIR = $(BUILDINCROOT)/X11
+        BUILDINCTOP = ..
+--- 133,142 ----
+  # X Window System make variables; this need to be coordinated with rules
+  
+            PATHSEP = /
+!         USRLIBDIR = /usr/local/lib
+  
+             BINDIR = /usr/local/bin
+!           INCROOT = /usr/local/include
+       BUILDINCROOT = $(TOP)
+        BUILDINCDIR = $(BUILDINCROOT)/X11
+        BUILDINCTOP = ..
+***************
+*** 153,159 ****
+  
+            MANPATH = /usr/local/man
+      MANSOURCEPATH = $(MANPATH)/man
+!         MANSUFFIX = n
+       LIBMANSUFFIX = 3
+             MANDIR = $(MANSOURCEPATH)$(MANSUFFIX)
+          LIBMANDIR = $(MANSOURCEPATH)$(LIBMANSUFFIX)
+--- 153,159 ----
+  
+            MANPATH = /usr/local/man
+      MANSOURCEPATH = $(MANPATH)/man
+!         MANSUFFIX = 1
+       LIBMANSUFFIX = 3
+             MANDIR = $(MANSOURCEPATH)$(MANSUFFIX)
+          LIBMANDIR = $(MANSOURCEPATH)$(LIBMANSUFFIX)



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201401310003.s0V03evl004558>