1
0
mirror of https://git.FreeBSD.org/ports.git synced 2024-10-20 20:09:11 +00:00

Update to 4.27

PR:		153636
Submitted by:	maintainer
This commit is contained in:
Tilman Keskinoz 2011-01-03 13:10:32 +00:00
parent f612d46cef
commit a32368c162
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=267314
5 changed files with 53 additions and 43 deletions

View File

@ -6,7 +6,7 @@
#
PORTNAME= di
PORTVERSION= 4.26
PORTVERSION= 4.27
CATEGORIES= sysutils
MASTER_SITES= http://www.gentoo.com/di/ \
http://fresh.t-systems-sfr.com/unix/src/privat2/
@ -29,6 +29,6 @@ MAKE_ENV+= LDFLAGS="${LDFLAGS}" prefix="${PREFIX}"
.include <bsd.port.pre.mk>
post-patch:
@${REINPLACE_CMD} -e "s|zoneid_t|zoneId_t|g" ${WRKSRC}/di.c
@${REINPLACE_CMD} -e "s|zoneid_t|zoneId_t|g" ${WRKSRC}/C/di.c
.include <bsd.port.post.mk>

View File

@ -1,3 +1,2 @@
MD5 (di-4.26.tar.gz) = 7568e18b1c5c72bfbe3d9ba55c30d1ed
SHA256 (di-4.26.tar.gz) = fab06941be68d5247cc829c8ba0192cf759e519b3ab7fa61e48a4bb5d9627751
SIZE (di-4.26.tar.gz) = 114432
SHA256 (di-4.27.tar.gz) = 92a1553c2916f3143f2a0c866473d62da712a6f936a7824b58873c9054ee1782
SIZE (di-4.27.tar.gz) = 139125

View File

@ -0,0 +1,38 @@
--- C/Makefile.orig 2011-01-01 15:25:04.000000000 -0500
+++ C/Makefile 2011-01-02 15:29:46.000000000 -0500
@@ -6,7 +6,7 @@
# $Id: Makefile,v 1.109 2010-12-31 21:15:39-08 bll Exp $
#
-CC = cc
+CC ?= cc
# for tests.done
DC = gdc
@@ -34,7 +34,7 @@
###
# installation options
#
-prefix = /usr/local
+prefix ?= /usr/local
LOCALEDIR = $(prefix)/share/locale
PROG = di
MPROG = mi
@@ -145,7 +145,7 @@
$(MAKE) _MKCONFIG_SHELL=$(MKCONFIG_SHELL) \
CC=cc LD=cc EXE_EXT="" OBJ_EXT=".o" \
CFLAGS="$(CFLAGS) -O" \
- LDFLAGS="-O" di-programs
+ LDFLAGS="-O $(LDFLAGS)" di-programs
bsd43-gcc:
@$(MAKE) ../dioptions.dat
@@ -156,7 +156,7 @@
$(MAKE) _MKCONFIG_SHELL=$(MKCONFIG_SHELL) \
CC=gcc LD=gcc EXE_EXT="" OBJ_EXT=".o" \
CFLAGS="$(CFLAGS) -O2" \
- LDFLAGS="-O2" di-programs
+ LDFLAGS="-O2 $(LDFLAGS)" di-programs
###
# cleaning

View File

@ -1,24 +1,15 @@
--- Makefile.orig 2010-05-11 01:55:01.000000000 -0400
+++ Makefile 2010-05-11 07:37:54.000000000 -0400
@@ -9,7 +9,7 @@
SHELL = /bin/sh
OBJ_EXT = .o
EXE_EXT =
-CC = cc
+CC ?= cc
MAKE = make
#
@@ -31,7 +31,7 @@
#
--- Makefile.orig 2011-01-01 15:25:04.000000000 -0500
+++ Makefile 2011-01-02 15:28:29.000000000 -0500
@@ -33,7 +33,7 @@
###
# installation options
#
-prefix = /usr/local
+prefix ?= /usr/local
LOCALEDIR = $(prefix)/share/locale
#
INSTALL_DIR = $(prefix)
@@ -59,7 +59,7 @@
PROG = di
MPROG = mi
@@ -55,7 +55,7 @@
#
# simple man page installation
#
@ -27,21 +18,3 @@
DI_MANDIR = $(DI_MANINSTDIR)/man1
MAN_TARGET = $(PROG).1
MANPERM = 644
@@ -180,7 +180,7 @@
$(MAKE) \
CC=cc LD=cc EXE_EXT="" OBJ_EXT=".o" \
CFLAGS="$(CFLAGS) -O" \
- LDFLAGS="-O" di-programs
+ LDFLAGS="-O $(LDFLAGS)" di-programs
bsd43-gcc:
@echo ':' > di.env;chmod a+rx di.env
@@ -190,7 +190,7 @@
$(MAKE) \
CC=gcc LD=gcc EXE_EXT="" OBJ_EXT=".o" \
CFLAGS="$(CFLAGS) -O2" \
- LDFLAGS="-O2" di-programs
+ LDFLAGS="-O2 $(LDFLAGS)" di-programs
###
# cleaning

View File

@ -1,7 +1,7 @@
--- di.c.old Tue Oct 23 11:48:51 2007
+++ di.c Tue Oct 23 11:49:19 2007
@@ -267,10 +267,8 @@
char *disp;
--- C/di.c.orig 2011-01-01 15:25:04.000000000 -0500
+++ C/di.c 2011-01-02 15:31:35.000000000 -0500
@@ -252,10 +252,8 @@
char *disp[2];
} dispTable_t;
-#if ! _lib_zone_list