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

Collapse All | Expand All

(-)Mk/Uses/libtool.mk (+6 lines)
Lines 35-40 patch-libtool: Link Here
35
35
36
	@${FIND} ${WRKDIR} -type f -name ltmain.sh |			\
36
	@${FIND} ${WRKDIR} -type f -name ltmain.sh |			\
37
		${XARGS} ${REINPLACE_CMD}				\
37
		${XARGS} ${REINPLACE_CMD}				\
38
		-e '/link) libs=/s/ $$dependency_libs//'		\
39
		-e '/elif.*linkmode.*prog.*linkmode.*lib/,/continue/ {	\
40
		    /elif/,/fi/ { /elif/ { h; d; }; H; d; };		\
41
		    /continue/ { H; g; }; }'				\
42
		-e '/if.*linkmode.*prog.*mode.*!= relink/s/if.*;/if :;/'\
43
		-e '/if.*linkmode.*prog.*mode.* = relink/s/||.*;/;/'	\
38
		-e 's/|-p|-pg|/|-B*|-p|-pg|/'
44
		-e 's/|-p|-pg|/|-B*|-p|-pg|/'
39
45
40
.if ! ${libtool_ARGS:Moldver}
46
.if ! ${libtool_ARGS:Moldver}
(-)archivers/rpm4/Makefile (-2 / +3 lines)
Lines 25-31 NLS_CONFIGURE_ENABLE=nls Link Here
25
NLS_USES=	gettext
25
NLS_USES=	gettext
26
PORTDOCS=	*
26
PORTDOCS=	*
27
27
28
USES=		gmake shebangfix lua:51 libtool tar:bzip2
28
USES=		gmake libtool lua:51 pathfix shebangfix tar:bzip2
29
USE_BDB=	46+
29
USE_BDB=	46+
30
INVALID_BDB_VER=51
30
INVALID_BDB_VER=51
31
GNU_CONFIGURE=	yes
31
GNU_CONFIGURE=	yes
Lines 57-63 CONFIGURE_ENV+= LUA_CFLAGS=-I${LUA_INCDI Link Here
57
PLIST_SUB+=	VERSION=${PORTVERSION}
57
PLIST_SUB+=	VERSION=${PORTVERSION}
58
58
59
post-patch:
59
post-patch:
60
	${REINPLACE_CMD} -e '/^pkgconfigdir/s:/:data/:' \
60
	${REINPLACE_CMD} \
61
		-e '/_LDADD =/s/=/= @LTLIBINTL@/' \
61
		-e 's:\.\./\.\./bin/::' ${WRKSRC}/Makefile.in
62
		-e 's:\.\./\.\./bin/::' ${WRKSRC}/Makefile.in
62
	${REINPLACE_CMD} -e 's/(hpux)/& || defined(__FreeBSD__)/' \
63
	${REINPLACE_CMD} -e 's/(hpux)/& || defined(__FreeBSD__)/' \
63
		${WRKSRC}/misc/fts.?
64
		${WRKSRC}/misc/fts.?
(-)databases/evolution-data-server/Makefile (+18 lines)
Lines 68-72 post-patch: Link Here
68
		s|-Wl,--no-undefined||g ; \
68
		s|-Wl,--no-undefined||g ; \
69
		s|-Wmissing-include-dirs||g' \
69
		s|-Wmissing-include-dirs||g' \
70
			${WRKSRC}/configure
70
			${WRKSRC}/configure
71
	@${REINPLACE_CMD} '/^e_addressbook_factory_LDADD =/ \
72
		s/=/= -lgio-2.0 -lgobject-2.0 -lgthread-2.0 -lglib-2.0 $$(INTLLIBS)/' \
73
		${WRKSRC}/addressbook/libedata-book/Makefile.in
74
	@${REINPLACE_CMD} '/^test_interval_searches_LDADD =/s/=/= -lgthread-2.0/' \
75
		${WRKSRC}/calendar/backends/file/Makefile.in
76
	@${REINPLACE_CMD} -e '/^test_e_sexp_LDADD =/s/=/= -lical/' \
77
		-e '/^test_intervaltree_LDADD =/s/=/= -lical/' \
78
		-e '/^e_calendar_factory_LDADD =/s|=|= ../libecal/libecal-1.2.la -lical|' \
79
		${WRKSRC}/calendar/libedata-cal/Makefile.in
80
	@${REINPLACE_CMD} '/^camel_index_control_1_2_LDADD =/s/=/= -lgthread-2.0/' \
81
		${WRKSRC}/camel/Makefile.in
82
	@${REINPLACE_CMD} '/^test_imapx_LDADD =/s/=/= -lgobject-2.0 -lgthread-2.0/' \
83
		${WRKSRC}/camel/providers/imapx/Makefile.in
84
	@${REINPLACE_CMD} -e '/^test_contact_store_LDADD =/s|$$| ../addressbook/libebook/libebook-1.2.la|' \
85
		-e '/^test_name_selector_LDADD =/s|$$| ../camel/libcamel-1.2.la -lgthread-2.0|' \
86
		${WRKSRC}/libedataserverui/Makefile.in
87
	@${REINPLACE_CMD} '/^soap_test_LDADD =/s/=/= -lgthread-2.0/' \
88
		${WRKSRC}/servers/groupwise/Makefile.in
71
89
72
.include <bsd.port.mk>
90
.include <bsd.port.mk>
(-)databases/gdbm/Makefile (-3 / +3 lines)
Lines 13-18 COMMENT= GNU database manager Link Here
13
LICENSE=	GPLv3
13
LICENSE=	GPLv3
14
14
15
GNU_CONFIGURE=	yes
15
GNU_CONFIGURE=	yes
16
INSTALL_TARGET=	install-strip
16
USE_LDCONFIG=	yes
17
USE_LDCONFIG=	yes
17
USES=		gmake libtool:keepla
18
USES=		gmake libtool:keepla
18
19
Lines 32-39 post-patch: Link Here
32
		-e "s|BINOWN = bin|BINOWN = root|" -e "s|BINGRP = bin|BINGRP = wheel|" \
33
		-e "s|BINOWN = bin|BINOWN = root|" -e "s|BINGRP = bin|BINGRP = wheel|" \
33
		-e "s|libgdbm.la libgdbm_compat.la|libgdbm.la libgdbm_compat.la gdbm.info|" \
34
		-e "s|libgdbm.la libgdbm_compat.la|libgdbm.la libgdbm_compat.la gdbm.info|" \
34
			${WRKSRC}/Makefile.in
35
			${WRKSRC}/Makefile.in
35
36
	@${REINPLACE_CMD} '/_LDADD =/s/$$/ @LTLIBINTL@/' \
36
post-install:
37
		${WRKSRC}/src/Makefile.in
37
	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libgdbm*.so
38
38
39
.include <bsd.port.mk>
39
.include <bsd.port.mk>
(-)devel/anjuta/Makefile (+9 lines)
Lines 93-98 PLIST_SUB+= DEVHELP="" Link Here
93
93
94
post-patch:
94
post-patch:
95
	@${RM} ${WRKSRC}/plugins/debug-manager/anjuta-debug-manager.schemas
95
	@${RM} ${WRKSRC}/plugins/debug-manager/anjuta-debug-manager.schemas
96
	@${REINPLACE_CMD} '/^test_LDADD =/ \
97
		s/=/= -lgtk-x11-2.0 -lgio-2.0 -lgobject-2.0 -lglib-2.0 -lxml2 $$(INTLLIBS)/' \
98
		${WRKSRC}/plugins/gbf-am/Makefile.in
99
	@${REINPLACE_CMD} '/^gdbmi_test_LDADD =/s/$$/ -lgtk-x11-2.0 -lglib-2.0/' \
100
		${WRKSRC}/plugins/gdb/Makefile.in
101
	@${REINPLACE_CMD} -e '/^anjuta_LDADD =/s/=/= $$(ANJUTA_LIBS)/' \
102
		-e '/^anjuta_shell_LDADD =/ \
103
		s/=/= -lgtk-x11-2.0 -lgobject-2.0 -lglib-2.0 $$(INTLLIBS)/' \
104
		${WRKSRC}/src/Makefile.in
96
105
97
post-configure:
106
post-configure:
98
	@${REINPLACE_CMD} -e 's|"make|"gmake|g' \
107
	@${REINPLACE_CMD} -e 's|"make|"gmake|g' \
(-)devel/gettext/files/patch-gettext-tools_src_Makefile.in (+42 lines)
Line 0 Link Here
1
--- gettext-tools/src/Makefile.in.orig
2
+++ gettext-tools/src/Makefile.in
3
@@ -1984,24 +1984,21 @@
4
 msgmerge_CXXFLAGS = $(AM_CXXFLAGS) $(OPENMP_CFLAGS)
5
 
6
 # Link dependencies.
7
-# INTL_MACOSX_LIBS is needed because the programs depend on libintl.la
8
-# but libtool doesn't put -Wl,-framework options into .la files.
9
-# For msginit, it is also needed because of localename.c.
10
-msgcmp_LDADD = libgettextsrc.la @INTL_MACOSX_LIBS@ @MSGMERGE_LIBM@ $(WOE32_LDADD)
11
-msgfmt_LDADD = libgettextsrc.la @INTL_MACOSX_LIBS@ $(WOE32_LDADD)
12
-msgmerge_LDADD = libgettextsrc.la @INTL_MACOSX_LIBS@ @MSGMERGE_LIBM@ $(WOE32_LDADD) $(OPENMP_CFLAGS)
13
-msgunfmt_LDADD = libgettextsrc.la @INTL_MACOSX_LIBS@ $(WOE32_LDADD)
14
-xgettext_LDADD = libgettextsrc.la @INTL_MACOSX_LIBS@ @LTLIBEXPAT@ @LTLIBICONV@ $(WOE32_LDADD)
15
-msgattrib_LDADD = libgettextsrc.la @INTL_MACOSX_LIBS@ $(WOE32_LDADD)
16
-msgcat_LDADD = libgettextsrc.la @INTL_MACOSX_LIBS@ $(WOE32_LDADD)
17
-msgcomm_LDADD = libgettextsrc.la @INTL_MACOSX_LIBS@ $(WOE32_LDADD)
18
-msgconv_LDADD = libgettextsrc.la @INTL_MACOSX_LIBS@ $(WOE32_LDADD)
19
-msgen_LDADD = libgettextsrc.la @INTL_MACOSX_LIBS@ $(WOE32_LDADD)
20
-msgexec_LDADD = libgettextsrc.la @INTL_MACOSX_LIBS@ $(WOE32_LDADD)
21
-msgfilter_LDADD = libgettextsrc.la @INTL_MACOSX_LIBS@ $(WOE32_LDADD)
22
-msggrep_LDADD = $(LIBGREP) libgettextsrc.la @INTL_MACOSX_LIBS@ $(WOE32_LDADD)
23
-msginit_LDADD = libgettextsrc.la @INTL_MACOSX_LIBS@ $(WOE32_LDADD)
24
-msguniq_LDADD = libgettextsrc.la @INTL_MACOSX_LIBS@ $(WOE32_LDADD)
25
+msgcmp_LDADD = libgettextsrc.la ../gnulib-lib/libgettextlib.la @LTLIBINTL@ @MSGMERGE_LIBM@ $(WOE32_LDADD)
26
+msgfmt_LDADD = libgettextsrc.la ../gnulib-lib/libgettextlib.la @LTLIBINTL@ $(WOE32_LDADD)
27
+msgmerge_LDADD = libgettextsrc.la ../gnulib-lib/libgettextlib.la @LTLIBINTL@ @MSGMERGE_LIBM@ $(WOE32_LDADD) $(OPENMP_CFLAGS)
28
+msgunfmt_LDADD = libgettextsrc.la ../gnulib-lib/libgettextlib.la @LTLIBINTL@ $(WOE32_LDADD)
29
+xgettext_LDADD = libgettextsrc.la ../gnulib-lib/libgettextlib.la @LTLIBINTL@ @LTLIBEXPAT@ @LTLIBICONV@ $(WOE32_LDADD)
30
+msgattrib_LDADD = libgettextsrc.la ../gnulib-lib/libgettextlib.la @LTLIBINTL@ $(WOE32_LDADD)
31
+msgcat_LDADD = libgettextsrc.la ../gnulib-lib/libgettextlib.la @LTLIBINTL@ $(WOE32_LDADD)
32
+msgcomm_LDADD = libgettextsrc.la ../gnulib-lib/libgettextlib.la @LTLIBINTL@ $(WOE32_LDADD)
33
+msgconv_LDADD = libgettextsrc.la ../gnulib-lib/libgettextlib.la @LTLIBINTL@ $(WOE32_LDADD)
34
+msgen_LDADD = libgettextsrc.la ../gnulib-lib/libgettextlib.la @LTLIBINTL@ $(WOE32_LDADD)
35
+msgexec_LDADD = libgettextsrc.la ../gnulib-lib/libgettextlib.la @LTLIBINTL@ $(WOE32_LDADD)
36
+msgfilter_LDADD = libgettextsrc.la ../gnulib-lib/libgettextlib.la @LTLIBINTL@ $(WOE32_LDADD)
37
+msggrep_LDADD = $(LIBGREP) libgettextsrc.la ../gnulib-lib/libgettextlib.la @LTLIBINTL@ $(WOE32_LDADD)
38
+msginit_LDADD = libgettextsrc.la ../gnulib-lib/libgettextlib.la @LTLIBINTL@ $(WOE32_LDADD)
39
+msguniq_LDADD = libgettextsrc.la ../gnulib-lib/libgettextlib.la @LTLIBINTL@ $(WOE32_LDADD)
40
 
41
 # Specify when to relink the programs.
42
 msgcmp_DEPENDENCIES = libgettextsrc.la ../gnulib-lib/libgettextlib.la $(WOE32_LDADD)
(-)devel/gitg0/Makefile (+4 lines)
Lines 35-38 NLS_CONFIGURE_ENABLE=nls Link Here
35
NLS_CPPFLAGS=	-I${LOCALBASE}/include
35
NLS_CPPFLAGS=	-I${LOCALBASE}/include
36
NLS_LDFLAGS=	-L${LOCALBASE}/lib
36
NLS_LDFLAGS=	-L${LOCALBASE}/lib
37
37
38
post-patch:
39
	@${REINPLACE_CMD} '/shell_LDADD =/s/$$/ -lgio-2.0 -lgobject-2.0 -lglib-2.0/' \
40
		${WRKSRC}/tests/Makefile.in ${WRKSRC}/tools/Makefile.in
41
38
.include <bsd.port.mk>
42
.include <bsd.port.mk>
(-)devel/gnome-vfs/Makefile (+2 lines)
Lines 88-93 post-patch: Link Here
88
			${WRKSRC}/configure
88
			${WRKSRC}/configure
89
	@${REINPLACE_CMD} -e 's|-DG_DISABLE_DEPRECATED||g' \
89
	@${REINPLACE_CMD} -e 's|-DG_DISABLE_DEPRECATED||g' \
90
		${WRKSRC}/*/Makefile.in
90
		${WRKSRC}/*/Makefile.in
91
	@${REINPLACE_CMD} '/^gnomevfs_info_LDADD =/s/$$/ -lgobject-2.0/' \
92
		${WRKSRC}/programs/Makefile.in
91
	@${SED} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \
93
	@${SED} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \
92
		< ${MASTERDIR}/pkg-install.in > ${PKGINSTALL}
94
		< ${MASTERDIR}/pkg-install.in > ${PKGINSTALL}
93
	@${SED} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \
95
	@${SED} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \
(-)devel/gnome-vfs/files/patch-ac (-11 lines)
Lines 1-11 Link Here
1
--- modules/Makefile.in.orig	Mon Oct  3 11:55:14 2005
2
+++ modules/Makefile.in	Mon Oct  3 11:55:55 2005
3
@@ -465,7 +465,7 @@
4
 @HAVE_SAMBA_TRUE@SMB_LTLIBS = libsmb.la
5
 @OS_WIN32_FALSE@PLATFROM_SPECIFIC_LTLIBS = libdns-sd.la libnetwork.la libnntp.la libsftp.la $(HTTP_LTLIBS) libftp.la
6
 @OS_WIN32_TRUE@PLATFROM_SPECIFIC_LTLIBS = 
7
-module_flags = -export_dynamic -avoid-version -module -no-undefined
8
+module_flags = -export_dynamic -avoid-version -module -no-undefined
9
 modulesdir = $(libdir)/gnome-vfs-2.0/modules
10
 modules_LTLIBRARIES = \
11
 	$(CDDA_LTLIBS)				\
(-)devel/libbonobo/files/patch-samples-echo-Makefile.in (+10 lines)
Line 0 Link Here
1
--- samples/echo/Makefile.in.orig
2
+++ samples/echo/Makefile.in
3
@@ -321,6 +321,7 @@
4
 bonobo_echo_2_LDADD = \
5
 	libEcho.a				\
6
 	$(top_builddir)/bonobo/libbonobo-2.la	\
7
+	$(top_builddir)/bonobo-activation/libbonobo-activation.la	\
8
 	$(LIBBONOBO_LIBS)			\
9
 	$(INTLLIBS)
10
 
(-)devel/libgii/Makefile (+4 lines)
Lines 51-56 CONFIGURE_ARGS+=--disable-vgl Link Here
51
PLIST_SUB+=	VGL="@comment "
51
PLIST_SUB+=	VGL="@comment "
52
.endif
52
.endif
53
53
54
post-patch:
55
	@${REINPLACE_CMD} '/^LDADD =/s,$$, $$(top_builddir)/gg/libgg.la,' \
56
		${WRKSRC}/regress/gii/Makefile.in
57
54
post-install:
58
post-install:
55
	${MV} ${STAGEDIR}${PREFIX}/etc/ggi/libgii.conf ${STAGEDIR}${PREFIX}/etc/ggi/libgii.conf.sample
59
	${MV} ${STAGEDIR}${PREFIX}/etc/ggi/libgii.conf ${STAGEDIR}${PREFIX}/etc/ggi/libgii.conf.sample
56
	${MV} ${STAGEDIR}${PREFIX}/etc/ggi/filter/mouse ${STAGEDIR}${PREFIX}/etc/ggi/filter/mouse.sample
60
	${MV} ${STAGEDIR}${PREFIX}/etc/ggi/filter/mouse ${STAGEDIR}${PREFIX}/etc/ggi/filter/mouse.sample
(-)devel/ois/Makefile (-9 / +5 lines)
Lines 12-19 MAINTAINER= amdmi3@FreeBSD.org Link Here
12
COMMENT=	Object Oriented Input System
12
COMMENT=	Object Oriented Input System
13
13
14
GNU_CONFIGURE=	yes
14
GNU_CONFIGURE=	yes
15
INSTALL_TARGET=	install-strip
15
USES=		pathfix gmake libtool
16
USES=		pathfix gmake libtool
16
USE_AUTOTOOLS=	aclocal:env autoheader:env automake:env autoconf:env libtoolize:env
17
PATHFIX_MAKEFILEIN=	Makefile.am
18
USE_AUTOTOOLS=	aclocal autoheader automake autoconf libtoolize
19
AUTOMAKE_ARGS=	--add-missing --copy --foreign
17
USE_XORG=	x11 xaw
20
USE_XORG=	x11 xaw
18
USE_LDCONFIG=	yes
21
USE_LDCONFIG=	yes
19
22
Lines 23-35 LDFLAGS+= -L${LOCALBASE}/lib Link Here
23
WRKSRC=		${WRKDIR}/${PORTNAME}
26
WRKSRC=		${WRKDIR}/${PORTNAME}
24
27
25
post-patch:
28
post-patch:
26
	@${REINPLACE_CMD} 's|^pkgconfigdir = .*|pkgconfigdir=$${prefix}/libdata/pkgconfig|' \
29
	@${REINPLACE_CMD} '/_LDADD =/s/$$/ -lX11/' ${WRKSRC}/demos/Makefile.am
27
		${WRKSRC}/Makefile.am
28
29
pre-configure:
30
	@cd ${WRKSRC} && ./bootstrap
31
32
post-install:
33
	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libOIS.so
34
30
35
.include <bsd.port.mk>
31
.include <bsd.port.mk>
(-)devel/zziplib/Makefile (-14 / +4 lines)
Lines 20-25 USE_PYTHON_BUILD= yes Link Here
20
GNU_CONFIGURE=	yes
20
GNU_CONFIGURE=	yes
21
CONFIGURE_ENV=	ac_cv_path_XMLTO=":"
21
CONFIGURE_ENV=	ac_cv_path_XMLTO=":"
22
USE_LDCONFIG=	yes
22
USE_LDCONFIG=	yes
23
INSTALL_TARGET=	install-strip
23
24
24
PORTSCOUT=	limit:^0\.
25
PORTSCOUT=	limit:^0\.
25
26
Lines 29-47 OPTIONS_SUB= yes Link Here
29
SDL_USE=		SDL=sdl
30
SDL_USE=		SDL=sdl
30
SDL_CONFIGURE_ENABLE=	sdl
31
SDL_CONFIGURE_ENABLE=	sdl
31
32
32
.include <bsd.port.pre.mk>
33
regression-test:
33
34
	@(cd ${BUILD_WRKSRC}; ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_FLAGS} \
34
test check:
35
	@(cd ${BUILD_WRKSRC}; ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} \
36
		${MAKEFILE} ${MAKE_ARGS} check)
35
		${MAKEFILE} ${MAKE_ARGS} check)
37
36
38
.if !defined(WITHOUT_TESTS)
37
.include <bsd.port.mk>
39
post-build::	test
40
.endif
41
42
post-install:
43
.for lib in zzip zzipmmapped zzipfseeko zzipwrap
44
	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/lib${lib}.so
45
.endfor
46
47
.include <bsd.port.post.mk>
(-)devel/zziplib/files/patch-configure (-19 / +7 lines)
Lines 1-14 Link Here
1
--- configure.orig	2012-03-11 23:21:53.000000000 +0900
1
--- configure.orig	2012-03-11 23:21:53.000000000 +0900
2
+++ configure	2012-03-12 17:46:25.000000000 +0900
2
+++ configure	2012-03-12 17:46:25.000000000 +0900
3
@@ -2608,7 +2608,7 @@
4
   else
5
     test ".$ax_enable_builddir" = "."  && ax_enable_builddir="."
6
     test ".$ax_enable_builddir" = ".no"  && ax_enable_builddir="."
7
-    test ".$BUILD" = "." && BUILD=`uname -msr | tr " /" "__"`.d
8
+    test ".$BUILD" = "." && BUILD=./build
9
     test ".$ax_enable_builddir" = ".yes" && ax_enable_builddir="$BUILD"
10
     if test ".$ax_enable_builddir" != ".." ; then    # we know where to go and
11
       as_dir=$ax_enable_builddir; as_fn_mkdir_p
12
@@ -11452,7 +11452,7 @@
3
@@ -11452,7 +11452,7 @@
13
   if test "_$MICRO_VERSION" = "_" ; then MICRO_VERSION="0" ; fi
4
   if test "_$MICRO_VERSION" = "_" ; then MICRO_VERSION="0" ; fi
14
   if test "_$MINOR_VERSION" = "_" ; then MINOR_VERSION="$MAJOR_VERSION" ; MAJOR_VERSION="0" ; fi
5
   if test "_$MINOR_VERSION" = "_" ; then MINOR_VERSION="$MAJOR_VERSION" ; MAJOR_VERSION="0" ; fi
Lines 18-24 Link Here
18
   VERSION_INFO="-version-info $MINOR_VERSION:$MICRO_VERSION"
9
   VERSION_INFO="-version-info $MINOR_VERSION:$MICRO_VERSION"
19
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: /$MAJOR_VERSION/$MINOR_VERSION:$MICRO_VERSION (-$MAJOR_VERSION.so.$MINOR_VERSION.0.$MICRO_VERSION)" >&5
10
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: /$MAJOR_VERSION/$MINOR_VERSION:$MICRO_VERSION (-$MAJOR_VERSION.so.$MINOR_VERSION.0.$MICRO_VERSION)" >&5
20
 $as_echo "/$MAJOR_VERSION/$MINOR_VERSION:$MICRO_VERSION (-$MAJOR_VERSION.so.$MINOR_VERSION.0.$MICRO_VERSION)" >&6; }
11
 $as_echo "/$MAJOR_VERSION/$MINOR_VERSION:$MICRO_VERSION (-$MAJOR_VERSION.so.$MINOR_VERSION.0.$MICRO_VERSION)" >&6; }
21
@@ -13733,7 +13733,7 @@
12
@@ -13733,12 +13733,12 @@
22
 ;; *)
13
 ;; *)
23
     if test ".$can_build_shared" != ".no" ; then
14
     if test ".$can_build_shared" != ".no" ; then
24
       ZZIPLIB_LDFLAGS="-export-dynamic"
15
       ZZIPLIB_LDFLAGS="-export-dynamic"
Lines 27-38 Link Here
27
          ZZIPLIB_LDFLAGS="${wl}--export-dynamic"
18
          ZZIPLIB_LDFLAGS="${wl}--export-dynamic"
28
          # TODO: that is for backward compatibility only
19
          # TODO: that is for backward compatibility only
29
       fi
20
       fi
30
@@ -16590,7 +16590,7 @@
21
     fi
31
 _EOF
22
-    RESOLVES=" # "
32
     test ".$USE_MAINTAINER_MODE" = ".no" || \
23
+    RESOLVES=' '
33
   	cp "$tmp/conftemp.sed" "$ac_top_srcdir/makefile.sed~"            ## DEBUGGING
24
 ;; esac
34
-    echo 'BUILD=`uname -msr | tr " /" "__"`.d' >$ac_top_srcdir/Makefile
25
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ZZIPLIB_LDFLAGS $RESOLVES" >&5
35
+    echo 'BUILD=./build' >$ac_top_srcdir/Makefile
26
 $as_echo "$ZZIPLIB_LDFLAGS $RESOLVES" >&6; }
36
     echo 'ISNOTSRCDIR=test ! -f configure' >>$ac_top_srcdir/Makefile
37
     $ax_enable_builddir_sed -f $tmp/conftemp.sed Makefile >>$ac_top_srcdir/Makefile
38
     echo 'done: ;@ if grep "$(RULE)-done .*:" Makefile > /dev/null; then     echo $(MAKE) $(RULE)-done ; $(MAKE) $(RULE)-done ; else true ; fi'     >> $ac_top_srcdir/Makefile
(-)graphics/devil/Makefile (+2 lines)
Lines 93-98 CONFIGURE_ARGS+=--disable-altivec --disa Link Here
93
93
94
post-patch:
94
post-patch:
95
	@${REINPLACE_CMD} -e '/^SUBDIRS/s|docs||g' ${WRKSRC}/Makefile.am
95
	@${REINPLACE_CMD} -e '/^SUBDIRS/s|docs||g' ${WRKSRC}/Makefile.am
96
	@${REINPLACE_CMD} -e '/^ilur_LDADD =/s|$$| $$(il_library)|' \
97
		${WRKSRC}/bin/Makefile.am
96
	@${REINPLACE_CMD} -e '/^pkgdir=/s|$$(libdir)/|$$(prefix)/libdata/|g' \
98
	@${REINPLACE_CMD} -e '/^pkgdir=/s|$$(libdir)/|$$(prefix)/libdata/|g' \
97
		${WRKSRC}/data/Makefile.am
99
		${WRKSRC}/data/Makefile.am
98
	@${REINPLACE_CMD} -e 's|<malloc\.h>|<stdlib.h>|g' \
100
	@${REINPLACE_CMD} -e 's|<malloc\.h>|<stdlib.h>|g' \
(-)graphics/geomview/Makefile (+2 lines)
Lines 34-39 post-patch: Link Here
34
		'/^install-data-am:/s|install-info-am|| ; \
34
		'/^install-data-am:/s|install-info-am|| ; \
35
		 /install-man/s|install-nobase_infoimgDATA||' \
35
		 /install-man/s|install-nobase_infoimgDATA||' \
36
		${WRKSRC}/doc/Makefile.in
36
		${WRKSRC}/doc/Makefile.in
37
	@${REINPLACE_CMD} '/^gvx_LDADD =/s/=/= $$(OPENGLLIBS)/' \
38
		${WRKSRC}/src/bin/geomview/x11/Makefile.in
37
39
38
post-build:
40
post-build:
39
	@(cd ${WRKSRC}/doc && /usr/bin/makeinfo --no-split --no-validate \
41
	@(cd ${WRKSRC}/doc && /usr/bin/makeinfo --no-split --no-validate \
(-)graphics/libggi/Makefile (+15 lines)
Lines 69-74 CONFIGURE_ARGS+=--disable-vgagl --disabl Link Here
69
PLIST_SUB+=	WITH_SVGALIB="@comment "
69
PLIST_SUB+=	WITH_SVGALIB="@comment "
70
.endif
70
.endif
71
71
72
post-patch:
73
	@${REINPLACE_CMD} '/^exttest1_LDADD =/s/$$/ -lgg/' \
74
		${WRKSRC}/extensions/test/Makefile.in
75
	@${REINPLACE_CMD} '/^showaccel_LDADD =/ { \
76
		p; s/showaccel/palette/; p; s/palette/cbconsist/; }' \
77
		${WRKSRC}/programs/check/Makefile.in
78
	@${REINPLACE_CMD} '/^cube3d_LDADD =/s/$$/ -lgii/' \
79
		${WRKSRC}/programs/demos/Makefile.in
80
	@${REINPLACE_CMD} '/^LDADD =/s/$$/ -lgii/' \
81
		${WRKSRC}/programs/regress/Makefile.in
82
	@${REINPLACE_CMD} '/^inputdump_LDADD =/s/$$/ -lgii/' \
83
		${WRKSRC}/programs/util/Makefile.in
84
	@${REINPLACE_CMD} '/^ggiteleserver_LDADD =/s/$$/ -lgg/' \
85
		${WRKSRC}/programs/util/ggiteleserver/Makefile.in
86
72
post-install:
87
post-install:
73
	${TOUCH} ${STAGEDIR}${PREFIX}/lib/ggi/default/fbdev/.keep
88
	${TOUCH} ${STAGEDIR}${PREFIX}/lib/ggi/default/fbdev/.keep
74
	${TOUCH} ${STAGEDIR}${PREFIX}/lib/ggi/default/kgi/.keep
89
	${TOUCH} ${STAGEDIR}${PREFIX}/lib/ggi/default/kgi/.keep
(-)graphics/libgnomecanvas/files/patch-demos-Makefile.in (+10 lines)
Line 0 Link Here
1
--- demos/Makefile.in.orig
2
+++ demos/Makefile.in
3
@@ -255,6 +255,7 @@
4
 
5
 LDADD = \
6
 	$(top_builddir)/libgnomecanvas/libgnomecanvas-2.la \
7
+	$(LIBGNOMECANVAS_LIBS) \
8
 	$(INTLLIBS)
9
 
10
 canvas_demo_SOURCES = \
(-)graphics/swfdec/Makefile (-3 / +5 lines)
Lines 38-48 CONFIGURE_ARGS+= --with-audio=oss Link Here
38
.endif
38
.endif
39
39
40
post-extract:
40
post-extract:
41
	${CP} ${FILESDIR}/swfdec_playback_oss.c \
41
	@${CP} ${FILESDIR}/swfdec_playback_oss.c \
42
	    	${WRKSRC}/swfdec-gtk
42
		${WRKSRC}/swfdec-gtk
43
43
44
post-patch:
44
post-patch:
45
	${REINPLACE_CMD} -e 's|-Wmissing-include-dirs||g' \
45
	@${REINPLACE_CMD} -e 's|-Wmissing-include-dirs||g' \
46
	    	${WRKSRC}/configure
46
	    	${WRKSRC}/configure
47
	@${REINPLACE_CMD} '/^swfdec_test_LDADD =/s/$$/ -lgmodule-2.0/' \
48
		${WRKSRC}/test/Makefile.in
47
49
48
.include <bsd.port.mk>
50
.include <bsd.port.mk>
(-)irc/xchat/Makefile (-3 / +2 lines)
Lines 32-40 OPTIONS_RADIO_SPELL= GTKSPELL LIBSEXY Link Here
32
GTKSPELL_DESC=	Spell check support via gtkspell
32
GTKSPELL_DESC=	Spell check support via gtkspell
33
LIBSEXY_DESC=	Spell check support via libsexy
33
LIBSEXY_DESC=	Spell check support via libsexy
34
34
35
.if defined(WITH_PYTHON)
36
.endif
37
38
.include <bsd.port.options.mk>
35
.include <bsd.port.options.mk>
39
36
40
.if ${PORT_OPTIONS:MDBUS}
37
.if ${PORT_OPTIONS:MDBUS}
Lines 100-105 PLIST_SUB+= TCL="@comment " Link Here
100
post-patch:
97
post-patch:
101
	@${REINPLACE_CMD} -e 's|glib/.*\.h>|glib.h>|g' \
98
	@${REINPLACE_CMD} -e 's|glib/.*\.h>|glib.h>|g' \
102
		${WRKSRC}/src/common/*.[ch]
99
		${WRKSRC}/src/common/*.[ch]
100
	@${REINPLACE_CMD} '/xchat_LDADD =/s/$$/ -lgmodule-2.0/' \
101
		${WRKSRC}/src/fe-gtk/Makefile.in
103
102
104
# Create plugins directory even when no plugins are installed
103
# Create plugins directory even when no plugins are installed
105
post-install:
104
post-install:
(-)mail/evolution/Makefile (+8 lines)
Lines 109-114 post-patch: Link Here
109
		-e 's|-DG_DISABLE_DEPRECATED||g' \
109
		-e 's|-DG_DISABLE_DEPRECATED||g' \
110
		-e 's|-Wmissing-include-dirs||g' \
110
		-e 's|-Wmissing-include-dirs||g' \
111
	    	${WRKSRC}/configure
111
	    	${WRKSRC}/configure
112
	@${REINPLACE_CMD} '/^evolution_alarm_notify_LDADD =/s/=/= -lgthread-2.0/' \
113
		${WRKSRC}/calendar/gui/alarm-notify/Makefile.in
114
	@${REINPLACE_CMD} '/^evolution_settings_LDADD =/s/=/= -lgthread-2.0/' \
115
		${WRKSRC}/capplet/Makefile.in
116
	@${REINPLACE_CMD} '/^evolution_backup_LDADD =/s/=/= -lgthread-2.0/' \
117
		${WRKSRC}/plugins/backup-restore/Makefile.in
118
	@${REINPLACE_CMD} '/^evolution_LDADD =/s/=/= -lgthread-2.0/' \
119
		${WRKSRC}/shell/Makefile.in
112
	@${REINPLACE_CMD} -e 's|/usr|${LOCALBASE}|g' \
120
	@${REINPLACE_CMD} -e 's|/usr|${LOCALBASE}|g' \
113
		${WRKSRC}/plugins/bogo-junk-plugin/bf-junk-filter.c
121
		${WRKSRC}/plugins/bogo-junk-plugin/bf-junk-filter.c
114
	@${REINPLACE_CMD} -e 's|/usr/sbin|${LOCALBASE}/bin|g' \
122
	@${REINPLACE_CMD} -e 's|/usr/sbin|${LOCALBASE}/bin|g' \
(-)multimedia/mjpegtools/Makefile (-18 / +10 lines)
Lines 3-9 Link Here
3
3
4
PORTNAME=	mjpegtools
4
PORTNAME=	mjpegtools
5
PORTVERSION=	2.1.0
5
PORTVERSION=	2.1.0
6
PORTREVISION=	2
6
PORTREVISION=	3
7
CATEGORIES=	multimedia
7
CATEGORIES=	multimedia
8
MASTER_SITES=	SF/${PORTNAME:S/tools//}/${PORTNAME}/${PORTVERSION}
8
MASTER_SITES=	SF/${PORTNAME:S/tools//}/${PORTNAME}/${PORTVERSION}
9
9
Lines 18-38 LIB_DEPENDS= libjpeg.so:${PORTSDIR}/grap Link Here
18
CONFLICTS=	mplex-[0-9]*
18
CONFLICTS=	mplex-[0-9]*
19
19
20
USES=		gmake libtool pathfix pkgconfig
20
USES=		gmake libtool pathfix pkgconfig
21
PATHFIX_MAKEFILEIN=	Makefile.am
22
USE_AUTOTOOLS=	libtoolize aclocal autoheader automake autoconf
23
LIBTOOLIZE_ARGS=-i -c -f
24
ACLOCAL_ARGS=	--automake-acdir=${ACLOCAL_DIR} \
25
		-I ${LOCALBASE}/share/aclocal
26
AUTOMAKE_ARGS=	--add-missing --foreign
27
CONFIGURE_ARGS=	--without-dga --without-x
28
USE_LDCONFIG=	yes
21
USE_LDCONFIG=	yes
29
22
23
GNU_CONFIGURE=	yes
24
CONFIGURE_ARGS=	--without-dga --without-x
25
CONFIGURE_TARGET=	${ARCH:S/amd64/x86_64/}-portbld-${OPSYS:tl}${OSREL}
30
CPPFLAGS+=	-I${LOCALBASE}/include
26
CPPFLAGS+=	-I${LOCALBASE}/include
31
LDFLAGS+=	-L${LOCALBASE}/lib
27
LIBS+=		-L${LOCALBASE}/lib
32
28
33
INFO=		mjpeg-howto
29
INFO=		mjpeg-howto
34
30
35
OPTIONS_DEFINE=		DOCS DV GTK2 PNG QUICKTIME SDL SIMD
31
OPTIONS_DEFINE=		DOCS DV GTK2 PNG QUICKTIME SDL
36
OPTIONS_DEFAULT=	GTK2 PNG SDL
32
OPTIONS_DEFAULT=	GTK2 PNG SDL
37
OPTIONS_SUB=		yes
33
OPTIONS_SUB=		yes
38
34
Lines 46-57 QUICKTIME_LIB_DEPENDS= libquicktime.so:$ Link Here
46
QUICKTIME_CONFIGURE_WITH=	libquicktime
42
QUICKTIME_CONFIGURE_WITH=	libquicktime
47
SDL_USE=		SDL=gfx,sdl
43
SDL_USE=		SDL=gfx,sdl
48
SDL_CONFIGURE_OFF=	--without-libsdl --without-sdlgfx
44
SDL_CONFIGURE_OFF=	--without-libsdl --without-sdlgfx
49
SIMD_CONFIGURE_ENABLE=	simd-accel
50
45
51
.include <bsd.port.options.mk>
46
.include <bsd.port.options.mk>
52
47
53
.if ${ARCH} == "i386"
48
.if ${ARCH} == "i386"
54
CFLAGS:=	${CFLAGS:N-O*:N-fno-strict*}
49
USES+=		compiler:c++11-lang
55
.endif
50
.endif
56
51
57
.if ${ARCH} == "powerpc" && ${OSVERSION} > 900000
52
.if ${ARCH} == "powerpc" && ${OSVERSION} > 900000
Lines 59-70 BROKEN= Does not build on powerpc-9 Link Here
59
.endif
54
.endif
60
55
61
post-patch:
56
post-patch:
62
	@${REINPLACE_CMD} -e \
57
	@${REINPLACE_CMD} \
63
		's| \*-\*-linux\*)| *-*-*)| ; \
58
		-e 's| \*-\*-linux\*)| *-*-*)|' \
64
		 /ARCHFLAGS=/s|^|#|g' ${WRKSRC}/configure.ac
59
		-e '/ARCHFLAGS=/d' ${WRKSRC}/configure
65
66
pre-configure:
67
	@${RM} -f ${WRKSRC}/missing
68
60
69
post-install:
61
post-install:
70
	@${MKDIR} ${STAGEDIR}${DOCSDIR}
62
	@${MKDIR} ${STAGEDIR}${DOCSDIR}
(-)multimedia/mjpegtools/files/patch-mplex__Makefile.in (+11 lines)
Line 0 Link Here
1
--- mplex/Makefile.in.orig
2
+++ mplex/Makefile.in
3
@@ -360,7 +360,7 @@
4
 libmplex2_la_CXXFLAGS = 
5
 mplex_SOURCES = main.cpp 
6
 mplex_DEPENDENCIES = libmplex2.la
7
-mplex_LDADD = libmplex2.la @LIBGETOPT_LIB@ $(LIBM_LIBS)
8
+mplex_LDADD = libmplex2.la $(top_builddir)/utils/libmjpegutils.la @LIBGETOPT_LIB@ $(LIBM_LIBS)
9
 all: all-am
10
 
11
 .SUFFIXES:
(-)net/gtk-vnc/Makefile (+4 lines)
Lines 27-30 LDFLAGS+= -L${LOCALBASE}/lib Link Here
27
CONFIGURE_ARGS=	--with-gtkglext=yes
27
CONFIGURE_ARGS=	--with-gtkglext=yes
28
INSTALL_TARGET=	install-strip
28
INSTALL_TARGET=	install-strip
29
29
30
post-patch:
31
	@${REINPLACE_CMD} '/LDADD/s/GTK_CFLAGS/GTK_LIBS/' \
32
		${WRKSRC}/examples/Makefile.in
33
30
.include <bsd.port.mk>
34
.include <bsd.port.mk>
(-)net/libgweather/Makefile (+3 lines)
Lines 28-31 INSTALL_TARGET= install-strip Link Here
28
28
29
GCONF_SCHEMAS=	gweather.schemas
29
GCONF_SCHEMAS=	gweather.schemas
30
30
31
post-patch:
32
	@${REINPLACE_CMD} '/noinst_PROGRAMS/,+1 d' ${WRKSRC}/libgweather/Makefile.in
33
31
.include <bsd.port.mk>
34
.include <bsd.port.mk>
(-)net/libnetdude/Makefile (-2 / +8 lines)
Lines 3-9 Link Here
3
3
4
PORTNAME=	libnetdude
4
PORTNAME=	libnetdude
5
PORTVERSION=	0.12
5
PORTVERSION=	0.12
6
PORTREVISION=	1
6
PORTREVISION=	2
7
CATEGORIES=	net
7
CATEGORIES=	net
8
MASTER_SITES=	SF/netdude/${PORTNAME}/${PORTVERSION}
8
MASTER_SITES=	SF/netdude/${PORTNAME}/${PORTVERSION}
9
9
Lines 14-21 LIB_DEPENDS= libpcapnav.so:${PORTSDIR}/n Link Here
14
14
15
USES=		libtool
15
USES=		libtool
16
GNU_CONFIGURE=	yes
16
GNU_CONFIGURE=	yes
17
CONFIGURE_ARGS=	--disable-gtk-doc --disable-static --with-html-dir=${DOCSDIR}
18
CPPFLAGS+=	-I${LOCALBASE}/include
19
LIBS+=		-L${LOCALBASE}/lib
20
USE_AUTOTOOLS=	libltdl
17
USE_GNOME=	glib12
21
USE_GNOME=	glib12
18
CONFIGURE_ARGS=	--disable-gtk-doc --with-html-dir=${DOCSDIR}
19
USE_LDCONFIG=	yes
22
USE_LDCONFIG=	yes
20
INSTALL_TARGET=	install-strip
23
INSTALL_TARGET=	install-strip
21
24
Lines 29-33 post-patch: Link Here
29
		${WRKSRC}/protocols/fddi/libnd_fddi.h
32
		${WRKSRC}/protocols/fddi/libnd_fddi.h
30
	@${REINPLACE_CMD} -e 's|DOC_MODULE = libnetdude|DOC_MODULE =|' \
33
	@${REINPLACE_CMD} -e 's|DOC_MODULE = libnetdude|DOC_MODULE =|' \
31
		${WRKSRC}/docs/Makefile.in
34
		${WRKSRC}/docs/Makefile.in
35
	@${FIND} ${WRKSRC} -name Makefile.in | ${XARGS} ${REINPLACE_CMD} \
36
		-e 's,-I$$(top_srcdir)/libltdl,@INCLTDL@,' \
37
		-e '/LIBADD/s,$$(top_builddir)/libltdl/libltdlc.la,@LIBLTDL@,'
32
38
33
.include <bsd.port.mk>
39
.include <bsd.port.mk>
(-)net/libnetdude/files/patch-plugins__ChecksumFix__Makefile.in (-11 lines)
Lines 1-11 Link Here
1
--- ./plugins/ChecksumFix/Makefile.in.orig	2008-01-27 18:27:24.000000000 -0500
2
+++ ./plugins/ChecksumFix/Makefile.in	2008-01-27 18:27:33.000000000 -0500
3
@@ -79,7 +79,7 @@
4
 ETAGS = etags
5
 CTAGS = ctags
6
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
7
-pkgincludedir = $(includedir)/libnetdude/$(version_major).$(version_minor)/plugins/
8
+pkgincludedir = $(includedir)/libnetdude/$(version_major).$(version_minor)/plugins
9
 ACLOCAL = @ACLOCAL@
10
 AMDEP_FALSE = @AMDEP_FALSE@
11
 AMDEP_TRUE = @AMDEP_TRUE@
(-)net/libnetdude/files/patch-tools-Makefile.in (+11 lines)
Line 0 Link Here
1
--- tools/Makefile.in.orig
2
+++ tools/Makefile.in
3
@@ -224,7 +224,7 @@
4
 MAINTAINERCLEANFILES = Makefile.in Makefile lndtool.c
5
 INCLUDES = -I$(top_srcdir)/src -I$(top_srcdir)/libltdl @glib_cflags@ @pcapnav_cflags@ -W -Wall ## -DMEMDEBUG
6
 lndtool_SOURCES = lndtool.c
7
-lndtool_LDADD = -L$(top_builddir)/src/ -lnetdude
8
+lndtool_LDADD = $(top_builddir)/src/libnetdude.la @pcapnav_libs@
9
 lndtool_LDFLAGS = -export-dynamic
10
 all: all-am
11
 
(-)net/libnetdude/pkg-plist (-14 lines)
Lines 38-72 include/libnetdude/%%PORTVERSION%%/proto Link Here
38
include/libnetdude/%%PORTVERSION%%/protocols/tcp/libnd_tcp.h
38
include/libnetdude/%%PORTVERSION%%/protocols/tcp/libnd_tcp.h
39
include/libnetdude/%%PORTVERSION%%/protocols/udp/libnd_udp.h
39
include/libnetdude/%%PORTVERSION%%/protocols/udp/libnd_udp.h
40
include/libnetdude/%%PORTVERSION%%/protocols/vlan/libnd_vlan.h
40
include/libnetdude/%%PORTVERSION%%/protocols/vlan/libnd_vlan.h
41
lib/libnetdude.a
42
lib/libnetdude.so
41
lib/libnetdude.so
43
lib/libnetdude.so.0
42
lib/libnetdude.so.0
44
lib/libnetdude.so.0.0.0
43
lib/libnetdude.so.0.0.0
45
%%DATADIR%%/%%PORTVERSION%%/plugins/libnd_bpf.a
46
%%DATADIR%%/%%PORTVERSION%%/plugins/libnd_bpf.so
44
%%DATADIR%%/%%PORTVERSION%%/plugins/libnd_bpf.so
47
%%DATADIR%%/%%PORTVERSION%%/plugins/libnd_cksumfix.a
48
%%DATADIR%%/%%PORTVERSION%%/plugins/libnd_cksumfix.so
45
%%DATADIR%%/%%PORTVERSION%%/plugins/libnd_cksumfix.so
49
%%DATADIR%%/%%PORTVERSION%%/protocols/libnd_802_11.a
50
%%DATADIR%%/%%PORTVERSION%%/protocols/libnd_802_11.so
46
%%DATADIR%%/%%PORTVERSION%%/protocols/libnd_802_11.so
51
%%DATADIR%%/%%PORTVERSION%%/protocols/libnd_arp.a
52
%%DATADIR%%/%%PORTVERSION%%/protocols/libnd_arp.so
47
%%DATADIR%%/%%PORTVERSION%%/protocols/libnd_arp.so
53
%%DATADIR%%/%%PORTVERSION%%/protocols/libnd_ethernet.a
54
%%DATADIR%%/%%PORTVERSION%%/protocols/libnd_ethernet.so
48
%%DATADIR%%/%%PORTVERSION%%/protocols/libnd_ethernet.so
55
%%DATADIR%%/%%PORTVERSION%%/protocols/libnd_fddi.a
56
%%DATADIR%%/%%PORTVERSION%%/protocols/libnd_fddi.so
49
%%DATADIR%%/%%PORTVERSION%%/protocols/libnd_fddi.so
57
%%DATADIR%%/%%PORTVERSION%%/protocols/libnd_icmp.a
58
%%DATADIR%%/%%PORTVERSION%%/protocols/libnd_icmp.so
50
%%DATADIR%%/%%PORTVERSION%%/protocols/libnd_icmp.so
59
%%DATADIR%%/%%PORTVERSION%%/protocols/libnd_ip.a
60
%%DATADIR%%/%%PORTVERSION%%/protocols/libnd_ip.so
51
%%DATADIR%%/%%PORTVERSION%%/protocols/libnd_ip.so
61
%%DATADIR%%/%%PORTVERSION%%/protocols/libnd_sll.a
62
%%DATADIR%%/%%PORTVERSION%%/protocols/libnd_sll.so
52
%%DATADIR%%/%%PORTVERSION%%/protocols/libnd_sll.so
63
%%DATADIR%%/%%PORTVERSION%%/protocols/libnd_snap.a
64
%%DATADIR%%/%%PORTVERSION%%/protocols/libnd_snap.so
53
%%DATADIR%%/%%PORTVERSION%%/protocols/libnd_snap.so
65
%%DATADIR%%/%%PORTVERSION%%/protocols/libnd_tcp.a
66
%%DATADIR%%/%%PORTVERSION%%/protocols/libnd_tcp.so
54
%%DATADIR%%/%%PORTVERSION%%/protocols/libnd_tcp.so
67
%%DATADIR%%/%%PORTVERSION%%/protocols/libnd_udp.a
68
%%DATADIR%%/%%PORTVERSION%%/protocols/libnd_udp.so
55
%%DATADIR%%/%%PORTVERSION%%/protocols/libnd_udp.so
69
%%DATADIR%%/%%PORTVERSION%%/protocols/libnd_vlan.a
70
%%DATADIR%%/%%PORTVERSION%%/protocols/libnd_vlan.so
56
%%DATADIR%%/%%PORTVERSION%%/protocols/libnd_vlan.so
71
@dirrm %%DATADIR%%/%%PORTVERSION%%/protocols
57
@dirrm %%DATADIR%%/%%PORTVERSION%%/protocols
72
@dirrm %%DATADIR%%/%%PORTVERSION%%/plugins
58
@dirrm %%DATADIR%%/%%PORTVERSION%%/plugins
(-)security/sssd/Makefile (+1 lines)
Lines 95-100 post-patch: Link Here
95
		-e 's|install-data-hook install-dist_initSCRIPTS|install-dist_initSCRIPTS|g' \
95
		-e 's|install-data-hook install-dist_initSCRIPTS|install-dist_initSCRIPTS|g' \
96
		-e 's|install-data-hook|notinstall-data-hook|g' \
96
		-e 's|install-data-hook|notinstall-data-hook|g' \
97
		-e 's| -lpam_misc||g' \
97
		-e 's| -lpam_misc||g' \
98
		-e '/^ldap_child_LDADD =/s|=|= $$(LTLIBINTL)|' \
98
		${WRKSRC}/Makefile.am
99
		${WRKSRC}/Makefile.am
99
	@${REINPLACE_CMD} -e 's|/etc/sssd/|${ETCDIR}/|g' \
100
	@${REINPLACE_CMD} -e 's|/etc/sssd/|${ETCDIR}/|g' \
100
		-e 's|/etc/openldap/|${LOCALBASE}/etc/openldap/|g' \
101
		-e 's|/etc/openldap/|${LOCALBASE}/etc/openldap/|g' \
(-)sysutils/tracker-client/Makefile (+4 lines)
Lines 81-86 CONFIGURE_ARGS+= --disable-libtrackergtk Link Here
81
81
82
post-patch:
82
post-patch:
83
	@${REINPLACE_CMD} -e 's|libpng|libpng15|' ${WRKSRC}/configure
83
	@${REINPLACE_CMD} -e 's|libpng|libpng15|' ${WRKSRC}/configure
84
	@${REINPLACE_CMD} '/tracker_extract_LDADD =/s/=/= $$(DBUS_LIBS) $$(GIO_LIBS)/' \
85
		${WRKSRC}/src/tracker-extract/Makefile.in
86
	@${REINPLACE_CMD} '/tracker_status_LDADD =/s/$$/ $$(DBUS_LIBS)/' \
87
		${WRKSRC}/src/tracker-utils/Makefile.in
84
88
85
post-build:
89
post-build:
86
.if defined(TRACKER_SLAVE) && ${TRACKER_SLAVE}=="libtrackergtk"
90
.if defined(TRACKER_SLAVE) && ${TRACKER_SLAVE}=="libtrackergtk"
(-)www/gtkhtml3/Makefile (-1 / +3 lines)
Lines 23-29 RUN_DEPENDS= ${LOCALBASE}/libdata/pkgcon Link Here
23
23
24
USES=		gettext libtool:keepla pathfix pkgconfig gmake tar:bzip2
24
USES=		gettext libtool:keepla pathfix pkgconfig gmake tar:bzip2
25
USE_XORG=	xinerama xi xrandr xcursor xcomposite xdamage
25
USE_XORG=	xinerama xi xrandr xcursor xcomposite xdamage
26
USE_GNOME=	gnomeprefix intlhack gconf2
26
USE_GNOME=	gnomeprefix intlhack gconf2 gtk20
27
USE_LDCONFIG=	yes
27
USE_LDCONFIG=	yes
28
GNU_CONFIGURE=	yes
28
GNU_CONFIGURE=	yes
29
CPPFLAGS+=	-I${LOCALBASE}/include
29
CPPFLAGS+=	-I${LOCALBASE}/include
Lines 41-46 post-patch: Link Here
41
	    	s|-DGDK_DISABLE_DEPRECATED||g' \
41
	    	s|-DGDK_DISABLE_DEPRECATED||g' \
42
		${WRKSRC}/configure
42
		${WRKSRC}/configure
43
	@${REINPLACE_CMD} -e 's|gtkhtml-editor-test[$$]|gtkhtml3-editor-test$$|' \
43
	@${REINPLACE_CMD} -e 's|gtkhtml-editor-test[$$]|gtkhtml3-editor-test$$|' \
44
		-e '/^gtkhtml_editor_test_LDADD =/s/=/= @GTKHTML_LIBS@/' \
45
		-e 's/$$(GTHREAD_LIBS)/-lgthread-2.0/' \
44
	    	${WRKSRC}/components/editor/Makefile.in
46
	    	${WRKSRC}/components/editor/Makefile.in
45
	@${REINPLACE_CMD} -e 's|G_CONST_RETURN||g' \
47
	@${REINPLACE_CMD} -e 's|G_CONST_RETURN||g' \
46
		${WRKSRC}/a11y/*.[ch]
48
		${WRKSRC}/a11y/*.[ch]
(-)x11/gnome-panel/Makefile (+2 lines)
Lines 74-79 post-patch: Link Here
74
		${WRKSRC}/help/fish/Makefile.in
74
		${WRKSRC}/help/fish/Makefile.in
75
	@${REINPLACE_CMD} -e 's|python.* python2\.0|${PYTHON_VERSION}|g' \
75
	@${REINPLACE_CMD} -e 's|python.* python2\.0|${PYTHON_VERSION}|g' \
76
		${WRKSRC}/configure
76
		${WRKSRC}/configure
77
	@${REINPLACE_CMD} '/^panel_test_applets_LDADD =/s/=/= -lgmodule-2.0/' \
78
		${WRKSRC}/gnome-panel/Makefile.in
77
79
78
.include <bsd.port.mk>
80
.include <bsd.port.mk>
79
81
(-)x11-toolkits/gdl/Makefile (+4 lines)
Lines 19-22 CPPFLAGS+= -I${LOCALBASE}/include Link Here
19
LDFLAGS+=	-L${LOCALBASE}/lib
19
LDFLAGS+=	-L${LOCALBASE}/lib
20
INSTALL_TARGET=	install-strip
20
INSTALL_TARGET=	install-strip
21
21
22
post-patch:
23
	@${REINPLACE_CMD} '/^test_dock_LDADD =/s/$$/ $$(GDL_DEPENDENCIES_LIBS)/' \
24
		${WRKSRC}/gdl/Makefile.in
25
22
.include <bsd.port.mk>
26
.include <bsd.port.mk>
(-)x11-toolkits/libgdiplus/Makefile (+5 lines)
Lines 31-34 PLIST_FILES= lib/libgdiplus.a \ Link Here
31
		lib/libgdiplus.so.0.0.0 \
31
		lib/libgdiplus.so.0.0.0 \
32
		libdata/pkgconfig/libgdiplus.pc
32
		libdata/pkgconfig/libgdiplus.pc
33
33
34
post-patch:
35
	@${REINPLACE_CMD} \
36
		'/^testgdi_LDADD =/s/$$/ $$(BASE_DEPENDENCIES_LIBS) -lX11/' \
37
		${WRKSRC}/tests/Makefile.in
38
34
.include <bsd.port.mk>
39
.include <bsd.port.mk>
(-)x11-toolkits/open-motif/Makefile (-2 / +63 lines)
Lines 27-34 USES= gmake iconv libtool:keepla pkgcon Link Here
27
USE_AUTOTOOLS=	libtoolize aclocal autoconf autoheader automake
27
USE_AUTOTOOLS=	libtoolize aclocal autoconf autoheader automake
28
ACLOCAL_ARGS=	-I.
28
ACLOCAL_ARGS=	-I.
29
AUTOMAKE_ARGS=	-a -c -f --foreign
29
AUTOMAKE_ARGS=	-a -c -f --foreign
30
LIBTOOLIZE_ARGS=-i -c -f
30
USE_XORG=	x11 xaw xbitmaps xext xft xt
31
USE_XORG=	xaw xbitmaps xft
32
GNU_CONFIGURE=	yes
31
GNU_CONFIGURE=	yes
33
USE_LDCONFIG=	yes
32
USE_LDCONFIG=	yes
34
MAKE_ENV=	LANG=C
33
MAKE_ENV=	LANG=C
Lines 51-56 post-patch: Link Here
51
		${XARGS} ${REINPLACE_CMD} -e 's|special file|5| ; \
50
		${XARGS} ${REINPLACE_CMD} -e 's|special file|5| ; \
52
		 s|file formats|5|'
51
		 s|file formats|5|'
53
	@${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|' ${WRKSRC}/configure.ac
52
	@${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|' ${WRKSRC}/configure.ac
53
	@${REINPLACE_CMD} '/^mwm_LDADD =/s/$$/ -lXt -lXext -lX11/' \
54
		${WRKSRC}/clients/mwm/Makefile.am
55
	@${REINPLACE_CMD} '/^uil_LDADD =/s/$$/ -lXt/' \
56
		${WRKSRC}/clients/uil/Makefile.am
57
	@${REINPLACE_CMD} '/^LDADD =/s/\\*$$/ -lXt -lX11 &/' \
58
		${WRKSRC}/clients/xmbind/Makefile.am \
59
		${WRKSRC}/demos/doc/programGuide/ch05/Scale/Makefile.am \
60
		${WRKSRC}/demos/doc/programGuide/ch06/combo_box/Makefile.am \
61
		${WRKSRC}/demos/doc/programGuide/ch06/spin_box/Makefile.am \
62
		${WRKSRC}/demos/doc/programGuide/ch08/Container/Makefile.am \
63
		${WRKSRC}/demos/doc/programGuide/ch08/Notebook/Makefile.am \
64
		${WRKSRC}/demos/doc/programGuide/ch16/Makefile.am \
65
		${WRKSRC}/demos/doc/programGuide/ch17/simple_drag/Makefile.am \
66
		${WRKSRC}/demos/doc/programGuide/ch17/simple_drop/Makefile.am \
67
		${WRKSRC}/demos/programs/ColorSel/Makefile.am \
68
		${WRKSRC}/demos/programs/Column/Makefile.am \
69
		${WRKSRC}/demos/programs/Exm/simple_app/Makefile.am \
70
		${WRKSRC}/demos/programs/Ext18List/Makefile.am \
71
		${WRKSRC}/demos/programs/IconB/Makefile.am \
72
		${WRKSRC}/demos/programs/TabStack/Makefile.am \
73
		${WRKSRC}/demos/programs/Tree/Makefile.am \
74
		${WRKSRC}/demos/programs/airport/Makefile.am \
75
		${WRKSRC}/demos/programs/animate/Makefile.am \
76
		${WRKSRC}/demos/programs/drag_and_drop/Makefile.am \
77
		${WRKSRC}/demos/programs/draw/Makefile.am \
78
		${WRKSRC}/demos/programs/filemanager/Makefile.am \
79
		${WRKSRC}/demos/programs/fileview/Makefile.am \
80
		${WRKSRC}/demos/programs/getsubres/Makefile.am \
81
		${WRKSRC}/demos/programs/i18ninput/Makefile.am \
82
		${WRKSRC}/demos/programs/panner/Makefile.am \
83
		${WRKSRC}/demos/programs/periodic/Makefile.am \
84
		${WRKSRC}/demos/programs/piano/Makefile.am \
85
		${WRKSRC}/demos/programs/popups/Makefile.am \
86
		${WRKSRC}/demos/programs/sampler2_0/Makefile.am \
87
		${WRKSRC}/demos/programs/setdate/Makefile.am \
88
		${WRKSRC}/demos/programs/workspace/Makefile.am \
89
		${WRKSRC}/demos/unsupported/aicon/Makefile.am \
90
		${WRKSRC}/demos/unsupported/dainput/Makefile.am \
91
		${WRKSRC}/demos/unsupported/dogs/Makefile.am \
92
		${WRKSRC}/demos/unsupported/motifshell/Makefile.am \
93
		${WRKSRC}/demos/unsupported/xmapdef/Makefile.am \
94
		${WRKSRC}/demos/unsupported/xmfonts/Makefile.am
95
	@${REINPLACE_CMD} '/^LDADD =/s/$$/ -lXt/' \
96
		${WRKSRC}/demos/lib/Exm/wml/Makefile.am \
97
		${WRKSRC}/demos/lib/Xmd/Makefile.am \
98
		${WRKSRC}/demos/programs/ButtonBox/Makefile.am \
99
		${WRKSRC}/demos/programs/Combo2/Makefile.am \
100
		${WRKSRC}/demos/programs/FontSel/Makefile.am \
101
		${WRKSRC}/demos/programs/Outline/Makefile.am \
102
		${WRKSRC}/demos/programs/Paned/Makefile.am \
103
		${WRKSRC}/demos/programs/hellomotif/Makefile.am \
104
		${WRKSRC}/demos/programs/hellomotifi18n/Makefile.am \
105
		${WRKSRC}/demos/programs/tooltips/Makefile.am \
106
		${WRKSRC}/demos/unsupported/hellomotif/Makefile.am \
107
		${WRKSRC}/demos/unsupported/xmforc/Makefile.am \
108
		${WRKSRC}/demos/unsupported/xmform/Makefile.am
109
	@${REINPLACE_CMD} '/^LDADD =/s/\\*$$/ -lXt -lXext -lX11 &/' \
110
		${WRKSRC}/demos/programs/Exm/app_in_c/Makefile.am \
111
		${WRKSRC}/demos/programs/earth/Makefile.am \
112
		${WRKSRC}/demos/programs/todo/Makefile.am
113
	@${REINPLACE_CMD} '/^wmldbcreate_LDADD =/s/$$/ -lXt/' \
114
		${WRKSRC}/tools/wml/Makefile.am
54
115
55
post-install:
116
post-install:
56
	@${MKDIR} ${STAGEDIR}${DOCSDIR}
117
	@${MKDIR} ${STAGEDIR}${DOCSDIR}
(-)x11-wm/mutter/Makefile (+2 lines)
Lines 32-36 GCONF_SCHEMAS= mutter.schemas Link Here
32
post-patch:
32
post-patch:
33
	@${REINPLACE_CMD} -e 's|-Werror||g' \
33
	@${REINPLACE_CMD} -e 's|-Werror||g' \
34
	    	${WRKSRC}/configure
34
	    	${WRKSRC}/configure
35
	@${REINPLACE_CMD} '/^mutter_LDADD =/s|$$| -lgmodule-2.0|' \
36
		${WRKSRC}/src/Makefile.in
35
37
36
.include <bsd.port.mk>
38
.include <bsd.port.mk>

Return to bug 190941