aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--x11-toolkits/wxgtk2-devel/Makefile14
-rw-r--r--x11-toolkits/wxgtk2-utils-devel/Makefile4
-rw-r--r--x11-toolkits/wxgtk26-contrib-utils/Makefile4
-rw-r--r--x11-toolkits/wxgtk26/Makefile14
-rw-r--r--x11-toolkits/wxgtk28/Makefile14
-rw-r--r--x11-toolkits/wxgtk29/Makefile14
6 files changed, 28 insertions, 36 deletions
diff --git a/x11-toolkits/wxgtk2-devel/Makefile b/x11-toolkits/wxgtk2-devel/Makefile
index ef76001c322e..df416dfb68c1 100644
--- a/x11-toolkits/wxgtk2-devel/Makefile
+++ b/x11-toolkits/wxgtk2-devel/Makefile
@@ -17,7 +17,7 @@ DISTNAME= wxGTK-${PORTVERSION}
MAINTAINER?= fjoe@FreeBSD.org
COMMENT?= The wxWidgets GUI toolkit with GTK+ bindings (devel version)
-LIB_DEPENDS= png.5:${PORTSDIR}/graphics/png \
+LIB_DEPENDS+= png.5:${PORTSDIR}/graphics/png \
jpeg.9:${PORTSDIR}/graphics/jpeg \
tiff.4:${PORTSDIR}/graphics/tiff \
expat.5:${PORTSDIR}/textproc/expat2
@@ -60,14 +60,9 @@ INSTALL_TARGET= install-common
INSTALLS_SHLIB= yes
.endif # *-common
-.if ${WXGTK_FLAVOR:M*-contrib*} != "" || ${WXGTK_FLAVOR:M*-utils*} != ""
-.if ${WXGTK_FLAVOR:M*-utils*} != ""
-BUILD_WRKSRC= ${WRKSRC}/contrib/utils
-INSTALL_WRKSRC= ${BUILD_WRKSRC}
-.else
+.if ${WXGTK_FLAVOR:M*-contrib*} != ""
BUILD_WRKSRC= ${WRKSRC}/contrib
INSTALL_WRKSRC= ${BUILD_WRKSRC}
-.endif # *-utils*
.if ${WXGTK_FLAVOR} != "gtk2-contrib-common"
RUN_DEPENDS= ${X11BASE}/include/wx/stc/stc.h:${PORTSDIR}/x11-toolkits/wxgtk2-contrib-common-devel
@@ -78,13 +73,14 @@ LIB_DEPENDS+= wx_baseu-2.5.2:${PORTSDIR}/x11-toolkits/wxgtk2-unicode-devel
LIB_DEPENDS+= wx_base-2.5.2:${PORTSDIR}/x11-toolkits/wxgtk2-devel
.endif
+.endif # !gtk2-contrib-common
+.endif # *-contrib*
+
pre-configure:
@${FIND} ${WRKSRC}/contrib -name Makefile.in -print0 | ${XARGS} -0 ${REINPLACE_CMD} \
-e "s,@CXXFLAGS@,${CFLAGS} `${WXGTK_CONFIG} --cxxflags`," \
-e "s,@CFLAGS@,${CFLAGS} `${WXGTK_CONFIG} --cflags`," \
-e "s,@CPPFLAGS@,,"
-.endif # !gtk2-contrib-common
-.endif # *-contrib* || *-utils*
.include <bsd.port.pre.mk>
diff --git a/x11-toolkits/wxgtk2-utils-devel/Makefile b/x11-toolkits/wxgtk2-utils-devel/Makefile
index f5888c98e07d..7aa0032743c7 100644
--- a/x11-toolkits/wxgtk2-utils-devel/Makefile
+++ b/x11-toolkits/wxgtk2-utils-devel/Makefile
@@ -10,10 +10,14 @@ COMMENT= The wxWidgets GUI toolkit utils (devel version)
.if defined(WITH_UNICODE)
WXGTK_FLAVOR= gtk2-unicode-utils
+LIB_DEPENDS= wx_gtk2u_stc-2.5.2:${PORTSDIR}/x11-toolkits/wxgtk2-unicode-contrib-devel
.else
WXGTK_FLAVOR= gtk2-utils
+LIB_DEPENDS= wx_gtk2_stc-2.5.2:${PORTSDIR}/x11-toolkits/wxgtk2-contrib-devel
.endif
+BUILD_WRKSRC= ${WRKSRC}/contrib/utils
+INSTALL_WRKSRC= ${BUILD_WRKSRC}
MASTERDIR= ${.CURDIR}/../wxgtk2-devel
.include "${MASTERDIR}/Makefile"
diff --git a/x11-toolkits/wxgtk26-contrib-utils/Makefile b/x11-toolkits/wxgtk26-contrib-utils/Makefile
index f5888c98e07d..7aa0032743c7 100644
--- a/x11-toolkits/wxgtk26-contrib-utils/Makefile
+++ b/x11-toolkits/wxgtk26-contrib-utils/Makefile
@@ -10,10 +10,14 @@ COMMENT= The wxWidgets GUI toolkit utils (devel version)
.if defined(WITH_UNICODE)
WXGTK_FLAVOR= gtk2-unicode-utils
+LIB_DEPENDS= wx_gtk2u_stc-2.5.2:${PORTSDIR}/x11-toolkits/wxgtk2-unicode-contrib-devel
.else
WXGTK_FLAVOR= gtk2-utils
+LIB_DEPENDS= wx_gtk2_stc-2.5.2:${PORTSDIR}/x11-toolkits/wxgtk2-contrib-devel
.endif
+BUILD_WRKSRC= ${WRKSRC}/contrib/utils
+INSTALL_WRKSRC= ${BUILD_WRKSRC}
MASTERDIR= ${.CURDIR}/../wxgtk2-devel
.include "${MASTERDIR}/Makefile"
diff --git a/x11-toolkits/wxgtk26/Makefile b/x11-toolkits/wxgtk26/Makefile
index ef76001c322e..df416dfb68c1 100644
--- a/x11-toolkits/wxgtk26/Makefile
+++ b/x11-toolkits/wxgtk26/Makefile
@@ -17,7 +17,7 @@ DISTNAME= wxGTK-${PORTVERSION}
MAINTAINER?= fjoe@FreeBSD.org
COMMENT?= The wxWidgets GUI toolkit with GTK+ bindings (devel version)
-LIB_DEPENDS= png.5:${PORTSDIR}/graphics/png \
+LIB_DEPENDS+= png.5:${PORTSDIR}/graphics/png \
jpeg.9:${PORTSDIR}/graphics/jpeg \
tiff.4:${PORTSDIR}/graphics/tiff \
expat.5:${PORTSDIR}/textproc/expat2
@@ -60,14 +60,9 @@ INSTALL_TARGET= install-common
INSTALLS_SHLIB= yes
.endif # *-common
-.if ${WXGTK_FLAVOR:M*-contrib*} != "" || ${WXGTK_FLAVOR:M*-utils*} != ""
-.if ${WXGTK_FLAVOR:M*-utils*} != ""
-BUILD_WRKSRC= ${WRKSRC}/contrib/utils
-INSTALL_WRKSRC= ${BUILD_WRKSRC}
-.else
+.if ${WXGTK_FLAVOR:M*-contrib*} != ""
BUILD_WRKSRC= ${WRKSRC}/contrib
INSTALL_WRKSRC= ${BUILD_WRKSRC}
-.endif # *-utils*
.if ${WXGTK_FLAVOR} != "gtk2-contrib-common"
RUN_DEPENDS= ${X11BASE}/include/wx/stc/stc.h:${PORTSDIR}/x11-toolkits/wxgtk2-contrib-common-devel
@@ -78,13 +73,14 @@ LIB_DEPENDS+= wx_baseu-2.5.2:${PORTSDIR}/x11-toolkits/wxgtk2-unicode-devel
LIB_DEPENDS+= wx_base-2.5.2:${PORTSDIR}/x11-toolkits/wxgtk2-devel
.endif
+.endif # !gtk2-contrib-common
+.endif # *-contrib*
+
pre-configure:
@${FIND} ${WRKSRC}/contrib -name Makefile.in -print0 | ${XARGS} -0 ${REINPLACE_CMD} \
-e "s,@CXXFLAGS@,${CFLAGS} `${WXGTK_CONFIG} --cxxflags`," \
-e "s,@CFLAGS@,${CFLAGS} `${WXGTK_CONFIG} --cflags`," \
-e "s,@CPPFLAGS@,,"
-.endif # !gtk2-contrib-common
-.endif # *-contrib* || *-utils*
.include <bsd.port.pre.mk>
diff --git a/x11-toolkits/wxgtk28/Makefile b/x11-toolkits/wxgtk28/Makefile
index ef76001c322e..df416dfb68c1 100644
--- a/x11-toolkits/wxgtk28/Makefile
+++ b/x11-toolkits/wxgtk28/Makefile
@@ -17,7 +17,7 @@ DISTNAME= wxGTK-${PORTVERSION}
MAINTAINER?= fjoe@FreeBSD.org
COMMENT?= The wxWidgets GUI toolkit with GTK+ bindings (devel version)
-LIB_DEPENDS= png.5:${PORTSDIR}/graphics/png \
+LIB_DEPENDS+= png.5:${PORTSDIR}/graphics/png \
jpeg.9:${PORTSDIR}/graphics/jpeg \
tiff.4:${PORTSDIR}/graphics/tiff \
expat.5:${PORTSDIR}/textproc/expat2
@@ -60,14 +60,9 @@ INSTALL_TARGET= install-common
INSTALLS_SHLIB= yes
.endif # *-common
-.if ${WXGTK_FLAVOR:M*-contrib*} != "" || ${WXGTK_FLAVOR:M*-utils*} != ""
-.if ${WXGTK_FLAVOR:M*-utils*} != ""
-BUILD_WRKSRC= ${WRKSRC}/contrib/utils
-INSTALL_WRKSRC= ${BUILD_WRKSRC}
-.else
+.if ${WXGTK_FLAVOR:M*-contrib*} != ""
BUILD_WRKSRC= ${WRKSRC}/contrib
INSTALL_WRKSRC= ${BUILD_WRKSRC}
-.endif # *-utils*
.if ${WXGTK_FLAVOR} != "gtk2-contrib-common"
RUN_DEPENDS= ${X11BASE}/include/wx/stc/stc.h:${PORTSDIR}/x11-toolkits/wxgtk2-contrib-common-devel
@@ -78,13 +73,14 @@ LIB_DEPENDS+= wx_baseu-2.5.2:${PORTSDIR}/x11-toolkits/wxgtk2-unicode-devel
LIB_DEPENDS+= wx_base-2.5.2:${PORTSDIR}/x11-toolkits/wxgtk2-devel
.endif
+.endif # !gtk2-contrib-common
+.endif # *-contrib*
+
pre-configure:
@${FIND} ${WRKSRC}/contrib -name Makefile.in -print0 | ${XARGS} -0 ${REINPLACE_CMD} \
-e "s,@CXXFLAGS@,${CFLAGS} `${WXGTK_CONFIG} --cxxflags`," \
-e "s,@CFLAGS@,${CFLAGS} `${WXGTK_CONFIG} --cflags`," \
-e "s,@CPPFLAGS@,,"
-.endif # !gtk2-contrib-common
-.endif # *-contrib* || *-utils*
.include <bsd.port.pre.mk>
diff --git a/x11-toolkits/wxgtk29/Makefile b/x11-toolkits/wxgtk29/Makefile
index ef76001c322e..df416dfb68c1 100644
--- a/x11-toolkits/wxgtk29/Makefile
+++ b/x11-toolkits/wxgtk29/Makefile
@@ -17,7 +17,7 @@ DISTNAME= wxGTK-${PORTVERSION}
MAINTAINER?= fjoe@FreeBSD.org
COMMENT?= The wxWidgets GUI toolkit with GTK+ bindings (devel version)
-LIB_DEPENDS= png.5:${PORTSDIR}/graphics/png \
+LIB_DEPENDS+= png.5:${PORTSDIR}/graphics/png \
jpeg.9:${PORTSDIR}/graphics/jpeg \
tiff.4:${PORTSDIR}/graphics/tiff \
expat.5:${PORTSDIR}/textproc/expat2
@@ -60,14 +60,9 @@ INSTALL_TARGET= install-common
INSTALLS_SHLIB= yes
.endif # *-common
-.if ${WXGTK_FLAVOR:M*-contrib*} != "" || ${WXGTK_FLAVOR:M*-utils*} != ""
-.if ${WXGTK_FLAVOR:M*-utils*} != ""
-BUILD_WRKSRC= ${WRKSRC}/contrib/utils
-INSTALL_WRKSRC= ${BUILD_WRKSRC}
-.else
+.if ${WXGTK_FLAVOR:M*-contrib*} != ""
BUILD_WRKSRC= ${WRKSRC}/contrib
INSTALL_WRKSRC= ${BUILD_WRKSRC}
-.endif # *-utils*
.if ${WXGTK_FLAVOR} != "gtk2-contrib-common"
RUN_DEPENDS= ${X11BASE}/include/wx/stc/stc.h:${PORTSDIR}/x11-toolkits/wxgtk2-contrib-common-devel
@@ -78,13 +73,14 @@ LIB_DEPENDS+= wx_baseu-2.5.2:${PORTSDIR}/x11-toolkits/wxgtk2-unicode-devel
LIB_DEPENDS+= wx_base-2.5.2:${PORTSDIR}/x11-toolkits/wxgtk2-devel
.endif
+.endif # !gtk2-contrib-common
+.endif # *-contrib*
+
pre-configure:
@${FIND} ${WRKSRC}/contrib -name Makefile.in -print0 | ${XARGS} -0 ${REINPLACE_CMD} \
-e "s,@CXXFLAGS@,${CFLAGS} `${WXGTK_CONFIG} --cxxflags`," \
-e "s,@CFLAGS@,${CFLAGS} `${WXGTK_CONFIG} --cflags`," \
-e "s,@CPPFLAGS@,,"
-.endif # !gtk2-contrib-common
-.endif # *-contrib* || *-utils*
.include <bsd.port.pre.mk>
generated by cgit (git 2.34.1) at 2024-12-29 01:19:53 +0800