Attachment 140467 Details for Bug 187050 – file.diff

[patch] file.diff

file.diff (text/plain), 3.34 KB, created by tkato432 on 2014-02-25 18:10:04 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: tkato432

Created: 2014-02-25 18:10:04 UTC

Size: 3.34 KB

patch

obsolete

>diff -urN /usr/ports/mail/asmail/Makefile mail/asmail/Makefile
>--- /usr/ports/mail/asmail/Makefile	2014-02-08 04:11:52.000000000 +0900
>+++ mail/asmail/Makefile	2014-02-26 00:00:00.000000000 +0900
>@@ -3,16 +3,14 @@
> 
> PORTNAME=	asmail
> PORTVERSION=	2.1
>-PORTREVISION=	3
>+PORTREVISION=	4
> CATEGORIES=	mail afterstep
>-MASTER_SITES=	http://www.tigr.net/afterstep/download/asmail/
>+MASTER_SITES=	AFTERSTEP/apps/asmail/ \
>+		http://tigr.net/afterstep/download/asmail/
> 
> MAINTAINER=	ports@FreeBSD.org
> COMMENT=	Biff-type program, designed to match AfterStep
> 
>-DEPRECATED=	No more public distfiles
>-EXPIRATION_DATE=	2014-03-07
>-
> USE_XORG=	xpm
> USE_OPENSSL=	yes
> GNU_CONFIGURE=	yes
>@@ -21,27 +19,34 @@
> 		--with-xpm-includes=${LOCALBASE}/include \
> 		--with-xpm-library=${LOCALBASE}/lib
> 
>-MAN1=	asmail.1x
>-MAN5=	asmailrc.5x
>+LDFLAGS+=	-pthread -lssl -lcrypto
> 
>-CPPFLAGS+=	${PTHREAD_CFLAGS}
>-LDFLAGS+=	${PTHREAD_LIBS} -lssl -lcrypto
>+OPTIONS_DEFINE=	DOCS EXAMPLES
> 
>-NO_STAGE=	yes
> post-patch:
>-	@${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g ; \
>-		 s|machine/soundcard|sys/soundcard|g' ${WRKSRC}/configure
>-	@${REINPLACE_CMD} -e 's|@CFLAGS@ -D|@CFLAGS@ @CPPFLAGS@ -D|g ; \
>-		 s|-lpthread -lrt|@LDFLAGS@|g' ${WRKSRC}/autoconf/Makefile.defines.in
> 	@${REINPLACE_CMD} -e \
>-		's|/usr/local|${PREFIX}|g' ${WRKSRC}/asmailrc.sample
>+		's|-lpthread|-pthread|g ; \
>+		 s|machine/soundcard|sys/soundcard|g' \
>+		${WRKSRC}/configure
>+	@${REINPLACE_CMD} -e \
>+		'/STRIP/s|^|#| ; \
>+		 s| $$$(AFTER_.*DIR)$| $$(DESTDIR)\1| ; \
>+		 s|\.$[0-9]$x|.\1|' \
>+		${WRKSRC}/autoconf/Makefile.common.in
>+	@${REINPLACE_CMD} -e \
>+		's|@CFLAGS@ -D|@CFLAGS@ @CPPFLAGS@ -D|g ; \
>+		 s|-lpthread -lrt|@LDFLAGS@|g' \
>+		${WRKSRC}/autoconf/Makefile.defines.in
>+	@${REINPLACE_CMD} -e \
>+		's|/usr/local|${PREFIX}|g' \
>+		${WRKSRC}/asmailrc.sample
> 
> post-install:
>-.if !defined(NOPORTDOCS)
>-	@${MKDIR} ${DOCSDIR}
>-	${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR}
>-	@${MKDIR} ${EXAMPLESDIR}
>-	${INSTALL_DATA} ${WRKSRC}/asmailrc.sample ${EXAMPLESDIR}
>-.endif
>+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
>+	(cd ${WRKSRC} && ${INSTALL_DATA} README \
>+		${STAGEDIR}${DOCSDIR})
>+	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
>+	(cd ${WRKSRC} && ${INSTALL_DATA} asmailrc.sample \
>+		${STAGEDIR}${EXAMPLESDIR})
> 
> .include <bsd.port.mk>
>diff -urN /usr/ports/mail/asmail/pkg-descr mail/asmail/pkg-descr
>--- /usr/ports/mail/asmail/pkg-descr	2014-01-23 03:17:41.000000000 +0900
>+++ mail/asmail/pkg-descr	2014-02-26 00:00:00.000000000 +0900
>@@ -3,4 +3,4 @@
> It can be put in the Wharf, execute a program on incoming mail,
> execute a program upon mouseclick, show animations and more...
> 
>-WWW: http://www.tigr.net/afterstep/
>+WWW: http://tigr.net/afterstep/
>diff -urN /usr/ports/mail/asmail/pkg-plist mail/asmail/pkg-plist
>--- /usr/ports/mail/asmail/pkg-plist	2014-01-23 03:17:41.000000000 +0900
>+++ mail/asmail/pkg-plist	2014-02-26 00:00:00.000000000 +0900
>@@ -1,4 +1,6 @@
> bin/asmail
>+man/man1/asmail.1.gz
>+man/man5/asmailrc.5.gz
> %%DATADIR%%/pixmaps/e-no.xpm
> %%DATADIR%%/pixmaps/e0.xpm
> %%DATADIR%%/pixmaps/e1.xpm
>@@ -65,8 +67,8 @@
> %%DATADIR%%/sounds/clink.au
> %%DATADIR%%/sounds/drip.au
> %%PORTDOCS%%%%DOCSDIR%%/README
>-%%PORTDOCS%%%%EXAMPLESDIR%%/asmailrc.sample
>-%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%
>+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/asmailrc.sample
>+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%
> %%PORTDOCS%%@dirrm %%DOCSDIR%%
> @dirrm %%DATADIR%%/pixmaps
> @dirrm %%DATADIR%%/sounds

Actions: View | Diff

Attachments on bug 187050: 140467