diff options
author | miwi <miwi@FreeBSD.org> | 2008-04-19 17:56:05 +0000 |
---|---|---|
committer | miwi <miwi@FreeBSD.org> | 2008-04-19 17:56:05 +0000 |
commit | bce9b81f9d6099820f3839d7809d6b08c1d2ae7b (patch) | |
tree | f5dd7c3a8dbebad79bdb5e844aeb69c59a9fd12c /cad | |
parent | 2eea5f1d2e44418020f8f4db08d40bea6915b6e8 (diff) | |
download | FreeBSD-ports-bce9b81f9d6099820f3839d7809d6b08c1d2ae7b.zip FreeBSD-ports-bce9b81f9d6099820f3839d7809d6b08c1d2ae7b.tar.gz |
- 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)
Diffstat (limited to 'cad')
62 files changed, 134 insertions, 147 deletions
diff --git a/cad/alliance/Makefile b/cad/alliance/Makefile index a35bebc..7395740 100644 --- a/cad/alliance/Makefile +++ b/cad/alliance/Makefile @@ -28,8 +28,6 @@ USE_MOTIF= yes HAS_CONFIGURE= yes CONFIGURE_ENV+= ALLIANCE_TOP=${ALLIANCE_TOP} CONFIGURE_ARGS+=--mandir=${MANPREFIX}/man \ - --x-libraries=${X11BASE}/lib \ - --x-includes=${X11BASE}/include \ --prefix=${ALLIANCE_TOP} ${CONFIGURE_TARGET} SUB_FILES= pkg-message diff --git a/cad/astk-serveur/Makefile b/cad/astk-serveur/Makefile index 0cebc04..b5c91ee 100644 --- a/cad/astk-serveur/Makefile +++ b/cad/astk-serveur/Makefile @@ -108,9 +108,9 @@ SHIA= zsh SHIADEP= ${SHIA} .if !defined(WITH_ED) -. if exists(${X11BASE}/bin/nedit) +. if exists(${LOCALBASE}/bin/nedit) WITH_ED= nedit -RUN_DEPENDS+= ${X11BASE}/bin/nedit:${PORTSDIR}/editors/nedit +RUN_DEPENDS+= ${LOCALBASE}/bin/nedit:${PORTSDIR}/editors/nedit . elif exists(${LOCALBASE}/bin/gvim) WITH_ED= gvim RUN_DEPENDS+= ${LOCALBASE}/bin/gvim:${PORTSDIR}/editors/vim @@ -125,10 +125,10 @@ WITH_ED= gedit RUN_DEPENDS+= ${LOCALBASE}/bin/gedit:${PORTSDIR}/editors/gedit . elif exists(${LOCALBASE}/bin/kwrite) WITH_ED= kwrite -RUN_DEPENDS+= ${X11BASE}/bin/kwrite:${PORTSDIR}/x11/kdebase3 +RUN_DEPENDS+= ${LOCALBASE}/bin/kwrite:${PORTSDIR}/x11/kdebase3 . elif exists(${LOCALBASE}/bin/xedit) WITH_ED= xedit -RUN_DEPENDS+= ${X11BASE}/bin/xedit:${PORTSDIR}/x11/xedit +RUN_DEPENDS+= ${LOCALBASE}/bin/xedit:${PORTSDIR}/x11/xedit . else WITH_ED= vi . endif @@ -206,12 +206,12 @@ do-configure: -e "s#?vaster?#${vaster}#" \ -e "s#?TOOLS_DIR?#${tools_dir}#" ${conf_dir}/outils ${REINPLACE_CMD} -e "s#?HOME_ASTK?#${inst_dir}#" \ - -e "s#?XTERM?#${X11BASE}/bin/xterm#" \ + -e "s#?XTERM?#${LOCALBASE}/bin/xterm#" \ -e "s#?FULL_SERVER_NAME?#${SERVER_NAME}#" \ -e "s#?SERVER_NAME?#${HOST_NAME}#" \ -e "s#?ASTER_ROOT?#${PREFIX}/aster#" \ -e "s#?EDITOR?#${WITH_ED}#" ${conf_dir}/config_serveurs - ${REINPLACE_CMD} -e "s#?XTERM?#${X11BASE}/bin/xterm#" \ + ${REINPLACE_CMD} -e "s#?XTERM?#${LOCALBASE}/bin/xterm#" \ -e "s#?ASTER_VERSION?#${ASTER_VER}#" \ -e "s#langue : ENG#langue : ${ASTK_LANG}#" \ -e "s#?DOMAIN_NAME?#${DOMAIN_NAME}#" \ diff --git a/cad/brlcad/Makefile b/cad/brlcad/Makefile index b827986..c652d59 100644 --- a/cad/brlcad/Makefile +++ b/cad/brlcad/Makefile @@ -7,7 +7,7 @@ PORTNAME= brlcad PORTVERSION= 7.10.4 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= cad MASTER_SITES= SF @@ -20,9 +20,9 @@ LIB_DEPENDS= png.5:${PORTSDIR}/graphics/png \ USE_AUTOTOOLS= libtool:15 USE_BZIP2= yes -USE_GL= yes +USE_GL= gl +USE_ORG= x11 xt USE_GMAKE= yes -USE_XLIB= yes USE_TK= 85 PREFIX?= ${LOCALBASE}/${PORTNAME} diff --git a/cad/calculix/Makefile b/cad/calculix/Makefile index 8dc41e4..3b12877 100644 --- a/cad/calculix/Makefile +++ b/cad/calculix/Makefile @@ -28,8 +28,7 @@ EXTRACT_ONLY+= ${DIST_EXAMPLES} MAINTAINER= maho@FreeBSD.org COMMENT= A Three-Dimensional Structural Finite Element Program -LIB_DEPENDS= glut.4:${PORTSDIR}/graphics/libglut \ - arpack.1:${PORTSDIR}/math/arpack \ +LIB_DEPENDS= arpack.1:${PORTSDIR}/math/arpack \ spooles.1:${PORTSDIR}/math/spooles \ metis.1:${PORTSDIR}/math/metis \ taucs.1:${PORTSDIR}/math/taucs @@ -47,7 +46,7 @@ DIST_EXAMPLES= ccx_${PORTVERSION}.test${EXTRACT_SUFX} \ WRKSRC= ${WRKDIR}/${PORTNAME} USE_GMAKE= yes -USE_GL= yes +USE_GL= glut BROWSER?= mozilla PSVIEWER?= gv @@ -97,8 +96,7 @@ pre-build: s+%%LAPACK_LIBS%%+${LAPACK_LIBS}+ ; \ s+%%LOCALBASE%%+${LOCALBASE}+g;' \ ${WRKSRC}/ccx_${PORTVERSION}/src/Makefile - @${REINPLACE_CMD} -e 's+%%X11BASE%%+${X11BASE}+g; \ - s+%%PTHREAD_CFLAGS%%+${PTHREAD_CFLAGS}+g; \ + @${REINPLACE_CMD} -e 's+%%PTHREAD_CFLAGS%%+${PTHREAD_CFLAGS}+g; \ s+%%PTHREAD_LIBS%%+${PTHREAD_LIBS}+g;' \ ${WRKSRC}/cgx_${PORTVERSION}/src/Makefile @${REINPLACE_CMD} -e 's+%%DOCSDIR%%+${DOCSDIR}+g; \ diff --git a/cad/calculix/files/patch-cgx_VER+src+Makefile b/cad/calculix/files/patch-cgx_VER+src+Makefile index 0ec0b69..d93c74c 100644 --- a/cad/calculix/files/patch-cgx_VER+src+Makefile +++ b/cad/calculix/files/patch-cgx_VER+src+Makefile @@ -6,17 +6,17 @@ -I./ \ -I/usr/include \ - -I/usr/include/GL \ -+ -I%%X11BASE%%/include/GL \ ++ -I$(LOCALBASE)/include/GL \ -I../../libSNL/src \ - -I/usr/X11/include -+ -I%%X11BASE%%/include ++ -I$(LOCALBASE)/include -LFLAGS = \ - -L/usr/lib -lGL -lGLU -lglut \ - -L/usr/X11/lib -lX11 -lXext -lXi -lXmu -lXt -lSM -lICE \ +LFLAGS += \ -+ -L%%X11BASE%%/lib -lGL -lGLU -lglut \ -+ -L%%X11BASE%%/lib -lX11 -lXext -lXi -lXmu -lXt -lSM -lICE \ ++ -L$(LOCALBASE)/lib -lGL -lGLU -lglut \ ++ -L$(LOCALBASE)/lib -lX11 -lXext -lXi -lXmu -lXt -lSM -lICE \ -lm # -L/usr/X11/lib64 -lpthread -lX11 -lXext -lXi -lXmu -lXt -lSM -lICE \ diff --git a/cad/chipmunk/Makefile b/cad/chipmunk/Makefile index 2a52744..7d14ce3 100644 --- a/cad/chipmunk/Makefile +++ b/cad/chipmunk/Makefile @@ -7,7 +7,7 @@ PORTNAME= chipmunk PORTVERSION= 5.64 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= cad MASTER_SITES= http://www.cs.berkeley.edu/~lazzaro/chipmunk/pickup/sources/ DISTFILES= psys-1.59.tar.gz log-5.64.tar.gz netcmp-1.13.tar.gz \ @@ -23,7 +23,7 @@ MAINTAINER= ports@FreeBSD.org COMMENT= An electronic CAD system NO_WRKSUBDIR= yes -USE_XLIB= yes +USE_XORG= x11 USE_GMAKE= yes .include <bsd.port.pre.mk> diff --git a/cad/chipmunk/files/patch-ad b/cad/chipmunk/files/patch-ad index e817242..2da2708 100644 --- a/cad/chipmunk/files/patch-ad +++ b/cad/chipmunk/files/patch-ad @@ -16,7 +16,7 @@ ## first one for OS X. -XINCLUDEDIR = . -+XINCLUDEDIR = ${X11BASE}/include ++XINCLUDEDIR = ${LOCALBASE}/include -BINDIR = ../../bin +BINDIR = ${PREFIX}/bin @@ -28,7 +28,7 @@ ## -LIBX11 = -lX11 -+LIBX11 = -lX11 -L${X11BASE}/lib ++LIBX11 = -lX11 -L${LOCALBASE}/lib ## ## (2) Library additions diff --git a/cad/chipmunk/files/patch-ae b/cad/chipmunk/files/patch-ae index 1f3c9cf..daad308 100644 --- a/cad/chipmunk/files/patch-ae +++ b/cad/chipmunk/files/patch-ae @@ -5,7 +5,7 @@ LOCINC = ../../../psys/include -XINCLUDEDIR = . -+XINCLUDEDIR = ${X11BASE}/include ++XINCLUDEDIR = ${LOCALBASE}/include ## ## (1) Choosing your compiler diff --git a/cad/chipmunk/files/patch-af b/cad/chipmunk/files/patch-af index 42cb565..ae3b823 100644 --- a/cad/chipmunk/files/patch-af +++ b/cad/chipmunk/files/patch-af @@ -23,7 +23,7 @@ ## first one for OS X. -XINCLUDEDIR = . -+XINCLUDEDIR = ${X11BASE}/include ++XINCLUDEDIR = ${LOCALBASE}/include ## ## If X isn't in the library path (the case for many MachTen and Linux @@ -32,7 +32,7 @@ ## -LIBX11 = -lX11 -+LIBX11 = -lX11 -L${X11BASE}/lib ++LIBX11 = -lX11 -L${LOCALBASE}/lib ## ## (3) Adding appropriate flags diff --git a/cad/chipmunk/files/patch-ah b/cad/chipmunk/files/patch-ah index 927e879..c505043 100644 --- a/cad/chipmunk/files/patch-ah +++ b/cad/chipmunk/files/patch-ah @@ -16,7 +16,7 @@ ## -XINCLUDEDIR = . -+XINCLUDEDIR = ${X11BASE}/include ++XINCLUDEDIR = ${LOCALBASE}/include ## ## (1) Choosing your compiler diff --git a/cad/chipmunk/files/patch-aj b/cad/chipmunk/files/patch-aj index 0bf1295..9560ddc 100644 --- a/cad/chipmunk/files/patch-aj +++ b/cad/chipmunk/files/patch-aj @@ -5,7 +5,7 @@ -XINCLUDEDIR = . -+XINCLUDEDIR = ${X11BASE}/include ++XINCLUDEDIR = ${LOCALBASE}/include ## ## If X isn't in the library path (the case for many MachTen and Linux @@ -14,7 +14,7 @@ -LIBX11 = -lX11 -+LIBX11 = -lX11 -L${X11BASE}/lib ++LIBX11 = -lX11 -L${LOCALBASE}/lib LIBP2C = ../../psys/src/libp2c.a diff --git a/cad/chipmunk/files/patch-au b/cad/chipmunk/files/patch-au index e941961..5a382b4 100644 --- a/cad/chipmunk/files/patch-au +++ b/cad/chipmunk/files/patch-au @@ -5,7 +5,7 @@ ## -XINCLUDEDIR = . -+XINCLUDEDIR = ${X11BASE}/include ++XINCLUDEDIR = ${LOCALBASE}/include ## ## If X isn't in the library path (the case for many MachTen and Linux @@ -14,7 +14,7 @@ ## -LIBX11 = -lX11 -+LIBX11 = -lX11 -L${X11BASE}/lib ++LIBX11 = -lX11 -L${LOCALBASE}/lib LIBP2C = ../psys/src/libp2c.a diff --git a/cad/chipmunk/files/patch-ay b/cad/chipmunk/files/patch-ay index 23aed95..8957470 100644 --- a/cad/chipmunk/files/patch-ay +++ b/cad/chipmunk/files/patch-ay @@ -5,7 +5,7 @@ ## -XINCLUDEDIR = . -+XINCLUDEDIR = ${X11BASE}/include ++XINCLUDEDIR = ${LOCALBASE}/include ## ## If X isn't in the library path (the case for many MachTen and Linux @@ -14,7 +14,7 @@ ## -LIBX11 = -lX11 -+LIBX11 = -lX11 -L${X11BASE}/lib ++LIBX11 = -lX11 -L${LOCALBASE}/lib diff --git a/cad/chipmunk/files/patch-az b/cad/chipmunk/files/patch-az index 2bd2b0f..9e62e23 100644 --- a/cad/chipmunk/files/patch-az +++ b/cad/chipmunk/files/patch-az @@ -14,7 +14,7 @@ ## -XINCLUDEDIR = . -+XINCLUDEDIR = ${X11BASE}/include ++XINCLUDEDIR = ${LOCALBASE}/include ## diff --git a/cad/cider/Makefile b/cad/cider/Makefile index 58bd9aa..726fdda 100644 --- a/cad/cider/Makefile +++ b/cad/cider/Makefile @@ -7,7 +7,7 @@ PORTNAME= cider PORTVERSION= 1.b1 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= cad MASTER_SITES= ${MASTER_SITE_LOCAL} MASTER_SITE_SUBDIR= mita @@ -18,11 +18,11 @@ COMMENT= A mixed-level circuit and device simulator (includes SPICE3) CONFLICTS= spice-[0-9]* WRKSRC= ${WRKDIR}/sim -USE_XLIB= yes MAN1= sconvert.1 nutmeg.1 spice.1 cider.1 MAN3= mfb.3 MAN5= mfbcap.5 MLINKS= spice.1 spice3.1 +USE_XORG= xt xaw xmu MAKE_ENV+= CC="${CC}" diff --git a/cad/cider/files/FreeBSD b/cad/cider/files/FreeBSD index a0906fa..340d053 100644 --- a/cad/cider/files/FreeBSD +++ b/cad/cider/files/FreeBSD @@ -4,7 +4,7 @@ MAKE = /usr/bin/make INTERFACE_OPTS = -DWANT_X11 CC_OPT = $(CFLAGS) #CC_OPT_SAFE = $(CFLAGS) -fno-strength-reduce -X_DIR = $(X11BASE) -LDFLAGS = -L$(X11BASE)/lib -lm -ltermcap +X_DIR = $(LOCALBASE) +LDFLAGS = -L$(LOCALBASE)/lib -lm -ltermcap ASM_HACK = < /dev/null SYS_CFLAGS = -Dbsd diff --git a/cad/dinotrace/Makefile b/cad/dinotrace/Makefile index 862b754..8c604b2 100644 --- a/cad/dinotrace/Makefile +++ b/cad/dinotrace/Makefile @@ -7,7 +7,7 @@ PORTNAME= dinotrace DISTVERSION= 9.3b -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= cad MASTER_SITES= http://www.veripool.com/ftp/ EXTRACT_SUFX= .tgz @@ -19,7 +19,7 @@ USE_GNOME= gnometarget GNU_CONFIGURE= yes USE_MOTIF= yes USE_PERL5_BUILD= yes -USE_X_PREFIX= yes +USE_XORG= x11 sm ice xmu xt USE_GMAKE= yes INFO= dinotrace diff --git a/cad/electric/Makefile b/cad/electric/Makefile index 52abcdf..854642e 100644 --- a/cad/electric/Makefile +++ b/cad/electric/Makefile @@ -58,7 +58,7 @@ post-patch: s|%%LOCALBASE%%|${LOCALBASE}|g; \ s|@PTHREAD_LIBS@|${PTHREAD_LIBS:S/"//g}|' \ ${WRKSRC}/Makefile.in - @${REINPLACE_CMD} -e 's|/usr/X11R6/|${X11BASE}/|' ${WRKSRC}/configure + @${REINPLACE_CMD} -e 's|/usr/X11R6/|${LOCALBASE}/|' ${WRKSRC}/configure .for FEATURE in ${FEATURES} @${REINPLACE_CMD} -e 's|#%%${FEATURE}%%||g' ${WRKSRC}/Makefile.in .endfor diff --git a/cad/feappv/Makefile b/cad/feappv/Makefile index fcb35f7..02c0d70 100644 --- a/cad/feappv/Makefile +++ b/cad/feappv/Makefile @@ -7,7 +7,7 @@ PORTNAME= feappv PORTVERSION= 2.0 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= cad science MASTER_SITES= http://www.ce.berkeley.edu/~rlt/feappv/ MASTER_SITE_SUBDIR= feap @@ -25,7 +25,7 @@ USE_ZIP= yes EXTRACT_BEFORE_ARGS= -L WRKSRC= ${WRKDIR}/ver20 -USE_XLIB= yes +USE_XORG= x11 USE_FORTRAN= yes FFLAGS+= -O2 MAKEFILE= makefile @@ -34,7 +34,7 @@ ALL_TARGET= install post-patch: @${REINPLACE_CMD} -e 's+%%FC%%+${FC}+g; s+%%CC%%+${CC}+g; \ s+%%FFLAGS%%+${FFLAGS}+g; s+%%CFLAGS%%+${CFLAGS}+g; \ - s+/usr/X11R6+${X11BASE}+g; s+%%WRKSRC%%+${WRKSRC}+;' \ + s+/usr/X11R6+${LOCALBASE}+g; s+%%WRKSRC%%+${WRKSRC}+;' \ ${WRKSRC}/makefile.in do-install: diff --git a/cad/freehdl/Makefile b/cad/freehdl/Makefile index 8199fb0..fda08c1 100644 --- a/cad/freehdl/Makefile +++ b/cad/freehdl/Makefile @@ -7,7 +7,7 @@ PORTNAME= freehdl PORTVERSION= 0.0.4 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= cad MASTER_SITES= http://www.home.hs-karlsruhe.de/~fado0011/ \ http://cran.mit.edu/~enaroska/ @@ -19,10 +19,8 @@ USE_GMAKE= yes USE_LDCONFIG= yes USE_PERL5= yes HAS_CONFIGURE= yes -CONFIGURE_ARGS= --x-libraries=${X11BASE}/lib \ - --prefix=${PREFIX} \ - --mandir=${MANPREFIX}/man \ - --infodir=${PREFIX}/info +CONFIGURE_ARGS= --infodir=${PREFIX}/info \ + --mandir=${MANPREFIX}/man MAN1= freehdl-config.1 \ freehdl-gennodes.1 \ diff --git a/cad/gmsh/Makefile b/cad/gmsh/Makefile index 8bab0a0..2f4848c 100644 --- a/cad/gmsh/Makefile +++ b/cad/gmsh/Makefile @@ -28,7 +28,7 @@ TETGEN_SRC= predicates.cxx tetgen.cxx tetgen.h GNU_CONFIGURE= yes CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} -CONFIGURE_ARGS= --with-fltk-prefix=${X11BASE} \ +CONFIGURE_ARGS= --with-fltk-prefix=${LOCALBASE} \ --with-gsl-prefix=${LOCALBASE} \ --with-jpeg-prefix=${LOCALBASE} \ --with-png-prefix=${LOCALBASE} diff --git a/cad/gspiceui/files/patch-src_Makefile b/cad/gspiceui/files/patch-src_Makefile index 1b813dc..e53a6a5 100644 --- a/cad/gspiceui/files/patch-src_Makefile +++ b/cad/gspiceui/files/patch-src_Makefile @@ -25,7 +25,7 @@ # Includes -INCLUDES = -I/usr/include -I/usr/X11R6/include -I. -+INCLUDES = -I/usr/include -I${X11BASE}/include -I. $(shell /usr/local/bin/wxgtk2u-2.8-config --cxxflags) ++INCLUDES = -I/usr/include -I${LOCALBASE}/include -I. $(shell /usr/local/bin/wxgtk2u-2.8-config --cxxflags) # Libraries # (The pkg-config stuff was requested by a user, somehow pangox was missing) diff --git a/cad/gtkwave/Makefile b/cad/gtkwave/Makefile index 7afb580..8b3b19e 100644 --- a/cad/gtkwave/Makefile +++ b/cad/gtkwave/Makefile @@ -23,7 +23,7 @@ USE_AUTOTOOLS= libtool:15 USE_GNOME= gtk12 GNU_CONFIGURE= yes CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes LDCONFIG_DIRS= ${PREFIX}/lib/gtkwave DOCS= doc/*.html doc/*.png doc/*.ps diff --git a/cad/gwave/Makefile b/cad/gwave/Makefile index 8729cee..e688337 100644 --- a/cad/gwave/Makefile +++ b/cad/gwave/Makefile @@ -20,8 +20,8 @@ LIB_DEPENDS= guile.18:${PORTSDIR}/lang/guile \ USE_GNOME= gtk12 GNU_CONFIGURE= yes USE_GMAKE= yes -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \ - LIBS="-L${LOCALBASE}/lib -L${X11BASE}/lib" +CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ + LIBS="-L${LOCALBASE}/lib" OPTIONS= PLOTUTILS "Use GNU plotutils for plotting" off \ GNUPLOT "Use gnuplot for plotting" on \ diff --git a/cad/irsim/Makefile b/cad/irsim/Makefile index db778e9..5890dd2 100644 --- a/cad/irsim/Makefile +++ b/cad/irsim/Makefile @@ -7,7 +7,7 @@ PORTNAME= irsim PORTVERSION= 9.7.64 -PORTREVISION= 0 +PORTREVISION= 1 CATEGORIES= cad MASTER_SITES= http://opencircuitdesign.com/irsim/archive/ EXTRACT_SUFX= .tgz @@ -15,13 +15,13 @@ EXTRACT_SUFX= .tgz MAINTAINER= stas@FreeBSD.org COMMENT= An event-driven logic-level simulator for MOS circuis -USE_XLIB= yes +USE_XORG= x11 USE_GMAKE= yes GNU_CONFIGURE= yes CONFIGURE_WRKSRC= ${WRKSRC}/scripts/ -CFLAGS+= -I${X11BASE}/include -LDFLAGS+= -L${X11BASE}/lib +CFLAGS+= -I${LOCALBASE}/include +LDFLAGS+= -L${LOCALBASE}/lib CONFIGURE_ENV+= PIC_CFLAGS="-fpic" LDFLAGS="${LDFLAGS}" \ PTHREAD_LIBS="${PTHREAD_LIBS}" diff --git a/cad/jspice3/Makefile b/cad/jspice3/Makefile index 4383654..d2ed545 100644 --- a/cad/jspice3/Makefile +++ b/cad/jspice3/Makefile @@ -7,7 +7,7 @@ PORTNAME= jspice3 PORTVERSION= 2.5 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= cad MASTER_SITES= http://www.wrcad.com/ftp/pub/ \ ftp://ftp.srware.com/pub/ @@ -22,7 +22,7 @@ OPTIONS= X "Use X window system" on .include <bsd.port.pre.mk> .if !defined(WITHOUT_X) -USE_XLIB= yes +USE_XORG= x11 xaw xt .endif pre-configure: diff --git a/cad/jspice3/files/patch-build b/cad/jspice3/files/patch-build index 23dd41e..9fd79ec 100644 --- a/cad/jspice3/files/patch-build +++ b/cad/jspice3/files/patch-build @@ -14,7 +14,7 @@ if [ -f conf/util/configure ]; then cd conf - util/configure -srcdir . -+ util/configure -srcdir . --prefix=${PREFIX} -x-includes="${X11BASE}/include" -x-libraries="${X11BASE}/lib" ++ util/configure -srcdir . --prefix=${PREFIX} -x-includes="${LOCALBASE}/include" -x-libraries="${LOCALBASE}/lib" if [ ! -f ../src/include/config.h ] || \ [ "`diff config.h ../src/include/config.h |head`" ]; then echo Installing config.h diff --git a/cad/kicad-devel/Makefile b/cad/kicad-devel/Makefile index 050d793..902c2be 100644 --- a/cad/kicad-devel/Makefile +++ b/cad/kicad-devel/Makefile @@ -74,16 +74,16 @@ pre-configure: ${REINPLACE_CMD} -e 's|CC = gcc|#CC = gcc|' \ -e 's|LD = gcc|LD = ${CC}|' \ -e 's|LD = g++|LD = ${CXX}|' \ - -e 's|-O2|${CFLAGS} -I${X11BASE}/include|' \ + -e 's|-O2|${CFLAGS} -I${LOCALBASE}/include|' \ -e 's|wx-config|${WX_CONFIG}|' \ - -e 's|LDFLAGS =|LDFLAGS += -L${X11BASE}/lib|' \ + -e 's|LDFLAGS =|LDFLAGS += -L${LOCALBASE}/lib|' \ -e 's|libs.linux|libs.${OPSYS}|' \ -e 's|gcc -D|${CC} -D|' $$f ; \ done ${REINPLACE_CMD} -e 's|kicad/linux|${INSTDIR}/${OPSYS}|' \ -e 's|/usr/share/kicad|${PREFIX}/${INSTDIR}|' \ -e 's|/usr/local|${PREFIX}|' ${WRKSRC}/common/gestfich.cpp - ${REINPLACE_CMD} -e 's|/usr/bin/xpdf|${X11BASE}/bin/xpdf|' \ + ${REINPLACE_CMD} -e 's|/usr/bin/xpdf|${LOCALBASE}/bin/xpdf|' \ -e 's|/usr/bin/konqueror|${LOCALBASE}/bin/konqueror|' \ ${WRKSRC}/common/eda_doc.cpp diff --git a/cad/kicad-devel/files/patch-3d-viewer_makefile.include b/cad/kicad-devel/files/patch-3d-viewer_makefile.include index 4afef4e..e0ae0ad 100644 --- a/cad/kicad-devel/files/patch-3d-viewer_makefile.include +++ b/cad/kicad-devel/files/patch-3d-viewer_makefile.include @@ -3,7 +3,7 @@ @@ -1,5 +1,5 @@ EXTRALIBS = -EXTRACPPFLAGS= -I./ -I../include -I../common -I../pcbnew -+EXTRACPPFLAGS= -I./ -I../include -I../common -I../pcbnew -I${X11BASE}/include ++EXTRACPPFLAGS= -I./ -I../include -I../common -I../pcbnew -I${LOCALBASE}/include CPPFLAGS += $(EXTRACPPFLAGS) diff --git a/cad/kicad-devel/files/patch-cvpcb_makefile.include b/cad/kicad-devel/files/patch-cvpcb_makefile.include index abe33ee..89f4e6c 100644 --- a/cad/kicad-devel/files/patch-cvpcb_makefile.include +++ b/cad/kicad-devel/files/patch-cvpcb_makefile.include @@ -5,7 +5,7 @@ OBJSUFF = o -EXTRACPPFLAGS += -DCVPCB -fno-strict-aliasing -I./ -I../cvpcb -I../include -Ibitmaps -I../pcbnew -I../3d-viewer -+EXTRACPPFLAGS += -DCVPCB -fno-strict-aliasing -I./ -I../cvpcb -I../include -Ibitmaps -I../pcbnew -I../3d-viewer -I${X11BASE}/include ++EXTRACPPFLAGS += -DCVPCB -fno-strict-aliasing -I./ -I../cvpcb -I../include -Ibitmaps -I../pcbnew -I../3d-viewer -I${LOCALBASE}/include EXTRALIBS = ../common/common.a LIBVIEWER3D = ../3d-viewer/3d-viewer.a diff --git a/cad/kicad-devel/files/patch-gerbview_makefile.include b/cad/kicad-devel/files/patch-gerbview_makefile.include index 0479d92..72f76b6 100644 --- a/cad/kicad-devel/files/patch-gerbview_makefile.include +++ b/cad/kicad-devel/files/patch-gerbview_makefile.include @@ -4,7 +4,7 @@ EXTRALIBS = ../common/common.a EXTRACPPFLAGS= -DGERBVIEW -DPCBNEW -fno-strict-aliasing -I./ -I../gerbview -I../include\ - -I../share -I../pcbnew -I../3d-viewer -+ -I../share -I../pcbnew -I../3d-viewer -I${X11BASE}/include ++ -I../share -I../pcbnew -I../3d-viewer -I${LOCALBASE}/include #COMMON = pcbnew.h struct.h diff --git a/cad/kicad-devel/files/patch-libs.FreeBSD b/cad/kicad-devel/files/patch-libs.FreeBSD index ceff283..faea1d4 100644 --- a/cad/kicad-devel/files/patch-libs.FreeBSD +++ b/cad/kicad-devel/files/patch-libs.FreeBSD @@ -116,7 +116,7 @@ + -lz\ $(LIBREGEX)\ - /usr/X11R6/lib/libXinerama.a \ -+ ${X11BASE}/lib/libXinerama.a \ ++ ${LOCALBASE}/lib/libXinerama.a \ -lgtk-x11-2.0 -lgdk-x11-2.0 \ -latk-1.0 -lgdk_pixbuf-2.0 -lm -lpangoxft-1.0 -lpangox-1.0 -lgthread-2.0\ -lpango-1.0 -lgobject-2.0 -lgmodule-2.0 -ldl\ @@ -133,8 +133,8 @@ $(LIBS3D)\ - /usr/X11R6/lib/libXinerama.a \ - /usr/X11R6/lib/libXxf86vm.a \ -+ ${X11BASE}/lib/libXinerama.a \ -+ ${X11BASE}/lib/libXxf86vm.a \ ++ ${LOCALBASE}/lib/libXinerama.a \ ++ ${LOCALBASE}/lib/libXxf86vm.a \ -lgtk-x11-2.0 -lgdk-x11-2.0 \ -latk-1.0 -lgdk_pixbuf-2.0 -lm -lpangoxft-1.0 -lpangox-1.0 -lgthread-2.0\ -lpango-1.0 -lgobject-2.0 -lgmodule-2.0 -ldl\ @@ -162,11 +162,11 @@ # attention à l'ordre des libairies -LIBS = -L/usr/local/lib -L/usr/X11R6/lib\ -+LIBS = -L${LOCALBASE}/lib -L${X11BASE}/lib\ ++LIBS = -L${LOCALBASE}/lib\ $(EXTRALIBS) $(WXSYSLIB)\ $(LIBSTDC) $(PYLIBS) -LIBS_WITH_GL = -L/usr/local/lib -L/usr/X11R6/lib\ -+LIBS_WITH_GL = -L${LOCALBASE}/lib -L${X11BASE}/lib\ ++LIBS_WITH_GL = -L${LOCALBASE}/lib\ $(EXTRALIBS) $(WXSYSLIB_WITH_GL)\ $(LIBSTDC) $(PYLIBS) diff --git a/cad/kicad-devel/files/patch-pcbnew_makefile.include b/cad/kicad-devel/files/patch-pcbnew_makefile.include index 69b12eb..d680604 100644 --- a/cad/kicad-devel/files/patch-pcbnew_makefile.include +++ b/cad/kicad-devel/files/patch-pcbnew_makefile.include @@ -3,7 +3,7 @@ @@ -1,5 +1,5 @@ EXTRALIBS = ../common/common.a -EXTRACPPFLAGS += -DPCBNEW -fno-strict-aliasing -I./ -Ibitmaps -I../include -I../share -I../pcbnew -I../3d-viewer -+EXTRACPPFLAGS += -DPCBNEW -fno-strict-aliasing -I./ -Ibitmaps -I../include -I../share -I../pcbnew -I../3d-viewer -I${X11BASE}/include ++EXTRACPPFLAGS += -DPCBNEW -fno-strict-aliasing -I./ -Ibitmaps -I../include -I../share -I../pcbnew -I../3d-viewer -I${LOCALBASE}/include #COMMON = pcbnew.h struct.h class_pad.h class_module.h class_text_mod.h \ # class_edge_mod.h class_equipot.h diff --git a/cad/kicad/Makefile b/cad/kicad/Makefile index 050d793..902c2be 100644 --- a/cad/kicad/Makefile +++ b/cad/kicad/Makefile @@ -74,16 +74,16 @@ pre-configure: ${REINPLACE_CMD} -e 's|CC = gcc|#CC = gcc|' \ -e 's|LD = gcc|LD = ${CC}|' \ -e 's|LD = g++|LD = ${CXX}|' \ - -e 's|-O2|${CFLAGS} -I${X11BASE}/include|' \ + -e 's|-O2|${CFLAGS} -I${LOCALBASE}/include|' \ -e 's|wx-config|${WX_CONFIG}|' \ - -e 's|LDFLAGS =|LDFLAGS += -L${X11BASE}/lib|' \ + -e 's|LDFLAGS =|LDFLAGS += -L${LOCALBASE}/lib|' \ -e 's|libs.linux|libs.${OPSYS}|' \ -e 's|gcc -D|${CC} -D|' $$f ; \ done ${REINPLACE_CMD} -e 's|kicad/linux|${INSTDIR}/${OPSYS}|' \ -e 's|/usr/share/kicad|${PREFIX}/${INSTDIR}|' \ -e 's|/usr/local|${PREFIX}|' ${WRKSRC}/common/gestfich.cpp - ${REINPLACE_CMD} -e 's|/usr/bin/xpdf|${X11BASE}/bin/xpdf|' \ + ${REINPLACE_CMD} -e 's|/usr/bin/xpdf|${LOCALBASE}/bin/xpdf|' \ -e 's|/usr/bin/konqueror|${LOCALBASE}/bin/konqueror|' \ ${WRKSRC}/common/eda_doc.cpp diff --git a/cad/kicad/files/patch-3d-viewer_makefile.include b/cad/kicad/files/patch-3d-viewer_makefile.include index 4afef4e..e0ae0ad 100644 --- a/cad/kicad/files/patch-3d-viewer_makefile.include +++ b/cad/kicad/files/patch-3d-viewer_makefile.include @@ -3,7 +3,7 @@ @@ -1,5 +1,5 @@ EXTRALIBS = -EXTRACPPFLAGS= -I./ -I../include -I../common -I../pcbnew -+EXTRACPPFLAGS= -I./ -I../include -I../common -I../pcbnew -I${X11BASE}/include ++EXTRACPPFLAGS= -I./ -I../include -I../common -I../pcbnew -I${LOCALBASE}/include CPPFLAGS += $(EXTRACPPFLAGS) diff --git a/cad/kicad/files/patch-cvpcb_makefile.include b/cad/kicad/files/patch-cvpcb_makefile.include index abe33ee..89f4e6c 100644 --- a/cad/kicad/files/patch-cvpcb_makefile.include +++ b/cad/kicad/files/patch-cvpcb_makefile.include @@ -5,7 +5,7 @@ OBJSUFF = o -EXTRACPPFLAGS += -DCVPCB -fno-strict-aliasing -I./ -I../cvpcb -I../include -Ibitmaps -I../pcbnew -I../3d-viewer -+EXTRACPPFLAGS += -DCVPCB -fno-strict-aliasing -I./ -I../cvpcb -I../include -Ibitmaps -I../pcbnew -I../3d-viewer -I${X11BASE}/include ++EXTRACPPFLAGS += -DCVPCB -fno-strict-aliasing -I./ -I../cvpcb -I../include -Ibitmaps -I../pcbnew -I../3d-viewer -I${LOCALBASE}/include EXTRALIBS = ../common/common.a LIBVIEWER3D = ../3d-viewer/3d-viewer.a diff --git a/cad/kicad/files/patch-gerbview_makefile.include b/cad/kicad/files/patch-gerbview_makefile.include index 0479d92..72f76b6 100644 --- a/cad/kicad/files/patch-gerbview_makefile.include +++ b/cad/kicad/files/patch-gerbview_makefile.include @@ -4,7 +4,7 @@ EXTRALIBS = ../common/common.a EXTRACPPFLAGS= -DGERBVIEW -DPCBNEW -fno-strict-aliasing -I./ -I../gerbview -I../include\ - -I../share -I../pcbnew -I../3d-viewer -+ -I../share -I../pcbnew -I../3d-viewer -I${X11BASE}/include ++ -I../share -I../pcbnew -I../3d-viewer -I${LOCALBASE}/include #COMMON = pcbnew.h struct.h diff --git a/cad/kicad/files/patch-libs.FreeBSD b/cad/kicad/files/patch-libs.FreeBSD index ceff283..faea1d4 100644 --- a/cad/kicad/files/patch-libs.FreeBSD +++ b/cad/kicad/files/patch-libs.FreeBSD @@ -116,7 +116,7 @@ + -lz\ $(LIBREGEX)\ - /usr/X11R6/lib/libXinerama.a \ -+ ${X11BASE}/lib/libXinerama.a \ ++ ${LOCALBASE}/lib/libXinerama.a \ -lgtk-x11-2.0 -lgdk-x11-2.0 \ -latk-1.0 -lgdk_pixbuf-2.0 -lm -lpangoxft-1.0 -lpangox-1.0 -lgthread-2.0\ -lpango-1.0 -lgobject-2.0 -lgmodule-2.0 -ldl\ @@ -133,8 +133,8 @@ $(LIBS3D)\ - /usr/X11R6/lib/libXinerama.a \ - /usr/X11R6/lib/libXxf86vm.a \ -+ ${X11BASE}/lib/libXinerama.a \ -+ ${X11BASE}/lib/libXxf86vm.a \ ++ ${LOCALBASE}/lib/libXinerama.a \ ++ ${LOCALBASE}/lib/libXxf86vm.a \ -lgtk-x11-2.0 -lgdk-x11-2.0 \ -latk-1.0 -lgdk_pixbuf-2.0 -lm -lpangoxft-1.0 -lpangox-1.0 -lgthread-2.0\ -lpango-1.0 -lgobject-2.0 -lgmodule-2.0 -ldl\ @@ -162,11 +162,11 @@ # attention à l'ordre des libairies -LIBS = -L/usr/local/lib -L/usr/X11R6/lib\ -+LIBS = -L${LOCALBASE}/lib -L${X11BASE}/lib\ ++LIBS = -L${LOCALBASE}/lib\ $(EXTRALIBS) $(WXSYSLIB)\ $(LIBSTDC) $(PYLIBS) -LIBS_WITH_GL = -L/usr/local/lib -L/usr/X11R6/lib\ -+LIBS_WITH_GL = -L${LOCALBASE}/lib -L${X11BASE}/lib\ ++LIBS_WITH_GL = -L${LOCALBASE}/lib\ $(EXTRALIBS) $(WXSYSLIB_WITH_GL)\ $(LIBSTDC) $(PYLIBS) diff --git a/cad/kicad/files/patch-pcbnew_makefile.include b/cad/kicad/files/patch-pcbnew_makefile.include index 69b12eb..d680604 100644 --- a/cad/kicad/files/patch-pcbnew_makefile.include +++ b/cad/kicad/files/patch-pcbnew_makefile.include @@ -3,7 +3,7 @@ @@ -1,5 +1,5 @@ EXTRALIBS = ../common/common.a -EXTRACPPFLAGS += -DPCBNEW -fno-strict-aliasing -I./ -Ibitmaps -I../include -I../share -I../pcbnew -I../3d-viewer -+EXTRACPPFLAGS += -DPCBNEW -fno-strict-aliasing -I./ -Ibitmaps -I../include -I../share -I../pcbnew -I../3d-viewer -I${X11BASE}/include ++EXTRACPPFLAGS += -DPCBNEW -fno-strict-aliasing -I./ -Ibitmaps -I../include -I../share -I../pcbnew -I../3d-viewer -I${LOCALBASE}/include #COMMON = pcbnew.h struct.h class_pad.h class_module.h class_text_mod.h \ # class_edge_mod.h class_equipot.h diff --git a/cad/leocad/Makefile b/cad/leocad/Makefile index bf612471..85acf2e 100644 --- a/cad/leocad/Makefile +++ b/cad/leocad/Makefile @@ -39,8 +39,7 @@ post-extract: post-patch: @${REINPLACE_CMD} -e \ - 's|%%X11BASE%%|${X11BASE}|g; \ - s|%%LOCALBASE%%|${LOCALBASE}|g; \ + 's|%%LOCALBASE%%|${LOCALBASE}|g; \ s|%%PTHREAD_CFLAGS%%|${PTHREAD_CFLAGS}|; \ s|%%PTHREAD_LIBS%%|${PTHREAD_LIBS}|' \ ${WRKSRC}/config.mk diff --git a/cad/leocad/files/patch-config.mk b/cad/leocad/files/patch-config.mk index 8f9dc51..262869e 100644 --- a/cad/leocad/files/patch-config.mk +++ b/cad/leocad/files/patch-config.mk @@ -22,7 +22,7 @@ $FreeBSD$ OS := -DLC_LINUX OSDIR := linux -PREFIX := /usr/local -+PREFIX := %%X11BASE%% ++PREFIX := %%LOCALBASE%% GTK_CONFIG := gtk12-config -CPPFLAGS += -L/usr/local/lib +CPPFLAGS += ${CFLAGS} -L%%LOCALBASE%%/lib -I%%LOCALBASE%%/include %%PTHREAD_CFLAGS%% diff --git a/cad/linux-gid/Makefile b/cad/linux-gid/Makefile index 03d2d9d..3723dfa 100644 --- a/cad/linux-gid/Makefile +++ b/cad/linux-gid/Makefile @@ -20,7 +20,7 @@ CONFLICTS= id-utils-[0-9]* coreutils-[0-9]* ONLY_FOR_ARCHS= i386 USE_LINUX= yes -#USE_X_PREFIX= yes +USE_XLIB= yes REINPLACE_ARGS= -i "" NO_WRKSUBDIR= yes NO_BUILD= yes diff --git a/cad/magic/Makefile b/cad/magic/Makefile index 0055457..5b0e758 100644 --- a/cad/magic/Makefile +++ b/cad/magic/Makefile @@ -7,16 +7,16 @@ PORTNAME= magic PORTVERSION= 7.1 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= cad MASTER_SITES= http://vlsi.cornell.edu/magic/ MAINTAINER= ports@FreeBSD.org COMMENT= An interactive editor for VLSI layouts -USE_XLIB= yes +USE_XORG= x11 USE_GMAKE= yes -MAKE_ENV= CADDIR="${PREFIX}" X11BASE="${X11BASE}" +MAKE_ENV= CADDIR="${PREFIX}" ALL_TARGET= mains BINS= XHelper7 ext2sim ext2spice extcheck magic magicusage net2ir diff --git a/cad/magic/files/defs.mak b/cad/magic/files/defs.mak index fd1f5c3..3082889 100644 --- a/cad/magic/files/defs.mak +++ b/cad/magic/files/defs.mak @@ -28,9 +28,9 @@ READLINE_LIBS = -lreadline -ltermcap DEPEND_FLAG = -MM DEPEND_FILE = Depend -GR_CFLAGS = -I${X11BASE}/include +GR_CFLAGS = -I${LOCALBASE}/include GR_DFLAGS = -DX11 -DXLIB -DX11HELP_PROG=\"${X11HELP_PROG}\" -GR_LIBS = -L${X11BASE}/lib -lX11 +GR_LIBS = -L${LOCALBASE}/lib -lX11 GR_SRCS = ${X11_SRCS} GR_HELPER_SRCS = ${X11HELPER_SRCS} GR_HELPER_PROG = ${X11HELP_PROG} diff --git a/cad/mars/files/patch-01 b/cad/mars/files/patch-01 index ac8f7e7..899605d 100644 --- a/cad/mars/files/patch-01 +++ b/cad/mars/files/patch-01 @@ -6,8 +6,8 @@ # only if they are not in a standard directory. -LIBDIRS = -INCDIRS = -+LIBDIRS = -L${X11BASE}/lib -+INCDIRS = -I${X11BASE}/include ++LIBDIRS = -L${LOCALBASE}/lib ++INCDIRS = -I${LOCALBASE}/include #LIBDIRS = -L/usr/imports/lib/X11R5 #INCDIRS = -I/usr/imports/include diff --git a/cad/mars/files/patch-08 b/cad/mars/files/patch-08 index e30b943..ffb4e6c 100644 --- a/cad/mars/files/patch-08 +++ b/cad/mars/files/patch-08 @@ -6,8 +6,8 @@ # only if they are not in a standard directory. -LIBDIRS = -INCDIRS = -+LIBDIRS = -L$(X11BASE)/lib -+INCDIRS = -I$(X11BASE)/include ++LIBDIRS = -L$(LOCALBASE)/lib ++INCDIRS = -I$(LOCALBASE)/include #LIBDIRS = -L/usr/imports/lib/X11R5 #INCDIRS = -I/usr/imports/include/X11R5 -I/usr/imports/include diff --git a/cad/netgen/files/patch-libsrc::makefile.mach.FREEBSD b/cad/netgen/files/patch-libsrc::makefile.mach.FREEBSD index 5632330..a42eb4c8 100644 --- a/cad/netgen/files/patch-libsrc::makefile.mach.FREEBSD +++ b/cad/netgen/files/patch-libsrc::makefile.mach.FREEBSD @@ -6,13 +6,13 @@ CFLAGS2 = -CPLUSPLUSFLAGS2 = $(CXXFLAGS) -I$(X11BASE)/include -DLINUX -DOPENGL -CPLUSPLUSFLAGS3 = -I$(LIBSRC_DIR)/step `echo $(TCL_INCLUDE_SPEC)` `echo -I$(TK_PREFIX)`/include/tk`echo $(TK_VERSION)` -+CPLUSPLUSFLAGS2 = $(CXXFLAGS) -I$(X11BASE)/include -DFREEBSD -DOPENGL -DNGSOLVE \ ++CPLUSPLUSFLAGS2 = $(CXXFLAGS) -I$(LOCALBASE)/include -DFREEBSD -DOPENGL -DNGSOLVE \ + -ftemplate-depth-99 -finline-limit=20000 \ + -funroll-loops + +CPLUSPLUSFLAGS3 = -I$(LIBSRC_DIR)/step -I$(TCL_INCLUDEDIR) -I$(TK_INCLUDEDIR) # - LINKFLAGS2 = -L$(LOCALBASE)/lib -L$(X11BASE)/lib + LINKFLAGS2 = -L$(LOCALBASE)/lib SYSLIB2 = -lstdc++ + diff --git a/cad/netgen/files/patch-togl::Makefile b/cad/netgen/files/patch-togl::Makefile index 6a7bf9b..c714582 100644 --- a/cad/netgen/files/patch-togl::Makefile +++ b/cad/netgen/files/patch-togl::Makefile @@ -29,7 +29,7 @@ # Where to find tcl.h, tk.h, OpenGL/Mesa headers, etc: -INCLUDES = -I/usr/local/include -I/usr/include/tcl -I/usr/freeware/include -+INCLUDES = -I$(X11BASE)/include $(CPLUSPLUSFLAGS3) ++INCLUDES = -I$(LOCALBASE)/include $(CPLUSPLUSFLAGS3) # Where to find libtcl.a, libtk.a, OpenGL/Mesa libraries: -LIBDIRS = -L/usr/local/lib diff --git a/cad/opencascade-tutorial/Makefile b/cad/opencascade-tutorial/Makefile index 2c8b16f..ff4f889 100644 --- a/cad/opencascade-tutorial/Makefile +++ b/cad/opencascade-tutorial/Makefile @@ -22,8 +22,8 @@ USE_BZIP2= yes USE_GL= yes USE_QT_VER= 3 HAS_CONFIGURE= yes -CONFIGURE_ARGS= --with-gl-include=${X11BASE}/include \ - --with-gl-library=${X11BASE}/lib \ +CONFIGURE_ARGS= --with-gl-include=${LOCALBASE}/include \ + --with-gl-library=${LOCALBASE}/lib \ --with-qt-dir=${QTDIR} \ --enable-qt-mt \ --with-cascade-dir=${CASROOT} @@ -48,7 +48,7 @@ PLIST_SUB= INSTDIR=${LINSTDIR} pre-configure: ${CHMOD} a+x ${WRKSRC}/${CONFIGURE_SCRIPT} ${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|' \ - -e 's|/usr/X11R6|${X11BASE}|' \ + -e 's|/usr/X11R6|${LOCALBASE}|' \ ${WRKSRC}/${CONFIGURE_SCRIPT} do-install: diff --git a/cad/opencascade/Makefile b/cad/opencascade/Makefile index b4130e0..06549b8 100644 --- a/cad/opencascade/Makefile +++ b/cad/opencascade/Makefile @@ -56,17 +56,17 @@ CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} CONFIGURE_ARGS= --with-tcl=${TCL_LIBDIR} \ --with-tk=${TK_LIBDIR} \ --with-java-include=${JAVA_HOME}/include \ - --with-dps-include=${X11BASE}/include \ - --with-dps-library=${X11BASE}/lib \ - --with-gl-include=${X11BASE}/include \ - --with-gl-library=${X11BASE}/lib \ - --with-xmu-include=${X11BASE}/include/X11 \ - --with-xmu-library=${X11BASE}/lib \ + --with-dps-include=${LOCALBASE}/include \ + --with-dps-library=${LOCALBASE}/lib \ + --with-gl-include=${LOCALBASE}/include \ + --with-gl-library=${LOCALBASE}/lib \ + --with-xmu-include=${LOCALBASE}/include/X11 \ + --with-xmu-library=${LOCALBASE}/lib \ --with-stlport-include=${LOCALBASE}/include/stlport \ --with-stlport-libname=stlport_${STL_COMPILER} \ --with-stlport-library=${LOCALBASE}/lib \ --enable-production=yes -CONFIGURE_ENV= CPPFLAGS="${CXXFLAGS} ${GCC4WA} -I${X11BASE}/include \ +CONFIGURE_ENV= CPPFLAGS="${CXXFLAGS} ${GCC4WA} -I${LOCALBASE}/include \ -I${TCL_INCLUDEDIR} -I${TK_INCLUDEDIR}" ARCH=${ARCH} # We strip the libs MAKE_ENV= INSTALL_STRIP_FLAG=-s OCC_BUILDDIR="${PATCH_WRKSRC}" \ @@ -177,12 +177,12 @@ pre-configure: -e 's|/usr/bin/gcc|${CC}|' \ -e 's|%%JAVAHOME%%|${JAVA_HOME}|' \ -e 's|/usr/local|${LOCALBASE}|' \ - -e 's|/usr/X11R6|${X11BASE}|' \ + -e 's|/usr/X11R6|${LOCALBASE}|' \ ${WRKSRC}/src/OS/Draw.tcl \ ${WRKSRC}/src/OS/Visualization.tcl \ ${WRKSRC}/src/OS/ApplicationFramework.tcl ${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|'\ - -e 's|/usr/X11R6|${X11BASE}|' \ + -e 's|/usr/X11R6|${LOCALBASE}|' \ -e 's|/usr/local/bin/tclsh8.4|${TCLSH}|'\ ${PATCH_WRKSRC}/wok/site/wokinit.csh \ ${WRKSRC}/src/WOKsite/wokinit.csh \ diff --git a/cad/pcb/Makefile b/cad/pcb/Makefile index 71b4f4b..3bfc376 100644 --- a/cad/pcb/Makefile +++ b/cad/pcb/Makefile @@ -9,8 +9,7 @@ PORTNAME= pcb PORTVERSION= 20060822 PORTREVISION= 1 CATEGORIES= cad -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR= ${PORTNAME} +MASTER_SITES= SF MAINTAINER= hrs@FreeBSD.org COMMENT= X11 interactive printed circuit board layout system @@ -28,8 +27,8 @@ USE_GNOME= gtk20 GNU_CONFIGURE= yes USE_GMAKE= yes USE_TK_RUN= 83 -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include ${PTHREAD_CFLAGS}" \ - LDFLAGS="${PTHREAD_LIBS} -L${LOCALBASE}/lib -L${X11BASE}/lib" +CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \ + LDFLAGS="${PTHREAD_LIBS} -L${LOCALBASE}/lib" .if !defined(NOPORTDOCS) INFO= pcb diff --git a/cad/qcad-partslib/Makefile b/cad/qcad-partslib/Makefile index a33e302c..0fe884e 100644 --- a/cad/qcad-partslib/Makefile +++ b/cad/qcad-partslib/Makefile @@ -7,7 +7,7 @@ PORTNAME= qcad-partslib PORTVERSION= 2.1.2.8.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= cad MASTER_SITES= ftp://www.ribbonsoft.com/archives/partlibrary/ DISTNAME= partlibrary-${PORTVERSION:S/.1$/-1/} @@ -20,7 +20,6 @@ BUILD_DEPENDS= qcad:${PORTSDIR}/cad/qcad WRKSRC= ${WRKDIR}/partlibrary-${PORTVERSION:S/.1$/-1/} DATADIR= ${PREFIX}/share/qcad/library -USE_X_PREFIX= yes USE_ZIP= yes NO_BUILD= yes PLIST= ${WRKDIR}/pkg-plist diff --git a/cad/qcad/Makefile b/cad/qcad/Makefile index 167d194..2180de4 100644 --- a/cad/qcad/Makefile +++ b/cad/qcad/Makefile @@ -7,8 +7,7 @@ PORTNAME= qcad PORTVERSION= 2.0.5.0.1 -PORTREVISION= 1 -#PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= cad MASTER_SITES= ftp://www.ribbonsoft.com/archives/qcad/ DISTNAME= ${PORTNAME}-${PORTVERSION:S/.1$/-1/}-community.src @@ -23,7 +22,6 @@ WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION:S/.1$/-1/}-community.src QTDIR?= ${QT_PREFIX} -USE_X_PREFIX= yes USE_QT_VER= 3 USE_GMAKE= yes PLIST= ${WRKDIR}/pkg-plist diff --git a/cad/slffea/Makefile b/cad/slffea/Makefile index 2ad219d..955bab8 100644 --- a/cad/slffea/Makefile +++ b/cad/slffea/Makefile @@ -10,8 +10,7 @@ PORTNAME= slffea PORTVERSION= 1.3 PORTREVISION= 4 CATEGORIES= cad -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR= ${PORTNAME} +MASTER_SITES= SF DISTNAME= ${PORTNAME}13 EXTRACT_SUFX= .tgz @@ -22,7 +21,7 @@ LIB_DEPENDS= glut.4:${PORTSDIR}/graphics/libglut CONFLICTS= swi-pl-[0-9]* TenDRA-[0-9]* -CFLAGS+= -I${X11BASE}/include ${PTHREAD_CFLAGS} +CFLAGS+= -I${LOCALBASE}/include ${PTHREAD_CFLAGS} WRKSRC= ${WRKDIR}/${PORTNAME}-1.3 ALL_TARGET= everything @@ -39,9 +38,9 @@ post-patch: ${REINPLACE_CMD} -E -e "s|^CC = .*|CC = ${CC} ${CFLAGS}|g" \ -e "s|-lglut|-lglut ${PTHREAD_LIBS}|g" \ -e "s|/usr/local|${LOCALBASE}|g" \ - -e "s|/usr/X/|${X11BASE}/|g" \ - -e "s|/usr/X11/|${X11BASE}/|g" \ - -e "s|/usr/X11R6/|${X11BASE}/|g") + -e "s|/usr/X/|${LOCALBASE}/|g" \ + -e "s|/usr/X11/|${LOCALBASE}/|g" \ + -e "s|/usr/X11R6/|${LOCALBASE}/|g") do-install: .for file in ${EXEC} diff --git a/cad/spice/Makefile b/cad/spice/Makefile index 3a14cea..ada632a 100644 --- a/cad/spice/Makefile +++ b/cad/spice/Makefile @@ -7,7 +7,7 @@ PORTNAME= spice PORTVERSION= 3f5.2 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= cad MASTER_SITES= http://embedded.eecs.berkeley.edu/pubs/downloads/spice/:sources DISTFILES= spice3f5${EXTRACT_SUFX}:sources \ @@ -31,7 +31,7 @@ PKGNAMESUFFIX= -without-x11 COMMENT= A general-purpose circuit simulation program (non-X11 version) MAKE_ARGS+= -DWITHOUT_X11 .else -USE_XLIB= yes +USE_XORG= x11 xaw xext xmu xt .endif .include <bsd.port.pre.mk> @@ -43,7 +43,7 @@ do-configure: @${CP} ${FILESDIR}/FreeBSD ${WRKSRC}/conf/FreeBSD @${CP} ${FILESDIR}/FreeBSD.without_x11 ${WRKSRC}/conf/FreeBSD.without_x11 @${REINPLACE_CMD} -e 's+@CC@+${CC}+ ; s+@CFLAGS@+${CFLAGS}+ ; \ - s+@X11BASE@+${X11BASE}+;' \ + s+@X11BASE@+${LOCALBASE}+;' \ ${WRKSRC}/conf/FreeBSD ${WRKSRC}/conf/FreeBSD.without_x11 post-install: diff --git a/cad/spice/files/patch-conf_defaults b/cad/spice/files/patch-conf_defaults index 2260890..c5d6e9b 100644 --- a/cad/spice/files/patch-conf_defaults +++ b/cad/spice/files/patch-conf_defaults @@ -39,7 +39,7 @@ # a convenience that is used in the following definitions. -X_DIR = /usr -+X_DIR = ${X11BASE} ++X_DIR = ${LOCALBASE} # INCX lists the X include directories. This may be different between # MIT X11r5, X11r4, and your vendor's version of X11, though listing diff --git a/cad/tclspice/Makefile b/cad/tclspice/Makefile index 8b443e7..9548281 100644 --- a/cad/tclspice/Makefile +++ b/cad/tclspice/Makefile @@ -25,7 +25,7 @@ AUTOMAKE_ARGS= -c -a USE_GMAKE= yes ALL_TARGET= tcl INSTALL_TARGET= install-tcl -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes SUB_FILES= pkg-message diff --git a/cad/tkgate/Makefile b/cad/tkgate/Makefile index d6770f4..cff9278 100644 --- a/cad/tkgate/Makefile +++ b/cad/tkgate/Makefile @@ -7,7 +7,7 @@ PORTNAME= tkgate PORTVERSION= 1.8.7 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= cad MASTER_SITES= ftp://gadoid.ices.cmu.edu/pub/tkgate/ EXTRACT_SUFX= .tgz @@ -17,16 +17,16 @@ COMMENT= A Tcl/Tk based digital circuit editor and simulator LIB_DEPENDS= tk84.1:${PORTSDIR}/x11-toolkits/tk84 RUN_DEPENDS= tclsh8.4:${PORTSDIR}/lang/tcl84 -BUILD_DEPENDS= xmkmf:${X_IMAKE_PORT} +BUILD_DEPENDS= xmkmf:${PORTSDIR}/devel/imake HAS_CONFIGURE= yes USE_BISON= build -USE_X_PREFIX= yes +USE_XORG= x11 PLIST_SUB= VERSION=${PORTVERSION} post-patch: - @${REINPLACE_CMD} -e 's,/usr/X11R6,${X11BASE},g' \ + @${REINPLACE_CMD} -e 's,/usr/X11R6,${LOCALBASE},g' \ ${WRKSRC}/Imakefile ${WRKSRC}/config.h .include <bsd.port.mk> diff --git a/cad/varkon/Makefile b/cad/varkon/Makefile index df54601..5d31eda 100644 --- a/cad/varkon/Makefile +++ b/cad/varkon/Makefile @@ -45,7 +45,7 @@ post-patch: @${REINPLACE_CMD} -e 's+%%VARKON_PREFIX%%+${VARKON_PREFIX}+ ; s+%%DOCSDIR%%+${DOCSDIR}+g ' \ ${VARKON_ROOT}/com/english/varkon @${FIND} ${WRKSRC} -name 'Makefile.FreeBSD' -print0 | ${XARGS} -0 \ - ${REINPLACE_CMD} -e 's+/usr/X11R6+${X11BASE}+g' + ${REINPLACE_CMD} -e 's+/usr/X11R6+${LOCALBASE}+g' do-build: @(cd ${WRKSRC};${SETENV} ${MAKE_ENV} ${SH} make_varkon ) diff --git a/cad/xcircuit/Makefile b/cad/xcircuit/Makefile index 0fa3438..57be451 100644 --- a/cad/xcircuit/Makefile +++ b/cad/xcircuit/Makefile @@ -7,7 +7,7 @@ PORTNAME= xcircuit PORTVERSION= 3.4.22 -PORTREVISION= 1 +PORTREVISION= 2 PORTEPOCH= 1 CATEGORIES= cad MASTER_SITES= http://opencircuitdesign.com/xcircuit/archive/ \ @@ -17,8 +17,7 @@ EXTRACT_SUFX= .tgz MAINTAINER= shaun@FreeBSD.org COMMENT= An X11 drawing program [especially for circuit schematics] -USE_X_PREFIX= yes -USE_XPM= yes +USE_XORG= xpm xt USE_TCL= 84 USE_TCL_BUILD= 84 USE_TK= 84 diff --git a/cad/z88/Makefile b/cad/z88/Makefile index 5cad487..b8c2e83 100644 --- a/cad/z88/Makefile +++ b/cad/z88/Makefile @@ -42,7 +42,7 @@ post-patch: @${REINPLACE_CMD} -e 's+%%CC%%+${CC}+g ; s+%%CFLAGS%%+${CFLAGS}+g' \ ${WRKSRC}/z88kernel.mk @${REINPLACE_CMD} -e 's+%%CC%%+${CC}+g ; s+%%CFLAGS%%+${CFLAGS}+g ; \ - s+%%X11BASE%%+${X11BASE}+g;' \ + s+%%LOCALBASE%%+${LOCALBASE}+g;' \ ${WRKSRC}/z88other.mk @${REINPLACE_CMD} -e 's+%%PREFIX%%+${PREFIX}+g; ' \ ${WRKSRC}/z88.sh diff --git a/cad/z88/files/patch-z88.mk.other b/cad/z88/files/patch-z88.mk.other index 7e5cb21..cf925d8 100644 --- a/cad/z88/files/patch-z88.mk.other +++ b/cad/z88/files/patch-z88.mk.other @@ -8,16 +8,16 @@ -CFLAGS = -mcpu=i486 -I. -I/usr/X11R6/include -DFR_UNIX -DFR_XDOUB -DFR_XLONG -O3\ - -fomit-frame-pointer +CC = %%CC%% -+CFLAGS =%%CFLAGS%% -I. -I%%X11BASE%%/include -DFR_UNIX -DFR_XDOUB -DFR_XLONG ++CFLAGS =%%CFLAGS%% -I. -I%%LOCALBASE%%/include -DFR_UNIX -DFR_XDOUB -DFR_XLONG LDLIBSOM = -lc LDLIBSOX = -lm -lc -LDLIBSNX = -L/usr/X11R6/lib -lXm -lXpm -lXt -lSM -lXp -lICE -lXext -lX11 -lc -LDLIBSMX = -L/usr/X11R6/lib -lXm -lXpm -lXt -lSM -lXp -lICE -lXext -lX11 -lm -lc -LDLIBSMO = -L/usr/X11R6/lib -lGLw -lGL -lXm -lXpm -lXt -lSM -lXp -lICE -lXext -lX11 -lm -lc -+LDLIBSNX = -L%%X11BASE%%/lib -lXm -lXpm -lXt -lSM -lXp -lICE -lXext -lX11 -lc -+LDLIBSMX = -L%%X11BASE%%/lib -lXm -lXpm -lXt -lSM -lXp -lICE -lXext -lX11 -lm -lc -+LDLIBSMO = -L%%X11BASE%%/lib -lGLw -lGL -lXm -lXpm -lXt -lSM -lXp -lICE -lXext -lX11 -lm -lc ++LDLIBSNX = -L%%LOCALBASE%%/lib -lXm -lXpm -lXt -lSM -lXp -lICE -lXext -lX11 -lc ++LDLIBSMX = -L%%LOCALBASE%%/lib -lXm -lXpm -lXt -lSM -lXp -lICE -lXext -lX11 -lm -lc ++LDLIBSMO = -L%%LOCALBASE%%/lib -lGLw -lGL -lXm -lXpm -lXt -lSM -lXp -lICE -lXext -lX11 -lm -lc OBJECTSE = z88e.o ale88e.o dyn88e.o clr88.o m1.o m2.o stop88e.o cshe88.o\ hexa88.o lqua88.o qshe88.o isod88.o tetr88.o spur88.o spla88.o hpla88.o\ |