Date: Sun, 19 Sep 2004 14:11:41 +0800 (CST) From: Yen-Ming Lee <leeym@FreeBSD.org> To: FreeBSD-gnats-submit@FreeBSD.org Cc: jeremy@external.org Subject: ports/71900: [PATCH] sysutils/ipsc: unbreak Message-ID: <20040919061141.853FA3E9CB1@utopia.leeym.com> Resent-Message-ID: <200409190620.i8J6KUQU043393@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 71900
>Category: ports
>Synopsis: [PATCH] sysutils/ipsc: unbreak
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Sun Sep 19 06:20:30 GMT 2004
>Closed-Date:
>Last-Modified:
>Originator: Yen-Ming Lee
>Release: FreeBSD 5.3-BETA4 i386
>Organization:
FreeBSD Taiwan
>Environment:
System: FreeBSD utopia.leeym.com 5.3-BETA4 FreeBSD 5.3-BETA4 #7: Mon Sep 13 05:12:30 CST 2004
>Description:
- add patch file
- correct the path of prips
- unbreak this port on 5.x
Added file(s):
- files/patch-main.c
Port maintainer (jeremy@external.org) is cc'd.
Generated with FreeBSD Port Tools 0.63
>How-To-Repeat:
>Fix:
--- ipsc-0.4.2_1.patch begins here ---
Index: Makefile
===================================================================
RCS file: /home/pcvs/ports/sysutils/ipsc/Makefile,v
retrieving revision 1.14
diff -u -u -r1.14 Makefile
--- Makefile 4 Feb 2004 05:09:01 -0000 1.14
+++ Makefile 19 Sep 2004 06:10:29 -0000
@@ -15,14 +15,12 @@
MAINTAINER= jeremy@external.org
COMMENT= An IP Subnet Calculator
-BUILD_DEPENDS= ${PORTSDIR}/sysutils/prips/work/prips/prips.o:${PORTSDIR}/sysutils/prips:build
+BUILD_DEPENDS= ${WRKDIRPREFIX}${PORTSDIR}/sysutils/prips/work/prips/prips.o:${PORTSDIR}/sysutils/prips:build
WRKSRC= ${WRKDIR}/ipsc/src
WANT_GNOME= yes
-.include <bsd.port.pre.mk>
-
.if defined(HAVE_GNOME)
USE_X_PREFIX= yes
USE_GNOME= yes
@@ -31,12 +29,8 @@
ALL_TARGET= ipsc
.endif
-.if ${OSVERSION} >= 500113
-BROKEN= "Does not compile on FreeBSD ${OSVERSION}"
-.endif
-
post-extract:
- @${LN} -s ${WRKDIRPREFIX}${.CURDIR}/../prips/work/prips \
+ @${LN} -s ${WRKDIRPREFIX}${PORTSDIR}/sysutils/prips/work/prips \
${WRKDIR}/prips
do-install:
@@ -45,4 +39,4 @@
${INSTALL_PROGRAM} ${WRKSRC}/gipsc ${PREFIX}/bin
.endif
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
Index: files/patch-main.c
===================================================================
RCS file: files/patch-main.c
diff -N files/patch-main.c
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ files/patch-main.c 19 Sep 2004 06:10:29 -0000
@@ -0,0 +1,33 @@
+--- main.c.orig Sun Sep 19 13:58:16 2004
++++ main.c Sun Sep 19 13:58:51 2004
+@@ -142,18 +142,18 @@
+
+ void usage(const char *prog)
+ {
+- fprintf(stderr, "usage: %s [options] <addr/mask | addr/offset | addr>
+- -C <class> Network class (a, b, or c). Must be used with -B
+- -B <bits> Subnet bits (must be used with -C)
+- -i <if> Reverse engineer an interface (e.g. eth0)
+- -a Print all information available
+- -g Print general information
+- -s Print all possible subnets
+- -h Print host information
+- -c Print CIDR information
+- -v Print the program version
+- -? Print this help message
+-
++ fprintf(stderr, "usage: %s [options] <addr/mask | addr/offset | addr>\n\
++ -C <class> Network class (a, b, or c). Must be used with -B\n\
++ -B <bits> Subnet bits (must be used with -C)\n\
++ -i <if> Reverse engineer an interface (e.g. eth0)\n\
++ -a Print all information available\n\
++ -g Print general information\n\
++ -s Print all possible subnets\n\
++ -h Print host information\n\
++ -c Print CIDR information\n\
++ -v Print the program version\n\
++ -? Print this help message\n\
++\n\
+ \rReport bugs to %s\n",
+ prog, MAINTAINER);
+ }
--- ipsc-0.4.2_1.patch ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20040919061141.853FA3E9CB1>