Attachment 28038 Details for Bug 47329 – file.diff

[patch] file.diff

file.diff (text/plain), 4.00 KB, created by tkato on 2003-01-21 20:40:09 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: tkato

Created: 2003-01-21 20:40:09 UTC

Size: 4.00 KB

patch

obsolete

>diff -urN /usr/ports/lang/icon/Makefile lang/icon/Makefile
>--- /usr/ports/lang/icon/Makefile	Mon Nov 11 19:00:09 2002
>+++ lang/icon/Makefile	Fri Jan 17 01:04:48 2003
>@@ -6,7 +6,7 @@
> #
> 
> PORTNAME=	icon
>-PORTVERSION=	9.4.0
>+PORTVERSION=	9.4.1
> CATEGORIES=	lang
> MASTER_SITES=	http://www.cs.arizona.edu/icon/ftp/packages/unix/
> DISTNAME=	${PORTNAME}.v${PORTVERSION:S/.//g}src
>@@ -16,7 +16,15 @@
> 
> ONLY_FOR_ARCHS=	alpha i386
> 
>-.ifdef WITHOUT_X11
>+USE_REINPLACE=	yes
>+ALL_TARGET=	All
>+
>+MAN1=		icont.1
>+
>+ARCH_NAME=	${OPSYS:L}
>+ICONDIR=	${PREFIX}/lib/${PORTNAME}
>+
>+.if defined(WITHOUT_X11)
> CONFIG_CMD=	Configure
> PLIST_SUB=	WITHOUT_X11="@comment "
> .else
>@@ -25,44 +33,37 @@
> CONFIG_CMD=	X-Configure
> PLIST_SUB=	WITHOUT_X11=
> .endif
>-USE_REINPLACE=	yes
>-ALL_TARGET=	All
>-
>-MAN1=		icont.1
> 
>-ARCH_NAME=	${ARCH:S/i386/intel/}_${OPSYS:L}
>-ICONDIR=	${PREFIX}/lib/${PORTNAME}
>-
>-pre-patch:
>+post-patch:
> 	@${REINPLACE_CMD} -e "s|^CC.*|CC=${CC}|g ; \
> 		 s|^CFLAGS.*|CFLAGS=${CFLAGS}|g ; \
> 		 s|^XLIBS.*|XLIBS=-L${X11BASE}/lib -lX11|g" \
> 		${WRKSRC}/config/unix/${ARCH_NAME}/Makedefs
> 	@${REINPLACE_CMD} -e 's|/opt/icon|${ICONDIR}|g' ${WRKSRC}/ipl/BuildBin
>+	@${REINPLACE_CMD} -e 's|ld -Bshareable|\$$CC -shared|g ; \
>+		 s|-lc||g' ${WRKSRC}/ipl/cfuncs/mklib.sh
> 
> do-configure:
> 	@(cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} \
> 		${MAKEFILE} ${MAKE_ARGS} ${CONFIG_CMD} name=${ARCH_NAME})
> 
> do-install:
>-	${INSTALL_MAN} ${WRKSRC}/man/man1/icont.1 ${PREFIX}/man/man1
>+	${INSTALL_MAN} ${WRKSRC}/man/man1/icont.1 ${MANPREFIX}/man/man1
> 	@${MKDIR} ${ICONDIR}/bin
> .for file in icont iconx patchstr
>-	${INSTALL_PROGRAM} ${WRKSRC}/bin/${file} ${ICONDIR}/bin
>-.endfor
>-.ifndef WITHOUT_X11
>-.for file in colrbook colrpick fontpick ipatch palette vib wevents xgamma
>-	${INSTALL_SCRIPT} ${WRKSRC}/bin/${file} ${ICONDIR}/bin
>+	${INSTALL_PROGRAM} ${WRKSRC}/bin/${file} ${ICONDIR}/bin/${file}
> .endfor
>-.endif
> .for file in icont iconx
> 	@${LN} -sf ${ICONDIR}/bin/${file} ${PREFIX}/bin/${file}
> .endfor
>-.ifndef WITHOUT_X11
>-	@${LN} -sf ${ICONDIR}/bin/vib ${PREFIX}/bin/vib
>-.endif
> 	@${MKDIR} ${ICONDIR}/lib
> 	${INSTALL_DATA} ${WRKSRC}/lib/*.* ${ICONDIR}/lib
>+.if !defined(WITHOUT_X11)
>+.for file in colrbook colrpick fontpick ipatch palette vib wevents xgamma
>+	${INSTALL_SCRIPT} ${WRKSRC}/bin/${file} ${ICONDIR}/bin/${file}
>+.endfor
>+	@${LN} -sf ${ICONDIR}/bin/vib ${PREFIX}/bin/vib
>+.endif
> .if !defined(NOPORTDOCS)
> 	@${MKDIR} ${DOCSDIR}
> 	${INSTALL_DATA} ${WRKSRC}/doc/*.* ${DOCSDIR}
>diff -urN /usr/ports/lang/icon/distinfo lang/icon/distinfo
>--- /usr/ports/lang/icon/distinfo	Sat Sep 22 15:07:41 2001
>+++ lang/icon/distinfo	Sat Jan 11 18:38:54 2003
>@@ -1 +1 @@
>-MD5 (icon.v940src.tgz) = 1e4b77ad34af335d8eb5b64f16f7853a
>+MD5 (icon.v941src.tgz) = 5ab62c32eb0d20fa6ee5840dd88a09f6
>diff -urN /usr/ports/lang/icon/pkg-plist lang/icon/pkg-plist
>--- /usr/ports/lang/icon/pkg-plist	Tue Sep 17 18:02:41 2002
>+++ lang/icon/pkg-plist	Fri Jan 17 01:15:40 2003
>@@ -329,8 +329,6 @@
> lib/icon/lib/iscreen.u2
> lib/icon/lib/isdplot.u1
> lib/icon/lib/isdplot.u2
>-lib/icon/lib/ispf.u1
>-lib/icon/lib/ispf.u2
> lib/icon/lib/iterfncs.u1
> lib/icon/lib/iterfncs.u2
> lib/icon/lib/itlib.u1
>@@ -385,6 +383,8 @@
> lib/icon/lib/lstfncs.u2
> lib/icon/lib/lsystem.u1
> lib/icon/lib/lsystem.u2
>+lib/icon/lib/lterps.u1
>+lib/icon/lib/lterps.u2
> lib/icon/lib/lu.u1
> lib/icon/lib/lu.u2
> lib/icon/lib/maccolor.icn
>@@ -481,6 +481,8 @@
> lib/icon/lib/plural.u2
> lib/icon/lib/polynom.u1
> lib/icon/lib/polynom.u2
>+lib/icon/lib/polyseq.u1
>+lib/icon/lib/polyseq.u2
> lib/icon/lib/polystuf.u1
> lib/icon/lib/polystuf.u2
> lib/icon/lib/popen.u1
>@@ -545,8 +547,6 @@
> lib/icon/lib/revadd.u2
> lib/icon/lib/rewrap.u1
> lib/icon/lib/rewrap.u2
>-lib/icon/lib/rexx.u1
>-lib/icon/lib/rexx.u2
> lib/icon/lib/rgbcomp.u1
> lib/icon/lib/rgbcomp.u2
> lib/icon/lib/rgbrec.u1
>@@ -800,6 +800,7 @@
> %%PORTDOCS%%share/doc/icon/files.htm
> %%PORTDOCS%%share/doc/icon/gb80.jpg
> %%PORTDOCS%%share/doc/icon/ib80.jpg
>+%%PORTDOCS%%share/doc/icon/icon.txt
> %%PORTDOCS%%share/doc/icon/icont.txt
> %%PORTDOCS%%share/doc/icon/index.htm
> %%PORTDOCS%%share/doc/icon/install.htm

Actions: View | Diff

Attachments on bug 47329: 28038