Date: Mon, 4 Sep 2000 12:14:14 -0700 (PDT) From: tkato@prontomail.ne.jp To: freebsd-gnats-submit@FreeBSD.org Subject: ports/21036: Update port: graphics/xmfract Message-ID: <20000904191414.8639137B424@hub.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 21036
>Category: ports
>Synopsis: Update port: graphics/xmfract
>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: Mon Sep 04 12:20:02 PDT 2000
>Closed-Date:
>Last-Modified:
>Originator: KATO Tsuguru
>Release: 4.1-RELEASE i386
>Organization:
>Environment:
>Description:
- Support PREFIX properly
New file:
patches/patch-ac patches/patch-ad patches/patch-ae patches/patch-af
patches/patch-ag patches/patch-ah
Remove file:
patches/patch-aa patches/patch-ab
>How-To-Repeat:
>Fix:
diff -urN /usr/ports/graphics/xmfract/patches/patch-aa graphics/xmfract/patches/patch-aa
--- /usr/ports/graphics/xmfract/patches/patch-aa Tue Aug 13 01:23:21 1996
+++ graphics/xmfract/patches/patch-aa Thu Jan 1 09:00:00 1970
@@ -1,57 +0,0 @@
---- ./src/Makefile.in~ Tue Jun 20 10:46:55 1995
-+++ ./src/Makefile.in Thu Aug 1 10:39:58 1996
-@@ -48,8 +48,8 @@
- CC = @CC@
- DEFS = @DEFS@
- LIBS = @MALLOC_DEBUG_LIBS@ @X_LIBS@ @X_PRE_LIBS@ \
-- @MOTIF_LIBS@ -lXm @MOTIF_POST_LIBS@ \
-- @LIBXMU@ -lXt -lX11 @X_EXTRA_LIBS@ ../lib/libxmfra.a @LIBS@
-+ @MOTIF_LIBS@ ${MOTIFLIB} @MOTIF_POST_LIBS@ \
-+ @LIBXMU@ -lXext -lXt -lX11 @X_EXTRA_LIBS@ ../lib/libxmfra.a @LIBS@
- CFLAGS = @MALLOC_DEBUG_INC@ @CFLAGS@ @MOTIF_CFLAGS@ @X_CFLAGS@
- LDFLAGS = @LDFLAGS@
- STRIP = strip
---- ./etc/Makefile.in~ Thu Aug 1 10:34:07 1996
-+++ ./etc/Makefile.in Thu Aug 1 10:34:27 1996
-@@ -28,7 +28,7 @@
- VPATH = @srcdir@
-
- prefix = @prefix@
--libdir = $(prefix)/xmfract
-+libdir = $(prefix)/lib/X11/xmfract
- INSTALL = @INSTALL@
- INSTALL_DATA = @INSTALL_DATA@
- RM = rm
---- ./help/Makefile.in~ Tue Jun 20 10:47:32 1995
-+++ ./help/Makefile.in Thu Aug 1 10:43:29 1996
-@@ -28,7 +28,7 @@
- VPATH = @srcdir@
-
- prefix = @prefix@
--libdir = $(prefix)/xmfract
-+libdir = $(prefix)/lib/X11/xmfract
- helpdir = $(libdir)/help
- INSTALL = @INSTALL@
- INSTALL_DATA = @INSTALL_DATA@
---- ./Makefile.in~ Tue Jun 20 10:46:53 1995
-+++ ./Makefile.in Thu Aug 1 10:46:48 1996
-@@ -48,7 +48,7 @@
-
- .SUFFIXES:
-
--all install uninstall: config.h Makefile
-+all install uninstall:: config.h Makefile
- for subdir in $(SUBDIRS); do \
- echo making $@ in $$subdir; \
- (cd $$subdir && $(MAKE) $@) || exit 1; \
-@@ -56,6 +56,10 @@
-
- check:
- installcheck:
-+
-+install::
-+ install -c Xmfract.ad ${PREFIX}/lib/X11/app-defaults/Xmfract
-+ install -c xmfract.ini ${PREFIX}/lib/X11/xmfract
-
- $(PROGS):
- cd lib && $(MAKE) all
diff -urN /usr/ports/graphics/xmfract/patches/patch-ab graphics/xmfract/patches/patch-ab
--- /usr/ports/graphics/xmfract/patches/patch-ab Fri Aug 2 05:27:53 1996
+++ graphics/xmfract/patches/patch-ab Thu Jan 1 09:00:00 1970
@@ -1,38 +0,0 @@
---- ./src/cmdfile.c~ Tue Jun 20 10:46:57 1995
-+++ ./src/cmdfile.c Thu Aug 1 11:25:27 1996
-@@ -382,9 +382,11 @@
- */
- tempstr = getenv("XMFRACTDIR");
- if(tempstr == NULL) tempstr = getenv("FRACTDIR");
-- if(tempstr != NULL)
-+ if(tempstr != NULL) {
- sprintf(fractdir, "%s", tempstr);
--
-+ } else {
-+ sprintf(fractdir, "/usr/X11R6/lib/X11/xmfract/");
-+ }
- if(((ret = stat(fractdir, &st)) == -1) ||
- ((st.st_mode & S_IFMT) != S_IFDIR))
- {
---- ./src/init_data.c~ Tue Jun 20 10:47:04 1995
-+++ ./src/init_data.c Thu Aug 1 11:36:13 1996
-@@ -332,7 +332,9 @@
- {
- char *tempstr = getenv("XMFRACTDIR");
-
-- if (tempstr == NULL) tempstr = getenv("FRACTDIR");
-+ if (tempstr == NULL) {
-+ tempstr = getenv("FRACTDIR");
-+ }
-
- if(tempstr != NULL)
- {
-@@ -346,7 +348,7 @@
- }
-
- if(fractdir == NULL)
-- fractdir = getcwd(NULL, 64);
-+ fractdir = "/usr/X11R6/lib/X11/xmfract/";
-
- if(fractdir == NULL)
- {
diff -urN /usr/ports/graphics/xmfract/patches/patch-ac graphics/xmfract/patches/patch-ac
--- /usr/ports/graphics/xmfract/patches/patch-ac Thu Jan 1 09:00:00 1970
+++ graphics/xmfract/patches/patch-ac Thu Aug 10 23:21:03 2000
@@ -0,0 +1,33 @@
+--- Makefile.in.orig Wed Jun 21 00:46:53 1995
++++ Makefile.in Thu Aug 10 23:20:55 2000
+@@ -37,6 +37,10 @@
+
+ SHELL = /bin/sh
+
++prefix = @prefix@
++
++INSTALL_DATA = @INSTALL_DATA@
++
+ DISTFILES = Makefile.in config.h.in configure install.sh readme \
+ configure.in manifest
+
+@@ -48,7 +52,7 @@
+
+ .SUFFIXES:
+
+-all install uninstall: config.h Makefile
++all install uninstall:: config.h Makefile
+ for subdir in $(SUBDIRS); do \
+ echo making $@ in $$subdir; \
+ (cd $$subdir && $(MAKE) $@) || exit 1; \
+@@ -56,6 +60,10 @@
+
+ check:
+ installcheck:
++
++install::
++ $(INSTALL_DATA) $(srcdir)/Xmfract.ad $(prefix)/lib/X11/app-defaults/Xmfract
++ $(INSTALL_DATA) $(srcdir)/xmfract.ini $(prefix)/lib/X11/xmfract
+
+ $(PROGS):
+ cd lib && $(MAKE) all
diff -urN /usr/ports/graphics/xmfract/patches/patch-ad graphics/xmfract/patches/patch-ad
--- /usr/ports/graphics/xmfract/patches/patch-ad Thu Jan 1 09:00:00 1970
+++ graphics/xmfract/patches/patch-ad Thu Aug 10 22:22:17 2000
@@ -0,0 +1,22 @@
+--- src/Makefile.in.orig Wed Jun 21 00:46:55 1995
++++ src/Makefile.in Thu Aug 10 22:22:02 2000
+@@ -41,15 +41,15 @@
+ prefix = @prefix@
+ exec_prefix = @exec_prefix@
+ bindir = $(exec_prefix)/bin
+-libdir = $(prefix)/xmfract
++libdir = $(prefix)/lib/X11/xmfract
+
+ INSTALL = @INSTALL@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+ CC = @CC@
+-DEFS = @DEFS@
++DEFS = @DEFS@ -DXMFLACT_LIBDIR=\"$(libdir)\"
+ LIBS = @MALLOC_DEBUG_LIBS@ @X_LIBS@ @X_PRE_LIBS@ \
+- @MOTIF_LIBS@ -lXm @MOTIF_POST_LIBS@ \
+- @LIBXMU@ -lXt -lX11 @X_EXTRA_LIBS@ ../lib/libxmfra.a @LIBS@
++ @MOTIF_LIBS@ ${MOTIFLIB} @MOTIF_POST_LIBS@ \
++ @LIBXMU@ -lXext -lXt -lX11 @X_EXTRA_LIBS@ ../lib/libxmfra.a @LIBS@
+ CFLAGS = @MALLOC_DEBUG_INC@ @CFLAGS@ @MOTIF_CFLAGS@ @X_CFLAGS@
+ LDFLAGS = @LDFLAGS@
+ STRIP = strip
diff -urN /usr/ports/graphics/xmfract/patches/patch-ae graphics/xmfract/patches/patch-ae
--- /usr/ports/graphics/xmfract/patches/patch-ae Thu Jan 1 09:00:00 1970
+++ graphics/xmfract/patches/patch-ae Thu Aug 10 22:16:57 2000
@@ -0,0 +1,16 @@
+--- src/cmdfile.c.orig Wed Jun 21 00:46:57 1995
++++ src/cmdfile.c Thu Aug 10 22:13:02 2000
+@@ -382,9 +382,11 @@
+ */
+ tempstr = getenv("XMFRACTDIR");
+ if(tempstr == NULL) tempstr = getenv("FRACTDIR");
+- if(tempstr != NULL)
++ if(tempstr != NULL) {
+ sprintf(fractdir, "%s", tempstr);
+-
++ } else {
++ sprintf(fractdir, XMFLACT_LIBDIR);
++ }
+ if(((ret = stat(fractdir, &st)) == -1) ||
+ ((st.st_mode & S_IFMT) != S_IFDIR))
+ {
diff -urN /usr/ports/graphics/xmfract/patches/patch-af graphics/xmfract/patches/patch-af
--- /usr/ports/graphics/xmfract/patches/patch-af Thu Jan 1 09:00:00 1970
+++ graphics/xmfract/patches/patch-af Thu Aug 10 22:17:27 2000
@@ -0,0 +1,22 @@
+--- src/init_data.c.orig Wed Jun 21 00:47:04 1995
++++ src/init_data.c Thu Aug 10 22:13:02 2000
+@@ -332,7 +332,9 @@
+ {
+ char *tempstr = getenv("XMFRACTDIR");
+
+- if (tempstr == NULL) tempstr = getenv("FRACTDIR");
++ if (tempstr == NULL) {
++ tempstr = getenv("FRACTDIR");
++ }
+
+ if(tempstr != NULL)
+ {
+@@ -346,7 +348,7 @@
+ }
+
+ if(fractdir == NULL)
+- fractdir = getcwd(NULL, 64);
++ fractdir = XMFLACT_LIBDIR;
+
+ if(fractdir == NULL)
+ {
diff -urN /usr/ports/graphics/xmfract/patches/patch-ag graphics/xmfract/patches/patch-ag
--- /usr/ports/graphics/xmfract/patches/patch-ag Thu Jan 1 09:00:00 1970
+++ graphics/xmfract/patches/patch-ag Thu Aug 10 22:14:13 2000
@@ -0,0 +1,11 @@
+--- etc/Makefile.in.orig Wed Jun 21 00:47:16 1995
++++ etc/Makefile.in Thu Aug 10 22:13:01 2000
+@@ -28,7 +28,7 @@
+ VPATH = @srcdir@
+
+ prefix = @prefix@
+-libdir = $(prefix)/xmfract
++libdir = $(prefix)/lib/X11/xmfract
+ INSTALL = @INSTALL@
+ INSTALL_DATA = @INSTALL_DATA@
+ RM = rm
diff -urN /usr/ports/graphics/xmfract/patches/patch-ah graphics/xmfract/patches/patch-ah
--- /usr/ports/graphics/xmfract/patches/patch-ah Thu Jan 1 09:00:00 1970
+++ graphics/xmfract/patches/patch-ah Thu Aug 10 22:14:24 2000
@@ -0,0 +1,11 @@
+--- help/Makefile.in.orig Wed Jun 21 00:47:32 1995
++++ help/Makefile.in Thu Aug 10 22:13:01 2000
+@@ -28,7 +28,7 @@
+ VPATH = @srcdir@
+
+ prefix = @prefix@
+-libdir = $(prefix)/xmfract
++libdir = $(prefix)/lib/X11/xmfract
+ helpdir = $(libdir)/help
+ INSTALL = @INSTALL@
+ INSTALL_DATA = @INSTALL_DATA@
>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?20000904191414.8639137B424>