From f811cb122614ff29efc79aff21662b196fcdae64 Mon Sep 17 00:00:00 2001 From: Jacques Vidrine Date: Tue, 24 Nov 1998 18:46:10 +0000 Subject: * Update checksum for distribution. * Fix for ELF. * Fix misuse of errno as a structure member name (original author notified). * Build and install both static and shared libraries. * Move install target from port Makefile to files/Makefile. --- lang/rexx-imc/Makefile | 49 ++++++++++++++++++++++---------------------- lang/rexx-imc/distinfo | 2 +- lang/rexx-imc/files/Makefile | 43 ++++++++++++++++++++++++++++++-------- lang/rexx-imc/pkg-plist | 7 ++++--- 4 files changed, 65 insertions(+), 36 deletions(-) (limited to 'lang/rexx-imc') diff --git a/lang/rexx-imc/Makefile b/lang/rexx-imc/Makefile index e6890e5b8a0e..fc8679756e15 100644 --- a/lang/rexx-imc/Makefile +++ b/lang/rexx-imc/Makefile @@ -3,7 +3,7 @@ # Date created: Septermber 21 96 # Whom: James FitzGibbon # -# $Id: Makefile,v 1.4 1998/05/03 18:03:23 steve Exp $ +# $Id: Makefile,v 1.5 1998/10/14 03:46:56 jseger Exp $ # DISTNAME= rexx-imc-1.6d @@ -12,33 +12,34 @@ MASTER_SITES= http://www.comlab.ox.ac.uk/oucl/users/ian.collier/distribution/ MAINTAINER= jfitz@FreeBSD.ORG -BROKEN_ELF= yes - NO_WRKSUBDIR= YES +MAKE_ENV= MKDIR="${MKDIR}" + +# we must patch these files until the author correct misuse of +# errno in struct fileinfo +UGLY_PATCH= rexx.c rxfn.c util.c + +.include + +post-patch: +.for c in ${UGLY_PATCH} + @${ECHO_MSG} "Changing struct fileinfo member errno to ferrno in ${c}" + @mv ${WRKSRC}/${c} ${WRKSRC}/${c}.old + @${SED} 's/->errno/->ferrno/g;' ${WRKSRC}/${c}.old > ${WRKSRC}/${c} + @${RM} ${WRKSRC}/${c}.old +.endfor + pre-build: @ ${CP} ${FILESDIR}/Makefile ${WRKDIR} -do-install: - @strip ${WRKDIR}/librexx.so.1.6.4 ${WRKDIR}/rxmathfn.rxfn - @ for file in rexx rxque rxstack; do \ - ${INSTALL_PROGRAM} ${WRKDIR}/$$file ${PREFIX}/bin; \ - done - @ for file in rxmathfn.rxfn rxmathfn.rxlib; do \ - ${INSTALL_DATA} ${WRKDIR}/$$file ${PREFIX}/bin; \ - done - @ for file in librexx.a librexx.so.1.6.4; do \ - ${INSTALL_DATA} ${WRKDIR}/$$file ${PREFIX}/lib; \ - done - @(${INSTALL_DATA} ${WRKDIR}/rexxsaa.h ${PREFIX}/include) -.ifndef(NOPORTDOCS) - @ ${MKDIR} ${PREFIX}/share/doc/rexx-imc/ - @ for file in README README.avail README.bugreport README.docs README.files README.make README.news README.versions rexx.info rexx.ref rexx.summary rexx.tech; do \ - ${INSTALL_DATA} ${WRKDIR}/$$file ${PREFIX}/share/doc/rexx-imc/; \ - done -.endif - post-install: - @ ${LDCONFIG} -m ${PREFIX}/lib +.if ${PORTOBJFORMAT} == "aout" + @${ECHO_MSG} "Fixing packing list for a.out" + @${MV} ${TMPPLIST} ${TMPPLIST}.new + @${GREP} -v '.so$$' ${TMPPLIST}.new > ${TMPPLIST} + @${RM} ${TMPPLIST}.new +.endif + @${LDCONFIG} -m ${PREFIX}/lib -.include +.include diff --git a/lang/rexx-imc/distinfo b/lang/rexx-imc/distinfo index 7126a4021399..fd982f12f772 100644 --- a/lang/rexx-imc/distinfo +++ b/lang/rexx-imc/distinfo @@ -1 +1 @@ -MD5 (rexx-imc-1.6d.tar.gz) = 4b70cd0e92ac6fbd1be207d2e414aae5 +MD5 (rexx-imc-1.6d.tar.gz) = 8e71b90eb538af7a2b6be7c30957e8a3 diff --git a/lang/rexx-imc/files/Makefile b/lang/rexx-imc/files/Makefile index 74b069be76b1..e1e6194e12c8 100644 --- a/lang/rexx-imc/files/Makefile +++ b/lang/rexx-imc/files/Makefile @@ -16,16 +16,22 @@ RXMONTH= 8 RXYEAR= 96 DATE= -DDAY=${RXDAY} -DMONTH=${RXMONTH} -DYEAR=${RXYEAR} -# Shared Library Version -VER= 1.6.4 +REXXDOCS= README README.avail README.bugreport README.docs \ + README.files README.make README.news README.versions \ + rexx.info rexx.ref rexx.summary rexx.tech -SHAREDLIB= librexx.so.${VER} -STATICLIB= librexx.a -.ifdef(BUILD_STATIC) -REXXLIB=${STATICLIB} +# Shared Library Version +.if ${PORTOBJFORMAT} == "elf" +VER= 2 +SHAREDLIB= librexx.so librexx.so.${VER} .else -REXXLIB=${SHAREDLIB} +VER= 2.0 +SHAREDLIB= librexx.so.${VER} .endif +STATICLIB= librexx.a + +REXXLIB=${STATICLIB} ${SHAREDLIB} + MATH= rxmathfn.rxfn REXXIMC= ${PREFIX}/bin FILEDEFS= -DREXXIMC=\"${REXXIMC}\" @@ -38,7 +44,9 @@ interface.o: interface.c ${HFILES} ${CC} ${OPTFLAGS} ${CCFLAGS} -c ${DATE} ${FILEDEFS} -o $@ interface.c ${SHAREDLIB}: ${LIBFILES} - ${LD} -Bshareable -o ${SHAREDLIB} ${LIBFILES} +.for t in ${.TARGET} + ${LD} -Bshareable -o ${t} ${LIBFILES} +.endfor ${STATICLIB}: ${LIBFILES} ar rc ${STATICLIB} ${LIBFILES} @@ -59,5 +67,24 @@ rxmathfn.rxfn: rxmathfn.o ${HFILES} interface.o: interface.c ${HFILES} ${CC} ${OPTFLAGS} ${CCFLAGS} -o interface.o ${FILEDEFS} interface.c +install: + @strip ${SHAREDLIBS} rxmathfn.rxfn +.for f in rexx rxque rxstack + ${BSD_INSTALL_PROGRAM} ${f} ${PREFIX}/bin +.endfor +.for f in rxmathfn.rxfn rxmathfn.rxlib + ${BSD_INSTALL_DATA} ${f} ${PREFIX}/bin +.endfor +.for f in ${REXXLIB} + ${BSD_INSTALL_DATA} ${f} ${PREFIX}/lib +.endfor + ${BSD_INSTALL_DATA} rexxsaa.h ${PREFIX}/include +.if !defined(NOPORTDOCS) + ${MKDIR} ${PREFIX}/share/doc/rexx-imc/ +.for f in ${REXXDOCS} + ${BSD_INSTALL_DATA} ${f} ${PREFIX}/share/doc/rexx-imc/ +.endfor +.endif + .c.o: ${CC} ${OPTFLAGS} ${CCFLAGS} -o $@ $< diff --git a/lang/rexx-imc/pkg-plist b/lang/rexx-imc/pkg-plist index 4dc7235e3787..9c9ace5f3d76 100644 --- a/lang/rexx-imc/pkg-plist +++ b/lang/rexx-imc/pkg-plist @@ -4,10 +4,11 @@ bin/rxstack bin/rxmathfn.rxfn bin/rxmathfn.rxlib lib/librexx.a -lib/librexx.so.1.6.4 +lib/librexx.so.2.0 +lib/librexx.so include/rexxsaa.h -@exec ldconfig -m %B -@unexec /sbin/ldconfig -R +@exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %D/lib +@unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R share/doc/rexx-imc/README share/doc/rexx-imc/README.avail share/doc/rexx-imc/README.bugreport -- cgit v1.2.3