diff options
| author | skreuzer <skreuzer@FreeBSD.org> | 2011-06-07 22:53:03 +0800 |
|---|---|---|
| committer | skreuzer <skreuzer@FreeBSD.org> | 2011-06-07 22:53:03 +0800 |
| commit | 73fb03e13fa3c41d191a1c0b5504f1621d425792 (patch) | |
| tree | 3fd9e18725a50f15dcc393c251f96575a63f4f07 | |
| parent | 65e9f13cd9702aec750275e139bf4d8d479816a2 (diff) | |
| download | freebsd-ports-gnome-73fb03e13fa3c41d191a1c0b5504f1621d425792.tar.gz freebsd-ports-gnome-73fb03e13fa3c41d191a1c0b5504f1621d425792.tar.zst freebsd-ports-gnome-73fb03e13fa3c41d191a1c0b5504f1621d425792.zip | |
Respect WITHOUT_X11 in plist
PR: ports/157428
Submitted by: Jimmy Olgeni <olgeni@freebsd.org>
| -rw-r--r-- | emulators/mtools/Makefile | 11 | ||||
| -rw-r--r-- | emulators/mtools/distinfo | 1 | ||||
| -rw-r--r-- | emulators/mtools/files/patch-a | 26 |
3 files changed, 27 insertions, 11 deletions
diff --git a/emulators/mtools/Makefile b/emulators/mtools/Makefile index a157c3e410c1..65518b9b778c 100644 --- a/emulators/mtools/Makefile +++ b/emulators/mtools/Makefile @@ -7,7 +7,7 @@ PORTNAME= mtools PORTVERSION= 4.0.10 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= emulators MASTER_SITES= ${MASTER_SITE_GNU} MASTER_SITE_SUBDIR= mtools @@ -43,6 +43,7 @@ LDFLAGS+= -L${LOCALBASE}/lib -liconv .if defined(WITHOUT_X11) CONFIGURE_ARGS+= --without-x PLIST_SUB= X11="@comment " +MAKE_ENV+= WITHOUT_X11=${WITHOUT_X11} .else USE_XORG= x11 sm ice xau PLIST_SUB= X11="" @@ -53,13 +54,11 @@ post-patch: @${REINPLACE_CMD} -e \ 's|^#define MT_SIZE_T size_t|#define MT_SIZE_T off_t|g' \ ${WRKSRC}/llong.h -.for file in mformat.c @${REINPLACE_CMD} -e 's|/etc/mtools.conf|${PREFIX}/etc/mtools.conf|g' \ - ${WRKSRC}/${file} -.endfor -.for file in mtools.5 mtools.texi + ${WRKSRC}/mformat.c +.for f in mtools.5 mtools.texi @${REINPLACE_CMD} -e 's|/usr/local/etc/|${PREFIX}/etc/|g' \ - ${WRKSRC}/${file} + ${WRKSRC}/${f} .endfor post-install: diff --git a/emulators/mtools/distinfo b/emulators/mtools/distinfo index f0d701a5dd10..446286d9c92e 100644 --- a/emulators/mtools/distinfo +++ b/emulators/mtools/distinfo @@ -1,3 +1,2 @@ -MD5 (mtools-4.0.10.tar.bz2) = 750c2beba968a5d46dbaae24551a82b9 SHA256 (mtools-4.0.10.tar.bz2) = 860fee13acb39365bd28763070e24011ea55f381f96714d2841937525aa02ded SIZE (mtools-4.0.10.tar.bz2) = 381481 diff --git a/emulators/mtools/files/patch-a b/emulators/mtools/files/patch-a index 0d7a41122a56..203654ad2f99 100644 --- a/emulators/mtools/files/patch-a +++ b/emulators/mtools/files/patch-a @@ -1,6 +1,24 @@ ---- Makefile.in.orig Sat May 27 06:56:01 2006 -+++ Makefile.in Sat May 27 07:07:37 2006 -@@ -116,7 +116,7 @@ + +$FreeBSD$ + +--- Makefile.in.orig ++++ Makefile.in +@@ -72,10 +72,13 @@ + .SUFFIXES: .o .c + .SUFFIXES: .o .c + +-MAN1 = floppyd.1 floppyd_installtest.1 mattrib.1 mbadblocks.1 mcat.1 mcd.1 \ ++MAN1 = mattrib.1 mbadblocks.1 mcat.1 mcd.1 \ + mclasserase.1 mcopy.1 mdel.1 mdeltree.1 mdir.1 mdu.1 mformat.1 minfo.1 \ + mkmanifest.1 mlabel.1 mmd.1 mmount.1 mmove.1 mpartition.1 \ + mrd.1 mren.1 mshowfat.1 mtoolstest.1 mtools.1 mtype.1 mzip.1 ++ifndef WITHOUT_X11 ++MAN1 += floppyd.1 floppyd_installtest.1 ++endif + MAN1EXT = 1 + MAN1DIR = $(DESTDIR)$(mandir)/man${MAN1EXT} + MAN5 = mtools.5 +@@ -132,7 +135,7 @@ xdf_io.c mkmanifest.c @@ -9,7 +27,7 @@ LINKS=mattrib mcat mcd mclasserase mcopy mdel mdeltree mdir mdu mformat minfo \ mlabel mmd mmount mmove mpartition mrd mren mtype mtoolstest mshowfat \ -@@ -257,11 +257,11 @@ +@@ -269,11 +272,11 @@ install-scripts: $(DESTDIR)$(bindir)/mtools @$(top_srcdir)/mkinstalldirs $(DESTDIR)$(bindir) @for j in $(SCRIPTS) ; do \ |