Attachment #135582 for bug #180518

View | Details | Raw Unified | Return to bug 180518
Collapse All | Expand All

Lines 2-8 Link Here

(-)biology/tinker/Makefile (-1 / +4 lines)
2	# $FreeBSD: head/biology/tinker/Makefile 319343 2013-05-29 05:25:49Z miwi $	2	# $FreeBSD: head/biology/tinker/Makefile 319343 2013-05-29 05:25:49Z miwi $
3		3
4	PORTNAME= tinker	4	PORTNAME= tinker
5	PORTVERSION= 6.2.05	5	PORTVERSION= 6.2.06
6	CATEGORIES= biology	6	CATEGORIES= biology
7	MASTER_SITES= http://dasher.wustl.edu/tinker/downloads/	7	MASTER_SITES= http://dasher.wustl.edu/tinker/downloads/
8		8
Lines 39-44 Link Here
39	post-extract:	39	post-extract:
40	@${CHMOD} -R u+w ${WRKSRC}	40	@${CHMOD} -R u+w ${WRKSRC}
41		41
		42	pre-build:
		43	@${RM} -f ${BUILD_WRKSRC}/*.c
		44
42	post-install:	45	post-install:
43	@${MKDIR} ${DATADIR}	46	@${MKDIR} ${DATADIR}
44	(cd ${INSTALL_WRKSRC} && ${INSTALL_DATA} tinker.txt ${DATADIR})	47	(cd ${INSTALL_WRKSRC} && ${INSTALL_DATA} tinker.txt ${DATADIR})

Lines 1-2 Link Here

(-)biology/tinker/distinfo (-2 / +2 lines)
1	SHA256 (tinker-6.2.05.tar.gz) = 73dcb0fff809bd38e8fbede896b778302ff1e89c90129ca30b54d773b2ea8e50	1	SHA256 (tinker-6.2.06.tar.gz) = 6d5e79cd2a431787cd77bce2c469b7eec219f8e874425dcf8ebb74dabb0d985c
2	SIZE (tinker-6.2.05.tar.gz) = 20246464	2	SIZE (tinker-6.2.06.tar.gz) = 20182802




 
 ##
 ##  Machine:  Macintosh
@@ -597,14 +611,13 @@
            xyzpdb.x \
            xyzsybyl.x
 
-%.o: %.f
-	${F77} ${F77FLAGS} ${OPTFLAGS} $< -o $@ 
+.SUFFIXES: .x
 
-%.o: %.c
-	${CC} ${CFLAGS} ${INCLUDEDIR} ${OPTFLAGS} $<
+.f.o:
+	${F77} ${F77FLAGS} ${OPTFLAGS} $< -o $@ 
 server.o:
 	${F77} ${F77FLAGS} ${OPTFLAGS} server.f
 
-%.x: %.o libtinker.a
-	${F77} ${LINKFLAGS} -o $@ $^ ${LIBS}; strip $@

 
 all:	${EXEFILES}
 
@@ -612,70 +625,70 @@
 	rm -f *.o *.a *.x
 
 listing:
-	cat *.i *.f *.c > tinker.txt
+	cat *.i *.f > tinker.txt
 
 rename:
-	mv  alchemy.x    $(BINDIR)/alchemy
-	mv  analyze.x    $(BINDIR)/analyze
-	mv  anneal.x     $(BINDIR)/anneal
-	mv  archive.x    $(BINDIR)/archive
-	mv  bar.x        $(BINDIR)/bar
-	mv  correlate.x  $(BINDIR)/correlate
-	mv  crystal.x    $(BINDIR)/crystal
-	mv  diffuse.x    $(BINDIR)/diffuse

+	${BSD_INSTALL_PROGRAM}  analyze.x    $(BINDIR)/analyze
+	${BSD_INSTALL_PROGRAM}  anneal.x     $(BINDIR)/anneal
+	${BSD_INSTALL_PROGRAM}  archive.x    $(BINDIR)/archive
+	${BSD_INSTALL_PROGRAM}  bar.x        $(BINDIR)/bar
+	${BSD_INSTALL_PROGRAM}  correlate.x  $(BINDIR)/correlate
+	${BSD_INSTALL_PROGRAM}  crystal.x    $(BINDIR)/crystal
+	${BSD_INSTALL_PROGRAM}  diffuse.x    $(BINDIR)/diffuse




bin/analyze
bin/anneal
bin/archive
bin/bar
bin/correlate
bin/crystal
bin/diffuse

%%PORTEXAMPLES%%%%EXAMPLESDIR%%/copper.xyz
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cpentene.key
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cpentene.xyz
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/crambin.dyn
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/crambin.key
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/crambin.pdb
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/crambin.seq

%%PORTEXAMPLES%%%%EXAMPLESDIR%%/melittin.xyz
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/membrane.key
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/membrane.xyz
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/meohbox.dyn
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/meohbox.key
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/meohbox.xyz
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/methane.int

Return to bug 180518

Lines 53-70 Link Here

(-)biology/tinker/files/patch-make__Makefile (-10 / +16 lines)
53		53
54	##	54	##
55	## Machine: Macintosh	55	## Machine: Macintosh
56	@@ -595,6 +609,8 @@	56	@@ -597,14 +611,13 @@
57	xyzpdb.x \	57	xyzpdb.x \
58	xyzsybyl.x	58	xyzsybyl.x
59		59
		60	-%.o: %.f
		61	- ${F77} ${F77FLAGS} ${OPTFLAGS} $< -o $@
60	+.SUFFIXES: .x	62	+.SUFFIXES: .x
61	+	63
62	.f.o:	64	-%.o: %.c
63	${F77} ${F77FLAGS} ${OPTFLAGS} $*.f	65	- ${CC} ${CFLAGS} ${INCLUDEDIR} ${OPTFLAGS} $<
64		66	+.f.o:
65	@@ -604,8 +620,8 @@	67	+ ${F77} ${F77FLAGS} ${OPTFLAGS} $< -o $@
66	server.o:
67	${F77} ${F77FLAGS} ${OPTFLAGS} server.f
68		68
69	-%.x: %.o libtinker.a	69	-%.x: %.o libtinker.a
70	- ${F77} ${LINKFLAGS} -o $@ $^ ${LIBS}; strip $@	70	- ${F77} ${LINKFLAGS} -o $@ $^ ${LIBS}; strip $@
Lines 73-86 Link Here
73		73
74	all: ${EXEFILES}	74	all: ${EXEFILES}
75		75
76	@@ -616,66 +632,66 @@	76	@@ -612,70 +625,70 @@
77	cat .i .f *.c > tinker.txt	77	rm -f .o .a *.x
		78
		79	listing:
		80	- cat .i .f *.c > tinker.txt
		81	+ cat .i .f > tinker.txt
78		82
79	rename:	83	rename:
80	- mv alchemy.x $(BINDIR)/alchemy	84	- mv alchemy.x $(BINDIR)/alchemy
81	- mv analyze.x $(BINDIR)/analyze	85	- mv analyze.x $(BINDIR)/analyze
82	- mv anneal.x $(BINDIR)/anneal	86	- mv anneal.x $(BINDIR)/anneal
83	- mv archive.x $(BINDIR)/archive	87	- mv archive.x $(BINDIR)/archive
		88	- mv bar.x $(BINDIR)/bar
84	- mv correlate.x $(BINDIR)/correlate	89	- mv correlate.x $(BINDIR)/correlate
85	- mv crystal.x $(BINDIR)/crystal	90	- mv crystal.x $(BINDIR)/crystal
86	- mv diffuse.x $(BINDIR)/diffuse	91	- mv diffuse.x $(BINDIR)/diffuse
Lines 141-146 Link Here
141	+ ${BSD_INSTALL_PROGRAM} analyze.x $(BINDIR)/analyze	146	+ ${BSD_INSTALL_PROGRAM} analyze.x $(BINDIR)/analyze
142	+ ${BSD_INSTALL_PROGRAM} anneal.x $(BINDIR)/anneal	147	+ ${BSD_INSTALL_PROGRAM} anneal.x $(BINDIR)/anneal
143	+ ${BSD_INSTALL_PROGRAM} archive.x $(BINDIR)/archive	148	+ ${BSD_INSTALL_PROGRAM} archive.x $(BINDIR)/archive
		149	+ ${BSD_INSTALL_PROGRAM} bar.x $(BINDIR)/bar
144	+ ${BSD_INSTALL_PROGRAM} correlate.x $(BINDIR)/correlate	150	+ ${BSD_INSTALL_PROGRAM} correlate.x $(BINDIR)/correlate
145	+ ${BSD_INSTALL_PROGRAM} crystal.x $(BINDIR)/crystal	151	+ ${BSD_INSTALL_PROGRAM} crystal.x $(BINDIR)/crystal
146	+ ${BSD_INSTALL_PROGRAM} diffuse.x $(BINDIR)/diffuse	152	+ ${BSD_INSTALL_PROGRAM} diffuse.x $(BINDIR)/diffuse

Lines 2-7 Link Here

(-)biology/tinker/pkg-plist (-1 / +2 lines)
2	bin/analyze	2	bin/analyze
3	bin/anneal	3	bin/anneal
4	bin/archive	4	bin/archive
		5	bin/bar
5	bin/correlate	6	bin/correlate
6	bin/crystal	7	bin/crystal
7	bin/diffuse	8	bin/diffuse
Lines 156-161 Link Here
156	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/copper.xyz	157	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/copper.xyz
157	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cpentene.key	158	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cpentene.key
158	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cpentene.xyz	159	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/cpentene.xyz
		160	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/crambin.dyn
159	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/crambin.key	161	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/crambin.key
160	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/crambin.pdb	162	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/crambin.pdb
161	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/crambin.seq	163	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/crambin.seq
Lines 279-285 Link Here
279	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/melittin.xyz	281	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/melittin.xyz
280	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/membrane.key	282	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/membrane.key
281	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/membrane.xyz	283	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/membrane.xyz
282	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/meohbox.dyn
283	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/meohbox.key	284	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/meohbox.key
284	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/meohbox.xyz	285	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/meohbox.xyz
285	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/methane.int	286	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/methane.int