ports/64193: fix port: lang/gcc295

[Yen-Ming Lee]

>Number:         64193
>Category:       ports
>Synopsis:       fix port: lang/gcc295
>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:   Fri Mar 12 21:00:24 PST 2004
>Closed-Date:
>Last-Modified:
>Originator:     Yen-Ming Lee
>Release:        FreeBSD 5.2.1-RELEASE-p1 i386
>Organization:
>Environment:
System: FreeBSD utopia.leeym.com 5.2.1-RELEASE-p1 FreeBSD 5.2.1-RELEASE-p1 #22: Fri Mar 5 05:34:20 CST 2004 root at utopia.leeym.com:/usr/obj/usr/src/sys/UTOPIA i386


	
>Description:
- use INFO, which will remove PREFIX/info/{gcc,cpp}*.info when deinstalling
- some cosmetic update in Makefile

>How-To-Repeat:
	
>Fix:

	

--- gcc295.diff begins here ---
Index: Makefile
===================================================================
RCS file: /home/pcvs/ports/lang/gcc295/Makefile,v
retrieving revision 1.98
diff -u -r1.98 Makefile
--- Makefile	17 Feb 2004 00:02:45 -0000	1.98
+++ Makefile	13 Mar 2004 04:49:41 -0000
@@ -51,14 +51,15 @@
 #CONFIGURE_ARGS+=	--program-suffix=-295
 CONFIGURE_ENV=	MAKEINFO="makeinfo --no-split"
 .if defined(WANT_SHAREDLIBS)
-CONFIGURE_ARGS+= --enable-shared
+CONFIGURE_ARGS+=--enable-shared
 .endif
 .if defined(WANT_THREADS)
 #	?is this an ObjC only thing?
-CONFIGURE_ARGS+= --enable-threads=posix
+CONFIGURE_ARGS+=--enable-threads=posix
 .endif
 ALL_TARGET=	bootstrap
 MAN1=		cccp.1 g++295.1 gcc295.1
+INFO=		gcc cpp
 
 pre-patch:
 	@${MV} ${WRKSRC}/gcc/config/i386/freebsd.h ${WRKSRC}/gcc/config/i386/freebsd-aout.h
@@ -76,8 +77,8 @@
 	@${CP} ${FILESDIR}/alpha-freebsd.h ${WRKSRC}/gcc/config/alpha/freebsd.h
 	@# Keep from running `autoconf' and `autoheader' since we modified
 	@# configure.in by patching it.
-	@touch ${WRKSRC}/gcc/configure
-	@touch ${WRKSRC}/gcc/cstamp-h.in
+	@${TOUCH} ${WRKSRC}/gcc/configure
+	@${TOUCH} ${WRKSRC}/gcc/cstamp-h.in
 
 pre-install:
 	${MKDIR} ${PREFIX}/info
@@ -109,7 +110,7 @@
 .if defined(WANT_SHAREDLIBS)
 	${MV} -f ${PREFIX}/lib/libstdc++.so* ${TARGLIB}
 .endif
-.for info in cpp gcc
+.for info in ${INFO}
 	install-info ${PREFIX}/info/${info}.info ${PREFIX}/info/dir
 .endfor
 	cd ${PREFIX} ;\
Index: pkg-plist
===================================================================
RCS file: /home/pcvs/ports/lang/gcc295/pkg-plist,v
retrieving revision 1.33
diff -u -r1.33 pkg-plist
--- pkg-plist	31 Dec 2002 23:00:02 -0000	1.33
+++ pkg-plist	13 Mar 2004 04:49:41 -0000
@@ -10,12 +10,6 @@
 @comment Insert PLIST.gcc-lib here
 @comment -=[ begin PLIST.gcc-lib ]=-
 @comment -=[ end PLIST.gcc-lib ]=-
- at unexec install-info --delete %D/info/gcc.info %D/info/dir
- at unexec install-info --delete %D/info/cpp.info %D/info/dir
-info/cpp.info
-info/gcc.info
- at exec install-info %D/info/cpp.info %D/info/dir
- at exec install-info %D/info/gcc.info %D/info/dir
 @dirrm %%GNU_HOST%%/include
 @dirrm %%GNU_HOST%%
 @dirrm lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++/std
--- gcc295.diff ends here ---


>Release-Note:
>Audit-Trail:
>Unformatted: