Skip to content

Commit

Permalink
- Remove unneeded dependency from gtk12/gtk20 [1]
Browse files Browse the repository at this point in the history 
- Remove USE_XLIB/USE_X_PREFIX/USE_XPM in favor of USE_XORG
- Remove X11BASE support in favor of LOCALBASE or PREFIX
- Use USE_LDCONFIG instead of INSTALLS_SHLIB
- Remove unneeded USE_GCC 3.4+

Thanks to all Helpers:
	Dmitry Marakasov, Chess Griffin, beech@, dinoex, rafan, gahr,
	ehaupt, nox, itetcu, flz, pav

PR:		116263
Tested on:	pointyhat
Approved by:	portmgr (pav)
  • Loading branch information
@miwi-fbsd
miwi-fbsd committed Apr 19, 2008
1 parent 2eea5f1 commit bce9b81
Show file tree
Hide file tree
Showing 3,056 changed files with 6,226 additions and 7,056 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
6 changes: 3 additions & 3 deletions Mk/bsd.efl.mk
View file
Original file line number Diff line number Diff line change
Expand Up @@ -512,9 +512,9 @@ LIB_DEPENDS+= ${_${LIB}_SLIB}.${_${LIB}_VERSION}:${PORTSDIR}/${_${LIB}_CATEGORY}
#
# Initialize configure enviropment
#
CONFIGURE_ENV+= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
CFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include ${CFLAGS}" \
LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib ${LDFLAGS}"
CONFIGURE_ENV+= CPPFLAGS="-I${LOCALBASE}/include" \
CFLAGS="-I${LOCALBASE}/include ${CFLAGS}" \
LDFLAGS="-L${LOCALBASE}/lib ${LDFLAGS}"

PLIST_SUB+= E17_ARCH=freebsd${OSREL}-${ARCH}

Expand Down
2 changes: 1 addition & 1 deletion Mk/bsd.gnustep.mk
View file
Original file line number Diff line number Diff line change
Expand Up @@ -517,7 +517,7 @@ TARGLIB!= (cd ${PORTSDIR}/${GNUSTEP_GCC_PORT} && make -V TARGLIB)
.for i in ${USE_GNUSTEP_LDCONFIG}
LDCONFIG_DIRS+= ${i}
.endfor
INSTALLS_SHLIB= yes
USE_LDCONFIG= yes
.endif

# eof
8 changes: 4 additions & 4 deletions Mk/bsd.kde.mk
View file
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ CATEGORIES+=ipv6
.if !defined(_NO_KDE_CONFTARGET_HACK)
CONFIGURE_TARGET=
CONFIGURE_ARGS+=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL} \
--x-libraries=${X11BASE}/lib --x-includes=${X11BASE}/include \
--x-libraries=${LOCALBASE}/lib --x-includes=${LOCALBASE}/include \
--disable-as-needed
.endif

Expand All @@ -83,7 +83,7 @@ IGNORE= cannot install: unsupported value in USE_KDELIBS_VER
.if ${USE_QT_VER} == CVS

KDE_CVS_PREFIX?= ${LOCALBASE}/kde-cvs
QT_CVS_PREFIX?= ${X11BASE}/qt-cvs
QT_CVS_PREFIX?= ${LOCALBASE}/qt-cvs
QTCPPFLAGS?=
QTCFGLIBS?=

Expand All @@ -110,14 +110,14 @@ QTCPPFLAGS?=
QTCGFLIBS?=

# Qt 3.x common stuff
QT_PREFIX?= ${X11BASE}
QT_PREFIX?= ${LOCALBASE}
MOC?= ${QT_PREFIX}/bin/moc
#LIB_DEPENDS+= qt-mt.3:${PORTSDIR}/x11-toolkits/qt33
BUILD_DEPENDS+= ${QT_PREFIX}/bin/moc:${PORTSDIR}/x11-toolkits/qt33
RUN_DEPENDS+= ${QT_PREFIX}/bin/moc:${PORTSDIR}/x11-toolkits/qt33
QTCPPFLAGS+= -I${LOCALBASE}/include -I${PREFIX}/include \
-I${QT_PREFIX}/include -D_GETOPT_H
QTCFGLIBS+= -Wl,-export-dynamic -L${LOCALBASE}/lib -L${X11BASE}/lib -ljpeg \
QTCFGLIBS+= -Wl,-export-dynamic -L${LOCALBASE}/lib -ljpeg \
-L${QT_PREFIX}/lib
.if defined(PACKAGE_BUILDING)
TMPDIR?= /tmp
Expand Down
8 changes: 4 additions & 4 deletions Mk/bsd.kde4.mk
View file
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ CATEGORIES+=ipv6
.if !defined(_NO_KDE_CONFTARGET_HACK)
CONFIGURE_TARGET=
CONFIGURE_ARGS+=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL} \
--x-libraries=${X11BASE}/lib --x-includes=${X11BASE}/include \
--x-libraries=${LOCALBASE}/lib --x-includes=${LOCALBASE}/include \
--disable-as-needed
.endif

Expand All @@ -83,7 +83,7 @@ IGNORE= cannot install: unsupported value in USE_KDELIBS_VER
.if ${USE_QT_VER} == CVS

KDE_CVS_PREFIX?= ${LOCALBASE}/kde-cvs
QT_CVS_PREFIX?= ${X11BASE}/qt-cvs
QT_CVS_PREFIX?= ${LOCALBASE}/qt-cvs
QTCPPFLAGS?=
QTCFGLIBS?=

Expand All @@ -110,14 +110,14 @@ QTCPPFLAGS?=
QTCGFLIBS?=

# Qt 3.x common stuff
QT_PREFIX?= ${X11BASE}
QT_PREFIX?= ${LOCALBASE}
MOC?= ${QT_PREFIX}/bin/moc
#LIB_DEPENDS+= qt-mt.3:${PORTSDIR}/x11-toolkits/qt33
BUILD_DEPENDS+= ${QT_PREFIX}/bin/moc:${PORTSDIR}/x11-toolkits/qt33
RUN_DEPENDS+= ${QT_PREFIX}/bin/moc:${PORTSDIR}/x11-toolkits/qt33
QTCPPFLAGS+= -I${LOCALBASE}/include -I${PREFIX}/include \
-I${QT_PREFIX}/include -D_GETOPT_H
QTCFGLIBS+= -Wl,-export-dynamic -L${LOCALBASE}/lib -L${X11BASE}/lib -ljpeg \
QTCFGLIBS+= -Wl,-export-dynamic -L${LOCALBASE}/lib -ljpeg \
-L${QT_PREFIX}/lib
.if defined(PACKAGE_BUILDING)
TMPDIR?= /tmp
Expand Down
4 changes: 2 additions & 2 deletions Mk/bsd.ocaml.mk
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# ex:ts=4
#
# $MBSDlabs: portmk/bsd.ocaml.mk,v 1.18 2006/08/06 18:47:23 stas Exp $
# $FreeBSD: /tmp/pcvs/ports/Mk/bsd.ocaml.mk,v 1.1 2007-03-14 04:05:25 linimon Exp $
# $FreeBSD: /tmp/pcvs/ports/Mk/bsd.ocaml.mk,v 1.2 2008-04-19 17:46:02 miwi Exp $
#
# bsd.ocaml.mk - Support for the Objective Caml language packages
#
Expand Down Expand Up @@ -177,7 +177,7 @@ ocaml-wash:
#
.if !target(add-plist-post)
add-plist-post:
. if (${PREFIX} != ${LOCALBASE} && ${PREFIX} != ${X11BASE} && \
. if (${PREFIX} != ${LOCALBASE} && \
${PREFIX} != ${LINUXBASE} && ${PREFIX} != "/usr")
@${ECHO_CMD} "@unexec rmdir %D 2> /dev/null || true" >> ${TMPPLIST}
. else
Expand Down
4 changes: 2 additions & 2 deletions Mk/bsd.scons.mk
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,8 @@ SCONS_PORT= ${PORTSDIR}/devel/scons
CCFLAGS?= ${CFLAGS}
LINKFLAGS?= ${LDFLAGS}
PKGCONFIGDIR?= ${LOCALBASE}/libdata/pkgconfig
LIBPATH?= ${LOCALBASE}/lib ${X11BASE}/lib
CPPPATH?= ${LOCALBASE}/include ${X11BASE}/include
LIBPATH?= ${LOCALBASE}/lib
CPPPATH?= ${LOCALBASE}/include

#
# SCONS_ENV is where we pass all the stuff that should be the
Expand Down
10 changes: 5 additions & 5 deletions Mk/bsd.wx.mk
View file
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@
# It determines the type of parameters that have to be passed
# to the configure script. In the first case it adds
# "--with-wx-config=${WX_CONFIG}" (absolute path of
# WX_CONFIG), and in second one "--with-wx=${X11BASE}" plus
# WX_CONFIG), and in second one "--with-wx=${LOCALBASE}" plus
# "--with-wx-config=${WX_CONFIG:T} (prefix and name).
# WX_PREMK - Define to determine version and define WX_CONFIG/WX_VERSION
# after <bsd.port.pre.mk> (in case the port needs to manually run
Expand Down Expand Up @@ -189,7 +189,7 @@ _WX_COMP= ${comp}
. for ver in ${_WX_VERS_ALL}
. if defined(_WX_LIB_${comp}_${ver})
_WX_SHVER_${comp}_${ver}= 0
_WX_FILE_${comp}_${ver}= ${X11BASE}/lib/lib${_WX_LIB_${comp}_${ver}}.so.${_WX_SHVER_${comp}_${ver}}
_WX_FILE_${comp}_${ver}= ${LOCALBASE}/lib/lib${_WX_LIB_${comp}_${ver}}.so.${_WX_SHVER_${comp}_${ver}}
. endif
. if ${_WX_COMP} == "python"
_WX_DEPTYPE_${comp}_${ver}= run
Expand Down Expand Up @@ -494,8 +494,8 @@ _WX_VER= ${ver}
# Set variables.
#

WX_CONFIG?= ${X11BASE}/bin/wxgtk2${_WX_UC}-${_WX_VER}-config
WXRC_CMD?= ${X11BASE}/bin/wxrc-gtk2${_WX_UC}-${_WX_VER}
WX_CONFIG?= ${LOCALBASE}/bin/wxgtk2${_WX_UC}-${_WX_VER}-config
WXRC_CMD?= ${LOCALBASE}/bin/wxrc-gtk2${_WX_UC}-${_WX_VER}
WX_VERSION?= ${_WX_VER}

.endif # _WX_Need_Version
Expand Down Expand Up @@ -586,7 +586,7 @@ CONFIGURE_ENV+= WX_CONFIG=${WX_CONFIG}
. if ${WX_CONF_ARGS:L} == "absolute"
CONFIGURE_ARGS+= --with-wx-config=${WX_CONFIG}
. elif ${WX_CONF_ARGS:L} == "relative"
CONFIGURE_ARGS+= --with-wx=${X11BASE} \
CONFIGURE_ARGS+= --with-wx=${LOCALBASE} \
--with-wx-config=${WX_CONFIG:T}
. else
IGNORE?= selected an invalid wxWidgets configure argument type: ${WX_CONF_ARGS}
Expand Down
Loading

0 comments on commit bce9b81

Please sign in to comment.