From owner-freebsd-ports  Fri Aug 11 16:50:25 2000
Delivered-To: freebsd-ports@freebsd.org
Received: from freefall.freebsd.org (freefall.FreeBSD.ORG [204.216.27.21])
	by hub.freebsd.org (Postfix) with ESMTP id E07FF37BCE4
	for <freebsd-ports@FreeBSD.org>; Fri, 11 Aug 2000 16:50:07 -0700 (PDT)
	(envelope-from gnats@FreeBSD.org)
Received: (from gnats@localhost)
	by freefall.freebsd.org (8.9.3/8.9.2) id QAA16386;
	Fri, 11 Aug 2000 16:50:07 -0700 (PDT)
	(envelope-from gnats@FreeBSD.org)
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 98D5F37BBE5; Fri, 11 Aug 2000 16:49:41 -0700 (PDT)
Message-Id: <20000811234941.98D5F37BBE5@hub.freebsd.org>
Date: Fri, 11 Aug 2000 16:49:41 -0700 (PDT)
From: tkato@prontomail.ne.jp
To: freebsd-gnats-submit@FreeBSD.org
X-Send-Pr-Version: www-1.0
Subject: ports/20545: Update port: mail/wmpop3
Sender: owner-freebsd-ports@FreeBSD.ORG
Precedence: bulk
X-Loop: FreeBSD.org


>Number:         20545
>Category:       ports
>Synopsis:       Update port: mail/wmpop3
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Fri Aug 11 16:50:07 PDT 2000
>Closed-Date:
>Last-Modified:
>Originator:     KATO Tsuguru
>Release:        4.1-RELEASE i386
>Organization:
>Environment:
>Description:
- Support X11BASE properly
- Remove USE_GMAKE

>How-To-Repeat:

>Fix:
diff -urN /usr/ports/mail/wmpop3/Makefile mail/wmpop3/Makefile
--- /usr/ports/mail/wmpop3/Makefile	Thu Aug  3 21:22:29 2000
+++ mail/wmpop3/Makefile	Thu Aug 10 23:47:44 2000
@@ -13,24 +13,23 @@
 
 MAINTAINER=	jim@FreeBSD.org
 
-USE_GMAKE=	yes
 WRKSRC=		${WRKDIR}/${PKGNAME}/wmpop3
+
 USE_X_PREFIX=	yes
 USE_XPM=	yes
+ALL_TARGET=	clean all
 
-.include <bsd.port.pre.mk>
-
-pre-build:
-	(cd ${WRKSRC} && ${GMAKE} clean)
-
-post-install:
+do-install:
+	${INSTALL_PROGRAM} ${WRKSRC}/wmpop3 ${PREFIX}/bin
 	@${ECHO} "===>   Installing wmpop3rc in ${PREFIX}/share/examples/wmpop3"
 	@${ECHO} "===>   Modify to your config and copy to ~/.wmpop3rc"
-	@${MKDIR} ${PREFIX}/share/examples/wmpop3 && ${CHMOD} a+rx ${PREFIX}/share/examples/wmpop3
-	@${INSTALL_DATA} ${WRKSRC}/wmpop3rc ${PREFIX}/share/examples/wmpop3
+	@${MKDIR} ${PREFIX}/share/examples/wmpop3
+	${INSTALL_DATA} ${WRKSRC}/wmpop3rc ${PREFIX}/share/examples/wmpop3
+.if !defined(NOPORTDOCS)
 	@${ECHO} "===>   Installing README in ${PREFIX}/share/doc/wmpop3"
 	@${ECHO} "===>   Please read it for usage instructions"
-	@${MKDIR} ${PREFIX}/share/doc/wmpop3 && ${CHMOD} a+rx ${PREFIX}/share/doc/wmpop3
-	@${INSTALL_DATA} ${WRKDIR}/${PKGNAME}/README ${PREFIX}/share/doc/wmpop3
+	@${MKDIR} ${PREFIX}/share/doc/wmpop3
+	${INSTALL_DATA} ${WRKDIR}/${PKGNAME}/README ${PREFIX}/share/doc/wmpop3
+.endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff -urN /usr/ports/mail/wmpop3/patches/patch-aa mail/wmpop3/patches/patch-aa
--- /usr/ports/mail/wmpop3/patches/patch-aa	Sun Jun 20 08:40:00 1999
+++ mail/wmpop3/patches/patch-aa	Thu Aug 10 23:41:39 2000
@@ -14,40 +14,11 @@
  
  .c.o:
 -	cc -I/usr/X11R6/share/include $(FLAGS) -c -Wall $< -o $*.o
-+	${CC} -I/usr/X11R6/include $(CFLAGS) -c -Wall $< -o $*.o
++	${CC} -I${X11BASE}/include $(CFLAGS) -c $< -o $@
  
  wmpop3: $(OBJS) 
 -	cc $(FLAGS) -o wmpop3 $^ -lXext $(LIBDIR) $(LIBS)
-+	${CC} $(CFLAGS) -o wmpop3 $^ -lXext $(LIBDIR) $(LIBS)
++	${CC} $(CFLAGS) -o wmpop3 $(OBJS) -lXext $(LIBDIR) $(LIBS)
  
  all:: wmpop3
  
-@@ -24,25 +24,7 @@
- 	rm -f *~
- 
- install:: wmpop3 
--	@echo "Use 'make install1' for system install." 
--	@echo "Use 'make install2' for single user install."
--	@echo 
--
--install1:: wmpop3 
--	cp -f wmpop3 /usr/local/bin/
--	chmod 755 /usr/local/bin/wmpop3
--	chown root:root /usr/local/bin/wmpop3
--	@echo 
--	@echo "WMPop3 Installation finished..."
--
--install2:: wmpop3
--	mkdir $(HOME)/wmpop3
--	cp -f wmpop3 $(HOME)/wmpop3
--	chmod 755 $(HOME)/wmpop3
--	cp -f wmpop3rc $(HOME)/.wmpop3rc
--	chmod 600 $(HOME)/.wmpop3rc
--	@echo "WMPop3 Installation finished..."
--	@echo 
--	@echo "Make sure ~/wmpop3 is in your path"
--	@echo 
-+	cp -f wmpop3 /usr/X11R6/bin/
-+	chmod 755 /usr/X11R6/bin/wmpop3
-+	chown root.wheel /usr/X11R6/bin/wmpop3
- 	@echo "Please edit ~/.wmpop3rc before running WMPop3."


>Release-Note:
>Audit-Trail:
>Unformatted:


To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-ports" in the body of the message