aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorbland <bland@FreeBSD.org>2005-04-22 13:41:26 +0800
committerbland <bland@FreeBSD.org>2005-04-22 13:41:26 +0800
commitbb6e44f1a6fd5a23df61d91bf52ebdbd04d85680 (patch)
treec6bc890a4c418c48748c041ecfe134a009450b86
parent4b2e3f9fa9b56c28d8bc1f6ee8825df89b39ce83 (diff)
downloadfreebsd-ports-gnome-bb6e44f1a6fd5a23df61d91bf52ebdbd04d85680.tar.gz
freebsd-ports-gnome-bb6e44f1a6fd5a23df61d91bf52ebdbd04d85680.tar.zst
freebsd-ports-gnome-bb6e44f1a6fd5a23df61d91bf52ebdbd04d85680.zip
Fix build failure triggered by pkgconfig update.
Diffstat
-rw-r--r--databases/libgdamm/Makefile5
-rw-r--r--devel/gconfmm26/Makefile3
-rw-r--r--devel/gnome-vfsmm/Makefile2
-rw-r--r--devel/libglademm24/Makefile2
-rw-r--r--devel/libglademm24/files/patch-tools__extra_defs_gen__Makefile.in11
-rw-r--r--graphics/libgnomecanvasmm26/Makefile3
-rw-r--r--graphics/libgnomecanvasmm26/files/patch-tools__extra_defs_gen__Makefile.in11
-rw-r--r--print/libgnomeprintmm/Makefile5
-rw-r--r--print/libgnomeprintmm/files/patch-tools__extra_defs_gen__Makefile.in11
-rw-r--r--x11-toolkits/libgnomeprintuimm/Makefile2
-rw-r--r--x11-toolkits/libgnomeuimm26/Makefile2
-rw-r--r--x11-toolkits/libpanelappletmm/Makefile2
12 files changed, 26 insertions, 33 deletions
diff --git a/databases/libgdamm/Makefile b/databases/libgdamm/Makefile
index 756f6fae7c2a..8dbde0ba72bc 100644
--- a/databases/libgdamm/Makefile
+++ b/databases/libgdamm/Makefile
@@ -22,6 +22,7 @@ USE_BZIP2= yes
USE_X_PREFIX= yes
USE_GCC= 3.4
USE_GMAKE= yes
+USE_REINPLACE= yes
USE_GNOME= gnomehack libgda2
USE_INC_LIBTOOL_VER= 15
INSTALLS_SHLIB= yes
@@ -36,4 +37,8 @@ patch-autotools:
${RM} $$file.tmp; \
done);
+post-patch:
+ @${REINPLACE_CMD} -e "s|\(-lglibmm\)|-L\$$(GMM_PROCDIR)/../.. \1|" \
+ ${WRKSRC}/tools/extra_defs_gen/Makefile.in
+
.include <bsd.port.mk>
diff --git a/devel/gconfmm26/Makefile b/devel/gconfmm26/Makefile
index 4845e1a14cd2..f11917c32a47 100644
--- a/devel/gconfmm26/Makefile
+++ b/devel/gconfmm26/Makefile
@@ -36,6 +36,9 @@ PLIST_SUB= VERSION="2.6" API_VERSION="2.6"
post-patch:
@${REINPLACE_CMD} -e '/^SUBDIRS =/s/examples//' \
${WRKSRC}/Makefile.in
+ @${REINPLACE_CMD} -e "s|\(-lglibmm\)|-L\$$(GMM_PROCDIR)/../.. \1|" \
+ ${WRKSRC}/tools/extra_defs_gen/Makefile.in
+
patch-autotools:
@(cd ${PATCH_WRKSRC}; \
diff --git a/devel/gnome-vfsmm/Makefile b/devel/gnome-vfsmm/Makefile
index 48a4815301e2..14b1fecd7943 100644
--- a/devel/gnome-vfsmm/Makefile
+++ b/devel/gnome-vfsmm/Makefile
@@ -33,6 +33,8 @@ PLIST_SUB= VERSION="2.6" API_VERSION="2.6"
post-patch:
@${REINPLACE_CMD} -e '/^SUBDIRS =/s/examples//' \
${WRKSRC}/Makefile.in
+ @${REINPLACE_CMD} -e "s|\(-lglibmm\)|-L\$$(GMM_PROCDIR)/../.. \1|" \
+ ${WRKSRC}/tools/extra_defs_gen/Makefile.in
patch-autotools:
@(cd ${PATCH_WRKSRC}; \
diff --git a/devel/libglademm24/Makefile b/devel/libglademm24/Makefile
index 3c82d4db7ded..048be0b176fb 100644
--- a/devel/libglademm24/Makefile
+++ b/devel/libglademm24/Makefile
@@ -38,6 +38,8 @@ post-patch:
.if defined(NOPORTDOCS)
@${REINPLACE_CMD} -e 's|^\(SUBDIRS = .*\)\(docs\)\(.*\)|\1\3|' ${WRKSRC}/Makefile.in
.endif
+ @${REINPLACE_CMD} -e "s|\(-lglibmm\)|-L\$$(GMM_PROCDIR)/../.. \1|" \
+ ${WRKSRC}/tools/extra_defs_gen/Makefile.in
patch-autotools:
@(cd ${PATCH_WRKSRC}; \
diff --git a/devel/libglademm24/files/patch-tools__extra_defs_gen__Makefile.in b/devel/libglademm24/files/patch-tools__extra_defs_gen__Makefile.in
deleted file mode 100644
index 4854e78ba418..000000000000
--- a/devel/libglademm24/files/patch-tools__extra_defs_gen__Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- tools/extra_defs_gen/Makefile.in.orig Sun Mar 6 23:00:45 2005
-+++ tools/extra_defs_gen/Makefile.in Tue Apr 19 18:39:53 2005
-@@ -125,7 +125,7 @@
- LIBGLADEMM_VERSION = @LIBGLADEMM_VERSION@
- LIBGLADE_VERSION_NEEDED = @LIBGLADE_VERSION_NEEDED@
- LIBOBJS = @LIBOBJS@
--LIBS = $(LIBGLADEMM_LIBS) -lglibmm_generate_extra_defs-2.4
-+LIBS = $(LIBGLADEMM_LIBS) -L$(GMM_PROCDIR)/../.. -lglibmm_generate_extra_defs-2.4
- LIBTOOL = @LIBTOOL@
- LN_S = @LN_S@
- LTLIBOBJS = @LTLIBOBJS@
diff --git a/graphics/libgnomecanvasmm26/Makefile b/graphics/libgnomecanvasmm26/Makefile
index a2a5d49984d5..061a519aabc0 100644
--- a/graphics/libgnomecanvasmm26/Makefile
+++ b/graphics/libgnomecanvasmm26/Makefile
@@ -35,6 +35,9 @@ PLIST_SUB= VERSION="2.6" API_VERSION="2.6"
post-patch:
@${REINPLACE_CMD} -e '/^SUBDIRS =/s/examples//' \
${WRKSRC}/Makefile.in
+ @${REINPLACE_CMD} -e "s|\(-lglibmm\)|-L\$$(GMM_PROCDIR)/../.. \1|" \
+ ${WRKSRC}/tools/extra_defs_gen/Makefile.in
+
patch-autotools:
@(cd ${PATCH_WRKSRC}; \
diff --git a/graphics/libgnomecanvasmm26/files/patch-tools__extra_defs_gen__Makefile.in b/graphics/libgnomecanvasmm26/files/patch-tools__extra_defs_gen__Makefile.in
deleted file mode 100644
index bb755df57485..000000000000
--- a/graphics/libgnomecanvasmm26/files/patch-tools__extra_defs_gen__Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- tools/extra_defs_gen/Makefile.in.bak Mon Mar 7 02:40:39 2005
-+++ tools/extra_defs_gen/Makefile.in Fri Apr 22 12:17:55 2005
-@@ -122,7 +122,7 @@
- LIBGNOMECANVASMM_VERSION = @LIBGNOMECANVASMM_VERSION@
- LIBGNOMECANVAS_VERSION_NEEDED = @LIBGNOMECANVAS_VERSION_NEEDED@
- LIBOBJS = @LIBOBJS@
--LIBS = $(LIBGNOMECANVASMM_LIBS) -lglibmm_generate_extra_defs-2.4
-+LIBS = $(LIBGNOMECANVASMM_LIBS) -L$(GMM_PROCDIR)/../.. -lglibmm_generate_extra_defs-2.4
- LIBTOOL = @LIBTOOL@
- LN_S = @LN_S@
- LTLIBOBJS = @LTLIBOBJS@
diff --git a/print/libgnomeprintmm/Makefile b/print/libgnomeprintmm/Makefile
index d91a2a9737f1..e023ef869f8d 100644
--- a/print/libgnomeprintmm/Makefile
+++ b/print/libgnomeprintmm/Makefile
@@ -21,6 +21,7 @@ BUILD_DEPENDS= gm4:${PORTSDIR}/devel/m4
USE_BZIP2= yes
USE_X_PREFIX= yes
USE_GMAKE= yes
+USE_REINPLACE= yes
USE_GCC= 3.4
USE_GNOME= gnomeprefix gnomehack libgnomeprint
INSTALLS_SHLIB= yes
@@ -29,6 +30,10 @@ CONFIGURE_ARGS= --enable-static
PLIST_SUB= VERSION="2.5" API_VERSION="2.6"
+post-patch:
+ @${REINPLACE_CMD} -e "s|\(-lglibmm\)|-L\$$(GMM_PROCDIR)/../.. \1|" \
+ ${WRKSRC}/tools/extra_defs_gen/Makefile.in
+
patch-autotools:
@(cd ${PATCH_WRKSRC}; \
for file in ${LIBTOOLFILES}; do \
diff --git a/print/libgnomeprintmm/files/patch-tools__extra_defs_gen__Makefile.in b/print/libgnomeprintmm/files/patch-tools__extra_defs_gen__Makefile.in
deleted file mode 100644
index ad005e718636..000000000000
--- a/print/libgnomeprintmm/files/patch-tools__extra_defs_gen__Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- tools/extra_defs_gen/Makefile.in.bak Tue Jun 8 19:58:29 2004
-+++ tools/extra_defs_gen/Makefile.in Fri Apr 22 12:25:56 2005
-@@ -119,7 +119,7 @@
- LIBGNOMEPRINTMM_VERSION = @LIBGNOMEPRINTMM_VERSION@
- LIBGNOMEPRINT_VERSION_NEEDED = @LIBGNOMEPRINT_VERSION_NEEDED@
- LIBOBJS = @LIBOBJS@
--LIBS = $(LIBGNOMEPRINTMM_LIBS) -lglibmm_generate_extra_defs-2.4
-+LIBS = $(LIBGNOMEPRINTMM_LIBS) -L$(GMM_PROCDIR)/../.. -lglibmm_generate_extra_defs-2.4
- LIBTOOL = @LIBTOOL@
- LN_S = @LN_S@
- LTLIBOBJS = @LTLIBOBJS@
diff --git a/x11-toolkits/libgnomeprintuimm/Makefile b/x11-toolkits/libgnomeprintuimm/Makefile
index 3ee5e140fe52..3afd3e3ee892 100644
--- a/x11-toolkits/libgnomeprintuimm/Makefile
+++ b/x11-toolkits/libgnomeprintuimm/Makefile
@@ -33,6 +33,8 @@ PLIST_SUB= VERSION="2.5" API_VERSION="2.6"
post-patch:
@${REINPLACE_CMD} -e 's|2\.0|2.6|' ${WRKSRC}/tools/m4/Makefile.in
+ @${REINPLACE_CMD} -e "s|\(-lglibmm\)|-L\$$(GMM_PROCDIR)/../.. \1|" \
+ ${WRKSRC}/tools/extra_defs_gen/Makefile.in
patch-autotools:
@(cd ${PATCH_WRKSRC}; \
diff --git a/x11-toolkits/libgnomeuimm26/Makefile b/x11-toolkits/libgnomeuimm26/Makefile
index 7f4bb83e2fa9..945dbcb22147 100644
--- a/x11-toolkits/libgnomeuimm26/Makefile
+++ b/x11-toolkits/libgnomeuimm26/Makefile
@@ -39,6 +39,8 @@ PLIST_SUB= VERSION="2.6" API_VERSION="2.6"
post-patch:
@${REINPLACE_CMD} -e '/^SUBDIRS =/s/examples//' \
${WRKSRC}/Makefile.in
+ @${REINPLACE_CMD} -e "s|\(-lglibmm\)|-L\$$(GMM_PROCDIR)/../.. \1|" \
+ ${WRKSRC}/tools/extra_defs_gen/Makefile.in
patch-autotools:
@(cd ${PATCH_WRKSRC}; \
diff --git a/x11-toolkits/libpanelappletmm/Makefile b/x11-toolkits/libpanelappletmm/Makefile
index 687fd2618863..a27fc110abea 100644
--- a/x11-toolkits/libpanelappletmm/Makefile
+++ b/x11-toolkits/libpanelappletmm/Makefile
@@ -35,5 +35,7 @@ PLIST_SUB= VERSION="2.6" API_VERSION="2.6"
post-patch:
@${REINPLACE_CMD} -e '/^SUBDIRS =/s/examples//' \
${WRKSRC}/Makefile.in
+ @${REINPLACE_CMD} -e "s|\(-lglibmm\)|-L\$$(GMM_PROCDIR)/../.. \1|" \
+ ${WRKSRC}/tools/extra_defs_gen/Makefile.in
.include <bsd.port.mk>
generated by cgit (git 2.34.1) at 2024-11-29 10:08:58 +0800