*: Cleanup

*: Replace BUILDLINK_PREFIX.libX11 with X11BASE
gdb-git: Use perl c c++; drop AUTO_MKDIRS
This commit is contained in:
Kamil Rytarowski 2016-10-25 19:05:06 +02:00
parent aa8d4bc40a
commit 9f5eced152
9 changed files with 17 additions and 17 deletions

View file

@ -18,8 +18,8 @@ USE_LANGUAGES= c c++
USE_PKGLOCALEDIR= yes
GNU_CONFIGURE= yes
USE_TOOLS+= grep intltool msgfmt msgmerge xgettext
CONFIGURE_ARGS+= --with-x --x-includes=${BUILDLINK_PREFIX.libX11}/include
CONFIGURE_ARGS+= --x-libraries=${BUILDLINK_PREFIX.libX11}/lib
CONFIGURE_ARGS+= --with-x --x-includes=${X11BASE}/include
CONFIGURE_ARGS+= --x-libraries=${X11BASE}/lib
CONFIGURE_ARGS+= --includedir=${BUILDLINK_PREFIX.MesaLib}/include/GL
post-install:

View file

@ -19,14 +19,14 @@ BROKEN_GETTEXT_DETECTION= yes
GNU_CONFIGURE= YES
USE_PKGLOCALEDIR= YES
USE_LIBTOOL= YES
USE_TOOLS+= gmake msgfmt makeinfo
USE_TOOLS+= gmake msgfmt makeinfo perl
REPLACE_LOCALEDIR_PATTERNS+= Make-in
INSTALL_TARGET= install install-info
TEST_TARGET= check
INFO_FILES= yes
CONFIGURE_ENV+= CONFIG_LDFLAGS=${LDFLAGS:M*:Q}
AUTO_MKDIRS= yes
USE_LANGUAGES= c c++
.include "options.mk"

View file

@ -22,8 +22,8 @@ USE_LANGUAGES+= c c++ fortran
USE_TOOLS+= msgfmt perl pkg-config xgettext
CONFIGURE_ENV+= GCONF_SCHEMA_FILE_DIR="${PREFIX}/share/gconf/schemas/"
CONFIGURE_ARGS+= --x-includes=${BUILDLINK_PREFIX.libX11}/include
CONFIGURE_ARGS+= --x-libraries=${BUILDLINK_PREFIX.libX11}/lib
CONFIGURE_ARGS+= --x-includes=${X11BASE}/include
CONFIGURE_ARGS+= --x-libraries=${X11BASE}/lib
MAKE_ENV+= GCONF_SCHEMA_FILE_DIR="${PREFIX}/share/gconf/schemas/"
GCONF_SCHEMAS+= gnome-jabber.schemas

View file

@ -33,8 +33,8 @@ CONFIGURE_ARGS+= --configure-option="--x-libraries=${XLIBRARIES}"
.if ${X11_TYPE} == "modular"
XINCLUDES= ${BUILDLINK_PREFIX.libX11}/include
XLIBRARIES+= ${BUILDLINK_PREFIX.libX11}/lib
XINCLUDES= ${X11BASE}/include
XLIBRARIES+= ${X11BASE}/lib
.else
XINCLUDES= ${X11BASE}/include
XLIBRARIES= ${X11BASE}/lib

View file

@ -12,8 +12,8 @@ COMMENT= Framework for building mega-widgets using [incr Tcl]
LICENSE= mit # Standard ML of New Jersey Variant
GNU_CONFIGURE= yes
CONFIGURE_ARGS+= --x-includes=${BUILDLINK_PREFIX.libX11}/include/X11
CONFIGURE_ARGS+= --x-libraries=${BUILDLINK_PREFIX.libX11}/lib
CONFIGURE_ARGS+= --x-includes=${X11BASE}/include/X11
CONFIGURE_ARGS+= --x-libraries=${X11BASE}/lib
CONFIGURE_ARGS+= --includedir=${PREFIX}/include/itcl3
USE_TOOLS+= grep

View file

@ -12,8 +12,8 @@ COMMENT= Framework for building mega-widgets for Tcl/Tk
LICENSE= mit # Standard ML of New Jersey Variant
GNU_CONFIGURE= yes
CONFIGURE_ARGS+= --x-includes=${BUILDLINK_PREFIX.libX11}/include/X11
CONFIGURE_ARGS+= --x-libraries=${BUILDLINK_PREFIX.libX11}/lib
CONFIGURE_ARGS+= --x-includes=${X11BASE}/include/X11
CONFIGURE_ARGS+= --x-libraries=${X11BASE}/lib
CONFIGURE_ARGS+= --with-itcl=${BUILDLINK_PREFIX.tcl-itcl3}/lib
CONFIGURE_ARGS+= --includedir=${PREFIX}/include/itk3
USE_TOOLS+= grep

View file

@ -14,8 +14,8 @@ CONFIGURE_ARGS+= --disable-symbols
.if !empty(PKG_OPTIONS:Mx11)
.include "../../x11/libX11/buildlink3.mk"
CONFIGURE_ARGS+= --with-x --x-includes=${BUILDLINK_PREFIX.libX11}/include
CONFIGURE_ARGS+= --x-libraries=${BUILDLINK_PREFIX.libX11}/lib
CONFIGURE_ARGS+= --with-x --x-includes=${X11BASE}/include
CONFIGURE_ARGS+= --x-libraries=${X11BASE}/lib
.else
CONFIGURE_ARGS+= --without-x
.endif

View file

@ -16,8 +16,8 @@ GNU_CONFIGURE= yes
.include "../../mk/bsd.prefs.mk"
.if ${X11_TYPE} == "modular"
CONFIGURE_ARGS+= --x-includes=${BUILDLINK_PREFIX.libX11:Q}/include
CONFIGURE_ARGS+= --x-libraries=${BUILDLINK_PREFIX.libX11:Q}/lib
CONFIGURE_ARGS+= --x-includes=${X11BASE:Q}/include
CONFIGURE_ARGS+= --x-libraries=${X11BASE:Q}/lib
.endif
.include "../../lang/tcl/buildlink3.mk"

View file

@ -18,7 +18,7 @@ SUBST_CLASSES+= x11
SUBST_FILES.x11= Makefile
SUBST_STAGE.x11= post-patch
SUBST_MESSAGE.x11= Fixing X11 LIBDIR.
SUBST_SED.x11= -e "s|/usr/X11R6/lib|${BUILDLINK_PREFIX.libX11}/lib -Wl,-rpath,${BUILDLINK_PREFIX.libX11}/lib|"
SUBST_SED.x11= -e "s|/usr/X11R6/lib|${X11BASE}/lib -Wl,-rpath,${X11BASE}/lib|"
do-install:
${INSTALL_PROGRAM} ${WRKSRC}/wmsupermon ${DESTDIR}${PREFIX}/bin/wmsupermon