From jeremy@indigo.external.org  Mon Jan 10 23:37:45 2000
Return-Path: <jeremy@indigo.external.org>
Received: from indigo.external.org (indigo.external.org [209.224.118.250])
	by hub.freebsd.org (Postfix) with ESMTP id B030315031
	for <FreeBSD-gnats-submit@freebsd.org>; Mon, 10 Jan 2000 23:37:43 -0800 (PST)
	(envelope-from jeremy@indigo.external.org)
Received: (from jeremy@localhost)
	by indigo.external.org (8.9.3/8.9.3) id BAA60939;
	Tue, 11 Jan 2000 01:37:42 -0600 (CST)
	(envelope-from jeremy)
Message-Id: <200001110737.BAA60939@indigo.external.org>
Date: Tue, 11 Jan 2000 01:37:42 -0600 (CST)
From: jeremy@external.org
Sender: jeremy@indigo.external.org
Reply-To: jeremyexternal.org@indigo.external.org
To: FreeBSD-gnats-submit@freebsd.org
Subject: Port update: sysutils/ipsc
X-Send-Pr-Version: 3.2

>Number:         16054
>Category:       ports
>Synopsis:       Update from 0.4.0 -> 0.4.2
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Mon Jan 10 23:40:01 PST 2000
>Closed-Date:    Tue Jan 11 22:00:01 PST 2000
>Last-Modified:  Tue Jan 11 22:00:08 PST 2000
>Originator:     Jeremy Shaffner
>Release:        FreeBSD 3.4-STABLE i386
>Organization:
none
>Environment:

FreeBSD Ports Collection.

>Description:

Upgrade from 0.4.0 to 0.4.2.
Cleaned up the Makefile a bit and added a reminder to USE_GNOME.
Requires prips-0.9.4. [also submitted]
I donated a shell to Author so it now builds cleanly.
Please Remove:
    patches/patch-aa patches/patch-ab patches/patch-ac patches/patch-ad
   
>How-To-Repeat:

	

>Fix:
	
diff -ruN ipsc.bak/Makefile ipsc/Makefile
--- ipsc.bak/Makefile	Thu Dec  9 19:21:46 1999
+++ ipsc/Makefile	Tue Jan 11 00:02:11 2000
@@ -1,26 +1,31 @@
 # New ports collection makefile for:	ipsc
-# Version required:	0.4.0
+# Version required:	0.4.2
 # Date created:		31 October 1999
 # Whom:			Jeremy Shaffner <jeremy@external.org>
 #
 # $FreeBSD: ports/sysutils/ipsc/Makefile,v 1.2 1999/12/10 01:21:46 imura Exp $
 #
 
-DISTNAME=	ipsc-0.4.0-src
-PKGNAME=	ipsc-0.4.0
+DISTNAME=	ipsc-0.4.2-src
+PKGNAME=	ipsc-0.4.2
 CATEGORIES=	sysutils gnome x11 
 MASTER_SITES=	http://www.interloper.net/~dan/software/dist/ipsc/
 
 MAINTAINER=	jeremy@external.org
 
-BUILD_DEPENDS=	${WRKDIRPREFIX}${PORTSDIR}/sysutils/prips/work/prips.o:${PORTSDIR}/sysutils/prips:build
+BUILD_DEPENDS=	${WRKDIRPREFIX}${PORTSDIR}/sysutils/prips/work/prips/prips.o:${PORTSDIR}/sysutils/prips:build
 .if defined(USE_GNOME)
 LIB_DEPENDS=	gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 \
 		gnome.3:${PORTSDIR}/x11/gnomelibs
 .endif
 
-WRKSRC=		${WRKDIR}/ipsc
+WRKSRC=		${WRKDIR}/ipsc/src
 
+post-extract:
+	@${LN} -s ${WRKDIRPREFIX}${.CURDIR}/../prips/work/prips \
+		${WRKDIR}/prips
+
+pre-build:
 .if defined(USE_GNOME)
 PLIST=		${PKGDIR}/PLIST.gnome
 ALL_TARGET=     all
@@ -28,9 +33,12 @@
 ALL_TARGET=	ipsc
 .endif
 
-pre-build:
-	@${LN} -s ${WRKDIRPREFIX}${PORTSDIR}/sysutils/prips/work/prips \
-		${WRKDIR}/prips
+post-build:
+.if defined(USE_GNOME)
+	@${ECHO_MSG} ""
+	@${ECHO_MSG} "Don't forget to define USE_GNOME when installing"
+	@${ECHO_MSG} ""
+.endif
 
 do-install:
 	@${INSTALL_PROGRAM} ${WRKSRC}/ipsc ${PREFIX}/bin
diff -ruN ipsc.bak/files/md5 ipsc/files/md5
--- ipsc.bak/files/md5	Thu Dec  9 19:21:47 1999
+++ ipsc/files/md5	Mon Dec 13 23:41:50 1999
@@ -1 +1 @@
-MD5 (ipsc-0.4.0-src.tar.gz) = e61eba8fac27dfb72d75ce55c78b1d50
+MD5 (ipsc-0.4.2-src.tar.gz) = 8a127e2927e12689df903b26dc11f0a3
diff -ruN ipsc.bak/patches/patch-ab ipsc/patches/patch-ab
--- ipsc.bak/patches/patch-ab	Thu Dec  9 19:21:48 1999
+++ ipsc/patches/patch-ab	Wed Dec 31 18:00:00 1969
@@ -1,13 +0,0 @@
---- ipsc.h.orig	Tue Nov 16 00:28:50 1999
-+++ ipsc.h	Tue Nov 16 00:29:30 1999
-@@ -48,8 +48,8 @@
-  */
- int ipsc_network_init_parse_text(Network *n, const char *text);
- 
--int ipsc_network_init_by_addr(Network *n, ulong addr);
--int ipsc_network_init_by_addr_and_mask(Network *n, ulong addr, ulong mask);
-+int ipsc_network_init_by_addr(Network *n, long addr);
-+int ipsc_network_init_by_addr_and_mask(Network *n, long addr, long mask);
- int ipsc_network_init_by_interface(Network *n, const char *if_name);
- int ipsc_network_init(Network *n);
- 
diff -ruN ipsc.bak/patches/patch-ac ipsc/patches/patch-ac
--- ipsc.bak/patches/patch-ac	Thu Dec  9 19:21:48 1999
+++ ipsc/patches/patch-ac	Wed Dec 31 18:00:00 1969
@@ -1,38 +0,0 @@
---- ipsc.c.orig	Tue Nov 16 00:29:47 1999
-+++ ipsc.c	Tue Nov 16 00:29:55 1999
-@@ -235,7 +235,7 @@
- 		ifr = (struct ifreq *) ptr;	
- 		if( strcmp(ifr->ifr_name, if_name) == 0)
- 		{
--			ulong addr, mask;
-+			long addr, mask;
- 				
- 			addr = get_addr(sockfd, SIOCGIFADDR, ifr);
- 			mask = get_addr(sockfd, SIOCGIFNETMASK, ifr);
-@@ -362,7 +362,7 @@
- {
- 	char *addr_str = NULL;
- 	char *mask_str = NULL;
--	ulong addr, mask;
-+	long addr, mask;
- 
- 	if((addr_str = strdup(text)) == NULL)
- 		return -1;
-@@ -412,7 +412,7 @@
- 	return 0;
- }
- 
--int ipsc_network_init_by_addr(Network *n, ulong addr)
-+int ipsc_network_init_by_addr(Network *n, long addr)
- {
- 	char class = get_class(addr);
- 	
-@@ -430,7 +430,7 @@
- 	return 0;
- }
- 
--int ipsc_network_init_by_addr_and_mask(Network *n, ulong addr, ulong mask)
-+int ipsc_network_init_by_addr_and_mask(Network *n, long addr, long mask)
- {
- 	char class = get_class(addr);
- 
diff -ruN ipsc.bak/patches/patch-ad ipsc/patches/patch-ad
--- ipsc.bak/patches/patch-ad	Thu Dec  9 19:21:48 1999
+++ ipsc/patches/patch-ad	Wed Dec 31 18:00:00 1969
@@ -1,11 +0,0 @@
---- gui/gipsc.c.orig	Tue Nov 16 00:32:20 1999
-+++ gui/gipsc.c	Tue Nov 16 00:32:44 1999
-@@ -338,7 +338,7 @@
- 
- void update_subnets_tab(const Network *n)
- {
--	ulong i, network = n->addr, network_end;
-+	long i, network = n->addr, network_end;
- 	gchar *cols[2];
- 	
- 	GString *subnet_number = g_string_new(NULL);


>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: gnats-admin->freebsd-ports 
Responsible-Changed-By: asmodai 
Responsible-Changed-When: Tue Jan 11 02:15:39 PST 2000 
Responsible-Changed-Why:  
Belongs to the ports cabal. 
State-Changed-From-To: open->closed  
State-Changed-By: cpiazza 
State-Changed-When: Tue Jan 11 22:00:01 PST 2000 
State-Changed-Why:  
Committed, thanks! 
>Unformatted:
