View | Details | Raw Unified | Return to bug 194068 | Differences between
and this patch

Collapse All | Expand All

(-)Mk/Uses/libtool.mk (+4 lines)
Lines 19-24 _USES_POST+= libtool Link Here
19
19
20
.if ${libtool_ARGS:Mbuild}
20
.if ${libtool_ARGS:Mbuild}
21
BUILD_DEPENDS+=	libtool:${PORTSDIR}/devel/libtool
21
BUILD_DEPENDS+=	libtool:${PORTSDIR}/devel/libtool
22
CONFIGURE_ENV+=	LTTRAP=no
23
MAKE_ENV+=	LTTRAP=no
22
.endif
24
.endif
23
.endif
25
.endif
24
26
Lines 40-46 patch-libtool: Link Here
40
	@${FIND} ${WRKDIR} -type f -name ltmain.sh |			\
42
	@${FIND} ${WRKDIR} -type f -name ltmain.sh |			\
41
		${XARGS} ${REINPLACE_CMD}				\
43
		${XARGS} ${REINPLACE_CMD}				\
42
		-e '/if.*linkmode.*prog.*mode.*!= relink/s/if.*;/if :;/'\
44
		-e '/if.*linkmode.*prog.*mode.*!= relink/s/if.*;/if :;/'\
45
		-e '/if.*prog.*linkmode.*relink !=.*mode/s/if.*;/if :;/'\
43
		-e '/if.*linkmode.*prog.*mode.* = relink/s/||.*;/;/'	\
46
		-e '/if.*linkmode.*prog.*mode.* = relink/s/||.*;/;/'	\
47
		-e '/if.*prog.*linkmode.*relink = .*mode/s/||.*;/;/'	\
44
		-e 's/|-p|-pg|/|-B*|-p|-pg|/'
48
		-e 's/|-p|-pg|/|-B*|-p|-pg|/'
45
49
46
.if ! ${libtool_ARGS:Moldver}
50
.if ! ${libtool_ARGS:Moldver}
(-)archivers/tardy/Makefile (-1 / +1 lines)
Lines 4-10 Link Here
4
PORTNAME=	tardy
4
PORTNAME=	tardy
5
PORTVERSION=	1.28
5
PORTVERSION=	1.28
6
DISTVERSIONSUFFIX=	.D001.orig
6
DISTVERSIONSUFFIX=	.D001.orig
7
PORTREVISION=	1
7
PORTREVISION=	2
8
CATEGORIES=	archivers
8
CATEGORIES=	archivers
9
MASTER_SITES=	SF/tardy/${PORTVERSION}/
9
MASTER_SITES=	SF/tardy/${PORTVERSION}/
10
DISTNAME=	${PORTNAME}_${PORTVERSION}${DISTVERSIONSUFFIX}
10
DISTNAME=	${PORTNAME}_${PORTVERSION}${DISTVERSIONSUFFIX}
(-)audio/libnoise/Makefile (-2 / +2 lines)
Lines 3-9 Link Here
3
3
4
PORTNAME=	libnoise
4
PORTNAME=	libnoise
5
DISTVERSION=	1.0.0
5
DISTVERSION=	1.0.0
6
PORTREVISION=	2
6
PORTREVISION=	3
7
CATEGORIES=	audio
7
CATEGORIES=	audio
8
MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}%20sources/${PORTVERSION}
8
MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}%20sources/${PORTVERSION}
9
DISTNAME=	${PORTNAME}src-${DISTVERSION}
9
DISTNAME=	${PORTNAME}src-${DISTVERSION}
Lines 26-32 post-patch: Link Here
26
26
27
do-install:
27
do-install:
28
	${MKDIR} ${STAGEDIR}${PREFIX}/lib
28
	${MKDIR} ${STAGEDIR}${PREFIX}/lib
29
	(cd ${WRKSRC}/src && ${LOCALBASE}/bin/libtool --mode=install \
29
	(cd ${WRKSRC}/src && ${SETENV} LTTRAP=no ${LOCALBASE}/bin/libtool --mode=install \
30
		${INSTALL_LIB} libnoise.la ${STAGEDIR}${PREFIX}/lib)
30
		${INSTALL_LIB} libnoise.la ${STAGEDIR}${PREFIX}/lib)
31
	(cd ${WRKSRC}/include && \
31
	(cd ${WRKSRC}/include && \
32
		${COPYTREE_SHARE} . ${STAGEDIR}${PREFIX}/include/noise)
32
		${COPYTREE_SHARE} . ${STAGEDIR}${PREFIX}/include/noise)
(-)audio/libnoise/pkg-plist (+1 lines)
Lines 45-50 include/noise/vectortable.h Link Here
45
lib/libnoise.a
45
lib/libnoise.a
46
lib/libnoise.so
46
lib/libnoise.so
47
lib/libnoise.so.0
47
lib/libnoise.so.0
48
lib/libnoise.so.0.0.0
48
@dirrm include/noise/model
49
@dirrm include/noise/model
49
@dirrm include/noise/module
50
@dirrm include/noise/module
50
@dirrm include/noise
51
@dirrm include/noise
(-)devel/bglibs/Makefile (-1 / +1 lines)
Lines 3-9 Link Here
3
3
4
PORTNAME=	bglibs
4
PORTNAME=	bglibs
5
PORTVERSION=	1.106
5
PORTVERSION=	1.106
6
PORTREVISION=	5
6
PORTREVISION=	6
7
PORTEPOCH=	1
7
PORTEPOCH=	1
8
CATEGORIES=	devel
8
CATEGORIES=	devel
9
MASTER_SITES=	http://untroubled.org/${PORTNAME}/archive/ \
9
MASTER_SITES=	http://untroubled.org/${PORTNAME}/archive/ \
(-)devel/bglibs/pkg-plist (-2 / +4 lines)
Lines 100-110 lib/bglibs/libbg-path.a Link Here
100
lib/bglibs/libbg-str.a
100
lib/bglibs/libbg-str.a
101
lib/bglibs/libbg-sysdeps.a
101
lib/bglibs/libbg-sysdeps.a
102
lib/bglibs/libbg-sysdeps.so
102
lib/bglibs/libbg-sysdeps.so
103
lib/bglibs/libbg-sysdeps.so.2
103
lib/bglibs/libbg-sysdeps.so.1
104
lib/bglibs/libbg-sysdeps.so.1.1.1
104
lib/bglibs/libbg-unix.a
105
lib/bglibs/libbg-unix.a
105
lib/bglibs/libbg.a
106
lib/bglibs/libbg.a
106
lib/bglibs/libbg.so
107
lib/bglibs/libbg.so
107
lib/bglibs/libbg.so.2
108
lib/bglibs/libbg.so.1
109
lib/bglibs/libbg.so.1.1.1
108
lib/bglibs/libinstaller.a
110
lib/bglibs/libinstaller.a
109
lib/bglibs/libinstcheck.a
111
lib/bglibs/libinstcheck.a
110
lib/bglibs/libinstshow.a
112
lib/bglibs/libinstshow.a
(-)devel/cdialog/Makefile (+1 lines)
Lines 2-7 Link Here
2
2
3
PORTNAME=	cdialog
3
PORTNAME=	cdialog
4
PORTVERSION=	1.2.20140219
4
PORTVERSION=	1.2.20140219
5
PORTREVISION=	1
5
PORTEPOCH=	2
6
PORTEPOCH=	2
6
CATEGORIES=	devel
7
CATEGORIES=	devel
7
MASTER_SITES=	ftp://invisible-island.net/${PORTNAME:S|^c||}/
8
MASTER_SITES=	ftp://invisible-island.net/${PORTNAME:S|^c||}/
(-)devel/cdialog/pkg-plist (+1 lines)
Lines 7-12 include/cdialog/dlg_keys.h Link Here
7
lib/libcdialog.a
7
lib/libcdialog.a
8
lib/libcdialog.so
8
lib/libcdialog.so
9
lib/libcdialog.so.11
9
lib/libcdialog.so.11
10
lib/libcdialog.so.11.1.0
10
man/man1/cdialog.1.gz
11
man/man1/cdialog.1.gz
11
man/man3/cdialog.3.gz
12
man/man3/cdialog.3.gz
12
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/README
13
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/README
(-)devel/fhist/Makefile (-1 / +1 lines)
Lines 4-10 Link Here
4
PORTNAME=	fhist
4
PORTNAME=	fhist
5
PORTVERSION=	1.21
5
PORTVERSION=	1.21
6
DISTVERSIONSUFFIX=	.D001
6
DISTVERSIONSUFFIX=	.D001
7
PORTREVISION=	3
7
PORTREVISION=	4
8
CATEGORIES=	devel
8
CATEGORIES=	devel
9
MASTER_SITES=	SF/${PORTNAME}/${PORTVERSION}
9
MASTER_SITES=	SF/${PORTNAME}/${PORTVERSION}
10
10
(-)devel/libdsp/Makefile (-1 / +1 lines)
Lines 3-9 Link Here
3
3
4
PORTNAME=	libdsp
4
PORTNAME=	libdsp
5
PORTVERSION=	5.0.2
5
PORTVERSION=	5.0.2
6
PORTREVISION=	1
6
PORTREVISION=	2
7
CATEGORIES=	devel audio
7
CATEGORIES=	devel audio
8
MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}-stable-src/${PORTVERSION} \
8
MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}-stable-src/${PORTVERSION} \
9
		http://mirror.mcx2.org/
9
		http://mirror.mcx2.org/
(-)devel/libdsp/pkg-plist (-1 / +2 lines)
Lines 27-31 include/dsp/dspop.h Link Here
27
include/dsp/dsptypes.h
27
include/dsp/dsptypes.h
28
lib/libdsp.a
28
lib/libdsp.a
29
lib/libdsp.so
29
lib/libdsp.so
30
lib/libdsp.so.10
30
lib/libdsp.so.2
31
lib/libdsp.so.2.8.1
31
@dirrm include/dsp
32
@dirrm include/dsp
(-)devel/libexplain/Makefile (-1 / +1 lines)
Lines 3-9 Link Here
3
3
4
PORTNAME=	libexplain
4
PORTNAME=	libexplain
5
PORTVERSION=	1.3.${PATCHLEVEL}
5
PORTVERSION=	1.3.${PATCHLEVEL}
6
PORTREVISION=	1
6
PORTREVISION=	2
7
CATEGORIES=	devel
7
CATEGORIES=	devel
8
MASTER_SITES=	SF/${PORTNAME}/${PORTVERSION:R}
8
MASTER_SITES=	SF/${PORTNAME}/${PORTVERSION:R}
9
DISTNAME=	${PORTNAME}-${PORTVERSION:R}
9
DISTNAME=	${PORTNAME}-${PORTVERSION:R}
(-)devel/libexplain/pkg-plist (-1 / +2 lines)
Lines 240-246 include/libexplain/write.h Link Here
240
include/libexplain/writev.h
240
include/libexplain/writev.h
241
lib/libexplain.a
241
lib/libexplain.a
242
lib/libexplain.so
242
lib/libexplain.so
243
lib/libexplain.so.55
243
lib/libexplain.so.51
244
lib/libexplain.so.51.4.0
244
libdata/pkgconfig/libexplain.pc
245
libdata/pkgconfig/libexplain.pc
245
man/man1/explain.1.gz
246
man/man1/explain.1.gz
246
man/man1/explain_lca2010.1.gz
247
man/man1/explain_lca2010.1.gz
(-)devel/liblangtag/Makefile (-1 lines)
Lines 15-21 LICENSE_COMB= dual Link Here
15
LIB_DEPENDS=	libxml2.so:${PORTSDIR}/textproc/libxml2
15
LIB_DEPENDS=	libxml2.so:${PORTSDIR}/textproc/libxml2
16
16
17
GNU_CONFIGURE=	yes
17
GNU_CONFIGURE=	yes
18
USE_AUTOTOOLS=	libtoolize
19
USE_LDCONFIG=	yes
18
USE_LDCONFIG=	yes
20
USES=		gmake iconv libtool pathfix pkgconfig tar:bzip2
19
USES=		gmake iconv libtool pathfix pkgconfig tar:bzip2
21
INSTALL_TARGET=	install-strip
20
INSTALL_TARGET=	install-strip
(-)devel/liblangtag/files/patch-configure (+15 lines)
Line 0 Link Here
1
--- configure.orig	2014-05-21 03:36:23 UTC
2
+++ configure
3
@@ -14651,11 +14651,7 @@ MODULE_LIBS=
4
 if test "x$enable_modules" != "xno"; then
5
 	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for the suffix of module shared libraries" >&5
6
 $as_echo_n "checking for the suffix of module shared libraries... " >&6; }
7
-	export SED
8
-	shrext_cmds=`libtool --config | grep '^shrext_cmds='`
9
-	eval $shrext_cmds
10
-	module=yes eval std_shrext=$shrext_cmds
11
-	lt_module_suffix=`echo $std_shrext | sed 's/^\.//'`
12
+	lt_module_suffix=so
13
 	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: .$lt_module_suffix" >&5
14
 $as_echo ".$lt_module_suffix" >&6; }
15
 	if test "x$lt_module_suffix" = x; then
(-)devel/libltdl/Makefile (-11 / +10 lines)
Lines 2-22 Link Here
2
# $FreeBSD$
2
# $FreeBSD$
3
3
4
PORTNAME=	libltdl
4
PORTNAME=	libltdl
5
MASTERDIR=	${.CURDIR}/../../devel/libtool
5
PORTREVISION=	0
6
6
7
COMMENT=	System independent dlopen wrapper
7
COMMENT=	System independent dlopen wrapper
8
8
9
.include "${.CURDIR}/../libtool/Makefile.common"
10
9
LICENSE=	LGPL21
11
LICENSE=	LGPL21
10
USE_LDCONFIG=	yes
12
LICENSE_FILE=	${WRKSRC}/COPYING.LIB
11
USES=		libtool:keepla
12
CONFIGURE_ARGS=	--enable-ltdl-install
13
13
14
CONFIGURE_WRKSRC=${WRKSRC}/libltdl
14
GNU_CONFIGURE=	yes
15
BUILD_WRKSRC=	${CONFIGURE_WRKSRC}
15
CONFIGURE_ARGS=	--enable-ltdl-install
16
INSTALL_WRKSRC=	${CONFIGURE_WRKSRC}
17
DESCR=		${.CURDIR}/pkg-descr
18
PLIST=		${.CURDIR}/pkg-plist
19
INFO=		# empty
20
INSTALL_TARGET=	install-strip
16
INSTALL_TARGET=	install-strip
17
USES+=		libtool:keepla # .la file used in ltdl.m4
18
USE_LDCONFIG=	yes
19
WRKSRC_SUBDIR=	libltdl
21
20
22
.include "${MASTERDIR}/Makefile"
21
.include <bsd.port.mk>
(-)devel/libltdl/pkg-plist (-2 / +1 lines)
Lines 6-10 lib/libltdl.a Link Here
6
lib/libltdl.la
6
lib/libltdl.la
7
lib/libltdl.so
7
lib/libltdl.so
8
lib/libltdl.so.7
8
lib/libltdl.so.7
9
lib/libltdl.so.7.3.0
9
lib/libltdl.so.7.3.1
10
@dirrm include/libltdl
(-)devel/libmaa/Makefile (-2 / +3 lines)
Lines 3-9 Link Here
3
3
4
PORTNAME=	libmaa
4
PORTNAME=	libmaa
5
PORTVERSION=	1.3.2
5
PORTVERSION=	1.3.2
6
PORTREVISION=	1
6
PORTREVISION=	2
7
PORTEPOCH=	1
7
PORTEPOCH=	1
8
CATEGORIES=	devel
8
CATEGORIES=	devel
9
MASTER_SITES=	SF/dict/${PORTNAME}/${PORTNAME}-${PORTVERSION}
9
MASTER_SITES=	SF/dict/${PORTNAME}/${PORTNAME}-${PORTVERSION}
Lines 27-33 DOCS= README doc/libmaa.600dpi.ps Link Here
27
PLIST_FILES=	include/maa.h \
27
PLIST_FILES=	include/maa.h \
28
		lib/libmaa.a \
28
		lib/libmaa.a \
29
		lib/libmaa.so \
29
		lib/libmaa.so \
30
		lib/libmaa.so.3
30
		lib/libmaa.so.3 \
31
		lib/libmaa.so.3.0.0
31
PORTDOCS=	${DOCS:T}
32
PORTDOCS=	${DOCS:T}
32
33
33
post-install:
34
post-install:
(-)devel/libtool/Makefile (-22 / +21 lines)
Lines 1-36 Link Here
1
# Created by: Motoyuki Kasahara <m-kasahr@sra.co.jp>
1
# Created by: Motoyuki Kasahara <m-kasahr@sra.co.jp>
2
# $FreeBSD$
2
# $FreeBSD$
3
3
4
PORTNAME?=	libtool
4
PORTNAME=	libtool
5
PORTVERSION=	2.4.2
5
PORTREVISION=	0
6
PORTREVISION=	3
7
CATEGORIES=	devel
8
MASTER_SITES=	${MASTER_SITE_GNU}
9
MASTER_SITE_SUBDIR=	libtool
10
DISTNAME=	libtool-${PORTVERSION}
11
6
12
MAINTAINER=	autotools@FreeBSD.org
7
COMMENT=	Generic shared library support script
13
COMMENT?=	Generic shared library support script
14
8
15
LICENSE?=        GPLv2
9
.include "${.CURDIR}/../libtool/Makefile.common"
16
10
17
CONFLICTS=	libtool-fixed-[0-9]*
11
LICENSE=	GPLv2
12
LICENSE_FILE=	${WRKSRC}/COPYING
13
14
BUILD_DEPENDS=	gm4:${PORTSDIR}/devel/m4
15
RUN_DEPENDS=	gm4:${PORTSDIR}/devel/m4
18
16
19
USES+=		makeinfo
20
GNU_CONFIGURE=	yes
17
GNU_CONFIGURE=	yes
21
CONFIGURE_ARGS?= --disable-ltdl-install
18
CONFIGURE_ARGS=	--disable-ltdl-install
22
CONFIGURE_ENV=	MAKEINFO="makeinfo --no-split"
19
MAKE_ARGS=	MAKEINFOFLAGS=--no-split
23
INFO?=		libtool
20
USES+=		makeinfo
24
21
25
post-extract:
22
INFO=		libtool
26
	@${RM} -f ${WRKSRC}/doc/*.info*
27
23
28
post-patch:
24
post-patch:
29
	@${REINPLACE_CMD} -e 's|sed gsed|sed|g' \
25
	@${RM} -f ${WRKSRC}/doc/*.info*
30
		-e 's|CC=cc|CC=${CC}|g' \
26
.for f in build-aux/ltmain.sh configure libtoolize.in m4/libtool.m4
31
		${WRKSRC}/configure ${WRKSRC}/libltdl/configure
27
	@${TOUCH} -mr ${WRKSRC}/${f}.orig ${WRKSRC}/${f}
28
.endfor
32
29
33
post-configure:
30
post-install:
34
	@${FIND} ${WRKSRC} -type f | ${XARGS} ${TOUCH} -f
31
	${SED} -i '' \
32
		'2s/^/[ x$$LTTRAP = xno ] || { echo "Caught one!"; exit 1; }/' \
33
		${STAGEDIR}${PREFIX}/bin/libtool
35
34
36
.include <bsd.port.mk>
35
.include <bsd.port.mk>
(-)devel/libtool/Makefile.common (+12 lines)
Line 0 Link Here
1
# $FreeBSD$
2
3
PORTVERSION=	2.4.2.418
4
PORTREVISION?=	0 # Leave this zero. Set in Makefile instead.
5
CATEGORIES=	devel
6
MASTER_SITES=	GNU_ALPHA/libtool
7
DISTNAME=	libtool-${PORTVERSION}
8
9
MAINTAINER=	autotools@FreeBSD.org
10
11
DISTINFO_FILE=	${.CURDIR}/../libtool/distinfo
12
USES=		tar:xz
(-)devel/libtool/distinfo (-2 / +2 lines)
Lines 1-2 Link Here
1
SHA256 (libtool-2.4.2.tar.gz) = b38de44862a987293cd3d8dfae1c409d514b6c4e794ebc93648febf9afc38918
1
SHA256 (libtool-2.4.2.418.tar.xz) = 6465c7e6ebb7c9083aa610d510498aadf7be0c6dc5f2f4e57008686879d27d8c
2
SIZE (libtool-2.4.2.tar.gz) = 2632347
2
SIZE (libtool-2.4.2.418.tar.xz) = 941808
(-)devel/libtool/files/patch-build-aux_ltmain.sh (+30 lines)
Line 0 Link Here
1
--- build-aux/ltmain.sh.orig	2013-10-26 22:53:58 UTC
2
+++ build-aux/ltmain.sh
3
@@ -8598,13 +8598,13 @@ func_mode_link ()
4
 	  #
5
 	  case $version_type in
6
 	  # correct linux to gnu/linux during the next big refactor
7
-	  darwin|linux|osf|windows|none)
8
+	  darwin|freebsd-elf|linux|osf|windows|none)
9
 	    func_arith $number_major + $number_minor
10
 	    current=$func_arith_result
11
 	    age=$number_minor
12
 	    revision=$number_revision
13
 	    ;;
14
-	  freebsd-aout|freebsd-elf|qnx|sunos)
15
+	  freebsd-aout|qnx|sunos)
16
 	    current=$number_major
17
 	    revision=$number_minor
18
 	    age=0
19
@@ -8690,8 +8690,9 @@ func_mode_link ()
20
 	  ;;
21
 
22
 	freebsd-elf)
23
-	  major=.$current
24
-	  versuffix=.$current
25
+	  func_arith $current - $age
26
+	  major=.$func_arith_result
27
+	  versuffix=$major.$age.$revision
28
 	  ;;
29
 
30
 	irix | nonstopux)
(-)devel/libtool/files/patch-configure (+42 lines)
Line 0 Link Here
1
--- configure.orig	2013-10-26 22:53:35 UTC
2
+++ configure
3
@@ -11582,7 +11582,8 @@ freebsd* | dragonfly*)
4
   version_type=freebsd-$objformat
5
   case $version_type in
6
     freebsd-elf*)
7
-      library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext $libname$shared_ext'
8
+      library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
9
+      soname_spec='$libname$release$shared_ext$major'
10
       need_version=no
11
       need_lib_prefix=no
12
       ;;
13
@@ -16739,7 +16740,8 @@ freebsd* | dragonfly*)
14
   version_type=freebsd-$objformat
15
   case $version_type in
16
     freebsd-elf*)
17
-      library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext $libname$shared_ext'
18
+      library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
19
+      soname_spec='$libname$release$shared_ext$major'
20
       need_version=no
21
       need_lib_prefix=no
22
       ;;
23
@@ -19695,7 +19697,8 @@ freebsd* | dragonfly*)
24
   version_type=freebsd-$objformat
25
   case $version_type in
26
     freebsd-elf*)
27
-      library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext $libname$shared_ext'
28
+      library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
29
+      soname_spec='$libname$release$shared_ext$major'
30
       need_version=no
31
       need_lib_prefix=no
32
       ;;
33
@@ -22786,7 +22789,8 @@ freebsd* | dragonfly*)
34
   version_type=freebsd-$objformat
35
   case $version_type in
36
     freebsd-elf*)
37
-      library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext $libname$shared_ext'
38
+      library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
39
+      soname_spec='$libname$release$shared_ext$major'
40
       need_version=no
41
       need_lib_prefix=no
42
       ;;
(-)devel/libtool/files/patch-libltdl-Makefile.in (-23 lines)
Lines 1-23 Link Here
1
--- libltdl/Makefile.in.orig	2009-11-19 14:55:46.000000000 +0100
2
+++ libltdl/Makefile.in	2009-11-19 14:56:35.000000000 +0100
3
@@ -402,12 +402,6 @@
4
 $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
5
 	$(SHELL) ./config.status --recheck
6
 
7
-$(top_srcdir)/configure:  $(am__configure_deps)
8
-	$(am__cd) $(srcdir) && $(AUTOCONF)
9
-$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
10
-	$(am__cd) $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
11
-$(am__aclocal_m4_deps):
12
-
13
 config.h: stamp-h1
14
 	@if test ! -f $@; then \
15
 	  rm -f stamp-h1; \
16
@@ -418,7 +412,6 @@
17
 	@rm -f stamp-h1
18
 	cd $(top_builddir) && $(SHELL) ./config.status config.h
19
 $(srcdir)/config-h.in:  $(am__configure_deps) 
20
-	($(am__cd) $(top_srcdir) && $(AUTOHEADER))
21
 	rm -f stamp-h1
22
 	touch $@
23
 
(-)devel/libtool/files/patch-libltdl_config_ltmain.sh (-83 lines)
Lines 1-83 Link Here
1
--- libltdl/config/ltmain.sh.orig	2010-09-22 09:45:43.000000000 -0500
2
+++ libltdl/config/ltmain.sh	2011-01-18 12:59:46.000000000 -0600
3
@@ -1376,2 +1376,17 @@
4
     $opt_debug
5
+
6
+    # FreeBSD-specific: where we install compilers with non-standard names
7
+    tag_compilers_CC="*cc cc* *gcc gcc* clang*"
8
+    tag_compilers_CXX="*c++ c++* *g++ g++* clang++*"
9
+    base_compiler=`set -- "$@"; echo $1`
10
+
11
+    # If $tagname isn't set, then try to infer if the default "CC" tag applies
12
+    if test -z "$tagname"; then
13
+      for zp in $tag_compilers_CC; do
14
+        case $base_compiler in
15
+	 $zp) tagname="CC"; break;;
16
+	esac
17
+      done
18
+    fi
19
+
20
     if test -n "$available_tags" && test -z "$tagname"; then
21
@@ -1412,3 +1427,18 @@
22
 	    esac
23
-	  fi
24
+
25
+	    # FreeBSD-specific: try compilers based on inferred tag
26
+	    if test -z "$tagname"; then
27
+	      eval "tag_compilers=\$tag_compilers_${z}"
28
+	      if test -n "$tag_compilers"; then
29
+		for zp in $tag_compilers; do
30
+		  case $base_compiler in   
31
+		    $zp) tagname=$z; break;;
32
+		  esac
33
+		done
34
+		if test -n "$tagname"; then
35
+		  break
36
+		fi
37
+	      fi
38
+            fi
39
+          fi
40
 	done
41
@@ -3516,2 +3546,5 @@
42
 	;;
43
+      *-*-freebsd*)
44
+	# FreeBSD doesn't need this...
45
+	;;
46
       *)
47
@@ -5585,2 +5618,3 @@
48
 	esac
49
+	deplibs="$deplibs $arg"
50
 	continue
51
@@ -6155,9 +6189,26 @@
52
 	    func_append compiler_flags " $deplib"
53
-	    if test "$linkmode" = lib ; then
54
-		case "$new_inherited_linker_flags " in
55
-		    *" $deplib "*) ;;
56
-		    * ) func_append new_inherited_linker_flags " $deplib" ;;
57
-		esac
58
-	    fi
59
 	  fi
60
+
61
+	  case $linkmode in
62
+	  lib)
63
+	    deplibs="$deplib $deplibs"
64
+	    test "$pass" = conv && continue
65
+	    newdependency_libs="$deplib $newdependency_libs"
66
+	    ;;
67
+	  prog)
68
+	    if test "$pass" = conv; then
69
+	      deplibs="$deplib $deplibs"
70
+	      continue
71
+	    fi
72
+	    if test "$pass" = scan; then
73
+	      deplibs="$deplib $deplibs"
74
+	    else
75
+	      compile_deplibs="$deplib $compile_deplibs"
76
+	      finalize_deplibs="$deplib $finalize_deplibs"
77
+	    fi
78
+	    ;;
79
+	  *)
80
+	    ;;
81
+	  esac # linkmode
82
+
83
 	  continue
(-)devel/libtool/files/patch-libtoolize.in (+34 lines)
Line 0 Link Here
1
--- libtoolize.in.orig	2013-08-23 05:06:01 UTC
2
+++ libtoolize.in
3
@@ -393,7 +393,7 @@ func_copy ()
4
     # Filters always take priority.
5
     if test -n "$my_filter"; then
6
       if $opt_dry_run || {
7
-          ( umask 0
8
+          (
9
             $SED -e "$my_filter" "$my_srcfile" > "$my_destfile"
10
           ) >/dev/null 2>&1
11
         }
12
@@ -423,7 +423,7 @@ func_copy ()
13
     $opt_verbose && my_copy_msg="$my_copycmd $my_srcfile $my_destdir"
14
 
15
     if $opt_dry_run || {
16
-        ( umask 0
17
+        (
18
           $my_copycmd "$my_srcfile" "$my_destfile"
19
         ) >/dev/null 2>&1
20
       }
21
@@ -1894,9 +1894,10 @@ func_require_seen_libtool ()
22
   # Lists of all files libtoolize has ever installed.  These are removed
23
   # before installing the latest files when --force was passed to help
24
   # ensure a clean upgrade.
25
-  # Do not remove config.guess nor config.sub, we don't install them
26
-  # without --install, and the project may not be using Automake.
27
-  all_pkgaux_files="compile install-sh depcomp missing ltmain.sh snippet/_Noreturn.h snippet/arg-nonnull.h snippet/c++defs.h snippet/warn-on-use.h"
28
+  # Do not remove config.guess, config.sub or install-sh, we don't
29
+  # install them without --install, and the project may not be using
30
+  # Automake.
31
+  all_pkgaux_files="compile depcomp missing ltmain.sh snippet/_Noreturn.h snippet/arg-nonnull.h snippet/c++defs.h snippet/warn-on-use.h"
32
   all_pkgmacro_files="argz.m4 libtool.m4 ltdl.m4 ltoptions.m4 ltsugar.m4 ltversion.in ltversion.m4 lt~obsolete.m4"
33
   all_pkgltdl_files="COPYING.LIB Makefile Makefile.in Makefile.inc Makefile.am README acinclude.m4 aclocal.m4 argz_.h argz.c config.h.in config-h.in configure configure.ac configure.in libltdl/lt__alloc.h libltdl/lt__dirent.h libltdl/lt__glibc.h libltdl/lt__private.h libltdl/lt__strl.h libltdl/lt_dlloader.h libltdl/lt_error.h libltdl/lt_system.h libltdl/slist.h loaders/dld_link.c loaders/dlopen.c loaders/dyld.c loaders/load_add_on.c loaders/loadlibrary.c loaders/preopen.c loaders/shl_load.c lt__alloc.c lt__dirent.c lt__strl.c lt_dlloader.c lt_error.c ltdl.c ltdl.h ltdl.mk slist.c"
34
 
(-)devel/libtool/files/patch-m4_libtool.m4 (+12 lines)
Line 0 Link Here
1
--- m4/libtool.m4.orig	2013-10-25 23:37:46 UTC
2
+++ m4/libtool.m4
3
@@ -2547,7 +2547,8 @@ freebsd* | dragonfly*)
4
   version_type=freebsd-$objformat
5
   case $version_type in
6
     freebsd-elf*)
7
-      library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext $libname$shared_ext'
8
+      library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
9
+      soname_spec='$libname$release$shared_ext$major'
10
       need_version=no
11
       need_lib_prefix=no
12
       ;;
(-)devel/libtool/pkg-plist (-47 / +42 lines)
Lines 9-58 share/aclocal/ltoptions.m4 Link Here
9
share/aclocal/ltsugar.m4
9
share/aclocal/ltsugar.m4
10
share/aclocal/ltversion.m4
10
share/aclocal/ltversion.m4
11
share/aclocal/lt~obsolete.m4
11
share/aclocal/lt~obsolete.m4
12
share/libtool/config/compile
12
%%DATADIR%%/COPYING.LIB
13
share/libtool/config/config.guess
13
%%DATADIR%%/Makefile.am
14
share/libtool/config/config.sub
14
%%DATADIR%%/Makefile.in
15
share/libtool/config/depcomp
15
%%DATADIR%%/README
16
share/libtool/config/install-sh
16
%%DATADIR%%/aclocal.m4
17
share/libtool/config/ltmain.sh
17
%%DATADIR%%/argz.c
18
share/libtool/config/missing
18
%%DATADIR%%/argz_.h
19
share/libtool/libltdl/COPYING.LIB
19
%%DATADIR%%/build-aux/compile
20
share/libtool/libltdl/Makefile.am
20
%%DATADIR%%/build-aux/config.guess
21
share/libtool/libltdl/Makefile.in
21
%%DATADIR%%/build-aux/config.sub
22
share/libtool/libltdl/Makefile.inc
22
%%DATADIR%%/build-aux/depcomp
23
share/libtool/libltdl/README
23
%%DATADIR%%/build-aux/install-sh
24
share/libtool/libltdl/aclocal.m4
24
%%DATADIR%%/build-aux/ltmain.sh
25
share/libtool/libltdl/argz.c
25
%%DATADIR%%/build-aux/missing
26
share/libtool/libltdl/argz_.h
26
%%DATADIR%%/config-h.in
27
share/libtool/libltdl/config-h.in
27
%%DATADIR%%/configure
28
share/libtool/libltdl/configure
28
%%DATADIR%%/configure.ac
29
share/libtool/libltdl/configure.ac
29
%%DATADIR%%/libltdl/lt__alloc.h
30
share/libtool/libltdl/libltdl/lt__alloc.h
30
%%DATADIR%%/libltdl/lt__dirent.h
31
share/libtool/libltdl/libltdl/lt__dirent.h
31
%%DATADIR%%/libltdl/lt__glibc.h
32
share/libtool/libltdl/libltdl/lt__glibc.h
32
%%DATADIR%%/libltdl/lt__private.h
33
share/libtool/libltdl/libltdl/lt__private.h
33
%%DATADIR%%/libltdl/lt__strl.h
34
share/libtool/libltdl/libltdl/lt__strl.h
34
%%DATADIR%%/libltdl/lt_dlloader.h
35
share/libtool/libltdl/libltdl/lt_dlloader.h
35
%%DATADIR%%/libltdl/lt_error.h
36
share/libtool/libltdl/libltdl/lt_error.h
36
%%DATADIR%%/libltdl/lt_system.h
37
share/libtool/libltdl/libltdl/lt_system.h
37
%%DATADIR%%/libltdl/slist.h
38
share/libtool/libltdl/libltdl/slist.h
38
%%DATADIR%%/loaders/dld_link.c
39
share/libtool/libltdl/loaders/dld_link.c
39
%%DATADIR%%/loaders/dlopen.c
40
share/libtool/libltdl/loaders/dlopen.c
40
%%DATADIR%%/loaders/dyld.c
41
share/libtool/libltdl/loaders/dyld.c
41
%%DATADIR%%/loaders/load_add_on.c
42
share/libtool/libltdl/loaders/load_add_on.c
42
%%DATADIR%%/loaders/loadlibrary.c
43
share/libtool/libltdl/loaders/loadlibrary.c
43
%%DATADIR%%/loaders/preopen.c
44
share/libtool/libltdl/loaders/preopen.c
44
%%DATADIR%%/loaders/shl_load.c
45
share/libtool/libltdl/loaders/shl_load.c
45
%%DATADIR%%/lt__alloc.c
46
share/libtool/libltdl/lt__alloc.c
46
%%DATADIR%%/lt__dirent.c
47
share/libtool/libltdl/lt__dirent.c
47
%%DATADIR%%/lt__strl.c
48
share/libtool/libltdl/lt__strl.c
48
%%DATADIR%%/lt_dlloader.c
49
share/libtool/libltdl/lt_dlloader.c
49
%%DATADIR%%/lt_error.c
50
share/libtool/libltdl/lt_error.c
50
%%DATADIR%%/ltdl.c
51
share/libtool/libltdl/ltdl.c
51
%%DATADIR%%/ltdl.h
52
share/libtool/libltdl/ltdl.h
52
%%DATADIR%%/ltdl.mk
53
share/libtool/libltdl/slist.c
53
%%DATADIR%%/slist.c
54
@dirrm share/libtool/libltdl/loaders
55
@dirrm share/libtool/libltdl/libltdl
56
@dirrm share/libtool/libltdl
57
@dirrm share/libtool/config
58
@dirrm share/libtool
(-)devel/srecord/Makefile (-1 / +1 lines)
Lines 3-9 Link Here
3
3
4
PORTNAME=	srecord
4
PORTNAME=	srecord
5
PORTVERSION=	1.64
5
PORTVERSION=	1.64
6
PORTREVISION=	1
6
PORTREVISION=	2
7
CATEGORIES=	devel
7
CATEGORIES=	devel
8
MASTER_SITES=	SF
8
MASTER_SITES=	SF
9
9
(-)devel/srecord/pkg-plist (+1 lines)
Lines 143-148 include/srecord/string.h Link Here
143
lib/libsrecord.a
143
lib/libsrecord.a
144
lib/libsrecord.so
144
lib/libsrecord.so
145
lib/libsrecord.so.0
145
lib/libsrecord.so.0
146
lib/libsrecord.so.0.0.0
146
libdata/pkgconfig/srecord.pc
147
libdata/pkgconfig/srecord.pc
147
man/man1/srec_cat.1.gz
148
man/man1/srec_cat.1.gz
148
man/man1/srec_cmp.1.gz
149
man/man1/srec_cmp.1.gz
(-)devel/xparam/Makefile (-1 / +1 lines)
Lines 3-9 Link Here
3
3
4
PORTNAME=	xparam
4
PORTNAME=	xparam
5
PORTVERSION=	1.22
5
PORTVERSION=	1.22
6
PORTREVISION=	2
6
PORTREVISION=	3
7
CATEGORIES=	devel
7
CATEGORIES=	devel
8
MASTER_SITES=	SF
8
MASTER_SITES=	SF
9
9
(-)devel/xparam/pkg-plist (-1 / +1 lines)
Lines 84-87 include/xparam_extend.h Link Here
84
lib/libxparam.a
84
lib/libxparam.a
85
lib/libxparam.so
85
lib/libxparam.so
86
lib/libxparam.so.1
86
lib/libxparam.so.1
87
@dirrm include/xparam
87
lib/libxparam.so.1.0.0
(-)dns/dnsutl/Makefile (+1 lines)
Lines 3-8 Link Here
3
3
4
PORTNAME=	dnsutl
4
PORTNAME=	dnsutl
5
PORTVERSION=	1.12
5
PORTVERSION=	1.12
6
PORTREVISION=	1
6
CATEGORIES=	dns
7
CATEGORIES=	dns
7
MASTER_SITES=	SF/${PORTNAME}/${PORTVERSION}
8
MASTER_SITES=	SF/${PORTNAME}/${PORTVERSION}
8
9
(-)dns/ldns/Makefile (-3 / +6 lines)
Lines 14-21 COMMENT= Library for programs conforming Link Here
14
LICENSE=	BSD3CLAUSE
14
LICENSE=	BSD3CLAUSE
15
LICENSE_FILE=	${WRKSRC}/LICENSE
15
LICENSE_FILE=	${WRKSRC}/LICENSE
16
16
17
GNU_CONFIGURE=	yes
17
USES=		gmake libtool
18
USES=		gmake libtool
18
USE_AUTOTOOLS=	libtoolize
19
USE_OPENSSL=	yes
19
USE_OPENSSL=	yes
20
USE_LDCONFIG=	yes
20
USE_LDCONFIG=	yes
21
21
Lines 108-122 CONFIGURE_ARGS+= --enable-rrtype-ta Link Here
108
.if ! (defined(BUILD_PYLDNS) || defined(BUILD_P5PERL))
108
.if ! (defined(BUILD_PYLDNS) || defined(BUILD_P5PERL))
109
109
110
post-configure:
110
post-configure:
111
# ac_cv_prog_libtool=../libtool => Always use bundled libtool
111
.if ${PORT_OPTIONS:MEXAMPLES}
112
.if ${PORT_OPTIONS:MEXAMPLES}
112
	@(cd ${WRKSRC}/examples; ./configure --prefix=${PREFIX} \
113
	@(cd ${WRKSRC}/examples; ./configure --prefix=${PREFIX} \
113
		--infodir=${PREFIX}/${INFO_PATH} --mandir=${MANPREFIX}/man \
114
		--infodir=${PREFIX}/${INFO_PATH} --mandir=${MANPREFIX}/man \
114
		--build=${CONFIGURE_TARGET} ${NO_GOST} ${NO_SHA2})
115
		--build=${CONFIGURE_TARGET} ${NO_GOST} ${NO_SHA2} \
116
		ac_cv_prog_libtool=../libtool)
115
.endif
117
.endif
116
.if ${PORT_OPTIONS:MDRILL}
118
.if ${PORT_OPTIONS:MDRILL}
117
	@(cd ${WRKSRC}/drill; ./configure --prefix=${PREFIX} \
119
	@(cd ${WRKSRC}/drill; ./configure --prefix=${PREFIX} \
118
		--mandir=${MANPREFIX}/man \
120
		--mandir=${MANPREFIX}/man \
119
		--build=${CONFIGURE_TARGET})
121
		--build=${CONFIGURE_TARGET} \
122
		ac_cv_prog_libtool=../libtool)
120
.endif
123
.endif
121
124
122
post-build:
125
post-build:
(-)ftp/twoftpd/Makefile (+1 lines)
Lines 3-8 Link Here
3
3
4
PORTNAME=	twoftpd
4
PORTNAME=	twoftpd
5
PORTVERSION=	1.42
5
PORTVERSION=	1.42
6
PORTREVISION=	1
6
CATEGORIES=	ftp
7
CATEGORIES=	ftp
7
MASTER_SITES=	http://untroubled.org/${PORTNAME}/
8
MASTER_SITES=	http://untroubled.org/${PORTNAME}/
8
9
(-)games/gnubg/Makefile (-4 lines)
Lines 28-34 GNU_CONFIGURE= yes Link Here
28
INSTALLS_ICONS=	yes
28
INSTALLS_ICONS=	yes
29
INSTALL_TARGET=	install-strip
29
INSTALL_TARGET=	install-strip
30
USES=		gmake libtool pathfix shebangfix python pkgconfig compiler:c++11-lang
30
USES=		gmake libtool pathfix shebangfix python pkgconfig compiler:c++11-lang
31
USE_AUTOTOOLS=	aclocal automake libtoolize
32
USE_GNOME=	glib20
31
USE_GNOME=	glib20
33
32
34
OPTIONS_DEFINE=	NLS DOCS
33
OPTIONS_DEFINE=	NLS DOCS
Lines 38-44 OPTIONS_SUB= yes Link Here
38
NLS_USES=	gettext
37
NLS_USES=	gettext
39
NLS_CONFIGURE_ENABLE=	nls
38
NLS_CONFIGURE_ENABLE=	nls
40
39
41
#pre-configure:
42
#	cd ${WRKSRC} && ./autogen.sh
43
44
.include <bsd.port.mk>
40
.include <bsd.port.mk>
(-)graphics/gexiv2/Makefile (-1 / +1 lines)
Lines 3-9 Link Here
3
3
4
PORTNAME=	gexiv2
4
PORTNAME=	gexiv2
5
PORTVERSION=	0.6.1
5
PORTVERSION=	0.6.1
6
PORTREVISION=	2
6
PORTREVISION=	3
7
CATEGORIES=	graphics
7
CATEGORIES=	graphics
8
MASTER_SITES=	http://yorba.org/download/${PORTNAME}/${PORTVERSION:R}/
8
MASTER_SITES=	http://yorba.org/download/${PORTNAME}/${PORTVERSION:R}/
9
DISTNAME=	lib${PORTNAME}_${PORTVERSION}
9
DISTNAME=	lib${PORTNAME}_${PORTVERSION}
(-)graphics/gexiv2/pkg-plist (-5 / +3 lines)
Lines 5-15 include/gexiv2/gexiv2-managed-stream.h Link Here
5
include/gexiv2/gexiv2-preview-properties.h
5
include/gexiv2/gexiv2-preview-properties.h
6
include/gexiv2/gexiv2-preview-image.h
6
include/gexiv2/gexiv2-preview-image.h
7
include/gexiv2/gexiv2-startup.h
7
include/gexiv2/gexiv2-startup.h
8
lib/libgexiv2.so.2
9
lib/libgexiv2.so
10
lib/libgexiv2.a
8
lib/libgexiv2.a
9
lib/libgexiv2.so
10
lib/libgexiv2.so.2
11
lib/libgexiv2.so.2.0.0
11
libdata/pkgconfig/gexiv2.pc
12
libdata/pkgconfig/gexiv2.pc
12
share/vala/vapi/gexiv2.vapi
13
share/vala/vapi/gexiv2.vapi
13
@dirrmtry include/gexiv2
14
@dirrmtry share/vala/vapi
15
@dirrmtry share/vala
(-)lang/gforth/Makefile (-1 / +1 lines)
Lines 3-9 Link Here
3
3
4
PORTNAME=	gforth
4
PORTNAME=	gforth
5
PORTVERSION=	0.7.3
5
PORTVERSION=	0.7.3
6
PORTREVISION=	2
6
PORTREVISION=	3
7
CATEGORIES=	lang
7
CATEGORIES=	lang
8
MASTER_SITES=	http://www.complang.tuwien.ac.at/forth/gforth/ \
8
MASTER_SITES=	http://www.complang.tuwien.ac.at/forth/gforth/ \
9
		GNU
9
		GNU
(-)lang/gforth/pkg-plist (-8 / +12 lines)
Lines 12-29 include/gforth/%%PORTVERSION%%/config.h Link Here
12
include/gforth/%%PORTVERSION%%/libcc.h
12
include/gforth/%%PORTVERSION%%/libcc.h
13
lib/gforth/%%PORTVERSION%%/gforth-ditc
13
lib/gforth/%%PORTVERSION%%/gforth-ditc
14
lib/gforth/%%PORTVERSION%%/gforth.fi
14
lib/gforth/%%PORTVERSION%%/gforth.fi
15
lib/gforth/%%PORTVERSION%%/libcc-named/cstr.so.0
16
lib/gforth/%%PORTVERSION%%/libcc-named/cstr.so
17
lib/gforth/%%PORTVERSION%%/libcc-named/cstr.a
15
lib/gforth/%%PORTVERSION%%/libcc-named/cstr.a
18
lib/gforth/%%PORTVERSION%%/libcc-named/socket.so.0
16
lib/gforth/%%PORTVERSION%%/libcc-named/cstr.so
19
lib/gforth/%%PORTVERSION%%/libcc-named/socket.so
17
lib/gforth/%%PORTVERSION%%/libcc-named/cstr.so.0
18
lib/gforth/%%PORTVERSION%%/libcc-named/cstr.so.0.0.0
20
lib/gforth/%%PORTVERSION%%/libcc-named/socket.a
19
lib/gforth/%%PORTVERSION%%/libcc-named/socket.a
21
lib/gforth/%%PORTVERSION%%/libcc-named/libffi.so.0
20
lib/gforth/%%PORTVERSION%%/libcc-named/socket.so
22
lib/gforth/%%PORTVERSION%%/libcc-named/libffi.so
21
lib/gforth/%%PORTVERSION%%/libcc-named/socket.so.0
22
lib/gforth/%%PORTVERSION%%/libcc-named/socket.so.0.0.0
23
lib/gforth/%%PORTVERSION%%/libcc-named/libffi.a
23
lib/gforth/%%PORTVERSION%%/libcc-named/libffi.a
24
lib/gforth/%%PORTVERSION%%/libcc-named/fflib.so.0
24
lib/gforth/%%PORTVERSION%%/libcc-named/libffi.so
25
lib/gforth/%%PORTVERSION%%/libcc-named/fflib.so
25
lib/gforth/%%PORTVERSION%%/libcc-named/libffi.so.0
26
lib/gforth/%%PORTVERSION%%/libcc-named/libffi.so.0.0.0
26
lib/gforth/%%PORTVERSION%%/libcc-named/fflib.a
27
lib/gforth/%%PORTVERSION%%/libcc-named/fflib.a
28
lib/gforth/%%PORTVERSION%%/libcc-named/fflib.so
29
lib/gforth/%%PORTVERSION%%/libcc-named/fflib.so.0
30
lib/gforth/%%PORTVERSION%%/libcc-named/fflib.so.0.0.0
27
man/man1/gforth.1.gz
31
man/man1/gforth.1.gz
28
%%DATADIR%%/%%PORTVERSION%%/TAGS
32
%%DATADIR%%/%%PORTVERSION%%/TAGS
29
%%DATADIR%%/%%PORTVERSION%%/add.fs
33
%%DATADIR%%/%%PORTVERSION%%/add.fs
(-)lang/oo2c/Makefile (-1 / +1 lines)
Lines 3-9 Link Here
3
3
4
PORTNAME=	oo2c
4
PORTNAME=	oo2c
5
PORTVERSION=	2.1.11
5
PORTVERSION=	2.1.11
6
PORTREVISION=	2
6
PORTREVISION=	3
7
CATEGORIES=	lang
7
CATEGORIES=	lang
8
MASTER_SITES=	SF/ooc/ooc2/${PORTVERSION}
8
MASTER_SITES=	SF/ooc/ooc2/${PORTVERSION}
9
DISTNAME=	${PORTNAME}_${BITS}-${PORTVERSION}
9
DISTNAME=	${PORTNAME}_${BITS}-${PORTVERSION}
(-)lang/oo2c/pkg-plist (+1 lines)
Lines 10-15 man/man1/oowhereis.1.gz Link Here
10
lib/liboo2c.a
10
lib/liboo2c.a
11
lib/liboo2c.so
11
lib/liboo2c.so
12
lib/liboo2c.so.3
12
lib/liboo2c.so.3
13
lib/liboo2c.so.3.0.0
13
lib/oo2c/emacs/o2-default.el
14
lib/oo2c/emacs/o2-default.el
14
lib/oo2c/emacs/o2-indent.el
15
lib/oo2c/emacs/o2-indent.el
15
lib/oo2c/emacs/o2-insert.el
16
lib/oo2c/emacs/o2-insert.el
(-)mail/mailfront/Makefile (+1 lines)
Lines 3-8 Link Here
3
3
4
PORTNAME=	mailfront
4
PORTNAME=	mailfront
5
PORTVERSION=	2.01
5
PORTVERSION=	2.01
6
PORTREVISION=	1
6
CATEGORIES=	mail
7
CATEGORIES=	mail
7
MASTER_SITES=	http://untroubled.org/${PORTNAME}/ \
8
MASTER_SITES=	http://untroubled.org/${PORTNAME}/ \
8
		http://untroubled.org/${PORTNAME}/archive/
9
		http://untroubled.org/${PORTNAME}/archive/
(-)mail/qmail-autoresponder/Makefile (-1 / +1 lines)
Lines 3-9 Link Here
3
3
4
PORTNAME=	qmail-autoresponder
4
PORTNAME=	qmail-autoresponder
5
PORTVERSION=	0.97
5
PORTVERSION=	0.97
6
PORTREVISION=	1
6
PORTREVISION=	2
7
CATEGORIES=	mail
7
CATEGORIES=	mail
8
MASTER_SITES=	http://untroubled.org/${PORTNAME}/
8
MASTER_SITES=	http://untroubled.org/${PORTNAME}/
9
9
(-)mail/qmail-qfilter/Makefile (-1 / +1 lines)
Lines 3-9 Link Here
3
3
4
PORTNAME=	qmail-qfilter
4
PORTNAME=	qmail-qfilter
5
PORTVERSION=	2.1
5
PORTVERSION=	2.1
6
PORTREVISION=	2
6
PORTREVISION=	3
7
CATEGORIES=	mail
7
CATEGORIES=	mail
8
MASTER_SITES=	http://untroubled.org/${PORTNAME}/
8
MASTER_SITES=	http://untroubled.org/${PORTNAME}/
9
9
(-)math/libtommath/Makefile (-2 / +2 lines)
Lines 2-8 Link Here
2
2
3
PORTNAME=	libtommath
3
PORTNAME=	libtommath
4
PORTVERSION=	0.42.0
4
PORTVERSION=	0.42.0
5
PORTREVISION=	1
5
PORTREVISION=	2
6
CATEGORIES=	math
6
CATEGORIES=	math
7
MASTER_SITES=	http://libtom.org/files/
7
MASTER_SITES=	http://libtom.org/files/
8
DISTNAME=	ltm-${PORTVERSION}
8
DISTNAME=	ltm-${PORTVERSION}
Lines 31-37 post-patch: Link Here
31
.if ${PORT_OPTIONS:MSHARED}
31
.if ${PORT_OPTIONS:MSHARED}
32
USES+=		libtool:build
32
USES+=		libtool:build
33
USE_LDCONFIG=	yes
33
USE_LDCONFIG=	yes
34
PLIST_FILES+=	lib/libtommath.so.0 lib/libtommath.so
34
PLIST_FILES+=	lib/libtommath.so lib/libtommath.so.0 lib/libtommath.so.0.0.41
35
MAKEFILE=	makefile.shared
35
MAKEFILE=	makefile.shared
36
.else
36
.else
37
MAKEFILE=	makefile
37
MAKEFILE=	makefile
(-)net/ntop/Makefile (-5 / +3 lines)
Lines 22-29 RUN_DEPENDS:= ${BUILD_DEPENDS} \ Link Here
22
22
23
DBDIR?=		/var/db
23
DBDIR?=		/var/db
24
24
25
USES=		gmake libtool python
25
USES=		autoreconf:build gmake libtool python
26
USE_AUTOTOOLS=	automake autoconf libtoolize
27
USE_GNOME=	libxml2
26
USE_GNOME=	libxml2
28
USE_OPENSSL=	yes
27
USE_OPENSSL=	yes
29
GNU_CONFIGURE=	yes
28
GNU_CONFIGURE=	yes
Lines 36-44 CONFIGURE_ARGS= --localstatedir=${DBDIR} Link Here
36
		--with-zlib-root=/usr
35
		--with-zlib-root=/usr
37
INSTALL_TARGET=	install-strip
36
INSTALL_TARGET=	install-strip
38
37
39
CFLAGS+=	-I${LOCALBASE}/include -L${LOCALBASE}/lib
40
LDFLAGS+=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}
41
CPPFLAGS+=	-I${LOCALBASE}/include
38
CPPFLAGS+=	-I${LOCALBASE}/include
39
LIBS+=		-L${LOCALBASE}/lib
42
PKGDEINSTALL=	${WRKDIR}/pkg-deinstall
40
PKGDEINSTALL=	${WRKDIR}/pkg-deinstall
43
SUB_FILES=	pkg-deinstall
41
SUB_FILES=	pkg-deinstall
44
SUB_LIST=	DBDIR=${DBDIR}
42
SUB_LIST=	DBDIR=${DBDIR}
Lines 91-97 CONFIGURE_ARGS+= STRIP=${LOCALBASE}/bin/ Link Here
91
.endif
89
.endif
92
90
93
pre-configure:
91
pre-configure:
94
	@cd ${WRKSRC} && ${SETENV} ${SCRIPTS_ENV} ${SH} autogen.sh --noconfig
92
	@(cd ${WRKSRC} && ${SETENV} LTTRAP=no ./autogen.sh --noconfig)
95
93
96
pre-install:
94
pre-install:
97
	@cd ${WRKSRC} && ${MAKE_CMD} dnetter
95
	@cd ${WRKSRC} && ${MAKE_CMD} dnetter
(-)security/cvm/Makefile (-1 / +1 lines)
Lines 3-9 Link Here
3
3
4
PORTNAME=	cvm
4
PORTNAME=	cvm
5
PORTVERSION=	0.96
5
PORTVERSION=	0.96
6
PORTREVISION=	2
6
PORTREVISION=	3
7
CATEGORIES=	security
7
CATEGORIES=	security
8
MASTER_SITES=	http://untroubled.org/${PORTNAME}/ \
8
MASTER_SITES=	http://untroubled.org/${PORTNAME}/ \
9
		http://untroubled.org/${PORTNAME}/archive/
9
		http://untroubled.org/${PORTNAME}/archive/
(-)security/cvm/pkg-plist (-11 / +18 lines)
Lines 26-56 lib/libcvm-client.a Link Here
26
lib/libcvm-client.so
26
lib/libcvm-client.so
27
lib/libcvm-command.a
27
lib/libcvm-command.a
28
lib/libcvm-command.so
28
lib/libcvm-command.so
29
lib/libcvm-command.so.2
29
lib/libcvm-command.so.1
30
lib/libcvm-command.so.1.1.0
30
lib/libcvm-local.a
31
lib/libcvm-local.a
31
lib/libcvm-local.so
32
lib/libcvm-local.so
32
lib/libcvm-local.so.2
33
lib/libcvm-local.so.1
34
lib/libcvm-local.so.1.1.0
33
lib/libcvm-module.a
35
lib/libcvm-module.a
34
lib/libcvm-module.so
36
lib/libcvm-module.so
35
lib/libcvm-module.so.2
37
lib/libcvm-module.so.1
38
lib/libcvm-module.so.1.1.0
36
lib/libcvm-qmail.a
39
lib/libcvm-qmail.a
37
lib/libcvm-qmail.so
40
lib/libcvm-qmail.so
38
lib/libcvm-qmail.so.2
41
lib/libcvm-qmail.so.1
42
lib/libcvm-qmail.so.1.1.0
39
lib/libcvm-sasl.a
43
lib/libcvm-sasl.a
40
lib/libcvm-sasl.so
44
lib/libcvm-sasl.so
41
lib/libcvm-sasl.so.2
45
lib/libcvm-sasl.so.1
46
lib/libcvm-sasl.so.1.1.0
42
lib/libcvm-sql.a
47
lib/libcvm-sql.a
43
lib/libcvm-sql.so
48
lib/libcvm-sql.so
44
lib/libcvm-sql.so.2
49
lib/libcvm-sql.so.1
50
lib/libcvm-sql.so.1.1.0
45
lib/libcvm-udp.a
51
lib/libcvm-udp.a
46
lib/libcvm-udp.so
52
lib/libcvm-udp.so
47
lib/libcvm-udp.so.2
53
lib/libcvm-udp.so.1
54
lib/libcvm-udp.so.1.1.0
48
lib/libcvm-v1client.a
55
lib/libcvm-v1client.a
49
lib/libcvm-v1client.so
56
lib/libcvm-v1client.so
50
lib/libcvm-v1client.so.2
57
lib/libcvm-v1client.so.1
58
lib/libcvm-v1client.so.1.1.0
51
lib/libcvm-v2client.a
59
lib/libcvm-v2client.a
52
lib/libcvm-v2client.so
60
lib/libcvm-v2client.so
53
lib/libcvm-v2client.so.2
61
lib/libcvm-v2client.so.1
62
lib/libcvm-v2client.so.1.1.0
54
%%PORTDOCS%%%%DOCSDIR%%/NEWS
63
%%PORTDOCS%%%%DOCSDIR%%/NEWS
55
%%PORTDOCS%%%%DOCSDIR%%/README
64
%%PORTDOCS%%%%DOCSDIR%%/README
56
%%PORTDOCS%%%%DOCSDIR%%/TODO
65
%%PORTDOCS%%%%DOCSDIR%%/TODO
Lines 77-81 lib/libcvm-v2client.so.2 Link Here
77
%%PORTDOCS%%%%DOCSDIR%%/sql.html
86
%%PORTDOCS%%%%DOCSDIR%%/sql.html
78
%%PORTDOCS%%%%DOCSDIR%%/v1client.html
87
%%PORTDOCS%%%%DOCSDIR%%/v1client.html
79
%%PORTDOCS%%%%DOCSDIR%%/v2client.html
88
%%PORTDOCS%%%%DOCSDIR%%/v2client.html
80
%%PORTDOCS%%@dirrm %%DOCSDIR%%
81
@dirrm include/cvm
(-)security/libtomcrypt/Makefile (-1 / +1 lines)
Lines 3-9 Link Here
3
3
4
PORTNAME=	libtomcrypt
4
PORTNAME=	libtomcrypt
5
PORTVERSION=	1.17
5
PORTVERSION=	1.17
6
PORTREVISION=	3
6
PORTREVISION=	4
7
CATEGORIES=	security
7
CATEGORIES=	security
8
MASTER_SITES=	http://libtom.org/files/
8
MASTER_SITES=	http://libtom.org/files/
9
DISTNAME=	crypt-${PORTVERSION}
9
DISTNAME=	crypt-${PORTVERSION}
(-)security/libtomcrypt/pkg-plist (+2 lines)
Lines 15-23 include/tomcrypt_test.h Link Here
15
lib/libtomcrypt.a
15
lib/libtomcrypt.a
16
lib/libtomcrypt.so
16
lib/libtomcrypt.so
17
lib/libtomcrypt.so.0
17
lib/libtomcrypt.so.0
18
lib/libtomcrypt.so.0.0.117
18
lib/libtomcrypt_prof.a
19
lib/libtomcrypt_prof.a
19
lib/libtomcrypt_prof.so
20
lib/libtomcrypt_prof.so
20
lib/libtomcrypt_prof.so.0
21
lib/libtomcrypt_prof.so.0
22
lib/libtomcrypt_prof.so.0.0.117
21
%%PORTDOCS%%%%DOCSDIR%%/pdf/crypt.pdf
23
%%PORTDOCS%%%%DOCSDIR%%/pdf/crypt.pdf
22
%%PORTDOCS%%@dirrm %%DOCSDIR%%/pdf
24
%%PORTDOCS%%@dirrm %%DOCSDIR%%/pdf
23
%%PORTDOCS%%@dirrm %%DOCSDIR%%
25
%%PORTDOCS%%@dirrm %%DOCSDIR%%
(-)sysutils/ucspi-proxy/Makefile (-1 / +1 lines)
Lines 3-9 Link Here
3
3
4
PORTNAME=	ucspi-proxy
4
PORTNAME=	ucspi-proxy
5
PORTVERSION=	0.98
5
PORTVERSION=	0.98
6
PORTREVISION=	1
6
PORTREVISION=	2
7
CATEGORIES=	sysutils
7
CATEGORIES=	sysutils
8
MASTER_SITES=	http://untroubled.org/ucspi-proxy/
8
MASTER_SITES=	http://untroubled.org/ucspi-proxy/
9
9
(-)sysutils/vii/Makefile (-1 / +1 lines)
Lines 3-9 Link Here
3
3
4
PORTNAME=	vii
4
PORTNAME=	vii
5
PORTVERSION=	4.2
5
PORTVERSION=	4.2
6
PORTREVISION=	3
6
PORTREVISION=	4
7
CATEGORIES=	sysutils
7
CATEGORIES=	sysutils
8
MASTER_SITES=	http://vii.sourceforge.net/ \
8
MASTER_SITES=	http://vii.sourceforge.net/ \
9
		CRITICAL
9
		CRITICAL
(-)x11/roxterm/Makefile (-1 / +1 lines)
Lines 48-54 do-configure: Link Here
48
		${PYTHON_CMD} mscript.py configure)
48
		${PYTHON_CMD} mscript.py configure)
49
49
50
do-build:
50
do-build:
51
	@(cd ${WRKSRC} && ${PYTHON_CMD} mscript.py build)
51
	@(cd ${WRKSRC} && ${SETENV} LTTRAP=no ${PYTHON_CMD} mscript.py build)
52
52
53
do-install:
53
do-install:
54
.for i in roxterm roxterm-config
54
.for i in roxterm roxterm-config
(-)x11-toolkits/xmhtml/Makefile (-1 / +2 lines)
Lines 3-8 Link Here
3
3
4
PORTNAME=	XmHTML
4
PORTNAME=	XmHTML
5
PORTVERSION=	1.1.9
5
PORTVERSION=	1.1.9
6
PORTREVISION=	1
6
CATEGORIES=	x11-toolkits www
7
CATEGORIES=	x11-toolkits www
7
MASTER_SITES=	SF/${PORTNAME:tl}
8
MASTER_SITES=	SF/${PORTNAME:tl}
8
9
Lines 24-30 MAKE_ENV= LIBTOOL=${LIBTOOL} Link Here
24
OPTIONS_DEFINE=	DOCS EXAMPLES
25
OPTIONS_DEFINE=	DOCS EXAMPLES
25
26
26
do-install:
27
do-install:
27
	(cd ${WRKSRC}/lib && ${LIBTOOL} --mode=install ${INSTALL_DATA} \
28
	(cd ${WRKSRC}/lib && ${SETENV} LTTRAP=no ${LIBTOOL} --mode=install ${INSTALL_DATA} \
28
		libXmHTML.la ${STAGEDIR}${PREFIX}/lib)
29
		libXmHTML.la ${STAGEDIR}${PREFIX}/lib)
29
	@${MKDIR} ${STAGEDIR}${PREFIX}/include/XmHTML
30
	@${MKDIR} ${STAGEDIR}${PREFIX}/include/XmHTML
30
	(cd ${WRKSRC}/include/XmHTML && ${INSTALL_DATA} *.h \
31
	(cd ${WRKSRC}/include/XmHTML && ${INSTALL_DATA} *.h \
(-)x11-toolkits/xmhtml/pkg-plist (+1 lines)
Lines 14-19 include/XmHTML/toolkit.h Link Here
14
lib/libXmHTML.a
14
lib/libXmHTML.a
15
lib/libXmHTML.so
15
lib/libXmHTML.so
16
lib/libXmHTML.so.1
16
lib/libXmHTML.so.1
17
lib/libXmHTML.so.1.0.2
17
%%PORTDOCS%%%%DOCSDIR%%/GPL.html
18
%%PORTDOCS%%%%DOCSDIR%%/GPL.html
18
%%PORTDOCS%%%%DOCSDIR%%/LGPL.html
19
%%PORTDOCS%%%%DOCSDIR%%/LGPL.html
19
%%PORTDOCS%%%%DOCSDIR%%/XmHTML.html
20
%%PORTDOCS%%%%DOCSDIR%%/XmHTML.html

Return to bug 194068