summaryrefslogtreecommitdiff
path: root/lang
diff options
context:
space:
mode:
Diffstat (limited to 'lang')
-rw-r--r--lang/gcc28/Makefile8
-rw-r--r--lang/gcc295/Makefile9
-rw-r--r--lang/gcc32/Makefile4
-rw-r--r--lang/pm3-forms/Makefile15
-rw-r--r--lang/pm3-gui/Makefile15
-rw-r--r--lang/pm3-m3tk/Makefile15
-rw-r--r--lang/pm3-net/Makefile15
-rw-r--r--lang/pm3-netobj/Makefile15
-rw-r--r--lang/tcl80/Makefile8
-rw-r--r--lang/tcl80/files/patch-ab22
-rw-r--r--lang/tcl81-thread/files/patch-ab7
-rw-r--r--lang/tcl82/files/patch-ab7
12 files changed, 18 insertions, 122 deletions
diff --git a/lang/gcc28/Makefile b/lang/gcc28/Makefile
index 6320057650be..57f63c5f9c97 100644
--- a/lang/gcc28/Makefile
+++ b/lang/gcc28/Makefile
@@ -26,14 +26,10 @@ DEPRECATED= This port is no longer in use by anything in the ports collection.
.include <bsd.port.pre.mk>
.if ${ARCH} == "alpha"
-BROKEN= "Does not compile on alpha"
+BROKEN= Does not compile on alpha
.endif
-.if ${PORTOBJFORMAT} == "elf"
CONFIGURE_TARGET= ${ARCH}-portbld-freebsd${OSREL}
-.else
-CONFIGURE_TARGET= ${ARCH}-portbld-freebsdaout${OSREL}
-.endif
CONFIGURE_ENV+= OSVERSION=${OSVERSION}
PLIST_SUB= GNUHOST=${CONFIGURE_TARGET}
.if ${OSVERSION} < 600011
@@ -48,7 +44,7 @@ MAN1= cccp28.1 g++28.1 gcc28.1
INFO= cpp gcc
pre-everything::
- @${ECHO_MSG} "GCC ${DISTNAME:S/^gcc-//} for ${OPSYS} ${OSREL} ${PORTOBJFORMAT}"
+ @${ECHO_MSG} "GCC ${DISTNAME:S/^gcc-//} for ${OPSYS} ${OSREL}"
pre-patch:
@${MV} ${WRKSRC}/config/i386/freebsd.h ${WRKSRC}/config/i386/freebsd-aout.h
diff --git a/lang/gcc295/Makefile b/lang/gcc295/Makefile
index af70d35aa1cb..d5088108d79e 100644
--- a/lang/gcc295/Makefile
+++ b/lang/gcc295/Makefile
@@ -30,7 +30,7 @@ IGNORE= Cannot install: you have the 'USE_GCC' variable defined either in enviro
.include <bsd.port.pre.mk>
.if (${ARCH} == alpha)
-BROKEN= "Does not compile on alpha"
+BROKEN= Does not compile on alpha
WITHOUT_CPU_CFLAGS= yes
.endif
@@ -42,15 +42,10 @@ GCC_REV= ${DISTNAME:S/gcc-//g:S/.test3//g}
TARGLIB= ${PREFIX}/lib/gcc-lib/${CONFIGURE_TARGET}/${GCC_REV}
LIBSTDCPP_REV= 2100
-.if ${PORTOBJFORMAT} == "aout"
-CONFIGURE_TARGET= ${ARCH}-portbld-freebsdaout${OSREL}
-.else
-CONFIGURE_TARGET= ${ARCH}-portbld-freebsd${OSREL}
-.endif
-
PLIST_SUB+= EGCS_REV=${GCC_REV} GNU_HOST=${CONFIGURE_TARGET}
GNU_CONFIGURE= yes
USE_GMAKE= yes
+CONFIGURE_TARGET= ${ARCH}-portbld-freebsd${OSREL}
CONFIGURE_ARGS= --with-gnu-as --with-gnu-ld \
--with-gxx-include-dir=${TARGLIB}/include/g++
#CONFIGURE_ARGS+= --program-suffix=-295
diff --git a/lang/gcc32/Makefile b/lang/gcc32/Makefile
index e2c7167d769b..bb756e709a3b 100644
--- a/lang/gcc32/Makefile
+++ b/lang/gcc32/Makefile
@@ -38,15 +38,11 @@ NOMANCOMPRESS= yes # too hard to deal with differences on 5-cur and releng4
.include <bsd.port.pre.mk>
-.if ${PORTOBJFORMAT} == "aout"
-CONFIGURE_TARGET= ${ARCH}-portbld-freebsdaout${OSREL}
-.else
.if ${ARCH} == "amd64"
CONFIGURE_TARGET= x86_64-portbld-freebsd${OSREL}
.else
CONFIGURE_TARGET= ${ARCH}-portbld-freebsd${OSREL}
.endif
-.endif
WITHOUT_CPU_CFLAGS=true
GCC_REV= ${PORTVERSION:C/\.0$//}
diff --git a/lang/pm3-forms/Makefile b/lang/pm3-forms/Makefile
index 1d08c7e53ad1..58f8b5456c10 100644
--- a/lang/pm3-forms/Makefile
+++ b/lang/pm3-forms/Makefile
@@ -39,25 +39,12 @@ USE_GMAKE= yes
.include <bsd.port.pre.mk>
-.if ${PORTOBJFORMAT} == "aout"
-L2= .so.${SOVERSION}.0
-TARGET= FreeBSD2
-INST_TARGET= freebsd-2
-WORDSIZE= 32
-.elif ${ARCH} == "i386"
+.if ${ARCH} == "i386"
L2= .so.${SOVERSION}
-.if ${OSVERSION} < 400011
-TARGET= FreeBSD3
-INST_TARGET= freebsd-3
-.else
TARGET= FreeBSD4
INST_TARGET= freebsd-4
-.endif
WORDSIZE= 32
.elif ${ARCH} == "alpha"
-.if ${OSVERSION} < 400011
-IGNORE= Not supported on older versions of FreeBSD/Alpha
-.endif
CFLAGS+= -mieee
L2= .so.${SOVERSION}
TARGET= FBSD_ALPHA
diff --git a/lang/pm3-gui/Makefile b/lang/pm3-gui/Makefile
index 2982eabef8bf..80359a2eec6d 100644
--- a/lang/pm3-gui/Makefile
+++ b/lang/pm3-gui/Makefile
@@ -36,25 +36,12 @@ USE_BZIP2= yes
.include <bsd.port.pre.mk>
-.if ${PORTOBJFORMAT} == "aout"
-L2= .so.${SOVERSION}.0
-TARGET= FreeBSD2
-INST_TARGET= freebsd-2
-WORDSIZE= 32
-.elif ${ARCH} == "i386"
+.if ${ARCH} == "i386"
L2= .so.${SOVERSION}
-.if ${OSVERSION} < 400011
-TARGET= FreeBSD3
-INST_TARGET= freebsd-3
-.else
TARGET= FreeBSD4
INST_TARGET= freebsd-4
-.endif
WORDSIZE= 32
.elif ${ARCH} == "alpha"
-.if ${OSVERSION} < 400011
-IGNORE= Not supported on older versions of FreeBSD/Alpha
-.endif
CFLAGS+= -mieee
L2= .so.${SOVERSION}
TARGET= FBSD_ALPHA
diff --git a/lang/pm3-m3tk/Makefile b/lang/pm3-m3tk/Makefile
index 9ae2a967ebec..eb2e6ec1fefc 100644
--- a/lang/pm3-m3tk/Makefile
+++ b/lang/pm3-m3tk/Makefile
@@ -32,25 +32,12 @@ USE_BZIP2= yes
.include <bsd.port.pre.mk>
-.if ${PORTOBJFORMAT} == "aout"
-L2= .so.${SOVERSION}.0
-TARGET= FreeBSD2
-INST_TARGET= freebsd-2
-WORDSIZE= 32
-.elif ${ARCH} == "i386"
+.if ${ARCH} == "i386"
L2= .so.${SOVERSION}
-.if ${OSVERSION} < 400011
-TARGET= FreeBSD3
-INST_TARGET= freebsd-3
-.else
TARGET= FreeBSD4
INST_TARGET= freebsd-4
-.endif
WORDSIZE= 32
.elif ${ARCH} == "alpha"
-.if ${OSVERSION} < 400011
-IGNORE= Not supported on older versions of FreeBSD/Alpha
-.endif
CFLAGS+= -mieee
L2= .so.${SOVERSION}
TARGET= FBSD_ALPHA
diff --git a/lang/pm3-net/Makefile b/lang/pm3-net/Makefile
index 810f258eabf1..474f50e3fe8e 100644
--- a/lang/pm3-net/Makefile
+++ b/lang/pm3-net/Makefile
@@ -36,25 +36,12 @@ USE_BZIP2= yes
.include <bsd.port.pre.mk>
-.if ${PORTOBJFORMAT} == "aout"
-L2= .so.${SOVERSION}.0
-TARGET= FreeBSD2
-INST_TARGET= freebsd-2
-WORDSIZE= 32
-.elif ${ARCH} == "i386"
+.if ${ARCH} == "i386"
L2= .so.${SOVERSION}
-.if ${OSVERSION} < 400011
-TARGET= FreeBSD3
-INST_TARGET= freebsd-3
-.else
TARGET= FreeBSD4
INST_TARGET= freebsd-4
-.endif
WORDSIZE= 32
.elif ${ARCH} == "alpha"
-.if ${OSVERSION} < 400011
-IGNORE= Not supported on older versions of FreeBSD/Alpha
-.endif
CFLAGS+= -mieee
L2= .so.${SOVERSION}
TARGET= FBSD_ALPHA
diff --git a/lang/pm3-netobj/Makefile b/lang/pm3-netobj/Makefile
index 274641600262..5fc13303c5c5 100644
--- a/lang/pm3-netobj/Makefile
+++ b/lang/pm3-netobj/Makefile
@@ -39,25 +39,12 @@ USE_BZIP2= yes
.include <bsd.port.pre.mk>
-.if ${PORTOBJFORMAT} == "aout"
-L2= .so.${SOVERSION}.0
-TARGET= FreeBSD2
-INST_TARGET= freebsd-2
-WORDSIZE= 32
-.elif ${ARCH} == "i386"
+.if ${ARCH} == "i386"
L2= .so.${SOVERSION}
-.if ${OSVERSION} < 400011
-TARGET= FreeBSD3
-INST_TARGET= freebsd-3
-.else
TARGET= FreeBSD4
INST_TARGET= freebsd-4
-.endif
WORDSIZE= 32
.elif ${ARCH} == "alpha"
-.if ${OSVERSION} < 400011
-IGNORE= Not supported on older versions of FreeBSD/Alpha
-.endif
CFLAGS+= -mieee
L2= .so.${SOVERSION}
TARGET= FBSD_ALPHA
diff --git a/lang/tcl80/Makefile b/lang/tcl80/Makefile
index e3c994414637..62f0705edf63 100644
--- a/lang/tcl80/Makefile
+++ b/lang/tcl80/Makefile
@@ -38,12 +38,6 @@ TCL_LIB= libtcl80.so
MANCOMPRESSED= yes
-.if ${PORTOBJFORMAT} == "elf"
-TCL_LIB_FILE= ${TCL_LIB}.${SHLIB_MAJOR}
-.else
-TCL_LIB_FILE= ${TCL_LIB}.${SHLIB_MAJOR}.${SHLIB_MINOR}
-.endif
-
post-configure:
@${CP} ${FILESDIR}/Makefile.lib ${WRKSRC}
@${CP} ${FILESDIR}/makefile ${WRKSRC}
@@ -58,7 +52,7 @@ pre-build:
OSVERSION=${OSVERSION}
post-install:
- ${LN} -sf ${TCL_LIB_FILE} ${PREFIX}/lib/${TCL_LIB}
+ ${LN} -sf ${TCL_LIB}.${SHLIB_MAJOR} ${PREFIX}/lib/${TCL_LIB}
.if exists(${PKGINSTALL})
${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL}
.endif
diff --git a/lang/tcl80/files/patch-ab b/lang/tcl80/files/patch-ab
index ab7c767146ea..36f9ea1b7c31 100644
--- a/lang/tcl80/files/patch-ab
+++ b/lang/tcl80/files/patch-ab
@@ -1,15 +1,11 @@
---- configure.orig Mon Mar 8 22:51:26 1999
-+++ configure Thu Apr 29 11:13:56 1999
-@@ -4097,15 +4097,23 @@
+--- configure.orig Tue Mar 9 07:51:26 1999
++++ configure Sat Jan 27 00:40:27 2007
+@@ -4097,14 +4097,14 @@
echo "$ac_t""yes" 1>&6
SHLIB_CFLAGS="-fpic"
- SHLIB_LD="ld -Bshareable -x"
-+ if [ "$PORTOBJFORMAT" = "elf" ]; then
-+ SHLIB_LD="ld -shared -x -soname \$@"
-+ else
-+ SHLIB_LD="ld -Bshareable -x"
-+ fi
++ SHLIB_LD="ld -shared -x -soname \$@"
SHLIB_LD_LIBS=""
SHLIB_SUFFIX=".so"
DL_OBJS="tclLoadDl.o"
@@ -17,13 +13,7 @@
LD_FLAGS=""
LD_SEARCH_FLAGS=""
- TCL_SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so.1.0'
--
-+ if [ "$PORTOBJFORMAT" = "elf" ]; then
-+ TCL_SHARED_LIB_SUFFIX='`echo ${VERSION} | tr -d .`.so.1'
-+ else
-+ TCL_SHARED_LIB_SUFFIX='`echo ${VERSION} | tr -d .`.so.1.5'
-+ fi
-+
++ TCL_SHARED_LIB_SUFFIX='`echo ${VERSION} | tr -d .`.so.1'
+
else
echo "$ac_t""no" 1>&6
-
diff --git a/lang/tcl81-thread/files/patch-ab b/lang/tcl81-thread/files/patch-ab
index 332fcbb2d5e1..cfb20e671ed8 100644
--- a/lang/tcl81-thread/files/patch-ab
+++ b/lang/tcl81-thread/files/patch-ab
@@ -23,7 +23,7 @@
else
echo "configure: warning: "Don t know how to find pthread lib on your system - you must disable thread support or edit the LIBS in the Makefile..."" 1>&2
fi
-@@ -4330,14 +4329,19 @@
+@@ -4330,14 +4329,14 @@
echo "$ac_t""yes" 1>&6
SHLIB_CFLAGS="-fpic"
@@ -35,13 +35,8 @@
LD_FLAGS=""
LD_SEARCH_FLAGS=""
- TCL_SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so.1.0'
-+ if eval "test \"`echo ${PORTOBJFORMAT}`\" = elf"; then
+ TCL_SHARED_LIB_SUFFIX='`echo ${VERSION} | tr -d .`.so.1'
+ SHLIB_LD="ld -shared -x -soname \$@"
-+ else
-+ TCL_SHARED_LIB_SUFFIX='`echo ${VERSION} | tr -d .`.so.1.0'
-+ SHLIB_LD="ld -Bshareable -x"
-+ fi
else
echo "$ac_t""no" 1>&6
diff --git a/lang/tcl82/files/patch-ab b/lang/tcl82/files/patch-ab
index b4b6a5a660f4..ed0e1646d0a9 100644
--- a/lang/tcl82/files/patch-ab
+++ b/lang/tcl82/files/patch-ab
@@ -18,7 +18,7 @@
# Not available on all versions: check for include file.
ac_safe=`echo "dlfcn.h" | sed 'y%./+-%__p_%'`
echo $ac_n "checking for dlfcn.h""... $ac_c" 1>&6
-@@ -4922,16 +4922,21 @@
+@@ -4922,16 +4922,16 @@
fi
if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
echo "$ac_t""yes" 1>&6
@@ -33,14 +33,9 @@
LDFLAGS=""
LD_SEARCH_FLAGS=""
- SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so.1.0'
-+ if eval "test \"`echo ${PORTOBJFORMAT}`\" = elf" ; then
+ SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.so.1'
+ TCL_SHLIB_LD_EXTRAS="-soname \$@"
+ SHLIB_LD="ld -shared -x"
-+ else
-+ SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.so.1.0'
-+ SHLIB_LD="ld -Bshareable -x"
-+ fi
else
echo "$ac_t""no" 1>&6
generated by cgit v1.2.3 (git 2.25.1) at 2025-09-09 03:18:43 +0000