Date: Tue, 18 May 1999 21:42:31 +0200 (CEST) From: lkoeller@cc.fh-lippe.de To: FreeBSD-gnats-submit@freebsd.org Subject: ports/11768: Fixes for xbanner-1.31 port in categorie x11 Message-ID: <199905181942.VAA38009@cc.fh-lippe.de>
next in thread | raw e-mail | index | archive | help
>Number: 11768 >Category: ports >Synopsis: Fixes some problems and smother compiling/configuring >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: Tue May 18 13:50:01 PDT 1999 >Closed-Date: >Last-Modified: >Originator: Lars Koeller >Release: FreeBSD 3.1-RELEASE i386 >Organization: Fachhochschule Lippe, Lemgo, Germany >Environment: FreeBSD 3.1-RELEASE i386 >Description: Following fixes for xbanner-1.31 port: - installing in libexec directory isn't useful - app-defaults file could only be found when XAPPLRESDIR enviroment variable is set -> patch in sourcefile is needed - some compiler warnings and gets usage is fixed - wrong usage of isnumber macro fixed >How-To-Repeat: Make the port and try and look ;-) >Fix: Apply the appended patch to the port diff -abcr xbanner.org/Makefile xbanner/Makefile *** xbanner.org/Makefile Tue Feb 2 04:27:50 1999 --- xbanner/Makefile Tue May 18 20:16:33 1999 *************** *** 10,15 **** --- 10,16 ---- PKGNAME= xbanner-1.31 CATEGORIES= x11 MASTER_SITES= ftp://physics.fullerton.edu/pub/Linux/XBanner/ \ + ftp://ftp.uni-bielefeld.de/pub/systems/FreeBSD/lkoeller/ \ ${MASTER_SITE_SUNSITE} MASTER_SITE_SUBDIR=X11/xutils *************** *** 19,24 **** --- 20,30 ---- USE_X_PREFIX= yes #USE_IMAKE= yes + + post-patch: + ${MV} ${WRKSRC}/xres.c ${WRKSRC}/xres.c.input + ${SED} "s:%%X11BASE%%:${X11BASE}:" ${WRKSRC}/xres.c.input > ${WRKSRC}/xres.c + ${RM} -f ${WRKSRC}/xres.c.input post-install: ${INSTALL_DATA} ${WRKSRC}/samples/XBanner.ad \ diff -abcr xbanner.org/patches/patch-aa xbanner/patches/patch-aa *** xbanner.org/patches/patch-aa Wed Jan 20 09:18:57 1999 --- xbanner/patches/patch-aa Tue May 18 21:22:42 1999 *************** *** 1,5 **** ! *** Makefile.orig Mon May 12 10:55:59 1997 ! --- Makefile Tue Jan 19 22:27:09 1999 *************** *** 6,30 **** --- 1,5 ---- ! *** Makefile.orig Mon May 12 17:55:59 1997 ! --- Makefile Tue May 18 21:22:21 1999 *************** *** 6,30 **** *************** *** 40,46 **** GZIP =gzip # Binary directory for make install ! ! BINDIR =$(PREFIX)/libexec # Library directories for Linux ! XLIBDIR =$(X11BASE)/lib --- 40,46 ---- GZIP =gzip # Binary directory for make install ! ! BINDIR =$(PREFIX)/bin # Library directories for Linux ! XLIBDIR =$(X11BASE)/lib *************** *** 88,110 **** all: xbanner freetemp random_effect xb_check *************** ! *** 71,79 **** $(CC) $(CFLAGS) -o xb_check xb_check.o ! install: freetemp xbanner xb_check ! $(INSTALL) --strip --mode "0755" --owner root --group bin freetemp $(BINDIR)/freetemp ! $(INSTALL) --strip --mode "0755" --owner root --group bin xbanner $(BINDIR)/xbanner ! $(INSTALL) --strip --mode "0755" --owner root --group bin xb_check $(BINDIR)/xb_check strip: exe strip xbanner freetemp xb_check random_effect ! --- 71,79 ---- $(CC) $(CFLAGS) -o xb_check xb_check.o ! install: freetemp xbanner xb_check ! $(INSTALL) -cs -g bin -m "0755" -o root freetemp $(BINDIR)/freetemp ! $(INSTALL) -cs -g bin -m "0755" -o root xbanner $(BINDIR)/xbanner ! $(INSTALL) -cs -g bin -m "0755" -o root xb_check $(BINDIR)/xb_check strip: exe strip xbanner freetemp xb_check random_effect --- 88,113 ---- all: xbanner freetemp random_effect xb_check *************** ! *** 70,79 **** ! xb_check: xb_check.o $(CC) $(CFLAGS) -o xb_check xb_check.o ! ! install: freetemp xbanner xb_check ! $(INSTALL) --strip --mode "0755" --owner root --group bin freetemp $(BINDIR)/freetemp ! $(INSTALL) --strip --mode "0755" --owner root --group bin xbanner $(BINDIR)/xbanner ! $(INSTALL) --strip --mode "0755" --owner root --group bin xb_check $(BINDIR)/xb_check strip: exe strip xbanner freetemp xb_check random_effect ! --- 70,80 ---- ! xb_check: xb_check.o $(CC) $(CFLAGS) -o xb_check xb_check.o ! ! install: freetemp xbanner xb_check random_effect ! $(INSTALL) -cs -g bin -m "0755" -o root freetemp $(BINDIR)/freetemp ! $(INSTALL) -cs -g bin -m "0755" -o root xbanner $(BINDIR)/xbanner ! $(INSTALL) -cs -g bin -m "0755" -o root xb_check $(BINDIR)/xb_check + ! $(INSTALL) -cs -g bin -m "0755" -o root random_effect $(BINDIR)/random_effect strip: exe strip xbanner freetemp xb_check random_effect diff -abcr xbanner.org/patches/patch-ab xbanner/patches/patch-ab *** xbanner.org/patches/patch-ab Wed Jan 20 09:18:57 1999 --- xbanner/patches/patch-ab Tue May 18 20:51:41 1999 *************** *** 1,5 **** ! *** xb_check.c.orig Mon Jan 18 23:27:31 1999 ! --- xb_check.c Mon Jan 18 23:31:08 1999 *************** *** 145,151 **** } --- 1,5 ---- ! *** xb_check.c.orig Mon May 12 17:55:59 1997 ! --- xb_check.c Tue May 18 20:51:35 1999 *************** *** 145,151 **** } *************** *** 17,19 **** --- 17,70 ---- { if(atoi(s)==0 && *s!='0') return 0; + *************** + *** 303,309 **** + } + } + + ! while(gets(line)!=NULL) + { + if(line[0]=='!') + continue; + --- 303,309 ---- + } + } + + ! while(fgets(line, LNLEN, stdin)!=NULL) + { + if(line[0]=='!') + continue; + *************** + *** 363,369 **** + printf("Valid resource name with unknown program name:\n%s\n",line); + if(val[0]=='\0') + printf("No value in line containing valid resource name:\n%s\n",line); + ! if(!isnumber(val)) + printf("Value in line requiring a numerical value is not numerical:\n%s\n",line); + } + else + --- 363,369 ---- + printf("Valid resource name with unknown program name:\n%s\n",line); + if(val[0]=='\0') + printf("No value in line containing valid resource name:\n%s\n",line); + ! if(!isnumb(val)) + printf("Value in line requiring a numerical value is not numerical:\n%s\n",line); + } + else + *************** + *** 373,379 **** + printf("Valid resource class name with unknown program name:\n%s\n",line); + if(val[0]=='\0') + printf("No value in line containing valid resource class name:\n%s\n",line); + ! if(!isnumber(val)) + printf("Value in line requiring a numerical value is not numerical:\n%s\n",line); + } + break; + --- 373,379 ---- + printf("Valid resource class name with unknown program name:\n%s\n",line); + if(val[0]=='\0') + printf("No value in line containing valid resource class name:\n%s\n",line); + ! if(!isnumb(val)) + printf("Value in line requiring a numerical value is not numerical:\n%s\n",line); + } + break; Only in xbanner/patches: patch-ac Only in xbanner/patches: patch-ad diff -abcr xbanner.org/pkg/PLIST xbanner/pkg/PLIST *** xbanner.org/pkg/PLIST Wed Jan 20 09:18:57 1999 --- xbanner/pkg/PLIST Tue May 18 21:26:41 1999 *************** *** 1,6 **** ! libexec/freetemp ! libexec/xbanner ! libexec/xb_check share/doc/XBanner/COPYING-2.0 share/doc/XBanner/Changes.txt share/doc/XBanner/Credits.txt --- 1,8 ---- ! bin/freetemp ! bin/xbanner ! bin/xb_check ! bin/random_effect ! lib/X11/app-defaults/XBanner share/doc/XBanner/COPYING-2.0 share/doc/XBanner/Changes.txt share/doc/XBanner/Credits.txt *************** *** 23,25 **** --- 25,29 ---- share/examples/XBanner/FgGrad_Idea_2 share/examples/XBanner/Just_an_Idea share/examples/XBanner/My_Home_Setup.tar + @dirrm share/doc/XBanner + @dirrm share/examples/XBanner >Release-Note: >Audit-Trail: >Unformatted: To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?199905181942.VAA38009>