diff options
| author | ashish <ashish@FreeBSD.org> | 2014-04-22 19:21:12 +0800 |
|---|---|---|
| committer | ashish <ashish@FreeBSD.org> | 2014-04-22 19:21:12 +0800 |
| commit | e96b308a41c78f4e1c7cf5f33d93019cfd6b9630 (patch) | |
| tree | bf1e55d6dde516c32c724dc4a356279d98454292 /editors/emacs | |
| parent | 7fc3137ac7a64eb02829cd59ae6ef22f69625b5d (diff) | |
| download | freebsd-ports-gnome-e96b308a41c78f4e1c7cf5f33d93019cfd6b9630.tar.gz freebsd-ports-gnome-e96b308a41c78f4e1c7cf5f33d93019cfd6b9630.tar.zst freebsd-ports-gnome-e96b308a41c78f4e1c7cf5f33d93019cfd6b9630.zip | |
- Fix CONFLICTS to silence portlint warnings
- Add 'USES=shebangfix' to fix perl path of grep-changelog.[1][2]
- Convert 'USE_XZ' to 'USES=tar.xz'.[1][2]
- Convert to new LIB_DEPENDS format.[1][2]
- Remove deprecated and needless MAN1 setting.[1][2]
PR: ports/188583[1], ports/188720[2]
Submitted by: swills[1], Yasuhiro KIMURA <yasu@utahmime.org>[2]
Diffstat (limited to 'editors/emacs')
| -rw-r--r-- | editors/emacs/Makefile | 34 |
1 files changed, 16 insertions, 18 deletions
diff --git a/editors/emacs/Makefile b/editors/emacs/Makefile index 7b6bbd94871d..f3896c7b785f 100644 --- a/editors/emacs/Makefile +++ b/editors/emacs/Makefile @@ -21,23 +21,21 @@ LICENSE_FILE= ${WRKSRC}/COPYING MAKE_JOBS_SAFE= yes -CONFLICTS= emacs-19.* emacs21-* emacs22-* emacs23-* \ +CONFLICTS= emacs-19.* emacs21-[0-9]* emacs22-[0-9]* emacs23-[0-9]* \ xemacs-[0-9]* xemacs-devel-[0-9]* \ xemacs-mule-[0-9]* xemacs-devel-mule-[0-9]* \ - emacs-devel-* + emacs-devel-[0-9]* EMACS_VER= 24.3 GNU_CONFIGURE= yes -USES= ncurses gmake pkgconfig -USE_XZ= yes +USES= ncurses gmake pkgconfig shebangfix tar:xz CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib INFO_PATH= ${DATADIR_REL}/info CONFIGURE_ARGS= --localstatedir=/var --without-compress-info WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} +SHEBANG_FILES= lib-src/grep-changelog -MAN1= ctags.1 ebrowse.1 emacs.1 emacsclient.1 etags.1 \ - grep-changelog.1 PLIST_SUB= EMACS_VER=${EMACS_VER} INFODIR=${INFO_PATH} EMACS_DIRS= ${DATADIR}/${EMACS_VER}/leim ${DATADIR}/${EMACS_VER}/lisp ${DATADIR}/${EMACS_VER}/src \ @@ -86,14 +84,14 @@ CANNA_CONFIGURE_ON= --with-canna \ --with-canna-libraries=${LOCALBASE}/lib CANNA_PATCH_SITES= http://distfiles.pirateparty.in/%SUBDIR%/ ${MASTER_SITE_LOCAL} CANNA_PATCHFILES= emacs24.3canna-20130321.diff.gz -CANNA_LIB_DEPENDS= canna:${PORTSDIR}/japanese/canna-lib +CANNA_LIB_DEPENDS= libcanna.so:${PORTSDIR}/japanese/canna-lib SOUND_CONFIGURE_WITH= sound -DBUS_LIB_DEPENDS= dbus-1:${PORTSDIR}/devel/dbus +DBUS_LIB_DEPENDS= libdbus-1.so:${PORTSDIR}/devel/dbus DBUS_CONFIGURE_WITH= dbus -GNUTLS_LIB_DEPENDS= gnutls:${PORTSDIR}/security/gnutls +GNUTLS_LIB_DEPENDS= libgnutls.so:${PORTSDIR}/security/gnutls GNUTLS_CONFIGURE_WITH= gnutls XML_USE= GNOME=libxml2 @@ -108,7 +106,7 @@ GTK2_CONFIGURE_ON= --with-x-toolkit=gtk2 GTK3_USE= GNOME=gtk30 GTK3_CONFIGURE_ON= --with-x-toolkit=gtk3 -XAW3D_LIB_DEPENDS= Xaw3d:${PORTSDIR}/x11-toolkits/Xaw3d +XAW3D_LIB_DEPENDS= libXaw3d.so:${PORTSDIR}/x11-toolkits/Xaw3d XAW3D_CONFIGURE_ON= --with-x-toolkit=athena XAW_USE= XORG=xaw @@ -121,32 +119,32 @@ SCROLLBARS_CONFIGURE_WITH= toolkit-scroll-bars SYNC_INPUT_CONFIGURE_WITH= sync-input -JPEG_LIB_DEPENDS= jpeg:${PORTSDIR}/graphics/jpeg +JPEG_LIB_DEPENDS= libjpeg.so:${PORTSDIR}/graphics/jpeg JPEG_CONFIGURE_WITH= jpeg -TIFF_LIB_DEPENDS= tiff:${PORTSDIR}/graphics/tiff +TIFF_LIB_DEPENDS= libtiff.so:${PORTSDIR}/graphics/tiff TIFF_CONFIGURE_WITH= tiff -GIF_LIB_DEPENDS= gif:${PORTSDIR}/graphics/giflib +GIF_LIB_DEPENDS= libgif.so:${PORTSDIR}/graphics/giflib GIF_CONFIGURE_WITH= gif -PNG_LIB_DEPENDS+= png15:${PORTSDIR}/graphics/png +PNG_LIB_DEPENDS+= libpng15.so:${PORTSDIR}/graphics/png PNG_CONFIGURE_WITH= png XPM_USE= XORG=xpm XPM_CONFIGURE_WITH= xpm XFT_USE= XORG=xft -XFT_LIB_DEPENDS= freetype:${PORTSDIR}/print/freetype2 +XFT_LIB_DEPENDS= libfreetype.so:${PORTSDIR}/print/freetype2 XFT_CONFIGURE_WITH= xft -M17N_LIB_DEPENDS= m17n:${PORTSDIR}/devel/m17n-lib +M17N_LIB_DEPENDS= libm17n.so:${PORTSDIR}/devel/m17n-lib M17N_CONFIGURE_WITH= m17n-flt -OTF_LIB_DEPENDS= otf:${PORTSDIR}/print/libotf +OTF_LIB_DEPENDS= libotf.so:${PORTSDIR}/print/libotf OTF_CONFIGURE_WITH= libotf -MAGICK_LIB_DEPENDS= MagickCore:${PORTSDIR}/graphics/ImageMagick +MAGICK_LIB_DEPENDS= libMagickCore.so:${PORTSDIR}/graphics/ImageMagick MAGICK_CONFIGURE_WITH= imagemagick GSETTINGS_USE= gnome=glib20 |