Index: head/editors/xcoral/Makefile =================================================================== --- head/editors/xcoral/Makefile (revision 559773) +++ head/editors/xcoral/Makefile (revision 559774) @@ -1,40 +1,48 @@ # Created by: erich@rrnet.com # $FreeBSD$ PORTNAME= xcoral PORTVERSION= 3.47 PORTREVISION= 4 CATEGORIES= editors MASTER_SITES= http://xcoral.free.fr/ PATCH_SITES= http://aldan.algebra.com/~mi/port-stuff/ PATCHFILES= xcoral-alpheus-and-peneus-2020.patch.bz2 MAINTAINER= mi@aldan.algebra.com COMMENT= Multiwindow mouse-based text editor for X LICENSE= GPLv2 USES= bison compiler:c11 xorg USE_XORG= x11 GNU_CONFIGURE= yes CONFIGURE_ARGS= --libdir=${PREFIX}/share LIBS+= -lgnuregex +LDFLAGS+= -L${LOCALBASE}/lib +CFLAGS+= -isystem ${LOCALBASE}/include EXTRACT_AFTER_ARGS= --exclude BR_Parser.[ch] PLIST_SUB= VERSION="${PORTVERSION}" OPTIONS_DEFINE= DOCS +.include + +.if ${OSVERSION} > 1300000 +LIB_DEPENDS+= libgnuregex.so.[6-9]:devel/libgnuregex +.endif + post-patch: @${REINPLACE_CMD} -e 's| regex\.[co] | |g ; \ s| -g | |g' ${WRKSRC}/Makefile.in do-install: ${INSTALL_PROGRAM} ${WRKSRC}/xcoral ${STAGEDIR}${PREFIX}/bin ${MKDIR} ${STAGEDIR}${DATADIR} ${INSTALL_DATA} ${WRKSRC}/SmacLib/* ${STAGEDIR}${DATADIR} ${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${WRKSRC}/Doc/* ${STAGEDIR}${DOCSDIR} -.include +.include Index: head/lang/scm/Makefile =================================================================== --- head/lang/scm/Makefile (revision 559773) +++ head/lang/scm/Makefile (revision 559774) @@ -1,106 +1,110 @@ # Created by: hsu # $FreeBSD$ PORTNAME= scm PORTVERSION= 5f2 PORTREVISION= 10 CATEGORIES= lang scheme MASTER_SITES= http://groups.csail.mit.edu/mac/ftpdir/scm/%SUBDIR%/ MASTER_SITE_SUBDIR= . OLD DISTFILES= ${DISTNAME}${EXTRACT_SUFX} slib-3b5.zip slib-psd1-3.tar.gz EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX} slib-3b5.zip MAINTAINER= mi@aldan.algebra.com COMMENT= Scheme interpreter LICENSE= LGPL21 BROKEN_aarch64= ld: error: undefined symbol: sbrk BROKEN_powerpc64= fails to build: "/wrkdirs/usr/ports/lang/scm/work/slib/lineio.scm": read-char: Wrong type in arg1 #f WRKSRC= ${WRKDIR}/${PORTNAME} USES= readline zip HAS_CONFIGURE= yes CONFIGURE_ENV= --prefix=${PREFIX} MAKE_JOBS_UNSAFE= yes CFLAGS:= ${CFLAGS:N-O*} -O0 CFLAGS+= -Wall -Wwrite-strings -Wmissing-declarations -Wredundant-decls -Wcast-qual CFLAGS+= -Wno-unused-label -Wno-uninitialized SUB_FILES= require.scm PLIST_SUB= VERSION="${PORTVERSION}" PKGDEINSTALL= ${PKGINSTALL} INFO= scm OPTIONS_DEFINE= X11 OPTIONS_SUB= yes X11_USES= xorg X11_USE= xorg=ice,sm,x11,xext SCM_DATA= COPYING COPYING.LESSER Iedline.scm Idiffer.scm \ Init${PORTVERSION}.scm Link.scm Macexp.scm Macro.scm \ Transcen.scm Tscript.scm build build.scm compile.scm \ hobbit.scm mkimpcat.scm patchlvl.h \ r4rstest.scm rwb-isam.scm scmhob.h scmhob.scm wbtab.scm SCM_DATA_X11= keysymdef.scm x11.scm xatoms.scm xevent.scm SCM_MODULES= byte.so bytenumb.so crs.so differ.so edline.so gsubr.so \ ioext.so posix.so ramap.so record.so rgx.so sc2.so \ socket.so unix.so SCM_MODULES_X11=x.so .include +.if ${OSVERSION} > 1300000 +LIB_DEPENDS+= libgnuregex.so.[6-9]:devel/libgnuregex +.endif + .if ${PORT_OPTIONS:MX11} SCM_MODULES+= ${SCM_MODULES_X11} SCM_DATA+= ${SCM_DATA_X11} .endif .if ${ARCH} == "ia64" EXTRA_PATCHES+= ${FILESDIR}/ia64-patch ARCHOBJS= continue-ia64.S .endif .if "${readline_ARGS}" == "port" LIBEDIT_SUB1= ${CPPFLAGS}" "${LDFLAGS:M-L*} LIBEDIT_SUB2= ${LDFLAGS:M-L*} .else LIBEDIT_SUB1= -I/usr/include/edit" " .endif post-patch: @${REINPLACE_CMD} -e 's|/usr/include|${LOCALBASE}/include| ; \ /strip/s|^|#|' ${WRKSRC}/Makefile @${REINPLACE_CMD} -e 's|%%CC%%|${CC}|g ; \ s|%%CFLAGS%%|${CFLAGS}|g ; \ s|%%ARCHOBJS%%|${ARCHOBJS}|g ; \ s|editline freebsd "" "|editline freebsd "${LIBEDIT_SUB1}| ; \ s|-lreadline")$$|${LIBEDIT_SUB2} -lreadline")| ; \ s|%%LOCALBASE%%|${LOCALBASE}|g' ${WRKSRC}/build.scm @${REINPLACE_CMD} -e 's|__osf__|__FreeBSD__|' ${WRKSRC}/gmalloc.c @${REINPLACE_CMD} -e 's|gnuregex\.h|gnu/regex.h|g' ${WRKSRC}/rgx.c @${REINPLACE_CMD} -e 's|/usr/include|${LOCALBASE}/include|g' \ ${WRKSRC}/xgen.scm @${REINPLACE_CMD} -e 's|/usr/local|${PREFIX}|g' \ ${WRKSRC}/*.info ${WRKSRC}/*.texi ${TOUCH} ${WRKSRC}/scm.core do-install: ${INSTALL_PROGRAM} ${WRKSRC}/scm ${WRKSRC}/scmlit \ ${STAGEDIR}${PREFIX}/bin ${INSTALL_MAN} ${WRKSRC}/scm.1 ${STAGEDIR}${MANPREFIX}/man/man1 @${MKDIR} ${STAGEDIR}${PREFIX}/lib/scm ${INSTALL_DATA} ${WRKDIR}/require.scm ${SCM_DATA:S|^|${WRKSRC}/|} \ ${STAGEDIR}${PREFIX}/lib/scm ${INSTALL_LIB} ${SCM_MODULES:S|^|${WRKSRC}/|} \ ${STAGEDIR}${PREFIX}/lib/scm ${TAR} -C ${STAGEDIR}${PREFIX}/lib/scm -xf ${DISTDIR}/${DISTFILES:Mslib*.tar.gz} '*.scm' ${INSTALL_DATA} ${WRKDIR}/slib/*.scm ${STAGEDIR}${PREFIX}/lib/scm/slib/ ${INSTALL_DATA} ${WRKDIR}/scm/scm.info ${STAGEDIR}${PREFIX}/${INFO_PATH} .include Index: head/lang/scm/files/patch-build.scm =================================================================== --- head/lang/scm/files/patch-build.scm (revision 559773) +++ head/lang/scm/files/patch-build.scm (revision 559774) @@ -1,72 +1,73 @@ --- build.scm 2009-08-04 03:35:57.000000000 +0900 +++ build.scm 2015-01-23 16:23:32.000000000 -0500 @@ -665,14 +665,15 @@ (dump darwin "" "" #f ("unexmacosx.c" "lastfile.c") ()) (dlll darwin "-DSUN_DL" "-ldl" "" () ()) - (c freebsd "" "-export-dynamic" #f () ()) + (c freebsd "" "-Wl,-export-dynamic %%ARCHOBJS%%" #f () ()) (m freebsd "" "-lm" #f () ()) - (curses freebsd "" "-lncurses" "/usr/lib/libncurses.a" () ()) + (curses freebsd "" "-lcurses" "/usr/lib/libcurses.a" () ()) - (regex freebsd "-I/usr/include/gnu" "-lgnuregex" "" () ()) +- (regex freebsd "-I/usr/include/gnu" "-lgnuregex" "" () ()) ++ (regex freebsd "-I%%LOCALBASE%%/include" "-lgnuregex" "" () ()) (editline freebsd "" "-lreadline" "" () ()) - (dlll freebsd "-DSUN_DL" "-export-dynamic" "" () ()) - (nostart freebsd "" "-e start -dc -dp -Bstatic -lgnumalloc" #f ("pre-crt0.c") ()) - (dump freebsd "" "/usr/lib/crt0.o" "" ("unexsunos4.c") ()) + (graphics freebsd "-I%%LOCALBASE%%/include -DX11" "-lX11" "-L%%LOCALBASE%%/lib" () ()) + (dlll freebsd "-DSUN_DL" "" "" () ()) + (nostart freebsd "" "" #f () ()) + (dump freebsd "" "" #f ("unexelf.c") ()) (curses netbsd "-I/usr/pkg/include" "-lncurses" "-Wl,-rpath -Wl,/usr/pkg/lib -L/usr/pkg/lib" () ()) (editline netbsd "-I/usr/pkg/include" "-lreadline" "-Wl,-rpath -Wl,/usr/pkg/lib -L/usr/pkg/lib" () ()) (graphics netbsd "-I/usr/X11R6/include -DX11" "-lX11" "-Wl,-rpath -Wl,/usr/X11R6/lib -L/usr/X11R6/lib" () ()) @@ -1630,7 +1631,7 @@ parms ;;; gcc 3.4.2 for FreeBSD does not allow options other than default i.e. -O0 if NO -DGCC_SPARC_BUG - dai 2004-10-30 ;;"cc" "-O3 -pipe -DGCC_SPARC_BUG " "-c" - "cc" "-O3 -pipe " "-c" + "%%CC%%" "%%CFLAGS%%" "-c" (include-spec "-I" parms) (c-includes parms) (c-flags parms) @@ -1641,7 +1642,7 @@ (batch:rename-file parms oname (string-append oname "~")) (and (batch:try-command parms - "cc" "-o" oname + "%%CC%%" "-o" oname (must-be-first '("-nostartfiles" "pre-crt0.o" "crt0.o" @@ -1651,17 +1652,18 @@ (defcommand compile-dll-c-files freebsd (lambda (files parms) (and (batch:try-chopped-command - parms "cc" "-O3 -pipe " "-fPIC" "-c" + parms "%%CC%%" "%%CFLAGS%%" "-fPIC" "-c" (include-spec "-I" parms) (c-includes parms) (c-flags parms) files) (let ((fnames (truncate-up-to (map c-> files) #\/))) (and (batch:try-command - parms "cc" "-shared" + parms "%%CC%%" "-shared" (cond ((equal? (car fnames) "edline") "-lreadline") - ((equal? (car fnames) "x") "-L/usr/X11R6/lib -lSM -lICE -lXext -lX11 -lxpg4") -+ ((equal? (car fnames) "rgx") "-lgnuregex") ++ ((equal? (car fnames) "rgx") "-L%%LOCALBASE%%/lib -lgnuregex") + ((equal? (car fnames) "x") "-L%%LOCALBASE%%/lib -lSM -lICE -lXext -lX11") (else "")) "-o" (string-append (car fnames) ".so") (map (lambda (fname) (string-append fname ".o")) fnames)) @@ -1674,7 +1676,7 @@ (lambda (oname objects libs parms) (and (batch:try-command parms - "cc" "-shared" "-o" + "%%CC%%" "-shared" "-o" (string-append (car (parameter-list-ref parms 'implvic)) oname ".so")