Bug 102893
| Summary: | editors/emacs-devel: broken plist and ".../site-lisp missing" when WITHOUT_GTK=YES is used | ||
|---|---|---|---|
| Product: | Ports & Packages | Reporter: | Boris Samorodov <bsam> |
| Component: | Individual Port(s) | Assignee: | Boris Samorodov <bsam> |
| Status: | Closed FIXED | ||
| Severity: | Affects Only Me | ||
| Priority: | Normal | ||
| Version: | Latest | ||
| Hardware: | Any | ||
| OS: | Any | ||
Responsible Changed From-To: freebsd-ports-bugs->bsam Submitter has GNATS access State Changed From-To: open->feedback Awaiting maintainers feedback OK, I understand what's going on.
1. Upstream developers build and install documents based upon
configure arguments (i.e. DOC-{EMACS_VER}.2 is builded and
unstalled if one use WITHOUT_GTK=YES). The corresponding DOC2 for
PLIST_SUB is introduced at Makefile and pkg-list.
2. {LOCALBASE}/emacs/site-lisp exists at /etc/mtree/BSD.local.dist
since 1998, hence no need to get removeg it by the port. The
correspondign line deletted from pkg-plist.
And while I'm here:
3. Replace some @dirrmtry by @dirrm at pkg-plist since other ports
which use those directories should be marked as CONFLICTS with the
current one and the main goal to use @dirrmtry is to avoid building
errors but not errors while administrative uninstalling/upgrading
(which are natural at a working machine). Hence unnecessary
@dirrmtry only mask (potential) building errors.
Note for those who wish to test the patch at 4.x/5.x: the patch from
PR/102906 should be applied as well.
And here is the proposed patch:
Index: Makefile
===================================================================
RCS file: /home/pcvs/ports/editors/emacs-devel/Makefile,v
retrieving revision 1.10
diff -u -r1.10 Makefile
--- Makefile 2 Sep 2006 16:03:28 -0000 1.10
+++ Makefile 6 Sep 2006 06:10:31 -0000
@@ -59,6 +59,11 @@
MAN1= ctags.1 emacs.1 emacsclient.1 etags.1
PLIST_SUB= EMACS_VER=${EMACS_VER} EMACS_ARCH=${CONFIGURE_TARGET}
+.if defined(WITHOUT_GTK)
+PLIST_SUB+= DOC2=""
+.else
+PLIST_SUB+= DOC2="@comment "
+.endif
INFO= ada-mode autotype calc ccmode cl dired-x ebrowse ediff \
efaq eintr elisp emacs-mime emacs erc eshell eudc \
Index: pkg-plist
===================================================================
RCS file: /home/pcvs/ports/editors/emacs-devel/pkg-plist,v
retrieving revision 1.7
diff -u -r1.7 pkg-plist
--- pkg-plist 2 Sep 2006 16:03:28 -0000 1.7
+++ pkg-plist 6 Sep 2006 06:10:32 -0000
@@ -24,6 +24,7 @@
%%DATADIR%%/%%EMACS_VER%%/etc/DEBUG
%%DATADIR%%/%%EMACS_VER%%/etc/DISTRIB
%%DATADIR%%/%%EMACS_VER%%/etc/DOC-%%EMACS_VER%%.1
+%%DOC2%%%%DATADIR%%/%%EMACS_VER%%/etc/DOC-%%EMACS_VER%%.2
%%DATADIR%%/%%EMACS_VER%%/etc/ERC-NEWS
%%DATADIR%%/%%EMACS_VER%%/etc/ETAGS.EBNF
%%DATADIR%%/%%EMACS_VER%%/etc/FTP
@@ -2599,7 +2600,7 @@
var/games/emacs/tetris-scores
@dirrm libexec/emacs/%%EMACS_VER%%/%%EMACS_ARCH%%
@dirrm libexec/emacs/%%EMACS_VER%%
-@dirrmtry libexec/emacs
+@dirrm libexec/emacs
@dirrm %%DATADIR%%/%%EMACS_VER%%/lisp/url
@dirrm %%DATADIR%%/%%EMACS_VER%%/lisp/textmodes
@dirrm %%DATADIR%%/%%EMACS_VER%%/lisp/term
@@ -2635,9 +2636,8 @@
@dirrm %%DATADIR%%/%%EMACS_VER%%/etc/images
@dirrm %%DATADIR%%/%%EMACS_VER%%/etc/e
@dirrm %%DATADIR%%/%%EMACS_VER%%/etc
-@dirrmtry %%DATADIR%%/%%EMACS_VER%%/site-lisp
-@dirrmtry %%DATADIR%%/%%EMACS_VER%%
-@dirrmtry %%DATADIR%%/site-lisp
+@dirrm %%DATADIR%%/%%EMACS_VER%%/site-lisp
+@dirrm %%DATADIR%%/%%EMACS_VER%%
@dirrmtry var/games/emacs
@dirrmtry var/games
@dirrmtry var
WBR
--
bsam
bsam 2006-09-23 23:26:26 UTC
FreeBSD ports repository
Modified files:
editors/emacs-devel Makefile pkg-plist
Removed files:
editors/emacs-devel/files extrapatch-texinfo
Log:
- fix pkg-plist [1]
o when WITHOUT_GTK=YES is used (add DOC2 variable to PLIST_SUB
at Makefile and corresponding changes to pkg-plist);
o change some @dirrmtry to @dirrm (for those directories which
belongs to the port);
o remove @dirrmrty for ${DATADIR}/emacs/site-lisp as it listed at
BSD.local.dist.
- fix make patch for 5.x and 4.x [2]
(remove extrapatch if ${OSVERSION} < 600000 -- upsteam is already have it).
PR: 102893 [1], 102906 [2]
Submitted by: bsam (me) [1], [2]
Approved by: keramida__at__ceid.upatras.gr (maintainer timeout 19 days)
Revision Changes Path
1.11 +5 -4 ports/editors/emacs-devel/Makefile
1.2 +0 -42 ports/editors/emacs-devel/files/extrapatch-texinfo (dead)
1.8 +4 -4 ports/editors/emacs-devel/pkg-plist
_______________________________________________
cvs-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/cvs-all
To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org"
State Changed From-To: feedback->closed Committed, thanks! ;-) |
I'm using misc/tinderbox to test package building. With the default options all is OK. But if I add options to portstree.env: ----- export EMACS_PORT_NAME="emacs22" if [ ${DIRNAME}="/usr/ports/editors/emacs-devel" ]; then export WITHOUT_GTK="YES" fi ----- the ports building have errors: ----- ... ====================<phase 7: make package>==================== ===> Building package for emacs-22.0.50.20060901 Creating package /tmp/packages/All/emacs-22.0.50.20060901.tbz Registering depends: Xaw3d-1.5E_1 libungif-4.1.4_1 xorg-libraries-6.9.0 fontconfig-2.3.2_5,1 tiff-3.8.2 libdrm-2.0.2 expat-2.0.0_1 freetype2-2.1.10_5 png-1.2.12_1 jpeg-6b_4 pkg-config-0.20_3. Creating bzip'd tar ball in '/tmp/packages/All/emacs-22.0.50.20060901.tbz' Deleting emacs-22.0.50.20060901 pkg_delete: unable to completely remove directory '/usr/local/share/emacs/22.0.50/etc' pkg_delete: couldn't entirely delete package (perhaps the packing list is incorrectly specified?) ================================================================ === Checking filesystem state list of extra files and directories in / (not present before this port was installed but present after it was deinstalled) 785014 4 drwxr-xr-x 3 root wheel 512 Sep 4 09:36 usr/local/share/emacs/22.0.50 785015 8 drwxr-xr-x 2 root wheel 3072 Sep 4 09:36 usr/local/share/emacs/22.0.50/etc 785158 4192 -rw-r--r-- 1 root wheel 2116112 Sep 4 09:35 usr/local/share/emacs/22.0.50/etc/DOC-22.0.50.2 list of files present before this port was installed but missing after it was deinstalled) ./usr/local/share/emacs/site-lisp missing Deleting tiff-3.8.2 Deleting png-1.2.12_1 Deleting libungif-4.1.4_1 Deleting autoconf-2.59_2 Deleting Xaw3d-1.5E_1 Deleting jpeg-6b_4 Deleting m4-1.4.4 Deleting perl-5.8.8 Removing stale symlinks from /usr/bin... Removing /usr/bin/perl Removing /usr/bin/perl5 Done. Cleaning up /etc/make.conf... Done. Cleaning up /etc/manpath.config... Done. Deleting xorg-libraries-6.9.0 Deleting libdrm-2.0.2 Deleting fontconfig-2.3.2_5,1 Deleting expat-2.0.0_1 Deleting freetype2-2.1.10_5 Deleting pkg-config-0.20_3 === Checking filesystem state after all packages deleted ================================================================ list of extra files and directories in / (not present on clean system but present after everything was deinstalled) 785014 4 drwxr-xr-x 3 root wheel 512 Sep 4 09:36 usr/local/share/emacs/22.0.50 785015 8 drwxr-xr-x 2 root wheel 3072 Sep 4 09:36 usr/local/share/emacs/22.0.50/etc 785158 4192 -rw-r--r-- 1 root wheel 2116112 Sep 4 09:35 usr/local/share/emacs/22.0.50/etc/DOC-22.0.50.2 list of files present on clean system but missing after everything was deinstalled) ./usr/local/share/emacs/site-lisp missing ================================================================ build of /usr/ports/editors/emacs-devel ended at Mon Sep 4 09:36:58 UTC 2006 ----- If I add a line to pkg-plist: ----- %%DATADIR%%/%%EMACS_VER%%/etc/DOC-%%EMACS_VER%%.2 ----- ...this error doesn't occure (until I try to build the port with default settings) but "./usr/local/share/emacs/site-lisp missing" stays. Fix: Unknown. WBR -- bsam How-To-Repeat: Use misc/tinderbox and portstree.env as shown above and/or standard make procedure with make.conf: ----- EMACS_PORT_NAME=emacs22 .if ${.CURDIR:M*/editors/emacs-devel} WITHOUT_GTK=YES .endif ----- But at the latter case you won't catch "./usr/local/share/emacs/site-lisp missing"