diff options
author | Martin Wilke <miwi@FreeBSD.org> | 2008-04-19 17:56:05 +0000 |
---|---|---|
committer | Martin Wilke <miwi@FreeBSD.org> | 2008-04-19 17:56:05 +0000 |
commit | 3e4ed01146cfe2bdca465bd0e4d199341f62a0b6 (patch) | |
tree | d573ea09b2bf6be67cb497df199932da9e2707c4 /lang | |
parent | 40049f4af2200d0dcf33596508688623fc75f764 (diff) | |
download | ports-3e4ed01146cfe2bdca465bd0e4d199341f62a0b6.tar.gz ports-3e4ed01146cfe2bdca465bd0e4d199341f62a0b6.zip |
- Remove unneeded dependency from gtk12/gtk20 [1]
- Remove USE_XLIB/USE_X_PREFIX/USE_XPM in favor of USE_XORG
- Remove X11BASE support in favor of LOCALBASE or PREFIX
- Use USE_LDCONFIG instead of INSTALLS_SHLIB
- Remove unneeded USE_GCC 3.4+
Thanks to all Helpers:
Dmitry Marakasov, Chess Griffin, beech@, dinoex, rafan, gahr,
ehaupt, nox, itetcu, flz, pav
PR: 116263
Tested on: pointyhat
Approved by: portmgr (pav)
Notes
Notes:
svn path=/head/; revision=211584
Diffstat (limited to 'lang')
65 files changed, 104 insertions, 118 deletions
diff --git a/lang/STk/Makefile b/lang/STk/Makefile index eaa43dc238ad..88a647bd8cc7 100644 --- a/lang/STk/Makefile +++ b/lang/STk/Makefile @@ -7,7 +7,7 @@ PORTNAME= STk PORTVERSION= 4.0.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= lang scheme MASTER_SITES= ${MASTER_SITE_SUNSITE} \ ftp://kaolin.unice.fr/pub/STk/ @@ -16,8 +16,9 @@ MASTER_SITE_SUBDIR= devel/lang/lisp MAINTAINER= ports@FreeBSD.org COMMENT= A scheme interpreter with full access to the Tk graphical package -USE_XLIB= yes +USE_XORG= x11 ice sm xt GNU_CONFIGURE= yes +CFLAGS= -I${LOCALBASE}/include PLIST_SUB= STK_VERSION=${PORTVERSION} STK_ARCH=${STK_ARCH} diff --git a/lang/Sather/Makefile b/lang/Sather/Makefile index e281d45da3de..319ad360f0e2 100644 --- a/lang/Sather/Makefile +++ b/lang/Sather/Makefile @@ -31,7 +31,7 @@ INFO= sather sather-mode sather-tutorial SAT_CFLAGS= ${CFLAGS} -I. -I${BC_DIR}/include \ -I../System/Common \ - -I${LOCALBASE}/include -I${X11BASE}/include \ + -I${LOCALBASE}/include \ -I${LOCALBASE}/include/tcl8.4 -I${LOCALBASE}/include/tk8.4 SAT_LIBS= -L${BC_DIR}/.libs -L${LOCALBASE}/lib -lgc -lm SAT_LIBDIR= ${PREFIX}/lib/sather @@ -59,8 +59,8 @@ post-extract: post-patch: @${REINPLACE_CMD} -E \ -e "s,/usr/lib/sather,${SAT_LIBDIR}," \ - -e "s,/usr/X11R6,${X11BASE}," \ - -e "s,/usr/X11R6,${X11BASE}," \ + -e "s,/usr/X11R6,${LOCALBASE}," \ + -e "s,/usr/X11R6,${LOCALBASE}," \ ${WRKSRC}/Boot/sacomp.code/strings.c \ ${WRKSRC}/Doc/Installation.html \ ${WRKSRC}/Doc/man/man1/sabrowse.1 \ diff --git a/lang/caml-light/files/patch-ab b/lang/caml-light/files/patch-ab index 6b5068407094..338db1e2cc21 100644 --- a/lang/caml-light/files/patch-ab +++ b/lang/caml-light/files/patch-ab @@ -51,14 +51,14 @@ # (usually /usr/include; for SunOS with OpenLook, /usr/openwin/include) # Needed for the "libgraph" and "camltk" packages. -X11_INCLUDES=/usr/X11R6/include -+X11_INCLUDES=${X11BASE}/include ++X11_INCLUDES=${LOCALBASE}/include #X11_INCLUDES=/usr/include/X11 # The path to the directory containing the X11 libraries. # (usually /usr/lib; for SunOS with OpenLook, /usr/openwin/lib) # Needed for the "libgraph" and "camltk" packages. -X11_LIB=/usr/X11R6/lib -+X11_LIB=${X11BASE}/lib ++X11_LIB=${LOCALBASE}/lib #X11_LIB=/usr/lib/X11 # Name of the target architecture. diff --git a/lang/caml-light/files/patch-contrib_libgraph_Makefile b/lang/caml-light/files/patch-contrib_libgraph_Makefile index dfd6501e724c..705c0063f8ca 100644 --- a/lang/caml-light/files/patch-contrib_libgraph_Makefile +++ b/lang/caml-light/files/patch-contrib_libgraph_Makefile @@ -10,8 +10,8 @@ -X11_INCLUDES=/usr/include -X11_LIB=/usr/lib -CPP=/lib/cpp -P -+X11_INCLUDES=${X11BASE} -+X11_LIB=${X11BASE}/lib ++X11_INCLUDES=${LOCALBASE} ++X11_LIB=${LOCALBASE}/lib +CPP=/usr/bin/cpp -P -BINDIR=/usr/local/bin diff --git a/lang/drscheme/Makefile b/lang/drscheme/Makefile index 064253ea7cb2..c1702b26ffbe 100644 --- a/lang/drscheme/Makefile +++ b/lang/drscheme/Makefile @@ -7,7 +7,7 @@ PORTNAME= drscheme PORTVERSION= 370 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= lang scheme MASTER_SITES= http://download.plt-scheme.org/bundles/${PORTVERSION}/plt/ \ http://www.cs.utah.edu/plt/download/${PORTVERSION}/plt/ \ @@ -23,17 +23,15 @@ EXTRACT_ONLY= plt-${PORTVERSION}-src-unix.tgz MAINTAINER= ports@FreeBSD.org COMMENT= An interactive, integrated, graphical Scheme programming environment -LIB_DEPENDS= Xft.2:${PORTSDIR}/x11-fonts/libXft \ - Xrender.1:${PORTSDIR}/x11/libXrender \ - cairo.2:${PORTSDIR}/graphics/cairo \ +LIB_DEPENDS= cairo.2:${PORTSDIR}/graphics/cairo \ jpeg.9:${PORTSDIR}/graphics/jpeg \ png.5:${PORTSDIR}/graphics/png +USE_XORG= xft x11 xrender GNU_CONFIGURE= yes CONFIGURE_ARGS= --prefix=${PREFIX} --enable-shared --enable-xft --enable-gl \ --enable-xrender --enable-cairo --with-x --enable-pthread \ --enable-lt=${LIBTOOL} \ - --x-includes=${X11BASE}/include --x-libraries=${X11BASE}/lib \ CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" \ CPPFLAGS="${CPPFLAGS}" diff --git a/lang/dylan/Makefile b/lang/dylan/Makefile index 601169a787e8..0d34c25ceec9 100644 --- a/lang/dylan/Makefile +++ b/lang/dylan/Makefile @@ -43,7 +43,7 @@ PLIST_SUB+= DYLANARCH="x86-freebsd-elf-gcc" ONLY_FOR_ARCHS= i386 -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes LDCONFIG_DIRS= %%PREFIX%%/lib/dylan/%%DYLANVER%%/%%DYLANARCH%% USE_GMAKE= yes GNU_CONFIGURE= yes diff --git a/lang/ecl/Makefile b/lang/ecl/Makefile index d68dfa6cd779..fd2522a2c798 100644 --- a/lang/ecl/Makefile +++ b/lang/ecl/Makefile @@ -34,7 +34,7 @@ OPTIONS= ASDF "Enable ASDF building facility" on \ MAN1= ecl.1 INFO= ecl ecldev -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes LDCONFIG_DIRS= %%PREFIX%%/lib/ecl .include <bsd.port.pre.mk> diff --git a/lang/elan/Makefile b/lang/elan/Makefile index 78a6f32b2a4a..1f04ff20d12f 100644 --- a/lang/elan/Makefile +++ b/lang/elan/Makefile @@ -23,7 +23,7 @@ MAN1= elancc.1 USE_AUTOTOOLS= libtool:15 USE_GMAKE= yes GNU_CONFIGURE= yes -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes .include <bsd.port.pre.mk> diff --git a/lang/elk/Makefile b/lang/elk/Makefile index 8513cfcc6a52..32e7e0694f8e 100644 --- a/lang/elk/Makefile +++ b/lang/elk/Makefile @@ -26,9 +26,8 @@ USE_LDCONFIG= yes MAN1= elk.1 -CPPFLAGS= -I${LOCALBASE}/include/libelf -I${LOCALBASE}/include \ - -I${X11BASE}/include -LDFLAGS= -L${LOCALBASE}/lib -L${X11BASE}/lib +CPPFLAGS= -I${LOCALBASE}/include/libelf -I${LOCALBASE}/include +LDFLAGS= -L${LOCALBASE}/lib .include <bsd.port.pre.mk> diff --git a/lang/ezm3/scripts/configure b/lang/ezm3/scripts/configure index 34ff8649b77a..db975d911920 100644 --- a/lang/ezm3/scripts/configure +++ b/lang/ezm3/scripts/configure @@ -4,6 +4,6 @@ cfg=${WRKSRC}/m3config/src/${TARGET} cp -p ${cfg} ${cfg}.bak || exit sed \ -e "/^INSTALL_ROOT = /s|\".*\"|\"${PREFIX}\"|" \ - -e "/^X11ROOT = /s|\".*\"|\"${X11BASE}/lib\"|" \ + -e "/^X11ROOT = /s|\".*\"|\"${LOCALBASE}/lib\"|" \ ${cfg} > ${cfg}.tmp || exit mv ${cfg}.tmp ${cfg} diff --git a/lang/ferite/Makefile b/lang/ferite/Makefile index 43aaa13ca5b0..68f6be059b7b 100644 --- a/lang/ferite/Makefile +++ b/lang/ferite/Makefile @@ -24,7 +24,7 @@ GNU_CONFIGURE= yes CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \ LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}" -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes PLIST_SUB= MACHINE_ARCH=${MACHINE_ARCH} MAN1= builder.1 ferite.1 diff --git a/lang/gambas/Makefile b/lang/gambas/Makefile index 3f377d87983d..576988f0852c 100644 --- a/lang/gambas/Makefile +++ b/lang/gambas/Makefile @@ -8,8 +8,7 @@ PORTNAME= gambas PORTVERSION= 1.0.19 PORTREVISION= 1 CATEGORIES= lang -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR= ${PORTNAME} +MASTER_SITES= SF MAINTAINER= thierry@FreeBSD.org COMMENT= Gambas Almost Means BASic @@ -30,7 +29,7 @@ CONFIGURE_ARGS= --with-conv-includes=${LOCALBASE}/include \ --with-conv-libraries=${LOCALBASE}/lib \ --with-gettext-includes=${LOCALBASE}/include \ --with-gettext-libraries=${LOCALBASE}/lib \ - --with-moc=${X11BASE}/bin + --with-moc=${LOCALBASE}/bin CONFIGURE_ENV+= PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \ PTHREAD_LIBS="${PTHREAD_LIBS}" CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} diff --git a/lang/gcc-ooo/Makefile b/lang/gcc-ooo/Makefile index b7014802d0aa..5898326c5f4a 100644 --- a/lang/gcc-ooo/Makefile +++ b/lang/gcc-ooo/Makefile @@ -60,7 +60,7 @@ CONFIGURE_ARGS= --disable-nls \ MAKE_ARGS+= MAKEINFOFLAGS="--no-split" .if defined(WANT_SHAREDLIBS) CONFIGURE_ARGS+= --enable-shared -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes LDCONFIG_DIRS= %%PREFIX%%/lib ${TARGLIB} EXTRA_SHLIB= libgcc_s .else diff --git a/lang/gcl/Makefile b/lang/gcl/Makefile index 2ed7e05bc8d0..9f3e6bfe9fb2 100644 --- a/lang/gcl/Makefile +++ b/lang/gcl/Makefile @@ -30,8 +30,6 @@ CONFIGURE_ARGS=--prefix=${PREFIX} \ --enable-tkconfig=${LOCALBASE}/lib/tk8.4 \ --enable-tclconfig=${LOCALBASE}/lib/tcl8.4 \ --with-x \ - --x-includes=${X11BASE}/include \ - --x-libraries=${X11BASE}/lib \ --disable-dlopen \ --disable-dynsysbfd \ --disable-statsysbfd \ diff --git a/lang/gnat/Makefile b/lang/gnat/Makefile index fe41b1184b91..9f2b1db799d9 100644 --- a/lang/gnat/Makefile +++ b/lang/gnat/Makefile @@ -113,7 +113,7 @@ CONFIGURE_ENV= ${COMPILE_DATA} PATH=${have_boot} # Shared library handling .if defined(WANT_SHAREDLIBS) CONFIGURE_ARGS+= --enable-shared -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes LDCONFIG_DIRS= %%PREFIX%%/lib ${TARGLIB} LIBRARY_VERSION= 2006 PLIST_SUB+= SHAREDLIB="" diff --git a/lang/guile/Makefile b/lang/guile/Makefile index 972f8ee640d7..81c566b3ae82 100644 --- a/lang/guile/Makefile +++ b/lang/guile/Makefile @@ -44,7 +44,7 @@ post-extract: post-patch: @cd ${WRKSRC} ; \ ${REINPLACE_CMD} -e 's|<malloc\.h>|<stdlib.h>|g' ${REINPLACE_FILES} - @${REINPLACE_CMD} -e 's|%%X11BASE%%|${X11BASE}|g ; \ - s|%%LOCALBASE%%|${LOCALBASE}|g' ${WRKSRC}/libguile/load.c + @${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \ + ${WRKSRC}/libguile/load.c .include <bsd.port.post.mk> diff --git a/lang/hugs/Makefile b/lang/hugs/Makefile index b5782c00b323..8d582cb8e9db 100644 --- a/lang/hugs/Makefile +++ b/lang/hugs/Makefile @@ -36,8 +36,7 @@ BROKEN= dumps core during build on ${ARCH} .endif .if !defined(WITHOUT_X11) -USE_GL= yes -LIB_DEPENDS+= glut.4:${PORTSDIR}/graphics/libglut +USE_GL= glut PLIST_SUB+= X11="" .else BROKEN= not supported at the moment @@ -55,7 +54,7 @@ post-patch: @${REINPLACE_CMD} -e '/^install :: install_notes/d ; \ /^install :: install_guide/d' \ ${WRKSRC}/src/MkInstal.in - @${REINPLACE_CMD} -e 's,/usr/X11R6,${X11BASE},g' \ + @${REINPLACE_CMD} -e 's,/usr/X11R6,${LOCALBASE},g' \ ${WRKSRC}/packages/OpenGL/configure \ ${WRKSRC}/packages/GLUT/configure \ ${WRKSRC}/packages/X11/configure \ diff --git a/lang/icon/Makefile b/lang/icon/Makefile index 66e649b2f98b..408499131f5f 100644 --- a/lang/icon/Makefile +++ b/lang/icon/Makefile @@ -7,7 +7,7 @@ PORTNAME= icon PORTVERSION= 9.4.3 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= lang MASTER_SITES= http://www.cs.arizona.edu/icon/ftp/packages/unix/ DISTNAME= ${PORTNAME}.v${PORTVERSION:S/.//g}src @@ -30,8 +30,8 @@ BINXS= colrbook colrpick fontpick palette vib wevents xgamma CONFIG_CMD= Configure PLIST_SUB= WITHOUT_X11="@comment " .else -USE_XLIB= yes -CFLAGS+= -I${X11BASE}/include +USE_XORG= x11 xpm +CFLAGS+= -I${LOCALBASE}/include CONFIG_CMD= X-Configure PLIST_SUB= WITHOUT_X11= .endif @@ -39,9 +39,9 @@ PLIST_SUB= WITHOUT_X11= post-patch: @${REINPLACE_CMD} -e "s|^CC.*|CC=${CC}|g ; \ s|^CFLAGS.*|CFLAGS=${CFLAGS}|g ; \ - s|/usr/X11R6|${X11BASE}|g ; \ + s|/usr/X11R6|${LOCALBASE}|g ; \ s|-lpthread|${PTHREAD_LIBS}| ; \ - s|^XLIBS.*|XLIBS=-L${X11BASE}/lib -lX11|g" \ + s|^XLIBS.*|XLIBS=-L${LOCALBASE}/lib -lX11|g" \ ${WRKSRC}/config/${ARCH_NAME}/Makedefs @${REINPLACE_CMD} -e 's|/opt/icon|${ICONDIR}|g' ${WRKSRC}/ipl/BuildBin @${REINPLACE_CMD} -e 's|ld -Bshareable|\$$CC -shared|g ; \ diff --git a/lang/lafontaine/Makefile b/lang/lafontaine/Makefile index 56aeb6a5a498..087436ad7dae 100644 --- a/lang/lafontaine/Makefile +++ b/lang/lafontaine/Makefile @@ -8,7 +8,7 @@ PORTNAME= lafontaine PORTVERSION= 0.4.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= lang MASTER_SITES= http://www.nongnu.org/lafontaine/archives/ DISTNAME= ${PORTNAME}_0.4-1 @@ -18,7 +18,6 @@ COMMENT= Graphical logo interpreter WRKSRC= ${WRKDIR}/${PORTNAME}-0.4 -USE_X_PREFIX= yes USE_GNOME= gnomehack gnometarget gtk20 USE_GMAKE= yes GNU_CONFIGURE= yes diff --git a/lang/linux-f10-libg2c/Makefile b/lang/linux-f10-libg2c/Makefile index 15307ccf7a3c..f1034d8870df 100644 --- a/lang/linux-f10-libg2c/Makefile +++ b/lang/linux-f10-libg2c/Makefile @@ -15,7 +15,7 @@ COMMENT= Fortran 77 compatibility runtime ONLY_FOR_ARCHS= i386 amd64 USE_LINUX_RPM= yes LINUX_DIST_VER= 4 -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes SRC_DISTFILES= compat-gcc-32-${PORTVERSION}-47.fc4.src.rpm PLIST_FILES= usr/lib/libg2c.so.0 usr/lib/libg2c.so.0.0.0 diff --git a/lang/linux-f8-libg2c/Makefile b/lang/linux-f8-libg2c/Makefile index 15307ccf7a3c..f1034d8870df 100644 --- a/lang/linux-f8-libg2c/Makefile +++ b/lang/linux-f8-libg2c/Makefile @@ -15,7 +15,7 @@ COMMENT= Fortran 77 compatibility runtime ONLY_FOR_ARCHS= i386 amd64 USE_LINUX_RPM= yes LINUX_DIST_VER= 4 -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes SRC_DISTFILES= compat-gcc-32-${PORTVERSION}-47.fc4.src.rpm PLIST_FILES= usr/lib/libg2c.so.0 usr/lib/libg2c.so.0.0.0 diff --git a/lang/linux-libg2c/Makefile b/lang/linux-libg2c/Makefile index 15307ccf7a3c..f1034d8870df 100644 --- a/lang/linux-libg2c/Makefile +++ b/lang/linux-libg2c/Makefile @@ -15,7 +15,7 @@ COMMENT= Fortran 77 compatibility runtime ONLY_FOR_ARCHS= i386 amd64 USE_LINUX_RPM= yes LINUX_DIST_VER= 4 -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes SRC_DISTFILES= compat-gcc-32-${PORTVERSION}-47.fc4.src.rpm PLIST_FILES= usr/lib/libg2c.so.0 usr/lib/libg2c.so.0.0.0 diff --git a/lang/linux-libperl5.8/Makefile b/lang/linux-libperl5.8/Makefile index 55dab73cbfc5..adcc15beb1b7 100644 --- a/lang/linux-libperl5.8/Makefile +++ b/lang/linux-libperl5.8/Makefile @@ -18,7 +18,7 @@ MAINTAINER= ports@FreeBSD.org COMMENT= Library for embedding the perl interpreter (linux version) USE_LINUX_RPM= yes -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes ONLY_FOR_ARCHS= i386 amd64 DIST_SUBDIR= rpm diff --git a/lang/logo/Makefile b/lang/logo/Makefile index 1873df877707..cf693a5feea8 100644 --- a/lang/logo/Makefile +++ b/lang/logo/Makefile @@ -7,7 +7,7 @@ PORTNAME= ucblogo PORTVERSION= 5.5 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= lang MASTER_SITES= http://www.cs.berkeley.edu/~bh/downloads/ DISTNAME= ${PORTNAME} @@ -26,7 +26,7 @@ BUILD_DEPENDS+= tex:${PORTSDIR}/print/teTeX \ .endif WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} -USE_XLIB= yes +USE_XORG= x11 ice sm USE_AUTOTOOLS= autoconf:261 MAKEFILE= makefile HAS_CONFIGURE= yes diff --git a/lang/mdk/Makefile b/lang/mdk/Makefile index 5dbc582321e3..5fd411837ab2 100644 --- a/lang/mdk/Makefile +++ b/lang/mdk/Makefile @@ -8,7 +8,7 @@ PORTNAME= mdk PORTVERSION= 1.2.1 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= lang gnome MASTER_SITES= ${MASTER_SITE_GNU:S/$/:gnu/} \ ${MASTER_SITE_SOURCEFORGE:S/$/:sf/} @@ -23,7 +23,6 @@ COMMENT= A set of utilities for developing programs using MIX and MIXAL LIB_DEPENDS= guile.18:${PORTSDIR}/lang/guile \ readline.5:${PORTSDIR}/devel/readline -USE_X_PREFIX= yes USE_GNOME= gnometarget libglade2 GNU_CONFIGURE= yes CONFIGURE_ARGS= --disable-nls diff --git a/lang/metaocaml/Makefile b/lang/metaocaml/Makefile index fab567a301f8..3049836550b3 100644 --- a/lang/metaocaml/Makefile +++ b/lang/metaocaml/Makefile @@ -76,7 +76,7 @@ MANPREFIX= ${PREFIX}/share/metaocaml .if defined(WITH_X11) USE_XORG= x11 -CONFIGURE_ARGS+=-x11include ${X11BASE}/include -x11lib ${X11BASE}/lib +CONFIGURE_ARGS+=-x11include ${LOCALBASE}/include -x11lib ${LOCALBASE}/lib PLIST_SUB+= X11="" .else PLIST_SUB+= X11="@comment " diff --git a/lang/mpd/Makefile b/lang/mpd/Makefile index 0bd00122708c..cec0db29bf6e 100644 --- a/lang/mpd/Makefile +++ b/lang/mpd/Makefile @@ -48,7 +48,7 @@ post-patch: s%^((MPD(CMD|LIB)|MAN[135]) =) /usr/local%\1 ${PREFIX}%" \ ${WRKSRC}/Configuration .if !defined(WITHOUT_X11) - @${REINPLACE_CMD} -Ee 's%^(XINCL =) .*%\1 ${X11BASE}/include%' \ + @${REINPLACE_CMD} -Ee 's%^(XINCL =) .*%\1 ${LOCALBASE}/include%' \ ${WRKSRC}/Configuration .else @${REINPLACE_CMD} -Ee 's%^(XINCL =) .*%\1%' ${WRKSRC}/Configuration diff --git a/lang/ocaml/Makefile b/lang/ocaml/Makefile index a170e7d86216..2cc85c6a0e80 100644 --- a/lang/ocaml/Makefile +++ b/lang/ocaml/Makefile @@ -7,7 +7,7 @@ PORTNAME= ocaml PORTVERSION= 3.10.2 -PORTREVISION= 0 +PORTREVISION= 1 CATEGORIES= lang MASTER_SITES= http://caml.inria.fr/distrib/${DISTNAME:R}/ \ ftp://ftp.inria.fr/INRIA/caml-light/${DISTNAME:R}/ \ @@ -54,8 +54,8 @@ CONFIGURE_ARGS+=-no-pthread .if !defined(WITHOUT_X11) PLIST_SUB+= X11="" -USE_XLIB= yes -CONFIGURE_ARGS+=-x11include ${X11BASE}/include -x11lib ${X11BASE}/lib +USE_XORG= x11 +CONFIGURE_ARGS+=-x11include ${LOCALBASE}/include -x11lib ${LOCALBASE}/lib .else PLIST_SUB+= X11="@comment " WITHOUT_TK= yes diff --git a/lang/ocs/Makefile b/lang/ocs/Makefile index 4f38e37e4f83..bd7c62a175cb 100644 --- a/lang/ocs/Makefile +++ b/lang/ocs/Makefile @@ -42,9 +42,9 @@ CONFIGURE_ARGS= --prefix="${WRKDIR}" \ --disable-absolute-pathes \ --disable-locallinks \ --with-tcl-lib="-L${LOCALBASE}/lib -ltcl${TCL_VER:S/.//}" \ - --with-tcl-incl="-I${TCL_INCLUDEDIR} -I${TK_INCLUDEDIR} -I${X11BASE}/include" \ + --with-tcl-incl="-I${TCL_INCLUDEDIR} -I${TK_INCLUDEDIR} -I${LOCALBASE}/include" \ --with-tk-lib="-ltk${TK_VER:S/.//}" \ - --with-tk-incl="-I${TCL_INCLUDEDIR} -I${TK_INCLUDEDIR} -I${X11BASE}/include" + --with-tk-incl="-I${TCL_INCLUDEDIR} -I${TK_INCLUDEDIR} -I${LOCALBASE}/include" MAN1= ocs.1 oc.1 genmake.1 diff --git a/lang/ohugs/Makefile b/lang/ohugs/Makefile index 1996ce87f49c..0636eed888a9 100644 --- a/lang/ohugs/Makefile +++ b/lang/ohugs/Makefile @@ -24,7 +24,7 @@ BUILD_WRKSRC= ${WRKSRC}/src USE_BISON= build LDFLAGS+= -lm -lreadline -ltermcap .if !defined(WITHOUT_X11) -CFLAGS+= -I${LOCALBASE}/include/tk8.4 -I${LOCALBASE}/include/tcl8.4 -I${LOCALBASE}/include -I${X11BASE}/include +CFLAGS+= -I${LOCALBASE}/include/tk8.4 -I${LOCALBASE}/include/tcl8.4 -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib -ltk84 -ltcl84 -ltix8184 .endif MAKE_ARGS= CC="${CC}" CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" \ diff --git a/lang/onyx/Makefile b/lang/onyx/Makefile index 913807fa23cc..d4c877458834 100644 --- a/lang/onyx/Makefile +++ b/lang/onyx/Makefile @@ -22,7 +22,7 @@ GNU_CONFIGURE= yes CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} CONFIGURE_ARGS= --with-libedit-prefix=${LOCALBASE} \ --with-pcre-prefix=${LOCALBASE} -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes MAN1= onyx.1 onyx_config.1 diff --git a/lang/otcl/Makefile b/lang/otcl/Makefile index ad7eb9e51314..ae3e7945a10e 100644 --- a/lang/otcl/Makefile +++ b/lang/otcl/Makefile @@ -10,8 +10,7 @@ PORTVERSION= 1.13 PORTREVISION= 3 DISTVERSIONPREFIX= src- CATEGORIES= lang tcl tk -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR= otcl-tclcl +MASTER_SITES= SF/otcl-tclcl MAINTAINER= mm@FreeBSD.org COMMENT= MIT Object Tcl @@ -35,11 +34,10 @@ PORTDOCS= ${DOCS:S/doc\///} .include <bsd.port.pre.mk> CFLAGS+= -DHAVE_UNISTD_H -CONFIGURE_ARGS+= --with-tcl-ver=${TCL_VER} --with-tk-ver=${TK_VER} \ - --x-includes=${X11BASE}/include --x-libraries=${X11BASE}/lib +CONFIGURE_ARGS+= --with-tcl-ver=${TCL_VER} --with-tk-ver=${TK_VER} post-patch: - @${REINPLACE_CMD} -e 's|/usr/X11R6|${X11BASE}|g' \ + @${REINPLACE_CMD} -e 's|/usr/X11R6|${LOCALBASE}|g' \ -e's|X11/Intrinsic.h|X11/Xlib.h|g' \ ${WRKSRC}/configure ${WRKSRC}/conf/configure.in.x11 @${REINPLACE_CMD} -e 's|../lib/tcl$$TCL_HI_VERS|${TCL_LIBDIR}|g' \ diff --git a/lang/php4/Makefile.ext b/lang/php4/Makefile.ext index 47db2048df1e..7edb16b1e0f9 100644 --- a/lang/php4/Makefile.ext +++ b/lang/php4/Makefile.ext @@ -108,7 +108,7 @@ CONFIGURE_ARGS+=--with-gd \ --with-png-dir=${LOCALBASE} \ --with-zlib-dir=/usr . if !defined(WITHOUT_X11) -CONFIGURE_ARGS+=--with-xpm-dir=${X11BASE} +CONFIGURE_ARGS+=--with-xpm-dir=${LOCALBASE} . endif OPTIONS= T1LIB "Include T1lib support" on \ diff --git a/lang/php5/Makefile.ext b/lang/php5/Makefile.ext index 36d05113c4ec..b1836720a42e 100644 --- a/lang/php5/Makefile.ext +++ b/lang/php5/Makefile.ext @@ -96,7 +96,7 @@ CONFIGURE_ARGS+=--with-gd \ --with-png-dir=${LOCALBASE} \ --with-zlib-dir=/usr . if !defined(WITHOUT_X11) -CONFIGURE_ARGS+=--with-xpm-dir=${X11BASE} +CONFIGURE_ARGS+=--with-xpm-dir=${LOCALBASE} . endif OPTIONS= T1LIB "Include T1lib support" on \ diff --git a/lang/php53/Makefile.ext b/lang/php53/Makefile.ext index 36d05113c4ec..b1836720a42e 100644 --- a/lang/php53/Makefile.ext +++ b/lang/php53/Makefile.ext @@ -96,7 +96,7 @@ CONFIGURE_ARGS+=--with-gd \ --with-png-dir=${LOCALBASE} \ --with-zlib-dir=/usr . if !defined(WITHOUT_X11) -CONFIGURE_ARGS+=--with-xpm-dir=${X11BASE} +CONFIGURE_ARGS+=--with-xpm-dir=${LOCALBASE} . endif OPTIONS= T1LIB "Include T1lib support" on \ diff --git a/lang/pm3-base/scripts/configure b/lang/pm3-base/scripts/configure index 34ff8649b77a..db975d911920 100644 --- a/lang/pm3-base/scripts/configure +++ b/lang/pm3-base/scripts/configure @@ -4,6 +4,6 @@ cfg=${WRKSRC}/m3config/src/${TARGET} cp -p ${cfg} ${cfg}.bak || exit sed \ -e "/^INSTALL_ROOT = /s|\".*\"|\"${PREFIX}\"|" \ - -e "/^X11ROOT = /s|\".*\"|\"${X11BASE}/lib\"|" \ + -e "/^X11ROOT = /s|\".*\"|\"${LOCALBASE}/lib\"|" \ ${cfg} > ${cfg}.tmp || exit mv ${cfg}.tmp ${cfg} diff --git a/lang/ptoc/files/patch-makefile.bsd b/lang/ptoc/files/patch-makefile.bsd index 3ec01eae7fb0..aa2d6a57d30e 100644 --- a/lang/ptoc/files/patch-makefile.bsd +++ b/lang/ptoc/files/patch-makefile.bsd @@ -5,7 +5,7 @@ libXbgi.a: - (cd Xbgi; make) -+ (cd Xbgi; $(MAKE) CC="$(CC)" CFLAGS="$(CFLAGS)" X11BASE="$(X11BASE)") ++ (cd Xbgi; $(MAKE) CC="$(CC)" CFLAGS="$(CFLAGS)" X11BASE="$(LOCALBASE)") all : $(BINS) $(LIBS) diff --git a/lang/python23/Makefile b/lang/python23/Makefile index ae0a12bc3809..5dfd1913ecd1 100644 --- a/lang/python23/Makefile +++ b/lang/python23/Makefile @@ -22,7 +22,7 @@ CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} CONFIGURE_ARGS= --with-fpectl CONFIGURE_ENV= OPT="${CFLAGS}" MAKE_ENV= VPATH="${WRKSRC}" -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes INSTALL_TARGET= altinstall MAN1= ${PYTHON_VERSION}.1 @@ -111,7 +111,7 @@ pre-patch: 's,/usr/doc/python-docs-,${PREFIX}/share/doc/python,g' \ ${WRKSRC}/Lib/pydoc.py ${REINPLACE_CMD} -e \ - 's|^\(prefixes = .*\)\]$$|\1, "${X11BASE}"]|g' \ + 's|^\(prefixes = .*\)\]$$|\1, "${LOCALBASE}"]|g' \ ${WRKSRC}/Lib/site.py .for ver in 6 7 8 ${MKDIR} ${WRKSRC}/Lib/plat-freebsd${ver} diff --git a/lang/python24/Makefile b/lang/python24/Makefile index 7103949945ff..a659af4cf734 100644 --- a/lang/python24/Makefile +++ b/lang/python24/Makefile @@ -127,7 +127,7 @@ pre-patch: 's,/usr/doc/python-docs-,${PREFIX}/share/doc/python,g' \ ${WRKSRC}/Lib/pydoc.py ${REINPLACE_CMD} -e \ - 's|^\( *prefixes = .*\)\]$$|\1, "${X11BASE}"]|g' \ + 's|^\( *prefixes = .*\)\]$$|\1, "${LOCALBASE}"]|g' \ ${WRKSRC}/Lib/site.py .if defined(WITH_FPECTL) && ${ARCH} == i386 ${ECHO} "fpectl fpectlmodule.c" >> ${WRKSRC}/Modules/Setup.dist diff --git a/lang/python25/Makefile b/lang/python25/Makefile index 1f99726da72c..3e19ec12e903 100644 --- a/lang/python25/Makefile +++ b/lang/python25/Makefile @@ -23,7 +23,7 @@ CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} CONFIGURE_SCRIPT= ../configure # must be relative CONFIGURE_ENV= OPT="${CFLAGS}" SVNVERSION="echo freebsd" MAKE_ENV= VPATH="${PYTHON_WRKSRC}" -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes INSTALL_TARGET= altinstall MAN1= ${PYTHON_VERSION}.1 @@ -132,7 +132,7 @@ pre-patch: 's,/usr/doc/python-docs-,${PREFIX}/share/doc/python,g' \ ${PATCH_WRKSRC}/Lib/pydoc.py ${REINPLACE_CMD} -e \ - 's|^\( *prefixes = .*\)\]$$|\1, "${X11BASE}"]|g' \ + 's|^\( *prefixes = .*\)\]$$|\1, "${LOCALBASE}"]|g' \ ${PATCH_WRKSRC}/Lib/site.py ${REINPLACE_CMD} -e \ 's|^ \(..ASDLGEN.*\)$$| ${TRUE}|g' \ diff --git a/lang/python26/Makefile b/lang/python26/Makefile index 1f99726da72c..3e19ec12e903 100644 --- a/lang/python26/Makefile +++ b/lang/python26/Makefile @@ -23,7 +23,7 @@ CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} CONFIGURE_SCRIPT= ../configure # must be relative CONFIGURE_ENV= OPT="${CFLAGS}" SVNVERSION="echo freebsd" MAKE_ENV= VPATH="${PYTHON_WRKSRC}" -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes INSTALL_TARGET= altinstall MAN1= ${PYTHON_VERSION}.1 @@ -132,7 +132,7 @@ pre-patch: 's,/usr/doc/python-docs-,${PREFIX}/share/doc/python,g' \ ${PATCH_WRKSRC}/Lib/pydoc.py ${REINPLACE_CMD} -e \ - 's|^\( *prefixes = .*\)\]$$|\1, "${X11BASE}"]|g' \ + 's|^\( *prefixes = .*\)\]$$|\1, "${LOCALBASE}"]|g' \ ${PATCH_WRKSRC}/Lib/site.py ${REINPLACE_CMD} -e \ 's|^ \(..ASDLGEN.*\)$$| ${TRUE}|g' \ diff --git a/lang/python27/Makefile b/lang/python27/Makefile index 1f99726da72c..3e19ec12e903 100644 --- a/lang/python27/Makefile +++ b/lang/python27/Makefile @@ -23,7 +23,7 @@ CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} CONFIGURE_SCRIPT= ../configure # must be relative CONFIGURE_ENV= OPT="${CFLAGS}" SVNVERSION="echo freebsd" MAKE_ENV= VPATH="${PYTHON_WRKSRC}" -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes INSTALL_TARGET= altinstall MAN1= ${PYTHON_VERSION}.1 @@ -132,7 +132,7 @@ pre-patch: 's,/usr/doc/python-docs-,${PREFIX}/share/doc/python,g' \ ${PATCH_WRKSRC}/Lib/pydoc.py ${REINPLACE_CMD} -e \ - 's|^\( *prefixes = .*\)\]$$|\1, "${X11BASE}"]|g' \ + 's|^\( *prefixes = .*\)\]$$|\1, "${LOCALBASE}"]|g' \ ${PATCH_WRKSRC}/Lib/site.py ${REINPLACE_CMD} -e \ 's|^ \(..ASDLGEN.*\)$$| ${TRUE}|g' \ diff --git a/lang/python30/Makefile b/lang/python30/Makefile index 1f99726da72c..3e19ec12e903 100644 --- a/lang/python30/Makefile +++ b/lang/python30/Makefile @@ -23,7 +23,7 @@ CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} CONFIGURE_SCRIPT= ../configure # must be relative CONFIGURE_ENV= OPT="${CFLAGS}" SVNVERSION="echo freebsd" MAKE_ENV= VPATH="${PYTHON_WRKSRC}" -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes INSTALL_TARGET= altinstall MAN1= ${PYTHON_VERSION}.1 @@ -132,7 +132,7 @@ pre-patch: 's,/usr/doc/python-docs-,${PREFIX}/share/doc/python,g' \ ${PATCH_WRKSRC}/Lib/pydoc.py ${REINPLACE_CMD} -e \ - 's|^\( *prefixes = .*\)\]$$|\1, "${X11BASE}"]|g' \ + 's|^\( *prefixes = .*\)\]$$|\1, "${LOCALBASE}"]|g' \ ${PATCH_WRKSRC}/Lib/site.py ${REINPLACE_CMD} -e \ 's|^ \(..ASDLGEN.*\)$$| ${TRUE}|g' \ diff --git a/lang/python31/Makefile b/lang/python31/Makefile index 1f99726da72c..3e19ec12e903 100644 --- a/lang/python31/Makefile +++ b/lang/python31/Makefile @@ -23,7 +23,7 @@ CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} CONFIGURE_SCRIPT= ../configure # must be relative CONFIGURE_ENV= OPT="${CFLAGS}" SVNVERSION="echo freebsd" MAKE_ENV= VPATH="${PYTHON_WRKSRC}" -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes INSTALL_TARGET= altinstall MAN1= ${PYTHON_VERSION}.1 @@ -132,7 +132,7 @@ pre-patch: 's,/usr/doc/python-docs-,${PREFIX}/share/doc/python,g' \ ${PATCH_WRKSRC}/Lib/pydoc.py ${REINPLACE_CMD} -e \ - 's|^\( *prefixes = .*\)\]$$|\1, "${X11BASE}"]|g' \ + 's|^\( *prefixes = .*\)\]$$|\1, "${LOCALBASE}"]|g' \ ${PATCH_WRKSRC}/Lib/site.py ${REINPLACE_CMD} -e \ 's|^ \(..ASDLGEN.*\)$$| ${TRUE}|g' \ diff --git a/lang/python32/Makefile b/lang/python32/Makefile index 1f99726da72c..3e19ec12e903 100644 --- a/lang/python32/Makefile +++ b/lang/python32/Makefile @@ -23,7 +23,7 @@ CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} CONFIGURE_SCRIPT= ../configure # must be relative CONFIGURE_ENV= OPT="${CFLAGS}" SVNVERSION="echo freebsd" MAKE_ENV= VPATH="${PYTHON_WRKSRC}" -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes INSTALL_TARGET= altinstall MAN1= ${PYTHON_VERSION}.1 @@ -132,7 +132,7 @@ pre-patch: 's,/usr/doc/python-docs-,${PREFIX}/share/doc/python,g' \ ${PATCH_WRKSRC}/Lib/pydoc.py ${REINPLACE_CMD} -e \ - 's|^\( *prefixes = .*\)\]$$|\1, "${X11BASE}"]|g' \ + 's|^\( *prefixes = .*\)\]$$|\1, "${LOCALBASE}"]|g' \ ${PATCH_WRKSRC}/Lib/site.py ${REINPLACE_CMD} -e \ 's|^ \(..ASDLGEN.*\)$$| ${TRUE}|g' \ diff --git a/lang/rexx-imc/Makefile b/lang/rexx-imc/Makefile index bdfbbff5ec60..eabdd324985d 100644 --- a/lang/rexx-imc/Makefile +++ b/lang/rexx-imc/Makefile @@ -26,7 +26,7 @@ CONFIGURE_ARGS= o all # configures and builds in one step NO_BUILD= yes -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes MAN1= rexx.1 rxstack.1 rxque.1 diff --git a/lang/rexx-regina/Makefile b/lang/rexx-regina/Makefile index 64d4c9f95344..343c9397168b 100644 --- a/lang/rexx-regina/Makefile +++ b/lang/rexx-regina/Makefile @@ -24,7 +24,7 @@ WRKSRC= ${WRKDIR}/Regina-${PORTVERSION} USE_OPENSSL= yes GNU_CONFIGURE= yes USE_GMAKE= yes -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes MAN1= regina.1 diff --git a/lang/schemetoc/Makefile b/lang/schemetoc/Makefile index 909cc2b015f1..7ad3dee93cf9 100644 --- a/lang/schemetoc/Makefile +++ b/lang/schemetoc/Makefile @@ -18,7 +18,7 @@ COMMENT= Scheme-to-C, a compiler and interpreter for compiling scheme into C USE_GCC= 2.95 USE_XORG= x11 xi -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes NO_WRKSUBDIR= yes MAN1= scc.1 sci.1 @@ -34,6 +34,6 @@ post-extract: post-patch: @${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g; \ - s|%%X11BASE%%|${X11BASE}|g' ${WRKSRC}/scsc/*.sc + s|%%LOCALBASE%%|${LOCALBASE}|g' ${WRKSRC}/scsc/*.sc .include <bsd.port.mk> diff --git a/lang/schemetoc/files/makefile-head b/lang/schemetoc/files/makefile-head index 14944c6a593e..ba600cf2daf2 100644 --- a/lang/schemetoc/files/makefile-head +++ b/lang/schemetoc/files/makefile-head @@ -24,7 +24,7 @@ CPP = cpp # X library -XLIB = -L${X11BASE}/lib -lX11 +XLIB = -L${LOCALBASE}/lib -lX11 XLIBCFLAGS = PICFLAGS = -fpic -DPIC diff --git a/lang/schemetoc/files/patch-ah b/lang/schemetoc/files/patch-ah index b35797872119..87a28e47e92c 100644 --- a/lang/schemetoc/files/patch-ah +++ b/lang/schemetoc/files/patch-ah @@ -105,12 +105,12 @@ + (if (member "-c" c-flags) + '() + (if (member "xlib" with-modules) -+ (list "-lm" sc-library scxl-library "-L%%X11BASE%%/lib -lX11") ++ (list "-lm" sc-library scxl-library "-L%%LOCALBASE%%/lib -lX11") + (list "-lm" sc-library)))) + (if (member "-c" c-flags) + '() + (if (member "xlib" with-modules) -+ (list "-L%%X11BASE%%/lib -lm -lsc -lscxl -lX11") ++ (list "-L%%LOCALBASE%%/lib -lm -lsc -lscxl -lX11") + (list "-lm -lsc")))))))))) (reset)) (catch-error diff --git a/lang/scm/Makefile b/lang/scm/Makefile index 806faf9c614b..3a67ecfb0523 100644 --- a/lang/scm/Makefile +++ b/lang/scm/Makefile @@ -49,7 +49,7 @@ post-patch: @${REINPLACE_CMD} -e 's|exec ./scmlit|exec $$SCMLIT|g' ${WRKSRC}/build @${REINPLACE_CMD} -e 's|%%CC%%|${CC}|g ; \ s|%%CFLAGS%%|${CFLAGS}|g ; \ - s|%%X11BASE%%|${X11BASE}|g' ${WRKSRC}/build.scm + s|%%LOCALBASE%%|${LOCALBASE}|g' ${WRKSRC}/build.scm post-build: @cd ${WRKSRC} \ diff --git a/lang/scm/files/patch-build.scm b/lang/scm/files/patch-build.scm index a7a9a3f16228..8e2ea75a001a 100644 --- a/lang/scm/files/patch-build.scm +++ b/lang/scm/files/patch-build.scm @@ -31,7 +31,7 @@ (cond ((equal? (car fnames) "edline") "-lreadline") - ((equal? (car fnames) "x") "-L/usr/X11R6/lib -lSM -lICE -lXext -lX11 -lxpg4") -+ ((equal? (car fnames) "x") "-L%%X11BASE%%/lib -lSM -lICE -lXext -lX11 -lxpg4") ++ ((equal? (car fnames) "x") "-L%%LOCALBASE%%/lib -lSM -lICE -lXext -lX11 -lxpg4") (else "")) "-o" (string-append (car fnames) ".so") (map (lambda (fname) (string-append fname ".o")) fnames)) diff --git a/lang/scriba/Makefile b/lang/scriba/Makefile index a549d670574e..f281143a571c 100644 --- a/lang/scriba/Makefile +++ b/lang/scriba/Makefile @@ -99,7 +99,6 @@ post-patch: ${REINPLACE_CMD} \ -e 's,%%PREFIX%%,${PREFIX},g' \ -e 's,%%LOCALBASE%%,${LOCALBASE},g' \ - -e 's,%%X11BASE%%,${X11BASE},g' \ -e 's,%%DOCSDIR%%,${DOCSDIR},g' \ -e 's,%%DATADIR%%,${DATADIR},g' \ -e 's,%%CC%%,${CC},g' \ diff --git a/lang/scriba/files/patch-make_gcc.jim b/lang/scriba/files/patch-make_gcc.jim index 301f4e1ddebe..25037c488dbd 100644 --- a/lang/scriba/files/patch-make_gcc.jim +++ b/lang/scriba/files/patch-make_gcc.jim @@ -5,7 +5,7 @@ -L where the libraries are } -{#define cc=gcc -w} -+{#define cc=cc -w %%CFLAGS%% -L%%LOCALBASE%%/lib -I%%LOCALBASE%%/include -L%%X11BASE%%/lib -I%%X11BASE%%/include -I%%LOCALBASE%%/include/libxml2 -L%%LOCALBASE%%/lib/mysql } ++{#define cc=cc -w %%CFLAGS%% -L%%LOCALBASE%%/lib -I%%LOCALBASE%%/include -I%%LOCALBASE%%/include/libxml2 -L%%LOCALBASE%%/lib/mysql } {#define CcOptOutput/X=-o X} {#define CcOptInput/X=X} {#define CcOptCompile=-c} @@ -14,7 +14,7 @@ {#define LibOptInput/X=X} -{#define ld=ld -shared -Bstatic} -+{#define ld=ld %%LDFLAGS%% -shared -Bstatic -L%%LOCALBASE%%/lib -L%%X11BASE%%/lib -L%%LOCALBASE%%/lib/mysql } ++{#define ld=ld %%LDFLAGS%% -shared -Bstatic -L%%LOCALBASE%%/lib -L%%LOCALBASE%%/lib/mysql } {#define LdOptOutput/X=-o X} {#define LdOptInput/X=X} diff --git a/lang/siod/Makefile b/lang/siod/Makefile index ffb1acad6a5e..0162ce0fba12 100644 --- a/lang/siod/Makefile +++ b/lang/siod/Makefile @@ -16,7 +16,7 @@ EXTRACT_SUFX= .tgz MAINTAINER= ports@FreeBSD.org COMMENT= A small footprint implementation of the Scheme programming language -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes NO_WRKSUBDIR= yes MAKEFILE= makefile diff --git a/lang/squeak-dev/Makefile b/lang/squeak-dev/Makefile index 21693c893085..5aac2af4344c 100644 --- a/lang/squeak-dev/Makefile +++ b/lang/squeak-dev/Makefile @@ -85,8 +85,8 @@ INSTALL_WRKSRC= ${CONFIGURE_WRKSRC} CONFIGURE_SCRIPT= ../platforms/unix/config/configure CONFIGURE_ARGS+= --libdir=${PREFIX}/share \ --without-quartz \ - LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib" \ - CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" + LDFLAGS="-L${LOCALBASE}/lib" \ + CPPFLAGS="-I${LOCALBASE}/include" # don't pass "-s" to install to avoid trying to strip a shell script CONFIGURE_ENV= @@ -163,7 +163,6 @@ PLIST_SUB= IMAGEVERSION=${IMAGEVERSION}\ post-patch: @${REINPLACE_CMD} \ -e "s,%%LOCALBASE%%,${LOCALBASE},g" \ - -e "s,%%X11BASE%%,${X11BASE},g" \ ${WRKSRC}/platforms/unix/npsqueak/npsqueakregister.in \ ${WRKSRC}/platforms/unix/npsqueak/npsqueakrun.in \ ${WRKSRC}/platforms/unix/npsqueak/Makefile diff --git a/lang/squeak-dev/files/patch-platforms::unix::npsqueak::Makefile b/lang/squeak-dev/files/patch-platforms::unix::npsqueak::Makefile index f8692044db87..d5def76a44c7 100644 --- a/lang/squeak-dev/files/patch-platforms::unix::npsqueak::Makefile +++ b/lang/squeak-dev/files/patch-platforms::unix::npsqueak::Makefile @@ -5,7 +5,7 @@ ############ Customize flags here ####################### -INC = -I./include -I/usr/X11R6/include -+INC = -I./include -I%%X11BASE%%/include ++INC = -I./include -I%%LOCALBASE%%/include CC = gcc CFLAGS = $(INC) -O2 -fPIC -Wall LD = gcc @@ -14,7 +14,7 @@ npsqueak.so : npsqueak.o npunix.o - $(LD) $(LDFLAGS) npsqueak.o npunix.o -o npsqueak.so -+ $(LD) $(LDFLAGS) npsqueak.o npunix.o -o npsqueak.so -L%%X11BASE%%/lib -lXt -lX11 ++ $(LD) $(LDFLAGS) npsqueak.o npunix.o -o npsqueak.so -L%%LOCALBASE%%/lib -lXt -lX11 npsqueak.o: npsqueak.c ../config.h $(CC) -c $(CFLAGS) -DVM_LIBDIR=\"$(VM_LIBDIR)\" $< diff --git a/lang/squeak-dev/files/patch-platforms::unix::npsqueak::npsqueakregister.in b/lang/squeak-dev/files/patch-platforms::unix::npsqueak::npsqueakregister.in index a4ba55ad46d4..a7bd917d2677 100644 --- a/lang/squeak-dev/files/patch-platforms::unix::npsqueak::npsqueakregister.in +++ b/lang/squeak-dev/files/patch-platforms::unix::npsqueak::npsqueakregister.in @@ -7,7 +7,7 @@ -BROWSERS="netscape mozilla mozilla-firefox opera MozillaFirefox/lib" -BROWSER_DIRS="/usr/local/lib /usr/lib /opt" +BROWSERS="netscape mozilla firefox opera seamonkey" -+BROWSER_DIRS="%%X11BASE%%/lib %%X11BASE%%/share %%LOCALBASE%%/lib %%LOCALBASE%%/share /usr/lib" ++BROWSER_DIRS="%%LOCALBASE%%/lib %%LOCALBASE%%/share %%LOCALBASE%%/lib %%LOCALBASE%%/share /usr/lib" SYSTEM_BROWSER_DIR="/usr/lib/browser-plugins" ACTION=register diff --git a/lang/squeak/Makefile b/lang/squeak/Makefile index 21693c893085..5aac2af4344c 100644 --- a/lang/squeak/Makefile +++ b/lang/squeak/Makefile @@ -85,8 +85,8 @@ INSTALL_WRKSRC= ${CONFIGURE_WRKSRC} CONFIGURE_SCRIPT= ../platforms/unix/config/configure CONFIGURE_ARGS+= --libdir=${PREFIX}/share \ --without-quartz \ - LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib" \ - CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" + LDFLAGS="-L${LOCALBASE}/lib" \ + CPPFLAGS="-I${LOCALBASE}/include" # don't pass "-s" to install to avoid trying to strip a shell script CONFIGURE_ENV= @@ -163,7 +163,6 @@ PLIST_SUB= IMAGEVERSION=${IMAGEVERSION}\ post-patch: @${REINPLACE_CMD} \ -e "s,%%LOCALBASE%%,${LOCALBASE},g" \ - -e "s,%%X11BASE%%,${X11BASE},g" \ ${WRKSRC}/platforms/unix/npsqueak/npsqueakregister.in \ ${WRKSRC}/platforms/unix/npsqueak/npsqueakrun.in \ ${WRKSRC}/platforms/unix/npsqueak/Makefile diff --git a/lang/squeak/files/patch-platforms::unix::npsqueak::Makefile b/lang/squeak/files/patch-platforms::unix::npsqueak::Makefile index f8692044db87..d5def76a44c7 100644 --- a/lang/squeak/files/patch-platforms::unix::npsqueak::Makefile +++ b/lang/squeak/files/patch-platforms::unix::npsqueak::Makefile @@ -5,7 +5,7 @@ ############ Customize flags here ####################### -INC = -I./include -I/usr/X11R6/include -+INC = -I./include -I%%X11BASE%%/include ++INC = -I./include -I%%LOCALBASE%%/include CC = gcc CFLAGS = $(INC) -O2 -fPIC -Wall LD = gcc @@ -14,7 +14,7 @@ npsqueak.so : npsqueak.o npunix.o - $(LD) $(LDFLAGS) npsqueak.o npunix.o -o npsqueak.so -+ $(LD) $(LDFLAGS) npsqueak.o npunix.o -o npsqueak.so -L%%X11BASE%%/lib -lXt -lX11 ++ $(LD) $(LDFLAGS) npsqueak.o npunix.o -o npsqueak.so -L%%LOCALBASE%%/lib -lXt -lX11 npsqueak.o: npsqueak.c ../config.h $(CC) -c $(CFLAGS) -DVM_LIBDIR=\"$(VM_LIBDIR)\" $< diff --git a/lang/squeak/files/patch-platforms::unix::npsqueak::npsqueakregister.in b/lang/squeak/files/patch-platforms::unix::npsqueak::npsqueakregister.in index a4ba55ad46d4..a7bd917d2677 100644 --- a/lang/squeak/files/patch-platforms::unix::npsqueak::npsqueakregister.in +++ b/lang/squeak/files/patch-platforms::unix::npsqueak::npsqueakregister.in @@ -7,7 +7,7 @@ -BROWSERS="netscape mozilla mozilla-firefox opera MozillaFirefox/lib" -BROWSER_DIRS="/usr/local/lib /usr/lib /opt" +BROWSERS="netscape mozilla firefox opera seamonkey" -+BROWSER_DIRS="%%X11BASE%%/lib %%X11BASE%%/share %%LOCALBASE%%/lib %%LOCALBASE%%/share /usr/lib" ++BROWSER_DIRS="%%LOCALBASE%%/lib %%LOCALBASE%%/share %%LOCALBASE%%/lib %%LOCALBASE%%/share /usr/lib" SYSTEM_BROWSER_DIR="/usr/lib/browser-plugins" ACTION=register diff --git a/lang/sr/Makefile b/lang/sr/Makefile index edc843d22602..f4cd2d4abc2d 100644 --- a/lang/sr/Makefile +++ b/lang/sr/Makefile @@ -20,7 +20,7 @@ COMMENT= A parallel language "Synchronization Resources" HAS_CONFIGURE= yes CONFIGURE_ARGS= prefix -CONFIGURE_ENV= PREFIX="${PREFIX}" X11BASE="${X11BASE}" +CONFIGURE_ENV= PREFIX="${PREFIX}" NO_WRKSUBDIR= yes MAN1 = sr.1 srl.1 srm.1 srprof.1 srtex.1 srlatex.1 srgrind.1 \ ccr2sr.1 m2sr.1 csp2sr.1 diff --git a/lang/sr/files/patch-aa b/lang/sr/files/patch-aa index 01b67d7c514e..b6c7a25c80fd 100644 --- a/lang/sr/files/patch-aa +++ b/lang/sr/files/patch-aa @@ -4,7 +4,7 @@ XINCL=/usr/include if [ -d /usr/X11/include/X11 ]; then XINCL=/usr/X11/include; fi if [ -d /usr/openwin/include/X11 ]; then XINCL=/usr/openwin/include; fi -+if [ -d ${X11BASE}/include/X11 ]; then XINCL=${X11BASE}/include; fi ++if [ -d ${LOCALBASE}/include/X11 ]; then XINCL=${LOCALBASE}/include; fi if [ ! -d $XINCL/X11 ]; then XINCL=; fi XTANGO=/home/sr/xtango/include @@ -14,15 +14,15 @@ +# on FreeBSD, set X11R6 library +if [ "`(uname -s) 2>/dev/null`" = "FreeBSD" ]; then -+ LIBR="-L${X11BASE}/lib" ++ LIBR="-L${LOCALBASE}/lib" +fi +# on OpenBSD, set X11R6 library +if [ "`(uname -s) 2>/dev/null`" = "OpenBSD" ]; then -+ LIBR="-L${X11BASE}/lib" ++ LIBR="-L${LOCALBASE}/lib" +fi +# on NetBSD, set X11R6 library +if [ "`(uname -s) 2>/dev/null`" = "NetBSD" ]; then -+ LIBR="-L${X11BASE}/lib" ++ LIBR="-L${LOCALBASE}/lib" +fi + # if this looks like an Arizona system, use our srmap file diff --git a/lang/xsb/Makefile b/lang/xsb/Makefile index a0fcba573685..de0110710c3c 100644 --- a/lang/xsb/Makefile +++ b/lang/xsb/Makefile @@ -9,14 +9,13 @@ PORTNAME= XSB PORTVERSION= 2.6 PORTREVISION= 1 CATEGORIES= lang -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR= ${PORTNAME:L} +MASTER_SITES= SF/${PORTNAME:L} DISTNAME= ${PORTNAME}-${PORTVERSION:S/./_/g} MAINTAINER= c.rued@xsb.com COMMENT= A tabled Logic Programming and Deductive Database system -BUILD_DEPENDS= makedepend:${X_IMAKE_PORT} +BUILD_DEPENDS= makedepend:${PORTSDIR}/devel/makedepend WRKSRC= ${WRKDIR}/XSB/build USE_GMAKE= yes diff --git a/lang/yabasic/Makefile b/lang/yabasic/Makefile index 67a3e5bd866e..48f48cfbd109 100644 --- a/lang/yabasic/Makefile +++ b/lang/yabasic/Makefile @@ -7,14 +7,14 @@ PORTNAME= yabasic PORTVERSION= 2.763 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= lang MASTER_SITES= http://www.yabasic.de/download/ MAINTAINER= ports@FreeBSD.org COMMENT= Yet another Basic for Unix and Windows -USE_XLIB= yes +USE_XORG= x11 ice sm xt USE_BISON= build GNU_CONFIGURE= yes CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} |