diff options
72 files changed, 45 insertions, 153 deletions
diff --git a/archivers/ocaml-zip/Makefile b/archivers/ocaml-zip/Makefile index 613d11c76c1a..aa998ca54877 100644 --- a/archivers/ocaml-zip/Makefile +++ b/archivers/ocaml-zip/Makefile @@ -27,7 +27,6 @@ MASTERPORT= ${PORTSDIR}/devel/ocaml-camlidl PATTERN= ([[:space:]]*)cp([[:space:]]+.*) .include <bsd.port.pre.mk> -.include "${PORTSDIR}/lang/ocaml/bsd.ocaml.mk" post-extract: # PREFIX, CFLAGS and permissions safeness diff --git a/audio/thunar-media-tags-plugin/Makefile b/audio/thunar-media-tags-plugin/Makefile index 34d96b0ed9d6..d11612d299e7 100644 --- a/audio/thunar-media-tags-plugin/Makefile +++ b/audio/thunar-media-tags-plugin/Makefile @@ -26,6 +26,4 @@ USE_XFCE= configenv libexo thunar USE_XLIB= yes USE_AUTOTOOLS= libtool:15 -.include <bsd.port.pre.mk> -.include "${PORTSDIR}/x11-wm/xfce4/bsd.xfce.mk" -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/audio/xfce4-mixer/Makefile b/audio/xfce4-mixer/Makefile index a627cc0f72d9..bcc0b4b3f084 100644 --- a/audio/xfce4-mixer/Makefile +++ b/audio/xfce4-mixer/Makefile @@ -26,6 +26,4 @@ USE_XLIB= yes post-patch: @${REINPLACE_CMD} -e 's|echo aout|echo elf|g' ${WRKSRC}/configure -.include <bsd.port.pre.mk> -.include "${PORTSDIR}/x11-wm/xfce4/bsd.xfce.mk" -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/audio/xfce4-mpc-plugin/Makefile b/audio/xfce4-mpc-plugin/Makefile index 9c4009ab19ea..9d9498e51e06 100644 --- a/audio/xfce4-mpc-plugin/Makefile +++ b/audio/xfce4-mpc-plugin/Makefile @@ -24,6 +24,4 @@ USE_GNOME= gnometarget gtk20 intltool intlhack pkgconfig USE_XFCE= configenv libgui libutil panel USE_XLIB= yes -.include <bsd.port.pre.mk> -.include "${PORTSDIR}/x11-wm/xfce4/bsd.xfce.mk" -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/deskutils/orage/Makefile b/deskutils/orage/Makefile index 4d612ab4b223..2f6b273d644c 100644 --- a/deskutils/orage/Makefile +++ b/deskutils/orage/Makefile @@ -27,7 +27,6 @@ OPTIONS= BDB "Enable BDB support" off \ ICAL "Enable libical support" off .include <bsd.port.pre.mk> -.include "${PORTSDIR}/x11-wm/xfce4/bsd.xfce.mk" .if defined(WITH_BDB) CONFIGURE_ARGS+=--with-bdb4=yes --with-bdb4_dir=${LOCALBASE} diff --git a/deskutils/xfce4-notes-plugin/Makefile b/deskutils/xfce4-notes-plugin/Makefile index 40b9f3bbbc54..25af95e874e0 100644 --- a/deskutils/xfce4-notes-plugin/Makefile +++ b/deskutils/xfce4-notes-plugin/Makefile @@ -22,6 +22,4 @@ USE_GNOME= gnometarget gtk20 intltool intlhack pkgconfig USE_XFCE= configenv libgui libutil panel USE_XLIB= yes -.include <bsd.port.pre.mk> -.include "${PORTSDIR}/x11-wm/xfce4/bsd.xfce.mk" -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/deskutils/xfce4-xkb-plugin/Makefile b/deskutils/xfce4-xkb-plugin/Makefile index baf3557ca751..493313441e28 100644 --- a/deskutils/xfce4-xkb-plugin/Makefile +++ b/deskutils/xfce4-xkb-plugin/Makefile @@ -22,6 +22,4 @@ USE_GNOME= gnometarget gtk20 intltool intlhack pkgconfig USE_XFCE= configenv panel USE_XLIB= yes -.include <bsd.port.pre.mk> -.include "${PORTSDIR}/x11-wm/xfce4/bsd.xfce.mk" -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/devel/aifad/Makefile b/devel/aifad/Makefile index 1eb594d9ca81..4fd66ec8eb0d 100644 --- a/devel/aifad/Makefile +++ b/devel/aifad/Makefile @@ -31,7 +31,6 @@ SA_DIR= ${LOCALBASE}/${OCAML_SITELIBDIR} DOCS= README.txt TODO .include <bsd.port.pre.mk> -.include "${PORTSDIR}/lang/ocaml/bsd.ocaml.mk" do-install: ${INSTALL_PROGRAM} ${WRKSRC}/src/${PORTNAME} ${PREFIX}/bin/ diff --git a/devel/ocaml-annexlib/Makefile b/devel/ocaml-annexlib/Makefile index 1263af59168b..9269f9790d11 100644 --- a/devel/ocaml-annexlib/Makefile +++ b/devel/ocaml-annexlib/Makefile @@ -34,7 +34,6 @@ PORTDOCS= * .endif .include <bsd.port.pre.mk> -.include "${PORTSDIR}/lang/ocaml/bsd.ocaml.mk" post-extract: # For nonstandard prefixes diff --git a/devel/ocaml-camljava/Makefile b/devel/ocaml-camljava/Makefile index 800da4d3a516..0499eaa97500 100644 --- a/devel/ocaml-camljava/Makefile +++ b/devel/ocaml-camljava/Makefile @@ -20,7 +20,6 @@ USE_JAVA= yes JAVA_VERSION= 1.4+ .include <bsd.port.pre.mk> -.include "${PORTSDIR}/lang/ocaml/bsd.ocaml.mk" post-extract: @${REINPLACE_CMD} -e "s,^\(JAVAC=\).*,\1${JAVAC},g" \ diff --git a/devel/ocaml-camomile/Makefile b/devel/ocaml-camomile/Makefile index 6f9cbaf422e7..3687f93ae9de 100644 --- a/devel/ocaml-camomile/Makefile +++ b/devel/ocaml-camomile/Makefile @@ -31,7 +31,6 @@ PLIST_FILES= bin/camomilecharmap \ bin/camomilelocaledef .include <bsd.port.pre.mk> -.include "${PORTSDIR}/lang/ocaml/bsd.ocaml.mk" .if ${OSVERSION} < 500000 BROKEN= Need working <wctype.h> diff --git a/devel/ocaml-cfg/Makefile b/devel/ocaml-cfg/Makefile index 9e3eb5af37fd..993f312324df 100644 --- a/devel/ocaml-cfg/Makefile +++ b/devel/ocaml-cfg/Makefile @@ -33,7 +33,6 @@ COPYTREE_SHARE= ${SH} -c '(${FIND} -d $$0 $$2 | ${CPIO} -dumpl $$1 >/dev/null \ ${FIND} $$1/ -type f -exec ${CHMOD} ${SHAREMODE} {} \;' -- .include <bsd.port.pre.mk> -.include "${PORTSDIR}/lang/ocaml/bsd.ocaml.mk" post-extract: # For nonstandard prefixes diff --git a/devel/ocaml-lacaml/Makefile b/devel/ocaml-lacaml/Makefile index b15e36c399f7..2e3523ae2501 100644 --- a/devel/ocaml-lacaml/Makefile +++ b/devel/ocaml-lacaml/Makefile @@ -40,7 +40,6 @@ COPYTREE_SHARE= ${SH} -c '(${FIND} -d $$0 $$2 | ${CPIO} -dumpl $$1 >/dev/null \ ${FIND} $$1/ -type f -exec ${CHMOD} ${SHAREMODE} {} \;' -- .include <bsd.port.pre.mk> -.include "${PORTSDIR}/lang/ocaml/bsd.ocaml.mk" post-extract: # diff --git a/devel/ocaml-pcre/Makefile b/devel/ocaml-pcre/Makefile index 66a77a08da2d..a31919e189bf 100644 --- a/devel/ocaml-pcre/Makefile +++ b/devel/ocaml-pcre/Makefile @@ -40,6 +40,4 @@ post-install: @(cd ${WRKSRC}/examples && ${COPYTREE_SHARE} \* ${EXAMPLESDIR}/) .endif -.include <bsd.port.pre.mk> -.include "${PORTSDIR}/lang/ocaml/bsd.ocaml.mk" -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/devel/ocaml-pomap/Makefile b/devel/ocaml-pomap/Makefile index d7eee5680e2f..7a1d0b6526da 100644 --- a/devel/ocaml-pomap/Makefile +++ b/devel/ocaml-pomap/Makefile @@ -33,7 +33,6 @@ COPYTREE_SHARE= ${SH} -c '(${FIND} -d $$0 $$2 | ${CPIO} -dumpl $$1 >/dev/null \ ${FIND} $$1/ -type f -exec ${CHMOD} ${SHAREMODE} {} \;' -- .include <bsd.port.pre.mk> -.include "${PORTSDIR}/lang/ocaml/bsd.ocaml.mk" post-extract: # For nonstandard prefixes diff --git a/devel/ocaml-res/Makefile b/devel/ocaml-res/Makefile index 5d6d74ab7dfb..f08718d20f23 100644 --- a/devel/ocaml-res/Makefile +++ b/devel/ocaml-res/Makefile @@ -33,7 +33,6 @@ COPYTREE_SHARE= ${SH} -c '(${FIND} -d $$0 $$2 | ${CPIO} -dumpl $$1 >/dev/null \ ${FIND} $$1/ -type f -exec ${CHMOD} ${SHAREMODE} {} \;' -- .include <bsd.port.pre.mk> -.include "${PORTSDIR}/lang/ocaml/bsd.ocaml.mk" post-extract: # For nonstandard prefixes diff --git a/devel/ocaml-sdl/Makefile b/devel/ocaml-sdl/Makefile index 27961a703c38..1460abf69c1b 100644 --- a/devel/ocaml-sdl/Makefile +++ b/devel/ocaml-sdl/Makefile @@ -40,7 +40,6 @@ INFO= ocamlsdl .endif .include <bsd.port.pre.mk> -.include "${PORTSDIR}/lang/ocaml/bsd.ocaml.mk" post-install: .if !defined(NOPORTDOCS) diff --git a/devel/ocaml-sexplib/Makefile b/devel/ocaml-sexplib/Makefile index 57dbd7c2e9fc..8ec611b929a9 100644 --- a/devel/ocaml-sexplib/Makefile +++ b/devel/ocaml-sexplib/Makefile @@ -22,7 +22,6 @@ USE_OCAML_FINDLIB=yes DOCSDIR= ${PREFIX}/share/doc/ocaml/${PORTNAME} .include <bsd.port.pre.mk> -.include "${PORTSDIR}/lang/ocaml/bsd.ocaml.mk" post-extract: # For nonstandard prefixes diff --git a/devel/ocaml-xstr/Makefile b/devel/ocaml-xstr/Makefile index 6b35c17ae54a..a301c997f7c1 100644 --- a/devel/ocaml-xstr/Makefile +++ b/devel/ocaml-xstr/Makefile @@ -20,6 +20,4 @@ USE_GMAKE= yes USE_OCAML= yes USE_OCAML_FINDLIB=yes -.include <bsd.port.pre.mk> -.include "${PORTSDIR}/lang/ocaml/bsd.ocaml.mk" -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/devel/ocaml-xstrp4/Makefile b/devel/ocaml-xstrp4/Makefile index a4929d9a7e45..b3d575ae92e1 100644 --- a/devel/ocaml-xstrp4/Makefile +++ b/devel/ocaml-xstrp4/Makefile @@ -22,7 +22,6 @@ USE_OCAML_FINDLIB=yes EXAMPLESDIR= ${PREFIX}/share/examples/ocaml/${PORTNAME} .include <bsd.port.pre.mk> -.include "${PORTSDIR}/lang/ocaml/bsd.ocaml.mk" post-extract: # For nonstandard prefixes diff --git a/devel/omake/Makefile b/devel/omake/Makefile index 00b292490909..092b9e1e1ab1 100644 --- a/devel/omake/Makefile +++ b/devel/omake/Makefile @@ -27,7 +27,6 @@ MAN1= omake-base.1 omake-doc.1 omake-language.1 omake-options.1 \ omake-shell.1 omake-system.1 omake.1 osh.1 .include <bsd.port.pre.mk> -.include "${PORTSDIR}/lang/ocaml/bsd.ocaml.mk" .if ${OSVERSION} > 500000 && exists(${LOCALBASE}/lib/libreadline.so.5) LIB_DEPENDS+= readline.5:${PORTSDIR}/devel/readline diff --git a/devel/xfce4-dev-tools/Makefile b/devel/xfce4-dev-tools/Makefile index 4ba181e944f6..57896b4db1c5 100644 --- a/devel/xfce4-dev-tools/Makefile +++ b/devel/xfce4-dev-tools/Makefile @@ -25,6 +25,4 @@ post-patch: @${REINPLACE_CMD} -e '12s|^$$|PATH="$${PATH}:${LOCALBASE}/gnu-autotools/bin"|' \ ${WRKSRC}/scripts/xdt-autogen.in -.include <bsd.port.pre.mk> -.include "${PORTSDIR}/x11-wm/xfce4/bsd.xfce.mk" -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/editors/mousepad/Makefile b/editors/mousepad/Makefile index d6cfc8a3813f..9c1c788238a6 100644 --- a/editors/mousepad/Makefile +++ b/editors/mousepad/Makefile @@ -22,6 +22,4 @@ USE_GNOME= gnometarget gtk20 intltool intlhack pkgconfig USE_XFCE= configenv libgui USE_XLIB= yes -.include <bsd.port.pre.mk> -.include "${PORTSDIR}/x11-wm/xfce4/bsd.xfce.mk" -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/graphics/ocaml-lablgl/Makefile b/graphics/ocaml-lablgl/Makefile index f43b51c38ada..19b21d6aca4d 100644 --- a/graphics/ocaml-lablgl/Makefile +++ b/graphics/ocaml-lablgl/Makefile @@ -38,7 +38,6 @@ COPYTREE_SHARE= ${SH} -c '(${FIND} -d $$0 $$2 | ${CPIO} -dumpl $$1 >/dev/null \ ${FIND} $$1/ -type f -exec ${CHMOD} ${SHAREMODE} {} \;' -- .include <bsd.port.pre.mk> -.include "${PORTSDIR}/lang/ocaml/bsd.ocaml.mk" post-extract: @${CP} ${WRKSRC}/Makefile.config.freebsd ${WRKSRC}/Makefile.config diff --git a/lang/imp-interpreter/Makefile b/lang/imp-interpreter/Makefile index 4c02c749404f..417d09a55cff 100644 --- a/lang/imp-interpreter/Makefile +++ b/lang/imp-interpreter/Makefile @@ -29,7 +29,6 @@ PORTDOCS= README .endif .include <bsd.port.pre.mk> -.include "${PORTSDIR}/lang/ocaml/bsd.ocaml.mk" do-install: ${INSTALL_PROGRAM} ${WRKSRC}/main ${TARGETDIR}/bin/IMP diff --git a/lang/ocaml-camlidl/Makefile b/lang/ocaml-camlidl/Makefile index f8e03e11cc9f..1058b23f45c4 100644 --- a/lang/ocaml-camlidl/Makefile +++ b/lang/ocaml-camlidl/Makefile @@ -24,7 +24,6 @@ USE_OCAMLWASH= yes DOCSDIR= ${PREFIX}/share/doc/ocaml/${PORTNAME} .include <bsd.port.pre.mk> -.include "${PORTSDIR}/lang/ocaml/bsd.ocaml.mk" .if ${OSVERSION} < 500000 USE_GMAKE= yes diff --git a/mail/xfce4-mailwatch-plugin/Makefile b/mail/xfce4-mailwatch-plugin/Makefile index af2239d2ea44..95f67e5bd133 100644 --- a/mail/xfce4-mailwatch-plugin/Makefile +++ b/mail/xfce4-mailwatch-plugin/Makefile @@ -24,6 +24,4 @@ USE_GNOME= gnometarget gtk20 intltool intlhack pkgconfig USE_XFCE= configenv libgui libutil panel USE_XLIB= yes -.include <bsd.port.pre.mk> -.include "${PORTSDIR}/x11-wm/xfce4/bsd.xfce.mk" -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/misc/xfce4-appfinder/Makefile b/misc/xfce4-appfinder/Makefile index 3d01dfeb28b0..a854d07e6ea1 100644 --- a/misc/xfce4-appfinder/Makefile +++ b/misc/xfce4-appfinder/Makefile @@ -23,6 +23,4 @@ USE_GNOME= gnometarget gtk20 intltool intlhack pkgconfig USE_XFCE= configenv libgui USE_XLIB= yes -.include <bsd.port.pre.mk> -.include "${PORTSDIR}/x11-wm/xfce4/bsd.xfce.mk" -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/misc/xfce4-weather-plugin/Makefile b/misc/xfce4-weather-plugin/Makefile index f887051f23db..a8994da23ce9 100644 --- a/misc/xfce4-weather-plugin/Makefile +++ b/misc/xfce4-weather-plugin/Makefile @@ -23,6 +23,4 @@ USE_GNOME= gnometarget glib20 gtk20 intltool intlhack libxml2 pkgconfig USE_XFCE= configenv libgui libutil panel USE_XLIB= yes -.include <bsd.port.pre.mk> -.include "${PORTSDIR}/x11-wm/xfce4/bsd.xfce.mk" -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/misc/xfce4-wm-themes/Makefile b/misc/xfce4-wm-themes/Makefile index a638eaadbbf6..0f29a90dfd97 100644 --- a/misc/xfce4-wm-themes/Makefile +++ b/misc/xfce4-wm-themes/Makefile @@ -20,6 +20,4 @@ INSTALLS_ICONS= yes USE_BZIP2= yes USE_GNOME= gnometarget -.include <bsd.port.pre.mk> -.include "${PORTSDIR}/x11-wm/xfce4/bsd.xfce.mk" -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/multimedia/xfce4-media/Makefile b/multimedia/xfce4-media/Makefile index 36b70e57b547..65612d8421e1 100644 --- a/multimedia/xfce4-media/Makefile +++ b/multimedia/xfce4-media/Makefile @@ -33,7 +33,6 @@ OPTIONS= TAGLIB "Enable metadata editing" off \ STARTUP "Enable startup notification support" on .include <bsd.port.pre.mk> -.include "${PORTSDIR}/x11-wm/xfce4/bsd.xfce.mk" .if defined(WITH_TAGLIB) LIB_DEPENDS+= tag.5:${PORTSDIR}/audio/taglib diff --git a/multimedia/xfce4-xmms-plugin/Makefile b/multimedia/xfce4-xmms-plugin/Makefile index e836fd7d6e88..ac7a42b81f66 100644 --- a/multimedia/xfce4-xmms-plugin/Makefile +++ b/multimedia/xfce4-xmms-plugin/Makefile @@ -29,7 +29,6 @@ OPTIONS= XMMS "Enable xmms support" on \ AUDACIOUS "Enable audacious support" off .include <bsd.port.pre.mk> -.include "${PORTSDIR}/x11-wm/xfce4/bsd.xfce.mk" .if defined(WITH_BEEP) RUN_DEPENDS+= beep-media-player:${PORTSDIR}/multimedia/beep-media-player diff --git a/net-im/xfce4-messenger-plugin/Makefile b/net-im/xfce4-messenger-plugin/Makefile index dddb13299a71..caf5d947053b 100644 --- a/net-im/xfce4-messenger-plugin/Makefile +++ b/net-im/xfce4-messenger-plugin/Makefile @@ -24,6 +24,4 @@ USE_GNOME= gnometarget gtk20 intltool intlhack pkgconfig USE_XFCE= configenv libgui libutil panel USE_XLIB= yes -.include <bsd.port.pre.mk> -.include "${PORTSDIR}/x11-wm/xfce4/bsd.xfce.mk" -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/net/ocaml-netclient/Makefile b/net/ocaml-netclient/Makefile index 1774d498f36f..49f0b3d5539e 100644 --- a/net/ocaml-netclient/Makefile +++ b/net/ocaml-netclient/Makefile @@ -41,7 +41,6 @@ PORTDOCS= * .endif .include <bsd.port.pre.mk> -.include "${PORTSDIR}/lang/ocaml/bsd.ocaml.mk" post-extract: # For nonstandard prefixes diff --git a/print/advi/Makefile b/print/advi/Makefile index e7c405559df7..cf21a0cce6cc 100644 --- a/print/advi/Makefile +++ b/print/advi/Makefile @@ -45,6 +45,4 @@ post-extract: -e 's,install -m 755,\$${BSD_INSTALL_PROGRAM},' \ ${WRKSRC}/Makefile -.include <bsd.port.pre.mk> -.include "${PORTSDIR}/lang/ocaml/bsd.ocaml.mk" -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/print/xfce4-print/Makefile b/print/xfce4-print/Makefile index 3f9d97b7004b..40f070399a9b 100644 --- a/print/xfce4-print/Makefile +++ b/print/xfce4-print/Makefile @@ -30,7 +30,6 @@ OPTIONS= LPR "Use lpr as printing system" on \ LETTER "Use letter paper format instead of A4" off .include <bsd.port.pre.mk> -.include "${PORTSDIR}/x11-wm/xfce4/bsd.xfce.mk" .if defined(WITH_CUPS) CONFIGURE_ARGS+=--enable-cups diff --git a/security/ocaml-cryptgps/Makefile b/security/ocaml-cryptgps/Makefile index 229b4dd2180a..36467ae44227 100644 --- a/security/ocaml-cryptgps/Makefile +++ b/security/ocaml-cryptgps/Makefile @@ -29,7 +29,6 @@ DOCSDIR= ${PREFIX}/share/doc/ocaml/${PORTNAME} .endif .include <bsd.port.pre.mk> -.include "${PORTSDIR}/lang/ocaml/bsd.ocaml.mk" post-extract: # For nonstandard prefixes diff --git a/sysutils/thunar-volman-plugin/Makefile b/sysutils/thunar-volman-plugin/Makefile index 4ae106c95b83..0f8d0dcc3040 100644 --- a/sysutils/thunar-volman-plugin/Makefile +++ b/sysutils/thunar-volman-plugin/Makefile @@ -25,6 +25,4 @@ USE_GNOME= gnometarget gtk20 intltool intlhack pkgconfig USE_XFCE= configenv libexo thunar USE_XLIB= yes -.include <bsd.port.pre.mk> -.include "${PORTSDIR}/x11-wm/xfce4/bsd.xfce.mk" -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/sysutils/xfce4-battery-plugin/Makefile b/sysutils/xfce4-battery-plugin/Makefile index 7eba212fbf0d..410fa80c92d2 100644 --- a/sysutils/xfce4-battery-plugin/Makefile +++ b/sysutils/xfce4-battery-plugin/Makefile @@ -28,6 +28,4 @@ USE_GNOME= gnometarget gtk20 intltool intlhack pkgconfig USE_XFCE= configenv panel USE_XLIB= yes -.include <bsd.port.pre.mk> -.include "${PORTSDIR}/x11-wm/xfce4/bsd.xfce.mk" -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/sysutils/xfce4-cpugraph-plugin/Makefile b/sysutils/xfce4-cpugraph-plugin/Makefile index 7c6fdcfbcda5..b7505e904ead 100644 --- a/sysutils/xfce4-cpugraph-plugin/Makefile +++ b/sysutils/xfce4-cpugraph-plugin/Makefile @@ -23,6 +23,4 @@ USE_GNOME= gnometarget gtk20 intltool intlhack pkgconfig USE_XFCE= configenv panel USE_XLIB= yes -.include <bsd.port.pre.mk> -.include "${PORTSDIR}/x11-wm/xfce4/bsd.xfce.mk" -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/sysutils/xfce4-fsguard-plugin/Makefile b/sysutils/xfce4-fsguard-plugin/Makefile index c476e0d91037..3fe4d19b351d 100644 --- a/sysutils/xfce4-fsguard-plugin/Makefile +++ b/sysutils/xfce4-fsguard-plugin/Makefile @@ -23,6 +23,4 @@ USE_GNOME= gnometarget gtk20 intltool intlhack pkgconfig USE_XFCE= configenv panel USE_XLIB= yes -.include <bsd.port.pre.mk> -.include "${PORTSDIR}/x11-wm/xfce4/bsd.xfce.mk" -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/sysutils/xfce4-genmon-plugin/Makefile b/sysutils/xfce4-genmon-plugin/Makefile index 51b9e1db769d..584a66167582 100644 --- a/sysutils/xfce4-genmon-plugin/Makefile +++ b/sysutils/xfce4-genmon-plugin/Makefile @@ -22,6 +22,4 @@ USE_GNOME= gnometarget gtk20 intltool intlhack pkgconfig USE_XFCE= configenv panel USE_XLIB= yes -.include <bsd.port.pre.mk> -.include "${PORTSDIR}/x11-wm/xfce4/bsd.xfce.mk" -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/sysutils/xfce4-mcs-manager/Makefile b/sysutils/xfce4-mcs-manager/Makefile index 6821ee13e321..c72650a46b2f 100644 --- a/sysutils/xfce4-mcs-manager/Makefile +++ b/sysutils/xfce4-mcs-manager/Makefile @@ -24,6 +24,4 @@ USE_GNOME= gnomehack gnometarget gtk20 intltool intlhack pkgconfig USE_XFCE= configenv libgui libmcs USE_XLIB= yes -.include <bsd.port.pre.mk> -.include "${PORTSDIR}/x11-wm/xfce4/bsd.xfce.mk" -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/sysutils/xfce4-mcs-plugins/Makefile b/sysutils/xfce4-mcs-plugins/Makefile index 46fa1c78b734..bacdf2ffae35 100644 --- a/sysutils/xfce4-mcs-plugins/Makefile +++ b/sysutils/xfce4-mcs-plugins/Makefile @@ -26,6 +26,4 @@ USE_XLIB= yes post-patch: @${REINPLACE_CMD} -e 's|echo aout|echo elf|g' ${WRKSRC}/configure -.include <bsd.port.pre.mk> -.include "${PORTSDIR}/x11-wm/xfce4/bsd.xfce.mk" -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/sysutils/xfce4-minicmd-plugin/Makefile b/sysutils/xfce4-minicmd-plugin/Makefile index d99c613bffc9..aee3e6e7d346 100644 --- a/sysutils/xfce4-minicmd-plugin/Makefile +++ b/sysutils/xfce4-minicmd-plugin/Makefile @@ -22,6 +22,4 @@ USE_GNOME= gnometarget gtk20 intltool intlhack pkgconfig USE_XFCE= configenv panel USE_XLIB= yes -.include <bsd.port.pre.mk> -.include "${PORTSDIR}/x11-wm/xfce4/bsd.xfce.mk" -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/sysutils/xfce4-netload-plugin/Makefile b/sysutils/xfce4-netload-plugin/Makefile index e9e032548639..9c9cc6fb43ac 100644 --- a/sysutils/xfce4-netload-plugin/Makefile +++ b/sysutils/xfce4-netload-plugin/Makefile @@ -23,6 +23,4 @@ USE_GNOME= gnometarget gtk20 intltool intlhack pkgconfig USE_XFCE= configenv panel USE_XLIB= yes -.include <bsd.port.pre.mk> -.include "${PORTSDIR}/x11-wm/xfce4/bsd.xfce.mk" -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/sysutils/xfce4-systemload-plugin/Makefile b/sysutils/xfce4-systemload-plugin/Makefile index f5ffc533845f..aa1af89d4f7e 100644 --- a/sysutils/xfce4-systemload-plugin/Makefile +++ b/sysutils/xfce4-systemload-plugin/Makefile @@ -22,6 +22,4 @@ USE_GNOME= gnometarget gtk20 intltool intlhack pkgconfig USE_XFCE= configenv panel USE_XLIB= yes -.include <bsd.port.pre.mk> -.include "${PORTSDIR}/x11-wm/xfce4/bsd.xfce.mk" -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/sysutils/xfce4-utils/Makefile b/sysutils/xfce4-utils/Makefile index 70f05305e8a7..36766cfb7faa 100644 --- a/sysutils/xfce4-utils/Makefile +++ b/sysutils/xfce4-utils/Makefile @@ -28,7 +28,6 @@ USE_XLIB= yes OPTIONS= DBUS "Enable D-BUS support" on .include <bsd.port.pre.mk> -.include "${PORTSDIR}/x11-wm/xfce4/bsd.xfce.mk" .if !defined(WITHOUT_DBUS) LIB_DEPENDS+= dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib diff --git a/sysutils/xfce4-wavelan-plugin/Makefile b/sysutils/xfce4-wavelan-plugin/Makefile index 7b18f3abe932..6f7a5e84da8f 100644 --- a/sysutils/xfce4-wavelan-plugin/Makefile +++ b/sysutils/xfce4-wavelan-plugin/Makefile @@ -21,6 +21,4 @@ USE_GNOME= gnometarget gtk20 intltool intlhack pkgconfig USE_XFCE= configenv panel USE_XLIB= yes -.include <bsd.port.pre.mk> -.include "${PORTSDIR}/x11-wm/xfce4/bsd.xfce.mk" -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/textproc/xfce4-dict-plugin/Makefile b/textproc/xfce4-dict-plugin/Makefile index 2de2419c4e1b..0f4e0c0d8200 100644 --- a/textproc/xfce4-dict-plugin/Makefile +++ b/textproc/xfce4-dict-plugin/Makefile @@ -23,6 +23,4 @@ USE_GNOME= gnometarget gtk20 intltool intlhack pkgconfig USE_XFCE= configenv panel USE_XLIB= yes -.include <bsd.port.pre.mk> -.include "${PORTSDIR}/x11-wm/xfce4/bsd.xfce.mk" -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/www/xfce4-smartbookmark-plugin/Makefile b/www/xfce4-smartbookmark-plugin/Makefile index cdb5bd22dbf6..971c2ce12c58 100644 --- a/www/xfce4-smartbookmark-plugin/Makefile +++ b/www/xfce4-smartbookmark-plugin/Makefile @@ -22,6 +22,4 @@ USE_GNOME= gnometarget gtk20 intltool intlhack pkgconfig USE_XFCE= configenv libgui libutil panel USE_XLIB= yes -.include <bsd.port.pre.mk> -.include "${PORTSDIR}/x11-wm/xfce4/bsd.xfce.mk" -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/x11-clocks/xfce4-datetime-plugin/Makefile b/x11-clocks/xfce4-datetime-plugin/Makefile index cc54a2910970..4434b5fb2090 100644 --- a/x11-clocks/xfce4-datetime-plugin/Makefile +++ b/x11-clocks/xfce4-datetime-plugin/Makefile @@ -22,6 +22,4 @@ USE_GNOME= gnometarget gtk20 intltool intlhack pkgconfig USE_XFCE= configenv libgui libutil panel USE_XLIB= yes -.include <bsd.port.pre.mk> -.include "${PORTSDIR}/x11-wm/xfce4/bsd.xfce.mk" -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/x11-clocks/xfce4-timer-plugin/Makefile b/x11-clocks/xfce4-timer-plugin/Makefile index 009acb7899d8..142364e7876a 100644 --- a/x11-clocks/xfce4-timer-plugin/Makefile +++ b/x11-clocks/xfce4-timer-plugin/Makefile @@ -23,6 +23,4 @@ USE_GNOME= gnometarget gtk20 intltool intlhack pkgconfig USE_XFCE= configenv libgui libutil panel USE_XLIB= yes -.include <bsd.port.pre.mk> -.include "${PORTSDIR}/x11-wm/xfce4/bsd.xfce.mk" -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/x11-fm/thunar/Makefile b/x11-fm/thunar/Makefile index da7846cd7754..2303753d2367 100644 --- a/x11-fm/thunar/Makefile +++ b/x11-fm/thunar/Makefile @@ -144,6 +144,4 @@ post-patch: post-install: @-update-desktop-database -#keep this here -.include "${PORTSDIR}/x11-wm/xfce4/bsd.xfce.mk" .include <bsd.port.post.mk> diff --git a/x11-themes/gtk-xfce-engine/Makefile b/x11-themes/gtk-xfce-engine/Makefile index 25cd4ae58bf0..358fe7fe4490 100644 --- a/x11-themes/gtk-xfce-engine/Makefile +++ b/x11-themes/gtk-xfce-engine/Makefile @@ -23,6 +23,4 @@ USE_XLIB= yes post-patch: @${REINPLACE_CMD} -e 's|echo aout|echo elf|g' ${WRKSRC}/configure -.include <bsd.port.pre.mk> -.include "${PORTSDIR}/x11-wm/xfce4/bsd.xfce.mk" -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/x11-themes/xfce4-icon-theme/Makefile b/x11-themes/xfce4-icon-theme/Makefile index 66b955437be5..c4cbe0890a0a 100644 --- a/x11-themes/xfce4-icon-theme/Makefile +++ b/x11-themes/xfce4-icon-theme/Makefile @@ -24,6 +24,4 @@ USE_XFCE= configenv USE_XLIB= yes WANT_GNOME= yes -.include <bsd.port.pre.mk> -.include "${PORTSDIR}/x11-wm/xfce4/bsd.xfce.mk" -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/x11-toolkits/libxfce4gui/Makefile b/x11-toolkits/libxfce4gui/Makefile index e50ca0d7938d..c00e0b1f3a22 100644 --- a/x11-toolkits/libxfce4gui/Makefile +++ b/x11-toolkits/libxfce4gui/Makefile @@ -28,7 +28,6 @@ USE_XLIB= yes OPTIONS= GTKDOC "install the library documentation" off .include <bsd.port.pre.mk> -.include "${PORTSDIR}/x11-wm/xfce4/bsd.xfce.mk" .if defined(WITH_GTKDOC) BUILD_DEPENDS+= gtkdocize:${PORTSDIR}/textproc/gtk-doc diff --git a/x11-toolkits/ocaml-lablgtk/Makefile b/x11-toolkits/ocaml-lablgtk/Makefile index d78c265b6918..60f91d523e86 100644 --- a/x11-toolkits/ocaml-lablgtk/Makefile +++ b/x11-toolkits/ocaml-lablgtk/Makefile @@ -37,7 +37,6 @@ MASTERPORT= ${PORTSDIR}/devel/ocaml-camlidl PATTERN= [[:space:]]*(do|then)?[[:space:]]*)cp([[:space:]] .include <bsd.port.pre.mk> -.include "${PORTSDIR}/lang/ocaml/bsd.ocaml.mk" .if defined(WITHOUT_GL) PLIST_SUB+= GL="@comment " diff --git a/x11-toolkits/ocaml-lablgtk2/Makefile b/x11-toolkits/ocaml-lablgtk2/Makefile index e97eca71fc44..d26d123f5a0a 100644 --- a/x11-toolkits/ocaml-lablgtk2/Makefile +++ b/x11-toolkits/ocaml-lablgtk2/Makefile @@ -41,7 +41,6 @@ CONFIGURE_ARGS= --prefix=${PREFIX} --with-libdir=${PREFIX}/lib/ocaml PATTERN= [[:space:]]*(do|then)?[[:space:]]*)cp([[:space:]] .include <bsd.port.pre.mk> -.include "${PORTSDIR}/lang/ocaml/bsd.ocaml.mk" .if (exists(${LOCALBASE}/bin/lablgl) && exists(${LOCALBASE}/libdata/pkgconfig/gtkgl-2.0.pc)) || defined(WITH_GTKTL) CONFIGURE_ARGS+= --with-gl diff --git a/x11-wm/xfce4-desktop/Makefile b/x11-wm/xfce4-desktop/Makefile index 8810a26c7c00..4af0eab2a400 100644 --- a/x11-wm/xfce4-desktop/Makefile +++ b/x11-wm/xfce4-desktop/Makefile @@ -28,7 +28,8 @@ USE_LDCONFIG= yes USE_XFCE= configenv libgui libmcs libutil mcsmanager panel USE_XLIB= yes -OPTIONS= THUNAR "Enable thunar support" on +OPTIONS= FAM "Enable FAM support" on \ + THUNAR "Enable thunar support" on MAN1= xfdesktop.1 @@ -41,7 +42,9 @@ USE_XFCE+= libexo thunar CONFIGURE_ARGS+=--disable-thunar-vfs --disable-thunarx --disable-exo .endif -.include "${PORTSDIR}/x11-wm/xfce4/bsd.xfce.mk" +.if !defined(WITHOUT_FAM) +.else +.endif post-patch: @${REINPLACE_CMD} -e 's|echo aout|echo elf|g' ${WRKSRC}/configure diff --git a/x11-wm/xfce4-panel/Makefile b/x11-wm/xfce4-panel/Makefile index 38b8f42b797a..66c7cd579bf4 100644 --- a/x11-wm/xfce4-panel/Makefile +++ b/x11-wm/xfce4-panel/Makefile @@ -29,7 +29,6 @@ OPTIONS= GTKDOC "install the library documentation" off \ STARTUP "Enable startup notification support" on .include <bsd.port.pre.mk> -.include "${PORTSDIR}/x11-wm/xfce4/bsd.xfce.mk" .if defined(WITH_GTKDOC) BUILD_DEPENDS+= gtkdocize:${PORTSDIR}/textproc/gtk-doc diff --git a/x11-wm/xfce4-session/Makefile b/x11-wm/xfce4-session/Makefile index 3fb94e4d6116..b0e41a3a22db 100644 --- a/x11-wm/xfce4-session/Makefile +++ b/x11-wm/xfce4-session/Makefile @@ -32,6 +32,4 @@ MAN1= xfce4-session.1 xfce4-session-logout.1 post-patch: @${REINPLACE_CMD} -e 's|echo aout|echo elf|g' ${WRKSRC}/configure -.include <bsd.port.pre.mk> -.include "${PORTSDIR}/x11-wm/xfce4/bsd.xfce.mk" -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/x11-wm/xfce4-wm/Makefile b/x11-wm/xfce4-wm/Makefile index 903e7dace3c9..46e45a06a1c2 100644 --- a/x11-wm/xfce4-wm/Makefile +++ b/x11-wm/xfce4-wm/Makefile @@ -30,7 +30,6 @@ OPTIONS= COMPOSITE "Support the experimental X11 Composite extension" on \ STARTUP "Enable startup notification support" on .include <bsd.port.pre.mk> -.include "${PORTSDIR}/x11-wm/xfce4/bsd.xfce.mk" .if !defined(WITHOUT_COMPOSITE) CONFIGURE_ARGS+=--enable-compositor diff --git a/x11/Terminal/Makefile b/x11/Terminal/Makefile index 4c95e70110d2..d1ce0449aa12 100644 --- a/x11/Terminal/Makefile +++ b/x11/Terminal/Makefile @@ -32,7 +32,6 @@ OPTIONS= DBUS "Enable D-BUS support" on \ MAN1= Terminal.1 .include <bsd.port.pre.mk> -.include "${PORTSDIR}/x11-wm/xfce4/bsd.xfce.mk" .if !defined(WITHOUT_DBUS) LIB_DEPENDS+= dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib diff --git a/x11/libexo/Makefile b/x11/libexo/Makefile index 92f1934f2a8a..3bd95126d61f 100644 --- a/x11/libexo/Makefile +++ b/x11/libexo/Makefile @@ -43,7 +43,6 @@ OPTIONS= HAL "Enable HAL support" on \ MAN1= exo-csource.1 exo-open.1 .include <bsd.port.pre.mk> -.include "${PORTSDIR}/x11-wm/xfce4/bsd.xfce.mk" .if defined(WITH_GTKDOC) BUILD_DEPENDS+= gtkdocize:${PORTSDIR}/textproc/gtk-doc diff --git a/x11/libxfce4mcs/Makefile b/x11/libxfce4mcs/Makefile index 5321e278c0ca..95edaac3cc9f 100644 --- a/x11/libxfce4mcs/Makefile +++ b/x11/libxfce4mcs/Makefile @@ -28,7 +28,6 @@ OPTIONS= GTKDOC "install the library documentation" off \ STARTUP "Enable startup notification support" on .include <bsd.port.pre.mk> -.include "${PORTSDIR}/x11-wm/xfce4/bsd.xfce.mk" .if defined(WITH_GTKDOC) BUILD_DEPENDS+= gtkdocize:${PORTSDIR}/textproc/gtk-doc diff --git a/x11/libxfce4util/Makefile b/x11/libxfce4util/Makefile index 7aea8b5f3852..f48b6dc77e19 100644 --- a/x11/libxfce4util/Makefile +++ b/x11/libxfce4util/Makefile @@ -31,6 +31,4 @@ CONFIGURE_ARGS+=--disable-gtk-doc PLIST_SUB+= GTK_DOC="@comment " .endif -.include <bsd.port.pre.mk> -.include "${PORTSDIR}/x11-wm/xfce4/bsd.xfce.mk" -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/x11/xfce4-clipman-plugin/Makefile b/x11/xfce4-clipman-plugin/Makefile index 2ae3d75b483b..1dda6c1e9058 100644 --- a/x11/xfce4-clipman-plugin/Makefile +++ b/x11/xfce4-clipman-plugin/Makefile @@ -23,6 +23,4 @@ USE_GNOME= gnometarget gtk20 intltool intlhack pkgconfig USE_XFCE= configenv panel libgui libutil USE_XLIB= yes -.include <bsd.port.pre.mk> -.include "${PORTSDIR}/x11-wm/xfce4/bsd.xfce.mk" -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/x11/xfce4-quicklauncher-plugin/Makefile b/x11/xfce4-quicklauncher-plugin/Makefile index c26485f88b8a..34151c64f472 100644 --- a/x11/xfce4-quicklauncher-plugin/Makefile +++ b/x11/xfce4-quicklauncher-plugin/Makefile @@ -24,6 +24,4 @@ USE_GNOME= gnometarget gtk20 intltool intlhack pkgconfig USE_XFCE= configenv panel USE_XLIB= yes -.include <bsd.port.pre.mk> -.include "${PORTSDIR}/x11-wm/xfce4/bsd.xfce.mk" -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/x11/xfce4-screenshooter-plugin/Makefile b/x11/xfce4-screenshooter-plugin/Makefile index dae235aa7184..a27a95fef767 100644 --- a/x11/xfce4-screenshooter-plugin/Makefile +++ b/x11/xfce4-screenshooter-plugin/Makefile @@ -22,6 +22,4 @@ USE_GNOME= gnometarget gtk20 intltool intlhack pkgconfig USE_XFCE= configenv panel USE_XLIB= yes -.include <bsd.port.pre.mk> -.include "${PORTSDIR}/x11-wm/xfce4/bsd.xfce.mk" -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/x11/xfce4-taskmanager/Makefile b/x11/xfce4-taskmanager/Makefile index 5c09aac8cbb9..9c891ef1a23d 100644 --- a/x11/xfce4-taskmanager/Makefile +++ b/x11/xfce4-taskmanager/Makefile @@ -7,7 +7,7 @@ PORTNAME= xfce4-taskmanager PORTVERSION= 0.4.0.r2 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= x11 xfce MASTER_SITES= http://xfce4-taskmanager.nebulon.de/ DISTNAME= ${PORTNAME}-${PORTVERSION:S/.r/-rc/} @@ -30,6 +30,4 @@ USE_XLIB= yes post-patch: @${REINPLACE_CMD} -e 's|linux|freebsd|g; s|^CFLAGS = |&-lkvm -lm |' ${WRKSRC}/src/Makefile.in -.include <bsd.port.pre.mk> -.include "${PORTSDIR}/x11-wm/xfce4/bsd.xfce.mk" -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/x11/xfce4-xfapplet-plugin/Makefile b/x11/xfce4-xfapplet-plugin/Makefile index f449fe5d0ece..09b046ab5ffd 100644 --- a/x11/xfce4-xfapplet-plugin/Makefile +++ b/x11/xfce4-xfapplet-plugin/Makefile @@ -24,6 +24,4 @@ USE_GNOME= gnometarget gtk20 intltool intlhack orbit2 pkgconfig USE_XFCE= configenv libgui libutil panel USE_XLIB= yes -.include <bsd.port.pre.mk> -.include "${PORTSDIR}/x11-wm/xfce4/bsd.xfce.mk" -.include <bsd.port.post.mk> +.include <bsd.port.mk> |