- Update to git revision af40b76

- Switch to GitHub for MASTER_SITES
- Remove USE_AUTOTOOLS, and move it to USES instead
- Cosmetic changes to Makefile, and pkg-plist
- Remove pkg-install/pkg-deinstall scripts, not needed anymore

PR:		204842
Submitted by:	Joseph Mingrone <jrm at ftfl.ca>
This commit is contained in:
Ashish SHUKLA 2015-11-30 00:24:59 +00:00
parent 2885f1117a
commit 0d03e1ae70
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=402637
5 changed files with 4124 additions and 4065 deletions

View file

@ -3,11 +3,8 @@
PORTNAME= emacs
PORTVERSION= ${EMACS_VER}.${EMACS_REV}
DISTVERSIONSUFFIX= .${GIT_REV}
PORTEPOCH= 2
CATEGORIES= editors ipv6
MASTER_SITES= http://distfiles.pirateparty.in/ashish/ \
LOCAL/ashish
PKGNAMESUFFIX= -devel
MAINTAINER= ashish@FreeBSD.org
@ -18,81 +15,80 @@ LICENSE_FILE= ${WRKSRC}/COPYING
BROKEN_FreeBSD_9= does not build
BROKEN_sparc64= fails to compile at bootstrap phase
BROKEN_ia64= Emacs 24.X does not currently build on ia64
CONFLICTS= emacs-19.* emacs21-[0-9]* emacs22-[0-9]* emacs23-[0-9]* \
emacs24-[0-9]* xemacs-[0-9]* xemacs-devel-[0-9]* \
xemacs-mule-[0-9]* xemacs-devel-mule-[0-9]* \
emacs-nox11-[0-9]*
USE_GITHUB= yes
GH_ACCOUNT= emacs-mirror
GH_TAGNAME= af40b76
EMACS_VER= 25.0.50
EMACS_REV= 20150810
GIT_REV= a9bb9d8f
EMACS_REV= 20151126
GNU_CONFIGURE= yes
USES= cpe gmake makeinfo ncurses pkgconfig shebangfix tar:xz
USES= autoreconf cpe gmake makeinfo ncurses pkgconfig tar:xz
CPPFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib
INFO_PATH= ${DATADIR_REL}/info
USE_AUTOTOOLS= autoconf:env aclocal:env automake:env autoheader:env
WRKSRC= ${WRKDIR}/${PORTNAME}-${GH_TAGNAME}
CPE_VENDOR= gnu
CPE_VERSION= ${EMACS_VER}
SUB_FILES= pkg-install
SUB_LIST+= ARCHLIBDIR=${PREFIX}/libexec/emacs/${EMACS_VER}/${CONFIGURE_TARGET}
# Append --without-compress-install to prevent emacs from compressing info
# which bsd.port.mk is not able to detect
CONFIGURE_ARGS= --localstatedir=/var --without-compress-install
EMACS_DIRS= ${DATADIR}/${EMACS_VER}/lisp ${DATADIR}/${EMACS_VER}/src \
${PREFIX}/libexec/${PORTNAME}
CONFIGURE_ARGS= --localstatedir=/var --with-gameuser=games:games
PLIST_SUB= EMACS_VER=${EMACS_VER} GNU_HOST=${CONFIGURE_TARGET}
MAKE_ENV= LC_ALL=C
INFO= ada-mode auth autotype bovine calc ccmode cl dbus dired-x \
ebrowse ede ediff edt efaq eieio eintr elisp emacs-mime emacs-gnutls emacs epa \
erc ert eshell eudc eww flymake forms gnus htmlfontify idlwave ido info \
mairix-el message mh-e newsticker nxml-mode octave-mode \
org pcl-cvs pgg rcirc reftex remember sasl sc semantic ses sieve smtpmail speedbar \
srecode todo-mode tramp url vhdl-mode vip viper widget wisent woman
INFO= ada-mode auth autotype bovine calc ccmode cl dbus dired-x \
ebrowse ede ediff edt efaq eieio eintr elisp emacs \
emacs-gnutls emacs-mime epa erc ert eshell eudc eww flymake \
forms gnus htmlfontify idlwave ido info mairix-el message mh-e \
newsticker nxml-mode octave-mode org pcl-cvs pgg rcirc reftex \
remember sasl sc semantic ses sieve smtpmail speedbar srecode \
todo-mode tramp url vhdl-mode vip viper widget wisent woman
OPTIONS_DEFINE= X11 ACL DBUS GCONF GIF JPEG M17N OTF PNG SOUND SOURCES SVG TIFF SCROLLBARS \
XFT XIM XML XPM MAGICK GNUTLS GSETTINGS LTO FILENOTIFY LLDB CAIRO
OPTIONS_SINGLE= X11 SOUND
ACL_DESC= ACL support
GSETTINGS_DESC= GSettings support
SCROLLBARS_DESC= Toolkit scroll-bars
SOUND_DESC= Sound support
SOURCES_DESC= Install sources
XAW_DESC= Athena widgets
XAW3D_DESC= Athena3D widgets
XIM_DESC= X Input Method Support
M17N_DESC= M17N support for text-shaping
OTF_DESC= Opentype fonts suport
FILENOTIFY_DESC= File notification support
LTO_DESC= Enable link-time optimization (requires GCC 4.6+)
LLDB_DESC= Enable lldb support for GUD (from llvm.org)
ACL_DESC= ACL support
GSETTINGS_DESC= GSettings support
SCROLLBARS_DESC=Toolkit scroll-bars
SOUND_DESC= Sound support
SOURCES_DESC= Install sources
XAW_DESC= Athena widgets
XAW3D_DESC= Athena3D widgets
XIM_DESC= X Input Method Support
M17N_DESC= M17N support for text-shaping
OTF_DESC= Opentype fonts suport
FILENOTIFY_DESC=File notification support
LTO_DESC= Enable link-time optimization (requires GCC 4.6+)
LLDB_DESC= Enable lldb support for GUD (from llvm.org)
OPTIONS_SINGLE_X11= GTK2 GTK3 XAW XAW3D MOTIF
OPTIONS_SINGLE_SOUND= ALSA OSS
OPTIONS_SINGLE_SOUND= ALSA OSS
OPTIONS_DEFAULT=ACL DBUS GCONF GIF GTK2 JPEG M17N OTF PNG SOUND SOURCES SVG TIFF \
SCROLLBARS XFT XIM XML XPM MAGICK GNUTLS GSETTINGS FILENOTIFY OSS X11
OPTIONS_DEFAULT=ACL DBUS FILENOTIFY GCONF GIF GNUTLS GSETTINGS GTK2 JPEG M17N \
MAGICK OSS OTF PNG SCROLLBARS SOUND SOURCES SVG TIFF X11 XFT XIM \
XML XPM
OPTIONS_SUB= SOURCES
OPTIONS_SUB= YES
LLDB_EXTRA_PATCHES= ${PATCHDIR}/extrapatch-lldb-gud.el
SOUND_CONFIGURE_OFF= --with-sound=no
ALSA_CONFIGURE_ON= --with-sound=alsa
ALSA_CONFIGURE_ON= --with-sound=alsa
ALSA_LIB_DEPENDS= libasound.so:${PORTSDIR}/audio/alsa-lib
OSS_CONFIGURE_ON= --with-sound=oss
OSS_CONFIGURE_ON= --with-sound=oss
DBUS_LIB_DEPENDS= libdbus-1.so:${PORTSDIR}/devel/dbus
DBUS_CONFIGURE_WITH= dbus
DBUS_LIB_DEPENDS= libdbus-1.so:${PORTSDIR}/devel/dbus
DBUS_CONFIGURE_WITH= dbus
GNUTLS_LIB_DEPENDS= libgnutls.so:${PORTSDIR}/security/gnutls
GNUTLS_CONFIGURE_WITH= gnutls
@ -100,26 +96,26 @@ GNUTLS_CONFIGURE_WITH= gnutls
XML_USE= GNOME=libxml2
XML_CONFIGURE_WITH= xml2
SVG_USE= GNOME=librsvg2
SVG_USE= GNOME=librsvg2
SVG_CONFIGURE_WITH= rsvg
X11_CONFIGURE_WITH= x
X11_USE= XORG=x11
X11_USE= XORG=x11
X11_USES= desktop-file-utils
GTK2_USE= GNOME=gtk20
GTK2_USE= GNOME=gtk20
GTK2_CONFIGURE_ON= --with-x-toolkit=gtk2
GTK3_USE= GNOME=gtk30
GTK3_USE= GNOME=gtk30
GTK3_CONFIGURE_ON= --with-x-toolkit=gtk3
XAW3D_LIB_DEPENDS= libXaw3d.so:${PORTSDIR}/x11-toolkits/Xaw3d
XAW3D_CONFIGURE_ON= --with-x-toolkit=athena
XAW_USE= XORG=xaw
XAW_USE= XORG=xaw
XAW_CONFIGURE_ON+= --with-x-toolkit=athena --without-xaw3d
MOTIF_USES= motif
MOTIF_USES= motif
MOTIF_CONFIGURE_ON+= --with-x-toolkit=motif
SCROLLBARS_CONFIGURE_WITH= toolkit-scroll-bars
@ -154,25 +150,25 @@ OTF_CONFIGURE_WITH= libotf
MAGICK_LIB_DEPENDS= libMagickCore-6.so:${PORTSDIR}/graphics/ImageMagick
MAGICK_CONFIGURE_WITH= imagemagick
GSETTINGS_USE= gnome=glib20
GSETTINGS_USE= gnome=glib20
GSETTINGS_CONFIGURE_WITH= gsettings
GCONF_USE= gnome=gconf2
GCONF_CONFIGURE_WITH= gconf
GCONF_USE= gnome=gconf2
GCONF_CONFIGURE_WITH= gconf
XIM_CONFIGURE_WITH= xim
XIM_CONFIGURE_WITH= xim
LTO_CONFIGURE_ON= --enable-link-time-optimization
LTO_USE= GCC=4.6+
LTO_CONFIGURE_ON= --enable-link-time-optimization
LTO_USE= GCC=4.6+
ACL_CONFIGURE_OFF= --disable-acl
ACL_CONFIGURE_OFF= --disable-acl
FILENOTIFY_CONFIGURE_ON= --with-file-notification=gfile
FILENOTIFY_CONFIGURE_ON=--with-file-notification=gfile
FILENOTIFY_CONFIGURE_OFF= --without-file-notification
FILENOTIFY_USE= GNOME=glib20
FILENOTIFY_USE= GNOME=glib20
CAIRO_USE= GNOME=cairo
CAIRO_CONFIGURE_ON= --with-cairo
CAIRO_USE= GNOME=cairo
CAIRO_CONFIGURE_ON= --with-cairo
.include <bsd.port.options.mk>
@ -182,37 +178,33 @@ CAIRO_CONFIGURE_ON= --with-cairo
# fixed in r263312 (11-CURRENT), and fixed in r263765 (10-STABLE)
.if ${ARCH} == "i386"
.if (${OSVERSION} < 1000706) || (${OSVERSION} >= 1100000 && ${OSVERSION} < 1100015)
USE_GCC= any
USE_GCC= any
.endif
.endif
DBUS_PTHREAD_LIBS= ${CC} -dumpspecs | ${GREP} -m 1 pthread: | ${SED} -e 's|^.*%{\!pg: %{pthread:||' -e 's|}.*$$||' || ${TRUE}
.if ${PORT_OPTIONS:MX11}
INSTALLS_ICONS= yes
.if !${PORT_OPTIONS:MXFT}
.if ${PORT_OPTIONS:MM17N}
IGNORE= m17n support for text-shaping requires Xft. Please run 'make config'
IGNORE= m17n support for text-shaping requires Xft. Please run 'make config'
.elif ${PORT_OPTIONS:MOTF}
IGNORE= opentype fonts support requires Xft. Please run 'make config'
IGNORE= opentype fonts support requires Xft. Please run 'make config'
.endif
.endif
.else
.for OPT in SVG GTK2 GTK3 XAW3D XAW MOTIF SCROLLBARS JPEG TIFF GIF PNG XPM XFT M17N MAGICK GCONF GSETTINGS XIM
.for OPT in GCONF GIF GSETTINGS GTK2 GTK3 JPEG M17N MAGICK MOTIF PNG \
SCROLLBARS SVG TIFF XAW XAW3D XFT XIM XPM
.if ${PORT_OPTIONS:M${OPT}}
IGNORE= option ${OPT} requires X11 option
IGNORE= option ${OPT} requires X11 option
.endif
.endfor
.endif
.if !${PORT_OPTIONS:MDBUS}
.if ${PORT_OPTIONS:MGSETTINGS}
IGNORE= support for GSettings requires DBUS. Please run 'make config'
IGNORE= support for GSettings requires DBUS. Please run 'make config'
.endif
.endif
@ -223,10 +215,6 @@ IGNORE= support for GSettings requires DBUS. Please run 'make config'
LDFLAGS+= -ltinfo
.endif
.if ${ARCH} == "ia64"
BROKEN= Emacs 24.X does not currently build on ia64
.endif
post-patch:
@${RM} -f ${WRKSRC}/info/*
@${REINPLACE_CMD} -e "s/%%EMACS_VER%%/${EMACS_VER}/g" -e "s/%%DATADIR%%/${DATADIR:C/\//\\\//g}/g" ${WRKSRC}/sources.el
@ -235,19 +223,20 @@ post-patch:
.endif
post-configure:
@${REINPLACE_CMD} -e "s/^\(DBUS_LIBS.*\)-pthread\(.*\)$$/\1$$(${DBUS_PTHREAD_LIBS})\2/" \
${WRKSRC}/src/Makefile
@${REINPLACE_CMD} -e \
"s/^\(DBUS_LIBS.*\)-pthread\(.*\)$$/\1$$(${DBUS_PTHREAD_LIBS})\2/" \
${WRKSRC}/src/Makefile
pre-configure:
@cd ${WRKSRC} && ./autogen.sh
post-install:
@${RM} -rf ${STAGEDIR}/var/games/emacs
.if ${PORT_OPTIONS:MSOURCES}
@${MKDIR} ${STAGEDIR}${DATADIR}/${EMACS_VER}/src
${INSTALL_DATA} ${WRKSRC}/src/*.[ch] ${STAGEDIR}${DATADIR}/${EMACS_VER}/src
${INSTALL_DATA} ${WRKSRC}/sources.el ${STAGEDIR}${DATADIR}/${EMACS_VER}/site-lisp/site-start.el
.endif
@${FIND} ${STAGEDIR}${PREFIX}/${INFO_PATH} -type f -name '*.gz' -exec ${GUNZIP_CMD} '{}' \;
.if !defined(WITHOUT_X11)
pre-everything::

View file

@ -1,2 +1,2 @@
SHA256 (emacs-25.0.50.20150810.a9bb9d8f.tar.xz) = 8229a8c0da55855d191997cee9fe64ac983b93a91b05dd5a005563ee865c76e6
SIZE (emacs-25.0.50.20150810.a9bb9d8f.tar.xz) = 26833624
SHA256 (emacs-mirror-emacs-25.0.50.20151126-af40b76_GH0.tar.xz) = 432b7359f5c798c4294d17661071e20dc4d8b6e7058105ab20a431619712ae77
SIZE (emacs-mirror-emacs-25.0.50.20151126-af40b76_GH0.tar.xz) = 37709547

View file

@ -1,19 +0,0 @@
#!/bin/sh
# $FreeBSD$
GAMESROOT=/var/games/emacs
ARCHLIBDIR=%%ARCHLIBDIR%%
if [ "$2" = "POST-INSTALL" ]; then
umask 022
mkdir -p $GAMESROOT
touch $GAMESROOT/snake-scores
touch $GAMESROOT/tetris-scores
chown games $ARCHLIBDIR/update-game-score
chmod u+s $ARCHLIBDIR/update-game-score
chown games $GAMESROOT
chmod 775 $GAMESROOT
fi
exit 0

View file

@ -1,16 +0,0 @@
#!/bin/sh
# $FreeBSD$
GAMESROOT=/var/games/emacs
if [ "$2" = "DEINSTALL" ]; then
for s in snake tetris; do
if [ ! -s $GAMESROOT/$s-scores ]; then
rm -f $GAMESROOT/$s-scores
fi
done
rmdir $GAMESROOT 2>/dev/null
fi
exit 0

File diff suppressed because it is too large Load diff