- add missing license comment

- regen WANTLIB/PLIST/PATCHES
- use SUBST_CMD

from gleydson soares
This commit is contained in:
jasper 2011-04-25 12:39:31 +00:00
parent 951451a628
commit 24a0fea2d5
6 changed files with 33 additions and 33 deletions

View File

@ -1,9 +1,9 @@
# $OpenBSD: Makefile,v 1.32 2010/11/22 10:16:08 espie Exp $
# $OpenBSD: Makefile,v 1.33 2011/04/25 12:39:31 jasper Exp $
COMMENT= biff-type program, designed to match AfterStep
DISTNAME= asmail-0.56
REVISION = 3
REVISION = 4
CATEGORIES= mail
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=asmail/}
@ -12,11 +12,13 @@ HOMEPAGE= http://asmail.sourceforge.net/
LIB_DEPENDS= graphics/jpeg
# GPLv2
PERMIT_PACKAGE_CDROM= Yes
PERMIT_PACKAGE_FTP= Yes
PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes
WANTLIB= ICE SM X11 Xext Xpm Xt c pthread-stubs xcb jpeg>=62
WANTLIB= ICE SM X11 Xext Xpm Xt c jpeg>=62
USE_GROFF = Yes
@ -26,9 +28,7 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
pre-configure:
@sed -e s#!!PREFIX!!#${PREFIX}#g \
${WRKSRC}/sample.asmailrc > ${WRKSRC}/sample.asmailrc.new
@mv ${WRKSRC}/sample.asmailrc.new ${WRKSRC}/sample.asmailrc
${SUBST_CMD} ${WRKSRC}/sample.asmailrc
NO_REGRESS= Yes

View File

@ -1,6 +1,6 @@
--- autoconf/Makefile.common.in.orig Thu Apr 13 05:55:58 2000
+++ autoconf/Makefile.common.in Mon Jun 26 17:48:09 2000
@@ -8,14 +8,14 @@
--- autoconf/Makefile.common.in.orig Thu Apr 13 06:55:58 2000
+++ autoconf/Makefile.common.in Sun Apr 24 22:44:14 2011
@@ -8,14 +8,14 @@ all: $(PROG)
install: $(PROG)
$(STRIP) $(PROG)
@ -19,7 +19,7 @@
clean:
$(RMF) $(PROG) *.o *~ *% *.bak \#* core
@@ -32,10 +32,10 @@
@@ -32,10 +32,10 @@ indent:
done
$(PROG): $(OBJS)

View File

@ -1,5 +1,5 @@
--- autoconf/Makefile.defines.in.orig Thu Apr 13 05:55:58 2000
+++ autoconf/Makefile.defines.in Mon Jun 26 17:46:46 2000
--- autoconf/Makefile.defines.in.orig Thu Apr 13 06:55:58 2000
+++ autoconf/Makefile.defines.in Sun Apr 24 22:44:14 2011
@@ -4,6 +4,8 @@
CC = @CC@
@ -9,7 +9,7 @@
# -march=pentiumpro -mcpu=pentiumpro
RANLIB = @RANLIB@
@@ -45,6 +47,8 @@
@@ -45,6 +47,8 @@ AFTER_DIR = @with_afterdir@
AFTER_SAVE = @with_afterdir@/.workspace_state
AFTER_NONCF = @with_afterdir@/non-configurable

View File

@ -1,5 +1,5 @@
--- pop.c.orig
+++ pop.c
--- pop.c.orig Thu Apr 13 07:08:02 2000
+++ pop.c Sun Apr 24 22:44:14 2011
@@ -38,7 +38,7 @@
case 0: /* Timeout */ \
return -1; \
@ -9,7 +9,7 @@
if (strcmp(strg, ACK_MSG) != 0) \
return -1; \
}
@@ -170,7 +170,7 @@
@@ -170,7 +170,7 @@ int pop3(int sd, int *nm, int *om, char *user, char *p
case 0: /* Timeout */
return -1;
}
@ -18,7 +18,7 @@
if (strcmp(strg, ACK_MSG) == 0) {
/* LIST works */
pnt = input + strlen(strg) + 1;
@@ -210,21 +210,21 @@
@@ -210,21 +210,21 @@ int pop(char *string, int *nmail, int *oldmail)
/* Parse the string */
/* Servername */
pnt = string + 2;
@ -43,7 +43,7 @@
InDuty = 0;
return -1;
}
@@ -239,7 +239,7 @@
@@ -239,7 +239,7 @@ int pop(char *string, int *nmail, int *oldmail)
/* optional mailboxname for IMAP */
if (type == TYPE_IMAP)

View File

@ -1,6 +1,6 @@
--- sample.asmailrc.orig Mon Jun 26 16:24:30 2000
+++ sample.asmailrc Mon Jun 26 16:26:56 2000
@@ -70,7 +70,7 @@
--- sample.asmailrc.orig Thu Apr 13 06:55:58 2000
+++ sample.asmailrc Sun Apr 24 23:00:50 2011
@@ -70,7 +70,7 @@ AnimationSpeed 0 0 60
#########################################################
# Turns off shaped window #
#########################################################
@ -9,25 +9,25 @@
#########################################################
@@ -116,7 +116,7 @@
@@ -116,25 +116,25 @@ NumOfMsgColor white
#########################################################
# Assign frame if not shaped #
#########################################################
-#Frame ~/GNUstep/Library/AfterStep/desktop/icons/8bpp/frame.xpm
+#Frame !!PREFIX!!/include/X11/pixmaps/frame.xpm
+#Frame ${PREFIX}/include/X11/pixmaps/frame.xpm
#########################################################
@@ -124,17 +124,18 @@
# Assign icons/animations #
#########################################################
NoMail
# /usr/local/share/afterstep/desktop/icons/common/Mail1.xpm
+ !!PREFIX!!/include/X11/pixmaps/nomail_s.xpm
-# /usr/local/share/afterstep/desktop/icons/common/Mail1.xpm
+ ${PREFIX}/include/X11/pixmaps/nomail_s.xpm
End
OldMail
-# /usr/local/share/afterstep/desktop/icons/common/Mail2.xpm
+ !!PREFIX!!/include/X11/pixmaps/oldmail_s.xpm
+ ${PREFIX}/include/X11/pixmaps/oldmail_s.xpm
End
NewMail
@ -35,10 +35,10 @@
-# /usr/local/share/afterstep/desktop/icons/common/Mail2.xpm
-# /usr/local/share/afterstep/desktop/icons/common/Mail3.xpm
-# /usr/local/share/afterstep/desktop/icons/common/Mail2.xpm
+ !!PREFIX!!/include/X11/pixmaps/oldmail_s.xpm
+ !!PREFIX!!/include/X11/pixmaps/newmail_s.xpm
+ !!PREFIX!!/include/X11/pixmaps/oldmail_s.xpm
+ !!PREFIX!!/include/X11/pixmaps/newmail_s.xpm
+ ${PREFIX}/include/X11/pixmaps/oldmail_s.xpm
+ ${PREFIX}/include/X11/pixmaps/newmail_s.xpm
+ ${PREFIX}/include/X11/pixmaps/oldmail_s.xpm
+ ${PREFIX}/include/X11/pixmaps/newmail_s.xpm
End
#########################################################

View File

@ -1,6 +1,6 @@
@comment $OpenBSD: PLIST,v 1.7 2004/12/30 01:07:37 espie Exp $
@comment $OpenBSD: PLIST,v 1.8 2011/04/25 12:39:31 jasper Exp $
@conflict xfaces-*
bin/asmail
@bin bin/asmail
include/X11/pixmaps/
include/X11/pixmaps/cloud-e/
include/X11/pixmaps/cloud-e/e0.xpm